diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 11bfc315a3..0abf3fcb59 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2008-10-08 Evi Vanoost + + * godmode/db/db_event.php: Didn't work for some or another reason. + Partially rewrote it. It works now. + 2008-10-07 Evi Vanoost * include/functions_reporting.php: Handle empty and zero values in diff --git a/pandora_console/godmode/db/db_event.php b/pandora_console/godmode/db/db_event.php index 03f9b44885..b100fd0372 100644 --- a/pandora_console/godmode/db/db_event.php +++ b/pandora_console/godmode/db/db_event.php @@ -31,48 +31,58 @@ if (! give_acl ($config['id_user'], 0, "DM")) { # ====================================== # Purge data using dates if (isset ($_POST["date_purge"])){ - $from_date = get_parameter_post ("date_purge"); - $query = sprintf ("DELETE FROM `tevento` WHERE `timestamp` < '%s'",$from_date); - (int) $deleted = process_sql ($query); + $from_date = (int) get_parameter_post ("date_purge"); + $query = sprintf ("DELETE FROM `tevento` WHERE `utimestamp` < %d",$from_date); + $deleted = process_sql ($query); + if ($deleted !== false) { + echo '

'.__('Successfully deleted old events').'

'; + } else { + echo '

'.__('Error deleting old events').'

'; + } } # End of get parameters block -echo "

".__('Database Maintenance')." > "; -echo __('Event Database cleanup')."

"; +echo "

".__('Database Maintenance')." > ".__('Event Database cleanup')."

"; -echo ""; -echo ""; +$table->data = array (); +$table->cellpadding = 4; +$table->cellspacing = 4; +$table->class = "databox"; +$table->width = 300; -echo ""; -echo ""; -echo ""; +$table->data[0][0] = ''.__('Total').':'; +$table->data[0][1] = $row["total"].' '.__('Records'); +$table->data[1][0] = ''.__('First date').':'; +$table->data[1][1] = $row["first_date"]; -echo ""; -echo "
"; $row = get_db_row_sql ("SELECT COUNT(*) AS total, MIN(timestamp) AS first_date, MAX(timestamp) AS latest_date FROM tevento"); -echo "".__('Total').""; -echo "".$row["total"]." ".__('Records')."
".__('First date')."".$row["first_date"]."
"; -echo "".__('Latest date').""; -echo "".$row["latest_date"]."
"; +$table->data[2][0] = ''.__('Latest data').':'; +$table->data[2][1] = $row["latest_date"]; + +print_table ($table); +unset ($table); + +echo '

'.__('Purge data').'

'; + +echo '
'; +echo ' +
'; + +$time = time (); +$fields = array (); +$fields[$time - 7776000] = __('Purge event data over 90 days'); +$fields[$time - 2592000] = __('Purge event data over 30 days'); +$fields[$time - 1209600] = __('Purge event data over 14 days'); +$fields[$time - 604800] = __('Purge event data over 7 days'); +$fields[$time - 259200] = __('Purge event data over 3 days'); +$fields[$time - 86400] = __('Purge event data over 1 day'); +$fields[$time] = __('Purge all event data'); + +print_select ($fields, "date_purge", '', '', '', '0', false, false, false, "w255"); + +echo ''; +print_submit_button (__('Do it!'),'purgedb', false, 'class="sub wand" onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;"'); +echo '
'; ?> - -

-
- -
- - - - -
-