From: hickert Date: Thu, 18 May 2006 06:00:02 +0000 (+0000) Subject: Added some more checks X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f8fe7d27306d456cbfbc8e8f291e214fa64aa803;p=gosa.git Added some more checks git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3396 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/plugins/gofon/fonreports/class_fonreport.inc b/plugins/gofon/fonreports/class_fonreport.inc index 6a50526f9..53999c83c 100644 --- a/plugins/gofon/fonreports/class_fonreport.inc +++ b/plugins/gofon/fonreports/class_fonreport.inc @@ -218,16 +218,18 @@ class fonreport extends plugin $this->report_list= $report_list; @mysql_close($link); - /* Generate output */ - $mod= 0; - /***************** Create list of results *****************/ - $output= ""; - foreach ($this->report_list as $val){ + /* Generate output */ + $mod = 0; + $output = ""; + if(count($this->report_list) < $this->start){ + $this->start = 0; + } + foreach($this->report_list as $val){ if ($mod < $this->start) { $mod++; continue; @@ -244,7 +246,6 @@ class fonreport extends plugin $output.= "$val"; } - /***************** Tell smarty what we have found *****************/ @@ -302,7 +303,11 @@ class fonreport extends plugin } } } - $str .= " dst like '".$s2."' OR src like '".$s2."' OR lastapp like '".$s2."')"; + $str .= " channel like '%".$s."%' OR + dstchannel like '%".$s."%' OR + dst like '".$s2."' OR + src like '".$s2."' OR + lastapp like '".$s2."')"; return($str); }