X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fgofon%2Ffonreports%2Fclass_fonreport.inc;h=5b810f60b6be0d3d04e86f5e74f96cf9d27bfba9;hb=fc062d415b59d3560ae0b071bb6f0b4581b02392;hp=4979edcc1ab4a4385869116ac2409d9eee65478a;hpb=951e1704806f7cb9ee25df2ae372782da68ea149;p=gosa.git

diff --git a/plugins/gofon/fonreports/class_fonreport.inc b/plugins/gofon/fonreports/class_fonreport.inc
index 4979edcc1..5b810f60b 100644
--- a/plugins/gofon/fonreports/class_fonreport.inc
+++ b/plugins/gofon/fonreports/class_fonreport.inc
@@ -56,9 +56,17 @@ class fonreport extends plugin
 	/* Call parent execute */
 	plugin::execute();
 
-	/* Get template engine */
+	/* GVet template engine */
 	$smarty= get_smarty();
 
+	foreach($this->fields as $field){
+		if(chkacl($this->acl,$field)==""){
+			$smarty->assign($field."ACL","");	
+		}else{
+			$smarty->assign($field."ACL"," disabled ");	
+		}
+	}
+
 	$months= array();
 	$months[1]= _("January"); $months[2]= _("February"); $months[3]= _("March"); $months[4]= _("April");
 	$months[5]= _("May"); $months[6]= _("June"); $months[7]= _("July"); $months[8]= _("August");
@@ -85,21 +93,21 @@ class fonreport extends plugin
  	
 	/* Connecting, selecting database */
 	if (!isset($this->config->data['SERVERS']['FON'])){
-		print_red("There is no asterisk database defined. Can't query anything.");
+		print_red(_("Can't connect to phone database, no reports can be shown!"));
 		return($smarty->fetch(get_template_path('contents.tpl', TRUE)));
 	}elseif(!is_callable("mysql_connect")){
-		print_red("There is no mysql extension available. Can't establish database connection.");
+		print_red(_("There is no mysql extension available, please check your php setup."));
 		return($smarty->fetch(get_template_path('contents.tpl', TRUE)));
 	}else{
 
 		$cfg= $this->config->data['SERVERS']['FON'];
 		$link = @mysql_pconnect($cfg['SERVER'], $cfg['LOGIN'], $cfg['PASSWORD']);
 		if ($link === FALSE){
-			print_red(_("Can't connect to phone database, no reports can be shown!. Check server,username and password combination."));
+			print_red(_("Can't connect to phone database, no reports can be shown!"));
 			return($smarty->fetch(get_template_path('contents.tpl', TRUE)));
 		}
 		if (! @mysql_select_db("gophone")){
-			print_red(_("Can't select phone (gophone) database for report generation!"));
+			print_red(_("Can't select phone database for report generation!"));
 			return($smarty->fetch(get_template_path('contents.tpl', TRUE)));
 		}
 	}
@@ -171,9 +179,17 @@ class fonreport extends plugin
 		  $this->userfilter= preg_replace("/OR $/", "", $this->userfilter);
 	  }
 
-	  /* Perform SQL query */
-##### FIXME ACL, FILTER ######
-#        if ($this->userfilter){
+	$fields_str = "calldate, ";
+
+	foreach($this->fields as $field){
+		if($field == "calldate") continue;	
+		if(chkacl($this->acl,$field)==""){
+			$fields_str .= $field.", ";
+		}
+	}
+
+	$fields_str = preg_replace("/, $/","",$fields_str);
+
 	if ($this->sort_direction == "down"){
 		$desc= "DESC";
 	} else {
@@ -181,8 +197,7 @@ class fonreport extends plugin
 	}
 	$start= date ("YmdHis", mktime(0,0,0,$this->month,1,$this->year));
 	$end=   date ("YmdHis", mktime(23,59,59,$this->month+1,0,$this->year));
-	$query = "SELECT calldate, channel, src, clid, lastapp, lastdata, dst, ".
-		"disposition, duration FROM cdr ".
+	$query = "SELECT ".$fields_str." FROM cdr ".
 		"WHERE calldate <= $end AND ".
 		"calldate >= $start ORDER BY ".$this->fields[$this->sort]." $desc;";
 
@@ -199,20 +214,23 @@ class fonreport extends plugin
 	}
 	$report_list= array();
 	while ($line = mysql_fetch_array($result, MYSQL_ASSOC)) {
+		$append_str = "";
 		$hour=  substr($line["calldate"], 11, 2);
 		$minute=substr($line["calldate"], 14, 2);
 		$format= _("Y-M-D");
 		$date= preg_replace("/Y/", substr($line["calldate"], 0, 4), $format);
 		$date= preg_replace("/M/", substr($line["calldate"], 5, 2), $date);
 		$date= preg_replace("/D/", substr($line["calldate"], 8, 2), $date);
-
-		$report_list[]= "<td>$date $hour:$minute</td>".
-			"<td>".$line["src"]."</td>".
-			"<td>".$line["dst"]."</td>".
-			"<td>".$line["channel"]."</td>".
-			"<td>".$line["lastapp"]."</td>".
-			"<td>".$line["disposition"]."</td>".
-			"<td>".$this->gen_duration($line["duration"])."</td>";
+		$append_str .= 	"<td>$date $hour:$minute</td>";
+		foreach(array("src","dst","channel","lastapp","disposition") as $atr){
+			if(isset($line[$atr])){
+				$append_str .= 	"<td>".$line[$atr]."</td>";
+			}
+		}
+		if(isset($line['duration'])){
+			$append_str .= 	"<td>".$this->gen_duration($line["duration"])."</td>";
+		}
+		$report_list[] = $append_str;
 	}
 
 	$this->report_list= $report_list;