Changeset 3255 for branches/2.2/workflow/inc/class.so_adminaccess.inc.php

Timestamp:

09/15/10 17:06:46 (14 years ago)

Author:

pereira.jair

Message:

Ticket #1186 - Alterado modulo administrativo do organograma p/ definir diferentes niveis de usuarios.

File:

• branches/2.2/workflow/inc/class.so_adminaccess.inc.php (modified) (10 diffs)

branches/2.2/workflow/inc/class.so_adminaccess.inc.php

@@ -184 +184 @@
         function get_granted_organograms($user_id)
         {
-                return $this->getUserPermissions('ORG', $user_id);
+                return $this->getUserPermissions('ORG', $user_id, 0);
         }
 
@@ -311 +311 @@
         * @param string $type type of resource
         * @param integer $uid user id
+        * @param requiredLevel Level Required to Access.
         * @return bool
         * @access public
         */
-        function getUserPermissions($type, $uid)
+        function getUserPermissions($type, $uid, $requiredLevel = null)
         {
                 $query = "
                         SELECT
-                                numvalue
+                                numvalue,
+                                nivel
                         FROM
                                 egw_wf_admin_access
@@ -329 +331 @@
                 $output = array();
                 if ($result)
-                        while ($row = $result->fetchRow())
-                                $output[] = $row['numvalue'];
+                        while ($row = $result->fetchRow()) {
+                                $authorized = $this->_checkLevelNumber($row['nivel'], $requiredLevel);
+                                if (isset($requiredLevel)) {
+                                        $authorized = $this->checkUserAccessToResource($type,$uid,$row['numvalue'],$requiredLevel);
+                                        if ($authorized) {
+                                                $output[] = $row['numvalue'];
+                                        }
+                                } else {
+                                        $output[] = $row['numvalue'];
+                                }
+                        }
 
                 return $output;
@@ -342 +353 @@
          * @return array
          */
-        function getUserGroupPermissions($type, $uid)
+        function getUserGroupPermissions($type, $uid, $requiredLevel = null)
         {
                 $groups = galaxia_retrieve_user_groups($uid);
@@ -361 +372 @@
                 $output = array();
                 if ($result)
-                        while ($row = $result->fetchRow())
-                                $output[] = $row['numvalue'];
+                        while ($row = $result->fetchRow()) {
+                                if (isset($requiredLevel)) {
+                                        //$authorized = $this->_checkLevelNumber($row['nivel'], $requiredLevel);                
+                                        $authorized = $this->checkUserAccessToResource($type,$uid,$row['numvalue'],$requiredLevel);
+                                        if ($authorized) {
+                                                $output[] = $row['numvalue'];
+                                        }
+                                } else {
+                                        $output[] = $row['numvalue'];
+                                }
+                        }
 
                 return $output;
@@ -376 +396 @@
         function checkUserAccessToType($type, $uid)
         {
-                return (count($this->getUserPermissions($type, $uid)) > 0);
+                return (count($this->getUserPermissions($type, $uid,0)) > 0);
         }
         /**
@@ -414 +434 @@
 
                 $result = $this->db->query($query, array($type, $uid, $numvalue));
+                
                 $row = $result->fetchRow();
 
-                if (isset($row['nivel']))
-                        return $this->_checkLevelNumber($row['nivel'], $requiredLevel);
+                if (isset($row['nivel'])) {
+                        $res = $this->_checkLevelNumber($row['nivel'], $requiredLevel);         
+                        return $res;
+                }
                 else
                         return false;
@@ -491 +514 @@
         }
         /**
-        * Setaa o nivel de administracao
+        * Seta o nivel de administracao
         *
         * @param string  $type tipo de recurso
@@ -505 +528 @@
                         $level = $this->_permissionListToNumber($level);
 
-                $query = "
-                        UPDATE egw_wf_admin_access
+                $query = "UPDATE egw_wf_admin_access
                         SET
                                 nivel = ?
@@ -513 +535 @@
                                 (tipo = ?) AND
                                 (numvalue = ?)";
-                $this->db->query($query, array($level, $uid, $type, $numvalue));
+                $result = $this->db->query($query, array($level, $uid, $type, $numvalue));
+                
+                return $result;
         }