Skip to content

Commit

Permalink
Whitespace
Browse files Browse the repository at this point in the history
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1260 7c3ca157-0c34-0410-bff1-cbf682f78f5c
  • Loading branch information
jakubvrana committed Dec 3, 2009
1 parent eb5e03b commit fc3b652
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions adminer/user.inc.php
Expand Up @@ -72,8 +72,8 @@
unset($grants[$object]); unset($grants[$object]);
} }
if (preg_match('~^(.+)\\s*(\\(.*\\))?$~U', $object, $match) && ( if (preg_match('~^(.+)\\s*(\\(.*\\))?$~U', $object, $match) && (
!grant("REVOKE", $revoke, $match[2], " ON $match[1] FROM $new_user") //! SQL injection !grant("REVOKE", $revoke, $match[2], " ON $match[1] FROM $new_user") //! SQL injection
|| !grant("GRANT", $grant, $match[2], " ON $match[1] TO $new_user") || !grant("GRANT", $grant, $match[2], " ON $match[1] TO $new_user")
)) { )) {
$error = true; $error = true;
break; break;
Expand Down
2 changes: 1 addition & 1 deletion compile.php
Expand Up @@ -103,7 +103,7 @@ function php_shrink($input) {
$token = array(0, $token); $token = array(0, $token);
} }
if ($tokens[$i+2][0] === T_CLOSE_TAG && $tokens[$i+3][0] === T_INLINE_HTML && $tokens[$i+4][0] === T_OPEN_TAG if ($tokens[$i+2][0] === T_CLOSE_TAG && $tokens[$i+3][0] === T_INLINE_HTML && $tokens[$i+4][0] === T_OPEN_TAG
&& strlen(addcslashes($tokens[$i+3][1], "'\\")) < strlen($tokens[$i+3][1]) + 3 && strlen(addcslashes($tokens[$i+3][1], "'\\")) < strlen($tokens[$i+3][1]) + 3
) { ) {
$tokens[$i+2] = array(T_ECHO, 'echo'); $tokens[$i+2] = array(T_ECHO, 'echo');
$tokens[$i+3] = array(T_CONSTANT_ENCAPSED_STRING, "'" . addcslashes($tokens[$i+3][1], "'\\") . "'"); $tokens[$i+3] = array(T_CONSTANT_ENCAPSED_STRING, "'" . addcslashes($tokens[$i+3][1], "'\\") . "'");
Expand Down

0 comments on commit fc3b652

Please sign in to comment.