Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG (revision 1919)
+++ branches/2.8.x/CHANGELOG (revision 1920)
@@ -12,6 +12,11 @@
===============================================================================
+07 Jun-2013 Build 1920 Dietmar Woellbrink (Luisehahne)
+! /modules/admin.php $sSectionIdPrefix
+! /admin/media/upload.php change $database->query($sql) to $database->get_one($sql)
+! /upgrade-script.php only systemadministartor can call the script
+ upgrade all dev-module inclding in package
07 Jun-2013 Build 1919 Dietmar Woellbrink (Luisehahne)
! /modules/form/ beginning recoding
07 Jun-2013 Build 1918 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/upgrade-script.php
===================================================================
--- branches/2.8.x/wb/upgrade-script.php (revision 1919)
+++ branches/2.8.x/wb/upgrade-script.php (revision 1920)
@@ -41,6 +41,10 @@
require($config_file);
}
+//require_once(WB_PATH.'/framework/class.admin.php');
+if(!class_exists('admin', false)){ include(WB_PATH.'/framework/class.admin.php'); }
+$admin = new admin('Addons', 'modules', false, false);
+
// solved wrong pages_directory value before creating access files
$sql = 'SELECT `value` FROM `'.TABLE_PREFIX.'settings` '
. 'WHERE `name`=\'pages_directory\'';
@@ -53,11 +57,8 @@
. 'WHERE `name`=\'pages_directory\' ';
WbDatabase::getInstance()->query($sql);
}
-//require_once(WB_PATH.'/framework/class.admin.php');
-if(!class_exists('admin', false)){ include(WB_PATH.'/framework/class.admin.php'); }
require_once(WB_PATH.'/framework/functions.php');
// require_once(WB_PATH.'/framework/Database.php');
-$admin = new admin('Addons', 'modules', false, false);
$oldVersion = 'Version '.WB_VERSION;
$oldVersion .= (defined('WB_SP') ? WB_SP : '');
@@ -320,8 +321,7 @@
WebsiteBaker Upgrade
Warning:
It is not possible to upgrade from WebsiteBaker Versions before 2.7.
For upgrading to version '.VERSION.' you must upgrade first to v.2.7 at least!!!', 'warning', 'div');
- echo '
';
+ status_msg('
It is not possible to upgrade from WebsiteBaker Versions before 2.7.
For upgrading to version '.VERSION.' you must upgrade first to v.2.7 at least!!!', 'warning', 'div');
echo "
@@ -330,7 +330,52 @@
";
exit();
}
+if($admin->get_user_id()!=1){
+ status_msg('
WebsiteBaker upgrading is not possible!
Before upgrading to Revision '.REVISION.' you have to login as System-Administrator!
', 'warning', 'div');
+ echo '
';
+// delete remember key of current user from database
+//if (isset($_SESSION['USER_ID']) && isset($database)) {
+// $table = TABLE_PREFIX . 'users';
+// $sql = "UPDATE `$table` SET `remember_key` = '' WHERE `user_id` = '" . (int) $_SESSION['USER_ID'] . "'";
+// $database->query($sql);
+//}
+// delete remember key cookie if set
+if (isset($_COOKIE['REMEMBER_KEY'])) {
+ setcookie('REMEMBER_KEY', '', time() - 3600, '/');
+}
+
+// delete most critical session variables manually
+$_SESSION['USER_ID'] = null;
+$_SESSION['GROUP_ID'] = null;
+$_SESSION['GROUPS_ID'] = null;
+$_SESSION['USERNAME'] = null;
+$_SESSION['PAGE_PERMISSIONS'] = null;
+$_SESSION['SYSTEM_PERMISSIONS'] = null;
+// overwrite session array
+$_SESSION = array();
+// delete session cookie if set
+if (isset($_COOKIE[session_name()])) {
+ setcookie(session_name(), '', time() - 42000, '/');
+}
+// delete the session itself
+session_destroy();
+status_msg('
After login as System-Adminstrator you have to start upgrade-script.php again!
', 'info', 'div');
+ echo '
';
+ if(defined('ADMIN_URL')) {
+ echo '';
+ }
+echo "
+
+
+
+