Piotr Labudda пре 11 година
родитељ
комит
b92043ed23
2 измењених фајлова са 22 додато и 4 уклоњено
  1. 1 1
      SE/VERSION
  2. 21 3
      SE/se-lib/User.php

+ 1 - 1
SE/VERSION

@@ -1 +1 @@
-3.9.10-9
+3.9.10-10

+ 21 - 3
SE/se-lib/User.php

@@ -153,13 +153,22 @@ class User {
 	}
 	}
 
 
 	public static function reloadAcl() {
 	public static function reloadAcl() {
+		IF('123'==V::get('DBG_ACL','',$_GET)){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">$_SESSION keys (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r(array_keys($_SESSION));echo'</pre>';}
+		/*
+		 * [3] => USER_PROFILE
+		 * [29] => CRM_PROCES_USERA_WYKONANE_TESTY-4517
+		 * [30] => TableAjax_Cache
+		 */
+		IF('123'==V::get('DBG_ACL','',$_GET)){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">CONFIG (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($_SESSION['CONFIG']);echo'</pre>';}
+		IF('123'==V::get('DBG_ACL','',$_GET)){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">TableAjax_Cache (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($_SESSION['TableAjax_Cache']);echo'</pre>';}
+		unset($_SESSION['UserAcl_cache']);
 		unset($_SESSION['TableAcl_cache']);
 		unset($_SESSION['TableAcl_cache']);
 		unset($_SESSION['Typespecial_Cache']);
 		unset($_SESSION['Typespecial_Cache']);
 		unset($_SESSION['ADM_INICJALY_HANDLOWCA']);
 		unset($_SESSION['ADM_INICJALY_HANDLOWCA']);
 		unset($_SESSION['EMPLOYEE_TYPE']);
 		unset($_SESSION['EMPLOYEE_TYPE']);
 		unset($_SESSION['DEFAULT_ACL_GROUP']);
 		unset($_SESSION['DEFAULT_ACL_GROUP']);
-		//TODO: not work: unset($_SESSION['CRM_PROCES_USERA_WYKONANE_TESTY-' . User::getID()]);
-//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;display:none">ses (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($_SESSION);echo'</pre>';
+		$testySesKey = 'CRM_PROCES_USERA_WYKONANE_TESTY-' . User::getID();
+		if (isset($_SESSION[$testySesKey])) unset($_SESSION[$testySesKey]);
 		$userAcl = User::getAcl();
 		$userAcl = User::getAcl();
 		$userAcl->fetchAllPerms(true);
 		$userAcl->fetchAllPerms(true);
 	}
 	}
@@ -201,7 +210,16 @@ class User {
 				break;
 				break;
 
 
 			case 'PERMS_RELOAD':
 			case 'PERMS_RELOAD':
-				User::reloadAcl();
+				if (User::logged()) {
+					User::reloadAcl();
+
+					$data = array();
+					SE_Layout::gora();
+					SE_Layout::menu();
+					SE_Layout::loadTemplate('defaultPage', $data);
+					SE_Layout::dol();
+					exit;
+				}
 				break;
 				break;
 
 
 			case 'PASSEDIT':
 			case 'PASSEDIT':