From aa7fb30cfbfef6ef28ebde963f6312c79122f411 Mon Sep 17 00:00:00 2001 From: kink Date: Sun, 8 Sep 2002 14:15:25 +0000 Subject: [PATCH] Fix a bunch of plugins to cope with moved load_prefs/validate files. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3616 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- plugins/abook_take/take.php | 4 ++-- plugins/administrator/options.php | 2 +- plugins/bug_report/bug_report.php | 22 ++++++++++----------- plugins/calendar/calendar.php | 2 +- plugins/calendar/day.php | 2 +- plugins/calendar/event_create.php | 2 +- plugins/calendar/event_delete.php | 2 +- plugins/calendar/event_edit.php | 2 +- plugins/listcommands/mailout.php | 2 +- plugins/mail_fetch/fetch.php | 18 +++++++++-------- plugins/mail_fetch/options.php | 8 +++++--- plugins/mail_fetch/setup.php | 7 +++---- plugins/newmail/newmail.php | 2 +- plugins/newmail/newmail_opt.php | 2 +- plugins/newmail/testsound.php | 1 - plugins/spamcop/options.php | 5 +++-- plugins/squirrelspell/sqspell_interface.php | 2 +- plugins/squirrelspell/sqspell_options.php | 4 ++-- plugins/translate/options.php | 20 +++++++++++-------- 19 files changed, 58 insertions(+), 51 deletions(-) diff --git a/plugins/abook_take/take.php b/plugins/abook_take/take.php index da149203..62bf7dfe 100644 --- a/plugins/abook_take/take.php +++ b/plugins/abook_take/take.php @@ -12,13 +12,13 @@ define('SM_PATH','../../'); /* SquirrelMail required files. */ require_once(SM_PATH . 'config/config.php'); -require_once(SM_PATH . 'src/validate.php'); +require_once(SM_PATH . 'include/validate.php'); 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/page_header.php'); require_once(SM_PATH . 'functions/addressbook.php'); -require_once(SM_PATH . 'src/load_prefs.php'); +require_once(SM_PATH . 'include/load_prefs.php'); require_once(SM_PATH . 'functions/html.php'); displayPageHeader($color, 'None'); diff --git a/plugins/administrator/options.php b/plugins/administrator/options.php index ed695e0f..9842e245 100644 --- a/plugins/administrator/options.php +++ b/plugins/administrator/options.php @@ -140,7 +140,7 @@ define('SM_PATH','../'); require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/page_header.php'); require_once(SM_PATH . 'functions/imap.php'); -require_once(SM_PATH . 'src/load_prefs.php'); +require_once(SM_PATH . 'include/load_prefs.php'); require_once(SM_PATH . 'plugins/administrator/defines.php'); require_once(SM_PATH . 'plugins/administrator/auth.php'); diff --git a/plugins/bug_report/bug_report.php b/plugins/bug_report/bug_report.php index c90a4677..36cdc7d5 100644 --- a/plugins/bug_report/bug_report.php +++ b/plugins/bug_report/bug_report.php @@ -16,18 +16,18 @@ * $Id$ */ -chdir('..'); - session_start(); - -require_once('../config/config.php'); -require_once('../functions/strings.php'); -require_once('../functions/page_header.php'); -require_once('../functions/display_messages.php'); -require_once('../functions/imap.php'); -require_once('../functions/array.php'); -require_once('../functions/i18n.php'); -require_once('../src/load_prefs.php'); +chdir('..'); +define('SM_PATH','../'); + +require_once(SM_PATH . 'config/config.php'); +require_once(SM_PATH . 'functions/strings.php'); +require_once(SM_PATH . 'functions/page_header.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/i18n.php'); +require_once(SM_PATH . 'include/load_prefs.php'); displayPageHeader($color, 'None'); diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php index 31e7ee47..a0db3488 100644 --- a/plugins/calendar/calendar.php +++ b/plugins/calendar/calendar.php @@ -25,7 +25,7 @@ require_once(SM_PATH . 'functions/strings.php'); require_once(SM_PATH . 'functions/date.php'); require_once(SM_PATH . 'config/config.php'); require_once(SM_PATH . 'functions/page_header.php'); -require_once(SM_PATH . 'src/load_prefs.php'); +require_once(SM_PATH . 'include/load_prefs.php'); require_once(SM_PATH . 'functions/html.php'); //display upper part of month calendar view diff --git a/plugins/calendar/day.php b/plugins/calendar/day.php index feb6489b..fc21bf3e 100644 --- a/plugins/calendar/day.php +++ b/plugins/calendar/day.php @@ -25,7 +25,7 @@ require_once(SM_PATH . 'functions/strings.php'); require_once(SM_PATH . 'functions/date.php'); require_once(SM_PATH . 'config/config.php'); require_once(SM_PATH . 'functions/page_header.php'); -require_once(SM_PATH . 'src/load_prefs.php'); +require_once(SM_PATH . 'include/load_prefs.php'); require_once(SM_PATH . 'functions/html.php'); //displays head of day calendar view diff --git a/plugins/calendar/event_create.php b/plugins/calendar/event_create.php index 96876853..92610e06 100644 --- a/plugins/calendar/event_create.php +++ b/plugins/calendar/event_create.php @@ -24,7 +24,7 @@ require_once(SM_PATH . 'functions/strings.php'); require_once(SM_PATH . 'functions/date.php'); require_once(SM_PATH . 'config/config.php'); require_once(SM_PATH . 'functions/page_header.php'); -require_once(SM_PATH . 'src/load_prefs.php'); +require_once(SM_PATH . 'include/load_prefs.php'); require_once(SM_PATH . 'functions/html.php'); //main form to gather event info diff --git a/plugins/calendar/event_delete.php b/plugins/calendar/event_delete.php index a9ecc725..cd23d8d7 100644 --- a/plugins/calendar/event_delete.php +++ b/plugins/calendar/event_delete.php @@ -24,7 +24,7 @@ require_once(SM_PATH . 'functions/strings.php'); require_once(SM_PATH . 'functions/date.php'); require_once(SM_PATH . 'config/config.php'); require_once(SM_PATH . 'functions/page_header.php'); -require_once(SM_PATH . 'src/load_prefs.php'); +require_once(SM_PATH . 'include/load_prefs.php'); require_once(SM_PATH . 'functions/html.php'); function confirm_deletion() diff --git a/plugins/calendar/event_edit.php b/plugins/calendar/event_edit.php index f1ce4ce4..c40f175f 100644 --- a/plugins/calendar/event_edit.php +++ b/plugins/calendar/event_edit.php @@ -24,7 +24,7 @@ require_once(SM_PATH . 'functions/strings.php'); require_once(SM_PATH . 'functions/date.php'); require_once(SM_PATH . 'config/config.php'); require_once(SM_PATH . 'functions/page_header.php'); -require_once(SM_PATH . 'src/load_prefs.php'); +require_once(SM_PATH . 'include/load_prefs.php'); require_once(SM_PATH . 'functions/html.php'); // update event info diff --git a/plugins/listcommands/mailout.php b/plugins/listcommands/mailout.php index 6a2ef137..21be9738 100644 --- a/plugins/listcommands/mailout.php +++ b/plugins/listcommands/mailout.php @@ -14,7 +14,7 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ require_once(SM_PATH . 'include/validate.php'); include_once(SM_PATH . 'functions/page_header.php'); -include_once(SM_PATH . 'src/load_prefs.php'); +include_once(SM_PATH . 'include/load_prefs.php'); include_once(SM_PATH . 'functions/html.php'); displayPageHeader($color, $mailbox); diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php index 8e0ffd89..85753e69 100644 --- a/plugins/mail_fetch/fetch.php +++ b/plugins/mail_fetch/fetch.php @@ -12,14 +12,16 @@ **/ chdir('..'); - require_once('../src/validate.php'); - require_once('../functions/page_header.php'); - require_once('../functions/imap.php'); - require_once('../src/load_prefs.php'); - require_once('../plugins/mail_fetch/class.POP3.php'); - require_once('../functions/i18n.php'); - require_once( '../plugins/mail_fetch/functions.php' ); - require_once( '../functions/html.php' ); + define('SM_PATH','../'); + + require_once(SM_PATH . 'include/validate.php'); + require_once(SM_PATH . 'functions/page_header.php'); + require_once(SM_PATH . 'functions/imap.php'); + require_once(SM_PATH . 'include/load_prefs.php'); + require_once(SM_PATH . 'plugins/mail_fetch/class.POP3.php'); + require_once(SM_PATH . 'functions/i18n.php'); + require_once(SM_PATH . 'plugins/mail_fetch/functions.php' ); + require_once(SM_PATH . 'functions/html.php' ); function Mail_Fetch_Status($msg) { diff --git a/plugins/mail_fetch/options.php b/plugins/mail_fetch/options.php index bcf103ec..10c9dd3e 100644 --- a/plugins/mail_fetch/options.php +++ b/plugins/mail_fetch/options.php @@ -12,9 +12,11 @@ **/ chdir('..'); - require_once('../src/validate.php'); - require_once('../functions/imap.php'); - require_once('../src/load_prefs.php'); + define('SM_PATH','../'); + + require_once(SM_PATH . 'include/validate.php'); + require_once(SM_PATH . 'functions/imap.php'); + require_once(SM_PATH . 'include/load_prefs.php'); displayPageHeader( $color, 'None' ); diff --git a/plugins/mail_fetch/setup.php b/plugins/mail_fetch/setup.php index 27c4b53b..4741605c 100644 --- a/plugins/mail_fetch/setup.php +++ b/plugins/mail_fetch/setup.php @@ -11,7 +11,8 @@ ** $Id$ **/ - require_once( '../plugins/mail_fetch/functions.php' ); + define('SM_PATH','../'); + require_once(SM_PATH . 'plugins/mail_fetch/functions.php' ); function squirrelmail_plugin_init_mail_fetch() { global $squirrelmail_plugin_hooks; @@ -205,9 +206,7 @@ function mail_fetch_setnew() { global $data_dir,$username; - // require_once ('../src/load_prefs.php'); - // require_once ('../src/validate.php'); - require_once('../functions/prefs.php'); + require_once(SM_PATH . 'functions/prefs.php'); if( $username <> '' ) { // Creates the pref file if it does not exist. diff --git a/plugins/newmail/newmail.php b/plugins/newmail/newmail.php index 7e919cb9..da04ec4f 100644 --- a/plugins/newmail/newmail.php +++ b/plugins/newmail/newmail.php @@ -16,7 +16,7 @@ /* SquirrelMail required files. */ require_once(SM_PATH . 'include/validate.php'); - require_once(SM_PATH . 'src/load_prefs.php'); + require_once(SM_PATH . 'include/load_prefs.php'); require_once(SM_PATH . 'functions/page_header.php'); displayHtmlHeader( _("New Mail"), '', FALSE ); diff --git a/plugins/newmail/newmail_opt.php b/plugins/newmail/newmail_opt.php index 87426a49..b3492b31 100644 --- a/plugins/newmail/newmail_opt.php +++ b/plugins/newmail/newmail_opt.php @@ -21,7 +21,7 @@ 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 . 'src/load_prefs.php'); + require_once(SM_PATH . 'include/load_prefs.php'); displayPageHeader($color, 'None'); diff --git a/plugins/newmail/testsound.php b/plugins/newmail/testsound.php index 0d3f4f7b..36f3241b 100644 --- a/plugins/newmail/testsound.php +++ b/plugins/newmail/testsound.php @@ -17,7 +17,6 @@ /* SquirrelMail required files. */ require_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/html.php'); - require_once(SM_PATH . 'src/load_prefs.php'); if (!isset($sound)) { $sound = "Click.wav"; diff --git a/plugins/spamcop/options.php b/plugins/spamcop/options.php index 13140bf6..2ff09a61 100755 --- a/plugins/spamcop/options.php +++ b/plugins/spamcop/options.php @@ -1,6 +1,7 @@