tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-09-08 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_api.php: fixed in function "otherParameter2Filter" the
	simbol of timestamp comparation and separate the AND operator. And added
	2 more filters, the "limit" and the "offset".



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4931 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2011-09-08 16:37:58 +00:00
parent fd5ae15f50
commit db5f13c59b
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2011-09-08 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed in function "otherParameter2Filter" the
simbol of timestamp comparation and separate the AND operator. And added
2 more filters, the "limit" and the "offset".
2011-09-08 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/setup/performance.php

12
pandora_console/include/functions_api.php
View File

@ -871,11 +871,19 @@ function otherParameter2Filter($other) {
}
if (($other['data'][6] != null) && ($other['data'][6] != -1)) {
$filterString .= ' AND utimestamp => ' . $other['data'][6];
$filterString .= ' AND utimestamp >= ' . $other['data'][6];
}
if (($other['data'][7] != null) && ($other['data'][7] != -1)) {
$filterString .= 'AND utimestamp <= ' . $other['data'][7];
$filterString .= ' AND utimestamp <= ' . $other['data'][7];
}
if ($other['data'][8] != null) {
$filterString .= ' LIMIT ' . $other['data'][8];
}
if ($other['data'][9] != null) {
$filterString .= ' OFFSET ' . $other['data'][9];
}
return $filterString;