diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-02 13:19:40 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-02 13:19:40 +0000 |
| commit | 7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3 (patch) | |
| tree | b2bbf1e855f1c185f76972777cef56b29e5e10d2 /phpBB/install | |
| parent | de1c536548c5b41d33a16f3afe12ba67000d7210 (diff) | |
| download | forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar.gz forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar.bz2 forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar.xz forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.zip | |
- a bunch of fixes
- added todos to the updater to make sure i do not forget. :)
git-svn-id: file:///svn/phpbb/trunk@6698 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/install_update.php | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index f7d9a801ee..c57aff8ed8 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -6,6 +6,12 @@ * @copyright (c) 2006 phpBB Group * @license http://opensource.org/licenses/gpl-license.php GNU Public License * +* @todo add successful file update to log +* @todo add successful database update to log +* @todo do database update before updating files. Within the updater create a new config variable (version_update_from). Use this version in favor of the real versino to check for the database update successfully run through. After successful file update remove the information. +* @todo check memory by setting limit to 8MB locally. +* @todo make sure binary files get updated too, omitting the diff engine for this (handle like a conflict) +* @todo do not require login... */ /** @@ -71,6 +77,8 @@ class install_update extends module global $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth; $this->tpl_name = 'install_update'; + $this->page_title = 'UPDATE_INSTALLATION'; + $this->old_location = $phpbb_root_path . 'install/update/old/'; $this->new_location = $phpbb_root_path . 'install/update/new/'; @@ -87,7 +95,17 @@ class install_update extends module // We do not need this any longer, unset for safety purposes unset($dbpasswd); - $config = $cache->obtain_config(); + $config = array(); + + $sql = 'SELECT config_name, config_value + FROM ' . CONFIG_TABLE; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + $config[$row['config_name']] = $row['config_value']; + } + $db->sql_freeresult($result); // First of all, init the user session $user->session_begin(); @@ -99,17 +117,6 @@ class install_update extends module include_once($phpbb_root_path . 'includes/diff/engine.' . $phpEx); include_once($phpbb_root_path . 'includes/diff/renderer.' . $phpEx); - // Check for user session - if (!$user->data['is_registered']) - { - login_box('', $user->lang['LOGIN_UPDATE_EXPLAIN']); - } - - if (!$auth->acl_get('a_')) - { - trigger_error($user->lang['NO_AUTH_UPDATE']); - } - // If we are within the intro page we need to make sure we get up-to-date version info if ($sub == 'intro') { @@ -696,6 +703,8 @@ class install_update extends module 'U_DB_UPDATE' => $phpbb_root_path . 'install/database_update.' . $phpEx) ); + + break; } } |