From 0d1bfa47f1f459b4893426e752ce2d3e9b2de030 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Sat, 3 Aug 2013 05:41:01 -0400
Subject: [PATCH] Web config editor: Write "MOD", "JANITOR", etc. to
 instance-config instead of just int representations

---
 inc/mod/config-editor.php        | 10 +++++++++-
 inc/mod/pages.php                | 15 ++++++++++++++-
 templates/mod/config-editor.html |  2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/inc/mod/config-editor.php b/inc/mod/config-editor.php
index d6cad8f0..caca5a0e 100644
--- a/inc/mod/config-editor.php
+++ b/inc/mod/config-editor.php
@@ -62,6 +62,13 @@ function config_vars() {
 				} else {
 					$var['type'] = gettype($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;
@@ -80,7 +87,8 @@ function config_vars() {
 				'comment' => array(),
 				'default' => false,
 				'default_temp' => false,
-				'commented' => false
+				'commented' => false,
+				'permissions' => false,
 			);
 		}
 		
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 6c46a84f..13520871 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -2010,7 +2010,20 @@ function mod_config() {
 					$config_append .= '[' . var_export($var['name'], true) . ']';
 				}
 				
-				$config_append .= ' = ' . var_export($value, true) . ";\n";
+				
+				$config_append .= ' = ';
+				if ($var['permissions'] && in_array($value, array(JANITOR, MOD, ADMIN, DISABLED))) {
+					$perm_array = array(
+						JANITOR => 'JANITOR',
+						MOD => 'MOD',
+						ADMIN => 'ADMIN',
+						DISABLED => 'DISABLED'
+					);
+					$config_append .= $perm_array[$value];
+				} else {
+					$config_append .= var_export($value, true);
+				}
+				$config_append .= ";\n";
 			}
 		}
 		
diff --git a/templates/mod/config-editor.html b/templates/mod/config-editor.html
index 41e01dad..d333e9a2 100644
--- a/templates/mod/config-editor.html
+++ b/templates/mod/config-editor.html
@@ -25,7 +25,7 @@
 				<td>
 					{% if var.type == 'string' %}
 						<input name="{{ name }}" type="text" value="{{ var.value|e }}">
-					{% elseif var.type == 'integer' and var.name.0 == 'mod' and (var.default in ['JANITOR', 'MOD', 'ADMIN', 'DISABLED'] or var.default|slice(0, 14) == "$config['mod']") and var.value <= constant('DISABLED') %}
+					{% elseif var.permissions %}
 						<select name="{{ name }}">
 							<option value="{{ constant('JANITOR') }}"{% if var.value == constant('JANITOR')%} selected{% endif %}>JANITOR</option>
 							<option value="{{ constant('MOD') }}"{% if var.value == constant('MOD')%} selected{% endif %}>MOD</option>