From df21b2cebea9e3e35322d4d35866fa044ae8812f Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 15 Sep 2013 06:09:25 -0400
Subject: [PATCH 1/3] Fix codestyle

---
 libraries/insert_edit.lib.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index 2fda58d389..3bac53ecb3 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -2214,7 +2214,9 @@ function PMA_getCurrentValueAsAnArrayForMultipleEdit($multi_edit_colummns,
         || ($current_value != "''"
         && in_array($multi_edit_funcs[$key], $func_optional_param))
     ) {
-        if (isset($multi_edit_salt[$key]) && ($multi_edit_funcs[$key] == "AES_ENCRYPT")) {
+        if (isset($multi_edit_salt[$key]) 
+            && ($multi_edit_funcs[$key] == "AES_ENCRYPT")
+        ) {
             return $multi_edit_funcs[$key] . '(' . $current_value . ",'"
                    . PMA_Util::sqlAddSlashes($multi_edit_salt[$key]) . "')";
         } else {
@@ -2702,10 +2704,11 @@ function PMA_getHtmlForInsertEditFormHeader($has_blob_field, $is_upload)
  * 
  * @return string
  */
-function PMA_getHtmlForInsertEditFormColumn($table_columns, $i, $column, $comments_map,
-    $timestamp_seen, $current_result, $chg_evt_handler, $jsvkey, $vkey,
-    $insert_mode, $current_row, $odd_row, &$o_rows, &$tabindex, $columns_cnt, $is_upload,
-    $tabindex_for_function, $foreigners, $tabindex_for_null, $tabindex_for_value,
+function PMA_getHtmlForInsertEditFormColumn($table_columns, $i, $column,
+    $comments_map, $timestamp_seen, $current_result, $chg_evt_handler,
+    $jsvkey, $vkey, $insert_mode, $current_row, $odd_row, &$o_rows,
+    &$tabindex, $columns_cnt, $is_upload, $tabindex_for_function,
+    $foreigners, $tabindex_for_null, $tabindex_for_value,
     $table, $db, $row_id, $titles, $biggest_max_file_size,
     $default_char_editing, $text_dir    
 ) {

From 377c6823047a591e6ee1445048d8e9dc6d6d1cbf Mon Sep 17 00:00:00 2001
From: Dieter Adriaenssens <ruleant@users.sourceforge.net>
Date: Sun, 15 Sep 2013 12:35:28 +0200
Subject: [PATCH 2/3] wrap long lines

---
 libraries/server_status_monitor.lib.php | 29 ++++++++++++++++---------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/libraries/server_status_monitor.lib.php b/libraries/server_status_monitor.lib.php
index a37b433738..a2c6f35396 100644
--- a/libraries/server_status_monitor.lib.php
+++ b/libraries/server_status_monitor.lib.php
@@ -95,20 +95,25 @@ function PMA_getHtmlForAnalyseDialog()
     $retval  = '<div id="logAnalyseDialog" title="';
     $retval .= __('Log statistics') . '" style="display:none;">';
     $retval .= '<p>' . __('Selected time range:');
-    $retval .= '<input type="text" name="dateStart" class="datetimefield" value="" /> - ';
+    $retval .= '<input type="text" name="dateStart"'
+        . ' class="datetimefield" value="" /> - ';
     $retval .= '<input type="text" name="dateEnd" class="datetimefield" value="" />';
     $retval .= '</p>';
-    $retval .= '<input type="checkbox" id="limitTypes" value="1" checked="checked" />';
+    $retval .= '<input type="checkbox" id="limitTypes"'
+        . ' value="1" checked="checked" />';
     $retval .= '<label for="limitTypes">';
     $retval .= __('Only retrieve SELECT,INSERT,UPDATE and DELETE Statements');
     $retval .= '</label>';
     $retval .= '<br/>';
-    $retval .= '<input type="checkbox" id="removeVariables" value="1" checked="checked" />';
+    $retval .= '<input type="checkbox" id="removeVariables"'
+        . ' value="1" checked="checked" />';
     $retval .= '<label for="removeVariables">';
     $retval .= __('Remove variable data in INSERT statements for better grouping');
     $retval .= '</label>';
     $retval .= '<p>';
-    $retval .= __('Choose from which log you want the statistics to be generated from.');
+    $retval .= __(
+        'Choose from which log you want the statistics to be generated from.'
+    );
     $retval .= '</p>';
     $retval .= '<p>';
     $retval .= __('Results are grouped by query text.');
@@ -204,10 +209,13 @@ function PMA_getHtmlForInstructionsDialog()
  */
 function PMA_getHtmlForAddChartDialog()
 {
-    $retval  = '<div id="addChartDialog" title="' . __('Add chart') . '" style="display:none;">';
+    $retval  = '<div id="addChartDialog" title="'
+        . __('Add chart') . '" style="display:none;">';
     $retval .= '<div id="tabGridVariables">';
-    $retval .= '<p><input type="text" name="chartTitle" value="' . __('Chart Title') . '" /></p>';
-    $retval .= '<input type="radio" name="chartType" value="preset" id="chartPreset" />';
+    $retval .= '<p><input type="text" name="chartTitle" value="'
+        . __('Chart Title') . '" /></p>';
+    $retval .= '<input type="radio" name="chartType"'
+        . ' value="preset" id="chartPreset" />';
     $retval .= '<label for="chartPreset">' . __('Preset chart') . '</label>';
     $retval .= '<select name="presetCharts"></select><br/>';
     $retval .= '<input type="radio" name="chartType" value="variable" '
@@ -238,12 +246,13 @@ function PMA_getHtmlForAddChartDialog()
     $retval .= ' </label>';
     $retval .= '<input type="text" name="variableInput" id="variableInput" />';
     $retval .= '<p></p>';
-    $retval .= '<input type="checkbox" name="differentialValue"';
-    $retval .= ' id="differentialValue" value="differential" checked="checked" />';
+    $retval .= '<input type="checkbox" name="differentialValue"'
+        . ' id="differentialValue" value="differential" checked="checked" />';
     $retval .= '<label for="differentialValue">';
     $retval .= __('Display as differential value');
     $retval .= '</label><br />';
-    $retval .= '<input type="checkbox" id="useDivisor" name="useDivisor" value="1" />';
+    $retval .= '<input type="checkbox" id="useDivisor"'
+        . ' name="useDivisor" value="1" />';
     $retval .= '<label for="useDivisor">' . __('Apply a divisor') . '</label>';
     $retval .= '<span class="divisorInput" style="display:none;">';
     $retval .= '<input type="text" name="valueDivisor" size="4" value="1" />';

From 70d9f2721351b356ab8808931a561906f1d4220e Mon Sep 17 00:00:00 2001
From: Dieter Adriaenssens <ruleant@users.sourceforge.net>
Date: Sun, 15 Sep 2013 12:37:39 +0200
Subject: [PATCH 3/3] remove trailing space

---
 libraries/insert_edit.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index 3bac53ecb3..df8344e08e 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -2214,7 +2214,7 @@ function PMA_getCurrentValueAsAnArrayForMultipleEdit($multi_edit_colummns,
         || ($current_value != "''"
         && in_array($multi_edit_funcs[$key], $func_optional_param))
     ) {
-        if (isset($multi_edit_salt[$key]) 
+        if (isset($multi_edit_salt[$key])
             && ($multi_edit_funcs[$key] == "AES_ENCRYPT")
         ) {
             return $multi_edit_funcs[$key] . '(' . $current_value . ",'"