Merge branch 'ent-3774-Autorefresh_no_se_deshabilita' into 'develop'

fixed minor error header disabled

See merge request artica/pandorafms!2297

Former-commit-id: ffc6904ecfa47e41ea87b867f8650c237ee1877a
This commit is contained in:
Daniel Rodriguez 2019-03-26 18:49:27 +01:00
commit b7267dfafa
2 changed files with 10 additions and 7 deletions

View File

@ -19,10 +19,11 @@ require_once 'include/functions_notifications.php';
config_check();
if ($_SESSION['menu_type']=='classic')
if ($_SESSION['menu_type'] == 'classic') {
echo '<div id="header_table" class="header_table_classic">';
else
} else {
echo '<div id="header_table" class="header_table_collapsed">';
}
?>
<div id="header_table_inner">
<?php
@ -178,7 +179,8 @@ else
);
if ((isset($select[0]['time_autorefresh']) === true)
&& $select[0]['time_autorefresh'] !== 0 && !$config['refr']
&& $select[0]['time_autorefresh'] !== 0
&& $config['refr'] === null
) {
$config['refr'] = $select[0]['time_autorefresh'];
$autorefresh_txt .= ' (<span id="refrcounter">';

View File

@ -173,8 +173,8 @@ if (!empty($config['https']) && empty($_SERVER['HTTPS'])) {
// Pure mode (without menu, header and footer).
$config['pure'] = (bool) get_parameter('pure');
// Auto Refresh page (can now be disabled anywhere in the script)
if (get_parameter('refr')) {
// Auto Refresh page (can now be disabled anywhere in the script).
if (get_parameter('refr') != null) {
$config['refr'] = (int) get_parameter('refr');
}
@ -1031,10 +1031,11 @@ if ($config['pure'] == 0) {
echo '<div id="container"><div id="head">';
include 'general/header.php';
if ($_SESSION['menu_type']=='classic')
if ($_SESSION['menu_type'] == 'classic') {
echo '</div><div id="page" class="page_classic"><div id="menu">';
else
} else {
echo '</div><div id="page" class="page_collapsed"><div id="menu">';
}
include 'general/main_menu.php';
echo '</div>';