瀏覽代碼

A bit of clean up

emanuele 13 年之前
父節點
當前提交
fe54790b55
共有 2 個文件被更改,包括 5 次插入19 次删除
  1. 5 8
      Sources/ManageSettings.php
  2. 0 11
      Themes/default/Admin.template.php

+ 5 - 8
Sources/ManageSettings.php

@@ -346,14 +346,11 @@ function ModifyCoreFeatures($return_config = false)
 
 		$setting_changes = array('admin_features' => array());
 
-		// Are we using the javascript stuff or radios to submit?
-		$post_var_prefix = 'feature_';
-
 		// Cycle each feature and change things as required!
 		foreach ($core_features as $id => $feature)
 		{
 			// Enabled?
-			if (!empty($_POST[$post_var_prefix . $id]))
+			if (!empty($_POST['feature_' . $id]))
 				$setting_changes['admin_features'][] = $id;
 
 			// Setting values to change?
@@ -361,14 +358,14 @@ function ModifyCoreFeatures($return_config = false)
 			{
 				foreach ($feature['settings'] as $key => $value)
 				{
-					if (empty($_POST[$post_var_prefix . $id]) || (!empty($_POST[$post_var_prefix . $id]) && ($value < 2 || empty($modSettings[$key]))))
-						$setting_changes[$key] = !empty($_POST[$post_var_prefix . $id]) ? $value : !$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[$post_var_prefix . $id]));
+				$returned_settings = $feature['setting_callback'](!empty($_POST['feature_' . $id]));
 				if (!empty($returned_settings))
 					$setting_changes = array_merge($setting_changes, $returned_settings);
 			}
@@ -389,7 +386,7 @@ function ModifyCoreFeatures($return_config = false)
 		{
 			// Standard save callback?
 			if (isset($feature['save_callback']))
-				$feature['save_callback'](!empty($_POST[$post_var_prefix . $id]));
+				$feature['save_callback'](!empty($_POST['feature_' . $id]));
 		}
 
 		redirectexit('action=admin;area=corefeatures;' . $context['session_var'] . '=' . $context['session_id']);

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

@@ -1427,17 +1427,6 @@ function template_core_features()
 		</form>
 	</div>
 	<br class="clear" />';
-
-	// Turn on the pretty javascript if we can!
-	echo '
-	<script type="text/javascript"><!-- // --><![CDATA[
-		document.getElementById(\'js_worked\').value = "1";';
-		foreach ($context['features'] as $id => $feature)
-			echo '
-		document.getElementById(\'js_feature_', $id, '\').style.display = "";
-		document.getElementById(\'plain_feature_', $id, '\').style.display = "none";';
-	echo '
-	// ]]></script>';
 }