Permalink
Browse files

Strip trailing spaces

  • Loading branch information...
1 parent 22f0a5d commit 046da00eb609325ccaee82d37793872c42117deb @vrana committed May 8, 2013
Showing with 18 additions and 16 deletions.
  1. +1 −1 adminer/include/bootstrap.inc.php
  2. +15 −13 adminer/include/editing.inc.php
  3. +1 −1 adminer/processlist.inc.php
  4. +1 −1 plugins/master-slave.php
@@ -28,7 +28,7 @@
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]";
@@ -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
@@ -22,7 +22,7 @@
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
);
@@ -9,7 +9,7 @@
class AdminerMasterSlave {
private $masters = array();
- /**
+ /**
* @param array ($slave => $master)
*/
function AdminerMasterSlave($masters) {

0 comments on commit 046da00

Please sign in to comment.