Index: compose.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/compose.php,v
retrieving revision 1.319.2.20
diff -r1.319.2.20 compose.php
570a571,572
>     
>     $identity = getPref($data_dir, $username, 'identity'); /* Alex */
645,646c647,648
<         if (!empty($idents) && $idents > 1) {
<             $identities[]  = '"'. getPref($data_dir, $username, 'full_name')
---
>         if (!empty($idents) && sizeof($idents) > 1) {
>             $identities[]  = '"'. getPref($data_dir, $username, 'namepreferred')
648c650,661
<             for ($i = 1; $i < $idents; $i++) {
---
>             foreach ($idents as $ident) {
>                 $enc_from_name = '"'.
> 		        ( isset($ident['full_name']) ? $ident['full_name'] : getPref($data_dir, $username, 'namepreferred') ) .
>                         '" <' .
>                     getPref($data_dir, $username, 'email_address' . $i) . '>';
> 
>                 if ($enc_from_name == $orig_from) {
>                     $identity = $ident;
>                     break;
>                 }
>                 $identities[] = $enc_from_name;
> 	        /*
657a671
> 		*/
755a770,800
> 
> 	/* vvvvvvvvvvvvvvvvvvvvvvvvv Alex / Edunet vvvvvvvvvvvvvvvvvvvvvvvvv */    
>         case ('reply_folder'):
>             $send_to = $_SESSION['folderinfo'][$mailbox]['mail'];
>             $subject =  decodeHeader($orig_header->subject);
>             $subject = str_replace('"', "'", $subject);
>             $subject = trim($subject);
>             if (substr(strtolower($subject), 0, 3) != 're:') {
>                 $subject = 'Re: ' . $subject;
>             }
>             /* this corrects some wrapping/quoting problems on replies */
>             $rewrap_body = explode("\n", $body);
> 	        $from =  (is_array($orig_header->from)) ? 
> 	                $orig_header->from[0] : $orig_header->from;
>             $body = getReplyCitation($from->getAddress(false));
>             sqUnWordWrap($body);
>             $cnt = count($rewrap_body);
>             for ($i=0;$i<$cnt;$i++) {
>               sqWordWrap($rewrap_body[$i], ($editor_size));
>                 if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) {
>                     $gt = $matches[1];
>                     $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($rewrap_body[$i])) ."\n";
>                 } else {
>                     $body .= '> ' . str_replace("\n", "\n> ", rtrim($rewrap_body[$i])) . "\n";
>                 }
>                 unset($rewrap_body[$i]);
>             }
>             $composeMessage->reply_rfc822_header = $orig_header;
>             break;
> 	/* ^^^^^^^^^^^^^^^^^^^^^^^ Alex / Edunet ^^^^^^^^^^^^^^^^^^^^^^^^^^^ */    
> 
763a809
>     
883c929,930
<        $identity = (int) $values['identity'];
---
>        /* Alex */
>        $identity = $values['identity'];
941c988
<         $fn = getPref($data_dir, $username, 'full_name');
---
>         $fn = getPref($data_dir, $username, 'namepreferred');
958,960c1005,1008
<         for ($i = 1; $i < $idents; $i ++) {
<             $fn = getPref($data_dir, $username, 'full_name' . $i);
<             $em = getPref($data_dir, $username, 'email_address' . $i);
---
> 	/* Alex */
>         foreach ($idents as $ident) {
>             $fn = (isset($ident['full_name']) ? $ident['full_name'] : getPref($data_dir, $username, 'namepreferred') );
>             $em = $ident['email_address']; // getPref($data_dir, $username, 'email_address' . $i);
962,963c1010,1011
<             echo '<option value="' . $i . '"';
<             if (isset($identity) && $identity == $i) {
---
>             echo '<option value="' . $ident['email_address'] . '"';
>             if (isset($identity) && $identity == $ident['email_address']) {
1388,1390c1436,1440
<         $from_mail = getPref($data_dir, $username,'email_address' . $identity);
<         $full_name = getPref($data_dir, $username,'full_name' . $identity);
<         $reply_to = getPref($data_dir, $username,'reply_to' . $identity);
---
>     	/* Alex - LDAP Identities */
>         $idents = getPref($data_dir, $username,'identities');
>         $from_mail = (isset($idents[$identity]['email_address']) ? $idents[$identity]['email_address'] : getPref($data_dir, $username,'email_address') );
>         $full_name = (isset($idents[$identity]['full_name']) ? $idents[$identity]['full_name'] : getPref($data_dir, $username,'full_name') );
>         $reply_to = getPref($data_dir, $username,'reply_to');
1393c1443
<         $full_name = getPref($data_dir, $username, 'full_name');
---
>         $full_name = getPref($data_dir, $username, 'namepreferred');