Changeset 77

Timestamp:

10/03/07 10:13:32 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk

Files:

• instant_messenger/inc/class.contacts_im.inc.php (modified) (1 diff)
• instant_messenger/js/im_functions.js (modified) (1 diff)
• instant_messenger/js/im_win.js (modified) (1 diff)
• instant_messenger/setup/phpgw_pt-br.lang (modified) (previous)
• preferences/changepassword.php (modified) (1 diff)

trunk/instant_messenger/inc/class.contacts_im.inc.php

@@ -70 +70 @@
                 $uid_unique = @array_values(@array_unique($ordenar));
                 
-                foreach($uid_unique as $tmp){   
+                foreach($uid_unique as $tmp)
+                {       
                         $result = explode(";",$tmp);
-                        if($result[3] == $param['ou']){
+                        if(strtolower($result[3]) == strtolower($param['ou']))
+                        {
                                 $return[$i]['cn']   = $result[0];
                                 $return[$i]['mail'] = $result[1];

trunk/instant_messenger/js/im_functions.js

@@ -89 +89 @@
                                 document.getElementById('div_contacts').innerHTML  = '<div><img src="' + img_wait.src + '" width="25px" heigth="25px" style="float:left;margin:3px "/>';
                                 document.getElementById('div_contacts').innerHTML += '<font style="color:#0000FF;float:left;margin:9px 5px">' + _this.get_lang("Wait a moment !!") + '</font></div>';
-                                _this.load_im();
+                                setTimeout('IM.load_im()',2000);
                         _this.count_Vcard = 0;
                                 _this.ImgStatus('available');

trunk/instant_messenger/js/im_win.js

@@ -79 +79 @@
                         var main_menu_head_name_lable = func.newEl('span');
                         func.confEl(main_menu_head_name_lable,'style','margin: 3px;');
-                        main_menu_head_name_lable.innerHTML = "Nickname ";
+                        main_menu_head_name_lable.innerHTML = IM.get_lang('Nickname');
 
                         var br1 = func.newEl('br');

trunk/preferences/changepassword.php

@@ -87 +87 @@
                 {
                         $errors[] = lang('Your password must contain %1 or more letters', $GLOBALS['phpgw_info']['server']['num_letters_userpass']);                    
-                }               
-                # password that start with a-Z or 0-9 and contain _.-!@#$%&*+=| will be accepted.
-                //else if (! ereg ("(^[a-zA-Z0-9_.\-\!@#$%&*+=|]*)$", $n_passwd ) )
-                //else if (! ereg ("(^[a-zA-Z0-9_.\-\!@#$%&*+=|\(\)\^\~\}\{\[\]\/\\\"\'\:\;\?]*)$", $n_passwd ) )
-                else if (! ereg ("([]^[a-zA-Z0-9\_\.\-\!\@\#\$\%\&\*\+\=\|\(\)\^\~\}\{\/\\\"\'\:\;\?]*)$", $n_passwd ) )
-                {                       
-                        $errors[] = lang('Your password contains characters not allowed');
-                }               
-                # password must contain 2 special letters, numbers or special characters
-                //else if ($GLOBALS['phpgw_info']['server']['num_special_letters_userpass'] && ! ereg ("([0-9_.\-!@#$%&*+=|]){".$GLOBALS['phpgw_info']['server']['num_special_letters_userpass'].",}", $n_passwd ) )
-                //else if ($GLOBALS['phpgw_info']['server']['num_special_letters_userpass'] && ! ereg ("([0-9_.\-!@#$%&*+=|\(\)\^\~\}\{\[\]\/\\\"\'\:\;\?]){".$GLOBALS['phpgw_info']['server']['num_special_letters_userpass']."}", $n_passwd ) )
-                else if ($GLOBALS['phpgw_info']['server']['num_special_letters_userpass'] && ! ereg ("([][0-9\_\.\-\!\@\#\$\%\&\*\+\=\|\(\)\^\~\}\{\/\\\"\'\:\;\?]){".$GLOBALS['phpgw_info']['server']['num_special_letters_userpass']."}", $n_passwd ) )
+                }
+                
+                // Special Letters
+                $speccial_letter = 0;
+                for ($i=0; $i<strlen($n_passwd); $i++) 
+                {
+                        $letter = $n_passwd[$i];
+                        if (! ereg ("[a-zA-Z]", $letter ) )
+                                $speccial_letter++;
+                }
+                if ($speccial_letter < $GLOBALS['phpgw_info']['server']['num_special_letters_userpass'])
                 {
                         $errors[] = lang('Your password must contain at least %1 numbers or characters special', $GLOBALS['phpgw_info']['server']['num_special_letters_userpass']);