From 654436fbc9a7765d9faacab950c7d3e8508b747c Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 21 Jul 2013 23:21:00 +0100 Subject: fixed references to images in old template (FS#2816) --- install.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.php') diff --git a/install.php b/install.php index ab0fad121..9f1ad0dc1 100644 --- a/install.php +++ b/install.php @@ -148,8 +148,8 @@ header('Content-Type: text/html; charset=utf-8');
- driven by DokuWiki - powered by PHP + driven by DokuWiki + powered by PHP
-- cgit v1.2.3 From 93d16b87e9f2ab15088bd0d7adfbfce17336c28c Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 28 Oct 2013 20:11:55 +0100 Subject: release preparation --- install.php | 1 + 1 file changed, 1 insertion(+) (limited to 'install.php') diff --git a/install.php b/install.php index 9f1ad0dc1..82a47b037 100644 --- a/install.php +++ b/install.php @@ -56,6 +56,7 @@ $dokuwiki_hash = array( '2012-01-25' => '72c083c73608fc43c586901fd5dabb74', '2012-09-10' => 'eb0b3fc90056fbc12bac6f49f7764df3', '2013-05-10' => '7b62b75245f57f122d3e0f8ed7989623', + '2013-10-28' => '263c76af309fbf083867c18a34ff5214', ); -- cgit v1.2.3 From 74850f2906bbb3935065d28e3e22ac131766d6f2 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 9 Nov 2013 19:51:29 +0000 Subject: added possibility to approve users to ACL policies in installer --- install.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'install.php') diff --git a/install.php b/install.php index 82a47b037..fd006d566 100644 --- a/install.php +++ b/install.php @@ -207,6 +207,10 @@ function print_form($d){ + @@ -270,6 +274,7 @@ function check_data(&$d){ 'password' => '', 'confirm' => '', 'policy' => '0', + 'approve' => '0', 'license' => 'cc-by-sa' ); global $lang; @@ -332,6 +337,7 @@ function store_data($d){ global $LC; $ok = true; $d['policy'] = (int) $d['policy']; + $usergroup = $d['approve'] ? 'member' : 'user'; // create local.php $now = gmdate('r'); @@ -360,7 +366,7 @@ EOT; // create users.auth.php // --- user:SMD5password:Real Name:email:groups,comma,seperated - $output = join(":",array($d['superuser'], $pass, $d['fullname'], $d['email'], 'admin,user')); + $output = join(":",array($d['superuser'], $pass, $d['fullname'], $d['email'], 'admin,'.$usergroup)); $output = @file_get_contents(DOKU_CONF.'users.auth.php.dist')."\n$output\n"; $ok = $ok && fileWrite(DOKU_LOCAL.'users.auth.php', $output); @@ -378,10 +384,10 @@ EOT; EOT; if($d['policy'] == 2){ $output .= "* @ALL 0\n"; - $output .= "* @user 8\n"; + $output .= "* @".$usergroup." 8\n"; }elseif($d['policy'] == 1){ $output .= "* @ALL 1\n"; - $output .= "* @user 8\n"; + $output .= "* @".$usergroup." 8\n"; }else{ $output .= "* @ALL 8\n"; } -- cgit v1.2.3 From d2ea6dc1fd93e375f40ebb1d3792412d52ef9f73 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 9 Nov 2013 20:07:14 +0000 Subject: changed how to approve users in installer ACL policy --- install.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'install.php') diff --git a/install.php b/install.php index fd006d566..4f09ccacb 100644 --- a/install.php +++ b/install.php @@ -357,6 +357,9 @@ EOT; $output .= '$conf[\'useacl\'] = 1'.";\n"; $output .= "\$conf['superuser'] = '@admin';\n"; } + if($d['approve']){ + $output .= '$conf[\'defaultgroup\'] = \'guest\''.";\n"; + } $ok = $ok && fileWrite(DOKU_LOCAL.'local.php',$output); if ($d['acl']) { @@ -366,7 +369,7 @@ EOT; // create users.auth.php // --- user:SMD5password:Real Name:email:groups,comma,seperated - $output = join(":",array($d['superuser'], $pass, $d['fullname'], $d['email'], 'admin,'.$usergroup)); + $output = join(":",array($d['superuser'], $pass, $d['fullname'], $d['email'], 'admin,user')); $output = @file_get_contents(DOKU_CONF.'users.auth.php.dist')."\n$output\n"; $ok = $ok && fileWrite(DOKU_LOCAL.'users.auth.php', $output); @@ -384,10 +387,10 @@ EOT; EOT; if($d['policy'] == 2){ $output .= "* @ALL 0\n"; - $output .= "* @".$usergroup." 8\n"; + $output .= "* @user 8\n"; }elseif($d['policy'] == 1){ $output .= "* @ALL 1\n"; - $output .= "* @".$usergroup." 8\n"; + $output .= "* @user 8\n"; }else{ $output .= "* @ALL 8\n"; } -- cgit v1.2.3 From fc84dec2c8d52379fa32a38d1004acf0296a0ef7 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 10 Nov 2013 02:01:02 +0000 Subject: removed redundant line --- install.php | 1 - 1 file changed, 1 deletion(-) (limited to 'install.php') diff --git a/install.php b/install.php index 4f09ccacb..657a67d55 100644 --- a/install.php +++ b/install.php @@ -337,7 +337,6 @@ function store_data($d){ global $LC; $ok = true; $d['policy'] = (int) $d['policy']; - $usergroup = $d['approve'] ? 'member' : 'user'; // create local.php $now = gmdate('r'); -- cgit v1.2.3 From 43c137edff65d5383d3e19fbbf50bc5045e4107a Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 17 Nov 2013 19:55:02 +0000 Subject: changed user approval option to disable registration option in installer --- install.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'install.php') 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){ -