#11739 Fixed deprecated functions
This commit is contained in:
parent
c2d7c10442
commit
bee65bc575
|
@ -502,9 +502,13 @@ if ($access_console_node === true) {
|
||||||
$sub2[$extmenu['sec2']]['refr'] = 0;
|
$sub2[$extmenu['sec2']]['refr'] = 0;
|
||||||
} else {
|
} else {
|
||||||
if (is_array($extmenu) === true && array_key_exists('fatherId', $extmenu) === true) {
|
if (is_array($extmenu) === true && array_key_exists('fatherId', $extmenu) === true) {
|
||||||
if (strlen($extmenu['fatherId']) > 0) {
|
if (empty($extmenu['fatherId']) === false
|
||||||
|
&& strlen($extmenu['fatherId']) > 0
|
||||||
|
) {
|
||||||
if (array_key_exists('subfatherId', $extmenu) === true) {
|
if (array_key_exists('subfatherId', $extmenu) === true) {
|
||||||
if (strlen($extmenu['subfatherId']) > 0) {
|
if (empty($extmenu['subfatherId']) === false
|
||||||
|
&& strlen($extmenu['subfatherId']) > 0
|
||||||
|
) {
|
||||||
$menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['subfatherId']]['sub2'][$extmenu['sec2']]['text'] = __($extmenu['name']);
|
$menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['subfatherId']]['sub2'][$extmenu['sec2']]['text'] = __($extmenu['name']);
|
||||||
$menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['subfatherId']]['sub2'][$extmenu['sec2']]['id'] = str_replace(' ', '_', $extmenu['name']);
|
$menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['subfatherId']]['sub2'][$extmenu['sec2']]['id'] = str_replace(' ', '_', $extmenu['name']);
|
||||||
$menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['subfatherId']]['sub2'][$extmenu['sec2']]['refr'] = 0;
|
$menu_godmode[$extmenu['fatherId']]['sub'][$extmenu['subfatherId']]['sub2'][$extmenu['sec2']]['refr'] = 0;
|
||||||
|
|
|
@ -907,7 +907,7 @@ function set_cookie($name, $value)
|
||||||
{
|
{
|
||||||
if (is_null($value)) {
|
if (is_null($value)) {
|
||||||
unset($_COOKIE[$value]);
|
unset($_COOKIE[$value]);
|
||||||
setcookie($name, null, -1, '/');
|
setcookie($name, '', -1, '/');
|
||||||
} else {
|
} else {
|
||||||
setcookie($name, $value);
|
setcookie($name, $value);
|
||||||
}
|
}
|
||||||
|
|
|
@ -353,7 +353,7 @@ function menu_print_menu(&$menu)
|
||||||
$secExtensionBool = false;
|
$secExtensionBool = false;
|
||||||
|
|
||||||
if ($secExtensionBool) {
|
if ($secExtensionBool) {
|
||||||
if (strlen($sub['icon']) > 0) {
|
if (empty($sub['icon']) === false && strlen($sub['icon']) > 0) {
|
||||||
$icon_enterprise = false;
|
$icon_enterprise = false;
|
||||||
if (isset($sub['enterprise'])) {
|
if (isset($sub['enterprise'])) {
|
||||||
$icon_enterprise = (bool) $sub['enterprise'];
|
$icon_enterprise = (bool) $sub['enterprise'];
|
||||||
|
@ -380,7 +380,7 @@ function menu_print_menu(&$menu)
|
||||||
$secExtension = $sub['sec'];
|
$secExtension = $sub['sec'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strlen($secExtension) > 0) {
|
if (empty($secExtension) === false && strlen($secExtension) > 0) {
|
||||||
$secUrl = $secExtension;
|
$secUrl = $secExtension;
|
||||||
$extensionInMenu = 'extension_in_menu='.$mainsec.'&';
|
$extensionInMenu = 'extension_in_menu='.$mainsec.'&';
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -4788,7 +4788,10 @@ function ui_get_url_refresh($params=false, $relative=true, $add_post=true)
|
||||||
$url .= $key.'['.$k.']='.$v.'&';
|
$url .= $key.'['.$k.']='.$v.'&';
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$url .= $key.'='.io_safe_input(rawurlencode($value)).'&';
|
$aux = (empty($value) === false)
|
||||||
|
? io_safe_input(rawurlencode($value))
|
||||||
|
: '';
|
||||||
|
$url .= $key.'='.$aux.'&';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -59,6 +59,7 @@ class StreamReader {
|
||||||
class StringReader {
|
class StringReader {
|
||||||
var $_pos;
|
var $_pos;
|
||||||
var $_str;
|
var $_str;
|
||||||
|
var $is_overloaded;
|
||||||
|
|
||||||
function __construct($str='') {
|
function __construct($str='') {
|
||||||
$this->_str = $str;
|
$this->_str = $str;
|
||||||
|
|
|
@ -292,7 +292,7 @@ enterprise_include_once('include/auth/saml.php');
|
||||||
if (isset($config['id_user']) === false) {
|
if (isset($config['id_user']) === false) {
|
||||||
// Clear error messages.
|
// Clear error messages.
|
||||||
unset($_COOKIE['errormsg']);
|
unset($_COOKIE['errormsg']);
|
||||||
setcookie('errormsg', null, -1);
|
setcookie('errormsg', '', -1);
|
||||||
|
|
||||||
if (isset($_GET['login']) === true) {
|
if (isset($_GET['login']) === true) {
|
||||||
include_once 'include/functions_db.php';
|
include_once 'include/functions_db.php';
|
||||||
|
|
Loading…
Reference in New Issue