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

* Moved load_prefs.php and display_page.php (or whatever it is called) into
validate.php
* validate.php now sets up the language
* Any errors? Call 1-800-cvs-commit

Tyler Akins 24 years ago
parent
8aa8ed31c7
commit
36cf35b7f1
31 changed files with 19 additions and 70 deletions
Split View Show Diff Stats
  1. 0 4
      src/addrbook_popup.php
  2. 0 2
      src/addrbook_search.php
  3. 0 2
      src/addrbook_search_html.php
  4. 0 3
      src/addressbook.php
  5. 0 2
      src/compose.php
  6. 0 2
      src/delete_message.php
  7. 0 3
      src/download.php
  8. 0 2
      src/empty_trash.php
  9. 0 2
      src/folders.php
  10. 0 2
      src/folders_create.php
  11. 0 2
      src/folders_delete.php
  12. 0 2
      src/folders_rename_do.php
  13. 0 2
      src/folders_rename_getname.php
  14. 0 2
      src/folders_subscribe.php
  15. 0 2
      src/help.php
  16. 0 2
      src/left_main.php
  17. 9 5
      src/login.php
  18. 0 2
      src/move_messages.php
  19. 0 2
      src/options.php
  20. 0 2
      src/options_display.php
  21. 0 2
      src/options_folder.php
  22. 0 2
      src/options_highlight.php
  23. 0 2
      src/options_identities.php
  24. 0 2
      src/options_order.php
  25. 0 2
      src/options_personal.php
  26. 0 2
      src/read_body.php
  27. 3 0
      src/redirect.php
  28. 0 6
      src/right_main.php
  29. 0 2
      src/search.php
  30. 0 2
      src/signout.php
  31. 7 1
      src/validate.php

+ 0 - 4
src/addrbook_popup.php
View File 

@@ -11,11 +11,7 @@
 
     **/
 
 
    include('../src/validate.php');
 
-   include('../functions/page_header.php');
 
    include('../functions/addressbook.php');
 
-   include('../src/load_prefs.php');
 
-   
-   set_up_language(getPref($data_dir, $username, 'language'));
 
    
 ?>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">

+ 0 - 2
src/addrbook_search.php
View File 

@@ -130,9 +130,7 @@ function bcc_address($addr) {
 
 
    include('../functions/array.php');
 
    include('../functions/strings.php');
 
-   include('../functions/page_header.php');
 
    include('../functions/addressbook.php');
 
-   include('../src/load_prefs.php');
 
 
    displayHtmlHeader();

+ 0 - 2
src/addrbook_search_html.php
View File 

@@ -17,13 +17,11 @@
 
     **/
 
 
    include('../src/validate.php');
 
-   include('../functions/page_header.php');
 
    include('../functions/date.php');
 
    include('../functions/smtp.php');
 
    include('../functions/display_messages.php');
 
    include('../functions/addressbook.php');
 
    include('../functions/plugin.php');
 
-   include('../src/load_prefs.php');
 
 
    // Insert hidden data
 
    function addr_insert_hidden() {

+ 0 - 3
src/addressbook.php
View File 

@@ -12,7 +12,6 @@
 
 
    include('../src/validate.php');
 
    include('../functions/array.php');
 
-   include('../functions/page_header.php');
 
    include('../functions/display_messages.php');
 
    include('../functions/addressbook.php');
 
 
@@ -76,8 +75,6 @@
 
    }
 
 
 
-   include('../src/load_prefs.php');
 
-
 
    // Open addressbook, with error messages on but without LDAP (the
 
    // second "true"). Don't need LDAP here anyway
 
    $abook = addressbook_init(true, true);

+ 0 - 2
src/compose.php
View File 

@@ -16,14 +16,12 @@
 
     **/
 
 
    include('../src/validate.php');
 
-   include("../functions/page_header.php");
 
    include("../functions/imap.php");
 
    include("../functions/date.php");
 
    include("../functions/mime.php");
 
    include("../functions/smtp.php");
 
    include("../functions/display_messages.php");
 
    include ("../functions/plugin.php");
 
-   include("../src/load_prefs.php");
 
 
    if (!isset($attachments))
 
    {

+ 0 - 2
src/delete_message.php
View File 

@@ -11,10 +11,8 @@
 
     **/
 
 
    include("../src/validate.php");
 
-   include("../functions/page_header.php");
 
    include("../functions/display_messages.php");
 
    include("../functions/imap.php");
 
-   include("../src/load_prefs.php");
 
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
    sqimap_mailbox_select($imapConnection, $mailbox);

+ 0 - 3
src/download.php
View File 

@@ -17,7 +17,6 @@
 
    include("../functions/imap.php");
 
    include("../functions/mime.php");
 
    include("../functions/date.php");
 
-   include("../src/load_prefs.php");
 
 
    header("Pragma: ");
 
    header("Cache-Control: cache");
 
@@ -144,7 +143,6 @@
 
             if ($type1 == "plain" || $type1 == "html") {
 
                 $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id);
 
                 $body = decodeBody($body, $header->encoding);
 
-                include("../functions/page_header.php");
 
                 viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at);
 
             } else {
 
 		DumpHeaders($type0, $type1, $filename, 0);
 
@@ -156,7 +154,6 @@
 
          case "message":
 
             $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id);
 
             $body = decodeBody($body, $header->encoding);
 
-            include("../functions/page_header.php");
 
             viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at);
 
             break;
 
          default:

+ 0 - 2
src/empty_trash.php
View File 

@@ -12,12 +12,10 @@
 
     **/
 
 
    include('../src/validate.php');
 
-   include("../functions/page_header.php");
 
    include("../functions/display_messages.php");
 
    include("../functions/imap.php");
 
    include("../functions/array.php");
 
    include("../functions/tree.php");
 
-   include("../src/load_prefs.php");
 
 
    $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);

+ 0 - 2
src/folders.php
View File 

@@ -13,11 +13,9 @@
 
     **/
 
 
    include('../src/validate.php');
 
-   include("../functions/page_header.php");
 
    include("../functions/imap.php");
 
    include("../functions/array.php");
 
    include("../functions/plugin.php");
 
-   include("../src/load_prefs.php");
 
 
    displayPageHeader($color, _("None"));

+ 0 - 2
src/folders_create.php
View File 

@@ -12,10 +12,8 @@
 
     **/
 
 
    include('../src/validate.php');
 
-   include("../functions/page_header.php");
 
    include("../functions/imap.php");
 
    include("../functions/display_messages.php");
 
-   include("../src/load_prefs.php");
 
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
    $dm = sqimap_get_delimiter($imapConnection);

+ 0 - 2
src/folders_delete.php
View File 

@@ -12,11 +12,9 @@
 
     **/
 
 
    include('../src/validate.php');
 
-   include("../functions/page_header.php");
 
    include("../functions/imap.php");
 
    include("../functions/array.php");
 
    include("../functions/tree.php");
 
-   include("../src/load_prefs.php");
 
 
    /*
 
    *  Incoming values:

+ 0 - 2
src/folders_rename_do.php
View File 

@@ -12,9 +12,7 @@
 
     **/
 
 
    include("../src/validate.php");
 
-   include("../functions/page_header.php");
 
    include("../functions/imap.php");
 
-   include("../src/load_prefs.php");
 
 
 
    if($old_name == $new_name) {

+ 0 - 2
src/folders_rename_getname.php
View File 

@@ -12,9 +12,7 @@
 
     **/
 
 
    include('../src/validate.php');
 
-   include("../functions/page_header.php");
 
    include("../functions/imap.php");
 
-   include("../src/load_prefs.php");
 
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);

+ 0 - 2
src/folders_subscribe.php
View File 

@@ -12,10 +12,8 @@
 
     **/
 
 
    include ('../src/validate.php');
 
-   include("../functions/page_header.php");
 
    include("../functions/imap.php");
 
    include("../functions/display_messages.php");
 
-   include("../src/load_prefs.php");
 
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
    $dm = sqimap_get_delimiter($imapConnection);

+ 0 - 2
src/help.php
View File 

@@ -11,11 +11,9 @@
 
     **/
 
 
    include('../src/validate.php');
 
-   include("../functions/page_header.php");
 
    include("../functions/display_messages.php");
 
    include("../functions/imap.php");
 
    include("../functions/array.php");
 
-   include("../src/load_prefs.php");
 
 
 
    displayPageHeader($color, "None");

+ 0 - 2
src/left_main.php
View File 

@@ -13,9 +13,7 @@
 
    include('../src/validate.php');
 
    include("../functions/array.php");
 
    include("../functions/imap.php");
 
-   include("../functions/page_header.php");
 
    include("../functions/plugin.php");
 
-   include("../src/load_prefs.php");
 
 
    // open a connection on the imap port (143)
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); // the 10 is to hide the output

+ 9 - 5
src/login.php
View File 

@@ -11,6 +11,14 @@
 
     **  $Id$
 
     **/
 
 
+   $rcptaddress = '';
 
+   if (isset($emailaddress)) {
 
+      if (stristr($emailaddress, 'mailto:'))
 
+         $rcptaddress = substr($emailaddress, 7);
 
+      else
 
+         $rcptaddress = $emailaddress;
 
+   }
 
+
 
    include("../functions/strings.php");
 
    include("../config/config.php");
 
    include('../functions/i18n.php');
 
@@ -77,11 +85,7 @@
 
    echo "               </TD><TD WIDTH=* ALIGN=left>\n";
 
    echo "                  <INPUT TYPE=PASSWORD NAME=\"$password_form_name\">\n";
 
    echo "               </TD>\n";
 
-   if (isset($emailaddress)) {
 
-      if (stristr($emailaddress,"mailto:"))
 
-         $rcptaddress = substr ($emailaddress, 7,strlen($emailaddress)-7);
 
-      else
 
-         $rcptaddress = $emailaddress;
 
+   if ($rcptaddress != '') {
 
       echo "               <INPUT TYPE=HIDDEN NAME=\"rcptemail\" VALUE=\"".htmlspecialchars($rcptaddress)."\">\n";
 
    }
 
    echo "         </TABLE>\n";

+ 0 - 2
src/move_messages.php
View File 

@@ -11,10 +11,8 @@
 
     **/
 
 
    include('../src/validate.php');
 
-   include("../functions/page_header.php");
 
    include("../functions/display_messages.php");
 
    include("../functions/imap.php");
 
-   include("../src/load_prefs.php");
 
 
    function putSelectedMessagesIntoString($msg) {
 
       $j = 0;

+ 0 - 2
src/options.php
View File 

@@ -12,7 +12,6 @@
 
     **/
 
 
    include('../src/validate.php');
 
-   include('../functions/page_header.php');
 
    include('../functions/display_messages.php');
 
    include('../functions/imap.php');
 
    include('../functions/array.php');
 
@@ -22,7 +21,6 @@
 
       $squirrelmail_language = $language;
 
    }   
 
-   include('../src/load_prefs.php');
 
    displayPageHeader($color, _("None"));
 
 
 ?>

+ 0 - 2
src/options_display.php
View File 

@@ -11,12 +11,10 @@
 
     **/
 
 
    include('../src/validate.php');
 
-   include('../functions/page_header.php');
 
    include('../functions/display_messages.php');
 
    include('../functions/imap.php');
 
    include('../functions/array.php');
 
    include('../functions/plugin.php');
 
-   include('../src/load_prefs.php');
 
    
    displayPageHeader($color, 'None');
 
    $chosen_language = getPref($data_dir, $username, 'language');

+ 0 - 2
src/options_folder.php
View File 

@@ -11,12 +11,10 @@
 
     **/
 
 
    include('../src/validate.php');
 
-   include('../functions/page_header.php');
 
    include('../functions/display_messages.php');
 
    include('../functions/imap.php');
 
    include('../functions/array.php');
 
    include('../functions/plugin.php');
 
-   include('../src/load_prefs.php');
 
    
    displayPageHeader($color, 'None');

+ 0 - 2
src/options_highlight.php
View File 

@@ -11,7 +11,6 @@
 
     **/
 
 
    include('../src/validate.php');
 
-   include('../functions/page_header.php');
 
    include('../functions/display_messages.php');
 
    include('../functions/imap.php');
 
    include('../functions/array.php');
 
@@ -47,7 +46,6 @@
 
       $message_highlight_list[$theid]['value'] = $value;
 
       $message_highlight_list[$theid]['match_type'] = $match_type;
 
    } 
-   include('../src/load_prefs.php');
 
    displayPageHeader($color, 'None');
 
 ?>
 
    <br>

+ 0 - 2
src/options_identities.php
View File 

@@ -6,9 +6,7 @@
 
     **/
 
 
    include('../src/validate.php');
 
-   include('../functions/page_header.php');
 
    include('../functions/display_messages.php');
 
-   include('../src/load_prefs.php');
 
 
    if (isset($return)) {
 
       SaveUpdateFunction();

+ 0 - 2
src/options_order.php
View File 

@@ -11,7 +11,6 @@
 
     **/
 
 
    include('../src/validate.php');
 
-   include('../functions/page_header.php');
 
    include('../functions/display_messages.php');
 
    include('../functions/imap.php');
 
    include('../functions/array.php');
 
@@ -23,7 +22,6 @@
 
       removePref($data_dir, $username, "highlight$theid");
 
    } else if ($action == 'save') {
 
    } 
-   include('../src/load_prefs.php');
 
    displayPageHeader($color, 'None');
 
 ?>
 
    <br>

+ 0 - 2
src/options_personal.php
View File 

@@ -11,12 +11,10 @@
 
     **/
 
 
    include('../src/validate.php');
 
-   include('../functions/page_header.php');
 
    include('../functions/display_messages.php');
 
    include('../functions/imap.php');
 
    include('../functions/array.php');
 
    include('../functions/plugin.php');
 
-   include('../src/load_prefs.php');
 
    
    displayPageHeader($color, 'None');

+ 0 - 2
src/read_body.php
View File 

@@ -12,12 +12,10 @@
 
    **/
 
 
    include("../src/validate.php");
 
-   include('../functions/page_header.php');
 
    include('../functions/imap.php');
 
    include('../functions/mime.php');
 
    include('../functions/date.php');
 
    include('../functions/url_parser.php');
 
-   include('../src/load_prefs.php');
 
    
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
    sqimap_mailbox_select($imapConnection, $mailbox);

+ 3 - 0
src/redirect.php
View File 

@@ -33,6 +33,9 @@
 
    session_register ('base_uri');
 
 
    if(!isset($login_username)) {
 
+      if (! isset($squirrelmail_language)) 
+         $squirrelmail_language = '';
 
+      set_up_language($squirrelmail_language, true);
 
       echo "<html><body bgcolor=\"ffffff\">\n";
 
       echo "<br><br>";
 
       echo "<center>";

+ 0 - 6
src/right_main.php
View File 

@@ -14,14 +14,11 @@
 
    include('../src/validate.php');
 
    include('../functions/imap.php');
 
    include('../functions/date.php');
 
-   include('../functions/page_header.php');
 
    include('../functions/array.php');
 
    include('../functions/mime.php');
 
    include('../functions/mailbox_display.php');
 
    include('../functions/display_messages.php');
 
 
-?>
 
-<?php
 
    /////////////////////////////////////////////////////////////////////////////////
 
    //
 
    // incoming variables from URL:
 
@@ -40,9 +37,6 @@
 
    // open a connection on the imap port (143)
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
 
-   /** If it was a successful login, lets load their preferences **/
 
-   include('../src/load_prefs.php');
 
-
 
    if (isset($newsort) && $newsort != $sort) {
 
       setPref($data_dir, $username, 'sort', $newsort);
 
    }

+ 0 - 2
src/search.php
View File 

@@ -3,11 +3,9 @@
 
    /* $Id$ */
 
 
    include('../src/validate.php');
 
-   include('../functions/page_header.php');
 
    include('../functions/imap.php');
 
    include('../functions/imap_search.php');
 
    include('../functions/array.php');
 
-   include('../src/load_prefs.php');
 
 
    displayPageHeader($color, $mailbox);
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);

+ 0 - 2
src/signout.php
View File 

@@ -12,7 +12,6 @@
 
     **/
 
 
    include('../src/validate.php');
 
-   include ('../src/load_prefs.php');
 
    include ('../functions/prefs.php');
 
    include ('../functions/plugin.php');
 
 
@@ -25,7 +24,6 @@
 
            unlink($attachment_dir . $info['localfilename']);
 
        }
 
    }
 
-   set_up_language(getPref($data_dir, $username, 'language'));
 
 
    // If a user hits reload on the last page, $base_uri isn't set
 
    // because it was deleted with the session.

+ 7 - 1
src/validate.php
View File 

@@ -104,5 +104,11 @@
 
    // variables overwrite any passed in variables (for security)
 
    include ('../functions/strings.php');
 
    include ('../config/config.php');
 
-   
+   include ('../src/load_prefs.php');
 
+   include ('../functions/page_header.php');
 
+
 
+   // Set up the language
 
+   // i18n.php was included by auth.php
 
+   global $username, $data_dir;
 
+   set_up_language(getPref($data_dir, $username, 'language'));
 
 ?>

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