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

2013-03-22 Miguel de Dios <miguel.dedios@artica.es> 

* include/db/mysql.php: fixed the querys for the columns with
	empty string in the function
	"mysql_db_format_array_where_clause_sql".
	
	* include/functions_events.php: added lost parameter $similars in
	the function "events_change_owner".
	
	* operation/events/events.build_query.php: cleaned source code
	style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7882 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-03-22 14:27:47 +00:00
parent 4aec2e65d1
commit 8c5d21275e
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/ChangeLog
View File

@ -1,3 +1,15 @@
2013-03-22 Miguel de Dios <miguel.dedios@artica.es>
* include/db/mysql.php: fixed the querys for the columns with
empty string in the function
"mysql_db_format_array_where_clause_sql".
* include/functions_events.php: added lost parameter $similars in
the function "events_change_owner".
* operation/events/events.build_query.php: cleaned source code
style.
2013-03-22 Ramon Novoa <rnovoa@artica.es>
* include/functions_db.php: Always display the source ip address

6
pandora_console/include/db/mysql.php
View File

@ -533,7 +533,11 @@ function mysql_db_format_array_where_clause_sql ($values, $join = 'AND', $prefix
$query .= sprintf ('%s IN ("%s")', $field, implode ('", "', $value));
}
else {
if ($value[0] == ">") {
if (empty($value)) {
//Search empty string
$query .= sprintf ("%s = ''", $field);
}
else if ($value[0] == ">") {
$value = substr($value,1,strlen($value)-1);
$query .= sprintf ("%s > '%s'", $field, $value);
}

4
pandora_console/include/functions_events.php
View File

@ -594,7 +594,7 @@ function events_get_events_table($meta, $history) {
*
* @return bool Whether or not it was successful
*/
function events_comment ($id_event, $comment = '', $action = 'Added comment', $meta = false, $history = false) {
function events_comment ($id_event, $comment = '', $action = 'Added comment', $meta = false, $history = false, $similars = true) {
global $config;
$event_table = events_get_events_table($meta, $history);
@ -1439,7 +1439,7 @@ function events_get_all_status (){
$fields[0] = __('Only new');
$fields[1] = __('Only validated');
$fields[2] = __('Only in process');
$fields[3] = __('Only not validated');
$fields[3] = __('Only not validated');
return $fields;
}

3
pandora_console/operation/events/events.build_query.php
View File

@ -159,7 +159,8 @@ else {
$group_array = array_keys($groups);
}
$tags_acls_condition = tags_get_acl_tags($id_user, $group_array, 'ER', 'event_condition', 'AND');
$tags_acls_condition = tags_get_acl_tags($id_user, $group_array, 'ER',
'event_condition', 'AND');
$sql_post .= $tags_acls_condition;