Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG (revision 1767)
+++ branches/2.8.x/CHANGELOG (revision 1768)
@@ -13,6 +13,9 @@
+23 Sep-2012 Build 1768 Dietmar Woellbrink (Luisehahne)
++ add 2 fields custom01, custom02 with VARCHAR( 255 ) to table pages
+! update upgrade-script with this 2 fields
22 Sep-2012 Build 1767 Dietmar Woellbrink (Luisehahne)
! change page_extended to extended settings under page language
22 Sep-2012 Build 1766 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/upgrade-script.php
===================================================================
--- branches/2.8.x/wb/upgrade-script.php (revision 1767)
+++ branches/2.8.x/wb/upgrade-script.php (revision 1768)
@@ -425,137 +425,139 @@
}
echo 'Step '.(++$stepID).': Setting default_theme
';
-
-if($bDebugModus) {
+$aDebugMessage = array();
/**********************************************************
* - Adding field default_theme to settings table
*/
- echo '';
- echo "
Adding default_theme to settings table";
+ $aDebugMessage[] = '
';
+ $aDebugMessage[] = "
Adding default_theme to settings table";
// db_update_key_value('settings', 'default_theme', $DEFAULT_THEME);
- echo (db_update_key_value( 'settings', 'default_theme', $DEFAULT_THEME ) ? " $OK
" : " $FAIL!
");
- echo '
';
+ $aDebugMessage[] = (db_update_key_value( 'settings', 'default_theme', $DEFAULT_THEME ) ? " $OK
" : " $FAIL!
");
+ $aDebugMessage[] = '
Step '.(++$stepID).': Updating core tables
';
-
-if($bDebugModus) {
+$aDebugMessage = array();
+echo'Step '.(++$stepID).': Updating core tables
';
/**********************************************************
* - Adding field sec_anchor to settings table
*/
echo '';
echo "
Adding/updating entries on table settings
";
- echo "Adding/updating sec_anchor to settings table";
+ $aDebugMessage[] = "Adding/updating sec_anchor to settings table";
$cfg = array(
'sec_anchor' => defined('SEC_ANCHOR') ? SEC_ANCHOR : 'section_'
);
- echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
+ $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
/**********************************************************
* - Adding redirect timer to settings table
*/
- echo "Adding/updating redirect timer to settings table";
+ $aDebugMessage[] = "Adding/updating redirect timer to settings table";
$cfg = array(
'redirect_timer' => defined('REDIRECT_TIMER') ? REDIRECT_TIMER : '1500'
);
- echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
+ $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
/**********************************************************
* - Adding rename_files_on_upload to settings table
*/
- echo "Adding/Updating rename_files_on_upload to settings table";
+ $aDebugMessage[] = "Adding/Updating rename_files_on_upload to settings table";
$cfg = array(
'rename_files_on_upload' => (defined('RENAME_FILES_ON_UPLOAD') ? RENAME_FILES_ON_UPLOAD : 'ph.*?,cgi,pl,pm,exe,com,bat,pif,cmd,src,asp,aspx,js')
);
- echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
+ $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
/**********************************************************
* - Adding mediasettings to settings table
*/
- echo "Adding/updating mediasettings to settings table";
+ $aDebugMessage[] = "Adding/updating mediasettings to settings table";
$cfg = array(
'mediasettings' => (defined('MEDIASETTINGS') ? MEDIASETTINGS : ''),
);
- echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
+ $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
/**********************************************************
* - Adding fingerprint_with_ip_octets to settings table
*/
- echo "Adding/updating fingerprint_with_ip_octets to settings table";
+ $aDebugMessage[] = "Adding/updating fingerprint_with_ip_octets to settings table";
$cfg = array(
'fingerprint_with_ip_octets' => (defined('FINGERPRINT_WITH_IP_OCTETS') ? FINGERPRINT_WITH_IP_OCTETS : '2'),
'secure_form_module' => (defined('SECURE_FORM_MODULE') ? SECURE_FORM_MODULE : '')
);
- echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
+ $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
/**********************************************************
* - Adding page_icon_dir to settings table
*/
- echo "Adding/updating page_icon_dir to settings table";
+ $aDebugMessage[] = "Adding/updating page_icon_dir to settings table";
$cfg = array(
'page_icon_dir' => (defined('PAGE_ICON_DIR') ? PAGE_ICON_DIR : '/templates/*/title_images'),
);
- echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
+ $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
/**********************************************************
* - Adding page_extended to settings table
*/
- echo "Adding/updating page_extended to settings table";
+ $aDebugMessage[] = "Adding/updating page_extended to settings table";
$cfg = array(
'page_extended' => (defined('PAGE_EXTENDED') ? PAGE_EXTENDED : 'true'),
);
- echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
+ $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
/**********************************************************
* - Adding website_signature to settings table
*/
- echo "Adding/updating website_signature to settings table";
+ $aDebugMessage[] = "Adding/updating website_signature to settings table";
$cfg = array(
'website_signature' => (defined('WEBSITE_SIGNATURE') && (WEBSITE_SIGNATURE=='') ? '' : WEBSITE_SIGNATURE)
);
- echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
+ $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
/**********************************************************
* - Adding confirmed_registration to settings table
*/
- echo "Adding/updating confirmed_registration to settings table";
+ $aDebugMessage[] = "Adding/updating confirmed_registration to settings table";
$cfg = array(
'confirmed_registration' => (defined('CONFIRMED_REGISTRATION') && (CONFIRMED_REGISTRATION=='') ? '' : CONFIRMED_REGISTRATION)
);
- echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
+ $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
/**********************************************************
* - Adding dev_infos to settings table
*/
- echo "Adding/updating dev_infos to settings table";
+ $aDebugMessage[] = "Adding/updating dev_infos to settings table";
$cfg = array(
'dev_infos' => (defined('DEV_INFOS') ? DEV_INFOS : 'false')
);
- echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
+ $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
/**********************************************************
* - Adding dev_infos to settings table
*/
- echo "Adding/updating modules_upgrade_list to settings table";
+ $aDebugMessage[] = "Adding/updating modules_upgrade_list to settings table";
$cfg = array(
'modules_upgrade_list' => (defined('MODULES_UPGRADE_LIST') ? MODULES_UPGRADE_LIST : 'news')
);
- echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
+ $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
");
- echo '';
-
+if($bDebugModus) {
+ echo implode(PHP_EOL,$aDebugMessage);
}
+echo '';
+$aDebugMessage = array();
if(version_compare(WB_REVISION, REVISION, '<'))
{
echo '';
@@ -706,7 +708,34 @@
echo "
Modify field viewing_users to pages table";
echo ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
");
+ /**********************************************************
+ * - Add field "custom01" to table "pages"
+ */
+ $table_name = TABLE_PREFIX.'pages';
+ $field_name = 'custom01';
+ $description = "VARCHAR( 255 ) NOT NULL DEFAULT '' ";
+ if(!$database->field_exists($table_name,$field_name)) {
+ echo "Adding field custom01 to pages table";
+ echo ($database->field_add($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
");
+ } else {
+ echo "Modify field custom01 to pages table";
+ echo ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
");
+ }
+ /**********************************************************
+ * - Add field "custom02" to table "pages"
+ */
+ $table_name = TABLE_PREFIX.'pages';
+ $field_name = 'custom02';
+ $description = "VARCHAR( 255 ) NOT NULL DEFAULT '' ";
+ if(!$database->field_exists($table_name,$field_name)) {
+ echo "Adding field custom02 to pages table";
+ echo ($database->field_add($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
");
+ } else {
+ echo "Modify field custom02 to pages table";
+ echo ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
");
+ }
+
/**********************************************************
* modify wrong strucre on table sections
* wrong structure let crash wb
@@ -727,29 +756,37 @@
}
+if($bDebugModus) {
+ echo implode(PHP_EOL,$aDebugMessage);
+}
+$aDebugMessage = array();
/**********************************************************
* This part with changing in mod_wysiwyg will be removed in the final version
* special workout for the tester
* - Remove/add PRIMARY KEY from/to "section_id" from table "mod_wysiwygs"
*/
-if($bDebugModus) {
- echo '';
+ $aDebugMessage[] = '
';
$sTable = TABLE_PREFIX.'mod_wysiwyg';
$field_name = 'wysiwyg_id';
if($database->field_exists($sTable, 'wysiwyg_id')) {
if($database->index_exists($sTable, 'PRIMARY')) {
- echo "Remove PRIMARY KEY from table mod_wysiwyg.wysiwyg_id";
- echo $database->index_remove($sTable, 'PRIMARY') ? " $OK
" : " $FAIL!
";
+ $aDebugMessage[] = "Remove PRIMARY KEY from table mod_wysiwyg.wysiwyg_id";
+ $aDebugMessage[] = $database->index_remove($sTable, 'PRIMARY') ? " $OK
" : " $FAIL!
";
}
- echo "Remove field 'wysiwyg_id' from table mod_wysiwyg";
- echo $database->field_remove($sTable, 'wysiwyg_id') ? " $OK
" : " $FAIL!
";
+ $aDebugMessage[] = "Remove field 'wysiwyg_id' from table mod_wysiwyg";
+ $aDebugMessage[] = $database->field_remove($sTable, 'wysiwyg_id') ? " $OK
" : " $FAIL!
";
}
- echo "
Create PRIMARY KEY ( `section_id` ) on table mod_wysiwygs.";
- echo $database->index_add($sTable, '', 'section_id', 'PRIMARY') ? " $OK
" : " $FAIL!
";
- echo '
';
+ $aDebugMessage[] = "
Create PRIMARY KEY ( `section_id` ) on table mod_wysiwygs.";
+ $aDebugMessage[] = $database->index_add($sTable, '', 'section_id', 'PRIMARY') ? " $OK
" : " $FAIL!
";
+ $aDebugMessage[] = '
Step '.(++$stepID).': Updating acess and protected files in folders
';
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php (revision 1767)
+++ branches/2.8.x/wb/admin/interface/version.php (revision 1768)
@@ -51,5 +51,5 @@
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
if(!defined('VERSION')) define('VERSION', '2.8.3');
-if(!defined('REVISION')) define('REVISION', '1767');
+if(!defined('REVISION')) define('REVISION', '1768');
if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/install/save.php
===================================================================
--- branches/2.8.x/wb/install/save.php (revision 1767)
+++ branches/2.8.x/wb/install/save.php (revision 1768)
@@ -396,6 +396,8 @@
. ' `viewing_users` VARCHAR( 512 ) NOT NULL ,'
. ' `modified_when` INT NOT NULL DEFAULT \'0\','
. ' `modified_by` INT NOT NULL DEFAULT \'0\','
+ . ' `custom01` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
+ . ' `custom02` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,'
. ' PRIMARY KEY ( `page_id` ) '
. ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
if(!$database->query($pages)) {