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

fixed errors php

This commit is contained in:
daniel 2018-10-15 10:32:24 +02:00
parent d28bc79b79
commit d84427b014
5 changed files with 52 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandora_console/general/login_page.php
View File

@ -70,9 +70,10 @@ switch ($login_screen) {
$logo_link = 'index.php';
$logo_title = __('Refresh');
break;
$splash_title = __('Splash login');
}
$splash_title = __('Splash login');
$url = '?login=1';
//These variables come from index.php
if (!empty ($page) && !empty ($sec)) {
@ -303,7 +304,7 @@ echo '</div>';
echo '<div id="ver_num">'.$pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '') . '</div>';
echo '</div>';
if ($process_error_message == '' && $mail != "") {
if (!isset($process_error_message) && isset($mail)) {
echo '<div id="reset_correct" title="' . __('Password reset') . '">';
echo '<div class="content_alert">';
echo '<div class="icon_message_alert">';
@ -315,13 +316,13 @@ if ($process_error_message == '' && $mail != "") {
echo '<p>' . __('An email has been sent to your email address') . '</p>';
echo '</div>';
echo '<div class="button_message_alert">';
html_print_submit_button("Ok", 'reset_correct_button', false);
html_print_submit_button("Ok", 'reset_correct_button', false);
echo '</div>';
echo '</div>';
echo '</div>';
echo '</div>';
}
else if ($process_error_message != '') {
else if (isset($process_error_message)) {
echo '<div id="reset_correct" title="' . __('Password reset') . '">';
echo '<div class="content_alert">';
echo '<div class="icon_message_alert">';
@ -333,7 +334,7 @@ else if ($process_error_message != '') {
echo '<p>' . $process_error_message . '</p>';
echo '</div>';
echo '<div class="button_message_alert">';
html_print_submit_button("Ok", 'reset_correct_button', false);
html_print_submit_button("Ok", 'reset_correct_button', false);
echo '</div>';
echo '</div>';
echo '</div>';
@ -341,7 +342,7 @@ else if ($process_error_message != '') {
}
if ($correct_reset_pass_process != "") {
if (isset($correct_reset_pass_process)) {
echo '<div id="final_process_correct" title="' . __('Password reset') . '">';
echo '<div class="content_alert">';
echo '<div class="icon_message_alert">';
@ -353,7 +354,7 @@ if ($correct_reset_pass_process != "") {
echo '<p>' . $correct_reset_pass_process . '</p>';
echo '</div>';
echo '<div class="button_message_alert">';
html_print_submit_button("Ok", 'final_process_correct_button', false);
html_print_submit_button("Ok", 'final_process_correct_button', false);
echo '</div>';
echo '</div>';
echo '</div>';

18
pandora_console/include/config_process.php
View File

@ -250,10 +250,20 @@ if (isset($_POST['vc_refr'])) {
//======= Autorefresh code =============================================
$select = db_process_sql("SELECT autorefresh_white_list FROM tusuario WHERE id_user = '" . $config['id_user'] . "'");
$autorefresh_list = json_decode($select[0]['value']);
$config['autorefresh_white_list'] = array();
$config['autorefresh_white_list'] = $autorefresh_list;
if(isset($config['id_user'])){
$select = db_process_sql("SELECT autorefresh_white_list FROM tusuario WHERE id_user = '" . $config['id_user'] . "'");
if(isset($select[0]['value'])){
$autorefresh_list = json_decode($select[0]['value']);
}
else{
$autorefresh_list =null;
}
$config['autorefresh_white_list'] = array();
$config['autorefresh_white_list'] = $autorefresh_list;
}
else{
$config['autorefresh_white_list'] = null;
}
// Specific metaconsole autorefresh white list sections
if (defined('METACONSOLE')) {
$config['autorefresh_white_list'][] = 'monitoring/tactical';

25
pandora_console/include/functions_config.php
View File

@ -1520,7 +1520,7 @@ function config_process_config () {
else {
if (!json_decode(io_safe_output($config['ad_adv_perms']))) {
$temp_ad_adv_perms = array();
if ($config['ad_adv_perms'] != '') {
if (!isset($config['ad_adv_perms']) && $config['ad_adv_perms'] != '') {
$perms = explode(';', io_safe_output($config['ad_adv_perms']));
foreach ($perms as $ad_adv_perm) {
if (preg_match('/[\[\]]/',$ad_adv_perm)) {
@ -1584,7 +1584,7 @@ function config_process_config () {
else {
if (!json_decode(io_safe_output($config['ldap_adv_perms']))) {
$temp_ldap_adv_perms = array();
if ($config['ldap_adv_perms'] != '') {
if (!isset($config['ad_adv_perms']) && $config['ldap_adv_perms'] != '') {
$perms = explode(';', io_safe_output($config['ldap_adv_perms']));
foreach ($perms as $ad_adv_perm) {
if (preg_match('/[\[\]]/',$ad_adv_perm)) {
@ -2266,9 +2266,14 @@ function config_user_set_custom_config() {
function config_prepare_session() {
global $config;
$user = users_get_user_by_id($config["id_user"]);
$user_sesion_time = $user['session_time'];
if(isset($config["id_user"])){
$user = users_get_user_by_id($config["id_user"]);
$user_sesion_time = $user['session_time'];
}
else{
$user_sesion_time = null;
}
if ($user_sesion_time == 0) {
// Change the session timeout value to session_timeout minutes // 8*60*60 = 8 hours
@ -2278,20 +2283,20 @@ function config_prepare_session() {
// Change the session timeout value to session_timeout minutes // 8*60*60 = 8 hours
$sessionCookieExpireTime = $user_sesion_time;
}
if ($sessionCookieExpireTime <= 0)
$sessionCookieExpireTime = 10 * 365 * 24 * 60 * 60;
else
$sessionCookieExpireTime *= 60;
ini_set('session.gc_maxlifetime', $sessionCookieExpireTime);
session_set_cookie_params ($sessionCookieExpireTime);
// Reset the expiration time upon page load //session_name() is default name of session PHPSESSID
if (isset($_COOKIE[session_name()]))
setcookie(session_name(), $_COOKIE[session_name()], time() + $sessionCookieExpireTime, "/");
ini_set("post_max_size", $config["max_file_size"]);
ini_set("upload_max_filesize", $config["max_file_size"]);
}

17
pandora_console/include/functions_io.php
View File

@ -374,13 +374,18 @@ function __ ($string /*, variable arguments */) {
global $l10n;
global $config;
static $extensions_cache = array();
if (array_key_exists($config["id_user"], $extensions_cache)) {
$extensions = $extensions_cache[$config["id_user"]];
if( !isset($config["id_user"]) && count($extensions_cache) > 0 ) {
if (array_key_exists($config["id_user"], $extensions_cache)) {
$extensions = $extensions_cache[$config["id_user"]];
}
else {
$extensions = extensions_get_extensions();
$extensions_cache[$config["id_user"]] = $extensions;
}
}
else {
$extensions = extensions_get_extensions();
$extensions_cache[$config["id_user"]] = $extensions;
else{
$extension =null;
}
if (empty($extensions))
$extensions = array();

8
pandora_console/include/functions_visual_map.php
View File

@ -3597,17 +3597,17 @@ function visual_map_get_user_layouts ($id_user = 0, $only_names = false, $filter
$retval[$layout['id']] = $layout;
//add_perms
if ($groups[$layout['id_group']]['vconsole_view']){
if (isset($groups[$layout['id_group']]['vconsole_view'])){
$retval[$layout['id']]['vr'] = $groups[$layout['id_group']]['vconsole_view'];
}
if ($groups[$layout['id_group']]['vconsole_edit']){
if (isset($groups[$layout['id_group']]['vconsole_edit'])){
$retval[$layout['id']]['vw'] = $groups[$layout['id_group']]['vconsole_edit'];
}
if ($groups[$layout['id_group']]['vconsole_management']){
if (isset($groups[$layout['id_group']]['vconsole_management'])){
$retval[$layout['id']]['vm'] = $groups[$layout['id_group']]['vconsole_management'];
}
}
return $retval;
}