Make use of get_identities function

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5240 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/compose.php b/src/compose.php
index e1b2d57007b8d211412ce2adbf48e36c2c831a0d..e1c67a644f10388bdff4b76f50db8d87ac5d2ea2 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -30,6 +30,7 @@ require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 require_once(SM_PATH . 'class/deliver/Deliver.class.php');
 require_once(SM_PATH . 'functions/addressbook.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 require_once(SM_PATH . 'class/deliver/Deliver.class.php');
 require_once(SM_PATH . 'functions/addressbook.php');

+require_once(SM_PATH . 'functions/identity.php');

 
 /* --------------------- Get globals ------------------------------------- */
 /** COOKIE VARS */
 
 /* --------------------- Get globals ------------------------------------- */
 /** COOKIE VARS */


@@ -48,7 +49,9 @@ sqgetGlobalVar('compose_messages',  $compose_messages,  SQ_SESSION);
 sqgetGlobalVar('action',$action);
 sqgetGlobalVar('session',$session);
 sqgetGlobalVar('mailbox',$mailbox);
 sqgetGlobalVar('action',$action);
 sqgetGlobalVar('session',$session);
 sqgetGlobalVar('mailbox',$mailbox);

-sqgetGlobalVar('identity',$identity);
+if(!sqgetGlobalVar('identity',$identity)) {
+    $identity=0;
+}

 sqgetGlobalVar('send_to',$send_to);
 sqgetGlobalVar('send_to_cc',$send_to_cc);
 sqgetGlobalVar('send_to_bcc',$send_to_bcc);
 sqgetGlobalVar('send_to',$send_to);
 sqgetGlobalVar('send_to_cc',$send_to_cc);
 sqgetGlobalVar('send_to_bcc',$send_to_bcc);


@@ -89,11 +92,13 @@ sqgetGlobalVar('attachedmessages', $attachedmessages, SQ_GET);
 
 /* Location (For HTTP 1.1 Header("Location: ...") redirects) */
 $location = get_location();
 
 /* Location (For HTTP 1.1 Header("Location: ...") redirects) */
 $location = get_location();

+/* Identities (fetch only once) */
+$idents = get_identities();

 
 /* --------------------- Specific Functions ------------------------------ */
 
 function replyAllString($header) {
 
 /* --------------------- Specific Functions ------------------------------ */
 
 function replyAllString($header) {

-   global $include_self_reply_all, $username, $data_dir;
+   global $include_self_reply_all, $idents;

    $excl_ar = array();
    /**
     * 1) Remove the addresses we'll be sending the message 'to'
    $excl_ar = array();
    /**
     * 1) Remove the addresses we'll be sending the message 'to'


@@ -107,18 +112,9 @@ function replyAllString($header) {
     * TO list) only if $include_self_reply_all is turned off
     */
    if (!$include_self_reply_all) {
     * TO list) only if $include_self_reply_all is turned off
     */
    if (!$include_self_reply_all) {

-       $email_address = strtolower(trim(getPref($data_dir, $username, 'email_address')));
-       $excl_ar[$email_address] = '';
-       $idents = getPref($data_dir, $username, 'identities');
-       if ($idents != '' && $idents > 1) {
-              $first_id = false;
-          for ($i = 1; $i < $idents; $i ++) {
-             $cur_email_address = getPref($data_dir, $username, 
-                                         'email_address' . $i);
-             $cur_email_address = strtolower(trim($cur_email_address));
-             $excl_ar[$cur_email_address] = '';
-         }
-       }
+       foreach($idents as $id) {
+           $excl_ar[strtolower(trim($id['email_address']))] = '';
+        }

    }
 
    /** 
    }
 
    /** 


@@ -463,15 +459,8 @@ if ($send) {
     showInputForm($session);
 }
 elseif (isset($sigappend)) {
     showInputForm($session);
 }
 elseif (isset($sigappend)) {

-    $idents = getPref($data_dir, $username, 'identities', 0);
-    if ($idents > 1) {
-       if ($identity == 'default') {
-          $no = 'g';
-       } else {
-          $no = $identity;
-       }
-       $signature = getSig($data_dir, $username, $no);
-    }
+    $signature = $idents[$identity]['signature'];
+

     $body .= "\n\n".($prefix_sig==true? "-- \n":'').$signature;
     if ($compose_new_win == '1') {
          compose_Header($color, $mailbox);
     $body .= "\n\n".($prefix_sig==true? "-- \n":'').$signature;
     if ($compose_new_win == '1') {
          compose_Header($color, $mailbox);


@@ -555,7 +544,7 @@ exit();
 
 /* This function is used when not sending or adding attachments */
 function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $session='') {
 
 /* This function is used when not sending or adding attachments */
 function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $session='') {

-    global $editor_size, $default_use_priority, $body,
+    global $editor_size, $default_use_priority, $body, $idents,

            $use_signature, $composesession, $data_dir, $username,
            $username, $key, $imapServerAddress, $imapPort, $compose_messages,
            $composeMessage;
            $use_signature, $composesession, $data_dir, $username,
            $username, $key, $imapServerAddress, $imapPort, $compose_messages,
            $composeMessage;


@@ -629,28 +618,24 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
         //ClearAttachments($session);
 
         $identity = '';
         //ClearAttachments($session);
 
         $identity = '';

-        $idents = getPref($data_dir, $username, 'identities');

         $from_o = $orig_header->from;
         if (is_object($from_o)) {
             $orig_from = $from_o->getAddress();
         } else {
             $orig_from = '';
         }
         $from_o = $orig_header->from;
         if (is_object($from_o)) {
             $orig_from = $from_o->getAddress();
         } else {
             $orig_from = '';
         }

+

         $identities = array();
         $identities = array();

-        if (!empty($idents) && $idents > 1) {
-            $identities[]  = '"'. getPref($data_dir, $username, 'full_name') 
-              . '" <' .  getPref($data_dir, $username, 'email_address') . '>';
-            for ($i = 1; $i < $idents; $i++) {
-                $enc_from_name = '"'. 
-                    getPref($data_dir, $username, 'full_name' . $i) .
-                        '" <' . 
-                    getPref($data_dir, $username, 'email_address' . $i) . '>';
-                if ($enc_from_name == $orig_from && $i) {
-                    $identity = $i;
+        if (count($idents) > 1) {
+            foreach($idents as $nr=>$data) {
+                $enc_from_name = '"'.$data['full_name'].'" <'. $data['email_address'].'>';
+                if($enc_from_name == $orig_from) {
+                    $identity = $nr;

                     break;
                 }
                 $identities[] = $enc_from_name;
             }
                     break;
                 }
                 $identities[] = $enc_from_name;
             }

+

             $identity_match = $orig_header->findAddress($identities);
             if ($identity_match) {
                 $identity = $identity_match;
             $identity_match = $orig_header->findAddress($identities);
             if ($identity_match) {
                 $identity = $identity_match;


@@ -859,7 +844,7 @@ function showInputForm ($session, $values=false) {
            $editor_size, $attachments, $subject, $newmail,
            $use_javascript_addr_book, $send_to_bcc, $passed_id, $mailbox,
            $from_htmladdr_search, $location_of_buttons, $attachment_dir,
            $editor_size, $attachments, $subject, $newmail,
            $use_javascript_addr_book, $send_to_bcc, $passed_id, $mailbox,
            $from_htmladdr_search, $location_of_buttons, $attachment_dir,

-           $username, $data_dir, $identity, $draft_id, $delete_draft,
+           $username, $data_dir, $identity, $idents, $draft_id, $delete_draft,

            $mailprio, $default_use_mdn, $mdn_user_support, $compose_new_win,
            $saved_draft, $mail_sent, $sig_first, $edit_as_new, $action, 
            $username, $compose_messages, $composesession, $default_charset;
            $mailprio, $default_use_mdn, $mdn_user_support, $compose_new_win,
            $saved_draft, $mail_sent, $sig_first, $edit_as_new, $action, 
            $username, $compose_messages, $composesession, $default_charset;


@@ -927,43 +912,21 @@ function showInputForm ($session, $values=false) {
     }
 
     /* display select list for identities */
     }
 
     /* display select list for identities */

-    $idents = getPref($data_dir, $username, 'identities', 0);
-    if ($idents > 1) {
-        $fn = getPref($data_dir, $username, 'full_name');
-        $em = getPref($data_dir, $username, 'email_address');
+    if (count($idents) > 1) {

         echo '   <tr>' . "\n" .
                     html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
                     _("From:") . '</td>' . "\n" .
                     html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .
         echo '   <tr>' . "\n" .
                     html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) .
                     _("From:") . '</td>' . "\n" .
                     html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) .

-             '         <select name="identity">' . "\n" .
-             '         <option value="default">' .
-                       htmlspecialchars($fn);
-        if ($em != '') {
-            if($fn != '') {
-                echo htmlspecialchars(' <' . $em . '>') . "\n";
-            } else {
-                echo htmlspecialchars($em) . "\n";
-            }
-        }
-        echo '</option>';
-        for ($i = 1; $i < $idents; $i ++) {
-            $fn = getPref($data_dir, $username, 'full_name' . $i);
-            $em = getPref($data_dir, $username, 'email_address' . $i);
-
-            echo '<option value="' . $i . '"';
-            if (isset($identity) && $identity == $i) {
+             '         <select name="identity">' . "\n" ;
+        foreach($idents as $id=>$data) {
+            echo '<option value="'.$id.'"';
+            if($id == $identity) {

                 echo ' selected';
             }
                 echo ' selected';
             }

-            echo '>' . htmlspecialchars($fn);
-            if ($em != '') {
-                if($fn != '') {
-                    echo htmlspecialchars(' <' . $em . '>') . "\n";
-                } else {
-                    echo htmlspecialchars($em) . "\n";
-                }
-            }
-            echo '</option>';
+            echo '>'.htmlspecialchars($data['full_name'].' <'.$data['email_address'].'>').
+                 "</option>\n";

         }
         }

+

         echo '</select>' . "\n" .
              '      </td>' . "\n" .
              '   </tr>' . "\n";
         echo '</select>' . "\n" .
              '      </td>' . "\n" .
              '   </tr>' . "\n";


@@ -1020,14 +983,7 @@ function showInputForm ($session, $values=false) {
     }
 
     if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
     }
 
     if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {

-        if ($idents > 1) {
-            if ($identity == 'default') {
-                $no = 'g';
-        } else {
-            $no = $identity;
-        }
-        $signature = getSig($data_dir, $username, $no);
-    }
+        $signature = $idents[$identity]['signature'];

 
         if ($sig_first == '1') {
             if ($default_charset == 'iso-2022-jp') {
 
         if ($sig_first == '1') {
             if ($default_charset == 'iso-2022-jp') {


@@ -1333,7 +1289,7 @@ function getByteSize($ini_size) {
 
 function deliverMessage($composeMessage, $draft=false) {
     global $send_to, $send_to_cc, $send_to_bcc, $mailprio, $subject, $body,
 
 function deliverMessage($composeMessage, $draft=false) {
     global $send_to, $send_to_cc, $send_to_bcc, $mailprio, $subject, $body,

-           $username, $popuser, $usernamedata, $identity, $data_dir,
+           $username, $popuser, $usernamedata, $identity, $idents, $data_dir,

            $request_mdn, $request_dr, $default_charset, $color, $useSendmail,
            $domain, $action, $default_move_to_sent, $move_to_sent;
     global $imapServerAddress, $imapPort, $sent_folder, $key;
            $request_mdn, $request_dr, $default_charset, $color, $useSendmail,
            $domain, $action, $default_move_to_sent, $move_to_sent;
     global $imapServerAddress, $imapPort, $sent_folder, $key;


@@ -1374,15 +1330,9 @@ function deliverMessage($composeMessage, $draft=false) {
        $popuser = $username;
     }
     $reply_to = '';
        $popuser = $username;
     }
     $reply_to = '';

-    if (isset($identity) && $identity != 'default') {
-        $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);
-    } else {
-        $from_mail = getPref($data_dir, $username, 'email_address');
-        $full_name = getPref($data_dir, $username, 'full_name');
-        $reply_to = getPref($data_dir, $username,'reply_to');
-    }
+    $from_mail = $idents[$identity]['email_address'];
+    $full_name = $idents[$identity]['full_name'];
+    $reply_to  = $idents[$identity]['reply_to'];

     if (!$from_mail) {
        $from_mail = "$popuser@$domain";
     }
     if (!$from_mail) {
        $from_mail = "$popuser@$domain";
     }