Remove some unnecessary string concatenations

https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md Signed-off-by: Marc Delisle <marc@infomarc.info>
phpmyadmin · Dec 3, 2015 · 2607023 · 2607023
1 parent bc5c8e4
commit 2607023
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 37 deletions.
diff --git a/db_datadict.php b/db_datadict.php
@@ -115,11 +115,11 @@
     echo '<th width="40">' . __('Null') . '</th>';
     echo '<th width="70">' . __('Default') . '</th>';
     if ($have_rel) {
-        echo '    <th>' . __('Links to') . '</th>' . "\n";
+        echo '    <th>' , __('Links to') , '</th>' , "\n";
     }
-    echo '    <th>' . __('Comments') . '</th>' . "\n";
+    echo '    <th>' , __('Comments') , '</th>' , "\n";
     if ($cfgRelation['mimework']) {
-        echo '    <th>MIME</th>' . "\n";
+        echo '    <th>MIME</th>' , "\n";
     }
     echo '</tr>';
     $odd_row = true;
@@ -152,7 +152,7 @@
         echo htmlspecialchars($column_name);
 
         if (isset($pk_array[$row['Field']])) {
-            echo ' <em>(' . __('Primary') . ')</em>';
+            echo ' <em>(' , __('Primary') , ')</em>';
         }
         echo '</td>';
         echo '<td'

diff --git a/gis_data_editor.php b/gis_data_editor.php
@@ -155,11 +155,11 @@ function escape($variable)
 echo '<div id="gis_data_header">';
 echo '<select name="gis_data[gis_type]" class="gis_type">';
 foreach ($gis_types as $gis_type) {
-    echo '<option value="' . $gis_type . '"';
+    echo '<option value="' , $gis_type , '"';
     if ($geom_type == $gis_type) {
         echo ' selected="selected"';
     }
-    echo '>' . $gis_type . '</option>';
+    echo '>' , $gis_type , '</option>';
 }
 echo '</select>';
 echo '&nbsp;&nbsp;&nbsp;&nbsp;';
@@ -200,7 +200,7 @@ function escape($variable)
             if ($type == $gis_type) {
                 echo ' selected="selected"';
             }
-            echo '>' . $gis_type . '</option>';
+            echo '>' , $gis_type , '</option>';
         }
         echo '</select>';
     } else {

diff --git a/import_status.php b/import_status.php
@@ -106,10 +106,10 @@
     }
 
     echo $_SESSION['Import_message']['message'];
-    echo '<fieldset class="tblFooters">' . "\n";
-    echo '    [ <a href="' . $_SESSION['Import_message']['go_back_url']
-        . '">' . __('Back') . '</a> ]' . "\n";
-    echo '</fieldset>' . "\n";
+    echo '<fieldset class="tblFooters">' , "\n";
+    echo '    [ <a href="' , $_SESSION['Import_message']['go_back_url']
+        . '">' , __('Back') , '</a> ]' , "\n";
+    echo '</fieldset>' , "\n";
 
 } else {
     PMA_importAjaxStatus($_GET["id"]);

diff --git a/libraries/plugins/auth/AuthenticationConfig.php b/libraries/plugins/auth/AuthenticationConfig.php
@@ -152,7 +152,7 @@ public function authFails()
         echo '</td>
         </tr>
         <tr>
-            <td>' . "\n";
+            <td>' , "\n";
         echo '<a href="'
             . PMA\libraries\Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabServer'],
@@ -166,13 +166,13 @@ public function authFails()
         if (count($GLOBALS['cfg']['Servers']) > 1) {
             // offer a chance to login to other servers if the current one failed
             include_once './libraries/select_server.lib.php';
-            echo '<tr>' . "\n";
-            echo ' <td>' . "\n";
+            echo '<tr>' , "\n";
+            echo ' <td>' , "\n";
             echo PMA_selectServer(true, true);
-            echo ' </td>' . "\n";
-            echo '</tr>' . "\n";
+            echo ' </td>' , "\n";
+            echo '</tr>' , "\n";
         }
-        echo '</table>' . "\n";
+        echo '</table>' , "\n";
         if (!defined('TESTSUITE')) {
             exit;
         }

diff --git a/libraries/plugins/auth/AuthenticationCookie.php b/libraries/plugins/auth/AuthenticationCookie.php
@@ -167,7 +167,7 @@ public function auth()
         echo '</div>
     <br />
     <!-- Login form -->
-    <form method="post" action="index.php" name="login_form"' . $autocomplete .
+    <form method="post" action="index.php" name="login_form"' , $autocomplete ,
             ' class="disableAjax login hide js-show">
         <fieldset>
         <legend>';
@@ -210,7 +210,7 @@ public function auth()
                 <select name="server" id="select_server"';
             if ($GLOBALS['cfg']['AllowArbitraryServer']) {
                 echo ' onchange="document.forms[\'login_form\'].'
-                    . 'elements[\'pma_servername\'].value = \'\'" ';
+                    , 'elements[\'pma_servername\'].value = \'\'" ';
             }
             echo '>';
 
@@ -236,7 +236,7 @@ public function auth()
 
         echo '</fieldset>
         <fieldset class="tblFooters">
-            <input value="' . __('Go') . '" type="submit" id="input_go" />';
+            <input value="' , __('Go') , '" type="submit" id="input_go" />';
         $_form_params = array();
         if (! empty($GLOBALS['target'])) {
             $_form_params['target'] = $GLOBALS['target'];

diff --git a/libraries/plugins/auth/swekey/swekey.auth.lib.php b/libraries/plugins/auth/swekey/swekey.auth.lib.php
@@ -226,7 +226,7 @@ function timedCheck()
                 url = url.substr(0, url.indexOf("?"));
             }
             Swekey_SetUnplugUrl(key, "pma_login", url + "?session_to_unset=<?php echo session_id();?>&token=<?php echo $_SESSION[' PMA_token ']; ?>");
-            var otp = Swekey_GetOtp(key, <?php echo '"' . $_SESSION['SWEKEY']['RND_TOKEN'] . '"';?>);
+            var otp = Swekey_GetOtp(key, <?php echo '"' , $_SESSION['SWEKEY']['RND_TOKEN'] , '"';?>);
             window.location.search="?swekey_id=" + key + "&swekey_otp=" + otp + "&token=<?php echo $_SESSION[' PMA_token ']; ?>";
         }
         </script>

diff --git a/libraries/plugins/schema/ExportRelationSchema.php b/libraries/plugins/schema/ExportRelationSchema.php
@@ -289,12 +289,12 @@ public static function dieSchema($pageNumber, $type = '', $error_message = '')
         if (!empty($error_message)) {
             $error_message = htmlspecialchars($error_message);
         }
-        echo '<p>' . "\n";
-        echo '    ' . $error_message . "\n";
-        echo '</p>' . "\n";
+        echo '<p>' , "\n";
+        echo '    ' , $error_message , "\n";
+        echo '</p>' , "\n";
         echo '<a href="db_designer.php'
-            . PMA_URL_getCommon(array('db' => $GLOBALS['db']))
-            . '&page=' . htmlspecialchars($pageNumber) . '">' . __('Back') . '</a>';
+            , PMA_URL_getCommon(array('db' => $GLOBALS['db']))
+            , '&page=' . htmlspecialchars($pageNumber) , '">' , __('Back') , '</a>';
         echo "\n";
         exit;
     }

diff --git a/prefs_manage.php b/prefs_manage.php
@@ -265,21 +265,21 @@
     . '<div class="localStorage-empty">';
 Message::notice(__('You have no saved settings!'))->display();
 echo  '</div>'
-    . '</div>'
-    . '<div class="localStorage-unsupported">';
+    , '</div>'
+    , '<div class="localStorage-unsupported">';
 Message::notice(
     __('This feature is not supported by your web browser')
 )->display();
 echo '</div>'
-    . '</div>'
-    . '<input type="checkbox" id="import_merge" name="import_merge" />'
-    . '<label for="import_merge">'
-    . __('Merge with current configuration') . '</label>'
-    . '<br /><br />'
-    . '<input type="submit" name="submit_import" value="'
-    . __('Go') . '" />'
-    . '</form>'
-    . '</div>';
+    , '</div>'
+    , '<input type="checkbox" id="import_merge" name="import_merge" />'
+    , '<label for="import_merge">'
+    , __('Merge with current configuration') . '</label>'
+    , '<br /><br />'
+    , '<input type="submit" name="submit_import" value="'
+    , __('Go') . '" />'
+    , '</form>'
+    , '</div>';
 if (file_exists('setup/index.php')) {
             // show only if setup script is available, allows to disable this message
             // by simply removing setup directory