Fixed CRLF handling in the gui

Signed-off-by: Janos SUTO <sj@acts.hu>

webui/model/mail/mail.php

@@ -8,6 +8,9 @@ class ModelMailMail extends Model {
       require_once 'Zend/Mail/Protocol/Smtp.php';
       require_once 'Zend/Mail/Protocol/Smtp/Auth/Login.php';
 
+      // Workaround for the zend framework
+      $msg = str_replace("\r", "", $msg);
+
       $ok = 0;
 
       if($to == "" || strlen($msg) < 30){ return $ok; }

webui/model/search/message.php

@@ -224,6 +224,7 @@ class ModelSearchMessage extends Model {
 
       if($html == 0) {
          foreach($terms as $k => $v) {
+            $s = preg_replace("/THE_BREAK_HTML_TAG/", "<br />", $s);
             $s = preg_replace("/$v/i", "<span class=\"mssghglght\">$v</span>", $s);
          }