More SM_PATH changes

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

diff --git a/functions/addressbook.php b/functions/addressbook.php
index f62ccde50fdc0f752c2968d05edf02a7d4864ea2..9b98f61bf386d2f1ee6a3e0a3763326eaddf4a84 100644 (file)
--- a/functions/addressbook.php
+++ b/functions/addressbook.php
@@ -37,12 +37,12 @@ global $addrbook_dsn;
 
 /* Use this if you wanna have a global address book */
 if (isset($address_book_global_filename)) {
-    include_once('../functions/abook_global_file.php');
+    include_once(SM_PATH . 'functions/abook_global_file.php');
 }
 
 /* Only load database backend if database is configured */
 if(isset($addrbook_dsn) && !empty($addrbook_dsn)) {
-  include_once('../functions/abook_database.php');
+  include_once(SM_PATH . 'functions/abook_database.php');
 }
 
 /*

diff --git a/functions/file_prefs.php b/functions/file_prefs.php
index 0ae47bac77a7f60b6ac99cc193efb0bfac52b604..3e594e62f018beb0ddb7beb1da29c9cba43a8a5c 100644 (file)
--- a/functions/file_prefs.php
+++ b/functions/file_prefs.php
@@ -35,7 +35,7 @@ function cachePrefValues($data_dir, $username) {
 
     /* Make sure that the preference file now DOES exist. */
     if (!file_exists($filename)) {
-        include_once( '../functions/display_messages.php' );
+        include_once(SM_PATH . 'functions/display_messages.php');
         logout_error( sprintf( _("Preference file, %s, does not exist. Log out, and log back in to create a default preference file."), $filename)  );
         exit;
     }
@@ -43,7 +43,7 @@ function cachePrefValues($data_dir, $username) {
     /* Open the file, or else display an error to the user. */
     if(!$file = @fopen($filename, 'r'))
     {
-        include_once( '../functions/display_messages.php' );
+        include_once(SM_PATH . 'functions/display_messages.php');
         logout_error( sprintf( _("Preference file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename) );
         exit;
     }
@@ -103,7 +103,7 @@ function savePrefValues($data_dir, $username) {
     /* Open the file for writing, or else display an error to the user. */
     if(!$file = @fopen($filename, 'w'))
     {
-        include_once( '../functions/display_messages.php' );
+        include_once(SM_PATH . 'functions/display_messages.php');
         logout_error( sprintf( _("Preference file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename) );
         exit;
     }
@@ -168,7 +168,7 @@ function checkForPrefs($data_dir, $username, $filename = '') {
 
         /* If it is not there, check the internal data directory. */
         if (!@file_exists($default_pref)) {
-            $default_pref = '../data/default_pref';
+            $default_pref = SM_PATH . 'data/default_pref';
         }
 
         /* Otherwise, report an error. */
@@ -177,7 +177,7 @@ function checkForPrefs($data_dir, $username, $filename = '') {
             $errString = $errTitle . "<br>\n" .
                          _("Default preference file not found!") . "<br>\n" .
                          _("Please contact your system administrator and report this error.") . "<br>\n";
-            include_once( '../functions/display_messages.php' );
+            include_once(SM_PATH . 'functions/display_messages.php' );
             logout_error( $errString, $errTitle );
             exit;
         } else if (!@copy($default_pref, $filename)) {
@@ -190,7 +190,7 @@ function checkForPrefs($data_dir, $username, $filename = '') {
                        _("Could not create initial preference file!") . "<br>\n" .
                        sprintf( _("%s should be writable by user %s"), $data_dir, $uid ) .
                        "<br>\n" . _("Please contact your system administrator and report this error.") . "<br>\n";
-            include_once( '../functions/display_messages.php' );
+            include_once(SM_PATH . 'functions/display_messages.php' );
             logout_error( $errString, $errTitle );
             exit;
         }
@@ -205,7 +205,7 @@ function setSig($data_dir, $username, $number, $value) {
     /* Open the file for writing, or else display an error to the user. */
     if(!$file = @fopen($filename, 'w'))
     {
-        include_once( '../functions/display_messages.php' );
+        include_once(SM_PATH . '/functions/display_messages.php' );
         logout_error( sprintf( _("Signature file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename) );
         exit;
     }
@@ -223,7 +223,7 @@ function getSig($data_dir, $username, $number) {
         /* Open the file, or else display an error to the user. */
         if(!$file = @fopen($filename, 'r'))
         {
-            include_once( '../functions/display_messages.php' );
+            include_once(SM_PATH . 'functions/display_messages.php');
             logout_error( sprintf( _("Signature file, %s, could not be opened. Contact your system administrator to resolve this issue."), $filename) );
             exit;
         }

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 4e7db9ae0059ca08aff4839c2bd1ab3c07a18fbc..24dd45fcda49c7dd81d9653360d1486c9247049b 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -234,8 +234,8 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $
                  */
                 
                 set_up_language($squirrelmail_language, true);
-                include_once( '../functions/display_messages.php' );
-                logout_error( _("Unknown user or password incorrect.") );                
+                include_once(SM_PATH . 'functions/display_messages.php' );
+                logout_error( _("Unknown user or password incorrect.") );
                 session_destroy();
                 exit;
             }

diff --git a/functions/mime.php b/functions/mime.php
index 273e6b3ec0346bada7523e32a3b6df0467a64b66..6e7bbe553c809155fa24311068c0e711114d900e 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -33,7 +33,7 @@ function mime_structure ($bodystructure, $flags=array()) {
     $res  = $msg->parseStructure($read);
     $msg  = $res[0];
     if (!is_object($msg)) {
-        include_once( '../functions/display_messages.php' );
+        include_once(SM_PATH . 'functions/display_messages.php');
         global $color, $mailbox;
         displayPageHeader( $color, urldecode($mailbox) );
         echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n\n" .

diff --git a/functions/plugin.php b/functions/plugin.php
index 9b52a649aa274e735cf2a27dd2241126436273d6..3cc3af43ea7195d04cff17979404fb688373ca9b 100644 (file)
--- a/functions/plugin.php
+++ b/functions/plugin.php
@@ -18,8 +18,8 @@ $squirrelmail_plugin_hooks = array();
 
 /* This function adds a plugin. */
 function use_plugin ($name) {
-    if (file_exists("../plugins/$name/setup.php")) {
-        include_once("../plugins/$name/setup.php");
+    if (file_exists(SM_PATH . "plugins/$name/setup.php")) {
+        include_once(SM_PATH . "plugins/$name/setup.php");
         $function = "squirrelmail_plugin_init_$name";
         if (function_exists($function)) {
             $function();

diff --git a/functions/prefs.php b/functions/prefs.php
index bc534c346e55e33e1200c48d8e34e879e0ee63fe..b17e9c5e291abd2fd252ce48ef9236b39eaed425 100644 (file)
--- a/functions/prefs.php
+++ b/functions/prefs.php
@@ -45,7 +45,7 @@ function getHashedFile($username, $dir, $datafile, $hash_search = true) {
     $real_hash_dir = getHashedDir($username, $dir, $hash_dirs);
 
     /* Set the value of our real data file. */
-    $result = "$real_hash_dir/$datafile";
+    $result = SM_PATH . "$real_hash_dir/$datafile";
 
     /* Check for this file in the real hash directory. */
     if ($hash_search && !@file_exists($result)) {

diff --git a/functions/smtp.php b/functions/smtp.php
index ad55611525c867802d4e5a7c4cf2504e17894fbb..44611dccc262cf71206bf573520eb768443be15d 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -787,14 +787,14 @@ function errorCheck($line, $smtpConnection, $verbose = false) {
     }
 
     if ($status == 0) {
-        include_once('../functions/page_header.php');
+        include_once(SM_PATH . 'functions/page_header.php');
         if ($compose_new_win == '1') {
             compose_Header($color, 'None');
         }
         else {
             displayPageHeader($color, 'None');
         }
-        include_once('../functions/display_messages.php');
+        include_once(SM_PATH . 'functions/display_messages.php');
         $lines = nl2br(htmlspecialchars($lines));
         $msg  = $message . "<br>\nServer replied: $lines";
         plain_error_message($msg, $color);

diff --git a/plugins/squirrelspell/modules/check_me.mod b/plugins/squirrelspell/modules/check_me.mod
index 370241f1621628dd66fc9c772496bae6dfb1415e..313c0b523ee887ddb63e17567e9fdbd93f1084d4 100644 (file)
--- a/plugins/squirrelspell/modules/check_me.mod
+++ b/plugins/squirrelspell/modules/check_me.mod
@@ -90,7 +90,7 @@ $sqspell_command=$SQSPELL_APP[$sqspell_use_app];
  * QUITE remote.
  */
 do {
-  $floc = "$attachment_dir/" . md5($sqspell_new_text . microtime());
+  $floc = SM_PATH . "$attachment_dir/" . md5($sqspell_new_text . microtime());
 } while (file_exists($floc));
 /**
  * Write the contents to the file.

diff --git a/plugins/squirrelspell/sqspell_options.php b/plugins/squirrelspell/sqspell_options.php
index dbff907361074cfee0cda72a7b2248efaa454251..54a898f5ae16a1fa27c29e61889852fcff0d5d6d 100644 (file)
--- a/plugins/squirrelspell/sqspell_options.php
+++ b/plugins/squirrelspell/sqspell_options.php
@@ -30,8 +30,8 @@ require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'include/load_prefs.php');
 require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'functions/page_header.php');
-require_once($SQSPELL_DIR . 'sqspell_config.php');
-require_once($SQSPELL_DIR . 'sqspell_functions.php');
+require_once(SM_PATH . $SQSPELL_DIR . 'sqspell_config.php');
+require_once(SM_PATH . $SQSPELL_DIR . 'sqspell_functions.php');
 
 /**
  * $MOD is the name of the module to invoke.
@@ -45,6 +45,6 @@ if (!isset($MOD) || !$MOD){
 }
 
 /* Load the stuff already. */
-require_once($SQSPELL_DIR . "modules/$MOD.mod");
+require_once(SM_PATH . $SQSPELL_DIR . "modules/$MOD.mod");
 
 ?>

diff --git a/src/addressbook.php b/src/addressbook.php
index 20082452e13cd9d02190f34dc984f7640ef63590..923f85ec7552a2c5c251185fec9b452d96fc7776 100644 (file)
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -175,7 +175,7 @@ if($REQUEST_METHOD == 'POST') {
                                       "\n". '<strong>' . _("Update address") . '</strong>' ."\n",
                                       'center', $color[0] )
                                    ),
-                             'center', '', 'width="100%" ' ) .
+                             'center', '', 'width="100%" ' );
                         address_form("editaddr", _("Update address"), $olddata);
                         echo '<INPUT TYPE=hidden NAME=oldnick VALUE="' . 
                              htmlspecialchars($olddata["nickname"]) . "\">\n" .