Commit f9587bd9 authored by Côme Bernigaud's avatar Côme Bernigaud Committed by Benoit Mortier

Fixes #3514 Fixed various formulation problems

Conflicts:
	asterisk/admin/macro/class_gofonMacro.inc
	asterisk/admin/systems/asterisk/class_phoneGeneric.inc
	systems/admin/systems/class_printGeneric.inc
parent e21d73e5
......@@ -39,7 +39,7 @@ class aliasConfig extends simplePlugin
{
return array(
'main' => array(
'name' => _('LDAP tree'),
'name' => _('Alias'),
'attrs' => array(
new StringAttribute (
_('Alias RDN'), _('Branch in which aliases will be stored'),
......
......@@ -65,7 +65,7 @@ class serviceApacheVhostEdit extends simplePlugin
{
return array(
'section1' => array (
'name' => _('Generic'),
'name' => _('Informations'),
'class' => array('fullwidth'),
'attrs' => array(
new StringAttribute (
......
......@@ -28,8 +28,8 @@ class application extends simplePlugin
static function plInfo()
{
return array(
'plShortName' => _('Generic'),
'plDescription' => _('Application generic'),
'plShortName' => _('Application'),
'plDescription' => _('Application information'),
'plObjectType' => array('application' => array(
'name' => _('Application'),
'filter' => 'objectClass=fdDesktopApplication',
......
......@@ -38,7 +38,7 @@ class asteriskPluginConfig extends simplePlugin
{
return array(
'rdns' => array(
'name' => _('LDAP tree'),
'name' => _('Asterisk'),
'attrs' => array(
new StringAttribute (
_('Phone RDN'), _('Branch in which phones will be stored'),
......
......@@ -39,7 +39,7 @@ class autofsConfig extends simplePlugin
{
return array(
'main' => array(
'name' => _('LDAP tree'),
'name' => _('AutoFS'),
'attrs' => array(
new StringAttribute (
_('AutoFS RDN'), _('Branch in which automount info will be stored'),
......
......@@ -160,7 +160,7 @@ class debconfProfileGeneric extends simplePlugin
{
return array(
'plShortName' => _('Debconf profile'),
'plDescription' => _('Debconf profile generic'),
'plDescription' => _('Debconf profile information'),
'plSelfModify' => FALSE,
'plObjectType' => array('debconfProfile' => array(
'name' => _('Debconf profile'),
......
......@@ -39,7 +39,7 @@ class dsaConfig extends simplePlugin
{
return array(
'main' => array(
'name' => _('LDAP tree'),
'name' => _('DSA'),
'attrs' => array(
new StringAttribute (
_('DSA RDN'), _('Branch in which Directory Service Account (dsa) will be stored (required)'),
......
......@@ -38,7 +38,7 @@ class faiConfig extends simplePlugin
{
$attrs = array(
'main' => array(
'name' => _('LDAP tree'),
'name' => _('FAI'),
'attrs' => array(
new StringAttribute (
_('Fai base RDN'), _('Branch in which fai branches will be stored'),
......
......@@ -39,7 +39,7 @@ class faxConfig extends simplePlugin
{
return array(
'main' => array(
'name' => _('LDAP tree'),
'name' => _('Fax'),
'attrs' => array(
new StringAttribute (
_('Fax RDN'), _('Branch in which fax blocklists will be stored'),
......
......@@ -79,7 +79,7 @@ class serviceKolab extends simpleService
{
return array (
'section1' => array (
'name' => _('Generic'),
'name' => _('Informations'),
'icon' => 'images/rightarrow.png',
'attrs' => array (
new StringAttribute('', '', 'k', FALSE, 'kolab'),
......
......@@ -76,7 +76,7 @@ class mailgroup extends simplePlugin
{
return array(
'main' => array(
'name' => _('Generic'),
'name' => _('Informations'),
'attrs' => array(
new HiddenAttribute (
'gosaMailDeliveryMode', FALSE,
......
......@@ -41,7 +41,7 @@ class servicePostfix extends simpleService
{
return array (
'section1' => array (
'name' => _('Generic'),
'name' => _('Informations'),
'icon' => 'images/rightarrow.png',
'attrs' => array (
new StringAttribute (
......
......@@ -43,7 +43,7 @@ class serviceAntiVirus extends simpleService {
{
return array (
'section1' => array (
'name' => _('Generic virus filtering'),
'name' => _('Virus filtering'),
'icon' => 'images/rightarrow.png',
'attrs' => array (
new StringAttribute (
......
......@@ -94,7 +94,7 @@ class mailAccount extends simplePlugin
{
return array (
'main' => array (
'name' => _('Generic'),
'name' => _('Mail account'),
'attrs' => array (
new MailAttribute (
_('Primary address'), _('Primary mail address'),
......
......@@ -39,7 +39,7 @@ class nagiosConfig extends simplePlugin
{
return array(
'main' => array(
'name' => _('LDAP tree'),
'name' => _('Nagios'),
'attrs' => array(
new StringAttribute (
_('Lconf prefix'), _('Prefix used for lconf LDAP fields'),
......
......@@ -47,8 +47,8 @@ class netgroup extends simplePlugin
static function plInfo() {
return array(
'plShortName' => _('Generic'),
'plDescription' => _('Generic NIS Netgroup settings'),
'plShortName' => _('Netgroup'),
'plDescription' => _('NIS Netgroup settings'),
'plSelfModify' => FALSE,
'plObjectType' => array('netgroup' => array(
'name' => _('NIS Netgroup'),
......
......@@ -39,7 +39,7 @@ class netgroupConfig extends simplePlugin
{
return array(
'main' => array(
'name' => _('LDAP tree'),
'name' => _('Netgroup'),
'attrs' => array(
new StringAttribute (
_('Netgroup RDN'), _('Branch in which netgroups will be stored'),
......
......@@ -39,7 +39,7 @@ class opsiConfig extends simplePlugin
{
return array(
'main' => array(
'name' => _('LDAP tree'),
'name' => _('OPSI'),
'attrs' => array(
new StringAttribute (
_('OPSI RDN'), _('Branch in which OPSI profiles will be stored'),
......
......@@ -64,7 +64,7 @@ class buildRepository extends simplePlugin
'cn', TRUE
),
new TextAreaAttribute (
_('description'), _('description'),
_('Description'), _('Description of this repository'),
'description', FALSE
),
new SetAttribute (
......
......@@ -61,7 +61,7 @@ class repositoryDistribution extends simplePlugin
'cn', TRUE
),
new TextAreaAttribute (
_('description'), _('Description of this distribution'),
_('Description'), _('Description of this distribution'),
'description', FALSE
),
new SetAttribute (
......
......@@ -58,7 +58,7 @@ class repositorySection extends simplePlugin
'cn', TRUE
),
new TextAreaAttribute (
_('description'), _('Description of this section'),
_('Description'), _('Description of this section'),
'description', FALSE
),
new SetAttribute (
......
......@@ -39,7 +39,7 @@ class repositoryConfig extends simplePlugin
{
return array(
'main' => array(
'name' => _('LDAP tree'),
'name' => _('Repository'),
'attrs' => array(
new StringAttribute (
_('Repository RDN'), _('Branch in which repository objects will be stored'),
......
......@@ -37,8 +37,8 @@ class winstationGeneric extends simplePlugin
static function plInfo()
{
return array(
'plShortName' => _('Winstation generic'),
'plDescription' => _('Windows workstation generic'),
'plShortName' => _('Winstation'),
'plDescription' => _('Windows workstation information'),
'plSelfModify' => FALSE,
'plObjectType' => array(
'winstation' => array(
......
......@@ -157,7 +157,7 @@ class sambaAccount extends simplePlugin
static $sambaRegEx = '/^\\\\\\\\([a-z0-9%_.:$+-\\\\]+\\\\?)+$/i';
return array(
'generic' => array(
'name' => _('Generic'),
'name' => _('Samba profile'),
'icon' => 'images/rightarrow.png',
'attrs' => array(
new HiddenAttribute ('sambaSID'),
......
......@@ -39,7 +39,7 @@ class sogoConfig extends simplePlugin
{
return array(
'main' => array(
'name' => _('LDAP tree'),
'name' => _('SOGo'),
'attrs' => array(
new StringAttribute (
_('SOGo RDN'), _('Branch in which SOGo objects will be stored (required)'),
......
......@@ -39,7 +39,7 @@ class sudoConfig extends simplePlugin
{
return array(
'main' => array(
'name' => _('LDAP tree'),
'name' => _('Sudo'),
'attrs' => array(
new StringAttribute (
_('Sudo RDN'), _('Branch in which sudoers will be stored'),
......
......@@ -39,7 +39,7 @@ class supannConfig extends simplePlugin
{
return array(
'main' => array(
'name' => _('LDAP tree'),
'name' => _('SUPANN'),
'attrs' => array(
new StringAttribute (
_('SUPANN RDN'), _('Branch in which SUPANN structures will be stored'),
......
......@@ -28,8 +28,8 @@ class componentGeneric extends simplePlugin
static function plInfo()
{
return array(
'plShortName' => _('Generic'),
'plDescription' => _('Component generic'),
'plShortName' => _('Component'),
'plDescription' => _('Component information'),
'plSelfModify' => FALSE,
'plObjectType' => array(
'component' => array(
......
......@@ -29,8 +29,8 @@ class mobilePhoneGeneric extends simplePlugin
static function plInfo()
{
return array(
'plShortName' => _('Generic'),
'plDescription' => _('Mobile phone generic'),
'plShortName' => _('Mobile phone'),
'plDescription' => _('Mobile phone information'),
'plSelfModify' => FALSE,
'plObjectType' => array(
'mobilePhone' => array(
......
......@@ -30,7 +30,7 @@ class printGeneric extends simplePlugin
{
return array(
'plShortName' => _('Printer'),
'plDescription' => _('Print generic'),
'plDescription' => _('Printer information'),
'plPriority' => 10,
'plObjectType' => array(
'printer' => array(
......
......@@ -40,8 +40,8 @@ class serverGeneric extends workstationGeneric
static function plInfo()
{
return array(
'plShortName' => _('Generic'),
'plDescription' => _('Server generic'),
'plShortName' => _('Server'),
'plDescription' => _('Server information'),
'plSelfModify' => FALSE,
'plObjectType' => array(
'server' => array(
......
......@@ -40,8 +40,8 @@ class terminalGeneric extends workstationGeneric
static function plInfo()
{
return array(
'plShortName' => _('Generic'),
'plDescription' => _('Terminal generic'),
'plShortName' => _('Terminal'),
'plDescription' => _('Terminal information'),
'plSelfModify' => FALSE,
'plObjectType' => array('terminal' =>
array(
......
......@@ -122,8 +122,8 @@ class workstationGeneric extends simplePlugin
static function plInfo()
{
return array(
'plShortName' => _('Generic'),
'plDescription' => _('Workstation generic'),
'plShortName' => _('Workstation'),
'plDescription' => _('Workstation information'),
'plSelfModify' => FALSE,
'plObjectType' => array('workstation' =>
array(
......
......@@ -2,7 +2,7 @@
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
Copyright (C) 2011-2013 FusionDirectory
Copyright (C) 2011-2014 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -19,11 +19,10 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
class serviceNTP extends simpleService {
class serviceNTP extends simpleService
{
var $objectclasses = array("goNtpServer");
/* Return plugin informations for acl handling */
static function plInfo()
{
return array(
......@@ -35,19 +34,16 @@ class serviceNTP extends simpleService {
);
}
/* The main function : information about attributes */
static function getAttributesInfo ()
{
return array (
'section1' => array (
'name' => _('Generic'),
'name' => _('Informations'),
'attrs' => array (
new SetAttribute (
new StringAttribute (
_('Time server'),
'',
'goTimeSource',
FALSE
_('Time servers'), _('List of time sources to use'),
'goTimeSource', FALSE
)
)
)
......
<?php
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003-2010 Cajus Pollmeier
......@@ -22,11 +21,8 @@
class serviceTerminal extends simpleService
{
/* This plugin only writes its objectClass */
var $objectclasses = array("goTerminalServer");
/* Return plugin informations for acl handling */
static function plInfo()
{
return array(
......@@ -38,9 +34,6 @@ class serviceTerminal extends simpleService
);
}
/*!
* \brief The main function : information about attributes
*/
static function getAttributesInfo ()
{
return array (
......@@ -49,9 +42,8 @@ class serviceTerminal extends simpleService
'attrs' => array (
new BooleanAttribute (
_('Temporary disable login'),
_(' '),
'goXdmcpIsEnabled',
FALSE,
_('Disables the login on this terminal server'),
'goXdmcpIsEnabled', FALSE,
FALSE,
'',
1,
......@@ -60,9 +52,8 @@ class serviceTerminal extends simpleService
new SetAttribute (
new SelectAttribute (
_('Supported session types'),
_(' '),
'gotoSessionType',
FALSE,
_('The session types supported by this terminal server'),
'gotoSessionType', FALSE,
array("LDM","XDMCP", "SHELL", "RDP", "TELNET"),
'',
array("LDM","XDMCP", "SHELL", "RDP", "TELNET")
......
......@@ -147,7 +147,7 @@
<name>edit</name>
<type>entry</type>
<image>geticon.php?context=actions&amp;icon=document-edit&amp;size=16</image>
<label>Edit role</label>
<label>Edit system</label>
</action>
<action>
......
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