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

2011-06-29 Ramon Novoa <rnovoa@artica.es> 

* include/functions_events.php: Do not update validated events.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4501 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2011-06-29 15:35:02 +00:00
parent a154c840fa
commit ad6a22c3c7
1 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pandora_console/include/functions_events.php
View File

@ -158,8 +158,7 @@ function events_validate_event ($id_event, $similars = true, $comment = '', $new
$id_event = (array) safe_int ($id_event, 1);
/* We must validate all events like the selected */
if ($similars) {
if ($similars && $new_status == 1) {
foreach ($id_event as $id) {
$id_event = array_merge ($id_event, events_get_similar_ids ($id));
}
@ -167,7 +166,6 @@ function events_validate_event ($id_event, $similars = true, $comment = '', $new
}
db_process_sql_begin ();
$errors = 0;
switch($new_status) {
case 1:
@ -187,10 +185,12 @@ function events_validate_event ($id_event, $similars = true, $comment = '', $new
}
foreach ($id_event as $event) {
if (check_acl ($config["id_user"], events_get_group ($event), "IW") == 0) {
db_pandora_audit("ACL Violation", "Attempted updating event #".$event);
}
$comment = '<b>-- '.$new_status_string.' '.__('by').' '.$config['id_user'].' '.'['.date ($config["date_format"]).'] --</b><br>'.$commentbox;
$fullevent = events_get_event($event);
if($fullevent['user_comment'] != ''){
$comment .= '<br>'.$fullevent['user_comment'];
}
@ -201,32 +201,18 @@ function events_validate_event ($id_event, $similars = true, $comment = '', $new
'user_comment' => $comment);
$ret = db_process_sql_update('tevento', $values, array('id_evento' => $event), 'AND', false);
if (check_acl ($config["id_user"], events_get_group ($event), "IW") == 0) {
//Check ACL
db_pandora_audit("ACL Violation", "Attempted updating event #".$event);
}
elseif ($ret !== false) {
//ACL didn't fail nor did return
continue;
}
$errors++;
break;
}
if ($errors > 1) {
db_process_sql_rollback ();
if ($ret === false) {
process_sql_rollback ();
return false;
}
else {
}
foreach ($id_event as $event) {
db_pandora_audit("Event validated", "Validated event #".$event);
}
db_process_sql_commit ();
return true;
}
}
/**
* Get group id of an event.