summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inc/actions.php4
-rw-r--r--inc/auth.php2
-rw-r--r--inc/html.php6
-rw-r--r--lang/de/lang.php1
-rw-r--r--lang/en/lang.php1
5 files changed, 11 insertions, 3 deletions
diff --git a/inc/actions.php b/inc/actions.php
index 3f7cc8c94..fc68ef173 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -64,7 +64,9 @@ function act_dispatch(){
if($_REQUEST['page'] == 'acl'){
require_once(DOKU_INC.'inc/admin_acl.php');
admin_acl_handler();
- }
+ } elseif ($_REQUEST['page'] == 'register') {
+ $ACT = 'register';
+ }
}
//call template FIXME: all needed vars available?
diff --git a/inc/auth.php b/inc/auth.php
index 4e3130ef7..0b40b6995 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -368,7 +368,7 @@ function register(){
global $conf;
if(!$_POST['save']) return false;
- if(!$conf['openregister']) return false;
+// if(!$conf['openregister']) return false;
//clean username
$_POST['login'] = preg_replace('/.*:/','',$_POST['login']);
diff --git a/inc/html.php b/inc/html.php
index 9e736f702..cb076b76d 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -985,6 +985,7 @@ function html_debug(){
function html_admin(){
global $ID;
global $lang;
+ global $conf;
print p_locale_xhtml('admin');
@@ -992,7 +993,10 @@ function html_admin(){
// currently ACL only - more to come
ptln('<li><a href="'.wl($ID,'do=admin&amp;page=acl').'">'.$lang['admin_acl'].'</a></li>');
-
+ if (!$conf['openregister']){
+ ptln('<li><a href="'.wl($ID,'do=admin&amp;page=register').'">'.$lang['admin_register'].'</a></li>');
+ }
+
ptln('</ul>');
}
diff --git a/lang/de/lang.php b/lang/de/lang.php
index 3a4d7acf7..08924a8d3 100644
--- a/lang/de/lang.php
+++ b/lang/de/lang.php
@@ -107,6 +107,7 @@ $lang['qb_sig'] = 'Unterschrift einfügen';
$lang['del_confirm']= 'Eintrag wirklich löschen?';
$lang['admin_acl'] = 'Zugangsverwaltung...';
+$lang['admin_register']= 'Neuen Benutzer anmelden...';
$lang['acl_group'] = 'Gruppe';
$lang['acl_user'] = 'Benutzer';
diff --git a/lang/en/lang.php b/lang/en/lang.php
index d0f83556b..935398d6d 100644
--- a/lang/en/lang.php
+++ b/lang/en/lang.php
@@ -105,6 +105,7 @@ $lang['qb_sig'] = 'Insert Signature';
$lang['del_confirm']= 'Delete this entry?';
$lang['admin_acl'] = 'Access Control List Management...';
+$lang['admin_register']= 'Add new user...';
$lang['acl_group'] = 'Group';
$lang['acl_user'] = 'User';