![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc
index 863e7c3d94a0dea690123d1bef6ff8b2a8c4dd7e..33388787b8305f5c3b945b43bb3fbd10777cf728 100644 (file)
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;
var $objectclasses= array("top", "goFonHardware");
- function phonegeneric ($config, $dn= NULL)
+ function phonegeneric ($config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn);
- $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses);
+ plugin::plugin ($config, $dn, $parent);
+ $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses, true);
+ $this->netConfigDNS->acl = $this->acl;
/* Set base */
if ($this->dn == "new"){
function execute()
{
- /* Call parent execute */
- plugin::execute();
+ $this->netConfigDNS->acl = $this->acl;
+
+ /* Call parent execute */
+ plugin::execute();
/* Do we represent a valid phone? */
if (!$this->is_account && $this->parent == NULL){
/* Fill templating stuff */
$smarty= get_smarty();
$smarty->assign("bases", $this->config->idepartments);
+ $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($attr."ACL", chkacl($this->acl, $attr));
}
$smarty->assign("base_select", $this->base);
+ $smarty->assign("baseACL", chkacl($this->acl,"base"));
- $smarty->assign("goFonDefaultIPs",array("dynamic"=>_("dynamic"),"network"=>_("Networksettings")));
-
- /* Show main page */
+ $smarty->assign("goFonDefaultIPs",array("dynamic"=>_("dynamic"),"network"=>_("Network settings")));
+ $this->netConfigDNS->cn= $this->cn;
$smarty->assign("netconfig", $this->netConfigDNS->execute());
+
+ /* Display sub dialog from network settings */
+ if($this->netConfigDNS->dialog){
+ $this->dialog = TRUE;
+ return($this->netConfigDNS->execute());
+ }else{
+ $this->dialog = FALSE;
+ }
+
+ /* Show main page */
$smarty->assign("phonesettings", dirname(__FILE__)."/phonesettings.tpl");
return($smarty->fetch (get_template_path('phone.tpl', TRUE)));
}
function remove_from_parent()
{
+ $this->netConfigDNS->acl = $this->acl;
$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 user which are depending on this phone. One of them is user '%s'."),
+ 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);
- show_ldap_error($ldap->get_error());
- $this->handle_post_events("remove");
+ show_ldap_error($ldap->get_error(), _("Removing phone failed"));
+ $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']);
/* Check supplied data */
function check()
{
- $message= $this->netConfigDNS->check();
+ /* 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(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.");
-// }
-// }
+ 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 ($this->cn == "" && chkacl ($this->acl, "cn") == ""){
$message[]= _("The required field 'Phone name' is not set.");
$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;
/* Save to LDAP */
function save()
{
+ $this->netConfigDNS->acl = $this->acl;
plugin::save();
$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->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
$ldap->cd($this->dn);
$ldap->add($this->attrs);
- $this->handle_post_events("add");
+ $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);
+ $ldap->modify ($this->attrs);
// $user_phone_reload
$ldap->cd ($this->config->current['BASE']);
$usertab->save();
unset($usertab);
}
- $this->handle_post_events("modify");
+ $this->handle_post_events("modify",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
}
$this->netConfigDNS->cn = $this->cn;
$this->netConfigDNS->save($this->dn);
-
- show_ldap_error($ldap->get_error());
- /* Optionally execute a command after we're done */
- $this->postcreate();
+ show_ldap_error($ldap->get_error(), _("Saving phone failed"));
}
}