Commit 09c4924e authored by Côme Chilliet's avatar Côme Chilliet Committed by Benoit Mortier
Browse files

Using static:: instead of self::

Conflicts:
	fai/admin/systems/class_faiStartup.inc
	puppet/admin/systems/puppet/class_puppetNode.inc
	subcontracting/personal/subcontracting/class_subContracting.inc
	systems/admin/systems/class_serverService.inc
	systems/admin/systems/class_terminalStartup.inc
	systems/admin/systems/class_workstationGeneric.inc
parent e702ad9f
......@@ -39,7 +39,7 @@ class mailAliasDistribution extends simplePlugin
'ou' => get_ou('aliasRDN'),
)),
'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
......@@ -39,7 +39,7 @@ class mailAliasRedirection extends simplePlugin
'ou' => get_ou('aliasRDN'),
)),
'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
......@@ -31,7 +31,7 @@ class aliasConfig extends simplePlugin
"plCategory" => array("configuration"),
"plObjectType" => array("smallConfig"),
"plProvidedAcls" => parent::generatePlProvidedAcls(self::getAttributesInfo())
"plProvidedAcls" => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
......@@ -35,7 +35,7 @@ class application extends simplePlugin
'icon' => 'geticon.php?context=mimetypes&icon=application-x-executable&size=16',
)),
'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
......@@ -34,7 +34,7 @@ class webApplication extends simplePlugin
'icon' => 'geticon.php?context=categories&icon=applications-internet&size=16'
)),
'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
......@@ -34,7 +34,7 @@ class applicationRights extends simplePlugin
'fdApplicationAllowed' => 'webApplication',
),
'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
......@@ -29,7 +29,7 @@ class applicationsPluginConfig extends simplePlugin
'plDescription' => _('Applications plugin configuration'),
'plObjectType' => array('smallConfig'),
'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
......@@ -86,7 +86,7 @@ class argonautAction extends simplePlugin
'icon' => 'geticon.php?context=applications&icon=argonaut&size=16',
)),
'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
......@@ -50,7 +50,7 @@ class argonautEventTypes
*/
static public function get_event_info($action)
{
$events = self::get_event_types();
$events = static::get_event_types();
if (isset($events[$action])) {
$infos = $events[$action];
......
......@@ -38,7 +38,7 @@ class argonautImportFile extends simplePlugin
'icon' => 'geticon.php?context=applications&icon=argonaut&size=16',
)),
'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
......@@ -69,10 +69,10 @@ class ArgonautServiceNameAttribute extends CompositeAttribute
foreach ($services as $tab) {
$name = $tab['CLASS'];
if (in_array($name, self::$argonautService_blacklist)) {
if (in_array($name, static::$argonautService_blacklist)) {
continue;
}
$value = (isset(self::$argonautService_defaults[$name])?self::$argonautService_defaults[$name]:"");
$value = (isset(static::$argonautService_defaults[$name])?static::$argonautService_defaults[$name]:"");
$this->attributes[$name] = new StringAttribute ($name, "Service $name",
"service_$name", FALSE,
$value, $this->getAcl());
......@@ -119,7 +119,7 @@ class argonautClient extends simplePlugin
'plSelfModify' => FALSE,
'plObjectType' => array('workstation','server','ogroup-dynamic'),
'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
......@@ -31,7 +31,7 @@ class argonautDNSConfig extends simpleService
'plDescription' => _('Argonaut DNS settings').' ('._('Services').')',
'plIcon' => 'geticon.php?context=applications&icon=argonaut-dns&size=16',
'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
......@@ -31,7 +31,7 @@ class argonautFuseConfig extends simpleService
'plDescription' => _('Argonaut Fuse settings'),
'plIcon' => 'geticon.php?context=applications&icon=argonaut-fuse&size=16',
'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
......@@ -33,7 +33,7 @@ class argonautFuseFAIConfig extends simplePlugin
"plDescription" => _("Argonaut Fuse FAI module settings")." ("._("Services").")",
"plCategory" => array("server"),
"plObjectType" => array("fusemodule"),
"plProvidedAcls" => parent::generatePlProvidedAcls(self::getAttributesInfo())
"plProvidedAcls" => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
......@@ -33,7 +33,7 @@ class argonautFuseLTSPConfig extends simplePlugin
'plDescription' => _('Argonaut Fuse LTSP module settings').' ('._('Services').')',
'plCategory' => array('server'),
'plObjectType' => array('fusemodule'),
'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
......@@ -33,7 +33,7 @@ class argonautFuseOPSIConfig extends simplePlugin
"plDescription" => _("Argonaut Fuse OPSI module settings")." ("._("Services").")",
"plCategory" => array("server"),
"plObjectType" => array("fusemodule"),
"plProvidedAcls" => parent::generatePlProvidedAcls(self::getAttributesInfo())
"plProvidedAcls" => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
......@@ -30,7 +30,7 @@ class argonautMirrorConfig extends simpleService
'plDescription' => _('Argonaut Mirror settings'),
'plIcon' => 'geticon.php?context=applications&icon=argonaut-mirror&size=16',
'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
......@@ -32,7 +32,7 @@ class argonautServer extends simpleService
'plDescription' => _('Argonaut server').' ('._('Services').')',
'plIcon' => 'geticon.php?context=applications&icon=argonaut&size=16',
'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
......@@ -60,7 +60,7 @@ class auditEvent extends simplePlugin
'mainAttr' => FALSE,
)),
'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
......@@ -30,7 +30,7 @@ class auditConfig extends simplePlugin
'plCategory' => array('configuration'),
'plObjectType' => array('smallConfig'),
'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
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