|
From: OryNider <ory...@us...> - 2007-12-20 13:10:44
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24668/admin Modified Files: index.php page_footer_admin.php Log Message: Admin templates by Culprit and some fixes to admin files by me. Index: page_footer_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_footer_admin.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** page_footer_admin.php 5 May 2007 20:12:56 -0000 1.16 --- page_footer_admin.php 20 Dec 2007 13:10:05 -0000 1.17 *************** *** 28,35 **** $stime = ( $endtime[1] + $endtime[0] ) - $mx_starttime; $execution_stats = '<div align="center"><span class="copyright">' . sprintf($lang['Execution_Stats'], $db->num_queries, round($stime, 4)) . '</span></div>'; $template->assign_vars(array( ! 'PHPBB_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '2' . $board_config['version'] : '', 'MX_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '', 'TRANSLATION_INFO' => (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : ''), --- 28,50 ---- $stime = ( $endtime[1] + $endtime[0] ) - $mx_starttime; + switch (PORTAL_BACKEND) + { + case 'internal': + + case 'phpbb2': + + $current_phpbb_version = '2' . $board_config['version']; + break; + + case 'phpbb3': + + $current_phpbb_version = $board_config['version']; + break; + } + $execution_stats = '<div align="center"><span class="copyright">' . sprintf($lang['Execution_Stats'], $db->num_queries, round($stime, 4)) . '</span></div>'; $template->assign_vars(array( ! 'PHPBB_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? $current_phpbb_version : '', 'MX_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '', 'TRANSLATION_INFO' => (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : ''), Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** index.php 9 Sep 2007 16:48:16 -0000 1.33 --- index.php 20 Dec 2007 13:10:04 -0000 1.34 *************** *** 887,892 **** /* Begin phpBB version check code block */ ! $current_phpbb_version = explode('.', '2' . $board_config['version']); ! $minor_phpbb_revision = (int) $current_phpbb_version[2]; $errno = 0; --- 887,906 ---- /* Begin phpBB version check code block */ ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! ! case 'phpbb2': ! ! $current_phpbb_version = explode('.', '2' . $board_config['version']); ! $minor_phpbb_revision = (int) $current_phpbb_version[2]; ! break; ! ! case 'phpbb3': ! ! $current_phpbb_version = explode('.', '' . $board_config['version']); ! $minor_phpbb_revision = (int) $current_phpbb_version[3]; ! break; ! } $errno = 0; *************** *** 895,932 **** if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr, 10)) { ! @fputs($fsock, "GET /updatecheck/20x.txt HTTP/1.1\r\n"); ! @fputs($fsock, "HOST: www.phpbb.com\r\n"); ! @fputs($fsock, "Connection: close\r\n\r\n"); ! ! $get_info = false; ! while (!@feof($fsock)) { ! if ($get_info) ! { ! $phpbb_version_info .= @fread($fsock, 1024); ! } ! else ! { ! if (@fgets($fsock, 1024) == "\r\n") { ! $get_info = true; } ! } ! } ! @fclose($fsock); ! $phpbb_version_info = explode("\n", $phpbb_version_info); ! $latest_phpbb_head_revision = (int) $phpbb_version_info[0]; ! $latest_phpbb_minor_revision = (int) $phpbb_version_info[2]; ! $latest_phpbb_version = (int) $phpbb_version_info[0] . '.' . (int) $phpbb_version_info[1] . '.' . (int) $phpbb_version_info[2]; ! if ($latest_phpbb_head_revision == 2 && $minor_phpbb_revision == $latest_phpbb_minor_revision) ! { ! $phpbb_version_info = '<p style="color:green">' . $lang['Version_up_to_date'] . '</p>'; ! } ! else ! { ! $phpbb_version_info = '<p style="color:red">' . $lang['Version_not_up_to_date']; ! $phpbb_version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_phpbb_version) . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>'; } } --- 909,980 ---- if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr, 10)) { ! switch (PORTAL_BACKEND) { ! case 'internal': ! ! case 'phpbb2': ! ! @fputs($fsock, "GET /updatecheck/20x.txt HTTP/1.1\r\n"); ! @fputs($fsock, "HOST: www.phpbb.com\r\n"); ! @fputs($fsock, "Connection: close\r\n\r\n"); ! ! $get_info = false; ! while (!@feof($fsock)) { ! if ($get_info) ! { ! $phpbb_version_info .= @fread($fsock, 1024); ! } ! else ! { ! if (@fgets($fsock, 1024) == "\r\n") ! { ! $get_info = true; ! } ! } } ! @fclose($fsock); ! $phpbb_version_info = explode("\n", $phpbb_version_info); ! $latest_phpbb_head_revision = (int) $phpbb_version_info[0]; ! $latest_phpbb_minor_revision = (int) $phpbb_version_info[2]; ! $latest_phpbb_version = (int) $phpbb_version_info[0] . '.' . (int) $phpbb_version_info[1] . '.' . (int) $phpbb_version_info[2]; ! if ($latest_phpbb_head_revision == 2 && $minor_phpbb_revision == $latest_phpbb_minor_revision) ! { ! $phpbb_version_info = '<p style="color:green">' . $lang['Version_up_to_date'] . '</p>'; ! } ! else ! { ! $phpbb_version_info = '<p style="color:red">' . $lang['Version_not_up_to_date']; ! $phpbb_version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_phpbb_version) . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>'; ! } ! break; ! case 'phpbb3': ! ! $phpbb_version_info = mx_get_remote_file('www.phpbb.com', '/updatecheck', ((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno); ! if ($info === false) ! { ! trigger_error($errstr, E_USER_WARNING); ! } ! ! $phpbb_version_info = explode("\n", $phpbb_version_info); ! ! $announcement_url = trim($info[1]); ! //$update_link = append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=update'); ! $latest_phpbb_head_revision = trim($phpbb_version_info[0]); ! $latest_phpbb_minor_revision = trim($phpbb_version_info[2]); ! $latest_phpbb_version = trim($phpbb_version_info[0]) . '.' . trim($phpbb_version_info[1]) . '.' . trim($phpbb_version_info[2]); ! ! if ($latest_phpbb_head_revision == 3 && $minor_phpbb_revision == $latest_phpbb_minor_revision) ! { ! $phpbb_version_info = '<p style="color:green">' . $lang['Version_up_to_date'] . '</p>'; ! } ! else ! { ! $phpbb_version_info = '<p style="color:red">' . $lang['Version_not_up_to_date']; ! $phpbb_version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_phpbb_version) . sprintf($lang['Current_version_info'], $board_config['version']) . '</p>'; ! } ! break; } } *************** *** 982,986 **** $latest_mxbb_version = (int) $mxbb_version_info[0] . '.' . (int) $mxbb_version_info[1] . '.' . (int) $mxbb_version_info[2]; ! if ($minor_mxbb_revision == $latest_mxbb_minor_revision) { $mxbb_version_info = '<p style="color:green">' . $lang['mxBB_Version_up_to_date'] . '</p>'; --- 1030,1034 ---- $latest_mxbb_version = (int) $mxbb_version_info[0] . '.' . (int) $mxbb_version_info[1] . '.' . (int) $mxbb_version_info[2]; ! if ($latest_mxbb_head_revision == 3 && $minor_mxbb_revision == $latest_mxbb_minor_revision) { $mxbb_version_info = '<p style="color:green">' . $lang['mxBB_Version_up_to_date'] . '</p>'; |