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>

1 files changed, 52 insertions, 52 deletions

diff --git a/gis_data_editor.php b/gis_data_editor.php
index 7ae2ad842c..21918e8b74 100644
--- a/gis_data_editor.php
+++ b/gis_data_editor.php
@@ -120,12 +120,12 @@ printf(
 echo '</h3>';
 
 echo '<input type="hidden" name="field" value="'
-    . htmlspecialchars($_REQUEST['field']) . '" />';
+    , htmlspecialchars($_REQUEST['field']) , '" />';
 // The input field to which the final result should be added
 // and corresponding null checkbox
 if (isset($_REQUEST['input_name'])) {
     echo '<input type="hidden" name="input_name" value="'
-        . htmlspecialchars($_REQUEST['input_name']) . '" />';
+        , htmlspecialchars($_REQUEST['input_name']) , '" />';
 }
 echo PMA_URL_getHiddenInputs();
 
@@ -164,7 +164,7 @@ foreach ($gis_types as $gis_type) {
 echo '</select>';
 echo '&nbsp;&nbsp;&nbsp;&nbsp;';
 /* l10n: Spatial Reference System Identifier */
-echo '<label for="srid">' .  __('SRID:') . '</label>';
+echo '<label for="srid">' ,  __('SRID:') , '</label>';
 echo '<input name="gis_data[srid]" type="text" value="' , $srid , '" />';
 echo '</div>';
 echo '<!-- End of header section -->';
@@ -180,7 +180,7 @@ if ($geom_type == 'GEOMETRYCOLLECTION') {
         $geom_count++;
     }
     echo '<input type="hidden" name="gis_data[GEOMETRYCOLLECTION][geom_count]"'
-        . ' value="' . $geom_count . '" />';
+        , ' value="' , $geom_count , '" />';
 }
 
 for ($a = 0; $a < $geom_count; $a++) {
@@ -210,7 +210,7 @@ for ($a = 0; $a < $geom_count; $a++) {
     if ($type == 'POINT') {
         echo '<br/>';
         echo __('Point:');
-        echo '<label for="x">' . __("X") . '</label>';
+        echo '<label for="x">' , __("X") , '</label>';
         echo '<input name="gis_data[' , $a , '][POINT][x]" type="text"'
             , ' value="' , escape($gis_data[$a]['POINT']['x']) , '" />';
         echo '<label for="y">' , __("Y") , '</label>';
@@ -230,8 +230,8 @@ for ($a = 0; $a < $geom_count; $a++) {
         if (isset($gis_data[$a][$type]['add_point'])) {
             $no_of_points++;
         }
-        echo '<input type="hidden" value="' . $no_of_points . '"'
-            . ' name="gis_data[' . $a . '][' . $type . '][no_of_points]" />';
+        echo '<input type="hidden" value="' , $no_of_points , '"'
+            , ' name="gis_data[' , $a , '][' , $type , '][no_of_points]" />';
 
         for ($i = 0; $i < $no_of_points; $i++) {
             echo '<br/>';
@@ -239,16 +239,16 @@ for ($a = 0; $a < $geom_count; $a++) {
             echo ': ';
             echo '<label for="x">' .  __("X") . '</label>';
             echo '<input type="text"'
-                . ' name="gis_data[' . $a . '][' . $type . '][' . $i . '][x]"'
-                . ' value="' . escape($gis_data[$a][$type][$i]['x']) . '" />';
+                , ' name="gis_data[' , $a , '][' , $type , '][' , $i , '][x]"'
+                , ' value="' , escape($gis_data[$a][$type][$i]['x']) , '" />';
             echo '<label for="y">' . __("Y") . '</label>';
             echo '<input type="text"'
-                . ' name="gis_data[' . $a . '][' . $type . '][' . $i . '][y]"'
-                . ' value="' . escape($gis_data[$a][$type][$i]['y']) . '" />';
+                , ' name="gis_data[' , $a , '][' , $type , '][' , $i , '][y]"'
+                , ' value="' , escape($gis_data[$a][$type][$i]['y']) , '" />';
         }
         echo '<input type="submit"'
-            . ' name="gis_data[' . $a . '][' . $type . '][add_point]"'
-            . ' class="add addPoint" value="' . __("Add a point") . '" />';
+            , ' name="gis_data[' , $a , '][' , $type , '][add_point]"'
+            , ' class="add addPoint" value="' , __("Add a point") , '" />';
 
     } elseif ($type == 'MULTILINESTRING' || $type == 'POLYGON') {
         $no_of_lines = isset($gis_data[$a][$type]['no_of_lines'])
@@ -259,8 +259,8 @@ for ($a = 0; $a < $geom_count; $a++) {
         if (isset($gis_data[$a][$type]['add_line'])) {
             $no_of_lines++;
         }
-        echo '<input type="hidden" value="' . $no_of_lines . '"'
-            . ' name="gis_data[' . $a . '][' . $type . '][no_of_lines]" />';
+        echo '<input type="hidden" value="' , $no_of_lines , '"'
+            , ' name="gis_data[' , $a , '][' , $type , '][no_of_lines]" />';
 
         for ($i = 0; $i < $no_of_lines; $i++) {
             echo '<br/>';
@@ -285,34 +285,34 @@ for ($a = 0; $a < $geom_count; $a++) {
             if (isset($gis_data[$a][$type][$i]['add_point'])) {
                 $no_of_points++;
             }
-            echo '<input type="hidden" value="' . $no_of_points . '"'
-                . ' name="gis_data[' . $a . '][' . $type . '][' . $i
-                . '][no_of_points]" />';
+            echo '<input type="hidden" value="' , $no_of_points , '"'
+                , ' name="gis_data[' , $a , '][' , $type , '][' , $i
+                , '][no_of_points]" />';
 
             for ($j = 0; $j < $no_of_points; $j++) {
                 echo('<br/>');
                 printf(__('Point %d'), $j + 1);
                 echo ': ';
                 echo '<label for="x">' .  __("X") . '</label>';
-                echo '<input type="text" name="gis_data[' . $a . '][' . $type . ']['
-                    . $i . '][' . $j . '][x]" value="'
-                    . escape($gis_data[$a][$type][$i][$j]['x']) . '" />';
-                echo '<label for="y">' . __("Y") . '</label>';
-                echo '<input type="text" name="gis_data[' . $a . '][' . $type . ']['
-                    . $i . '][' . $j . '][y]"' . ' value="'
-                    . escape($gis_data[$a][$type][$i][$j]['y']) . '" />';
+                echo '<input type="text" name="gis_data[' , $a , '][' , $type . ']['
+                    , $i , '][' , $j , '][x]" value="'
+                    , escape($gis_data[$a][$type][$i][$j]['x']) , '" />';
+                echo '<label for="y">' , __("Y") , '</label>';
+                echo '<input type="text" name="gis_data[' , $a , '][' , $type , ']['
+                    , $i , '][' , $j , '][y]"' , ' value="'
+                    , escape($gis_data[$a][$type][$i][$j]['y']) , '" />';
             }
-            echo '<input type="submit" name="gis_data[' . $a . '][' . $type . ']['
-                . $i . '][add_point]"'
-                . ' class="add addPoint" value="' . __("Add a point") . '" />';
+            echo '<input type="submit" name="gis_data[' , $a , '][' , $type , ']['
+                , $i , '][add_point]"'
+                , ' class="add addPoint" value="' , __("Add a point") , '" />';
         }
         $caption = ($type == 'MULTILINESTRING')
             ? __('Add a linestring')
             : __('Add an inner ring');
         echo '<br/>';
         echo '<input type="submit"'
-            . ' name="gis_data[' . $a . '][' . $type . '][add_line]"'
-            . ' class="add addLine" value="' . $caption . '" />';
+            , ' name="gis_data[' , $a , '][' , $type , '][add_line]"'
+            , ' class="add addLine" value="' , $caption , '" />';
 
     } elseif ($type == 'MULTIPOLYGON') {
         $no_of_polygons = isset($gis_data[$a][$type]['no_of_polygons'])
@@ -324,8 +324,8 @@ for ($a = 0; $a < $geom_count; $a++) {
             $no_of_polygons++;
         }
         echo '<input type="hidden"'
-            . ' name="gis_data[' . $a . '][' . $type . '][no_of_polygons]"'
-            . ' value="' . $no_of_polygons . '" />';
+            , ' name="gis_data[' , $a , '][' , $type , '][no_of_polygons]"'
+            , ' value="' , $no_of_polygons , '" />';
 
         for ($k = 0; $k < $no_of_polygons; $k++) {
             echo '<br/>';
@@ -339,8 +339,8 @@ for ($a = 0; $a < $geom_count; $a++) {
                 $no_of_lines++;
             }
             echo '<input type="hidden"'
-                . ' name="gis_data[' . $a . '][' . $type . '][' . $k
-                . '][no_of_lines]"' . ' value="' . $no_of_lines . '" />';
+                , ' name="gis_data[' , $a , '][' , $type , '][' , $k
+                , '][no_of_lines]"' , ' value="' , $no_of_lines , '" />';
 
             for ($i = 0; $i < $no_of_lines; $i++) {
                 echo '<br/><br/>';
@@ -359,8 +359,8 @@ for ($a = 0; $a < $geom_count; $a++) {
                     $no_of_points++;
                 }
                 echo '<input type="hidden"'
-                    . ' name="gis_data[' . $a . '][' . $type . '][' . $k . '][' . $i
-                    . '][no_of_points]"' . ' value="' . $no_of_points . '" />';
+                    , ' name="gis_data[' , $a , '][' , $type , '][' , $k , '][' , $i
+                    , '][no_of_points]"' , ' value="' , $no_of_points , '" />';
 
                 for ($j = 0; $j < $no_of_points; $j++) {
                     echo '<br/>';
@@ -368,32 +368,32 @@ for ($a = 0; $a < $geom_count; $a++) {
                     echo ': ';
                     echo '<label for="x">' .  __("X") . '</label>';
                     echo '<input type="text"'
-                        . ' name="gis_data[' . $a . '][' . $type . '][' . $k . ']['
-                        . $i . '][' . $j . '][x]"'
-                        . ' value="' . escape($gis_data[$a][$type][$k][$i][$j]['x'])
-                        . '" />';
-                    echo '<label for="y">' . __("Y") . '</label>';
+                        , ' name="gis_data[' , $a , '][' , $type , '][' , $k , ']['
+                        , $i , '][' , $j , '][x]"'
+                        , ' value="' , escape($gis_data[$a][$type][$k][$i][$j]['x'])
+                        , '" />';
+                    echo '<label for="y">' , __("Y") , '</label>';
                     echo '<input type="text"'
-                        . ' name="gis_data[' . $a . '][' . $type . '][' . $k . ']['
-                        . $i . '][' . $j . '][y]"'
-                        . ' value="' . escape($gis_data[$a][$type][$k][$i][$j]['y'])
-                        . '" />';
+                        , ' name="gis_data[' , $a , '][' , $type , '][' , $k , ']['
+                        , $i , '][' , $j , '][y]"'
+                        , ' value="' , escape($gis_data[$a][$type][$k][$i][$j]['y'])
+                        , '" />';
                 }
                 echo '<input type="submit"'
-                    . ' name="gis_data[' . $a . '][' . $type . '][' . $k . '][' . $i
-                    . '][add_point]"'
-                    . ' class="add addPoint" value="' . __("Add a point") . '" />';
+                    , ' name="gis_data[' , $a , '][' , $type , '][' , $k , '][' , $i
+                    , '][add_point]"'
+                    , ' class="add addPoint" value="' , __("Add a point") , '" />';
             }
             echo '<br/>';
             echo '<input type="submit"'
-                . ' name="gis_data[' . $a . '][' . $type . '][' . $k . '][add_line]"'
-                . ' class="add addLine" value="' . __('Add an inner ring') . '" />';
+                , ' name="gis_data[' , $a , '][' , $type , '][' , $k , '][add_line]"'
+                , ' class="add addLine" value="' , __('Add an inner ring') , '" />';
             echo '<br/>';
         }
         echo '<br/>';
         echo '<input type="submit"'
-            . ' name="gis_data[' . $a . '][' . $type . '][add_polygon]"'
-            . ' class="add addPolygon" value="' .  __('Add a polygon') . '" />';
+            , ' name="gis_data[' , $a , '][' , $type , '][add_polygon]"'
+            , ' class="add addPolygon" value="' ,  __('Add a polygon') , '" />';
     }
 }
 if ($geom_type == 'GEOMETRYCOLLECTION') {