diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc
index e9ec34749523bfd4a9152911a7e751fa069206ee..0a9601386ec7c9856418606a92106ee48cc99018 100644 (file)
$ldap->search("(objectClass=goFonMacro)", array("*"));
/* Add none for no macro*/
- $this->macros['none']=_("none");
+ $this->macros['none']=_("no macro");
$this->macro ="none";
}//is_array
}//visible = 1
}//while
+
/* Go through already saved values, for a parameter */
$tmp = split("!",$this->goFonMacro);
$macrotab="";
}else{
- $macrotab ="<table>";
+ $macrotab ="<table summary=\""._("Parameter")."\">";
/* for every single parameter-> display textfile,combo, or true false switch*/
foreach($this->macroarray[$this->macro] as $paras){
$str = $default;
/* in case of a combo box display a combobox with selected attr */
- if($type == "combo"){
- $str="<select name='".$var."' ".chkacl($this->acl, "goFonMacro").">";
- foreach(split(":",$default) as $choice){
- if($choosen==$choice){
- $str.="\n<option name='".$var."' value='".$choice."' selected>".$choice."</option>";
- }else{
- $str.="\n<option name='".$var."' value='".$choice."'>".$choice."</option>";
+ $macrotab.= "<tr>";
+ switch ($type){
+
+ case "combo":
+ $str= "<select name='".$var."' ".chkacl($this->acl, "goFonMacro")." ".chkacl($this->acl, "goFonMacro").">";
+ foreach(split(":",$default) as $choice){
+ if($choosen==$choice){
+ $str.= "\n<option value='".$choice."' selected>".$choice." </option>";
+ }else{
+ $str.= "\n<option value='".$choice."'>".$choice." </option>";
+ }
}
- }
- $str.="</select>";
- }
+ $str.="</select>";
+ $macrotab.= "<td>$name</td><td>$str";
+ break;
+ case "bool":
+ if(!$choosen){
+ $str="\n<input type='checkbox' name='".$var."' value='1' ".chkacl($this->acl, "goFonMacro")." >";
+ }else{
+ $str="\n<input type='checkbox' name='".$var."' value='1' checked ".chkacl($this->acl, "goFonMacro").">";
+ }
+ $macrotab.= "<td colspan='2'>$str $name";
+ break;
-
- /* Display switch for true false*/
- if($type == "bool"){
- if(!$choosen){
- $str="\n<input type='checkbox' name='".$var."' value='1'>";
- }else{
- $str="\n<input type='checkbox' name='".$var."' value='1' checked>";
- }
- }
+ case "string":
+ $str="<input name='".$var."' value='".$choosen."' ".chkacl($this->acl, "goFonMacro").">";
+ $macrotab.= "<td>$name</td><td>$str";
+ break;
- /* display simple textfield */
- if($type=="string"){
- $str="<input name='".$var."' value='".$choosen."' ".chkacl($this->acl, "goFonMacro").">";
}
-
- /* create table entry*/
- $macrotab.= "\n<tr><td>".$name."</td><td>".$str."</td></tr>";
+ $macrotab.= "</td</tr>";
}
$macrotab.="</table>";
/* Transfer ACL's */
foreach($this->attributes as $val){
$smarty->assign($val."ACL", chkacl($this->acl, "$val"));
+ $smarty->assign($val,$this->$val);
}
/* Fill arrays */
} else {
$color= "";
}
- $hl.= " <option $color label=\"$cn\" value=\"$cn\" $selected>$description</option>\n";
+ $hl.= " <option $color label=\"$cn\" value=\"$cn\" $selected>$description </option>\n";
}
$hl.= "</select>\n";
$smarty->assign ("hardware_list", $hl);
$message[]= sprintf(_("You need to specify at least one phone number!"));
}
+ if(($this->goFonPIN)==""){
+ $this->goFonPIN = array();
+ }else{
+ if(strcmp ((int)($this->goFonPIN),($this->goFonPIN))){
+ $message[] = sprintf(_("The given PIN is not valid, only numbers are allowed for this type."));
+ }elseif(strlen($this->goFonPIN) < 4){
+ $message[] = sprintf(_("The given PIN is too short"));
+ }
+
+ }
/* Check timestamps and phonenumbers */
foreach ($this->forwarders as $fw){
}
unset($this->attrs['macro']) ;
+ if($this->attrs['goFonMacro']==""){
+ $this->attrs['goFonMacro']=array();
+ }
/* Write back to ldap */
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->dn);
function remove_from_parent()
{
+ /* unset macro attr, it will cause an error */
+ $tmp = array_flip($this->attributes);
+ unset($tmp['macro']);
+ $this->attributes=array_flip($tmp);
+
/* Cancel if there's nothing to do here */
if (!$this->initially_was_account){
return;