Author: nathangray
New Revision: 36047
URL: http://svn.stylite.de/viewvc/egroupware?rev=36047&view=rev
Log:
Add ability for admin to manually complete / cancel pending registration.
Modified:
trunk/registration/inc/class.registration_bo.inc.php
trunk/registration/inc/class.registration_ui.inc.php
trunk/registration/lang/egw_en.lang
trunk/registration/setup/etemplates.inc.php
Modified: trunk/registration/inc/class.registration_bo.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/registration/inc/class.registration_bo.inc.php?rev=36047&r1=36046&r2=36047&view=diff
— trunk/registration/inc/class.registration_bo.inc.php (original)
+++ trunk/registration/inc/class.registration_bo.inc.php Tue Aug 9 19:01:20 2011
@@ -46,7 +46,10 @@
$reg_info = self::$so->read((int)$reg_id);
if($reg_info && $reg_info[‘contact_id’]) {
$addressbook = new addressbook_bo();
-
$reg_info += $addressbook->read($reg_info['contact_id']);
-
$contact = $addressbook->read($reg_info['contact_id']); -
if($contact && is_array($contact)) { -
$reg_info += $contact; -
}} } return $reg_info;
Modified: trunk/registration/inc/class.registration_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/registration/inc/class.registration_ui.inc.php?rev=36047&r1=36046&r2=36047&view=diff
— trunk/registration/inc/class.registration_ui.inc.php (original)
+++ trunk/registration/inc/class.registration_ui.inc.php Tue Aug 9 19:01:20 2011
@@ -51,6 +51,24 @@
$registration = registration_bo::read($reg_id);
-
if($content && $registration['status'] == registration_bo::PENDING && $GLOBALS['egw_info']['user']['apps']['admin']) { -
if($content['cancel']) { -
// Cancel pending registration -
$addressbook = new addressbook_bo(); -
if(!$addressbook->delete($registration['contact_id'])) { -
$msg = lang('%1 needs permission to delete - address remains.', common::grab_owner_name($addressbook->user)); -
} -
registration_bo::delete($registration['reg_id']); -
$registration = registration_bo::read($reg_id); -
$msg .= lang('Canceled'); -
} -
if($content['register']) { -
// Push through pending registration -
$registration = registration_bo::confirm($registration['register_code']); -
$mgs .= lang('Registered'); -
} -
} -
switch ($registration['status']) { case registration_bo::PENDING: $registration['timestamp_label'] = lang('Expires');
@@ -66,6 +84,18 @@
);
$sel_options['status'] = registration_bo::$status_list;
-
$registration['no_actions'] = !$GLOBALS['egw_info']['user']['apps']['admin'] || $registration['status'] != registration_bo::PENDING; -
if(!$registration['no_actions']) { -
// Check ACL on target addressbooks -
$addressbook = new addressbook_bo(); -
if(!in_array($registration['owner'], array_keys($addressbook->get_addressbooks(EGW_ACL_DELETE)))) { -
$msg .= lang('You don\'t have delete permission, address will be left if you manually register or cancel.'); -
} -
} -
$registration['msg'] = $msg; -
$preserv['reg_id'] = $reg_id; $GLOBALS['egw_info']['flags']['app_header'] = lang('registration'); $template = new etemplate('registration.view');
Modified: trunk/registration/lang/egw_en.lang
URL: http://svn.stylite.de/viewvc/egroupware/trunk/registration/lang/egw_en.lang?rev=36047&r1=36046&r2=36047&view=diff
— trunk/registration/lang/egw_en.lang (original)
+++ trunk/registration/lang/egw_en.lang Tue Aug 9 19:01:20 2011
@@ -1,3 +1,7 @@
+%1 needs permission to delete - address remains. registration en %1 needs permission to delete - address remains.
+%s days registration en %s days
+%s hours registration en %s hours
+%s please calculate the result registration en %s please calculate the result
13: error occured registration en 13: error occured
please contact the site administrator. registration en
Please contact the site administrator.
[unknown first name] registration en [unknown first name]
@@ -10,6 +14,7 @@
activate account admin en Activate account
address registration en Address
address line 2 registration en Address line 2
+addressbook the contacts should be saved to before they are confirmed registration en Addressbook the contacts should be saved to before they are confirmed
addressbook the contacts should be saved to before they are confirmed. registration en Address book the contacts should be saved to before they are confirmed.
after you enter your email address, the user accounts associated with this email address will be mailed to that address. registration en After you enter your email address, the user accounts associated with this email address will be mailed to that address.
after you enter your username, instructions to change your password will be sent to you by e-mail to the address you gave when you registered. registration en After you enter your username, instructions to change your password will be sent to you by email to the address you gave when you registered.
@@ -18,7 +23,10 @@
an error occured. please remove your cookies and try again. registration en An error occurred. Please remove your cookies and try again.
an unknown error occured. please try registering again. registration en An unknown error occurred. Please try registering again.
anonymous password admin en Anonymous password
+anonymous user registration en Anonymous user
anonymous user needs access to registration application registration en Anonymous user needs access to registration application
+business phone registration en Business phone
+canceled registration en Canceled
change password for user registration en Change password for user
city registration en City
confirm registration en Confirm
@@ -33,7 +41,9 @@
email address registration en Email address
email address to display for support admin en Email address to display for support
email address to send notices from admin en Email address to send notices from
+enable registration registration en Enable registration
enable registration? admin en Enable registration?
+enter password registration en Enter password
enter your new password registration en Enter your new password
expires registration en Expires
fax registration en Fax
@@ -47,8 +57,13 @@
if you did not request this account, simply ignore this message. registration en If you did not request this account, simply ignore this message.
if you did not request this change, simply ignore this message. registration en If you did not request this change, simply ignore this message.
immediately admin en Immediately
+internet registration en Internet
+ip registration en IP
+login id registration en Login ID
+login page registration en Login page
lost login id login en Lost login ID
lost password login en Lost password
+lost password link registration en Lost password link
lost password link at login screen? admin en Lost password link at login screen?
lost user account retrieval registration en Lost user account retrieval
lost user id registration en Lost user ID
@@ -67,16 +82,18 @@
re-enter your password registration en Re-enter your password
register common en Register
register link at login screen? admin en Register link at login screen?
-registered common en Registered
+registered registration en Registered
+registered accounts expire registration en Registered accounts expire
registration common en Registration
registration complete registration en Registration complete
+registration expires after registration en Registration expires after
+registration fields registration en Registration fields
registration settings admin en Registration settings
remove registration en Remove
report all problems and abuse to registration en Report all problems and abuse to
required registration en Required
response registration en Response
send email admin en Send email
-sorry, no account exists for registration en Sorry, no account exists for
sorry, no account exists for %1 registration en Sorry, no account exists for %1
sorry, that username does not exist. registration en Sorry, that user name does not exist.
sorry, that username is already taken. registration en Sorry, that user name is already taken.
@@ -110,6 +127,8 @@
wrong - try again … registration en Wrong - try again …
wrong session registration en Wrong session
you can go back to the login page registration en You can go back to the login page
+you don’t have delete permission, address will be left if you manually register or cancel. registration en You don’t have delete permission, address will be left if you manually register or cancel.
+you don’t have delete permission, address will be left if you manually register or cancel. registration en You don’t have delete permission, address will be left if you manually register or cancel.
you have entered an invalid birthday registration en You have entered an invalid birthday
you have entered an invalid email address registration en You have entered an invalid email address
you must enter a password registration en You must enter a password
@@ -123,5 +142,4 @@
your login is not available. time is expired registration en Your login is not available. Time is expired
your password was changed. registration en Your password was changed.
your registration code is missing or incorrect. registration en Your registration code is missing or incorrect.
-zip code registration en zip code
zip/postal registration en ZIP/Postal
Modified: trunk/registration/setup/etemplates.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/registration/setup/etemplates.inc.php?rev=36047&r1=36046&r2=36047&view=diff
— trunk/registration/setup/etemplates.inc.php (original)
+++ trunk/registration/setup/etemplates.inc.php Tue Aug 9 19:01:20 2011
@@ -1,14 +1,14 @@