From cc3acf76ce74c0e73614999a95cf79f028a88dd4 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 26 May 2010 08:40:21 +0000 Subject: [PATCH] Updated plugin deactivation -Deactivate Icon Menu entries too. -Do not allow to instantiate tabs while base plugin is not available git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18746 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/include/class_management.inc | 20 +- gosa-core/include/class_pluglist.inc | 14 +- .../plugins/personal/generic/class_user.inc | 2 +- gosa-core/plugins/personal/myaccount/main.inc | 215 ++++++++++-------- 4 files changed, 142 insertions(+), 109 deletions(-) diff --git a/gosa-core/include/class_management.inc b/gosa-core/include/class_management.inc index 837688dc5..77f07307f 100644 --- a/gosa-core/include/class_management.inc +++ b/gosa-core/include/class_management.inc @@ -625,11 +625,21 @@ class management if(empty($tabClass) || empty($tabType)){ // No tab type defined }else{ - if (isset($this->config->data['TABS'][$tabType])) { - $this->tabObject= new $tabClass($this->config,$this->config->data['TABS'][$tabType], $this->dn, $aclCategory); - $this->tabObject->set_acl_base($this->headpage->getBase()); - $this->tabObject->parent = &$this; - @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,$this->dn,"Create new entry initiated!"); + + if (isset($this->config->data['TABS'][$tabType])) { + + // Check if the base plugin is available - it is mostly responsible for object creation and removal. + $first = $this->config->data['TABS'][$tabType][0]; + if(!class_available($first['CLASS'])){ + msg_dialog::display(_("Internal error"), + sprintf(_("Cannot instantiate tabbed-plugin, the base plugin (%s) is not available!"), $first['CLASS']), + ERROR_DIALOG); + }else{ + $this->tabObject= new $tabClass($this->config,$this->config->data['TABS'][$tabType], $this->dn, $aclCategory); + $this->tabObject->set_acl_base($this->headpage->getBase()); + $this->tabObject->parent = &$this; + @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,$this->dn,"Create new entry initiated!"); + } } else { msg_dialog::display(_("Error"), sprintf(_("No tab definition for %s found in configuration file: cannot create plugin instance!"), bold($tabType)), ERROR_DIALOG); } diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc index 3bf9caa74..83fd3c6ef 100644 --- a/gosa-core/include/class_pluglist.inc +++ b/gosa-core/include/class_pluglist.inc @@ -186,7 +186,7 @@ class pluglist } } - $disabledPlugins = $this->config->configRegistry->getDisabledPlugins(); + $disabledPlugins = $this->config->configRegistry->getDisabledPlugins(); $cfg= $this->config->data['MENU']; $menu = "\n
"; @@ -258,9 +258,10 @@ class pluglist function show_iconmenu() { $add_hr =FALSE; - $this->iconmenu = ""; if ($this->iconmenu == ""){ + $disabledPlugins = $this->config->configRegistry->getDisabledPlugins(); + $cfg= $this->config->data['MENU']; foreach ($cfg as $headline => $plug){ $col= 0; @@ -277,6 +278,9 @@ class pluglist // Get Plugin info list($index, $title, $desc, $icon) = $this->getPlugData($info['CLASS']); + // The Plugin has been deactivated for some reason, perhabs a missing ldap schema. + if(isset($disabledPlugins[$info['CLASS']])) continue; + // Add a seperating row if (($col % 4) == 0){ $this->iconmenu .= "\n
"; @@ -307,6 +311,8 @@ class pluglist { if(empty($this->pathMenu)){ + $disabledPlugins = $this->config->configRegistry->getDisabledPlugins(); + // Now load the path menu and try to register the plugins in the pluglist // if this fails for some reason, then remove the plugin from the menu. if(isset($this->config->data['PATHMENU'])){ @@ -331,6 +337,10 @@ class pluglist $rcfg = array_reverse($cfg); foreach($rcfg as $id => $plug){ list($index, $title, $desc, $icon) = $this->getPlugData($plug['CLASS']); + + // The Plugin has been deactivated for some reason, perhabs a missing ldap schema. + if(isset($disabledPlugins[$plug['CLASS']])) continue; + $this->pathMenu.= "\n
  • {$title}
    • "; } } diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc index 4b3ff88a0..12effd8a2 100644 --- a/gosa-core/plugins/personal/generic/class_user.inc +++ b/gosa-core/plugins/personal/generic/class_user.inc @@ -1692,7 +1692,7 @@ class user extends plugin 'gosaAccount' => '>=2.7', 'gosaUserTemplate' => '>=2.7' ), - 'onFailureDisablePlugin' => array(get_class(),'userManagement') + 'onFailureDisablePlugin' => array(get_class(),'userManagement', 'user') ), "plProperties" => array( diff --git a/gosa-core/plugins/personal/myaccount/main.inc b/gosa-core/plugins/personal/myaccount/main.inc index 7c1c86bb7..a69c6ddb9 100644 --- a/gosa-core/plugins/personal/myaccount/main.inc +++ b/gosa-core/plugins/personal/myaccount/main.inc @@ -27,132 +27,145 @@ $lock_msg=""; if ($remove_lock || isset($_POST['edit_cancel']) || isset($_POST['password_cancel'])){ del_lock($ui->dn); if(session::is_set('MyAccountTabs') && session::is_set('edit')){ - session::un_set('MyAccountTabs'); + session::un_set('MyAccountTabs'); } } /* Reset requested? */ if (isset($_POST['edit_cancel']) || $cleanup){ - session::un_set ('edit'); - session::un_set ('MyAccountTabs'); + session::un_set ('edit'); + session::un_set ('MyAccountTabs'); } /* Remove this plugin from session */ if (! $cleanup ){ - /* Create MyAccountTabs object on demand */ - if (!session::is_set('MyAccountTabs') || (isset($_GET['reset']) && $_GET['reset'] == 1)){ - $MyAccountTabs= new MyAccountTabs($config,$config->data['TABS']['MYACCOUNTTABS'], $ui->dn, "users", true, true); - $MyAccountTabs->setReadOnly(TRUE); - session::set('MyAccountTabs',$MyAccountTabs); - } - $MyAccountTabs = session::get('MyAccountTabs'); - - /* Enter edit mode? */ - if ((isset($_POST['edit'])) && (!session::is_set('edit'))){ - - /* Check locking */ - if (($username= get_lock($ui->dn)) != ""){ - session::set('back_plugin',$plug); - session::set('LOCK_VARS_TO_USE',array("/^edit$/","/^plug$/")); - $lock_msg = gen_locked_message ($username, array($ui->dn)); - - }else{ - - /* Lock the current entry */ - add_lock ($ui->dn, $ui->dn); - session::set('edit',TRUE); - $MyAccountTabs->setReadOnly(FALSE); - } - } + /* Create MyAccountTabs object on demand */ + if (!session::is_set('MyAccountTabs') || (isset($_GET['reset']) && $_GET['reset'] == 1)){ - $info= ""; - if (isset($_POST['edit_finish'])){ - $message= $MyAccountTabs->check (); - if (count ($message) == 0){ - $MyAccountTabs->save (); - del_lock ($ui->dn); - session::un_set ('edit'); - $MyAccountTabs->setReadOnly(TRUE); - if(isset($MyAccountTabs->by_object['user']) && $MyAccountTabs->by_object['user']->password_change_needed()){ - $MyAccountTabs->password_change_needed = TRUE; - }else{ - session::un_set ('MyAccountTabs'); - } - } else { - msg_dialog::displayChecks($message); + // Check if the base plugin is available - it is mostly responsible for object creation and removal. + $first = $config->data['TABS']['MYACCOUNTTABS'][0]; + if(!class_available($first['CLASS'])){ + msg_dialog::display(_("Internal error"), + sprintf(_("Cannot instantiate tabbed-plugin, the base plugin (%s) is not available!"), $first['CLASS']), + ERROR_DIALOG); + }else{ + + $MyAccountTabs= new MyAccountTabs($config,$config->data['TABS']['MYACCOUNTTABS'], $ui->dn, "users", true, true); + $MyAccountTabs->setReadOnly(TRUE); + session::set('MyAccountTabs',$MyAccountTabs); + } } - } + if(session::is_set('MyAccountTabs')){ + $MyAccountTabs = session::get('MyAccountTabs'); - if (isset($_POST['password_finish']) && $MyAccountTabs->password_change_needed){ - $user = $MyAccountTabs->by_object['user']; + /* Enter edit mode? */ + if ((isset($_POST['edit'])) && (!session::is_set('edit'))){ - if ($user->acl_is_writeable("userPassword") || $user->acl_is_createable()){ - $message= array(); - if ($_POST['new_password'] != $_POST['repeated_password']){ - $message[]= _("The passwords you've entered as 'New password' and 'Repeated new password' do not match."); - } else { - if ($_POST['new_password'] == ""){ - $message[]= msgPool::required(_("New password")); + /* Check locking */ + if (($username= get_lock($ui->dn)) != ""){ + session::set('back_plugin',$plug); + session::set('LOCK_VARS_TO_USE',array("/^edit$/","/^plug$/")); + $lock_msg = gen_locked_message ($username, array($ui->dn)); + + }else{ + + /* Lock the current entry */ + add_lock ($ui->dn, $ui->dn); + session::set('edit',TRUE); + $MyAccountTabs->setReadOnly(FALSE); + } } - } - - if (count($message) != 0){ - msg_dialog::displayChecks($message); - $display.= $smarty->fetch(get_template_path('password.tpl', TRUE)); - return ($display); - } - change_password ($user->dn, $_POST['new_password'], 0, $user->pw_storage); - $MyAccountTabs= new MyAccountTabs($config,$config->data['TABS']['MYACCOUNTTABS'], $ui->dn, "users", true, true); - $MyAccountTabs->setReadOnly(TRUE); - session::set('MyAccountTabs',$MyAccountTabs); - new log("modify","users/password","",array(),"Password has been changed"); - } else { - msg_dialog::display(_("Error"), _("You have no permission to set your password!"), ERROR_DIALOG); - } - del_lock ($ui->dn); - session::un_set ('user'); - } + $info= ""; + if (isset($_POST['edit_finish'])){ + $message= $MyAccountTabs->check (); + if (count ($message) == 0){ + $MyAccountTabs->save (); + del_lock ($ui->dn); + session::un_set ('edit'); + $MyAccountTabs->setReadOnly(TRUE); + if(isset($MyAccountTabs->by_object['user']) && $MyAccountTabs->by_object['user']->password_change_needed()){ + $MyAccountTabs->password_change_needed = TRUE; + }else{ + session::un_set ('MyAccountTabs'); + } + } else { + msg_dialog::displayChecks($message); + } + } - if($MyAccountTabs->password_change_needed){ - $display.= $smarty->fetch(get_template_path('password.tpl', TRUE)); - } - /* Execute formular */ - if(!$MyAccountTabs->password_change_needed){ - pathNavigator::registerPlugin(_("My account")); - if($lock_msg){ - $display = $lock_msg; - }else{ - $display.= $MyAccountTabs->execute (); - } - } + if (isset($_POST['password_finish']) && $MyAccountTabs->password_change_needed){ + $user = $MyAccountTabs->by_object['user']; + + if ($user->acl_is_writeable("userPassword") || $user->acl_is_createable()){ + $message= array(); + if ($_POST['new_password'] != $_POST['repeated_password']){ + $message[]= _("The passwords you've entered as 'New password' and 'Repeated new password' do not match."); + } else { + if ($_POST['new_password'] == ""){ + $message[]= msgPool::required(_("New password")); + } + } + + if (count($message) != 0){ + msg_dialog::displayChecks($message); + $display.= $smarty->fetch(get_template_path('password.tpl', TRUE)); + return ($display); + } + change_password ($user->dn, $_POST['new_password'], 0, $user->pw_storage); + $MyAccountTabs= new MyAccountTabs($config,$config->data['TABS']['MYACCOUNTTABS'], $ui->dn, "users", true, true); + $MyAccountTabs->setReadOnly(TRUE); + session::set('MyAccountTabs',$MyAccountTabs); + new log("modify","users/password","",array(),"Password has been changed"); + } else { + msg_dialog::display(_("Error"), _("You have no permission to set your password!"), ERROR_DIALOG); + } + + del_lock ($ui->dn); + session::un_set ('user'); + } - /* Store changes in session */ - if (session::is_set('edit')){ - session::set('MyAccountTabs',$MyAccountTabs); - } + if($MyAccountTabs->password_change_needed){ + $display.= $smarty->fetch(get_template_path('password.tpl', TRUE)); + } - /* Show page footer depending on the mode */ - if (!$MyAccountTabs->is_modal_dialog() && empty($lock_msg) && !$MyAccountTabs->password_change_needed){ + /* Execute formular */ + if(!$MyAccountTabs->password_change_needed){ + pathNavigator::registerPlugin(_("My account")); + if($lock_msg){ + $display = $lock_msg; + }else{ + $display.= $MyAccountTabs->execute (); + } + } - $display.= "
    "; + /* Store changes in session */ + if (session::is_set('edit')){ + session::set('MyAccountTabs',$MyAccountTabs); + } - /* Are we in edit mode? */ - if (session::is_set('edit')){ - $display.= "\n"; - $display.= "\n"; - } else { - if(preg_match("/r/",$ui->get_category_permissions($ui->dn,"users"))){ - $display.= "\n"; - } - $display.= "\n"; + /* Show page footer depending on the mode */ + if (!$MyAccountTabs->is_modal_dialog() && empty($lock_msg) && !$MyAccountTabs->password_change_needed){ + + $display.= "
    "; + + /* Are we in edit mode? */ + if (session::is_set('edit')){ + $display.= "\n"; + $display.= "\n"; + } else { + if(preg_match("/r/",$ui->get_category_permissions($ui->dn,"users"))){ + $display.= "\n"; + } + $display.= "\n"; + } + $display.= "
    \n"; + } } - $display.= "
    \n"; - } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: -- 2.30.2