Fixed connectivity acls

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4167 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc
index 9f08ea9110e4bdad8c1c550f80f08d79ec042c9e..85a9bd8da33a0656ce34a0c9889968a0cb548021 100644 (file)
--- 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 c4042e3f3ae79ad9e0c9c25c7d8e1924643363b1..1ca0f5163c049e11792e59e0b01064f69fbfb171 100644 (file)
--- 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 7e26867f00022f5f1bbbf9dd8cda0ee5accb729a..3ea6e541bb8bfa3c1e37fc911a2965f902e6a3db 100644 (file)
--- 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 368ae95222066f60e69fccf38431c261bca3818e..9728376707cd8fd5773ef2ce907805a696d4b4ae 100644 (file)
--- 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 13931e4fc03d2265fc82b169f22c8807d307476c..e6dbb2a7050835717d600b9797844c8dd4a5a50f 100644 (file)
--- 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 fff0bcf3c4d5b86d19d52f53e8189fb4ffb2a8a9..fdb110b1eec2a8edc6ca49dce3b91b37623e9257 100644 (file)
--- 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 cddd05d9b3c7bad1f1a7f983642d069ee0abcaf5..6f0447335294eb7620010ab94f5f7cd4c79c0862 100644 (file)
--- 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 4cea74549ffc6106148149c9e8344ee4663d4bdb..af13efb6a384e91ecb8f6ccfa7f5257f7d10ed2c 100644 (file)
--- 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 088f0103035bd5f9f0f6d4baba0040b2cebd4e72..80860d545ab2753a6d6099a4bbc2ab29789a43b4 100644 (file)
--- 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"))
+          ));
   }
 }