From 66c15daba0a4a34e108cb01a852b9171ae0f51ab Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 6 Dec 2015 08:01:07 -0500 Subject: [PATCH] Remove some unnecessary string concatenations https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md Signed-off-by: Marc Delisle --- db_datadict.php | 16 ++++++++-------- db_tracking.php | 2 +- examples/openid.php | 2 +- gis_data_editor.php | 12 ++++++------ libraries/plugins/auth/AuthenticationConfig.php | 4 ++-- libraries/plugins/auth/AuthenticationCookie.php | 2 +- setup/frames/config.inc.php | 2 +- setup/frames/index.inc.php | 14 +++++++------- setup/frames/menu.inc.php | 14 +++++++------- view_operations.php | 2 +- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 46373a7a6b..71f7654d1f 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -54,8 +54,8 @@ if ($cfgRelation['commwork']) { * Displays DB comment */ if ($comment) { - echo '

' . __('Database comment') - . '
' . htmlspecialchars($comment) . '

'; + echo '

' , __('Database comment') + , '
' , htmlspecialchars($comment) , '

'; } // end if } @@ -110,10 +110,10 @@ foreach ($tables as $table) { */ echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; + echo ''; if ($have_rel) { echo ' ' , "\n"; } @@ -156,10 +156,10 @@ foreach ($tables as $table) { } echo ''; echo '' . $type . ''; + , ' lang="en" dir="ltr">' , $type , ''; echo ''; echo ''; diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php index a630e2b597..399fcc0bd2 100644 --- a/setup/frames/index.inc.php +++ b/setup/frames/index.inc.php @@ -108,8 +108,8 @@ foreach ($all_languages as $each_lang_key => $each_lang) { $lang_name = PMA_languageName($each_lang); //Is current one active? $selected = ($GLOBALS['lang'] == $each_lang_key) ? ' selected="selected"' : ''; - echo '' . "\n"; + echo '' , "\n"; } echo ''; @@ -170,12 +170,12 @@ if ($cf->getServerCount() > 0) { foreach ($cf->getServers() as $id => $server) { echo ''; - echo ''; - echo ''; + echo ''; + echo ''; echo ''; - echo ''; + , htmlspecialchars($cf->getValue("Servers/$id/auth_type")) + , ''; + echo ''; echo '
' . __('Column') . '' . __('Type') . '' . __('Null') . '' . __('Default') . '
' , __('Column') , '' , __('Type') , '' , __('Null') , '' , __('Default') , '' , __('Links to') , ''; echo (($row['Null'] == 'NO') ? __('No') : __('Yes')); diff --git a/db_tracking.php b/db_tracking.php index 7d18c79739..ad072fca44 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -99,7 +99,7 @@ $data = Tracker::getTrackedData($_REQUEST['db'], '', '1'); // No tables present and no log exist if ($num_tables == 0 && count($data['ddlog']) == 0) { - echo '

' . __('No tables found in database.') . '

' . "\n"; + echo '

' , __('No tables found in database.') , '

' , "\n"; if (empty($db_is_system_schema)) { echo PMA_getHtmlForCreateTable($db); diff --git a/examples/openid.php b/examples/openid.php index f186758993..e402d4e26d 100644 --- a/examples/openid.php +++ b/examples/openid.php @@ -53,7 +53,7 @@ function Show_page($contents) ' . $_SESSION['PMA_single_signon_message'] . '

'; + echo '

' , $_SESSION['PMA_single_signon_message'] , '

'; unset($_SESSION['PMA_single_signon_message']); } echo $contents; diff --git a/gis_data_editor.php b/gis_data_editor.php index 21918e8b74..63886a7b9e 100644 --- a/gis_data_editor.php +++ b/gis_data_editor.php @@ -194,9 +194,9 @@ for ($a = 0; $a < $geom_count; $a++) { } else { $type = $gis_types[0]; } - echo ''; foreach (array_slice($gis_types, 0, 6) as $gis_type) { - echo '
'; echo ''; echo '
' . $id . '' . htmlspecialchars($cf->getServerName($id)) . '' , $id , '' , htmlspecialchars($cf->getServerName($id)) , '' - . htmlspecialchars($cf->getValue("Servers/$id/auth_type")) - . '' . htmlspecialchars($cf->getServerDSN($id)) . '' , htmlspecialchars($cf->getServerDSN($id)) , ''; echo ''; echo '' . __('Overview') . ''; +echo '
  • ' , __('Overview') , '
    • '; $formsets = array( 'Features' => __('Features'), @@ -28,10 +28,10 @@ $formsets = array( ); foreach ($formsets as $formset => $label) { - echo '
  • ' . $label . '
    • '; + echo '
  • ' , $label , '
    • '; } echo ''; diff --git a/view_operations.php b/view_operations.php index 6d47f0eee6..10079dee83 100644 --- a/view_operations.php +++ b/view_operations.php @@ -127,7 +127,7 @@ $drop_view_url_params = array_merge( ); echo '
    '; echo '
    '; -echo '' . __('Delete data or table') . ''; +echo '' , __('Delete data or table') , ''; echo '
      '; echo PMA_getDeleteDataOrTableLink(