From 8e2f307279bc2c415181b0fd2ac52ce497c036a0 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 30 Jun 2014 11:10:00 -0400 Subject: [PATCH] Fix coding style Signed-off-by: Marc Delisle --- libraries/bookmark.lib.php | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php index fba3a798d0..64d044c6c4 100644 --- a/libraries/bookmark.lib.php +++ b/libraries/bookmark.lib.php @@ -65,7 +65,7 @@ function PMA_Bookmark_getList($db = false) } $ret = Array(); - if($db !== false) { + if ($db !== false) { $query = 'SELECT label, id FROM ' . PMA_Util::backquote($cfgBookmark['db']) . '.' . PMA_Util::backquote($cfgBookmark['table']) . ' WHERE dbase = \'' . PMA_Util::sqlAddSlashes($db) . '\'' @@ -92,20 +92,31 @@ function PMA_Bookmark_getList($db = false) asort($ret); } else { - $query = 'SELECT label, id, query, dbase FROM ' . PMA_Util::backquote($cfgBookmark['db']) + $query = 'SELECT label, id, query, dbase FROM ' + . PMA_Util::backquote($cfgBookmark['db']) . '.' . PMA_Util::backquote($cfgBookmark['table']) - . ' WHERE user = \'' . PMA_Util::sqlAddSlashes($cfgBookmark['user']) . '\'' + . ' WHERE user = \'' + . PMA_Util::sqlAddSlashes($cfgBookmark['user']) . '\'' . ' ORDER BY label'; $per_user = $GLOBALS['dbi']->fetchResult( - $query, Array('id', 'label', 'dbase'), 'query', $controllink, PMA_DatabaseInterface::QUERY_STORE + $query, + Array('id', 'label', 'dbase'), + 'query', + $controllink, + PMA_DatabaseInterface::QUERY_STORE ); - $query = 'SELECT label, id, query, dbase FROM ' . PMA_Util::backquote($cfgBookmark['db']) + $query = 'SELECT label, id, query, dbase FROM ' + . PMA_Util::backquote($cfgBookmark['db']) . '.' . PMA_Util::backquote($cfgBookmark['table']) . ' WHERE user = \'\'' . ' ORDER BY label'; $global = $GLOBALS['dbi']->fetchResult( - $query, Array('id', 'label', 'dbase'), 'query', $controllink, PMA_DatabaseInterface::QUERY_STORE + $query, + Array('id', 'label', 'dbase'), + 'query', + $controllink, + PMA_DatabaseInterface::QUERY_STORE ); $ret = Array();