index 1ca3e6eb4ee11d206363a618244e137f18cfccac..ce28ef5745810f7a3476926769e5a0bb312058d5 100644 (file)
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+/* Remove locks created by this plugin
+*/
if ($remove_lock){
if(session::is_set('userManagement')){
if ($remove_lock){
if(session::is_set('userManagement')){
- $userManagement = session::get('userManagement');
- $userManagement->remove_lock();
+ $macl = session::get('userManagement');
+ $macl->remove_lock();
}
}
-} else {
+}
+
+/* Remove this plugin from session
+*/
+if ( $cleanup ){
+ session::un_set('userManagement');
+}else{
+
/* Create usermanagement object on demand */
/* Create usermanagement object on demand */
- if (!session::is_set('userManagement') ||
- (isset($_GET['reset']) && $_GET['reset'] == 1)){
+ if (!session::is_set('userManagement')){
$userManagement= new userManagement ($config, $ui);
$userManagement= new userManagement ($config, $ui);
- $userManagement->set_acl_category("users");
session::set('userManagement',$userManagement);
}
$userManagement = session::get('userManagement');
session::set('userManagement',$userManagement);
}
$userManagement = session::get('userManagement');
- $userManagement->save_object();
- $output= $userManagement->execute();
-
- /* Page header*/
- if (get_object_info() != ""){
- $display= print_header(get_template_path($userManagement->plIcon),
- _("User administration"),
- "<img alt=\"\" class=\"center\" src=\"".
- get_template_path('images/lists/locked.png').
- "\"> ".LDAP::fix(get_object_info()));
- } else {
- $display= print_header(get_template_path($userManagement->plIcon),
- _("User administration"));
- }
-
- /* Generate dialog output */
- $display.= $output;
+ $display= $userManagement->execute();
/* Reset requested? */
if (isset($_GET['reset']) && $_GET['reset'] == 1){
/* Reset requested? */
if (isset($_GET['reset']) && $_GET['reset'] == 1){