Strip trailing spaces

diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index 7903229b96a2c0e25e11a9fbc69370e3bc3dd861..c71a851a10f94c1aebe43dc9fe15ed02c6bda26d 100644 (file)
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -28,7 +28,7 @@ include "../adminer/include/functions.inc.php";
 global $adminer, $connection, $drivers, $edit_functions, $enum_length, $error, $functions, $grouping, $HTTPS, $inout, $jush, $LANG, $langs, $on_actions, $permanent, $structured_types, $token, $translations, $types, $unsigned, $VERSION; // allows including Adminer inside a function
 
 if (!$_SERVER["REQUEST_URI"]) { // IIS 5 compatibility
-       $_SERVER["REQUEST_URI"] = $_SERVER["ORIG_PATH_INFO"]; 
+       $_SERVER["REQUEST_URI"] = $_SERVER["ORIG_PATH_INFO"];
 }
 if (!strpos($_SERVER["REQUEST_URI"], '?') && $_SERVER["QUERY_STRING"] != "") { // IIS 7 compatibility
        $_SERVER["REQUEST_URI"] .= "?$_SERVER[QUERY_STRING]";

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 6495feaf0db024be75dc0c18626688f323940315..ef312a529a048c937cec8cb15827d26f1ad3e8fc 100644 (file)
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -3,7 +3,7 @@
 * @param Min_Result
 * @param Min_DB connection to examine indexes
 * @param string base link for <th> fields
-* @param array 
+* @param array
 * @return null
 */
 function select($result, $connection2 = null, $href = "", $orgtables = array()) {
@@ -360,11 +360,12 @@ function drop_create($drop, $create, $test, $drop_test, $location, $message_drop
 function create_trigger($on, $row) {
        global $jush;
        $timing_event = " $row[Timing] $row[Event]";
-       return "CREATE TRIGGER " 
-               . idf_escape($row["Trigger"]) 
-               . ($jush == "mssql" ? $on . $timing_event : $timing_event . $on) 
-               . rtrim(" $row[Type]\n$row[Statement]", ";") 
-               . ";";
+       return "CREATE TRIGGER "
+               . idf_escape($row["Trigger"])
+               . ($jush == "mssql" ? $on . $timing_event : $timing_event . $on)
+               . rtrim(" $row[Type]\n$row[Statement]", ";")
+               . ";"
+       ;
 }
 
 /** Generate SQL query for creating routine
@@ -382,13 +383,14 @@ function create_routine($routine, $row) {
                        $set[] = (ereg("^($inout)\$", $field["inout"]) ? "$field[inout] " : "") . idf_escape($field["field"]) . process_type($field, "CHARACTER SET");
                }
        }
-       return "CREATE $routine " 
-               . idf_escape(trim($row["name"])) 
-               . " (" . implode(", ", $set) . ")" 
-               . (isset($_GET["function"]) ? " RETURNS" . process_type($row["returns"], "CHARACTER SET") : "") 
-               . ($row["language"] ? " LANGUAGE $row[language]" : "") 
-               . rtrim("\n$row[definition]", ";") 
-               . ";";
+       return "CREATE $routine "
+               . idf_escape(trim($row["name"]))
+               . " (" . implode(", ", $set) . ")"
+               . (isset($_GET["function"]) ? " RETURNS" . process_type($row["returns"], "CHARACTER SET") : "")
+               . ($row["language"] ? " LANGUAGE $row[language]" : "")
+               . rtrim("\n$row[definition]", ";")
+               . ";"
+       ;
 }
 
 /** Remove current user definer from SQL command

diff --git a/adminer/processlist.inc.php b/adminer/processlist.inc.php
index 5938ec55585bbbebd90b1046891bda8e56d5a629..b7c3e6a867902a6c1066fd054c81de29090bf523 100644 (file)
--- a/adminer/processlist.inc.php
+++ b/adminer/processlist.inc.php
@@ -22,7 +22,7 @@ foreach (process_list() as $i => $row) {
        if (!$i) {
                echo "<thead><tr lang='en'>" . (support("kill") ? "<th>&nbsp;" : "");
                foreach ($row as $key => $val) {
-                       echo "<th>" . ($jush == "sql" 
+                       echo "<th>" . ($jush == "sql"
                                ? "<a href='http://dev.mysql.com/doc/refman/" . substr($connection->server_info, 0, 3) . "/en/show-processlist.html#processlist_" . strtolower($key) . "' target='_blank' rel='noreferrer' class='help'>$key</a>"
                                : $key
                        );

diff --git a/plugins/master-slave.php b/plugins/master-slave.php
index d150ee292373256e67f041de572361e62b31a872..6de7c252bb60966179bb487efa3b453e1862945b 100644 (file)
--- a/plugins/master-slave.php
+++ b/plugins/master-slave.php
@@ -9,7 +9,7 @@
 class AdminerMasterSlave {
        private $masters = array();
        
-       /** 
+       /**
        * @param array ($slave => $master)
        */
        function AdminerMasterSlave($masters) {