1 files changed, 41 insertions, 12 deletions

diff --git a/inc/mod/config-editor.php b/inc/mod/config-editor.php
index 484bd908..caca5a0e 100644
--- a/inc/mod/config-editor.php
+++ b/inc/mod/config-editor.php
@@ -13,13 +13,14 @@ function config_vars() {
 		'default_temp' => false
 	);
 	$temp_comment = false;
+	$line_no = 0;
 	foreach ($config_file as $line) {
 		if ($temp_comment) {
 			$var['comment'][] = $temp_comment;
 			$temp_comment = false;
 		}
 		
-		if (preg_match('!^\s*// (.*)$!', $line, $matches)) {
+		if (preg_match('!^\s*// ([^$].*)$!', $line, $matches)) {
 			if ($var['default'] !== false) {
 				$line = '';
 				$temp_comment = $matches[1];
@@ -28,7 +29,10 @@ function config_vars() {
 			}
 		} else if ($var['default_temp'] !== false) {
 			$var['default_temp'] .= "\n" . $line;
-		} elseif (preg_match('!^\s*\$config\[(.+?)\] = (.+?)(;( //.+)?)?$!', $line, $matches)) {
+		} elseif (preg_match('!^[\s/]*\$config\[(.+?)\] = (.+?)(;( //.+)?)?$!', $line, $matches)) {
+			if (preg_match('!^\s*//\s*!', $line)) {
+				$var['commented'] = true;
+			}
 			$var['name'] = explode('][', $matches[1]);
 			if (count($var['name']) == 1) {
 				$var['name'] = preg_replace('/^\'(.*)\'$/', '$1', end($var['name']));
@@ -43,20 +47,37 @@ function config_vars() {
 				$var['default_temp'] = $matches[2];
 		}
 		
-		if (trim($line) === '') {
-			if ($var['name'] !== false) {
-				if ($var['default_temp'])
-					$var['default'] = $var['default_temp'];
-				
-				$temp = eval('return ' . $var['default'] . ';');
-				if (!isset($temp))
+		if ($var['name'] !== false) {
+			if ($var['default_temp'])
+				$var['default'] = $var['default_temp'];
+			if ($var['default'][0] == '&')
+				continue; // This is just an alias.
+			if (!preg_match('/^array|\[\]|function/', $var['default']) && !preg_match('/^Example: /', trim(implode(' ', $var['comment'])))) {
+				$syntax_error = true;
+				$temp = eval('$syntax_error = false;return ' . $var['default'] . ';');
+				if ($syntax_error && $temp === false) {
+					error('Error parsing config.php (line ' . $line_no . ')!', null, $var);
+				} elseif (!isset($temp)) {
 					$var['type'] = 'unknown';
-				else
+				} else {
 					$var['type'] = gettype($temp);
+				}
 				
-				unset($var['default_temp']);
+				if ($var['type'] == 'integer' && $var['name'][0] == 'mod' &&
+					(in_array($var['default'], array('JANITOR', 'MOD', 'ADMIN', 'DISABLED')) || mb_strpos($var['default'], "\$config['mod']") === 0)) {
+					// Permissions variable
+					$var['permissions'] = true;
+				}
 				
+				unset($var['default_temp']);
 				if (!is_array($var['name']) || (end($var['name']) != '' && !in_array(reset($var['name']), array('stylesheets')))) {
+					$already_exists = false;
+					foreach ($conf as $_var) {
+						if ($var['name'] == $_var['name'])
+							$already_exists = true;
+							
+					}
+					if (!$already_exists)
 					$conf[] = $var;
 				}
 			}
@@ -65,9 +86,17 @@ function config_vars() {
 				'name' => false,
 				'comment' => array(),
 				'default' => false,
-				'default_temp' => false
+				'default_temp' => false,
+				'commented' => false,
+				'permissions' => false,
 			);
 		}
+		
+		if (trim($line) === '') {
+			$var['comment'] = array();
+		}
+		
+		$line_no++;
 	}
 	
 	return $conf;