diff --git a/src/clientlang.php b/src/clientlang.php index 76cb58f..f20502d 100644 --- a/src/clientlang.php +++ b/src/clientlang.php @@ -41,7 +41,7 @@ if(isset($_COOKIE['bm_language']) } } -include('./serverlib/init.inc.php'); +require './serverlib/init.inc.php'; if(isset($_REQUEST['sid']) && trim($_REQUEST['sid']) != '') RequestPrivileges(PRIVILEGES_USER, true) || RequestPrivileges(PRIVILEGES_ADMIN, true); diff --git a/src/cron.php b/src/cron.php index 18572a5..e9b0438 100644 --- a/src/cron.php +++ b/src/cron.php @@ -19,8 +19,8 @@ * */ -include './serverlib/init.inc.php'; -include './serverlib/pop3gateway.class.php'; +require './serverlib/init.inc.php'; +require './serverlib/pop3gateway.class.php'; include './serverlib/userpop3gateway.class.php'; include './serverlib/calendar.class.php'; @@ -70,7 +70,7 @@ if ($bm_prefs['last_cron'] < time() - $bm_prefs['cron_interval']) { } register_shutdown_function('ReleaseCronLock'); - include './serverlib/cron.inc.php'; + require './serverlib/cron.inc.php'; // update last cron run time $db->Query('UPDATE {pre}prefs SET last_cron=?', diff --git a/src/cron.userpop3.php b/src/cron.userpop3.php index e714ab8..05a8956 100644 --- a/src/cron.userpop3.php +++ b/src/cron.userpop3.php @@ -19,7 +19,7 @@ * */ -include('./serverlib/init.inc.php'); +require './serverlib/init.inc.php'; include('./serverlib/userpop3gateway.class.php'); // try to prevent abortion diff --git a/src/deref.php b/src/deref.php index ec316a6..3e4f464 100644 --- a/src/deref.php +++ b/src/deref.php @@ -19,7 +19,7 @@ * */ -include('./serverlib/init.inc.php'); +require './serverlib/init.inc.php'; /** * file handler for modules diff --git a/src/email.compose.php b/src/email.compose.php index 8fda97b..6b752cd 100644 --- a/src/email.compose.php +++ b/src/email.compose.php @@ -19,7 +19,7 @@ * */ -include('./serverlib/init.inc.php'); +require './serverlib/init.inc.php'; if(!class_exists('BMMailbox')) include('./serverlib/mailbox.class.php'); include('./serverlib/addressbook.class.php'); diff --git a/src/email.folders.php b/src/email.folders.php index 124b3d9..e121c34 100644 --- a/src/email.folders.php +++ b/src/email.folders.php @@ -19,7 +19,7 @@ * */ -include('./serverlib/init.inc.php'); +require './serverlib/init.inc.php'; if(!class_exists('BMMailbox')) include('./serverlib/mailbox.class.php'); RequestPrivileges(PRIVILEGES_USER); diff --git a/src/email.php b/src/email.php index fad8b3b..bf9dfc0 100644 --- a/src/email.php +++ b/src/email.php @@ -19,7 +19,7 @@ * */ -include('./serverlib/init.inc.php'); +require './serverlib/init.inc.php'; if(!class_exists('BMMailbox')) include('./serverlib/mailbox.class.php'); include('./serverlib/zip.class.php'); diff --git a/src/email.read.php b/src/email.read.php index 2ba4cab..7c30de0 100644 --- a/src/email.read.php +++ b/src/email.read.php @@ -19,7 +19,7 @@ * */ -include('./serverlib/init.inc.php'); +require './serverlib/init.inc.php'; if(!class_exists('BMMailbox')) include('./serverlib/mailbox.class.php'); include('./serverlib/vcard.class.php'); diff --git a/src/index.php b/src/index.php index 232610e..1380b70 100644 --- a/src/index.php +++ b/src/index.php @@ -19,7 +19,7 @@ * */ -include('./serverlib/init.inc.php'); +require './serverlib/init.inc.php'; /** * languages diff --git a/src/interface/caldav.php b/src/interface/caldav.php index 56efd11..7b04f7b 100644 --- a/src/interface/caldav.php +++ b/src/interface/caldav.php @@ -21,7 +21,7 @@ define('INTERFACE_MODE', true); -include('../serverlib/init.inc.php'); +require '../serverlib/init.inc.php'; include('../serverlib/dav.inc.php'); include('../serverlib/organizerdav.inc.php'); include('../serverlib/calendar.class.php'); diff --git a/src/interface/carddav.php b/src/interface/carddav.php index 3f4da48..71cd632 100644 --- a/src/interface/carddav.php +++ b/src/interface/carddav.php @@ -21,7 +21,7 @@ define('INTERFACE_MODE', true); -include('../serverlib/init.inc.php'); +require '../serverlib/init.inc.php'; include('../serverlib/dav.inc.php'); include('../serverlib/organizerdav.inc.php'); include('../serverlib/addressbook.class.php'); diff --git a/src/interface/clientapi.php b/src/interface/clientapi.php index fb09e94..d206245 100644 --- a/src/interface/clientapi.php +++ b/src/interface/clientapi.php @@ -20,7 +20,7 @@ */ define('INTERFACE_MODE', true); -include('../serverlib/init.inc.php'); +require '../serverlib/init.inc.php'; $exportedClasses = array( 'BMToolInterface' => array( diff --git a/src/interface/ipn.php b/src/interface/ipn.php index 6cd6d2b..27f36ed 100644 --- a/src/interface/ipn.php +++ b/src/interface/ipn.php @@ -20,7 +20,7 @@ */ define('INTERFACE_MODE', true); -include('../serverlib/init.inc.php'); +require '../serverlib/init.inc.php'; include('../serverlib/payment.class.php'); PutLog(sprintf('IPN: <%s> Called', diff --git a/src/interface/su_callback.php b/src/interface/su_callback.php index ee91e9b..b64281d 100644 --- a/src/interface/su_callback.php +++ b/src/interface/su_callback.php @@ -20,7 +20,7 @@ */ define('INTERFACE_MODE', true); -include('../serverlib/init.inc.php'); +require '../serverlib/init.inc.php'; include('../serverlib/payment.class.php'); PutLog('SU-Callback: Called', diff --git a/src/interface/webdav.php b/src/interface/webdav.php index a5440ee..dcab51a 100644 --- a/src/interface/webdav.php +++ b/src/interface/webdav.php @@ -22,7 +22,7 @@ define('INTERFACE_MODE', true); define('WEBDAV_ALT_TIMESTAMP', 1411119133); -include('../serverlib/init.inc.php'); +require '../serverlib/init.inc.php'; include('../serverlib/dav.inc.php'); include('../serverlib/webdisk.class.php'); diff --git a/src/m/calendar.php b/src/m/calendar.php index bbe4473..ee7a69a 100644 --- a/src/m/calendar.php +++ b/src/m/calendar.php @@ -19,7 +19,7 @@ * */ -include('../serverlib/init.inc.php'); +require '../serverlib/init.inc.php'; if(!class_exists('BMCalendar')) include('../serverlib/calendar.class.php'); if(!class_exists('BMAddressbook')) diff --git a/src/m/contacts.php b/src/m/contacts.php index 2b6e42a..db012f6 100644 --- a/src/m/contacts.php +++ b/src/m/contacts.php @@ -19,7 +19,7 @@ * */ -include('../serverlib/init.inc.php'); +require '../serverlib/init.inc.php'; if(!class_exists('BMAddressbook')) include('../serverlib/addressbook.class.php'); RequestPrivileges(PRIVILEGES_USER | PRIVILEGES_MOBILE); diff --git a/src/m/email.php b/src/m/email.php index 44618a7..64900e9 100644 --- a/src/m/email.php +++ b/src/m/email.php @@ -19,7 +19,7 @@ * */ -include('../serverlib/init.inc.php'); +require '../serverlib/init.inc.php'; if(!class_exists('BMMailbox')) include('../serverlib/mailbox.class.php'); if(!class_exists('BMMailBuilder')) diff --git a/src/m/index.php b/src/m/index.php index 3e1374f..f43225b 100644 --- a/src/m/index.php +++ b/src/m/index.php @@ -19,7 +19,7 @@ * */ -include('../serverlib/init.inc.php'); +require '../serverlib/init.inc.php'; /** * file handler for modules diff --git a/src/m/tasks.php b/src/m/tasks.php index 8f538c8..47c39b0 100644 --- a/src/m/tasks.php +++ b/src/m/tasks.php @@ -19,7 +19,7 @@ * */ -include('../serverlib/init.inc.php'); +require '../serverlib/init.inc.php'; if(!class_exists('BMTodo')) include('../serverlib/todo.class.php'); RequestPrivileges(PRIVILEGES_USER | PRIVILEGES_MOBILE); diff --git a/src/m/webdisk.php b/src/m/webdisk.php index 0621140..4f09248 100644 --- a/src/m/webdisk.php +++ b/src/m/webdisk.php @@ -19,7 +19,7 @@ * */ -include('../serverlib/init.inc.php'); +require '../serverlib/init.inc.php'; if(!class_exists('BMWebdisk')) include('../serverlib/webdisk.class.php'); if(!class_exists('BMZIP')) diff --git a/src/organizer.addressbook.php b/src/organizer.addressbook.php index ef4e964..a6b9a17 100644 --- a/src/organizer.addressbook.php +++ b/src/organizer.addressbook.php @@ -19,7 +19,7 @@ * */ -include('./serverlib/init.inc.php'); +require './serverlib/init.inc.php'; include('./serverlib/todo.class.php'); include('./serverlib/vcard.class.php'); include('./serverlib/addressbook.class.php'); diff --git a/src/organizer.calendar.php b/src/organizer.calendar.php index a0c1a58..4fc803b 100644 --- a/src/organizer.calendar.php +++ b/src/organizer.calendar.php @@ -19,7 +19,7 @@ * */ -include('./serverlib/init.inc.php'); +require './serverlib/init.inc.php'; include('./serverlib/todo.class.php'); include('./serverlib/calendar.class.php'); include('./serverlib/addressbook.class.php'); @@ -146,7 +146,7 @@ if($_REQUEST['action'] == 'start') if($viewMode == 'day') { $dates = $calendar->GetDatesForTimeframe($dateStart, $dateEnd, $group); - $tpl->assign('weekDay', _strftime('%A', $dateStart)); + $tpl->assign('weekDay', date('l', $dateStart)); $tpl->assign('calWeek', date(date('o') == 'o' ? 'W/Y' : 'W/o', $dateStart)); $tpl->assign('dates', $dates); $tpl->assign('pageContent', 'li/organizer.calendar.dayview.tpl'); diff --git a/src/organizer.notes.php b/src/organizer.notes.php index bde3779..2378e32 100644 --- a/src/organizer.notes.php +++ b/src/organizer.notes.php @@ -19,7 +19,7 @@ * */ -include('./serverlib/init.inc.php'); +require './serverlib/init.inc.php'; include('./serverlib/notes.class.php'); include('./serverlib/todo.class.php'); RequestPrivileges(PRIVILEGES_USER); diff --git a/src/organizer.php b/src/organizer.php index 4499c44..e461e3c 100644 --- a/src/organizer.php +++ b/src/organizer.php @@ -19,7 +19,7 @@ * */ -include('./serverlib/init.inc.php'); +require './serverlib/init.inc.php'; include('./serverlib/todo.class.php'); include('./serverlib/dashboard.class.php'); RequestPrivileges(PRIVILEGES_USER); diff --git a/src/organizer.todo.php b/src/organizer.todo.php index a1a71c1..e695a16 100644 --- a/src/organizer.todo.php +++ b/src/organizer.todo.php @@ -19,7 +19,7 @@ * */ -include('./serverlib/init.inc.php'); +require './serverlib/init.inc.php'; include('./serverlib/todo.class.php'); RequestPrivileges(PRIVILEGES_USER); diff --git a/src/prefs.php b/src/prefs.php index 1801caa..a304e4e 100644 --- a/src/prefs.php +++ b/src/prefs.php @@ -19,7 +19,7 @@ * */ -include('./serverlib/init.inc.php'); +require './serverlib/init.inc.php'; include('./serverlib/mailbox.class.php'); include('./serverlib/payment.class.php'); RequestPrivileges(PRIVILEGES_USER); diff --git a/src/search.php b/src/search.php index f06c99a..76db449 100644 --- a/src/search.php +++ b/src/search.php @@ -19,7 +19,7 @@ * */ -include('./serverlib/init.inc.php'); +require './serverlib/init.inc.php'; RequestPrivileges(PRIVILEGES_USER); /** @@ -204,9 +204,9 @@ if($_REQUEST['action'] == 'search') } // show results + $tpl->assign('sortOrderInv', $sortOrder == 'asc' ? 'desc' : 'asc'); $tpl->assign('sortColumn', $sortColumn); $tpl->assign('sortOrder', $sortOrderFA); - $tpl->assign('sortOrderInv', $sortOrder == 'asc' ? 'desc' : 'asc'); $tpl->assign('pageNo', $pageNo); $tpl->assign('pageCount', $pageCount); $tpl->assign('results', $results); diff --git a/src/sms.php b/src/sms.php index 355ea05..1069fd4 100644 --- a/src/sms.php +++ b/src/sms.php @@ -19,7 +19,7 @@ * */ -include('./serverlib/init.inc.php'); +require './serverlib/init.inc.php'; include('./serverlib/sms.class.php'); RequestPrivileges(PRIVILEGES_USER); diff --git a/src/start.php b/src/start.php index 7490662..545ca99 100644 --- a/src/start.php +++ b/src/start.php @@ -19,7 +19,7 @@ * */ -include('./serverlib/init.inc.php'); +require './serverlib/init.inc.php'; include('./serverlib/dashboard.class.php'); RequestPrivileges(PRIVILEGES_USER); diff --git a/src/webdisk.php b/src/webdisk.php index d433331..b0f614e 100644 --- a/src/webdisk.php +++ b/src/webdisk.php @@ -19,7 +19,7 @@ * */ -include('./serverlib/init.inc.php'); +require './serverlib/init.inc.php'; include('./serverlib/webdisk.class.php'); include('./serverlib/zip.class.php'); include('./serverlib/unzip.class.php');