Permalink
Browse files

Whitespace cleanup

  • Loading branch information...
1 parent 8fd3184 commit 6f619e43758ec38d734edc2b69a1c2ae8d60bd35 @nijel nijel committed Aug 13, 2011
Showing with 24 additions and 24 deletions.
  1. +24 −24 tbl_zoom_select.php
View
@@ -29,18 +29,18 @@
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
-/**
+/**
* Handle AJAX request for data row on point select
* @var post_params Object containing parameters for the POST request
*/
if (isset($_REQUEST['get_data_row']) && $_REQUEST['get_data_row'] == true) {
-
- $extra_data = array();
- $row_info_query = 'SELECT * FROM `' . $_REQUEST['db'] . '`.`' . $_REQUEST['table'] . '` WHERE ' . $_REQUEST['where_clause'];
+
+ $extra_data = array();
+ $row_info_query = 'SELECT * FROM `' . $_REQUEST['db'] . '`.`' . $_REQUEST['table'] . '` WHERE ' . $_REQUEST['where_clause'];
$result = PMA_DBI_query( $row_info_query . ";" , null, PMA_DBI_QUERY_STORE);
$fields_meta = PMA_DBI_get_fields_meta($result);
- while ($row = PMA_DBI_fetch_assoc($result))
+ while ($row = PMA_DBI_fetch_assoc($result))
$extra_data['row_info'] = $row;
PMA_ajaxResponse(NULL, true, $extra_data);
@@ -120,7 +120,7 @@
?>
<?php
-
+
/*
* Form for input criteria
*/
@@ -143,14 +143,14 @@
<tbody>
<?php
$odd_row = true;
-
+
for($i = 0 ; $i < 4 ; $i++){
-
+
if($i == 2){
echo "<tr><td>";
echo __("Additional search criteria");
echo "</td><tr>";
- }
+ }
?>
<tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>">
@@ -170,7 +170,7 @@
</select></th>
<td><?php if(isset($tbl_fields_type[$i]))echo $tbl_fields_type[$i]; ?></td>
<td><?php if(isset($tbl_fields_collation[$i]))echo $tbl_fields_collation[$i]; ?></td>
-
+
<td>
<?php if(isset($inputs) && $inputs[$i] != __('pma_null')){ ?>
<select name="zoomFunc[]">
@@ -216,7 +216,7 @@
}
}
} // end if... else...
-
+
if ($tbl_fields_null[$i]) {
foreach ($GLOBALS['cfg']['NullOperators'] as $fc) {
if(isset($zoomFunc[$i]) && $zoomFunc[$i] == $fc){
@@ -237,16 +237,16 @@
<td>
<?php
$field = $inputs[$i];
-
+
$foreignData = PMA_getForeignData($foreigners, $field, false, '', '');
if (isset($fields))
echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i ,$db, $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], $fields);
else
echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i ,$db, $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], '');
-
+
}
else{ ?>
-
+
</td><td></td>
<?php } ?>
@@ -273,7 +273,7 @@
//Set default datalabel if not selected
if(isset($zoom_submit) && $inputs[0] != __('pma_null') && $inputs[1] != __('pma_null')) {
- if ($dataLabel == '')
+ if ($dataLabel == '')
$dataLabel = PMA_getDisplayField($db,$table);
}
?>
@@ -303,7 +303,7 @@
else { ?>
<input type="text" name="maxPlotLimit" value="<?php echo $GLOBALS['cfg']['maxRowPlotLimit']; ?>" /></td></tr>
<?php
- } ?>
+ } ?>
</table>
</fieldset>
@@ -314,7 +314,7 @@
</fieldset>
</form>
-<?php
+<?php
/*
* Handle the input criteria and gerate the query result
@@ -325,11 +325,11 @@
/*
* Query generation part
*/
- $w = $data = array();
+ $w = $data = array();
$sql_query = 'SELECT *';
//Add the table
-
+
$sql_query .= ' FROM ' . PMA_backquote($table);
for($i = 0 ; $i < 4 ; $i++){
if($inputs[$i] == __('pma_null'))
@@ -370,15 +370,15 @@
$data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], 'where_clause' => $uniqueCondition[0]);
else
$data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], $dataLabel => $row[$dataLabel], 'where_clause' => $uniqueCondition[0]);
- }
+ }
?>
<?php
/*
* Form for displaying point data and also the scatter plot
*/
-?>
+?>
<form method="post" action="tbl_zoom_select.php" name="displayResultForm" id="zoom_display_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>>
<?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
<input type="hidden" name="goto" value="<?php echo $goto; ?>" />
@@ -397,7 +397,7 @@
</div>
<div id="querychart" style="float:right"></div>
</div>
- <?php
+ <?php
} ?>
</center>
<fieldset id='dataDisplay' style="display:none">
@@ -423,7 +423,7 @@
<th><?php echo '<input type="checkbox" class="checkbox_null" name="fields_null[ ' . $i . ' ]" id="fields_null_id_' . $i . '" />'; ?></th>
<th><?php echo PMA_getForeignFields_Values($foreigners, $foreignData, $fieldpopup, $tbl_fields_type, $i, $db, $table, $titles,$GLOBALS['cfg']['ForeignKeyMaxLimit'], '' ); ?> </th>
</tr>
- <?php
+ <?php
} ?>
</tbody>
</table>
@@ -437,7 +437,7 @@
<input type="hidden" id="queryID" name="sql_query" />
</form>
</fieldset>
- <?php
+ <?php
}
?>

0 comments on commit 6f619e4

Please sign in to comment.