Skip to content
Snippets Groups Projects
Commit 4285770b authored by Peter Rotich's avatar Peter Rotich
Browse files

Allow admin to view logs during upgrade process

parent 3fc0b6e9
No related branches found
No related tags found
No related merge requests found
......@@ -20,13 +20,15 @@ if(!defined('OSTSCPINC') || !$thisstaff || !$thisstaff->isAdmin()) die('Access D
echo '<b><font color="red">Internal error occurred - get technical help.</font></b>';
}
?>
<p><b>For detailed - please view <a href="logs.php">system logs</a></b></p>
<br>
<p>Please, refer to the <a target="_blank" href="http://osticket.com/wiki/Upgrade_and_Migration">Upgrade Guide</a> on the wiki for more information.</p>
</div>
<p><strong>Need Help?</strong> We provide <a target="_blank" href="http://osticket.com/support/professional_services.php"><u>professional upgrade services</u></a> and commercial support. <a target="_blank" href="http://osticket.com/support/">Contact us</a> today for <u>expedited</u> help.</p>
</div>
<div id="sidebar">
<h3>What to do?</h3>
<p>Restore your previous version from backup and try again or <a target="_blank" href="http://osticket.com/support/">seek help</a>.</p>
<p>Restore your previous version from backup and try again or <a target="_blank" href="http://osticket.com/support/">seek help</a>.</p>
</div>
<div class="clear"></div>
</div>
......@@ -27,11 +27,11 @@ define('ADMINPAGE',TRUE); //Used by the header to swap menus.
//Some security related warnings - bitch until fixed!!! :)
if($ost->isUpgradePending()) {
$errors['err']=$sysnotice='System upgrade is pending <a href="upgrade.php">Upgrade Now</a>';
if(basename($_SERVER['SCRIPT_NAME'])!='upgrade.php')
if(!in_array(basename($_SERVER['SCRIPT_NAME']), array('upgrade.php', 'logs.php'))) {
header('Location: upgrade.php');
require('upgrade.php');
exit;
require('upgrade.php');
exit;
}
} else {
if(file_exists('../setup/')) {
......
......@@ -92,7 +92,7 @@ $errors=array();
$msg=$warn=$sysnotice='';
$tabs=array();
$submenu=array();
$exempt = in_array(basename($_SERVER['SCRIPT_NAME']), array('logout.php','ajax.php'));
$exempt = in_array(basename($_SERVER['SCRIPT_NAME']), array('logout.php', 'ajax.php', 'logs.php'));
if($ost->isUpgradePending() && !$exempt) {
$errors['err']=$sysnotice='System upgrade is pending <a href="upgrade.php">Upgrade Now</a>';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment