standardization of var name in configadd

paszczus · Jan 20, 2016 · 08d6f52 · 08d6f52
1 parent a13d504
commit 08d6f52
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/modules/configadd.php b/modules/configadd.php
@@ -33,27 +33,27 @@
 	foreach($config as $key => $val)
 	    $config[$key] = trim($val);
 
-	if(!($config['name'] || $config['value'] || $config['description']))
+	if(!($config['var'] || $config['value'] || $config['description']))
 	{
 		$SESSION->redirect('?m=configlist');
 	}
 
-	if($config['name']=='')
-		$error['name'] = trans('Option name is required!');
-	elseif(strlen($config['name'])>64)
-		$error['name'] = trans('Option name is too long (max.64 characters)!');
-	elseif(!preg_match('/^[a-z0-9_-]+$/', $config['name']))
-		$error['name'] = trans('Option name contains forbidden characters!');
-	elseif($LMS->GetConfigOptionId($config['name'], $config['section']))
-		$error['name'] = trans('Option exists!'); 
+	if($config['var']=='')
+		$error['var'] = trans('Option name is required!');
+	elseif(strlen($config['var'])>64)
+		$error['var'] = trans('Option name is too long (max.64 characters)!');
+	elseif(!preg_match('/^[a-z0-9_-]+$/', $config['var']))
+		$error['var'] = trans('Option name contains forbidden characters!');
+	elseif($LMS->GetConfigOptionId($config['var'], $config['section']))
+		$error['var'] = trans('Option exists!');
 
 	$section = empty($config['section']) ? $config['newsection'] : $config['section'];
 	if (empty($section))
 		$error['newsection'] = trans('Section name can\'t be empty!');
 	elseif (!preg_match('/^[a-z0-9_-]+$/', $section))
 		$error[empty($config['section']) ? 'newsection' : 'section'] = trans('Section name contains forbidden characters!');
 
-	$option = $config['section'] . '.' . $config['name'];
+	$option = $config['section'] . '.' . $config['var'];
 	$config['type'] = $LMS->GetConfigDefaultType($option);
 	if($config['value']=='')
 		$error['value'] = trans('Option with empty value not allowed!');
@@ -65,7 +65,7 @@
 	if (!$error) {
 		$args = array(
 			'section' => $section,
-			'name' => $config['name'],
+			'var' => $config['var'],
 			'value' => $config['value'],
 			'description' => $config['description'],
 			'disabled' => $config['disabled'],
@@ -83,7 +83,7 @@
 		if (!isset($config['reuse']))
 			$SESSION->redirect('?m=configlist');
 
-		unset($config['name']);
+		unset($config['var']);
 		unset($config['value']);
 		unset($config['description']);
 		unset($config['disabled']);

diff --git a/templates/default/config/configadd.html b/templates/default/config/configadd.html
@@ -23,7 +23,7 @@ <H1>{$layout.pagetitle}</H1>
 			<B>{trans("Name:")}</B>
 		</TD>
 		<TD width="98%">
-			<INPUT type="text" name="config[name]" value="{$config.name}" {tip text="Enter option name" trigger="name" bold=1}>&nbsp;
+			<INPUT type="text" name="config[var]" value="{$config.var}" {tip text="Enter option name" trigger="var" bold=1}>&nbsp;
 			<B>{trans("Section:")}</B>
 			<SELECT size="1" name="config[section]" {tip text="Select section" trigger="section"} onchange="javascript:change_section(this.options[this.selectedIndex].value);">
 				{foreach $sections as $section}
@@ -81,7 +81,7 @@ <H1>{$layout.pagetitle}</H1>
 </P>
 <SCRIPT type="text/javascript">
 <!--
-document.forms['config'].elements['config[name]'].focus();
+document.forms['config'].elements['config[var]'].focus();
 //-->
 </SCRIPT>
 {/block}