gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove post_params

Browse Source
This commit is contained in:
Atul Pratap Singh 2012-07-17 07:06:57 +05:30
parent ec6ac79775
commit 6f63f54ca9
2 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
db_qbe.php
View File

@ -11,19 +11,6 @@
*/
require_once 'libraries/common.inc.php';
require_once 'libraries/db_qbe.lib.php';
/**
* Sets globals from $_POST
*/
$post_params = array(
'criteriaColumn',
'criteriaShow',
'criteriaSort'
);
foreach ($post_params as $one_post_param) {
if (isset($_POST[$one_post_param])) {
$GLOBALS[$one_post_param] = $_POST[$one_post_param];
}
}
/**
* Sets globals from $_POST patterns, for Or* variables
@ -242,7 +229,7 @@ echo PMA_dbQbeGetTablesList($tbl_names);
// 1. SELECT
echo PMA_dbQbeGetSelectClause($criteria_column_count);
// 2. FROM
$from_clause = PMA_dbQbeGetFromClause($criteriaColumn, $criteria, $cfgRelation);
$from_clause = PMA_dbQbeGetFromClause($criteria, $cfgRelation);
if (! empty($from_clause)) {
echo 'FROM ' . htmlspecialchars($from_clause) . "\n";
}

18
libraries/db_qbe.lib.php
View File

@ -854,17 +854,16 @@ function PMA_dbQbeGetMasterTable($db, $all_tables, $all_columns,
/**
* Provides columns and tables that have valid where clause criteria
*
* @param string $criteriaColumn Selected table.columns
* @param string $criteria Already Filled criteria
*
* @return array
*/
function getWhereClauseTablesAndColumns($criteriaColumn, $criteria) {
function getWhereClauseTablesAndColumns($criteria) {
$where_clause_columns = array();
$where_clause_tables = array();
// Now we need all tables that we have in the where clause
for ($column_index = 0; $column_index < count($criteria); $column_index++) {
$current_table = explode('.', $criteriaColumn[$column_index]);
$current_table = explode('.', $_POST['criteriaColumn'][$column_index]);
if (empty($current_table[0]) || empty($current_table[1])) {
continue;
} // end if
@ -891,21 +890,20 @@ function getWhereClauseTablesAndColumns($criteriaColumn, $criteria) {
/**
* Provides FROM clause for building SQL query
*
* @param string $criteriaColumn Selected table.columns
* @param string $criteria Already Filled criteria
*
* @return FROM clause
*/
function PMA_dbQbeGetFromClause($criteriaColumn, $criteria, $cfgRelation)
function PMA_dbQbeGetFromClause($criteria, $cfgRelation)
{
$from_clause = '';
if (isset($criteriaColumn) && count($criteriaColumn) > 0) {
if (isset($_POST['criteriaColumn']) && count($_POST['criteriaColumn']) > 0) {
// Initialize some variables
$all_tables = $all_columns = $known_tables = $remaining_tables = array();
$left_join = '';
// We only start this if we have fields, otherwise it would be dumb
foreach ($criteriaColumn as $value) {
foreach ($_POST['criteriaColumn'] as $value) {
$parts = explode('.', $value);
if (! empty($parts[0]) && ! empty($parts[1])) {
$table = str_replace('`', '', $parts[0]);
@ -917,9 +915,7 @@ function PMA_dbQbeGetFromClause($criteriaColumn, $criteria, $cfgRelation)
// Create LEFT JOINS out of Relations
if ($cfgRelation['relwork'] && count($all_tables) > 0) {
// Get tables and columns with valid where clauses
$valid_where_clauses = getWhereClauseTablesAndColumns(
$criteriaColumn, $criteria
);
$valid_where_clauses = getWhereClauseTablesAndColumns($criteria);
$where_clause_tables = $valid_where_clauses['where_clause_tables'];
$where_clause_columns = $valid_where_clauses['where_clause_columns'];
// Get master table
@ -949,7 +945,7 @@ function PMA_dbQbeGetFromClause($criteriaColumn, $criteria, $cfgRelation)
$from_clause = PMA_CommonFunctions::getInstance()->backquote($master)
. $emerg . $left_join;
} // end if ($cfgRelation['relwork'] && count($all_tables) > 0)
} // end count($criteriaColumn) > 0
} // end count($_POST['criteriaColumn']) > 0
// In case relations are not defined, just generate the FROM clause
// from the list of tables, however we don't generate any JOIN