Moved gofon

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

diff --git a/gosa-core/plugins/admin/systems/gofon/class_phoneGeneric.inc b/gosa-core/plugins/admin/systems/gofon/class_phoneGeneric.inc
deleted file mode 100644 (file)
index 444e3f6..0000000
--- a/gosa-core/plugins/admin/systems/gofon/class_phoneGeneric.inc
+++ /dev/null
@@ -1,521 +0,0 @@
-<?php
-
-class phoneGeneric extends plugin
-{
-  /* CLI vars */
-  var $cli_summary= "Manage phone base objects";
-  var $cli_description= "Some longer text\nfor help";
-  var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
-
-  /* Generic terminal attributes */
-  var $interfaces= array();
-  var $ignore_account= TRUE;
-
-  /* Needed values and lists */
-  var $base             = "";
-  var $cn               = "";
-  var $description      = "";
-  var $orig_dn          = "";
-  var $goFonType        = "";
-  var $goFonDmtfMode    = "";
-  var $goFonHost        = "";
-  var $goFonDefaultIP   = "dynamic";
-  var $goFonQualify     = "";
-  var $goFonAuth        = "";
-  var $goFonSecret      = "";
-  var $goFonInkeys      = "";
-  var $goFonPermit      = array();
-  var $goFonDeny        = array();
-  var $goFonOutkey      = "";
-  var $goFonTrunk       = "";
-  var $goFonAccountCode = "";
-  var $goFonMSN         = "";
-  var $selected_categorie    = 0;
-  var $netConfigDNS;
-  var $view_logged      = FALSE;
-
-  /* attribute list for save action */
-  var $attributes= array("cn", "description",
-                          "goFonType","goFonDmtfMode","goFonHost","goFonDefaultIP",
-                          "goFonQualify","goFonAuth","goFonSecret","goFonInkeys","goFonOutkey",
-                          "goFonTrunk","goFonAccountCode","goFonMSN","selected_categorie","goFonPermit","goFonDeny" 
-                         );
-
-  /* this array defines which attributes are schown / saved for the different type of phones */ 
-  var $usedattrs =    array( "0"=>array("cn", "description", 
-                                  "goFonType","goFonDmtfMode","goFonHost","goFonDefaultIP",
-                                  "goFonQualify"),
-                             "1"=>array("cn", "description", 
-                                  "goFonType","goFonHost","goFonDefaultIP",
-                                  "goFonQualify","goFonAuth","goFonSecret","goFonInkeys","goFonOutkey",
-                                  "goFonTrunk","goFonAccountCode","selected_categorie","goFonPermit","goFonDeny"),
-                             "2"=>array("cn", "description", "goFonMSN"));
-  
-
-  var $objectclasses= array("top", "goFonHardware");
-
-  function phoneGeneric (&$config, $dn= NULL, $parent= NULL)
-  {
-    plugin::plugin ($config, $dn, $parent);
-    $this->netConfigDNS = new termDNS($this->config,$this,$this->objectclasses, true);
-
-    /* Set base */
-    if ($this->dn == "new"){
-      $ui= get_userinfo();
-      $this->base= dn2base($ui->dn);
-      $this->cn= "";
-    } else {
-      $this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
-    }
-  
-    if($this->goFonMSN != ""){
-      $this->selected_categorie = 2;
-    }elseif($this->goFonAccountCode != ""){
-      $this->selected_categorie = 1 ;
-    
-      if(isset($this->attrs['goFonPermit']['count'])){
-        unset ($this->attrs['goFonPermit']['count']);
-        $this->goFonPermit=$this->attrs['goFonPermit'];
-      }  
-     
-      if(isset($this->attrs['goFonDeny']['count'])){
-        unset ($this->attrs['goFonDeny']['count'])   ;
-        $this->goFonDeny=$this->attrs['goFonDeny'];
-      } 
-
-    } else {
-      $this->selected_categorie = 0;
-    }
-
-    if($this->goFonDefaultIP!="dynamic"){
-      $this->goFonDefaultIP = "network";
-    }
-
-    /* Save dn for later references */
-    $this->orig_dn= $this->dn;
-  }
-
-  function set_acl_base($base)
-  {
-    plugin::set_acl_base($base);
-    $this->netConfigDNS->set_acl_base($base);
-  }
-
-  function set_acl_category($cat)
-  {
-    plugin::set_acl_category($cat);
-    $this->netConfigDNS->set_acl_category($cat);
-  }
-
-
-  function execute()
-  {
-    /* Call parent execute */
-    plugin::execute();
-
-    if($this->is_account && !$this->view_logged){
-      $this->view_logged = TRUE;
-      new log("view","phone/".get_class($this),$this->dn);
-    }
-
-    /* Do we represent a valid phone? */
-    if (!$this->is_account && $this->parent === NULL){
-      $display= "<img alt=\"\" src=\"images/stop.png\" align=middle>&nbsp;<b>".
-        _("This 'dn' has no phone features.")."</b>";
-      return($display);
-    }
-
-    /* Base select dialog */
-    $once = true;
-    foreach($_POST as $name => $value){
-      if(preg_match("/^chooseBase/",$name) && $once){
-        $once = false;
-        $this->dialog = new baseSelectDialog($this->config,$this,$this->get_allowed_bases());
-        $this->dialog->setCurrentBase($this->base);
-      }
-    }
-
-    /* Dialog handling */
-    if(is_object($this->dialog)){
-      /* Must be called before save_object */
-      $this->dialog->save_object();
-
-      if($this->dialog->isClosed()){
-        $this->dialog = false;
-      }elseif($this->dialog->isSelected()){
-        
-        /* A new base was selected, check if it is a valid one */
-        $tmp = $this->get_allowed_bases();
-        if(isset($tmp[$this->dialog->isSelected()])){
-          $this->base = $this->dialog->isSelected();
-        }
-
-        $this->dialog= false;
-      }else{
-        return($this->dialog->execute());
-      }
-    }
-
-    /* handle Permit Add*/
-    if(isset($_POST['goFonPermitAdd']) && $this->acl_is_writeable("goFonPermit")){
-      if(isset($_POST['goFonPermitNew'])){
-        if(is_string($this->goFonPermit)){
-          $this->goFonPermit=array();
-        }
-        $new = $_POST['goFonPermitNew'];
-        if(strlen($new)> 1) {
-          $this->goFonPermit[]= $new;
-        }
-      }
-    }
-      
-    /* handle Deny Add*/
-    if(isset($_POST['goFonDenyAdd']) && $this->acl_is_writeable("goFonDeny")){
-      if(isset($_POST['goFonDenyNew'])){
-        if(is_string($this->goFonDeny)){
-          $this->goFonDeny=array();
-        }
-        $new = $_POST['goFonDenyNew'];
-        if(strlen($new)> 1) {
-          $this->goFonDeny[]= $new;
-        }
-      }
-    }
-
-    /* Handle Permit Deletion*/
-    if(isset($_POST['goFonPermitDel']) && $this->acl_is_writeable("goFonPermit")){
-      if(isset($_POST['goFonPermitS'])){
-        if(is_string($this->goFonPermit)){
-          $this->goFonPermit=array();
-        }
-        $new = $_POST['goFonPermitS'];
-        $tmp = array_flip($this->goFonPermit);
-        unset($tmp[$new]);
-        $this->goFonPermit=array();
-        foreach(array_flip($tmp) as $tm){
-          $this->goFonPermit[]=$tm;
-        }
-      }
-    }
-
-
-    /* Handle Permit Deletion*/
-    if(isset($_POST['goFonDenyDel']) && $this->acl_is_writeable("goFonDeny")){
-      if(isset($_POST['goFonDenyS'])){
-        if(is_string($this->goFonDeny)){
-          $this->goFonDeny=array();
-        }
-        $new = $_POST['goFonDenyS'];
-        $tmp = array_flip($this->goFonDeny);
-        unset($tmp[$new]);
-        $this->goFonDeny=array();
-        foreach(array_flip($tmp) as $tm){
-          $this->goFonDeny[]=$tm;
-        }
-      }
-    }
-  
-    /* Fill templating stuff */
-    $smarty= get_smarty();
-
-    $smarty->assign("bases", $this->get_allowed_bases());
-
-    $tmp = $this->plInfo();
-    foreach($tmp['plProvidedAcls'] as $name => $translation){
-      $smarty->assign($name."ACL",$this->getacl($name));
-    }
-
-    $smarty->assign("staticAddress","<font class=\"must\">*</font>");// $this->config->idepartments);
-
-    /* Create Arrays for samrty select boxes */
-    $smarty->assign("categories",     array("SIP","IAX","CAPI"));
-    $smarty->assign("goFonTypes",     array("peer"      =>"peer"      ,"user"   =>"user"    ,"friend" =>"friend"));
-    $smarty->assign("goFonDmtfModes", array("inband"    =>"inband"    ,"rfc2833"=>"rfc2833" ,"info"   =>"info"));
-    $smarty->assign("goFonAuths",     array("plaintext" =>"plaintext" ,"md5"    =>"md5"     /*,"rsa"    =>"rsa"*/));
-    $smarty->assign("goFonTrunks",    array("yes" =>_("yes") ,"no" => _("no")));
-
-    /* deativate all fields that are not used by the specified type */
-    foreach($this->attributes as $att){
-      if((!in_array($att,$this->usedattrs[$this->selected_categorie]))){
-        $smarty->assign($att."USED", "disabled" );
-        $smarty->assign($att, "");
-      }else{
-        $smarty->assign($att."USED", "" );
-        $smarty->assign($att, $this->$att);
-      }
-    }
-    
-    $smarty->assign("selected_categorie",$this->selected_categorie);
-
-    /* Assign attributes */
-    $smarty->assign("base_select", $this->base);
-    $smarty->assign("goFonDefaultIPs",array("dynamic"=>_("dynamic"),"network"=>_("Networksettings")));
- 
-    /* Show main page */
-    $str = $this->netConfigDNS->execute();
-    if(is_object($this->netConfigDNS->dialog)){
-      return($str);
-    }
-    $smarty->assign("netconfig", $str);
-    $smarty->assign("phonesettings", dirname(__FILE__)."/phonesettings.tpl");
-    return($smarty->fetch (get_template_path('phone.tpl', TRUE)));
-  }
-
-  function remove_from_parent()
-  {
-    if($this->acl_is_removeable()){
-      $ldap= $this->config->get_ldap_link();
-      $ldap->cd($this->config->current['BASE']);
-
-      $ldap->search ("(&(objectClass=goFonAccount)(goFonHardware=".$this->cn."))", array("uid","cn"));
-      while ($attr =  $ldap->fetch()){
-        print_red(sprintf(_("Can't delete because there are users which are depending on this phone. One of them is user '%s'."),
-              ($attr['uid'][0]." - ".$attr['cn'][0])));
-        return;
-      }
-
-      $this->netConfigDNS->remove_from_parent();
-      $ldap->rmdir($this->dn);
-  
-      new log("remove","phone/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
-
-      show_ldap_error($ldap->get_error(), sprintf(_("Removing of system phone/generic with dn '%s' failed."),$this->dn));
-      $this->handle_post_events("remove",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
-
-      /* Delete references to object groups */
-      $ldap->cd ($this->config->current['BASE']);
-      $ldap->search ("(&(objectClass=gosaGroupOfNames)(member=".LDAP::prepare4filter($this->dn)."))", array("cn"));
-      while ($ldap->fetch()){
-        $og= new ogroup($this->config, $ldap->getDN());
-        unset($og->member[$this->dn]);
-        $og->save ();
-      }
-    }
-  }
-
-
-  /* Save data to object */
-  function save_object()
-  {
-    /* Create a base backup and reset the
-       base directly after calling plugin::save_object();
-       Base will be set seperatly a few lines below */
-    $base_tmp = $this->base;
-    plugin::save_object();
-    $this->base = $base_tmp;
-
-    $this->netConfigDNS->save_object();
-
-    /* Set new base if allowed */
-    $tmp = $this->get_allowed_bases();
-    if(isset($_POST['base'])){
-      if(isset($tmp[$_POST['base']])){
-        $this->base= $_POST['base'];
-      }
-    }
-  }
-
-
-  /* Check supplied data */
-  function check()
-  {
-    /* Call common method to give check the hook */
-    $message= plugin::check();
-    $message= array_merge($message, $this->netConfigDNS->check());
-
-    $this->dn= "cn=".$this->cn.",".get_ou('phoneou').$this->base;
-
-    /* To check for valid ip*/
-    if($this->netConfigDNS->ipHostNumber == ""){
-       $message[]= _("The required field IP address is empty.");
-    } else {
-      if (!tests::is_ip($this->netConfigDNS->ipHostNumber)){
-        $message[]= _("The field IP address contains an invalid address.");
-      }
-    }
-
-    /* Check if given name is a valid host/dns name */
-    if(!tests::is_dns_name($this->cn) ){
-      $message[] = _("Please specify a valid name for this object.");
-    }
-
-    if ($this->cn == ""){
-      $message[]= _("The required field 'Phone name' is not set.");
-    }
-    if ($this->cn == "0"){ 
-      $message[]= _("The 'Phone name' '0' is reserved and cannot be used.");
-    }
-
-    if ($this->orig_dn != $this->dn){
-      $ldap= $this->config->get_ldap_link();
-      $ldap->cd ($this->base);
-      $ldap->search ("(cn=".$this->cn.")", array("cn"));
-      if ($ldap->count() != 0){
-        while ($attrs= $ldap->fetch()){
-
-          if(preg_match("/cn=dhcp,/",$attrs['dn'])){
-            continue;
-          }
-  
-          if ($attrs['dn'] != $this->orig_dn){
-            $message[]= sprintf (_("There is already an entry '%s' in the base choosen by you"), $this->cn);
-            break;
-          }
-        }
-      }
-    }
-
-    return ($message);
-  }
-
-
-  /* Save to LDAP */
-  function save()
-  {
-    plugin::save();
-   
-   
-    /* only to define which attrs to save*/ 
-    $mode = $this->selected_categorie;
-
-    /* Remove all unwanted attrs */
-    foreach($this->attributes as $att){
-      
-      /* Check all attributes, if they are needed for this type of phone */
-      if(!in_array($att,$this->usedattrs[$mode])){
-        $this->attrs[$att] = array();
-      }
-    }
-
-    /* unset the categorie*/
-    unset($this->attrs['selected_categorie']);
-    
-    /* Remove all empty values */
-    if ($this->orig_dn == 'new'){
-      $attrs= array();
-      foreach ($this->attrs as $key => $val){
-        if (is_array($val) && count($val) == 0){
-          continue;
-        }
-        $attrs[$key]= $val;
-      }
-      $this->attrs= $attrs;
-    }
-
-    if($this->goFonDefaultIP!="dynamic"){
-      $this->attrs['goFonDefaultIP'] = $this->netConfigDNS->ipHostNumber;
-    }    
-
-    $this->attrs = $this->netConfigDNS->getVarsForSaving($this->attrs);
-
-    /* Write back to ldap */
-    $ldap= $this->config->get_ldap_link();
-    if ($this->orig_dn == 'new'){
-      $ldap->cd($this->config->current['BASE']);
-      $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
-      $ldap->cd($this->dn);
-      $ldap->add($this->attrs);
-      new log("create","phone/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
-      $this->handle_post_events("add",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
-    } else {
-      if ($this->orig_dn != $this->dn){
-        $this->move($this->orig_dn, $this->dn);
-      }
-
-      $ldap->cd($this->dn);
-      $this->cleanup();
-      $ldap->modify ($this->attrs); 
-      new log("modify","phone/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
-
-      // $user_phone_reload   
-      $ldap->cd ($this->config->current['BASE']); 
-      $user_phone_assignment = $ldap->fetch($ldap->search("(&(objectClass=goFonAccount)(goFonHardware=".$this->cn."))",array("uid")));
-      if($user_phone_assignment){
-        $usertab= new usertabs($this->config,$this->config->data['TABS']['USERTABS'], $user_phone_assignment['dn']);
-        $usertab->by_object['phoneAccount']->is_modified = true;
-        $usertab->save();
-        unset($usertab);
-      }
-      $this->handle_post_events("modify",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
-    }
-    $this->netConfigDNS->cn = $this->cn;    
-    $this->netConfigDNS->save();
-    show_ldap_error($ldap->get_error(), sprintf(_("Saving of system phone/generic with dn '%s' failed."),$this->dn));
-  }
-
-
-  /* Display generic part for server copy & paste */
-  function getCopyDialog()
-  {
-    $vars = array("cn");
-    $smarty = get_smarty();
-    $smarty->assign("cn" ,$this->cn);
-    $smarty->assign("object","phone");
-    $str = $smarty->fetch(get_template_path("paste_generic.tpl",TRUE));
-    $ret = array();
-    $ret['string'] = $str;
-    $ret['status'] = "";
-    return($ret);
-  }
-
-
-  function saveCopyDialog()
-  {
-    if(isset($_POST['cn'])){
-      $this->cn = $_POST['cn'];
-    }
-  }
-
-
-  function PrepareForCopyPaste($source)
-  {
-    plugin::PrepareForCopyPaste($source);
-    if(isset($source['macAddress'][0])){
-      $this->netConfigDNS->macAddress = $source['macAddress'][0];
-    }
-    if(isset($source['ipHostNumber'][0])){
-      $this->netConfigDNS->ipHostNumber = $source['ipHostNumber'][0];
-    }
-
-    $source_o = new phoneGeneric($this->config, $source['dn']);
-    $this->selected_categorie = $source_o->selected_categorie;
-  }
-
-
-  /* Return plugin informations for acl handling
-      #FIXME FAIscript seams to ununsed within this class... */
-  static function plInfo()
-  {
-    return (array(
-          "plShortName"   => _("Generic"),
-          "plDescription" => _("Phone generic"),
-          "plSelfModify"  => FALSE,
-          "plDepends"     => array(),
-          "plPriority"    => 0,
-          "plSection"     => array("administration"),
-          "plCategory"    => array("phone" => array("description"  => _("Phone hardware"),
-                                                    "objectClass"  => "goFonHardware")),
-          "plProvidedAcls"=> array(
-            "cn"                  => _("Name"),
-            "base"                => _("Base"),
-            "description"         => _("Description"),
-            "goFonType"           => _("SIP Mode"),
-            "goFonDmtfMode"       => _("SIP DTMF mode"),
-            "goFonDefaultIP"      => _("SIP Default ip"),
-            "goFonQualify"        => _("SIP Qualify"),
-            "goFonAuth"           => _("IAX authentication type"),
-            "goFonSecret"         => _("IAX secret"),
-            "goFonAccountCode"    => _("IAX account code"),
-            "goFonTrunk"          => _("IAX trunk lines"),
-            "goFonPermit"         => _("IAX permit settings"),
-            "goFonDeny"           => _("IAX deny settings"),
-            "goFonMSN"            => _("CAPI MSN"),
-            "categorie"  => _("Hardware type"))
-          ));
-  }
-
-
-}
-
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>

diff --git a/gosa-core/plugins/admin/systems/gofon/phone.tpl b/gosa-core/plugins/admin/systems/gofon/phone.tpl
deleted file mode 100644 (file)
index 58fdd60..0000000
--- a/gosa-core/plugins/admin/systems/gofon/phone.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<table summary="" width="100%">
- <tr>
-  <td style="vertical-align:top; width:50%; border-right:1px solid #A0A0A0">
-       <table summary="">
-        <tr>
-         <td><LABEL for="cn">{t}Phone name{/t}</LABEL>{$must}</td>
-         <td>
-{render acl=$cnACL}
-          <input id="cn" name="cn" size=20 maxlength=60 value="{$cn}">
-{/render}
-         </td>
-        </tr>
-        <tr>
-          <td colspan=2>&nbsp;</td>
-        </tr>
-        <tr>
-         <td><LABEL for="base">{t}Base{/t}</LABEL>{$must}</td>
-         <td>
-{render acl=$baseACL}
-      <select id="base" size="1" name="base" title="{t}Choose subtree to place group in{/t}">
-       {html_options options=$bases selected=$base_select}
-      </select>
-{/render}
-{render acl=$baseACL disable_picture='images/folder_gray.png'}
-        <input type="image" name="chooseBase" src="images/folder.png" class="center" title="{t}Select a base{/t}">
-{/render}
-          </td>
-         </tr>
-       </table>
-  </td>
-  <td style="vertical-align:top">
-       <table summary="">
-        <tr>
-         <td><LABEL for="description">{t}Description{/t}</LABEL></td>
-         <td>
-{render acl=$descriptionACL}
-          <input name="description" id="description" size=25 maxlength=80 value="{$description}">
-{/render}
-          </td>
-        </tr>
-       </table>
-  </td>
- </tr>
-</table>
-
-<p class="plugbottom" style="margin-bottom:0px; padding:0px;">&nbsp;</p>
-{include file="$phonesettings"}
-
-<p class="plugbottom" style="margin-bottom:0px; padding:0px;">&nbsp;</p>
-{$netconfig}
-
-<!-- Place cursor -->
-<script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-       focus_field('cn');
-  -->
-</script>

diff --git a/gosa-core/plugins/admin/systems/gofon/phonesettings.tpl b/gosa-core/plugins/admin/systems/gofon/phonesettings.tpl
deleted file mode 100644 (file)
index 19385ac..0000000
--- a/gosa-core/plugins/admin/systems/gofon/phonesettings.tpl
+++ /dev/null
@@ -1,260 +0,0 @@
-<h2><img class="center" alt="" align="middle" src="images/select_phone.png"> {t}Advanced phone settings{/t}</h2>
-
-<table summary="" style="width:100%" border=0>
-       <tr>
-               <td colspan="2">
-               <LABEL for="selected_categorie">{t}Phone type{/t}</LABEL>{$staticAddress}
-{render acl=$categorieACL}
-               <select id="selected_categorie" size="1" name="selected_categorie" title="{t}Choose a phone type{/t}" onchange="mainform.submit();">
-                       {html_options options=$categories selected=$selected_categorie}
-               </select>
-{/render}
-               {if $javascript eq 'false'}
-                       <input type="submit" value="{t}refresh{/t}" name="refresh">
-               {/if}
-               <br>
-               <br>
-       </td>
-       </tr>
-{if $selected_categorie eq '0'}
-       <tr>
-               <td style="width:50%; border-right:1px solid #A0A0A0">
-                       <table summary="" border=0>
-                        <tr>
-                               <td>
-                                       <LABEL for="goFonType">{t}Mode{/t}</LABEL>{$staticAddress}
-                                       
-                               </td>
-                               <td>
-{render acl=$goFonTypeACL}
-                                       <select id="goFonType" size="1" name="goFonType" title="{t}Choose a phone type{/t}" style="width:200px;" {$goFonTypeUSED}>
-                                               {html_options options=$goFonTypes selected=$goFonType}
-                                       </select>
-{/render}
-                               </td>
-                        </tr>
-                        <tr>
-                               <td >
-                                       <LABEL for="goFonDmtfMode">{t}DTMF mode{/t}</LABEL>
-                               </td>
-                               <td>
-{render acl=$goFonDmtfModeACL}
-                                       <select size="1" id="goFonDmtfMode" name="goFonDmtfMode" title="{t}Choose a phone type{/t}" style="width:200px;" {$goFonDmtfModeUSED}>
-                                               {html_options options=$goFonDmtfModes selected=$goFonDmtfMode}
-                                       </select>
-{/render}
-                               </td>
-                       </tr>
-               </table>
-          </td>
-          <td>
-               <table summary="" border=0>
-                       <tr>
-                               <td >
-                                       <LABEL for="goFonDefaultIP">{t}Default IP{/t}</LABEL>
-                               </td>
-                <td>
-{render acl=$goFonDefaultIPACL}
-                    <select id="goFonDefaultIP" size="1" name="goFonDefaultIP" title="{t}Choose a phone type{/t}" style="width:200px;" >
-                        {html_options options=$goFonDefaultIPs selected=$goFonDefaultIP}
-                    </select>
-{/render}
-                   </td>
-                       </tr>
-                       <tr>
-                               <td >
-                                       <LABEL for="goFonQualify">{t}Response timeout{/t}</LABEL>
-                               </td>
-                               <td>
-{render acl=$goFonQualifyACL}
-                                       <input id="goFonQualify" style="width:200px" name="goFonQualify" value="{$goFonQualify}" {$goFonQualifyUSED}>
-{/render}
-                               </td>
-                       </tr>
-                       </table>
-               </td>
-        </tr>
-</table>
-{/if}
-
-{if $selected_categorie eq '1'}
-               
-       <tr>
-               <td style="vertical-align:top; width:50%; border-right:1px solid #A0A0A0">
-                       <table summary="" width="100%">
-                        <tr>
-                               <td>
-                                       <LABEL for="goFonType">{t}Modus{/t}{$staticAddress}</LABEL>
-                               </td>
-                               <td >
-{render acl=$goFonTypeACL}
-                                       <select size="1" id="goFonType" name="goFonType" title="{t}Choose a phone type{/t}" style="width:200px;" {$goFonTypeUSED}>
-                                               {html_options options=$goFonTypes selected=$goFonType}
-                                       </select>
-{/render}
-                               </td>
-                        </tr>
-                       <tr>
-                               <td >
-                                       <LABEL for="goFonDefaultIP">{t}Default IP{/t}</LABEL>
-                               </td>
-                               <td>
-{render acl=$goFonDefaultIPACL}
-                                       <input id="goFonDefaultIP" style="width:200px" name="goFonDefaultIP" value="{$goFonDefaultIP}" {$goFonDefaultIPUSED}>
-{/render}
-                               </td>
-                       </tr>
-                       <tr>
-                               <td >
-                                       <LABEL for="goFonQualify">{t}Response timeout{/t}</LABEL>
-                               </td>
-                               <td>
-{render acl=$goFonQualifyACL}
-                                       <input id="goFonQualify" style="width:200px" name="goFonQualify" value="{$goFonQualify}" {$goFonQualifyUSED}>
-{/render}
-                               </td>
-                       </tr>
-                       <tr>
-                               <td colspan=2>
-                                       &nbsp;                                  
-                               </td>
-                       </tr>
-                       <tr>
-                               <td>
-                                       <LABEL for="goFonAuth">{t}Authtype{/t}</LABEL>
-                               </td>
-                               <td>
-{render acl=$goFonAuthACL}
-                                       <select size="1" id="goFonAuth" name="goFonAuth" title="{t}Choose a phone type{/t}" style="width:200px;" {$goFonAuthUSED}>
-                                               {html_options options=$goFonAuths selected=$goFonAuth}
-                                       </select>
-{/render}
-                               </td>
-                       </tr>
-                       <tr>
-                               <td>    
-                                        <LABEL for="goFonSecret">{t}Secret{/t}</LABEL>
-                               </td>
-                               <td>
-{render acl=$goFonSecretACL}
-                                       <input id="goFonSecret" style="width:200px" name="goFonSecret" value="{$goFonSecret}" {$goFonSecretUSED}>
-{/render}
-                               </td>
-                       </tr>
-<!--                   <tr>
-                               <td>
-                                        {t}GoFonInkeys{/t}
-                               </td>
-                               <td>
-                                       <input style="width:200px" name="goFonInkeys" value="{$goFonInkeys}" {$goFonInkeysUSED}>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td>
-                                        {t}GoFonOutKeys{/t}
-                               </td>
-                               <td>
-                                       <input style="width:200px" name="goFonOutkey" value="{$goFonOutkey}" {$goFonOutkeyUSED}>
-                               </td>
-                       </tr> -->
-                       <tr>
-                <td colspan=2>
-                                       &nbsp;
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <LABEL for="goFonAccountCode">{t}Account code{/t}</LABEL>
-                </td>
-                <td>
-{render acl=$goFonAccountCodeACL}
-                    <input id="goFonAccountCode" style="width:200px" name="goFonAccountCode" value="{$goFonAccountCode}" {$goFonAccountCodeUSED}>
-{/render}
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <LABEL for="goFonTrunk">{t}Trunk lines{/t}</LABEL>
-                </td>
-                <td>
-{render acl=$goFonTrunkACL}
-                     <select size="1" id="goFonTrunk" name="goFonTrunk" title="{t}Choose a phone type{/t}" {$goFonTrunkUSED}>
-                        {html_options options=$goFonTrunks selected=$goFonTrunk}
-                     </select>
-{/render}
-                 </td>
-            </tr>
-
-                       </table>
-               </td>
-               <td valign="top" style="vertical-align:top">
-                        <table summary="" width="100%">
-               <tr>
-                    <td style="vertical-align:top;">
-                        <LABEL for="goFonPermitS">{t}Hosts that are allowed to connect{/t}</LABEL><br>
-{render acl=$goFonPermitACL}
-                        <select id="goFonPermitS" style="width:100%; height:80px;" name="goFonPermitS" size=15
-                            multiple title="{t}List of alternative mail addresses{/t}">
-                            {html_options values=$goFonPermit output=$goFonPermit}
-                            <option disabled>&nbsp;</option>
-                        </select>
-{/render}
-                        <br>
-{render acl=$goFonPermitACL}
-                            <input name="goFonPermitNew" size=30 align="middle" maxlength="65" value="">
-{/render}
-{render acl=$goFonPermitACL}
-                        <input type=submit value="{t}Add{/t}" name="goFonPermitAdd">
-{/render}
-{render acl=$goFonPermitACL}
-                        <input type=submit value="{t}Delete{/t}" name="goFonPermitDel">
-{/render}
-                                               <br><br>
-                    </td>
-                </tr>
-                               <tr>
-                    <td style="vertical-align:top;">
-                       <LABEL for="goFonDenyS">{t}Hosts that are not allowed to connect{/t}</LABEL><br>
-{render acl=$goFonDenyACL}
-                        <select id="goFonDenyS" style="width:100%; height:80px;" name="goFonDenyS" size=15
-                            multiple title="{t}List of alternative mail addresses{/t}">
-                            {html_options values=$goFonDeny output=$goFonDeny}
-                            <option disabled>&nbsp;</option>
-                        </select>
-{/render}
-                        <br>
-{render acl=$goFonDenyACL}
-                            <input name="goFonDenyNew" size=30 align="middle" maxlength="65" value="">
-{/render}
-{render acl=$goFonDenyACL}
-                        <input type=submit value="{t}Add{/t}" name="goFonDenyAdd">
-{/render}
-{render acl=$goFonDenyACL}
-                        <input type=submit value="{t}Delete{/t}" name="goFonDenyDel">
-{/render}
-                    </td>
-                </table>
-    </tr>
-</table>
-{/if}
-
-{if $selected_categorie eq '2'}
-       <tr>
-               <td style="width:50%">
-                       <table summary="" width="100%">
-                               <tr>
-                                       <td>
-                                               <LABEL for="goFonMSN">{t}MSN{/t}</LABEL>&nbsp;
-{render acl=$goFonMSNACL}
-                                               <input id="goFonMSN" style="width:200px" name="goFonMSN" value="{$goFonMSN}" {$goFonMSNUSED}>
-{/render}
-                                       </td>
-                               </tr>
-                       </table>
-               </td>
-               <td>
-                       &nbsp;
-               </td>
-       </tr>
-</table>
-{/if}

diff --git a/gosa-core/plugins/admin/systems/gofon/tabs_phone.inc b/gosa-core/plugins/admin/systems/gofon/tabs_phone.inc
deleted file mode 100644 (file)
index fbf1107..0000000
--- a/gosa-core/plugins/admin/systems/gofon/tabs_phone.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-class phonetabs extends tabs
-{
-
-  function phonetabs($config, $data, $dn,$category)
-  {
-    tabs::tabs($config, $data, $dn,$category);
-
-    /* Add references/acls/snapshots */
-    $this->addSpecialTabs();
-  }
-
-  function save_object($save_current= FALSE)
-  {
-    tabs::save_object($save_current);
-  }
-
-
-  function save($ignore_account= FALSE)
-  {
-    /* Check for new 'dn', in order to propagate the
-       'dn' to all plugins */
-    $baseobject= $this->by_object['phoneGeneric'];
-    $this->dn= "cn=$baseobject->cn,".get_ou('phoneou').$baseobject->base;
-    $baseobject->dn= $this->dn;
-
-    foreach ($this->by_object as $key => $obj){
-      $this->by_object[$key]->dn= $this->dn;
-    }
-
-    tabs::save(TRUE);
-  }
-
-}
-
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>