[Hastymail-cvs] SF.net SVN: hastymail:[1637] trunk/hastymail2/plugins
Brought to you by:
sailfrog,
slushpupie
From: <sai...@us...> - 2010-07-28 15:01:29
|
Revision: 1637 http://hastymail.svn.sourceforge.net/hastymail/?rev=1637&view=rev Author: sailfrog Date: 2010-07-28 15:01:23 +0000 (Wed, 28 Jul 2010) Log Message: ----------- update plugins to use the include path and filesystem delimiter as defined in the index.php file Modified Paths: -------------- trunk/hastymail2/plugins/calendar/display.php trunk/hastymail2/plugins/calendar/page.php trunk/hastymail2/plugins/context/display.php trunk/hastymail2/plugins/context/work.php trunk/hastymail2/plugins/imap_domain_map/work.php trunk/hastymail2/plugins/logger/work.php trunk/hastymail2/plugins/login_alias/work.php trunk/hastymail2/plugins/pop_fetch/ajax.php trunk/hastymail2/plugins/pop_fetch/work.php trunk/hastymail2/plugins/uuencode/display.php trunk/hastymail2/plugins/uuencode/work.php Modified: trunk/hastymail2/plugins/calendar/display.php =================================================================== --- trunk/hastymail2/plugins/calendar/display.php 2010-07-28 15:00:13 UTC (rev 1636) +++ trunk/hastymail2/plugins/calendar/display.php 2010-07-28 15:01:23 UTC (rev 1637) @@ -53,7 +53,7 @@ } function calendar_message_top($tools) { return ''; // short circuit during development - require_once('cal_include.php'); + require_once($tools->include_path.'cal_include.php'); if ($tools->get_current_message_type() == 'text/calendar' || $tools->get_current_message_type() == 'text/x-vCalendar') { $message = $tools->get_current_message(); $vcal = hm_new('vcal'); Modified: trunk/hastymail2/plugins/calendar/page.php =================================================================== --- trunk/hastymail2/plugins/calendar/page.php 2010-07-28 15:00:13 UTC (rev 1636) +++ trunk/hastymail2/plugins/calendar/page.php 2010-07-28 15:01:23 UTC (rev 1637) @@ -22,7 +22,7 @@ * $Id:$ */ -require_once('cal_include.php'); +require_once($tools->include_path.'cal_include.php'); /* main work function that parses user input (POST/GET) */ function url_action_calendar($tools, $get, $post) { Modified: trunk/hastymail2/plugins/context/display.php =================================================================== --- trunk/hastymail2/plugins/context/display.php 2010-07-28 15:00:13 UTC (rev 1636) +++ trunk/hastymail2/plugins/context/display.php 2010-07-28 15:01:23 UTC (rev 1637) @@ -23,7 +23,7 @@ */ function context_message_headers_bottom($tools) { - require('settings.php'); + require($tools->include_path.'settings.php'); $data = '<tr><td colspan="3" id="context_row" style="padding: 5px; padding-bottom: 8px; padding-left: 20px;"><div style="display: none;" id="context_store"></div>'; foreach ($context_btn as $index => $btn) { $data .= '<input type="submit" title="'.$tools->str[$btn['title']].'" onmousedown="context_search('.$index.')" id="'.$btn['id'].'" name="'.$btn['id']. Modified: trunk/hastymail2/plugins/context/work.php =================================================================== --- trunk/hastymail2/plugins/context/work.php 2010-07-28 15:00:13 UTC (rev 1636) +++ trunk/hastymail2/plugins/context/work.php 2010-07-28 15:01:23 UTC (rev 1637) @@ -28,7 +28,7 @@ if ($tools->get_page() != 'message') { return; } - require('settings.php'); + require($tools->include_path.'settings.php'); $tools->register_ajax_callback('fetch', 1, 'context_store'); $tools->add_js_event_handler('document.body', 'onmouseup', 'check_selection'); $tools->add_js_event_handler('msg_iframe.document.body', 'onmouseup', 'check_selection'); Modified: trunk/hastymail2/plugins/imap_domain_map/work.php =================================================================== --- trunk/hastymail2/plugins/imap_domain_map/work.php 2010-07-28 15:00:13 UTC (rev 1636) +++ trunk/hastymail2/plugins/imap_domain_map/work.php 2010-07-28 15:01:23 UTC (rev 1637) @@ -31,7 +31,7 @@ if (isset($_POST['user']) && strstr($_POST['user'], '@') && strpos($_POST['user'], '@') < strlen($_POST['user'])) { $domain = substr($_POST['user'], (strpos($_POST['user'], '@') + 1)); - require('settings.php'); + require($tools->include_path.'settings.php'); foreach ($server_map as $server => $vals) { if (in_array($domain, $vals)) { $imap_server = $server; Modified: trunk/hastymail2/plugins/logger/work.php =================================================================== --- trunk/hastymail2/plugins/logger/work.php 2010-07-28 15:00:13 UTC (rev 1636) +++ trunk/hastymail2/plugins/logger/work.php 2010-07-28 15:01:23 UTC (rev 1637) @@ -71,7 +71,7 @@ log_event($tools, 'new_page_start'); } function log_event($tools, $event) { - require('settings.php'); + require($tools->include_path.'settings.php'); if ($enable_log) { $log_event = false; if ($log_all_pages) { Modified: trunk/hastymail2/plugins/login_alias/work.php =================================================================== --- trunk/hastymail2/plugins/login_alias/work.php 2010-07-28 15:00:13 UTC (rev 1636) +++ trunk/hastymail2/plugins/login_alias/work.php 2010-07-28 15:01:23 UTC (rev 1637) @@ -31,7 +31,7 @@ } } function get_alias($username, $tools) { - require('settings.php'); + require($tools->include_path.'settings.php'); $alias = false; switch ($storage_type) { case 'file': Modified: trunk/hastymail2/plugins/pop_fetch/ajax.php =================================================================== --- trunk/hastymail2/plugins/pop_fetch/ajax.php 2010-07-28 15:00:13 UTC (rev 1636) +++ trunk/hastymail2/plugins/pop_fetch/ajax.php 2010-07-28 15:01:23 UTC (rev 1637) @@ -22,8 +22,8 @@ * $Id:$ */ function ajax_pop_fetch_fetch_mail($method, $tools) { - require_once('pop3_class.php'); - require_once('settings.php'); + require_once($tools->include_path.'pop3_class.php'); + require_once($tools->include_path.'settings.php'); $accounts = $tools->get_setting('pop_fetch_accounts'); $uid_map = get_pop_fetch_map($tools, $uid_map_dir); $map_sig = md5(serialize($uid_map)); Modified: trunk/hastymail2/plugins/pop_fetch/work.php =================================================================== --- trunk/hastymail2/plugins/pop_fetch/work.php 2010-07-28 15:00:13 UTC (rev 1636) +++ trunk/hastymail2/plugins/pop_fetch/work.php 2010-07-28 15:01:23 UTC (rev 1637) @@ -23,7 +23,7 @@ */ function pop_fetch_init($tools) { - require_once('pop3_class.php'); + require_once($tools->include_path.'pop3_class.php'); if ($tools->is_new_window()) { return; } Modified: trunk/hastymail2/plugins/uuencode/display.php =================================================================== --- trunk/hastymail2/plugins/uuencode/display.php 2010-07-28 15:00:13 UTC (rev 1636) +++ trunk/hastymail2/plugins/uuencode/display.php 2010-07-28 15:01:23 UTC (rev 1637) @@ -21,8 +21,8 @@ * $Id:$ */ -require_once('include.php'); function uuencode_message_top($tools) { + require_once($tools->asdf.'include.php'); if ($tools->get_current_message_type() == 'text/plain') { $message = $tools->get_current_message(); $attachments = get_attachments($message); Modified: trunk/hastymail2/plugins/uuencode/work.php =================================================================== --- trunk/hastymail2/plugins/uuencode/work.php 2010-07-28 15:00:13 UTC (rev 1636) +++ trunk/hastymail2/plugins/uuencode/work.php 2010-07-28 15:01:23 UTC (rev 1637) @@ -21,8 +21,8 @@ * $Id:$ */ -require_once('include.php'); function uuencode_page_end($tools) { + require_once($tools->include_path.'include.php'); if ($tools->get_page() == 'message' && strstr($tools->get_url(), 'uuencode=1')) { if (preg_match('/filename=([^&]+)/', $tools->get_url(), $matches)) { $filename = $matches[1]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |