diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 0d53d10670..e057884c1a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2011-03-07 Miguel de Dios + + * include/functions_db.php, godmode/admin_access_logs.php: changes for the + interval operator in PostgreSQL. + 2011-03-07 Juan Manuel Ramon * pandoradb.oracle.sql: Added to repository. Creation script with some diff --git a/pandora_console/godmode/admin_access_logs.php b/pandora_console/godmode/admin_access_logs.php index cd748519a4..39c9821060 100644 --- a/pandora_console/godmode/admin_access_logs.php +++ b/pandora_console/godmode/admin_access_logs.php @@ -103,7 +103,14 @@ if ($filter_ip != '') { } if ($filter_hours_old != 0) { - $filter .= ' AND fecha >= DATE_ADD(NOW(), INTERVAL -' . $filter_hours_old . ' HOUR)'; + switch ($config["dbtype"]) { + case "mysql": + $filter .= ' AND fecha >= DATE_ADD(NOW(), INTERVAL -' . $filter_hours_old . ' HOUR)'; + break; + case "postgresql": + $filter .= ' AND fecha >= DATE_ADD(NOW(), INTERVAL - \'' . $filter_hours_old . ' HOUR \')'; + break; + } } $sql = "SELECT COUNT(*) FROM tsesion " . $filter; diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index 28581d0697..d6d67e035d 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -3081,7 +3081,16 @@ function __ ($string /*, variable arguments */) { * @return int The number of servers alive. */ function check_server_status () { - $sql = "SELECT COUNT(id_server) FROM tserver WHERE status = 1 AND keepalive > NOW() - INTERVAL 15 MINUTE"; + global $config; + + switch ($config["dbtype"]) { + case "mysql": + $sql = "SELECT COUNT(id_server) FROM tserver WHERE status = 1 AND keepalive > NOW() - INTERVAL 15 MINUTE"; + break; + case "postgresql": + $sql = "SELECT COUNT(id_server) FROM tserver WHERE status = 1 AND keepalive > NOW() - INTERVAL '15 MINUTE'"; + break; + } $status = (int) get_db_sql ($sql); //Cast as int will assure a number value // This function should just ack of server down, not set it down. return $status;