diff -uri functions/attachment_common.php.orig functions/attachment_common.php
--- functions/attachment_common.php.orig Mon Dec 27 18:03:43 2004
+++ functions/attachment_common.php Wed Jun 8 12:59:05 2005
@@ -88,6 +88,7 @@
function attachment_common_link_text(&$Args) {
+ global $base_uri;
/* If there is a text attachment, we would like to create a "View" button
that links to the text attachment viewer.
@@ -100,7 +101,7 @@
$Args[1]['attachment_common']['href'] = Where it links to */
sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
- $Args[1]['attachment_common']['href'] = SM_PATH . 'src/view_text.php?'. $QUERY_STRING;
+ $Args[1]['attachment_common']['href'] = $base_uri . 'src/view_text.php?'. $QUERY_STRING;
$Args[1]['attachment_common']['href'] =
set_url_var($Args[1]['attachment_common']['href'],
'ent_id',$Args[5]);
@@ -120,7 +121,8 @@
}
function attachment_common_link_message(&$Args) {
- $Args[1]['attachment_common']['href'] = SM_PATH . 'src/read_body.php?startMessage=' .
+ global $base_uri;
+ $Args[1]['attachment_common']['href'] = $base_uti . 'src/read_body.php?startMessage=' .
$Args[2] . '&passed_id=' . $Args[3] . '&mailbox=' . $Args[4] .
'&passed_ent_id=' . $Args[5] . '&override_type0=message&override_type1=rfc822';
@@ -131,9 +133,10 @@
function attachment_common_link_html(&$Args) {
+ global $base_uri;
sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
- $Args[1]['attachment_common']['href'] = SM_PATH . 'src/view_text.php?'. $QUERY_STRING.
+ $Args[1]['attachment_common']['href'] = $base_uri . 'src/view_text.php?'. $QUERY_STRING.
/* why use the overridetype? can this be removed */
'&override_type0=text&override_type1=html';
$Args[1]['attachment_common']['href'] =
@@ -146,7 +149,7 @@
}
function attachment_common_link_image(&$Args) {
- global $attachment_common_show_images, $attachment_common_show_images_list;
+ global $attachment_common_show_images, $attachment_common_show_images_list, $base_uri;
sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
@@ -156,7 +159,7 @@
$attachment_common_show_images_list[] = $info;
- $Args[1]['attachment_common']['href'] = SM_PATH . 'src/image.php?'. $QUERY_STRING;
+ $Args[1]['attachment_common']['href'] = $base_uri . 'src/image.php?'. $QUERY_STRING;
$Args[1]['attachment_common']['href'] =
set_url_var($Args[1]['attachment_common']['href'],
'ent_id',$Args[5]);
@@ -168,9 +171,10 @@
function attachment_common_link_vcard(&$Args) {
+ global $base_uri;
sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
- $Args[1]['attachment_common']['href'] = SM_PATH . 'src/vcard.php?'. $QUERY_STRING;
+ $Args[1]['attachment_common']['href'] = $base_uri . 'src/vcard.php?'. $QUERY_STRING;
$Args[1]['attachment_common']['href'] =
set_url_var($Args[1]['attachment_common']['href'],
'ent_id',$Args[5]);
diff -uri functions/identity.php.orig functions/identity.php
--- functions/identity.php.orig Mon Dec 27 18:03:43 2004
+++ functions/identity.php Wed Jun 1 17:35:48 2005
@@ -14,7 +14,7 @@
/** Used to simplify includes */
if (!defined('SM_PATH')) {
- define('SM_PATH','../');
+ define('SM_PATH',dirname(__FILE__) . '/../');
}
include_once(SM_PATH . 'include/load_prefs.php');
diff -uri functions/mime.php.orig functions/mime.php
--- functions/mime.php.orig Mon Jan 10 21:52:48 2005
+++ functions/mime.php Wed Jun 8 12:55:22 2005
@@ -382,7 +382,7 @@
function formatAttachments($message, $exclude_id, $mailbox, $id) {
- global $where, $what, $startMessage, $color, $passed_ent_id;
+ global $where, $what, $startMessage, $color, $passed_ent_id, $base_uri;
static $ShownHTML = 0;
$att_ar = $message->getAttachments($exclude_id);
@@ -400,11 +400,11 @@
$type1 = strtolower($header->type1);
$name = '';
$links['download link']['text'] = _("Download");
- $links['download link']['href'] = SM_PATH .
+ $links['download link']['href'] = $base_uri .
"src/download.php?absolute_dl=true&passed_id=$id&mailbox=$urlMailbox&ent_id=$ent";
$ImageURL = '';
if ($type0 =='message' && $type1 == 'rfc822') {
- $default_page = SM_PATH . 'src/read_body.php';
+ $default_page = $base_uri . 'src/read_body.php';
$rfc822_header = $att->rfc822_header;
$filename = $rfc822_header->subject;
if (trim( $filename ) == '') {
@@ -419,7 +419,7 @@
$from_name = decodeHeader(($from_name));
$description = $from_name;
} else {
- $default_page = SM_PATH . 'src/download.php';
+ $default_page = $base_uri . 'src/download.php';
if (is_object($header->disposition)) {
$filename = $header->disposition->getProperty('filename');
if (trim($filename) == '') {
@@ -1497,7 +1497,7 @@
unsave link image */
$httpurl = '';
if ($linkurl) {
- $httpurl = $quotchar . SM_PATH . 'src/download.php?absolute_dl=true&' .
+ $httpurl = $quotchar . $base_uri . 'src/download.php?absolute_dl=true&' .
"passed_id=$id&mailbox=" . urlencode($mailbox) .
'&ent_id=' . $linkurl . $quotchar;
}
diff -uri help/en_US/options.hlp.orig help/en_US/options.hlp
--- help/en_US/options.hlp.orig Fri Apr 4 21:28:38 2003
+++ help/en_US/options.hlp Wed Jun 1 17:16:57 2005
@@ -277,8 +277,8 @@
total number of messages in that folder.
- Enable Collapsible Folders
- Collapsible Folders allow you to 'fold' or collapse a folder which contains
+ Enable Collapsable Folders
+ Collapsable Folders allow you to 'fold' or collapse a folder which contains
subfolders so the subfolders will not be displayed. You can collapse a
folder by clicking the "-" next to it and expand it again with the "+" sign.
Setting this to No disables collapsing.
diff -uri plugins/abook_take/setup.php.orig plugins/abook_take/setup.php
--- plugins/abook_take/setup.php.orig Mon Dec 27 18:03:48 2004
+++ plugins/abook_take/setup.php Wed Jun 1 17:34:49 2005
@@ -14,7 +14,7 @@
*/
if (!defined('SM_PATH')) {
- define('SM_PATH','../../');
+ define('SM_PATH',dirname(__FILE__) . '/../../');
}
/* SquirrelMail required files. */
diff -uri plugins/abook_take/take.php.orig plugins/abook_take/take.php
--- plugins/abook_take/take.php.orig Mon Dec 27 18:03:48 2004
+++ plugins/abook_take/take.php Wed Jun 1 17:34:53 2005
@@ -13,7 +13,7 @@
*/
/* Path for SquirrelMail required files. */
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'functions/strings.php');
diff -uri plugins/administrator/options.php.orig plugins/administrator/options.php
--- plugins/administrator/options.php.orig Mon Dec 27 18:03:48 2004
+++ plugins/administrator/options.php Wed Jun 1 17:34:32 2005
@@ -214,7 +214,7 @@
/* ---------------------- main -------------------------- */
/** @ignore */
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri plugins/administrator/setup.php.orig plugins/administrator/setup.php
--- plugins/administrator/setup.php.orig Mon Dec 27 18:03:48 2004
+++ plugins/administrator/setup.php Wed Jun 1 17:34:36 2005
@@ -14,7 +14,7 @@
/** add SM_PATH */
if (!defined('SM_PATH')) {
- define('SM_PATH','../../');
+ define('SM_PATH',dirname(__FILE__) . '/../../');
}
/** @ignore */
diff -uri plugins/bug_report/bug_report.php.orig plugins/bug_report/bug_report.php
--- plugins/bug_report/bug_report.php.orig Mon Dec 27 18:03:48 2004
+++ plugins/bug_report/bug_report.php Wed Jun 1 17:34:23 2005
@@ -21,7 +21,7 @@
/**
* @ignore
*/
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
require_once(SM_PATH . 'include/validate.php');
diff -uri plugins/calendar/calendar.php.orig plugins/calendar/calendar.php
--- plugins/calendar/calendar.php.orig Mon Dec 27 18:03:49 2004
+++ plugins/calendar/calendar.php Wed Jun 1 17:35:02 2005
@@ -12,7 +12,7 @@
*
* $Id: patch-path-all,v 1.1 2005/06/08 10:28:18 gd Exp $
*/
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* Calender plugin required files. */
require_once(SM_PATH . 'plugins/calendar/calendar_data.php');
diff -uri plugins/calendar/day.php.orig plugins/calendar/day.php
--- plugins/calendar/day.php.orig Mon Dec 27 18:03:49 2004
+++ plugins/calendar/day.php Wed Jun 1 17:35:14 2005
@@ -13,7 +13,7 @@
* $Id: patch-path-all,v 1.1 2005/06/08 10:28:18 gd Exp $
*/
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* Calender plugin required files. */
require_once(SM_PATH . 'plugins/calendar/calendar_data.php');
diff -uri plugins/calendar/event_create.php.orig plugins/calendar/event_create.php
--- plugins/calendar/event_create.php.orig Mon Dec 27 18:03:49 2004
+++ plugins/calendar/event_create.php Wed Jun 1 17:34:58 2005
@@ -12,7 +12,7 @@
*
* $Id: patch-path-all,v 1.1 2005/06/08 10:28:18 gd Exp $
*/
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* Calender plugin required files. */
require_once(SM_PATH . 'plugins/calendar/calendar_data.php');
diff -uri plugins/calendar/event_delete.php.orig plugins/calendar/event_delete.php
--- plugins/calendar/event_delete.php.orig Mon Dec 27 18:03:49 2004
+++ plugins/calendar/event_delete.php Wed Jun 1 17:35:06 2005
@@ -12,7 +12,7 @@
*
* $Id: patch-path-all,v 1.1 2005/06/08 10:28:18 gd Exp $
*/
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* Calender plugin required files. */
require_once(SM_PATH . 'plugins/calendar/calendar_data.php');
diff -uri plugins/calendar/event_edit.php.orig plugins/calendar/event_edit.php
--- plugins/calendar/event_edit.php.orig Mon Dec 27 18:03:49 2004
+++ plugins/calendar/event_edit.php Wed Jun 1 17:35:10 2005
@@ -12,7 +12,7 @@
*
* $Id: patch-path-all,v 1.1 2005/06/08 10:28:18 gd Exp $
*/
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* Calender plugin required files. */
require_once(SM_PATH . 'plugins/calendar/calendar_data.php');
diff -uri plugins/filters/options.php.orig plugins/filters/options.php
--- plugins/filters/options.php.orig Mon Dec 27 18:03:57 2004
+++ plugins/filters/options.php Wed Jun 1 17:35:19 2005
@@ -29,7 +29,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri plugins/filters/spamoptions.php.orig plugins/filters/spamoptions.php
--- plugins/filters/spamoptions.php.orig Mon Dec 27 18:03:57 2004
+++ plugins/filters/spamoptions.php Wed Jun 1 17:35:22 2005
@@ -29,7 +29,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri plugins/info/options.php.orig plugins/info/options.php
--- plugins/info/options.php.orig Mon Dec 27 18:03:58 2004
+++ plugins/info/options.php Wed Jun 1 17:34:28 2005
@@ -13,7 +13,7 @@
*
*/
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri plugins/listcommands/mailout.php.orig plugins/listcommands/mailout.php
--- plugins/listcommands/mailout.php.orig Mon Dec 27 18:03:58 2004
+++ plugins/listcommands/mailout.php Wed Jun 1 17:34:44 2005
@@ -8,7 +8,7 @@
* $Id: patch-path-all,v 1.1 2005/06/08 10:28:18 gd Exp $
*/
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri plugins/mail_fetch/fetch.php.orig plugins/mail_fetch/fetch.php
--- plugins/mail_fetch/fetch.php.orig Mon Dec 27 18:03:58 2004
+++ plugins/mail_fetch/fetch.php Wed Jun 1 17:31:12 2005
@@ -11,7 +11,7 @@
* $Id: patch-path-all,v 1.1 2005/06/08 10:28:18 gd Exp $
*/
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
require_once(SM_PATH . 'include/validate.php');
require_once(SM_PATH . 'functions/page_header.php');
diff -uri plugins/mail_fetch/options.php.orig plugins/mail_fetch/options.php
--- plugins/mail_fetch/options.php.orig Mon Dec 27 18:03:58 2004
+++ plugins/mail_fetch/options.php Wed Jun 1 17:31:08 2005
@@ -11,7 +11,7 @@
* $Id: patch-path-all,v 1.1 2005/06/08 10:28:18 gd Exp $
*/
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
require_once(SM_PATH . 'include/validate.php');
require_once(SM_PATH . 'functions/imap.php');
diff -uri plugins/message_details/message_details_bottom.php.orig plugins/message_details/message_details_bottom.php
--- plugins/message_details/message_details_bottom.php.orig Mon Dec 27 18:03:58 2004
+++ plugins/message_details/message_details_bottom.php Wed Jun 1 17:31:17 2005
@@ -16,7 +16,7 @@
*/
/** @ignore */
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri plugins/message_details/message_details_main.php.orig plugins/message_details/message_details_main.php
--- plugins/message_details/message_details_main.php.orig Mon Dec 27 18:03:58 2004
+++ plugins/message_details/message_details_main.php Wed Jun 1 17:34:15 2005
@@ -18,7 +18,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri plugins/message_details/message_details_top.php.orig plugins/message_details/message_details_top.php
--- plugins/message_details/message_details_top.php.orig Mon Dec 27 18:03:58 2004
+++ plugins/message_details/message_details_top.php Wed Jun 1 17:34:19 2005
@@ -14,7 +14,7 @@
*/
/** @ignore */
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri plugins/newmail/newmail.php.orig plugins/newmail/newmail.php
--- plugins/newmail/newmail.php.orig Mon Dec 27 18:03:58 2004
+++ plugins/newmail/newmail.php Wed Jun 1 17:31:04 2005
@@ -14,7 +14,7 @@
*/
/** @ignore */
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri plugins/newmail/newmail_opt.php.orig plugins/newmail/newmail_opt.php
--- plugins/newmail/newmail_opt.php.orig Mon Dec 27 18:03:58 2004
+++ plugins/newmail/newmail_opt.php Wed Jun 1 17:30:56 2005
@@ -14,7 +14,7 @@
*/
/** @ignore */
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri plugins/newmail/testsound.php.orig plugins/newmail/testsound.php
--- plugins/newmail/testsound.php.orig Mon Dec 27 18:03:58 2004
+++ plugins/newmail/testsound.php Wed Jun 1 17:31:00 2005
@@ -9,7 +9,7 @@
* $Id: patch-path-all,v 1.1 2005/06/08 10:28:18 gd Exp $
*/
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri plugins/spamcop/options.php.orig plugins/spamcop/options.php
--- plugins/spamcop/options.php.orig Mon Dec 27 18:03:58 2004
+++ plugins/spamcop/options.php Wed Jun 1 17:35:27 2005
@@ -9,7 +9,7 @@
** $Id: patch-path-all,v 1.1 2005/06/08 10:28:18 gd Exp $
**/
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
require_once(SM_PATH . 'include/validate.php');
function spamcop_enable_disable($option,$disable_action,$enable_action) {
diff -uri plugins/spamcop/spamcop.php.orig plugins/spamcop/spamcop.php
--- plugins/spamcop/spamcop.php.orig Mon Dec 27 18:03:58 2004
+++ plugins/spamcop/spamcop.php Wed Jun 1 17:35:31 2005
@@ -8,7 +8,7 @@
** $Id: patch-path-all,v 1.1 2005/06/08 10:28:18 gd Exp $
**/
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri plugins/squirrelspell/sqspell_interface.php.orig plugins/squirrelspell/sqspell_interface.php
--- plugins/squirrelspell/sqspell_interface.php.orig Mon Dec 27 18:03:59 2004
+++ plugins/squirrelspell/sqspell_interface.php Wed Jun 1 17:35:35 2005
@@ -29,7 +29,7 @@
* Load the stuff needed from squirrelmail
*/
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri plugins/squirrelspell/sqspell_options.php.orig plugins/squirrelspell/sqspell_options.php
--- plugins/squirrelspell/sqspell_options.php.orig Mon Dec 27 18:03:59 2004
+++ plugins/squirrelspell/sqspell_options.php Wed Jun 1 17:35:39 2005
@@ -23,7 +23,7 @@
/**
* Load some necessary stuff from squirrelmail.
*/
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri plugins/translate/options.php.orig plugins/translate/options.php
--- plugins/translate/options.php.orig Mon Dec 27 18:03:59 2004
+++ plugins/translate/options.php Wed Jun 1 17:35:43 2005
@@ -14,7 +14,7 @@
*/
/* Path for SquirrelMail required files. */
-define('SM_PATH','../../');
+define('SM_PATH',dirname(__FILE__) . '/../../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/addrbook_popup.php.orig src/addrbook_popup.php
--- src/addrbook_popup.php.orig Mon Dec 27 18:03:59 2004
+++ src/addrbook_popup.php Wed Jun 1 17:29:43 2005
@@ -16,7 +16,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/** SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/addrbook_search.php.orig src/addrbook_search.php
--- src/addrbook_search.php.orig Mon Dec 27 18:03:59 2004
+++ src/addrbook_search.php Wed Jun 1 17:29:22 2005
@@ -20,7 +20,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/** SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/addrbook_search_html.php.orig src/addrbook_search_html.php
--- src/addrbook_search_html.php.orig Mon Dec 27 18:03:59 2004
+++ src/addrbook_search_html.php Wed Jun 1 17:30:20 2005
@@ -19,7 +19,7 @@
* @ignore
*/
if (! defined('SM_PATH') ) {
- define('SM_PATH','../');
+ define('SM_PATH',dirname(__FILE__) . '/../');
}
/** SquirrelMail required files. */
diff -uri src/addressbook.php.orig src/addressbook.php
--- src/addressbook.php.orig Mon Dec 27 18:03:59 2004
+++ src/addressbook.php Wed Jun 1 17:27:40 2005
@@ -16,7 +16,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/** SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/compose.php.orig src/compose.php
--- src/compose.php.orig Mon Jan 3 18:06:28 2005
+++ src/compose.php Wed Jun 1 17:28:10 2005
@@ -22,7 +22,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/delete_message.php.orig src/delete_message.php
--- src/delete_message.php.orig Mon Dec 27 18:03:59 2004
+++ src/delete_message.php Wed Jun 1 17:29:39 2005
@@ -16,7 +16,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/download.php.orig src/download.php
--- src/download.php.orig Mon Dec 27 18:03:59 2004
+++ src/download.php Wed Jun 1 17:30:34 2005
@@ -17,7 +17,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/empty_trash.php.orig src/empty_trash.php
--- src/empty_trash.php.orig Mon Dec 27 18:03:59 2004
+++ src/empty_trash.php Wed Jun 1 17:28:14 2005
@@ -17,7 +17,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/folders.php.orig src/folders.php
--- src/folders.php.orig Mon Dec 27 18:03:59 2004
+++ src/folders.php Wed Jun 1 17:28:04 2005
@@ -18,7 +18,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/folders_create.php.orig src/folders_create.php
--- src/folders_create.php.orig Mon Dec 27 18:03:59 2004
+++ src/folders_create.php Wed Jun 1 17:27:50 2005
@@ -17,7 +17,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/folders_delete.php.orig src/folders_delete.php
--- src/folders_delete.php.orig Mon Dec 27 18:03:59 2004
+++ src/folders_delete.php Wed Jun 1 17:29:57 2005
@@ -17,7 +17,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/folders_rename_do.php.orig src/folders_rename_do.php
--- src/folders_rename_do.php.orig Mon Dec 27 18:04:00 2004
+++ src/folders_rename_do.php Wed Jun 1 17:30:43 2005
@@ -17,7 +17,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/folders_rename_getname.php.orig src/folders_rename_getname.php
--- src/folders_rename_getname.php.orig Mon Dec 27 18:04:00 2004
+++ src/folders_rename_getname.php Wed Jun 1 17:30:11 2005
@@ -17,7 +17,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/folders_subscribe.php.orig src/folders_subscribe.php
--- src/folders_subscribe.php.orig Mon Dec 27 18:04:00 2004
+++ src/folders_subscribe.php Wed Jun 1 17:30:15 2005
@@ -17,7 +17,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/help.php.orig src/help.php
--- src/help.php.orig Mon Dec 27 18:04:00 2004
+++ src/help.php Wed Jun 1 17:30:47 2005
@@ -16,7 +16,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/image.php.orig src/image.php
--- src/image.php.orig Mon Dec 27 18:04:00 2004
+++ src/image.php Wed Jun 1 17:29:47 2005
@@ -16,7 +16,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/left_main.php.orig src/left_main.php
--- src/left_main.php.orig Wed Dec 29 22:12:07 2004
+++ src/left_main.php Wed Jun 1 17:30:50 2005
@@ -17,7 +17,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/login.php.orig src/login.php
--- src/login.php.orig Mon Dec 27 18:04:00 2004
+++ src/login.php Wed Jun 1 17:29:30 2005
@@ -17,7 +17,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'functions/strings.php');
diff -uri src/move_messages.php.orig src/move_messages.php
--- src/move_messages.php.orig Mon Dec 27 18:04:00 2004
+++ src/move_messages.php Wed Jun 1 17:29:35 2005
@@ -12,7 +12,7 @@
*/
/* Path for SquirrelMail required files. */
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/options.php.orig src/options.php
--- src/options.php.orig Mon Dec 27 18:04:00 2004
+++ src/options.php Wed Jun 1 17:27:54 2005
@@ -17,7 +17,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/options_highlight.php.orig src/options_highlight.php
--- src/options_highlight.php.orig Mon Dec 27 18:04:00 2004
+++ src/options_highlight.php Wed Jun 1 17:27:35 2005
@@ -16,7 +16,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/options_identities.php.orig src/options_identities.php
--- src/options_identities.php.orig Mon Dec 27 18:04:00 2004
+++ src/options_identities.php Wed Jun 1 17:30:26 2005
@@ -16,7 +16,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/options_order.php.orig src/options_order.php
--- src/options_order.php.orig Mon Dec 27 18:04:00 2004
+++ src/options_order.php Wed Jun 1 17:29:14 2005
@@ -16,7 +16,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/printer_friendly_bottom.php.orig src/printer_friendly_bottom.php
--- src/printer_friendly_bottom.php.orig Tue Dec 28 16:02:49 2004
+++ src/printer_friendly_bottom.php Wed Jun 1 17:29:53 2005
@@ -19,7 +19,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/printer_friendly_main.php.orig src/printer_friendly_main.php
--- src/printer_friendly_main.php.orig Mon Dec 27 18:04:00 2004
+++ src/printer_friendly_main.php Wed Jun 1 17:29:06 2005
@@ -13,7 +13,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/printer_friendly_top.php.orig src/printer_friendly_top.php
--- src/printer_friendly_top.php.orig Mon Dec 27 18:04:00 2004
+++ src/printer_friendly_top.php Wed Jun 1 17:30:39 2005
@@ -16,7 +16,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/read_body.php.orig src/read_body.php
--- src/read_body.php.orig Tue Dec 28 16:46:23 2004
+++ src/read_body.php Wed Jun 8 12:48:46 2005
@@ -17,7 +17,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
@@ -861,7 +861,7 @@
if (($attachment_common_show_images) &&
is_array($attachment_common_show_images_list)) {
foreach ($attachment_common_show_images_list as $img) {
- $imgurl = SM_PATH . 'src/download.php' .
+ $imgurl = $base_uri . 'src/download.php' .
'?' .
'passed_id=' . urlencode($img['passed_id']) .
'&mailbox=' . urlencode($mailbox) .
diff -uri src/redirect.php.orig src/redirect.php
--- src/redirect.php.orig Sat Jan 15 16:10:25 2005
+++ src/redirect.php Wed Jun 1 17:29:18 2005
@@ -17,7 +17,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'functions/global.php');
diff -uri src/right_main.php.orig src/right_main.php
--- src/right_main.php.orig Mon Dec 27 18:04:00 2004
+++ src/right_main.php Wed Jun 1 17:27:59 2005
@@ -17,7 +17,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/search.php.orig src/search.php
--- src/search.php.orig Mon Dec 27 18:04:00 2004
+++ src/search.php Wed Jun 1 17:30:07 2005
@@ -14,7 +14,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/** SquirrelMail required files.
*/
diff -uri src/signout.php.orig src/signout.php
--- src/signout.php.orig Sat Jan 15 16:10:25 2005
+++ src/signout.php Wed Jun 1 17:30:03 2005
@@ -16,7 +16,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* check if we're already logged out (e.g. when this page is reloaded),
* so we can skip to the output and not give error messages */
diff -uri src/view_header.php.orig src/view_header.php
--- src/view_header.php.orig Mon Dec 27 18:04:01 2004
+++ src/view_header.php Wed Jun 1 17:29:10 2005
@@ -16,7 +16,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/view_text.php.orig src/view_text.php
--- src/view_text.php.orig Mon Dec 27 18:04:02 2004
+++ src/view_text.php Wed Jun 1 17:30:31 2005
@@ -18,7 +18,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
diff -uri src/webmail.php.orig src/webmail.php
--- src/webmail.php.orig Thu Jan 20 22:50:34 2005
+++ src/webmail.php Wed Jun 1 17:27:30 2005
@@ -18,7 +18,7 @@
* Path for SquirrelMail required files.
* @ignore
*/
-define('SM_PATH','../');
+define('SM_PATH',dirname(__FILE__) . '/../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'functions/strings.php');