Project

General

Profile

« Previous | Next » 

Revision 2110

Added by darkviper almost 10 years ago

  1. install/ change old install-struct format into new one

View differences:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12
===============================================================================
13 13

  
14
25 Nov-2014 Build 2110 Manuela v.d.Decken(DarkViper)
15
# install/ change old install-struct format into new one
14 16
25 Nov-2014 Build 2109 Manuela v.d.Decken(DarkViper)
15 17
# admin/settings/ little typofix, save settings now use official method
16 18
25 Nov-2014 Build 2108 Manuela v.d.Decken(DarkViper)
branches/2.8.x/wb/admin/interface/version.php
51 51

  
52 52
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
53 53
if(!defined('VERSION')) define('VERSION', '2.8.4');
54
if(!defined('REVISION')) define('REVISION', '2109');
54
if(!defined('REVISION')) define('REVISION', '2110');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/install/sql/install-struct.sql
5 5
-- --------------------------------------------------------
6 6
-- Database structure for WebsiteBaker core
7 7
--
8
-- Replacements: {TABLE_PREFIX}, {TABLE_ENGINE}, {TABLE_COLLATION}
8
-- Replacements: {TABLE_PREFIX}, {TABLE_ENGINE}, {FIELD_COLLATION}
9 9
--
10 10
-- --------------------------------------------------------
11 11
--
......
14 14
DROP TABLE IF EXISTS `{TABLE_PREFIX}addons`;
15 15
CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}addons` (
16 16
  `addon_id` int(11) NOT NULL AUTO_INCREMENT,
17
  `type` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
18
  `directory` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
19
  `name` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
20
  `description` text{TABLE_COLLATION} NOT NULL,
21
  `function` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
22
  `version` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
23
  `platform` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
24
  `author` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
25
  `license` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
17
  `type` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
18
  `directory` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
19
  `name` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
20
  `description` text{FIELD_COLLATION} NOT NULL,
21
  `function` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
22
  `version` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
23
  `platform` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
24
  `author` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
25
  `license` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
26 26
  PRIMARY KEY (addon_id)
27 27
){TABLE_ENGINE};
28 28
--
......
31 31
DROP TABLE IF EXISTS `{TABLE_PREFIX}groups`;
32 32
CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}groups` (
33 33
  `group_id` int(11) NOT NULL AUTO_INCREMENT,
34
  `name` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
35
  `system_permissions` text{TABLE_COLLATION} NOT NULL,
36
  `module_permissions` text{TABLE_COLLATION} NOT NULL,
37
  `template_permissions` text{TABLE_COLLATION} NOT NULL,
34
  `name` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
35
  `system_permissions` text{FIELD_COLLATION} NOT NULL,
36
  `module_permissions` text{FIELD_COLLATION} NOT NULL,
37
  `template_permissions` text{FIELD_COLLATION} NOT NULL,
38 38
  PRIMARY KEY (`group_id`)
39 39
){TABLE_ENGINE};
40 40
--
......
46 46
  `parent` int(11) NOT NULL DEFAULT '0',
47 47
  `root_parent` int(11) NOT NULL DEFAULT '0',
48 48
  `level` int(11) NOT NULL DEFAULT '0',
49
  `link` varchar(255){TABLE_COLLATION} NOT NULL,
50
  `target` varchar(7){TABLE_COLLATION} NOT NULL DEFAULT '',
51
  `page_title` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
52
  `page_icon` varchar(512){TABLE_COLLATION} NOT NULL DEFAULT '',
53
  `menu_title` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
54
  `menu_icon_0` varchar(512){TABLE_COLLATION} NOT NULL DEFAULT '',
55
  `menu_icon_1` varchar(512){TABLE_COLLATION} NOT NULL DEFAULT '',
56
  `tooltip` varchar(512){TABLE_COLLATION} NOT NULL DEFAULT '',
57
  `description` text{TABLE_COLLATION} NOT NULL,
58
  `keywords` text{TABLE_COLLATION} NOT NULL,
59
  `page_trail` varchar(255){TABLE_COLLATION} NOT NULL,
60
  `template` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
61
  `visibility` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
49
  `link` varchar(255){FIELD_COLLATION} NOT NULL,
50
  `target` varchar(7){FIELD_COLLATION} NOT NULL DEFAULT '',
51
  `page_title` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
52
  `page_icon` varchar(512){FIELD_COLLATION} NOT NULL DEFAULT '',
53
  `menu_title` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
54
  `menu_icon_0` varchar(512){FIELD_COLLATION} NOT NULL DEFAULT '',
55
  `menu_icon_1` varchar(512){FIELD_COLLATION} NOT NULL DEFAULT '',
56
  `tooltip` varchar(512){FIELD_COLLATION} NOT NULL DEFAULT '',
57
  `description` text{FIELD_COLLATION} NOT NULL,
58
  `keywords` text{FIELD_COLLATION} NOT NULL,
59
  `page_trail` varchar(255){FIELD_COLLATION} NOT NULL,
60
  `template` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
61
  `visibility` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
62 62
  `position` int(11) NOT NULL DEFAULT '0',
63 63
  `menu` int(11) NOT NULL DEFAULT '1',
64
  `language` varchar(5){TABLE_COLLATION} NOT NULL DEFAULT '',
64
  `language` varchar(5){FIELD_COLLATION} NOT NULL DEFAULT '',
65 65
  `page_code` int(11) NOT NULL DEFAULT '0',
66 66
  `searching` int(11) NOT NULL DEFAULT '0',
67
  `admin_groups` varchar(512){TABLE_COLLATION} NOT NULL DEFAULT '1',
68
  `admin_users` varchar(512){TABLE_COLLATION} NOT NULL,
69
  `viewing_groups` varchar(512){TABLE_COLLATION} NOT NULL DEFAULT '1',
70
  `viewing_users` varchar(512){TABLE_COLLATION} NOT NULL,
67
  `admin_groups` varchar(512){FIELD_COLLATION} NOT NULL DEFAULT '1',
68
  `admin_users` varchar(512){FIELD_COLLATION} NOT NULL,
69
  `viewing_groups` varchar(512){FIELD_COLLATION} NOT NULL DEFAULT '1',
70
  `viewing_users` varchar(512){FIELD_COLLATION} NOT NULL,
71 71
  `modified_when` int(11) NOT NULL DEFAULT '0',
72 72
  `modified_by` int(11) NOT NULL DEFAULT '0',
73
  `custom01` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
74
  `custom02` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
73
  `custom01` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
74
  `custom02` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
75 75
  PRIMARY KEY (`page_id`)
76 76
) {TABLE_ENGINE};
77 77
--
......
82 82
  `section_id` int(11) NOT NULL AUTO_INCREMENT,
83 83
  `page_id` int(11) NOT NULL DEFAULT '0',
84 84
  `position` int(11) NOT NULL DEFAULT '0',
85
  `title` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
86
  `module` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
85
  `title` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
86
  `module` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
87 87
  `block` int(11) NOT NULL DEFAULT '1',
88 88
  `publ_start` int(11) NOT NULL DEFAULT '0',
89 89
  `publ_end` int(11) NOT NULL DEFAULT '0',
......
96 96
CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}users` (
97 97
  `user_id` int(11) NOT NULL AUTO_INCREMENT,
98 98
  `group_id` int(11) NOT NULL DEFAULT '0' COMMENT 'this field is set deprecated and never used in WB',
99
  `groups_id` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '0',
99
  `groups_id` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '0',
100 100
  `active` int(11) NOT NULL DEFAULT '0',
101
  `username` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
102
  `password` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
103
  `confirm_code` varchar(32){TABLE_COLLATION} NOT NULL DEFAULT '',
101
  `username` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
102
  `password` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
103
  `confirm_code` varchar(32){FIELD_COLLATION} NOT NULL DEFAULT '',
104 104
  `confirm_timeout` int(11) NOT NULL DEFAULT '0',
105
  `remember_key` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
105
  `remember_key` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
106 106
  `last_reset` int(11) NOT NULL DEFAULT '0',
107
  `display_name` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
108
  `email` text{TABLE_COLLATION} NOT NULL,
107
  `display_name` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
108
  `email` text{FIELD_COLLATION} NOT NULL,
109 109
  `timezone` int(11) NOT NULL DEFAULT '0',
110
  `date_format` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
111
  `time_format` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
112
  `language` varchar(5){TABLE_COLLATION} NOT NULL DEFAULT 'EN',
113
  `home_folder` text{TABLE_COLLATION} NOT NULL,
110
  `date_format` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
111
  `time_format` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
112
  `language` varchar(5){FIELD_COLLATION} NOT NULL DEFAULT 'EN',
113
  `home_folder` text{FIELD_COLLATION} NOT NULL,
114 114
  `login_when` int(11) NOT NULL DEFAULT '0',
115
  `login_ip` varchar(15){TABLE_COLLATION} NOT NULL DEFAULT '',
115
  `login_ip` varchar(15){FIELD_COLLATION} NOT NULL DEFAULT '',
116 116
  PRIMARY KEY (`user_id`)
117 117
){TABLE_ENGINE};
118 118
--
......
120 120
--
121 121
DROP TABLE IF EXISTS `{TABLE_PREFIX}settings`;
122 122
CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}settings` (
123
  `name` varchar(255){TABLE_COLLATION} NOT NULL,
124
  `value` text{TABLE_COLLATION} NOT NULL,
123
  `name` varchar(255){FIELD_COLLATION} NOT NULL,
124
  `value` text{FIELD_COLLATION} NOT NULL,
125 125
  PRIMARY KEY (`name`)
126 126
){TABLE_ENGINE};
127 127
--
......
130 130
DROP TABLE IF EXISTS `{TABLE_PREFIX}search`;
131 131
CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}search` (
132 132
  `search_id` int(11) NOT NULL AUTO_INCREMENT,
133
  `name` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
134
  `value` text{TABLE_COLLATION} NOT NULL,
135
  `extra` text{TABLE_COLLATION} NOT NULL,
133
  `name` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
134
  `value` text{FIELD_COLLATION} NOT NULL,
135
  `extra` text{FIELD_COLLATION} NOT NULL,
136 136
  PRIMARY KEY (`search_id`)
137 137
){TABLE_ENGINE};
138 138
-- EndOfFile
branches/2.8.x/wb/install/save.php
474 474
/*****************************
475 475
Begin Create Database Tables
476 476
*****************************/
477
$oSqlInst = new SqlInstall($database, __DIR__.'/sql/install-struct.sql');
477
$oSqlInst = new SqlImport($database, __DIR__.'/sql/install-struct.sql');
478 478
if ($oSqlInst) {
479 479
    if (!$oSqlInst->doImport('install')) {
480 480
        set_error($oSqlInst->getError());
481 481
    }
482 482
}
483
$oSqlInst = new SqlInstall($database, __DIR__.'/sql/install-data.sql');
483
$oSqlInst = new SqlImport($database, __DIR__.'/sql/install-data.sql');
484 484
if ($oSqlInst) {
485 485
    if (!$oSqlInst->doImport('install')) {
486 486
        set_error($oSqlInst->getError());

Also available in: Unified diff