From ce5c6e9e524f0d24cc3260a75a7f2265eb990bbc Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Tue, 9 Jul 2013 10:52:21 +0530
Subject: [PATCH 01/30] Use a drop down as only one check option can be
 selected.

---
 view_create.php | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/view_create.php b/view_create.php
index af53a5550c..90f25a8841 100644
--- a/view_create.php
+++ b/view_create.php
@@ -56,41 +56,40 @@ if (isset($_REQUEST['createview'])) {
     $sql_query .= $sep . ' AS ' . $_REQUEST['view']['as'];
 
     if (isset($_REQUEST['view']['with'])) {
-        $options = array_intersect($_REQUEST['view']['with'], $view_with_options);
-        if (count($options)) {
-            $sql_query .= $sep . ' WITH ' . implode(' ', $options);
+        if (in_array($_REQUEST['view']['with'], $view_with_options)) {
+            $sql_query .= $sep . ' WITH ' . $_REQUEST['view']['with'];
         }
     }
 
     if ($GLOBALS['dbi']->tryQuery($sql_query)) {
-        
+
         include_once './libraries/tbl_views.lib.php';
-        
+
         // If different column names defined for VIEW
         $view_columns = array();
         if (isset($_REQUEST['view']['column_names'])) {
             $view_columns = explode(',', $_REQUEST['view']['column_names']);
         }
-        
+
         $column_map = PMA_getColumnMap($_REQUEST['view']['as'], $view_columns);
         $pma_tranformation_data = PMA_getExistingTranformationData($GLOBALS['db']);
-        
+
         if ($pma_tranformation_data !== false) {
-            
+
             // SQL for store new transformation details of VIEW
             $new_transformations_sql = PMA_getNewTransformationDataSql(
                 $pma_tranformation_data, $column_map, $_REQUEST['view']['name'],
                 $GLOBALS['db']
-            );            
-            
+            );
+
             // Store new transformations
             if ($new_transformations_sql != '') {
                 $GLOBALS['dbi']->tryQuery($new_transformations_sql);
             }
-            
+
         }
         unset($pma_tranformation_data);
-        
+
         if ($GLOBALS['is_ajax_request'] != true) {
             $message = PMA_Message::success();
             include './' . $cfg['DefaultTabDatabase'];
@@ -103,9 +102,9 @@ if (isset($_REQUEST['createview'])) {
                 )
             );
         }
-        
+
         exit;
-        
+
     } else {
         if ($GLOBALS['is_ajax_request'] != true) {
             $message = PMA_Message::rawError($GLOBALS['dbi']->getError());
@@ -202,18 +201,16 @@ $htmlString .= '>' . htmlspecialchars($view['as']) . '</textarea>'
     . '<tr><td>WITH</td>'
     . '<td>';
 
+$htmlString .= '<select name="view[with]">'
+    . '<option value=""></option>';
 foreach ($view_with_options as $option) {
-    $htmlString .= '<input type="checkbox" name="view[with][]"';
+    $htmlString .= '<option value="' . htmlspecialchars($option) . '"';
     if (in_array($option, $view['with'])) {
-        $htmlString .= ' checked="checked"';
+        $htmlString .= ' selected="selected"';
     }
-    $htmlString .= ' id="view_with_'
-        . str_replace(' ', '_', htmlspecialchars($option)) . '"'
-        . ' value="' . htmlspecialchars($option) . '" />'
-        . '<label for="view_with_' . str_replace(' ', '_', htmlspecialchars($option))
-        . '">&nbsp;'
-        . htmlspecialchars($option) . '</label><br />';
+    $htmlString .= '>' . htmlspecialchars($option) . '</option>';
 }
+$htmlString .= '<select>';
 
 $htmlString .= '</td>'
     . '</tr>'

From d5a531f7b35a50af62279008f4e209060a5f2f48 Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Wed, 10 Jul 2013 11:40:33 +0530
Subject: [PATCH 02/30] Match UI style of trigger, routine etc AJAX dialogs

---
 js/functions.js | 3 +--
 js/messages.php | 2 ++
 view_create.php | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index c83b06e319..c010a4ad77 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3733,12 +3733,11 @@ function PMA_createViewDialog($this)
                 maxWidth: 620,
                 modal: true,
                 buttons: buttonOptions,
-                title: $('legend', $(data.message)).html(),
+                title: PMA_messages.strCreateView,
                 close: function () {
                     $(this).remove();
                 }
             });
-            $dialog.find('legend').remove();
             // Attach syntax highlited editor
             if (typeof CodeMirror !== 'undefined') {
                 var $elm = $dialog.find('textarea');
diff --git a/js/messages.php b/js/messages.php
index fb103a1859..445901bdd4 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -376,6 +376,8 @@ $js_messages['strNewerVersion'] = __('A newer version of phpMyAdmin is available
 $js_messages['strLatestAvailable'] = __(', latest stable version:');
 $js_messages['strUpToDate'] = __('up to date');
 
+$js_messages['strCreateView'] = __('Create view');
+
 
 echo "var PMA_messages = new Array();\n";
 foreach ($js_messages as $name => $js_message) {
diff --git a/view_create.php b/view_create.php
index 90f25a8841..a79a190791 100644
--- a/view_create.php
+++ b/view_create.php
@@ -148,8 +148,7 @@ $htmlString = '<!-- CREATE VIEW options -->'
     . '<form method="post" action="view_create.php">'
     . PMA_generate_common_hidden_inputs($url_params)
     . '<fieldset>'
-    . '<legend>' . __('Create view')
-    . PMA_Util::showMySQLDocu('SQL-Syntax', 'CREATE_VIEW') . '</legend>'
+    . '<legend>' . __('Details') . '</legend>'
     . '<table class="rte_table">'
     . '<tr><td><label for="or_replace">OR REPLACE</label></td>'
     . '<td><input type="checkbox" name="view[or_replace]" id="or_replace"';

From 5621d85e3636ec0d696b770f23b1714919760e09 Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Wed, 10 Jul 2013 14:53:54 +0530
Subject: [PATCH 03/30] Use ajax dialog for view editing

---
 js/functions.js             | 11 +++----
 js/messages.php             |  2 +-
 libraries/structure.lib.php | 43 ++++++++++++++++--------
 view_create.php             | 66 ++++++++++++++++++++++---------------
 4 files changed, 76 insertions(+), 46 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index c010a4ad77..65498b4451 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3675,7 +3675,7 @@ function printPage()
  */
 AJAX.registerTeardown('functions.js', function () {
     $('input#print').unbind('click');
-    $('span a.create_view.ajax').die('click');
+    $('a.create_view.ajax, a.alter_view.ajax').die('click');
     $('#createViewDialog').find('input, select').die('keydown');
 });
 
@@ -3684,7 +3684,7 @@ AJAX.registerOnload('functions.js', function () {
     /**
      * Ajaxification for the "Create View" action
      */
-    $('span a.create_view.ajax').live('click', function (e) {
+    $('a.create_view.ajax, a.alter_view.ajax').live('click', function (e) {
         e.preventDefault();
         PMA_createViewDialog($(this));
     });
@@ -3704,7 +3704,7 @@ function PMA_createViewDialog($this)
 {
     var $msg = PMA_ajaxShowMessage();
     var syntaxHighlighter = null;
-    $.get($this.attr('href') + '&ajax_request=1', function (data) {
+    $.get($this.attr('href') + '&ajax_request=1&ajax_dialog=1', function (data) {
         if (data.success === true) {
             PMA_ajaxRemoveMessage($msg);
             var buttonOptions = {};
@@ -3729,11 +3729,10 @@ function PMA_createViewDialog($this)
             };
             var $dialog = $('<div/>').attr('id', 'createViewDialog').append(data.message).dialog({
                 width: 500,
-                minWidth: 300,
-                maxWidth: 620,
+                minWidth: 400,
                 modal: true,
                 buttons: buttonOptions,
-                title: PMA_messages.strCreateView,
+                title: $this.is('.create_view') ? PMA_messages.strCreateView : PMA_messages.strEditView,
                 close: function () {
                     $(this).remove();
                 }
diff --git a/js/messages.php b/js/messages.php
index 445901bdd4..3df253a468 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -377,7 +377,7 @@ $js_messages['strLatestAvailable'] = __(', latest stable version:');
 $js_messages['strUpToDate'] = __('up to date');
 
 $js_messages['strCreateView'] = __('Create view');
-
+$js_messages['strEditView'] = __('Edit view');
 
 echo "var PMA_messages = new Array();\n";
 foreach ($js_messages as $name => $js_message) {
diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
index 8bec377eee..035be91303 100644
--- a/libraries/structure.lib.php
+++ b/libraries/structure.lib.php
@@ -1449,19 +1449,36 @@ function PMA_getHtmlDivForMoveColumnsDialog()
  */
 function PMA_getHtmlForEditView($url_params)
 {
-    $create_view = $GLOBALS['dbi']->getDefinition(
-        $GLOBALS['db'], 'VIEW', $GLOBALS['table']
+    $retval = array();
+    $query = "SELECT `VIEW_DEFINITION`, `CHECK_OPTION`"
+        . " FROM `INFORMATION_SCHEMA`.`VIEWS`"
+        . " WHERE TABLE_SCHEMA='" . PMA_Util::sqlAddSlashes($GLOBALS['db']) . "'"
+        . " AND TABLE_NAME='" . PMA_Util::sqlAddSlashes($GLOBALS['table']) . "';";
+    $item = $GLOBALS['dbi']->fetchSingleRow($query);
+
+    $view = array(
+        'operation' => 'alter',
+        'name' => $GLOBALS['table'],
+        'as' => $item['VIEW_DEFINITION'],
+        'with' => $item['CHECK_OPTION'],
+    );
+    $url  = 'view_create.php' . PMA_generate_common_url($url_params) . '&amp;';
+    $url .= implode(
+        '&amp;',
+        array_map(
+            function($key, $val) {
+                return 'view[' . urlencode($key) . ']=' . urlencode($val);
+            },
+            array_keys($view),
+            $view
+        )
     );
-    $create_view = preg_replace('@^CREATE@', 'ALTER', $create_view);
     $html_output = PMA_Util::linkOrButton(
-        'tbl_sql.php' . PMA_generate_common_url(
-            $url_params +
-            array(
-                'sql_query' => $create_view,
-                'show_query' => '1',
-            )
-        ),
-        PMA_Util::getIcon('b_edit.png', __('Edit view'), true)
+        $url,
+        PMA_Util::getIcon('b_edit.png', __('Edit view'), true),
+        array(
+            'class' => 'alter_view ajax'
+        )
     );
     return $html_output;
 }
@@ -1722,10 +1739,10 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation,
         && isset($showtable['Avg_row_length'])
         && $showtable['Avg_row_length'] > 0
     ) {
-        list($avg_row_length_value, $avg_row_length_unit) 
+        list($avg_row_length_value, $avg_row_length_unit)
             = PMA_Util::formatByteDown(
                 $showtable['Avg_row_length'],
-                6, 
+                6,
                 1
             );
         $html_output .= PMA_getHtmlForRowStatsTableRow(
diff --git a/view_create.php b/view_create.php
index a79a190791..d46c5c328c 100644
--- a/view_create.php
+++ b/view_create.php
@@ -27,20 +27,23 @@ $view_algorithm_options = array(
 );
 
 $view_with_options = array(
-    'CASCADED CHECK OPTION',
-    'LOCAL CHECK OPTION'
+    'CASCADED',
+    'LOCAL'
 );
 
-if (isset($_REQUEST['createview'])) {
+if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
     /**
      * Creates the view
      */
     $sep = "\r\n";
 
-    $sql_query = 'CREATE';
-
-    if (isset($_REQUEST['view']['or_replace'])) {
-        $sql_query .= ' OR REPLACE';
+    if (isset($_REQUEST['createview'])) {
+        $sql_query = 'CREATE';
+        if (isset($_REQUEST['view']['or_replace'])) {
+            $sql_query .= ' OR REPLACE';
+        }
+    } else {
+        $sql_query = 'ALTER';
     }
 
     if (PMA_isValid($_REQUEST['view']['algorithm'], $view_algorithm_options)) {
@@ -90,7 +93,7 @@ if (isset($_REQUEST['createview'])) {
         }
         unset($pma_tranformation_data);
 
-        if ($GLOBALS['is_ajax_request'] != true) {
+        if (! isset($_REQUEST['ajax_dialog'])) {
             $message = PMA_Message::success();
             include './' . $cfg['DefaultTabDatabase'];
         } else {
@@ -106,7 +109,7 @@ if (isset($_REQUEST['createview'])) {
         exit;
 
     } else {
-        if ($GLOBALS['is_ajax_request'] != true) {
+        if (! isset($_REQUEST['ajax_dialog'])) {
             $message = PMA_Message::rawError($GLOBALS['dbi']->getError());
         } else {
             $response = PMA_Response::getInstance();
@@ -125,12 +128,13 @@ if (isset($_REQUEST['createview'])) {
 
 // prefill values if not already filled from former submission
 $view = array(
+    'operation' => 'create',
     'or_replace' => '',
     'algorithm' => '',
     'name' => '',
     'column_names' => '',
     'as' => $sql_query,
-    'with' => array(),
+    'with' => '',
 );
 
 if (PMA_isValid($_REQUEST['view'], 'array')) {
@@ -148,17 +152,23 @@ $htmlString = '<!-- CREATE VIEW options -->'
     . '<form method="post" action="view_create.php">'
     . PMA_generate_common_hidden_inputs($url_params)
     . '<fieldset>'
-    . '<legend>' . __('Details') . '</legend>'
-    . '<table class="rte_table">'
-    . '<tr><td><label for="or_replace">OR REPLACE</label></td>'
-    . '<td><input type="checkbox" name="view[or_replace]" id="or_replace"';
-if ($view['or_replace']) {
-    $htmlString .= ' checked="checked"';
+    . '<legend>'
+    . (isset($_REQUEST['ajax_dialog']) ? __('Details') : ($view['operation'] == 'create' ? __('Create view') : __('Edit view')))
+    . '</legend>'
+    . '<table class="rte_table">';
+
+if ($view['operation'] == 'create') {
+    $htmlString .= '<tr>'
+        . '<td><label for="or_replace">OR REPLACE</label></td>'
+        . '<td><input type="checkbox" name="view[or_replace]" id="or_replace"';
+    if ($view['or_replace']) {
+        $htmlString .= ' checked="checked"';
+    }
+    $htmlString .= ' value="1" /></td>'
+        . '</tr>';
 }
-$htmlString .= ' value="1" />'
-    . '</td>'
-    . '</tr>'
-    . '<tr>'
+
+$htmlString .= '<tr>'
     . '<td><label for="algorithm">ALGORITHM</label></td>'
     . '<td><select name="view[algorithm]" id="algorithm">';
 
@@ -197,14 +207,14 @@ if ($GLOBALS['cfg']['TextareaAutoSelect'] || true) {
 $htmlString .= '>' . htmlspecialchars($view['as']) . '</textarea>'
     . '</td>'
     . '</tr>'
-    . '<tr><td>WITH</td>'
+    . '<tr><td>WITH CHECK OPTION</td>'
     . '<td>';
 
 $htmlString .= '<select name="view[with]">'
     . '<option value=""></option>';
 foreach ($view_with_options as $option) {
     $htmlString .= '<option value="' . htmlspecialchars($option) . '"';
-    if (in_array($option, $view['with'])) {
+    if ($option == $view['with']) {
         $htmlString .= ' selected="selected"';
     }
     $htmlString .= '>' . htmlspecialchars($option) . '</option>';
@@ -216,13 +226,17 @@ $htmlString .= '</td>'
     . '</table>'
     . '</fieldset>';
 
-if ($GLOBALS['is_ajax_request'] != true) {
+if (! isset($_REQUEST['ajax_dialog'])) {
     $htmlString .= '<fieldset class="tblFooters">'
-        . '<input type="submit" name="createview" value="' . __('Go') . '" />'
+        . '<input type="submit" name="'
+        . ($view['operation'] == 'create' ? 'createview' : 'alterview' )
+        . '" value="' . __('Go') . '" />'
         . '</fieldset>';
 } else {
-    $htmlString .= '<input type="hidden" name="createview" value="1" />'
-        . '<input type="hidden" name="ajax_request" value="1" />';
+    $htmlString .= '<input type="hidden" name="'
+        . ($view['operation'] == 'create' ? 'createview' : 'alterview' )
+        . '" value="1" />'
+        . '<input type="hidden" name="ajax_dialog" value="1" />';
 }
 
 $htmlString .= '</form>'

From 18dfc07367cb22d6ff4486c3044d139e9e1131b5 Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Thu, 11 Jul 2013 15:20:59 +0530
Subject: [PATCH 04/30] Add definer field

---
 libraries/structure.lib.php |  3 ++-
 view_create.php             | 43 ++++++++++++++++++++++++-------------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
index 035be91303..d11e02e492 100644
--- a/libraries/structure.lib.php
+++ b/libraries/structure.lib.php
@@ -1450,7 +1450,7 @@ function PMA_getHtmlDivForMoveColumnsDialog()
 function PMA_getHtmlForEditView($url_params)
 {
     $retval = array();
-    $query = "SELECT `VIEW_DEFINITION`, `CHECK_OPTION`"
+    $query = "SELECT `VIEW_DEFINITION`, `CHECK_OPTION`, `DEFINER`"
         . " FROM `INFORMATION_SCHEMA`.`VIEWS`"
         . " WHERE TABLE_SCHEMA='" . PMA_Util::sqlAddSlashes($GLOBALS['db']) . "'"
         . " AND TABLE_NAME='" . PMA_Util::sqlAddSlashes($GLOBALS['table']) . "';";
@@ -1458,6 +1458,7 @@ function PMA_getHtmlForEditView($url_params)
 
     $view = array(
         'operation' => 'alter',
+        'definer' => $item['DEFINER'],
         'name' => $GLOBALS['table'],
         'as' => $item['VIEW_DEFINITION'],
         'with' => $item['CHECK_OPTION'],
diff --git a/view_create.php b/view_create.php
index d46c5c328c..10a537707c 100644
--- a/view_create.php
+++ b/view_create.php
@@ -50,6 +50,10 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
         $sql_query .= $sep . ' ALGORITHM = ' . $_REQUEST['view']['algorithm'];
     }
 
+    if (! empty($_REQUEST['view']['definer'])) {
+        $sql_query .= $sep . ' DEFINER ' . $_REQUEST['view']['definer'];
+    }
+
     $sql_query .= $sep . ' VIEW ' . PMA_Util::backquote($_REQUEST['view']['name']);
 
     if (! empty($_REQUEST['view']['column_names'])) {
@@ -131,6 +135,7 @@ $view = array(
     'operation' => 'create',
     'or_replace' => '',
     'algorithm' => '',
+    'definer' => '',
     'name' => '',
     'column_names' => '',
     'as' => $sql_query,
@@ -164,14 +169,12 @@ if ($view['operation'] == 'create') {
     if ($view['or_replace']) {
         $htmlString .= ' checked="checked"';
     }
-    $htmlString .= ' value="1" /></td>'
-        . '</tr>';
+    $htmlString .= ' value="1" /></td></tr>';
 }
 
 $htmlString .= '<tr>'
     . '<td><label for="algorithm">ALGORITHM</label></td>'
     . '<td><select name="view[algorithm]" id="algorithm">';
-
 foreach ($view_algorithm_options as $option) {
     $htmlString .= '<option value="' . htmlspecialchars($option) . '"';
     if ($view['algorithm'] === $option) {
@@ -179,22 +182,32 @@ foreach ($view_algorithm_options as $option) {
     }
     $htmlString .= '>' . htmlspecialchars($option) . '</option>';
 }
-
 $htmlString .= '</select>'
-    . '</td>'
-    . '</tr>'
-    . '<tr><td>' . __('VIEW name') . '</td>'
-    . '<td><input type="text" size="20" name="view[name]" onfocus="this.select()"'
-    . ' value="' . htmlspecialchars($view['name']) . '" />'
-    . '</td>'
-    . '</tr>'
-    . '<tr><td>' . __('Column names') . '</td>'
+    . '</td></tr>';
+
+$htmlString .= '<tr><td>' . __('Definer') . '</td>'
+    . '<td><input type="text" maxlength="100" size="50" name="view[definer]"'
+    . ' value="' . htmlspecialchars($view['definer']) . '" />'
+    . '</td></tr>';
+
+$htmlString .= '<tr><td>' . __('Column names') . '</td>'
     . '<td><input type="text" maxlength="100" size="50" name="view[column_names]"'
     . ' onfocus="this.select()"'
     . ' value="' . htmlspecialchars($view['column_names']) . '" />'
-    . '</td>'
-    . '</tr>'
-    . '<tr><td>AS</td>'
+    . '</td></tr>';
+
+$htmlString .= '<tr><td>' . __('VIEW name') . '</td>'
+    . '<td><input type="text" size="20" name="view[name]" onfocus="this.select()"'
+    . ' value="' . htmlspecialchars($view['name']) . '" />'
+    . '</td></tr>';
+
+$htmlString .= '<tr><td>' . __('Column names') . '</td>'
+    . '<td><input type="text" maxlength="100" size="50" name="view[column_names]"'
+    . ' onfocus="this.select()"'
+    . ' value="' . htmlspecialchars($view['column_names']) . '" />'
+    . '</td></tr>';
+
+$htmlString .= '<tr><td>AS</td>'
     . '<td>'
     . '<textarea name="view[as]" rows="' . $cfg['TextareaRows'] . '"'
     . ' cols="' . $cfg['TextareaCols'] . '"'

From a2c36a55bd0220c161cf36a4cffb87630f7f9c21 Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Thu, 11 Jul 2013 16:02:02 +0530
Subject: [PATCH 05/30] Add sql security field

---
 js/functions.js             |  2 +-
 libraries/structure.lib.php |  3 ++-
 view_create.php             | 44 ++++++++++++++++++++++++-------------
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index 65498b4451..39e9e6e944 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3728,7 +3728,7 @@ function PMA_createViewDialog($this)
                 $(this).dialog("close");
             };
             var $dialog = $('<div/>').attr('id', 'createViewDialog').append(data.message).dialog({
-                width: 500,
+                width: 600,
                 minWidth: 400,
                 modal: true,
                 buttons: buttonOptions,
diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
index d11e02e492..4c87e23ca1 100644
--- a/libraries/structure.lib.php
+++ b/libraries/structure.lib.php
@@ -1450,7 +1450,7 @@ function PMA_getHtmlDivForMoveColumnsDialog()
 function PMA_getHtmlForEditView($url_params)
 {
     $retval = array();
-    $query = "SELECT `VIEW_DEFINITION`, `CHECK_OPTION`, `DEFINER`"
+    $query = "SELECT `VIEW_DEFINITION`, `CHECK_OPTION`, `DEFINER`, `SECURITY_TYPE`"
         . " FROM `INFORMATION_SCHEMA`.`VIEWS`"
         . " WHERE TABLE_SCHEMA='" . PMA_Util::sqlAddSlashes($GLOBALS['db']) . "'"
         . " AND TABLE_NAME='" . PMA_Util::sqlAddSlashes($GLOBALS['table']) . "';";
@@ -1459,6 +1459,7 @@ function PMA_getHtmlForEditView($url_params)
     $view = array(
         'operation' => 'alter',
         'definer' => $item['DEFINER'],
+        'sql_security' => $item['SECURITY_TYPE'],
         'name' => $GLOBALS['table'],
         'as' => $item['VIEW_DEFINITION'],
         'with' => $item['CHECK_OPTION'],
diff --git a/view_create.php b/view_create.php
index 10a537707c..4c60ec2c91 100644
--- a/view_create.php
+++ b/view_create.php
@@ -31,6 +31,11 @@ $view_with_options = array(
     'LOCAL'
 );
 
+$view_sql_security_options = array(
+    'DEFINER',
+    'INVOKER'
+);
+
 if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
     /**
      * Creates the view
@@ -54,6 +59,12 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
         $sql_query .= $sep . ' DEFINER ' . $_REQUEST['view']['definer'];
     }
 
+    if (isset($_REQUEST['view']['sql_security'])) {
+        if (in_array($_REQUEST['view']['sql_security'], $view_sql_security_options)) {
+            $sql_query .= $sep . ' SQL SECURITY ' . $_REQUEST['view']['sql_security'];
+        }
+    }
+
     $sql_query .= $sep . ' VIEW ' . PMA_Util::backquote($_REQUEST['view']['name']);
 
     if (! empty($_REQUEST['view']['column_names'])) {
@@ -136,6 +147,7 @@ $view = array(
     'or_replace' => '',
     'algorithm' => '',
     'definer' => '',
+    'sql_security' => '',
     'name' => '',
     'column_names' => '',
     'as' => $sql_query,
@@ -190,10 +202,17 @@ $htmlString .= '<tr><td>' . __('Definer') . '</td>'
     . ' value="' . htmlspecialchars($view['definer']) . '" />'
     . '</td></tr>';
 
-$htmlString .= '<tr><td>' . __('Column names') . '</td>'
-    . '<td><input type="text" maxlength="100" size="50" name="view[column_names]"'
-    . ' onfocus="this.select()"'
-    . ' value="' . htmlspecialchars($view['column_names']) . '" />'
+$htmlString .= '<tr><td>SQL SECURITY</td>'
+    . '<td><select name="view[with]">'
+    . '<option value=""></option>';
+foreach ($view_sql_security_options as $option) {
+    $htmlString .= '<option value="' . htmlspecialchars($option) . '"';
+    if ($option == $view['sql_security']) {
+        $htmlString .= ' selected="selected"';
+    }
+    $htmlString .= '>' . htmlspecialchars($option) . '</option>';
+}
+$htmlString .= '<select>'
     . '</td></tr>';
 
 $htmlString .= '<tr><td>' . __('VIEW name') . '</td>'
@@ -212,18 +231,14 @@ $htmlString .= '<tr><td>AS</td>'
     . '<textarea name="view[as]" rows="' . $cfg['TextareaRows'] . '"'
     . ' cols="' . $cfg['TextareaCols'] . '"'
     . ' dir="' . $text_dir . '"';
-
 if ($GLOBALS['cfg']['TextareaAutoSelect'] || true) {
     $htmlString .= ' onclick="selectContent(this, sql_box_locked, true)"';
 }
-
 $htmlString .= '>' . htmlspecialchars($view['as']) . '</textarea>'
-    . '</td>'
-    . '</tr>'
-    . '<tr><td>WITH CHECK OPTION</td>'
-    . '<td>';
+    . '</td></tr>';
 
-$htmlString .= '<select name="view[with]">'
+$htmlString .= '<tr><td>WITH CHECK OPTION</td>'
+    . '<td><select name="view[with]">'
     . '<option value=""></option>';
 foreach ($view_with_options as $option) {
     $htmlString .= '<option value="' . htmlspecialchars($option) . '"';
@@ -232,11 +247,10 @@ foreach ($view_with_options as $option) {
     }
     $htmlString .= '>' . htmlspecialchars($option) . '</option>';
 }
-$htmlString .= '<select>';
+$htmlString .= '<select>'
+    . '</td></tr>';
 
-$htmlString .= '</td>'
-    . '</tr>'
-    . '</table>'
+$htmlString .= '</table>'
     . '</fieldset>';
 
 if (! isset($_REQUEST['ajax_dialog'])) {

From 7e2efa97b4bb361189c75e385f2eb68701fef12d Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Thu, 11 Jul 2013 18:02:59 +0530
Subject: [PATCH 06/30] Do line wrapping for Codemirror editor

---
 js/functions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/functions.js b/js/functions.js
index 39e9e6e944..f2923cd1b7 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3740,7 +3740,7 @@ function PMA_createViewDialog($this)
             // Attach syntax highlited editor
             if (typeof CodeMirror !== 'undefined') {
                 var $elm = $dialog.find('textarea');
-                var opts = {lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql"};
+                var opts = {lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql", lineWrapping: true};
                 syntaxHighlighter = CodeMirror.fromTextArea($elm[0], opts);
             }
             $('input:visible[type=text]', $dialog).first().focus();

From 846ead2f909dcbd7399c05d53131483ba3376d09 Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Thu, 11 Jul 2013 18:35:09 +0530
Subject: [PATCH 07/30] Fix typos

---
 view_create.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/view_create.php b/view_create.php
index 4c60ec2c91..88c453a5ef 100644
--- a/view_create.php
+++ b/view_create.php
@@ -56,7 +56,7 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
     }
 
     if (! empty($_REQUEST['view']['definer'])) {
-        $sql_query .= $sep . ' DEFINER ' . $_REQUEST['view']['definer'];
+        $sql_query .= $sep . ' DEFINER = ' . $_REQUEST['view']['definer'];
     }
 
     if (isset($_REQUEST['view']['sql_security'])) {
@@ -119,6 +119,7 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
                     PMA_Message::success(), $sql_query
                 )
             );
+            $response->isSuccess(true);
         }
 
         exit;
@@ -203,7 +204,7 @@ $htmlString .= '<tr><td>' . __('Definer') . '</td>'
     . '</td></tr>';
 
 $htmlString .= '<tr><td>SQL SECURITY</td>'
-    . '<td><select name="view[with]">'
+    . '<td><select name="view[sql_security]">'
     . '<option value=""></option>';
 foreach ($view_sql_security_options as $option) {
     $htmlString .= '<option value="' . htmlspecialchars($option) . '"';

From f498b59af7b21acee7946f575ce20f92dbeb906c Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Fri, 12 Jul 2013 09:08:26 +0530
Subject: [PATCH 08/30] Fix syntax error in generated sql. Add required hidden
 inputs to properly execute view creation

---
 view_create.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/view_create.php b/view_create.php
index 88c453a5ef..f6314fb4e7 100644
--- a/view_create.php
+++ b/view_create.php
@@ -75,7 +75,7 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
 
     if (isset($_REQUEST['view']['with'])) {
         if (in_array($_REQUEST['view']['with'], $view_with_options)) {
-            $sql_query .= $sep . ' WITH ' . $_REQUEST['view']['with'];
+            $sql_query .= $sep . ' WITH ' . $_REQUEST['view']['with'] . '  CHECK OPTION';
         }
     }
 
@@ -256,15 +256,17 @@ $htmlString .= '</table>'
 
 if (! isset($_REQUEST['ajax_dialog'])) {
     $htmlString .= '<fieldset class="tblFooters">'
-        . '<input type="submit" name="'
+        . '<input type="hidden" name="'
         . ($view['operation'] == 'create' ? 'createview' : 'alterview' )
-        . '" value="' . __('Go') . '" />'
+        . '" value="1" />'
+        . '<input type="submit" name="" value="' . __('Go') . '" />'
         . '</fieldset>';
 } else {
     $htmlString .= '<input type="hidden" name="'
         . ($view['operation'] == 'create' ? 'createview' : 'alterview' )
         . '" value="1" />'
-        . '<input type="hidden" name="ajax_dialog" value="1" />';
+        . '<input type="hidden" name="ajax_dialog" value="1" />'
+        . '<input type="hidden" name="ajax_request" value="1" />';
 }
 
 $htmlString .= '</form>'

From 05b5f0a28444eb6d4029ea233b39f531e56d02a8 Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Fri, 12 Jul 2013 09:24:55 +0530
Subject: [PATCH 09/30] It is illogical using 'TextareaCols' configuration
 here. Default values give a very small text area to edit the view

---
 view_create.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/view_create.php b/view_create.php
index f6314fb4e7..1857240a02 100644
--- a/view_create.php
+++ b/view_create.php
@@ -230,8 +230,7 @@ $htmlString .= '<tr><td>' . __('Column names') . '</td>'
 $htmlString .= '<tr><td>AS</td>'
     . '<td>'
     . '<textarea name="view[as]" rows="' . $cfg['TextareaRows'] . '"'
-    . ' cols="' . $cfg['TextareaCols'] . '"'
-    . ' dir="' . $text_dir . '"';
+    . ' cols="80" dir="' . $text_dir . '"';
 if ($GLOBALS['cfg']['TextareaAutoSelect'] || true) {
     $htmlString .= ' onclick="selectContent(this, sql_box_locked, true)"';
 }

From bee4c42060f3b0daa9de8e97fbe7ae6dfdffe09b Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Fri, 12 Jul 2013 09:26:08 +0530
Subject: [PATCH 10/30] Go back to tbl_structure page after editing a view

---
 view_create.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/view_create.php b/view_create.php
index 1857240a02..b183934928 100644
--- a/view_create.php
+++ b/view_create.php
@@ -17,7 +17,7 @@ require_once './libraries/common.inc.php';
  * Runs common work
  */
 require './libraries/db_common.inc.php';
-$url_params['goto'] = $cfg['DefaultTabDatabase'];
+$url_params['goto'] = 'tbl_structure';
 $url_params['back'] = 'view_create.php';
 
 $view_algorithm_options = array(
@@ -110,7 +110,7 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
 
         if (! isset($_REQUEST['ajax_dialog'])) {
             $message = PMA_Message::success();
-            include './' . $cfg['DefaultTabDatabase'];
+            include 'tbl_structure';
         } else {
             $response = PMA_Response::getInstance();
             $response->addJSON(

From 06e1ff3b2ac94eef5dd054f3f6b2a75eb7c2d08e Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Fri, 12 Jul 2013 09:36:01 +0530
Subject: [PATCH 11/30] Fix typo

---
 view_create.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view_create.php b/view_create.php
index b183934928..78dcbab18c 100644
--- a/view_create.php
+++ b/view_create.php
@@ -110,7 +110,7 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
 
         if (! isset($_REQUEST['ajax_dialog'])) {
             $message = PMA_Message::success();
-            include 'tbl_structure';
+            include 'tbl_structure.php';
         } else {
             $response = PMA_Response::getInstance();
             $response->addJSON(

From c6c2eff7840972971c366c222c0c5126423a03d9 Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Fri, 12 Jul 2013 09:38:53 +0530
Subject: [PATCH 12/30] Editing a view is likely to change view structure. So
 there is no point using an ajax dialog for that as view structure page need
 to be refreshed.

---
 js/functions.js             | 6 +++---
 js/messages.php             | 1 -
 libraries/structure.lib.php | 5 +----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index c89f33322c..e699b576da 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3675,7 +3675,7 @@ function printPage()
  */
 AJAX.registerTeardown('functions.js', function () {
     $('input#print').unbind('click');
-    $('a.create_view.ajax, a.alter_view.ajax').die('click');
+    $('a.create_view.ajax').die('click');
     $('#createViewDialog').find('input, select').die('keydown');
 });
 
@@ -3684,7 +3684,7 @@ AJAX.registerOnload('functions.js', function () {
     /**
      * Ajaxification for the "Create View" action
      */
-    $('a.create_view.ajax, a.alter_view.ajax').live('click', function (e) {
+    $('a.create_view.ajax').live('click', function (e) {
         e.preventDefault();
         PMA_createViewDialog($(this));
     });
@@ -3732,7 +3732,7 @@ function PMA_createViewDialog($this)
                 minWidth: 400,
                 modal: true,
                 buttons: buttonOptions,
-                title: $this.is('.create_view') ? PMA_messages.strCreateView : PMA_messages.strEditView,
+                title: PMA_messages.strCreateView,
                 close: function () {
                     $(this).remove();
                 }
diff --git a/js/messages.php b/js/messages.php
index 3df253a468..c63a3f05e8 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -377,7 +377,6 @@ $js_messages['strLatestAvailable'] = __(', latest stable version:');
 $js_messages['strUpToDate'] = __('up to date');
 
 $js_messages['strCreateView'] = __('Create view');
-$js_messages['strEditView'] = __('Edit view');
 
 echo "var PMA_messages = new Array();\n";
 foreach ($js_messages as $name => $js_message) {
diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
index 6f8e191dd8..e25e36b3af 100644
--- a/libraries/structure.lib.php
+++ b/libraries/structure.lib.php
@@ -1473,10 +1473,7 @@ function PMA_getHtmlForEditView($url_params)
     );
     $html_output = PMA_Util::linkOrButton(
         $url,
-        PMA_Util::getIcon('b_edit.png', __('Edit view'), true),
-        array(
-            'class' => 'alter_view ajax'
-        )
+        PMA_Util::getIcon('b_edit.png', __('Edit view'), true)
     );
     return $html_output;
 }

From f2e214247c08c46eb65ad6c241f502dad1d51261 Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Fri, 12 Jul 2013 09:56:01 +0530
Subject: [PATCH 13/30] Use Codemirror editor for view editing

---
 js/functions.js | 16 ++++++++++++++++
 view_create.php |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/js/functions.js b/js/functions.js
index e699b576da..7096bafcf2 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3698,6 +3698,22 @@ AJAX.registerOnload('functions.js', function () {
             $(this).closest('.ui-dialog').find('.ui-button:first').click();
         }
     }); // end $.live()
+    
+    var $elm = $('textarea[name="view[as]"]');
+    if ($elm.length > 0) {
+        if (typeof CodeMirror != 'undefined') {
+            syntaxHighlighter = CodeMirror.fromTextArea(
+                $elm[0], 
+                {
+                    lineNumbers: true, 
+                    matchBrackets: true, 
+                    indentUnit: 4, 
+                    mode: "text/x-mysql", 
+                    lineWrapping: true
+                }
+            );
+        }
+    }
 });
 
 function PMA_createViewDialog($this)
diff --git a/view_create.php b/view_create.php
index 78dcbab18c..f9d2ee246d 100644
--- a/view_create.php
+++ b/view_create.php
@@ -230,7 +230,7 @@ $htmlString .= '<tr><td>' . __('Column names') . '</td>'
 $htmlString .= '<tr><td>AS</td>'
     . '<td>'
     . '<textarea name="view[as]" rows="' . $cfg['TextareaRows'] . '"'
-    . ' cols="80" dir="' . $text_dir . '"';
+    . ' cols="' . $cfg['TextareaCols'] . '" dir="' . $text_dir . '"';
 if ($GLOBALS['cfg']['TextareaAutoSelect'] || true) {
     $htmlString .= ' onclick="selectContent(this, sql_box_locked, true)"';
 }

From e1ec1d24cecdd15cae75226339c66294851630ab Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Fri, 12 Jul 2013 10:12:27 +0530
Subject: [PATCH 14/30] Allow setting view name only when creating a view

---
 view_create.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/view_create.php b/view_create.php
index f9d2ee246d..d7689ab089 100644
--- a/view_create.php
+++ b/view_create.php
@@ -216,10 +216,16 @@ foreach ($view_sql_security_options as $option) {
 $htmlString .= '<select>'
     . '</td></tr>';
 
-$htmlString .= '<tr><td>' . __('VIEW name') . '</td>'
-    . '<td><input type="text" size="20" name="view[name]" onfocus="this.select()"'
-    . ' value="' . htmlspecialchars($view['name']) . '" />'
-    . '</td></tr>';
+if ($view['operation'] == 'create') {
+    $htmlString .= '<tr><td>' . __('VIEW name') . '</td>'
+        . '<td><input type="text" size="20" name="view[name]" onfocus="this.select()"'
+        . ' value="' . htmlspecialchars($view['name']) . '" />'
+        . '</td></tr>';
+} else {
+    $htmlString .= '<tr><td><input type="hidden" name="view[name]"'
+        . ' value="' . htmlspecialchars($view['name']) . '" />'
+        . '</td></tr>';
+}
 
 $htmlString .= '<tr><td>' . __('Column names') . '</td>'
     . '<td><input type="text" maxlength="100" size="50" name="view[column_names]"'

From c625e934403d9bc2c5dfd42ef8418e1e30bef5c8 Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Fri, 12 Jul 2013 10:20:09 +0530
Subject: [PATCH 15/30] Wrap some long lines

---
 view_create.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/view_create.php b/view_create.php
index d7689ab089..ea20d67b73 100644
--- a/view_create.php
+++ b/view_create.php
@@ -61,7 +61,8 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
 
     if (isset($_REQUEST['view']['sql_security'])) {
         if (in_array($_REQUEST['view']['sql_security'], $view_sql_security_options)) {
-            $sql_query .= $sep . ' SQL SECURITY ' . $_REQUEST['view']['sql_security'];
+            $sql_query .= $sep . ' SQL SECURITY '
+                . $_REQUEST['view']['sql_security'];
         }
     }
 
@@ -75,7 +76,8 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
 
     if (isset($_REQUEST['view']['with'])) {
         if (in_array($_REQUEST['view']['with'], $view_with_options)) {
-            $sql_query .= $sep . ' WITH ' . $_REQUEST['view']['with'] . '  CHECK OPTION';
+            $sql_query .= $sep . ' WITH ' . $_REQUEST['view']['with']
+                . '  CHECK OPTION';
         }
     }
 
@@ -171,7 +173,10 @@ $htmlString = '<!-- CREATE VIEW options -->'
     . PMA_generate_common_hidden_inputs($url_params)
     . '<fieldset>'
     . '<legend>'
-    . (isset($_REQUEST['ajax_dialog']) ? __('Details') : ($view['operation'] == 'create' ? __('Create view') : __('Edit view')))
+    . (isset($_REQUEST['ajax_dialog']) ?
+        __('Details') :
+        ($view['operation'] == 'create' ? __('Create view') : __('Edit view'))
+    )
     . '</legend>'
     . '<table class="rte_table">';
 
@@ -218,7 +223,8 @@ $htmlString .= '<select>'
 
 if ($view['operation'] == 'create') {
     $htmlString .= '<tr><td>' . __('VIEW name') . '</td>'
-        . '<td><input type="text" size="20" name="view[name]" onfocus="this.select()"'
+        . '<td><input type="text" size="20" name="view[name]"'
+        . ' onfocus="this.select()"'
         . ' value="' . htmlspecialchars($view['name']) . '" />'
         . '</td></tr>';
 } else {

From 784121514faf4d4f4b5b76a430514177d1d7103f Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Fri, 12 Jul 2013 10:32:19 +0530
Subject: [PATCH 16/30] Nowrap for labels

---
 view_create.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/view_create.php b/view_create.php
index ea20d67b73..dc6c6b8735 100644
--- a/view_create.php
+++ b/view_create.php
@@ -182,7 +182,7 @@ $htmlString = '<!-- CREATE VIEW options -->'
 
 if ($view['operation'] == 'create') {
     $htmlString .= '<tr>'
-        . '<td><label for="or_replace">OR REPLACE</label></td>'
+        . '<td class="nowrap"><label for="or_replace">OR REPLACE</label></td>'
         . '<td><input type="checkbox" name="view[or_replace]" id="or_replace"';
     if ($view['or_replace']) {
         $htmlString .= ' checked="checked"';
@@ -191,7 +191,7 @@ if ($view['operation'] == 'create') {
 }
 
 $htmlString .= '<tr>'
-    . '<td><label for="algorithm">ALGORITHM</label></td>'
+    . '<td class="nowrap"><label for="algorithm">ALGORITHM</label></td>'
     . '<td><select name="view[algorithm]" id="algorithm">';
 foreach ($view_algorithm_options as $option) {
     $htmlString .= '<option value="' . htmlspecialchars($option) . '"';
@@ -203,12 +203,12 @@ foreach ($view_algorithm_options as $option) {
 $htmlString .= '</select>'
     . '</td></tr>';
 
-$htmlString .= '<tr><td>' . __('Definer') . '</td>'
+$htmlString .= '<tr><td class="nowrap">' . __('Definer') . '</td>'
     . '<td><input type="text" maxlength="100" size="50" name="view[definer]"'
     . ' value="' . htmlspecialchars($view['definer']) . '" />'
     . '</td></tr>';
 
-$htmlString .= '<tr><td>SQL SECURITY</td>'
+$htmlString .= '<tr><td class="nowrap">SQL SECURITY</td>'
     . '<td><select name="view[sql_security]">'
     . '<option value=""></option>';
 foreach ($view_sql_security_options as $option) {
@@ -222,7 +222,7 @@ $htmlString .= '<select>'
     . '</td></tr>';
 
 if ($view['operation'] == 'create') {
-    $htmlString .= '<tr><td>' . __('VIEW name') . '</td>'
+    $htmlString .= '<tr><td class="nowrap">' . __('VIEW name') . '</td>'
         . '<td><input type="text" size="20" name="view[name]"'
         . ' onfocus="this.select()"'
         . ' value="' . htmlspecialchars($view['name']) . '" />'
@@ -233,13 +233,13 @@ if ($view['operation'] == 'create') {
         . '</td></tr>';
 }
 
-$htmlString .= '<tr><td>' . __('Column names') . '</td>'
+$htmlString .= '<tr><td class="nowrap">' . __('Column names') . '</td>'
     . '<td><input type="text" maxlength="100" size="50" name="view[column_names]"'
     . ' onfocus="this.select()"'
     . ' value="' . htmlspecialchars($view['column_names']) . '" />'
     . '</td></tr>';
 
-$htmlString .= '<tr><td>AS</td>'
+$htmlString .= '<tr><td class="nowrap">AS</td>'
     . '<td>'
     . '<textarea name="view[as]" rows="' . $cfg['TextareaRows'] . '"'
     . ' cols="' . $cfg['TextareaCols'] . '" dir="' . $text_dir . '"';
@@ -249,7 +249,7 @@ if ($GLOBALS['cfg']['TextareaAutoSelect'] || true) {
 $htmlString .= '>' . htmlspecialchars($view['as']) . '</textarea>'
     . '</td></tr>';
 
-$htmlString .= '<tr><td>WITH CHECK OPTION</td>'
+$htmlString .= '<tr><td class="nowrap">WITH CHECK OPTION</td>'
     . '<td><select name="view[with]">'
     . '<option value=""></option>';
 foreach ($view_with_options as $option) {

From d61fe0fe8cb54fd4e35b316ea98ffeddc24582b3 Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Fri, 12 Jul 2013 10:49:58 +0530
Subject: [PATCH 17/30] Fix typo

---
 view_create.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view_create.php b/view_create.php
index dc6c6b8735..0a2cae5f85 100644
--- a/view_create.php
+++ b/view_create.php
@@ -17,7 +17,7 @@ require_once './libraries/common.inc.php';
  * Runs common work
  */
 require './libraries/db_common.inc.php';
-$url_params['goto'] = 'tbl_structure';
+$url_params['goto'] = 'tbl_structure.php';
 $url_params['back'] = 'view_create.php';
 
 $view_algorithm_options = array(

From e257c17588a7a3e0f3c38edd68f371819717dc99 Mon Sep 17 00:00:00 2001
From: xmujay <xmujay@gmail.com>
Date: Fri, 12 Jul 2013 22:31:35 +0800
Subject: [PATCH 18/30] Unit test case for PMA_server_replication refactored
 functions

---
 .../libraries/PMA_server_replication_test.php | 386 ++++++++++++++++++
 1 file changed, 386 insertions(+)
 create mode 100644 test/libraries/PMA_server_replication_test.php

diff --git a/test/libraries/PMA_server_replication_test.php b/test/libraries/PMA_server_replication_test.php
new file mode 100644
index 0000000000..91e8e10375
--- /dev/null
+++ b/test/libraries/PMA_server_replication_test.php
@@ -0,0 +1,386 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * tests for replication_gui.lib.php
+ *
+ * @package PhpMyAdmin-test
+ */
+
+/*
+ * Include to test.
+ */
+require_once 'libraries/Util.class.php';
+require_once 'libraries/php-gettext/gettext.inc';
+require_once 'libraries/url_generating.lib.php';
+require_once 'libraries/database_interface.inc.php';
+require_once 'libraries/replication.inc.php';
+require_once 'libraries/replication_gui.lib.php';
+require_once 'libraries/Theme.class.php';
+require_once 'libraries/Message.class.php';
+require_once 'libraries/sanitizing.lib.php';
+require_once 'libraries/sqlparser.lib.php';
+require_once 'libraries/js_escape.lib.php';
+
+/**
+ * PMA_Serverreplication_Test class
+ *
+ * this class is for testing replication_gui.lib.php functions
+ *
+ * @package PhpMyAdmin-test
+ */
+class PMA_ServerReplication_Test extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Prepares environment for the test.
+     *
+     * @return void
+     */ 
+    public function setUp()
+    {
+        //$_REQUEST
+        $_REQUEST['log'] = "index1";
+        $_REQUEST['pos'] = 3;
+        $_REQUEST['mr_adduser'] = "mr_adduser";
+        
+        //$GLOBALS
+        $GLOBALS['cfg']['MaxRows'] = 10;
+        $GLOBALS['cfg']['ServerDefault'] = "server";
+        $GLOBALS['cfg']['RememberSorting'] = true;
+        $GLOBALS['cfg']['SQP'] = array();
+        $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
+        $GLOBALS['cfg']['ShowSQL'] = true;
+        $GLOBALS['cfg']['SQP']['fmtType'] = 'none';
+        $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
+        $GLOBALS['cfg']['LimitChars'] = 100;
+        $GLOBALS['cfg']['DBG']['sql'] = false;
+        $GLOBALS['cfg']['ShowHint'] = true;
+        
+        $GLOBALS['table'] = "table";
+        $GLOBALS['url_params'] = array();
+        $GLOBALS['pmaThemeImage'] = 'image';
+        
+        //$_SESSION
+        $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
+        $_SESSION['PMA_Theme'] = new PMA_Theme();
+        
+        //Mock DBI
+        $server_master_replication = array(
+            array(
+                "File" => "master-bin.000030",
+                "Position" => "107",
+                "Binlog_Do_DB" => "Binlog_Do_DB",
+                "Binlog_Ignore_DB" => "Binlog_Ignore_DB",
+            )
+        );
+        $server_slave_replication = array(
+            array(
+                "File" => "slave-bin.000030",
+                "Position" => "slave_Position",
+                "Binlog_Do_DB" => "slave__Do_DB",
+                "Binlog_Ignore_DB" => "slave_Binlog_Ignore_DB",
+            )
+        );
+
+        $slave_host = array(
+            array('Server_id'=>'Server_id1', 'Host'=>'Host1'),
+            array('Server_id'=>'Server_id2', 'Host'=>'Host2'),
+        );
+        
+        $fetchResult = array(
+            array(
+                "SHOW MASTER STATUS",
+                null,
+                null,
+                null,
+                0,
+                $server_master_replication
+            ),
+            array(
+                "SHOW SLAVE STATUS",
+                null,
+                null,
+                null,
+                0,
+                $server_slave_replication
+            ),
+            array(
+                "SHOW SLAVE HOSTS",
+                null,
+                null,
+                null,
+                0,
+                $slave_host
+            ),
+        );
+        
+        $dbi = $this->getMockBuilder('PMA_DatabaseInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $dbi->expects($this->any())->method('fetchResult')
+            ->will($this->returnValueMap($fetchResult));
+
+        $fields_info = array(
+            "Host" => array(
+                "Field" => "host",
+                "Type" => "char(60)",
+                "Null" => "NO",
+            )
+        );
+        $dbi->expects($this->any())->method('getColumns')
+            ->will($this->returnValue($fields_info));
+        
+        $GLOBALS['dbi'] = $dbi; 
+    }
+
+    /**
+     * Test for PMA_getHtmlForMasterReplication
+     *
+     * @return void
+     */
+    public function testPMAGetHtmlForMasterReplication()
+    {      
+        global $master_variables;
+        global $master_variables_alerts;
+        global $master_variables_oks;
+        global $server_master_replication;
+        global $strReplicationStatus_master;
+
+        $server_master_replication = array(
+            array(
+                "File" => "master-bin.000030",
+                "Position" => "107",
+                "Binlog_Do_DB" => "Binlog_Do_DB",
+                "Binlog_Ignore_DB" => "Binlog_Ignore_DB",
+            )
+        );
+        $master_variables_alerts = null;
+        $master_variables_oks = null;
+        $strReplicationStatus_master = null;
+
+        //Call the test function
+        $html = PMA_getHtmlForMasterReplication();
+        
+        //validate 1: Master replication
+        $this->assertContains(
+            '<legend>Master replication</legend>',
+            $html
+        );
+        $this->assertContains(
+            'This server is configured as master in a replication process.',
+            $html
+        );
+        
+        //validate 2: PMA_getHtmlForReplicationStatusTable
+        $this->assertContains(
+            '<div id="replication_master_section"',
+            $html
+        );
+        //$master_variables
+        $this->assertContains(
+            "Binlog_Do_DB",
+            $html
+        );
+        $this->assertContains(
+            "Binlog_Ignore_DB",
+            $html
+        );
+        //$server_master_replication
+        $this->assertContains(
+            "master-bin.000030",
+            $html
+        );
+        
+        //validate 3: PMA_getHtmlForReplicationSlavesTable
+        $this->assertContains(
+            'replication_slaves_section',
+            $html
+        );
+        $this->assertContains(
+            '<th>Server ID</th>',
+            $html
+        );
+        $this->assertContains(
+            '<th>Host</th>',
+            $html
+        );        
+        //slave host
+        $this->assertContains(
+            '<td class="value">Server_id1</td>',
+            $html
+        );
+        $this->assertContains(
+            '<td class="value">Server_id2</td>',
+            $html
+        );
+        $this->assertContains(
+            '<td class="value">Host1</td>',
+            $html
+        );
+        $this->assertContains(
+            '<td class="value">Host2</td>',
+            $html
+        );
+        //Notice
+        $this->assertContains(
+            'Only slaves started with the',
+            $html
+        );
+        
+        //validate 4: navigation URL
+        $this->assertContains(
+            '<a href="server_replication.php',
+            $html
+        );
+        $this->assertContains(
+            'Add slave replication user',
+            $html
+        );
+        
+        //validate 5: 'Add replication slave user' form
+        $this->assertContains(
+            '<div id="master_addslaveuser_gui">',
+            $html
+        );
+    }
+
+    /**
+     * Test for PMA_getHtmlForNotServerReplication
+     *
+     * @return void
+     */
+    public function testPMAGetHtmlForNotServerReplication()
+    {
+        //Call the test function             
+        $html = PMA_getHtmlForNotServerReplication();
+        
+        $this->assertContains(
+            '<legend>Master replication</legend>',
+            $html
+        );
+        $this->assertContains(
+            'This server is not configured as master in a replication process.',
+            $html
+        );
+    }
+
+    /**
+     * Test for PMA_getHtmlForSlaveConfiguration
+     *
+     * @return void
+     */
+    public function testPMAGetHtmlForSlaveConfiguration()
+    {
+        global $server_slave_replication;
+        $server_slave_replication = array(
+            array(
+                'Slave_IO_State' => 'running',
+                'Master_Host' => 'locahost',
+                'Master_User' => 'Master_User',
+                'Master_Port' => '1002',
+                'Connect_Retry' => 'Connect_Retry',
+                'Master_Log_File' => 'Master_Log_File',
+                'Read_Master_Log_Pos' => 'Read_Master_Log_Pos',
+                'Relay_Log_File' => 'Relay_Log_File',
+                'Relay_Log_Pos' => 'Relay_Log_Pos',
+                'Relay_Master_Log_File' =>  'Relay_Master_Log_File',
+                'Slave_IO_Running' => 'NO',
+                'Slave_SQL_Running' => 'NO',
+                'Replicate_Do_DB' => 'Replicate_Do_DB',
+                'Replicate_Ignore_DB' => 'Replicate_Ignore_DB',
+                'Replicate_Do_Table' => 'Replicate_Do_Table',
+                'Replicate_Ignore_Table' => 'Replicate_Ignore_Table',
+                'Replicate_Wild_Do_Table' => 'Replicate_Wild_Do_Table',
+                'Replicate_Wild_Ignore_Table' => 'Replicate_Wild_Ignore_Table',
+                'Last_Errno' => 'Last_Errno',
+                'Last_Error' => 'Last_Error',
+                'Skip_Counter' =>  'Skip_Counter',
+                'Exec_Master_Log_Pos' => 'Exec_Master_Log_Pos',
+                'Relay_Log_Space' => 'Relay_Log_Space',
+                'Until_Condition' => 'Until_Condition',
+                'Until_Log_File' => 'Until_Log_File',
+                'Until_Log_Pos' => 'Until_Log_Pos',
+                'Master_SSL_Allowed' => 'Master_SSL_Allowed',
+                'Master_SSL_CA_File' => 'Master_SSL_CA_File',
+                'Master_SSL_CA_Path' => 'Master_SSL_CA_Path',
+                'Master_SSL_Cert' => 'Master_SSL_Cert',
+                'Master_SSL_Cipher' => 'Master_SSL_Cipher',
+                'Master_SSL_Key' => 'Master_SSL_Key',
+                'Seconds_Behind_Master' => 'Seconds_Behind_Master',
+            )
+        );
+        
+        //Call the test function
+        $html = PMA_getHtmlForSlaveConfiguration(
+            true, 
+            $server_slave_replication
+        );
+        
+        //legend
+        $this->assertContains(
+            '<legend>Slave replication</legend>',
+            $html
+        );
+        $this->assertContains(
+            '<div id="slave_configuration_gui">',
+            $html
+        );
+        //notice
+        $this->assertContains(
+            'Server is configured as slave in a replication process.',
+            $html
+        );
+        //slave session
+        $this->assertContains(
+            '<div id="replication_slave_section"',
+            $html
+        );
+        //variable
+        $this->assertContains(
+            'Master_SSL_CA_Path',
+            $html
+        );
+        $this->assertContains(
+            'Master_SSL_Cert',
+            $html
+        );
+        $this->assertContains(
+            'Master_SSL_Cipher',
+            $html
+        );
+        $this->assertContains(
+            'Seconds_Behind_Master',
+            $html
+        );
+    }
+
+    /**
+     * Test for PMA_getHtmlForReplicationChangeMaster
+     *
+     * @return void
+     */
+    public function testPMAGetHtmlForReplicationChangeMaster()
+    {
+        //Call the test function             
+        $html = PMA_getHtmlForReplicationChangeMaster("slave_changemaster");
+
+        $this->assertContains(
+            '<form method="post" action="server_replication.php">',
+            $html
+        );
+        $this->assertContains(
+            'Slave configuration',
+            $html
+        );
+        $this->assertContains(
+            'Change or reconfigure master server',
+            $html
+        );
+        $notice = 'Make sure, you have unique server-id ' 
+            . 'in your configuration file (my.cnf)';
+        $this->assertContains(
+            $notice,
+            $html
+        );
+    }
+}

From 9ee4bb0efddbc0ea12cbd112465825847f837d97 Mon Sep 17 00:00:00 2001
From: xmujay <xmujay@gmail.com>
Date: Fri, 12 Jul 2013 22:56:02 +0800
Subject: [PATCH 19/30] fix the failure: Cannot modify header information

---
 setup/lib/form_processing.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php
index 65ebb1db2e..32b2a1d0ea 100644
--- a/setup/lib/form_processing.lib.php
+++ b/setup/lib/form_processing.lib.php
@@ -56,9 +56,9 @@ function process_formset(FormDisplay $form_display)
             <?php
         } else {
             // drop post data
-            header('HTTP/1.1 303 See Other');
-            header('Location: index.php');
             if (!defined('TESTSUITE')) {
+                header('HTTP/1.1 303 See Other');
+                header('Location: index.php');
                 exit;
             }
         }

From 70e90600c8b42959b12edc70195ddfc6fe885ff3 Mon Sep 17 00:00:00 2001
From: xmujay <xmujay@gmail.com>
Date: Fri, 12 Jul 2013 23:11:05 +0800
Subject: [PATCH 20/30] revert the changes about header

---
 setup/lib/form_processing.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php
index 32b2a1d0ea..65ebb1db2e 100644
--- a/setup/lib/form_processing.lib.php
+++ b/setup/lib/form_processing.lib.php
@@ -56,9 +56,9 @@ function process_formset(FormDisplay $form_display)
             <?php
         } else {
             // drop post data
+            header('HTTP/1.1 303 See Other');
+            header('Location: index.php');
             if (!defined('TESTSUITE')) {
-                header('HTTP/1.1 303 See Other');
-                header('Location: index.php');
                 exit;
             }
         }

From ecc0e3d5ebd7291fcc8f08b78a983dca9dba9769 Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Fri, 12 Jul 2013 21:07:01 +0530
Subject: [PATCH 21/30] ChangeLog entry for rfe #1373

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 2ab770de46..36f98a2dca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@ phpMyAdmin - ChangeLog
 + rfe #175 Allow cross-database relations
 - [core] Dropped support for PHP 5.2.
 + rfe #487 and rfe #1405 Find and Replacing column wise
++ rfe #1373 Use same create view dialog for editing a view 
 
 4.0.5.0 (not yet released)
 - bug #3977 Not detected configuration storage

From b0b492d62e6b8736b0f5aa841f51ce1f2e009f5e Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 12 Jul 2013 15:58:59 -0400
Subject: [PATCH 22/30] Fix typo and clarify comment

---
 libraries/TableSearch.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php
index 57d46d7d59..d3c367fd6b 100644
--- a/libraries/TableSearch.class.php
+++ b/libraries/TableSearch.class.php
@@ -192,11 +192,11 @@ class PMA_TableSearch
     }
 
     /**
-     * Returns an array with necessary configrations to create
-     * sub-tabs(Table Search and Zoom Search) in the table_select page.
+     * Returns an array with necessary configurations to create
+     * sub-tabs in the table_select page.
      *
      * @return array Array containing configuration (icon, text, link, id, args)
-     * of sub-tabs for Table Search and Zoom search
+     * of sub-tabs
      */
     private function _getSubTabs()
     {

From 2e0b83d812178480bae327dac054f8d0595c1220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= <matiasbellone+weblate@gmail.com>
Date: Fri, 12 Jul 2013 21:25:54 +0200
Subject: [PATCH 23/30] Translated using Weblate (Spanish)

Currently translated at 100.0% (2680 of 2680)
---
 po/es.po | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/po/es.po b/po/es.po
index 6e6bd19a08..85a1e6c804 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,10 +4,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2013-07-12 16:06+0200\n"
-"PO-Revision-Date: 2013-07-09 15:28+0200\n"
+"PO-Revision-Date: 2013-07-12 21:25+0200\n"
 "Last-Translator: Matías Bellone <matiasbellone+weblate@gmail.com>\n"
-"Language-Team: Spanish <http://l10n.cihar.com/projects/phpmyadmin/master/es/"
-">\n"
+"Language-Team: Spanish "
+"<http://l10n.cihar.com/projects/phpmyadmin/master/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1679,7 +1679,7 @@ msgstr "Agregar %d valor(es)"
 msgid ""
 "Note: If the file contains multiple tables, they will be combined into one."
 msgstr ""
-"Nota: si la fila contiene múltiples tablas, van a ser combinadas en una"
+"Nota: si la fila contiene múltiples tablas, van a ser combinadas en una."
 
 #: js/messages.php:262
 msgid "Hide query box"
@@ -2862,7 +2862,7 @@ msgstr "La clave primaria ha sido eliminada"
 #: libraries/Index.class.php:608
 #, php-format
 msgid "Index %s has been dropped."
-msgstr "El índice %s ha sido eliminado"
+msgstr "El índice %s ha sido eliminado."
 
 #: libraries/Index.class.php:731
 #, php-format
@@ -3848,7 +3848,7 @@ msgstr ""
 #: libraries/sql_query_form.lib.php:483
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
-"No se puede acceder al directorio que seleccionó para subir los archivos"
+"No se puede acceder al directorio que seleccionó para subir los archivos."
 
 #: libraries/Util.class.php:3452
 msgid "There are no files to upload"
@@ -8054,7 +8054,8 @@ msgstr ""
 #, php-format
 msgid "No activity within %s seconds; please log in again."
 msgstr ""
-"No ha habido actividad desde hace %s o más segundos; inicie sesión nuevamente"
+"No ha habido actividad desde hace %s o más segundos; inicie sesión "
+"nuevamente."
 
 #: libraries/plugins/auth/AuthenticationCookie.class.php:667
 #: libraries/plugins/auth/AuthenticationCookie.class.php:669
@@ -8079,7 +8080,7 @@ msgstr "El archivo %s no contiene ningún id de clave"
 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
 msgid "Hardware authentication failed!"
-msgstr "La autenticación de hardware fracasó"
+msgstr "¡Fracasó la autenticación de hardware!"
 
 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
 msgid "No valid authentication key plugged"
@@ -11316,7 +11317,7 @@ msgid ""
 msgstr ""
 "Parece haber un error en su consulta de SQL. La salida generada por el "
 "servidor de MySQL, de existir, aparece abajo, en cuyo caso puede ayudar a "
-"diagnosticar el problema"
+"diagnosticar el problema."
 
 #: libraries/sqlparser.lib.php:178
 msgid ""

From 827ea778fae9da964a5b5e1994350b95dac77297 Mon Sep 17 00:00:00 2001
From: Burak Yavuz <hitowerdigit@hotmail.com>
Date: Fri, 12 Jul 2013 20:53:57 +0200
Subject: [PATCH 24/30] Translated using Weblate (Turkish)

Currently translated at 100.0% (2680 of 2680)
---
 po/tr.po | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/po/tr.po b/po/tr.po
index 7864369068..76fff09aca 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,10 +4,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2013-07-12 16:06+0200\n"
-"PO-Revision-Date: 2013-07-09 12:21+0200\n"
+"PO-Revision-Date: 2013-07-12 20:53+0200\n"
 "Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
-"Language-Team: Turkish <http://l10n.cihar.com/projects/phpmyadmin/master/tr/"
-">\n"
+"Language-Team: Turkish "
+"<http://l10n.cihar.com/projects/phpmyadmin/master/tr/>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1663,7 +1663,7 @@ msgid ""
 "Note: If the file contains multiple tables, they will be combined into one."
 msgstr ""
 "Not: Eğer dosya çoklu tablolar içeriyorsa, bunlar bir tane içinde "
-"birleştirilecektir"
+"birleştirilecektir."
 
 #: js/messages.php:262
 msgid "Hide query box"
@@ -2832,7 +2832,7 @@ msgstr "Birincil anahtar kaldırıldı"
 #: libraries/Index.class.php:608
 #, php-format
 msgid "Index %s has been dropped."
-msgstr "%s indeksi kaldırıldı"
+msgstr "%s indeksi kaldırıldı."
 
 #: libraries/Index.class.php:731
 #, php-format
@@ -3797,7 +3797,7 @@ msgstr "Web sunucusu gönderme dizininden <b>%s</b> seçin:"
 #: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
 #: libraries/sql_query_form.lib.php:483
 msgid "The directory you set for upload work cannot be reached."
-msgstr "Gönderme işi için ayarladığınız dizine ulaşılamıyor"
+msgstr "Gönderme işi için ayarladığınız dizine ulaşılamıyor."
 
 #: libraries/Util.class.php:3452
 msgid "There are no files to upload"
@@ -7954,7 +7954,7 @@ msgstr ""
 #: libraries/plugins/auth/AuthenticationSignon.class.php:254
 #, php-format
 msgid "No activity within %s seconds; please log in again."
-msgstr "%s saniye içinde hiçbir işlem yapılmadı, lütfen yeniden oturum açın"
+msgstr "%s saniye içinde hiçbir işlem yapılmadı; lütfen tekrar oturum açın."
 
 #: libraries/plugins/auth/AuthenticationCookie.class.php:667
 #: libraries/plugins/auth/AuthenticationCookie.class.php:669
@@ -7978,7 +7978,7 @@ msgstr "%s dosyası herhangi bir anahtar kimliği içermiyor"
 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
 msgid "Hardware authentication failed!"
-msgstr "Donanım kimlik doğrulaması başarısız"
+msgstr "Donanım kimlik doğrulaması başarısız oldu!"
 
 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
 msgid "No valid authentication key plugged"
@@ -11148,7 +11148,8 @@ msgid ""
 "below, if there is any, may also help you in diagnosing the problem."
 msgstr ""
 "SQL sorgunuzda bir hata olduğu görünüyor. MySQL sunucusu hata çıktısı "
-"aşağıdadır, eğer varsa, sorunu teşhis etmenizde ayrıca size yardımcı olabilir"
+"aşağıdadır, eğer varsa, sorunu teşhis etmenizde ayrıca size yardımcı "
+"olabilir."
 
 #: libraries/sqlparser.lib.php:178
 msgid ""

From 3f358142cb9864fca50f3c961bc3c5381b278f8f Mon Sep 17 00:00:00 2001
From: xmujay <xmujay@gmail.com>
Date: Sat, 13 Jul 2013 11:31:01 +0800
Subject: [PATCH 25/30] fix the "Not support query" error by moving mock data
 to DBI Dummy class

---
 libraries/dbi/DBIDummy.class.php              | 55 +++++++++++++
 test/classes/plugin/import/ImportCsv_test.php |  1 +
 test/classes/plugin/import/ImportLdi_test.php |  1 +
 .../plugin/import/ImportMediawiki_test.php    |  1 +
 test/classes/plugin/import/ImportOds_test.php |  1 +
 test/classes/plugin/import/ImportSql_test.php |  1 +
 test/classes/plugin/import/ImportXml_test.php |  1 +
 .../libraries/PMA_server_replication_test.php | 80 +------------------
 8 files changed, 63 insertions(+), 78 deletions(-)

diff --git a/libraries/dbi/DBIDummy.class.php b/libraries/dbi/DBIDummy.class.php
index 1361629e23..163f885fe1 100644
--- a/libraries/dbi/DBIDummy.class.php
+++ b/libraries/dbi/DBIDummy.class.php
@@ -301,6 +301,61 @@ $GLOBALS['dummy_queries'] = array(
             " AND table_name = 'pma_test_table2'" .
             " ORDER BY version DESC",
         'result' => array()
+    ),
+    array(
+        'query' => "SHOW SLAVE STATUS",
+        'result' => array(
+            array(
+                'Slave_IO_State' => 'running',
+                'Master_Host' => 'locahost',
+                'Master_User' => 'Master_User',
+                'Master_Port' => '1002',
+                'Connect_Retry' => 'Connect_Retry',
+                'Master_Log_File' => 'Master_Log_File',
+                'Read_Master_Log_Pos' => 'Read_Master_Log_Pos',
+                'Relay_Log_File' => 'Relay_Log_File',
+                'Relay_Log_Pos' => 'Relay_Log_Pos',
+                'Relay_Master_Log_File' =>  'Relay_Master_Log_File',
+                'Slave_IO_Running' => 'NO',
+                'Slave_SQL_Running' => 'NO',
+                'Replicate_Do_DB' => 'Replicate_Do_DB',
+                'Replicate_Ignore_DB' => 'Replicate_Ignore_DB',
+                'Replicate_Do_Table' => 'Replicate_Do_Table',
+                'Replicate_Ignore_Table' => 'Replicate_Ignore_Table',
+                'Replicate_Wild_Do_Table' => 'Replicate_Wild_Do_Table',
+                'Replicate_Wild_Ignore_Table' => 'Replicate_Wild_Ignore_Table',
+                'Last_Errno' => 'Last_Errno',
+                'Last_Error' => 'Last_Error',
+                'Skip_Counter' =>  'Skip_Counter',
+                'Exec_Master_Log_Pos' => 'Exec_Master_Log_Pos',
+                'Relay_Log_Space' => 'Relay_Log_Space',
+                'Until_Condition' => 'Until_Condition',
+                'Until_Log_File' => 'Until_Log_File',
+                'Until_Log_Pos' => 'Until_Log_Pos',
+                'Master_SSL_Allowed' => 'Master_SSL_Allowed',
+                'Master_SSL_CA_File' => 'Master_SSL_CA_File',
+                'Master_SSL_CA_Path' => 'Master_SSL_CA_Path',
+                'Master_SSL_Cert' => 'Master_SSL_Cert',
+                'Master_SSL_Cipher' => 'Master_SSL_Cipher',
+                'Master_SSL_Key' => 'Master_SSL_Key',
+                'Seconds_Behind_Master' => 'Seconds_Behind_Master',
+            )
+        )
+    ),
+    array(
+        'query' => "SHOW MASTER STATUS",
+        'result' => array(
+            array(
+                "File" => "master-bin.000030",
+                "Position" => "107",
+                "Binlog_Do_DB" => "Binlog_Do_DB",
+                "Binlog_Ignore_DB" => "Binlog_Ignore_DB",
+            )
+        )
+    ),
+    array(
+        'query' => "SHOW GRANTS",
+        'result' => array()
     )
 );
 /**
diff --git a/test/classes/plugin/import/ImportCsv_test.php b/test/classes/plugin/import/ImportCsv_test.php
index 404b3ed131..63e1ec6140 100644
--- a/test/classes/plugin/import/ImportCsv_test.php
+++ b/test/classes/plugin/import/ImportCsv_test.php
@@ -18,6 +18,7 @@ require_once 'libraries/Util.class.php';
 require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/Table.class.php';
+require_once 'libraries/Tracker.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/import.lib.php';
 require_once 'libraries/sanitizing.lib.php';
diff --git a/test/classes/plugin/import/ImportLdi_test.php b/test/classes/plugin/import/ImportLdi_test.php
index 9a68cd191d..7703a36faa 100644
--- a/test/classes/plugin/import/ImportLdi_test.php
+++ b/test/classes/plugin/import/ImportLdi_test.php
@@ -19,6 +19,7 @@ require_once 'libraries/Util.class.php';
 require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/Table.class.php';
+require_once 'libraries/Tracker.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/import.lib.php';
 /* Each PluginObserver instance contains a PluginManager instance */
diff --git a/test/classes/plugin/import/ImportMediawiki_test.php b/test/classes/plugin/import/ImportMediawiki_test.php
index 1e66090d11..dfe89efbdd 100644
--- a/test/classes/plugin/import/ImportMediawiki_test.php
+++ b/test/classes/plugin/import/ImportMediawiki_test.php
@@ -17,6 +17,7 @@ require_once 'libraries/Util.class.php';
 require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/Table.class.php';
+require_once 'libraries/Tracker.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/import.lib.php';
 
diff --git a/test/classes/plugin/import/ImportOds_test.php b/test/classes/plugin/import/ImportOds_test.php
index 51ce3df8b8..313fc7b398 100644
--- a/test/classes/plugin/import/ImportOds_test.php
+++ b/test/classes/plugin/import/ImportOds_test.php
@@ -18,6 +18,7 @@ require_once 'libraries/Util.class.php';
 require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/Table.class.php';
+require_once 'libraries/Tracker.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/import.lib.php';
 require_once 'libraries/sanitizing.lib.php';
diff --git a/test/classes/plugin/import/ImportSql_test.php b/test/classes/plugin/import/ImportSql_test.php
index 13c76aea38..dafb9c20c5 100644
--- a/test/classes/plugin/import/ImportSql_test.php
+++ b/test/classes/plugin/import/ImportSql_test.php
@@ -18,6 +18,7 @@ require_once 'libraries/Util.class.php';
 require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/Table.class.php';
+require_once 'libraries/Tracker.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/import.lib.php';
 
diff --git a/test/classes/plugin/import/ImportXml_test.php b/test/classes/plugin/import/ImportXml_test.php
index 60e8314b2f..c1b3fb93cd 100644
--- a/test/classes/plugin/import/ImportXml_test.php
+++ b/test/classes/plugin/import/ImportXml_test.php
@@ -18,6 +18,7 @@ require_once 'libraries/Util.class.php';
 require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/Table.class.php';
+require_once 'libraries/Tracker.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/import.lib.php';
 /* Each PluginObserver instance contains a PluginManager instance */
diff --git a/test/libraries/PMA_server_replication_test.php b/test/libraries/PMA_server_replication_test.php
index 91e8e10375..cbf841d955 100644
--- a/test/libraries/PMA_server_replication_test.php
+++ b/test/libraries/PMA_server_replication_test.php
@@ -12,6 +12,7 @@
 require_once 'libraries/Util.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/url_generating.lib.php';
+require_once 'libraries/Tracker.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/replication.inc.php';
 require_once 'libraries/replication_gui.lib.php';
@@ -64,22 +65,6 @@ class PMA_ServerReplication_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = new PMA_Theme();
         
         //Mock DBI
-        $server_master_replication = array(
-            array(
-                "File" => "master-bin.000030",
-                "Position" => "107",
-                "Binlog_Do_DB" => "Binlog_Do_DB",
-                "Binlog_Ignore_DB" => "Binlog_Ignore_DB",
-            )
-        );
-        $server_slave_replication = array(
-            array(
-                "File" => "slave-bin.000030",
-                "Position" => "slave_Position",
-                "Binlog_Do_DB" => "slave__Do_DB",
-                "Binlog_Ignore_DB" => "slave_Binlog_Ignore_DB",
-            )
-        );
 
         $slave_host = array(
             array('Server_id'=>'Server_id1', 'Host'=>'Host1'),
@@ -87,22 +72,6 @@ class PMA_ServerReplication_Test extends PHPUnit_Framework_TestCase
         );
         
         $fetchResult = array(
-            array(
-                "SHOW MASTER STATUS",
-                null,
-                null,
-                null,
-                0,
-                $server_master_replication
-            ),
-            array(
-                "SHOW SLAVE STATUS",
-                null,
-                null,
-                null,
-                0,
-                $server_slave_replication
-            ),
             array(
                 "SHOW SLAVE HOSTS",
                 null,
@@ -145,15 +114,7 @@ class PMA_ServerReplication_Test extends PHPUnit_Framework_TestCase
         global $master_variables_oks;
         global $server_master_replication;
         global $strReplicationStatus_master;
-
-        $server_master_replication = array(
-            array(
-                "File" => "master-bin.000030",
-                "Position" => "107",
-                "Binlog_Do_DB" => "Binlog_Do_DB",
-                "Binlog_Ignore_DB" => "Binlog_Ignore_DB",
-            )
-        );
+        
         $master_variables_alerts = null;
         $master_variables_oks = null;
         $strReplicationStatus_master = null;
@@ -272,43 +233,6 @@ class PMA_ServerReplication_Test extends PHPUnit_Framework_TestCase
     public function testPMAGetHtmlForSlaveConfiguration()
     {
         global $server_slave_replication;
-        $server_slave_replication = array(
-            array(
-                'Slave_IO_State' => 'running',
-                'Master_Host' => 'locahost',
-                'Master_User' => 'Master_User',
-                'Master_Port' => '1002',
-                'Connect_Retry' => 'Connect_Retry',
-                'Master_Log_File' => 'Master_Log_File',
-                'Read_Master_Log_Pos' => 'Read_Master_Log_Pos',
-                'Relay_Log_File' => 'Relay_Log_File',
-                'Relay_Log_Pos' => 'Relay_Log_Pos',
-                'Relay_Master_Log_File' =>  'Relay_Master_Log_File',
-                'Slave_IO_Running' => 'NO',
-                'Slave_SQL_Running' => 'NO',
-                'Replicate_Do_DB' => 'Replicate_Do_DB',
-                'Replicate_Ignore_DB' => 'Replicate_Ignore_DB',
-                'Replicate_Do_Table' => 'Replicate_Do_Table',
-                'Replicate_Ignore_Table' => 'Replicate_Ignore_Table',
-                'Replicate_Wild_Do_Table' => 'Replicate_Wild_Do_Table',
-                'Replicate_Wild_Ignore_Table' => 'Replicate_Wild_Ignore_Table',
-                'Last_Errno' => 'Last_Errno',
-                'Last_Error' => 'Last_Error',
-                'Skip_Counter' =>  'Skip_Counter',
-                'Exec_Master_Log_Pos' => 'Exec_Master_Log_Pos',
-                'Relay_Log_Space' => 'Relay_Log_Space',
-                'Until_Condition' => 'Until_Condition',
-                'Until_Log_File' => 'Until_Log_File',
-                'Until_Log_Pos' => 'Until_Log_Pos',
-                'Master_SSL_Allowed' => 'Master_SSL_Allowed',
-                'Master_SSL_CA_File' => 'Master_SSL_CA_File',
-                'Master_SSL_CA_Path' => 'Master_SSL_CA_Path',
-                'Master_SSL_Cert' => 'Master_SSL_Cert',
-                'Master_SSL_Cipher' => 'Master_SSL_Cipher',
-                'Master_SSL_Key' => 'Master_SSL_Key',
-                'Seconds_Behind_Master' => 'Seconds_Behind_Master',
-            )
-        );
         
         //Call the test function
         $html = PMA_getHtmlForSlaveConfiguration(

From 1bf8a85d3e516cb4e78ecbaf9587903ae9c12361 Mon Sep 17 00:00:00 2001
From: Tony Chen <tonychen@finenet.com.tw>
Date: Sat, 13 Jul 2013 20:32:03 +0200
Subject: [PATCH 26/30] Translated using Weblate (Traditional Chinese)

Currently translated at 100.0% (2680 of 2680)
---
 po/zh_TW.po | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 78805d6c9b..51f047c4fc 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -4,10 +4,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2013-07-12 16:06+0200\n"
-"PO-Revision-Date: 2013-07-05 16:35+0200\n"
+"PO-Revision-Date: 2013-07-13 20:32+0200\n"
 "Last-Translator: Tony Chen <tonychen@finenet.com.tw>\n"
-"Language-Team: Traditional Chinese <http://l10n.cihar.com/projects/"
-"phpmyadmin/master/zh_TW/>\n"
+"Language-Team: Traditional Chinese "
+"<http://l10n.cihar.com/projects/phpmyadmin/master/zh_TW/>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1680,10 +1680,9 @@ msgid "Show search criteria"
 msgstr "顯示搜尋條件"
 
 #: js/messages.php:278
-#, fuzzy
 #| msgid "Hide search criteria"
 msgid "Hide find and replace criteria"
-msgstr "隱藏搜尋條件"
+msgstr "隱藏搜尋和替換條件"
 
 #: js/messages.php:279
 msgid "Show find and replace criteria"
@@ -2774,7 +2773,7 @@ msgstr "已刪除主鍵"
 #: libraries/Index.class.php:608
 #, php-format
 msgid "Index %s has been dropped."
-msgstr "已刪除索引 %s"
+msgstr "已刪除索引 %s。"
 
 #: libraries/Index.class.php:731
 #, php-format
@@ -3161,7 +3160,7 @@ msgstr "資料表搜尋"
 
 #: libraries/TableSearch.class.php:217 libraries/TableSearch.class.php:1172
 msgid "Find and Replace"
-msgstr ""
+msgstr "搜尋和替換"
 
 #: libraries/TableSearch.class.php:239 libraries/insert_edit.lib.php:1352
 msgid "Edit/Insert"
@@ -3226,20 +3225,18 @@ msgid "Reset zoom"
 msgstr "重設縮放大小"
 
 #: libraries/TableSearch.class.php:1281
-#, fuzzy
 #| msgid "Replace with"
 msgid "Replace with:"
-msgstr "替換爲"
+msgstr "替換爲："
 
 #: libraries/TableSearch.class.php:1341
 msgid "Find and replace - preview"
 msgstr "尋找和替換-預覽"
 
 #: libraries/TableSearch.class.php:1345
-#, fuzzy
 #| msgid "Column"
 msgid "Count"
-msgstr "欄位"
+msgstr "次數"
 
 #: libraries/TableSearch.class.php:1346
 msgid "Original string"
@@ -3722,7 +3719,7 @@ msgstr "選擇 Web 伺服器上傳目錄 <b>%s</b>："
 #: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
 #: libraries/sql_query_form.lib.php:483
 msgid "The directory you set for upload work cannot be reached."
-msgstr "設定之上傳目錄錯誤，無法使用"
+msgstr "設定之上傳目錄錯誤，無法使用。"
 
 #: libraries/Util.class.php:3452
 msgid "There are no files to upload"
@@ -7666,7 +7663,7 @@ msgstr "空密碼登錄被禁止 (參見 允許空密碼)"
 #: libraries/plugins/auth/AuthenticationSignon.class.php:254
 #, php-format
 msgid "No activity within %s seconds; please log in again."
-msgstr "登錄超時 (%s 秒未操作)，請重新登錄"
+msgstr "登錄超時 (%s 秒未操作)，請重新登錄。"
 
 #: libraries/plugins/auth/AuthenticationCookie.class.php:667
 #: libraries/plugins/auth/AuthenticationCookie.class.php:669
@@ -7690,7 +7687,7 @@ msgstr "檔案 %s 未包含任何密鑰"
 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
 msgid "Hardware authentication failed!"
-msgstr "硬件認證失敗"
+msgstr "硬體身份驗證失敗！"
 
 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
 msgid "No valid authentication key plugged"
@@ -9180,7 +9177,7 @@ msgstr "顯示資料表格大小"
 
 #: libraries/schema/User_Schema.class.php:461
 msgid "Same width for all tables"
-msgstr ""
+msgstr "所有資料表使用相同的寬度"
 
 #: libraries/schema/User_Schema.class.php:464 libraries/structure.lib.php:379
 msgid "Data Dictionary"
@@ -10710,9 +10707,7 @@ msgstr "僅查看"
 msgid ""
 "There seems to be an error in your SQL query. The MySQL server error output "
 "below, if there is any, may also help you in diagnosing the problem."
-msgstr ""
-"您的 SQL 查詢可能有錯。如果可能的話，以下會列出 MySQL 伺服器的錯誤輸出，這可"
-"能對您解決問題有一定的幫助"
+msgstr "您的 SQL 查詢可能有錯。如果可能的話，以下會列出 MySQL 伺服器的錯誤輸出，這可能對您解決問題有一定的幫助。"
 
 #: libraries/sqlparser.lib.php:178
 msgid ""

From d314b7499adec28ca468fd79413ce79ff864fe7b Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 14 Jul 2013 07:39:45 -0400
Subject: [PATCH 27/30] add CALL to the list of reserved words

---
 libraries/sqlparser.data.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index fab1177d88..f511faa757 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -396,6 +396,7 @@ $PMA_SQPdata_reserved_word = array (
     'BINLOG',
     'BOTH',
     'BY',
+    'CALL',
     'CASCADE',
     'CASE',
     'CHANGE',

From 4c6f3ec6561f61b74ee2dc0e05556d7bb8a386fd Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 14 Jul 2013 01:43:32 +0200
Subject: [PATCH 28/30] Translated using Weblate (French)

Currently translated at 100.0% (2680 of 2680)
---
 po/fr.po | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 3ad709085a..dbe0e88bde 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,10 +4,9 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2013-07-12 16:06+0200\n"
-"PO-Revision-Date: 2013-07-12 15:29+0200\n"
+"PO-Revision-Date: 2013-07-14 01:43+0200\n"
 "Last-Translator: Marc Delisle <marc@infomarc.info>\n"
-"Language-Team: French <http://l10n.cihar.com/projects/phpmyadmin/master/fr/"
-">\n"
+"Language-Team: French <http://l10n.cihar.com/projects/phpmyadmin/master/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1668,7 +1667,7 @@ msgstr "Ajouter %d valeur(s)"
 #: js/messages.php:259
 msgid ""
 "Note: If the file contains multiple tables, they will be combined into one."
-msgstr "Note : si le fichier contient plusieurs tables, elles seront combinées"
+msgstr "Note : si le fichier contient plusieurs tables, elles seront combinées."
 
 #: js/messages.php:262
 msgid "Hide query box"
@@ -2848,7 +2847,7 @@ msgstr "La clé primaire a été effacée"
 #: libraries/Index.class.php:608
 #, php-format
 msgid "Index %s has been dropped."
-msgstr "L'index %s a été effacé"
+msgstr "L'index %s a été effacé."
 
 #: libraries/Index.class.php:731
 #, php-format
@@ -3829,7 +3828,7 @@ msgstr ""
 #: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
 #: libraries/sql_query_form.lib.php:483
 msgid "The directory you set for upload work cannot be reached."
-msgstr "Le répertoire de transfert est inaccessible"
+msgstr "Le répertoire de transfert est inaccessible."
 
 #: libraries/Util.class.php:3452
 msgid "There are no files to upload"
@@ -8015,7 +8014,7 @@ msgstr "Le fichier %s ne contient pas d'identifiant de clé"
 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
 msgid "Hardware authentication failed!"
-msgstr "L'authentification matérielle a échoué"
+msgstr "L'authentification matérielle a échoué !"
 
 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
 msgid "No valid authentication key plugged"

From c9ac0891eba2bbb9135782b8a38bdd9e4f93107f Mon Sep 17 00:00:00 2001
From: Burak Yavuz <hitowerdigit@hotmail.com>
Date: Sun, 14 Jul 2013 12:36:42 +0200
Subject: [PATCH 29/30] Translated using Weblate (Turkish)

Currently translated at 100.0% (2680 of 2680)
---
 po/tr.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/tr.po b/po/tr.po
index 76fff09aca..8d9c544962 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2013-07-12 16:06+0200\n"
-"PO-Revision-Date: 2013-07-12 20:53+0200\n"
+"PO-Revision-Date: 2013-07-14 12:36+0200\n"
 "Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
 "Language-Team: Turkish "
 "<http://l10n.cihar.com/projects/phpmyadmin/master/tr/>\n"
@@ -3932,7 +3932,7 @@ msgstr "%s %s veya sonrasına yükseltmelisiniz."
 
 #: libraries/common.inc.php:1075
 msgid "Error: Token mismatch"
-msgstr "Hata: Belirti uyuşmazlığı"
+msgstr "Hata: Belirteç uyuşmazlığı"
 
 #: libraries/common.inc.php:1119
 msgid "GLOBALS overwrite attempt"

From f8650cc4db90903dc26d3625bdaf67acf2fad215 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 14 Jul 2013 07:42:18 -0400
Subject: [PATCH 30/30] Fix typo

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

diff --git a/libraries/DatabaseInterface.class.php b/libraries/DatabaseInterface.class.php
index 4d32d45666..5f7d91e611 100644
--- a/libraries/DatabaseInterface.class.php
+++ b/libraries/DatabaseInterface.class.php
@@ -1438,7 +1438,7 @@ class PMA_DatabaseInterface
 
     /**
      * Function called just after a connection to the MySQL database server has
-     * been established. It sets the connection collation, and determins the
+     * been established. It sets the connection collation, and determines the
      * version of MySQL which is running.
      *
      * @param mixed   $link           mysql link resource|object