projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: db673aa)
Added basic support for message highlighting. Note that this needs quite
authorlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Sun, 18 Jun 2000 05:25:12 +0000 (05:25 +0000)
committerlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Sun, 18 Jun 2000 05:25:12 +0000 (05:25 +0000)
a bit of work yet, because there is no error correction in the data entry
under the options menu.  But it works.  :)

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

ChangeLog patch | blob | blame | history
doc/sqimap.php3 patch | blob | blame | history
functions/mailbox_display.php patch | blob | blame | history
src/load_prefs.php patch | blob | blame | history
src/msg_highlight.php [new file with mode: 0644] patch | blob
src/options.php patch | blob | blame | history

diff --git a/ChangeLog b/ChangeLog
index 292ec2d80dee012ff5faef2c9c8acb429a5469a6..8a19bc9cc91198a8f0e9268e597604cc2d72c185 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Version 0.5pre1 -- DEVELOPMENT
 ------------------------------
+- Added support for message highlighting
 - Moved Address and Send buttons on Compose form for easier access 
 - Added Polish translation from Lukasz Klimek <casa@LO.Pila.PL>
 
diff --git a/doc/sqimap.php3 b/doc/sqimap.php3
index 59afe6efc14a9fb25225875003eade2411e6195f..bb0e2918050b9ea70c7201982ec592fc29f8649c 100644 (file)
--- a/doc/sqimap.php3
+++ b/doc/sqimap.php3
@@ -1,3 +1,4 @@
+<html><body>
 <a name="top"></a>
 <h1>SquirrelMail IMAP functions</h1>
 <?
@@ -47,3 +48,4 @@
                <?
        }
 ?>
+</body></html>
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index e52c4f9b35c6cfed666c5c0a80fa69c33befc6d4..afdbdb5c2201678ec430761fa22617b0709f20c9 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -13,6 +13,7 @@
    function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage) {
       global $color, $msgs, $msort;
                global $sent_folder;
+      global $message_highlight_list;
 
                $msg = $msgs[$key];
 
@@ -25,12 +26,21 @@
       if ($msg["FLAG_SEEN"] == false) { $bold = "<b>"; $bold_end = "</b>"; }
                if ($mailbox == $sent_folder) { $italic = "<i>"; $italic_end = "</i>"; }
       
-      echo "   <td width=1% align=center><input type=checkbox name=\"msg[$t]\" value=".$msg["ID"]."></TD>\n";
-      echo "   <td width=30%>$italic$bold$flag$senderName$flag_end$bold_end$italic_end</td>\n";
-      echo "   <td nowrap width=1%><center>$bold$flag".$msg["DATE_STRING"]."$flag_end$bold_end</center></td>\n";
-               if ($msg["FLAG_ANSWERED"] == true) echo "   <td width=1%><b><small>A</small></b></td>";
-               else    echo "   <td width=1%>&nbsp;</td>";
-      echo "   <td width=%>$bold<a href=\"read_body.php?mailbox=$urlMailbox&passed_id=".$msg["ID"]."&startMessage=$startMessage&show_more=0\">$flag$subject$flag_end</a>$bold_end</td>\n";
+      for ($i=0; $i < count($message_highlight_list); $i++) {
+         if (eregi($message_highlight_list[$i]["value"],$msg["FROM"])) {
+            $hlt_color = $message_highlight_list[$i]["color"];
+            continue;
+         }   
+      }   
+      if (!$hlt_color)
+         $hlt_color = $color[4];
+      
+      echo "   <td width=1% bgcolor=$hlt_color align=center><input type=checkbox name=\"msg[$t]\" value=".$msg["ID"]."></TD>\n";
+      echo "   <td width=30% bgcolor=$hlt_color>$italic$bold$flag$senderName$flag_end$bold_end$italic_end</td>\n";
+      echo "   <td nowrap width=1% bgcolor=$hlt_color><center>$bold$flag".$msg["DATE_STRING"]."$flag_end$bold_end</center></td>\n";
+               if ($msg["FLAG_ANSWERED"] == true) echo "   <td bgcolor=$hlt_color width=1%><b><small>A</small></b></td>";
+               else    echo "   <td bgcolor=$hlt_color width=1%>&nbsp;</td>";
+      echo "   <td bgcolor=$hlt_color width=%>$bold<a href=\"read_body.php?mailbox=$urlMailbox&passed_id=".$msg["ID"]."&startMessage=$startMessage&show_more=0\">$flag$subject$flag_end</a>$bold_end</td>\n";
 
       echo "</tr>\n";
    }
@@ -41,6 +51,7 @@
    function showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color,$show_num, $use_cache) {
       global $msgs, $msort;
                global $sent_folder;
+      global $message_highlight_list;
 
       if (!$use_cache) {
          if ($numMessages >= 1) {
diff --git a/src/load_prefs.php b/src/load_prefs.php
index c562f1ba39b7dd2f62ac393c504ca73c4287f1f9..2a24938cca1926aa9bfb58d34a3bbafc0e79e251 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -101,4 +101,11 @@
          $user_language = en;
    }      
 
+   //  highlightX comes in with the form: name,color,header,value
+   for ($i=0; $hlt = getPref($data_dir, $username, "highlight$i"); $i++) {
+      $ary = explode(",", $hlt);
+      $message_highlight_list[$i]["name"] = $ary[0]; 
+      $message_highlight_list[$i]["color"] = $ary[1];
+      $message_highlight_list[$i]["value"] = $ary[2];
+   }
 ?>
diff --git a/src/msg_highlight.php b/src/msg_highlight.php
new file mode 100644 (file)
index 0000000..bbcff87
--- /dev/null
+++ b/src/msg_highlight.php
@@ -0,0 +1,61 @@
+<?php
+   session_start();
+
+   if (!isset($config_php))
+      include("../config/config.php");
+   if (!isset($strings_php))
+      include("../functions/strings.php");
+   if (!isset($page_header_php))
+      include("../functions/page_header.php");
+   if (!isset($i18n_php))
+      include("../functions/i18n.php");
+   include("../src/load_prefs.php");
+
+   displayPageHeader($color, "None");
+
+   // MESSAGE HIGHLIGHTING
+   echo "<br>\n";
+   echo "<center><b>" . _("Message Highlighting") . "</b></center><br>\n";
+
+
+   if ($action == "save") {
+      if (!$id) $id = 0;
+      setPref($data_dir, $username, "highlight$id", $name.",".$newcolor.",".$value);
+      echo "<a href=\"options.php\">saved</a>";
+   } else {
+      if (!isset($id)) $id = count($message_highlight_list);
+      
+      echo "<form action=\"msg_highlight.php\">\n";
+      echo "<input type=\"hidden\" value=\"save\" name=\"action\">\n";
+      echo "<input type=\"hidden\" value=\"$id\" name=\"id\">\n";
+      echo "<table width=75% cellpadding=2 cellspacing=0 border=0>\n";
+      echo "   <tr>\n";
+      echo "      <td>\n";
+      echo _("Identifying name") . ":";
+      echo "      </td>\n";
+      echo "      <td>\n";
+      echo "         <input type=\"text\" value=\"".$message_highlight_list[$id]["name"]."\" name=\"name\">";
+      echo "      </td>\n";
+      echo "   </tr>\n";
+      echo "   <tr>\n";
+      echo "      <td>\n";
+      echo _("Color") . ":";
+      echo "      </td>\n";
+      echo "      <td>\n";
+      echo "         <input type=\"text\" value=\"".$message_highlight_list[$id]["color"]."\" name=\"newcolor\">";
+      echo "      </td>\n";
+      echo "   </tr>\n";
+      echo "   <tr>\n";
+      echo "      <td>\n";
+      echo _("Match") . ":";
+      echo "      </td>\n";
+      echo "      <td>\n";
+      echo "         <input type=\"text\" value=\"".$message_highlight_list[$id]["value"]."\" name=\"value\">";
+      echo "      </td>\n";
+      echo "   </tr>\n";
+      echo "</table>\n";
+      echo "<center><input type=\"submit\" value=\"" . _("Submit") . "\"></center>\n";
+      echo "</form>\n";
+   }   
+   echo "</BODY></HTML>";
+?>
diff --git a/src/options.php b/src/options.php
index 58ff03e3be500332a35dbbf956232594b3d74ad3..b8acd1e838baa617f73a13207fdc2e68646c53eb 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -403,6 +403,29 @@
    echo "<BR>Signature:<BR><TEXTAREA NAME=signature_edit ROWS=5 COLS=\"$sig_size\">$signature</TEXTAREA><BR>";
    echo "</CENTER>";
 
+   // MESSAGE HIGHLIGHTING
+   echo "<br>\n";
+   echo "<center><b>" . _("Message Highlighting") . "</b> - [<a href=\"msg_highlight.php?method=add\">" . _("New") . "</a>]</center><br>\n";
+   if (count($message_highlight_list) >= 1) {
+      echo "<table border=0 cellpadding=2 cellspacing=0 align=center width=100%>\n";
+      for ($i=0; $i < count($message_highlight_list); $i++) {
+         echo "<tr>\n";
+         echo "   <td width=1% bgcolor=" . $color[4] . ">\n";
+         echo "<small>[<a href=\"msg_highlight.php?method=edit&id=$i\">" . _("Edit") . "</a>]&nbsp;["._("Delete")."]</small>\n";
+         echo "   </td>";
+         echo "   <td bgcolor=" . $message_highlight_list[$i]["color"] . ">\n";
+         echo "      " . $message_highlight_list[$i]["name"];
+         echo "   </td>\n";
+         echo "   <td bgcolor=" . $message_highlight_list[$i]["color"] . ">\n";
+         echo "      " . $message_highlight_list[$i]["value"];
+         echo "   </td>\n";
+         echo "</tr>\n";
+      }
+      echo "</table>\n";
+   } else {
+      echo "<center>" . _("No highlighting is defined") . "</center><br>\n";
+   }
+   echo "<br>\n";
 
    // SUBMIT BUTTON
    echo "<BR><CENTER><INPUT TYPE=SUBMIT VALUE=\"";
Unnamed repository; edit this file 'description' to name the repository.