Merge remote branch 'upstream/develop' into develop

include/class.thread.php

@@ -215,6 +215,19 @@ class Thread {
                 && $thread->getId()
                 )?$thread:null;
     }
+
+    function getVar($name) {
+        switch ($name) {
+        case 'original':
+            return Message::firstByTicketId($this->ticket->getId())
+                ->getBody();
+            break;
+        case 'last_message':
+        case 'lastmessage':
+            return $this->ticket->getLastMessage()->getBody();
+            break;
+        }
+    }
 }
 
 
@@ -806,10 +819,18 @@ class Message extends ThreadEntry {
     }
 
     function lastByTicketId($ticketId) {
+        return self::byTicketId($ticketId);
+    }
+
+    function firstByTicketId($ticketId) {
+        return self::byTicketId($ticketId, false);
+    }
+
+    function byTicketId($ticketId, $last=true) {
 
         $sql=' SELECT thread.id FROM '.TICKET_THREAD_TABLE.' thread '
             .' WHERE thread_type=\'M\' AND thread.ticket_id = '.db_input($ticketId)
-            .' ORDER BY thread.id DESC LIMIT 1';
+            .sprintf(' ORDER BY thread.id %s LIMIT 1', $last ? 'DESC' : 'ASC');
 
         if (($res = db_query($sql)) && ($id = db_result($res)))
             return Message::lookup($id);

include/class.ticket.php

@@ -1293,8 +1293,9 @@ class Ticket {
         //Strip quoted reply...on emailed replies
         if(!strcasecmp($origin, 'Email')
                 && $cfg->stripQuotedReply()
-                && ($tag=$cfg->getReplySeparator()) && strpos($vars['message'], $tag))
-            if(list($msg) = split($tag, $vars['message']))
+                && ($tag=$cfg->getReplySeparator())
+                && strpos($vars['message'], $tag))
+            if((list($msg) = explode($tag, $vars['message'], 2)) && trim($msg))
                 $vars['message'] = $msg;
 
         if(isset($vars['ip']))

include/client/faq-category.inc.php

@@ -11,7 +11,8 @@ $sql='SELECT faq.faq_id, question, count(attach.file_id) as attachments '
     .' FROM '.FAQ_TABLE.' faq '
     .' LEFT JOIN '.FAQ_ATTACHMENT_TABLE.' attach ON(attach.faq_id=faq.faq_id) '
     .' WHERE faq.ispublished=1 AND faq.category_id='.db_input($category->getId())
-    .' GROUP BY faq.faq_id';
+    .' GROUP BY faq.faq_id '
+    .' ORDER BY question';
 if(($res=db_query($sql)) && db_num_rows($res)) {
     echo '
          <h2>Frequently Asked Questions</h2>

include/client/knowledgebase.inc.php

@@ -78,7 +78,7 @@ if($_REQUEST['q'] || $_REQUEST['cid'] || $_REQUEST['topicId']) { //Search.
                  )";
     }
 
-    $sql.=' GROUP BY faq.faq_id';
+    $sql.=' GROUP BY faq.faq_id ORDER BY question';
     echo "<div><strong>Search Results</strong></div><div class='clear'></div>";
     if(($res=db_query($sql)) && ($num=db_num_rows($res))) {
         echo '<div id="faq">'.$num.' FAQs matched your search criteria.

include/staff/faq-categories.inc.php

@@ -76,7 +76,7 @@ if($_REQUEST['q'] || $_REQUEST['cid'] || $_REQUEST['topicId']) { //Search.
                  )";
     }
 
-    $sql.=' GROUP BY faq.faq_id';
+    $sql.=' GROUP BY faq.faq_id ORDER BY question';
 
     echo "<div><strong>Search Results</strong></div><div class='clear'></div>";
     if(($res=db_query($sql)) && db_num_rows($res)) {

include/staff/faq-category.inc.php

@@ -33,7 +33,7 @@ $sql='SELECT faq.faq_id, question, ispublished, count(attach.file_id) as attachm
     .' FROM '.FAQ_TABLE.' faq '
     .' LEFT JOIN '.FAQ_ATTACHMENT_TABLE.' attach ON(attach.faq_id=faq.faq_id) '
     .' WHERE faq.category_id='.db_input($category->getId())
-    .' GROUP BY faq.faq_id';
+    .' GROUP BY faq.faq_id ORDER BY question';
 if(($res=db_query($sql)) && db_num_rows($res)) {
     echo '<div id="faq">
             <ol>';