From f70027ffbedce10f412868a7bf9b0b67b113f1b1 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Sun, 20 Jan 2019 11:48:48 +0100
Subject: Rev: 4423

---
 .../public/password/changeMyPassword-pre.php       |  3 +++
 .../www/policy/public/portal/portal/portal-pre.php | 22 +++-------------------
 .../www/policy/public/session/logout-pre.php       |  1 +
 3 files changed, 7 insertions(+), 19 deletions(-)

(limited to 'mayor-orig/www/policy/public')

diff --git a/mayor-orig/www/policy/public/password/changeMyPassword-pre.php b/mayor-orig/www/policy/public/password/changeMyPassword-pre.php
index f7c68879..e9ef2f3c 100644
--- a/mayor-orig/www/policy/public/password/changeMyPassword-pre.php
+++ b/mayor-orig/www/policy/public/password/changeMyPassword-pre.php
@@ -2,6 +2,9 @@
 
     if (_RIGHTS_OK !== true) die();
 
+    _clearSessionCache($sessionID);
+    unsetTokenCookies(); // ha valaki ide tévedne, visszavonjuk a Tokenjét és a cache-t is vissza kell
+
     $toPolicy = readVariable($_REQUEST['toPolicy'], 'enum', 'private', $POLICIES);
     $userAccount = readVariable($_REQUEST['userAccount'], 'emptystringnull', (defined('_USERACCOUNT'))?_USERACCOUNT:null);
 
diff --git a/mayor-orig/www/policy/public/portal/portal/portal-pre.php b/mayor-orig/www/policy/public/portal/portal/portal-pre.php
index 7ef3ebca..d02f5484 100644
--- a/mayor-orig/www/policy/public/portal/portal/portal-pre.php
+++ b/mayor-orig/www/policy/public/portal/portal/portal-pre.php
@@ -4,25 +4,9 @@
     require_once('include/modules/portal/share/nevnap.php');
     require_once('include/modules/portal/share/kerdoiv.php');
 
-   $ev=date('Y');
-    $honap=date('m');
-    $nap=date('d');
-    
-    if ($ev % 4 ==0) {
-	if ($ev % 100 !==0) {
-	    $szokoev=true;
-	} else {
-	    if ($ev % 400==0) {
-		$szokoev=true;
-	    }
-	}
-    } else {
-	$szokoev=false;
-    }
-
-    if (!$szokoev && $honap==2 && $nap>=24) {
-	$nap=$nap+1;
-    }
+    $ev=date('Y');$honap=date('m');$nap=date('d');
+    if ($ev % 4 ==0) {if ($ev % 100 !==0) {$szokoev=true;} else {if ($ev % 400==0) {$szokoev=true;}}} else {$szokoev=false;}
+    if (!$szokoev && $honap==2 && $nap>=24) {$nap=$nap+1;}
 
     $ADAT['nevnap']['ma'] = getNevnap($honap,$nap);
     $ADAT['nevnap']['holnap'] = getNevnap($honap,$nap+1);
diff --git a/mayor-orig/www/policy/public/session/logout-pre.php b/mayor-orig/www/policy/public/session/logout-pre.php
index ac344fee..013be18c 100644
--- a/mayor-orig/www/policy/public/session/logout-pre.php
+++ b/mayor-orig/www/policy/public/session/logout-pre.php
@@ -21,6 +21,7 @@
 	session_destroy();
 	session_write_close();
 	setcookie(session_name(),'',0,'/');
+	setcookie($sessionID,'',0,'/');
 	session_regenerate_id(true);
 	header('Location: index.php');
     }
-- 
cgit v1.2.3