diff options
| author | Guy Brand <gb@unistra.fr> | 2013-11-18 20:48:03 +0100 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2013-11-18 20:48:03 +0100 |
| commit | 9d6d3a45521ca9b4eecc9f264a6adfe12d2ed764 (patch) | |
| tree | d87417a2562e14e40f21012a9e1ede2d159239c5 /install.php | |
| parent | 0f71b9e8c36a27b7e476b43879f1cf9636a9958e (diff) | |
| parent | 14b3007921f7b66fc9e3621b861a3c83e7e9093c (diff) | |
| download | rpg-9d6d3a45521ca9b4eecc9f264a6adfe12d2ed764.tar.gz rpg-9d6d3a45521ca9b4eecc9f264a6adfe12d2ed764.tar.bz2 | |
Merge branch 'master' into stable
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..5cc8b0c02 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-11-18' => '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']) { |