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

Merge branch '1738-Problema_en_event.build_query.php_CDE' into 'develop' 

fixed warnings php in log pandora

See merge request artica/pandorafms!1234
This commit is contained in:
vgilc 2018-01-29 12:47:19 +01:00
parent 3f32fb709d 246d0ce9e0
commit 8f2a29ae3c
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,10 +81,14 @@ $events_wi_cdata = db_get_all_rows_sql('SELECT id_evento,custom_data from tevent
$count_events = 0;
$events_wi_cdata_id = 'OR id_evento IN (';
foreach ($events_wi_cdata as $key => $value) {
if(strpos(strtolower(base64_decode($value['custom_data'])),strtolower($search)) != false){
$needle = base64_decode($value['custom_data']);
if (($needle != "") && ($search != "")) {
if(strpos(strtolower($needle),strtolower($search)) != false){
$events_wi_cdata_id .= $value['id_evento'];
$count_events++;
}
}
if ($value !== end($events_wi_cdata) && $count_events > 0) {
$events_wi_cdata_id .= ',';
$events_wi_cdata_id = str_replace(',,', ',', $events_wi_cdata_id);

2
pandora_console/operation/events/events_list.php
View File

@ -264,6 +264,7 @@ html_print_div(array('hidden' => true,
if (check_acl ($config["id_user"], 0, "EW") || check_acl ($config["id_user"], 0, "EM") ) {
// Save filter div for dialog
echo '<div id="save_filter_layer" style="display: none">';
$table = new StdClass;
$table->id = 'save_filter_form';
$table->width = '100%';
$table->cellspacing = 4;
@ -329,6 +330,7 @@ if (check_acl ($config["id_user"], 0, "EW") || check_acl ($config["id_user"], 0,
// Load filter div for dialog
echo '<div id="load_filter_layer" style="display: none">';
$table = new StdClass;
$table->id = 'load_filter_form';
$table->width = '100%';
$table->cellspacing = 4;