Changeset 6697

Timestamp:

07/02/12 16:55:44 (11 years ago)

Author:

cristiano

Message:

Ticket #2665 - Erro ao criar setor no Expresso Admin - erros de coficação

Location:

trunk/expressoAdmin1_2/inc

Files:

• class.bosectors.inc.php (modified) (2 diffs)
• class.functions.inc.php (modified) (1 diff)
• class.uisectors.inc.php (modified) (5 diffs)

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

@@ -60 +60 @@
                         if ($_POST['sector_visible'])
                         {
-                                $sector_info['objectClass'][2]  = 'phpgwAccount';
+                                $sector_info['objectClass'][]   = 'phpgwAccount';
                                 $sector_info['phpgwaccountvisible'] = '-1';
                         }
@@ -150 +150 @@
                         $manager_context = $_POST['manager_context'];
 
-                        $sector_dn = utf8_encode($sector_dn);
+                        $sector_dn = $sector_dn;
 
                         $sector_users = $this->so->get_sector_users($sector_dn);

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

@@ -538 +538 @@
  
                 reset ( $array_dn ); 
-                $display .= ' ' . (current ( $array_dn ) ); 
+                $display .= ' ' . urldecode( str_replace('\\', '%', current ( $array_dn ))); 
                                  
                                 $info_retorno['display'] = $display; 

trunk/expressoAdmin1_2/inc/class.uisectors.inc.php

@@ -105 +105 @@
                                         );      
                                         
-                                        $var['sector_name'] = utf8_decode($var['sector_name']);
+                                        $var['sector_name'] =  utf8_decode($var['sector_name']);
 
                                                                         
@@ -233 +233 @@
 
                         $combo_manager_org = substr( $combo_manager_org, 0, ( strpos($combo_manager_org, '</option>') + 9 ) );
-
-                        $a_tmp = explode(",", ldap_dn2ufn($context));
-                        $sector_name = $a_tmp[0];
+                        $combo_manager_org =utf8_decode($combo_manager_org);
+                        $a_tmp = explode(",", $context); 
+                        $sector_name = utf8_decode( str_replace('ou=' , '' ,$a_tmp[0]));
                         
                         // Verifica se tem acesso a este modulo
@@ -255 +255 @@
                         if (!$_POST)
                         {
-                                $sector_info = $this->so->get_info($context);
+                                $sector_info = $this->so->get_info($_GET['context']);
                                 $sector_disk_quota = $sector_info[0]['diskquota'][0]; 
                                 $sector_users_quota = $sector_info[0]['usersquota'][0]; 
@@ -299 +299 @@
                 function view_cota() 
                 { 
-                        $context = $_GET['context']; 
-                        $a_tmp = explode(",", ldap_dn2ufn($context)); 
+                        $context = utf8_decode($_GET['context']); 
+                        $a_tmp = explode(",", $context); 
  
-                        $sector_name = $a_tmp[0]; 
+                        $sector_name = str_replace('ou=' , '' ,$a_tmp[0]); 
                         if($this->functions->db_functions->use_cota_control()) { 
-                                $sector_info = $this->so->get_info($context); 
+                                $sector_info = $this->so->get_info($_GET['context']); 
                                 $sector_disk_cota = $sector_info[0]['diskquota'][0]; 
                                 $sector_users_cota = $sector_info[0]['usersquota'][0]; 
@@ -442 +442 @@
                                 'sectors_list'                          => $subsectors_list 
                         );
-                        $var['sector_name'] = preg_replace("/\\\([0-9A-Fa-f]{2})/e", "''.chr(hexdec('\\1')).''",$var['sector_name']);
+                        $var['sector_name'] =utf8_decode( preg_replace("/\\\([0-9A-Fa-f]{2})/e", "''.chr(hexdec('\\1')).''",$var['sector_name']));
 
                         $p->set_var($var);