The branch, master has been updated via 6e05e71d1f2585c0cae63b245e189346908c3a10 (commit) via 7fdc4aa2ce4df220f7f6aa9c17f7aa88a6aa5bab (commit) via 016a210d6c146ee1822c396973dae7afacad25f2 (commit) via ddfa57e1dba67a260ce09b8b0532b63d2d2f6f78 (commit) via 347fca5b8683e9eee3c2b157370acdd7706a2824 (commit) from 5b54551280eebb60264cdb8dbe0e56c1f777e37c (commit)
- Log ----------------------------------------------------------------- commit 6e05e71d1f2585c0cae63b245e189346908c3a10 Author: Michal Čihař michal@cihar.com Date: Thu Aug 25 08:50:45 2011 +0200
Whitespace cleanup
commit 7fdc4aa2ce4df220f7f6aa9c17f7aa88a6aa5bab Author: Michal Čihař michal@cihar.com Date: Thu Aug 25 08:50:36 2011 +0200
Fix syntax
commit 016a210d6c146ee1822c396973dae7afacad25f2 Author: Michal Čihař michal@cihar.com Date: Thu Aug 25 08:50:22 2011 +0200
Remove useless comment
commit ddfa57e1dba67a260ce09b8b0532b63d2d2f6f78 Author: Michal Čihař michal@cihar.com Date: Thu Aug 25 08:49:57 2011 +0200
Fix typo
commit 347fca5b8683e9eee3c2b157370acdd7706a2824 Author: Michal Čihař michal@cihar.com Date: Thu Aug 25 08:49:31 2011 +0200
Use same order of database and table params as elsewhere
-----------------------------------------------------------------------
Summary of changes: libraries/tbl_select.lib.php | 9 +++------ tbl_select.php | 2 +- tbl_zoom_select.php | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index 07c5883..446a26e 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -3,9 +3,6 @@ /** * Functions for the table-search page and zoom-search page * - * Funtion PMA_tbl_getFields : Returns the fields of a table - * Funtion PMA_tbl_search_getWhereClause : Returns the where clause for query generation - * * @package phpMyAdmin */
@@ -40,13 +37,13 @@ function PMA_tbl_setTitle($propertiesIconic, $pmaThemeImage) * Gets all the fields of a table along with their types, collations * and whether null or not. * - * @param string $table Selected table * @param string $db Selected database + * @param string $table Selected table * * @return array Array containing the field list, field types, collations * and null constraint */ -function PMA_tbl_getFields($table,$db) +function PMA_tbl_getFields($db, $table) { // Gets the list and number of fields $fields = PMA_DBI_get_columns($db, $table, true); @@ -54,7 +51,7 @@ function PMA_tbl_getFields($table,$db) $geom_column_present = false; $geom_types = PMA_getGISDatatypes();
- foreach ($fields as $row) { + foreach ($fields as $key => $row) { $fields_list[] = $row['Field']; $type = $row['Type'];
diff --git a/tbl_select.php b/tbl_select.php index b9c23d5..ee5da27 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -63,7 +63,7 @@ if (! isset($param) || $param[0] == '') { $err_url = $goto . '?' . PMA_generate_common_url($db, $table);
// Gets the list and number of fields - list($fields_list, $fields_type, $fields_collation, $fields_null, $geom_column_present) = PMA_tbl_getFields($table,$db); + list($fields_list, $fields_type, $fields_collation, $fields_null, $geom_column_present) = PMA_tbl_getFields($db, $table); $fields_cnt = count($fields_list);
// retrieve keys into foreign fields, if any diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 7b11889..c5eebcd 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -73,7 +73,7 @@ $err_url = $goto . '?' . PMA_generate_common_url($db, $table);
// Gets the list and number of fields
-list($fields_list, $fields_type, $fields_collation, $fields_null) = PMA_tbl_getFields($table,$db); +list($fields_list, $fields_type, $fields_collation, $fields_null) = PMA_tbl_getFields($db, $table); $fields_cnt = count($fields_list);
// retrieve keys into foreign fields, if any @@ -193,7 +193,7 @@ for ($i = 0; $i < 4; $i++) { . '<option value="' . htmlspecialchars($fc) . '">' . htmlspecialchars($fc) . '</option>'; } - } + } } // end if... else...
if ($tbl_fields_null[$i]) { @@ -226,7 +226,7 @@ for ($i = 0; $i < 4; $i++) {
</td><td></td>
- <?php + <?php } ?>
</td> @@ -269,15 +269,15 @@ for ($j = 0; $j < $fields_cnt; $j++) { <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" > <?php echo htmlspecialchars($fields_list[$j]);?></option> <?php } -} +} ?> </select> </td></tr> <tr><td><label for="maxRowPlotLimit"><?php echo __("Maximum rows to plot"); ?></label></td> <td> -<?php +<?php echo '<input type="text" name="maxPlotLimit" id="maxRowPlotLimit" value="'; -if (! empty($maxPlotLimit)) { +if (! empty($maxPlotLimit)) { echo $maxPlotLimit; } else { echo $GLOBALS['cfg']['maxRowPlotLimit']; @@ -374,14 +374,14 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' <div id='resizer' style="width:600px;height:400px"> <center> <a href="#" onClick="displayHelp();"><?php echo __('How to use'); ?></a> </center> <div id="querydata" style="display:none"> -<?php - echo json_encode($data); +<?php + echo json_encode($data); ?> </div> <div id="querychart" style="float:right"></div> </div> <?php - } + } ?> </center> <fieldset id='dataDisplay' style="display:none"> @@ -408,7 +408,7 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' <th><?php echo PMA_getForeignFields_Values($foreigners, $foreignData, $fieldpopup, $tbl_fields_type, $i, $db, $table, $titles,$GLOBALS['cfg']['ForeignKeyMaxLimit'], '' ); ?> </th> </tr> <?php - } + } ?> </tbody> </table>
hooks/post-receive