Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

.travis.yml

@@ -57,6 +57,8 @@ matrix:
   allow_failures:
     - php: 5.6
       env: PHPUNIT_ARGS="--group selenium" SELENIUM="yes"
+    - php: hhvm
+      env: PHPUNIT_ARGS="--exclude-group selenium"
   fast_finish: true
   include:
     - php: 5.6

ChangeLog

@@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog
 + rfe #1525 Generate keys one per line
 + rfe #347  allow table with transformed column anywhere in FROM clause
 + rfe #1591 Shortcut link to search page
++ rfe #1568 Fold Add Column After / Before into dropdown
 
 4.3.7.0 (not yet released)
 - bug #4694 js error on marking table as favorite in Safari (in private mode)

README.rst

@@ -12,11 +12,11 @@ Code status
     :alt: Build status
     :target: https://travis-ci.org/phpmyadmin/phpmyadmin
 
-.. image:: http://hosted.weblate.org/widgets/phpmyadmin-status-badge.png
+.. image:: https://hosted.weblate.org/widgets/phpmyadmin/-/svg-badge.svg
     :alt: Translation status
     :target: https://hosted.weblate.org/engage/phpmyadmin/?utm_source=widget
 
-.. image:: https://coveralls.io/repos/phpmyadmin/phpmyadmin/badge.png?branch=master
+.. image:: https://coveralls.io/repos/phpmyadmin/phpmyadmin/badge.svg?branch=master
     :target: https://coveralls.io/r/phpmyadmin/phpmyadmin?branch=master
 
 .. image:: https://scrutinizer-ci.com/g/phpmyadmin/phpmyadmin/badges/quality-score.png?s=93dfde29ffa5771d9c254b7ffb11c4e673315035

js/tbl_structure.js

@@ -66,6 +66,13 @@ function reloadFieldForm() {
     $('#page_content').show();
 }
 
+function checkFirst() {
+    if ($("select[name=after_field] option:selected").data('pos') === 'first') {
+        $("input[name=field_where]").val('first');
+    } else {
+        $("input[name=field_where]").val('after');
+    }
+}
 /**
  * Unbind all event handlers before tearing down a page
  */
@@ -87,6 +94,9 @@ AJAX.registerOnload('tbl_structure.js', function () {
     indexes = [];
     fulltext_indexes = [];
 
+    //by default select the last option to add new column (adds at end of the table)
+    $("select[name=after_field] option:last").attr("selected","selected");
+
     /**
      *Ajax action for submitting the "Column Change" and "Add Column" form
      */

libraries/create_addfield.lib.php

@@ -99,10 +99,6 @@ function PMA_setColumnCreationStatementSuffix($current_field_num,
         return $sql_suffix;
     }
 
-    if ($_REQUEST['field_where'] == 'last') {
-        return $sql_suffix;
-    }
-
     // Only the first field can be added somewhere other than at the end
     if ($current_field_num == 0) {
         if ($_REQUEST['field_where'] == 'first') {
@@ -177,7 +173,7 @@ function PMA_getStatementPrefix($is_create_tbl = true)
 }
 
 /**
- * Merge index definitions for one type of index 
+ * Merge index definitions for one type of index
  *
  * @param array   $definitions     the index definitions to merge to
  * @param boolean $is_create_tbl   true if requirement is to get the statement
@@ -185,7 +181,7 @@ function PMA_getStatementPrefix($is_create_tbl = true)
  * @param array   $indexed_columns the columns for one type of index
  * @param string  $index_keyword   the index keyword to use in the definition
  *
- * @return array $index_definitions 
+ * @return array $index_definitions
  */
 function PMA_mergeIndexStatements(
     $definitions, $is_create_tbl, $indexed_columns, $index_keyword

libraries/structure.lib.php

@@ -1069,7 +1069,9 @@ function PMA_getServerSlaveStatus($server_slave_status, $truename)
     if ((strlen($searchTable) > 0) || strlen($searchDb) > 0) {
         $ignored = true;
     }
-    foreach ($GLOBALS['replication_info']['slave']['Wild_Ignore_Table'] as $db_table) {
+    foreach (
+        $GLOBALS['replication_info']['slave']['Wild_Ignore_Table'] as $db_table
+        ) {
         $table_part = PMA_extractDbOrTable($db_table, 'table');
         $pattern = "@^"
             . /*overload*/mb_substr($table_part, 0, -1)
@@ -1698,9 +1700,12 @@ function PMA_getHtmlForAddColumn($columns_list)
     // I tried displaying the drop-down inside the label but with Firefox
     // the drop-down was blinking
     $column_selector = '<select name="after_field" '
-        . 'onclick="this.form.field_where[2].checked=true" '
-        . 'onchange="this.form.field_where[2].checked=true">';
+        . 'onchange="checkFirst()">';
 
+    $column_selector .= '<option '
+            . 'value="first" data-pos = "first">'
+            . __('Beginning of table')
+            . '</option>';
     foreach ($columns_list as $one_column_name) {
         $column_selector .= '<option '
             . 'value="' . htmlspecialchars($one_column_name) . '">'
@@ -1708,15 +1713,8 @@ function PMA_getHtmlForAddColumn($columns_list)
             . '</option>';
     }
     $column_selector .= '</select>';
-
-    $choices = array(
-        'last'  => __('At End of Table'),
-        'first' => __('At Beginning of Table'),
-        'after' => sprintf(__('After %s'), '')
-    );
-    $html_output .= PMA_Util::getRadioFields(
-        'field_where', $choices, 'last', false
-    );
+    $html_output .= '<input type="hidden" name="field_where" value="after"/>';
+    $html_output .= ' ' . __('after') . ' ';
     $html_output .= $column_selector;
     $html_output .= '<input type="submit" value="' . __('Go') . '" />'
         . '</form>';
@@ -2847,7 +2845,9 @@ function PMA_displayTableBrowseForSelectedColumns($db, $table, $goto,
  */
 function PMA_checkFavoriteTable($db, $current_table)
 {
-    foreach ($_SESSION['tmpval']['favorite_tables'][$GLOBALS['server']] as $key => $value) {
+    foreach (
+        $_SESSION['tmpval']['favorite_tables'][$GLOBALS['server']] as $key => $value
+        ) {
         if ($value['db'] == $db && $value['table'] == $current_table) {
             return true;
         }