mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-04 05:25:01 +02:00
Code Issues Releases Wiki Activity

writeable -> writable merge

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@8762 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2008-08-16 13:11:50 +00:00
parent 4235be4bcb
commit 15e04808fc
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/adm/style/acp_main.html
View File

@ -21,10 +21,10 @@
</div> </div>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_WRITEABLE_CONFIG --> <!-- IF S_WRITABLE_CONFIG -->
<div class="errorbox"> <div class="errorbox">
<h3>{L_WARNING}</h3> <h3>{L_WARNING}</h3>
<p>{L_WRITEABLE_CONFIG}</p> <p>{L_WRITABLE_CONFIG}</p>
</div> </div>
<!-- ENDIF --> <!-- ENDIF -->

4
phpBB/includes/acm/acm_file.php
View File

@ -143,7 +143,7 @@ class acm
} }
} }
} }
set_config('cache_last_gc', time(), true); set_config('cache_last_gc', time(), true);
} }
@ -438,7 +438,7 @@ class acm
*/ */
private function remove_file($filename, $check = false) private function remove_file($filename, $check = false)
{ {
if ($check && !@is_writeable($this->cache_dir)) if ($check && !@is_writable($this->cache_dir))
{ {
// E_USER_ERROR - not using language entry - intended. // E_USER_ERROR - not using language entry - intended.
trigger_error('Unable to remove files within ' . $this->cache_dir . '. Please check directory permissions.', E_USER_ERROR); trigger_error('Unable to remove files within ' . $this->cache_dir . '. Please check directory permissions.', E_USER_ERROR);

6
phpBB/includes/acp/acp_main.php
View File

@ -459,9 +459,9 @@ class acp_main
$template->assign_var('S_REMOVE_INSTALL', true); $template->assign_var('S_REMOVE_INSTALL', true);
} }
if (file_exists(PHPBB_ROOT_PATH . 'config.' . PHP_EXT) && is_writeable(PHPBB_ROOT_PATH . 'config.' . PHP_EXT)) if (file_exists(PHPBB_ROOT_PATH . 'config.' . PHP_EXT) && is_writable(PHPBB_ROOT_PATH . 'config.' . PHP_EXT))
{ {
$template->assign_var('S_WRITEABLE_CONFIG', true); $template->assign_var('S_WRITABLE_CONFIG', true);
} }
$this->tpl_name = 'acp_main'; $this->tpl_name = 'acp_main';
@ -469,4 +469,4 @@ class acp_main
} }
} }
?> ?>

2
phpBB/language/en/acp/common.php
View File

@ -363,7 +363,7 @@ $lang = array_merge($lang, array(
'VIEW_INACTIVE_USERS' => 'View inactive users', 'VIEW_INACTIVE_USERS' => 'View inactive users',
'WELCOME_PHPBB' => 'Welcome to phpBB', 'WELCOME_PHPBB' => 'Welcome to phpBB',
'WRITEABLE_CONFIG' => 'Your config file (config.php) is currently world-writeable. We strongly encourage you to change the permissions to 640 or at least to 644 (for example: <a href="http://en.wikipedia.org/wiki/Chmod" rel="external">chmod</a> 640 config.php).', 'WRITABLE_CONFIG' => 'Your config file (config.php) is currently world-writable. We strongly encourage you to change the permissions to 640 or at least to 644 (for example: <a href="http://en.wikipedia.org/wiki/Chmod" rel="external">chmod</a> 640 config.php).',
)); ));
// Inactive Users // Inactive Users