Project

General

Profile

« Previous | Next » 

Revision 1822

Added by Dietmar almost 12 years ago

! update installer, strict difference between table structure and data
  1. fixed wrong constant for settings table
    ! update redirct to upgrade-script in /admin/start(index.php

View differences:

branches/2.8.x/CHANGELOG
13 13

  
14 14

  
15 15

  
16
20 Nov-2012 Build 1822 Dietmar Woellbrink (Luisehahne)
17
! update installer, strict difference between table structure and data 
18
# fixed wrong constant for settings table
19
! update redirct to upgrade-script in /admin/start(index.php
16 20
16 Nov-2012 Build 1821 Dietmar Woellbrink (Luisehahne)
17 21
! forgot to upload the /install/save.php
18 22
16 Nov-2012 Build 1820 Dietmar Woellbrink (Luisehahne)
branches/2.8.x/wb/upgrade-script.php
519 519
     */
520 520
    $aDebugMessage[] = "<span>Adding/updating website_signature to settings table</span>";
521 521
    $cfg = array(
522
    	'website_signature' => (defined('WEBSITE_SIGNATURE') && (WEBSITE_SIGNATURE=='') ? '' : WEBSITE_SIGNATURE)
522
    	'website_signature' => (defined('WEBSITE_SIGNATURE') ? WEBSITE_SIGNATURE : '')
523 523
    );
524 524

  
525 525
    $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
......
529 529
     */
530 530
    $aDebugMessage[] = "<span>Adding/updating confirmed_registration to settings table</span>";
531 531
    $cfg = array(
532
    	'confirmed_registration' => (defined('CONFIRMED_REGISTRATION') && (CONFIRMED_REGISTRATION=='') ? '' : CONFIRMED_REGISTRATION)
532
    	'confirmed_registration' => (defined('CONFIRMED_REGISTRATION') ? CONFIRMED_REGISTRATION : '0')
533 533
    );
534 534

  
535 535
    $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
......
770 770

  
771 771
}
772 772

  
773
$aDebugMessage = array();
774
/**********************************************************
775
 * This part with changing in mod_wysiwyg will be removed in the final version
776
 * special workout for the tester
777
 *  - Remove/add PRIMARY KEY from/to "section_id" from table "mod_wysiwygs"
778
 */
773
if(version_compare(WB_REVISION, '1800', '<'))
774
{
775
    $aDebugMessage = array();
776
    /**********************************************************
777
     * This part with changing in mod_wysiwyg will be removed in the final version
778
     * special workout for the tester
779
     *  - Remove/add PRIMARY KEY from/to "section_id" from table "mod_wysiwygs"
780
     */
779 781
    $aDebugMessage[] = '<div style="margin-left:2em;">';
780 782

  
781 783
    $sTable = TABLE_PREFIX.'mod_wysiwyg';
......
793 795
    $aDebugMessage[] = $database->index_add($sTable, '', 'section_id', 'PRIMARY') ? " $OK<br />" : " $FAIL!<br />";
794 796
    $aDebugMessage[] = '</div>';
795 797

  
796
if($bDebugModus) {
797
// $aDebugMessage[] =
798
    echo implode(PHP_EOL,$aDebugMessage);
798
    if($bDebugModus) {
799
    // $aDebugMessage[] =
800
        echo implode(PHP_EOL,$aDebugMessage);
801
    }
799 802
}
800
$aDebugMessage = array();
801
echo '<h3>Step '.(++$stepID).': Updating group_id in table users</h3>';
803

  
804
if(version_compare(WB_REVISION, VERSION, '<'))
805
{
806
    $aDebugMessage = array();
807
    echo '<h3>Step '.(++$stepID).': Updating group_id in table users</h3>';
802 808
    /**********************************************************
803 809
    * Updating group_id in table users
804 810
    */
805

  
806 811
        echo '<div style="margin-left:2em;">';
807 812
        $aUsers = array();
808 813
		// Get existing values
......
840 845

  
841 846
    $aDebugMessage[] = '</div>';
842 847

  
843
if($bDebugModus) {
844
// $aDebugMessage[] =
845
    echo implode(PHP_EOL,$aDebugMessage);
846
}else {
847
    echo '<span><strong>'.$iTotalUsers.' users updating the group_id</strong></span>'." $OK<br />";
848
    echo '</div>';
848
    if($bDebugModus) {
849
    // $aDebugMessage[] =
850
        echo implode(PHP_EOL,$aDebugMessage);
851
    }else {
852
        echo '<span><strong>'.$iTotalUsers.' users updating the group_id</strong></span>'." $OK<br />";
853
        echo '</div>';
854
    }
849 855
}
850 856

  
851 857
$aDebugMessage = array();
852 858

  
branches/2.8.x/wb/admin/start/index.php
14 14
 * @lastmodified    $Date$
15 15
 *
16 16
 */
17
//$string = "pages,pages_view,pages_add,pages_add_l0,pages_settings,pages_modify,pages_intro,pages_delete,media,media_view,media_upload,media_rename,media_delete,media_create,addons,modules,modules_view,modules_install,modules_uninstall,templates,templates_view,templates_install,templates_uninstall,languages,languages_view,languages_install,languages_uninstall,settings,settings_basic,settings_advanced,access,users,users_view,users_add,users_modify,users_delete,groups,groups_view,groups_add,groups_modify,groups_delete,admintools
18
//media,media_create,media_upload,media_view,preferences,preferences_view,pages,pages_modify,pages_view";
19
//$regex = "/(pages)+[a-z]*[_]([a-z_0-9]+)[^,]/im";
20
//preg_match_all ($regex, $string, $output);
21
//
22 17

  
23 18
$config_file = realpath('../../config.php');
24 19
if(file_exists($config_file) && !defined('WB_URL'))
......
79 74
	if($wb_revision=$database->get_one($sql)) {
80 75
	}
81 76
	if (version_compare($wb_revision, REVISION ) < 0) {
82
		if(!headers_sent()) {
83
			header('Location: '.WB_URL.'/upgrade-script.php');
84
		    exit;
85
		} else {
86
		    echo "<p style=\"text-align:center;\"> The <strong>upgrade script</strong> could not be start automatically.\n" .
87
		         "Please click <a style=\"font-weight:bold;\" " .
88
		         "href=\"".WB_URL."/upgrade-script.php\">on this link</a> to start the script!</p>\n";
89
		    exit;
90
		}
77
echo "<p style=\"text-align:center;\"> If the <strong>upgrade script</strong> could not be start automatically.\n" .
78
     "Please click <a style=\"font-weight:bold;\" " .
79
     "href=\"".WB_URL."/upgrade-script.php\">on this link</a> to start the script!</p>\n";
80

  
81
echo "<script type=\"text/javascript\">
82
<!--
83
// Get the location object
84
var locationObj = document.location;
85
// Set the value of the location object
86
document.location = '".WB_URL."/upgrade-script.php';
87
-->
88
</script>";
89

  
90
//		if(!headers_sent()) {
91
//			header('Location: '.WB_URL.'/upgrade-script.php');
92
//		    exit;
93
//		} else {
94
//		    echo "<p style=\"text-align:center;\"> The <strong>upgrade script</strong> could not be start automatically.\n" .
95
//		         "Please click <a style=\"font-weight:bold;\" " .
96
//		         "href=\"".WB_URL."/upgrade-script.php\">on this link</a> to start the script!</p>\n";
97
//		    exit;
98
//		}
91 99
	}
92 100
}
93 101
// ---------------------------------------
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.3');
54
if(!defined('REVISION')) define('REVISION', '1821');
54
if(!defined('REVISION')) define('REVISION', '1822');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/install/sql/wb_search.sql
1

  
2
--
3
-- Tabellenstruktur für Tabelle `{TABLE_PREFIX}search`
4
--
5

  
6
DROP TABLE IF EXISTS `{TABLE_PREFIX}search`;
7
CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}search` (
8
  `search_id` int(11) NOT NULL AUTO_INCREMENT,
9
  `name` varchar(255) NOT NULL DEFAULT '',
10
  `value` text NOT NULL,
11
  `extra` text NOT NULL,
12
  PRIMARY KEY (`search_id`)
13
) ENGINE=MyISAM  DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
14

  
15
--
16
-- Daten für Tabelle `{TABLE_PREFIX}search`
17
--
18

  
19
INSERT INTO `{TABLE_PREFIX}search` VALUES(1, 'header', '<h1>[TEXT_SEARCH]</h1>\r\n<form name="searchpage" action="[WB_URL]/search/index.php" method="get">\r\n<table cellpadding="3" cellspacing="0" border="0" style="width:100%; max-width:500px">\r\n<tr>\r\n<td>\r\n<input type="hidden" name="search_path" value="[SEARCH_PATH]" />\r\n<input type="hidden" name="referrer" value="[REFERRER]" />\r\n<input type="text" name="string" value="[SEARCH_STRING]" style="width: 100%;" />\r\n</td>\r\n<td width="100">\r\n<input type="submit" value="[TEXT_SEARCH]" style="width: 100%;" />\r\n</td>\r\n</tr>\r\n<tr>\r\n<td colspan="2">\r\n<input type="radio" name="match" id="match_all" value="all"[ALL_CHECKED] />\r\n<label for="match_all">[TEXT_ALL_WORDS]</label>\r\n<input type="radio" name="match" id="match_any" value="any"[ANY_CHECKED] />\r\n<label for="match_any">[TEXT_ANY_WORDS]</label>\r\n<input type="radio" name="match" id="match_exact" value="exact"[EXACT_CHECKED] />\r\n<label for="match_exact">[TEXT_EXACT_MATCH]</label>\r\n</td>\r\n</tr>\r\n</table>\r\n</form>\r\n<hr />', '');
20
INSERT INTO `{TABLE_PREFIX}search` VALUES(2, 'footer', '', '');
21
INSERT INTO `{TABLE_PREFIX}search` VALUES(3, 'results_header', '<p>[TEXT_RESULTS_FOR] "<strong>[SEARCH_STRING]</strong>":</p>\r\n<div class="searchresults">', '');
22
INSERT INTO `{TABLE_PREFIX}search` VALUES(4, 'results_loop', '<h3 style="margin:10px 0 3px 0;"><a href="[LINK]">[TITLE]</a></h3>\r\n<div style="font-size:0.8em;">[TEXT_LAST_UPDATED_BY] [DISPLAY_NAME] [TEXT_ON] [DATE]</div>\r\n<p style="padding: 0 0 5px 0; margin: 2px 0 10px 0; border-bottom: 1px solid #777;">[DESCRIPTION].. [EXCERPT]</p>', '');
23
INSERT INTO `{TABLE_PREFIX}search` VALUES(5, 'results_footer', '</div>', '');
24
INSERT INTO `{TABLE_PREFIX}search` VALUES(6, 'no_results', '<p>[TEXT_NO_RESULTS]</p>', '');
25
INSERT INTO `{TABLE_PREFIX}search` VALUES(7, 'module_order', 'faqbaker,manual,wysiwyg', '');
26
INSERT INTO `{TABLE_PREFIX}search` VALUES(8, 'max_excerpt', '5', '');
27
INSERT INTO `{TABLE_PREFIX}search` VALUES(9, 'time_limit', '0', '');
28
INSERT INTO `{TABLE_PREFIX}search` VALUES(10, 'cfg_enable_old_search', 'true', '');
29
INSERT INTO `{TABLE_PREFIX}search` VALUES(11, 'cfg_search_keywords', 'true', '');
30
INSERT INTO `{TABLE_PREFIX}search` VALUES(12, 'cfg_search_description', 'true', '');
31
INSERT INTO `{TABLE_PREFIX}search` VALUES(13, 'cfg_show_description', 'true', '');
32
INSERT INTO `{TABLE_PREFIX}search` VALUES(14, 'cfg_enable_flush', 'true', '');
33
INSERT INTO `{TABLE_PREFIX}search` VALUES(15, 'template', '', '');
34 0

  
branches/2.8.x/wb/install/sql/wb_search_data.sql
1
-- phpMyAdmin SQL Dump
2
-- Date of creation: 2012-11-17 12:37am
3
-- Server Version: 5.1.41
4
--
5
-- initial data for table `{TABLE_PREFIX}search`
6
--
7
INSERT INTO `{TABLE_PREFIX}search` VALUES(1, 'header', '<h1>[TEXT_SEARCH]</h1>\r\n<form name="searchpage" action="[WB_URL]/search/index.php" method="get">\r\n<table cellpadding="3" cellspacing="0" border="0" style="width:100%; max-width:500px">\r\n<tr>\r\n<td>\r\n<input type="hidden" name="search_path" value="[SEARCH_PATH]" />\r\n<input type="hidden" name="referrer" value="[REFERRER]" />\r\n<input type="text" name="string" value="[SEARCH_STRING]" style="width: 100%;" />\r\n</td>\r\n<td width="100">\r\n<input type="submit" value="[TEXT_SEARCH]" style="width: 100%;" />\r\n</td>\r\n</tr>\r\n<tr>\r\n<td colspan="2">\r\n<input type="radio" name="match" id="match_all" value="all"[ALL_CHECKED] />\r\n<label for="match_all">[TEXT_ALL_WORDS]</label>\r\n<input type="radio" name="match" id="match_any" value="any"[ANY_CHECKED] />\r\n<label for="match_any">[TEXT_ANY_WORDS]</label>\r\n<input type="radio" name="match" id="match_exact" value="exact"[EXACT_CHECKED] />\r\n<label for="match_exact">[TEXT_EXACT_MATCH]</label>\r\n</td>\r\n</tr>\r\n</table>\r\n</form>\r\n<hr />', '');
8
INSERT INTO `{TABLE_PREFIX}search` VALUES(2, 'footer', '', '');
9
INSERT INTO `{TABLE_PREFIX}search` VALUES(3, 'results_header', '<p>[TEXT_RESULTS_FOR] "<strong>[SEARCH_STRING]</strong>":</p>\r\n<div class="searchresults">', '');
10
INSERT INTO `{TABLE_PREFIX}search` VALUES(4, 'results_loop', '<h3 style="margin:10px 0 3px 0;"><a href="[LINK]">[TITLE]</a></h3>\r\n<div style="font-size:0.8em;">[TEXT_LAST_UPDATED_BY] [DISPLAY_NAME] [TEXT_ON] [DATE]</div>\r\n<p style="padding: 0 0 5px 0; margin: 2px 0 10px 0; border-bottom: 1px solid #777;">[DESCRIPTION].. [EXCERPT]</p>', '');
11
INSERT INTO `{TABLE_PREFIX}search` VALUES(5, 'results_footer', '</div>', '');
12
INSERT INTO `{TABLE_PREFIX}search` VALUES(6, 'no_results', '<p>[TEXT_NO_RESULTS]</p>', '');
13
INSERT INTO `{TABLE_PREFIX}search` VALUES(7, 'module_order', 'faqbaker,manual,wysiwyg', '');
14
INSERT INTO `{TABLE_PREFIX}search` VALUES(8, 'max_excerpt', '5', '');
15
INSERT INTO `{TABLE_PREFIX}search` VALUES(9, 'time_limit', '0', '');
16
INSERT INTO `{TABLE_PREFIX}search` VALUES(10, 'cfg_enable_old_search', 'true', '');
17
INSERT INTO `{TABLE_PREFIX}search` VALUES(11, 'cfg_search_keywords', 'true', '');
18
INSERT INTO `{TABLE_PREFIX}search` VALUES(12, 'cfg_search_description', 'true', '');
19
INSERT INTO `{TABLE_PREFIX}search` VALUES(13, 'cfg_show_description', 'true', '');
20
INSERT INTO `{TABLE_PREFIX}search` VALUES(14, 'cfg_enable_flush', 'true', '');
21
INSERT INTO `{TABLE_PREFIX}search` VALUES(15, 'template', '', '');
22
-- End of file
0 23

  
branches/2.8.x/wb/install/sql/websitebaker.sql
1
-- phpMyAdmin SQL Dump
2
-- Date of creation: 2012-11-17 12:37am
3
-- Server Version: 5.1.41
4
SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
5
-- --------------------------------------------------------
6
-- Database structure for WebsiteBaker core
1 7
--
2
-- Tabellenstruktur für Tabelle '{TABLE_PREFIX}addons'
8
-- Replacements: {TABLE_PREFIX}, {TABLE_ENGINE}, {TABLE_COLLATION}
3 9
--
4

  
5
DROP TABLE IF EXISTS {TABLE_PREFIX}addons;
6
CREATE TABLE IF NOT EXISTS {TABLE_PREFIX}addons (
7
  addon_id int(11) NOT NULL AUTO_INCREMENT,
8
  `type` varchar(255) NOT NULL DEFAULT '',
9
  `directory` varchar(255) NOT NULL DEFAULT '',
10
  `name` varchar(255) NOT NULL DEFAULT '',
11
  description text NOT NULL,
12
  `function` varchar(255) NOT NULL DEFAULT '',
13
  version varchar(255) NOT NULL DEFAULT '',
14
  platform varchar(255) NOT NULL DEFAULT '',
15
  author varchar(255) NOT NULL DEFAULT '',
16
  license varchar(255) NOT NULL DEFAULT '',
10
-- --------------------------------------------------------
11
--
12
-- Structure of table  '{TABLE_PREFIX}addons'
13
--
14
DROP TABLE IF EXISTS `{TABLE_PREFIX}addons`;
15
CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}addons` (
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 26
  PRIMARY KEY (addon_id)
18
) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
19

  
27
){TABLE_ENGINE};
20 28
--
21
-- Tabellenstruktur für Tabelle `{TABLE_PREFIX}groups`
29
-- Structure of table  '{TABLE_PREFIX}groups'
22 30
--
23

  
24 31
DROP TABLE IF EXISTS `{TABLE_PREFIX}groups`;
25 32
CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}groups` (
26 33
  `group_id` int(11) NOT NULL AUTO_INCREMENT,
27
  `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
28
  `system_permissions` text COLLATE utf8_unicode_ci NOT NULL,
29
  `module_permissions` text COLLATE utf8_unicode_ci NOT NULL,
30
  `template_permissions` text COLLATE utf8_unicode_ci NOT NULL,
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,
31 38
  PRIMARY KEY (`group_id`)
32
) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
33

  
39
){TABLE_ENGINE};
34 40
--
35
-- Daten für Tabelle `{TABLE_PREFIX}groups`
41
-- Structure of table  '{TABLE_PREFIX}pages'
36 42
--
37

  
38
INSERT INTO `{TABLE_PREFIX}groups` VALUES(1, 'Administrators', 'access,addons,admintools,admintools_view,groups,groups_add,groups_delete,groups_modify,groups_view,languages,languages_install,languages_uninstall,languages_view,media,media_create,media_delete,media_rename,media_upload,media_view,modules,modules_advanced,modules_install,modules_uninstall,modules_view,pages,pages_add,pages_add_l0,pages_delete,pages_intro,pages_modify,pages_settings,pages_view,preferences,preferences_view,settings,settings_advanced,settings_basic,settings_view,templates,templates_install,templates_uninstall,templates_view,users,users_add,users_delete,users_modify,users_view', '', '');
39

  
40
-- --------------------------------------------------------
41

  
42
--
43
-- Tabellenstruktur für Tabelle `{TABLE_PREFIX}pages`
44
--
45

  
46 43
DROP TABLE IF EXISTS `{TABLE_PREFIX}pages`;
47 44
CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}pages` (
48 45
  `page_id` int(11) NOT NULL AUTO_INCREMENT,
49 46
  `parent` int(11) NOT NULL DEFAULT '0',
50 47
  `root_parent` int(11) NOT NULL DEFAULT '0',
51 48
  `level` int(11) NOT NULL DEFAULT '0',
52
  `link` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
53
  `target` varchar(7) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
54
  `page_title` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
55
  `page_icon` varchar(512) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
56
  `menu_title` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
57
  `menu_icon_0` varchar(512) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
58
  `menu_icon_1` varchar(512) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
59
  `tooltip` varchar(512) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
60
  `description` text COLLATE utf8_unicode_ci NOT NULL,
61
  `keywords` text COLLATE utf8_unicode_ci NOT NULL,
62
  `page_trail` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
63
  `template` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
64
  `visibility` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
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 '',
65 62
  `position` int(11) NOT NULL DEFAULT '0',
66 63
  `menu` int(11) NOT NULL DEFAULT '1',
67
  `language` varchar(5) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
64
  `language` varchar(5){TABLE_COLLATION} NOT NULL DEFAULT '',
68 65
  `page_code` int(11) NOT NULL DEFAULT '0',
69 66
  `searching` int(11) NOT NULL DEFAULT '0',
70
  `admin_groups` varchar(512) COLLATE utf8_unicode_ci NOT NULL DEFAULT '1',
71
  `admin_users` varchar(512) COLLATE utf8_unicode_ci NOT NULL,
72
  `viewing_groups` varchar(512) COLLATE utf8_unicode_ci NOT NULL DEFAULT '1',
73
  `viewing_users` varchar(512) COLLATE utf8_unicode_ci NOT NULL,
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,
74 71
  `modified_when` int(11) NOT NULL DEFAULT '0',
75 72
  `modified_by` int(11) NOT NULL DEFAULT '0',
76
  `custom01` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
77
  `custom02` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
73
  `custom01` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
74
  `custom02` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
78 75
  PRIMARY KEY (`page_id`)
79 76
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
80

  
81
-- --------------------------------------------------------
82

  
83 77
--
84
-- Tabellenstruktur für Tabelle `{TABLE_PREFIX}sections`
78
-- Structure of table  '{TABLE_PREFIX}sections'
85 79
--
86

  
87 80
DROP TABLE IF EXISTS `{TABLE_PREFIX}sections`;
88 81
CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}sections` (
89 82
  `section_id` int(11) NOT NULL AUTO_INCREMENT,
90 83
  `page_id` int(11) NOT NULL DEFAULT '0',
91 84
  `position` int(11) NOT NULL DEFAULT '0',
92
  `module` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
93
  `block` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
94
  `publ_start` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
95
  `publ_end` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
85
  `module` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
86
  `block` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
87
  `publ_start` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '0',
88
  `publ_end` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '0',
96 89
  PRIMARY KEY (`section_id`)
97 90
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
98

  
99
-- --------------------------------------------------------
100

  
101 91
--
102
-- Tabellenstruktur für Tabelle `{TABLE_PREFIX}users`
92
-- Structure of table  '{TABLE_PREFIX}users'
103 93
--
104

  
105 94
DROP TABLE IF EXISTS `{TABLE_PREFIX}users`;
106 95
CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}users` (
107 96
  `user_id` int(11) NOT NULL AUTO_INCREMENT,
108 97
  `group_id` int(11) NOT NULL DEFAULT '0',
109
  `groups_id` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
98
  `groups_id` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '0',
110 99
  `active` int(11) NOT NULL DEFAULT '0',
111
  `username` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
112
  `password` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
113
  `confirm_code` varchar(32) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
100
  `username` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
101
  `password` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
102
  `confirm_code` varchar(32){TABLE_COLLATION} NOT NULL DEFAULT '',
114 103
  `confirm_timeout` int(11) NOT NULL DEFAULT '0',
115
  `remember_key` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
104
  `remember_key` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
116 105
  `last_reset` int(11) NOT NULL DEFAULT '0',
117
  `display_name` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
118
  `email` text COLLATE utf8_unicode_ci NOT NULL,
106
  `display_name` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
107
  `email` text{TABLE_COLLATION} NOT NULL,
119 108
  `timezone` int(11) NOT NULL DEFAULT '0',
120
  `date_format` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
121
  `time_format` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
122
  `language` varchar(5) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'EN',
123
  `home_folder` text COLLATE utf8_unicode_ci NOT NULL,
109
  `date_format` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
110
  `time_format` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
111
  `language` varchar(5){TABLE_COLLATION} NOT NULL DEFAULT 'EN',
112
  `home_folder` text{TABLE_COLLATION} NOT NULL,
124 113
  `login_when` int(11) NOT NULL DEFAULT '0',
125
  `login_ip` varchar(15) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
114
  `login_ip` varchar(15){TABLE_COLLATION} NOT NULL DEFAULT '',
126 115
  PRIMARY KEY (`user_id`)
127
) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
128

  
116
){TABLE_ENGINE};
129 117
--
130
-- Tabellenstruktur für Tabelle `{TABLE_PREFIX}settings`
118
-- Structure of table  '{TABLE_PREFIX}settings'
131 119
--
132

  
133 120
DROP TABLE IF EXISTS `{TABLE_PREFIX}settings`;
134 121
CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}settings` (
135 122
  `setting_id` int(11) NOT NULL AUTO_INCREMENT,
136
  `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
137
  `value` text COLLATE utf8_unicode_ci NOT NULL,
123
  `name` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
124
  `value` text{TABLE_COLLATION} NOT NULL,
138 125
  PRIMARY KEY (`setting_id`)
139
) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
140

  
126
){TABLE_ENGINE};
127
--
128
-- Structure of table `{TABLE_PREFIX}search`
129
--
130
DROP TABLE IF EXISTS `{TABLE_PREFIX}search`;
131
CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}search` (
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,
136
  PRIMARY KEY (`search_id`)
137
){TABLE_ENGINE};
138
-- EndOfFile
branches/2.8.x/wb/install/save.php
350 350
		}
351 351
	}
352 352

  
353
//  core tables structure and some default values
353
//  core tables only structure
354 354
    $sSqlFileName = dirname(__FILE__).'/sql/websitebaker.sql';
355 355
    if(!$database->SqlImport($sSqlFileName,TABLE_PREFIX, false)) { set_error($database->get_error()); }
356 356

  
......
422 422
	." (62, 'system_locked', '0')";
423 423
	if(!$database->query($settings_rows)) { set_error($database->get_error()); }
424 424

  
425
	// Admin group
426
	$full_system_permissions  = 'access,addons,admintools,admintools_view,groups,groups_add,groups_delete,groups_modify,groups_view,';
427
	$full_system_permissions .= 'languages,languages_install,languages_uninstall,languages_view,media,media_create,media_delete,media_rename,media_upload,media_view,';
428
	$full_system_permissions .= 'modules,modules_advanced,modules_install,modules_uninstall,modules_view,pages,pages_add,pages_add_l0,pages_delete,pages_intro,pages_modify,pages_settings,pages_view,';
429
	$full_system_permissions .= 'preferences,preferences_view,settings,settings_advanced,settings_basic,settings_view,templates,templates_install,templates_uninstall,templates_view,users,users_add,users_delete,users_modify,users_view';
430
	$insert_admin_group = "INSERT INTO `".TABLE_PREFIX."groups` VALUES ('1', 'Administrators', '$full_system_permissions', '', '')";
431
	if(!$database->query($insert_admin_group)) { set_error($database->get_error()); }
432

  
425 433
// Admin user
426 434
    $insert_admin_user = "INSERT INTO `".TABLE_PREFIX."users` VALUES (1, 1, '1', 1, '$admin_username', '".md5($admin_password)."', '', 0, '', 0, 'Administrator', '$admin_email', 0, '', '', '$default_language', '', 0, '');";
427 435
	if(!$database->query($insert_admin_user)) { set_error($database->get_error()); }
428 436

  
429
// Search settings table structure and default values
430
    $sSqlFileName = dirname(__FILE__).'/sql/wb_search.sql';
437
// Search layout default data
438
    $sSqlFileName = dirname(__FILE__).'/sql/wb_search_data.sql';
431 439
    if(!$database->SqlImport($sSqlFileName,TABLE_PREFIX, false)) { set_error($database->get_error()); }
432 440

  
433 441
// Include WB functions file

Also available in: Unified diff