Changeset 5133 for trunk/expressoAdmin1_2/inc/class.bosectors.inc.php

Timestamp:

11/03/11 13:24:14 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus, do modulo ExpressoAdmin.

File:

• trunk/expressoAdmin1_2/inc/class.bosectors.inc.php (modified) (7 diffs)

trunk/expressoAdmin1_2/inc/class.bosectors.inc.php

@@ -48 +48 @@
                         $sector_info['objectClass'][1]  = 'organizationalUnit';
 
-                        if( isset($_POST['associated_domain']) )
-                        {
-                                if ( $_POST['associated_domain'] != "") {
-                                        $sector_info['objectClass'][2]  = 'domainRelatedObject';
-                                        $sector_info['associatedDomain'] = trim($_POST['associated_domain']);
-                                }
-                        }
-
                         $systemName = $GLOBALS['phpgw_info']['server']['system_name'];
                         if ($systemName != '')
@@ -66 +58 @@
                         }
                         
-                        
-                        /*
-                         Insere as informações sobre quota total por usuários e por gigabytes de espaço em disco 
-                         Se não vierem os dados, ele coloca 0 (Caso não exista controle de cota).
-                        */
-                        
-                        $controlled_by_quota = false;
-
-                        if( isset($_POST['disk_quota']) )
-                        {
-                                $controlled_by_quota = true;
-                                $sector_info['diskQuota'] = (trim($_POST['disk_quota']) != "") ? $_POST['disk_quota'] : "0";
-                        }
-                        
-                        if( isset($_POST['users_quota']) )
-                        {
-                                $controlled_by_quota = true;
-                                $sector_info['usersQuota'] = (trim($_POST['users_quota']) != "") ? $_POST['users_quota'] : "0";
-                        }
-                        
-                        if( isset($_POST['file_manager_quota']) )
-                        {
-                                $controlled_by_quota = true;
-                                $sector_info['fileManagerQuota'] = (trim($_POST['file_manager_quota']) != "") ? $_POST['file_manager_quota'] : "0";
-                        }
-                        
-                        if($controlled_by_quota)
-                                $sector_info['objectClass'][]   = 'phpgwQuotaControlled';
-                                
                         // Chama funcao para escrever no OpenLDAP, case de erro, volta com msg de erro.
                         if (!$this->so->write_ldap($dn, $sector_info))
@@ -103 +66 @@
                         }
                         
-                        // Escreve no log
+                        //Escreve no log
                         $this->db_functions->write_log("created sector", "$dn");
                         
@@ -113 +76 @@
         function save_sector()
                 {
-                        $sector_info = $this->so->get_info($_POST['context']);
+                $context = utf8_encode($_POST['context']);
+
+                        $sector_info = $this->so->get_info($context);
                         
-                        if (($_POST['sector_visible'] == 'on') && ($sector_info[0]['phpgwaccountvisible'][0] != '-1'))
+                        if (($_POST['sector_visible'] == 'on') && ($sector_info['phpgwaccountvisible'] != '-1'))
                         {
-                                $phpgwAccount = $controlled_by_quota = false;
                                 foreach ($sector_info[0]['objectclass'] as $objectClass)
                                 {
                                         if ($objectClass == 'phpgwAccount')
                                                 $phpgwAccount = true;
-                                        if ($objectClass == 'phpgwquotacontrolled')
-                                                $controlled_by_quota = true;
+                                        else
+                                                $phpgwAccount = false;
                                 }
                                 
@@ -134 +98 @@
                                 $this->so->add_attribute($sector_info[0]['dn'], $ldap_mod_add);
                         }
-                        elseif($sector_info[0]['phpgwaccountvisible'][0] == '-1')
+                        else
                         {
                                 $ldap_mod_del['objectClass'] = 'phpgwAccount';
@@ -141 +105 @@
                         }
                         
-                        //Modifica o conteúdo das cotas.
-                        if( (isset($_POST['disk_quota']) ) 
-                                || (isset($_POST['users_quota']) ) 
-                                || (isset($_POST['file_manager_quota']) )) { //se for passado alguma coisa, lógico
-                                
-                                $file_manager_space = $this->functions->get_actual_disk_usage($_POST["context"],'FileManager');
-                                if($_POST["file_manager_quota"]<$file_manager_space){
-                                        $_POST['error_messages'] = lang("Theres more disk space in use than the quota. It needs to be more than %1 MB",$file_manager_space);
-                                        $_GET['context'] = $_POST["context"];
-                                        ExecMethod('expressoAdmin1_2.uisectors.edit_sector');
-                                        return false;
-                                }
-                                
-                                if(!$controlled_by_quota) {
-                                        $ldap_mod_add['objectClass'][] = 'phpgwQuotaControlled';
-                                        $this->so->add_attribute($sector_info[0]['dn'], $ldap_mod_add);
-                                }
-                                
-                                $ldap_mod_replace = array();
-                                $ldap_mod_replace['diskQuota'] = $_POST['disk_quota'];
-                                $ldap_mod_replace['usersQuota'] = $_POST['users_quota'];
-                                $ldap_mod_replace['fileManagerQuota'] = $_POST['file_manager_quota'];
-                                $this->so->replace_attribute($sector_info[0]['dn'], $ldap_mod_replace);
-                        }
-                                
                         // Volta para o ListSectors
                         ExecMethod('expressoAdmin1_2.uisectors.list_sectors');
@@ -184 +123 @@
                         $manager_context = $_POST['manager_context'];
 
-                        
+                        $sector_dn = utf8_encode($sector_dn);
 
                         $sector_users = $this->so->get_sector_users($sector_dn);
+
                         for ($i=0; $i<count($sector_users)-1; $i++)
                         {