'; var_dump($l); @@ -1012,7 +1012,7 @@ function PMA_SQP_analyze($arr) * * ['select_expr'] is filled with each expression, the key represents the * expression position in the list (0-based) (so we don't lose track of - * multiple occurences of the same column). + * multiple occurrences of the same column). * * ['table_ref'] is filled with each table ref, same thing for the key. * @@ -1061,7 +1061,7 @@ function PMA_SQP_analyze($arr) * query clauses * ------------- * - * The select is splitted in those clauses: + * The select is split in those clauses: * ['select_expr_clause'] * ['from_clause'] * ['group_by_clause'] @@ -2661,70 +2661,11 @@ function PMA_SQP_format( $before .= ' '; } - switch ($arr[$i]['data']) { - case 'CREATE': - case 'ALTER': - case 'DROP': - case 'RENAME'; - case 'TRUNCATE': - case 'ANALYZE': - case 'ANALYSE': - case 'OPTIMIZE': - if (!$in_priv_list) { - $space_punct_listsep = $html_line_break; - $space_alpha_reserved_word = ' '; - } - break; - case 'EVENT': - case 'TABLESPACE': - case 'TABLE': - case 'FUNCTION': - case 'INDEX': - case 'PROCEDURE': - case 'SERVER': - case 'TRIGGER': - case 'DATABASE': - case 'VIEW': - case 'GROUP': - break; - case 'SET': - if (!$in_priv_list) { - $space_punct_listsep = $html_line_break; - $space_alpha_reserved_word = ' '; - } - break; - case 'EXPLAIN': - case 'DESCRIBE': - case 'DELETE': - case 'SHOW': - case 'UPDATE': - if (!$in_priv_list) { - $space_punct_listsep = $html_line_break; - $space_alpha_reserved_word = ' '; - } - break; - case 'INSERT': - case 'REPLACE': - if (!$in_priv_list) { - $space_punct_listsep = $html_line_break; - $space_alpha_reserved_word = $html_line_break; - } - break; - case 'VALUES': - $space_punct_listsep = ' '; - $space_alpha_reserved_word = $html_line_break; - break; - case 'SELECT': - $space_punct_listsep = ' '; - $space_alpha_reserved_word = $html_line_break; - break; - case 'CALL': - case 'DO': - case 'HANDLER': - break; - default: - break; - } // end switch ($arr[$i]['data']) + list($space_punct_listsep, $space_alpha_reserved_word) + = PMA_SQP_format_getListsepAndReservedWord( + $arr[$i]['data'], $in_priv_list, $html_line_break, + $space_punct_listsep, $space_alpha_reserved_word + ); $after .= ' '; break; @@ -2807,6 +2748,91 @@ function PMA_SQP_format( return $str; } // end of the "PMA_SQP_format()" function +/** + * Define variables for PMA_SQP_format + * + * @param string $data Data to check + * @param boolean $in_priv_list In privilege list + * @param string $html_line_break HTML line break + * @param string $space_punct_listsep List separator + * @param string $space_alpha_reserved_word Space between reserved words + * + * @todo check definition of $space_punct_listsep and $space_alpha_reserved_word + * + * @return array Variables needed by PMA_SQP_format + */ +function PMA_SQP_format_getListsepAndReservedWord( + $data, $in_priv_list, $html_line_break, $space_punct_listsep, + $space_alpha_reserved_word +) +{ + switch ($data) { + case 'CREATE': + case 'ALTER': + case 'DROP': + case 'RENAME'; + case 'TRUNCATE': + case 'ANALYZE': + case 'ANALYSE': + case 'OPTIMIZE': + if (!$in_priv_list) { + $space_punct_listsep = $html_line_break; + $space_alpha_reserved_word = ' '; + } + break; + case 'EVENT': + case 'TABLESPACE': + case 'TABLE': + case 'FUNCTION': + case 'INDEX': + case 'PROCEDURE': + case 'SERVER': + case 'TRIGGER': + case 'DATABASE': + case 'VIEW': + case 'GROUP': + break; + case 'SET': + if (!$in_priv_list) { + $space_punct_listsep = $html_line_break; + $space_alpha_reserved_word = ' '; + } + break; + case 'EXPLAIN': + case 'DESCRIBE': + case 'DELETE': + case 'SHOW': + case 'UPDATE': + if (!$in_priv_list) { + $space_punct_listsep = $html_line_break; + $space_alpha_reserved_word = ' '; + } + break; + case 'INSERT': + case 'REPLACE': + if (!$in_priv_list) { + $space_punct_listsep = $html_line_break; + $space_alpha_reserved_word = $html_line_break; + } + break; + case 'VALUES': + $space_punct_listsep = ' '; + $space_alpha_reserved_word = $html_line_break; + break; + case 'SELECT': + $space_punct_listsep = ' '; + $space_alpha_reserved_word = $html_line_break; + break; + case 'CALL': + case 'DO': + case 'HANDLER': + break; + default: + break; + } + return array($space_punct_listsep, $space_alpha_reserved_word); +} + /** * Gets SQL queries with no format * diff --git a/sql.php b/sql.php index ac3d90e811..25141ef975 100644 --- a/sql.php +++ b/sql.php @@ -40,7 +40,7 @@ if (isset($ajax_reload) && $ajax_reload['reload'] === true) { /** * Defines the url to return to in case of error in a sql statement */ -// Security checkings +// Security checks if (! empty($goto)) { $is_gotofile = preg_replace('@^([^?]+).*$@s', '\\1', $goto); if (! @file_exists('' . $is_gotofile)) { diff --git a/test/classes/PMA_Error_test.php b/test/classes/PMA_Error_test.php index 8940ee973e..fcd7acfba3 100644 --- a/test/classes/PMA_Error_test.php +++ b/test/classes/PMA_Error_test.php @@ -162,7 +162,10 @@ class PMA_Error_Test extends PHPUnit_Framework_TestCase { $this->object->setBacktrace(array('bt1','bt2','bt3','bt4')); // case: full backtrace - $this->assertEquals(array('bt1','bt2','bt3','bt4'), $this->object->getBacktrace()); + $this->assertEquals( + array('bt1','bt2','bt3','bt4'), + $this->object->getBacktrace() + ); // case: first 2 frames $this->assertEquals(array('bt1','bt2'), $this->object->getBacktrace(2)); diff --git a/test/classes/gis/PMA_GIS_Geom_test.php b/test/classes/gis/PMA_GIS_Geom_test.php index d7b0fa3e2a..93cefaf878 100644 --- a/test/classes/gis/PMA_GIS_Geom_test.php +++ b/test/classes/gis/PMA_GIS_Geom_test.php @@ -61,7 +61,7 @@ abstract class PMA_GIS_GeomTest extends PHPUnit_Framework_TestCase /** * Tests whether content is a valid image. * - * @param object $image Image + * @param object $object Image * * @return void */ diff --git a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php index 4617798ea4..286e6a6642 100644 --- a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php +++ b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php @@ -137,7 +137,12 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase $mockHeader = $this->getMockBuilder('PMA_Header') ->disableOriginalConstructor() ->setMethods( - array('setBodyId', 'setTitle', 'disableMenuAndConsole', 'disableWarnings') + array( + 'setBodyId', + 'setTitle', + 'disableMenuAndConsole', + 'disableWarnings' + ) ) ->getMock(); diff --git a/test/libraries/PMA_PMD_common_test.php b/test/libraries/PMA_PMD_common_test.php index 2420a7ac81..b8c1b440be 100644 --- a/test/libraries/PMA_PMD_common_test.php +++ b/test/libraries/PMA_PMD_common_test.php @@ -57,7 +57,8 @@ class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase $dbi->expects($this->at(0)) ->method('fetchResult') - ->with(" + ->with( + " SELECT CONCAT_WS('.', `db_name`, `table_name`) AS `name`, `x` AS `X`, `y` AS `Y`, diff --git a/test/libraries/PMA_escapeJsString_test.php b/test/libraries/PMA_escapeJsString_test.php index 91cb02f2f3..96ad8e25ab 100644 --- a/test/libraries/PMA_escapeJsString_test.php +++ b/test/libraries/PMA_escapeJsString_test.php @@ -43,7 +43,10 @@ class PMA_EscapeJsString_Test extends PHPUnit_Framework_TestCase array('\\\';', '\';'), array('\r\n\\\'"), array('\\\';[XSS]', '\';[XSS]'), - array('[HTML]', '[HTML]'), + array( + '[HTML]', + '[HTML]' + ), array('\"\\\'\\\\\\\'\"', '"\'\\\'"'), array("\\\\\'\'\'\'\'\'\'\'\'\'\'\'\\\\", "\\''''''''''''\\") ); diff --git a/test/libraries/PMA_ip_allow_deny_test.php b/test/libraries/PMA_ip_allow_deny_test.php index 9d60cd4cb7..e204d6d8e4 100644 --- a/test/libraries/PMA_ip_allow_deny_test.php +++ b/test/libraries/PMA_ip_allow_deny_test.php @@ -32,13 +32,19 @@ class PMA_Ip_Allow_Deny_Test extends PHPUnit_Framework_TestCase public function setUp() { $GLOBALS['cfg']['Server']['user'] = "pma_username"; - $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = "allow % 255.255.255.0/4"; - $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = "allow % from 255.255.2.0/4"; - $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = "allow % from 2001:4998:c:a0d:0000:0000:4998:1020"; - $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = "allow % from 2001:4998:c:a0d:0000:0000:4998:[1001-2010]"; - $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = "allow % from 2001:4998:c:a0d:0000:0000:4998:3020/24"; + $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] + = "allow % 255.255.255.0/4"; + $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] + = "allow % from 255.255.2.0/4"; + $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] + = "allow % from 2001:4998:c:a0d:0000:0000:4998:1020"; + $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] + = "allow % from 2001:4998:c:a0d:0000:0000:4998:[1001-2010]"; + $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] + = "allow % from 2001:4998:c:a0d:0000:0000:4998:3020/24"; $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = "deny % 255.255.0.0/8"; - $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] = "deny % from 255.255.0.0/8"; + $GLOBALS['cfg']['Server']['AllowDeny']['rules'][] + = "deny % from 255.255.0.0/8"; include_once 'libraries/ip_allow_deny.lib.php'; } diff --git a/test/libraries/PMA_prettyPrint_test.php b/test/libraries/PMA_prettyPrint_test.php index 6c0ebc53d5..39168aa21e 100644 --- a/test/libraries/PMA_prettyPrint_test.php +++ b/test/libraries/PMA_prettyPrint_test.php @@ -40,7 +40,9 @@ class PMA_PrettyPrint_Test extends PHPUnit_Framework_TestCase { $this->assertEquals( "key[test0]: \"value0\"\nkey[test1]: \"value1\"\n", - PMA_prettyPrint(array('key' => array('test0' => 'value0', 'test1' => 'value1'))) + PMA_prettyPrint( + array('key' => array('test0' => 'value0', 'test1' => 'value1')) + ) ); } diff --git a/test/libraries/common/PMA_cache_test.php b/test/libraries/common/PMA_cache_test.php index ca7aa8f12c..6b0f808826 100644 --- a/test/libraries/common/PMA_cache_test.php +++ b/test/libraries/common/PMA_cache_test.php @@ -102,9 +102,15 @@ class PMA_Cache_Test extends PHPUnit_Framework_TestCase PMA_Util::cacheSet('test_data_2', 25); PMA_Util::cacheUnset('test_data'); - $this->assertArrayNotHasKey('test_data', $_SESSION['cache']['server_server']); + $this->assertArrayNotHasKey( + 'test_data', + $_SESSION['cache']['server_server'] + ); PMA_Util::cacheUnset('test_data_2'); - $this->assertArrayNotHasKey('test_data_2', $_SESSION['cache']['server_server']); + $this->assertArrayNotHasKey( + 'test_data_2', + $_SESSION['cache']['server_server'] + ); } /** @@ -116,10 +122,16 @@ class PMA_Cache_Test extends PHPUnit_Framework_TestCase { $GLOBALS['server'] = 'server'; PMA_Util::cacheSet('is_superuser', 'yes'); - $this->assertEquals('yes', $_SESSION['cache']['server_server']['is_superuser']); + $this->assertEquals( + 'yes', + $_SESSION['cache']['server_server']['is_superuser'] + ); PMA_Util::clearUserCache(); - $this->assertArrayNotHasKey('is_superuser', $_SESSION['cache']['server_server']); + $this->assertArrayNotHasKey( + 'is_superuser', + $_SESSION['cache']['server_server'] + ); } } ?> diff --git a/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/test/libraries/rte/PMA_RTN_getEditorForm_test.php index 4fd9cdd615..8053596cac 100644 --- a/test/libraries/rte/PMA_RTN_getEditorForm_test.php +++ b/test/libraries/rte/PMA_RTN_getEditorForm_test.php @@ -500,7 +500,9 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase { $GLOBALS['is_ajax_request'] = false; PMA_RTN_setGlobals(); - $this->assertTag($matcher, PMA_RTN_getEditorForm('edit', 'change', $data), false); + $this->assertTag( + $matcher, PMA_RTN_getEditorForm('edit', 'change', $data), false + ); } /** diff --git a/test/libraries/select_lang/PMA_langDetails_test.php b/test/libraries/select_lang/PMA_langDetails_test.php index 9cf1ab64dc..c6bb5c23ab 100644 --- a/test/libraries/select_lang/PMA_langDetails_test.php +++ b/test/libraries/select_lang/PMA_langDetails_test.php @@ -29,12 +29,32 @@ class PMA_LangDetails_Test extends PHPUnit_Framework_TestCase { return array( array('af|afrikaans', 'af', '', 'af'), - array('ar|arabic', 'ar', 'العربية', 'ar'), + array( + 'ar|arabic', + 'ar', + 'العربية', + 'ar' + ), array('az|azerbaijani', 'az', 'Azərbaycanca', 'az'), array('bn|bangla', 'bn', 'বাংলা', 'bn'), - array('be|belarusian', 'be', 'Беларуская', 'be'), - array('be[-_]lat|belarusian latin', 'be-lat', 'Biełaruskaja', 'be@latin'), - array('bg|bulgarian', 'bg', 'Български', 'bg'), + array( + 'be|belarusian', + 'be', + 'Беларуская', + 'be' + ), + array( + 'be[-_]lat|belarusian latin', + 'be-lat', + 'Biełaruskaja', + 'be@latin' + ), + array( + 'bg|bulgarian', + 'bg', + 'Български', + 'bg' + ), array('bs|bosnian', 'bs', 'Bosanski', 'bs'), array('br|breton', 'br', 'Brezhoneg', 'br'), array('ca|catalan', 'ca', 'Català', 'ca'), @@ -42,7 +62,12 @@ class PMA_LangDetails_Test extends PHPUnit_Framework_TestCase array('cy|welsh', 'cy', 'Cymraeg', 'cy'), array('da|danish', 'da', 'Dansk', 'da'), array('de|german', 'de', 'Deutsch', 'de'), - array('el|greek', 'el', 'Ελληνικά', 'el'), + array( + 'el|greek', + 'el', + 'Ελληνικά', + 'el' + ), array('en|english', 'en', '', 'en'), array('en[_-]gb|english (United Kingdom)', 'en-gb', '', 'en_GB'), array('es|spanish', 'es', 'Español', 'es'), @@ -53,44 +78,94 @@ class PMA_LangDetails_Test extends PHPUnit_Framework_TestCase array('fr|french', 'fr', 'Français', 'fr'), array('gl|galician', 'gl', 'Galego', 'gl'), array('he|hebrew', 'he', 'עברית', 'he'), - array('hi|hindi', 'hi', 'हिन्दी', 'hi'), + array( + 'hi|hindi', + 'hi', + 'हिन्दी', + 'hi' + ), array('hr|croatian', 'hr', 'Hrvatski', 'hr'), array('hu|hungarian', 'hu', 'Magyar', 'hu'), array('id|indonesian', 'id', 'Bahasa Indonesia', 'id'), array('it|italian', 'it', 'Italiano', 'it'), array('ja|japanese', 'ja', '日本語', 'ja'), array('ko|korean', 'ko', '한국어', 'ko'), - array('ka|georgian', 'ka', 'ქართული', 'ka'), + array( + 'ka|georgian', + 'ka', + 'ქართული', + 'ka' + ), array('lt|lithuanian', 'lt', 'Lietuvių', 'lt'), array('lv|latvian', 'lv', 'Latviešu', 'lv'), array('mk|macedonian', 'mk', 'Macedonian', 'mk'), - array('mn|mongolian', 'mn', 'Монгол', 'mn'), + array( + 'mn|mongolian', + 'mn', + 'Монгол', + 'mn' + ), array('ms|malay', 'ms', 'Bahasa Melayu', 'ms'), array('nl|dutch', 'nl', 'Nederlands', 'nl'), array('nb|norwegian', 'nb', 'Norsk', 'nb'), array('pl|polish', 'pl', 'Polski', 'pl'), - array('pt[-_]br|brazilian portuguese', 'pt-BR', 'Português', 'pt_BR'), + array( + 'pt[-_]br|brazilian portuguese', + 'pt-BR', + 'Português', + 'pt_BR' + ), array('pt|portuguese', 'pt', 'Português', 'pt'), array('ro|romanian', 'ro', 'Română', 'ro'), - array('ru|russian', 'ru', 'Русский', 'ru'), + array( + 'ru|russian', + 'ru', + 'Русский', + 'ru' + ), array('si|sinhala', 'si', 'සිංහල', 'si'), array('sk|slovak', 'sk', 'Slovenčina', 'sk'), array('sl|slovenian', 'sl', 'Slovenščina', 'sl'), array('sq|albanian', 'sq', 'Shqip', 'sq'), array('sr[-_]lat|serbian latin', 'sr-lat', 'Srpski', 'sr@latin'), - array('sr|serbian', 'sr', 'Српски', 'sr'), + array( + 'sr|serbian', + 'sr', + 'Српски', + 'sr' + ), array('sv|swedish', 'sv', 'Svenska', 'sv'), array('ta|tamil', 'ta', 'தமிழ்', 'ta'), array('te|telugu', 'te', 'తెలుగు', 'te'), - array('th|thai', 'th', 'ภาษาไทย', 'th'), + array( + 'th|thai', + 'th', + 'ภาษาไทย', + 'th' + ), array('tr|turkish', 'tr', 'Türkçe', 'tr'), array('tt|tatarish', 'tt', 'Tatarça', 'tt'), array('ug|uyghur', 'ug', 'ئۇيغۇرچە', 'ug'), - array('uk|ukrainian', 'uk', 'Українська', 'uk'), + array( + 'uk|ukrainian', + 'uk', + 'Українська', + 'uk' + ), array('ur|urdu', 'ur', 'اُردوُ', 'ur'), array('uz[-_]lat|uzbek-latin', 'uz-lat', 'O‘zbekcha', 'uz@latin'), - array('uz[-_]cyr|uzbek-cyrillic', 'uz-cyr', 'Ўзбекча', 'uz'), - array('zh[-_](tw|hk)|chinese traditional', 'zh-TW', '中文', 'zh_TW'), + array( + 'uz[-_]cyr|uzbek-cyrillic', + 'uz-cyr', + 'Ўзбекча', + 'uz' + ), + array( + 'zh[-_](tw|hk)|chinese traditional', + 'zh-TW', + '中文', + 'zh_TW' + ), array( 'zh(?)([-_][[:alpha:]]{2,3})?|chinese simplified', 'zh', diff --git a/user_password.php b/user_password.php index cabad4bb67..7a2dd739e2 100644 --- a/user_password.php +++ b/user_password.php @@ -181,8 +181,8 @@ function PMA_changePassUrlParamsAndSubmitQuery( /** * Display the page * - * @param string $message Message - * @param string $sql_query SQL query + * @param string $message Message + * @param string $sql_query SQL query * * @return void */