Browse Source

Merge pull request #771 from Arantor/release-2.1

! Core Features, you were a worthy piece of code in your own right, and ...
Arantor 11 years ago
parent
commit
28b5a40b5d

+ 1 - 8
Sources/Admin.php

@@ -103,12 +103,6 @@ function AdminMain()
 			'title' => $txt['admin_config'],
 			'permission' => array('admin_forum'),
 			'areas' => array(
-				'corefeatures' => array(
-					'label' => $txt['core_settings_title'],
-					'file' => 'ManageSettings.php',
-					'function' => 'ModifyCoreFeatures',
-					'icon' => 'corefeatures.png',
-				),
 				'featuresettings' => array(
 					'label' => $txt['modSettings_title'],
 					'file' => 'ManageSettings.php',
@@ -117,7 +111,7 @@ function AdminMain()
 					'subsections' => array(
 						'basic' => array($txt['mods_cat_features']),
 						'layout' => array($txt['mods_cat_layout']),
-						'karma' => array($txt['karma'], 'enabled' => in_array('k', $context['admin_features'])),
+						'karma' => array($txt['karma']),
 						'sig' => array($txt['signature_settings_short']),
 						'profile' => array($txt['custom_profile_shorttitle']),
 					),
@@ -688,7 +682,6 @@ function AdminSearchInternal()
 
 	// This is a special array of functions that contain setting data - we query all these to simply pull all setting bits!
 	$settings_search = array(
-		array('ModifyCoreFeatures', 'area=corefeatures'),
 		array('ModifyBasicSettings', 'area=featuresettings;sa=basic'),
 		array('ModifyLayoutSettings', 'area=featuresettings;sa=layout'),
 		array('ModifyKarmaSettings', 'area=featuresettings;sa=karma'),

+ 0 - 3
Sources/Load.php

@@ -1796,9 +1796,6 @@ function loadTheme($id_theme = 0, $initialize = true)
 	if (!isset($settings['theme_version']))
 		$modSettings['memberCount'] = $modSettings['totalMembers'];
 
-	// This allows us to change the way things look for the admin.
-	$context['admin_features'] = isset($modSettings['admin_features']) ? explode(',', $modSettings['admin_features']) : array('k,w');
-
 	// Default JS variables for use in every theme
 	$context['javascript_vars'] = array(
 		'smf_theme_url' => '"' . $settings['theme_url'] . '"',

+ 1 - 1
Sources/ManagePermissions.php

@@ -1553,7 +1553,7 @@ function loadAllPermissions($loadType = 'classic')
 	}
 	if ($modSettings['warning_settings'][0] == 0)
 		$hiddenPermissions[] = 'issue_warning';
-	if (!in_array('k', $context['admin_features']))
+	if (empty($modSettings['karmaMode']))
 		$hiddenPermissions[] = 'karma_edit';
 
 	// Post moderation?

+ 19 - 160
Sources/ManageSettings.php

@@ -63,10 +63,6 @@ function ModifyFeatureSettings()
 
 	call_integration_hook('integrate_modify_features', array(&$subActions));
 
-	// If karma is disabled don't show the setting page.
-	if (!in_array('k', $context['admin_features']))
-		unset($subActions['karma']);
-
 	loadGeneralSettingParameters($subActions, 'basic');
 
 	// Load up all the tabs...
@@ -128,148 +124,6 @@ function ModifyModSettings()
 	$subActions[$_REQUEST['sa']]();
 }
 
-/**
- * This is an overall control panel enabling/disabling lots of SMF's key feature components.
- *
- * @param $return_config
- */
-function ModifyCoreFeatures($return_config = false)
-{
-	global $txt, $scripturl, $context, $settings, $sc, $modSettings;
-
-	/* This is an array of all the features that can be enabled/disabled - each option can have the following:
-		title		- Text title of this item (If standard string does not exist).
-		desc		- Description of this feature (If standard string does not exist).
-		settings	- Array of settings to change (For each name => value) on enable - reverse is done for disable. If > 1 will not change value if set.
-		setting_callback- Function that returns an array of settings to save - takes one parameter which is value for this feature.
-		save_callback	- Function called on save, takes state as parameter.
-	*/
-	$core_features = array(
-		// k = karma.
-		'k' => array(
-			'url' => 'action=admin;area=featuresettings;sa=karma',
-			'settings' => array(
-				'karmaMode' => 2,
-			),
-		),
-	);
-
-	// Anyone who would like to add a core feature?
-	call_integration_hook('integrate_core_features', array(&$core_features));
-
-	// Are we getting info for the help section.
-	if ($return_config)
-	{
-		$return_data = array();
-		foreach ($core_features as $id => $data)
-			$return_data[] = array('switch', isset($data['title']) ? $data['title'] : $txt['core_settings_item_' . $id]);
-		return $return_data;
-	}
-
-	loadGeneralSettingParameters();
-
-	// Are we saving?
-	if (isset($_POST['save']))
-	{
-		checkSession();
-
-		if (isset($_GET['xml']))
-		{
-			$tokenValidation = validateToken('admin-core', 'post', false);
-
-			if (empty($tokenValidation))
-				return 'token_verify_fail';
-		}
-		else
-			validateToken('admin-core');
-
-		$setting_changes = array('admin_features' => array());
-
-		// Cycle each feature and change things as required!
-		foreach ($core_features as $id => $feature)
-		{
-			// Enabled?
-			if (!empty($_POST['feature_' . $id]))
-				$setting_changes['admin_features'][] = $id;
-
-			// Setting values to change?
-			if (isset($feature['settings']))
-			{
-				foreach ($feature['settings'] as $key => $value)
-				{
-					if (empty($_POST['feature_' . $id]) || (!empty($_POST['feature_' . $id]) && ($value < 2 || empty($modSettings[$key]))))
-						$setting_changes[$key] = !empty($_POST['feature_' . $id]) ? $value : !$value;
-				}
-			}
-			// Is there a call back for settings?
-			if (isset($feature['setting_callback']))
-			{
-				$returned_settings = $feature['setting_callback'](!empty($_POST['feature_' . $id]));
-				if (!empty($returned_settings))
-					$setting_changes = array_merge($setting_changes, $returned_settings);
-			}
-
-			// Standard save callback?
-			if (isset($feature['on_save']))
-				$feature['on_save']();
-		}
-
-		// Make sure this one setting is a string!
-		$setting_changes['admin_features'] = implode(',', $setting_changes['admin_features']);
-
-		// Make any setting changes!
-		updateSettings($setting_changes);
-
-		// This is needed to let menus appear if cache > 2
-		clean_cache('data');
-
-		// Any post save things?
-		foreach ($core_features as $id => $feature)
-		{
-			// Standard save callback?
-			if (isset($feature['save_callback']))
-				$feature['save_callback'](!empty($_POST['feature_' . $id]));
-		}
-
-		if (!isset($_REQUEST['xml']))
-			redirectexit('action=admin;area=corefeatures;' . $context['session_var'] . '=' . $context['session_id']);
-	}
-
-	// Put them in context.
-	$context['features'] = array();
-	foreach ($core_features as $id => $feature)
-		$context['features'][$id] = array(
-			'title' => isset($feature['title']) ? $feature['title'] : $txt['core_settings_item_' . $id],
-			'desc' => isset($feature['desc']) ? $feature['desc'] : $txt['core_settings_item_' . $id . '_desc'],
-			'enabled' => in_array($id, $context['admin_features']),
-			'state' => in_array($id, $context['admin_features']) ? 'on' : 'off',
-			'url' => !empty($feature['url']) ? $scripturl . '?' . $feature['url'] . ';' . $context['session_var'] . '=' . $context['session_id'] : '',
-			'image' => (file_exists($settings['theme_dir'] . '/images/admin/feature_' . $id . '.png') ? $settings['images_url'] : $settings['default_images_url']) . '/admin/feature_' . $id . '.png',
-		);
-
-	// Are they a new user?
-	$context['is_new_install'] = !isset($modSettings['admin_features']);
-	$context['force_disable_tabs'] = $context['is_new_install'];
-	// Don't show them this twice!
-	if ($context['is_new_install'])
-		updateSettings(array('admin_features' => ''));
-
-	// sub_template is already generic_xml and the token is created somewhere else
-	if (isset($_REQUEST['xml']))
-		return;
-
-	$context['sub_template'] = 'core_features';
-	$context['page_title'] = $txt['core_settings_title'];
-	$context[$context['admin_menu_name']]['tab_data'] = array(
-		'title' => $txt['core_settings_title'],
-		'help' => '',
-		'description' => $txt['core_settings_desc'],
-	);
-
-	// We love our tokens.
-	createToken('admin-core');
-}
-
 /**
  * Config array for chaning the basic forum settings
  * Accessed  from ?action=admin;area=featuresettings;sa=basic;
@@ -426,22 +280,27 @@ function ModifyLayoutSettings($return_config = false)
  */
 function ModifyKarmaSettings($return_config = false)
 {
-	global $txt, $scripturl, $context, $settings, $sc;
+	global $txt, $scripturl, $context, $settings, $modSettings;
 
-	$config_vars = array(
-			// Karma - On or off?
+	if (empty($modSettings['karmaMode']))
+		$config_vars = array(
 			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'),
-	);
+		);
+	else
+		$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));
 

+ 0 - 103
Sources/Xml.php

@@ -28,9 +28,6 @@ function XMLhttpMain()
 		'messageicons' => array(
 			'function' => 'ListMessageIcons',
 		),
-		'corefeatures' => array(
-			'function' => 'EnableCoreFeatures',
-		),
 		'previews' => array(
 			'function' => 'RetrievePreview',
 		),
@@ -81,106 +78,6 @@ function ListMessageIcons()
 	$context['sub_template'] = 'message_icons';
 }
 
-function EnableCoreFeatures()
-{
-	global $context, $smcFunc, $sourcedir, $modSettings, $txt, $boarddir, $settings;
-
-	$context['xml_data'] = array();
-	// Just in case, maybe we don't need it
-	loadLanguage('Errors');
-
-	// We need (at least) this to ensure that mod files are included
-	if (!empty($modSettings['integrate_admin_include']))
-	{
-		$admin_includes = explode(',', $modSettings['integrate_admin_include']);
-		foreach ($admin_includes as $include)
-		{
-			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
-			if (file_exists($include))
-				require_once($include);
-		}
-	}
-
-	$errors = array();
-	$returns = array();
-	$tokens = array();
-	if (allowedTo('admin_forum'))
-	{
-		$validation = validateSession();
-		if (empty($validation))
-		{
-			require_once($sourcedir . '/ManageSettings.php');
-			$result = ModifyCoreFeatures();
-
-			if (empty($result))
-			{
-				$id = isset($_POST['feature_id']) ? $_POST['feature_id'] : '';
-
-				if (!empty($id) && isset($context['features'][$id]))
-				{
-					$feature = $context['features'][$id];
-
-					$returns[] = array(
-						'value' => (!empty($_POST['feature_' . $id]) && $feature['url'] ? '<a href="' . $feature['url'] . '">' . $feature['title'] . '</a>' : $feature['title']),
-					);
-
-					createToken('admin-core', 'post');
-					$tokens = array(
-						array(
-							'value' => $context['admin-core_token'],
-							'attributes' => array('type' => 'token_var'),
-						),
-						array(
-							'value' => $context['admin-core_token_var'],
-							'attributes' => array('type' => 'token'),
-						),
-					);
-				}
-				else
-				{
-					$errors[] = array(
-						'value' => $txt['feature_no_exists'],
-					);
-				}
-			}
-			else
-			{
-				$errors[] = array(
-					'value' => $txt[$result],
-				);
-			}
-		}
-		else
-		{
-			$errors[] = array(
-				'value' => $txt[$validation],
-			);
-		}
-	}
-	else
-	{
-		$errors[] = array(
-			'value' => $txt['cannot_admin_forum']
-		);
-	}
-
-	$context['sub_template'] = 'generic_xml';
-	$context['xml_data'] = array (
-		'corefeatures' => array (
-			'identifier' => 'corefeature',
-			'children' => $returns,
-		),
-		'tokens' => array (
-			'identifier' => 'token',
-			'children' => $tokens,
-		),
-		'errors' => array (
-			'identifier' => 'error',
-			'children' => $errors,
-		),
-	);
-}
-
 function RetrievePreview()
 {
 	global $context;

+ 0 - 147
Themes/default/Admin.template.php

@@ -1261,153 +1261,6 @@ function template_admin_search_results()
 	</div>';
 }
 
-// Turn on and off certain key features.
-function template_core_features()
-{
-	global $context, $txt, $settings, $options, $scripturl;
-
-	echo '
-	<script type="text/javascript"><!-- // --><![CDATA[
-		var message, token_name, token_value;
-		var feature_on_text, feature_off_text;
-		var activation_text, deactivation_text;
-		var generic_error_text, imgs, sImageText;
-		var cc, cf, new_state, ajax_infobar;
-
-		feature_on_text = ', JavaScriptEscape($txt['core_settings_switch_off']), ';
-		feature_off_text = ', JavaScriptEscape($txt['core_settings_switch_on']), ';
-		activation_text = ', JavaScriptEscape($txt['core_settings_activation_message']), ';
-		deactivation_text = ', JavaScriptEscape($txt['core_settings_deactivation_message']), ';
-		generic_error_text = ', JavaScriptEscape($txt['core_settings_generic_error']), ';
-		imgs = [
-			"', $settings['images_url'], '/admin/switch_off.png",
-			"', $settings['images_url'], '/admin/switch_on.png"
-		];
-
-		$(document).ready(function() {
-			$(".core_features_hide").hide();
-			$(".core_features_img").css({\'cursor\': \'pointer\', \'display\': \'\'}).each(function() {
-				sImageText = $(this).hasClass(\'on\') ? feature_on_text : feature_off_text;
-				$(this).attr({title: sImageText, alt: sImageText});
-			});
-			$("#core_features_submit").hide();
-
-			if (token_name == undefined)
-				token_name = $("#core_features_token").attr("name")
-			if (token_value == undefined)
-				token_value = $("#core_features_token").attr("value")
-
-			$(".core_features_img").click(function() {
-				cc = $(this);
-				cf = $(this).attr("id").substring(7);
-				new_state = !$("#feature_" + cf).attr("checked");
-				ajax_infobar = document.createElement(\'div\');
-				$(ajax_infobar).addClass("cf_notification");
-				$("body").append(ajax_infobar);
-				$(ajax_infobar).hide();
-				$("#feature_" + cf).attr("checked", new_state);
-
-				data = {save: "save", feature_id: cf};
-				data[$("#core_features_session").attr("name")] = $("#core_features_session").val();
-				data[token_name] = token_value;
-				$(".core_features_status_box").each(function() {
-					data[$(this).attr("name")] = !$(this).attr("checked") ? 0 : 1;
-				});
-
-				// Launch AJAX request.
-				$.ajax({
-					// The link we are accessing.
-					url: smf_scripturl + "?action=xmlhttp;sa=corefeatures;xml",
-					// The type of request.
-					type: "post",
-					// The type of data that is getting returned.
-					data: data,
-					error: function(error) {
-							$(ajax_infobar).html(error).slideDown(\'fast\');
-					},
-
-					success: function(request) {
-						if ($(request).find("errors").find("error").length != 0)
-						{
-							$(ajax_infobar).attr(\'class\', \'errorbox\');
-							$(ajax_infobar).html($(request).find("errors").find("error").text()).slideDown(\'fast\');
-						}
-						else if ($(request).find("smf").length != 0)
-						{
-							$("#feature_link_" + cf).html($(request).find("corefeatures").find("corefeature").text());
-							cc.attr({
-								"src": imgs[new_state ? 1 : 0],
-								"title": new_state ? feature_on_text : feature_off_text,
-								"alt": new_state ? feature_on_text : feature_off_text
-							});
-							$("#feature_link_" + cf).fadeOut().fadeIn();
-							$(ajax_infobar).addClass("infobox");
-							message = new_state ? activation_text : deactivation_text;
-							$(ajax_infobar).html(message.replace(\'{core_feature}\', $(request).find("corefeatures").find("corefeature").text())).slideDown(\'fast\').delay(5*1000).slideUp(function() { $(this).remove(); });
-
-							token_name = $(request).find("tokens").find(\'[type="token"]\').text();
-							token_value = $(request).find("tokens").find(\'[type="token_var"]\').text();
-						}
-						else
-						{
-							$(ajax_infobar).addClass("errorbox");
-							$(ajax_infobar).text(generic_error_text).slideDown(\'fast\');
-
-						}
-					}
-				});
-			});
-		});
-	// ]]></script>
-	<div id="admincenter">';
-	if ($context['is_new_install'])
-	{
-		echo '
-			<div id="section_header" class="cat_bar">
-				<h3 class="catbg">
-					', $txt['core_settings_welcome_msg'], '
-				</h3>
-			</div>
-			<div class="information">
-				', $txt['core_settings_welcome_msg_desc'], '
-			</div>';
-	}
-
-	echo '
-			<form id="core_features" action="', $scripturl, '?action=admin;area=corefeatures" method="post" accept-charset="', $context['character_set'], '">
-			<div style="display:none" id="activation_message" class="errorbox"></div>';
-
-	$alternate = true;
-	$num = 0;
-	$num_features = count($context['features']);
-	foreach ($context['features'] as $id => $feature)
-	{
-		$num++;
-		echo '
-			<div class="content features', $num !== $num_features ? ' features_separate' : '', '">
-				<img class="features_image" src="', $feature['image'], '" alt="', $feature['title'], '" />
-				<div class="features_switch" id="js_feature_', $id, '">
-					<label class="core_features_hide" for="feature_', $id, '">', $txt['core_settings_enabled'], '<input class="core_features_status_box" type="checkbox" name="feature_', $id, '" id="feature_', $id, '"', $feature['enabled'] ? ' checked="checked"' : '', ' /></label>
-					<img class="core_features_img ', $feature['state'], '" src="', $settings['images_url'], '/admin/switch_', $feature['state'], '.png" alt="', $feature['state'], '" id="switch_', $id, '" style="margin-top: 1.3em;display:none" />
-				</div>
-				<h4 id="feature_link_' . $id . '">', ($feature['enabled'] && $feature['url'] ? '<a href="' . $feature['url'] . '">' . $feature['title'] . '</a>' : $feature['title']), '</h4>
-				<p>', $feature['desc'], '</p>
-			</div>';
-
-		$alternate = !$alternate;
-	}
-
-	echo '
-			<div class="righttext">
-				<input id="core_features_session" type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
-				<input id="core_features_token" type="hidden" name="', $context['admin-core_token_var'], '" value="', $context['admin-core_token'], '" />
-				<input id="core_features_submit" type="submit" value="', $txt['save'], '" name="save" class="button_submit" />
-			</div>
-		</form>
-	</div>';
-}
-
-
 // This little beauty shows questions and answer from the captcha type feature.
 function template_callback_question_answer_list()
 {

+ 3 - 80
Themes/default/css/admin.css

@@ -49,11 +49,11 @@ body.action_admin .navigate_section ul li a {
 /* Can be simplified quite a lot before production builds. */
 
 /* Re-style default cat bars to get rid of header bar mania. */
-#manage_maintenance .cat_bar, #core_features .cat_bar, #support_credits .cat_bar {
+#manage_maintenance .cat_bar, #support_credits .cat_bar {
 	border: none;
 	border-top: 1px solid #bbb;
 }
-#manage_maintenance .cat_bar .catbg, #manage_boards .cat_bar .catbg, #core_features .cat_bar .catbg,
+#manage_maintenance .cat_bar .catbg, #manage_boards .cat_bar .catbg,
 #support_credits .cat_bar .catbg, .generic_list_wrapper .cat_bar .catbg {
 	border: none;
 	border-top: 1px solid #fff;
@@ -131,7 +131,7 @@ body.action_admin .navigate_section ul li a {
 /* A general admin wrapper class. */
 #admin_main_section, div.quick_tasks,
 #support_credits, #admin_newsletters,
-#core_features, #generate_reports_type,
+#generate_reports_type,
 #groupForm, #mailqueue_stats, #manage_maintenance,
 #new_group, #view_group, #admin_form_wrapper, .action_admin .generic_list_wrapper{
 	background: #f0f4f7;
@@ -594,59 +594,6 @@ div.quick_tasks {
 	padding: 6px 0;
 }
 
-/* Styles for the core features screen.
-/* Cleaned up a  bit for clarity.
-------------------------------------------------------- */
-#core_features {
-	padding: 20px 0;
-}
-#core_features hr {
-	padding: 0;
-	margin: 4px 0 12px 0;
-}
-#core_features .content {
-	padding: 0 12px;
-	overflow: auto;
-}
-
-.cf_notification {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-}
-
-/* Keep your enemies close, and your submit buttons if your screen is huge. */
-/* Speaking of which, I can't see the last submit that is in the markup. */
-/* Still works without it if you reload the page, but rather odd that it's hiding. */
-.features_image {
-	float: left;
-	margin: 0 12px 0 0;
-}
-.features_switch {
-	margin: -20px 0 6px 6px;
-	float: right;
-}
-.features_separate {
-	margin-bottom: 12px;
-	border-bottom: 2px solid #ccc;
-}
-.features h4 {
-	padding: 0;
-	margin: 0 6px 0 105px;
-	font-size: 1.1em;
-	overflow: hidden;
-	white-space: pre;
-	text-overflow: ellipsis;
-	min-height: 1.6em;
-	max-height: 1.6em;
-}
-.features p {
-	margin: 0 6px 0 105px;
-	padding: 0;
-	min-height: 56px;
-}
-
 /* Styles for the package manager.
 /* Haven't got here yet. :P
 ------------------------------------------------- */
@@ -1188,15 +1135,7 @@ h3.grid_header {
 }
 
 /* Try out some nifty small screen friendliness, for the cost of a few more bytes. */
-/*@media screen and (max-width: 85em) {
-	.features p {
-		margin: 0;
-		padding: 0;
-		min-height: 10em;
-		max-height: 10em;
-	}
 
-}*/
 @media screen and (max-width: 490px),(max-width: 32em) {
 	body {
 		padding: 0;
@@ -1249,22 +1188,6 @@ h3.grid_header {
 	#credits_page img {
 		right: 6px;
 	}
-	#core_features .features_image {
-		display: none;
-	}
-	#core_features .features_switch {
-		margin: -24px 0 0 5px;
-	}
-	#core_features .features h4 {
-		padding: 0 0 10px 0;
-	}
-	#core_features .features p {
-		margin: 0;
-		padding: 0;
-		min-height: 0;
-		max-height: 5em;
-		overflow: auto;
-	}
 	#manage_boards .catbg {
 		margin-top: 10px;
 	}

+ 1 - 10
Themes/default/css/rtl.css

@@ -833,16 +833,7 @@ tr.windowbg2 th.stats_month, tr.windowbg2 td.stats_day {
 #quick_search {
 	margin-left: 5px;
 }
-.features_image {
-	float: right;
-	margin: 0 1em 0.5em 2em;
-}
-.features_switch {
-	float: left;
-}
-.features h4 {
-	padding: 1em 0.5em 0.5em 0;
-}
+
 /* admin home */
 #live_news div.content dl {
 	padding: 0.5em 0.5em 0 0;

BIN
Themes/default/images/admin/corefeatures.png


BIN
Themes/default/images/admin/feature_k.png


+ 0 - 6
Themes/default/languages/Admin.english.php

@@ -648,8 +648,6 @@ $txt['admin_search_results_none'] = 'No results found.';
 $txt['admin_search_section_sections'] = 'Section';
 $txt['admin_search_section_settings'] = 'Setting';
 
-$txt['core_settings_title'] = 'Core Features';
-$txt['core_settings_desc'] = 'This page allows you to turn on or off optional features of your forum.';
 $txt['mods_cat_features'] = 'General';
 $txt['antispam_title'] = 'Anti-Spam';
 $txt['mods_cat_modifications_misc'] = 'Miscellaneous';
@@ -663,10 +661,6 @@ $txt['pruning_desc'] = 'The following options are useful for keeping your logs f
 $txt['log_settings'] = 'Log Settings';
 $txt['log_ban_hits'] = 'Log ban hits in the error log?';
 
-$txt['core_settings_activation_message'] = 'The feature {core_feature} has been activated, click on the title to configure it';
-$txt['core_settings_deactivation_message'] = 'The feature {core_feature} has been deactivated';
-$txt['core_settings_generic_error'] = 'An unforeseen error occurred, please relod the page and try again';
-
 $txt['boardsEdit'] = 'Modify Boards';
 $txt['mboards_new_cat'] = 'Create new category';
 $txt['manage_holidays'] = 'Manage Holidays';

+ 0 - 9
Themes/default/languages/ManageSettings.english.php

@@ -294,15 +294,6 @@ $txt['custom_edit_delete_sure'] = 'Are you sure you wish to delete this field -
 $txt['standard_profile_title'] = 'Standard Profile Fields';
 $txt['standard_profile_field'] = 'Field';
 
-$txt['core_settings_welcome_msg'] = 'Welcome to Your New Forum';
-$txt['core_settings_welcome_msg_desc'] = 'To get you started we suggest you select which of SMF\'s core features you want to enable. We\'d recommend only enabling with those features you need!';
-$txt['core_settings_item_k'] = 'Karma';
-$txt['core_settings_item_k_desc'] = 'Karma is a feature that shows the popularity of a member. Members, if allowed, can \'applaud\' or \'smite\' other members, which is how their popularity is calculated.';
-$txt['core_settings_switch_on'] = 'Click to Enable';
-$txt['core_settings_switch_off'] = 'Click to Disable';
-$txt['core_settings_enabled'] = 'Enabled';
-$txt['core_settings_disabled'] = 'Disabled';
-
 $txt['languages_lang_name'] = 'Language Name';
 $txt['languages_locale'] = 'Locale';
 $txt['languages_default'] = 'Default';

+ 0 - 1
other/install_2-1_mysql.sql

@@ -1852,7 +1852,6 @@ VALUES ('smfVersion', '{$smf_version}'),
 	('warning_watch', '10'),
 	('warning_moderate', '35'),
 	('warning_mute', '60'),
-	('admin_features', ''),
 	('last_mod_report_action', '0'),
 	('pruningOptions', '30,180,180,180,30,0'),
 	('modlog_enabled', '1'),

+ 0 - 1
other/install_2-1_postgresql.sql

@@ -2352,7 +2352,6 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('warning_settings', '
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('warning_watch', '10');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('warning_moderate', '35');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('warning_mute', '60');
-INSERT INTO {$db_prefix}settings (variable, value) VALUES ('admin_features', '');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('last_mod_report_action', '0');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('pruningOptions', '30,180,180,180,30,0');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('modlog_enabled', '1');

+ 0 - 1
other/install_2-1_sqlite.sql

@@ -2001,7 +2001,6 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('warning_settings', '
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('warning_watch', '10');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('warning_moderate', '35');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('warning_mute', '60');
-INSERT INTO {$db_prefix}settings (variable, value) VALUES ('admin_features', '');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('last_mod_report_action', '0');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('pruningOptions', '30,180,180,180,30,0');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('modlog_enabled', '1');

+ 0 - 1
other/install_2-1_sqlite3.sql

@@ -2001,7 +2001,6 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('warning_settings', '
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('warning_watch', '10');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('warning_moderate', '35');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('warning_mute', '60');
-INSERT INTO {$db_prefix}settings (variable, value) VALUES ('admin_features', '');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('last_mod_report_action', '0');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('pruningOptions', '30,180,180,180,30,0');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('modlog_enabled', '1');