Changeset 458

Timestamp:

09/22/08 16:45:08 (16 years ago)

Author:

niltonneto

Message:

Alterações feitas por Joao Alfredo.
Melhorias e correções no ExpressoAdmin.
Email: jakjr@…

Location:

trunk/expressoAdmin1_2

Files:

• inc/class.ldap_functions.inc.php (modified) (2 diffs)
• inc/class.uimanagers.inc.php (modified) (1 diff)
• inc/class.user.inc.php (modified) (4 diffs)
• setup/phpgw_pt-br.lang (modified) (previous)

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

@@ -820 +820 @@
         {
                 $attrs['mailSenderAddress'] = $array_emails;
-                
-                print_r($attrs);
                 
                 $res = @ldap_mod_add($this->ldap, $dn, $attrs);
@@ -1356 +1354 @@
                         $return['status'] = true;
                 
-                print_r($return);
                 return $return;
         }

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

@@ -36 +36 @@
                         }
                         $GLOBALS['phpgw']->js->validate_file('jscode','connector','expressoAdmin1_2');#diretorio, arquivo.js, aplicacao
+                        $GLOBALS['phpgw']->js->validate_file('jscode','expressoadmin','expressoAdmin1_2');
                         $GLOBALS['phpgw']->js->validate_file('jscode','managers','expressoAdmin1_2');
                 }

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

@@ -905 +905 @@
                 function set_user_default_password($params)
                 {
-                        $return['status'] = true;
+                        $return['status'] = 1;
                         $uid = $params['uid'];
                         $defaultUserPassword = '{md5}'.base64_encode(pack("H*",md5($this->current_config['expressoAdmin_defaultUserPassword'])));
@@ -913 +913 @@
                                 $userPassword = $this->ldap_functions->set_user_password($uid, $defaultUserPassword);
                                 $this->db_functions->set_user_password($uid, $userPassword);
+                                $this->db_functions->write_log("inserted default password",$uid);
                         }
                         else
                         {
-                                $return['status'] = false;
-                                $return['msg'] = lang('default password already registered') . '!';
-                        }
-                        
-                        $this->db_functions->write_log("inserted default password",$uid);
+                                $return['status'] = 0;
+                                $return['msg'] = $this->functions->lang('default password already registered') . '!';
+                        }
                         
                         return $return;
@@ -927 +926 @@
                 function return_user_password($params)
                 {
-                        $return['status'] = true;
+                        $return['status'] = 1;
                         $uid = $params['uid'];
                         
@@ -937 +936 @@
                         else
                         {
-                                $return['status'] = false;
-                                $return['msg'] = lang('default password not registered') . '!';
+                                $return['status'] = 0;
+                                $return['msg'] = $this->functions->lang('default password not registered') . '!';
                         }