Changeset 608

Timestamp:

01/14/09 16:26:13 (15 years ago)

Author:

niltonneto

Message:

• Correção de traduções;
• Retirado código que pode gerar overflow no servidor (loop infinito

com while(true);

Location:

trunk

Files:

• admin/inc/class.uiconfig.inc.php (modified) (2 diffs)
• expressoAdmin1_2/inc/class.ldap_functions.inc.php (modified) (1 diff)
• expressoAdmin1_2/setup/phpgw_pt-br.lang (modified) (previous)

trunk/admin/inc/class.uiconfig.inc.php

@@ -160 +160 @@
                                 $dir = $GLOBALS['phpgw']->common->get_app_dir($appname) . "/inc";
                                 $options = ' ';
-                                if (is_dir($dir)) {
-                                        if ($dh = opendir($dir)) {
-                                                while (($file = readdir($dh)) !== false) {
+                                if (is_dir($dir))
+                                {
+                                        if ($dh = opendir($dir))
+                                        {
+                                                while (($file = readdir($dh)) !== false)
+                                                {
                                                         $temp = explode(".",$file);
-                                                        if((substr($temp[1],0,5)=='login') && ($temp[0]=='class')) {
+                                                        if( (substr($temp[1],0,5) =='login') && ($temp[0] == 'class') )
+                                                        {
                                                                 $options .= "<option value='".$temp[1]."'";
                                                                 if($current_config['expressoAdmin_loginGenScript'] == $temp[1])
@@ -181 +185 @@
                         if($appname=="admin") {                                                 
                                 /*
-                                 * FCK editor para o termo de aceite
+                                 * FCK editor to agree term
                                  */
                                 include_once("news_admin/inc/fckeditor.php");
-                                $texto_termo_aceite = isset($GLOBALS['phpgw_info']['server']['agree_term']) ? $GLOBALS['phpgw_info']['server']['agree_term'] : '';
                                 $oFCKeditor = new FCKeditor('newsettings[agree_term]');//CreateObject('news_admin.fckeditor','newsettings[agree_term]');
                                 $oFCKeditor->BasePath = 'news_admin/templates/celepar/fckeditor/'; 
                                 $oFCKeditor->ToolbarSet = 'Basic';
-                                $oFCKeditor->Value = $texto_termo_aceite;
+                                $oFCKeditor->Value = isset($GLOBALS['phpgw_info']['server']['agree_term']) ? $GLOBALS['phpgw_info']['server']['agree_term'] : '';
                                 $t->set_var('agree_term_input',$oFCKeditor->Create());                  
                         }

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

@@ -386 +386 @@
                         $classe = new ReflectionClass($this->current_config['expressoAdmin_loginGenScript']);
                                         
-                        if(!$classe->implementsInterface('login')) {
-                                return array("status" => False, "msg" => "A classe geradora de logins não implementa a interface login (Se você for um usuário, contacte o suporte)");
-                        }
-
-                        $gerador = $classe->newInstance();
-
-                        $login = $gerador->generate_login($params["first_name"],$params["second_name"],$this->ldap);
+                        if(!$classe->implementsInterface('login'))
+                        {
+                                return array(
+                                        "status" => False,
+                                        "msg" => lang("Login interface not implemented (contact suport)")
+                                );
+                        }
+
+                        $login = $classe->newInstance()->generate_login($params["first_name"],$params["second_name"],$this->ldap);
                         
                         /*
-                                Se o algoritmo gerar um login que já existe, colocamos um número no final do 
-                                login gerado, resultando em um login não existente
-                        */
-                        while(true) {
-                                $filter = "(uid=$login)";               
-                                $search = ldap_search($this->ldap, $context, $filter, $justthese);
-                                $entries = ldap_count_entries($this->ldap,$search);
-                                if($entries==0)
+                                If login exists, it concatenates a number to the end.
+                                resulting in a new login
+                         */
+                        $i = 1;
+                        while($i < 1000) // Limit of 1000 equal names
+                        {
+                                $search = ldap_search($this->ldap, $context, "(uid=".$login.")", $justthese);
+                                if (ldap_count_entries($this->ldap,$search) == 0)
                                         break;
-                                else {
-                                        $login.=$i;
+                                else
+                                {
+                                        if ($i > 1) // If login have a number, remove the number and put the new one
+                                                $login=substr($login,0,strlen($login)-strlen($i)).$i;
+                                        else
+                                                $login.=$i;
                                         $i++;
                                 }