![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/gofax/faxaccount/class_gofaxAccount.inc b/plugins/gofax/faxaccount/class_gofaxAccount.inc
index 7a2296292233f3dfd352a07f314238fadce2d70e..42ab729cecd4b5f0765cdff8aa5efdd74e300ad2 100644 (file)
var $plHeadline= "FAX";
var $plDescription= "This does something";
- /* CLI vars */
- var $cli_summary= "Manage users fax account";
- var $cli_description= "Some longer text\nfor help";
- var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
+ /* Department list shown in the divSelectList*/
+ var $departments;
/* Fax attributes */
- var $goFaxDeliveryMode= "";
+ var $goFaxDeliveryMode= "0";
var $facsimileTelephoneNumber= "";
var $goFaxIsEnabled= 1;
var $goFaxPrinter= "";
var $out_blocklist_dialog= FALSE;
var $current_blocklist= array();
+ /* Copy & paste variables */
+ var $CopyPasteVars=array("facsimileTelephoneNumber");//,"goFaxRBlocklist","goFaxRBlockgroups","goFaxSBlocklist","goFaxSBlockgroups");
+
/* attribute list for save action */
- var $attributes= array("goFaxDeliveryMode", "goFaxIsEnabled",
- "goFaxPrinter", "goFaxDivertNumber", "goFaxLanguage", "goFaxFormat", "mail");
+ var $attributes= array("goFaxDeliveryMode", "goFaxIsEnabled","facsimileAlternateTelephoneNumber","goFaxRBlocklist","goFaxRBlockgroups","goFaxSBlocklist","goFaxSBlockgroups","goFaxPrinter", "goFaxDivertNumber", "goFaxLanguage", "goFaxFormat", "mail","facsimileTelephoneNumber");
var $objectclasses= array("goFaxAccount");
- function gofaxAccount ($config, $dn= NULL)
+ var $uid= "";
+
+ function gofaxAccount ($config, $dn= NULL, $parent)
{
/* General initialization */
- plugin::plugin ($config, $dn);
+ plugin::plugin ($config, $dn, $parent);
+
+ /* Get user id */
+ if(isset($this->attrs['uid'])){
+ $this->uid = $this->attrs['uid'][0];
+ }
+
+ /* Hickert : 11.11.05
+ * Added to be able to handle department selection in divSelelect
+ */
+ if(!isset($_SESSION["Fax_Filter"])){
+ $_SESSION['Fax_Filter']['depselect'] = $this->config->current['BASE'];
+ }
if ($dn != "new"){
/* Get arrays */
foreach (array("goFaxRBlocklist", "goFaxRBlockgroups", "goFaxSBlocklist",
"goFaxSBlockgroups", "facsimileAlternateTelephoneNumber") as $val){
-
+ $this->$val =array();
if (isset($this->attrs["$val"]["count"])){
for ($i= 0; $i<$this->attrs["$val"]["count"]; $i++){
array_push($this->$val, $this->attrs["$val"][$i]);
"regex" => "");
register_global("faxfilter", $faxfilter);
}
+ $this->ui = get_userinfo();
}
function execute()
{
+ /* Call parent execute */
+ plugin::execute();
+
+
+ $acl= get_permissions ($this->ui->dn, $this->ui->subtreeACL);
+ $editacl= get_module_permission($acl, "gofax", $this->dn);
+ $this->acl = $editacl;
+
+ /* Hickert : 11.11.05
+ * Added to be able to handle department selection in divSelelect
+ */
+ if((isset($_GET['act']))&&($_GET['act']=="dep_open")){
+
+ if(strlen(base64_decode($_GET['dep_id']))>= strlen($this->config->current['BASE'])){
+ $_SESSION['Fax_Filter']['depselect']= base64_decode($_GET['dep_id']);
+ }else{
+ $_SESSION['Fax_Filter']['depselect']= $this->config->current['BASE'];
+ }
+ }
+
/* Load smarty stuff */
$smarty= get_smarty();
} elseif ( !$this->parent->by_object['mailAccount']->is_account){
$smarty->assign("has_mailaccount", "false");
$this->has_mailAccount= false;
+ } else {
+ $smarty->assign("has_mailaccount", "true");
}
/* Do we need to flip is_account state? */
if (isset($_POST['modify_state'])){
- $this->is_account= !$this->is_account;
+
+ /* Onyl change account state if allowed */
+ if($this->is_account && $this->acl == "#all#"){
+ $this->is_account= !$this->is_account;
+ }elseif(!$this->is_account && chkacl($this->acl,"create") == ""){
+ $this->is_account= !$this->is_account;
+ }
}
/* Do we represent a valid account? */
if (!$this->is_account && $this->parent == NULL){
- $display= "<img src=\"images/stop.png\" align=center> <b>".
+ $display= "<img alt=\"\" src=\"images/stop.png\" align=\"middle\"> <b>".
_("This account has no fax extensions.")."</b>";
$display.= back_to_main();
return ($display);
}
}
+ /* Hickert : 11.11.05
+ * Add selection from divSelelect to our Blocklist
+ */
+ /* Add list to blocklist */
+ if (isset($_POST['add_blocklist'])){
+ foreach($_POST as $name => $value){
+ if(preg_match("/ADDLIST_/i",$name)){
+ $this->current_blocklist= array_merge($this->current_blocklist, array(base64_decode($value)));
+
+ }
+ }
+ $this->current_blocklist= array_unique($this->current_blocklist);
+ sort($this->current_blocklist);
+ reset($this->current_blocklist);
+ }
+
/* Add list to blocklist */
- if (isset($_POST['add_blocklist']) && isset($_POST['predefined_list'])){
- $this->current_blocklist= array_merge($this->current_blocklist,
- $_POST['predefined_list']);
+ if (isset($_GET['add'])){
+ if(!is_array($this->current_blocklist)) $this->current_blocklist=array();
+ $this->current_blocklist= array_merge($this->current_blocklist, array( base64_decode($_GET['add'])));
$this->current_blocklist= array_unique($this->current_blocklist);
sort($this->current_blocklist);
reset($this->current_blocklist);
$this->current_blocklist= $tmp;
}
+
/* Blocklist edit finished */
if (isset($_POST['edit_blocklists_finish'])){
/* Incoming or outgoing? */
if ($this->in_blocklist_dialog){
- $destlist="goFaxRBlocklist";
- $destgroup="goFaxRBlockgroups";
+ $this->goFaxRBlocklist = array();
+ $this->goFaxRBlockgroups = array();
+
+ foreach ($this->current_blocklist as $val){
+ if (is_phone_nr($val)){
+ $this->goFaxRBlocklist[]=$val;
+ } else {
+ $this->goFaxRBlockgroups[]= $val;
+ }
+ }
} else {
- $destlist="goFaxSBlocklist";
- $destgroup="goFaxSBlockgroups";
- }
-
- /* Transfer values to ourself */
- $this->$destlist= array();
- $this->$destgroup= array();
-
- foreach ($this->current_blocklist as $val){
- if (is_phone_nr($val)){
- array_push($this->$destlist, $val);
- } else {
- array_push($this->$destgroups, $val);
+ $this->goFaxSBlocklist = array();
+ $this->goFaxSBlockgroups = array();
+
+ /* Transfer values to ourself */
+ foreach ($this->current_blocklist as $val){
+ if (is_phone_nr($val)){
+ $this->goFaxSBlocklist[]=$val;
+ } else {
+ $this->goFaxSBlockgroups[]= $val;
+ }
}
}
-
$this->is_modified= TRUE;
}
+
/* Set departments */
if ($this->locals_dialog ||
$this->in_blocklist_dialog ||
$base= $faxfilter['depselect'];
$acl= array($this->config->current['BASE'] => ":all");
- $res= get_list($acl, "(&(objectClass=goFaxAccount)$filter)", TRUE, $base, array("sn", "givenName", "facsimileTelephoneNumber"), TRUE);
+ $res= get_list("(&(objectClass=goFaxAccount)$filter)", $acl, $base,
+ array("sn", "givenName", "facsimileTelephoneNumber"), GL_SIZELIMIT | GL_SUBSEARCH);
foreach ($res as $attrs){
$list[$attrs['facsimileTelephoneNumber'][0]]=
/* 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("infoimage", get_template_path('images/info.png'));
$smarty->assign("launchimage", get_template_path('images/small_filter.png'));
return ($display);
}
+
/* Manage incoming blocklists */
if ($this->in_blocklist_dialog){
- $ldap->search ("(objectClass=goFaxRBlock)");
+
+ /* This handles the divSelectBox */
+
+ /* The base specifies the current position in the ldap tree
+ * The current base was specified by $_GET['dep_id'] before. Or contains the default value.
+ */
+ $base = $_SESSION['Fax_Filter']['depselect'];
+ $ldap->cd($base);
+
+ /* Ge all Blocklists */
+ $ldap->search ("(objectClass=goFaxRBlock)",array("cn","description"));
while ($attrs= $ldap->fetch()){
- $list[$attrs['cn'][0]]=
- $attrs['description'][0].
- " [".$attrs['cn'][0]."]";
+
+ /* Generate list depending on description */
+ if(isset($attrs['description'][0])){
+ $list[$attrs['cn'][0]]=
+ $attrs['description'][0].
+ " [".$attrs['cn'][0]."]";
+ }else{
+ $list[$attrs['cn'][0]]= $attrs['cn'][0];
+ }
+ }
+
+ /* Create our divselect box */
+ $divSel = new divSelectBox("divSelectPredefined");
+ $divSel->setHeight(296);
+
+ /* NEW LIST MANAGMENT
+ * We also need to search for the departments
+ * So we are able to navigate like in konquerer
+ */
+ $this->departments= array();
+
+ /* Get all departments within the current department */
+ $base = $_SESSION['Fax_Filter']['depselect'];
+ $ldap->ls("(objectClass=gosaDepartment)",$base);
+
+ /* Base back is used to go one department up in our ldap tree */
+ $base_back = preg_replace("/^[^,]+,/","",$base);
+
+ /* Only show base_back if it is needed */
+ if((strlen($base_back)>= strlen($this->config->current['BASE']))&&($base!=$this->config->current['BASE'])){
+ $this->departments[preg_replace("/^[^,]+,/","",$base)] = ".. - ["._("back")."]";
+ }
+
+ /* Fetch all returned departments an add them to our divlist */
+ while($value = $ldap->fetch()){
+ if($value["description"][0]!=".."){
+ $this->departments[$value['dn']]=convert_department_dn($value['dn'])." - [".$value["description"][0]."]";
+ }else{
+ $this->departments[$value['dn']]=$value["description"][0];
+ }
+ }
+ /* END NEW LIST MANAGMENT
+ */
+
+ // This links specifies the department open link
+ $linkopen = "<a href='?plug=".$_GET['plug']."&act=dep_open&dep_id=%s'>%s</a>";
+
+ /* Insert departments in divsel */
+ foreach($this->departments as $key=> $val){
+ 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;'");
+ $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val),"attach"=>" style='border:none'");
+ $divSel->AddEntry(array($field1,$field2));
+ }
+
+ /* Append predefined Blocklists */
+ foreach($list as $entry => $value){
+ $divSel->AddEntry(array(
+ array("string"=>"<input type='checkbox' value='".base64_encode($entry)."' name='ADDLIST_".base64_encode($entry)."'>"),
+ array("string"=>$value,"attach"=>"style='border:0px;'")
+ ));
}
/* Show dialog */
$smarty->assign("cblocklist", $this->current_blocklist);
$smarty->assign("goFaxBlockListACL", chkacl($this->acl, "goFaxBlockList"));
$smarty->assign("departments", $this->config->idepartments);
- $smarty->assign("list", $list);
- if (isset($_POST['department'])){
- $smarty->assign("department", $_POST['department']);
- }
+ $smarty->assign("divSelectPredefined", $divSel->DrawList());
$display.= $smarty->fetch (get_template_path('lists.tpl', TRUE, dirname(__FILE__)));
return ($display);
}
/* Manage outgoing blocklists */
+
if ($this->out_blocklist_dialog){
- $ldap->search ("(objectClass=goFaxSBlock)");
+
+ /* This handles the divSelectBox */
+
+ /* The base specifies the current position in the ldap tree
+ * The current base was specified by $_GET['dep_id'] before. Or contains the default value.
+ */
+ $base = $_SESSION['Fax_Filter']['depselect'];
+ $ldap->cd($base);
+
+ /* Ge all Blocklists */
+ $ldap->search ("(objectClass=goFaxSBlock)",array("cn","description"));
while ($attrs= $ldap->fetch()){
- if (isset($attrs['description'][0])){
- $list[$attrs['cn'][0]]= $attrs['cn'][0].
- " [".$attrs['description'][0]."]";
- } else {
+ if(isset($attrs['description'][0])){
+ $list[$attrs['cn'][0]]=
+ $attrs['description'][0].
+ " [".$attrs['cn'][0]."]";
+ }else{
$list[$attrs['cn'][0]]= $attrs['cn'][0];
}
}
+ /*Create DivSel*/
+ $divSel = new divSelectBox("divSelectPredefined");
+ $divSel->setHeight(296);
+
+ /* NEW LIST MANAGMENT
+ * We also need to search for the departments
+ * So we are able to navigate like in konquerer
+ */
+ $this->departments= array();
+ $ldap->ls("(objectClass=gosaDepartment)",$base);
+
+ /* Generate Back url, and append if it is needed */
+ $base_back = preg_replace("/^[^,]+,/","",$base);
+ if((strlen($base_back)>= strlen($this->config->current['BASE']))&&($base!=$this->config->current['BASE'])){
+ $this->departments[preg_replace("/^[^,]+,/","",$base)] = ".. - ["._("back")."]";
+ }
+
+ /* Get all departments */
+ while($value = $ldap->fetch()){
+ if(isset($value["description"][0])){
+ $this->departments[$value['dn']]=convert_department_dn($value['dn'])." - [".$value["description"][0]."]";
+ }else{
+ $this->departments[$value['dn']]=$value["description"][0];
+ }
+ }
+ /* END NEW LIST MANAGMENT
+ */
+
+ // Defining Links
+ $linkopen = "<a href='?plug=".$_GET['plug']."&act=dep_open&dep_id=%s'>%s</a>";
+
+ /* Insert departments in divlist*/
+ foreach($this->departments as $key=> $val){
+ 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;'");
+ $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val),"attach"=>" style='border:none'");
+ $divSel->AddEntry(array($field1,$field2));
+ }
+
+ /* Append Blocklits */
+ foreach($list as $entry => $value){
+ $divSel->AddEntry(array(
+ array("string"=>"<input type='checkbox' value='".base64_encode($entry)."' name='ADDLIST_".base64_encode($entry)."'>"),
+ array("string"=>$value,"attach"=>"style='border:0px;'")
+ ));
+ }
+
/* Show dialog */
$smarty->assign("cblocklist", $this->current_blocklist);
$smarty->assign("goFaxBlockListACL", chkacl($this->acl, "goFaxBlockList"));
$smarty->assign("departments", $this->config->idepartments);
- $smarty->assign("list", $list);
- if (isset($_POST['department'])){
- $smarty->assign("department", $_POST['department']);
- }
+ $smarty->assign("divSelectPredefined", $divSel->DrawList());
$display.= $smarty->fetch (get_template_path('lists.tpl', TRUE, dirname(__FILE__)));
return ($display);
}
/* Show main page */
- $smarty->assign("languages", $this->config->data['MAIN']['LANGUAGES']);
+ $smarty->assign("languages", get_languages(TRUE));
+
$smarty->assign("formats", $this->config->data['MAIN']['FAXFORMATS']);
$smarty->assign("printers", $this->printerList);
} else {
$smarty->assign("fax_to_printer", "");
}
+
+
$display.= $smarty->fetch (get_template_path('generic.tpl', TRUE, dirname(__FILE__)));
return ($display);
}
plugin::remove_from_parent();
- /* Zero out arrays */
- foreach (array("goFaxRBlocklist", "goFaxRBlockgroups", "goFaxSBlocklist",
- "goFaxSBlockgroups", "facsimileAlternateTelephoneNumber") as $val){
-
- $this->attrs[$val]= array();
- }
-
/* Adapt mail settings if needed */
- if ($this->parent->by_object['mailAccount']->is_account){
+ if ((isset($this->parent->by_object['mailAccount']->is_account)) && ($this->parent->by_object['mailAccount']->is_account)){
unset($this->attrs['mail']);
}
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->dn);
- $ldap->modify($this->attrs);
- show_ldap_error($ldap->get_error());
+ $this->cleanup();
+ $ldap->modify ($this->attrs);
+
+ show_ldap_error($ldap->get_error(), _("Removing FAX account failed"));
/* Optionally execute a command after we're done */
- $this->handle_post_events('remove');
+ $this->handle_post_events('remove',array("uid"=> $this->uid));
}
/* Check formular input */
function check()
{
- /* Reset message array */
- $message= array();
+ /* Call common method to give check the hook */
+ $message= plugin::check();
/* must: facsimileTelephoneNumber */
if ($this->facsimileTelephoneNumber == ""){
/* IF mail is specified (which is only the case if there's no mail account
present), check if it's valid.. */
if (@isset($this->parent->by_object['mailAccount']) &&
- $this->goFaxDeliveryMode && 32){
+ $this->goFaxDeliveryMode & 32){
if ($this->mail == ""){
$message[]= _("Mail delivery is checked, but no address has been specified.");
} elseif (!is_email($this->mail)){
}
}
+ // IE Fix, IE lets you choose disabled option, stupid browser ...
+ if((empty($this->goFaxPrinter))&&($this->goFaxDeliveryMode & 64)){
+ $message[]= _("Deliver fax to printer, is only possible if valid printer is given. Please correct your choice.");
+ }
+
return ($message);
}
/* Write to object */
if (chkacl ($this->acl, "goFaxDeliveryMode") == ""){
if ($tmp != $this->goFaxDeliveryMode){
- $this->is_modified= TRUE;
+ $this->is_modified= TRUE;
}
$this->goFaxDeliveryMode= "$tmp";
}
/* Check if mail account is active and correct the internal
reference to represent the current status. */
- if ($this->parent->by_object['mailAccount']->is_account){
+ if (isset($this->parent->by_object['mailAccount']->is_account)&&($this->parent->by_object['mailAccount']->is_account)){
$this->has_mailAccount= TRUE;
}
}
$this->attrs[$val]= $this->$val;
}
- /* Adapt mail settings if needed */
- unset($this->attrs['mail']);
- if (!$this->has_mailAccount && $this->goFaxDeliveryMode && 32){
- $this->attrs['mail']= $this->mail;
+ /* Do not save mail address ... it was possibly changed by mail plugin*/
+ if ((isset($this->parent->by_object['mailAccount']->is_account)) && ($this->parent->by_object['mailAccount']->is_account)){
+ unset($this->attrs['mail']);
}
/* Write back to ldap */
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->dn);
- $ldap->modify($this->attrs);
- show_ldap_error($ldap->get_error());
+ $this->cleanup();
+ $ldap->modify ($this->attrs);
+
+ show_ldap_error($ldap->get_error(), _("Saving FAX account failed"));
/* Optionally execute a command after we're done */
if ($this->initially_was_account == $this->is_account){
if ($this->is_modified){
- $this->handle_post_events("mofify");
+ $this->handle_post_events("modify",array("uid" => $this->uid));
}
} else {
- $this->handle_post_events("add");
+ $this->handle_post_events("add",array("uid" => $this->uid));
}
}
$this->facsimileAlternateTelephoneNumber);
}
+ function getCopyDialog()
+ {
+ $str = "";
+ $smarty = get_smarty();
+ $smarty->assign("facsimileTelephoneNumber", $this->facsimileTelephoneNumber);
+ $str['string'] = $smarty->fetch(get_template_path("paste_generic.tpl",TRUE,dirname(__FILE__)));
+ $str['status'] ="";
+ return($str);
+ }
+
+ function SaveCopyDialog()
+ {
+ if(isset($_POST['facsimileTelephoneNumber'])){
+ $this->facsimileTelephoneNumber = $_POST['facsimileTelephoneNumber'];
+ }
+ }
}