Changeset 2892 for trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php

Timestamp:

06/01/10 12:48:47 (14 years ago)

Author:

rodsouza

Message:

Ticket #1058 - Corrigindo problema na criação de usuários.

File:

• trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php (modified) (15 diffs)

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

@@ -245 +245 @@
                                 $result['status'] = false;
                                 $result['msg'] = $this->functions->lang('Connection with ldap fail') . ".";
-                                return $result;
+                                return json_encode( $result );
                         }
                 }
@@ -270 +270 @@
                         $result['status'] = false;
                         $result['msg'] = $this->functions->lang('this login can not be used because is a system account') . ".";
-                        return $result;
+                        return json_encode( $result );
                 }
                 
@@ -319 +319 @@
                                 $result['status'] = false;
                                 $result['msg'] = $this->functions->lang('this login is already used by') . ":\n" . $users;
-                                return $result;
+                                return json_encode( $result );
                         }
 
@@ -331 +331 @@
                                 $result['status'] = false;
                                 $result['msg'] = $this->functions->lang('This login is being used by a group') . ".";
-                                return $result;
+                                return json_encode( $result );
                         }
                         
@@ -378 +378 @@
                                                 $result['msg'] = $this->functions->lang('this login is already used by a user in another organization') . ".";
                                                 ldap_close($ldap_connection2);
-                                                return $result;
+                                                return json_encode( $result );
                                         }
                                 }
@@ -387 +387 @@
                 if ($type == 'rename_user')
                 {
-                        return $result;
+                        return json_encode( $result );
                 }
                 
@@ -399 +399 @@
                                 $result['status'] = false;
                                 $result['msg'] = $this->functions->lang('this email address is being used by 1 user') . ": " . $entries[0]['uid'][0];
-                                return $result;
+                                return json_encode( $result );
                         }
                 }
@@ -405 +405 @@
                         $result['status'] = false;
                         $result['msg'] = $this->functions->lang('this email address is being used by 2 or more users') . ".";
-                        return $result;
+                        return json_encode( $result );
                 }
                 
@@ -417 +417 @@
                                 $result['status'] = false;
                                 $result['msg'] = $this->functions->lang('alternative email is being used by 1 user') . ": " . $entries[0]['uid'][0];
-                                return $result;
+                                return json_encode( $result );
                         }
                 }
@@ -423 +423 @@
                         $result['status'] = false;
                         $result['msg'] = $this->functions->lang('alternative email is being used by 2 or more users') . ".";
-                        return $result;
+                        return json_encode( $result );
                 }
 
@@ -435 +435 @@
                                         $result['status'] = false;
                                         $result['msg'] = $this->functions->lang('Field CPF is invalid') . '.';
-                                        return $result;
+                                        return json_encode( $result );
                                 }
                                 else
@@ -453 +453 @@
                                                 $result['status'] = false;
                                                 $result['msg'] = $this->functions->lang('Connection with ldap fail') . ".";
-                                                return $result;
+                                                return json_encode( $result );
                                         }
                                 
@@ -476 +476 @@
                                                                         $result['question'] .= $entries_text;
                                                                         $result['question'] .= $this->functions->lang("Do you want to continue anyway") . "?";
-                                                                        return $result;
+                                                                        return json_encode( $result );
                                                                 } else {
                                                                         $result['status'] = false;
@@ -482 +482 @@
                                                                         $result['msg'] .= $this->functions->lang('Field CPF used by') . ":\n";
                                                                         $result['msg'] .= $entries_text;
-                                                                        return $result;
+                                                                        return json_encode( $result );
                                                                 }                                                               
                                                                         
@@ -494 +494 @@
                                 $result['status'] = false;
                                 $result['msg'] = $this->functions->lang('Field CPF must be completed') . '.';
-                                return $result;
+                                return json_encode( $result );
                         }
                 }
                 //End: Check CPF
 
-                return $result;
+                return json_encode( $result );
         }