diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-03 14:29:22 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-03 14:29:22 +0000 |
| commit | f7b51337c55f88f19f8b9406b64e7d03150efa2c (patch) | |
| tree | 3b2482e66108730672abc059963c6b0b3caec061 /phpBB/install | |
| parent | 58ac5df6b376ef57c333565b94698c41b02e67cf (diff) | |
| download | forums-f7b51337c55f88f19f8b9406b64e7d03150efa2c.tar forums-f7b51337c55f88f19f8b9406b64e7d03150efa2c.tar.gz forums-f7b51337c55f88f19f8b9406b64e7d03150efa2c.tar.bz2 forums-f7b51337c55f88f19f8b9406b64e7d03150efa2c.tar.xz forums-f7b51337c55f88f19f8b9406b64e7d03150efa2c.zip | |
some language-specific adjustements
fix prune users (adding the list of users to the confirmation page)
tried to fix the show/hide trigger in ACP by not using width: auto; (which gets somehow inherited to each other element)
git-svn-id: file:///svn/phpbb/trunk@7455 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/install_convert.php | 2 | ||||
| -rwxr-xr-x | phpBB/install/install_install.php | 12 | ||||
| -rw-r--r-- | phpBB/install/install_update.php | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 4c8d4aca1f..4c406d5105 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -826,7 +826,7 @@ class install_convert extends module $this->p_master->error($user->lang['DEV_NO_TEST_FILE'], __LINE__, __FILE__); } - if (!$local_path || !is_writeable($phpbb_root_path . $local_path)) + if (!$local_path || !@is_writable($phpbb_root_path . $local_path)) { if (!$local_path) { diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 3ea5fde7ee..55180ec80d 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -402,14 +402,14 @@ class install_install extends module // Now really check if (file_exists($phpbb_root_path . $dir) && is_dir($phpbb_root_path . $dir)) { - if (!is_writeable($phpbb_root_path . $dir)) + if (!@is_writable($phpbb_root_path . $dir)) { @chmod($phpbb_root_path . $dir, 0777); } $exists = true; } - // Now check if it is writeable by storing a simple file + // Now check if it is writable by storing a simple file $fp = @fopen($phpbb_root_path . $dir . 'test_lock', 'wb'); if ($fp !== false) { @@ -422,7 +422,7 @@ class install_install extends module $passed['files'] = ($exists && $write && $passed['files']) ? true : false; $exists = ($exists) ? '<b style="color:green">' . $lang['FOUND'] . '</b>' : '<b style="color:red">' . $lang['NOT_FOUND'] . '</b>'; - $write = ($write) ? ', <b style="color:green">' . $lang['WRITEABLE'] . '</b>' : (($exists) ? ', <b style="color:red">' . $lang['UNWRITEABLE'] . '</b>' : ''); + $write = ($write) ? ', <b style="color:green">' . $lang['WRITABLE'] . '</b>' : (($exists) ? ', <b style="color:red">' . $lang['UNWRITABLE'] . '</b>' : ''); $template->assign_block_vars('checks', array( 'TITLE' => $dir, @@ -447,7 +447,7 @@ class install_install extends module $write = $exists = true; if (file_exists($phpbb_root_path . $dir)) { - if (!is_writeable($phpbb_root_path . $dir)) + if (!@is_writable($phpbb_root_path . $dir)) { $write = false; } @@ -458,7 +458,7 @@ class install_install extends module } $exists_str = ($exists) ? '<b style="color:green">' . $lang['FOUND'] . '</b>' : '<b style="color:red">' . $lang['NOT_FOUND'] . '</b>'; - $write_str = ($write) ? ', <b style="color:green">' . $lang['WRITEABLE'] . '</b>' : (($exists) ? ', <b style="color:red">' . $lang['UNWRITEABLE'] . '</b>' : ''); + $write_str = ($write) ? ', <b style="color:green">' . $lang['WRITABLE'] . '</b>' : (($exists) ? ', <b style="color:red">' . $lang['UNWRITABLE'] . '</b>' : ''); $template->assign_block_vars('checks', array( 'TITLE' => $dir, @@ -872,7 +872,7 @@ class install_install extends module $config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused! // Attempt to write out the config file directly. If it works, this is the easiest way to do it ... - if ((file_exists($phpbb_root_path . 'config.' . $phpEx) && is_writeable($phpbb_root_path . 'config.' . $phpEx)) || is_writable($phpbb_root_path)) + if ((file_exists($phpbb_root_path . 'config.' . $phpEx) && is_writable($phpbb_root_path . 'config.' . $phpEx)) || is_writable($phpbb_root_path)) { // Assume it will work ... if nothing goes wrong below $written = true; diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 3f18439f08..b306ab4930 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -6,7 +6,7 @@ * @copyright (c) 2006 phpBB Group * @license http://opensource.org/licenses/gpl-license.php GNU Public License * -* @todo check for writeable cache/store/files directory +* @todo check for writable cache/store/files directory */ /** |