Commit 20c0279b authored by bmortier's avatar bmortier

Merge branch '1.0.17-fixes'

parents 89bfe508 a615c6e5

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -26,7 +26,7 @@ class aliasManagement extends simpleManagement
protected $autoFilterAttributes = array('dn', 'cn', 'description', 'aliasExpirationDate');
/* Return plugin informations for acl handling */
/* Return plugin information for acl handling */
public static function plInfo()
{
return array(
......
......@@ -24,7 +24,7 @@ class mailAliasDistribution extends simplePlugin
var $objectclasses = array('top', 'mailAliasDistribution');
/* Return plugin informations for acl handling */
/* Return plugin information for acl handling */
public static function plInfo()
{
return array(
......@@ -39,7 +39,7 @@ class mailAliasDistribution extends simplePlugin
'ou' => get_ou('aliasRDN'),
)),
'plProvidedAcls' => parent::generatePlProvidedAcls(self::getAttributesInfo())
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
);
}
......
......@@ -24,7 +24,7 @@ class mailAliasRedirection extends simplePlugin
var $objectclasses = array('top', 'mailAliasRedirection');
/* Return plugin informations for acl handling */
/* Return plugin information for acl handling */
public static function plInfo()
{
return array(
......@@ -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())
);
}
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2016-11-02 23:08+0100\n"
"POT-Creation-Date: 2017-01-11 21:15+0100\n"
"PO-Revision-Date: 2016-01-22 16:05+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
......@@ -43,50 +43,50 @@ msgstr ""
msgid "Temporary mail redirection"
msgstr ""
#: admin/alias/class_mailAliasRedirection.inc:52
#: admin/alias/class_mailAliasRedirection.inc:50
msgid "Mail redirection"
msgstr ""
#: admin/alias/class_mailAliasRedirection.inc:55
#: admin/alias/class_mailAliasDistribution.inc:56
#: admin/alias/class_mailAliasRedirection.inc:53
#: admin/alias/class_mailAliasDistribution.inc:54
msgid "Name"
msgstr "الإسم"
#: admin/alias/class_mailAliasRedirection.inc:55
#: admin/alias/class_mailAliasRedirection.inc:53
msgid "Name to identify this redirection"
msgstr ""
#: admin/alias/class_mailAliasRedirection.inc:57
#: admin/alias/class_mailAliasDistribution.inc:58
#: admin/alias/class_mailAliasRedirection.inc:55
#: admin/alias/class_mailAliasDistribution.inc:56
msgid "Description"
msgstr "الوصف"
#: admin/alias/class_mailAliasRedirection.inc:57
#: admin/alias/class_mailAliasRedirection.inc:55
msgid "Description of this redirection"
msgstr ""
#: admin/alias/class_mailAliasRedirection.inc:62
#: admin/alias/class_mailAliasRedirection.inc:60
msgid "Redirect from"
msgstr ""
#: admin/alias/class_mailAliasRedirection.inc:62
#: admin/alias/class_mailAliasRedirection.inc:60
msgid "Mail address from which you want to redirect"
msgstr ""
#: admin/alias/class_mailAliasRedirection.inc:68
#: admin/alias/class_mailAliasRedirection.inc:66
msgid "Redirect to"
msgstr ""
#: admin/alias/class_mailAliasRedirection.inc:68
#: admin/alias/class_mailAliasRedirection.inc:66
msgid "Destination of this redirection"
msgstr ""
#: admin/alias/class_mailAliasRedirection.inc:73
#: admin/alias/class_mailAliasDistribution.inc:77
#: admin/alias/class_mailAliasRedirection.inc:71
#: admin/alias/class_mailAliasDistribution.inc:75
msgid "Expiration date"
msgstr ""
#: admin/alias/class_mailAliasRedirection.inc:73
#: admin/alias/class_mailAliasRedirection.inc:71
msgid ""
"Date after which the redirection should be deleted. Leave empty for no "
"deletion."
......@@ -98,39 +98,39 @@ msgstr ""
msgid "Temporary mail distribution"
msgstr ""
#: admin/alias/class_mailAliasDistribution.inc:53
#: admin/alias/class_mailAliasDistribution.inc:51
msgid "Mail distribution"
msgstr ""
#: admin/alias/class_mailAliasDistribution.inc:56
#: admin/alias/class_mailAliasDistribution.inc:54
msgid "Name to identify this alias"
msgstr ""
#: admin/alias/class_mailAliasDistribution.inc:58
#: admin/alias/class_mailAliasDistribution.inc:56
msgid "Description of this alias"
msgstr ""
#: admin/alias/class_mailAliasDistribution.inc:62
#: admin/alias/class_mailAliasDistribution.inc:60
msgid "Email address"
msgstr ""
#: admin/alias/class_mailAliasDistribution.inc:67
#: admin/alias/class_mailAliasDistribution.inc:65
msgid "Email aliases"
msgstr ""
#: admin/alias/class_mailAliasDistribution.inc:67
#: admin/alias/class_mailAliasDistribution.inc:65
msgid "Aliases for this email address"
msgstr ""
#: admin/alias/class_mailAliasDistribution.inc:72
#: admin/alias/class_mailAliasDistribution.inc:70
msgid "Mail server"
msgstr ""
#: admin/alias/class_mailAliasDistribution.inc:72
#: admin/alias/class_mailAliasDistribution.inc:70
msgid "Mail server for this alias"
msgstr ""
#: admin/alias/class_mailAliasDistribution.inc:77
#: admin/alias/class_mailAliasDistribution.inc:75
msgid ""
"Date after which the alias should be deleted. Leave empty for no deletion."
msgstr ""
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2016-11-02 23:08+0100\n"
"POT-Creation-Date: 2017-01-11 21:15+0100\n"
"PO-Revision-Date: 2016-01-22 16:05+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
......@@ -43,50 +43,50 @@ msgstr ""
msgid "Temporary mail redirection"
msgstr ""
#: admin/alias/class_mailAliasRedirection.inc:52
#: admin/alias/class_mailAliasRedirection.inc:50
msgid "Mail redirection"
msgstr ""
#: admin/alias/class_mailAliasRedirection.inc:55
#: admin/alias/class_mailAliasDistribution.inc:56
#: admin/alias/class_mailAliasRedirection.inc:53
#: admin/alias/class_mailAliasDistribution.inc:54
msgid "Name"
msgstr "Nom"
#: admin/alias/class_mailAliasRedirection.inc:55
#: admin/alias/class_mailAliasRedirection.inc:53
msgid "Name to identify this redirection"
msgstr ""
#: admin/alias/class_mailAliasRedirection.inc:57
#: admin/alias/class_mailAliasDistribution.inc:58
#: admin/alias/class_mailAliasRedirection.inc:55
#: admin/alias/class_mailAliasDistribution.inc:56
msgid "Description"
msgstr ""
#: admin/alias/class_mailAliasRedirection.inc:57
#: admin/alias/class_mailAliasRedirection.inc:55
msgid "Description of this redirection"
msgstr ""
#: admin/alias/class_mailAliasRedirection.inc:62
#: admin/alias/class_mailAliasRedirection.inc:60
msgid "Redirect from"
msgstr ""
#: admin/alias/class_mailAliasRedirection.inc:62
#: admin/alias/class_mailAliasRedirection.inc:60
msgid "Mail address from which you want to redirect"
msgstr ""
#: admin/alias/class_mailAliasRedirection.inc:68
#: admin/alias/class_mailAliasRedirection.inc:66
msgid "Redirect to"
msgstr ""
#: admin/alias/class_mailAliasRedirection.inc:68
#: admin/alias/class_mailAliasRedirection.inc:66
msgid "Destination of this redirection"
msgstr ""
#: admin/alias/class_mailAliasRedirection.inc:73
#: admin/alias/class_mailAliasDistribution.inc:77
#: admin/alias/class_mailAliasRedirection.inc:71
#: admin/alias/class_mailAliasDistribution.inc:75
msgid "Expiration date"
msgstr ""
#: admin/alias/class_mailAliasRedirection.inc:73
#: admin/alias/class_mailAliasRedirection.inc:71
msgid ""
"Date after which the redirection should be deleted. Leave empty for no "
"deletion."
......@@ -98,39 +98,39 @@ msgstr ""
msgid "Temporary mail distribution"
msgstr ""
#: admin/alias/class_mailAliasDistribution.inc:53
#: admin/alias/class_mailAliasDistribution.inc:51
msgid "Mail distribution"
msgstr ""
#: admin/alias/class_mailAliasDistribution.inc:56
#: admin/alias/class_mailAliasDistribution.inc:54
msgid "Name to identify this alias"
msgstr ""
#: admin/alias/class_mailAliasDistribution.inc:58
#: admin/alias/class_mailAliasDistribution.inc:56
msgid "Description of this alias"
msgstr ""
#: admin/alias/class_mailAliasDistribution.inc:62
#: admin/alias/class_mailAliasDistribution.inc:60