From 402a08bd1a305851b74894f4d2bdd2ec5ededda1 Mon Sep 17 00:00:00 2001 From: Norv Date: Tue, 26 Feb 2013 05:58:52 +0200 Subject: [PATCH 01/16] Add documentation to action_welcome() Signed-off-by: Norv --- install/install.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/install/install.php b/install/install.php index 32d3bb28f0..b7a6c1860c 100644 --- a/install/install.php +++ b/install/install.php @@ -375,6 +375,11 @@ function installExit($fallThrough = false) die(); } +/** + * Welcome screen. + * It makes a few basic checks for compatibility + * and informs the user if there are problems. + */ function action_welcome() { global $incontext, $txt, $databases, $installurl; @@ -1368,7 +1373,7 @@ function action_deleteInstall() require(dirname(__FILE__) . '/Settings.php'); load_database(); - + if (!defined('SUBSDIR')) define('SUBSDIR', dirname(__FILE__) . '/sources/subs'); From 2dfe969a94a9924c0e84eb8d46dd367aec20f873 Mon Sep 17 00:00:00 2001 From: Norv Date: Tue, 26 Feb 2013 06:02:39 +0200 Subject: [PATCH 02/16] Document functions in the installer. Signed-off-by: Norv --- install/install.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/install/install.php b/install/install.php index b7a6c1860c..64f2d9d333 100644 --- a/install/install.php +++ b/install/install.php @@ -1855,6 +1855,13 @@ function close() } } +/** + * Write out the contents of Settings.php file. + * This function will add the variables passed to it in $vars, + * to the Settings.php file. + * + * @param array $vars the configuration variables to write out. + */ function updateSettingsFile($vars) { // Modify Settings.php. @@ -1924,6 +1931,9 @@ function updateSettingsFile($vars) return true; } +/** + * Write the db_last_error file. + */ function updateDbLastError() { // Write out the db_last_error file with the error timestamp @@ -1932,7 +1942,8 @@ function updateDbLastError() } /** - * Create an .htaccess file to prevent mod_security. Elkarte has filtering built-in. + * Create an .htaccess file to prevent mod_security. + * Elkarte has filtering built-in. */ function fixModSecurity() { @@ -2583,4 +2594,4 @@ function doTheDelete() ', sprintf($txt['go_to_your_forum'], $boardurl . '/index.php'), '

', $txt['good_luck']; -} +} \ No newline at end of file From 16fcedc0fcc0b5519bf475a9fee511e12a70885c Mon Sep 17 00:00:00 2001 From: Norv Date: Tue, 26 Feb 2013 06:08:39 +0200 Subject: [PATCH 03/16] Replace 'Hacking attempt' message in usual cases, with 'No access' (thanks MAS) Signed-off-by: Norv --- 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.php | 2 +- sources/Load.php | 2 +- sources/Logging.php | 2 +- sources/QueryString.php | 2 +- sources/ScheduledTasks.php | 2 +- sources/SearchAPI-Custom.class.php | 2 +- sources/SearchAPI-Fulltext.class.php | 2 +- sources/SearchAPI-Sphinx.class.php | 2 +- sources/SearchAPI-Sphinxql.class.php | 2 +- sources/SearchAPI-Standard.class.php | 2 +- sources/Security.php | 2 +- sources/Session.php | 2 +- sources/Subs.php | 2 +- sources/Subscriptions-PayPal.class.php | 2 +- sources/admin/Admin.php | 2 +- sources/admin/ManageAttachments.php | 2 +- sources/admin/ManageBadBehavior.php | 2 +- sources/admin/ManageBans.php | 2 +- sources/admin/ManageBoards.php | 2 +- sources/admin/ManageCalendar.php | 2 +- sources/admin/ManageDrafts.php | 2 +- sources/admin/ManageErrors.php | 2 +- sources/admin/ManageLanguages.php | 2 +- sources/admin/ManageMail.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 | 2 +- sources/admin/ManageServer.php | 2 +- sources/admin/ManageSettings.php | 2 +- sources/admin/ManageSmileys.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/admin/ViewQuery.php | 2 +- sources/controllers/Announce.controller.php | 2 +- sources/controllers/BoardIndex.controller.php | 2 +- sources/controllers/Calendar.controller.php | 2 +- sources/controllers/Display.controller.php | 2 +- sources/controllers/Drafts.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/LogInOut.controller.php | 2 +- sources/controllers/Markasread.controller.php | 2 +- sources/controllers/Memberlist.controller.php | 2 +- sources/controllers/Members.controller.php | 2 +- sources/controllers/MergeTopics.controller.php | 2 +- sources/controllers/MessageIndex.controller.php | 2 +- sources/controllers/ModerateAttachments.controller.php | 2 +- sources/controllers/ModerationCenter.controller.php | 2 +- sources/controllers/MoveTopic.controller.php | 2 +- sources/controllers/News.controller.php | 2 +- sources/controllers/Notify.controller.php | 2 +- sources/controllers/PersonalMessage.controller.php | 2 +- sources/controllers/Poll.controller.php | 2 +- sources/controllers/Post.controller.php | 2 +- sources/controllers/PostModeration.controller.php | 2 +- sources/controllers/Profile.controller.php | 2 +- sources/controllers/ProfileAccount.controller.php | 2 +- sources/controllers/ProfileHistory.controller.php | 2 +- sources/controllers/ProfileInfo.controller.php | 2 +- sources/controllers/ProfileOptions.controller.php | 2 +- sources/controllers/ProfileSubscriptions.controller.php | 2 +- sources/controllers/Recent.controller.php | 2 +- sources/controllers/Register.controller.php | 2 +- sources/controllers/Reminder.controller.php | 2 +- sources/controllers/RemoveTopic.controller.php | 2 +- sources/controllers/Search.controller.php | 2 +- sources/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.subs.php | 2 +- sources/database/Db-postgresql.subs.php | 2 +- sources/database/Db-sqlite.subs.php | 2 +- sources/database/DbExtra-mysql.php | 2 +- sources/database/DbExtra-postgresql.php | 2 +- sources/database/DbExtra-sqlite.php | 2 +- sources/database/DbPackages-mysql.php | 2 +- sources/database/DbPackages-postgresql.php | 2 +- sources/database/DbPackages-sqlite.php | 2 +- sources/database/DbSearch-mysql.php | 2 +- sources/database/DbSearch-postgresql.php | 2 +- sources/database/DbSearch-sqlite.php | 2 +- sources/ext/bad-behavior/badbehavior-plugin.php | 2 +- sources/subs/Admin.subs.php | 2 +- sources/subs/Attachments.subs.php | 2 +- sources/subs/Auth.subs.php | 2 +- sources/subs/BadBehavior.subs.php | 2 +- sources/subs/BoardIndex.subs.php | 2 +- sources/subs/Boards.subs.php | 2 +- sources/subs/Cache.subs.php | 2 +- 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/Editor.subs.php | 2 +- sources/subs/FTPConnection.class.php | 2 +- sources/subs/Graphics.subs.php | 2 +- sources/subs/List.subs.php | 2 +- sources/subs/Mail.subs.php | 2 +- sources/subs/Membergroups.subs.php | 2 +- sources/subs/Members.subs.php | 2 +- sources/subs/MembersOnline.subs.php | 2 +- sources/subs/Menu.subs.php | 2 +- sources/subs/MessageIndex.subs.php | 2 +- sources/subs/Messages.subs.php | 2 +- sources/subs/Moderation.subs.php | 2 +- sources/subs/OpenID.subs.php | 2 +- sources/subs/Package.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/SearchEngines.subs.php | 2 +- sources/subs/Sound.subs.php | 2 +- sources/subs/Topic.subs.php | 2 +- sources/subs/XmlArray.class.php | 2 +- 138 files changed, 138 insertions(+), 138 deletions(-) diff --git a/sources/BrowserDetect.class.php b/sources/BrowserDetect.class.php index e5b875f3a5..595a64d4bc 100644 --- a/sources/BrowserDetect.class.php +++ b/sources/BrowserDetect.class.php @@ -16,7 +16,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * This class is an experiment for the job of correctly detecting browsers and settings needed for them. diff --git a/sources/Combine.class.php b/sources/Combine.class.php index 3110ef771b..9f58bbfb77 100644 --- a/sources/Combine.class.php +++ b/sources/Combine.class.php @@ -9,7 +9,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Used to combine css or js files in to a single file diff --git a/sources/CurlFetchWeb.class.php b/sources/CurlFetchWeb.class.php index 024dc047fd..0805bfaf15 100644 --- a/sources/CurlFetchWeb.class.php +++ b/sources/CurlFetchWeb.class.php @@ -10,7 +10,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Simple cURL class to fetch a web page diff --git a/sources/Dispatcher.class.php b/sources/Dispatcher.class.php index 0811f3b5b2..b31ef1162d 100644 --- a/sources/Dispatcher.class.php +++ b/sources/Dispatcher.class.php @@ -10,7 +10,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Dispatch the request to the function or method registered to handle it. diff --git a/sources/DumpDatabase.php b/sources/DumpDatabase.php index 27dc997f32..4f1e94b6c7 100644 --- a/sources/DumpDatabase.php +++ b/sources/DumpDatabase.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Dumps the database. diff --git a/sources/Errors.php b/sources/Errors.php index 6e85569ec4..9d74633809 100644 --- a/sources/Errors.php +++ b/sources/Errors.php @@ -20,7 +20,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Log an error, if the error logging is enabled. diff --git a/sources/Load.php b/sources/Load.php index a30e8de1ac..c39045775b 100644 --- a/sources/Load.php +++ b/sources/Load.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Load the $modSettings array. diff --git a/sources/Logging.php b/sources/Logging.php index ecef31aabd..1661f1562d 100644 --- a/sources/Logging.php +++ b/sources/Logging.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Put this user in the online log. diff --git a/sources/QueryString.php b/sources/QueryString.php index 38f7b95983..a31ccfae7d 100644 --- a/sources/QueryString.php +++ b/sources/QueryString.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Clean the request variables - add html entities to GET and slashes if magic_quotes_gpc is Off. diff --git a/sources/ScheduledTasks.php b/sources/ScheduledTasks.php index 708b91700d..602ba955a5 100644 --- a/sources/ScheduledTasks.php +++ b/sources/ScheduledTasks.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * This function works out what to do! diff --git a/sources/SearchAPI-Custom.class.php b/sources/SearchAPI-Custom.class.php index debecdafe4..cfd64b5e58 100644 --- a/sources/SearchAPI-Custom.class.php +++ b/sources/SearchAPI-Custom.class.php @@ -16,7 +16,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * SearchAPI-Custom.php, Custom Search API class .. used when custom ELKARTE index is used diff --git a/sources/SearchAPI-Fulltext.class.php b/sources/SearchAPI-Fulltext.class.php index d27fffd8d8..831a7d5f93 100644 --- a/sources/SearchAPI-Fulltext.class.php +++ b/sources/SearchAPI-Fulltext.class.php @@ -16,7 +16,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * SearchAPI-Fulltext.php, Fulltext API, used when an SQL fulltext index is used diff --git a/sources/SearchAPI-Sphinx.class.php b/sources/SearchAPI-Sphinx.class.php index 8d09a3b0d7..4929f66fca 100644 --- a/sources/SearchAPI-Sphinx.class.php +++ b/sources/SearchAPI-Sphinx.class.php @@ -16,7 +16,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * SearchAPI-Sphinx.php, used when an Sphinx search daemon is used and access is via diff --git a/sources/SearchAPI-Sphinxql.class.php b/sources/SearchAPI-Sphinxql.class.php index d2cad29048..7ef893503d 100644 --- a/sources/SearchAPI-Sphinxql.class.php +++ b/sources/SearchAPI-Sphinxql.class.php @@ -16,7 +16,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * SearchAPI-Sphinxql.php, used when an Sphinx search daemon is used and you want to access it diff --git a/sources/SearchAPI-Standard.class.php b/sources/SearchAPI-Standard.class.php index 12595dff0b..880b64a791 100644 --- a/sources/SearchAPI-Standard.class.php +++ b/sources/SearchAPI-Standard.class.php @@ -16,7 +16,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * SearchAPI-Standard.php, Standard non full index, non custom index search diff --git a/sources/Security.php b/sources/Security.php index 9284fc4c28..94a63d5c4b 100644 --- a/sources/Security.php +++ b/sources/Security.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Check if the user is who he/she says he is diff --git a/sources/Session.php b/sources/Session.php index f9ae3c6a85..ca2a11765b 100644 --- a/sources/Session.php +++ b/sources/Session.php @@ -22,7 +22,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Attempt to start the session, unless it already has been. diff --git a/sources/Subs.php b/sources/Subs.php index af1fae9a1c..b01cfccb4b 100644 --- a/sources/Subs.php +++ b/sources/Subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Update some basic statistics. diff --git a/sources/Subscriptions-PayPal.class.php b/sources/Subscriptions-PayPal.class.php index 127d753ff4..2745787900 100644 --- a/sources/Subscriptions-PayPal.class.php +++ b/sources/Subscriptions-PayPal.class.php @@ -19,7 +19,7 @@ // ELKARTE Payment Gateway: paypal if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Class for returning available form data for this gateway diff --git a/sources/admin/Admin.php b/sources/admin/Admin.php index 4845d2e431..bc5c6c1ddb 100644 --- a/sources/admin/Admin.php +++ b/sources/admin/Admin.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * The main admin handling function. diff --git a/sources/admin/ManageAttachments.php b/sources/admin/ManageAttachments.php index 6cd74f4edc..896ca9676e 100644 --- a/sources/admin/ManageAttachments.php +++ b/sources/admin/ManageAttachments.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * The main 'Attachments and Avatars' management function. diff --git a/sources/admin/ManageBadBehavior.php b/sources/admin/ManageBadBehavior.php index 22a5567757..1c06802a3d 100644 --- a/sources/admin/ManageBadBehavior.php +++ b/sources/admin/ManageBadBehavior.php @@ -10,7 +10,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * View the forum's badbehavior log. diff --git a/sources/admin/ManageBans.php b/sources/admin/ManageBans.php index 9d81f8826e..d5c6666bf0 100644 --- a/sources/admin/ManageBans.php +++ b/sources/admin/ManageBans.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Ban center. The main entrance point for all ban center functions. diff --git a/sources/admin/ManageBoards.php b/sources/admin/ManageBoards.php index 8c018e9108..8066c8c837 100644 --- a/sources/admin/ManageBoards.php +++ b/sources/admin/ManageBoards.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * The main dispatcher; doesn't do anything, just delegates. diff --git a/sources/admin/ManageCalendar.php b/sources/admin/ManageCalendar.php index 8fe0000548..8e1e3b79f7 100644 --- a/sources/admin/ManageCalendar.php +++ b/sources/admin/ManageCalendar.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * The main controlling function doesn't have much to do... yet. diff --git a/sources/admin/ManageDrafts.php b/sources/admin/ManageDrafts.php index 501ca2fa02..5729939365 100644 --- a/sources/admin/ManageDrafts.php +++ b/sources/admin/ManageDrafts.php @@ -9,7 +9,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Modify any setting related to drafts. diff --git a/sources/admin/ManageErrors.php b/sources/admin/ManageErrors.php index 45d7e374ea..9e853e25c0 100644 --- a/sources/admin/ManageErrors.php +++ b/sources/admin/ManageErrors.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * View the forum's error log. diff --git a/sources/admin/ManageLanguages.php b/sources/admin/ManageLanguages.php index a016ec4ceb..cf9bb1eec2 100644 --- a/sources/admin/ManageLanguages.php +++ b/sources/admin/ManageLanguages.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * This is the main function for the languages area. diff --git a/sources/admin/ManageMail.php b/sources/admin/ManageMail.php index 14175756af..313188006f 100644 --- a/sources/admin/ManageMail.php +++ b/sources/admin/ManageMail.php @@ -20,7 +20,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Main dispatcher. diff --git a/sources/admin/ManageMaintenance.php b/sources/admin/ManageMaintenance.php index 8f59f8ecd7..429741fd64 100644 --- a/sources/admin/ManageMaintenance.php +++ b/sources/admin/ManageMaintenance.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Main dispatcher, the maintenance access point. diff --git a/sources/admin/ManageMembergroups.php b/sources/admin/ManageMembergroups.php index b6f4595bc8..af15e0002d 100644 --- a/sources/admin/ManageMembergroups.php +++ b/sources/admin/ManageMembergroups.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** diff --git a/sources/admin/ManageMembers.php b/sources/admin/ManageMembers.php index bcd8ff239b..6155a1066e 100644 --- a/sources/admin/ManageMembers.php +++ b/sources/admin/ManageMembers.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * The main entrance point for the Manage Members screen. diff --git a/sources/admin/ManageNews.php b/sources/admin/ManageNews.php index 2908d2f8f8..c55c39d2d0 100644 --- a/sources/admin/ManageNews.php +++ b/sources/admin/ManageNews.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * The news dispatcher; doesn't do anything, just delegates. diff --git a/sources/admin/ManagePaid.php b/sources/admin/ManagePaid.php index 4b111e7e95..1794cf8de5 100644 --- a/sources/admin/ManagePaid.php +++ b/sources/admin/ManagePaid.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * The main entrance point for the 'Paid Subscription' screen, calling diff --git a/sources/admin/ManagePermissions.php b/sources/admin/ManagePermissions.php index d7d20c72d1..4b854643cf 100644 --- a/sources/admin/ManagePermissions.php +++ b/sources/admin/ManagePermissions.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Dispaches to the right function based on the given subaction. diff --git a/sources/admin/ManagePosts.php b/sources/admin/ManagePosts.php index c54b80b468..d966db1506 100644 --- a/sources/admin/ManagePosts.php +++ b/sources/admin/ManagePosts.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * The main entrance point for the 'Posts and topics' screen. diff --git a/sources/admin/ManageRegistration.php b/sources/admin/ManageRegistration.php index e2acfc5b03..34db4d3282 100644 --- a/sources/admin/ManageRegistration.php +++ b/sources/admin/ManageRegistration.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Entrance point for the registration center, it checks permisions and forwards diff --git a/sources/admin/ManageScheduledTasks.php b/sources/admin/ManageScheduledTasks.php index 6c7a026f9f..442d8448aa 100644 --- a/sources/admin/ManageScheduledTasks.php +++ b/sources/admin/ManageScheduledTasks.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Scheduled tasks management dispatcher. This function checks permissions and delegates diff --git a/sources/admin/ManageSearch.php b/sources/admin/ManageSearch.php index 86a0ba19bc..e71e5544ba 100644 --- a/sources/admin/ManageSearch.php +++ b/sources/admin/ManageSearch.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Main entry point for the admin search settings screen. diff --git a/sources/admin/ManageSearchEngines.php b/sources/admin/ManageSearchEngines.php index 05aa3085a6..fef4e4b974 100644 --- a/sources/admin/ManageSearchEngines.php +++ b/sources/admin/ManageSearchEngines.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Entry point for this section. diff --git a/sources/admin/ManageServer.php b/sources/admin/ManageServer.php index 7bb4db3084..f48434c9c0 100644 --- a/sources/admin/ManageServer.php +++ b/sources/admin/ManageServer.php @@ -60,7 +60,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * This is the main dispatcher. Sets up all the available sub-actions, all the tabs and selects diff --git a/sources/admin/ManageSettings.php b/sources/admin/ManageSettings.php index f26fee3712..8c337b784d 100644 --- a/sources/admin/ManageSettings.php +++ b/sources/admin/ManageSettings.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * This just avoids some repetition. diff --git a/sources/admin/ManageSmileys.php b/sources/admin/ManageSmileys.php index 53255aae12..728b50ede0 100644 --- a/sources/admin/ManageSmileys.php +++ b/sources/admin/ManageSmileys.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * This is the dispatcher of smileys administration. diff --git a/sources/admin/Modlog.php b/sources/admin/Modlog.php index 1f00127c50..8206058c32 100644 --- a/sources/admin/Modlog.php +++ b/sources/admin/Modlog.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Prepares the information from the moderation log for viewing. diff --git a/sources/admin/PackageServers.php b/sources/admin/PackageServers.php index d84759dfa1..5519d004eb 100644 --- a/sources/admin/PackageServers.php +++ b/sources/admin/PackageServers.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Browse the list of package servers, add servers... diff --git a/sources/admin/Packages.php b/sources/admin/Packages.php index f05d4b5c24..ae8a4e357f 100644 --- a/sources/admin/Packages.php +++ b/sources/admin/Packages.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * This is the notoriously defunct package manager..... :/. diff --git a/sources/admin/RepairBoards.php b/sources/admin/RepairBoards.php index 7d372155f6..04d036329b 100644 --- a/sources/admin/RepairBoards.php +++ b/sources/admin/RepairBoards.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Finds or repairs errors in the database to fix possible problems. diff --git a/sources/admin/Reports.php b/sources/admin/Reports.php index f5cc4d27c0..45ffec015b 100644 --- a/sources/admin/Reports.php +++ b/sources/admin/Reports.php @@ -26,7 +26,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Handling function for generating reports. diff --git a/sources/admin/Themes.php b/sources/admin/Themes.php index 31c032d9cd..a4fa25123c 100644 --- a/sources/admin/Themes.php +++ b/sources/admin/Themes.php @@ -35,7 +35,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Subaction handler - manages the action and delegates control to the proper diff --git a/sources/admin/ViewQuery.php b/sources/admin/ViewQuery.php index 637ec4ab32..02930be507 100644 --- a/sources/admin/ViewQuery.php +++ b/sources/admin/ViewQuery.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Show the database queries for debugging diff --git a/sources/controllers/Announce.controller.php b/sources/controllers/Announce.controller.php index 8ea70e19b9..1a8b8a74fb 100644 --- a/sources/controllers/Announce.controller.php +++ b/sources/controllers/Announce.controller.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Default (sub)action for ?action=announce diff --git a/sources/controllers/BoardIndex.controller.php b/sources/controllers/BoardIndex.controller.php index a694a06082..eac1e24bd7 100644 --- a/sources/controllers/BoardIndex.controller.php +++ b/sources/controllers/BoardIndex.controller.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * This function shows the board index. diff --git a/sources/controllers/Calendar.controller.php b/sources/controllers/Calendar.controller.php index 22961cba96..b4207d37c3 100644 --- a/sources/controllers/Calendar.controller.php +++ b/sources/controllers/Calendar.controller.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Show the calendar. diff --git a/sources/controllers/Display.controller.php b/sources/controllers/Display.controller.php index 555e5e9f47..a99c511e09 100644 --- a/sources/controllers/Display.controller.php +++ b/sources/controllers/Display.controller.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * The central part of the board - topic display. diff --git a/sources/controllers/Drafts.controller.php b/sources/controllers/Drafts.controller.php index b5ea9a9692..9ab05f2f80 100644 --- a/sources/controllers/Drafts.controller.php +++ b/sources/controllers/Drafts.controller.php @@ -13,7 +13,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); // language and helper functions loadLanguage('Drafts'); diff --git a/sources/controllers/Emailuser.controller.php b/sources/controllers/Emailuser.controller.php index fd65f86f13..29bf676360 100644 --- a/sources/controllers/Emailuser.controller.php +++ b/sources/controllers/Emailuser.controller.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * This function initializes or sets up the necessary, for the other actions diff --git a/sources/controllers/Groups.controller.php b/sources/controllers/Groups.controller.php index 93bb0f21fe..886d7c85b7 100644 --- a/sources/controllers/Groups.controller.php +++ b/sources/controllers/Groups.controller.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Entry point function, permission checks, admin bars, etc. diff --git a/sources/controllers/Help.controller.php b/sources/controllers/Help.controller.php index 05e8494c06..f5a828f3b0 100644 --- a/sources/controllers/Help.controller.php +++ b/sources/controllers/Help.controller.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Redirect to the user help ;). diff --git a/sources/controllers/Karma.controller.php b/sources/controllers/Karma.controller.php index 35b5017495..9dc18abd44 100644 --- a/sources/controllers/Karma.controller.php +++ b/sources/controllers/Karma.controller.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Modify a user's karma. diff --git a/sources/controllers/LogInOut.controller.php b/sources/controllers/LogInOut.controller.php index 1ed1cdf8c9..aab6c30f35 100644 --- a/sources/controllers/LogInOut.controller.php +++ b/sources/controllers/LogInOut.controller.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Ask them for their login information. (shows a page for the user to type diff --git a/sources/controllers/Markasread.controller.php b/sources/controllers/Markasread.controller.php index fb2a581144..d354650117 100644 --- a/sources/controllers/Markasread.controller.php +++ b/sources/controllers/Markasread.controller.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * This is the main function for markasread file. diff --git a/sources/controllers/Memberlist.controller.php b/sources/controllers/Memberlist.controller.php index 0b1ee3b2d9..625519322a 100644 --- a/sources/controllers/Memberlist.controller.php +++ b/sources/controllers/Memberlist.controller.php @@ -21,7 +21,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Sets up the context for showing a listing of registered members. diff --git a/sources/controllers/Members.controller.php b/sources/controllers/Members.controller.php index 1fbb5fd104..dcba3a438c 100644 --- a/sources/controllers/Members.controller.php +++ b/sources/controllers/Members.controller.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * This simple function adds/removes the passed user from the current users buddy list. diff --git a/sources/controllers/MergeTopics.controller.php b/sources/controllers/MergeTopics.controller.php index 434e07374f..25211e7d24 100644 --- a/sources/controllers/MergeTopics.controller.php +++ b/sources/controllers/MergeTopics.controller.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Merges two or more topics into one topic. diff --git a/sources/controllers/MessageIndex.controller.php b/sources/controllers/MessageIndex.controller.php index d020b313e5..88a733f56b 100644 --- a/sources/controllers/MessageIndex.controller.php +++ b/sources/controllers/MessageIndex.controller.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Show the list of topics in this board, along with any child boards. diff --git a/sources/controllers/ModerateAttachments.controller.php b/sources/controllers/ModerateAttachments.controller.php index 637d77acd3..5638619a09 100644 --- a/sources/controllers/ModerateAttachments.controller.php +++ b/sources/controllers/ModerateAttachments.controller.php @@ -16,7 +16,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Called from a mouse click, diff --git a/sources/controllers/ModerationCenter.controller.php b/sources/controllers/ModerationCenter.controller.php index d50c45ac53..d5b7c83842 100644 --- a/sources/controllers/ModerationCenter.controller.php +++ b/sources/controllers/ModerationCenter.controller.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Entry point for the moderation center. diff --git a/sources/controllers/MoveTopic.controller.php b/sources/controllers/MoveTopic.controller.php index 55c2a87f22..56cb615ac1 100644 --- a/sources/controllers/MoveTopic.controller.php +++ b/sources/controllers/MoveTopic.controller.php @@ -16,7 +16,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * This function allows to move a topic, making sure to ask the moderator diff --git a/sources/controllers/News.controller.php b/sources/controllers/News.controller.php index e77af02b86..870d2c91a2 100644 --- a/sources/controllers/News.controller.php +++ b/sources/controllers/News.controller.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Outputs xml data representing recent information or a profile. diff --git a/sources/controllers/Notify.controller.php b/sources/controllers/Notify.controller.php index 86b4d64c18..7e392dc320 100644 --- a/sources/controllers/Notify.controller.php +++ b/sources/controllers/Notify.controller.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Turn off/on notification for a particular topic. diff --git a/sources/controllers/PersonalMessage.controller.php b/sources/controllers/PersonalMessage.controller.php index 22d2237c23..730d73baa2 100644 --- a/sources/controllers/PersonalMessage.controller.php +++ b/sources/controllers/PersonalMessage.controller.php @@ -20,7 +20,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * This is the main function of personal messages, called before the action handler. diff --git a/sources/controllers/Poll.controller.php b/sources/controllers/Poll.controller.php index 01322082f7..3dac0e0905 100644 --- a/sources/controllers/Poll.controller.php +++ b/sources/controllers/Poll.controller.php @@ -20,7 +20,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Allow the user to vote. diff --git a/sources/controllers/Post.controller.php b/sources/controllers/Post.controller.php index 8915478161..f2605c4960 100644 --- a/sources/controllers/Post.controller.php +++ b/sources/controllers/Post.controller.php @@ -20,7 +20,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Handles showing the post screen, loading the post to be modified, and loading any post quoted. diff --git a/sources/controllers/PostModeration.controller.php b/sources/controllers/PostModeration.controller.php index 58dc619367..dbd6d43581 100644 --- a/sources/controllers/PostModeration.controller.php +++ b/sources/controllers/PostModeration.controller.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * This is a handling function for all things post moderation. diff --git a/sources/controllers/Profile.controller.php b/sources/controllers/Profile.controller.php index 7a54d42a61..0a18125915 100644 --- a/sources/controllers/Profile.controller.php +++ b/sources/controllers/Profile.controller.php @@ -20,7 +20,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Allow the change or view of profiles... diff --git a/sources/controllers/ProfileAccount.controller.php b/sources/controllers/ProfileAccount.controller.php index e87820dac1..e964ffcd94 100644 --- a/sources/controllers/ProfileAccount.controller.php +++ b/sources/controllers/ProfileAccount.controller.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Issue/manage an user's warning status. diff --git a/sources/controllers/ProfileHistory.controller.php b/sources/controllers/ProfileHistory.controller.php index 86365849a5..fe7d26307a 100644 --- a/sources/controllers/ProfileHistory.controller.php +++ b/sources/controllers/ProfileHistory.controller.php @@ -16,7 +16,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Profile history main function. diff --git a/sources/controllers/ProfileInfo.controller.php b/sources/controllers/ProfileInfo.controller.php index 5ca166828f..37c9a8041d 100644 --- a/sources/controllers/ProfileInfo.controller.php +++ b/sources/controllers/ProfileInfo.controller.php @@ -16,7 +16,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * View a summary. diff --git a/sources/controllers/ProfileOptions.controller.php b/sources/controllers/ProfileOptions.controller.php index bf3dc34c15..3723202538 100644 --- a/sources/controllers/ProfileOptions.controller.php +++ b/sources/controllers/ProfileOptions.controller.php @@ -20,7 +20,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Show all the users buddies, as well as a add/delete interface. diff --git a/sources/controllers/ProfileSubscriptions.controller.php b/sources/controllers/ProfileSubscriptions.controller.php index a05f961aef..30f2dc12fc 100644 --- a/sources/controllers/ProfileSubscriptions.controller.php +++ b/sources/controllers/ProfileSubscriptions.controller.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Function for doing all the paid subscription stuff - kinda. diff --git a/sources/controllers/Recent.controller.php b/sources/controllers/Recent.controller.php index cf0c6f866e..a807536dd9 100644 --- a/sources/controllers/Recent.controller.php +++ b/sources/controllers/Recent.controller.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Get the latest post made on the system diff --git a/sources/controllers/Register.controller.php b/sources/controllers/Register.controller.php index a255f33dd1..2d7b1f4066 100644 --- a/sources/controllers/Register.controller.php +++ b/sources/controllers/Register.controller.php @@ -20,7 +20,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Begin the registration process. diff --git a/sources/controllers/Reminder.controller.php b/sources/controllers/Reminder.controller.php index 536a85b6bc..8e24a756ce 100644 --- a/sources/controllers/Reminder.controller.php +++ b/sources/controllers/Reminder.controller.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * This is the pre-dispatch function diff --git a/sources/controllers/RemoveTopic.controller.php b/sources/controllers/RemoveTopic.controller.php index 9e6c27a72c..0041c460cf 100644 --- a/sources/controllers/RemoveTopic.controller.php +++ b/sources/controllers/RemoveTopic.controller.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Completely remove an entire topic. diff --git a/sources/controllers/Search.controller.php b/sources/controllers/Search.controller.php index 0d6731d775..a29166c337 100644 --- a/sources/controllers/Search.controller.php +++ b/sources/controllers/Search.controller.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); // This defines two version types for checking the API's are compatible with this version of the software. $GLOBALS['search_versions'] = array( diff --git a/sources/controllers/SplitTopics.controller.php b/sources/controllers/SplitTopics.controller.php index 52cb21d537..192ecdc48c 100644 --- a/sources/controllers/SplitTopics.controller.php +++ b/sources/controllers/SplitTopics.controller.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Splits a topic into two topics. diff --git a/sources/controllers/Stats.controller.php b/sources/controllers/Stats.controller.php index f35523096f..01dfad9bc9 100644 --- a/sources/controllers/Stats.controller.php +++ b/sources/controllers/Stats.controller.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Display some useful/interesting board statistics. diff --git a/sources/controllers/Suggest.controller.php b/sources/controllers/Suggest.controller.php index 9c78542ae3..5f399be59d 100644 --- a/sources/controllers/Suggest.controller.php +++ b/sources/controllers/Suggest.controller.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * This keeps track of all registered handling functions for auto suggest diff --git a/sources/controllers/Topic.controller.php b/sources/controllers/Topic.controller.php index f3c4926364..5ecc9e0465 100644 --- a/sources/controllers/Topic.controller.php +++ b/sources/controllers/Topic.controller.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Locks a topic... either by way of a moderator or the topic starter. diff --git a/sources/controllers/Who.controller.php b/sources/controllers/Who.controller.php index 947b5025ef..5732f2fc82 100644 --- a/sources/controllers/Who.controller.php +++ b/sources/controllers/Who.controller.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Who's online, and what are they doing? diff --git a/sources/controllers/Xml.controller.php b/sources/controllers/Xml.controller.php index 862e8ed120..7d8566e82a 100644 --- a/sources/controllers/Xml.controller.php +++ b/sources/controllers/Xml.controller.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Main function for action=xmlhttp. diff --git a/sources/database/Db-mysql.subs.php b/sources/database/Db-mysql.subs.php index 4378bab212..4dff2747bd 100644 --- a/sources/database/Db-mysql.subs.php +++ b/sources/database/Db-mysql.subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Maps the implementations in this file (smf_db_function_name) diff --git a/sources/database/Db-postgresql.subs.php b/sources/database/Db-postgresql.subs.php index 24a5b140d1..c852975576 100644 --- a/sources/database/Db-postgresql.subs.php +++ b/sources/database/Db-postgresql.subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Maps the implementations in this file (smf_db_function_name) diff --git a/sources/database/Db-sqlite.subs.php b/sources/database/Db-sqlite.subs.php index 716bd9eba5..ef13cf4bc0 100644 --- a/sources/database/Db-sqlite.subs.php +++ b/sources/database/Db-sqlite.subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Maps the implementations in this file (smf_db_function_name) diff --git a/sources/database/DbExtra-mysql.php b/sources/database/DbExtra-mysql.php index d8a32ad76e..7a827e0aca 100644 --- a/sources/database/DbExtra-mysql.php +++ b/sources/database/DbExtra-mysql.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Add the functions implemented in this file to the $smcFunc array. diff --git a/sources/database/DbExtra-postgresql.php b/sources/database/DbExtra-postgresql.php index 6b36855350..57511d5fd5 100644 --- a/sources/database/DbExtra-postgresql.php +++ b/sources/database/DbExtra-postgresql.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Add the functions implemented in this file to the $smcFunc array. diff --git a/sources/database/DbExtra-sqlite.php b/sources/database/DbExtra-sqlite.php index 9f8a5e9e3f..050bcf59ef 100644 --- a/sources/database/DbExtra-sqlite.php +++ b/sources/database/DbExtra-sqlite.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Add the functions implemented in this file to the $smcFunc array. diff --git a/sources/database/DbPackages-mysql.php b/sources/database/DbPackages-mysql.php index 55e1041e7c..38bff4b41a 100644 --- a/sources/database/DbPackages-mysql.php +++ b/sources/database/DbPackages-mysql.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Add the file functions to the $smcFunc array. diff --git a/sources/database/DbPackages-postgresql.php b/sources/database/DbPackages-postgresql.php index 15d7839afc..46d0993edb 100644 --- a/sources/database/DbPackages-postgresql.php +++ b/sources/database/DbPackages-postgresql.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Add the file functions to the $smcFunc array. diff --git a/sources/database/DbPackages-sqlite.php b/sources/database/DbPackages-sqlite.php index 6504e8c5f2..f81e3903c4 100644 --- a/sources/database/DbPackages-sqlite.php +++ b/sources/database/DbPackages-sqlite.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Add the file functions to the $smcFunc array. diff --git a/sources/database/DbSearch-mysql.php b/sources/database/DbSearch-mysql.php index d578630d1e..819a6aaf68 100644 --- a/sources/database/DbSearch-mysql.php +++ b/sources/database/DbSearch-mysql.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Add the file functions to the $smcFunc array. diff --git a/sources/database/DbSearch-postgresql.php b/sources/database/DbSearch-postgresql.php index f7ac8d2d5f..9ba8ffc13d 100644 --- a/sources/database/DbSearch-postgresql.php +++ b/sources/database/DbSearch-postgresql.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Add the file functions to the $smcFunc array. diff --git a/sources/database/DbSearch-sqlite.php b/sources/database/DbSearch-sqlite.php index cb29adf9e4..d45f043007 100644 --- a/sources/database/DbSearch-sqlite.php +++ b/sources/database/DbSearch-sqlite.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Add the file functions to the $smcFunc array. diff --git a/sources/ext/bad-behavior/badbehavior-plugin.php b/sources/ext/bad-behavior/badbehavior-plugin.php index f8c6383a1a..2b71b4555b 100644 --- a/sources/ext/bad-behavior/badbehavior-plugin.php +++ b/sources/ext/bad-behavior/badbehavior-plugin.php @@ -14,7 +14,7 @@ * */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); define('BB2_CWD', dirname(__FILE__)); diff --git a/sources/subs/Admin.subs.php b/sources/subs/Admin.subs.php index 4a737d4092..0d2c1cfa1b 100644 --- a/sources/subs/Admin.subs.php +++ b/sources/subs/Admin.subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Get a list of versions that are currently installed on the server. diff --git a/sources/subs/Attachments.subs.php b/sources/subs/Attachments.subs.php index 3356557c98..a2178a3515 100644 --- a/sources/subs/Attachments.subs.php +++ b/sources/subs/Attachments.subs.php @@ -21,7 +21,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); function automanage_attachments_check_directory() { diff --git a/sources/subs/Auth.subs.php b/sources/subs/Auth.subs.php index 8fc711732e..568b24079a 100644 --- a/sources/subs/Auth.subs.php +++ b/sources/subs/Auth.subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Sets the login cookie and session based on the id_member and password passed. diff --git a/sources/subs/BadBehavior.subs.php b/sources/subs/BadBehavior.subs.php index 68dfae2de1..ffd03072d6 100644 --- a/sources/subs/BadBehavior.subs.php +++ b/sources/subs/BadBehavior.subs.php @@ -10,7 +10,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Delete all or some of the entries in the bad behavior log. diff --git a/sources/subs/BoardIndex.subs.php b/sources/subs/BoardIndex.subs.php index 7c20dc9deb..ffe9d74fd4 100644 --- a/sources/subs/BoardIndex.subs.php +++ b/sources/subs/BoardIndex.subs.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Fetches a list of boards and (optional) categories including diff --git a/sources/subs/Boards.subs.php b/sources/subs/Boards.subs.php index 93392644ce..0029c9303b 100644 --- a/sources/subs/Boards.subs.php +++ b/sources/subs/Boards.subs.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Mark a board or multiple boards read. diff --git a/sources/subs/Cache.subs.php b/sources/subs/Cache.subs.php index 0a8c2547bb..2ba1092f0f 100644 --- a/sources/subs/Cache.subs.php +++ b/sources/subs/Cache.subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Try to retrieve a cache entry. On failure, call the appropriate function. diff --git a/sources/subs/Calendar.subs.php b/sources/subs/Calendar.subs.php index 8739217d49..47662de667 100644 --- a/sources/subs/Calendar.subs.php +++ b/sources/subs/Calendar.subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Get all birthdays within the given time range. diff --git a/sources/subs/Categories.subs.php b/sources/subs/Categories.subs.php index 87bcf91fc9..372c670211 100644 --- a/sources/subs/Categories.subs.php +++ b/sources/subs/Categories.subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Edit the position and properties of a category. diff --git a/sources/subs/Charset.subs.php b/sources/subs/Charset.subs.php index 83bdb087df..abe76c8e3a 100644 --- a/sources/subs/Charset.subs.php +++ b/sources/subs/Charset.subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Converts the given UTF-8 string into lowercase. diff --git a/sources/subs/Compat.subs.php b/sources/subs/Compat.subs.php index cbfae79a3b..e8dcaef374 100644 --- a/sources/subs/Compat.subs.php +++ b/sources/subs/Compat.subs.php @@ -20,7 +20,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Define the old SMF sha1 function. diff --git a/sources/subs/Editor.subs.php b/sources/subs/Editor.subs.php index 98ab225b55..310985bcd9 100644 --- a/sources/subs/Editor.subs.php +++ b/sources/subs/Editor.subs.php @@ -19,7 +19,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Creates the javascript code for localization of the editor (SCEditor) diff --git a/sources/subs/FTPConnection.class.php b/sources/subs/FTPConnection.class.php index a95b1559fd..ee12d48227 100644 --- a/sources/subs/FTPConnection.class.php +++ b/sources/subs/FTPConnection.class.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Simple FTP protocol implementation. diff --git a/sources/subs/Graphics.subs.php b/sources/subs/Graphics.subs.php index 3255b52cdf..2f3a0bd66d 100644 --- a/sources/subs/Graphics.subs.php +++ b/sources/subs/Graphics.subs.php @@ -23,7 +23,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Create a thumbnail of the given source. diff --git a/sources/subs/List.subs.php b/sources/subs/List.subs.php index c9736d1014..a4b6a2e6a7 100644 --- a/sources/subs/List.subs.php +++ b/sources/subs/List.subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Create a new list diff --git a/sources/subs/Mail.subs.php b/sources/subs/Mail.subs.php index 4db9069cc5..c2875ce32b 100644 --- a/sources/subs/Mail.subs.php +++ b/sources/subs/Mail.subs.php @@ -20,7 +20,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * This function sends an email to the specified recipient(s). diff --git a/sources/subs/Membergroups.subs.php b/sources/subs/Membergroups.subs.php index 7b4d7ab103..4de77136f1 100644 --- a/sources/subs/Membergroups.subs.php +++ b/sources/subs/Membergroups.subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Delete one of more membergroups. diff --git a/sources/subs/Members.subs.php b/sources/subs/Members.subs.php index 194e74bed6..497ce2c4e4 100644 --- a/sources/subs/Members.subs.php +++ b/sources/subs/Members.subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Delete one or more members. diff --git a/sources/subs/MembersOnline.subs.php b/sources/subs/MembersOnline.subs.php index 0404352022..1371618458 100644 --- a/sources/subs/MembersOnline.subs.php +++ b/sources/subs/MembersOnline.subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Retrieve a list and several other statistics of the users currently online. diff --git a/sources/subs/Menu.subs.php b/sources/subs/Menu.subs.php index 519e61e752..4752c8536b 100644 --- a/sources/subs/Menu.subs.php +++ b/sources/subs/Menu.subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Create a menu. diff --git a/sources/subs/MessageIndex.subs.php b/sources/subs/MessageIndex.subs.php index cc08cba9dd..561e73959e 100644 --- a/sources/subs/MessageIndex.subs.php +++ b/sources/subs/MessageIndex.subs.php @@ -16,7 +16,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Generates the query to determine the list of available boards for a user diff --git a/sources/subs/Messages.subs.php b/sources/subs/Messages.subs.php index 8ea77d2e56..c316083fad 100644 --- a/sources/subs/Messages.subs.php +++ b/sources/subs/Messages.subs.php @@ -21,7 +21,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); function getExistingMessage($id_msg, $id_topic = 0, $attachment_type = 0) { diff --git a/sources/subs/Moderation.subs.php b/sources/subs/Moderation.subs.php index 18edf75ed7..e31db78c8b 100644 --- a/sources/subs/Moderation.subs.php +++ b/sources/subs/Moderation.subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * How many open reports do we have? diff --git a/sources/subs/OpenID.subs.php b/sources/subs/OpenID.subs.php index 68729b5bf4..08425c1fc1 100644 --- a/sources/subs/OpenID.subs.php +++ b/sources/subs/OpenID.subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Openid_uri is the URI given by the user diff --git a/sources/subs/Package.subs.php b/sources/subs/Package.subs.php index 62e4d012a0..83e16e5bfe 100644 --- a/sources/subs/Package.subs.php +++ b/sources/subs/Package.subs.php @@ -21,7 +21,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Reads a .tar.gz file, filename, in and extracts file(s) from it. diff --git a/sources/subs/PersonalMessage.subs.php b/sources/subs/PersonalMessage.subs.php index b68d4647dc..f734e4432c 100644 --- a/sources/subs/PersonalMessage.subs.php +++ b/sources/subs/PersonalMessage.subs.php @@ -22,7 +22,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); function loadMessageLimit() { diff --git a/sources/subs/Post.subs.php b/sources/subs/Post.subs.php index 441991c16f..1579cb56eb 100644 --- a/sources/subs/Post.subs.php +++ b/sources/subs/Post.subs.php @@ -20,7 +20,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Takes a message and parses it, returning nothing. diff --git a/sources/subs/Profile.subs.php b/sources/subs/Profile.subs.php index 232683ae97..9ddde95b2d 100644 --- a/sources/subs/Profile.subs.php +++ b/sources/subs/Profile.subs.php @@ -16,7 +16,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Setup the context for a page load! diff --git a/sources/subs/Recent.subs.php b/sources/subs/Recent.subs.php index 5db3072a0e..2a20843c0b 100644 --- a/sources/subs/Recent.subs.php +++ b/sources/subs/Recent.subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Get the latest posts of a forum. diff --git a/sources/subs/Search.subs.php b/sources/subs/Search.subs.php index 30a8072e32..4ec6af92a1 100644 --- a/sources/subs/Search.subs.php +++ b/sources/subs/Search.subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); // This defines two version types for checking the API's are compatible with this version of the software. $GLOBALS['search_versions'] = array( diff --git a/sources/subs/SearchEngines.subs.php b/sources/subs/SearchEngines.subs.php index 6aff383802..79fd161fdb 100644 --- a/sources/subs/SearchEngines.subs.php +++ b/sources/subs/SearchEngines.subs.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Do we think the current user is a spider? diff --git a/sources/subs/Sound.subs.php b/sources/subs/Sound.subs.php index a8408b44e4..d358f8248a 100644 --- a/sources/subs/Sound.subs.php +++ b/sources/subs/Sound.subs.php @@ -20,7 +20,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Creates a wave file that spells the letters of $word. diff --git a/sources/subs/Topic.subs.php b/sources/subs/Topic.subs.php index 17d972e2e5..6aefa50c5d 100644 --- a/sources/subs/Topic.subs.php +++ b/sources/subs/Topic.subs.php @@ -21,7 +21,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Removes the passed id_topic's. (permissions are NOT checked here!). diff --git a/sources/subs/XmlArray.class.php b/sources/subs/XmlArray.class.php index 3229641a4c..478d83a3fe 100644 --- a/sources/subs/XmlArray.class.php +++ b/sources/subs/XmlArray.class.php @@ -18,7 +18,7 @@ */ if (!defined('ELKARTE')) - die('Hacking attempt...'); + die('No access...'); /** * Class representing an xml array. From be1314928f125a1be27364397feedda92597915f Mon Sep 17 00:00:00 2001 From: Norv Date: Tue, 26 Feb 2013 06:13:10 +0200 Subject: [PATCH 04/16] Slightly more consistent capitalization in the PM UI. Signed-off-by: Norv --- themes/default/languages/PersonalMessage.english.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/themes/default/languages/PersonalMessage.english.php b/themes/default/languages/PersonalMessage.english.php index 7280be9d54..04d107bbfe 100644 --- a/themes/default/languages/PersonalMessage.english.php +++ b/themes/default/languages/PersonalMessage.english.php @@ -44,7 +44,7 @@ $txt['pm_replied'] = 'Replied To'; // Message Pruning. -$txt['pm_prune'] = 'Prune Messages'; +$txt['pm_prune'] = 'Prune messages'; $txt['pm_prune_desc1'] = 'Delete all personal messages older than'; $txt['pm_prune_desc2'] = 'days.'; $txt['pm_prune_warning'] = 'Are you sure you wish to prune your personal messages?'; @@ -132,7 +132,7 @@ $txt['pm_settings'] = 'Change settings'; $txt['pm_change_view'] = 'Change view'; -$txt['pm_manage_rules'] = 'Manage Rules'; +$txt['pm_manage_rules'] = 'Manage rules'; $txt['pm_manage_rules_desc'] = 'Message rules allow you to automatically sort incoming messages dependant on a set of criteria you define. Below are all the rules you currently have setup. To edit a rule simply click the rule name.'; $txt['pm_rules_none'] = 'You have not yet setup any message rules.'; $txt['pm_rule_title'] = 'Rule'; @@ -140,8 +140,8 @@ $txt['pm_apply_rules'] = 'Apply rules now'; // Use entities in the below string. $txt['pm_js_apply_rules_confirm'] = 'Are you sure you wish to apply the current rules to all personal messages?'; -$txt['pm_edit_rule'] = 'Edit Rule'; -$txt['pm_rule_save'] = 'Save Rule'; +$txt['pm_edit_rule'] = 'Edit rule'; +$txt['pm_rule_save'] = 'Save rule'; $txt['pm_delete_selected_rule'] = 'Delete selected rules'; // Use entities in the below string. $txt['pm_js_delete_rule_confirm'] = 'Are you sure you wish to delete the selected rules?'; From 8865ca0bde8dd52fcbfbf0a96e3113eeb383f661 Mon Sep 17 00:00:00 2001 From: Norv Date: Thu, 27 Dec 2012 09:51:52 +0200 Subject: [PATCH 05/16] Moved loadEssentialThemeData() in Load.php. Load.php itself is always loaded (regardless whether functions from it are called or not). ScheduledTasks and loadLanguage() are called before loadTheme(). And any of them (or both) use this stripped-down theme data loading. Signed-off-by: Norv --- sources/Load.php | 57 ++++++++++++++++++++++++++++++++++++-- sources/ScheduledTasks.php | 55 ------------------------------------ 2 files changed, 54 insertions(+), 58 deletions(-) diff --git a/sources/Load.php b/sources/Load.php index c39045775b..34b103dfb6 100644 --- a/sources/Load.php +++ b/sources/Load.php @@ -1686,6 +1686,60 @@ function smfAutoTask() $context['theme_loaded'] = true; } +/** + * This loads the bare minimum data. + * Needed by scheduled tasks, and any other code that needs language files + * before the forum (the theme) is loaded. + */ +function loadEssentialThemeData() +{ + global $settings, $modSettings, $smcFunc, $mbname, $context, SOURCEDIR; + + // Get all the default theme variables. + $result = $smcFunc['db_query']('', ' + SELECT id_theme, variable, value + FROM {db_prefix}themes + WHERE id_member = {int:no_member} + AND id_theme IN (1, {int:theme_guests})', + array( + 'no_member' => 0, + 'theme_guests' => $modSettings['theme_guests'], + ) + ); + while ($row = $smcFunc['db_fetch_assoc']($result)) + { + $settings[$row['variable']] = $row['value']; + + // Is this the default theme? + if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1') + $settings['default_' . $row['variable']] = $row['value']; + } + $smcFunc['db_free_result']($result); + + // Check we have some directories setup. + if (empty($settings['template_dirs'])) + { + $settings['template_dirs'] = array($settings['theme_dir']); + + // Based on theme (if there is one). + if (!empty($settings['base_theme_dir'])) + $settings['template_dirs'][] = $settings['base_theme_dir']; + + // Lastly the default theme. + if ($settings['theme_dir'] != $settings['default_theme_dir']) + $settings['template_dirs'][] = $settings['default_theme_dir']; + } + + // Assume we want this. + $context['forum_name'] = $mbname; + + // Check loadLanguage actually exists! + if (!function_exists('loadLanguage')) + require_once(SOURCEDIR . '/Subs.php'); + + loadLanguage('index+Modifications'); +} + /** * Load a template - if the theme doesn't include it, use the default. * What this function does: @@ -2035,10 +2089,7 @@ function loadLanguage($template_name, $lang = '', $fatal = true, $force_reload = // Make sure we have $settings - if not we're in trouble and need to find it! if (empty($settings['default_theme_dir'])) - { - require_once(SOURCEDIR . '/ScheduledTasks.php'); loadEssentialThemeData(); - } // What theme are we in? $theme_name = basename($settings['theme_url']); diff --git a/sources/ScheduledTasks.php b/sources/ScheduledTasks.php index 602ba955a5..2d37265807 100644 --- a/sources/ScheduledTasks.php +++ b/sources/ScheduledTasks.php @@ -1192,61 +1192,6 @@ function next_time($regularity, $unit, $offset) return $next_time; } -/** - * This loads the bare minimum data to allow us to load language files! - */ -function loadEssentialThemeData() -{ - global $settings, $modSettings, $smcFunc, $mbname, $context; - - // Get all the default theme variables. - $result = $smcFunc['db_query']('', ' - SELECT id_theme, variable, value - FROM {db_prefix}themes - WHERE id_member = {int:no_member} - AND id_theme IN (1, {int:theme_guests})', - array( - 'no_member' => 0, - 'theme_guests' => $modSettings['theme_guests'], - ) - ); - while ($row = $smcFunc['db_fetch_assoc']($result)) - { - $settings[$row['variable']] = $row['value']; - - // Is this the default theme? - if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1') - $settings['default_' . $row['variable']] = $row['value']; - } - $smcFunc['db_free_result']($result); - - // Check we have some directories setup. - if (empty($settings['template_dirs'])) - { - $settings['template_dirs'] = array($settings['theme_dir']); - - // Based on theme (if there is one). - if (!empty($settings['base_theme_dir'])) - $settings['template_dirs'][] = $settings['base_theme_dir']; - - // Lastly the default theme. - if ($settings['theme_dir'] != $settings['default_theme_dir']) - $settings['template_dirs'][] = $settings['default_theme_dir']; - } - - // Assume we want this. - $context['forum_name'] = $mbname; - - // Check loadLanguage actually exists! - if (!function_exists('loadLanguage')) - { - require_once(SOURCEDIR . '/Load.php'); - require_once(SOURCEDIR . '/Subs.php'); - } - - loadLanguage('index+Modifications'); -} - /** * This retieves data (e.g. last version of ELKARTE) */ From 906ef5a0d50250667d5f6f6773890eb47467e445 Mon Sep 17 00:00:00 2001 From: Norv Date: Tue, 26 Feb 2013 06:35:47 +0200 Subject: [PATCH 06/16] Minor doc updates. Signed-off-by: Norv --- sources/ScheduledTasks.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sources/ScheduledTasks.php b/sources/ScheduledTasks.php index 2d37265807..0a5f2ea967 100644 --- a/sources/ScheduledTasks.php +++ b/sources/ScheduledTasks.php @@ -1193,7 +1193,7 @@ function next_time($regularity, $unit, $offset) } /** - * This retieves data (e.g. last version of ELKARTE) + * This retrieves data (e.g. last version of ELKARTE) */ function scheduled_fetchFiles() { @@ -1260,7 +1260,8 @@ function scheduled_fetchFiles() } /** - * Happy birthday!! + * Schedule birthday emails. + * (aka "Happy birthday!!") */ function scheduled_birthdayemails() { From 19448d2190d3f0e3881ee20da12f956a3f986e77 Mon Sep 17 00:00:00 2001 From: Norv Date: Sat, 26 Jan 2013 06:22:53 +0200 Subject: [PATCH 07/16] Remove duplicate code related to attachments paths. Signed-off-by: Norv --- sources/ScheduledTasks.php | 16 +++--------- sources/Subs.php | 13 ++-------- sources/controllers/Attachment.controller.php | 1 - sources/subs/Attachments.subs.php | 26 +++++++++++++++++-- 4 files changed, 29 insertions(+), 27 deletions(-) diff --git a/sources/ScheduledTasks.php b/sources/ScheduledTasks.php index 0a5f2ea967..f9d38b75cb 100644 --- a/sources/ScheduledTasks.php +++ b/sources/ScheduledTasks.php @@ -1631,21 +1631,11 @@ function scheduled_paid_subscriptions() */ function scheduled_remove_temp_attachments() { - global $modSettings; + global $modSettings, SUBSDIR; // We need to know where this thing is going. - if (!empty($modSettings['currentAttachmentUploadDir'])) - { - if (!is_array($modSettings['attachmentUploadDir'])) - $modSettings['attachmentUploadDir'] = unserialize($modSettings['attachmentUploadDir']); - - // Just use the current path for temp files. - $attach_dirs = $modSettings['attachmentUploadDir']; - } - else - { - $attach_dirs = array($modSettings['attachmentUploadDir']); - } + require_once(SUBSDIR . '/Attachment.subs.php'); + $attach_dirs = attachmentPaths(); foreach ($attach_dirs as $attach_dir) { diff --git a/sources/Subs.php b/sources/Subs.php index b01cfccb4b..4ea6bcb9a9 100644 --- a/sources/Subs.php +++ b/sources/Subs.php @@ -2943,17 +2943,8 @@ function template_header() } // We are already checking so many files...just few more doesn't make any difference! :P - if (!empty($modSettings['currentAttachmentUploadDir'])) - { - if (!is_array($modSettings['attachmentUploadDir'])) - $modSettings['attachmentUploadDir'] = @unserialize($modSettings['attachmentUploadDir']); - $path = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']]; - } - else - { - $path = $modSettings['attachmentUploadDir']; - $id_folder_thumb = 1; - } + require_once(SUBSDIR . '/Attachments.subs.php'); + $path = getAttachmentPath(); secureDirectory($path, true); secureDirectory(CACHEDIR); diff --git a/sources/controllers/Attachment.controller.php b/sources/controllers/Attachment.controller.php index 52e540be7a..073d596274 100644 --- a/sources/controllers/Attachment.controller.php +++ b/sources/controllers/Attachment.controller.php @@ -31,7 +31,6 @@ function action_attachment() * Downloads an attachment or avatar, and increments the download count. * It requires the view_attachments permission. (not for avatars!) * It disables the session parser, and clears any previous output. - * It depends on the attachmentUploadDir setting being correct. * It is accessed via the query string ?action=dlattach. * Views to attachments and avatars do not increase hits and are not logged in the "Who's Online" log. */ diff --git a/sources/subs/Attachments.subs.php b/sources/subs/Attachments.subs.php index a2178a3515..4f3ee901a5 100644 --- a/sources/subs/Attachments.subs.php +++ b/sources/subs/Attachments.subs.php @@ -1389,8 +1389,8 @@ function url_image_size($url) /** * The current attachments path: * - BOARDDIR . '/attachments', if nothing is set yet. - * - if the forum is using multiple attachments directories, the current path - * - it is stored as unserialize($modSettings['attachmentUploadDir'])[$modSettings['currentAttachmentUploadDir']] + * - if the forum is using multiple attachments directories, + * then the current path is stored as unserialize($modSettings['attachmentUploadDir'])[$modSettings['currentAttachmentUploadDir']] * - otherwise, the current path is $modSettings['attachmentUploadDir']. */ function getAttachmentPath() @@ -1408,6 +1408,28 @@ function getAttachmentPath() return is_array($attachmentDir) ? $attachmentDir[$modSettings['currentAttachmentUploadDir']] : $attachmentDir; } +/** + * Return an array of attachments directories. + * @see getAttachmentPath() + */ +function attachmentPaths() +{ + global $modSettings, $boarddir; + + if (empty($modSettings['attachmentUploadDir'])) + return array($boarddir . '/attachments'); + elseif (!empty($modSettings['currentAttachmentUploadDir'])) + { + // we have more directories + if (!is_array($modSettings['attachmentUploadDir'])) + $modSettings['attachmentUploadDir'] = unserialize($modSettings['attachmentUploadDir']); + + return $modSettings['attachmentUploadDir']; + } + else + return array($modSettings['attachmentUploadDir']); +} + /** * The avatars path: if custom avatar directory is set, that's it. * Otherwise, it's attachments path. From 42e9c6166dbf17fb2af2520b4afbeecb333bc14f Mon Sep 17 00:00:00 2001 From: Norv Date: Tue, 26 Feb 2013 06:56:55 +0200 Subject: [PATCH 08/16] Add a few utility functions for attachments: removeOrphanAttachments() and attachment_filesize() Signed-off-by: Norv --- sources/subs/Attachments.subs.php | 72 +++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/sources/subs/Attachments.subs.php b/sources/subs/Attachments.subs.php index 4f3ee901a5..26f65a81a6 100644 --- a/sources/subs/Attachments.subs.php +++ b/sources/subs/Attachments.subs.php @@ -1701,4 +1701,76 @@ function getServerStoredAvatars($directory, $level) } return $result; +} + +/** + * Simple function to remove the strictly needed of orphan attachments. + * This is used from attachments maintenance. + * It assumes the files have no message, no member information. + * It only removes the attachments and thumbnails from the database. + * + * @param array $attach_ids + */ +function removeOrphanAttachments($attach_ids) +{ + global $smcFunc; + + $smcFunc['db_query']('', ' + DELETE FROM {db_prefix}attachments + WHERE id_attach IN ({array_int:to_remove})', + array( + 'to_remove' => $attach_ids, + ) + ); + $smcFunc['db_query']('', ' + UPDATE {db_prefix}attachments + SET id_thumb = {int:no_thumb} + WHERE id_thumb IN ({array_int:to_remove})', + array( + 'to_remove' => $attach_ids, + 'no_thumb' => 0, + ) + ); +} + +/** + * Set or retrieve the size of an attachment. + * + * @param int $attach_id + * @param int $filesize = null + */ +function attachment_filesize($attach_id, $filesize = null) +{ + global $smcFunc; + + if ($filesize === null) + { + $result = $smcFunc['db_query']('', ' + SELECT size + FROM {db_prefix}attachments + WHERE id_attach = {int:id_attach}', + array( + 'id_attach' => $id_attach, + ) + ); + if (!empty($result)) + { + list($filesize) = $smcFunc['db_fetch_row']($result); + $smcFunc['db_free_result']($result); + return $filesize; + } + return false; + } + else + { + $smcFunc['db_query']('', ' + UPDATE {db_prefix}attachments + SET size = {int:filesize} + WHERE id_attach = {int:id_attach}', + array( + 'filesize' => $filesize, + 'id_attach' => $attach_id, + ) + ); + } } \ No newline at end of file From cb1255d1136415130b9d2f3da52d4ce1230e1450 Mon Sep 17 00:00:00 2001 From: Norv Date: Tue, 26 Feb 2013 06:58:45 +0200 Subject: [PATCH 09/16] Fix patch apply issue. (extra global replaced with constant :)) Signed-off-by: Norv --- sources/ScheduledTasks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/ScheduledTasks.php b/sources/ScheduledTasks.php index f9d38b75cb..d3325d2362 100644 --- a/sources/ScheduledTasks.php +++ b/sources/ScheduledTasks.php @@ -1631,7 +1631,7 @@ function scheduled_paid_subscriptions() */ function scheduled_remove_temp_attachments() { - global $modSettings, SUBSDIR; + global $modSettings; // We need to know where this thing is going. require_once(SUBSDIR . '/Attachment.subs.php'); From 9d28e58b720c7ab75ce8d77df1ab8a6f04d046db Mon Sep 17 00:00:00 2001 From: Norv Date: Tue, 26 Feb 2013 07:03:14 +0200 Subject: [PATCH 10/16] Use the new utility function during attachment maintainance. Signed-off-by: Norv --- sources/admin/ManageAttachments.php | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/sources/admin/ManageAttachments.php b/sources/admin/ManageAttachments.php index 896ca9676e..3ca71aeec4 100644 --- a/sources/admin/ManageAttachments.php +++ b/sources/admin/ManageAttachments.php @@ -310,7 +310,7 @@ function action_avatars($return_config = false) ), array('title','gravatar'), array('permissions', 'profile_gvatar', 0, $txt['gravatar_groups']), - array('select', 'gravatar_rating', + array('select', 'gravatar_rating', array( 'g' => 'g', 'pg' => 'pg', @@ -998,6 +998,9 @@ function action_repair() } } + // We will work hard with attachments. + require_once(SUBSDIR . '/Attachments.subs.php'); + // All the valid problems are here: $context['repair_errors'] = array( 'missing_thumbnail_parent' => 0, @@ -1235,17 +1238,7 @@ function action_repair() // Fix it here? if ($fix_errors && in_array('file_wrong_size', $to_fix)) - { - $smcFunc['db_query']('', ' - UPDATE {db_prefix}attachments - SET size = {int:filesize} - WHERE id_attach = {int:id_attach}', - array( - 'filesize' => filesize($filename), - 'id_attach' => $row['id_attach'], - ) - ); - } + attachment_filesize($row['id_attach'], filesize($filename)); } } From 4f73278173019cd2a6d3fea9d20c174ad08fc675 Mon Sep 17 00:00:00 2001 From: Norv Date: Tue, 26 Feb 2013 07:06:49 +0200 Subject: [PATCH 11/16] Small refactoring, use removeOrphanAttachments() in maintainance. Signed-off-by: Norv --- sources/admin/ManageAttachments.php | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/sources/admin/ManageAttachments.php b/sources/admin/ManageAttachments.php index 3ca71aeec4..4aafa19c8d 100644 --- a/sources/admin/ManageAttachments.php +++ b/sources/admin/ManageAttachments.php @@ -1254,24 +1254,7 @@ function action_repair() // Do we need to delete what we have? if ($fix_errors && !empty($to_remove)) - { - $smcFunc['db_query']('', ' - DELETE FROM {db_prefix}attachments - WHERE id_attach IN ({array_int:to_remove})', - array( - 'to_remove' => $to_remove, - ) - ); - $smcFunc['db_query']('', ' - UPDATE {db_prefix}attachments - SET id_thumb = {int:no_thumb} - WHERE id_thumb IN ({array_int:to_remove})', - array( - 'to_remove' => $to_remove, - 'no_thumb' => 0, - ) - ); - } + removeOrphanAttachments($to_remove); pauseAttachmentMaintenance($to_fix, $thumbnails); } From ab39006b4e55e9d5c5b04a166414f678f3397e98 Mon Sep 17 00:00:00 2001 From: Norv Date: Tue, 26 Feb 2013 07:08:30 +0200 Subject: [PATCH 12/16] Oops. Forgot fix for parameter name. Signed-off-by: Norv --- sources/subs/Attachments.subs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/subs/Attachments.subs.php b/sources/subs/Attachments.subs.php index 26f65a81a6..62a00dd18b 100644 --- a/sources/subs/Attachments.subs.php +++ b/sources/subs/Attachments.subs.php @@ -1750,7 +1750,7 @@ function attachment_filesize($attach_id, $filesize = null) FROM {db_prefix}attachments WHERE id_attach = {int:id_attach}', array( - 'id_attach' => $id_attach, + 'id_attach' => $attach_id, ) ); if (!empty($result)) From 19e4f8a5f5d118af2f977a8aea9bce9e1ebdcdee Mon Sep 17 00:00:00 2001 From: Norv Date: Tue, 26 Feb 2013 07:10:25 +0200 Subject: [PATCH 13/16] Add attachment_folder() utility function. Signed-off-by: Norv --- sources/subs/Attachments.subs.php | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/sources/subs/Attachments.subs.php b/sources/subs/Attachments.subs.php index 62a00dd18b..648685a0c3 100644 --- a/sources/subs/Attachments.subs.php +++ b/sources/subs/Attachments.subs.php @@ -1773,4 +1773,46 @@ function attachment_filesize($attach_id, $filesize = null) ) ); } +} + +/** + * Set or retrieve the ID of the folder where an attachment is stored on disk. + * + * @param int $attach_id + * @param int $folder_id = null + */ +function attachment_folder($attach_id, $folder_id = null) +{ + global $smcFunc; + + if ($folder_id === null) + { + $result = $smcFunc['db_query']('', ' + SELECT id_folder + FROM {db_prefix}attachments + WHERE id_attach = {int:id_attach}', + array( + 'id_attach' => $attach_id, + ) + ); + if (!empty($result)) + { + list($folder_id) = $smcFunc['db_fetch_row']($result); + $smcFunc['db_free_result']($result); + return $folder_id; + } + return false; + } + else + { + $smcFunc['db_query']('', ' + UPDATE {db_prefix}attachments + SET id_folder = {int:new_folder} + WHERE id_attach = {int:id_attach}', + array( + 'new_folder' => $folder_id, + 'id_attach' => $attach_id, + ) + ); + } } \ No newline at end of file From 49199cfd9723df1c56e944ec3cf3ba3bc91ad41e Mon Sep 17 00:00:00 2001 From: Norv Date: Tue, 26 Feb 2013 07:12:18 +0200 Subject: [PATCH 14/16] Small refactoring in attachments maintenance: with attachment_folder() Signed-off-by: Norv --- sources/admin/ManageAttachments.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sources/admin/ManageAttachments.php b/sources/admin/ManageAttachments.php index 4aafa19c8d..1957a5ae32 100644 --- a/sources/admin/ManageAttachments.php +++ b/sources/admin/ManageAttachments.php @@ -1201,15 +1201,7 @@ function action_repair() // Are we going to fix this now? if ($fix_errors && in_array('wrong_folder', $to_fix)) - $smcFunc['db_query']('', ' - UPDATE {db_prefix}attachments - SET id_folder = {int:new_folder} - WHERE id_attach = {int:id_attach}', - array( - 'new_folder' => $id, - 'id_attach' => $row['id_attach'], - ) - ); + attachment_folder($row['id_attach'], $id); continue 2; } From 4f660cf7ca9c67ec7f94912dcdb191d567f5b339 Mon Sep 17 00:00:00 2001 From: Norv Date: Tue, 26 Feb 2013 07:14:13 +0200 Subject: [PATCH 15/16] Another small utility function: maxThumbnails() Signed-off-by: Norv --- sources/admin/ManageAttachments.php | 11 +---------- sources/subs/Attachments.subs.php | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/sources/admin/ManageAttachments.php b/sources/admin/ManageAttachments.php index 1957a5ae32..6c77c9813e 100644 --- a/sources/admin/ManageAttachments.php +++ b/sources/admin/ManageAttachments.php @@ -1091,16 +1091,7 @@ function action_repair() // Find parents which think they have thumbnails, but actually, don't. if ($_GET['step'] <= 1) { - $result = $smcFunc['db_query']('', ' - SELECT MAX(id_attach) - FROM {db_prefix}attachments - WHERE id_thumb != {int:no_thumb}', - array( - 'no_thumb' => 0, - ) - ); - list ($thumbnails) = $smcFunc['db_fetch_row']($result); - $smcFunc['db_free_result']($result); + $thumbnails = maxThumbnails(); for (; $_GET['substep'] < $thumbnails; $_GET['substep'] += 500) { diff --git a/sources/subs/Attachments.subs.php b/sources/subs/Attachments.subs.php index 648685a0c3..2e70ab1cd9 100644 --- a/sources/subs/Attachments.subs.php +++ b/sources/subs/Attachments.subs.php @@ -1815,4 +1815,25 @@ function attachment_folder($attach_id, $folder_id = null) ) ); } +} + +/** + * Get max attachment ID with a thumbnail. + */ +function maxThumbnails() +{ + global $smcFunc; + + $result = $smcFunc['db_query']('', ' + SELECT MAX(id_attach) + FROM {db_prefix}attachments + WHERE id_thumb != {int:no_thumb}', + array( + 'no_thumb' => 0, + ) + ); + list ($thumbnails) = $smcFunc['db_fetch_row']($result); + $smcFunc['db_free_result']($result); + + return $thumbnails; } \ No newline at end of file From 6a20420dc1f809d74dd490cccaf36628f33340d2 Mon Sep 17 00:00:00 2001 From: Norv Date: Tue, 26 Feb 2013 07:24:55 +0200 Subject: [PATCH 16/16] Gift for Ema. Signed-off-by: Norv --- sources/Load.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sources/Load.php b/sources/Load.php index 34b103dfb6..5f850a558b 100644 --- a/sources/Load.php +++ b/sources/Load.php @@ -280,7 +280,7 @@ function loadUserSettings() if(!empty($modSettings['avatar_default']) && empty($user_settings['avatar']) && empty($user_settings['filename'])) $user_settings['avatar'] = $settings['images_url'] . '/default_avatar.png'; - + if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) cache_put_data('user_settings-' . $id_member, $user_settings, 60); } @@ -1693,7 +1693,7 @@ function smfAutoTask() */ function loadEssentialThemeData() { - global $settings, $modSettings, $smcFunc, $mbname, $context, SOURCEDIR; + global $settings, $modSettings, $smcFunc, $mbname, $context; // Get all the default theme variables. $result = $smcFunc['db_query']('', ' @@ -2591,7 +2591,7 @@ function loadDatabase() } /** * Determine the user's avatar type and return the information as an array - * + * * @param array $profile * @param type $max_avatar_width * @param type $max_avatar_height @@ -2628,7 +2628,7 @@ function determineAvatar($profile, $max_avatar_width, $max_avatar_height) { // Gravatars URL. $gravatar_url = 'http://www.gravatar.com/avatar/' . md5(strtolower($profile['email_address'])) . 'd=' . $modSettings['avatar_max_height_external'] . (!empty($modSettings['gravatar_rating']) ? ('&r=' . $modSettings['gravatar_rating']) : ''); - + $avatar = array( 'name' => $profile['avatar'], 'image' => '', @@ -2643,7 +2643,7 @@ function determineAvatar($profile, $max_avatar_width, $max_avatar_height) $avatar = array( 'name' => $profile['avatar'], 'image' => '', - 'href' => $modSettings['avatar_url'] . '/' . $profile['avatar'], + 'href' => $modSettings['avatar_url'] . '/' . $profile['avatar'], 'url' => $modSettings['avatar_url'] . '/' . $profile['avatar'], ); } @@ -2656,7 +2656,7 @@ function determineAvatar($profile, $max_avatar_width, $max_avatar_height) 'image' => '', 'href' => $settings['images_url'] . '/default_avatar.png', 'url' => 'http://', - ); + ); } //finally ... else