projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8ddd44c)
changed some error messages to be formatted, and actually meaningful
authorlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Sat, 13 Jan 2001 16:01:43 +0000 (16:01 +0000)
committerlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Sat, 13 Jan 2001 16:01:43 +0000 (16:01 +0000)
(didn't break string freeze)

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

ChangeLog patch | blob | blame | history
src/addrbook_search.php patch | blob | blame | history
src/left_main.php patch | blob | blame | history
src/right_main.php patch | blob | blame | history
src/search.php patch | blob | blame | history
src/webmail.php patch | blob | blame | history

diff --git a/ChangeLog b/ChangeLog
index 8477e515b67b2fc820fd86fdf8f5ddad226a535f..21ee6689ffcccf8f3d70603f415a109d1a271cdd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Version 1.0pre2 -- DEVELOPMENT
 ------------------------------
+- Replaced error messages with better, formatted, and meaningful messages.
+- Fixed "reply all" so that it works intelligently now
 - Made deleted (but not expunged) messages easier to detect (only if $auto_expunge = false)
 - Fixed bug that didn't display size correctly in search results
 - Major memory management and speed improvements with downloading of attachments
diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index 3205e4a4478b9d8afb14a6f4379eca774fe880cb..55dc5cae61b509b4a694783bcdee8e52f06bf408 100644 (file)
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -129,17 +129,17 @@ function bcc_address($addr) {
    if (!isset($i18n_php))
       include("../functions/i18n.php");
 
-   if(!isset($logged_in)) {
-      set_up_language($squirrelmail_language, true);
-      echo _("You must login first.");
+   if(!isset($logged_in) || !isset($username) || !isset($key)) {
+      include ("../themes/default_theme.php");
+      include ("../functions/display_messages.php");
+      printf('<html><BODY TEXT="%s" BGCOLOR="%s" LINK="%s" VLINK="%s" ALINK="%s">',
+              $color[8], $color[4], $color[7], $color[7], $color[7]);
+      plain_error_message(_("You need a valid user and password to access this page!")
+                          . "<br><a href=\"../src/login.php\">"
+                          . _("Click here to log back in.") . "</a>.", $color);
+      echo "</body></html>";
       exit;
    }
-   if(!isset($username) || !isset($key)) {
-      set_up_language($squirrelmail_language, true);
-      echo _("You need a valid user and password to access this page!");
-      exit;
-   }
-
    if (!isset($config_php))
       include("../config/config.php");
    if (!isset($array_php))
diff --git a/src/left_main.php b/src/left_main.php
index 8d823baeb47453d14b05b3c6bd3193f0200fb182..6a0825ebc22aed1c2f3f79e9f166f4ab73550cde 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -16,7 +16,10 @@
 
    if(!isset($username)) {
       set_up_language($squirrelmail_language, true);
-      echo "You need a valid user and password to access this page!";
+         include ("../themes/default_theme.php");
+         printf('<html><BODY TEXT="%s" BGCOLOR="%s" LINK="%s" VLINK="%s" ALINK="%s">',
+                         $color[8], $color[4], $color[7], $color[7], $color[7]);
+         echo "</body></html>";
       exit;
    }
 
diff --git a/src/right_main.php b/src/right_main.php
index 3f6bba8add1da97b841942b086e96f7139d62c4c..955faf64ae84274ace6a1c8a036924c84e2bdeef 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -15,14 +15,15 @@
 
    session_start();
 
-   if(!isset($logged_in)) {
-      set_up_language($squirrelmail_language, true);
-      echo _("You must login first.");
-      exit;
-   }
-   if(!isset($username) || !isset($key)) {
-      set_up_language($squirrelmail_language, true);
-      echo _("You need a valid user and password to access this page!");
+   if(!isset($logged_in) || !isset($username) || !isset($key)) {
+      include ("../themes/default_theme.php");
+      include ("../functions/display_messages.php");
+      printf('<html><BODY TEXT="%s" BGCOLOR="%s" LINK="%s" VLINK="%s" ALINK="%s">',
+              $color[8], $color[4], $color[7], $color[7], $color[7]);
+      plain_error_message(_("You need a valid user and password to access this page!")
+                          . "<br><a href=\"../src/login.php\">"
+                          . _("Click here to log back in.") . "</a>.", $color);
+      echo "</body></html>";
       exit;
    }
 
diff --git a/src/search.php b/src/search.php
index 03945730b8b7ccaedf6a305e1a1cc93399a5b07e..570c5c7c6801cfaa44722e3d090c925dc5df0a6d 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -7,8 +7,14 @@
       exit;
    }
    if(!isset($username) || !isset($key)) {
-      set_up_language($squirrelmail_language, true);
-      echo _("You need a valid user and password to access this page!");
+      include ("../themes/default_theme.php");
+      include ("../functions/display_messages.php");
+      printf('<html><BODY TEXT="%s" BGCOLOR="%s" LINK="%s" VLINK="%s" ALINK="%s">',
+              $color[8], $color[4], $color[7], $color[7], $color[7]);
+      plain_error_message(_("You need a valid user and password to access this page!")
+                          . "<br><a href=\"../src/login.php\">"
+                          . _("Click here to log back in.") . "</a>.", $color);
+      echo "</body></html>";
       exit;
    }
 
diff --git a/src/webmail.php b/src/webmail.php
index 89b2536a7ae1dc216302d642cca6ed66a2ec7758..704d65499e52edcf25e5cbd1d834e9bd6ac8fb97 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -19,7 +19,14 @@
 
    if(!isset($username)) {
       set_up_language($squirrelmail_language);
-      echo _("You need a valid user and password to access this page!");
+         include ("../themes/default_theme.php");
+         include ("../functions/display_messages.php");
+         printf('<html><BODY TEXT="%s" BGCOLOR="%s" LINK="%s" VLINK="%s" ALINK="%s">',
+                         $color[8], $color[4], $color[7], $color[7], $color[7]);
+         plain_error_message(_("You need a valid user and password to access this page!") 
+                             . "<br><a href=\"../src/login.php\">" 
+                                                 . _("Click here to log back in.") . "</a>.", $color);
+         echo "</body></html>";
       exit;
    }
 
Unnamed repository; edit this file 'description' to name the repository.