added gofon acls.

Fixed repository service

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

diff --git a/plugins/admin/systems/class_goFonServer.inc b/plugins/admin/systems/class_goFonServer.inc
index 94e864f6b956e883228de226c5729af923207e7e..7a0920bcce7cfdeb694fe2900903acc9f3b2cbb2 100644 (file)
--- a/plugins/admin/systems/class_goFonServer.inc
+++ b/plugins/admin/systems/class_goFonServer.inc
@@ -1,6 +1,8 @@
 <?php
 
-class goFonServer extends plugin{
+require_once("class_goService.inc");
+
+class goFonServer extends goService{
        
   var $cli_summary      = "This pluign is used within the ServerService Pluign \nand indicates that this server supports asterisk management.";
   var $cli_description  = "Some longer text\nfor help";
@@ -38,98 +40,26 @@ class goFonServer extends plugin{
     $smarty = get_smarty(); 
     foreach($this->attributes as $attr){
       $smarty->assign($attr,$this->$attr);
-      $smarty->assign($attr."ACL",chkacl($this->acl,$attr));
     }
+
+    /* Assign acls */
+    $tmp = $this->plInfo();
+    foreach($tmp['plProvidedAcls'] as $name => $translation){
+      $smarty->assign($name."ACL",$this->getacl($name));
+    }
+
     return($smarty->fetch(get_template_path("goFonServer.tpl",TRUE,dirname(__FILE__))));
   }
 
 
   function getListEntry()
   {
-    $this->updateStatusState();
-    $flag = $this->StatusFlag;
-    $fields['Status']     = $this->$flag;
+    $fields = goService::getListEntry();
     $fields['Message']    = _("Asterisk management");
-    $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/gofon with dn '%s' failed."),$this->dn));
-    $this->handle_post_events("remove");
-  }
-
-
-  function save()
-  {
-    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/gofon 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/gofon with dn '%s' failed."),$this->dn));
-      $this->action_hook();
-    }
-  }
-
-
   function check()
   { 
     $message = plugin::check();
@@ -155,67 +85,6 @@ class goFonServer extends plugin{
       plugin::save_object();
     }
   } 
-
-  
-   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()
@@ -230,6 +99,10 @@ class goFonServer extends plugin{
           "plCategory"    => array("server"),
 
           "plProvidedAcls"=> array(
+            "start"         => _("Start"),
+            "stop"          => _("Stop"),
+            "restart"       => _("Restart"),
+
               "goFonAdmin"      => _("Admin"), 
               "goFonPassword"   => _("Password"),
               "goFonAreaCode"   => _("Area code"), 

diff --git a/plugins/admin/systems/class_servRepository.inc b/plugins/admin/systems/class_servRepository.inc
index 775f49b8da0552135d548aa6d860a8750978f71a..d6006348d893d099b6ff429bbe3be5fee1287fb6 100644 (file)
--- a/plugins/admin/systems/class_servRepository.inc
+++ b/plugins/admin/systems/class_servRepository.inc
@@ -338,6 +338,7 @@ class servrepository extends goService
     $fields = goService::getListEntry();
     $fields['Message']    = _("Repository service");
     $fields['AllowEdit']  = true;
+    $fields['AllowStart'] = $fields['AllowStop'] = $fields['AllowRestart'] = false;
     return($fields);
   }
 

diff --git a/plugins/admin/systems/goFonServer.tpl b/plugins/admin/systems/goFonServer.tpl
index c9c11188df308b61c5c6f659ebfccb56cd7e1fcb..84a2571f0931ca566e07bc0c8e1e50539989e339 100644 (file)
--- a/plugins/admin/systems/goFonServer.tpl
+++ b/plugins/admin/systems/goFonServer.tpl
@@ -2,19 +2,35 @@
   <table summary="">
     <tr>
      <td>{t}Asterisk DB user{/t}{$must}</td>
-     <td><input name="goFonAdmin" size=30 maxlength=60 id="goFonAdmin" {$goFonAdminACL} value="{$goFonAdmin}"></td>
+     <td>
+{render acl=$goFonAdminACL}
+      <input name="goFonAdmin" size=30 maxlength=60 id="goFonAdmin" {$goFonAdminACL} value="{$goFonAdmin}">
+{/render}
+     </td>
     </tr>
     <tr>
      <td>{t}Password{/t}{$must}</td>
-     <td><input type=password name="goFonPassword" id="goFonPassword" size=30 maxlength=60 {$goFonPasswordACL}   value="{$goFonPassword}"></td>
+     <td>
+{render acl=$goFonPasswordACL}
+      <input type=password name="goFonPassword" id="goFonPassword" size=30 maxlength=60 {$goFonPasswordACL}   value="{$goFonPassword}">
+{/render}
+     </td>
     </tr>
     <tr>
      <td>{t}Country dial prefix{/t}{$must}</td>
-     <td><input name="goFonCountryCode" size=10 maxlength=30 id="goFonCountryCode" {$goFonCountryCodeACL}   value="{$goFonCountryCode}"></td>
+     <td>
+{render acl=$goFonCountryCodeACL}
+      <input name="goFonCountryCode" size=10 maxlength=30 id="goFonCountryCode" {$goFonCountryCodeACL}   value="{$goFonCountryCode}">
+{/render}
+     </td>
     </tr>
     <tr>
      <td>{t}Local dial prefix{/t}{$must}</td>
-     <td><input name="goFonAreaCode" size=10 maxlength=30 id="goFonAreaCode" {$goFonAreaCodeACL}   value="{$goFonAreaCode}"></td>
+     <td>
+{render acl=$goFonAreaCodeACL}
+      <input name="goFonAreaCode" size=10 maxlength=30 id="goFonAreaCode" {$goFonAreaCodeACL}   value="{$goFonAreaCode}">
+{/render}
+     </td>
     </tr>
    </table>