Menu
▾
▴
[Phpbb-checkins] r9889 - in /branches/phpBB-3_0_0/phpBB: adm/style/acp_main.html includes/acp/acp_main.php language/en/acp/common.php language/en/install.php
|
From: Meik S. <acy...@ph...> - 2009-07-29 09:27:36
|
Author: acydburn
Date: Wed Jul 29 10:26:50 2009
New Revision: 9889
Log:
Slightly adjust version check on index page to be a bit more descriptive
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html
branches/phpBB-3_0_0/phpBB/includes/acp/acp_main.php
branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
branches/phpBB-3_0_0/phpBB/language/en/install.php
Modified: branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/acp_main.html Wed Jul 29 10:26:50 2009
***************
*** 14,34 ****
<p>{L_ADMIN_INTRO}</p>
<!-- IF S_VERSIONCHECK_FAIL -->
<div class="errorbox notice">
! <p>{L_VERSIONCHECK_FAIL} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> - <a href="{U_VERSIONCHECK}">{L_MORE}</a></p>
! </div>
<!-- ELSE -->
<!-- IF S_VERSION_UP_TO_DATE -->
<div class="successbox">
! <p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> - <a href="{U_VERSIONCHECK}">{L_MORE}</a></p>
! </div>
<!-- ELSE -->
<div class="errorbox">
! <p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> - <a href="{U_VERSIONCHECK}">{L_MORE}</a></p>
! </div>
<!-- ENDIF -->
<!-- ENDIF -->
<!-- IF S_REMOVE_INSTALL -->
<div class="errorbox">
--- 14,35 ----
<p>{L_ADMIN_INTRO}</p>
+ <!-- version check -->
+
<!-- IF S_VERSIONCHECK_FAIL -->
<div class="errorbox notice">
! <p>{L_VERSIONCHECK_FAIL}</p>
<!-- ELSE -->
<!-- IF S_VERSION_UP_TO_DATE -->
<div class="successbox">
! <p>{L_VERSION_UP_TO_DATE_ACP}</p>
<!-- ELSE -->
<div class="errorbox">
! <p>{L_VERSION_NOT_UP_TO_DATE_TITLE}</p>
<!-- ENDIF -->
<!-- ENDIF -->
+ <p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> · <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
+ </div>
<!-- IF S_REMOVE_INSTALL -->
<div class="errorbox">
Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_main.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_main.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_main.php Wed Jul 29 10:26:50 2009
***************
*** 345,359 ****
add_log('admin', 'LOG_PURGE_CACHE');
break;
!
case 'purge_sessions':
if ((int) $user->data['user_type'] !== USER_FOUNDER)
{
trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
}
!
$tables = array(CONFIRM_TABLE, SESSIONS_TABLE);
!
foreach ($tables as $table)
{
switch ($db->sql_layer)
--- 345,359 ----
add_log('admin', 'LOG_PURGE_CACHE');
break;
!
case 'purge_sessions':
if ((int) $user->data['user_type'] !== USER_FOUNDER)
{
trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
}
!
$tables = array(CONFIRM_TABLE, SESSIONS_TABLE);
!
foreach ($tables as $table)
{
switch ($db->sql_layer)
***************
*** 368,374 ****
break;
}
}
!
// let's restore the admin session
$reinsert_ary = array(
'session_id' => (string) $user->session_id,
--- 368,374 ----
break;
}
}
!
// let's restore the admin session
$reinsert_ary = array(
'session_id' => (string) $user->session_id,
***************
*** 385,394 ****
'session_admin' => 1,
'session_viewonline' => (int) $user->data['session_viewonline'],
);
!
$sql = 'INSERT INTO ' . SESSIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $reinsert_ary);
$db->sql_query($sql);
!
add_log('admin', 'LOG_PURGE_SESSIONS');
break;
}
--- 385,394 ----
'session_admin' => 1,
'session_viewonline' => (int) $user->data['session_viewonline'],
);
!
$sql = 'INSERT INTO ' . SESSIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $reinsert_ary);
$db->sql_query($sql);
!
add_log('admin', 'LOG_PURGE_SESSIONS');
break;
}
***************
*** 406,417 ****
else
{
$latest_version_info = explode("\n", $latest_version_info);
! $latest_version = trim($latest_version_info[0]);
! $template->assign_var('S_VERSION_UP_TO_DATE',
! version_compare(
! str_replace('rc', 'RC', strtolower($config['version'])),
! str_replace('rc', 'RC', strtolower($latest_version)),
! '<') ? false : true);
}
// Get forum statistics
--- 406,418 ----
else
{
$latest_version_info = explode("\n", $latest_version_info);
!
! $latest_version = str_replace('rc', 'RC', strtolower(trim($latest_version_info[0])));
! $current_version = str_replace('rc', 'RC', strtolower($config['version']));
!
! $template->assign_vars(array(
! 'S_VERSION_UP_TO_DATE' => version_compare($current_version, $latest_version, '<') ? false : true,
! ));
}
// Get forum statistics
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/common.php Wed Jul 29 10:26:50 2009
***************
*** 250,256 ****
'MANAGE' => 'Manage',
'MENU_TOGGLE' => 'Hide or display the side menu',
! 'MORE' => 'More »',
'MOVE_DOWN' => 'Move down',
'MOVE_UP' => 'Move up',
--- 250,257 ----
'MANAGE' => 'Manage',
'MENU_TOGGLE' => 'Hide or display the side menu',
! 'MORE' => 'More', // Not used at the moment
! 'MORE_INFORMATION' => 'More information »',
'MOVE_DOWN' => 'Move down',
'MOVE_UP' => 'Move up',
***************
*** 377,383 ****
'USERS_PER_DAY' => 'Users per day',
'VALUE' => 'Value',
! 'VERSIONCHECK_FAIL' => 'Failed to obtain latest version',
'VERSIONCHECK_FORCE_UPDATE' => 'Re-Check version',
'VIEW_ADMIN_LOG' => 'View administrator log',
'VIEW_INACTIVE_USERS' => 'View inactive users',
--- 378,384 ----
'USERS_PER_DAY' => 'Users per day',
'VALUE' => 'Value',
! 'VERSIONCHECK_FAIL' => 'Failed to obtain latest version information.',
'VERSIONCHECK_FORCE_UPDATE' => 'Re-Check version',
'VIEW_ADMIN_LOG' => 'View administrator log',
'VIEW_INACTIVE_USERS' => 'View inactive users',
Modified: branches/phpBB-3_0_0/phpBB/language/en/install.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/install.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/install.php Wed Jul 29 10:26:50 2009
***************
*** 564,569 ****
--- 564,570 ----
'VERSION_CHECK_EXPLAIN' => 'Checks to see if the version of phpBB you are currently running is up to date.',
'VERSION_NOT_UP_TO_DATE' => 'Your version of phpBB is not up to date. Please continue the update process.',
'VERSION_NOT_UP_TO_DATE_ACP'=> 'Your version of phpBB is not up to date.<br />Below you will find a link to the release announcement for the latest version as well as instructions on how to perform the update.',
+ 'VERSION_NOT_UP_TO_DATE_TITLE' => 'Your version of phpBB is not up to date.',
'VERSION_UP_TO_DATE' => 'Your installation is up to date, no updates are available for your version of phpBB. You may want to continue anyway to perform a file validity check.',
'VERSION_UP_TO_DATE_ACP' => 'Your installation is up to date, no updates are available for your version of phpBB. You do not need to update your installation.',
'VIEWING_FILE_CONTENTS' => 'Viewing file contents',
|
