Removed warnings
This commit is contained in:
parent
e711239c69
commit
40e97f6cf6
|
@ -80,9 +80,8 @@ if (isset($_GET['loginhash']) === true) {
|
|||
} else {
|
||||
include_once 'general/login_page.php';
|
||||
db_pandora_audit('Logon Failed (loginhash', '', 'system');
|
||||
while (@ob_end_flush()) {
|
||||
// Dumping...
|
||||
continue;
|
||||
while (ob_get_length() > 0) {
|
||||
ob_end_flush();
|
||||
}
|
||||
|
||||
exit('</html>');
|
||||
|
@ -169,7 +168,6 @@ if ($config['force_instant_logout'] === true) {
|
|||
}
|
||||
|
||||
|
||||
while (@ob_end_flush()) {
|
||||
// Dumping...
|
||||
continue;
|
||||
while (ob_get_length() > 0) {
|
||||
ob_end_flush();
|
||||
}
|
||||
|
|
|
@ -42,16 +42,7 @@ if (!is_dir($config['homedir'])) {
|
|||
|
||||
// Help to debug problems. Override global PHP configuration
|
||||
global $develop_bypass;
|
||||
if ($develop_bypass != 1) {
|
||||
// error_reporting(E_ALL);
|
||||
if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
|
||||
error_reporting(E_ALL & ~E_DEPRECATED & ~E_NOTICE);
|
||||
} else {
|
||||
error_reporting(E_ALL & ~E_NOTICE);
|
||||
}
|
||||
|
||||
ini_set('display_errors', 0);
|
||||
} else {
|
||||
if ((int) $develop_bypass === 1) {
|
||||
// Develop mode, show all notices and errors on Console (and log it)
|
||||
if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
|
||||
error_reporting(E_ALL & ~E_DEPRECATED);
|
||||
|
@ -304,7 +295,7 @@ switch ($config['dbtype']) {
|
|||
|
||||
// ======================================================================
|
||||
// Menu display mode.
|
||||
if ($_SESSION['menu_type']) {
|
||||
if (isset($_SESSION['meny_type']) === true && $_SESSION['menu_type']) {
|
||||
$config['menu_type'] = $_SESSION['menu_type'];
|
||||
} else {
|
||||
$config['menu_type'] = 'classic';
|
||||
|
|
|
@ -4463,7 +4463,7 @@ function get_help_info($section_name)
|
|||
{
|
||||
global $config;
|
||||
|
||||
$user_language = get_user_language($id_user);
|
||||
$user_language = get_user_language($config['id_user']);
|
||||
|
||||
$es = false;
|
||||
$result = 'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:';
|
||||
|
|
|
@ -12864,7 +12864,7 @@ function reporting_get_stats_servers()
|
|||
);
|
||||
$tdata[1] = '<span class="big_data" id="total_events">'.html_print_image('images/spinner.gif', true).'</span>';
|
||||
|
||||
if ($system_events > 50000 && !enterprise_installed()) {
|
||||
if (isset($system_events) && $system_events > 50000 && !enterprise_installed()) {
|
||||
$tdata[2] = "<div id='monitoreventsmodal' class='publienterprise' title='Community version' style='text-align:left'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>";
|
||||
} else {
|
||||
$tdata[3] = ' ';
|
||||
|
|
|
@ -304,6 +304,7 @@ function users_get_groups(
|
|||
$search=''
|
||||
) {
|
||||
static $group_cache = [];
|
||||
$filter = '';
|
||||
|
||||
// Added users_group_cache to avoid unnecessary proccess on massive calls...
|
||||
static $users_group_cache = [];
|
||||
|
|
|
@ -103,7 +103,7 @@ class gettext_reader {
|
|||
* @param object Reader the StreamReader object
|
||||
* @param boolean enable_cache Enable or disable caching of strings (default on)
|
||||
*/
|
||||
function gettext_reader($Reader, $enable_cache = true) {
|
||||
function __construct($Reader, $enable_cache = true) {
|
||||
$machine = php_uname("m");
|
||||
|
||||
$enabled64Bits = false;
|
||||
|
|
|
@ -219,7 +219,9 @@ function enable_session_handlers()
|
|||
{
|
||||
global $config;
|
||||
|
||||
if ($config['_using_pandora_sessionhandlers'] !== true) {
|
||||
if (isset($config['_using_pandora_sessionhandlers']) !== true
|
||||
|| $config['_using_pandora_sessionhandlers'] !== true
|
||||
) {
|
||||
if (session_status() !== PHP_SESSION_NONE) {
|
||||
// Close previous version.
|
||||
session_write_close();
|
||||
|
|
|
@ -60,7 +60,7 @@ class StringReader {
|
|||
var $_pos;
|
||||
var $_str;
|
||||
|
||||
function StringReader($str='') {
|
||||
function __construct($str='') {
|
||||
$this->_str = $str;
|
||||
$this->_pos = 0;
|
||||
//BUGFIX-HR: 2008-07-21 we have to detect, if we need mb_str* functions instead of normal functions !
|
||||
|
@ -128,7 +128,7 @@ class FileReader {
|
|||
var $_fd;
|
||||
var $_length;
|
||||
|
||||
function FileReader($filename) {
|
||||
function __construct($filename) {
|
||||
if (file_exists($filename)) {
|
||||
|
||||
$this->_length=filesize($filename);
|
||||
|
@ -184,8 +184,8 @@ class FileReader {
|
|||
// Preloads entire file in memory first, then creates a StringReader
|
||||
// over it (it assumes knowledge of StringReader internals)
|
||||
class CachedFileReader extends StringReader {
|
||||
function CachedFileReader($filename) {
|
||||
parent::StringReader(); //BUGFIX-HR: 2008-07-21 missing parent constructor call
|
||||
function __construct($filename) {
|
||||
parent::__construct(); //BUGFIX-HR: 2008-07-21 missing parent constructor call
|
||||
if (file_exists($filename)) {
|
||||
|
||||
$length=filesize($filename);
|
||||
|
|
|
@ -380,9 +380,8 @@ if (! isset($config['id_user'])) {
|
|||
'Invalid double auth login: '.$_SERVER['REMOTE_ADDR'],
|
||||
$_SERVER['REMOTE_ADDR']
|
||||
);
|
||||
while (@ob_end_flush()) {
|
||||
// Dumping...
|
||||
continue;
|
||||
while (ob_get_length() > 0) {
|
||||
ob_end_flush();
|
||||
}
|
||||
|
||||
exit('</html>');
|
||||
|
@ -401,9 +400,8 @@ if (! isset($config['id_user'])) {
|
|||
if (!$saml_user_id) {
|
||||
$login_failed = true;
|
||||
include_once 'general/login_page.php';
|
||||
while (@ob_end_flush()) {
|
||||
// Dumping...
|
||||
continue;
|
||||
while (ob_get_length() > 0) {
|
||||
ob_end_flush();
|
||||
}
|
||||
|
||||
exit('</html>');
|
||||
|
@ -446,9 +444,8 @@ if (! isset($config['id_user'])) {
|
|||
if ($blocked) {
|
||||
include_once 'general/login_page.php';
|
||||
db_pandora_audit('Password expired', 'Password expired: '.$nick, $nick);
|
||||
while (@ob_end_flush()) {
|
||||
// Dumping...
|
||||
continue;
|
||||
while (ob_get_length() > 0) {
|
||||
ob_end_flush();
|
||||
}
|
||||
|
||||
exit('</html>');
|
||||
|
@ -481,9 +478,8 @@ if (! isset($config['id_user'])) {
|
|||
'Password expired: '.$nick,
|
||||
$nick
|
||||
);
|
||||
while (@ob_end_flush()) {
|
||||
// Dumping...
|
||||
continue;
|
||||
while (ob_get_length() > 0) {
|
||||
ob_end_flush();
|
||||
}
|
||||
|
||||
exit('</html>');
|
||||
|
@ -505,9 +501,8 @@ if (! isset($config['id_user'])) {
|
|||
// Load the page to introduce the double auth code.
|
||||
$login_screen = 'double_auth';
|
||||
include_once 'general/login_page.php';
|
||||
while (@ob_end_flush()) {
|
||||
// Dumping...
|
||||
continue;
|
||||
while (ob_get_length() > 0) {
|
||||
ob_end_flush();
|
||||
}
|
||||
|
||||
exit('</html>');
|
||||
|
@ -603,7 +598,7 @@ if (! isset($config['id_user'])) {
|
|||
}
|
||||
|
||||
if ($prepare_session) {
|
||||
config_prepare_session();
|
||||
config_prepare_session();
|
||||
}
|
||||
|
||||
if (is_user_admin($config['id_user'])) {
|
||||
|
@ -677,9 +672,8 @@ if (! isset($config['id_user'])) {
|
|||
'Invalid login: '.$nick,
|
||||
$nick
|
||||
);
|
||||
while (@ob_end_flush()) {
|
||||
// Dumping...
|
||||
continue;
|
||||
while (ob_get_length() > 0) {
|
||||
ob_end_flush();
|
||||
}
|
||||
|
||||
exit('</html>');
|
||||
|
@ -690,9 +684,8 @@ if (! isset($config['id_user'])) {
|
|||
'Invalid login: '.$nick,
|
||||
$nick
|
||||
);
|
||||
while (@ob_end_flush()) {
|
||||
// Dumping...
|
||||
continue;
|
||||
while (ob_get_length() > 0) {
|
||||
ob_end_flush();
|
||||
}
|
||||
|
||||
exit('</html>');
|
||||
|
@ -741,9 +734,8 @@ if (! isset($config['id_user'])) {
|
|||
} else {
|
||||
include_once 'general/login_page.php';
|
||||
db_pandora_audit('Logon Failed (loginhash', '', 'system');
|
||||
while (@ob_end_flush()) {
|
||||
// Dumping...
|
||||
continue;
|
||||
while (ob_get_length() > 0) {
|
||||
ob_end_flush();
|
||||
}
|
||||
|
||||
exit('</html>');
|
||||
|
@ -891,9 +883,8 @@ if (! isset($config['id_user'])) {
|
|||
}
|
||||
}
|
||||
|
||||
while (@ob_end_flush()) {
|
||||
// Dumping...
|
||||
continue;
|
||||
while (ob_get_length() > 0) {
|
||||
ob_end_flush();
|
||||
}
|
||||
|
||||
exit('</html>');
|
||||
|
@ -917,9 +908,8 @@ if (! isset($config['id_user'])) {
|
|||
} else {
|
||||
include_once 'general/login_page.php';
|
||||
db_pandora_audit('Logon Failed (loginhash', '', 'system');
|
||||
while (@ob_end_flush()) {
|
||||
// Dumping...
|
||||
continue;
|
||||
while (ob_get_length() > 0) {
|
||||
ob_end_flush();
|
||||
}
|
||||
|
||||
exit('</html>');
|
||||
|
@ -941,9 +931,8 @@ if (! isset($config['id_user'])) {
|
|||
unset($_SESSION['id_usuario']);
|
||||
unset($iduser);
|
||||
include_once 'general/login_page.php';
|
||||
while (@ob_end_flush()) {
|
||||
// Dumping...
|
||||
continue;
|
||||
while (ob_get_length() > 0) {
|
||||
ob_end_flush();
|
||||
}
|
||||
|
||||
exit('</html>');
|
||||
|
@ -960,9 +949,8 @@ if (! isset($config['id_user'])) {
|
|||
unset($_SESSION['id_usuario']);
|
||||
unset($iduser);
|
||||
include_once 'general/login_page.php';
|
||||
while (@ob_end_flush()) {
|
||||
// Dumping...
|
||||
continue;
|
||||
while (ob_get_length() > 0) {
|
||||
ob_end_flush();
|
||||
}
|
||||
|
||||
exit('</html>');
|
||||
|
@ -995,9 +983,8 @@ if (isset($_GET['bye'])) {
|
|||
// Process logout.
|
||||
include 'general/logoff.php';
|
||||
|
||||
while (@ob_end_flush()) {
|
||||
// Dumping...
|
||||
continue;
|
||||
while (ob_get_length() > 0) {
|
||||
ob_end_flush();
|
||||
}
|
||||
|
||||
exit('</html>');
|
||||
|
@ -1007,11 +994,11 @@ clear_pandora_error_for_header();
|
|||
|
||||
/*
|
||||
* ----------------------------------------------------------------------
|
||||
* EXTENSIONS
|
||||
* ----------------------------------------------------------------------
|
||||
*
|
||||
* Load the basic configurations of extension and add extensions into menu.
|
||||
* Load here, because if not, some extensions not load well, I don't why.
|
||||
* EXTENSIONS
|
||||
* ----------------------------------------------------------------------
|
||||
*
|
||||
* Load the basic configurations of extension and add extensions into menu.
|
||||
* Load here, because if not, some extensions not load well, I don't why.
|
||||
*/
|
||||
|
||||
$config['logged'] = false;
|
||||
|
@ -1081,7 +1068,7 @@ if ($config['pure'] == 0) {
|
|||
|
||||
/*
|
||||
* Session locking concurrency speedup!
|
||||
* http://es2.php.net/manual/en/ref.session.php#64525
|
||||
* http://es2.php.net/manual/en/ref.session.php#64525
|
||||
*/
|
||||
|
||||
session_write_close();
|
||||
|
@ -1298,9 +1285,8 @@ if ($config['pure'] == 0) {
|
|||
require_once 'include/functions_clippy.php';
|
||||
clippy_start($sec2);
|
||||
|
||||
while (@ob_end_flush()) {
|
||||
// Dumping...
|
||||
continue;
|
||||
while (ob_get_length() > 0) {
|
||||
ob_end_flush();
|
||||
}
|
||||
|
||||
db_print_database_debug();
|
||||
|
@ -1317,8 +1303,8 @@ require 'include/php_to_js_values.php';
|
|||
|
||||
<script type="text/javascript" language="javascript">
|
||||
|
||||
// When there are less than 5 rows, all rows must be white
|
||||
var theme = "<?php echo $config['style']; ?>";
|
||||
// When there are less than 5 rows, all rows must be white
|
||||
var theme = "<?php echo $config['style']; ?>";
|
||||
if(theme === 'pandora'){
|
||||
if($('table.info_table tr').length < 5){
|
||||
$('table.info_table tbody > tr').css('background-color', '#fff');
|
||||
|
@ -1345,11 +1331,11 @@ require 'include/php_to_js_values.php';
|
|||
function topFunction() {
|
||||
|
||||
/*
|
||||
* Safari.
|
||||
* document.body.scrollTop = 0;
|
||||
* For Chrome, Firefox, IE and Opera.
|
||||
* document.documentElement.scrollTop = 0;
|
||||
*/
|
||||
* Safari.
|
||||
* document.body.scrollTop = 0;
|
||||
* For Chrome, Firefox, IE and Opera.
|
||||
* document.documentElement.scrollTop = 0;
|
||||
*/
|
||||
|
||||
$("HTML, BODY").animate({ scrollTop: 0 }, 500);
|
||||
}
|
||||
|
|
|
@ -60,7 +60,6 @@ if ($config['force_instant_logout'] === true) {
|
|||
}
|
||||
}
|
||||
|
||||
while (@ob_end_flush()) {
|
||||
// Dumping...
|
||||
continue;
|
||||
while (ob_get_length() > 0) {
|
||||
ob_end_flush();
|
||||
}
|
||||
|
|
|
@ -287,9 +287,8 @@ $(document).ready (function () {
|
|||
<?php
|
||||
echo '</body>';
|
||||
|
||||
while (@ob_end_flush()) {
|
||||
// Dumping...
|
||||
continue;
|
||||
while (ob_get_length() > 0) {
|
||||
ob_end_flush();
|
||||
}
|
||||
|
||||
echo '</html>';
|
||||
|
|
Loading…
Reference in New Issue