diff --git a/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc b/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc
index c8835201944aaf70c9856a4070ae7b0908ef8121..3731093505078d927947006603047ff4e8f1e356 100644 (file)
/* Do we represent a valid account? */
if (!$this->is_account && $this->parent === NULL){
- $display= "<img alt=\"\" src=\"images/stop.png\" align=\"middle\"> <b>".
+ $display= "<img alt=\"\" src=\"images/small-error.png\" align=\"middle\"> <b>".
msgPool::noValidExtension(_("GOfax"))."</b>";
$display.= back_to_main();
return ($display);
}
/* Show dialog */
- $smarty->assign("search_image", get_template_path('images/search.png'));
- $smarty->assign("usearch_image", get_template_path('images/search_user.png'));
- $smarty->assign("tree_image", get_template_path('images/tree.png'));
+ $smarty->assign("search_image", get_template_path('images/lists/search.png'));
+ $smarty->assign("usearch_image", get_template_path('images/lists/search-user.png'));
+ $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
$smarty->assign("infoimage", get_template_path('images/info.png'));
- $smarty->assign("launchimage", get_template_path('images/small_filter.png'));
+ $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
$smarty->assign("departments", $this->config->idepartments);
$smarty->assign("list", $list);
if (isset($_POST['depselect'])){
if(!isset($this->config->departments[trim($key)])){
$this->config->departments[trim($key)]="";
}
- $field1 = array("string" => "<img src='images/folder.png' alt='department'>","attach"=>"style='width:16px;text-align:center;'");
+ $field1 = array("string" => "<img src='images/lists/folder.png' alt='department'>","attach"=>"style='width:16px;text-align:center;'");
$field2 = array("string" => sprintf($linkopen,base64_encode($key),$val),"attach"=>" style='border:none'");
$divSel->AddEntry(array($field1,$field2));
}
$this->config->departments[trim($key)]="";
}
- $field1 = array("string" => "<img src='images/folder.png' alt='department'>","attach"=>"style='width:16px;text-align:center;'");
+ $field1 = array("string" => "<img src='images/lists/folder.png' alt='department'>","attach"=>"style='width:16px;text-align:center;'");
$field2 = array("string" => sprintf($linkopen,base64_encode($key),$val),"attach"=>" style='border:none'");
$divSel->AddEntry(array($field1,$field2));
}
/* must: facsimileTelephoneNumber */
if ($this->facsimileTelephoneNumber == ""){
- $message[]= msgPool::required(_("Faxi number"));
+ $message[]= msgPool::required(_("Fax number"));
}
if (!tests::is_phone_nr($this->facsimileTelephoneNumber)){
/* Adapt from template, using 'dn' */
- function adapt_from_template($dn)
+ function adapt_from_template($dn, $skip= array())
{
- plugin::adapt_from_template($dn);
+ plugin::adapt_from_template($dn, $skip);
foreach (array("goFaxRBlocklist", "goFaxRBlockgroups", "goFaxSBlocklist",
"goFaxSBlockgroups", "facsimileAlternateTelephoneNumber") as $val){
+ if (in_array($val, $skip)){
+ continue;
+ }
+
if (isset($this->attrs[$val])){
$this->$val= $this->attrs[$val];
}