Commit a566b308 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Fixes #5091 Cleaned a bit simpleManagement methods to remove obsolete function parameters

parent d0a3d36f
......@@ -658,14 +658,8 @@ class simpleManagement
* \param Array $target A list of object dns, which should be affected by this method.
*
* \param Array $all A combination of both 'action' and 'target'.
*
* \param String $altTabClass Empty string.
*
* \param String $altTabType Empty string.
*
* \param String $altAclCategory Empty string.
*/
function newEntry($action = "", $target = array(), $all = array(), $altTabClass = "", $altTabType = "", $altAclCategory = "")
function newEntry($action, array $target, array $all)
{
$type = strtoupper(preg_replace('/^new_/', '', $action));
......@@ -680,7 +674,7 @@ class simpleManagement
@DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, "Create new entry initiated!");
}
function newEntryTemplate($action = "", $target = array(), $all = array())
function newEntryTemplate($action, array $target, array $all)
{
if ($this->skipTemplates) {
return;
......@@ -690,7 +684,7 @@ class simpleManagement
$this->tabObject->setTemplateMode('template_cn');
}
function newEntryFromTemplate($action, $target = array())
function newEntryFromTemplate($action, array $target, array $all)
{
if ($this->skipTemplates) {
return;
......@@ -712,7 +706,7 @@ class simpleManagement
$this->dialogObject = new templateDialog($this, $type, $dn);
}
function applyTemplateToEntry($action, $target = array())
function applyTemplateToEntry($action, array $target, array $all)
{
global $ui;
if ($this->skipTemplates) {
......@@ -843,14 +837,8 @@ class simpleManagement
* \param Array $target A list of object dns, which should be affected by this method.
*
* \param Array $all A combination of both 'action' and 'target'.
*
* \param String $altTabClass Empty string.
*
* \param String $altTabType Empty string.
*
* \param String $altAclCategory Empty string.
*/
function editEntry($action = "", $target = array(), $all = array(), $altTabClass = "", $altTabType = "", $altAclCategory = "")
function editEntry($action, array $target, array $all)
{
global $ui;
// Do not create a new tabObject while there is already one opened,
......@@ -999,7 +987,7 @@ class simpleManagement
/*! \brief Queue selected objects to be removed.
* Checks ACLs, Locks and ask for confirmation.
*/
protected function removeEntryRequested($action = "", $target = array(), $all = array())
protected function removeEntryRequested($action, array $target, array $all)
{
global $ui;
$disallowed = array();
......@@ -1066,8 +1054,7 @@ class simpleManagement
}
}
function removeEntryConfirmed($action = '', $target = array(), $all = array(),
$altTabClass = '', $altTabType = '', $altAclCategory = '')
function removeEntryConfirmed($action, array $target, array $all)
{
global $ui;
@DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $target, "Entry removal confirmed!");
......@@ -1111,7 +1098,7 @@ class simpleManagement
*
* \param Array $all A combination of both 'action' and 'target'.
*/
function createSnapshotDialog($action = '', $target = array(), $all = array())
function createSnapshotDialog($action, array $target)
{
global $config, $ui;
@DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $target, 'Snaptshot creation initiated!');
......@@ -1142,7 +1129,7 @@ class simpleManagement
*
* \param Array $all' A combination of both 'action' and 'target'.
*/
function restoreSnapshotDialog($action = '', $target = array(), $all = array())
function restoreSnapshotDialog($action, array $target)
{
global $config, $ui;
// Set current restore base for snapshot handling.
......@@ -1188,8 +1175,7 @@ class simpleManagement
* @param Array 'target' A list of object dns, which should be affected by this method.
* @param Array 'all' A combination of both 'action' and 'target'.
*/
function copyPasteHandler($action = "", $target = array(), $all = array(),
$altTabClass = "", $altTabType = "", $altAclCategory = "", $altAclPlugin = "")
function copyPasteHandler($action = '', array $target = array(), array $all = array())
{
global $ui;
// Return without any actions while copy&paste handler is disabled.
......
......@@ -175,7 +175,7 @@ class aclManagement extends simpleManagement
/*!
* \brief This method intiates the object creation.
*/
function newEntry($action = '', $target = array(), $all = array(), $altTabClass = '', $altTabType = '', $altAclCategory = '')
function newEntry($action, array $target, array $all)
{
$this->dialogObject = new aclAssignmentCreationDialog($this);
}
......@@ -211,7 +211,7 @@ class aclManagement extends simpleManagement
return "<a href='?plug=".$_GET['plug']."&amp;PID=$pid&amp;act=listing_edit_$row' title='$dn'>$ou</a>";
}
protected function removeEntryRequested($action = "", $target = array(), $all = array())
protected function removeEntryRequested($action, array $target, array $all)
{
$result = parent::removeEntryRequested($action, $target, $all);
if ($result != "") {
......
......@@ -81,7 +81,7 @@ class departmentManagement extends simpleManagement
}
// Overridden remove request method - Avoid removal of the ldap base.
protected function removeEntryRequested($action = "", $target = array(), $all = array())
protected function removeEntryRequested($action, array $target, array $all)
{
global $config;
$target = array_remove_entries(array($config->current['BASE']), $target);
......@@ -100,9 +100,9 @@ class departmentManagement extends simpleManagement
}
// Finally remove departments and update departmnet browsers
function removeEntryConfirmed($action = "", $target = array(), $all = array(), $altTabClass = "", $altTabType = "", $altAclCategory = "")
function removeEntryConfirmed($action, array $target, array $all)
{
parent::removeEntryConfirmed($action, $target, $all, $altTabClass, $altTabType, $altAclCategory);
parent::removeEntryConfirmed($action, $target, $all);
$this->refreshDeps();
}
......
......@@ -121,7 +121,7 @@ class userManagement extends simpleManagement
/* !\brief Lock/unlock multiple users.
*/
function lockUsers($action, $target, $all)
function lockUsers($action, array $target, array $all)
{
if (!count($target)) {
return;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment