diff options
| author | Anika Henke <anika@selfthinker.org> | 2014-01-26 17:38:22 +0000 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2014-01-26 17:38:22 +0000 |
| commit | 8fe276f7d4bf70c4a798e1c5e7bb3da72a33877d (patch) | |
| tree | 1e3ce9edacc852741af07c070176bd04fb61c4b4 /install.php | |
| parent | c5393ecb1aa570830d21e9dc95b4c21cd9aa9c01 (diff) | |
| parent | ca605ff6763b98b580278988791dc5e57fc05a74 (diff) | |
| download | rpg-8fe276f7d4bf70c4a798e1c5e7bb3da72a33877d.tar.gz rpg-8fe276f7d4bf70c4a798e1c5e7bb3da72a33877d.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into video-audio
Diffstat (limited to 'install.php')
| -rw-r--r-- | install.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/install.php b/install.php index 82a47b037..779084cfa 100644 --- a/install.php +++ b/install.php @@ -56,7 +56,7 @@ $dokuwiki_hash = array( '2012-01-25' => '72c083c73608fc43c586901fd5dabb74', '2012-09-10' => 'eb0b3fc90056fbc12bac6f49f7764df3', '2013-05-10' => '7b62b75245f57f122d3e0f8ed7989623', - '2013-10-28' => '263c76af309fbf083867c18a34ff5214', + '2013-12-08' => '263c76af309fbf083867c18a34ff5214', ); @@ -207,6 +207,10 @@ function print_form($d){ <option value="2" <?php echo ($d['policy'] == 2)?'selected="selected"':'' ?>><?php echo $lang['i_pol2']?></option> </select> + <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> @@ -270,6 +274,7 @@ function check_data(&$d){ 'password' => '', 'confirm' => '', 'policy' => '0', + 'allowreg' => '0', 'license' => 'cc-by-sa' ); global $lang; @@ -351,6 +356,9 @@ EOT; $output .= '$conf[\'useacl\'] = 1'.";\n"; $output .= "\$conf['superuser'] = '@admin';\n"; } + if(!$d['allowreg']){ + $output .= '$conf[\'disableactions\'] = \'register\''.";\n"; + } $ok = $ok && fileWrite(DOKU_LOCAL.'local.php',$output); if ($d['acl']) { |