We use cookies to ensure you get the best experience on our website
Home Explore Help
Register Sign In
0ct0pu5
/
squirrelmail
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Focus plugin integrated into the core

philippe_mingo 24 years ago
parent
9bcf8a1991
commit
c846c4048f
6 changed files with 239 additions and 242 deletions
Unified View Show Diff Stats
  1. 1 3
      functions/page_header.php
  2. 163 165
      src/addrbook_search.php
  3. 58 57
      src/compose.php
  4. 2 2
      src/folders_create.php
  5. 2 2
      src/login.php
  6. 13 13
      src/redirect.php

+ 1 - 3
functions/page_header.php
View File 

@@ -44,9 +44,7 @@
 
    function displayPageHeader($color, $mailbox) {
 
    function displayPageHeader($color, $mailbox) {
 
       displayHtmlHeader ();
 
       displayHtmlHeader ();
 
 
 
-      printf('<BODY TEXT="%s" BGCOLOR="%s" LINK="%s" VLINK="%s" ALINK="%s">',
 
-             $color[8], $color[4], $color[7], $color[7], $color[7]);
 
-      echo "\n\n";
 
+      echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\" onLoad='document.forms[0].elements[0].focus();'>\n\n";
 
 
 
       /** Here is the header and wrapping table **/
 
       /** Here is the header and wrapping table **/
 
       $shortBoxName = readShortMailboxName($mailbox, ".");
 
       $shortBoxName = readShortMailboxName($mailbox, ".");

+ 163 - 165
src/addrbook_search.php
View File 

@@ -35,9 +35,9 @@ function to_address($addr) {
 
   if(pwintype != "undefined" ) {
 
   if(pwintype != "undefined" ) {
 
     if ( parent.opener.document.compose.send_to.value ) {
 
     if ( parent.opener.document.compose.send_to.value ) {
 
       prefix = ", ";
 
       prefix = ", ";
 
-      parent.opener.document.compose.send_to.value = 
+      parent.opener.document.compose.send_to.value =
 
         parent.opener.document.compose.send_to.value + ", " + $addr;
 
         parent.opener.document.compose.send_to.value + ", " + $addr;
 
-        
+
 
     } else {
 
     } else {
 
       parent.opener.document.compose.send_to.value = $addr;
 
       parent.opener.document.compose.send_to.value = $addr;
 
     }
 
     }
 
@@ -53,8 +53,8 @@ function cc_address($addr) {
 
   if(pwintype != "undefined" ) {
 
   if(pwintype != "undefined" ) {
 
     if ( parent.opener.document.compose.send_to_cc.value ) {
 
     if ( parent.opener.document.compose.send_to_cc.value ) {
 
       prefix = ", ";
 
       prefix = ", ";
 
-      parent.opener.document.compose.send_to_cc.value = 
-        parent.opener.document.compose.send_to_cc.value + ", " + $addr;      
+      parent.opener.document.compose.send_to_cc.value =
 
+        parent.opener.document.compose.send_to_cc.value + ", " + $addr;
 
     } else {
 
     } else {
 
       parent.opener.document.compose.send_to_cc.value = $addr;
 
       parent.opener.document.compose.send_to_cc.value = $addr;
 
     }
 
     }
 
@@ -64,14 +64,14 @@ function cc_address($addr) {
 
 function bcc_address($addr) {
 
 function bcc_address($addr) {
 
   var prefix    = "";
 
   var prefix    = "";
 
   var pwintype = typeof parent.opener.document.compose;
 
   var pwintype = typeof parent.opener.document.compose;
 
-  
+
 
   $addr = $addr.replace(/ {1,35}$/, "");
 
   $addr = $addr.replace(/ {1,35}$/, "");
 
 
 
   if(pwintype != "undefined" ) {
 
   if(pwintype != "undefined" ) {
 
     if ( parent.opener.document.compose.send_to_bcc.value ) {
 
     if ( parent.opener.document.compose.send_to_bcc.value ) {
 
       prefix = ", ";
 
       prefix = ", ";
 
-      parent.opener.document.compose.send_to_bcc.value = 
-        parent.opener.document.compose.send_to_bcc.value + ", " + $addr;      
+      parent.opener.document.compose.send_to_bcc.value =
 
+        parent.opener.document.compose.send_to_bcc.value + ", " + $addr;
 
     } else {
 
     } else {
 
       parent.opener.document.compose.send_to_bcc.value = $addr;
 
       parent.opener.document.compose.send_to_bcc.value = $addr;
 
     }
 
     }
 
@@ -80,167 +80,165 @@ function bcc_address($addr) {
 
 
 
 // --></SCRIPT>
 
 // --></SCRIPT>
 
 
 
-<?php 
+<?php
 
    } // End of included JavaScript
 
    } // End of included JavaScript
 
 
 
 
 
-   // List search results
 
-   function display_result($res, $includesource = true) {
 
-      global $color;
 
-
 
-      if(sizeof($res) <= 0) return;
 
-
 
-      insert_javascript();
 
-
 
-      $line = 0;
 
-      print '<TABLE BORDER="0" WIDTH="98%" ALIGN=center>';
 
-      printf("<TR BGCOLOR=\"$color[9]\"><TH ALIGN=left>&nbsp;".
 
-	     "<TH ALIGN=left>&nbsp;%s<TH ALIGN=left>&nbsp;%s".
 
-	     "<TH ALIGN=left>&nbsp;%s",
 
-	     _("Name"), _("E-mail"), _("Info"));
 
-
 
-      if($includesource)
 
-	 printf("<TH ALIGN=left WIDTH=\"10%%\">&nbsp;%s", _("Source"));
 
-
 
-      print "</TR>\n";
 
-      
-      while(list($undef, $row) = each($res)) {
 
-	 printf("<tr%s nowrap><td valign=top nowrap align=center width=\"5%%\">".
 
-		"<small><a href=\"javascript:to_address('%s');\">To</A> | ".
 
-		"<a href=\"javascript:cc_address('%s');\">Cc</A> | ".
 
-		"<a href=\"javascript:bcc_address('%s');\">Bcc</A></small>".
 
-		"<td nowrap valign=top>&nbsp;%s&nbsp;<td nowrap valign=top>".
 
-		"&nbsp;<a href=\"javascript:to_and_close('%s');\">%s</A>&nbsp;".
 
-		"<td valign=top>&nbsp;%s&nbsp;", 
-		($line % 2) ? " bgcolor=\"$color[0]\"" : "", 
-		$row["email"], $row["email"], $row["email"], 
-		$row["name"],  $row["email"], $row["email"],
 
-		$row["label"]);
 
-
 
-	 if($includesource)
 
-	    printf("<td nowrap valign=top>&nbsp;%s", $row["source"]);
 
-
 
-	 print "</TR>\n";
 
-	 $line++;
 
-      }
 
-      print '</TABLE>';
 
-   }
 
-
 
-   /* ================= End of functions ================= */
 
-
 
-   require_once('../functions/array.php');
 
-   require_once('../functions/strings.php');
 
-   require_once('../functions/addressbook.php');
 
-
 
-   displayHtmlHeader();
 
-
 
-   // Initialize vars
 
-   if(!isset($query)) $query = "";
 
-   if(!isset($show))  $show  = "";
 
-
 
-   // Choose correct colors for top and bottom frame
 
-   if($show == 'form') {
 
-      echo "<BODY BGCOLOR=\"$color[3]\" TEXT=\"$color[6]\" ";
 
-      echo "LINK=\"$color[6]\" VLINK=\"$color[6]\" ALINK=\"$color[6]\" ";
 
-      echo 'OnLoad="document.sform.query.focus();">';  
-   } else {
 
-      echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" ";
 
-      echo "LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
 
-   }
 
-
 
-   // Empty search
 
-   if(empty($query) && empty($show) && empty($listall))  {
 
-      printf("<P ALIGN=center><BR>%s</P>\n</BODY></HTML>\n",
 
-	     _("No persons matching your search was found"));
 
+    // List search results
 
+    function display_result($res, $includesource = true) {
 
+        global $color;
 
+        
+        if(sizeof($res) <= 0) return;
 
+        
+        insert_javascript();
 
+        
+        $line = 0;
 
+        echo '<TABLE BORDER="0" WIDTH="98%" ALIGN=center>';
 
+        printf("<TR BGCOLOR=\"$color[9]\"><TH ALIGN=left>&nbsp;".
 
+            "<TH ALIGN=left>&nbsp;%s<TH ALIGN=left>&nbsp;%s".
 
+            "<TH ALIGN=left>&nbsp;%s",
 
+            _("Name"), _("E-mail"), _("Info"));
 
+        
+        if($includesource)
 
+            printf("<TH ALIGN=left WIDTH=\"10%%\">&nbsp;%s", _("Source"));
 
+    
+        echo "</TR>\n";
 
+    
+        while(list($undef, $row) = each($res)) {
 
+            printf("<tr%s nowrap><td valign=top nowrap align=center width=\"5%%\">".
 
+                    "<small><a href=\"javascript:to_address('%s');\">To</A> | ".
 
+                    "<a href=\"javascript:cc_address('%s');\">Cc</A> | ".
 
+                    "<a href=\"javascript:bcc_address('%s');\">Bcc</A></small>".
 
+                    "<td nowrap valign=top>&nbsp;%s&nbsp;<td nowrap valign=top>".
 
+                    "&nbsp;<a href=\"javascript:to_and_close('%s');\">%s</A>&nbsp;".
 
+                    "<td valign=top>&nbsp;%s&nbsp;",
 
+                    ($line % 2) ? " bgcolor=\"$color[0]\"" : "",
 
+                    $row["email"], $row["email"], $row["email"],
 
+                    $row["name"],  $row["email"], $row["email"],
 
+                    $row["label"]);
 
+    
+            if($includesource)
 
+                printf("<td nowrap valign=top>&nbsp;%s", $row["source"]);
 
+    
+            echo "</TR>\n";
 
+            $line++;
 
+        }
 
+        echo '</TABLE>';
 
+    }
 
+
 
+    /* ================= End of functions ================= */
 
+    
+    require_once('../functions/array.php');
 
+    require_once('../functions/strings.php');
 
+    require_once('../functions/addressbook.php');
 
+    
+    displayHtmlHeader();
 
+    
+    // Initialize vars
 
+    if(!isset($query)) $query = "";
 
+    if(!isset($show))  $show  = "";
 
+
 
+    // Choose correct colors for top and bottom frame
 
+    if($show == 'form') {
 
+        echo "<BODY BGCOLOR=\"$color[3]\" TEXT=\"$color[6]\" ";
 
+        echo "LINK=\"$color[6]\" VLINK=\"$color[6]\" ALINK=\"$color[6]\" ";
 
+        echo 'OnLoad="document.sform.query.focus();">';
 
+    } else {
 
+        echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" ";
 
+        echo "LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
 
+    }
 
+
 
+    // Empty search
 
+    if(empty($query) && empty($show) && empty($listall))  {
 
+        printf("<P ALIGN=center><BR>%s</P>\n</BODY></HTML>\n",
 
+         _("No persons matching your search was found"));
 
       exit;
 
       exit;
 
-   }
 
-
 
-   // Initialize addressbook
 
-   $abook = addressbook_init();
 
-
 
-   // Create search form 
-   if($show == 'form') {
 
-      printf("<FORM NAME=sform TARGET=abookres ACTION=\"%s\" METHOD=\"POST\">\n",
 
-	     $PHP_SELF);
 
-      print('<TABLE BORDER="0" WIDTH="100%" HEIGHT="100%">');
 
-      print("<TR><TD NOWRAP VALIGN=middle>\n");
 
-      printf("  <STRONG>%s</STRONG>\n", _("Search for"));
 
-      printf("  <INPUT TYPE=text NAME=query VALUE=\"%s\" SIZE=26>\n",
 
-	     htmlspecialchars($query));
 
-
 
-      // List all backends to allow the user to choose where to search
 
-      if($abook->numbackends > 1) {
 
-	 printf("<STRONG>%s</STRONG>&nbsp;<SELECT NAME=backend>\n", 
-		_("in"));
 
-	 printf("<OPTION VALUE=-1 SELECTED>%s\n", 
-		_("All address books"));
 
-	 $ret = $abook->get_backend_list();
 
-	 while(list($undef,$v) = each($ret)) 
-	    printf("<OPTION VALUE=%d>%s\n", $v->bnum, $v->sname);
 
-	 print "</SELECT>\n";
 
-      } else {
 
-	 print "<INPUT TYPE=hidden NAME=backend VALUE=-1>\n";
 
-      }
 
-
 
-      printf("<INPUT TYPE=submit VALUE=\"%s\">",
 
-	     _("Search"));
 
-      printf("&nbsp;|&nbsp;<INPUT TYPE=submit VALUE=\"%s\" NAME=listall>\n",
 
+    }
 
+
 
+    // Initialize addressbook
 
+    $abook = addressbook_init();
 
+
 
+    // Create search form
 
+    if($show == 'form') {
 
+        echo "<FORM NAME=sform TARGET=abookres ACTION=\"$PHP_SELF\" METHOD=\"POST\">\n";
 
+        echo '<TABLE BORDER="0" WIDTH="100%" HEIGHT="100%">';
 
+        echo "<TR><TD NOWRAP VALIGN=middle>\n";
 
+        printf("  <STRONG>%s</STRONG>\n", _("Search for"));
 
+        printf("  <INPUT TYPE=text NAME=query VALUE=\"%s\" SIZE=26>\n",
 
+         htmlspecialchars($query));
 
+        
+        // List all backends to allow the user to choose where to search
 
+        if($abook->numbackends > 1) {
 
+            printf("<STRONG>%s</STRONG>&nbsp;<SELECT NAME=backend>\n",
 
+               _("in"));
 
+            printf("<OPTION VALUE=-1 SELECTED>%s\n",
 
+               _("All address books"));
 
+            $ret = $abook->get_backend_list();
 
+            while(list($undef,$v) = each($ret))
 
+                printf("<OPTION VALUE=%d>%s\n", $v->bnum, $v->sname);
 
+            print "</SELECT>\n";
 
+        } else {
 
+            print "<INPUT TYPE=hidden NAME=backend VALUE=-1>\n";
 
+        }
 
+        
+        printf("<INPUT TYPE=submit VALUE=\"%s\">",
 
+             _("Search"));
 
+        printf("&nbsp;|&nbsp;<INPUT TYPE=submit VALUE=\"%s\" NAME=listall>\n",
 
              _("List all"));
 
              _("List all"));
 
-      print "</TD><TD ALIGN=right>\n";
 
-      printf("<INPUT TYPE=button VALUE=\"%s\" onclick=\"parent.close();\">\n",
 
+        print "</TD><TD ALIGN=right>\n";
 
+        printf("<INPUT TYPE=button VALUE=\"%s\" onclick=\"parent.close();\">\n",
 
              _("Close window"));
 
              _("Close window"));
 
-      print "</TD></TR></TABLE></FORM>\n";
 
-   } else
 
-
 
-   // Show personal addressbook
 
-   if($show == 'blank' || !empty($listall)) {
 
-
 
-      if($backend != -1 || $show == 'blank') {
 
-	 if($show == 'blank') 
-	    $backend = $abook->localbackend;
 
-
 
-	 //printf("<H3 ALIGN=center>%s</H3>\n", $abook->backends[$backend]->sname);
 
-
 
-	 $res = $abook->list_addr($backend);
 
-
 
-	 if(is_array($res)) {
 
-	    display_result($res, false);
 
-	 } else {
 
-	    printf("<P ALIGN=center><STRONG>"._("Unable to list addresses from %s").
 
-		   "</STRONG></P>\n", $abook->backends[$backend]->sname);
 
-	 }
 
-
 
-      } else {
 
-	 $res = $abook->list_addr();
 
-	 display_result($res, true);
 
-      }
 
-
 
-   } else
 
-
 
-   // Do the search
 
-   if(!empty($query) && empty($listall)) {
 
-
 
-      if($backend == -1) {
 
-	 $res = $abook->s_search($query);
 
-      } else {
 
-	 $res = $abook->s_search($query, $backend);
 
-      }
 
-
 
-      if(!is_array($res)) {
 
-	 printf("<P ALIGN=center><B><BR>%s:<br>%s</B></P>\n</BODY></HTML>\n",
 
-		_("Your search failed with the following error(s)"),
 
-		$abook->error);
 
-	 exit;
 
-      }
 
-
 
-      if(sizeof($res) == 0) {
 
-	 printf("<P ALIGN=center><BR><B>%s.</B></P>\n</BODY></HTML>\n",
 
-		_("No persons matching your search was found"));
 
-	 exit;
 
-      }
 
-
 
-      display_result($res);
 
-   }
 
-?>
 
-
 
-</BODY></HTML>
 
+        print "</TD></TR></TABLE></FORM>\n";
 
+    } else
 
+
 
+    // Show personal addressbook
 
+    if($show == 'blank' || !empty($listall)) {
 
+
 
+        if($backend != -1 || $show == 'blank') {
 
+            if($show == 'blank')
 
+                $backend = $abook->localbackend;
 
+
 
+            $res = $abook->list_addr($backend);
 
+
 
+            if(is_array($res)) {
 
+                display_result($res, false);
 
+            } else {
 
+                printf("<P ALIGN=center><STRONG>"._("Unable to list addresses from %s").
 
+                       "</STRONG></P>\n", $abook->backends[$backend]->sname);
 
+            }
 
+
 
+        } else {
 
+         $res = $abook->list_addr();
 
+         display_result($res, true);
 
+        }
 
+
 
+    } else
 
+
 
+    // Do the search
 
+    if(!empty($query) && empty($listall)) {
 
+    
+        if($backend == -1) {
 
+            $res = $abook->s_search($query);
 
+        } else {
 
+            $res = $abook->s_search($query, $backend);
 
+        }
 
+        
+        if(!is_array($res)) {
 
+            printf("<P ALIGN=center><B><BR>%s:<br>%s</B></P>\n</BODY></HTML>\n",
 
+                   _("Your search failed with the following error(s)"),
 
+            $abook->error);
 
+            exit;
 
+        }
 
+        
+        if(sizeof($res) == 0) {
 
+            printf("<P ALIGN=center><BR><B>%s.</B></P>\n</BODY></HTML>\n",
 
+                   _("No persons matching your search was found"));
 
+            exit;
 
+        }
 
+        
+        display_result($res);
 
+    }
 
+   
+   echo "</BODY></HTML>\n";
 
+   
+?>

+ 58 - 57
src/compose.php
View File 

@@ -1,5 +1,5 @@
 
 <?php
 
 <?php
 
-   /** 
+   /**
 
     ** compose.php
 
     ** compose.php
 
     **
 
     **
 
     **  Copyright (c) 1999-2000 The SquirrelMail development team
 
     **  Copyright (c) 1999-2000 The SquirrelMail development team
 
@@ -33,7 +33,7 @@
 
    // This function is used when not sending or adding attachments
 
    // This function is used when not sending or adding attachments
 
    function newMail () {
 
    function newMail () {
 
       global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body,
 
       global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body,
 
-         $reply_id, $send_to, $send_to_cc, $mailbox, $send_to_bcc, $editor_size;
 
+             $reply_id, $send_to, $send_to_cc, $mailbox, $send_to_bcc, $editor_size;
 
 
 
       $send_to = decodeHeader($send_to);
 
       $send_to = decodeHeader($send_to);
 
       $send_to_cc = decodeHeader($send_to_cc);
 
       $send_to_cc = decodeHeader($send_to_cc);
 
@@ -52,7 +52,7 @@
 
          if ($ent_num)
 
          if ($ent_num)
 
             $message = getEntity($message, $ent_num);
 
             $message = getEntity($message, $ent_num);
 
 
 
-         if ($message->header->type0 == "text" || $message->header->type1 == "message") {
 
+         if ($message->header->type0 == 'text' || $message->header->type1 == 'message') {
 
             if ($ent_num)
 
             if ($ent_num)
 
                $body = decodeBody(mime_fetch_body($imapConnection, $id, $ent_num), $message->header->encoding);
 
                $body = decodeBody(mime_fetch_body($imapConnection, $id, $ent_num), $message->header->encoding);
 
             else
 
             else
 
@@ -60,11 +60,11 @@
 
          } else {
 
          } else {
 
             $body = "";
 
             $body = "";
 
          }
 
          }
 
-         
+
 
          if ($message->header->type1 == "html")
 
          if ($message->header->type1 == "html")
 
             $body = strip_tags($body);
 
             $body = strip_tags($body);
 
 
 
-         sqUnWordWrap($body);   
+         sqUnWordWrap($body);
 
          $body_ary = explode("\n", $body);
 
          $body_ary = explode("\n", $body);
 
          $i = count($body_ary) - 1;
 
          $i = count($body_ary) - 1;
 
          while ($i >= 0 && ereg("^[>\\s]*$", $body_ary[$i])) {
 
          while ($i >= 0 && ereg("^[>\\s]*$", $body_ary[$i])) {
 
@@ -91,9 +91,9 @@
 
          if ($forward_id)
 
          if ($forward_id)
 
          {
 
          {
 
              $bodyTop =  "-------- " . _("Original Message") . " --------\n";
 
              $bodyTop =  "-------- " . _("Original Message") . " --------\n";
 
-             $bodyTop .= _("Subject") . ": " . $orig_header->subject . "\n"; 
-             $bodyTop .= _("From") . ": " . $orig_header->from . "\n"; 
-             $bodyTop .= _("To") . ": " . $orig_header->to[0] . "\n"; 
+             $bodyTop .= _("Subject") . ": " . $orig_header->subject . "\n";
 
+             $bodyTop .= _("From") . ": " . $orig_header->from . "\n";
 
+             $bodyTop .= _("To") . ": " . $orig_header->to[0] . "\n";
 
              if (count($orig_header->to) > 1) {
 
              if (count($orig_header->to) > 1) {
 
                  for ($x=1; $x < count($orig_header->to); $x++) {
 
                  for ($x=1; $x < count($orig_header->to); $x++) {
 
                      $bodyTop .= "         " . $orig_header->to[$x] . "\n";
 
                      $bodyTop .= "         " . $orig_header->to[$x] . "\n";
 
@@ -108,7 +108,7 @@
 
              $orig_from = str_replace("'",'',$orig_from);
 
              $orig_from = str_replace("'",'',$orig_from);
 
              $body = getReplyCitation($orig_from) . $body;
 
              $body = getReplyCitation($orig_from) . $body;
 
          }
 
          }
 
-         
+
 
          return;
 
          return;
 
       }
 
       }
 
 
 
@@ -122,16 +122,16 @@
 
          $send_to_cc = ereg_replace(";", ",", $send_to_cc);
 
          $send_to_cc = ereg_replace(";", ",", $send_to_cc);
 
          $sendcc = explode(",", $send_to_cc);
 
          $sendcc = explode(",", $send_to_cc);
 
          $send_to_cc = "";
 
          $send_to_cc = "";
 
-         
+
 
          for ($i = 0; $i < count($sendcc); $i++) {
 
          for ($i = 0; $i < count($sendcc); $i++) {
 
             $sendcc[$i] = trim($sendcc[$i]);
 
             $sendcc[$i] = trim($sendcc[$i]);
 
             if ($sendcc[$i] == "")
 
             if ($sendcc[$i] == "")
 
                continue;
 
                continue;
 
-            
+
 
             $sendcc[$i] = sqimap_find_email($sendcc[$i]);
 
             $sendcc[$i] = sqimap_find_email($sendcc[$i]);
 
             $whofrom = sqimap_find_displayable_name($msg["HEADER"]["FROM"]);
 
             $whofrom = sqimap_find_displayable_name($msg["HEADER"]["FROM"]);
 
             $whoreplyto = sqimap_find_email($msg["HEADER"]["REPLYTO"]);
 
             $whoreplyto = sqimap_find_email($msg["HEADER"]["REPLYTO"]);
 
-         
+
 
             if ((strtolower(trim($sendcc[$i])) != strtolower(trim($whofrom))) &&
 
             if ((strtolower(trim($sendcc[$i])) != strtolower(trim($whofrom))) &&
 
                 (strtolower(trim($sendcc[$i])) != strtolower(trim($whoreplyto))) &&
 
                 (strtolower(trim($sendcc[$i])) != strtolower(trim($whoreplyto))) &&
 
                 (trim($sendcc[$i]) != "")) {
 
                 (trim($sendcc[$i]) != "")) {
 
@@ -151,17 +151,17 @@
 
 
 
       if (!$message) {
 
       if (!$message) {
 
            sqimap_mailbox_select($imapConnection, $mailbox);
 
            sqimap_mailbox_select($imapConnection, $mailbox);
 
-           $message = sqimap_get_message($imapConnection, $forward_id, 
+           $message = sqimap_get_message($imapConnection, $forward_id,
 
                $mailbox);
 
                $mailbox);
 
       }
 
       }
 
-      
+
 
       if (count($message->entities) == 0) {
 
       if (count($message->entities) == 0) {
 
           if ($message->header->entity_id != $ent_num) {
 
           if ($message->header->entity_id != $ent_num) {
 
               $filename = decodeHeader($message->header->filename);
 
               $filename = decodeHeader($message->header->filename);
 
-      
+
 
               if ($filename == "")
 
               if ($filename == "")
 
                   $filename = "untitled-".$message->header->entity_id;
 
                   $filename = "untitled-".$message->header->entity_id;
 
-      
+
 
               $localfilename = GenerateRandomString(32, '', 7);
 
               $localfilename = GenerateRandomString(32, '', 7);
 
               while (file_exists($attachment_dir . $localfilename))
 
               while (file_exists($attachment_dir . $localfilename))
 
                   $localfilename = GenerateRandomString(32, '', 7);
 
                   $localfilename = GenerateRandomString(32, '', 7);
 
@@ -174,33 +174,33 @@
 
 
 
               // Write Attachment to file
 
               // Write Attachment to file
 
               $fp = fopen ($attachment_dir.$localfilename, 'w');
 
               $fp = fopen ($attachment_dir.$localfilename, 'w');
 
-              fputs ($fp, decodeBody(mime_fetch_body($imapConnection, 
-                  $forward_id, $message->header->entity_id), 
+              fputs ($fp, decodeBody(mime_fetch_body($imapConnection,
 
+                  $forward_id, $message->header->entity_id),
 
                   $message->header->encoding));
 
                   $message->header->encoding));
 
               fclose ($fp);
 
               fclose ($fp);
 
-      
+
 
               $attachments[] = $newAttachment;
 
               $attachments[] = $newAttachment;
 
           }
 
           }
 
       } else {
 
       } else {
 
           for ($i = 0; $i < count($message->entities); $i++) {
 
           for ($i = 0; $i < count($message->entities); $i++) {
 
               getAttachments($message->entities[$i]);
 
               getAttachments($message->entities[$i]);
 
-          }       
+          }
 
       }
 
       }
 
       return;
 
       return;
 
-   }       
+   }
 
 
 
    function showInputForm () {
 
    function showInputForm () {
 
       global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body,
 
       global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body,
 
-         $passed_body, $color, $use_signature, $signature, $prefix_sig, 
-         $editor_size, $attachments, $subject, $newmail, 
-         $use_javascript_addr_book, $send_to_bcc, $reply_id, $mailbox, 
+         $passed_body, $color, $use_signature, $signature, $prefix_sig,
 
+         $editor_size, $attachments, $subject, $newmail,
 
+         $use_javascript_addr_book, $send_to_bcc, $reply_id, $mailbox,
 
          $from_htmladdr_search, $location_of_buttons, $attachment_dir,
 
          $from_htmladdr_search, $location_of_buttons, $attachment_dir,
 
          $username, $data_dir, $identity;
 
          $username, $data_dir, $identity;
 
 
 
       $subject = decodeHeader($subject);
 
       $subject = decodeHeader($subject);
 
       $reply_subj = decodeHeader($reply_subj);
 
       $reply_subj = decodeHeader($reply_subj);
 
       $forward_subj = decodeHeader($forward_subj);
 
       $forward_subj = decodeHeader($forward_subj);
 
-      
+
 
       if ($use_javascript_addr_book) {
 
       if ($use_javascript_addr_book) {
 
          echo "\n<SCRIPT LANGUAGE=JavaScript><!--\n";
 
          echo "\n<SCRIPT LANGUAGE=JavaScript><!--\n";
 
          echo "function open_abook() { \n";
 
          echo "function open_abook() { \n";
 
@@ -215,10 +215,7 @@
 
       echo "\n<FORM name=compose action=\"compose.php\" METHOD=POST ENCTYPE=\"multipart/form-data\"";
 
       echo "\n<FORM name=compose action=\"compose.php\" METHOD=POST ENCTYPE=\"multipart/form-data\"";
 
       do_hook("compose_form");
 
       do_hook("compose_form");
 
           echo ">\n";
 
           echo ">\n";
 
-      if ($reply_id) {
 
-         echo "<input type=hidden name=reply_id value=$reply_id>\n";
 
-      }                 
-      printf("<INPUT TYPE=hidden NAME=mailbox VALUE=\"%s\">\n", htmlspecialchars($mailbox));
 
+
 
       echo "<TABLE WIDTH=\"100%\" ALIGN=center CELLSPACING=0 BORDER=0>\n";
 
       echo "<TABLE WIDTH=\"100%\" ALIGN=center CELLSPACING=0 BORDER=0>\n";
 
 
 
       if ($location_of_buttons == 'top') showComposeButtonRow();
 
       if ($location_of_buttons == 'top') showComposeButtonRow();
 
@@ -230,7 +227,7 @@
 
          echo _("From:");
 
          echo _("From:");
 
          echo "      </TD><TD BGCOLOR=\"$color[4]\" WIDTH=\"90%\">\n";
 
          echo "      </TD><TD BGCOLOR=\"$color[4]\" WIDTH=\"90%\">\n";
 
          echo "<select name=identity>\n";
 
          echo "<select name=identity>\n";
 
-         echo "<option value=default>" . 
+         echo "<option value=default>" .
 
          htmlspecialchars(getPref($data_dir, $username, 'full_name'));
 
          htmlspecialchars(getPref($data_dir, $username, 'full_name'));
 
          $em = getPref($data_dir, $username, 'email_address');
 
          $em = getPref($data_dir, $username, 'email_address');
 
          if ($em != '')
 
          if ($em != '')
 
@@ -240,7 +237,7 @@
 
             if (isset($identity) && $identity == $i)
 
             if (isset($identity) && $identity == $i)
 
                echo ' SELECTED';
 
                echo ' SELECTED';
 
             echo '>';
 
             echo '>';
 
-            echo htmlspecialchars(getPref($data_dir, $username, 'full_name' . 
+            echo htmlspecialchars(getPref($data_dir, $username, 'full_name' .
 
                                         $i));
 
                                         $i));
 
             $em = getPref($data_dir, $username, 'email_address' . $i);
 
             $em = getPref($data_dir, $username, 'email_address' . $i);
 
             if ($em != '')
 
             if ($em != '')
 
@@ -315,12 +312,12 @@
 
       echo "      </TD>\n";
 
       echo "      </TD>\n";
 
       echo "   </TR>\n";
 
       echo "   </TR>\n";
 
 
 
-      if ($location_of_buttons == 'bottom') 
+      if ($location_of_buttons == 'bottom')
 
          showComposeButtonRow();
 
          showComposeButtonRow();
 
       else {
 
       else {
 
          echo "   <TR><TD>&nbsp;</TD><TD ALIGN=LEFT><INPUT TYPE=SUBMIT NAME=send VALUE=\""._("Send")."\"></TD></TR>\n";
 
          echo "   <TR><TD>&nbsp;</TD><TD ALIGN=LEFT><INPUT TYPE=SUBMIT NAME=send VALUE=\""._("Send")."\"></TD></TR>\n";
 
       }
 
       }
 
-      
+
 
       // This code is for attachments
 
       // This code is for attachments
 
       echo "   <tr>\n";
 
       echo "   <tr>\n";
 
       echo "     <TD BGCOLOR=\"$color[0]\" VALIGN=TOP ALIGN=RIGHT>\n";
 
       echo "     <TD BGCOLOR=\"$color[0]\" VALIGN=TOP ALIGN=RIGHT>\n";
 
@@ -339,23 +336,27 @@
 
          foreach ($attachments as $key => $info) {
 
          foreach ($attachments as $key => $info) {
 
             echo "<input type=\"checkbox\" name=\"delete[]\" value=\"$key\">\n";
 
             echo "<input type=\"checkbox\" name=\"delete[]\" value=\"$key\">\n";
 
             echo $info['remotefilename'] . " - " . $info['type'] . " (";
 
             echo $info['remotefilename'] . " - " . $info['type'] . " (";
 
-            echo show_readable_size(filesize($attachment_dir . 
+            echo show_readable_size(filesize($attachment_dir .
 
                 $info['localfilename'])) . ")<br>\n";
 
                 $info['localfilename'])) . ")<br>\n";
 
          }
 
          }
 
-         
+
 
          echo "<input type=\"submit\" name=\"do_delete\" value=\""._("Delete selected attachments")."\">\n";
 
          echo "<input type=\"submit\" name=\"do_delete\" value=\""._("Delete selected attachments")."\">\n";
 
          echo "</td></tr>";
 
          echo "</td></tr>";
 
       }
 
       }
 
       // End of attachment code
 
       // End of attachment code
 
 
 
       echo "</TABLE>\n";
 
       echo "</TABLE>\n";
 
+      if ($reply_id) {
 
+         echo "<input type=hidden name=reply_id value=$reply_id>\n";
 
+      }
 
+      printf("<INPUT TYPE=hidden NAME=mailbox VALUE=\"%s\">\n", htmlspecialchars($mailbox));      
       echo "</FORM>";
 
       echo "</FORM>";
 
       do_hook("compose_bottom");
 
       do_hook("compose_bottom");
 
    }
 
    }
 
-   
+
 
    function showComposeButtonRow() {
 
    function showComposeButtonRow() {
 
       global $use_javascript_addr_book;
 
       global $use_javascript_addr_book;
 
-      
+
 
       echo "   <TR><td>\n   </td><td>\n";
 
       echo "   <TR><td>\n   </td><td>\n";
 
       if ($use_javascript_addr_book) {
 
       if ($use_javascript_addr_book) {
 
          echo "      <SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"";
 
          echo "      <SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"";
 
@@ -363,11 +364,11 @@
 
          echo "         // --></SCRIPT><NOSCRIPT>\n";
 
          echo "         // --></SCRIPT><NOSCRIPT>\n";
 
          echo "         <input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
 
          echo "         <input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
 
          echo "      </NOSCRIPT>\n";
 
          echo "      </NOSCRIPT>\n";
 
-      } else {  
+      } else {
 
          echo "      <input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
 
          echo "      <input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
 
-      }   
+      }
 
       echo "\n    <INPUT TYPE=SUBMIT NAME=send VALUE=\"". _("Send") . "\">\n";
 
       echo "\n    <INPUT TYPE=SUBMIT NAME=send VALUE=\"". _("Send") . "\">\n";
 
-      
+
 
       do_hook("compose_button_row");
 
       do_hook("compose_button_row");
 
 
 
       echo "   </TD>\n";
 
       echo "   </TD>\n";
 
@@ -393,7 +394,7 @@
 
    // True if FAILURE
 
    // True if FAILURE
 
    function saveAttachedFiles() {
 
    function saveAttachedFiles() {
 
       global $HTTP_POST_FILES, $attachment_dir, $attachments;
 
       global $HTTP_POST_FILES, $attachment_dir, $attachments;
 
-      
+
 
       $localfilename = GenerateRandomString(32, '', 7);
 
       $localfilename = GenerateRandomString(32, '', 7);
 
       while (file_exists($attachment_dir . $localfilename))
 
       while (file_exists($attachment_dir . $localfilename))
 
           $localfilename = GenerateRandomString(32, '', 7);
 
           $localfilename = GenerateRandomString(32, '', 7);
 
@@ -403,10 +404,10 @@
 
             return true;
 
             return true;
 
          }
 
          }
 
       }
 
       }
 
-   
+
 
       $newAttachment['localfilename'] = $localfilename;
 
       $newAttachment['localfilename'] = $localfilename;
 
       $newAttachment['remotefilename'] = $HTTP_POST_FILES['attachfile']['name'];
 
       $newAttachment['remotefilename'] = $HTTP_POST_FILES['attachfile']['name'];
 
-      $newAttachment['type'] = 
+      $newAttachment['type'] =
 
          strtolower($HTTP_POST_FILES['attachfile']['type']);
 
          strtolower($HTTP_POST_FILES['attachfile']['type']);
 
 
 
       if ($newAttachment['type'] == "")
 
       if ($newAttachment['type'] == "")
 
@@ -414,7 +415,7 @@
 
 
 
       $attachments[] = $newAttachment;
 
       $attachments[] = $newAttachment;
 
     }
 
     }
 
-  
+
 
    if (!isset($mailbox) || $mailbox == "" || ($mailbox == "None"))
 
    if (!isset($mailbox) || $mailbox == "" || ($mailbox == "None"))
 
       $mailbox = "INBOX";
 
       $mailbox = "INBOX";
 
 
 
@@ -435,7 +436,7 @@
 
          // We'll change them to \r\n later (in the sendMessage function)
 
          // We'll change them to \r\n later (in the sendMessage function)
 
          $body = str_replace("\r\n", "\n", $body);
 
          $body = str_replace("\r\n", "\n", $body);
 
          $body = str_replace("\r", "\n", $body);
 
          $body = str_replace("\r", "\n", $body);
 
-         
+
 
          // Rewrap $body so that no line is bigger than $editor_size
 
          // Rewrap $body so that no line is bigger than $editor_size
 
          // This should only really kick in the sqWordWrap function
 
          // This should only really kick in the sqWordWrap function
 
          // if the browser doesn't support "HARD" as the wrap type
 
          // if the browser doesn't support "HARD" as the wrap type
 
@@ -453,23 +454,23 @@
 
             }
 
             }
 
          }
 
          }
 
          $body = $newBody;
 
          $body = $newBody;
 
-         
+
 
          do_hook("compose_send");
 
          do_hook("compose_send");
 
-         
+
 
          if (! sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id)) {
 
          if (! sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id)) {
 
-            showInputForm(); 
+            showInputForm();
 
             exit();
 
             exit();
 
          }
 
          }
 
          Header("Location: right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=1");
 
          Header("Location: right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=1");
 
       } else {
 
       } else {
 
          //$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
          //$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
          displayPageHeader($color, $mailbox);
 
          displayPageHeader($color, $mailbox);
 
-         
+
 
          if (isset($AttachFailure))
 
          if (isset($AttachFailure))
 
              plain_error_message(_("Could not move/copy file. File not attached"), $color);
 
              plain_error_message(_("Could not move/copy file. File not attached"), $color);
 
 
 
          checkInput(true);
 
          checkInput(true);
 
-         
+
 
          showInputForm();
 
          showInputForm();
 
          //sqimap_logout($imapConnection);
 
          //sqimap_logout($imapConnection);
 
       }
 
       }
 
@@ -495,7 +496,7 @@
 
        }
 
        }
 
          }
 
          }
 
       }
 
       }
 
-      
+
 
       showInputForm();
 
       showInputForm();
 
    } else if (isset($html_addr_search)) {
 
    } else if (isset($html_addr_search)) {
 
       if (isset($HTTP_POST_FILES['attachfile']) &&
 
       if (isset($HTTP_POST_FILES['attachfile']) &&
 
@@ -529,7 +530,7 @@
 
    } else {
 
    } else {
 
       // This handles the default case as well as the error case
 
       // This handles the default case as well as the error case
 
       // (they had the same code) --> if (isset($smtpErrors))
 
       // (they had the same code) --> if (isset($smtpErrors))
 
-      $imapConnection = sqimap_login($username, $key, $imapServerAddress, 
+      $imapConnection = sqimap_login($username, $key, $imapServerAddress,
 
           $imapPort, 0);
 
           $imapPort, 0);
 
       displayPageHeader($color, $mailbox);
 
       displayPageHeader($color, $mailbox);
 
 
 
@@ -539,21 +540,21 @@
 
 
 
       if (isset($forward_id) && $forward_id && isset($ent_num) && $ent_num)
 
       if (isset($forward_id) && $forward_id && isset($ent_num) && $ent_num)
 
           getAttachments(0);
 
           getAttachments(0);
 
-              
+
 
       newMail();
 
       newMail();
 
       showInputForm();
 
       showInputForm();
 
       sqimap_logout($imapConnection);
 
       sqimap_logout($imapConnection);
 
    }
 
    }
 
-   
+
 
    function ClearAttachments() {
 
    function ClearAttachments() {
 
        global $attachments, $attachment_dir;
 
        global $attachments, $attachment_dir;
 
-       
+
 
        foreach ($attachments as $info) {
 
        foreach ($attachments as $info) {
 
            if (file_exists($attachment_dir . $info['localfilename'])) {
 
            if (file_exists($attachment_dir . $info['localfilename'])) {
 
                unlink($attachment_dir . $info['localfilename']);
 
                unlink($attachment_dir . $info['localfilename']);
 
            }
 
            }
 
        }
 
        }
 
-       
+
 
        $attachments = array();
 
        $attachments = array();
 
    }
 
    }
 
 
 
@@ -584,5 +585,5 @@
 
 
 
       /* Build and return the citation string. */
 
       /* Build and return the citation string. */
 
       return ($start . $orig_from . $end . "\n");
 
       return ($start . $orig_from . $end . "\n");
 
-   }   
+   }
 
 ?>
 
 ?>

+ 2 - 2
src/folders_create.php
View File 

@@ -5,7 +5,7 @@
 
     **  Copyright (c) 1999-2000 The SquirrelMail development team
 
     **  Copyright (c) 1999-2000 The SquirrelMail development team
 
     **  Licensed under the GNU GPL. For full terms see the file COPYING.
 
     **  Licensed under the GNU GPL. For full terms see the file COPYING.
 
     **
 
     **
 
-    **  Creates folders on the IMAP server. 
+    **  Creates folders on the IMAP server.
 
     **  Called from folders.php
 
     **  Called from folders.php
 
     **
 
     **
 
     **  $Id$
 
     **  $Id$
 
@@ -20,7 +20,7 @@
 
 
 
    if (strpos($folder_name, "\"") || strpos($folder_name, "\\") ||
 
    if (strpos($folder_name, "\"") || strpos($folder_name, "\\") ||
 
        strpos($folder_name, "'") || strpos($folder_name, "$dm")) {
 
        strpos($folder_name, "'") || strpos($folder_name, "$dm")) {
 
-		print "<html><body bgcolor=$color[4]>";
 
+      echo "<html><body bgcolor=$color[4]>";
 
       plain_error_message(_("Illegal folder name.  Please select a different name.")."<BR><A HREF=\"../src/folders.php\">"._("Click here to go back")."</A>.", $color);
 
       plain_error_message(_("Illegal folder name.  Please select a different name.")."<BR><A HREF=\"../src/folders.php\">"._("Click here to go back")."</A>.", $color);
 
       sqimap_logout($imapConnection);
 
       sqimap_logout($imapConnection);
 
       exit;
 
       exit;

+ 2 - 2
src/login.php
View File 

@@ -83,11 +83,11 @@
 
 			   
 			   
    if ($theme_css != "")
 
    if ($theme_css != "")
 
        echo "<LINK REL=\"stylesheet\" TYPE=\"text/css\" HREF=\"$theme_css\">\n";
 
        echo "<LINK REL=\"stylesheet\" TYPE=\"text/css\" HREF=\"$theme_css\">\n";
 
-	 
+
 
    echo '<TITLE>';
 
    echo '<TITLE>';
 
    echo $org_name . ' - ' . _("Login");
 
    echo $org_name . ' - ' . _("Login");
 
    echo "</TITLE></HEAD>\n";
 
    echo "</TITLE></HEAD>\n";
 
-   echo "<BODY TEXT=000000 BGCOLOR=#FFFFFF LINK=0000CC VLINK=0000CC ALINK=0000CC>\n";
 
+   echo "<BODY TEXT=#000000 BGCOLOR=#FFFFFF LINK=#0000CC VLINK=#0000CC ALINK=#0000CC onLoad='document.forms[0].elements[0].focus();'>\n";
 
    echo "<FORM ACTION=\"redirect.php\" METHOD=\"POST\" NAME=f>\n";
 
    echo "<FORM ACTION=\"redirect.php\" METHOD=\"POST\" NAME=f>\n";
 
    
    
    $username_form_name = 'login_username';
 
    $username_form_name = 'login_username';

+ 13 - 13
src/redirect.php
View File 

@@ -32,12 +32,12 @@
 
    session_unregister ('user_is_logged_in');
 
    session_unregister ('user_is_logged_in');
 
    session_register ('base_uri');
 
    session_register ('base_uri');
 
 
 
-   if (! isset($squirrelmail_language)) 
+   if (! isset($squirrelmail_language))
 
       $squirrelmail_language = '';
 
       $squirrelmail_language = '';
 
    set_up_language($squirrelmail_language, true);
 
    set_up_language($squirrelmail_language, true);
 
-   
+
 
    if(!isset($login_username)) {
 
    if(!isset($login_username)) {
 
-      echo "<html><body bgcolor=\"ffffff\">\n";
 
+      echo "<html><body bgcolor=\"#ffffff\">\n";
 
       echo "<br><br>";
 
       echo "<br><br>";
 
       echo "<center>";
 
       echo "<center>";
 
       echo "<b>"._("You must be logged in to access this page.")."</b><br>";
 
       echo "<b>"._("You must be logged in to access this page.")."</b><br>";
 
@@ -68,16 +68,16 @@
 
           $login_username = strtolower($login_username);
 
           $login_username = strtolower($login_username);
 
 
 
       $imapConnection = sqimap_login($login_username, $key, $imapServerAddress, $imapPort, 0);
 
       $imapConnection = sqimap_login($login_username, $key, $imapServerAddress, $imapPort, 0);
 
-	  if (!$imapConnection) {
 
-             echo "<html><body bgcolor=\"ffffff\">\n";
 
-	     echo "<br><br>";
 
-	     echo "<center>";
 
-	     echo "<b>"._("There was an error contacting the mail server.")."</b><br>";
 
-	     echo _("Contact your administrator for help.")."\n";
 
-	     echo "</center>";
 
-	     echo "</body></html>\n";
 
-	     exit;
 
-	  }
 
+      if (!$imapConnection) {
 
+         echo "<html><body bgcolor=\"#ffffff\">\n";
 
+         echo "<br><br>";
 
+         echo "<center>";
 
+         echo "<b>"._("There was an error contacting the mail server.")."</b><br>";
 
+         echo _("Contact your administrator for help.")."\n";
 
+         echo "</center>";
 
+         echo "</body></html>\n";
 
+         exit;
 
+      }
 
       sqimap_logout($imapConnection);
 
       sqimap_logout($imapConnection);
 
 
 
       $username = $login_username;
 
       $username = $login_username;

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5