tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 

Former-commit-id: 8952ebd872b4030cb8e1bd4ad3f0425afd13fd09
This commit is contained in:
fbsanchez 2019-03-26 19:30:55 +01:00
parent 94bb818e6d b7267dfafa
commit ca5c214472
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/general/header.php
View File

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

4
pandora_console/index.php
View File

@ -173,8 +173,8 @@ if (!empty($config['https']) && empty($_SERVER['HTTPS'])) {
// Pure mode (without menu, header and footer). // Pure mode (without menu, header and footer).
$config['pure'] = (bool) get_parameter('pure'); $config['pure'] = (bool) get_parameter('pure');
// Auto Refresh page (can now be disabled anywhere in the script) // Auto Refresh page (can now be disabled anywhere in the script).
if (get_parameter('refr')) { if (get_parameter('refr') != null) {
$config['refr'] = (int) get_parameter('refr'); $config['refr'] = (int) get_parameter('refr');
} }