X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fadmin%2Fsystems%2Fclass_phoneGeneric.inc;h=9e602ba28c8f28e32715e8e3fb4dcea599401307;hb=a07e09435049ea336a78091402dab09261688d6e;hp=38839d7540a1db337b864e2290fab8f3befb5b47;hpb=84d2c065af9ce3f287fef380606a593a0cda5a81;p=gosa.git
diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc
index 38839d754..9e602ba28 100644
--- a/plugins/admin/systems/class_phoneGeneric.inc
+++ b/plugins/admin/systems/class_phoneGeneric.inc
@@ -14,14 +14,12 @@ class phoneGeneric extends plugin
/* Needed values and lists */
var $base = "";
var $cn = "";
- var $macAddress = "";
- var $ipHostNumber = "";
var $description = "";
var $orig_dn = "";
var $goFonType = "";
var $goFonDmtfMode = "";
var $goFonHost = "";
- var $goFonDefaultIP = "";
+ var $goFonDefaultIP = "dynamic";
var $goFonQualify = "";
var $goFonAuth = "";
var $goFonSecret = "";
@@ -33,23 +31,24 @@ class phoneGeneric extends plugin
var $goFonAccountCode = "";
var $goFonMSN = "";
var $selected_categorie = 0;
+ var $netConfigDNS;
/* attribute list for save action */
- var $attributes= array("cn", "description", "macAddress", "ipHostNumber"
- ,"goFonType","goFonDmtfMode","goFonHost","goFonDefaultIP",
+ 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", "macAddress", "ipHostNumber",
+ var $usedattrs = array( "0"=>array("cn", "description",
"goFonType","goFonDmtfMode","goFonHost","goFonDefaultIP",
"goFonQualify"),
- "1"=>array("cn", "description", "macAddress", "ipHostNumber",
+ "1"=>array("cn", "description",
"goFonType","goFonHost","goFonDefaultIP",
"goFonQualify","goFonAuth","goFonSecret","goFonInkeys","goFonOutkey",
"goFonTrunk","goFonAccountCode","selected_categorie","goFonPermit","goFonDeny"),
- "2"=>array("cn", "description", "macAddress", "ipHostNumber","goFonMSN"));
+ "2"=>array("cn", "description", "goFonMSN"));
var $objectclasses= array("top", "goFonHardware");
@@ -57,6 +56,7 @@ class phoneGeneric extends plugin
function phonegeneric ($config, $dn= NULL)
{
plugin::plugin ($config, $dn);
+ $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses, true);
/* Set base */
if ($this->dn == "new"){
@@ -106,6 +106,31 @@ class phoneGeneric extends plugin
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->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()){
+ $this->base = $this->dialog->isSelected();
+ $this->dialog= false;
+ }else{
+ return($this->dialog->execute());
+ }
+ }
+
/* handle Permit Add*/
if(isset($_POST['goFonPermitAdd'])){
if(isset($_POST['goFonPermitNew'])){
@@ -168,6 +193,7 @@ class phoneGeneric extends plugin
/* Fill templating stuff */
$smarty= get_smarty();
$smarty->assign("bases", $this->config->idepartments);
+ $smarty->assign("staticAddress","*");// $this->config->idepartments);
/* Create Arrays for samrty select boxes */
$smarty->assign("categories", array("SIP","IAX","CAPI"));
@@ -197,11 +223,8 @@ class phoneGeneric extends plugin
$smarty->assign("goFonDefaultIPs",array("dynamic"=>_("dynamic"),"network"=>_("Networksettings")));
- /* Show Asterisk for required attribute ipHostNumber and macAddress */
- $smarty->assign("staticAddress", "*");
-
/* Show main page */
- $smarty->assign("netconfig", dirname(__FILE__)."/network.tpl");
+ $smarty->assign("netconfig", $this->netConfigDNS->execute());
$smarty->assign("phonesettings", dirname(__FILE__)."/phonesettings.tpl");
return($smarty->fetch (get_template_path('phone.tpl', TRUE)));
}
@@ -218,8 +241,9 @@ class phoneGeneric extends plugin
return;
}
+ $this->netConfigDNS->remove_from_parent();
$ldap->rmdir($this->dn);
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), _("Removing phone failed"));
$this->handle_post_events("remove");
/* Delete references to object groups */
@@ -230,7 +254,6 @@ class phoneGeneric extends plugin
unset($og->member[$this->dn]);
$og->save ();
}
-
}
@@ -238,7 +261,7 @@ class phoneGeneric extends plugin
function save_object()
{
plugin::save_object();
-
+ $this->netConfigDNS->save_object();
/* Save base, since this is no LDAP attribute */
if (isset($_POST['base']) && chkacl($this->acl, "create") == ""){
$this->base= $_POST['base'];
@@ -249,41 +272,27 @@ class phoneGeneric extends plugin
/* Check supplied data */
function check()
{
- $message= array();
+ /* Call common method to give check the hook */
+ $message= plugin::check();
+ $message= array_merge($message, $this->netConfigDNS->check());
+
$this->dn= "cn=".$this->cn.",ou=phones,ou=systems,".$this->base;
/* To check for valid ip*/
- $num="(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])";
+ if($this->netConfigDNS->ipHostNumber == ""){
+ $message[]= _("The required field IP address is empty.");
+ } else {
+ if (!is_ip($this->netConfigDNS->ipHostNumber)){
+ $message[]= _("The field IP address contains an invalid address.");
+ }
+ }
-// if(in_array("goFonDefaultIP",$this->usedattrs[$this->selected_categorie])){
-// if (!preg_match("/^$num\\.$num\\.$num\\.$num$/", $this->goFonDefaultIP)){
-// $message[]= _("Wrong IP format in field goFonDefaultIP.");
-// }
-// }
-
-// /* Check for valid number */
-// if(in_array("goFonDefaultIP",$this->usedattrs[$this->selected_categorie])){
-// if((strlen($this->goFonQualify))!=(strlen((int)($this->goFonQualify)))){
-// $message[]= _("The given value for 'Response timeout' is not a valid number.");
-// }
-// }
-
- /* must: cn, macAddress, ipHostNumber */
if ($this->cn == "" && chkacl ($this->acl, "cn") == ""){
$message[]= _("The required field 'Phone name' is not set.");
}
if ($this->cn == "0" && chkacl ($this->acl, "cn") == ""){
$message[]= _("The 'Phone name' '0' is reserved and cannot be used.");
}
- if ($this->macAddress == "" && chkacl ($this->acl, "macAddress") == ""){
- $message[]= _("The required field 'MAC-address' is not set.");
- }
- if ($this->ipHostNumber == "" && chkacl ($this->acl, "ipHostNumber") == ""){
- $message[]= _("The required field 'IP-address' is not set.");
- }
- if (!preg_match("/^$num\\.$num\\.$num\\.$num$/", $this->ipHostNumber)){
- $message[]= _("Wrong IP format in field IP-address.");
- }
$ui= get_userinfo();
$acl= get_permissions ($this->dn, $ui->subtreeACL);
@@ -349,9 +358,11 @@ class phoneGeneric extends plugin
}
if($this->goFonDefaultIP!="dynamic"){
- $this->attrs['goFonDefaultIP'] = $this->ipHostNumber;
+ $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'){
@@ -366,7 +377,9 @@ class phoneGeneric extends plugin
}
$ldap->cd($this->dn);
- $ldap->modify($this->attrs);
+ $this->cleanup();
+ $ldap->modify ($this->attrs);
+
// $user_phone_reload
$ldap->cd ($this->config->current['BASE']);
$user_phone_assignment = $ldap->fetch($ldap->search("(&(objectClass=goFonAccount)(goFonHardware=".$this->cn."))",array("uid")));
@@ -378,7 +391,10 @@ class phoneGeneric extends plugin
}
$this->handle_post_events("modify");
}
- show_ldap_error($ldap->get_error());
+ $this->netConfigDNS->cn = $this->cn;
+ $this->netConfigDNS->save($this->dn);
+ show_ldap_error($ldap->get_error(), _("Saving phone failed"));
+
/* Optionally execute a command after we're done */
$this->postcreate();
}