Changeset 317

Timestamp:

06/17/08 14:43:30 (16 years ago)

Author:

niltonneto

Message:

Versionamento feito pelo desenvolvedor (jakjr).

Location:

trunk/expressoAdmin1_2

Files:

• controller.php (modified) (1 diff)
• inc/class.functions.inc.php (modified) (6 diffs)
• inc/class.group.inc.php (modified) (6 diffs)
• inc/class.institutional_accounts.inc.php (added)
• inc/class.ldap_functions.inc.php (modified) (10 diffs)
• inc/class.uiaccounts.inc.php (modified) (4 diffs)
• inc/class.uidomains.inc.php (modified) (1 diff)
• inc/class.uimanagers.inc.php (modified) (2 diffs)
• inc/class.user.inc.php (modified) (6 diffs)
• index.php (modified) (2 diffs)
• js/jscode/connector.js (modified) (4 diffs)
• js/jscode/institutional_accounts.js (added)
• js/jscode/maillists.js (modified) (1 diff)
• js/jscode/managers.js (modified) (1 diff)
• js/modal (added)
• js/modal/css (added)
• js/modal/css/modal_fx.css (added)
• js/modal/css/modal_ie.css (added)
• js/modal/images (added)
• js/modal/images/overlay.png (added)
• js/modal/images/rc_error.png (added)
• js/modal/images/rc_normal.png (added)
• js/modal/inc (added)
• js/modal/inc/load_lang.php (added)
• js/modal/modal.js (added)
• setup/phpgw_pt-br.lang (modified) (previous)
• templates/default/accounts_form.tpl (modified) (2 diffs)
• templates/default/images/delete.png (added)
• templates/default/images/institutional_account.png (added)
• templates/default/index.tpl (modified) (2 diffs)
• templates/default/institutional_accounts.css (added)
• templates/default/institutional_accounts.tpl (added)
• templates/default/institutional_accounts_modal.tpl (added)
• templates/default/managers_form.tpl (modified) (2 diffs)

trunk/expressoAdmin1_2/controller.php

@@ -21 +21 @@
         else
                 return $_SESSION['response'] = 'false';
-        
+                
         // Load dinamically class file.
         if($app == '$this')
                 $filename = 'inc/class.'.$class.'.inc.php';
+        else if( strpos($app, '$this/') !== false)
+        {
+                $filename = str_replace('$this/','',$app) . '.php';
+                include_once($filename);
+                exit;
+        }
         else
                 $filename = '../'.$app.'/inc/class.'.$class.'.inc.php';
                 
-        include_once($filename);        
+        include_once($filename);
         
         // Create new Object  (class loaded).   

trunk/expressoAdmin1_2/inc/class.functions.inc.php

@@ -49 +49 @@
                         {
                                 case list_users:
-                                        if ($array_acl[acl_add_users] || $array_acl[acl_edit_users] || $array_acl[acl_delete_users] || $array_acl[acl_change_users_password] || $array_acl[acl_change_users_quote] || $array_acl[acl_edit_sambausers_attributes] || $array_acl[acl_view_users] || $array_acl[acl_manipulate_corporative_information])
+                                        if ($array_acl[acl_add_users] || $array_acl[acl_edit_users] || $array_acl[acl_delete_users] || $array_acl[acl_change_users_password] || $array_acl[acl_change_users_quote] || $array_acl[acl_edit_sambausers_attributes] || $array_acl[acl_view_users] || $array_acl[acl_manipulate_corporative_information] || $array_acl[acl_edit_users_phonenumber] )
                                                 return true;
                                         break;
@@ -85 +85 @@
                                                 return true;
                                         break;
+
+                                case list_institutional_accounts:
+                                        if ($array_acl[acl_add_institutional_accounts] || $array_acl[acl_edit_institutional_accounts] || $array_acl[acl_delete_institutional_accounts])
+                                                return true;
+                                        break;
+
 
                                 default:
@@ -288 +294 @@
                 
                 // Make a array read humam
-                // Last acl:    1.073.741.824
+                // Last acl:    2.147.483.648 -> edit users phonephone
+                // Last acl:    4.294.967.296 -> add institutional accounts
+                // Last acl:    8.589.934.592 -> edit institutional accounts
+                // Last acl:   17.179.869.184 -> remove institutional accounts
                 function make_array_acl($acl)
                 {
@@ -322 +331 @@
                                                                 "acl_manipulate_corporative_information",
                                                                 "acl_edit_users_picture",
-                                                                "acl_edit_scl_email_lists"
+                                                                "acl_edit_scl_email_lists",
+                                                                "acl_edit_users_phonenumber",
+                                                                "acl_add_institutional_accounts",
+                                                                "acl_edit_institutional_accounts",
+                                                                "acl_remove_institutional_accounts"
                                                                 );
                         
@@ -334 +347 @@
                                 $bin = '1' . $bin;
                                 
-                                $array_acl[$right] = $acl & bindec($bin);
-                        }                       
+                                $array_acl[$right] = $this->safeBitCheck(bindec($bin), $acl);
+                        }
                         return $array_acl;
-                        /*
-                        $array_acl['acl_add_users'] = $acl & 1;
-                        $array_acl['acl_edit_users'] = $acl & 2;
-                        $array_acl['acl_delete_users'] = $acl & 4;
-                        //8
-                        $array_acl['acl_add_groups'] = $acl & 16;
-                        $array_acl['acl_edit_groups'] = $acl & 32;
-                        $array_acl['acl_delete_groups'] = $acl & 64;
-                        $array_acl['acl_change_users_password'] = $acl & 128;
-                        $array_acl['acl_add_maillists'] = $acl & 256;
-                        $array_acl['acl_edit_maillists'] = $acl & 512;
-                        $array_acl['acl_delete_maillists'] = $acl & 1024;
-                        //2048
-                        $array_acl['acl_create_sectors'] = $acl & 4096;
-                        $array_acl['acl_edit_sectors'] = $acl & 8192;
-                        $array_acl['acl_delete_sectors'] = $acl & 16384;
-                        $array_acl['acl_edit_sambausers_attributes'] = $acl & 32768;
-                        $array_acl['acl_view_global_sessions'] = $acl & 65536;
-                        $array_acl['acl_view_logs'] = $acl & 131072;
-                        $array_acl['acl_change_users_quote'] = $acl & 262144;
-                        $array_acl['acl_set_user_default_password'] = $acl & 524288;
-                        $array_acl['acl_create_computers'] = $acl & 1048576;
-                        $array_acl['acl_edit_computers'] = $acl & 2097152;
-                        $array_acl['acl_delete_computers'] = $acl & 4194304;
-                        $array_acl['acl_rename_users'] = $acl & 8388608;
-                        $array_acl['acl_edit_sambadomains'] = $acl & 16777216;
-                        $array_acl['acl_view_users'] = $acl & 33554432;
-                        $array_acl['acl_edit_email_groups'] = $acl & 67108864;
-                        $array_acl['acl_empty_user_inbox'] = $acl & 134217728;
-                        $array_acl['acl_manipulate_corporative_information'] = $acl & 268435456;
-                        $array_acl['acl_edit_users_picture'] = $acl & 536870912;
-                        return $array_acl;
-                        */
+                }
+
+                function safeBitCheck($number,$comparison)
+                {
+                $binNumber = base_convert($number,10,2);
+                $binComparison = strrev(base_convert($comparison,10,2));
+                        $str = strlen($binNumber);
+                
+                if ( ($str <= strlen($binComparison)) && ($binComparison{$str-1}==="1") )
+                        return '1';
+                else
+                        return '0';
                 }
                 
@@ -748 +740 @@
                 }
                 
+                function lang($key)
+                {
+                        if ($_SESSION['phpgw_info']['expressoAdmin']['lang'][$key])
+                                return $_SESSION['phpgw_info']['expressoAdmin']['lang'][$key];
+                        else
+                                return $key . '*';
+                }
         }
         

trunk/expressoAdmin1_2/inc/class.group.inc.php

@@ -52 +52 @@
                         //Retira os uids duplicados se existir
                         $array_tmp = array();
-                        $array_tmp = array_unique($params['members']);
+                        $array_tmp = @array_unique($params['members']);
                         $params['members'] = $array_tmp;
 
@@ -67 +67 @@
                                 $id = $next_id['id'];
                         }
-                        // Pega ID do BD e incrementa de 1.
-                        //$id = (($this->db_functions->get_next_id()) + 1);
-                        // Incrementa o id no BD.
-                        //$this->db_functions->increment_id($id,'groups');
                         
                         // Cria array para incluir no LDAP
@@ -90 +86 @@
                                 $group_info['mail'] = $params['email'];
                         
-                        if (count($params['members']))
+                        if ( (count($params['members'])) && (is_array($params['members'])) )
                         {
                                 foreach ($params['members'] as $index => $uidnumber)
@@ -122 +118 @@
                         {
                                 $return['status'] = false;
-                                $return['msg'] .= $result['msg'];
+                                if ($result['error_number'] == '65')
+                                        $return['msg'] .= "Não foi possível criar este grupo pois os schemas do servidor LDAP estão desatualizados.\n" .
+                                                                                "O Administrador deve atualizar o diretório /etc/ldap/schema/ e re-inicializar o ldap.\n".
+                                                                                "Uma versão atualizada deste arquivo pode ser encontrada no site:\n" .
+                                                                                "www.expressolivre.org -> Downloads -> schema.tgz";
+                                else
+                                        $return['msg'] .= $result['msg'];
                         }
                         
@@ -215 +217 @@
                                 {
                                         $return['status'] = false;
-                                        $return['msg'] .= $result['msg'];
+                                        if ($result['error_number'] == '65')
+                                                $return['msg'] .= "Não foi possível salvar alguns atributos deste grupo pois os schemas do servidor LDAP estão desatualizados.\n" .
+                                                                                        "O Administrador deve atualizar o diretório /etc/ldap/schema/ e re-inicializar o ldap.\n".
+                                                                                        "Uma versão atualizada deste arquivo pode ser encontrada no site:\n" .
+                                                                                        "www.expressolivre.org -> Downloads -> schema.tgz";
+                                        else
+                                                $return['msg'] .= $result['msg'];
                                 }
                         }                       
@@ -283 +291 @@
                         {
                                 $result = $this->ldap_functions->add_user_attributes($dn, $ldap_add);
+                                
                                 if (!$result['status'])
                                 {
                                         $return['status'] = false;
-                                        $return['msg'] .= $result['msg'];
+                                        if ($result['error_number'] == '65')
+                                                $return['msg'] .= "Não foi possível adicionar alguns atributos deste gruupo pois os schemas do servidor LDAP estão desatualizados.\n" .
+                                                                                        "O Administrador deve atualizar o diretório /etc/ldap/schema/ e re-inicializar o ldap.\n".
+                                                                                        "Uma versão atualizada deste arquivo pode ser encontrada no site:\n" .
+                                                                                        "www.expressolivre.org -> Downloads -> schema.tgz";
+                                        else
+                                                $return['msg'] .= $result['msg'];
                                 }
                         }

trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php

@@ -616 +616 @@
                 if (!@ldap_add ( $this->ldap, $dn, $entry ))
                 {
-                        $result['status'] = false;
-                        $result['msg'] = "Erro na funcao ldap_functions->ldap_add_entry ($dn).\nRetorno do servidor:" . ldap_error($this->ldap);
+                        $result['status']               = false;
+                        $result['error_number'] = ldap_errno($this->ldap);
+                        $result['msg']                  = "Erro na funcao ldap_functions->ldap_add_entry ($dn).\nRetorno do servidor:" . ldap_errno($this->ldap) . ldap_error($this->ldap);
                 }
                 else
@@ -743 +744 @@
                 {
                         $result['status'] = false;
-                        $result['msg'] = "Erro na funcao ldap_functions->add_user2maillist ($mail).\nRetorno do servidor:" . ldap_error($ldapMasterConnect);
+                        if (ldap_errno($ldapMasterConnect) == '50')
+                        {
+                                $result['msg'] = "Erro na funcao ldap_functions->add_user2maillist.\n" .
+                                                                 "O usuário utilizado para gravação no LDAP, DEVE ter direito de escrita.\n".
+                                                                 "O usuário " . $_SESSION['phpgw_info']['expresso']['cc_ldap_server']['acc'] . " não tem este direito.\n".
+                                                                 "Edite \"Configuração Global do Catálogo\", no módulo Administrador, Catálogo de Endereços e adicione um usuário com direitos de escrita.";
+                        }                                        
+                        else
+                                $result['msg'] = "Erro na funcao ldap_functions->add_user2maillist.\nRetorno do servidor:" . ldap_error($ldapMasterConnect);
                 }
                 
@@ -794 +803 @@
                 {
                         $result['status'] = false;
-                        $result['msg'] = "Erro na funcao ldap_functions->remove_user2maillist ($mail).\n\nRetorno do servidor:" . ldap_error($this->ldap);
+                        if (ldap_errno($ldapMasterConnect) == '50')
+                        {
+                                $result['msg'] = "Erro na funcao ldap_functions->add_user2maillist.\n" .
+                                                                 "O usuário utilizado para gravação no LDAP, DEVE ter direito de escrita.\n".
+                                                                 "O usuário " . $_SESSION['phpgw_info']['expresso']['cc_ldap_server']['acc'] . " não tem este direito.\n".
+                                                                 "Edite \"Configuração Global do Catálogo\", no módulo Administrador, Catálogo de Endereços e adicione um usuário com direitos de escrita.";
+                        }                                        
+                        else
+                                $result['msg'] = "Erro na funcao ldap_functions->add_user2maillist.\nRetorno do servidor:" . ldap_error($ldapMasterConnect);
                 }
                 ldap_close($ldapMasterConnect);
@@ -1271 +1288 @@
                 {
                         $return['status'] = false;
+                        $return['error_number'] = ldap_errno($this->ldap);
                         $return['msg'] = 'Erro em ldap_funcitons->replace_user_attributes: ' . ldap_error($this->ldap);
                 }
@@ -1284 +1302 @@
                 {
                         $return['status'] = false;
+                        $return['error_number'] = ldap_errno($this->ldap);
                         $return['msg'] = 'Erro em ldap_funcitons->add_user_attributes: ' . ldap_error($this->ldap);
                 }
@@ -1360 +1379 @@
                         }
                 }
-                        
+                
+                //INSTITUTIONAL ACCOUNTS
+                $attrs = array();
+                $attrs['mailForwardingAddress'] = $user_info['mail'];
+                
+                $justthese = array("dn");
+                $filter="(&(phpgwAccountType=i)(mailforwardingaddress=".$user_info['mail']."))";
+                $search = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_context'], $filter, $justthese);
+            $entries = ldap_get_entries($this->ldap, $search);
+                
+                for ($i=0; $i<$entries['count']; $i++)
+                {
+                        if ( !@ldap_mod_del($this->ldap, $entries[$i]['dn'], $attrs) )
+                        {
+                                $result['status'] = false;
+                                $result['msg'] = "Erro na funcao ldap_functions->delete_user, instutional_accounts.\nRetorno do servidor:" . ldap_error($this->ldap);
+                        }
+                }
+                
                 // MAILLISTS
                 $attrs = array();
@@ -1387 +1424 @@
                                 {
                                         $return['status'] = false;
-                                        $return['msg'] .= 'Erro em ldap_funcitons->delete_user, listas de email: ' . ldap_error($this->ldap);
+                                        if (ldap_errno($ldapMasterConnect) == '50')
+                                        {
+                                                $result['msg'] = "Erro na funcao ldap_functions->add_user2maillist.\n" .
+                                                                                 "O usuário utilizado para gravação no LDAP, DEVE ter direito de escrita.\n".
+                                                                                 "O usuário " . $_SESSION['phpgw_info']['expresso']['cc_ldap_server']['acc'] . " não tem este direito.\n".
+                                                                                "Edite \"Configuração Global do Catálogo\", no módulo Administrador, Catálogo de Endereços e adicione um usuário com direitos de escrita.";
+                                        }
+                                        else
+                                                $result['msg'] = "Erro na funcao ldap_functions->add_user2maillist.\nRetorno do servidor:" . ldap_error($ldapMasterConnect);
                                 }
                         }
@@ -1601 +1646 @@
                 return $return;
         }
+        function exist_domain_name_sid($sambadomainname, $sambasid)
+        {
+                $context = $GLOBALS['phpgw_info']['server']['ldap_context'];
+
+                $justthese = array("dn","sambaDomainName");
+                $filter="(&(objectClass=sambaDomain)(sambaSID=$sambasid)(sambaDomainName=$sambadomainname))";
+                $search = ldap_search($this->ldap, $context, $filter, $justthese);
+            $count_entries = ldap_count_entries($this->ldap, $search);
+            
+            if ($count_entries > 0)
+                return true;
+            else
+                return false;
+        }
         
         function add_sambadomain($sambadomainname, $sambasid, $context)
@@ -1615 +1674 @@
                 {
                         $return['status'] = false;
-                        $return['msg'] = "Erro na funcao ldap_functions->add_sambadomain ($dn).\nRetorno do servidor: " . ldap_error($this->ldap);
+                        $return['msg'] = "Erro ao adicionar Samba Domain";
                 }
                 else
@@ -1670 +1729 @@
         }
         
-        
+        function create_institutional_accounts($params)
+        {
+                /* Begin: Access verification */
+                if (!$this->functions->check_acl($_SESSION['phpgw_info']['expresso']['user']['account_lid'], 'add_institutional_accounts'))
+                {
+                        $return['status'] = false;
+                        $return['msg'] = $this->functions->lang('You do not have right to create institutional accounts') . ".";
+                        return $return;
+                }
+                
+                $access_granted = false;
+                foreach ($this->manager_contexts as $idx=>$manager_context)
+                {
+                        if (stristr($params['context'], $manager_context))
+                        {
+                                $access_granted = true;
+                                break;
+                        }
+                }
+                if (!$access_granted)
+                {
+                        $return['status'] = false;
+                        $return['msg'] = $this->functions->lang('You do not have access to this organization') . ".";
+                        return $return;
+                }
+                /* End: Access verification */
+
+                /* Begin: Validation */
+                if ( (empty($params['cn'])) || (empty($params['mail'])) )
+                {
+                        $result['status'] = false;
+                        $result['msg']  = $this->functions->lang('Field mail or name is empty');
+                        return $result;
+                }
+
+                if (! eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+$", $params['mail']) )
+                {
+                        $result['status'] = false;
+                        $result['msg']  = $this->functions->lang('Field mail is not formed correcty') . '.';
+                        return $result;
+                }
+
+                $uid = 'institutional_account_' . $params['mail'];
+                $dn = "uid=$uid," . $params['context'];
+
+                $filter = "(mail=".$params['mail'].")";
+                $justthese = array("cn");
+                $search = @ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_context'], $filter, $justthese);
+                $entries = @ldap_get_entries($this->ldap,$search);
+                if ($entries['count'] != 0)
+                {
+                        $result['status'] = false;
+                        $result['msg'] = $this->functions->lang('Field mail already in use');
+                        return $result;
+                }
+                /* End: Validation */
+                                                
+                $info = array();
+                $info['cn']                                     = $params['cn'];
+                $info['sn']                                     = $params['cn'];
+                $info['uid']                            = $uid;
+                $info['mail']                           = $params['mail'];
+                $info['phpgwAccountType']       = 'i';
+                $info['objectClass'][]          = 'inetOrgPerson';
+                $info['objectClass'][]          = 'phpgwAccount';
+                $info['objectClass'][]          = 'top';
+                $info['objectClass'][]          = 'person';
+                $info['objectClass'][]          = 'qmailUser';
+                $info['objectClass'][]          = 'organizationalPerson';
+                
+                if ($params['accountStatus'] == 'on')
+                {
+                        $info['accountStatus'] = 'active';
+                }
+                if ($params['phpgwAccountVisible'] == 'on')
+                {
+                        $info['phpgwAccountVisible'] = '-1';
+                }
+                
+                if (!empty($params['owners']))
+                {
+                        foreach($params['owners'] as $index=>$uidnumber)
+                        {
+                                $info['mailForwardingAddress'][] = $this->uidnumber2mail($uidnumber);
+                        }
+                }               
+                
+                $result = array();
+                if (!@ldap_add ( $this->ldap, $dn, $info ))
+                {
+                        $result['status'] = false;
+                        $result['msg']  = $this->functions->lang('Error in function') . ' ldap_functions->create_institutional_accounts';
+                        $result['msg'] .= "\n" . $this->functions->lang('Server return') . ': ' . ldap_error($this->ldap);
+                }
+                else
+                        $result['status'] = true;
+                
+                return $result;
+        }
+        
+        function save_institutional_accounts($params)
+        {
+                /* Begin: Access verification */
+                if (!$this->functions->check_acl($_SESSION['phpgw_info']['expresso']['user']['account_lid'], 'edit_institutional_accounts'))
+                {
+                        $return['status'] = false;
+                        $return['msg'] = $this->functions->lang('You do not have right to edit institutional accounts') . ".";
+                        return $return;
+                }
+                $access_granted = false;
+                foreach ($this->manager_contexts as $idx=>$manager_context)
+                {
+                        if (stristr($params['context'], $manager_context))
+                        {
+                                $access_granted = true;
+                                break;
+                        }
+                }
+                if (!$access_granted)
+                {
+                        $return['status'] = false;
+                        $return['msg'] = $this->functions->lang('You do not have access to this organization') . ".";
+                        return $return;
+                }
+                /* End: Access verification */
+                
+                /* Begin: Validation */
+                if ( (empty($params['cn'])) || (empty($params['mail'])) )
+                {
+                        $result['status'] = false;
+                        $result['msg']  = $this->functions->lang('Field mail or name is empty') . '.';
+                        return $result;
+                }
+
+                if (! eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+$", $params['mail']) )
+                {
+                        $result['status'] = false;
+                        $result['msg']  = $this->functions->lang('Field mail is not formed correcty') . '.';
+                        return $result;
+                }
+
+                $uid = 'institutional_account_' . $params['mail'];
+                $dn = strtolower("uid=$uid," . $params['context']);
+                $anchor = strtolower($params['anchor']);
+
+                $filter = "(mail=".$params['mail'].")";
+                $justthese = array("cn");
+                $search = @ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_context'], $filter, $justthese);
+                $entries = @ldap_get_entries($this->ldap,$search);
+                
+                if ( ($entries['count'] > 1) || (($entries['count'] == 1) && ($entries[0]['dn'] != $anchor)) )
+                {
+                        $result['status'] = false;
+                        $result['msg'] = $this->functions->lang('Field mail already in use.');
+                        return $result;
+                }
+                /* End: Validation */
+                
+                $result = array();
+                $result['status'] = true;
+                
+                if ($anchor != $dn)
+                {
+                        if (!@ldap_rename($this->ldap, $anchor, "uid=$uid", $params['context'], true))
+                        {
+                                $result['status'] = false;
+                                $result['msg']  = $this->functions->lang('Error in function') . ' ldap_functions->save_institutional_accounts: ldap_rename';
+                                $result['msg'] .= "\n" . $this->functions->lang('Server return') . ': ' . ldap_error($this->ldap);
+                        }
+                }
+                
+                $info = array();
+                $info['cn']                                     = $params['cn'];
+                $info['sn']                                     = $params['cn'];
+                $info['uid']                            = $uid;
+                $info['mail']                           = $params['mail'];
+                
+                if ($params['accountStatus'] == 'on')
+                        $info['accountStatus'] = 'active';
+                else
+                        $info['accountStatus'] = array();
+                
+                if ($params['phpgwAccountVisible'] == 'on')
+                        $info['phpgwAccountVisible'] = '-1';
+                else
+                        $info['phpgwAccountVisible'] = array();
+                
+                if (!empty($params['owners']))
+                {
+                        foreach($params['owners'] as $index=>$uidnumber)
+                        {
+                                $mailForwardingAddress = $this->uidnumber2mail($uidnumber);
+                                if ($mailForwardingAddress != '')
+                                        $info['mailForwardingAddress'][] = $mailForwardingAddress;
+                        }
+                }
+                else
+                        $info['mailForwardingAddress'] = array();
+                
+                if (!@ldap_modify ( $this->ldap, $dn, $info ))
+                {
+                        $result['status'] = false;
+                        $result['msg']  = $this->functions->lang('Error in function') . ' ldap_functions->save_institutional_accounts: ldap_modify';
+                        $result['msg'] .= "\n" . $this->functions->lang('Server return') . ': ' . ldap_error($this->ldap);
+                }
+
+                return $result;
+        }
+        
+        function get_institutional_accounts($params)
+        {
+                if (!$this->functions->check_acl($_SESSION['phpgw_info']['expresso']['user']['account_lid'], 'list_institutional_accounts'))
+                {
+                        $return['status'] = false;
+                        $return['msg'] = $this->functions->lang('You do not have right to list institutional accounts') . ".";
+                        return $return;
+                }
+
+                $input = $params['input'];
+                $justthese = array("cn", "mail", "uid");
+                $trs = array();
+                                
+                foreach ($this->manager_contexts as $idx=>$context)
+                {
+                $institutional_accounts = ldap_search($this->ldap, $context, ("(&(phpgwAccountType=i)(|(mail=$input*)(cn=*$input*)))"), $justthese);
+                $entries = ldap_get_entries($this->ldap, $institutional_accounts);
+                
+                        for ($i=0; $i<$entries['count']; $i++)
+                        {
+                                $tr = "<tr class='normal' onMouseOver=this.className='selected' onMouseOut=this.className='normal'><td onClick=edit_institutional_account('".$entries[$i]['uid'][0]."')>" . $entries[$i]['cn'][0] . "</td><td onClick=edit_institutional_account('".$entries[$i]['uid'][0]."')>" . $entries[$i]['mail'][0] . "</td><td align='center' onClick=delete_institutional_accounts('".$entries[$i]['uid'][0]."')><img HEIGHT='16' WIDTH='16' src=./expressoAdmin1_2/templates/default/images/delete.png></td></tr>";
+                                $trs[$tr] = $entries[$i]['cn'][0];
+                        }
+                }
+        
+        $trs_string = '';
+        if (count($trs))
+        {
+                natcasesort($trs);
+                foreach ($trs as $tr=>$cn)
+                {
+                        $trs_string .= $tr;
+                }
+        }
+        
+        $return['status'] = 'true';
+        $return['trs'] = $trs_string;
+        return $return;
+        }
+        
+        function get_institutional_account_data($params)
+        {
+                if (!$this->functions->check_acl($_SESSION['phpgw_info']['expresso']['user']['account_lid'], 'edit_institutional_accounts'))
+                {
+                        $return['status'] = false;
+                        $return['msg'] = $this->functions->lang('You do not have right to list institutional accounts') . ".";
+                        return $return;
+                }
+                
+                $uid = $params['uid'];
+                $justthese = array("accountStatus", "phpgwAccountVisible", "cn", "mail", "mailForwardingAddress");
+                                
+        $institutional_accounts = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_context'], ("(&(phpgwAccountType=i)(uid=$uid))"), $justthese);
+        $entrie = ldap_get_entries($this->ldap, $institutional_accounts);
+                
+                if ($entrie['count'] != 1)
+                {
+                        $return['status'] = 'false';
+                        $return['msg'] = 'Problemas carregando dados.';
+                }
+                else
+                {
+                        $tmp_user_context = split(",", $entrie[0]['dn']);
+                        $tmp_reverse_user_context = array_reverse($tmp_user_context);
+                        array_pop($tmp_reverse_user_context);
+                        $return['user_context'] = implode(",", array_reverse($tmp_reverse_user_context));
+                        
+                        $return['status'] = 'true';
+                        $return['accountStatus']                = $entrie[0]['accountstatus'][0];
+                        $return['phpgwAccountVisible']  = $entrie[0]['phpgwaccountvisible'][0];
+                        $return['cn']                                   = $entrie[0]['cn'][0];
+                        $return['mail']                                 = $entrie[0]['mail'][0];
+
+                        if ($entrie[0]['mailforwardingaddress']['count'] > 0)
+                        {
+                                $a_cn = array();
+                                for ($i=0; $i<$entrie[0]['mailforwardingaddress']['count']; $i++)
+                                {
+                                        $tmp = $this->mailforwardingaddress2uidnumber($entrie[0]['mailforwardingaddress'][$i]);
+                                        if (!$tmp) {}
+                                        else
+                                                $a_cn[$tmp['uidnumber']] = $tmp['cn'];
+                                }
+                                natcasesort($a_cn);
+                                foreach($a_cn as $uidnumber => $cn)
+                                {
+                                        $return['owners'] .= '<option value='. $uidnumber .'>' . $cn . '</option>';
+                                }
+                        }
+                }
+                
+                return $return;
+        }
+        
+        function mailforwardingaddress2uidnumber($mail)
+        {
+                $justthese = array("uidnumber","cn");
+        $search = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_context'], ("(&(phpgwAccountType=u)(mail=$mail))"), $justthese);
+        $entrie = ldap_get_entries($this->ldap, $search);
+                if ($entrie['count'] != 1)
+                        return false;
+                else
+                {
+                        $return['uidnumber'] = $entrie[0]['uidnumber'][0];
+                        $return['cn'] = $entrie[0]['cn'][0];
+                        return $return;
+                }
+        }
+        
+        function delete_institutional_account_data($params)
+        {
+                if (!$this->functions->check_acl($_SESSION['phpgw_info']['expresso']['user']['account_lid'], 'remove_institutional_accounts'))
+                {
+                        $return['status'] = false;
+                        $return['msg'] = $this->functions->lang('You do not have right to delete institutional accounts') . ".";
+                        return $return;
+                }
+
+                $uid = $params['uid'];
+                $return['status'] = true;
+                                
+                $justthese = array("cn");
+        $search = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_context'], ("(&(phpgwAccountType=i)(uid=$uid))"), $justthese);
+        $entrie = ldap_get_entries($this->ldap, $search);
+                if ($entrie['count'] > 1)
+                {
+                        $return['status'] = false;
+                        $return['msg']  = $this->functions->lang('More then one uid was found');
+                        return $return;
+                }               
+                if ($entrie['count'] == 0)
+                {
+                        $return['status'] = false;
+                        $return['msg']  = $this->functions->lang('No uid was found');
+                        return $return;
+                }               
+                
+                $dn = $entrie[0]['dn'];
+                if (!@ldap_delete($this->ldap, $dn))
+                {
+                        $return['status'] = false;
+                        $return['msg']  = $this->functions->lang('Error in function') . " ldap_functions->delete_institutional_accounts: ldap_delete";
+                        $return['msg'] .= "\n" . $this->functions->lang('Server return') . ': ' . ldap_error($this->ldap);
+                        return $return;
+                }
+                
+                return $return;
+        }
+        
+        function replace_mail_from_institutional_account($newMail, $oldMail)
+        {
+                $filter = "(&(phpgwAccountType=i)(mailforwardingaddress=$oldMail))";
+                $justthese = array("dn");
+                $search = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_context'], $filter, $justthese);
+                $entries = ldap_get_entries($this->ldap, $search);
+                $result['status'] = true;
+                for ($i=0; $i<$entries['count']; $i++)
+                {
+                        $attrs['mailforwardingaddress'] = $oldMail;
+                        $res1 = @ldap_mod_del($this->ldap, $entries[$i]['dn'], $attrs);
+                        $attrs['mailforwardingaddress'] = $newMail;
+                        $res2 = @ldap_mod_add($this->ldap, $entries[$i]['dn'], $attrs);
+                
+                        if ((!$res1) || (!$res2))
+                        {
+                                $result['status'] = false;
+                                $return['msg']  = $this->functions->lang('Error in function') . " ldap_functions->replace_mail_from_institutional_account.";
+                        }
+                }
+                
+                return $result;
+        }
 }
 ?>

trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php

@@ -62 +62 @@
                                 $context_display .= '<br>'.$tmp_context;
                         }
-                        
                         // Verifica se o administrador tem acesso.
                         if (!$this->functions->check_acl($account_lid,'list_users'))
@@ -136 +135 @@
                                         ($this->functions->check_acl($account_lid,'edit_sambausers_attributes')) ||  
                                         ($this->functions->check_acl($account_lid,'change_users_quote')) ||
-                                        ($this->functions->check_acl($account_lid,'manipulate_corporative_information'))
+                                        ($this->functions->check_acl($account_lid,'manipulate_corporative_information')) ||
+                                        ($this->functions->check_acl($account_lid,'edit_users_phonenumber'))
                                         ) 
                                         $can_edit = True;
@@ -369 +369 @@
                                 (!$this->functions->check_acl($manager_account_lid,'edit_sambausers_attributes')) &&
                                 (!$this->functions->check_acl($manager_account_lid,'view_users')) &&
-                                (!$this->functions->check_acl($manager_account_lid,'manipulate_corporative_information'))
+                                (!$this->functions->check_acl($manager_account_lid,'manipulate_corporative_information')) &&
+                                (!$this->functions->check_acl($manager_account_lid,'edit_users_phonenumber'))
                                 )
                         {
@@ -385 +386 @@
                                 $disabled = 'disabled';
                                 $disabled_samba = '';
+                        }
+                        // SOMENTE ALTERAÇÃO DE TELEFONE
+                        if ((!$this->functions->check_acl($manager_account_lid,'edit_users')) && ($this->functions->check_acl($manager_account_lid,'edit_users_phonenumber')))
+                        {
+                                $disabled = 'disabled';
+                                $disabled_phonenumber = '';
                         }
                         // TOTAIS MENOS O SAMBA

trunk/expressoAdmin1_2/inc/class.uidomains.inc.php

@@ -178 +178 @@
                                 return;
                         }
-                        
-                        $return = $this->ldap_functions->add_sambadomain(strtoupper($_POST['sambadomainname']), $_POST['sambasid'], $_POST['context']);
-                        if (!$return['status'])
-                        {
-                                $_POST['error_messages'] = $return['msg'];
-                                ExecMethod('expressoAdmin1_2.uidomains.add');
-                                return;
+
+                        if (!$this->ldap_functions->exist_domain_name_sid($_POST['sambadomainname'], $_POST['sambasid']))
+                        {
+                                $return = $this->ldap_functions->add_sambadomain(strtoupper($_POST['sambadomainname']), $_POST['sambasid'], $_POST['context']);
+                                if (!$return['status'])
+                                {
+                                        $_POST['error_messages'] = $return['msg'];
+                                        ExecMethod('expressoAdmin1_2.uidomains.add');
+                                        return;
+                                }
                         }
                         

trunk/expressoAdmin1_2/inc/class.uimanagers.inc.php

@@ -256 +256 @@
                                 //Cria vetor da ACL
                                 $manager_acl = $this->functions->make_array_acl($manager['acl']);
-
                                 //Pesquisa no Banco e pega os valores dos apps.
                                 $query = "SELECT * FROM phpgw_expressoadmin_apps WHERE manager_lid = '" . $_GET['manager_lid'] . "' AND context = '" . $_GET['context'] . "'";
@@ -327 +326 @@
                                 {
                                         if ($first_time)
-                                                $p->set_var($atribute, $manager_acl[$atribute] != '' ? 'checked' : '');
+                                                $p->set_var($atribute, $manager_acl[$atribute] === '1' ? 'checked' : '');
                                         else
-                                                $p->set_var($atribute, $_POST[$atribute] != '' ? 'checked' : ''); 
+                                                $p->set_var($atribute, $_POST[$atribute] === '1' ? 'checked' : ''); 
                                 }
                                 // Setar os langs do tpl.

trunk/expressoAdmin1_2/inc/class.user.inc.php

@@ -132 +132 @@
                                 if (($this->current_config['expressoAdmin_samba_support'] == 'true') && ($params['use_attrs_samba'] == 'on'))
                                 {
+                                        
+                                        // Qualquer um que crie um usuário, deve ter permissão para adicionar a senha samba.
                                         // Verifica o acesso do gerente aos atributos samba
-                                        if ($this->functions->check_acl($_SESSION['phpgw_session']['session_lid'], 'edit_sambausers_attributes'))
-                                        {
+                                        //if ($this->functions->check_acl($_SESSION['phpgw_session']['session_lid'], 'edit_sambausers_attributes'))
+                                        //{
                                                 //Verifica se o binario para criar as senhas do samba exite.
                                                 if (!is_file('/home/expressolivre/mkntpwd'))
@@ -162 +164 @@
                                                         $user_info['sambaPwdMustChange']        = '2147483647';
                                                 }
-                                        }
+                                        //}
                                 }
                                 
@@ -292 +294 @@
                                 (!$this->functions->check_acl($manager_account_lid,'change_users_password')) &&
                                 (!$this->functions->check_acl($manager_account_lid,'edit_sambausers_attributes')) &&
-                                (!$this->functions->check_acl($manager_account_lid,'manipulate_corporative_information'))
+                                (!$this->functions->check_acl($manager_account_lid,'manipulate_corporative_information')) &&
+                                (!$this->functions->check_acl($manager_account_lid,'edit_users_phonenumber'))
                                 )
                         {
@@ -340 +343 @@
                                         $ldap_mod_replace['mail'] = $new_values['mail'];
                                         $this->ldap_functions->replace_user2maillists($new_values['mail'], $old_values['mail']);
+                                        $this->ldap_functions->replace_mail_from_institutional_account($new_values['mail'], $old_values['mail']);
                                         $this->db_functions->write_log("alterado mail do usuario",'',$dn,'','');
                                 }
@@ -354 +358 @@
                                 }
                                 */
-                                if (($diff['telephonenumber']) && ($old_values['telephonenumber'] != ''))
-                                {
-                                        $ldap_mod_replace['telephonenumber'] = $new_values['telephonenumber'];
-                                        $this->db_functions->write_log("alterado telephonenumber do usuario",'',$dn,'','');
-                                }
                                 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                                 // Passwd Expired - Com atributo
@@ -397 +396 @@
                                         
                                         $this->db_functions->write_log("alterado password do usuario",'',$dn,'','');
+                                }
+                        }
+
+                        if ( ($this->functions->check_acl($_SESSION['phpgw_session']['session_lid'], 'edit_users')) || 
+                             ($this->functions->check_acl($_SESSION['phpgw_session']['session_lid'], 'edit_users_phonenumber')) )
+                        {
+                                if (($diff['telephonenumber']) && ($old_values['telephonenumber'] != ''))
+                                {
+                                        $ldap_mod_replace['telephonenumber'] = $new_values['telephonenumber'];
+                                        $this->db_functions->write_log("alterado telephonenumber do usuario",'',$dn,'','');
                                 }
                         }

trunk/expressoAdmin1_2/index.php

@@ -35 +35 @@
         $var = Array(
                 'lang_user_accounts'    => lang('User Accounts'),
+                'lang_institutional_accounts'=> lang('Institutional Accounts'),
                 'lang_user_groups'              => lang('User Groups'),
                 'lang_email_lists'              => lang('Email Lists'),
@@ -47 +48 @@
         $template->pfp('out','body');
         
+        /* save lang and session */
+        /*
+        if (!empty($GLOBALS['phpgw_info']['expresso']))
+        {
+                $_SESSION['phpgw_info']['expresso'] = $GLOBALS['phpgw_info']['expresso'];
+        }*/
+        
+        if (empty($_SESSION['phpgw_info']['expressoAdmin']['lang']))
+        {
+                $_SESSION['phpgw_info']['expressoAdmin']['user']['preferences']['common']['lang'] = $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'];
+                $fn = './setup/phpgw_'.$_SESSION['phpgw_info']['expressoAdmin']['user']['preferences']['common']['lang'].'.lang';
+                if (file_exists($fn))
+                {
+                        $fp = fopen($fn,'r');
+                        while ($data = fgets($fp,16000))
+                        {
+                                list($message_id,$app_name,$null,$content) = explode("\t",substr($data,0,-1));
+                                $_SESSION['phpgw_info']['expressoAdmin']['lang'][$message_id] = $content;
+                        }
+                        fclose($fp);
+                }
+        }
+
         $GLOBALS['phpgw']->common->phpgw_footer();
 ?>

trunk/expressoAdmin1_2/js/jscode/connector.js

@@ -46 +46 @@
                         var div = document.getElementById('divProgressBar');
                 
-                        if(! div) {                                                                                             
+                        if(! div) {
+                        try{
                                 div = document.createElement("DIV");
                                 div.style.visibility    = "hidden";             
@@ -79 +80 @@
                                         document.body.appendChild(div);                                                                                                                         
                                 }
+                        }
+                        catch(e){}
                         }                                                               
         }       
@@ -340 +343 @@
                                                                 var data = _thisObject.unserialize(oxmlhttp.responseText);
                                                                 if(debug_controller) {
-                                                                        document.getElementById("debug_controller").innerHTML += oxmlhttp.responseText;
-                                                                        document.getElementById("debug_controller").innerHTML += "<br>-------------------------------------------------------------------------------------<br>";
+                                                                        try{
+                                                                                document.getElementById("debug_controller").innerHTML += oxmlhttp.responseText;
+                                                                                document.getElementById("debug_controller").innerHTML += "<br>-------------------------------------------------------------------------------------<br>";
+                                                                        }
+                                                                        catch(e){}
                                                                 }                                                                       
                                                                 handler(data);
@@ -421 +427 @@
         {
                 div = document.getElementById('divProgressBar');
-                div.style.visibility = 'hidden';
-                this.isVisibleBar = false;
+                if ( (div) && (this.isVisibleBar) )
+                {
+                        div.style.visibility = 'hidden';
+                        this.isVisibleBar = false;
+                }
         }
         
         cConnector.prototype.showProgressBar = function()
         {
-        div = document.getElementById('divProgressBar');
-                div.style.visibility = 'visible';
-                this.isVisibleBar = true;
+                div = document.getElementById('divProgressBar');
+                if(div)
+                {
+                        div.style.visibility = 'visible';
+                        this.isVisibleBar = true;
+                }
+                else
+                        this.isVisibleBar = false;
         }
 

trunk/expressoAdmin1_2/js/jscode/maillists.js

@@ -320 +320 @@
 var finderTimeout = '';
 
-// Funcoes                                                                                      
+// Funcoes
 function optionFinderTimeout(obj)
 {

trunk/expressoAdmin1_2/js/jscode/managers.js

@@ -2 +2 @@
 function copy_manager(manager)
 {
-        var new_manager = prompt("Digite o login do novo gerente:","");
-        
+        if (!(new_manager = prompt("Digite o login do novo gerente:","")))
+        {
+                return;
+        }
+
         var handler_copy_manager = function(data)
         {

trunk/expressoAdmin1_2/templates/default/accounts_form.tpl

@@ -42 +42 @@
                 <tr bgcolor={row_on}>
                         <td>{lang_search_organization}:</td>
-                        <td><input type="text" id="organization_search" autocomplete="off" size=20 onKeyUp="javascript:search_organization(this.value, 'ea_combo_org_info');" onBlur="javascript:sinc_combos_org(context.value); get_available_groups(context.value); get_available_maillists(context.value); get_available_sambadomains(context.value, '{type}')"></td>
+                        <td><input type="text" id="organization_search" {disabled} autocomplete="off" size=20 onKeyUp="javascript:search_organization(this.value, 'ea_combo_org_info');" onBlur="javascript:sinc_combos_org(context.value); get_available_groups(context.value); get_available_maillists(context.value); get_available_sambadomains(context.value, '{type}')"></td>
                 </tr>
 
@@ -86 +86 @@
                 <tr bgcolor={row_off}>
                         <td width="15%">{lang_phone}:</td>
-                        <td width="35%"><input type="text" name="telephonenumber" id="telephonenumber" value="{telephonenumber}" autocomplete="off" {disabled} size=20 onkeyUp="FormataValor(event, this);"></input>&nbsp;</td>
+                        <td width="35%"><input type="text" name="telephonenumber" id="telephonenumber" value="{telephonenumber}" autocomplete="off" {disable_phonenumber} size=20 maxlength=13 onkeyUp="FormataValor(event, this);"></input>&nbsp;</td>
                         <td>&nbsp;</td>
                         <td rowspan="4" width="35%" style="display:{display_picture}">

trunk/expressoAdmin1_2/templates/default/index.tpl

@@ -1 +1 @@
 <!-- BEGIN body -->
-<table width="90%" border="0" cellspacing="4" cellpadding="0" align="center"> 
+<table width="90%" border="0" cellspacing="10" cellpadding="0" align="center"> 
         <tr>
                 <td width="1%" align="center">
@@ -7 +7 @@
                 <td>
                         <a href="../index.php?menuaction=expressoAdmin1_2.uiaccounts.list_users">{lang_user_accounts}</a>
+                </td>
+        </tr> 
+        <tr>
+                <td width="1%" align="center">
+                        <img HEIGHT='24' WIDTH='24' src='./templates/default/images/institutional_account.png'>
+                </td>
+                <td>
+                        <a href="../index.php?menuaction=expressoAdmin1_2.institutional_accounts.index">{lang_institutional_accounts}</a>
                 </td>
         </tr> 

trunk/expressoAdmin1_2/templates/default/managers_form.tpl

@@ -55 +55 @@
                                         
                                         <!-- BEGIN ACL CONTROL -->
+                                        <!-- last acl: 2147483648 -->
                                         <table id="ea_table_acl">
                                             <tr bgcolor="{color_font2}">
@@ -101 +102 @@
                                                         <td><input type="checkbox" name="acl_manipulate_corporative_information" value="268435456" {acl_manipulate_corporative_information}></td>
                                                 </tr>
+                                                
                                                 <tr bgcolor="{color_font2}" align='right'>
                                                         <td>{lang_view_user}:</td>
                                                         <td><input type="checkbox" name="acl_view_users" value="33554432" {acl_view_users}></td>
+                                                        
+                                                        <td>{lang_add_institutional_accounts}:</td>
+                                                        <td><input type="checkbox" name="acl_add_institutional_accounts" value="4294967296" {acl_add_institutional_accounts}></td>
                                                 </tr>
                                                 <tr bgcolor="{color_font1}" align='right'>
                                                         <td>{lang_edit_users_picture}:</td>
                                                         <td><input type="checkbox" name="acl_edit_users_picture" value="536870912" {acl_edit_users_picture}></td>
-                                                </tr>
-                                                <tr bgcolor="{color_font2}" align='right'>
+                                                        
+                                                        <td>{lang_edit_institutional_accounts}:</td>
+                                                        <td><input type="checkbox" name="acl_edit_institutional_accounts" value="8589934592" {acl_edit_institutional_accounts}></td>
+                                                </tr>
+                                                <tr bgcolor="{color_font2}" align='right'>
+                                                        <td>{lang_edit_users_phonenumber}:</td>
+                                                        <td><input type="checkbox" name="acl_edit_users_phonenumber" value="2147483648" {acl_edit_users_phonenumber}></td>
+                                                        
+                                                        <td>{lang_remove_institutional_accounts}:</td>
+                                                        <td><input type="checkbox" name="acl_remove_institutional_accounts" value="17179869184" {acl_remove_institutional_accounts}></td>
+                                                </tr>
+                                                
+                                                <tr bgcolor="{color_font1}" align='right'>
                                                         <td>{lang_change_users_password}:</td>
                                                         <td><input type="checkbox" name="acl_change_users_password" value="128" {acl_change_users_password}></td>
                                                 </tr>
-                                                <tr bgcolor="{color_font1}" align='right'>
+                                                <tr bgcolor="{color_font2}" align='right'>
                                                         <td>{lang_change_users_quote}:</td>
                                                         <td><input type="checkbox" name="acl_change_users_quote" value="262144" {acl_change_users_quote}></td>
                                                 </tr>
-                                                <tr bgcolor="{color_font2}" align='right'>
+                                                <tr bgcolor="{color_font1}" align='right'>
                                                         <td>{lang_set_default_users_password}:</td>
                                                         <td><input type="checkbox" name="acl_set_user_default_password" value="524288" {acl_set_user_default_password}></td>
                                                 </tr>
-                                                <tr bgcolor="{color_font1}" align='right'>
+                                                <tr bgcolor="{color_font2}" align='right'>
                                                         <td>{lang_empty_user_inbox}:</td>
                                                         <td><input type="checkbox" name="acl_empty_user_inbox" value="134217728" {acl_empty_user_inbox}></td>