summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inc/actions.php7
-rw-r--r--inc/auth.php5
2 files changed, 4 insertions, 8 deletions
diff --git a/inc/actions.php b/inc/actions.php
index 441a85d3c..25a2e14c2 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -123,10 +123,11 @@ function act_permcheck($act){
}elseif(in_array($act,array('login','search','recent'))){
$permneed = AUTH_NONE;
}elseif($act == 'register'){
- if ($conf['openregister'])
+ if ($conf['openregister']){
$permneed = AUTH_NONE;
- else
- $permneed = AUTH_AUTH;
+ }else{
+ $permneed = AUTH_ADMIN;
+ }
}elseif($act == 'admin'){
$permneed = AUTH_ADMIN;
}else{
diff --git a/inc/auth.php b/inc/auth.php
index 0433a327c..ca6fb20de 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -365,14 +365,9 @@ function auth_sendPassword($user,$password){
*/
function register(){
global $lang;
- global $conf;
if(!$_POST['save']) return false;
- //no open register? -> only admin allowed!
- if(!$conf['openregister'] &&
- auth_quickaclcheck('') != AUTH_ADMIN ) return false;
-
//clean username
$_POST['login'] = preg_replace('/.*:/','',$_POST['login']);
$_POST['login'] = cleanID($_POST['login']);