[Hastymail-cvs] hastymail/lib constant.php,1.64,1.65 session_2.php,1.53,1.54

[<sai...@us...>]

Update of /cvsroot/hastymail/hastymail/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22956/lib

Modified Files:
	constant.php session_2.php 
Log Message:
testing some ldap changes


Index: constant.php
===================================================================
RCS file: /cvsroot/hastymail/hastymail/lib/constant.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- constant.php	19 Feb 2006 17:13:25 -0000	1.64
+++ constant.php	17 Apr 2006 17:15:46 -0000	1.65
@@ -118,7 +118,7 @@
 
 /* available dictionaries for spellchecking */
 $dicts = array(
-    'en_US' => 'English',
+    'en' => 'English',
     'fr_FR' => 'French',
     );
 

Index: session_2.php
===================================================================
RCS file: /cvsroot/hastymail/hastymail/lib/session_2.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- session_2.php	24 Mar 2006 17:59:45 -0000	1.53
+++ session_2.php	17 Apr 2006 17:15:46 -0000	1.54
@@ -73,10 +73,14 @@
             array_shift($info);
             $i = 0;
             foreach ($info as $array) {
-                if (isset($array['mail'][0]) && strstr($array['mail'][0], '@')) {
-                    $contacts[$i] = array( $i, trim($array['mail'][0]), 
-                                    utf8_encode(trim($array['cn'][0], '')));
-                    $i++;
+                if (isset($array['mail']) && !empty($array['mail'])) {
+                    foreach ($array['mail'] as $index => $val) {
+                        if (is_numeric($index) && strstr($val, '@')) {
+                            $contacts[$i] = array( $i, trim($val), 
+                            utf8_encode(trim($array['cn'][0], '')));
+                            $i++;
+                        }
+                    }
                 }
             }
         }