We use cookies to ensure you get the best experience on our website
Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
0ct0pu5
/
squirrelmail
1
0
Fork 0
Tiedostot Ongelmat 0 Pull-pyynnöt 0 Wiki
Selaa lähdekoodia

Part 1 of switch to use of SM_PATH with require_once.

Feel free to convert things in functions/, class/, plugins/, etc too. I
have everything in src/ done.
thomppj 23 vuotta sitten
vanhempi
b68dcd3ebc
commit
73e0d0220c
41 muutettua tiedostoa jossa 442 lisäystä ja 265 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 6 2
      src/addrbook_popup.php
  2. 7 3
      src/addrbook_search.php
  3. 12 8
      src/addrbook_search_html.php
  4. 10 6
      src/addressbook.php
  5. 17 13
      src/compose.php
  6. 7 3
      src/delete_message.php
  7. 7 3
      src/download.php
  8. 5 1
      src/draft_actions.php
  9. 9 5
      src/empty_trash.php
  10. 10 6
      src/folders.php
  11. 7 3
      src/folders_create.php
  12. 9 6
      src/folders_delete.php
  13. 6 2
      src/folders_rename_do.php
  14. 7 3
      src/folders_rename_getname.php
  15. 7 3
      src/folders_subscribe.php
  16. 8 4
      src/help.php
  17. 9 5
      src/image.php
  18. 10 6
      src/left_main.php
  19. 8 4
      src/load_prefs.php
  20. 12 8
      src/login.php
  21. 9 4
      src/move_messages.php
  22. 11 7
      src/options.php
  23. 5 1
      src/options_folder.php
  24. 11 7
      src/options_highlight.php
  25. 8 4
      src/options_identities.php
  26. 10 6
      src/options_order.php
  27. 6 2
      src/options_personal.php
  28. 11 7
      src/printer_friendly_bottom.php
  29. 6 2
      src/printer_friendly_main.php
  30. 10 6
      src/printer_friendly_top.php
  31. 14 10
      src/read_body.php
  32. 15 11
      src/redirect.php
  33. 9 5
      src/retrievalerror.php
  34. 12 8
      src/right_main.php
  35. 10 6
      src/search.php
  36. 11 7
      src/signout.php
  37. 13 9
      src/validate.php
  38. 9 5
      src/vcard.php
  39. 9 4
      src/view_header.php
  40. 68 52
      src/view_text.php
  41. 12 8
      src/webmail.php

+ 6 - 2
src/addrbook_popup.php
Näytä tiedosto 

@@ -11,8 +11,12 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/addressbook.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/addressbook.php');
 
    
 ?>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">

+ 7 - 3
src/addrbook_search.php
Näytä tiedosto 

@@ -15,9 +15,13 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/strings.php');
 
-require_once('../functions/html.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/strings.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
 
 /* Function to include JavaScript code */
 
 function insert_javascript() {

+ 12 - 8
src/addrbook_search_html.php
Näytä tiedosto 

@@ -17,14 +17,18 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/date.php');
 
-require_once('../functions/smtp.php');
 
-require_once('../functions/display_messages.php');
 
-require_once('../functions/addressbook.php');
 
-require_once('../functions/plugin.php');
 
-require_once('../functions/strings.php');
 
-require_once('../functions/html.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/date.php');
 
+require_once(SM_PATH . 'functions/smtp.php');
 
+require_once(SM_PATH . 'functions/display_messages.php');
 
+require_once(SM_PATH . 'functions/addressbook.php');
 
+require_once(SM_PATH . 'functions/plugin.php');
 
+require_once(SM_PATH . 'functions/strings.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
 
 /* Insert hidden data */
 
 function addr_insert_hidden() {

+ 10 - 6
src/addressbook.php
Näytä tiedosto 

@@ -11,12 +11,16 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/array.php');
 
-require_once('../functions/display_messages.php');
 
-require_once('../functions/addressbook.php');
 
-require_once('../functions/strings.php');
 
-require_once('../functions/html.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/array.php');
 
+require_once(SM_PATH . 'functions/display_messages.php');
 
+require_once(SM_PATH . 'functions/addressbook.php');
 
+require_once(SM_PATH . 'functions/strings.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
 
 /* Make an input field */
 
 function adressbook_inp_field($label, $field, $name, $size, $values, $add) {

+ 17 - 13
src/compose.php
Näytä tiedosto 

@@ -17,14 +17,18 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/date.php');
 
-require_once('../functions/mime.php');
 
-//require_once('../functions/smtp.php');
 
-require_once('../functions/plugin.php');
 
-require_once('../functions/display_messages.php');
 
-require_once('../class/deliver/Deliver.class.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/date.php');
 
+require_once(SM_PATH . 'functions/mime.php');
 
+//require_once(SM_PATH . 'functions/smtp.php');
 
+require_once(SM_PATH . 'functions/plugin.php');
 
+require_once(SM_PATH . 'functions/display_messages.php');
 
+require_once(SM_PATH . 'class/deliver/Deliver.class.php');
 
 
 /* --------------------- Specific Functions ------------------------------ */
 
 
@@ -1206,7 +1210,7 @@ function sendMessage($composeMessage, $draft=false) {
 
     $composeMessage->rfc822_header = $rfc822_header;
 
 
     if (!$useSendmail && !$draft) {
 
-	require_once('../class/deliver/Deliver_SMTP.class.php');
 
+	require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
 
 	$deliver = new Deliver_SMTP();
 
 	global $smtpServerAddress, $smtpPort, $use_authenticated_smtp, $pop_before_smtp;
 
 	if ($use_authenticated_smtp) {
 
@@ -1221,18 +1225,18 @@ function sendMessage($composeMessage, $draft=false) {
 
 	$stream = $deliver->initStream($composeMessage,$domain,0,
 
 	                  $smtpServerAddress, $smtpPort, $authPop);
 
     } elseif (!$draft) {
 
-       require_once('../class/deliver/Deliver_SendMail.class.php');
 
+       require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php');
 
        global $sendmail_path;
 
        $deliver = new Deliver_SendMail();
 
        $stream = $deliver->initStream($composeMessage,$sendmail_path);
 
     } elseif ($draft) {
 
        global $draft_folder;
 
-       require_once('../class/deliver/Deliver_IMAP.class.php');
 
+       require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
 
        $imap_deliver = new Deliver_IMAP();
 
        $imap_stream = sqimap_login($username, $key, $imapServerAddress,
 
                       $imapPort, 0);
 
        if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) {
 
-	    require_once('../class/deliver/Deliver_IMAP.class.php');
 
+	    require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
 
 	    $imap_deliver = new Deliver_IMAP();
 
 	    $length = $imap_deliver->mail($composeMessage);
 
 	    sqimap_append ($imap_stream, $draft_folder, $length);	 
@@ -1258,7 +1262,7 @@ function sendMessage($composeMessage, $draft=false) {
 
         $imapPort, 0);
 
 	if (sqimap_mailbox_exists ($imap_stream, $sent_folder)) {
 
     	    sqimap_append ($imap_stream, $sent_folder, $length);
 
-	    require_once('../class/deliver/Deliver_IMAP.class.php');
 
+	    require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
 
 	    $imap_deliver = new Deliver_IMAP();
 
 	    $imap_deliver->mail($composeMessage, $imap_stream);
 
     	    sqimap_append_done ($imap_stream);

+ 7 - 3
src/delete_message.php
Näytä tiedosto 

@@ -11,9 +11,13 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/display_messages.php');
 
-require_once('../functions/imap.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/display_messages.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);

+ 7 - 3
src/download.php
Näytä tiedosto 

@@ -12,9 +12,13 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/mime.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/mime.php');
 
 
 header('Pragma: ');
 
 header('Cache-Control: cache');

+ 5 - 1
src/draft_actions.php
Näytä tiedosto 

@@ -9,7 +9,11 @@
 
  * $Id$
 
  */
 
 
-require_once ('../src/validate.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
 
 /* Print all the needed RFC822 headers */
 
 function write822HeaderForDraft ($fp, $t, $c, $b, $subject, $more_headers, $session) {

+ 9 - 5
src/empty_trash.php
Näytä tiedosto 

@@ -12,11 +12,15 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/display_messages.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/array.php');
 
-require_once('../functions/tree.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/display_messages.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/array.php');
 
+require_once(SM_PATH . 'functions/tree.php');
 
 
 $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);

+ 10 - 6
src/folders.php
Näytä tiedosto 

@@ -13,12 +13,16 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/imap_utf7_decode_local.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/array.php');
 
-require_once('../functions/plugin.php');
 
-require_once('../functions/html.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/imap_utf7_decode_local.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/array.php');
 
+require_once(SM_PATH . 'functions/plugin.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
 
 displayPageHeader($color, 'None');

+ 7 - 3
src/folders_create.php
Näytä tiedosto 

@@ -12,9 +12,13 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/display_messages.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/display_messages.php');
 
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
 global $delimiter;

+ 9 - 6
src/folders_delete.php
Näytä tiedosto 

@@ -12,12 +12,15 @@
 
  * $Id$
 
  */
 
 
-
 
-require_once('../src/validate.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/array.php');
 
-require_once('../functions/tree.php');
 
-require_once('../functions/display_messages.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/array.php');
 
+require_once(SM_PATH . 'functions/tree.php');
 
+require_once(SM_PATH . 'functions/display_messages.php');
 
 
 /*
 
 *  Incoming values:

+ 6 - 2
src/folders_rename_do.php
Näytä tiedosto 

@@ -14,8 +14,12 @@
 
 
 global $delimiter, $base_uri;
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/imap.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
 
 $new_name = trim($new_name);

+ 7 - 3
src/folders_rename_getname.php
Näytä tiedosto 

@@ -14,9 +14,13 @@
 
 
 global $delimiter;
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/html.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
 
 if ($old == '') {
 
     displayPageHeader($color, 'None');

+ 7 - 3
src/folders_subscribe.php
Näytä tiedosto 

@@ -12,9 +12,13 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/display_messages.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/display_messages.php');
 
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);

+ 8 - 4
src/help.php
Näytä tiedosto 

@@ -11,10 +11,14 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/display_messages.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/array.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/display_messages.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/array.php');
 
 
 displayPageHeader($color, 'None' );

+ 9 - 5
src/image.php
Näytä tiedosto 

@@ -11,11 +11,15 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/date.php');
 
-require_once('../functions/page_header.php');
 
-require_once('../functions/html.php');
 
-require_once('../src/load_prefs.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/date.php');
 
+require_once(SM_PATH . 'functions/page_header.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
+require_once(SM_PATH . 'src/load_prefs.php');
 
 
 displayPageHeader($color, 'None');

+ 10 - 6
src/left_main.php
Näytä tiedosto 

@@ -12,12 +12,16 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/array.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/plugin.php');
 
-require_once('../functions/page_header.php');
 
-require_once('../functions/html.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/array.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/plugin.php');
 
+require_once(SM_PATH . 'functions/page_header.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
 
 /* These constants are used for folder stuff. */
 
 define('SM_BOX_UNCOLLAPSED', 0);

+ 8 - 4
src/load_prefs.php
Näytä tiedosto 

@@ -12,10 +12,14 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/prefs.php');
 
-require_once('../functions/plugin.php');
 
-require_once('../functions/constants.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/prefs.php');
 
+require_once(SM_PATH . 'functions/plugin.php');
 
+require_once(SM_PATH . 'functions/constants.php');
 
 
 $username = ( !isset($username) ? '' : $username );

+ 12 - 8
src/login.php
Näytä tiedosto 

@@ -12,13 +12,17 @@
 
  * $Id$
 
  */
 
 
-require_once('../functions/strings.php');
 
-require_once('../config/config.php');
 
-require_once('../functions/i18n.php');
 
-require_once('../functions/plugin.php');
 
-require_once('../functions/constants.php');
 
-require_once('../functions/page_header.php');
 
-require_once('../functions/html.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'functions/strings.php');
 
+require_once(SM_PATH . 'config/config.php');
 
+require_once(SM_PATH . 'functions/i18n.php');
 
+require_once(SM_PATH . 'functions/plugin.php');
 
+require_once(SM_PATH . 'functions/constants.php');
 
+require_once(SM_PATH . 'functions/page_header.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
 
 /*
 
  * $squirrelmail_language is set by a cookie when the user selects
 
@@ -30,7 +34,7 @@ set_up_language($squirrelmail_language, TRUE);
 
  * Find out the base URI to set cookies.
 
  */
 
 if (!function_exists('sqm_baseuri')){
 
-    require_once('../functions/display_messages.php');
 
+    require_once(SM_PATH . 'functions/display_messages.php');
 
 }
 
 $base_uri = sqm_baseuri();
 
 @session_destroy();

+ 9 - 4
src/move_messages.php
Näytä tiedosto 

@@ -11,10 +11,15 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/display_messages.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/html.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/display_messages.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
+
 
 global $compose_new_win;
 
 
 function putSelectedMessagesIntoString($msg) {

+ 11 - 7
src/options.php
Näytä tiedosto 

@@ -12,13 +12,17 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/display_messages.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/array.php');
 
-require_once('../functions/options.php');
 
-require_once('../functions/strings.php');
 
-require_once('../functions/html.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/display_messages.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/array.php');
 
+require_once(SM_PATH . 'functions/options.php');
 
+require_once(SM_PATH . 'functions/strings.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
 
 /*********************************/
 
 /*** Build the resultant page. ***/

+ 5 - 1
src/options_folder.php
Näytä tiedosto 

@@ -11,7 +11,11 @@
 
  * $Id$
 
  */
 
 
-require_once('../functions/imap.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'functions/imap.php');
 
 
 /* Define the group constants for the folder options page. */   
 define('SMOPT_GRP_SPCFOLDER', 0);

+ 11 - 7
src/options_highlight.php
Näytä tiedosto 

@@ -11,13 +11,17 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/display_messages.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/array.php');
 
-require_once('../functions/plugin.php');
 
-require_once('../functions/strings.php');
 
-require_once('../functions/html.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/display_messages.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/array.php');
 
+require_once(SM_PATH . 'functions/plugin.php');
 
+require_once(SM_PATH . 'functions/strings.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
 
 function oh_opt( $val, $sel, $tit ) {
 
     echo "<option value=\"$val\"";

+ 8 - 4
src/options_identities.php
Näytä tiedosto 

@@ -11,9 +11,13 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/display_messages.php');
 
-require_once('../functions/html.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/display_messages.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
 
     if (isset($return)) {
 
        SaveUpdateFunction();
 
@@ -337,4 +341,4 @@ function ShowTableInfo($full_name, $email_address, $reply_to, $signature, $post)
 
 
     return ($return_val);
 
 }
 
-?>
 
+?>

+ 10 - 6
src/options_order.php
Näytä tiedosto 

@@ -11,12 +11,16 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/display_messages.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/array.php');
 
-require_once('../functions/plugin.php');
 
-require_once('../functions/html.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/display_messages.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/array.php');
 
+require_once(SM_PATH . 'functions/plugin.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
 
 if (! isset($action)) { $action = ''; }
 
 if ($action == 'delete' && isset($theid)) {

+ 6 - 2
src/options_personal.php
Näytä tiedosto 

@@ -11,8 +11,12 @@
 
  * $Id$
 
  */
 
 
-require_once('../functions/imap.php');
 
-require_once('../functions/array.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/array.php');
 
 
 /* Define the group constants for the personal options page. */
 
 define('SMOPT_GRP_CONTACT', 0);

+ 11 - 7
src/printer_friendly_bottom.php
Näytä tiedosto 

@@ -14,13 +14,17 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/strings.php');
 
-require_once('../config/config.php');
 
-require_once('../src/load_prefs.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/page_header.php');
 
-require_once('../functions/html.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/strings.php');
 
+require_once(SM_PATH . 'config/config.php');
 
+require_once(SM_PATH . 'src/load_prefs.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/page_header.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
 
 $pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay');
 
 $mailbox = urldecode($mailbox);

+ 6 - 2
src/printer_friendly_main.php
Näytä tiedosto 

@@ -9,8 +9,12 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/page_header.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/page_header.php');
 
 
 displayHtmlHeader( _("Printer Friendly"), '', FALSE );

+ 10 - 6
src/printer_friendly_top.php
Näytä tiedosto 

@@ -12,12 +12,16 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/strings.php');
 
-require_once('../config/config.php');
 
-require_once('../src/load_prefs.php');
 
-require_once('../functions/page_header.php');
 
-require_once('../functions/html.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/strings.php');
 
+require_once(SM_PATH . 'config/config.php');
 
+require_once(SM_PATH . 'src/load_prefs.php');
 
+require_once(SM_PATH . 'functions/page_header.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
 
 displayHtmlHeader( _("Printer Friendly"),
 
              "<script language=\"javascript\" type=\"text/javascript\">\n".

+ 14 - 10
src/read_body.php
Näytä tiedosto 

@@ -12,12 +12,16 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/mime.php');
 
-require_once('../functions/date.php');
 
-require_once('../functions/url_parser.php');
 
-require_once('../functions/html.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/mime.php');
 
+require_once(SM_PATH . 'functions/date.php');
 
+require_once(SM_PATH . 'functions/url_parser.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
 
 /**
 
  * Given an IMAP message id number, this will look it up in the cached
 
@@ -272,7 +276,7 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
 
 
 
     if (!$useSendmail) {
 
-	require_once('../class/deliver/Deliver_SMTP.class.php');
 
+	require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
 
 	$deliver = new Deliver_SMTP();
 
 	global $smtpServerAddress, $smtpPort, $use_authenticated_smtp, $pop_before_smtp;
 
 	if ($use_authenticated_smtp) {
 
@@ -287,7 +291,7 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
 
 	$stream = $deliver->initStream($composeMessage,$domain,0,
 
 	                  $smtpServerAddress, $smtpPort, $authPop);
 
     } else {
 
-       require_once('../class/deliver/Deliver_SendMail.class.php');
 
+       require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php');
 
        global $sendmail_path;
 
        $deliver = new Deliver_SendMail();
 
        $stream = $deliver->initStream($composeMessage,$sendmail_path);
 
@@ -299,13 +303,13 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
 
     }
 
     if (!$succes) {
 
         $msg  = $deliver->dlv_msg . '<br>Server replied: '.$deliver->dlv_ret_nr;
 
-	require_once('../functions/display_messages.php');
 
+	require_once(SM_PATH . 'functions/display_messages.php');
 
         plain_error_message($msg, $color);
 
     } else {
 
         unset ($deliver);
 
 	if (sqimap_mailbox_exists ($imapConnection, $sent_folder)) {
 
     	    sqimap_append ($imapConnection, $sent_folder, $length);
 
-	    require_once('../class/deliver/Deliver_IMAP.class.php');
 
+	    require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
 
 	    $imap_deliver = new Deliver_IMAP();
 
 	    $imap_deliver->mail($composeMessage, $imapConnection);
 
     	    sqimap_append_done ($imapConnection);

+ 15 - 11
src/redirect.php
Näytä tiedosto 

@@ -12,15 +12,19 @@
 
 * $Id$
 
 */
 
 
-require_once('../functions/i18n.php');
 
-require_once('../functions/strings.php');
 
-require_once('../config/config.php');
 
-require_once('../functions/prefs.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/plugin.php');
 
-require_once('../functions/constants.php');
 
-require_once('../functions/page_header.php');
 
-require_once('../functions/global.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'functions/i18n.php');
 
+require_once(SM_PATH . 'functions/strings.php');
 
+require_once(SM_PATH . 'config/config.php');
 
+require_once(SM_PATH . 'functions/prefs.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/plugin.php');
 
+require_once(SM_PATH . 'functions/constants.php');
 
+require_once(SM_PATH . 'functions/page_header.php');
 
+require_once(SM_PATH . 'functions/global.php');
 
 
 // Remove slashes if PHP added them
 
 if (get_magic_quotes_gpc()) {
 
@@ -38,7 +42,7 @@ if (get_magic_quotes_gpc()) {
 
 /* Before starting the session, the base URI must be known. Assuming */
 
 /* that this file is in the src/ subdirectory (or something).        */
 
 if (!function_exists('sqm_baseuri')){
 
-    require_once('../functions/display_messages.php');
 
+    require_once(SM_PATH . 'functions/display_messages.php');
 
 }
 
 $base_uri = sqm_baseuri();
 
 
@@ -197,4 +201,4 @@ function attachment_common_parse($str, $debug) {
 
 }
 
 
 
-?>
 
+?>

+ 9 - 5
src/retrievalerror.php
Näytä tiedosto 

@@ -14,11 +14,15 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/smtp.php');
 
-require_once('../functions/page_header.php');
 
-require_once('../src/load_prefs.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/smtp.php');
 
+require_once(SM_PATH . 'functions/page_header.php');
 
+require_once(SM_PATH . 'src/load_prefs.php');
 
 
 $destination = 'retrievalerror@squirrelmail.org';
 
 $attachments = array();

+ 12 - 8
src/right_main.php
Näytä tiedosto 

@@ -12,14 +12,18 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/date.php');
 
-require_once('../functions/array.php');
 
-require_once('../functions/mime.php');
 
-require_once('../functions/mailbox_display.php');
 
-require_once('../functions/display_messages.php');
 
-require_once('../functions/html.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/date.php');
 
+require_once(SM_PATH . 'functions/array.php');
 
+require_once(SM_PATH . 'functions/mime.php');
 
+require_once(SM_PATH . 'functions/mailbox_display.php');
 
+require_once(SM_PATH . 'functions/display_messages.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
 
 /***********************************************************
 
  * incoming variables from URL:                            *

+ 10 - 6
src/search.php
Näytä tiedosto 

@@ -9,12 +9,16 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/imap_search.php');
 
-require_once('../functions/imap_mailbox.php');
 
-require_once('../functions/array.php');
 
-require_once('../functions/strings.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/imap_search.php');
 
+require_once(SM_PATH . 'functions/imap_mailbox.php');
 
+require_once(SM_PATH . 'functions/array.php');
 
+require_once(SM_PATH . 'functions/strings.php');
 
 
 global $allow_thread_sort;

+ 11 - 7
src/signout.php
Näytä tiedosto 

@@ -11,11 +11,15 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/prefs.php');
 
-require_once('../functions/plugin.php');
 
-require_once('../functions/strings.php');
 
-require_once('../functions/html.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/prefs.php');
 
+require_once(SM_PATH . 'functions/plugin.php');
 
+require_once(SM_PATH . 'functions/strings.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
 
 /* Erase any lingering attachments */
 
 if (isset($attachments) && is_array($attachments) 
@@ -37,7 +41,7 @@ if (!isset($frame_top)) {
 
  * because it was deleted with the session. */
 
 if (!isset($base_uri)) {
 
     if (!function_exists('sqm_baseuri')){
 
-        require_once('../functions/display_messages.php');
 
+        require_once(SM_PATH . 'functions/display_messages.php');
 
     }
 
     $base_uri = sqm_baseuri();
 
 }
 
@@ -87,4 +91,4 @@ html_tag( 'table',
 
 'center', $color[4], 'width="50%" cols="1" cellpadding="2" cellspacing="0" border="0"' )
 
 ?>
 
 </body>
 
-</html>
 
+</html>

+ 13 - 9
src/validate.php
Näytä tiedosto 

@@ -13,14 +13,18 @@
 
  * messages with a session_register.
 
  */
 
  
-require_once('../class/mime.class.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'class/mime.class.php');
 
 
 session_start();
 
 
-require_once('../functions/i18n.php');
 
-require_once('../functions/auth.php');
 
-require_once('../functions/strings.php');
 
-require_once('../functions/global.php');
 
+require_once(SM_PATH . 'functions/i18n.php');
 
+require_once(SM_PATH . 'functions/auth.php');
 
+require_once(SM_PATH . 'functions/strings.php');
 
+require_once(SM_PATH . 'functions/global.php');
 
 
 is_logged_in();
 
 
@@ -77,10 +81,10 @@ global $theme;
 
 unset($theme);
 
 $theme=array();
 
 
-require_once('../config/config.php');
 
-require_once('../src/load_prefs.php');
 
-require_once('../functions/page_header.php');
 
-require_once('../functions/prefs.php');
 
+require_once(SM_PATH . 'config/config.php');
 
+require_once(SM_PATH . 'src/load_prefs.php');
 
+require_once(SM_PATH . 'functions/page_header.php');
 
+require_once(SM_PATH . 'functions/prefs.php');
 
 
 /* Set up the language (i18n.php was included by auth.php). */
 
 global $username, $data_dir;

+ 9 - 5
src/vcard.php
Näytä tiedosto 

@@ -11,11 +11,15 @@
 
  * $Id$
 
  */
 
 
-require_once('../src/validate.php');
 
-require_once('../functions/date.php');
 
-require_once('../functions/page_header.php');
 
-require_once('../functions/mime.php');
 
-require_once('../src/load_prefs.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/date.php');
 
+require_once(SM_PATH . 'functions/page_header.php');
 
+require_once(SM_PATH . 'functions/mime.php');
 
+require_once(SM_PATH . 'src/load_prefs.php');
 
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
 sqimap_mailbox_select($imapConnection, $mailbox);

+ 9 - 4
src/view_header.php
Näytä tiedosto 

@@ -10,10 +10,15 @@
 
  *
 
  * $Id$
 
  */
 
-require_once('../src/validate.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/html.php');
 
-require_once('../functions/url_parser.php');
 
+
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
+require_once(SM_PATH . 'functions/url_parser.php');
 
 
 function  parse_viewheader($imapConnection,$id, $passed_ent_id) {
 
    global $uid_support;

+ 68 - 52
src/view_text.php
Näytä tiedosto 

@@ -1,57 +1,73 @@
 
 <?php
 
 
-   require_once('../src/validate.php');
 
-   require_once('../functions/imap.php');
 
-   require_once('../functions/mime.php');
 
-   require_once('../functions/html.php');
 
+/**
 
+ * view_text.php -- Displays the main frameset
 
+ *
 
+ * Copyright (c) 1999-2002 The SquirrelMail development team
 
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
 
+ *
 
+ * Who knows what this file does. However PUT IT HERE DID NOT PUT
 
+ * A SINGLE FREAKING COMMENT IN! Whoever is responsible for this,
 
+ * be very ashamed.
 
+ *
 
+ * $Id$
 
+ */
 
+
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'src/validate.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/mime.php');
 
+require_once(SM_PATH . 'functions/html.php');
 
    
-   $mailbox = urldecode($mailbox);
 
-   if (!isset($passed_ent_id)) {
 
-      $passed_ent_id = '';
 
-   }
 
-
 
-   $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
-   $mbx_response =  sqimap_mailbox_select($imapConnection, $mailbox);
 
-
 
-   $message = &$messages[$mbx_response['UIDVALIDITY']]["$passed_id"];
 
-   $message_ent = &$message->getEntity($ent_id);
 
-   if ($passed_ent_id) {
 
-      $message = &$message->getEntity($passed_ent_id);
 
-   }
 
+$mailbox = urldecode($mailbox);
 
+if (!isset($passed_ent_id)) {
 
+    $passed_ent_id = '';
 
+}
 
+
 
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
+$mbx_response =  sqimap_mailbox_select($imapConnection, $mailbox);
 
+
 
+$message = &$messages[$mbx_response['UIDVALIDITY']]["$passed_id"];
 
+$message_ent = &$message->getEntity($ent_id);
 
+if ($passed_ent_id) {
 
+    $message = &$message->getEntity($passed_ent_id);
 
+}
 
    
-   $header = $message_ent->header;
 
-   $charset = $header->getParameter('charset');
 
-   $type0 = $header->type0;
 
-   $type1 = $header->type1;
 
-   $encoding = strtolower($header->encoding);
 
-
 
-   $msg_url = 'read_body.php?' . $QUERY_STRING;
 
-   $msg_url = set_url_var($msg_url, 'ent_id', 0);
 
-
 
-   $body = mime_fetch_body($imapConnection, $passed_id, $ent_id);
 
-   $body = decodeBody($body, $encoding);
 
-
 
-    displayPageHeader($color, 'None');
 
-
 
-    echo "<BR><TABLE WIDTH=\"100%\" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">".
 
-         "<B><CENTER>".
 
-         _("Viewing a text attachment") . " - ";
 
-    echo '<a href="'.$msg_url.'">'. _("View message") . '</a>';
 
-
 
-    $dwnld_url = '../src/download.php?'. $QUERY_STRING.'&amp;absolute_dl=true';
 
-    echo '</b></td><tr><tr><td><CENTER><A HREF="'.$dwnld_url. '">'.
 
-         _("Download this as a file").
 
-         "</A></CENTER><BR>".
 
-         "</CENTER></B>".
 
-         "</TD></TR></TABLE>".
 
-         "<TABLE WIDTH=\"98%\" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">".
 
-         "<TR><TD BGCOLOR=\"$color[4]\"><TT>";
 
-    if ($type1 == 'html' || 
-         (isset($override_type1) &&  $override_type1 == 'html')) {
 
-        $body = MagicHTML( $body, $passed_id, $message, $mailbox);
 
-    } else {
 
-        translateText($body, $wrap_at, $charset);
 
-    }
 
-    echo $body .
 
-         "</TT></TD></TR></TABLE>";
 
+$header = $message_ent->header;
 
+$charset = $header->getParameter('charset');
 
+$type0 = $header->type0;
 
+$type1 = $header->type1;
 
+$encoding = strtolower($header->encoding);
 
+
 
+$msg_url = 'read_body.php?' . $QUERY_STRING;
 
+$msg_url = set_url_var($msg_url, 'ent_id', 0);
 
+
 
+$body = mime_fetch_body($imapConnection, $passed_id, $ent_id);
 
+$body = decodeBody($body, $encoding);
 
+
 
+displayPageHeader($color, 'None');
 
+
 
+echo "<BR><TABLE WIDTH=\"100%\" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">".
 
+     "<B><CENTER>".
 
+     _("Viewing a text attachment") . " - ";
 
+echo '<a href="'.$msg_url.'">'. _("View message") . '</a>';
 
+
 
+$dwnld_url = '../src/download.php?'. $QUERY_STRING.'&amp;absolute_dl=true';
 
+echo '</b></td><tr><tr><td><CENTER><A HREF="'.$dwnld_url. '">'.
 
+     _("Download this as a file").
 
+     "</A></CENTER><BR>".
 
+     "</CENTER></B>".
 
+     "</TD></TR></TABLE>".
 
+     "<TABLE WIDTH=\"98%\" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">".
 
+     "<TR><TD BGCOLOR=\"$color[4]\"><TT>";
 
+if ($type1 == 'html' || (isset($override_type1) &&  $override_type1 == 'html')) {
 
+    $body = MagicHTML( $body, $passed_id, $message, $mailbox);
 
+} else {
 
+    translateText($body, $wrap_at, $charset);
 
+}
 
+echo $body . "</TT></TD></TR></TABLE>";
 
+
 
 ?>

+ 12 - 8
src/webmail.php
Näytä tiedosto 

@@ -13,16 +13,20 @@
 
  * $Id$
 
  */
 
 
-require_once('../functions/strings.php');
 
-require_once('../config/config.php');
 
-require_once('../functions/prefs.php');
 
-require_once('../functions/imap.php');
 
-require_once('../functions/plugin.php');
 
-require_once('../functions/i18n.php');
 
-require_once('../functions/auth.php');
 
+/* Path for SquirrelMail required files. */
 
+define('SM_PATH','../');
 
+
 
+/* SquirrelMail required files. */
 
+require_once(SM_PATH . 'functions/strings.php');
 
+require_once(SM_PATH . 'config/config.php');
 
+require_once(SM_PATH . 'functions/prefs.php');
 
+require_once(SM_PATH . 'functions/imap.php');
 
+require_once(SM_PATH . 'functions/plugin.php');
 
+require_once(SM_PATH . 'functions/i18n.php');
 
+require_once(SM_PATH . 'functions/auth.php');
 
 
 if (!function_exists('sqm_baseuri')){
 
-    require_once('../functions/display_messages.php');
 
+    require_once(SM_PATH . 'functions/display_messages.php');
 
 }
 
 $base_uri = sqm_baseuri();

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