Added imap acls

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

diff --git a/plugins/admin/systems/class_goImapServer.inc b/plugins/admin/systems/class_goImapServer.inc
index fa4108f8027524daa4e06f727837fac80bfc8dc4..96ddbdb787b6a46120924122e92f5038dcf74644 100644 (file)
--- a/plugins/admin/systems/class_goImapServer.inc
+++ b/plugins/admin/systems/class_goImapServer.inc
@@ -1,6 +1,8 @@
 <?php
 
-class goImapServer extends plugin{
+require_once ("class_goService.inc");
+
+class goImapServer extends goService {
        
   var $cli_summary      = "This pluign is used within the ServerService Pluign \nand indicates that this server supports mailqueue listings and so on.";
   var $cli_description  = "Some longer text\nfor help";
@@ -67,7 +69,11 @@ class goImapServer extends plugin{
 
     foreach($this->attributes as $attr){
       $smarty->assign($attr,$this->$attr);  
-      $smarty->assign($attr."ACL",chkacl($this->acl,$attr));  
+    }
+
+    $tmp = $this->plInfo();
+    foreach($tmp['plProvidedAcls'] as $name => $translation){
+      $smarty->assign($name."ACL",$this->getacl($name));
     }
     $smarty->assign("Actions",$this->Actions);
     $smarty->assign("is_new",$this->dn);
@@ -77,90 +83,13 @@ class goImapServer extends plugin{
 
   function getListEntry()
   {
-    $this->updateStatusState();
-    $flag = $this->StatusFlag;
-    $fields['Status']     = $this->$flag;
+    $fields               = goService::getListEntry();
     $fields['Message']    = _("Cyrus service");
-    $fields['AllowStart'] = true;
-    $fields['AllowStop']  = true;
-    $fields['AllowRestart'] = true;
     $fields['AllowRemove']= true;
     $fields['AllowEdit']  = true;
     return($fields);
   }
 
-  function remove_from_parent()
-  {
-    plugin::remove_from_parent();
-
-    /* Remove status flag, it is not a memeber of 
-        this->attributes, so ensure that it is deleted too */
-    if(!empty($this->StatusFlag)){
-      $this->attrs[$this->StatusFlag] = array();
-    }
-
-    /* Check if this is a new entry ... add/modify */
-    $ldap = $this->config->get_ldap_link();
-    $ldap->cat($this->dn,array("objectClass"));
-    if($ldap->count()){
-      $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
-    }else{
-      $ldap->cd($this->dn);
-      $ldap->add($this->attrs);
-    }
-    show_ldap_error($ldap->get_error(), sprintf(_("Removing server services/imap with dn '%s' failed."),$this->dn));
-    $this->handle_post_events("remove");
-  }
-
-  function save()
-  {
-    $this->goImapSieveServer = $this->cn;
-    plugin::save();
-    /* Check if this is a new entry ... add/modify */
-    $ldap = $this->config->get_ldap_link();
-    $ldap->cat($this->dn,array("objectClass"));
-    if($ldap->count()){
-      $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
-    }else{
-      $ldap->cd($this->dn);
-      $ldap->add($this->attrs);
-    }
-    show_ldap_error($ldap->get_error(), sprintf(_("Saving server services/imap with dn '%s' failed."),$this->dn));
-    if($this->initially_was_account){
-      $this->handle_post_events("modify");
-    }else{
-      $this->handle_post_events("add");
-    }
-
-  }
-
-
-   /* Directly save new status flag */
-  function setStatus($value)
-  {
-    if($value == "none") return;
-    if(!$this->initially_was_account) return;
-    $ldap = $this->config->get_ldap_link();
-    $ldap->cd($this->dn);
-    $ldap->cat($this->dn,array("objectClass"));
-    if($ldap->count()){
-
-      $tmp = $ldap->fetch();
-      for($i = 0; $i < $tmp['objectClass']['count']; $i ++){
-        $attrs['objectClass'][] = $tmp['objectClass'][$i];
-      }
-      $flag = $this->StatusFlag;
-      $attrs[$flag] = $value;
-      $this->$flag = $value;
-      $ldap->modify($attrs);
-      show_ldap_error($ldap->get_error(), sprintf(_("Set status flag for server services/imap with dn '%s' failed."),$this->dn));
-      $this->action_hook();
-    }
-  }
-
-
   function check()
   { 
     $message = plugin::check();
@@ -205,66 +134,6 @@ class goImapServer extends plugin{
     }
   }
 
-   function action_hook($add_attrs= array())
-  {
-    /* Find postcreate entries for this class */
-    $command= search_config($this->config->data['MENU'], get_class($this), "ACTION_HOOK");
-    if ($command == "" && isset($this->config->data['TABS'])){
-      $command= search_config($this->config->data['TABS'], get_class($this), "ACTION_HOOK");
-    }
-    if ($command != ""){
-      /* Walk through attribute list */
-      foreach ($this->attributes as $attr){
-        if (!is_array($this->$attr)){
-          $command= preg_replace("/%$attr/", $this->$attr, $command);
-        }
-      }
-      $command= preg_replace("/%dn/", $this->dn, $command);
-      /* Additional attributes */
-      foreach ($add_attrs as $name => $value){
-        $command= preg_replace("/%$name/", $value, $command);
-      }
-
-      /* If there are still some %.. in our command, try to fill these with some other class vars */
-      if(preg_match("/%/",$command)){
-        $attrs = get_object_vars($this);
-        foreach($attrs as $name => $value){
-          if(!is_string($value)) continue;
-          $command= preg_replace("/%$name/", $value, $command);
-        }
-      }
-
-      if (check_command($command)){
-        @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__,
-            $command, "Execute");
-
-        exec($command);
-      } else {
-        $message= sprintf(_("Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."), $command, get_class($this));
-        print_red ($message);
-      }
-    }
-  }
-
-  
-  /* Get updates for status flag */
-  function updateStatusState()
-  {
-    if(empty($this->StatusFlag)) return;
-
-    $attrs = array();
-    $flag = $this->StatusFlag;
-    $ldap = $this->config->get_ldap_link();
-    $ldap->cd($this->cn);
-    $ldap->cat($this->dn,array($flag));
-    if($ldap->count()){
-      $attrs = $ldap->fetch();
-    }
-    if(isset($attrs[$flag][0])){
-      $this->$flag = $attrs[$flag][0];
-    }
-  }
-
 
   /* Return plugin informations for acl handling */
   function plInfo()
@@ -279,6 +148,11 @@ class goImapServer extends plugin{
           "plCategory"    => array("server"),
 
           "plProvidedAcls"=> array(
+
+            "start"         => _("Start"),
+            "stop"          => _("Stop"),
+            "restart"       => _("Restart"),
+
             "goImapName"        =>_("Server identifier"),
             "goImapConnect"     =>_("Connect URL"),
             "goImapAdmin"       =>_("Admin user"),

diff --git a/plugins/admin/systems/goImapServer.tpl b/plugins/admin/systems/goImapServer.tpl
index 8ba8c56dc5e9008c538dc668f2bc1f94bfc88b80..958fecf61b4b8a39e5ce0512960c7e33827438e2 100644 (file)
--- a/plugins/admin/systems/goImapServer.tpl
+++ b/plugins/admin/systems/goImapServer.tpl
@@ -6,31 +6,46 @@
                                <tr>
                                        <td>{t}Server identifier{/t}{$must}
                                        </td>
-                                       <td><input name="goImapName" id="goImapName" size=40 maxlength=60 {$goImapNameACL} value="{$goImapName}" >
+                                       <td>
+{render acl=$goImapNameACL}
+                                               <input name="goImapName" id="goImapName" size=40 maxlength=60 value="{$goImapName}" >
+{/render}
                                        </td>
                                </tr>
                                <tr>
                                        <td>{t}Connect URL{/t}{$must}
                                        </td>
-                                       <td><input name="goImapConnect" id="goImapConnect" size=40 maxlength=60 {$goImapConnectACL} value="{$goImapConnect}" >
+                                       <td>
+{render acl=$goImapConnectACL}
+                                               <input name="goImapConnect" id="goImapConnect" size=40 maxlength=60 value="{$goImapConnect}" >
+{/render}
                                        </td>
                                </tr>
                                <tr>
                                        <td>{t}Admin user{/t}{$must}
                                        </td>
-                                       <td><input name="goImapAdmin" id="goImapAdmin" size=30 maxlength=60 {$goImapAdminACL} value="{$goImapAdmin}" >
+                                       <td>
+{render acl=$goImapAdminACL}
+                                               <input name="goImapAdmin" id="goImapAdmin" size=30 maxlength=60 value="{$goImapAdmin}" >
+{/render}
                                        </td>
                                </tr>
                                <tr>
                                        <td>{t}Password{/t}{$must}
                                        </td>
-                                       <td><input type=password name="goImapPassword" id="goImapPassword" size=30 maxlength=60 {$goImapPasswordACL} value="{$goImapPassword}" >
+                                       <td>
+{render acl=$goImapPasswordACL}
+                                       <input type=password name="goImapPassword" id="goImapPassword" size=30 maxlength=60 value="{$goImapPassword}" >
+{/render}
                                        </td>
                                </tr>
                                <tr>
                                        <td>{t}Sieve port{/t}{$must}
                                        </td>
-                                       <td><input name="goImapSievePort" id="goImapSievePort" size=10 maxlength=30 {$goImapSievePortACL} value="{$goImapSievePort}">
+                                       <td>
+{render acl=$goImapSievePortACL}
+                                               <input name="goImapSievePort" id="goImapSievePort" size=10 maxlength=30 value="{$goImapSievePort}">
+{/render}
                                        </td>
                                </tr>
                        </table>
@@ -39,28 +54,36 @@
                        <table>
                                <tr>
                                        <td>
+{render acl=$cyrusImapACL}
                                                <input type='checkbox' name='cyrusImap' value=1 {if $cyrusImap} checked {/if} {$cyrusImapACL}> 
+{/render}
                                        </td>
                                        <td>{t}Start IMAP service{/t}
                                        </td>
                                </tr>
                                <tr>
                                        <td>
+{render acl=$cyrusImapSSLACL}
                                                <input type='checkbox' name='cyrusImapSSL' value=1 {if $cyrusImapSSL} checked {/if} {$cyrusImapSSLACL}> 
+{/render}
                                        </td>
                                        <td>{t}Start IMAP SSL service{/t}
                                        </td>
                                </tr>
                                <tr>
                                        <td>
+{render acl=$cyrusPop3ACL}
                                                <input type='checkbox' name='cyrusPop3' value=1 {if $cyrusPop3} checked {/if} {$cyrusPop3ACL}> 
+{/render}
                                        </td>
                                        <td>{t}Start POP3 service{/t}
                                        </td>
                                </tr>
                                <tr>
                                        <td>
+{render acl=$cyrusPop3SSLACL}
                                                <input type='checkbox' name='cyrusPop3SSL' value=1 {if $cyrusPop3SSL} checked {/if} {$cyrusPop3SSLACL}> 
+{/render}
                                        </td>
                                        <td>{t}Start POP3 SSL service{/t}
                                        </td>