diff --git a/html/index.php b/html/index.php
index cc355254b5be562c4ee736e25634f72d4eda509a..d6fa366675697e6237b1714171135072ba5f18cb 100644
--- a/html/index.php
+++ b/html/index.php
@@ -230,8 +230,8 @@ class Index {
static function init()
{
- self::$username = NULL;
- self::$password = NULL;
+ static::$username = NULL;
+ static::$password = NULL;
}
/* Runs schemaCheck if activated in configuration */
@@ -277,11 +277,11 @@ class Index {
static function validateUserInput()
{
global $message, $smarty;
- self::$username = trim(self::$username);
- if (!preg_match('/^[@A-Za-z0-9_.-]+$/', self::$username)) {
+ static::$username = trim(static::$username);
+ if (!preg_match('/^[@A-Za-z0-9_.-]+$/', static::$username)) {
$message = _('Please specify a valid username!');
return FALSE;
- } elseif (mb_strlen(self::$password, 'UTF-8') == 0) {
+ } elseif (mb_strlen(static::$password, 'UTF-8') == 0) {
$message = _('Please specify your password!');
$smarty->assign ('focusfield', 'password');
return FALSE;
@@ -294,12 +294,12 @@ class Index {
{
global $ui, $config, $message, $smarty;
/* Login as user, initialize user ACL's */
- $ui = ldap_login_user(self::$username, self::$password);
+ $ui = ldap_login_user(static::$username, static::$password);
if ($ui === NULL) {
if (isset($_SERVER['REMOTE_ADDR'])) {
- logging::log('security', 'login', '', array(), 'Authentication failed for user "'.self::$username.'" [from '.$_SERVER['REMOTE_ADDR'].']');
+ logging::log('security', 'login', '', array(), 'Authentication failed for user "'.static::$username.'" [from '.$_SERVER['REMOTE_ADDR'].']');
} else {
- logging::log('security', 'login', '', array(), 'Authentication failed for user "'.self::$username.'"');
+ logging::log('security', 'login', '', array(), 'Authentication failed for user "'.static::$username.'"');
}
$message = _('Please check the username/password combination.');
$smarty->assign ('focusfield', 'password');
@@ -330,7 +330,7 @@ class Index {
$expired = $ui->expired_status();
if ($expired == POSIX_ACCOUNT_EXPIRED) {
- logging::log('security', 'login', '', array(), 'Account for user "'.self::$username.'" has expired');
+ logging::log('security', 'login', '', array(), 'Account for user "'.static::$username.'" has expired');
$message = _('Account locked. Please contact your system administrator!');
$smarty->assign ('focusfield', 'username');
return FALSE;
@@ -344,7 +344,7 @@ class Index {
{
global $config;
/* Not account expired or password forced change go to main page */
- logging::log('security', 'login', '', array(), 'User "'.self::$username.'" logged in successfully.');
+ logging::log('security', 'login', '', array(), 'User "'.static::$username.'" logged in successfully.');
session::global_set('connected', 1);
// check that newly installed plugins have their configuration in the LDAP
$config->checkLdapConfig();
@@ -366,7 +366,7 @@ class Index {
static function runSteps($steps)
{
foreach($steps as $step) {
- $status = self::$step();
+ $status = static::$step();
if (is_string($status)) {
msg_dialog::display(_('LDAP error'), $status, LDAP_ERROR);
return FALSE;
@@ -382,15 +382,15 @@ class Index {
{
global $config, $message;
- self::init();
+ static::init();
/* Reset error messages */
$message = '';
- self::$username = $_POST['username'];
- self::$password = $_POST['password'];
+ static::$username = $_POST['username'];
+ static::$password = $_POST['password'];
- $success = self::runSteps(array(
+ $success = static::runSteps(array(
'validateUserInput',
'ldapLoginUser',
'loginAndCheckExpired',
@@ -400,7 +400,7 @@ class Index {
if ($success) {
/* Everything went well, redirect to main.php */
- self::redirect();
+ static::redirect();
}
}
@@ -409,16 +409,16 @@ class Index {
{
global $config, $message, $ui;
- self::init();
+ static::init();
if (!isset($_SERVER['PHP_AUTH_USER'])) {
- self::authenticateHeader();
+ static::authenticateHeader();
}
- self::$username = $_SERVER['PHP_AUTH_USER'];
- self::$password = $_SERVER['PHP_AUTH_PW'];
+ static::$username = $_SERVER['PHP_AUTH_USER'];
+ static::$password = $_SERVER['PHP_AUTH_PW'];
- $success = self::runSteps(array(
+ $success = static::runSteps(array(
'validateUserInput',
'ldapLoginUser',
'loginAndCheckExpired',
@@ -428,9 +428,9 @@ class Index {
if ($success) {
/* Everything went well, redirect to main.php */
- self::redirect();
+ static::redirect();
} else {
- self::authenticateHeader($message);
+ static::authenticateHeader($message);
}
}
@@ -439,16 +439,16 @@ class Index {
{
global $config, $message, $ui;
- self::init();
+ static::init();
/* Reset error messages */
$message = '';
$header = $config->get_cfg_value('httpHeaderAuthHeaderName', 'AUTH_USER');
- self::$username = $_SERVER['HTTP_'.$header];
+ static::$username = $_SERVER['HTTP_'.$header];
- if (!self::$username) {
+ if (!static::$username) {
msg_dialog::display(
_('Error'),
sprintf(
@@ -465,7 +465,7 @@ class Index {
$verify_attr = explode(',', $config->get_cfg_value('loginAttribute', 'uid'));
$filter = '';
foreach ($verify_attr as $attr) {
- $filter .= '('.$attr.'='.ldap_escape_f(self::$username).')';
+ $filter .= '('.$attr.'='.ldap_escape_f(static::$username).')';
}
$ldap->search('(&(|'.$filter.')(objectClass=inetOrgPerson))');
$attrs = $ldap->fetch();
@@ -474,7 +474,7 @@ class Index {
_('Error'),
sprintf(
_('Header user "%s" could not be found in the LDAP'),
- self::$username
+ static::$username
),
FATAL_ERROR_DIALOG
);
@@ -484,7 +484,7 @@ class Index {
_('Error'),
sprintf(
_('Header user "%s" match several users in the LDAP'),
- self::$username
+ static::$username
),
FATAL_ERROR_DIALOG
);
@@ -493,7 +493,7 @@ class Index {
$ui = new userinfo($config, $attrs['dn']);
$ui->loadACL();
- $success = self::runSteps(array(
+ $success = static::runSteps(array(
'loginAndCheckExpired',
'runSchemaCheck',
'checkForLockingBranch',
@@ -501,7 +501,7 @@ class Index {
if ($success) {
/* Everything went well, redirect to main.php */
- self::redirect();
+ static::redirect();
}
}
@@ -510,7 +510,7 @@ class Index {
{
global $config, $message, $ui;
- self::init();
+ static::init();
/* Reset error messages */
$message = '';
@@ -531,13 +531,13 @@ class Index {
// force CAS authentication
phpCAS::forceAuthentication();
- self::$username = phpCAS::getUser();
+ static::$username = phpCAS::getUser();
$ldap = $config->get_ldap_link();
$ldap->cd($config->current['BASE']);
$verify_attr = explode(',', $config->get_cfg_value('loginAttribute', 'uid'));
$filter = '';
foreach ($verify_attr as $attr) {
- $filter .= '('.$attr.'='.ldap_escape_f(self::$username).')';
+ $filter .= '('.$attr.'='.ldap_escape_f(static::$username).')';
}
$ldap->search('(&(|'.$filter.')(objectClass=inetOrgPerson))');
$attrs = $ldap->fetch();
@@ -546,7 +546,7 @@ class Index {
_('Error'),
sprintf(
_('CAS user "%s" could not be found in the LDAP'),
- self::$username
+ static::$username
),
FATAL_ERROR_DIALOG
);
@@ -556,7 +556,7 @@ class Index {
_('Error'),
sprintf(
_('CAS user "%s" match several users in the LDAP'),
- self::$username
+ static::$username
),
FATAL_ERROR_DIALOG
);
@@ -565,7 +565,7 @@ class Index {
$ui = new userinfo($config, $attrs['dn']);
$ui->loadACL();
- $success = self::runSteps(array(
+ $success = static::runSteps(array(
'loginAndCheckExpired',
'runSchemaCheck',
'checkForLockingBranch',
@@ -573,7 +573,7 @@ class Index {
if ($success) {
/* Everything went well, redirect to main.php */
- self::redirect();
+ static::redirect();
}
}
}
diff --git a/include/class_IconTheme.inc b/include/class_IconTheme.inc
index b7874729d6804f379f1692fef8251c0545a82ebd..1d10ed5de0a223ecf339edc0c120f7f69c969209 100644
--- a/include/class_IconTheme.inc
+++ b/include/class_IconTheme.inc
@@ -111,8 +111,8 @@ class IconTheme
if ($filename != NULL) {
return $filename;
}
- if (isset(self::$fallbacks[$context.'/'.$icon])) {
- foreach (self::$fallbacks[$context.'/'.$icon] as $fallback) {
+ if (isset(static::$fallbacks[$context.'/'.$icon])) {
+ foreach (static::$fallbacks[$context.'/'.$icon] as $fallback) {
$filename = $this->LookupIcon($fallback[0], $fallback[1], $size);
if ($filename != NULL) {
return $filename;
@@ -123,7 +123,7 @@ class IconTheme
if ($this->parent !== NULL) {
$parent = $this->findTheme($this->parent);
if ($parent === NULL) {
- $parent = $this->findTheme(self::$default_theme);
+ $parent = $this->findTheme(static::$default_theme);
}
return $parent->FindIconHelper($context, $icon, $size);
}
@@ -138,7 +138,7 @@ class IconTheme
}
foreach ($this->subdirs[$context] as $path => &$subdir) {
if ($subdir->MatchesSize($size)) {
- foreach (self::$extensions as $extension) {
+ foreach (static::$extensions as $extension) {
$filename = $this->path.'/'.$path.'/'.$iconname.'.'.$extension;
if (file_exists($filename)) {
return $filename;
@@ -147,11 +147,11 @@ class IconTheme
}
}
unset($subdir);
- if (self::$find_closest) {
+ if (static::$find_closest) {
$minimal_size = PHP_INT_MAX;
foreach ($this->subdirs[$context] as $path => &$subdir) {
if (($sizedistance = $subdir->SizeDistance($size)) < $minimal_size) {
- foreach (self::$extensions as $extension) {
+ foreach (static::$extensions as $extension) {
$filename = $this->path.'/'.$path.'/'.$iconname.'.'.$extension;
if (file_exists($filename)) {
$closest_filename = $filename;
@@ -181,32 +181,32 @@ class IconTheme
while (($file = readdir($dir)) !== FALSE) {
if (file_exists("$path/$file/index.theme") && !preg_match("/^\./", $file)) {
try {
- if ($file == self::$default_theme) {
+ if ($file == static::$default_theme) {
$themes[$file] = new IconTheme("$path/$file", NULL);
} else {
- $themes[$file] = new IconTheme("$path/$file", self::$default_theme);
+ $themes[$file] = new IconTheme("$path/$file", static::$default_theme);
}
} catch (Exception $e) {
}
}
}
}
- $_SESSION[self::$session_var] = $themes;
+ $_SESSION[static::$session_var] = $themes;
}
static public function findThemeIcon($theme, $context, $icon, $size)
{
- if (!isset($_SESSION[self::$session_var])) {
+ if (!isset($_SESSION[static::$session_var])) {
die('Error: no theme found in session');
}
- if (isset($_SESSION[self::$session_var][$theme])) {
- return $_SESSION[self::$session_var][$theme]->FindIcon($context, $icon, $size);
+ if (isset($_SESSION[static::$session_var][$theme])) {
+ return $_SESSION[static::$session_var][$theme]->FindIcon($context, $icon, $size);
}
- return $_SESSION[self::$session_var][self::$default_theme]->FindIcon($context, $icon, $size);
+ return $_SESSION[static::$session_var][static::$default_theme]->FindIcon($context, $icon, $size);
}
public function findTheme($theme)
{
- if (isset($_SESSION[self::$session_var][$theme])) {
- $ret = &$_SESSION[self::$session_var][$theme];
+ if (isset($_SESSION[static::$session_var][$theme])) {
+ $ret = &$_SESSION[static::$session_var][$theme];
return $ret;
}
return NULL;
diff --git a/include/class_acl.inc b/include/class_acl.inc
index 4cda415ceecc6ad303930cfc8c994d24b1b2c5df..4a35e8c84e335124ec94718795d0997a06709a6f 100644
--- a/include/class_acl.inc
+++ b/include/class_acl.inc
@@ -84,7 +84,7 @@ class acl
$result = array();
foreach ($role as $aclTemplate) {
$list = explode(':', $aclTemplate, 2);
- $result[$list[0]] = self::extractACL($list[1]);
+ $result[$list[0]] = static::extractACL($list[1]);
}
ksort($result);
return $result;
diff --git a/include/class_objects.inc b/include/class_objects.inc
index 666f407d5ba1b4ddd1a1871237ee897b038e088d..77691b40fdb8f1bfb01d62b418f4de983c5ea7db 100644
--- a/include/class_objects.inc
+++ b/include/class_objects.inc
@@ -42,7 +42,7 @@ class objects
static function ls ($type, $attrs = NULL, $ou = NULL, $filter = '')
{
if ($attrs === NULL) {
- $infos = self::infos($type);
+ $infos = static::infos($type);
$attrs = $infos['mainAttr'];
}
@@ -52,7 +52,7 @@ class objects
$search_attrs = array($attrs);
}
try {
- $ldap = self::search($type, $search_attrs, $ou, $filter);
+ $ldap = static::search($type, $search_attrs, $ou, $filter);
} catch (NonExistingBranchException $e) {
return array();
}
@@ -94,7 +94,7 @@ class objects
static function count ($type, $ou = NULL, $filter = '')
{
try {
- $ldap = self::search($type, array('dn'), $ou, $filter);
+ $ldap = static::search($type, array('dn'), $ou, $filter);
} catch (EmptyFilterException $e) {
return 0;
} catch (NonExistingBranchException $e) {
@@ -110,7 +110,7 @@ class objects
if ($ou === NULL) {
$ou = $config->current['BASE'];
}
- $infos = self::infos($type);
+ $infos = static::infos($type);
if ($infos['filter'] == '') {
throw new EmptyFilterException();
@@ -148,7 +148,7 @@ class objects
{
global $config;
- $infos = self::infos($type);
+ $infos = static::infos($type);
$tabClass = $infos['tabClass'];
$tabObject = new $tabClass($type, $dn);
@@ -162,7 +162,7 @@ class objects
{
global $config;
- $infos = self::infos($type);
+ $infos = static::infos($type);
if (!isset($infos['management'])) {
throw new Exception('Asked for link for type "'.$type.'" but it does not have a management class');
}
@@ -199,7 +199,7 @@ class objects
static function create ($type)
{
- return self::open('new', $type);
+ return static::open('new', $type);
}
static function infos ($type)
@@ -216,7 +216,7 @@ class objects
static function isOfType ($attrs, $type)
{
//TODO : cache ldapFilter objects?
- $infos = self::infos($type);
+ $infos = static::infos($type);
$filter = ldapFilter::parse($infos['filter']);
return $filter($attrs);
}
@@ -233,7 +233,7 @@ class objects
{
global $config, $ui;
- $infos = self::infos($type);
+ $infos = static::infos($type);
$templates = array();
$ldap = $config->get_ldap_link();
diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index a7285af6a88c6d8f02faa217e26826886bb6635e..beb1449ca3f18594d0259594dcc16c1740d324aa 100644
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -255,7 +255,7 @@ class plugin
if ($this->mainTab) {
$this->_template_cn = $template_attrs['cn'][0];
}
- $this->attrs = self::tpl_template_to_attrs($template_attrs);
+ $this->attrs = static::tpl_template_to_attrs($template_attrs);
}
protected function templateSaveAttrs()
@@ -591,9 +591,9 @@ class plugin
$ldap = $config->get_ldap_link();
$ldap->cat($dn);
$attrs = $ldap->fetch();
- $attrs = self::tpl_template_to_attrs($attrs);
- $depends = self::tpl_attrs_depends($attrs);
- $attrs = self::tpl_sort_attrs($attrs, $depends);
+ $attrs = static::tpl_template_to_attrs($attrs);
+ $depends = static::tpl_attrs_depends($attrs);
+ $attrs = static::tpl_sort_attrs($attrs, $depends);
return array($attrs, $depends);
}
@@ -767,7 +767,7 @@ class plugin
}
$result_tmp = array();
foreach ($result as $r) {
- $result_tmp = array_merge($result_tmp, self::tpl_apply_modifier($modifier, $args, $r));
+ $result_tmp = array_merge($result_tmp, static::tpl_apply_modifier($modifier, $args, $r));
}
$result = $result_tmp;
}
@@ -845,7 +845,7 @@ class plugin
/* Flattens dependencies */
$flatdepends = array();
foreach ($depends as $key => $value) {
- self::tpl_depends_of($flatdepends, $depends, $key);
+ static::tpl_depends_of($flatdepends, $depends, $key);
}
return $flatdepends;
}
@@ -906,7 +906,7 @@ class plugin
if (!is_numeric($key)) {
continue;
}
- $string = self::tpl_parse_string($string, $attrs);
+ $string = static::tpl_parse_string($string, $attrs);
}
unset($string);
}
@@ -923,7 +923,7 @@ class plugin
{
$offset = 0;
while (preg_match('/%([^%]+)%/', $string, $m, PREG_OFFSET_CAPTURE, $offset)) {
- $replace = self::tpl_parse_mask($m[1][0], $attrs);
+ $replace = static::tpl_parse_mask($m[1][0], $attrs);
$replace = $replace[0];
if ($escapeMethod !== NULL) {
$replace = $escapeMethod($replace);
@@ -1493,7 +1493,7 @@ class plugin
}
}
- $command = self::tpl_parse_string($command, $addAttrs, 'escapeshellarg');
+ $command = static::tpl_parse_string($command, $addAttrs, 'escapeshellarg');
// If there are still some %.. in our command, try to fill these with some other class vars (FIXME: useless)
if (preg_match("/%/", $command)) {
@@ -1514,7 +1514,7 @@ class plugin
}
$addAttrs[$name] = $value;
}
- $command = self::tpl_parse_string($command, $addAttrs, 'escapeshellarg');
+ $command = static::tpl_parse_string($command, $addAttrs, 'escapeshellarg');
}
@DEBUG(DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execute");
diff --git a/include/class_timezone.inc b/include/class_timezone.inc
index d65fd68979823cf82792382f91626d41575b5a42..5a63aa7fd0852c53390d73c1444fd6e4ffc5d1da 100644
--- a/include/class_timezone.inc
+++ b/include/class_timezone.inc
@@ -73,7 +73,7 @@ class timezone
}
/* Is there a correct timezone set in the fusiondirectory configuration */
- if (self::setDefaultTimezoneFromConfig()) {
+ if (static::setDefaultTimezoneFromConfig()) {
$tz = $config->get_cfg_value('timezone');
$tz_delta = date('Z', $stamp);
$tz_delta = $tz_delta / 3600;
diff --git a/include/simpleplugin/class_simplePlugin.inc b/include/simpleplugin/class_simplePlugin.inc
index d320e9ed0fb877e507534c1880e1b9c96a229e7a..f33d2e4f7070aa519556900af7267f47f825302e 100644
--- a/include/simpleplugin/class_simplePlugin.inc
+++ b/include/simpleplugin/class_simplePlugin.inc
@@ -791,7 +791,7 @@ class simplePlugin extends plugin
{
global $ui;
trigger_error("userMainInc is deprecated");
- return self::mainInc($classname, $ui->dn);
+ return static::mainInc($classname, $ui->dn);
}
/*! \brief This function is the needed main.inc for plugins that are not used inside a management class
diff --git a/plugins/addons/dashboard/class_dashBoardUsers.inc b/plugins/addons/dashboard/class_dashBoardUsers.inc
index 4f4b6241f62f1045085002c56c5908a48abe48d5..7c524ddfd2c303a7647a823292a90626825033df 100644
--- a/plugins/addons/dashboard/class_dashBoardUsers.inc
+++ b/plugins/addons/dashboard/class_dashBoardUsers.inc
@@ -147,9 +147,9 @@ class dashboardUsers extends simplePlugin
while ($attrs = $ldap->fetch()) {
// Test if account is expired now
if ($attrs['shadowExpire'][0] <= $today) {
- $expired_accounts[] = self::get_user_infos($attrs);
+ $expired_accounts[] = static::get_user_infos($attrs);
} elseif ($attrs['shadowExpire'][0] <= $next_expired_date) {
- $next_expired_accounts[] = self::get_user_infos($attrs);
+ $next_expired_accounts[] = static::get_user_infos($attrs);
}
}
diff --git a/plugins/admin/acl/class_aclAssignment.inc b/plugins/admin/acl/class_aclAssignment.inc
index 34c80f3649f1a6500c6583afac5e21419af156ba..c77d60afb720d3487e3c9f5342c235c939c86ef3 100644
--- a/plugins/admin/acl/class_aclAssignment.inc
+++ b/plugins/admin/acl/class_aclAssignment.inc
@@ -27,7 +27,7 @@ class aclAssignmentDialogWindow extends simplePlugin
'plDescription' => _('Access control roles assignment dialog'),
'plCategory' => array('acl'),
- 'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+ 'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
@@ -275,7 +275,7 @@ class aclAssignment extends simplePlugin
)
),
- 'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+ 'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
diff --git a/plugins/admin/aclrole/class_aclRole.inc b/plugins/admin/aclrole/class_aclRole.inc
index d8fc324fda82ab30743bb9e59eb2ee77ad99c68c..714d5d02c4fcd16ab2689e631586bc9f55827708 100644
--- a/plugins/admin/aclrole/class_aclRole.inc
+++ b/plugins/admin/aclrole/class_aclRole.inc
@@ -84,7 +84,7 @@ class aclRole extends simplePlugin
'icon' => 'geticon.php?context=categories&icon=acl&size=16',
)),
- 'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+ 'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
diff --git a/plugins/admin/departments/class_country.inc b/plugins/admin/departments/class_country.inc
index 466c94c40be74720d671877849dde67a459602d3..9003206e62fef947b280a03a2d36df81bdc61013 100644
--- a/plugins/admin/departments/class_country.inc
+++ b/plugins/admin/departments/class_country.inc
@@ -35,13 +35,13 @@ class country extends department
'ou' => '',
'icon' => 'geticon.php?context=types&icon=country&size=16',
'tabClass' => 'deptabs',
- 'mainAttr' => self::$namingAttr,
+ 'mainAttr' => static::$namingAttr,
)),
'plForeignKeys' => array(
'manager' => 'user'
),
- 'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+ 'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
diff --git a/plugins/admin/departments/class_dcObject.inc b/plugins/admin/departments/class_dcObject.inc
index 5cb75677ba092f1da2b33224907012ab7f642341..8f474083a0623b5e0abd3f5033e41abc0fec5fef 100644
--- a/plugins/admin/departments/class_dcObject.inc
+++ b/plugins/admin/departments/class_dcObject.inc
@@ -36,13 +36,13 @@ class dcObject extends department
'ou' => '',
'icon' => 'geticon.php?context=types&icon=dc&size=16',
'tabClass' => 'deptabs',
- 'mainAttr' => self::$namingAttr,
+ 'mainAttr' => static::$namingAttr,
)),
'plForeignKeys' => array(
'manager' => 'user'
),
- 'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+ 'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
diff --git a/plugins/admin/departments/class_department.inc b/plugins/admin/departments/class_department.inc
index 741119217172f1121fd56b037f84637a6060ed3a..4094fcb7cb73eb884850062a4264898afe83aaaf 100644
--- a/plugins/admin/departments/class_department.inc
+++ b/plugins/admin/departments/class_department.inc
@@ -41,14 +41,14 @@ class department extends simplePlugin
'ou' => '',
'icon' => 'geticon.php?context=places&icon=folder&size=16',
'tabClass' => 'deptabs',
- 'mainAttr' => self::$namingAttr,
+ 'mainAttr' => static::$namingAttr,
)
),
'plForeignKeys' => array(
'manager' => 'user'
),
- 'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+ 'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index 20c250f4a3ffffb02cf4aa3985f501f36f415bba..b57f6f5035531b22da9a71e09938f1b3c9878b3f 100644
--- a/plugins/admin/departments/class_departmentManagement.inc
+++ b/plugins/admin/departments/class_departmentManagement.inc
@@ -37,7 +37,7 @@ class departmentManagement extends simpleManagement
'plIcon' => 'geticon.php?context=places&icon=folder&size=48',
'plSection' => array('accounts' => array('name' => _('Users and groups'), 'priority' => 0)),
'plPriority' => 0,
- 'plManages' => self::getDepartmentTypes(),
+ 'plManages' => static::getDepartmentTypes(),
'plProvidedAcls' => array()
);
@@ -45,7 +45,7 @@ class departmentManagement extends simpleManagement
function __construct()
{
- $this->objectTypes = self::getDepartmentTypes();
+ $this->objectTypes = static::getDepartmentTypes();
$this->listXMLPath = get_template_path('dep-list.xml', TRUE, dirname(__FILE__));
parent::__construct();
$this->headpage->registerElementFilter("depLabel", "departmentManagement::filterDepLabel");
diff --git a/plugins/admin/departments/class_domain.inc b/plugins/admin/departments/class_domain.inc
index aebd568de9a23cf2dfffc20556759b23d278fc71..31a594a1aae3e56c1727a73f221fd0d4a03c55a9 100644
--- a/plugins/admin/departments/class_domain.inc
+++ b/plugins/admin/departments/class_domain.inc
@@ -36,13 +36,13 @@ class domain extends department
'ou' => '',
'icon' => 'geticon.php?context=types&icon=domain&size=16',
'tabClass' => 'deptabs',
- 'mainAttr' => self::$namingAttr,
+ 'mainAttr' => static::$namingAttr,
)),
'plForeignKeys' => array(
'manager' => 'user'
),
- 'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+ 'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
diff --git a/plugins/admin/departments/class_locality.inc b/plugins/admin/departments/class_locality.inc
index 2bb901dda3be5fb89f60ab0d2d0b61288b6a2697..c1331240118693f89d424947e9a2d90a30482240 100644
--- a/plugins/admin/departments/class_locality.inc
+++ b/plugins/admin/departments/class_locality.inc
@@ -36,7 +36,7 @@ class locality extends department
'ou' => '',
'icon' => 'geticon.php?context=types&icon=locality&size=16',
'tabClass' => 'deptabs',
- 'mainAttr' => self::$namingAttr,
+ 'mainAttr' => static::$namingAttr,
)),
'plForeignKeys' => array(
'manager' => 'user'
diff --git a/plugins/admin/departments/class_organization.inc b/plugins/admin/departments/class_organization.inc
index 6b72ad4ce0403db878ff1255ccc65036ac0c6998..383993a6fe144155d98df0c2db2292b3968f96c4 100644
--- a/plugins/admin/departments/class_organization.inc
+++ b/plugins/admin/departments/class_organization.inc
@@ -36,7 +36,7 @@ class organization extends department
'ou' => '',
'icon' => 'geticon.php?context=types&icon=organization&size=16',
'tabClass' => 'deptabs',
- 'mainAttr' => self::$namingAttr,
+ 'mainAttr' => static::$namingAttr,
)),
'plForeignKeys' => array(
'manager' => 'user'
diff --git a/plugins/admin/groups/class_group.inc b/plugins/admin/groups/class_group.inc
index 5e85ed2d8352ecc6c25266d114a35a980b7cb8e5..58448b1143ec46fb2edcfb0c713a8ecbdbe7e901 100644
--- a/plugins/admin/groups/class_group.inc
+++ b/plugins/admin/groups/class_group.inc
@@ -45,7 +45,7 @@ class group extends simplePlugin
'memberUid' => array('user','uid')
),
- 'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+ 'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 8412c914db621386a7de5561f2324d9343879bfa..c42e34c449ef4d0a227dce6622f32f085cfe566e 100644
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -61,7 +61,7 @@ class groupManagement extends simpleManagement
if (empty($gosaGroupObjects)) {
return $result;
} else {
- return self::filterGroupObjects($row, $gosaGroupObjects);
+ return static::filterGroupObjects($row, $gosaGroupObjects);
}
}
if (strtolower($objectType) == 'role') {
diff --git a/plugins/admin/groups/class_ogroup.inc b/plugins/admin/groups/class_ogroup.inc
index c3c2de7d84379b5fbab780e59f3da87e1a344976..731b94c4f3d6c7e9fe5afe63da0714853ed7ae2e 100644
--- a/plugins/admin/groups/class_ogroup.inc
+++ b/plugins/admin/groups/class_ogroup.inc
@@ -180,7 +180,7 @@ class ogroup extends simplePlugin
)
),
- 'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+ 'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
diff --git a/plugins/admin/groups/class_roleGeneric.inc b/plugins/admin/groups/class_roleGeneric.inc
index 3f3bd7015b08dba3433c2f6ce8d777eea5478bf2..6af83a62033e9bf74bc52ecc7d63d1c922bc5bce 100644
--- a/plugins/admin/groups/class_roleGeneric.inc
+++ b/plugins/admin/groups/class_roleGeneric.inc
@@ -68,7 +68,7 @@ class roleGeneric extends simplePlugin
'roleOccupant' => 'user'
),
- 'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+ 'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
diff --git a/plugins/config/class_configInLdap.inc b/plugins/config/class_configInLdap.inc
index 2bf44fa25eb17c193c7b24bb5db832f3230b616f..c36be130a33032655bc33524addaeb559c05fe15 100644
--- a/plugins/config/class_configInLdap.inc
+++ b/plugins/config/class_configInLdap.inc
@@ -71,7 +71,7 @@ class configInLdap extends simplePlugin
'plManages' => array('configuration'),
'plPriority' => 0,
- 'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+ 'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
@@ -95,7 +95,7 @@ class configInLdap extends simplePlugin
new SelectAttribute (
_('Theme'), _('Theme to be used'),
'fdTheme', TRUE,
- self::get_themes(),
+ static::get_themes(),
'breezy'
),
new SelectAttribute (
@@ -478,7 +478,7 @@ class configInLdap extends simplePlugin
function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE, $attributesInfo = NULL)
{
global $config;
- $attributesInfo = self::getAttributesInfo();
+ $attributesInfo = static::getAttributesInfo();
/* Languages */
$languages = get_languages(TRUE);
asort($languages);
diff --git a/plugins/config/class_dashBoardConfig.inc b/plugins/config/class_dashBoardConfig.inc
index 1c10b1db9f940057b7d564148dc7384ece96e559..f54d7d178dd69baaf37b1d7316cf79ae8288f752 100644
--- a/plugins/config/class_dashBoardConfig.inc
+++ b/plugins/config/class_dashBoardConfig.inc
@@ -31,7 +31,7 @@ class dashboardConfig extends simplePlugin
'plCategory' => array('configuration'),
'plObjectType' => array('smallConfig'),
- 'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+ 'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
diff --git a/plugins/config/class_mainPluginsConfig.inc b/plugins/config/class_mainPluginsConfig.inc
index 9ad54bd5bceab82afa8eddc9f3a75f0476054983..6024cbe8976c4de8e479692955a454a643aba771 100644
--- a/plugins/config/class_mainPluginsConfig.inc
+++ b/plugins/config/class_mainPluginsConfig.inc
@@ -31,7 +31,7 @@ class mainPluginsConfig extends simplePlugin
"plCategory" => array("configuration"),
"plObjectType" => array("smallConfig"),
- "plProvidedAcls" => parent::generatePlProvidedAcls(self::getAttributesInfo())
+ "plProvidedAcls" => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
diff --git a/plugins/config/class_recoveryConfig.inc b/plugins/config/class_recoveryConfig.inc
index 6b0782e6e4162a48061e6c11b32285f951a1abf4..521ce81049f013ed8d5305f331b8bfece7e8ba1d 100644
--- a/plugins/config/class_recoveryConfig.inc
+++ b/plugins/config/class_recoveryConfig.inc
@@ -29,7 +29,7 @@ class recoveryConfig extends simplePlugin
'plDescription' => _('Settings for the password recovery feature'),
'plObjectType' => array('configuration'),
- 'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+ 'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index d8e956c834b974c91c2c2d3d7c9c718fe6303934..05005f6935684c93571f82c5285b53adb4b53cc2 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -291,7 +291,7 @@ class user extends simplePlugin
'manager' => array('user','dn')
),
- 'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+ 'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
index 18dfaede8afbefa05ec5ba2382a35af0fda1c53b..fa6282f6d327756308df94e70131926e2eec8b45 100644
--- a/plugins/personal/posix/class_posixAccount.inc
+++ b/plugins/personal/posix/class_posixAccount.inc
@@ -41,7 +41,7 @@ class EpochDaysDateAttribute extends DateAttribute
protected function ldapToDate($ldapValue)
{
- $date = DateTime::createFromFormat('U', $ldapValue * self::$secondsPerDay, timezone::utc());
+ $date = DateTime::createFromFormat('U', $ldapValue * static::$secondsPerDay, timezone::utc());
if ($date !== FALSE) {
return $date;
} else {
@@ -52,7 +52,7 @@ class EpochDaysDateAttribute extends DateAttribute
protected function dateToLdap($dateValue)
{
- return floor($dateValue->format('U') / self::$secondsPerDay);
+ return floor($dateValue->format('U') / static::$secondsPerDay);
}
function getEpochDays()
@@ -100,7 +100,7 @@ class posixAccount extends simplePlugin
)
),
- 'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+ 'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
diff --git a/plugins/personal/roles/class_userRoles.inc b/plugins/personal/roles/class_userRoles.inc
index e16a5d92ebd772045a23f79ad42d9a8c403b8c9f..cd4efc9d0cd892d6529ebd07e17f3a93a43f2ca0 100644
--- a/plugins/personal/roles/class_userRoles.inc
+++ b/plugins/personal/roles/class_userRoles.inc
@@ -36,7 +36,7 @@ class userRoles extends simplePlugin
'plObjectType' => array('user'),
'plPriority' => 5,
- 'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
+ 'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}