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

2012-04-08 Junichi Satoh <junichi@rworks.jp> 

* include/db/postgresql.php, include/functions_config.php,
	godmode/massive/massive_delete_modules.php,
	godmode/massive/massive_edit_modules.php: Fixed SQL error with
	PostgreSQL.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5910 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2012-04-08 12:43:18 +00:00
parent 5f6d61a6f9
commit 647ac2625a
5 changed files with 52 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2012-04-08 Junichi Satoh <junichi@rworks.jp>
* include/db/postgresql.php, include/functions_config.php,
godmode/massive/massive_delete_modules.php,
godmode/massive/massive_edit_modules.php: Fixed SQL error with
PostgreSQL.
2012-04-08 Junichi Satoh <junichi@rworks.jp> 2012-04-08 Junichi Satoh <junichi@rworks.jp>
* godmode/admin_access_logs.php: Fixed SQL error with PostgreSQL. * godmode/admin_access_logs.php: Fixed SQL error with PostgreSQL.

14
pandora_console/godmode/massive/massive_delete_modules.php
View File

@ -170,6 +170,9 @@ if ($delete) {
$groups = users_get_groups (); $groups = users_get_groups ();
$agents = agents_get_group_agents (array_keys (users_get_groups ()), false, "none"); $agents = agents_get_group_agents (array_keys (users_get_groups ()), false, "none");
switch ($config["dbtype"]) {
case "mysql":
case "oracle":
$module_types = db_get_all_rows_filter ('tagente_modulo,ttipo_modulo', $module_types = db_get_all_rows_filter ('tagente_modulo,ttipo_modulo',
array ('tagente_modulo.id_tipo_modulo = ttipo_modulo.id_tipo', array ('tagente_modulo.id_tipo_modulo = ttipo_modulo.id_tipo',
'id_agente' => array_keys ($agents), 'id_agente' => array_keys ($agents),
@ -177,6 +180,17 @@ $module_types = db_get_all_rows_filter ('tagente_modulo,ttipo_modulo',
'order' => 'ttipo_modulo.nombre'), 'order' => 'ttipo_modulo.nombre'),
array ('DISTINCT(id_tipo)', array ('DISTINCT(id_tipo)',
'CONCAT(ttipo_modulo.descripcion," (",ttipo_modulo.nombre,")") AS description')); 'CONCAT(ttipo_modulo.descripcion," (",ttipo_modulo.nombre,")") AS description'));
break;
case "postgresql":
$module_types = db_get_all_rows_filter ('tagente_modulo,ttipo_modulo',
array ('tagente_modulo.id_tipo_modulo = ttipo_modulo.id_tipo',
'id_agente' => array_keys ($agents),
'disabled' => 0,
'order' => 'description'),
array ('DISTINCT(id_tipo)',
'ttipo_modulo.descripcion || \' (\' || ttipo_modulo.nombre || \')\' AS description'));
break;
}
if ($module_types === false) if ($module_types === false)
$module_types = array (); $module_types = array ();

14
pandora_console/godmode/massive/massive_edit_modules.php
View File

@ -233,6 +233,9 @@ if (! $module_type) {
$table->rowstyle['edit7'] = 'display: none'; $table->rowstyle['edit7'] = 'display: none';
} }
$agents = agents_get_group_agents (array_keys (users_get_groups ()), false, "none"); $agents = agents_get_group_agents (array_keys (users_get_groups ()), false, "none");
switch ($config["dbtype"]) {
case "mysql":
case "oracle":
$module_types = db_get_all_rows_filter ('tagente_modulo,ttipo_modulo', $module_types = db_get_all_rows_filter ('tagente_modulo,ttipo_modulo',
array ('tagente_modulo.id_tipo_modulo = ttipo_modulo.id_tipo', array ('tagente_modulo.id_tipo_modulo = ttipo_modulo.id_tipo',
'id_agente' => array_keys ($agents), 'id_agente' => array_keys ($agents),
@ -240,6 +243,17 @@ $module_types = db_get_all_rows_filter ('tagente_modulo,ttipo_modulo',
'order' => 'ttipo_modulo.nombre'), 'order' => 'ttipo_modulo.nombre'),
array ('DISTINCT(id_tipo)', array ('DISTINCT(id_tipo)',
'CONCAT(ttipo_modulo.descripcion," (",ttipo_modulo.nombre,")") AS description')); 'CONCAT(ttipo_modulo.descripcion," (",ttipo_modulo.nombre,")") AS description'));
break;
case "postgresql":
$module_types = db_get_all_rows_filter ('tagente_modulo,ttipo_modulo',
array ('tagente_modulo.id_tipo_modulo = ttipo_modulo.id_tipo',
'id_agente' => array_keys ($agents),
'disabled' => 0,
'order' => 'description'),
array ('DISTINCT(id_tipo)',
'ttipo_modulo.descripcion || \' (\' || ttipo_modulo.nombre || \')\' AS description'));
break;
}
if ($module_types === false) if ($module_types === false)
$module_types = array (); $module_types = array ();

4
pandora_console/include/db/postgresql.php
View File

@ -540,7 +540,7 @@ function postgresql_db_format_array_where_clause_sql ($values, $join = 'AND', $p
foreach ($values as $field => $value) { foreach ($values as $field => $value) {
if (is_numeric ($field)) { if (is_numeric ($field)) {
/* User provide the exact operation to do */ /* User provide the exact operation to do */
$query .= sprintf ("%s = %d", $field, $value); $query .= $value;
if ($i < $max) { if ($i < $max) {
$query .= ' '.$join.' '; $query .= ' '.$join.' ';
@ -729,7 +729,7 @@ function postgresql_db_get_all_rows_filter ($table, $filter = array(), $fields =
$filter = ''; $filter = '';
} }
$sql = sprintf ('SELECT %s FROM "%s" %s', $fields, $table, $filter); $sql = sprintf ('SELECT %s FROM %s %s', $fields, $table, $filter);
if ($returnSQL) if ($returnSQL)
return $sql; return $sql;

2
pandora_console/include/functions_config.php
View File

@ -677,7 +677,7 @@ function config_check (){
$now = date("U"); $now = date("U");
// First action in order to know if it's a new installation or db maintenance never have been executed // First action in order to know if it's a new installation or db maintenance never have been executed
$first_action = db_get_value_filter('utimestamp', 'tsesion', array('1' => '1', 'order' => 'id_sesion ASC')); $first_action = db_get_value_filter('utimestamp', 'tsesion', array('1 = 1', 'order' => 'id_sesion ASC'));
$fresh_installation = $now - $first_action; $fresh_installation = $now - $first_action;
$resta = $now - $db_maintance; $resta = $now - $db_maintance;