From 49cbba4bf4654d5bf23aa1c1a8112daf5c1dc1e9 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Mon, 21 Jan 2013 13:42:06 +0100 Subject: [PATCH 1/7] improve coding style --- libraries/Footer.class.php | 3 ++- libraries/pmd_common.php | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libraries/Footer.class.php b/libraries/Footer.class.php index f12dce913b..a0d14ad525 100644 --- a/libraries/Footer.class.php +++ b/libraries/Footer.class.php @@ -246,7 +246,8 @@ class PMA_Footer $header = PMA_Response::getInstance()->getHeader(); $scripts = $header->getScripts()->getFiles(); $menuHash = $header->getMenu()->getHash(); - $this->_scripts->addCode( // prime the client-side cache + // prime the client-side cache + $this->_scripts->addCode( sprintf( 'AJAX.cache.primer = {' . ' url: "%s",' diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index ec02546ed3..ef4e633885 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -192,10 +192,7 @@ function get_script_tabs() for ($i = 0, $cnt = count($GLOBALS['PMD']['TABLE_NAME']); $i < $cnt; $i++) { $j = 0; - if (PMA_Util::isForeignKeySupported( - $GLOBALS['PMD']['TABLE_TYPE'][$i] - ) - ) { + if (PMA_Util::isForeignKeySupported($GLOBALS['PMD']['TABLE_TYPE'][$i])) { $j = 1; } $retval['j_tabs'][$GLOBALS['PMD_URL']['TABLE_NAME'][$i]] = $j; From f46687f8a197a486c72e2ce9dad0e2ca1f4c7e4c Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Mon, 21 Jan 2013 13:51:12 +0100 Subject: [PATCH 2/7] wrap long lines --- libraries/pmd_common.php | 54 ++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 13 deletions(-) diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index ef4e633885..ea6afc241e 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -31,17 +31,26 @@ function get_tables_info() PMA_DBI_select_db($GLOBALS['db']); $i = 0; foreach ($tables as $one_table) { - $GLOBALS['PMD']['TABLE_NAME'][$i] = $GLOBALS['db'] . "." . $one_table['TABLE_NAME']; + $GLOBALS['PMD']['TABLE_NAME'][$i] + = $GLOBALS['db'] . "." . $one_table['TABLE_NAME']; $GLOBALS['PMD']['OWNER'][$i] = $GLOBALS['db']; $GLOBALS['PMD']['TABLE_NAME_SMALL'][$i] = $one_table['TABLE_NAME']; - $GLOBALS['PMD_URL']['TABLE_NAME'][$i] = urlencode($GLOBALS['db'] . "." . $one_table['TABLE_NAME']); + $GLOBALS['PMD_URL']['TABLE_NAME'][$i] + = urlencode($GLOBALS['db'] . "." . $one_table['TABLE_NAME']); $GLOBALS['PMD_URL']['OWNER'][$i] = urlencode($GLOBALS['db']); - $GLOBALS['PMD_URL']['TABLE_NAME_SMALL'][$i] = urlencode($one_table['TABLE_NAME']); + $GLOBALS['PMD_URL']['TABLE_NAME_SMALL'][$i] + = urlencode($one_table['TABLE_NAME']); - $GLOBALS['PMD_OUT']['TABLE_NAME'][$i] = htmlspecialchars($GLOBALS['db'] . "." . $one_table['TABLE_NAME'], ENT_QUOTES); - $GLOBALS['PMD_OUT']['OWNER'][$i] = htmlspecialchars($GLOBALS['db'], ENT_QUOTES); - $GLOBALS['PMD_OUT']['TABLE_NAME_SMALL'][$i] = htmlspecialchars($one_table['TABLE_NAME'], ENT_QUOTES); + $GLOBALS['PMD_OUT']['TABLE_NAME'][$i] = htmlspecialchars( + $GLOBALS['db'] . "." . $one_table['TABLE_NAME'], ENT_QUOTES + ); + $GLOBALS['PMD_OUT']['OWNER'][$i] = htmlspecialchars( + $GLOBALS['db'], ENT_QUOTES + ); + $GLOBALS['PMD_OUT']['TABLE_NAME_SMALL'][$i] = htmlspecialchars( + $one_table['TABLE_NAME'], ENT_QUOTES + ); $GLOBALS['PMD']['TABLE_TYPE'][$i] = strtoupper($one_table['ENGINE']); @@ -66,7 +75,16 @@ function get_columns_info() PMA_DBI_select_db($GLOBALS['db']); $tab_column = array(); for ($i = 0, $cnt = count($GLOBALS['PMD']["TABLE_NAME"]); $i < $cnt; $i++) { - $fields_rs = PMA_DBI_query(PMA_DBI_get_columns_sql($GLOBALS['db'], $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i], null, true), null, PMA_DBI_QUERY_STORE); + $fields_rs = PMA_DBI_query( + PMA_DBI_get_columns_sql( + $GLOBALS['db'], + $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i], + null, + true + ), + null, + PMA_DBI_QUERY_STORE + ); $j = 0; while ($row = PMA_DBI_fetch_assoc($fields_rs)) { $tab_column[$GLOBALS['PMD']['TABLE_NAME'][$i]]['COLUMN_ID'][$j] = $j; @@ -89,7 +107,11 @@ function get_script_contr() PMA_DBI_select_db($GLOBALS['db']); $con["C_NAME"] = array(); $i = 0; - $alltab_rs = PMA_DBI_query('SHOW TABLES FROM ' . PMA_Util::backquote($GLOBALS['db']), null, PMA_DBI_QUERY_STORE); + $alltab_rs = PMA_DBI_query( + 'SHOW TABLES FROM ' . PMA_Util::backquote($GLOBALS['db']), + null, + PMA_DBI_QUERY_STORE + ); while ($val = @PMA_DBI_fetch_row($alltab_rs)) { $row = PMA_getForeigners($GLOBALS['db'], $val[0], '', 'internal'); //echo "
internal ".$GLOBALS['db']." - ".$val[0]." - "; @@ -99,7 +121,9 @@ function get_script_contr() $con['C_NAME'][$i] = ''; $con['DTN'][$i] = urlencode($GLOBALS['db'] . "." . $val[0]); $con['DCN'][$i] = urlencode($field); - $con['STN'][$i] = urlencode($value['foreign_db'] . "." . $value['foreign_table']); + $con['STN'][$i] = urlencode( + $value['foreign_db'] . "." . $value['foreign_table'] + ); $con['SCN'][$i] = urlencode($value['foreign_field']); $i++; } @@ -112,7 +136,9 @@ function get_script_contr() $con['C_NAME'][$i] = ''; $con['DTN'][$i] = urlencode($GLOBALS['db'].".".$val[0]); $con['DCN'][$i] = urlencode($field); - $con['STN'][$i] = urlencode($value['foreign_db'].".".$value['foreign_table']); + $con['STN'][$i] = urlencode( + $value['foreign_db'].".".$value['foreign_table'] + ); $con['SCN'][$i] = urlencode($value['foreign_field']); $i++; } @@ -218,9 +244,11 @@ function get_tab_pos() `y` AS `Y`, `v` AS `V`, `h` AS `H` - FROM " . PMA_Util::backquote($cfgRelation['db']) . "." . PMA_Util::backquote($cfgRelation['designer_coords']); - $tab_pos = PMA_DBI_fetch_result($query, 'name', null, $GLOBALS['controllink'], PMA_DBI_QUERY_STORE); + FROM " . PMA_Util::backquote($cfgRelation['db']) + . "." . PMA_Util::backquote($cfgRelation['designer_coords']); + $tab_pos = PMA_DBI_fetch_result( + $query, 'name', null, $GLOBALS['controllink'], PMA_DBI_QUERY_STORE + ); return count($tab_pos) ? $tab_pos : null; } - ?> From db137d9a7d5445ae492e0a577c795cfd7fc4441a Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Mon, 21 Jan 2013 13:57:22 +0100 Subject: [PATCH 3/7] improve docblocks --- libraries/pmd_common.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index ea6afc241e..13a34d71c5 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -17,6 +17,7 @@ $cfgRelation = PMA_getRelationsParam(); /** * retrieves table info and stores it in $GLOBALS['PMD'] * + * @return array with table info */ function get_tables_info() { @@ -165,6 +166,8 @@ function get_script_contr() } /** + * Returns UNIQUE and PRIMARY indices + * * @return array unique or primary indizes */ function get_pk_or_unique_keys() @@ -175,7 +178,7 @@ function get_pk_or_unique_keys() /** * returns all indices * - * @param boolean whether to include ony unique ones + * @param bool $unique_only whether to include ony unique ones * * @return array indices */ @@ -228,7 +231,9 @@ function get_script_tabs() } /** - * @return array table positions and sizes + * Returns table position + * + * @return array table positions and sizes */ function get_tab_pos() { From 1fda806175de6fa4eb622c2ee3dacea48ec8cdc8 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Mon, 21 Jan 2013 13:59:13 +0100 Subject: [PATCH 4/7] fix typos --- libraries/pmd_common.php | 4 ++-- libraries/tbl_columns_definition_form.inc.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index 13a34d71c5..1710c7d7bf 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -168,7 +168,7 @@ function get_script_contr() /** * Returns UNIQUE and PRIMARY indices * - * @return array unique or primary indizes + * @return array unique or primary indices */ function get_pk_or_unique_keys() { @@ -178,7 +178,7 @@ function get_pk_or_unique_keys() /** * returns all indices * - * @param bool $unique_only whether to include ony unique ones + * @param bool $unique_only whether to include only unique ones * * @return array indices */ diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index 61797e87e4..74a0bdc16a 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -180,7 +180,7 @@ if ($cfgRelation['mimework'] && $GLOBALS['cfg']['BrowseMIME']) { ); } -// workaround for field_fulltext, because its submitted indizes contain +// workaround for field_fulltext, because its submitted indices contain // the index as a value, not a key. Inserted here for easier maintaineance // and less code to change in existing files. if (isset($field_fulltext) && is_array($field_fulltext)) { From b24f2bf93fde100fce6b75557949c30e9c0fbde8 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Mon, 21 Jan 2013 14:06:49 +0100 Subject: [PATCH 5/7] refactoring : use temporary variable to reduce array-structure length --- libraries/pmd_common.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index 1710c7d7bf..b37c10ee9c 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -86,12 +86,13 @@ function get_columns_info() null, PMA_DBI_QUERY_STORE ); + $tbl_name = $GLOBALS['PMD']['TABLE_NAME'][$i]; $j = 0; while ($row = PMA_DBI_fetch_assoc($fields_rs)) { - $tab_column[$GLOBALS['PMD']['TABLE_NAME'][$i]]['COLUMN_ID'][$j] = $j; - $tab_column[$GLOBALS['PMD']['TABLE_NAME'][$i]]['COLUMN_NAME'][$j] = $row['Field']; - $tab_column[$GLOBALS['PMD']['TABLE_NAME'][$i]]['TYPE'][$j] = $row['Type']; - $tab_column[$GLOBALS['PMD']['TABLE_NAME'][$i]]['NULLABLE'][$j] = $row['Null']; + $tab_column[$tbl_name]['COLUMN_ID'][$j] = $j; + $tab_column[$tbl_name]['COLUMN_NAME'][$j] = $row['Field']; + $tab_column[$tbl_name]['TYPE'][$j] = $row['Type']; + $tab_column[$tbl_name]['NULLABLE'][$j] = $row['Null']; $j++; } } From 044f54dbdfda6bc90ca24583562776d1406f5907 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Mon, 21 Jan 2013 14:17:29 +0100 Subject: [PATCH 6/7] refactoring : use temporary variables to reduce array-structure length --- libraries/pmd_common.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index b37c10ee9c..02fd2b5d79 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -150,13 +150,15 @@ function get_script_contr() $ti = 0; $retval = array(); for ($i = 0, $cnt = count($con["C_NAME"]); $i < $cnt; $i++) { + $c_name_i = $con['C_NAME'][$i]; + $dtn_i = $con['DTN'][$i]; $retval[$ti] = array(); - $retval[$ti][$con['C_NAME'][$i]] = array(); - if (in_array($con['DTN'][$i], $GLOBALS['PMD_URL']["TABLE_NAME"]) + $retval[$ti][$c_name_i] = array(); + if (in_array($dtn_i, $GLOBALS['PMD_URL']["TABLE_NAME"]) && in_array($con['STN'][$i], $GLOBALS['PMD_URL']["TABLE_NAME"]) ) { - $retval[$ti][$con['C_NAME'][$i]][$con['DTN'][$i]] = array(); - $retval[$ti][$con['C_NAME'][$i]][$con['DTN'][$i]][$con['DCN'][$i]] = array( + $retval[$ti][$c_name_i][$dtn_i] = array(); + $retval[$ti][$c_name_i][$dtn_i][$con['DCN'][$i]] = array( 0 => $con['STN'][$i], 1 => $con['SCN'][$i] ); From 75e7e9eebc6c37411ec35e2ac904268c68a25a2b Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Mon, 21 Jan 2013 14:21:47 +0100 Subject: [PATCH 7/7] rename variable --- libraries/pmd_common.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index 02fd2b5d79..5bf7c58bbe 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -86,13 +86,13 @@ function get_columns_info() null, PMA_DBI_QUERY_STORE ); - $tbl_name = $GLOBALS['PMD']['TABLE_NAME'][$i]; + $tbl_name_i = $GLOBALS['PMD']['TABLE_NAME'][$i]; $j = 0; while ($row = PMA_DBI_fetch_assoc($fields_rs)) { - $tab_column[$tbl_name]['COLUMN_ID'][$j] = $j; - $tab_column[$tbl_name]['COLUMN_NAME'][$j] = $row['Field']; - $tab_column[$tbl_name]['TYPE'][$j] = $row['Type']; - $tab_column[$tbl_name]['NULLABLE'][$j] = $row['Null']; + $tab_column[$tbl_name_i]['COLUMN_ID'][$j] = $j; + $tab_column[$tbl_name_i]['COLUMN_NAME'][$j] = $row['Field']; + $tab_column[$tbl_name_i]['TYPE'][$j] = $row['Type']; + $tab_column[$tbl_name_i]['NULLABLE'][$j] = $row['Null']; $j++; } }