From 478e6eb6654001b2e5afada96bc1141d243d22a9 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Mon, 5 Apr 2010 12:38:23 +0000 Subject: [PATCH] implemented descriptive PDF fields --- lam/HISTORY | 1 + lam/lib/modules.inc | 2 +- lam/lib/modules/account.inc | 4 +- lam/lib/modules/asteriskAccount.inc | 4 +- lam/lib/modules/asteriskExtension.inc | 9 ++- lam/lib/modules/asteriskVoicemail.inc | 11 +-- lam/lib/modules/ddns.inc | 6 +- lam/lib/modules/dhcp_settings.inc | 24 +++---- lam/lib/modules/eduPerson.inc | 14 ++-- lam/lib/modules/fixed_ip.inc | 2 +- lam/lib/modules/hostObject.inc | 2 +- lam/lib/modules/ieee802device.inc | 2 +- lam/lib/modules/inetLocalMailRecipient.inc | 6 +- lam/lib/modules/inetOrgPerson.inc | 48 ++++++------- lam/lib/modules/kolabUser.inc | 10 ++- lam/lib/modules/ldapPublicKey.inc | 4 +- lam/lib/modules/nisMailAlias.inc | 5 +- lam/lib/modules/nisnetgroup.inc | 8 ++- lam/lib/modules/phpGroupwareUser.inc | 8 ++- lam/lib/modules/posixAccount.inc | 20 +++--- lam/lib/modules/posixGroup.inc | 10 +-- lam/lib/modules/quota.inc | 2 +- lam/lib/modules/range.inc | 2 +- lam/lib/modules/sambaDomain.inc | 23 +++++-- lam/lib/modules/sambaGroupMapping.inc | 12 ++-- lam/lib/modules/sambaSamAccount.inc | 80 +++++++++++----------- 26 files changed, 182 insertions(+), 137 deletions(-) diff --git a/lam/HISTORY b/lam/HISTORY index 1861cb66..c91d186e 100644 --- a/lam/HISTORY +++ b/lam/HISTORY @@ -1,6 +1,7 @@ June 2010 3.1.0 - Asterisk voicemail support - new hosts module for user accounts to define valid login workstations (replaces inetOrgPerson schema hack) (2951116) + - PDF editor: descriptive fields - LAM Pro -> custom scripts: new options to hide executed commands and define if output is HTML or plain text - fixed bugs: diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc index 60ad49ed..2537b1a2 100644 --- a/lam/lib/modules.inc +++ b/lam/lib/modules.inc @@ -379,7 +379,7 @@ function getAvailablePDFFields($scope) { } } } - $return['main'] = array('dn'); + $return['main'] = array('dn' => _('DN')); return $return; } diff --git a/lam/lib/modules/account.inc b/lam/lib/modules/account.inc index 03b59425..899570f7 100644 --- a/lam/lib/modules/account.inc +++ b/lam/lib/modules/account.inc @@ -72,10 +72,10 @@ class account extends baseModule { $return['attributes'] = array('uid', 'description'); // available PDF fields $return['PDF_fields'] = array( - 'description' + 'description' => _('Description') ); if (isset($_SESSION['loggedIn']) && ($_SESSION['loggedIn'] === true) && !in_array('posixAccount', $modules)) { - $return['PDF_fields'][] = 'uid'; + $return['PDF_fields']['uid'] = _('User name'); } // help Entries $return['help'] = array ( diff --git a/lam/lib/modules/asteriskAccount.inc b/lam/lib/modules/asteriskAccount.inc index a63bf273..5731b99b 100644 --- a/lam/lib/modules/asteriskAccount.inc +++ b/lam/lib/modules/asteriskAccount.inc @@ -122,7 +122,9 @@ class asteriskAccount extends baseModule implements passwordService { ); // available PDF fields $return['PDF_fields'] = array( - 'AstAccountCallerID', 'AstAccountContext', 'AstAccountHost', + 'AstAccountCallerID' => _('Caller ID'), + 'AstAccountContext' => _('Account context'), + 'AstAccountHost' => _('Host'), ); // upload dependencies $return['upload_preDepends'] = array('posixAccount', 'inetOrgPerson'); diff --git a/lam/lib/modules/asteriskExtension.inc b/lam/lib/modules/asteriskExtension.inc index 4f1c10ba..767011b8 100644 --- a/lam/lib/modules/asteriskExtension.inc +++ b/lam/lib/modules/asteriskExtension.inc @@ -129,8 +129,13 @@ class asteriskExtension extends baseModule { ); // available PDF fields $return['PDF_fields'] = array( - 'AstApplicationData', 'AstContext', 'AstExtension', - 'AstPriority', 'AstApplication', 'member', 'cn' + 'AstApplicationData' => _('Application data'), + 'AstContext' => _('Account context'), + 'AstExtension' => _('Extension name'), + 'AstPriority' => _('Priority'), + 'AstApplication' => _('Application'), + 'member' => _('Extension owners'), + 'cn' => _('Common name') ); // upload fields $return['upload_columns'] = array( diff --git a/lam/lib/modules/asteriskVoicemail.inc b/lam/lib/modules/asteriskVoicemail.inc index ecfee172..0ea062a8 100644 --- a/lam/lib/modules/asteriskVoicemail.inc +++ b/lam/lib/modules/asteriskVoicemail.inc @@ -130,10 +130,13 @@ class asteriskVoicemail extends baseModule implements passwordService { ); // available PDF fields $return['PDF_fields'] = array( - 'AstContext', 'AstVoicemailMailbox', - 'AstVoicemailFullname', 'AstVoicemailEmail', - 'AstVoicemailPager', 'AstVoicemailOptions', - 'AstVoicemailContext' + 'AstContext' => _('Account context'), + 'AstVoicemailMailbox' => _('Mailbox'), + 'AstVoicemailFullname' => _('Full name'), + 'AstVoicemailEmail' => _('Email address'), + 'AstVoicemailPager' => _('Pager'), + 'AstVoicemailOptions' => _('Options'), + 'AstVoicemailContext' => _('Voicemail context') ); // upload dependencies $return['upload_preDepends'] = array('posixAccount', 'inetOrgPerson'); diff --git a/lam/lib/modules/ddns.inc b/lam/lib/modules/ddns.inc index fe9e7271..3340d819 100644 --- a/lam/lib/modules/ddns.inc +++ b/lam/lib/modules/ddns.inc @@ -104,9 +104,9 @@ class ddns extends baseModule { ) ,); // available PDF fields $return['PDF_fields'] = array( - 'DNSserver', - 'zone', - 'reverseZone', + 'DNSserver' => _('IP address of the DNS server'), + 'zone' => _('Zone names'), + 'reverseZone' => _('Reverse zone names'), ); // upload fields if (isset($_SESSION['loggedIn']) && $this->check_if_ddns_is_enable()) { diff --git a/lam/lib/modules/dhcp_settings.inc b/lam/lib/modules/dhcp_settings.inc index c1fa4e83..b93a774e 100644 --- a/lam/lib/modules/dhcp_settings.inc +++ b/lam/lib/modules/dhcp_settings.inc @@ -4,7 +4,7 @@ $Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) Copyright (C) 2008 Thomas Manninger - 2008 -2010 Roland Gruber + 2008 - 2010 Roland Gruber 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 @@ -163,17 +163,17 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I ) ); // available PDF fields $return['PDF_fields'] = array( - 'subnet', - 'domainName', - 'leaseTime', - 'maxLeaseTime', - 'DNSserver', - 'gateway', - 'netbiosServer', - 'netbiosType', - 'subnetMask', - 'netMask', - 'description' + 'subnet' => _('Subnet'), + 'domainName' => _('Domain name'), + 'leaseTime' => _('Lease time'), + 'maxLeaseTime' => _('Maximum lease time'), + 'DNSserver' => _('DNS'), + 'gateway' => _('Default gateway'), + 'netbiosServer' => _('Netbios name servers'), + 'netbiosType' => _('Netbios node type'), + 'subnetMask' => _('Subnet mask'), + 'netMask' => _('Net mask'), + 'description' => _('Description') ); // profile elements $return['profile_options'] = array( diff --git a/lam/lib/modules/eduPerson.inc b/lam/lib/modules/eduPerson.inc index df9f906f..c25bac68 100644 --- a/lam/lib/modules/eduPerson.inc +++ b/lam/lib/modules/eduPerson.inc @@ -3,7 +3,7 @@ $Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2009 Roland Gruber + Copyright (C) 2009 - 2010 Roland Gruber 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 @@ -196,9 +196,15 @@ class eduPerson extends baseModule { ); // available PDF fields $return['PDF_fields'] = array( - 'affiliation', 'nickname', 'orgDN', 'orgUnitDN', - 'primaryAffiliation', 'principalName', 'entitlement', - 'primaryOrgUnitDN', 'scopedAffiliation' + 'affiliation' => _('Affiliations'), + 'nickname' => _('Nick names'), + 'orgDN' => _('Organization'), + 'orgUnitDN' => _('Organizational units'), + 'primaryAffiliation' => _('Primary affiliation'), + 'principalName' => _('Principal name'), + 'entitlement' => _('Entitlements'), + 'primaryOrgUnitDN' => _('Primary organizational unit'), + 'scopedAffiliation' => _('Scoped affiliation') ); return $return; } diff --git a/lam/lib/modules/fixed_ip.inc b/lam/lib/modules/fixed_ip.inc index 9d8ce1a1..de1f67b2 100644 --- a/lam/lib/modules/fixed_ip.inc +++ b/lam/lib/modules/fixed_ip.inc @@ -88,7 +88,7 @@ class fixed_ip extends baseModule { "Text" => _("The IP address of the PC.") ) ); // available PDF fields - $return['PDF_fields'] = array('IPlist'); + $return['PDF_fields'] = array('IPlist' => _('IP list')); return $return; } diff --git a/lam/lib/modules/hostObject.inc b/lam/lib/modules/hostObject.inc index 65883f2f..8130db9e 100644 --- a/lam/lib/modules/hostObject.inc +++ b/lam/lib/modules/hostObject.inc @@ -88,7 +88,7 @@ class hostObject extends baseModule { ); // available PDF fields $return['PDF_fields'] = array( - 'hosts' + 'hosts' => _('Host list') ); $return['profile_options'] = array( array( diff --git a/lam/lib/modules/ieee802device.inc b/lam/lib/modules/ieee802device.inc index 7ffec478..12cff076 100644 --- a/lam/lib/modules/ieee802device.inc +++ b/lam/lib/modules/ieee802device.inc @@ -76,7 +76,7 @@ class ieee802Device extends baseModule { ); // available PDF fields $return['PDF_fields'] = array( - 'macAddress' + 'macAddress' => _('MAC address(es)') ); return $return; } diff --git a/lam/lib/modules/inetLocalMailRecipient.inc b/lam/lib/modules/inetLocalMailRecipient.inc index 2adba23c..0fbf0483 100644 --- a/lam/lib/modules/inetLocalMailRecipient.inc +++ b/lam/lib/modules/inetLocalMailRecipient.inc @@ -3,7 +3,7 @@ $Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2004 - 2006 Roland Gruber + Copyright (C) 2004 - 2010 Roland Gruber 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 @@ -112,7 +112,9 @@ class inetLocalMailRecipient extends baseModule { ); // available PDF fields $return['PDF_fields'] = array( - 'routingAdr', 'localAdr', 'host' + 'routingAdr' => _('Routing address'), + 'localAdr' => _('Local address list'), + 'host' => _('Mail server') ); return $return; } diff --git a/lam/lib/modules/inetOrgPerson.inc b/lam/lib/modules/inetOrgPerson.inc index 0babfb63..7818b37c 100644 --- a/lam/lib/modules/inetOrgPerson.inc +++ b/lam/lib/modules/inetOrgPerson.inc @@ -442,75 +442,75 @@ class inetOrgPerson extends baseModule implements passwordService { } // available PDF fields $return['PDF_fields'] = array( - 'givenName', - 'sn' + 'givenName' => _('First name'), + 'sn' => _('Last name') ); if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideDescription')) { - $return['PDF_fields'][] = 'description'; + $return['PDF_fields']['description'] = _('Description'); } if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideStreet')) { - $return['PDF_fields'][] = 'street'; + $return['PDF_fields']['street'] = _('Street'); } if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hidePostOfficeBox')) { - $return['PDF_fields'][] = 'postOfficeBox'; + $return['PDF_fields']['postOfficeBox'] = _('Post office box'); } if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hidePostalCode')) { - $return['PDF_fields'][] = 'postalCode'; + $return['PDF_fields']['postalCode'] = _('Postal code'); } if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideLocation')) { - $return['PDF_fields'][] = 'location'; + $return['PDF_fields']['location'] = _('Location'); } if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideState')) { - $return['PDF_fields'][] = 'state'; + $return['PDF_fields']['state'] = _('State'); } if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hidePostalAddress')) { - $return['PDF_fields'][] = 'postalAddress'; + $return['PDF_fields']['postalAddress'] = _('Postal address'); } if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideOfficeName')) { - $return['PDF_fields'][] = 'officeName'; + $return['PDF_fields']['officeName'] = _('Office name'); } if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideRoomNumber')) { - $return['PDF_fields'][] = 'roomNumber'; + $return['PDF_fields']['roomNumber'] = _('Room number'); } if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideTelephoneNumber')) { - $return['PDF_fields'][] = 'telephoneNumber'; + $return['PDF_fields']['telephoneNumber'] = _('Telephone number'); } if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideHomeTelephoneNumber')) { - $return['PDF_fields'][] = 'homePhone'; + $return['PDF_fields']['homePhone'] = _('Home telephone number'); } if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideMobileNumber')) { - $return['PDF_fields'][] = 'mobileTelephoneNumber'; + $return['PDF_fields']['mobileTelephoneNumber'] = _('Mobile number'); } if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideFaxNumber')) { - $return['PDF_fields'][] = 'facimilieTelephoneNumber'; + $return['PDF_fields']['facimilieTelephoneNumber'] = _('Fax number'); } if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideEMailAddress')) { - $return['PDF_fields'][] = 'mail'; + $return['PDF_fields']['mail'] = _('Email address'); } if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideJobTitle')) { - $return['PDF_fields'][] = 'title'; + $return['PDF_fields']['title'] = _('Job title'); } if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideCarLicense')) { - $return['PDF_fields'][] = 'carLicense'; + $return['PDF_fields']['carLicense'] = _('Car license'); } if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideEmployeeType')) { - $return['PDF_fields'][] = 'employeeType'; + $return['PDF_fields']['employeeType'] = _('Employee type'); } if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideBusinessCategory')) { - $return['PDF_fields'][] = 'businessCategory'; + $return['PDF_fields']['businessCategory'] = _('Business category'); } if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideDepartments')) { - $return['PDF_fields'][] = 'departmentNumber'; + $return['PDF_fields']['departmentNumber'] = _('Department(s)'); } if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideManager')) { - $return['PDF_fields'][] = 'manager'; + $return['PDF_fields']['manager'] = _('Manager'); } if (isset($_SESSION['loggedIn']) && ($_SESSION['loggedIn'] === true)) { $modules = $_SESSION['config']->get_AccountModules($this->get_scope()); if (!in_array('posixAccount', $modules)) { - $return['PDF_fields'][] = 'uid'; - $return['PDF_fields'][] = 'cn'; + $return['PDF_fields']['uid'] = _('User name'); + $return['PDF_fields']['cn'] = _('Common name'); } } // help Entries diff --git a/lam/lib/modules/kolabUser.inc b/lam/lib/modules/kolabUser.inc index 050d511f..4b34f4ff 100644 --- a/lam/lib/modules/kolabUser.inc +++ b/lam/lib/modules/kolabUser.inc @@ -3,7 +3,7 @@ $Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2004 - 2008 Roland Gruber + Copyright (C) 2004 - 2010 Roland Gruber 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 @@ -223,7 +223,13 @@ class kolabUser extends baseModule { ); // available PDF fields $return['PDF_fields'] = array( - 'invPol', 'country', 'homeServer', 'aliases', 'delegate', 'freeBusy', 'quota' + 'invPol' => _('Invitation policy'), + 'country' => _('Country'), + 'homeServer' => _('Mailbox home server'), + 'aliases' => _('Email aliases'), + 'delegate' => _('Delegates'), + 'freeBusy' => _('Free/Busy interval'), + 'quota' => _('Mail quota') ); return $return; } diff --git a/lam/lib/modules/ldapPublicKey.inc b/lam/lib/modules/ldapPublicKey.inc index fae71500..2dd6d554 100644 --- a/lam/lib/modules/ldapPublicKey.inc +++ b/lam/lib/modules/ldapPublicKey.inc @@ -3,7 +3,7 @@ $Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2005 - 2006 Roland Gruber + Copyright (C) 2005 - 2010 Roland Gruber 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 @@ -78,7 +78,7 @@ class ldapPublicKey extends baseModule { ); // available PDF fields $return['PDF_fields'] = array( - 'sshPublicKey' + 'sshPublicKey' => _('SSH public key(s)') ); return $return; } diff --git a/lam/lib/modules/nisMailAlias.inc b/lam/lib/modules/nisMailAlias.inc index 958d5ea9..1f4a12e0 100644 --- a/lam/lib/modules/nisMailAlias.inc +++ b/lam/lib/modules/nisMailAlias.inc @@ -3,7 +3,7 @@ $Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2004 - 2006 Roland Gruber + Copyright (C) 2004 - 2010 Roland Gruber 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 @@ -93,7 +93,8 @@ class nisMailAlias extends baseModule { ); // available PDF fields $return['PDF_fields'] = array( - 'alias', 'recipients' + 'alias' => _('Alias name'), + 'recipients' => _('Recipient list') ); return $return; } diff --git a/lam/lib/modules/nisnetgroup.inc b/lam/lib/modules/nisnetgroup.inc index c4038b99..289452ab 100644 --- a/lam/lib/modules/nisnetgroup.inc +++ b/lam/lib/modules/nisnetgroup.inc @@ -3,7 +3,7 @@ $Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2009 Roland Gruber + Copyright (C) 2009 - 2010 Roland Gruber 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 @@ -121,8 +121,10 @@ class nisnetgroup extends baseModule { ); // available PDF fields $return['PDF_fields'] = array( - 'cn', 'description', - 'subgroups', 'members' + 'cn' => _('Group name'), + 'description' => _('Description'), + 'subgroups' => _('Subgroups'), + 'members' => _('Members') ); return $return; } diff --git a/lam/lib/modules/phpGroupwareUser.inc b/lam/lib/modules/phpGroupwareUser.inc index 54a793f5..bd5d7416 100644 --- a/lam/lib/modules/phpGroupwareUser.inc +++ b/lam/lib/modules/phpGroupwareUser.inc @@ -3,7 +3,7 @@ $Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2008 - 2009 Roland Gruber + Copyright (C) 2008 - 2010 Roland Gruber 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 @@ -96,8 +96,10 @@ class phpGroupwareUser extends baseModule implements passwordService { ); // available PDF fields $return['PDF_fields'] = array( - 'phpgwAccountStatus', 'phpgwAccountExpires', - 'phpgwLastLoginFrom', 'phpgwLastLogin' + 'phpgwAccountStatus' => _('Account status'), + 'phpgwAccountExpires' => _('Account expiration date'), + 'phpgwLastLoginFrom' => _('Last login from'), + 'phpgwLastLogin' => _('Last login') ); // upload dependencies $return['upload_preDepends'] = array('posixAccount'); diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc index 8f0c44fe..bbd0a8fb 100644 --- a/lam/lib/modules/posixAccount.inc +++ b/lam/lib/modules/posixAccount.inc @@ -308,16 +308,16 @@ class posixAccount extends baseModule implements passwordService { } // available PDF fields $return['PDF_fields'] = array( - 'uid', - 'uidNumber', - 'gidNumber', - 'gecos', - 'primaryGroup', - 'additionalGroups', - 'homeDirectory', - 'loginShell', - 'cn', - 'userPassword' + 'uid' => _('User name'), + 'uidNumber' => _('UID number'), + 'gidNumber' => _('GID number'), + 'gecos' => _('Gecos'), + 'primaryGroup' => _('Primary group'), + 'additionalGroups' => _('Additional groups'), + 'homeDirectory' => _('Home directory'), + 'loginShell' => _('Login shell'), + 'cn' => _('Common name'), + 'userPassword' => _('Password') ); // help Entries $return['help'] = array( diff --git a/lam/lib/modules/posixGroup.inc b/lam/lib/modules/posixGroup.inc index bb7f01d9..cbf978c8 100644 --- a/lam/lib/modules/posixGroup.inc +++ b/lam/lib/modules/posixGroup.inc @@ -4,7 +4,7 @@ $Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) Copyright (C) 2003 - 2006 Tilo Lutz - 2007 - 2009 Roland Gruber + 2007 - 2010 Roland Gruber 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 @@ -321,14 +321,14 @@ class posixGroup extends baseModule implements passwordService { 'error_message' => $this->messages['gidNumber'][7]); // available PDF fields $return['PDF_fields'] = array( - 'gidNumber', - 'memberUid' + 'gidNumber' => _('GID number'), + 'memberUid' => _('Group members') ); if ($this->manageCnAttribute) { - array_unshift($return['PDF_fields'], 'cn'); + $return['PDF_fields']['cn'] = _('Group name'); } if ($this->manageDescriptionAttribute) { - $return['PDF_fields'][] = 'description'; + $return['PDF_fields']['description'] = _('Description'); } // upload fields $return['upload_columns'] = array( diff --git a/lam/lib/modules/quota.inc b/lam/lib/modules/quota.inc index df49814d..85cb4266 100644 --- a/lam/lib/modules/quota.inc +++ b/lam/lib/modules/quota.inc @@ -89,7 +89,7 @@ class quota extends baseModule { $return['attributes'] = array('uid', 'cn'); // available PDF fields $return['PDF_fields'] = array( - 'quotas' + 'quotas' => _('Quota') ); // help entries $return['help'] = array( diff --git a/lam/lib/modules/range.inc b/lam/lib/modules/range.inc index f5bd6c63..4666ceb9 100644 --- a/lam/lib/modules/range.inc +++ b/lam/lib/modules/range.inc @@ -89,7 +89,7 @@ class range extends baseModule { ) ); // available PDF fields - $return['PDF_fields'] = array('ranges'); + $return['PDF_fields'] = array('ranges' => _('Ranges')); return $return; } diff --git a/lam/lib/modules/sambaDomain.inc b/lam/lib/modules/sambaDomain.inc index 6c50de42..308ec6c9 100644 --- a/lam/lib/modules/sambaDomain.inc +++ b/lam/lib/modules/sambaDomain.inc @@ -3,7 +3,7 @@ $Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2005 - 2007 Roland Gruber + Copyright (C) 2005 - 2010 Roland Gruber 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 @@ -174,10 +174,23 @@ class sambaDomain extends baseModule { ); // available PDF fields $return['PDF_fields'] = array( - 'domainName', 'domainSID', 'nextRID', 'nextUserRID', 'nextGroupRID', 'RIDbase', - 'minPwdLength', 'pwdHistoryLength', 'logonToChgPwd', 'forceLogoff', - 'refuseMachinePwdChange', 'lockoutThreshold', 'minPwdAge', 'maxPwdAge', - 'lockoutDuration', 'lockoutObservationWindow'); + 'domainName' => _('Domain name'), + 'domainSID' => _('Domain SID'), + 'nextRID' => _('Next RID'), + 'nextUserRID' => _('Next user RID'), + 'nextGroupRID' => _('Next group RID'), + 'RIDbase' => _('RID base'), + 'minPwdLength' => _('Minimal password length'), + 'pwdHistoryLength' => _('Password history length'), + 'logonToChgPwd' => _('Logon for password change'), + 'forceLogoff' => _('Disconnect users outside logon hours'), + 'refuseMachinePwdChange' => _('Allow machine password changes'), + 'lockoutThreshold' => _('Lockout users after bad logon attempts'), + 'minPwdAge' => _('Minimum password age'), + 'maxPwdAge' => _('Maximum password age'), + 'lockoutDuration' => _('Lockout duration'), + 'lockoutObservationWindow' => _('Reset time after lockout') + ); return $return; } diff --git a/lam/lib/modules/sambaGroupMapping.inc b/lam/lib/modules/sambaGroupMapping.inc index 89afd269..2c8b2728 100644 --- a/lam/lib/modules/sambaGroupMapping.inc +++ b/lam/lib/modules/sambaGroupMapping.inc @@ -4,7 +4,7 @@ $Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) Copyright (C) 2003 - 2006 Tilo Lutz - 2007 - 2008 Roland Gruber + 2007 - 2010 Roland Gruber 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 @@ -306,11 +306,11 @@ class sambaGroupMapping extends baseModule { $return['attributes'] = array('gidNumber', 'sambaSID', 'sambaGroupType', 'displayName', 'sambaSIDList', 'description'); // available PDF fields $return['PDF_fields'] = array( - 'gidNumber', - 'sambaSID', - 'displayName', - 'sambaGroupType', - 'description' + 'gidNumber' => _('GID number'), + 'sambaSID' => _('Windows group'), + 'displayName' => _('Display name'), + 'sambaGroupType' => _('Samba group type'), + 'description' => _('Description') ); // upload fields // search existing Samba 3 domains diff --git a/lam/lib/modules/sambaSamAccount.inc b/lam/lib/modules/sambaSamAccount.inc index 00ee8ba2..f0d5247a 100644 --- a/lam/lib/modules/sambaSamAccount.inc +++ b/lam/lib/modules/sambaSamAccount.inc @@ -186,40 +186,42 @@ class sambaSamAccount extends baseModule implements passwordService { } // available PDF fields $return['PDF_fields'] = array( - 'displayName', 'sambaDomainName', 'sambaPrimaryGroupSID' + 'displayName' => _('Display name'), + 'sambaDomainName' => _('Domain'), + 'sambaPrimaryGroupSID' => _('Windows group') ); if (!$this->isBooleanConfigOptionSet('sambaSamAccount_hideHomeDrive')) { - $return['PDF_fields'][] = 'sambaHomeDrive'; + $return['PDF_fields']['sambaHomeDrive'] = _('Home drive'); } if (!$this->isBooleanConfigOptionSet('sambaSamAccount_hideHomePath')) { - $return['PDF_fields'][] = 'sambaHomePath'; + $return['PDF_fields']['sambaHomePath'] = _('Home path'); } if (!$this->isBooleanConfigOptionSet('sambaSamAccount_hideProfilePath')) { - $return['PDF_fields'][] = 'sambaProfilePath'; + $return['PDF_fields']['sambaProfilePath'] = _('Profile path'); } if (!$this->isBooleanConfigOptionSet('sambaSamAccount_hideLogonScript')) { - $return['PDF_fields'][] = 'sambaLogonScript'; + $return['PDF_fields']['sambaLogonScript'] = _('Logon script'); } if (!$this->isBooleanConfigOptionSet('sambaSamAccount_hideWorkstations')) { - $return['PDF_fields'][] = 'sambaUserWorkstations'; + $return['PDF_fields']['sambaUserWorkstations'] = _('Samba workstations'); } if (!$this->isBooleanConfigOptionSet('sambaSamAccount_hideTerminalServer')) { - $return['PDF_fields'][] = 'tsAllowLogin'; - $return['PDF_fields'][] = 'tsHomeDir'; - $return['PDF_fields'][] = 'tsHomeDrive'; - $return['PDF_fields'][] = 'tsProfilePath'; - $return['PDF_fields'][] = 'tsInherit'; - $return['PDF_fields'][] = 'tsInitialProgram'; - $return['PDF_fields'][] = 'tsWorkDirectory'; - $return['PDF_fields'][] = 'tsConnectionLimit'; - $return['PDF_fields'][] = 'tsDisconnectionLimit'; - $return['PDF_fields'][] = 'tsIdleLimit'; - $return['PDF_fields'][] = 'tsConnectDrives'; - $return['PDF_fields'][] = 'tsConnectPrinters'; - $return['PDF_fields'][] = 'tsClientPrinterDefault'; - $return['PDF_fields'][] = 'tsShadowing'; - $return['PDF_fields'][] = 'tsBrokenConn'; - $return['PDF_fields'][] = 'tsReconnect'; + $return['PDF_fields']['tsAllowLogin'] = _('Allow terminal server login'); + $return['PDF_fields']['tsHomeDir'] = _('Home directory') . ' (TS)'; + $return['PDF_fields']['tsHomeDrive'] = _('Home drive') . ' (TS)'; + $return['PDF_fields']['tsProfilePath'] = _('Profile path') . ' (TS)'; + $return['PDF_fields']['tsInherit'] = _('Inherit client startup configuration') . ' (TS)'; + $return['PDF_fields']['tsInitialProgram'] = _('Initial program') . ' (TS)'; + $return['PDF_fields']['tsWorkDirectory'] = _('Working directory') . ' (TS)'; + $return['PDF_fields']['tsConnectionLimit'] = _('Connection time limit') . ' (TS)'; + $return['PDF_fields']['tsDisconnectionLimit'] = _('Disconnection time limit') . ' (TS)'; + $return['PDF_fields']['tsIdleLimit'] = _('Idle time limit') . ' (TS)'; + $return['PDF_fields']['tsConnectDrives'] = _('Connect client drives') . ' (TS)'; + $return['PDF_fields']['tsConnectPrinters'] = _('Connect client printers') . ' (TS)'; + $return['PDF_fields']['tsClientPrinterDefault'] = _('Client printer is default') . ' (TS)'; + $return['PDF_fields']['tsShadowing'] = _('Shadowing') . ' (TS)'; + $return['PDF_fields']['tsBrokenConn'] = _('On broken or timed out connection') . ' (TS)'; + $return['PDF_fields']['tsReconnect'] = _('Reconnect if disconnected') . ' (TS)'; } $return['selfServiceFieldSettings'] = array( 'syncNTPassword' => _('Sync Samba NT password with Unix password'), @@ -1361,8 +1363,8 @@ class sambaSamAccount extends baseModule implements passwordService { } $return[] = array(0 => array('kind' => 'text', 'text' => ' ', 'td' => array('colspan' => 8))); $return[] = array( - 0 => array('kind' => 'input', 'name' => 'form_subpage_sambaSamAccount_attributes_submit', 'type' => 'submit', 'value' => _('Ok'), 'td' => array('align' => 'right')), - 1 => array('kind' => 'input', 'name' => 'form_subpage_sambaSamAccount_attributes_abort', 'type' => 'submit', 'value' => _('Cancel'), 'td' => array('align' => 'left')) + array('kind' => 'input', 'name' => 'form_subpage_sambaSamAccount_attributes_submit', 'type' => 'submit', 'value' => _('Ok'), 'td' => array('align' => 'right')), + array('kind' => 'input', 'name' => 'form_subpage_sambaSamAccount_attributes_abort', 'type' => 'submit', 'value' => _('Cancel'), 'td' => array('align' => 'left')) ); return $return; } @@ -1790,34 +1792,34 @@ class sambaSamAccount extends baseModule implements passwordService { $tsAllowLogin = _('no'); } $return['sambaSamAccount_tsAllowLogin'] = array('' . _('Allow terminal server login') . '' . $tsAllowLogin . ''); - $return['sambaSamAccount_tsHomeDir'] = array('' . _('Home directory') . '' . $mDial->ctx['CtxWFHomeDir'] . ''); - $return['sambaSamAccount_tsHomeDrive'] = array('' . _('Home drive') . '' . $mDial->ctx['CtxWFHomeDirDrive'] . ''); - $return['sambaSamAccount_tsProfilePath'] = array('' . _('Profile path') . '' . $mDial->ctx['CtxWFProfilePath'] . ''); + $return['sambaSamAccount_tsHomeDir'] = array('' . _('Home directory') . ' (TS)' . $mDial->ctx['CtxWFHomeDir'] . ''); + $return['sambaSamAccount_tsHomeDrive'] = array('' . _('Home drive') . ' (TS)' . $mDial->ctx['CtxWFHomeDirDrive'] . ''); + $return['sambaSamAccount_tsProfilePath'] = array('' . _('Profile path') . ' (TS)' . $mDial->ctx['CtxWFProfilePath'] . ''); $tsInherit = _('yes'); if (!$mDial->getInheritMode()) { $tsInherit = _('no'); } - $return['sambaSamAccount_tsInherit'] = array('' . _('Inherit client startup configuration') . '' . $tsInherit . ''); - $return['sambaSamAccount_tsInitialProgram'] = array('' . _('Initial program') . '' . $mDial->ctx['CtxInitialProgram'] . ''); - $return['sambaSamAccount_tsWorkDirectory'] = array('' . _('Working directory') . '' . $mDial->ctx['CtxWorkDirectory'] . ''); - $return['sambaSamAccount_tsConnectionLimit'] = array('' . _('Connection time limit') . '' . $mDial->ctx['CtxMaxConnectionTime'] . ''); - $return['sambaSamAccount_tsDisconnectionLimit'] = array('' . _('Disconnection time limit') . '' . $mDial->ctx['CtxMaxDisconnectionTime'] . ''); - $return['sambaSamAccount_tsIdleLimit'] = array('' . _('Idle time limit') . '' . $mDial->ctx['CtxMaxIdleTime'] . ''); + $return['sambaSamAccount_tsInherit'] = array('' . _('Inherit client startup configuration') . ' (TS)' . $tsInherit . ''); + $return['sambaSamAccount_tsInitialProgram'] = array('' . _('Initial program') . ' (TS)' . $mDial->ctx['CtxInitialProgram'] . ''); + $return['sambaSamAccount_tsWorkDirectory'] = array('' . _('Working directory') . ' (TS)' . $mDial->ctx['CtxWorkDirectory'] . ''); + $return['sambaSamAccount_tsConnectionLimit'] = array('' . _('Connection time limit') . ' (TS)' . $mDial->ctx['CtxMaxConnectionTime'] . ''); + $return['sambaSamAccount_tsDisconnectionLimit'] = array('' . _('Disconnection time limit') . ' (TS)' . $mDial->ctx['CtxMaxDisconnectionTime'] . ''); + $return['sambaSamAccount_tsIdleLimit'] = array('' . _('Idle time limit') . ' (TS)' . $mDial->ctx['CtxMaxIdleTime'] . ''); $tsConnectDrives = _('yes'); if (!$mDial->getConnectClientDrives()) { $tsConnectDrives = _('no'); } - $return['sambaSamAccount_tsConnectDrives'] = array('' . _('Connect client drives') . '' . $tsConnectDrives . ''); + $return['sambaSamAccount_tsConnectDrives'] = array('' . _('Connect client drives') . ' (TS)' . $tsConnectDrives . ''); $tsConnectPrinters = _('yes'); if (!$mDial->getConnectClientPrinters()) { $tsConnectPrinters = _('no'); } - $return['sambaSamAccount_tsConnectPrinters'] = array('' . _('Connect client printers') . '' . $tsConnectPrinters . ''); + $return['sambaSamAccount_tsConnectPrinters'] = array('' . _('Connect client printers') . ' (TS)' . $tsConnectPrinters . ''); $tsClientPrinterDefault = _('yes'); if (!$mDial->getDefaultPrinter()) { $tsClientPrinterDefault = _('no'); } - $return['sambaSamAccount_tsClientPrinterDefault'] = array('' . _('Client printer is default') . '' . $tsClientPrinterDefault . ''); + $return['sambaSamAccount_tsClientPrinterDefault'] = array('' . _('Client printer is default') . ' (TS)' . $tsClientPrinterDefault . ''); $shadowOptions = array( '0' => _("disabled"), '1' => _("input on, notify on"), @@ -1828,7 +1830,7 @@ class sambaSamAccount extends baseModule implements passwordService { if (($mDial->getShadow() != null) && is_numeric($mDial->getShadow())) { $tsShadowing = $shadowOptions[$mDial->getShadow()]; } - $return['sambaSamAccount_tsShadowing'] = array('' . _('Shadowing') . '' . $tsShadowing . ''); + $return['sambaSamAccount_tsShadowing'] = array('' . _('Shadowing') . ' (TS)' . $tsShadowing . ''); $brokenConnOptions = array( '0' => _("disconnect"), '1' => _("reset")); @@ -1836,7 +1838,7 @@ class sambaSamAccount extends baseModule implements passwordService { if (($mDial->getBrokenConn() != null) && is_numeric($mDial->getBrokenConn())) { $tsBrokenConn = $brokenConnOptions[$mDial->getBrokenConn()]; } - $return['sambaSamAccount_tsBrokenConn'] = array('' . _('On broken or timed out connection') . '' . $tsBrokenConn . ''); + $return['sambaSamAccount_tsBrokenConn'] = array('' . _('On broken or timed out connection') . ' (TS)' . $tsBrokenConn . ''); $reconnectOptions = array( '0' => _("from any client"), '1' => _("from previous client only")); @@ -1844,7 +1846,7 @@ class sambaSamAccount extends baseModule implements passwordService { if (($mDial->getReConn() != null) && is_numeric($mDial->getReConn())) { $tsReconnect = $reconnectOptions[$mDial->getReConn()]; } - $return['sambaSamAccount_tsReconnect'] = array('' . _('Reconnect if disconnected') . '' . $tsReconnect . ''); + $return['sambaSamAccount_tsReconnect'] = array('' . _('Reconnect if disconnected') . ' (TS)' . $tsReconnect . ''); } return $return; }