Merge pull request #430 from splitbrain/change-installer-allowreg

swapped logic for allowing/disabling registration in installer

2 files changed, 6 insertions, 6 deletions

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 7d52ca3db..17a75803f 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_disablereg']          = 'Do not allow users to register themselves';
+$lang['i_allowreg']            = '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 540e9c9a6..a6032bebe 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="disablereg">
-                    <input type="checkbox" name="d[disablereg]" id="disablereg" <?php echo(($d['disablereg'] ? ' checked="checked"' : ''));?> />
-                    <?php echo $lang['i_disablereg']?>
+                <label for="allowreg">
+                    <input type="checkbox" name="d[allowreg]" id="allowreg" <?php echo(($d['allowreg'] ? ' checked="checked"' : ''));?> />
+                    <?php echo $lang['i_allowreg']?>
                 </label>
             </fieldset>
         </fieldset>
@@ -274,7 +274,7 @@ function check_data(&$d){
         'password'  => '',
         'confirm'   => '',
         'policy'    => '0',
-        'disablereg'=> '0',
+        'allowreg'  => '0',
         'license'   => 'cc-by-sa'
     );
     global $lang;
@@ -356,7 +356,7 @@ EOT;
         $output .= '$conf[\'useacl\'] = 1'.";\n";
         $output .= "\$conf['superuser'] = '@admin';\n";
     }
-    if($d['disablereg']){
+    if(!$d['allowreg']){
         $output .= '$conf[\'disableactions\'] = \'register\''.";\n";
     }
     $ok = $ok && fileWrite(DOKU_LOCAL.'local.php',$output);