Changeset 3255 for branches/2.2/workflow/inc

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.

Location:

branches/2.2/workflow/inc

Files:

• class.WorkflowLDAP.inc.php (modified) (1 diff)
• class.bo_adminaccess.inc.php (modified) (2 diffs)
• class.so_adminaccess.inc.php (modified) (10 diffs)
• class.so_orgchart.inc.php (modified) (3 diffs)
• class.ui_orgchart.inc.php (modified) (1 diff)
• hook_sidebox_menu.inc.php (modified) (1 diff)

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

@@ -562 +562 @@
                         );
 
-                        $result = array_merge($result, ldap_get_entries($this->dataSource, $resourceIdentifier));
+                        $entries = ldap_get_entries($this->dataSource, $resourceIdentifier);
+                        if (is_array($entries)) {
+                                $result = array_merge($result, $entries);
+                        }
+                        
                         unset($result['count']);
                 }

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

@@ -85 +85 @@
                 return $this->so->getUserNames($admins_id);
         }
+        
+        /**
+        * Retorna o nivel administrativo do organograma do processo
+        *
+        * @param array $p processo
+        * @return array o nivel administrativo do monitor do processo
+        * @access public
+        */
+        function get_organogram_admin_level($p)
+        {
+                return $this->so->getUserAdminLevel('ORG', $p['uid'], $p['pid']);
+        }
 
         /**
@@ -221 +233 @@
                 return null;
         }
+        
+        /**
+        * Seta o nivel administrativo do organograma
+        *
+        * @param array $p processo
+        * @return arraym
+        * @access public
+        */
+        function set_organogram_admin_level($p)
+        {
+                $np = explode('_', $p['np']);
+                $levels = array();
+                foreach ($np as $pair)
+                {
+                        list($key, $value) = explode('=', $pair, 2);
+                        $levels[$key] = ($value == '1') ? true : false;
+                }
+                
+
+                $result = $this->so->setAdminLevel('ORG', $p['uid'], $p['pid'], $levels);
+                
+                if (!$result) {
+                        return "Não atualizou as permissões.";
+                }
+                
+        }
 
         /**

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;
         }
 

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

@@ -145 +145 @@
                 else
                 {
-                        $organizations = $this->acl->getUserPermissions("ORG", $this->userID);
+                        $organizations = $this->acl->getUserPermissions("ORG", $this->userID, 0);
                         $organizations[] = -1;
                         $query = "SELECT organizacao_id, nome, descricao, ativa, url_imagem, sitio FROM organizacao WHERE (organizacao_id IN (" . implode(',', $organizations)  . ")) ORDER BY nome";
@@ -1126 +1126 @@
                 $mobile         = '';
                 $homePhone  = '';
-
+                
                 /*
                  * Check if the current user can view the mobile and homePhone of the employee
@@ -1132 +1132 @@
                  * that's being retrieved
                  */
-                if (in_array($account_id,$arr_supervisores) || ($account_id == $employeeID)) {
+                $authorized = $this->acl->checkUserAccessToResource('ORG', $account_id, (int) $organizationID, 1); 
+                if ((in_array($account_id,$arr_supervisores) || ($account_id == $employeeID)) || ($authorized)) {
                         $mobile         = $employeeEntry['mobile'];
                         $homePhone      = $employeeEntry['homephone'];

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

@@ -50 +50 @@
 
                 $isAdmin = $this->workflow_acl->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']);
-                $isOrgchartManager = $this->workflow_acl->checkUserGroupAccessToType('ORG', $GLOBALS['phpgw_info']['user']['account_id']);
+                $isOrgchartManager = $this->workflow_acl->checkUserGroupAccessToType('ORG', $GLOBALS['phpgw_info']['user']['account_id'],0);
 
                 if (!($isAdmin || $isOrgchartManager))

branches/2.2/workflow/inc/hook_sidebox_menu.inc.php

@@ -38 +38 @@
 
         /* check if the user can administrate the orgchart */
-        if ($workflowACL->checkUserGroupAccessToType('ORG', $userID) || $isWorkflowAdmin)
+        if ($workflowACL->checkUserGroupAccessToType('ORG', $userID,0) || $isWorkflowAdmin)
                 $file['Organization Chart']     = $GLOBALS['phpgw']->link('/index.php','menuaction=workflow.ui_orgchart.draw');