Sync users fix dbg

SE/se-lib/SyncUsers.php

@@ -492,10 +492,8 @@ class SyncUsers {
 		if (!$groupFrom) $groupFrom = $this->_fromStorage->getGroup($groupID);
 		if (!$groupTo) $groupTo = $this->_toStorage->getGroup($groupID);
 
-		if (V::get('DBG_SU', 0, $_GET, 'int') > 0) {
-			echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">groupFrom (hasNestedGroups:'.(!empty($groupFrom->nestedGroups)).') (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($groupFrom);echo'</pre>';
-			echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">groupTo (hasNestedGroups:'.(!empty($groupTo->nestedGroups)).') (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($groupTo);echo'</pre>';
-		}
+		DBG::_('DBG_SU', '>0', "groupFrom (hasNestedGroups:" . (!empty($groupFrom->nestedGroups)) . ")", $groupFrom, __CLASS__, __FUNCTION__, __LINE__);
+		DBG::_('DBG_SU', '>0', "groupTo (hasNestedGroups:" . (!empty($groupTo->nestedGroups)) . ")", $groupTo, __CLASS__, __FUNCTION__, __LINE__);
 
 		$fromParentGroups = $groupFrom->getParentGroups();
 		$toParentGroups = $groupTo->getParentGroups();
@@ -537,9 +535,7 @@ class SyncUsers {
 				}
 			}
 
-			if (V::get('DBG_SU', 0, $_GET, 'int') > 0) {
-				echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">groupsTodo (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($groupsTodo);echo'</pre>';
-			}
+			DBG::_('DBG_SU', '>0', "groupsTodo", $groupsTodo, __CLASS__, __FUNCTION__, __LINE__);
 
 			if (!empty($groupsTodo)) {
 				foreach ($groupsTodo as $kGroupID => $vBool) {

SE/se-lib/UserStorageMacOSX.php

@@ -70,12 +70,12 @@ class UserStorageMacOSX extends UserStorageBase {
 		$groups = UsersLdapHelper::getGroupsByID($groupID);
 		if (count($groups) == 1) {
 			$group = reset($groups);
-			if(V::get('DBG_SU', 0, $_GET, 'int') > 2){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">groupLdap (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($group);echo'</pre>';}
+			DBG::_('DBG_SU', '>2', "groupLdap", $group, __CLASS__, __FUNCTION__, __LINE__);
 			$group = $this->_buildGroupFromLdap($group, $fetchNested);
-			if(V::get('DBG_SU', 0, $_GET, 'int') > 2){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">group (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($group);echo'</pre>';}
+			DBG::_('DBG_SU', '>2', "group", $group, __CLASS__, __FUNCTION__, __LINE__);
 		} else if (count($groups) > 1) {
-			if(V::get('DBG_SU', 0, $_GET, 'int') > 0){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">'."Too much groups in ldap by ID {$groupID}".' (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($groups);echo'</pre>';}
-			trigger_error("Too much groups in ldap by ID {$groupID}", E_USER_WARNING);
+			DBG::_('DBG_SU', '>2', "Too much groups in ldap by ID {$groupID}", $groups, __CLASS__, __FUNCTION__, __LINE__);
+			throw new Exception("Za dużo grup w bazie Ldap pasujących do grupy nr {$groupID}!");
 		}
 		return $group;
 	}
@@ -460,10 +460,8 @@ class UserStorageMacOSX extends UserStorageBase {
 				}
 			}
 		}
-		if (V::get('DBG_SU', 0, $_GET, 'int') > 1) {
-			echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">groupsAll (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($groupsAll);echo'</pre>';
-			echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">groups (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($groups);echo'</pre>';
-		}
+		DBG::_('DBG_SU', '>1', "groupsAll", $groupsAll, __CLASS__, __FUNCTION__, __LINE__);
+		DBG::_('DBG_SU', '>1', "groups", $groups, __CLASS__, __FUNCTION__, __LINE__);
 
 		return $groups;
 	}

SE/se-lib/UsersLdapHelper.php

@@ -27,7 +27,7 @@ class UsersLdapHelper {
 		$entry = $ldap->first_entry($res);
 		while ($entry) {
 			$attrs = $ldap->get_attributes($entry);
-			if(V::get('DBG_L', '', $_GET) > 0){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">attrs(' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($attrs);echo'</pre>';}
+			DBG::_('DBG_L', '>0', "attrs", $attrs, __CLASS__, __FUNCTION__, __LINE__);
 			$userObj = new stdClass();
 			if ($allAttrs) {
 				for ($i = 0; $i < $attrs['count']; $i++) {
@@ -118,15 +118,13 @@ class UsersLdapHelper {
 				}
 			}
 
-			//if($DBG){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">ldap_search (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r(array('ldaprdn'=>'cn=groups,' . $ldap->getBaseDN(), 'filter'=>$filter, 'attributes'=>$attributes));echo'</pre>';}
-
 			$attributes = array();
 			$res = $ldap->search($filter, 'cn=groups', $attributes);
-			if(V::get('DBG_L', '', $_GET) > 0){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">search(' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($filter);echo'</pre>';}
+			DBG::_('DBG_L', '>0', "search", $filter, __CLASS__, __FUNCTION__, __LINE__);
 			$entry = $ldap->first_entry($res);
 			while ($entry) {
 				$attrs = $ldap->get_attributes($entry);
-				if(V::get('DBG_L', '', $_GET) > 0){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">user('.$userName.') (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($attrs);echo'</pre>';}
+				DBG::_('DBG_L', '>0', "user({$userName})", $attrs, __CLASS__, __FUNCTION__, __LINE__);
 
 				$groupObj = new stdClass();
 				foreach ($attrMap as $kAttrName => $vField) {
@@ -139,7 +137,7 @@ class UsersLdapHelper {
 				if ($groupObj->cn && $groupObj->gidNumber) {
 					$userLdapGroupsAdd[$groupObj->gidNumber] = $groupObj;
 				} else {
-					echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">Error: brak cn lub apple-generateduid (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($attrs);echo'</pre>';
+					DBG::_(true, true, "Error: brak cn lub apple-generateduid", $attrs, __CLASS__, __FUNCTION__, __LINE__);
 				}
 
 				$entry = $ldap->next_entry($entry);
@@ -149,7 +147,7 @@ class UsersLdapHelper {
 			if (empty($userLdapGroupsAdd)) {
 				break;
 			} else {
-				if(V::get('DBG_L', '', $_GET) > 0){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">userLdapGroupsAdd('.count($userLdapGroupsAdd).') (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($userLdapGroupsAdd);echo'</pre>';}
+				DBG::_('DBG_L', '>0', "userLdapGroupsAdd(".count($userLdapGroupsAdd).")", $userLdapGroupsAdd, __CLASS__, __FUNCTION__, __LINE__);
 				$lastLoopFound = array();
 				foreach ($userLdapGroupsAdd as $kAppleID => $vGroup) {
 					$userLdapGroups[$kAppleID] = $vGroup;
@@ -189,15 +187,13 @@ class UsersLdapHelper {
 				}
 			}
 
-			//if($DBG){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">ldap_search (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r(array('ldaprdn'=>'cn=groups,' . $ldap->getBaseDN(), 'filter'=>$filter, 'attributes'=>$attributes));echo'</pre>';}
-
 			$attributes = array();
 			$res = $ldap->search($filter, 'cn=groups', $attributes);
-			if(V::get('DBG_L', '', $_GET) > 0){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">search(' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($filter);echo'</pre>';}
+			DBG::_('DBG_L', '>0', "search", $filter, __CLASS__, __FUNCTION__, __LINE__);
 			$entry = $ldap->first_entry($res);
 			while ($entry) {
 				$attrs = $ldap->get_attributes($entry);
-				if(V::get('DBG_L', '', $_GET) > 0){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">user('.$userUid.') (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($attrs);echo'</pre>';}
+				DBG::_('DBG_L', '>0', "user({$userUid})", $attrs, __CLASS__, __FUNCTION__, __LINE__);
 
 				$groupObj = new stdClass();
 				foreach ($attrMap as $kAttrName => $vField) {
@@ -210,7 +206,7 @@ class UsersLdapHelper {
 				if ($groupObj->cn && $groupObj->gidNumber) {
 					$userLdapGroupsAdd[$groupObj->gidNumber] = $groupObj;
 				} else {
-					echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">Error: brak cn lub apple-generateduid (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($attrs);echo'</pre>';
+					DBG::_(true, true, "Error: brak cn lub apple-generateduid", $attrs, __CLASS__, __FUNCTION__, __LINE__);
 				}
 
 				$entry = $ldap->next_entry($entry);
@@ -220,7 +216,7 @@ class UsersLdapHelper {
 			if (empty($userLdapGroupsAdd)) {
 				break;
 			} else {
-				if(V::get('DBG_L', '', $_GET) > 0){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">userLdapGroupsAdd('.count($userLdapGroupsAdd).') (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($userLdapGroupsAdd);echo'</pre>';}
+				DBG::_('DBG_L', '>0', "userLdapGroupsAdd(".count($userLdapGroupsAdd).")", $userLdapGroupsAdd, __CLASS__, __FUNCTION__, __LINE__);
 				$lastLoopFound = array();
 				foreach ($userLdapGroupsAdd as $kAppleID => $vGroup) {
 					$userLdapGroups[$kAppleID] = $vGroup;
@@ -291,7 +287,7 @@ class UsersLdapHelper {
 			if ($groupObj->cn && $groupObj->appleUID) {
 				$allLdapGroups[$groupObj->appleUID] = $groupObj;
 			} else {
-				echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">Error: brak cn lub apple-generateduid (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r(array('attrs'=>$attrs, 'groupObj'=>$groupObj));echo'</pre>';
+				DBG::_(true, true, "Error: brak cn lub apple-generateduid", array('attrs'=>$attrs, 'groupObj'=>$groupObj), __CLASS__, __FUNCTION__, __LINE__);
 			}
 
 			$entry = $ldap->next_entry($entry);
@@ -357,7 +353,7 @@ class UsersLdapHelper {
 			if ($groupObj->cn && $groupObj->appleUID) {
 				$allLdapGroups[$groupObj->appleUID] = $groupObj;
 			} else {
-				echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">Error: brak cn lub apple-generateduid (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r(array('attrs'=>$attrs, 'groupObj'=>$groupObj));echo'</pre>';
+				DBG::_(true, true, "Error: brak cn lub apple-generateduid", array('attrs'=>$attrs, 'groupObj'=>$groupObj), __CLASS__, __FUNCTION__, __LINE__);
 			}
 
 			$entry = $ldap->next_entry($entry);
@@ -422,7 +418,7 @@ class UsersLdapHelper {
 			if ($groupObj->cn && $groupObj->appleUID) {
 				$allLdapGroups[$groupObj->appleUID] = $groupObj;
 			} else {
-				echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">Error: brak cn lub apple-generateduid (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r(array('attrs'=>$attrs, 'groupObj'=>$groupObj));echo'</pre>';
+				DBG::_(true, true, "Error: brak cn lub apple-generateduid", array('attrs'=>$attrs, 'groupObj'=>$groupObj), __CLASS__, __FUNCTION__, __LINE__);
 			}
 
 			$entry = $ldap->next_entry($entry);
@@ -487,7 +483,7 @@ class UsersLdapHelper {
 			if ($groupObj->cn && $groupObj->appleUID) {
 				$allLdapGroups[$groupObj->appleUID] = $groupObj;
 			} else {
-				echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">Error: brak cn lub apple-generateduid (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r(array('attrs'=>$attrs, 'groupObj'=>$groupObj));echo'</pre>';
+				DBG::_(true, true, "Error: brak cn lub apple-generateduid", array('attrs'=>$attrs, 'groupObj'=>$groupObj), __CLASS__, __FUNCTION__, __LINE__);
 			}
 
 			$entry = $ldap->next_entry($entry);