From 7ddd8eb34a0cde4bcf132fddf52c306a976e901c Mon Sep 17 00:00:00 2001
From: nuxsmin <nuxsmin@cygnux-pc>
Date: Tue, 21 Jan 2014 22:55:39 +0100
Subject: [PATCH] Fixes ACL parsing

---
 ajax/ajax_search.php  |  8 ++++----
 inc/account.class.php | 10 ++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ajax/ajax_search.php b/ajax/ajax_search.php
index 8cf41b2f..25748882 100644
--- a/ajax/ajax_search.php
+++ b/ajax/ajax_search.php
@@ -117,10 +117,10 @@ echo '<div id="data-search" class="data-rows">';
 // Mostrar los resultados de la búsqueda
 foreach ( $resQuery as $account ){
     $objAccount->accountId = $account->account_id;
-	$objAccount->accountUserId = $account->account_userId;
-	$objAccount->accountUserGroupId = $account->account_userGroupId;
-	$objAccount->accountOtherUserEdit = $account->account_otherUserEdit;
-	$objAccount->accountOtherGroupEdit = $account->account_otherGroupEdit;
+    $objAccount->accountUserId = $account->account_userId;
+    $objAccount->accountUserGroupId = $account->account_userGroupId;
+    $objAccount->accountOtherUserEdit = $account->account_otherUserEdit;
+    $objAccount->accountOtherGroupEdit = $account->account_otherGroupEdit;
     
     $accView = ( SP_ACL::checkAccountAccess("accview", $objAccount->getAccountDataForACL()) && SP_ACL::checkUserAccess("accview") );
     $accViewPass = ( SP_ACL::checkAccountAccess("accviewpass", $objAccount->getAccountDataForACL()) && SP_ACL::checkUserAccess("accviewpass")  );
diff --git a/inc/account.class.php b/inc/account.class.php
index c9964673..1ed361cd 100644
--- a/inc/account.class.php
+++ b/inc/account.class.php
@@ -244,6 +244,11 @@ class SP_Account {
             return FALSE;
         }
 
+        $this->accountUserId = $queryRes->account_userId;
+        $this->accountUserGroupId = $queryRes->account_userGroupId;
+        $this->accountOtherUserEdit = $queryRes->account_otherUserEdit;
+        $this->accountOtherGroupEdit = $queryRes->account_otherGroupEdit;
+        
         return $queryRes;
     }
 
@@ -292,6 +297,11 @@ class SP_Account {
             return FALSE;
         }
 
+        $this->accountUserId = $queryRes->acchistory_userId;
+        $this->accountUserGroupId = $queryRes->acchistory_userGroupId;
+        $this->accountOtherUserEdit = $queryRes->acchistory_otherUserEdit;
+        $this->accountOtherGroupEdit = $queryRes->acchistory_otherGroupEdit;
+        
         return $queryRes;
     }