Misc2

sources/admin/Admin.php

@@ -895,13 +895,13 @@ public function action_search_internal()
 		// - we query all these to simply pull all setting bits!
 		$settings_search = array(
 			array('config_vars', 'area=corefeatures', 'ManageCoreFeatures_Controller'),
-			array('_initBasicSettingsForm', 'area=featuresettings;sa=basic', 'ManageFeatures_Controller'),
-			array('_initLayoutSettingsForm', 'area=featuresettings;sa=layout', 'ManageFeatures_Controller'),
-			array('_initKarmaSettingsForm', 'area=featuresettings;sa=karma', 'ManageFeatures_Controller'),
-			array('_initSignatureSettingsForm', 'area=featuresettings;sa=sig', 'ManageFeatures_Controller'),
-			array('_initSecuritySettingsForm', 'area=securitysettings;sa=general', 'ManageSecurity_Controller'),
-			array('_initSpamSettingsForm', 'area=securitysettings;sa=spam', 'ManageSecurity_Controller'),
-			array('_initModerationSettingsForm', 'area=securitysettings;sa=moderation', 'ManageSecurity_Controller'),
+			array('basicSettings', 'area=featuresettings;sa=basic', 'ManageFeatures_Controller'),
+			array('layoutSettings', 'area=featuresettings;sa=layout', 'ManageFeatures_Controller'),
+			array('karmaSettings', 'area=featuresettings;sa=karma', 'ManageFeatures_Controller'),
+			array('signatureSettings', 'area=featuresettings;sa=sig', 'ManageFeatures_Controller'),
+			array('securitySettings', 'area=securitysettings;sa=general', 'ManageSecurity_Controller'),
+			array('spamSettings', 'area=securitysettings;sa=spam', 'ManageSecurity_Controller'),
+			array('moderationSettings', 'area=securitysettings;sa=moderation', 'ManageSecurity_Controller'),
 			array('settings', 'area=modsettings;sa=general', 'ManageAddonSettings_Controller'),
 			array('settings', 'area=manageattachments;sa=attachments', 'ManageAttachments_Controller'),
 			array('settings', 'area=manageattachments;sa=avatars', 'ManageAvatars_Controller'),
@@ -915,17 +915,17 @@ public function action_search_internal()
 			array('settings', 'area=postsettings;sa=topics', 'ManageTopics_Controller'),
 			array('settings', 'area=managesearch;sa=settings', 'ManageSearch_Controller'),
 			array('settings', 'area=smileys;sa=settings', 'ManageSmileys_Controller'),
-			array('_initGeneralSettingsForm', 'area=serversettings;sa=general', 'ManageServer_Controller'),
-			array('_initDatabaseSettingsForm', 'area=serversettings;sa=database', 'ManageServer_Controller'),
-			array('_initCookieSettingsForm', 'area=serversettings;sa=cookie', 'ManageServer_Controller'),
-			array('_initCacheSettingsForm', 'area=serversettings;sa=cache', 'ManageServer_Controller'),
-			array('_initLanguageSettingsForm', 'area=languages;sa=settings', 'ManageLanguages_Controller'),
+			array('generalSettings', 'area=serversettings;sa=general', 'ManageServer_Controller'),
+			array('databaseSettings', 'area=serversettings;sa=database', 'ManageServer_Controller'),
+			array('cookieSettings', 'area=serversettings;sa=cookie', 'ManageServer_Controller'),
+			array('cacheSettings', 'area=serversettings;sa=cache', 'ManageServer_Controller'),
+			array('settings', 'area=languages;sa=settings', 'ManageLanguages_Controller'),
 			array('settings', 'area=regcenter;sa=settings', 'ManageRegistration_Controller'),
 			array('settings', 'area=sengines;sa=settings', 'ManageSearchEngines_Controller'),
 			array('settings', 'area=paidsubscribe;sa=settings', 'ManagePaid_Controller'),
 			array('settings', 'area=logs;sa=pruning', 'AdminLog_Controller'),
 			array('settings', 'area=managedrafts', 'ManageDrafts_Controller'),
-			array('_initBBSettingsForm', 'area=securitysettings;sa=badbehavior', 'ManageSecurity_Controller')
+			array('bbSettings', 'area=securitysettings;sa=badbehavior', 'ManageSecurity_Controller')
 		);
 
 		call_integration_hook('integrate_admin_search', array(&$language_files, &$include_files, &$settings_search));

sources/admin/AdminLog.php

@@ -5,16 +5,8 @@
  * @copyright ElkArte Forum contributors
  * @license   BSD http://opensource.org/licenses/BSD-3-Clause
  *
- * This software is a derived product, based on:
- *
- * Simple Machines Forum (SMF)
- * copyright:	2011 Simple Machines (http://www.simplemachines.org)
- * license:  	BSD, See included LICENSE.TXT for terms and conditions.
- *
  * @version 1.0 Alpha
  *
- * This file, unpredictable as this might be, handles basic administration.
- *
  */
 
 if (!defined('ELKARTE'))

sources/admin/ManageBans.php

@@ -5,21 +5,17 @@
  * @copyright ElkArte Forum contributors
  * @license   BSD http://opensource.org/licenses/BSD-3-Clause
  *
- * This software is a derived product, based on:
- *
- * Simple Machines Forum (SMF)
- * copyright:	2011 Simple Machines (http://www.simplemachines.org)
- * license:  	BSD, See included LICENSE.TXT for terms and conditions.
- *
  * @version 1.0 Alpha
  *
- * This file contains all the functions used for the ban center.
- *
  */
 
 if (!defined('ELKARTE'))
 	die('No access...');
 
+/**
+ * This class controls execution for admin actions in the bans area
+ * of the admin panel.
+ */
 class ManageBans_Controller
 {
 	/**

sources/admin/ManageFeatures.php

@@ -1217,6 +1217,166 @@ public function action_profileedit()
 
 		createToken('admin-ecp');
 	}
+
+	/**
+	 * Return basic feature settings.
+	 * Used in admin center search.
+	 */
+	public function basicSettings()
+	{
+		global $txt;
+
+		$config_vars = array(
+				// Big Options... polls, sticky, bbc....
+				array('select', 'pollMode', array($txt['disable_polls'], $txt['enable_polls'], $txt['polls_as_topics'])),
+			'',
+				// Basic stuff, titles, flash, permissions...
+				array('check', 'allow_guestAccess'),
+				array('check', 'enable_buddylist'),
+				array('check', 'enable_disregard'),
+				array('check', 'allow_editDisplayName'),
+				array('check', 'allow_hideOnline'),
+				array('check', 'titlesEnable'),
+				array('text', 'default_personal_text', 'subtext' => $txt['default_personal_text_note']),
+			'',
+				// Javascript and CSS options
+				array('select', 'jquery_source', array('auto' => $txt['jquery_auto'], 'local' => $txt['jquery_local'], 'cdn' => $txt['jquery_cdn'])),
+				array('check', 'minify_css_js'),
+			'',
+				// SEO stuff
+				array('check', 'queryless_urls', 'subtext' => '<strong>' . $txt['queryless_urls_note'] . '</strong>'),
+				array('text', 'meta_keywords', 'subtext' => $txt['meta_keywords_note'], 'size' => 50),
+			'',
+				// Number formatting, timezones.
+				array('text', 'time_format'),
+				array('float', 'time_offset', 'subtext' => $txt['setting_time_offset_note'], 6, 'postinput' => $txt['hours']),
+				'default_timezone' => array('select', 'default_timezone', array()),
+			'',
+				// Who's online?
+				array('check', 'who_enabled'),
+				array('int', 'lastActive', 6, 'postinput' => $txt['minutes']),
+			'',
+				// Statistics.
+				array('check', 'trackStats'),
+				array('check', 'hitStats'),
+			'',
+				// Option-ish things... miscellaneous sorta.
+				array('check', 'allow_disableAnnounce'),
+				array('check', 'disallow_sendBody'),
+				array('select', 'enable_contactform', array('disabled' => $txt['contact_form_disabled'], 'registration' => $txt['contact_form_registration'], 'menu' => $txt['contact_form_menu'])),
+		);
+
+		// Get all the time zones.
+		if (function_exists('timezone_identifiers_list') && function_exists('date_default_timezone_set'))
+		{
+			$all_zones = timezone_identifiers_list();
+			// Make sure we set the value to the same as the printed value.
+			foreach ($all_zones as $zone)
+				$config_vars['default_timezone'][2][$zone] = $zone;
+		}
+		else
+		{
+			// we don't know this, huh?
+			unset($config_vars['default_timezone']);
+		}
+
+		call_integration_hook('integrate_modify_basic_settings', array(&$config_vars));
+
+		return $config_vars;
+	}
+
+	/**
+	 * Return layout settings.
+	 * Used in admin center search.
+	 */
+	public function layoutSettings()
+	{
+		global $txt;
+
+		$config_vars = array(
+				// Pagination stuff.
+				array('check', 'compactTopicPagesEnable'),
+				array('int', 'compactTopicPagesContiguous', null, $txt['contiguous_page_display'] . '<div class="smalltext">' . str_replace(' ', '&nbsp;', '"3" ' . $txt['to_display'] . ': <strong>1 ... 4 [5] 6 ... 9</strong>') . '<br />' . str_replace(' ', '&nbsp;', '"5" ' . $txt['to_display'] . ': <strong>1 ... 3 4 [5] 6 7 ... 9</strong>') . '</div>'),
+				array('int', 'defaultMaxMembers'),
+			'',
+				// Stuff that just is everywhere - today, search, online, etc.
+				array('select', 'todayMod', array($txt['today_disabled'], $txt['today_only'], $txt['yesterday_today'], $txt['relative_time'])),
+				array('check', 'topbottomEnable'),
+				array('check', 'onlineEnable'),
+				array('check', 'enableVBStyleLogin'),
+			'',
+				// Automagic image resizing.
+				array('int', 'max_image_width', 'subtext' => $txt['zero_for_no_limit']),
+				array('int', 'max_image_height', 'subtext' => $txt['zero_for_no_limit']),
+			'',
+				// This is like debugging sorta.
+				array('check', 'timeLoadPageEnable'),
+		);
+
+		call_integration_hook('integrate_layout_settings', array(&$config_vars));
+
+		return $config_vars;
+	}
+
+	/**
+	 * Return karma settings.
+	 * Used in admin center search.
+	 */
+	public function karmaSettings()
+	{
+		global $txt;
+
+		$config_vars = array(
+				// Karma - On or off?
+				array('select', 'karmaMode', explode('|', $txt['karma_options'])),
+			'',
+				// Who can do it.... and who is restricted by time limits?
+				array('int', 'karmaMinPosts', 6, 'postinput' => strtolower($txt['posts'])),
+				array('float', 'karmaWaitTime', 6, 'postinput' => $txt['hours']),
+				array('check', 'karmaTimeRestrictAdmins'),
+			'',
+				// What does it look like?  [smite]?
+				array('text', 'karmaLabel'),
+				array('text', 'karmaApplaudLabel'),
+				array('text', 'karmaSmiteLabel'),
+		);
+
+		call_integration_hook('integrate_karma_settings', array(&$config_vars));
+
+		return $config_vars;
+	}
+
+	/**
+	 * Return signature settings.
+	 * Used in admin center search.
+	 */
+	public function signatureSettings()
+	{
+		global $txt;
+
+		$config_vars = array(
+				// Are signatures even enabled?
+				array('check', 'signature_enable'),
+			'',
+				// Tweaking settings!
+				array('int', 'signature_max_length', 'subtext' => $txt['zero_for_no_limit']),
+				array('int', 'signature_max_lines', 'subtext' => $txt['zero_for_no_limit']),
+				array('int', 'signature_max_font_size', 'subtext' => $txt['zero_for_no_limit']),
+				array('check', 'signature_allow_smileys', 'onclick' => 'document.getElementById(\'signature_max_smileys\').disabled = !this.checked;'),
+				array('int', 'signature_max_smileys', 'subtext' => $txt['zero_for_no_limit']),
+			'',
+				// Image settings.
+				array('int', 'signature_max_images', 'subtext' => $txt['signature_max_images_note']),
+				array('int', 'signature_max_image_width', 'subtext' => $txt['zero_for_no_limit']),
+				array('int', 'signature_max_image_height', 'subtext' => $txt['zero_for_no_limit']),
+			'',
+				array('bbc', 'signature_bbc'),
+		);
+
+		call_integration_hook('integrate_signature_settings', array(&$config_vars));
+
+		return $config_vars;
+	}
 }
 
 /**

sources/admin/ManageLanguages.php

@@ -1063,4 +1063,23 @@ private function _initLanguageSettingsForm()
 		// initialize the little form
 		return $this->_languageSettings->settings($config_vars);
 	}
+
+	public function settings()
+	{
+		global $txt;
+
+		$config_vars = array(
+			'language' => array('language', $txt['default_language'], 'file', 'select', array(), null, 'disabled' => $settings_not_writable),
+			array('userLanguage', $txt['userLanguage'], 'db', 'check', null, 'userLanguage'),
+		);
+
+		call_integration_hook('integrate_language_settings', array(&$config_vars));
+
+		// Get all languages we speak.
+		$languages = getLanguages(false);
+		foreach ($languages as $lang)
+			$config_vars['language'][4][$lang['filename']] = array($lang['filename'], strtr($lang['name'], array('-utf8' => ' (UTF-8)')));
+
+		return $config_vars;
+	}
 }