Changeset 587

Timestamp:

01/08/09 16:38:59 (15 years ago)

Author:

niltonneto

Message:

Corrigido problemas relacionados ao samba (conta de trust).
Corrigido também algumas traduções.

Location:

trunk/expressoAdmin1_2/inc

Files:

• class.bocomputers.inc.php (modified) (2 diffs)
• class.group.inc.php (modified) (4 diffs)

trunk/expressoAdmin1_2/inc/class.bocomputers.inc.php

@@ -87 +87 @@
                                         return false;
                                 }
-                                $computer_info['sambaNTPassword']       = exec('/home/expressolivre/mkntpwd -L '.$_POST['computer_password']);
-                                $computer_info['sambaLMPassword']       = exec('/home/expressolivre/mkntpwd -N '.$_POST['computer_password']);
+                                $computer_info['sambaLMPassword']       = exec('/home/expressolivre/mkntpwd -L "' . $_POST['computer_password']. '"');
+                                $computer_info['sambaNTPassword']       = exec('/home/expressolivre/mkntpwd -N "' . $_POST['computer_password']. '"');
                         }
                         
@@ -153 +153 @@
                         if ($_POST['computer_password'] != '')
                         {
-                                $computer_mod_replace['sambaNTPassword']        = exec('/home/expressolivre/mkntpwd -L '.$_POST['computer_password']);
-                                $computer_mod_replace['sambaLMPassword']        = exec('/home/expressolivre/mkntpwd -N '.$_POST['computer_password']);
+                                $computer_mod_replace['sambaNTPassword']        = exec('/home/expressolivre/mkntpwd -L "'.$_POST['computer_password'] . '"');
+                                $computer_mod_replace['sambaLMPassword']        = exec('/home/expressolivre/mkntpwd -N "'.$_POST['computer_password'] . '"');
                         }
 

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

@@ -121 +121 @@
                                         $return['msg'] .= lang("It was not possible create the group because the LDAP schemas are not update") . "\n" .
                                                                           lang("The administrator must update the directory /etc/ldap/schema/ and re-start LDAP") . "\n" .
-                                                                          lang("A update version of this files can be found here") . ":\n" .
+                                                                          lang("A updated version of these files can be found here") . ":\n" .
                                                                                 "www.expressolivre.org -> Downloads -> schema.tgz";
                                 }
@@ -226 +226 @@
                                                 $return['msg'] .= lang("It was not possible create the group because the LDAP schemas are not update") . "\n" .
                                                                                   lang("The administrator must update the directory /etc/ldap/schema/ and re-start LDAP") . "\n" .
-                                                                                  lang("A update version of this files can be found here") . ":\n" .
+                                                                                  lang("A updated version of these files can be found here") . ":\n" .
                                                                                         "www.expressolivre.org -> Downloads -> schema.tgz";
                                         }
@@ -256 +256 @@
                         if (($this->current_config['expressoAdmin_samba_support'] == 'true') && (!$old_values['sambaGroup']) && ($new_values['use_attrs_samba'] == 'on'))
                         {
-                                if (!is_file('/home/expressolivre/mkntpwd'))
+                                $ldap_add['objectClass'][]              = 'sambaGroupMapping';
+                                $ldap_add['sambagrouptype']             = '2';
+                                $ldap_add['sambasid']                   = $new_values['sambasid'] . '-' . ((2 * $new_values['gidnumber'])+1001);
+                                        
+                                $result = $this->ldap_functions->add_user_attributes($dn, $ldap_add);
+                                if (!$result['status'])
                                 {
                                         $return['status'] = false;
-                                        $return['msg'] .= lang("The file /home/expressolivre/mkntpwd does not exist") . ".\n";
-                                        $return['msg'] .= lang("It is necessery to create samba passwords") . ".\n";
-                                        $return['msg'] .= lang("Inform your system administrator about this") . ".\n";
+                                        $return['msg'] .= $result['msg'];
                                 }
                                 else
-                                {
-                                        $ldap_add['objectClass'][]              = 'sambaGroupMapping';
-                                        $ldap_add['sambagrouptype']             = '2';
-                                        $ldap_add['sambasid']                   = $new_values['sambasid'] . '-' . ((2 * $new_values['gidnumber'])+1001);
-                                        
-                                        $result = $this->ldap_functions->add_user_attributes($dn, $ldap_add);
-                                        if (!$result['status'])
-                                        {
-                                                $return['status'] = false;
-                                                $return['msg'] .= $result['msg'];
-                                        }
-                                        else
-                                                $this->db_functions->write_log('Added samba attibutes to group',$dn);
-                                }
+                                        $this->db_functions->write_log('Added samba attibutes to group',$dn);
                         }
                         
@@ -306 +296 @@
                                                 $return['msg'] .= lang("It was not possible create the group because the LDAP schemas are not update") . "\n" .
                                                                                   lang("The administrator must update the directory /etc/ldap/schema/ and re-start LDAP") . "\n" .
-                                                                                  lang("A update version of this files can be found here") . ":\n" .
+                                                                                  lang("A updated version of these files can be found here") . ":\n" .
                                                                                            "www.expressolivre.org -> Downloads -> schema.tgz";
                                         }