From 43c137edff65d5383d3e19fbbf50bc5045e4107a Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 17 Nov 2013 19:55:02 +0000
Subject: changed user approval option to disable registration option in
 installer

---
 inc/lang/en/lang.php |  2 +-
 install.php          | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index c6bb0aa2d..7d52ca3db 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -315,7 +315,7 @@ $lang['i_policy']              = 'Initial ACL policy';
 $lang['i_pol0']                = 'Open Wiki (read, write, upload for everyone)';
 $lang['i_pol1']                = 'Public Wiki (read for everyone, write and upload for registered users)';
 $lang['i_pol2']                = 'Closed Wiki (read, write, upload for registered users only)';
-$lang['i_policyapprove']       = 'Registered users need to be approved before allowing access (to a Public or Closed Wiki)';
+$lang['i_disablereg']          = 'Do not allow users to register themselves';
 $lang['i_retry']               = 'Retry';
 $lang['i_license']             = 'Please choose the license you want to put your content under:';
 $lang['i_license_none']        = 'Do not show any license information';
diff --git a/install.php b/install.php
index 657a67d55..540e9c9a6 100644
--- a/install.php
+++ b/install.php
@@ -207,9 +207,9 @@ function print_form($d){
                     <option value="2" <?php echo ($d['policy'] == 2)?'selected="selected"':'' ?>><?php echo $lang['i_pol2']?></option>
                 </select>
 
-                <label for="approve">
-                    <input type="checkbox" name="d[approve]" id="approve" <?php echo(($d['approve'] ? ' checked="checked"' : ''));?> />
-                    <?php echo $lang['i_policyapprove']?>
+                <label for="disablereg">
+                    <input type="checkbox" name="d[disablereg]" id="disablereg" <?php echo(($d['disablereg'] ? ' checked="checked"' : ''));?> />
+                    <?php echo $lang['i_disablereg']?>
                 </label>
             </fieldset>
         </fieldset>
@@ -274,7 +274,7 @@ function check_data(&$d){
         'password'  => '',
         'confirm'   => '',
         'policy'    => '0',
-        'approve'   => '0',
+        'disablereg'=> '0',
         'license'   => 'cc-by-sa'
     );
     global $lang;
@@ -356,8 +356,8 @@ EOT;
         $output .= '$conf[\'useacl\'] = 1'.";\n";
         $output .= "\$conf['superuser'] = '@admin';\n";
     }
-    if($d['approve']){
-        $output .= '$conf[\'defaultgroup\'] = \'guest\''.";\n";
+    if($d['disablereg']){
+        $output .= '$conf[\'disableactions\'] = \'register\''.";\n";
     }
     $ok = $ok && fileWrite(DOKU_LOCAL.'local.php',$output);
 
-- 
cgit v1.2.3