Code style fixes

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
phpmyadmin · Jun 4, 2014 · fea0fe0 · fea0fe0
1 parent 1ca50ed
commit fea0fe0
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 20 deletions.
diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php
@@ -923,8 +923,10 @@ public function getColumnProperties($search_index, $column_index)
             ? $_POST['criteriaColumnOperators'][$search_index] : '');
         $entered_value = (isset($_POST['criteriaValues'])
             ? $_POST['criteriaValues'] : '');
-        $titles['Browse'] = PMA_Util::getIcon(
-            'b_browse.png', __('Browse foreign values')
+        $titles = array(
+            'Browse' => PMA_Util::getIcon(
+                'b_browse.png', __('Browse foreign values')
+            )
         );
         //Gets column's type and collation
         $type = $this->_columnTypes[$column_index];
@@ -1015,6 +1017,7 @@ private function _getRowsZoom()
     {
         $odd_row = true;
         $html_output = '';
+        $type = $collation = $func = $value = array();
         /**
          * Get already set search criteria (if any)
          */
@@ -1243,9 +1246,11 @@ public function getSelectionForm($goto, $dataLabel = null)
     public function getZoomResultsForm($goto, $data)
     {
         $html_output = '';
-        $titles['Browse'] = PMA_Util::getIcon(
-            'b_browse.png',
-            __('Browse foreign values')
+        $titles = array(
+            'Browse' => PMA_Util::getIcon(
+                'b_browse.png',
+                __('Browse foreign values')
+            )
         );
         $html_output .= '<form method="post" action="tbl_zoom_select.php"'
             . ' name="displayResultForm" id="zoom_display_form"'

diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
@@ -943,6 +943,7 @@ function PMA_handleControlRequest()
  */
 function PMA_handleRequestForSlaveChangeMaster()
 {
+    $sr = array();
     $_SESSION['replication']['m_username'] = $sr['username']
         = PMA_Util::sqlAddSlashes($_REQUEST['username']);
     $_SESSION['replication']['m_password'] = $sr['pma_pw']

diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php
@@ -1427,6 +1427,7 @@ public function dataDictionaryDoc($alltables)
                         ? str_replace('_', '/', $mime_map[$field_name]['mimetype'])
                         : '')
                 );
+                $links = array();
                 $links[0] = $pdf->PMA_links['RT'][$table][$field_name];
                 if (isset($res_rel[$field_name]['foreign_table'])
                     && isset($res_rel[$field_name]['foreign_field'])

diff --git a/libraries/server_status.lib.php b/libraries/server_status.lib.php
@@ -511,7 +511,9 @@ function PMA_getHtmlForServerProcessItem($process, $odd_row, $show_full_sql)
         }
     }
 
-    $url_params['kill'] = $process['Id'];
+    $url_params = array(
+        'kill' => $process['Id']
+    );
     $kill_process = 'server_status.php' . PMA_URL_getCommon($url_params);
 
     $retval  = '<tr class="' . ($odd_row ? 'odd' : 'even') . '">';

diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
@@ -1313,6 +1313,9 @@ function PMA_SQP_analyze($arr)
                         // setting the alias)
                         $alias_for_select_expr = $identifier;
                     } else {
+                        if (! isset($chain)) {
+                            $chain = array();
+                        }
                         $chain[] = $identifier;
                         $previous_was_identifier = true;
 
@@ -1325,6 +1328,9 @@ function PMA_SQP_analyze($arr)
                             // save it for later
                             $alias_for_table_ref = $identifier;
                         } else {
+                            if (! isset($chain)) {
+                                $chain = array();
+                            }
                             $chain[] = $identifier;
                             $previous_was_identifier = true;
 
@@ -2053,6 +2059,9 @@ function PMA_SQP_analyze($arr)
             $upper_data = strtoupper($arr[$i]['data']);
 
             if ($upper_data == 'NOT' && $in_timestamp_options) {
+                if (! isset($create_table_fields)) {
+                    $create_table_fields = array();
+                }
                 $create_table_fields[$current_identifier]['timestamp_not_null']
                     = true;
 
@@ -2150,6 +2159,9 @@ function PMA_SQP_analyze($arr)
                             $value = '';
                         }
                         if (!empty($value)) {
+                            if (! isset($foreign)) {
+                                $foreign = array();
+                            }
                             $foreign[$foreign_key_number][$clause] = $value;
                         }
                         unset($clause);

diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
@@ -180,10 +180,12 @@ function PMA_getHtmlBodyForTableSummary($num_tables, $server_slave_status,
     $row_count_sum = PMA_Util::formatNumber($sum_entries, 0);
     // If a table shows approximate rows count, display update-all-real-count anchor.
     if (isset($approx_rows)) {
-        $row_sum_url['ajax_request'] = true;
-        $row_sum_url['db'] = $GLOBALS['db'];
-        $row_sum_url['real_row_count'] = 'true';
-        $row_sum_url['real_row_count_all'] = 'true';
+        $row_sum_url = array(
+            'ajax_request'       => true,
+            'db'                 => $GLOBALS['db'],
+            'real_row_count'     => 'true',
+            'real_row_count_all' => 'true'
+        );
     }
     $cell_text = ($approx_rows)
         ? '<a href="db_structure.php' . PMA_URL_getCommon($row_sum_url)
@@ -702,10 +704,12 @@ function PMA_getHtmlForNotNullEngineViewTable($table_is_view, $current_table,
     $row_count = $row_count_pre
         . PMA_Util::formatNumber($current_table['TABLE_ROWS'], 0);
     // URL parameters to fetch the real row count.
-    $real_count_url['ajax_request'] = true;
-    $real_count_url['db'] = $GLOBALS['db'];
-    $real_count_url['table'] = $current_table['TABLE_NAME'];
-    $real_count_url['real_row_count'] = 'true';
+    $real_count_url = array(
+        'ajax_request'   => true,
+        'db'             => $GLOBALS['db'],
+        'table'          => $current_table['TABLE_NAME'],
+        'real_row_count' => 'true'
+    );
     // Content to be appended into 'tbl_rows' cell.
     // If row count is approximate, display it as an anchor to get real count.
     $cell_text = (! empty($row_count_pre))
@@ -2344,6 +2348,7 @@ function PMA_displayHtmlForColumnChange($db, $table, $selected, $action)
     /**
      * @todo optimize in case of multiple fields to modify
      */
+    $fields_meta = array();
     for ($i = 0; $i < $selected_cnt; $i++) {
         $fields_meta[] = $GLOBALS['dbi']->getColumns(
             $db, $table, $selected[$i], true

diff --git a/libraries/sysinfo.lib.php b/libraries/sysinfo.lib.php
@@ -351,6 +351,7 @@ public function supported()
     public function memory()
     {
         $pagesize = $this->_kstat('unix:0:seg_cache:slab_size');
+        $mem = array();
         $mem['MemTotal']
             = $this->_kstat('unix:0:system_pages:pagestotal') * $pagesize;
         $mem['MemUsed']

diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
@@ -366,6 +366,7 @@ function PMA_getMoveColumns($db, $table)
  */
 function PMA_getRowDataForRegeneration($columnNumber, $submit_fulltext)
 {
+    $columnMeta = array();
     $columnMeta['Field'] = isset($_REQUEST['field_name'][$columnNumber])
         ? $_REQUEST['field_name'][$columnNumber]
         : false;
@@ -512,7 +513,7 @@ function PMA_handleRegeneration($columnNumber, $submit_fulltext, $comments_map,
 }
 
 /**
- * Function to update default value info in $columnMeta and get this array 
+ * Function to update default value info in $columnMeta and get this array
  *
  * @param array $columnMeta column meta
  * @param bool  $isDefault  whether the row value is default
@@ -1296,7 +1297,7 @@ function PMA_getHtmlForColumnAttributes($columnNumber, $columnMeta, $type_upper,
  * @param array  $form_params          form parameters
  * @param int    $columnNumber         column/field number
  * @param string $type                 type in lowercase without the length
- * @param array  $extracted_columnspec details about the column spec 
+ * @param array  $extracted_columnspec details about the column spec
  *
  * @return array
  */

diff --git a/libraries/tbl_relation.lib.php b/libraries/tbl_relation.lib.php
@@ -204,10 +204,7 @@ function PMA_getHtmlForCommonForm($db, $table, $columns, $cfgRelation,
 function PMA_getHtmlForCommonFormRows($columns, $cfgRelation, $tbl_storage_engine,
     $existrel, $existrel_foreign, $options_array, $db, $table
 ) {
-    foreach ($columns as $row) {
-        $save_row[] = $row;
-    }
-
+    $save_row = array_values($columns);
     $saved_row_cnt  = count($save_row);
 
     $html_output = '<fieldset>'