From c8fe436824494c2d247938aa2f0b9ca1fa88124c Mon Sep 17 00:00:00 2001 From: Norv Date: Tue, 25 Jun 2013 13:23:12 +0300 Subject: [PATCH] Speaking of yelling. :) How about this? Signed-off-by: Norv --- SSI.php | 4 ++-- index.php | 2 +- install/install.php | 6 +++--- install/upgrade.php | 2 +- sources/BrowserDetect.class.php | 2 +- sources/Combine.class.php | 2 +- sources/CurlFetchWeb.class.php | 2 +- sources/Dispatcher.class.php | 2 +- sources/DumpDatabase.php | 2 +- sources/Errors.class.php | 2 +- sources/Errors.php | 8 ++++---- sources/Load.php | 16 +++++++-------- sources/Logging.php | 4 ++-- sources/QueryString.php | 2 +- sources/ScheduledTasks.php | 2 +- sources/Security.php | 4 ++-- sources/Session.php | 2 +- sources/Subs.php | 2 +- sources/Subscriptions-PayPal.class.php | 2 +- sources/admin/Admin.php | 2 +- sources/admin/AdminDebug.php | 2 +- sources/admin/AdminLog.php | 2 +- sources/admin/ManageAddonSettings.php | 2 +- sources/admin/ManageAttachments.php | 2 +- sources/admin/ManageAvatars.php | 2 +- sources/admin/ManageBBC.php | 2 +- sources/admin/ManageBadBehavior.php | 2 +- sources/admin/ManageBans.php | 2 +- sources/admin/ManageBoards.php | 2 +- sources/admin/ManageCalendar.php | 2 +- sources/admin/ManageCoreFeatures.php | 2 +- sources/admin/ManageDrafts.php | 2 +- sources/admin/ManageErrors.php | 2 +- sources/admin/ManageFeatures.php | 2 +- sources/admin/ManageLanguages.php | 4 ++-- sources/admin/ManageMail.php | 2 +- sources/admin/ManageMaillist.php | 2 +- sources/admin/ManageMaintenance.php | 2 +- sources/admin/ManageMembergroups.php | 2 +- sources/admin/ManageMembers.php | 2 +- sources/admin/ManageNews.php | 2 +- sources/admin/ManagePaid.php | 2 +- sources/admin/ManagePermissions.php | 2 +- sources/admin/ManagePosts.php | 2 +- sources/admin/ManageRegistration.php | 2 +- sources/admin/ManageScheduledTasks.php | 2 +- sources/admin/ManageSearch.php | 2 +- sources/admin/ManageSearchEngines.php | 4 ++-- sources/admin/ManageSecurity.php | 2 +- sources/admin/ManageServer.php | 2 +- sources/admin/ManageSmileys.php | 2 +- sources/admin/ManageTopics.php | 2 +- sources/admin/Modlog.php | 2 +- sources/admin/PackageServers.php | 2 +- sources/admin/Packages.php | 2 +- sources/admin/RepairBoards.php | 2 +- sources/admin/Reports.php | 2 +- sources/admin/Themes.php | 2 +- sources/controllers/Announce.controller.php | 2 +- sources/controllers/Auth.controller.php | 2 +- sources/controllers/BoardIndex.controller.php | 2 +- sources/controllers/Calendar.controller.php | 2 +- sources/controllers/Display.controller.php | 2 +- sources/controllers/Draft.controller.php | 2 +- sources/controllers/Emailpost.controller.php | 2 +- sources/controllers/Emailuser.controller.php | 2 +- sources/controllers/Groups.controller.php | 2 +- sources/controllers/Help.controller.php | 2 +- sources/controllers/Karma.controller.php | 2 +- sources/controllers/Likes.controller.php | 2 +- sources/controllers/Markasread.controller.php | 2 +- sources/controllers/Memberlist.controller.php | 2 +- sources/controllers/Members.controller.php | 2 +- .../controllers/MergeTopics.controller.php | 2 +- .../controllers/MessageIndex.controller.php | 2 +- .../ModerateAttachments.controller.php | 2 +- .../ModerationCenter.controller.php | 4 ++-- sources/controllers/MoveTopic.controller.php | 2 +- sources/controllers/News.controller.php | 2 +- sources/controllers/Notify.controller.php | 2 +- sources/controllers/OpenID.controller.php | 2 +- .../PersonalMessage.controller.php | 2 +- sources/controllers/Poll.controller.php | 2 +- sources/controllers/Post.controller.php | 2 +- .../controllers/PostModeration.controller.php | 2 +- sources/controllers/Profile.controller.php | 2 +- .../controllers/ProfileAccount.controller.php | 2 +- .../controllers/ProfileHistory.controller.php | 2 +- .../controllers/ProfileInfo.controller.php | 2 +- .../controllers/ProfileOptions.controller.php | 2 +- .../ProfileSubscriptions.controller.php | 2 +- sources/controllers/Recent.controller.php | 2 +- sources/controllers/Register.controller.php | 2 +- sources/controllers/Reminder.controller.php | 2 +- .../controllers/RemoveTopic.controller.php | 2 +- sources/controllers/Search.controller.php | 2 +- .../controllers/SplitTopics.controller.php | 2 +- sources/controllers/Stats.controller.php | 2 +- sources/controllers/Suggest.controller.php | 2 +- sources/controllers/Topic.controller.php | 2 +- sources/controllers/Who.controller.php | 2 +- sources/controllers/Xml.controller.php | 2 +- sources/database/Db-mysql.class.php | 8 ++++---- sources/database/Db-mysql.subs.php | 2 +- sources/database/Db-postgresql.class.php | 2 +- sources/database/Db-postgresql.subs.php | 2 +- sources/database/Db-sqlite.class.php | 2 +- sources/database/Db-sqlite.subs.php | 2 +- sources/database/Db.php | 2 +- sources/database/DbSearch-mysql.php | 2 +- sources/database/DbSearch-postgresql.php | 2 +- sources/database/DbSearch-sqlite.php | 2 +- sources/database/DbSearch.php | 2 +- sources/database/DbTable-mysql.php | 2 +- sources/database/DbTable-postgresql.php | 2 +- sources/database/DbTable-sqlite.php | 2 +- sources/database/DbTable.class.php | 2 +- sources/subs/Admin.subs.php | 4 ++-- sources/subs/AdminDebug.subs.php | 2 +- sources/subs/Attachments.subs.php | 4 ++-- sources/subs/Auth.subs.php | 2 +- sources/subs/BadBehavior.subs.php | 2 +- sources/subs/Bans.subs.php | 2 +- sources/subs/BoardIndex.subs.php | 2 +- sources/subs/Boards.subs.php | 4 ++-- sources/subs/Cache.subs.php | 12 +++++------ sources/subs/Calendar.subs.php | 2 +- sources/subs/Categories.subs.php | 2 +- sources/subs/Charset.subs.php | 2 +- sources/subs/Compat.subs.php | 2 +- sources/subs/DataValidator.class.php | 2 +- sources/subs/Editor.subs.php | 2 +- sources/subs/EmailFormat.class.php | 2 +- sources/subs/EmailParse.class.php | 2 +- sources/subs/EmailSettings.class.php | 2 +- sources/subs/Emailpost.subs.php | 2 +- sources/subs/Error.subs.php | 2 +- sources/subs/FTPConnection.class.php | 2 +- sources/subs/FollowUps.subs.php | 2 +- sources/subs/Graphics.subs.php | 2 +- sources/subs/Language.subs.php | 4 ++-- sources/subs/List.subs.php | 2 +- sources/subs/Mail.subs.php | 20 +++++++++---------- sources/subs/Maillist.subs.php | 2 +- sources/subs/ManageAddonSettings.subs.php | 2 +- sources/subs/ManageFeatures.subs.php | 2 +- sources/subs/ManageMaintenance.subs.php | 2 +- sources/subs/ManageNews.subs.php | 2 +- sources/subs/ManagePaid.subs.php | 4 ++-- sources/subs/ManagePermissions.subs.php | 2 +- sources/subs/ManageScheduledTasks.subs.php | 2 +- sources/subs/Membergroups.subs.php | 2 +- sources/subs/Memberlist.subs.php | 2 +- sources/subs/Members.subs.php | 2 +- sources/subs/MembersOnline.subs.php | 2 +- sources/subs/Menu.subs.php | 2 +- sources/subs/MessageIcons.subs.php | 2 +- sources/subs/MessageIndex.subs.php | 2 +- sources/subs/Messages.subs.php | 2 +- sources/subs/Moderation.subs.php | 4 ++-- sources/subs/Modlog.subs.php | 2 +- sources/subs/OpenID.subs.php | 2 +- sources/subs/Package.subs.php | 6 +++--- sources/subs/PackageServers.subs.php | 2 +- sources/subs/Permission.subs.php | 2 +- sources/subs/PersonalMessage.subs.php | 2 +- sources/subs/Post.subs.php | 2 +- sources/subs/Profile.subs.php | 2 +- sources/subs/Recent.subs.php | 2 +- sources/subs/Search.subs.php | 2 +- sources/subs/SearchAPI-Custom.class.php | 2 +- sources/subs/SearchAPI-Fulltext.class.php | 2 +- sources/subs/SearchAPI-Sphinx.class.php | 2 +- sources/subs/SearchAPI-Sphinxql.class.php | 2 +- sources/subs/SearchAPI-Standard.class.php | 2 +- sources/subs/SearchEngines.subs.php | 2 +- sources/subs/Settings.class.php | 2 +- sources/subs/Smileys.subs.php | 2 +- sources/subs/Sound.subs.php | 2 +- sources/subs/Stats.subs.php | 2 +- sources/subs/TemplateLayers.class.php | 2 +- sources/subs/Themes.subs.php | 2 +- sources/subs/Topic.subs.php | 2 +- sources/subs/Util.class.php | 2 +- sources/subs/Who.subs.php | 2 +- sources/subs/XmlArray.class.php | 2 +- tests/sources/TestRequest.php | 4 ++-- 187 files changed, 231 insertions(+), 231 deletions(-) diff --git a/SSI.php b/SSI.php index f4b381074e..dafa85d81d 100644 --- a/SSI.php +++ b/SSI.php @@ -15,10 +15,10 @@ */ // Don't do anything if ElkArte is already loaded. -if (defined('ELKARTE')) +if (defined('ELK')) return true; -define('ELKARTE', 'SSI'); +define('ELK', 'SSI'); // We're going to want a few globals... these are all set later. global $time_start, $maintenance, $msubject, $mmessage, $mbname, $language; diff --git a/index.php b/index.php index 5df1d4b180..cd9647cc05 100644 --- a/index.php +++ b/index.php @@ -22,7 +22,7 @@ $forum_version = 'ElkArte 1.0 Alpha'; // First things first, but not necessarily in that order. -define('ELKARTE', 1); +define('ELK', 1); if (function_exists('set_magic_quotes_runtime')) @set_magic_quotes_runtime(0); diff --git a/install/install.php b/install/install.php index ae0c31c2e3..9475f74d8c 100644 --- a/install/install.php +++ b/install/install.php @@ -296,8 +296,8 @@ function load_database() // Need this to check whether we need the database password. require(dirname(__FILE__) . '/Settings.php'); - if (!defined('ELKARTE')) - define('ELKARTE', 1); + if (!defined('ELK')) + define('ELK', 1); $modSettings['disableQueryCheck'] = true; @@ -760,7 +760,7 @@ function action_databaseSettings() } // Now include it for database functions! - define('ELKARTE', 1); + define('ELK', 1); $modSettings['disableQueryCheck'] = true; require_once(SOURCEDIR . '/database/Database.subs.php'); diff --git a/install/upgrade.php b/install/upgrade.php index 14c180c905..591f4ea828 100644 --- a/install/upgrade.php +++ b/install/upgrade.php @@ -823,7 +823,7 @@ function loadEssentialData() // Do the non-SSI stuff... @set_magic_quotes_runtime(0); error_reporting(E_ALL); - define('ELKARTE', 1); + define('ELK', 1); // Start the session. if (@ini_get('session.save_handler') == 'user') diff --git a/sources/BrowserDetect.class.php b/sources/BrowserDetect.class.php index b2fc7470c7..08ccea8c95 100644 --- a/sources/BrowserDetect.class.php +++ b/sources/BrowserDetect.class.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/Combine.class.php b/sources/Combine.class.php index bb055a02b5..afcf76a908 100644 --- a/sources/Combine.class.php +++ b/sources/Combine.class.php @@ -8,7 +8,7 @@ * @version 1.0 Alpha */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/CurlFetchWeb.class.php b/sources/CurlFetchWeb.class.php index 7735b22cfd..e082d5810f 100644 --- a/sources/CurlFetchWeb.class.php +++ b/sources/CurlFetchWeb.class.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/Dispatcher.class.php b/sources/Dispatcher.class.php index 36ec73c919..1e4097bab7 100644 --- a/sources/Dispatcher.class.php +++ b/sources/Dispatcher.class.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/DumpDatabase.php b/sources/DumpDatabase.php index f8d7c800f9..eae25063bd 100644 --- a/sources/DumpDatabase.php +++ b/sources/DumpDatabase.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/Errors.class.php b/sources/Errors.class.php index fc0c0293ad..3c48086770 100644 --- a/sources/Errors.class.php +++ b/sources/Errors.class.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('Hacking attempt...'); /** diff --git a/sources/Errors.php b/sources/Errors.php index c489663cbc..3165776d89 100644 --- a/sources/Errors.php +++ b/sources/Errors.php @@ -19,7 +19,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** @@ -73,7 +73,7 @@ function log_error($error_message, $error_type = 'general', $file = null, $line $query_string = empty($_SERVER['QUERY_STRING']) ? (empty($_SERVER['REQUEST_URL']) ? '' : str_replace($scripturl, '', $_SERVER['REQUEST_URL'])) : $_SERVER['QUERY_STRING']; // Don't log the session hash in the url twice, it's a waste. - $query_string = htmlspecialchars((ELKARTE == 'SSI' ? '' : '?') . preg_replace(array('~;sesc=[^&;]+~', '~' . session_name() . '=' . session_id() . '[&;]~'), array(';sesc', ''), $query_string)); + $query_string = htmlspecialchars((ELK == 'SSI' ? '' : '?') . preg_replace(array('~;sesc=[^&;]+~', '~' . session_name() . '=' . session_id() . '[&;]~'), array(';sesc', ''), $query_string)); // Just so we know what board error messages are from. if (isset($_POST['board']) && !isset($_GET['board'])) @@ -285,7 +285,7 @@ function setup_fatal_error_context($error_message, $error_code) return false; // Maybe they came from dlattach or similar? - if (ELKARTE != 'SSI' && empty($context['theme_loaded'])) + if (ELK != 'SSI' && empty($context['theme_loaded'])) loadTheme(); // Don't bother indexing errors mate... @@ -305,7 +305,7 @@ function setup_fatal_error_context($error_message, $error_code) $context['sub_template'] = 'fatal_error'; // If this is SSI, what do they want us to do? - if (ELKARTE == 'SSI') + if (ELK == 'SSI') { if (!empty($ssi_on_error_method) && $ssi_on_error_method !== true && is_callable($ssi_on_error_method)) $ssi_on_error_method(); diff --git a/sources/Load.php b/sources/Load.php index 55c9a78641..3cfce36137 100644 --- a/sources/Load.php +++ b/sources/Load.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** @@ -112,9 +112,9 @@ function reloadSettings() } // Integration is cool. - if (defined('ELKARTE_INTEGRATION_SETTINGS')) + if (defined('ELK_INTEGRATION_SETTINGS')) { - $integration_settings = unserialize(ELKARTE_INTEGRATION_SETTINGS); + $integration_settings = unserialize(ELK_INTEGRATION_SETTINGS); foreach ($integration_settings as $hook => $function) add_integration_function($hook, $function, false); } @@ -249,7 +249,7 @@ function loadUserSettings() // 2. RSS feeds and XMLHTTP requests don't count either. // 3. If it was set within this session, no need to set it again. // 4. New session, yet updated < five hours ago? Maybe cache can help. - if (ELKARTE != 'SSI' && !isset($_REQUEST['xml']) && (!isset($_REQUEST['action']) || $_REQUEST['action'] != '.xml') && empty($_SESSION['id_msg_last_visit']) && (empty($modSettings['cache_enable']) || ($_SESSION['id_msg_last_visit'] = cache_get_data('user_last_visit-' . $id_member, 5 * 3600)) === null)) + if (ELK != 'SSI' && !isset($_REQUEST['xml']) && (!isset($_REQUEST['action']) || $_REQUEST['action'] != '.xml') && empty($_SESSION['id_msg_last_visit']) && (empty($modSettings['cache_enable']) || ($_SESSION['id_msg_last_visit'] = cache_get_data('user_last_visit-' . $id_member, 5 * 3600)) === null)) { // @todo can this be cached? // Do a quick query to make sure this isn't a mistake. @@ -1307,7 +1307,7 @@ function loadTheme($id_theme = 0, $initialize = true) } // Hmm... check #2 - is it just different by a www? Send them to the correct place!! - if (empty($do_fix) && strtr($detected_url, array('://' => '://www.')) == $boardurl && (empty($_GET) || count($_GET) == 1) && ELKARTE != 'SSI') + if (empty($do_fix) && strtr($detected_url, array('://' => '://www.')) == $boardurl && (empty($_GET) || count($_GET) == 1) && ELK != 'SSI') { // Okay, this seems weird, but we don't want an endless loop - this will make $_GET not empty ;). if (empty($_GET)) @@ -2492,12 +2492,12 @@ function loadDatabase() $db_type = 'mysql'; // If we are in SSI try them first, but don't worry if it doesn't work, we have the normal username and password we can use. - if (ELKARTE == 'SSI' && !empty($ssi_db_user) && !empty($ssi_db_passwd)) + if (ELK == 'SSI' && !empty($ssi_db_user) && !empty($ssi_db_passwd)) $db_connection = elk_db_initiate($db_server, $db_name, $ssi_db_user, $ssi_db_passwd, $db_prefix, array('persist' => $db_persist, 'non_fatal' => true, 'dont_select_db' => true), $db_type); // Either we aren't in SSI mode, or it failed. if (empty($db_connection)) - $db_connection = elk_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, array('persist' => $db_persist, 'dont_select_db' => ELKARTE == 'SSI'), $db_type); + $db_connection = elk_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, array('persist' => $db_persist, 'dont_select_db' => ELK == 'SSI'), $db_type); // Safe guard here, if there isn't a valid connection lets put a stop to it. if (!$db_connection) @@ -2505,7 +2505,7 @@ function loadDatabase() // If in SSI mode fix up the prefix. $db = database(); - if (ELKARTE == 'SSI') + if (ELK == 'SSI') $db_prefix = $db->fix_prefix($db_prefix, $db_name); } diff --git a/sources/Logging.php b/sources/Logging.php index f699a4fdc9..6fea15768c 100644 --- a/sources/Logging.php +++ b/sources/Logging.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** @@ -144,7 +144,7 @@ function writeLog($force = false) $_SESSION['timeOnlineUpdated'] = time(); // Set their login time, if not already done within the last minute. - if (ELKARTE != 'SSI' && !empty($user_info['last_login']) && $user_info['last_login'] < time() - 60) + if (ELK != 'SSI' && !empty($user_info['last_login']) && $user_info['last_login'] < time() - 60) { // We log IPs the request came with, around here $req = request(); diff --git a/sources/QueryString.php b/sources/QueryString.php index 7aee87d91e..a1945c44ed 100644 --- a/sources/QueryString.php +++ b/sources/QueryString.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/ScheduledTasks.php b/sources/ScheduledTasks.php index 90ec2f8a85..36f96c4dae 100644 --- a/sources/ScheduledTasks.php +++ b/sources/ScheduledTasks.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/Security.php b/sources/Security.php index d18f415a79..15479f2a2d 100644 --- a/sources/Security.php +++ b/sources/Security.php @@ -18,7 +18,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** @@ -136,7 +136,7 @@ function is_not_guest($message = '', $is_fatal = true) obExit(false); // Attempt to detect if they came from dlattach. - if (ELKARTE != 'SSI' && empty($context['theme_loaded'])) + if (ELK != 'SSI' && empty($context['theme_loaded'])) loadTheme(); // Never redirect to an attachment diff --git a/sources/Session.php b/sources/Session.php index c770d9bcab..4bf4993ca8 100644 --- a/sources/Session.php +++ b/sources/Session.php @@ -19,7 +19,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/Subs.php b/sources/Subs.php index f2f7c453ea..f80973b00c 100644 --- a/sources/Subs.php +++ b/sources/Subs.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/Subscriptions-PayPal.class.php b/sources/Subscriptions-PayPal.class.php index 528e811f23..52a48b7835 100644 --- a/sources/Subscriptions-PayPal.class.php +++ b/sources/Subscriptions-PayPal.class.php @@ -18,7 +18,7 @@ // This won't be dedicated without this - this must exist in each gateway! // ElkArte Payment Gateway: paypal -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/Admin.php b/sources/admin/Admin.php index 026ec5e3ae..fad1f11ec6 100644 --- a/sources/admin/Admin.php +++ b/sources/admin/Admin.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/AdminDebug.php b/sources/admin/AdminDebug.php index 2353bb87ce..f2899ca3a9 100644 --- a/sources/admin/AdminDebug.php +++ b/sources/admin/AdminDebug.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class AdminDebug_Controller extends Action_Controller diff --git a/sources/admin/AdminLog.php b/sources/admin/AdminLog.php index e24e0d4d1c..a67d3a2a5b 100644 --- a/sources/admin/AdminLog.php +++ b/sources/admin/AdminLog.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManageAddonSettings.php b/sources/admin/ManageAddonSettings.php index 367a1cdd1f..bbd5c43bc2 100644 --- a/sources/admin/ManageAddonSettings.php +++ b/sources/admin/ManageAddonSettings.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManageAttachments.php b/sources/admin/ManageAttachments.php index 09c40006ae..b44298b842 100644 --- a/sources/admin/ManageAttachments.php +++ b/sources/admin/ManageAttachments.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManageAvatars.php b/sources/admin/ManageAvatars.php index ecb72b7e74..12d41aa5e5 100644 --- a/sources/admin/ManageAvatars.php +++ b/sources/admin/ManageAvatars.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManageBBC.php b/sources/admin/ManageBBC.php index 4a8577a502..87a72b0a10 100644 --- a/sources/admin/ManageBBC.php +++ b/sources/admin/ManageBBC.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManageBadBehavior.php b/sources/admin/ManageBadBehavior.php index d8a1020620..a1ac108a8a 100644 --- a/sources/admin/ManageBadBehavior.php +++ b/sources/admin/ManageBadBehavior.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class ManageBadBehavior_Controller extends Action_Controller diff --git a/sources/admin/ManageBans.php b/sources/admin/ManageBans.php index 06f2df9f2a..ff90f48eed 100644 --- a/sources/admin/ManageBans.php +++ b/sources/admin/ManageBans.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManageBoards.php b/sources/admin/ManageBoards.php index a7c7e87652..8ddcf16346 100644 --- a/sources/admin/ManageBoards.php +++ b/sources/admin/ManageBoards.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class ManageBoards_Controller extends Action_Controller diff --git a/sources/admin/ManageCalendar.php b/sources/admin/ManageCalendar.php index 35c774d0b0..2c3c10b5d8 100644 --- a/sources/admin/ManageCalendar.php +++ b/sources/admin/ManageCalendar.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class ManageCalendar_Controller extends Action_Controller diff --git a/sources/admin/ManageCoreFeatures.php b/sources/admin/ManageCoreFeatures.php index 3dc3b91b92..03848514fe 100644 --- a/sources/admin/ManageCoreFeatures.php +++ b/sources/admin/ManageCoreFeatures.php @@ -18,7 +18,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManageDrafts.php b/sources/admin/ManageDrafts.php index 366416233c..0f32b68358 100644 --- a/sources/admin/ManageDrafts.php +++ b/sources/admin/ManageDrafts.php @@ -8,7 +8,7 @@ * @version 1.0 Alpha */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManageErrors.php b/sources/admin/ManageErrors.php index 6727babb52..43743763e0 100644 --- a/sources/admin/ManageErrors.php +++ b/sources/admin/ManageErrors.php @@ -18,7 +18,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManageFeatures.php b/sources/admin/ManageFeatures.php index ec291f4e99..c49d5ef7c6 100644 --- a/sources/admin/ManageFeatures.php +++ b/sources/admin/ManageFeatures.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManageLanguages.php b/sources/admin/ManageLanguages.php index 805c7103a5..b1df707165 100644 --- a/sources/admin/ManageLanguages.php +++ b/sources/admin/ManageLanguages.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** @@ -342,7 +342,7 @@ public function action_downloadlang() elseif (!empty($install_files)) { // @todo retrieve the language pack per naming pattern from our sites - $archive_content = read_tgz_file('http://download.elkarte.net/fetch_language.php?version=' . urlencode(strtr($forum_version, array('ElkAarte ' => ''))) . ';fetch=' . urlencode($_GET['did']), BOARDDIR, false, true, $install_files); + $archive_content = read_tgz_file('http://download.elkarte.net/fetch_language.php?version=' . urlencode(strtr($forum_version, array('ElkArte ' => ''))) . ';fetch=' . urlencode($_GET['did']), BOARDDIR, false, true, $install_files); // Make sure the files aren't stuck in the cache. package_flush_cache(); $context['install_complete'] = sprintf($txt['languages_download_complete_desc'], $scripturl . '?action=admin;area=languages'); diff --git a/sources/admin/ManageMail.php b/sources/admin/ManageMail.php index c382d47d26..c57481c3bd 100644 --- a/sources/admin/ManageMail.php +++ b/sources/admin/ManageMail.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManageMaillist.php b/sources/admin/ManageMaillist.php index 0ebdf6b148..9203fa4730 100644 --- a/sources/admin/ManageMaillist.php +++ b/sources/admin/ManageMaillist.php @@ -11,7 +11,7 @@ * and those with approve email permission * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManageMaintenance.php b/sources/admin/ManageMaintenance.php index e1c401aa9b..8de085e70d 100644 --- a/sources/admin/ManageMaintenance.php +++ b/sources/admin/ManageMaintenance.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class ManageMaintenance_Controller extends Action_Controller diff --git a/sources/admin/ManageMembergroups.php b/sources/admin/ManageMembergroups.php index 28174d35ce..db090fa66c 100644 --- a/sources/admin/ManageMembergroups.php +++ b/sources/admin/ManageMembergroups.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManageMembers.php b/sources/admin/ManageMembers.php index d1950ab02c..36526796a6 100644 --- a/sources/admin/ManageMembers.php +++ b/sources/admin/ManageMembers.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManageNews.php b/sources/admin/ManageNews.php index fe6cc629fd..5a0e9ff1fe 100644 --- a/sources/admin/ManageNews.php +++ b/sources/admin/ManageNews.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManagePaid.php b/sources/admin/ManagePaid.php index ea05a8afe5..f7f0ba89f8 100644 --- a/sources/admin/ManagePaid.php +++ b/sources/admin/ManagePaid.php @@ -18,7 +18,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManagePermissions.php b/sources/admin/ManagePermissions.php index c81ea50ba0..c77d575976 100644 --- a/sources/admin/ManagePermissions.php +++ b/sources/admin/ManagePermissions.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManagePosts.php b/sources/admin/ManagePosts.php index 8c226e545f..2a0da3cc08 100644 --- a/sources/admin/ManagePosts.php +++ b/sources/admin/ManagePosts.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManageRegistration.php b/sources/admin/ManageRegistration.php index 451dd81928..7472d7659e 100644 --- a/sources/admin/ManageRegistration.php +++ b/sources/admin/ManageRegistration.php @@ -18,7 +18,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManageScheduledTasks.php b/sources/admin/ManageScheduledTasks.php index 7127e2928e..5138064e21 100644 --- a/sources/admin/ManageScheduledTasks.php +++ b/sources/admin/ManageScheduledTasks.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class ManageScheduledTasks_Controller extends Action_Controller diff --git a/sources/admin/ManageSearch.php b/sources/admin/ManageSearch.php index 7b693c0f0e..4c64573d06 100644 --- a/sources/admin/ManageSearch.php +++ b/sources/admin/ManageSearch.php @@ -16,7 +16,7 @@ * The admin screen to change the search settings. */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManageSearchEngines.php b/sources/admin/ManageSearchEngines.php index 26d6dbf0f4..993d8a0acc 100644 --- a/sources/admin/ManageSearchEngines.php +++ b/sources/admin/ManageSearchEngines.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** @@ -856,4 +856,4 @@ function list_getNumSpiderStats() { return getNumSpiderStats(); } -} \ No newline at end of file +} diff --git a/sources/admin/ManageSecurity.php b/sources/admin/ManageSecurity.php index 27a0e706af..11c59979c9 100644 --- a/sources/admin/ManageSecurity.php +++ b/sources/admin/ManageSecurity.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManageServer.php b/sources/admin/ManageServer.php index b637a827b9..e7d02ad800 100644 --- a/sources/admin/ManageServer.php +++ b/sources/admin/ManageServer.php @@ -59,7 +59,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); // We're working with them settings here. diff --git a/sources/admin/ManageSmileys.php b/sources/admin/ManageSmileys.php index 798aabc3cc..2218f39e31 100644 --- a/sources/admin/ManageSmileys.php +++ b/sources/admin/ManageSmileys.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/ManageTopics.php b/sources/admin/ManageTopics.php index 29c1644fc0..4d56eeb414 100644 --- a/sources/admin/ManageTopics.php +++ b/sources/admin/ManageTopics.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/Modlog.php b/sources/admin/Modlog.php index c6aa4f595d..2266f09098 100644 --- a/sources/admin/Modlog.php +++ b/sources/admin/Modlog.php @@ -18,7 +18,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/PackageServers.php b/sources/admin/PackageServers.php index fc7349261b..34bf4c8e81 100644 --- a/sources/admin/PackageServers.php +++ b/sources/admin/PackageServers.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/Packages.php b/sources/admin/Packages.php index 525e2a1e31..6264d6d239 100644 --- a/sources/admin/Packages.php +++ b/sources/admin/Packages.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/RepairBoards.php b/sources/admin/RepairBoards.php index 2e3ce88fbe..89927a9501 100644 --- a/sources/admin/RepairBoards.php +++ b/sources/admin/RepairBoards.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/admin/Reports.php b/sources/admin/Reports.php index 8634453ce8..bfa565fcb8 100644 --- a/sources/admin/Reports.php +++ b/sources/admin/Reports.php @@ -25,7 +25,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class Reports_Controller extends Action_Controller diff --git a/sources/admin/Themes.php b/sources/admin/Themes.php index 6e37ebad2c..27adbd9ebe 100644 --- a/sources/admin/Themes.php +++ b/sources/admin/Themes.php @@ -34,7 +34,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class Themes_Controller extends Action_Controller diff --git a/sources/controllers/Announce.controller.php b/sources/controllers/Announce.controller.php index 65899b73c5..88567f24b1 100644 --- a/sources/controllers/Announce.controller.php +++ b/sources/controllers/Announce.controller.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class Announce_Controller extends Action_Controller diff --git a/sources/controllers/Auth.controller.php b/sources/controllers/Auth.controller.php index fe5f2714ec..791c7522ad 100644 --- a/sources/controllers/Auth.controller.php +++ b/sources/controllers/Auth.controller.php @@ -18,7 +18,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class Auth_Controller extends Action_Controller diff --git a/sources/controllers/BoardIndex.controller.php b/sources/controllers/BoardIndex.controller.php index 950d261041..3e6e75137a 100644 --- a/sources/controllers/BoardIndex.controller.php +++ b/sources/controllers/BoardIndex.controller.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class BoardIndex_Controller extends Action_Controller diff --git a/sources/controllers/Calendar.controller.php b/sources/controllers/Calendar.controller.php index 694d1e6c7a..8f68f732b1 100644 --- a/sources/controllers/Calendar.controller.php +++ b/sources/controllers/Calendar.controller.php @@ -17,7 +17,7 @@ * Original module by Aaron O'Neil - aaron@mud-master.com */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class Calendar_Controller extends Action_Controller diff --git a/sources/controllers/Display.controller.php b/sources/controllers/Display.controller.php index 8797668a08..53d782bfa8 100644 --- a/sources/controllers/Display.controller.php +++ b/sources/controllers/Display.controller.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/Draft.controller.php b/sources/controllers/Draft.controller.php index 7abc963e20..2f62a4a7b2 100644 --- a/sources/controllers/Draft.controller.php +++ b/sources/controllers/Draft.controller.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/Emailpost.controller.php b/sources/controllers/Emailpost.controller.php index 1b69d9e9c5..6e7c9524b4 100644 --- a/sources/controllers/Emailpost.controller.php +++ b/sources/controllers/Emailpost.controller.php @@ -10,7 +10,7 @@ * All the functions that validate and then save an email as a post or pm */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/Emailuser.controller.php b/sources/controllers/Emailuser.controller.php index c885bc6e5f..75df67179a 100644 --- a/sources/controllers/Emailuser.controller.php +++ b/sources/controllers/Emailuser.controller.php @@ -18,7 +18,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class Emailuser_Controller extends Action_Controller diff --git a/sources/controllers/Groups.controller.php b/sources/controllers/Groups.controller.php index 634af712d1..437ffaa056 100644 --- a/sources/controllers/Groups.controller.php +++ b/sources/controllers/Groups.controller.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class Groups_Controller extends Action_Controller diff --git a/sources/controllers/Help.controller.php b/sources/controllers/Help.controller.php index e23ec9356e..197aeea7f2 100644 --- a/sources/controllers/Help.controller.php +++ b/sources/controllers/Help.controller.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/Karma.controller.php b/sources/controllers/Karma.controller.php index 65bb804bb8..2a5d6e968d 100644 --- a/sources/controllers/Karma.controller.php +++ b/sources/controllers/Karma.controller.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class Karma_Controller extends Action_Controller diff --git a/sources/controllers/Likes.controller.php b/sources/controllers/Likes.controller.php index 28cd34396f..832b3e6c55 100644 --- a/sources/controllers/Likes.controller.php +++ b/sources/controllers/Likes.controller.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/Markasread.controller.php b/sources/controllers/Markasread.controller.php index 698dd8eed4..a254af1fc1 100644 --- a/sources/controllers/Markasread.controller.php +++ b/sources/controllers/Markasread.controller.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/Memberlist.controller.php b/sources/controllers/Memberlist.controller.php index ccc69fefe4..88f2987ebc 100644 --- a/sources/controllers/Memberlist.controller.php +++ b/sources/controllers/Memberlist.controller.php @@ -20,7 +20,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/Members.controller.php b/sources/controllers/Members.controller.php index 7d8b21b6c7..0413526ce3 100644 --- a/sources/controllers/Members.controller.php +++ b/sources/controllers/Members.controller.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/MergeTopics.controller.php b/sources/controllers/MergeTopics.controller.php index 820f317aec..18eb607f50 100644 --- a/sources/controllers/MergeTopics.controller.php +++ b/sources/controllers/MergeTopics.controller.php @@ -18,7 +18,7 @@ * Original module by Mach8 - We'll never forget you. */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class MergeTopics_Controller extends Action_Controller diff --git a/sources/controllers/MessageIndex.controller.php b/sources/controllers/MessageIndex.controller.php index 9cc8cbcff0..862aa5c282 100644 --- a/sources/controllers/MessageIndex.controller.php +++ b/sources/controllers/MessageIndex.controller.php @@ -18,7 +18,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/ModerateAttachments.controller.php b/sources/controllers/ModerateAttachments.controller.php index ebb61bd677..c1f04aebf4 100644 --- a/sources/controllers/ModerateAttachments.controller.php +++ b/sources/controllers/ModerateAttachments.controller.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/ModerationCenter.controller.php b/sources/controllers/ModerationCenter.controller.php index 386ca6062b..25d20f5a7f 100644 --- a/sources/controllers/ModerationCenter.controller.php +++ b/sources/controllers/ModerationCenter.controller.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** @@ -1704,4 +1704,4 @@ public function block_reportedPosts() return 'reported_posts_block'; } -} \ No newline at end of file +} diff --git a/sources/controllers/MoveTopic.controller.php b/sources/controllers/MoveTopic.controller.php index 11dc3c9e8b..3544ff3867 100644 --- a/sources/controllers/MoveTopic.controller.php +++ b/sources/controllers/MoveTopic.controller.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/News.controller.php b/sources/controllers/News.controller.php index 2c9fea5556..604e2d12b8 100644 --- a/sources/controllers/News.controller.php +++ b/sources/controllers/News.controller.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/Notify.controller.php b/sources/controllers/Notify.controller.php index 4546723bf7..3c5b233a79 100644 --- a/sources/controllers/Notify.controller.php +++ b/sources/controllers/Notify.controller.php @@ -18,7 +18,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/OpenID.controller.php b/sources/controllers/OpenID.controller.php index 83cab484de..c4a59b0376 100644 --- a/sources/controllers/OpenID.controller.php +++ b/sources/controllers/OpenID.controller.php @@ -13,7 +13,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/PersonalMessage.controller.php b/sources/controllers/PersonalMessage.controller.php index b7e0454aed..0af920145b 100644 --- a/sources/controllers/PersonalMessage.controller.php +++ b/sources/controllers/PersonalMessage.controller.php @@ -19,7 +19,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/Poll.controller.php b/sources/controllers/Poll.controller.php index ef82c36d9e..95ee5e835c 100644 --- a/sources/controllers/Poll.controller.php +++ b/sources/controllers/Poll.controller.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/Post.controller.php b/sources/controllers/Post.controller.php index 7786a2f20d..00628d1000 100644 --- a/sources/controllers/Post.controller.php +++ b/sources/controllers/Post.controller.php @@ -19,7 +19,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/PostModeration.controller.php b/sources/controllers/PostModeration.controller.php index 0ef15d86dd..d0a5de7671 100644 --- a/sources/controllers/PostModeration.controller.php +++ b/sources/controllers/PostModeration.controller.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/Profile.controller.php b/sources/controllers/Profile.controller.php index d20a2dcaab..5abad2f209 100644 --- a/sources/controllers/Profile.controller.php +++ b/sources/controllers/Profile.controller.php @@ -19,7 +19,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class Profile_Controller extends Action_Controller diff --git a/sources/controllers/ProfileAccount.controller.php b/sources/controllers/ProfileAccount.controller.php index 47ca5de487..507d728091 100644 --- a/sources/controllers/ProfileAccount.controller.php +++ b/sources/controllers/ProfileAccount.controller.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/ProfileHistory.controller.php b/sources/controllers/ProfileHistory.controller.php index cbd744d311..e1bb399c9d 100644 --- a/sources/controllers/ProfileHistory.controller.php +++ b/sources/controllers/ProfileHistory.controller.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class ProfileHistory_Controller extends Action_Controller diff --git a/sources/controllers/ProfileInfo.controller.php b/sources/controllers/ProfileInfo.controller.php index 28e9c6cf23..7aa4713906 100644 --- a/sources/controllers/ProfileInfo.controller.php +++ b/sources/controllers/ProfileInfo.controller.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class ProfileInfo_Controller extends Action_Controller diff --git a/sources/controllers/ProfileOptions.controller.php b/sources/controllers/ProfileOptions.controller.php index 3301822ee5..788827195e 100644 --- a/sources/controllers/ProfileOptions.controller.php +++ b/sources/controllers/ProfileOptions.controller.php @@ -19,7 +19,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class ProfileOptions_Controller extends Action_Controller diff --git a/sources/controllers/ProfileSubscriptions.controller.php b/sources/controllers/ProfileSubscriptions.controller.php index 40b195168f..cfb37702b7 100644 --- a/sources/controllers/ProfileSubscriptions.controller.php +++ b/sources/controllers/ProfileSubscriptions.controller.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/Recent.controller.php b/sources/controllers/Recent.controller.php index 7e1e14a9a4..ccf1ea3762 100644 --- a/sources/controllers/Recent.controller.php +++ b/sources/controllers/Recent.controller.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/Register.controller.php b/sources/controllers/Register.controller.php index 82ad02c815..2c5764b2be 100644 --- a/sources/controllers/Register.controller.php +++ b/sources/controllers/Register.controller.php @@ -19,7 +19,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/Reminder.controller.php b/sources/controllers/Reminder.controller.php index 4719c6c507..4135d4069d 100644 --- a/sources/controllers/Reminder.controller.php +++ b/sources/controllers/Reminder.controller.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/RemoveTopic.controller.php b/sources/controllers/RemoveTopic.controller.php index 267eb9af8f..1dafcd8329 100644 --- a/sources/controllers/RemoveTopic.controller.php +++ b/sources/controllers/RemoveTopic.controller.php @@ -18,7 +18,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/Search.controller.php b/sources/controllers/Search.controller.php index c9d688cddc..ac06c99e43 100644 --- a/sources/controllers/Search.controller.php +++ b/sources/controllers/Search.controller.php @@ -16,7 +16,7 @@ * Handle all of the searching from here. * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); // This defines two version types for checking the API's are compatible with this version of the software. diff --git a/sources/controllers/SplitTopics.controller.php b/sources/controllers/SplitTopics.controller.php index 2f21b35005..700af7f5e6 100644 --- a/sources/controllers/SplitTopics.controller.php +++ b/sources/controllers/SplitTopics.controller.php @@ -18,7 +18,7 @@ * Original module by Mach8 - We'll never forget you. */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class SplitTopics_Controller extends Action_Controller diff --git a/sources/controllers/Stats.controller.php b/sources/controllers/Stats.controller.php index 795c3e5f8a..968e2e6267 100644 --- a/sources/controllers/Stats.controller.php +++ b/sources/controllers/Stats.controller.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/Suggest.controller.php b/sources/controllers/Suggest.controller.php index a39eafe400..2da8ba580a 100644 --- a/sources/controllers/Suggest.controller.php +++ b/sources/controllers/Suggest.controller.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/Topic.controller.php b/sources/controllers/Topic.controller.php index 76af48c767..71a07d5fa4 100644 --- a/sources/controllers/Topic.controller.php +++ b/sources/controllers/Topic.controller.php @@ -18,7 +18,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/Who.controller.php b/sources/controllers/Who.controller.php index aecb03f41c..2ea6129f93 100644 --- a/sources/controllers/Who.controller.php +++ b/sources/controllers/Who.controller.php @@ -18,7 +18,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/controllers/Xml.controller.php b/sources/controllers/Xml.controller.php index deebfd00f8..a1533b58c1 100644 --- a/sources/controllers/Xml.controller.php +++ b/sources/controllers/Xml.controller.php @@ -8,7 +8,7 @@ * @version 1.0 Alpha */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/database/Db-mysql.class.php b/sources/database/Db-mysql.class.php index 9b2bb18188..b6b6afd9e5 100644 --- a/sources/database/Db-mysql.class.php +++ b/sources/database/Db-mysql.class.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class Database_MySQL implements Database @@ -189,7 +189,7 @@ function replacement__callback($matches) break; case 'identifier': - // Backticks inside identifiers are supported as of MySQL 4.1. We don't need them for ElkArte. + // Backticks inside identifiers are supported as of MySQL 4.1. We don't need them for Elk. return '`' . strtr($replacement, array('`' => '', '.' => '')) . '`'; break; @@ -348,7 +348,7 @@ function query($identifier, $db_string, $db_values = array(), $connection = null $clean .= substr($db_string, $old_pos); $clean = trim(strtolower(preg_replace($allowed_comments_from, $allowed_comments_to, $clean))); - // We don't use UNION in ElkArte, at least so far. But it's useful for injections. + // We don't use UNION in Elk, at least so far. But it's useful for injections. if (strpos($clean, 'union') !== false && preg_match('~(^|[^a-z])union($|[^[a-z])~s', $clean) != 0) $fail = true; // Comments? We don't use comments in our queries, we leave 'em outside! @@ -617,7 +617,7 @@ function error($db_string, $connection = null) if (in_array($query_errno, array(2006, 2013)) && $db_connection == $connection) { // Are we in SSI mode? If so try that username and password first - if (ELKARTE == 'SSI' && !empty($ssi_db_user) && !empty($ssi_db_passwd)) + if (ELK == 'SSI' && !empty($ssi_db_user) && !empty($ssi_db_passwd)) { if (empty($db_persist)) $db_connection = @mysql_connect($db_server, $ssi_db_user, $ssi_db_passwd); diff --git a/sources/database/Db-mysql.subs.php b/sources/database/Db-mysql.subs.php index 0b6000504f..4ec7569e67 100644 --- a/sources/database/Db-mysql.subs.php +++ b/sources/database/Db-mysql.subs.php @@ -11,7 +11,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/database/Db-postgresql.class.php b/sources/database/Db-postgresql.class.php index ff01f68454..5e0b80663d 100644 --- a/sources/database/Db-postgresql.class.php +++ b/sources/database/Db-postgresql.class.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class Database_PostgreSQL implements Database diff --git a/sources/database/Db-postgresql.subs.php b/sources/database/Db-postgresql.subs.php index 0b6000504f..4ec7569e67 100644 --- a/sources/database/Db-postgresql.subs.php +++ b/sources/database/Db-postgresql.subs.php @@ -11,7 +11,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/database/Db-sqlite.class.php b/sources/database/Db-sqlite.class.php index 73195f703d..54c19c45d1 100644 --- a/sources/database/Db-sqlite.class.php +++ b/sources/database/Db-sqlite.class.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class Database_SQLite implements Database diff --git a/sources/database/Db-sqlite.subs.php b/sources/database/Db-sqlite.subs.php index 10227f0778..5863592a64 100644 --- a/sources/database/Db-sqlite.subs.php +++ b/sources/database/Db-sqlite.subs.php @@ -11,7 +11,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/database/Db.php b/sources/database/Db.php index 70c731ab9b..c7fcee2389 100644 --- a/sources/database/Db.php +++ b/sources/database/Db.php @@ -11,7 +11,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); interface Database diff --git a/sources/database/DbSearch-mysql.php b/sources/database/DbSearch-mysql.php index 6f379e5d96..6c639fe2d3 100644 --- a/sources/database/DbSearch-mysql.php +++ b/sources/database/DbSearch-mysql.php @@ -11,7 +11,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class DbSearch_MySQL implements DbSearch diff --git a/sources/database/DbSearch-postgresql.php b/sources/database/DbSearch-postgresql.php index ceaa8668db..1da857838b 100644 --- a/sources/database/DbSearch-postgresql.php +++ b/sources/database/DbSearch-postgresql.php @@ -11,7 +11,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class DbSearch_PostgreSQL implements DbSearch diff --git a/sources/database/DbSearch-sqlite.php b/sources/database/DbSearch-sqlite.php index 7f2176772f..7a99b3fe33 100644 --- a/sources/database/DbSearch-sqlite.php +++ b/sources/database/DbSearch-sqlite.php @@ -11,7 +11,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class DbSearch_SQLite implements DbSearch diff --git a/sources/database/DbSearch.php b/sources/database/DbSearch.php index d9b8f540e0..d31388645c 100644 --- a/sources/database/DbSearch.php +++ b/sources/database/DbSearch.php @@ -11,7 +11,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); interface DbSearch diff --git a/sources/database/DbTable-mysql.php b/sources/database/DbTable-mysql.php index f9323ecd7b..ba6ce2b3df 100644 --- a/sources/database/DbTable-mysql.php +++ b/sources/database/DbTable-mysql.php @@ -16,7 +16,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class DbTable_MySQL extends DbTable diff --git a/sources/database/DbTable-postgresql.php b/sources/database/DbTable-postgresql.php index 1c07f03c02..7b3609b45e 100644 --- a/sources/database/DbTable-postgresql.php +++ b/sources/database/DbTable-postgresql.php @@ -16,7 +16,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class DbTable_PostgreSQL extends DbTable diff --git a/sources/database/DbTable-sqlite.php b/sources/database/DbTable-sqlite.php index ad5e4b53a1..c184628be8 100644 --- a/sources/database/DbTable-sqlite.php +++ b/sources/database/DbTable-sqlite.php @@ -16,7 +16,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); class DbTable_SQLite extends DbTable diff --git a/sources/database/DbTable.class.php b/sources/database/DbTable.class.php index a454a498f5..8f725a12bc 100644 --- a/sources/database/DbTable.class.php +++ b/sources/database/DbTable.class.php @@ -14,7 +14,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); abstract class DbTable diff --git a/sources/subs/Admin.subs.php b/sources/subs/Admin.subs.php index 34e0d167fd..07d6d69807 100644 --- a/sources/subs/Admin.subs.php +++ b/sources/subs/Admin.subs.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** @@ -95,7 +95,7 @@ function getServerVersions($checkFor) /** * Search through source, theme and language files to determine their version. - * Get detailed version information about the physical ElkArte files on the server. + * Get detailed version information about the physical Elk files on the server. * * - the input parameter allows to set whether to include SSI.php and whether * the results should be sorted. diff --git a/sources/subs/AdminDebug.subs.php b/sources/subs/AdminDebug.subs.php index 1cfd12cc14..ee34cf9d8d 100644 --- a/sources/subs/AdminDebug.subs.php +++ b/sources/subs/AdminDebug.subs.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Attachments.subs.php b/sources/subs/Attachments.subs.php index 60417a3e5d..96714e546f 100644 --- a/sources/subs/Attachments.subs.php +++ b/sources/subs/Attachments.subs.php @@ -20,7 +20,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** @@ -1348,7 +1348,7 @@ function url_image_size($url) if ($fp != false) { // Send the HEAD request (since we don't have to worry about chunked, HTTP/1.1 is fine here.) - fwrite($fp, 'HEAD /' . $match[2] . ' HTTP/1.1' . "\r\n" . 'Host: ' . $match[1] . "\r\n" . 'User-Agent: PHP/ElkArte' . "\r\n" . 'Connection: close' . "\r\n\r\n"); + fwrite($fp, 'HEAD /' . $match[2] . ' HTTP/1.1' . "\r\n" . 'Host: ' . $match[1] . "\r\n" . 'User-Agent: PHP/ELK' . "\r\n" . 'Connection: close' . "\r\n\r\n"); // Read in the HTTP/1.1 or whatever. $test = substr(fgets($fp, 11), -1); diff --git a/sources/subs/Auth.subs.php b/sources/subs/Auth.subs.php index 9a5c2911c3..e042207a70 100644 --- a/sources/subs/Auth.subs.php +++ b/sources/subs/Auth.subs.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/BadBehavior.subs.php b/sources/subs/BadBehavior.subs.php index 23cfc71e2b..0d5c0df48f 100644 --- a/sources/subs/BadBehavior.subs.php +++ b/sources/subs/BadBehavior.subs.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Bans.subs.php b/sources/subs/Bans.subs.php index 5932e479f3..db4bc37358 100644 --- a/sources/subs/Bans.subs.php +++ b/sources/subs/Bans.subs.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/BoardIndex.subs.php b/sources/subs/BoardIndex.subs.php index 36b358b071..4b0efeee0b 100644 --- a/sources/subs/BoardIndex.subs.php +++ b/sources/subs/BoardIndex.subs.php @@ -18,7 +18,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Boards.subs.php b/sources/subs/Boards.subs.php index 10f670862b..722091f21a 100644 --- a/sources/subs/Boards.subs.php +++ b/sources/subs/Boards.subs.php @@ -18,7 +18,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** @@ -1799,4 +1799,4 @@ function boardNotifications($start, $items_per_page, $sort, $memID) $db->free_result($request); return $notification_boards; -} \ No newline at end of file +} diff --git a/sources/subs/Cache.subs.php b/sources/subs/Cache.subs.php index bb93d6ea0b..436772c7f3 100644 --- a/sources/subs/Cache.subs.php +++ b/sources/subs/Cache.subs.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** @@ -162,7 +162,7 @@ function cache_put_data($key, $value, $ttl = 120) case 'zend': // Zend Platform/ZPS/etc. if (function_exists('zend_shm_cache_store')) - zend_shm_cache_store('ELKARTE::' . $key, $value, $ttl); + zend_shm_cache_store('ELK::' . $key, $value, $ttl); elseif (function_exists('output_cache_put')) output_cache_put($key, $value); break; @@ -181,7 +181,7 @@ function cache_put_data($key, $value, $ttl = 120) @unlink(CACHEDIR . '/data_' . $key . '.php'); else { - $cache_data = '<' . '?' . 'php if (!defined(\'ELKARTE\')) die; if (' . (time() + $ttl) . ' < time()) $expired = true; else{$expired = false; $value = \'' . addcslashes($value, '\\\'') . '\';}'; + $cache_data = '<' . '?' . 'php if (!defined(\'ELK\')) die; if (' . (time() + $ttl) . ' < time()) $expired = true; else{$expired = false; $value = \'' . addcslashes($value, '\\\'') . '\';}'; // Write out the cache file, check that the cache write was successful; all the data must be written // If it fails due to low diskspace, or other, remove the cache file @@ -260,7 +260,7 @@ function cache_get_data($key, $ttl = 120) case 'zend': // Zend's pricey stuff. if (function_exists('zend_shm_cache_fetch')) - $value = zend_shm_cache_fetch('ELKARTE::' . $key, $ttl); + $value = zend_shm_cache_fetch('ELK::' . $key, $ttl); elseif (function_exists('output_cache_get')) $value = output_cache_get($key, $ttl); break; @@ -402,7 +402,7 @@ function clean_cache($type = '') break; case 'zend': if (function_exists('zend_shm_cache_clear')) - zend_shm_cache_clear('ELKARTE'); + zend_shm_cache_clear('ELK'); break; case 'xcache': if (function_exists('xcache_clear_cache') && function_exists('xcache_count')) @@ -463,7 +463,7 @@ function cache_get_key($key) // no need to do this every time, slows us down :P if (empty($key_prefix)) - $key_prefix = md5($boardurl . filemtime(SOURCEDIR . '/Load.php')) . '-ELKARTE-'; + $key_prefix = md5($boardurl . filemtime(SOURCEDIR . '/Load.php')) . '-ELK-'; return $key_prefix . ((empty($cache_accelerator) || $cache_accelerator === 'filebased') ? strtr($key, ':/', '-_') : $key); } \ No newline at end of file diff --git a/sources/subs/Calendar.subs.php b/sources/subs/Calendar.subs.php index 6cf0146f8b..6af6e93225 100644 --- a/sources/subs/Calendar.subs.php +++ b/sources/subs/Calendar.subs.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Categories.subs.php b/sources/subs/Categories.subs.php index 3cd215c71a..06ea617964 100644 --- a/sources/subs/Categories.subs.php +++ b/sources/subs/Categories.subs.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Charset.subs.php b/sources/subs/Charset.subs.php index 71fe773f47..b06a647841 100644 --- a/sources/subs/Charset.subs.php +++ b/sources/subs/Charset.subs.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Compat.subs.php b/sources/subs/Compat.subs.php index a67657ac8d..a1faa466d0 100644 --- a/sources/subs/Compat.subs.php +++ b/sources/subs/Compat.subs.php @@ -19,7 +19,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/DataValidator.class.php b/sources/subs/DataValidator.class.php index e4cafd70cf..14efb28f44 100644 --- a/sources/subs/DataValidator.class.php +++ b/sources/subs/DataValidator.class.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Editor.subs.php b/sources/subs/Editor.subs.php index d8e50542fb..52f50092ba 100644 --- a/sources/subs/Editor.subs.php +++ b/sources/subs/Editor.subs.php @@ -18,7 +18,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/EmailFormat.class.php b/sources/subs/EmailFormat.class.php index aa7e126deb..6840dea6f0 100644 --- a/sources/subs/EmailFormat.class.php +++ b/sources/subs/EmailFormat.class.php @@ -11,7 +11,7 @@ * as best it can to undo the 78/80 character email wrap */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/EmailParse.class.php b/sources/subs/EmailParse.class.php index e44bac3a81..87722a8691 100644 --- a/sources/subs/EmailParse.class.php +++ b/sources/subs/EmailParse.class.php @@ -10,7 +10,7 @@ * Take an email and parse the headers and body section in to an associative array */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/EmailSettings.class.php b/sources/subs/EmailSettings.class.php index 9f39b283af..c547c9cbe4 100644 --- a/sources/subs/EmailSettings.class.php +++ b/sources/subs/EmailSettings.class.php @@ -10,7 +10,7 @@ * Handles saving of config vars in another table than settings */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Emailpost.subs.php b/sources/subs/Emailpost.subs.php index 3957fbbc0b..39daaf49b3 100644 --- a/sources/subs/Emailpost.subs.php +++ b/sources/subs/Emailpost.subs.php @@ -10,7 +10,7 @@ * All the vital helper functions for use in email posting, formatting and conversion */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Error.subs.php b/sources/subs/Error.subs.php index 68fda6da13..b2eb30313e 100644 --- a/sources/subs/Error.subs.php +++ b/sources/subs/Error.subs.php @@ -8,7 +8,7 @@ * @version 1.0 Alpha */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/FTPConnection.class.php b/sources/subs/FTPConnection.class.php index e59784b2c1..64a06d01f9 100644 --- a/sources/subs/FTPConnection.class.php +++ b/sources/subs/FTPConnection.class.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/FollowUps.subs.php b/sources/subs/FollowUps.subs.php index 7f37ff59ed..e76508ef3b 100644 --- a/sources/subs/FollowUps.subs.php +++ b/sources/subs/FollowUps.subs.php @@ -12,7 +12,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Graphics.subs.php b/sources/subs/Graphics.subs.php index fee15b18c8..2db2224f1d 100644 --- a/sources/subs/Graphics.subs.php +++ b/sources/subs/Graphics.subs.php @@ -22,7 +22,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Language.subs.php b/sources/subs/Language.subs.php index 5a78774f9e..f196b6d4f3 100644 --- a/sources/subs/Language.subs.php +++ b/sources/subs/Language.subs.php @@ -9,12 +9,12 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** * Removes the given language from all members.. - * @param int $lang_id + * @param int $lang_id */ function removeLanguageFromMember($lang_id) { diff --git a/sources/subs/List.subs.php b/sources/subs/List.subs.php index 5df91f5ef1..03604cbb3e 100644 --- a/sources/subs/List.subs.php +++ b/sources/subs/List.subs.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Mail.subs.php b/sources/subs/Mail.subs.php index 121492020f..76549b4f1e 100644 --- a/sources/subs/Mail.subs.php +++ b/sources/subs/Mail.subs.php @@ -19,7 +19,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** @@ -121,7 +121,7 @@ function sendmail($to, $subject, $message, $from = null, $message_id = null, $se // Return path, date, mailer $headers .= 'Return-Path: ' . (!empty($modSettings['maillist_sitename_address']) ? $modSettings['maillist_sitename_address'] : (empty($modSettings['maillist_mail_from']) ? $webmaster_email : $modSettings['maillist_mail_from'])) . $line_break; $headers .= 'Date: ' . gmdate('D, d M Y H:i:s') . ' -0000' . $line_break; - $headers .= 'X-Mailer: ElkArte' . $line_break; + $headers .= 'X-Mailer: ELK' . $line_break; // Using the maillist functions? $maillist = !empty($modSettings['maillist_enabled']) && $from_wrapper !== null &&$message_id !== null && $priority < 4 && empty($modSettings['mail_no_message_id']); @@ -145,7 +145,7 @@ function sendmail($to, $subject, $message, $from = null, $message_id = null, $se $orig_message = $message; // The mime boundary separates the different alternative versions. - $mime_boundary = 'ELKARTE-' . md5($message . time()); + $mime_boundary = 'ELK-' . md5($message . time()); // Using mime, as it allows to send a plain unencoded alternative. $headers .= 'Mime-Version: 1.0' . $line_break; @@ -375,7 +375,7 @@ function AddMailQueue($flush = false, $to_array = array(), $subject = '', $messa } // If they are using SSI there is a good chance obExit will never be called. So lets be nice and flush it for them. - if (ELKARTE === 'SSI') + if (ELK === 'SSI') return AddMailQueue(true); return true; @@ -693,13 +693,13 @@ function server_parse($message, $socket, $response) function mail_insert_key($message, $unq_head, $encoded_unq_head, $line_break) { // append the key to the bottom of each message section, plain, html, encoded, etc - $message = preg_replace('~^(.*?)(' . $line_break . '--ELKARTE-[a-z0-9]{32})~s', "$1{$line_break}{$line_break}[{$unq_head}]{$line_break}$2", $message); - $message = preg_replace('~(Content-Type: text/plain;.*?Content-Transfer-Encoding: 7bit' . $line_break . $line_break . ')(.*?)(' . $line_break . '--ELKARTE-[a-z0-9]{32})~s', "$1$2{$line_break}{$line_break}[{$unq_head}]{$line_break}$3", $message); - $message = preg_replace('~(Content-Type: text/html;.*?Content-Transfer-Encoding: 7bit' . $line_break . $line_break . ')(.*?)(' . $line_break . '--ELKARTE-[a-z0-9]{32})~s', "$1$2

[{$unq_head}]
$3", $message); + $message = preg_replace('~^(.*?)(' . $line_break . '--ELK-[a-z0-9]{32})~s', "$1{$line_break}{$line_break}[{$unq_head}]{$line_break}$2", $message); + $message = preg_replace('~(Content-Type: text/plain;.*?Content-Transfer-Encoding: 7bit' . $line_break . $line_break . ')(.*?)(' . $line_break . '--ELK-[a-z0-9]{32})~s', "$1$2{$line_break}{$line_break}[{$unq_head}]{$line_break}$3", $message); + $message = preg_replace('~(Content-Type: text/html;.*?Content-Transfer-Encoding: 7bit' . $line_break . $line_break . ')(.*?)(' . $line_break . '--ELK-[a-z0-9]{32})~s', "$1$2

[{$unq_head}]
$3", $message); // base64 the harder one to insert our key // Find the sections, un-do the chunk_split, add in the new key, and re chunky it - if (preg_match('~(Content-Transfer-Encoding: base64' . $line_break . $line_break . ')(.*?)(' . $line_break . '--ELKARTE-[a-z0-9]{32})~s', $message, $match)) + if (preg_match('~(Content-Transfer-Encoding: base64' . $line_break . $line_break . ')(.*?)(' . $line_break . '--ELK-[a-z0-9]{32})~s', $message, $match)) { // un-chunk, add in our encoded key header, and re chunk, all so we match RFC 2045 semantics. $encoded_message = str_replace($line_break, '', $match[2]); @@ -931,7 +931,7 @@ function list_getMailQueueSize() /** * Deletes items from the mail queue - * @param array $items + * @param array $items */ function deleteMailQueueItems($items) { @@ -948,7 +948,7 @@ function deleteMailQueueItems($items) /** * get the current mail queue status - * @return array + * @return array */ function list_MailQueueStatus() { diff --git a/sources/subs/Maillist.subs.php b/sources/subs/Maillist.subs.php index 12b86e1239..2695c7fe79 100644 --- a/sources/subs/Maillist.subs.php +++ b/sources/subs/Maillist.subs.php @@ -10,7 +10,7 @@ * All of the helper functions for use by the maillist controller */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/ManageAddonSettings.subs.php b/sources/subs/ManageAddonSettings.subs.php index 708b7a2e0b..5d8def3db4 100644 --- a/sources/subs/ManageAddonSettings.subs.php +++ b/sources/subs/ManageAddonSettings.subs.php @@ -14,7 +14,7 @@ * @version 1.0 Alpha */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/ManageFeatures.subs.php b/sources/subs/ManageFeatures.subs.php index 0662e803b0..7b1cbf0b46 100644 --- a/sources/subs/ManageFeatures.subs.php +++ b/sources/subs/ManageFeatures.subs.php @@ -19,7 +19,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/ManageMaintenance.subs.php b/sources/subs/ManageMaintenance.subs.php index e3e611bb95..12ee2734cd 100644 --- a/sources/subs/ManageMaintenance.subs.php +++ b/sources/subs/ManageMaintenance.subs.php @@ -16,7 +16,7 @@ * Forum maintenance. Important stuff. * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/ManageNews.subs.php b/sources/subs/ManageNews.subs.php index af5e8a7ec5..4647570613 100644 --- a/sources/subs/ManageNews.subs.php +++ b/sources/subs/ManageNews.subs.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/ManagePaid.subs.php b/sources/subs/ManagePaid.subs.php index 89ebea71cd..a4ad2a3a90 100644 --- a/sources/subs/ManagePaid.subs.php +++ b/sources/subs/ManagePaid.subs.php @@ -18,7 +18,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** @@ -559,7 +559,7 @@ function deleteSubscription($id) } /** - * Adds a new subscription + * Adds a new subscription * * @param array $insert */ diff --git a/sources/subs/ManagePermissions.subs.php b/sources/subs/ManagePermissions.subs.php index ffd275badc..41d4d3149b 100644 --- a/sources/subs/ManagePermissions.subs.php +++ b/sources/subs/ManagePermissions.subs.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); diff --git a/sources/subs/ManageScheduledTasks.subs.php b/sources/subs/ManageScheduledTasks.subs.php index ba2e19d202..f1f38eb00e 100644 --- a/sources/subs/ManageScheduledTasks.subs.php +++ b/sources/subs/ManageScheduledTasks.subs.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Membergroups.subs.php b/sources/subs/Membergroups.subs.php index efee056403..f45cea45c3 100644 --- a/sources/subs/Membergroups.subs.php +++ b/sources/subs/Membergroups.subs.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Memberlist.subs.php b/sources/subs/Memberlist.subs.php index d2e55880a4..3f5964f8af 100644 --- a/sources/subs/Memberlist.subs.php +++ b/sources/subs/Memberlist.subs.php @@ -16,7 +16,7 @@ * Handle online users * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Members.subs.php b/sources/subs/Members.subs.php index 0a3aecc867..aa60023048 100644 --- a/sources/subs/Members.subs.php +++ b/sources/subs/Members.subs.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/MembersOnline.subs.php b/sources/subs/MembersOnline.subs.php index ad2f5ab9bf..d1b23484bd 100644 --- a/sources/subs/MembersOnline.subs.php +++ b/sources/subs/MembersOnline.subs.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Menu.subs.php b/sources/subs/Menu.subs.php index 1c803a5bae..653ff742f5 100644 --- a/sources/subs/Menu.subs.php +++ b/sources/subs/Menu.subs.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/MessageIcons.subs.php b/sources/subs/MessageIcons.subs.php index ee4c1f2671..5e72225988 100644 --- a/sources/subs/MessageIcons.subs.php +++ b/sources/subs/MessageIcons.subs.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/MessageIndex.subs.php b/sources/subs/MessageIndex.subs.php index 3be8ed2ee0..cc4bfa4459 100644 --- a/sources/subs/MessageIndex.subs.php +++ b/sources/subs/MessageIndex.subs.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); function messageIndexTopics($id_board, $id_member, $start, $per_page, $sort_by, $sort_column, $indexOptions) diff --git a/sources/subs/Messages.subs.php b/sources/subs/Messages.subs.php index c908b73dc7..7822bcf715 100644 --- a/sources/subs/Messages.subs.php +++ b/sources/subs/Messages.subs.php @@ -20,7 +20,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Moderation.subs.php b/sources/subs/Moderation.subs.php index 5088c93952..247c1e2d76 100644 --- a/sources/subs/Moderation.subs.php +++ b/sources/subs/Moderation.subs.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** @@ -1124,4 +1124,4 @@ function moderatorNotice($id_notice) $notice_body = parse_bbc($notice_body, false); return array($notice_body, $notice_subject); -} \ No newline at end of file +} diff --git a/sources/subs/Modlog.subs.php b/sources/subs/Modlog.subs.php index eb4aa33da6..d8075aa015 100644 --- a/sources/subs/Modlog.subs.php +++ b/sources/subs/Modlog.subs.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/OpenID.subs.php b/sources/subs/OpenID.subs.php index a21fa518cd..03a4f3cc6c 100644 --- a/sources/subs/OpenID.subs.php +++ b/sources/subs/OpenID.subs.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Package.subs.php b/sources/subs/Package.subs.php index 1b4e18e5f7..c07f840bd7 100644 --- a/sources/subs/Package.subs.php +++ b/sources/subs/Package.subs.php @@ -20,7 +20,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** @@ -3117,7 +3117,7 @@ function fetch_web_data($url, $post_data = '', $keep_alive = false, $redirection { fwrite($fp, 'GET ' . ($match[6] !== '/' ? str_replace(' ', '%20', $match[6]) : '') . ' HTTP/1.0' . "\r\n"); fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n"); - fwrite($fp, 'User-Agent: PHP/ElkArte' . "\r\n"); + fwrite($fp, 'User-Agent: PHP/ELK' . "\r\n"); if ($keep_alive) fwrite($fp, 'Connection: Keep-Alive' . "\r\n\r\n"); else @@ -3127,7 +3127,7 @@ function fetch_web_data($url, $post_data = '', $keep_alive = false, $redirection { fwrite($fp, 'POST ' . ($match[6] !== '/' ? $match[6] : '') . ' HTTP/1.0' . "\r\n"); fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n"); - fwrite($fp, 'User-Agent: PHP/ElkArte' . "\r\n"); + fwrite($fp, 'User-Agent: PHP/ELK' . "\r\n"); if ($keep_alive) fwrite($fp, 'Connection: Keep-Alive' . "\r\n"); else diff --git a/sources/subs/PackageServers.subs.php b/sources/subs/PackageServers.subs.php index 826d4cb5bd..ee59421e4a 100644 --- a/sources/subs/PackageServers.subs.php +++ b/sources/subs/PackageServers.subs.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Permission.subs.php b/sources/subs/Permission.subs.php index 2653111cb8..1891cdad4e 100644 --- a/sources/subs/Permission.subs.php +++ b/sources/subs/Permission.subs.php @@ -8,7 +8,7 @@ * @version 1.0 Alpha */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/PersonalMessage.subs.php b/sources/subs/PersonalMessage.subs.php index a6154769d6..803355cec0 100644 --- a/sources/subs/PersonalMessage.subs.php +++ b/sources/subs/PersonalMessage.subs.php @@ -21,7 +21,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); function loadMessageLimit() diff --git a/sources/subs/Post.subs.php b/sources/subs/Post.subs.php index 110b84ac8f..b9971057b6 100644 --- a/sources/subs/Post.subs.php +++ b/sources/subs/Post.subs.php @@ -19,7 +19,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Profile.subs.php b/sources/subs/Profile.subs.php index 1ce1985f74..eef7e98e4f 100644 --- a/sources/subs/Profile.subs.php +++ b/sources/subs/Profile.subs.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Recent.subs.php b/sources/subs/Recent.subs.php index c2986f6827..598b350460 100644 --- a/sources/subs/Recent.subs.php +++ b/sources/subs/Recent.subs.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Search.subs.php b/sources/subs/Search.subs.php index e26c1a0a23..0953c1f43d 100644 --- a/sources/subs/Search.subs.php +++ b/sources/subs/Search.subs.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); // This defines two version types for checking the API's are compatible with this version of the software. diff --git a/sources/subs/SearchAPI-Custom.class.php b/sources/subs/SearchAPI-Custom.class.php index b5dbf06a14..074fb293fb 100644 --- a/sources/subs/SearchAPI-Custom.class.php +++ b/sources/subs/SearchAPI-Custom.class.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/SearchAPI-Fulltext.class.php b/sources/subs/SearchAPI-Fulltext.class.php index e535997c45..82ffb47810 100644 --- a/sources/subs/SearchAPI-Fulltext.class.php +++ b/sources/subs/SearchAPI-Fulltext.class.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/SearchAPI-Sphinx.class.php b/sources/subs/SearchAPI-Sphinx.class.php index d02b5719bc..a4fff9fd84 100644 --- a/sources/subs/SearchAPI-Sphinx.class.php +++ b/sources/subs/SearchAPI-Sphinx.class.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/SearchAPI-Sphinxql.class.php b/sources/subs/SearchAPI-Sphinxql.class.php index dd20f8d346..bd5c386210 100644 --- a/sources/subs/SearchAPI-Sphinxql.class.php +++ b/sources/subs/SearchAPI-Sphinxql.class.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/SearchAPI-Standard.class.php b/sources/subs/SearchAPI-Standard.class.php index 71706225ac..251308a166 100644 --- a/sources/subs/SearchAPI-Standard.class.php +++ b/sources/subs/SearchAPI-Standard.class.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/SearchEngines.subs.php b/sources/subs/SearchEngines.subs.php index 8a13757451..323b6cb95a 100644 --- a/sources/subs/SearchEngines.subs.php +++ b/sources/subs/SearchEngines.subs.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Settings.class.php b/sources/subs/Settings.class.php index 16722a5e89..fa5bf37c2a 100644 --- a/sources/subs/Settings.class.php +++ b/sources/subs/Settings.class.php @@ -58,7 +58,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Smileys.subs.php b/sources/subs/Smileys.subs.php index 239d89348f..cf9ef2801e 100644 --- a/sources/subs/Smileys.subs.php +++ b/sources/subs/Smileys.subs.php @@ -15,7 +15,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Sound.subs.php b/sources/subs/Sound.subs.php index 2932925656..00a26564e0 100644 --- a/sources/subs/Sound.subs.php +++ b/sources/subs/Sound.subs.php @@ -19,7 +19,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Stats.subs.php b/sources/subs/Stats.subs.php index 33c162ced5..5ce5170b9c 100644 --- a/sources/subs/Stats.subs.php +++ b/sources/subs/Stats.subs.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/TemplateLayers.class.php b/sources/subs/TemplateLayers.class.php index d3e8aa35d8..ecc34beca2 100644 --- a/sources/subs/TemplateLayers.class.php +++ b/sources/subs/TemplateLayers.class.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Themes.subs.php b/sources/subs/Themes.subs.php index 40e0c219f3..091a6aa0ce 100644 --- a/sources/subs/Themes.subs.php +++ b/sources/subs/Themes.subs.php @@ -13,7 +13,7 @@ * already made). */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Topic.subs.php b/sources/subs/Topic.subs.php index 954b615b9d..1e1b1502a3 100644 --- a/sources/subs/Topic.subs.php +++ b/sources/subs/Topic.subs.php @@ -20,7 +20,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Util.class.php b/sources/subs/Util.class.php index a24471f2a8..33e3978db8 100644 --- a/sources/subs/Util.class.php +++ b/sources/subs/Util.class.php @@ -9,7 +9,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/Who.subs.php b/sources/subs/Who.subs.php index aea2f4e342..8c88be2192 100644 --- a/sources/subs/Who.subs.php +++ b/sources/subs/Who.subs.php @@ -11,7 +11,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/sources/subs/XmlArray.class.php b/sources/subs/XmlArray.class.php index cead892670..4ae4829e8f 100644 --- a/sources/subs/XmlArray.class.php +++ b/sources/subs/XmlArray.class.php @@ -17,7 +17,7 @@ * */ -if (!defined('ELKARTE')) +if (!defined('ELK')) die('No access...'); /** diff --git a/tests/sources/TestRequest.php b/tests/sources/TestRequest.php index 1648ff2cd3..d23e17387d 100644 --- a/tests/sources/TestRequest.php +++ b/tests/sources/TestRequest.php @@ -15,8 +15,8 @@ class TestRequest extends UnitTestCase function setUp() { // we are not in Elk, thereby need to set our define - if (!defined('ELKARTE')) - define('ELKARTE', 'SSI'); + if (!defined('ELK')) + define('ELK', 'SSI'); // and include our class. Kinda difficult without it. require_once(TESTDIR . '../sources/Request.php');