From ef1e5f92ce5ce4ac533fcc5ae467164739c7f725 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 24 Jun 2008 13:14:18 +0000 Subject: [PATCH] Updated organization handling. -Added ACLs -Added seperate template. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11419 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../departments/class_organizationGeneric.inc | 85 ++++++++++++++----- .../admin/departments/organization.tpl | 44 +++++++--- 2 files changed, 98 insertions(+), 31 deletions(-) diff --git a/gosa-core/plugins/admin/departments/class_organizationGeneric.inc b/gosa-core/plugins/admin/departments/class_organizationGeneric.inc index 467aa85e5..5a1219c2a 100644 --- a/gosa-core/plugins/admin/departments/class_organizationGeneric.inc +++ b/gosa-core/plugins/admin/departments/class_organizationGeneric.inc @@ -34,27 +34,27 @@ class organization extends department /* Attributes */ - var $st ="c"; - var $l ="c"; - var $description ="c"; - var $userPassword ="c"; - var $searchGuide ="c"; - var $seeAlso ="c"; - var $businessCategory ="c"; - var $x121Address ="c"; - var $registeredAddress ="c"; - var $destinationIndicator ="c"; - var $preferredDeliveryMethod ="c"; - var $telexNumber ="c"; - var $telephoneNumber ="c"; - var $internationaliSDNNumber ="c"; - var $facsimileTelephoneNumber ="c"; - var $street ="c"; - var $postOfficeBox ="c"; - var $postalCode ="c"; - var $postalAddress ="c"; - var $teletexTerminalIdentifier="c"; - var $physicalDeliveryOfficeName="c"; + var $st =""; + var $l =""; + var $description =""; + var $userPassword =""; + var $searchGuide =""; + var $seeAlso =""; + var $businessCategory =""; + var $x121Address =""; + var $registeredAddress =""; + var $destinationIndicator =""; + var $preferredDeliveryMethod =""; + var $telexNumber =""; + var $telephoneNumber =""; + var $internationaliSDNNumber =""; + var $facsimileTelephoneNumber =""; + var $street =""; + var $postOfficeBox =""; + var $postalCode =""; + var $postalAddress =""; + var $teletexTerminalIdentifier=""; + var $physicalDeliveryOfficeName=""; /* Naming attributes */ @@ -68,6 +68,49 @@ class organization extends department $message = plugin::check(); return($message); } + + + /* Return plugin informations for acl handling */ + static function plInfo() + { + return (array("plShortName" => _("Organization"), + "plDescription" => _("Organization"), + "plSelfModify" => FALSE, + "plPriority" => 0, + "plDepends" => array(), + "plSection" => array("admin"), + "plCategory" => array("department"), + + "plProvidedAcls" => array( +# "userPassword" => _("Password"), +# "searchGuide" => _("Search guide"), +# "seeAlso" => _("See also"), +# "x121Address" => _("No idea"), +# "registeredAddress" => _("Registered address"), +# "teletexTerminalIdentifier" => _("Teletext terminal identifier"), +# "physicalDeliveryOfficeName" => _("Physical delivery office name"), +# "internationaliSDNNumber" => _("International ISDN number"), +# "preferredDeliveryMethod" => _("Prefered delivery mode"), +# "telexNumber" => _("Telex number"), + + + "o" => _("Organization name"), + "description" => _("Description"), + "destinationIndicator" => _("Destination indicatior"), + "telephoneNumber" => _("Phone number"), + "street" => _("Street"), + "postOfficeBox" => _("Post office box "), + "postalCode" => _("Postal code"), + "postalAddress" => _("Postal address"), + "base" => _("Base"), + "businessCategory" => _("Category"), + "st" => _("State"), + "l" => _("Location"), + "gosaUnitTag" => _("Administrative settings"), + "facsimileTelephoneNumber"=> _("Fax")) + )); + } + } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/gosa-core/plugins/admin/departments/organization.tpl b/gosa-core/plugins/admin/departments/organization.tpl index 25b79dcdb..26ddc581c 100644 --- a/gosa-core/plugins/admin/departments/organization.tpl +++ b/gosa-core/plugins/admin/departments/organization.tpl @@ -1,17 +1,17 @@ - + +

{t}Properties{/t}

+ - + @@ -23,8 +23,20 @@ {/render} + + + + + + + + - -
{$must}{$must} -{render acl=$ouACL} - +{render acl=$oACL} + {/render}
+{render acl=$businessCategoryACL} + +{/render} +

{$must} {render acl=$baseACL} {/render} -
+
+ +   @@ -84,12 +98,14 @@ {/render} - - - + + + +

 

+
@@ -100,3 +116,11 @@
+ + + + -- 2.30.2