From 0554f323ab7240a30c0ac87261d85ffb9776a68a Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 17 Jul 2006 05:55:06 +0000 Subject: [PATCH 1/1] Fixed connectivity acls git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4167 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../connectivity/class_kolabAccount.inc | 22 ++++++++---- .../connectivity/class_opengwAccount.inc | 15 +++++--- .../connectivity/class_oxchangeAccount.inc | 24 ++++++++----- .../connectivity/class_phpgwAccount.inc | 17 +++++++--- .../class_phpscheduleitAccount.inc | 17 +++++++--- .../connectivity/class_pptpAccount.inc | 20 +++++++---- .../connectivity/class_proxyAccount.inc | 34 +++++++++++-------- .../connectivity/class_pureftpdAccount.inc | 30 +++++++++------- .../connectivity/class_webdavAccount.inc | 16 ++++++--- 9 files changed, 129 insertions(+), 66 deletions(-) diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc index 9f08ea911..85a9bd8da 100644 --- a/plugins/personal/connectivity/class_kolabAccount.inc +++ b/plugins/personal/connectivity/class_kolabAccount.inc @@ -406,13 +406,21 @@ class kolabAccount extends plugin function plInfo() { return (array( - "plDescription" => _("Koalb account settings"), - "plSelfModify" => TRUE, - "plDepends" => array("objectClass" => "gosaAccount"), - "kolabFreeBusyFuture" => _("Free busy future"), - "unrestrictedMailSize" => _("Mail size restriction"), - "calFBURL" => _("Free busy information"), - "kolabDelegate" => _("Delegations"))); + "plShortName" => _("Kolab"), + "plDescription" => _("Kolab account settings"), + "plSelfModify" => TRUE, + "plDepends" => array("connectivity"), + "plPriority" => 2, // Position in tabs + "plSection" => "personal", // This belongs to personal + "plCategory" => array("gosaAccount"), + "plOptions" => array(), + + "plProvidedAcls" => array( + "kolabFreeBusyFuture" => _("Free busy future"), + "unrestrictedMailSize" => _("Mail size restriction"), + "calFBURL" => _("Free busy information"), + "kolabDelegate" => _("Delegations")) + )); } } diff --git a/plugins/personal/connectivity/class_opengwAccount.inc b/plugins/personal/connectivity/class_opengwAccount.inc index c4042e3f3..1ca0f5163 100644 --- a/plugins/personal/connectivity/class_opengwAccount.inc +++ b/plugins/personal/connectivity/class_opengwAccount.inc @@ -331,13 +331,20 @@ class opengwAccount extends plugin #FIXME This is only an enable/disable checkbox for this account, there is possibly a better solution available later */ function plInfo() { - return (array( + return (array( + "plShortName" => _("Opengroupware"), "plDescription" => _("Open groupware account settings"), "plSelfModify" => TRUE, - "plDepends" => array("objectClass" => "gosaAccount"), - "opengwAccount" => "!!! FIXME "._("Open groupware account"))); + "plDepends" => array("connectivity"), + "plPriority" => 3, // Position in tabs + "plSection" => "personal", // This belongs to personal + "plCategory" => array("gosaAccount"), + "plOptions" => array(), + + "plProvidedAcls" => array( + "opengwAccount" => "!!! FIXME "._("Open groupware account")) + )); } - } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: ?> diff --git a/plugins/personal/connectivity/class_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc index 7e26867f0..3ea6e541b 100644 --- a/plugins/personal/connectivity/class_oxchangeAccount.inc +++ b/plugins/personal/connectivity/class_oxchangeAccount.inc @@ -876,14 +876,22 @@ class oxchangeAccount extends plugin #FIXME ACL attributes aren't translated yet. */ function plInfo() { - return ( - array("plDescription" => _("Open xchange account settings"), - "plSelfModify" => TRUE, - "plDepends" => array("objectClass" => _("gosaAccount")), - "OXAppointmentDays" => "!!! FIXME "._("OXAppointmentDays"), - "OXTaskDays" => _("OXTaskDays"), - "mailEnabled" => _("mailEnabled"), - "OXTimeZone" => _("OXTimeZone"))); + return (array( + "plShortName" => _("Open xchange"), + "plDescription" => _("Open xchange account settings"), + "plSelfModify" => TRUE, + "plDepends" => array("connectivity"), + "plPriority" => 4, // Position in tabs + "plSection" => "personal", // This belongs to personal + "plCategory" => array("gosaAccount"), + "plOptions" => array(), + + "plProvidedAcls" => array( + "OXAppointmentDays" => "!!! FIXME "._("OXAppointmentDays"), + "OXTaskDays" => _("OXTaskDays"), + "mailEnabled" => _("mailEnabled"), + "OXTimeZone" => _("OXTimeZone")) + )); } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/plugins/personal/connectivity/class_phpgwAccount.inc b/plugins/personal/connectivity/class_phpgwAccount.inc index 368ae9522..972837670 100644 --- a/plugins/personal/connectivity/class_phpgwAccount.inc +++ b/plugins/personal/connectivity/class_phpgwAccount.inc @@ -125,15 +125,22 @@ class phpgwAccount extends plugin #FIME ACL attributes arn't translated yet */ function plInfo() { - return (array( "plDescription" => _("Intranet account settings"), + return (array( + "plShortName" => _("PHP GW"), + "plDescription" => _("PHP GW account settings"), "plSelfModify" => TRUE, - "plDepends" => array("objectClass" => "gosaAccount"), + "plDepends" => array("connectivity"), + "plPriority" => 5, // Position in tabs + "plSection" => "personal", // This belongs to personal + "plCategory" => array("gosaAccount"), + "plOptions" => array(), + + "plProvidedAcls" => array( "phpgwAccountExpires" =>"!!! FIXME "._("phpgwAccountExpires"), "phpgwAccountStatus" =>_("phpgwAccountStatus"), - "phpgwAccountType" =>_("phpgwAccountType"))); + "phpgwAccountType" =>_("phpgwAccountType")) + )); } - - } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/plugins/personal/connectivity/class_phpscheduleitAccount.inc b/plugins/personal/connectivity/class_phpscheduleitAccount.inc index 13931e4fc..e6dbb2a70 100644 --- a/plugins/personal/connectivity/class_phpscheduleitAccount.inc +++ b/plugins/personal/connectivity/class_phpscheduleitAccount.inc @@ -134,13 +134,20 @@ class phpscheduleitAccount extends plugin #FIXME This is only an enable/disable checkbox for this account, there is possibly a better solution available later */ function plInfo() { - return (array( "plDescription" => _("PHPscheduleit account"), + return (array( + "plShortName" => _("PHP Schedule it"), + "plDescription" => _("PHP Schedule it settings"), "plSelfModify" => TRUE, - "plDepends" => array("objectClass" => "gosaAccount"), - "phpscheduleitAccount" => "!!! FIXME "._("PHPscheduleit account"))); + "plDepends" => array("connectivity"), + "plPriority" => 6, // Position in tabs + "plSection" => "personal", // This belongs to personal + "plCategory" => array("gosaAccount"), + "plOptions" => array(), + + "plProvidedAcls" => array( + "phpscheduleitAccount" => "!!! FIXME "._("PHPscheduleit account")) + )); } - - } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/plugins/personal/connectivity/class_pptpAccount.inc b/plugins/personal/connectivity/class_pptpAccount.inc index fff0bcf3c..fdb110b1e 100644 --- a/plugins/personal/connectivity/class_pptpAccount.inc +++ b/plugins/personal/connectivity/class_pptpAccount.inc @@ -137,14 +137,20 @@ class pptpAccount extends plugin #FIXME This is only an enable/disable checkbox for this account, there is possibly a better solution available later */ function plInfo() { - return (array( - "plDescription" => _("PPTP account"), - "plSelfModify" => TRUE, - "plDepends" => array("objectClass" => "gosaAccount"), - "pptpServerAccount" => "!!! FIXME "._("PPTP account"))); + return (array( + "plShortName" => _("PPTP"), + "plDescription" => _("PPTP account"), + "plSelfModify" => TRUE, + "plDepends" => array("connectivity"), + "plPriority" => 1, // Position in tabs + "plSection" => "personal", // This belongs to personal + "plCategory" => array("gosaAccount"), + "plOptions" => array(), + + "plProvidedAcls" => array( + "pptpServerAccount" => "!!! FIXME "._("PPTP account")) + )); } - - } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/plugins/personal/connectivity/class_proxyAccount.inc b/plugins/personal/connectivity/class_proxyAccount.inc index cddd05d9b..6f0447335 100644 --- a/plugins/personal/connectivity/class_proxyAccount.inc +++ b/plugins/personal/connectivity/class_proxyAccount.inc @@ -271,22 +271,28 @@ class proxyAccount extends plugin #FIME There possibly some attributes that can be combined to one acl. */ function plInfo() { - return (array( "plDescription" => _("Intranet account settings"), + return (array( + "plShortName" => _("Proxy"), + "plDescription" => _("Proxy account"), "plSelfModify" => TRUE, - "plDepends" => array("objectClass" => "gosaAccount"), - - "gosaProxyID" => "!!! FIXME "._("gosaProxyID"), - - "gosaProxyFlag_F" => _("Filter unwanted content"), - "gosaProxyFlag_T" => _("Limit proxy access"), - "gosaProxyFlag_B" => _("Restrict proxy usage by quota"), - - "gosaProxyWorkingTime" => _("Limit proxy access"), - "gosaProxyQuota" => _("Limit quota"), - "gosaProxyQuotaPeriod" => _("Quota limit period"))); + "plDepends" => array("connectivity"), + "plPriority" => 7, // Position in tabs + "plSection" => "personal", // This belongs to personal + "plCategory" => array("gosaAccount"), + "plOptions" => array(), + + "plProvidedAcls" => array( + "gosaProxyID" => "!!! FIXME "._("gosaProxyID"), + + "gosaProxyFlag_F" => _("Filter unwanted content"), + "gosaProxyFlag_T" => _("Limit proxy access"), + "gosaProxyFlag_B" => _("Restrict proxy usage by quota"), + + "gosaProxyWorkingTime" => _("Limit proxy access"), + "gosaProxyQuota" => _("Limit quota"), + "gosaProxyQuotaPeriod" => _("Quota limit period")) + )); } - - } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/plugins/personal/connectivity/class_pureftpdAccount.inc b/plugins/personal/connectivity/class_pureftpdAccount.inc index 4cea74549..af13efb6a 100644 --- a/plugins/personal/connectivity/class_pureftpdAccount.inc +++ b/plugins/personal/connectivity/class_pureftpdAccount.inc @@ -185,20 +185,26 @@ class pureftpdAccount extends plugin #FIME There possibly some attributes that can be combined to one acl. */ function plInfo() { - return (array( - "plDescription" => _("Intranet account settings"), + return (array( + "plShortName" => _("Ftp"), + "plDescription" => _("Pure ftp account"), "plSelfModify" => TRUE, - "plDepends" => array("objectClass" => "gosaAccount"), - - "FTPQuotaFiles" => "!!! FIXME "._("Quota files"), - "FTPUploadRatio" => _("Upload ratio"), - "FTPQuotaMBytes" => _("Quota MBytes"), - "FTPDownloadRatio" => _("Download ratio"), - "FTPUploadBandwidth" => _("Upload bandwith"), - "FTPDownloadBandwidth" => _("Download bandwith"), - "FTPStatus" => _("Status"))); + "plDepends" => array("connectivity"), + "plPriority" => 8, // Position in tabs + "plSection" => "personal", // This belongs to personal + "plCategory" => array("gosaAccount"), + "plOptions" => array(), + + "plProvidedAcls" => array( + "FTPQuotaFiles" => "!!! FIXME "._("Quota files"), + "FTPUploadRatio" => _("Upload ratio"), + "FTPQuotaMBytes" => _("Quota MBytes"), + "FTPDownloadRatio" => _("Download ratio"), + "FTPUploadBandwidth" => _("Upload bandwith"), + "FTPDownloadBandwidth" => _("Download bandwith"), + "FTPStatus" => _("Status")) + )); } - } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/plugins/personal/connectivity/class_webdavAccount.inc b/plugins/personal/connectivity/class_webdavAccount.inc index 088f01030..80860d545 100644 --- a/plugins/personal/connectivity/class_webdavAccount.inc +++ b/plugins/personal/connectivity/class_webdavAccount.inc @@ -121,10 +121,18 @@ class webdavAccount extends plugin function plInfo() { return (array( - "plDescription" => _("Intranet account settings"), - "plSelfModify" => TRUE, - "plDepends" => array("objectClass" => "gosaAccount"), - "gosaWebdavAccount" => "!!! FIXME "._("WebDAV account"))); + "plShortName" => _("WebDAV"), + "plDescription" => _("WebDAV account"), + "plSelfModify" => TRUE, + "plDepends" => array("connectivity"), + "plPriority" => 9, // Position in tabs + "plSection" => "personal", // This belongs to personal + "plCategory" => array("gosaAccount"), + "plOptions" => array(), + + "plProvidedAcls" => array( + "gosaWebdavAccount" => "!!! FIXME "._("WebDAV account")) + )); } } -- 2.30.2