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

Adapted Dialog and simpleSelectManagement constructors to remove $unused

parent 3d5a998a
......@@ -23,11 +23,11 @@ class groupSelect extends simpleSelectManagement
protected $objectTypes = array('group');
protected $autoFilter = FALSE;
function __construct($unused, $ui)
function __construct($ui)
{
$this->filterXMLPath = get_template_path('group-filter.xml', TRUE, dirname(__FILE__));
parent::__construct($unused, $ui);
parent::__construct($ui);
}
}
?>
......@@ -27,10 +27,10 @@ class GenericDialog
protected $post_cancel = 'add_cancel';
protected $post_finish = 'add_finish';
function __construct($simplePlugin, &$attribute)
function __construct($simplePlugin, $attribute)
{
$this->attribute = $attribute;
$this->dialog = new $this->dialogClass(NULL, get_userinfo());
$this->dialog = new $this->dialogClass(get_userinfo());
}
function execute ()
......@@ -700,10 +700,10 @@ class GenericSimplePluginDialog extends GenericDialog
{
protected $initialDialogValue = NULL;
function __construct($simplePlugin, &$attribute, $value = array())
function __construct($simplePlugin, $attribute, $value = array())
{
$this->attribute = $attribute;
$this->dialog = new $this->dialogClass(NULL, 'new');
$this->dialog = new $this->dialogClass('new');
$base = $simplePlugin->dn;
if ($base == 'new') {
......
......@@ -29,13 +29,13 @@ class simpleSelectManagement extends simpleManagement
protected $departmentRootVisible = FALSE;
function __construct($unused, $ui)
function __construct($ui)
{
if ($this->listXMLPath === NULL) {
$this->listXMLPath = get_template_path('simple-select-list.xml', TRUE, dirname(__FILE__));
}
parent::__construct($unused, $ui);
parent::__construct(NULL, $ui);
}
/* Build the action menu, fill the object definition, etc, based on objectTypes info */
......
......@@ -36,14 +36,14 @@ class simpleService extends simplePlugin {
/*! \brief constructor
*
* \param string $dn The dn of this instance
* \param Object $object An object to copy values from
* \param Object $parent The serverService instance
* \param array $attributesInfo An attributesInfo array, if NULL, getAttributesInfo will be used.
*
*/
function __construct ($dn = NULL, $object = NULL, $parent = NULL, $attributesInfo = NULL)
function __construct ($dn = NULL, $parent = NULL, $attributesInfo = NULL)
{
/* $object is the instance of serverService in this case, we set it as parent */
parent::__construct($dn, $object, $object, FALSE, $attributesInfo);
/* $parent is the instance of serverService in this case, we set it as parent */
parent::__construct($dn, $parent, $parent, FALSE, $attributesInfo);
$plInfos = pluglist::pluginInfos(get_class($this));
$this->DisplayName = $plInfos['plShortName'];
}
......
......@@ -128,7 +128,7 @@ class ACLsAssignmentDialog extends GenericDialog
protected $post_finish = 'add_acl_finish';
protected $dialogClass = 'aclAssignmentDialogWindow';
function __construct($simplePlugin, &$attribute, $acl = NULL)
function __construct($simplePlugin, $attribute, $acl = NULL)
{
$isContainer = FALSE;
if (isset($simplePlugin->attrs['objectClass'])) {
......
......@@ -28,7 +28,7 @@ class ACLEditionDialog extends GenericDialog
protected $aclContents = array();
protected $savedAclContents = array();
function __construct($simplePlugin, &$attribute, $acl = NULL)
function __construct($simplePlugin, $attribute, $acl = NULL)
{
$this->attribute = $attribute;
$this->initialAclValue = $acl;
......
Markdown is supported
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