Give threading URI to template, let template do the HTML layout

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

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 625d48a7895353379b37b6513824ff08274b53d2..c9860e352e4c33d139059da5ba070b3a4e925351 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -987,11 +987,11 @@ function showMessagesForMailbox($imapConnection, &$aMailbox,$aProps, &$iError) {
             $thread_name = _("Thread View");
             $newsort = $aMailbox['SORT'] + SQSORT_THREAD;
         }
-        $thread_link_str = '<small>[<a href="' . $baseurl . '&amp;srt='
-            . $newsort . '&amp;startMessage=1">' . $thread_name
-            . '</a>]</small>';
+        $thread_link_uri = $baseurl . '&amp;srt=' . $newsort 
+                         . '&amp;startMessage=1';
     } else {
-        $thread_link_str ='';
+        $thread_link_uri ='';
+        $thread_name = '';
     }
     $sort = $aMailbox['SORT'];
 
@@ -1151,7 +1151,8 @@ function showMessagesForMailbox($imapConnection, &$aMailbox,$aProps, &$iError) {
     $aTemplate['trash_folder'] = $trash_folder;
     $aTemplate['sent_folder'] = $sent_folder;
     $aTemplate['draft_folder'] = $draft_folder;
-    $aTemplate['thread_link_str'] = $thread_link_str;
+    $aTemplate['thread_link_uri'] = $thread_link_uri;
+    $aTemplate['thread_name'] = $thread_name;
     $aTemplate['php_self'] = str_replace('&','&amp;',$php_self);
     $aTemplate['mailbox'] = $sMailbox;
 //FIXME: javascript_on is always assigned to the template object in places like init.php; is there some reason to reassign it here?  is there some chance that it was changed?  if not, please remove this line!

diff --git a/templates/default/message_list.tpl b/templates/default/message_list.tpl
index 81c221e793b5e5b7bbfaf6cf0250303539bdaad8..afe49e4f53c6a819e57c810bd72ef4154d1e70d8 100644 (file)
--- a/templates/default/message_list.tpl
+++ b/templates/default/message_list.tpl
@@ -49,7 +49,8 @@
  *    $trash_folder
  *    $sent_folder
  *    $draft_folder
- *    $thread_link_str
+ *    $thread_link_uri
+ *    $thread_name
  *    $php_self
  *    $mailbox
  *    $enablesort
@@ -131,7 +132,8 @@ $clickedColor = (empty($color[16])) ? $color[2] : $color[16];
                        * $this is the Template class object.
                        */
                       $paginator_str = $this->fetch('paginator.tpl');
-                      echo $paginator_str . $thread_link_str ."\n"; ?>
+                      echo $paginator_str . '<small>[<a href="' . $thread_link_uri
+                                          . '">' . $thread_name . '</a>]</small>'; ?>
 <!-- end paginator and thread link string -->
               </td>
 <!-- message count string -->

diff --git a/templates/default/message_list_controls.tpl b/templates/default/message_list_controls.tpl
index bd650ed2c130e34183859c1a02fdd095081eef4e..5ca52d9f5212a75823e965fbd98c61e2e1c79558 100644 (file)
--- a/templates/default/message_list_controls.tpl
+++ b/templates/default/message_list_controls.tpl
@@ -49,7 +49,8 @@
  *    $trash_folder
  *    $sent_folder
  *    $draft_folder
- *    $thread_link_str
+ *    $thread_link_uri
+ *    $thread_name
  *    $php_self
  *    $mailbox
  *    $enablesort