July 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11140-g0a78229
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 0a782293e698b2fb31043b90b76bc4714598ffb6 (commit) from 7a3c021e854fe81494a08a9b449d8dd8db9bb919 (commit) - Log ----------------------------------------------------------------- commit 0a782293e698b2fb31043b90b76bc4714598ffb6 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 11:59:47 2011 +0200 Proper internationalised messages ----------------------------------------------------------------------- Summary of changes: libraries/File.class.php | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/File.class.php b/libraries/File.class.php index 553cc2d..8ae0262 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -8,7 +8,6 @@ /** * - * @todo replace error messages with localized string * @todo when uploading a file into a blob field, should we also consider using * chunks like in import? UPDATE `table` SET `field` = `field` + [chunk] * @package phpMyAdmin @@ -258,7 +257,7 @@ class PMA_File } if (! $bs_db || ! $bs_table) { - $this->_error_message = $GLOBALS['strUploadErrorUnknown']; + $this->_error_message = __('Unknown error while uploading.'); return false; } $blob_url = PMA_BS_UpLoadFile($bs_db, $bs_table, $tmp_file_type, $tmp_filename); @@ -388,7 +387,7 @@ class PMA_File } if (! $bs_db || !$bs_table) { - $this->_error_message = $GLOBALS['strUploadErrorUnknown']; + $this->_error_message = __('Unknown error while uploading.'); return false; } $blob_url = PMA_BS_UpLoadFile($bs_db, $bs_table, $tmp_file_type, $tmp_filename); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11139-g7a3c021
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 7a3c021e854fe81494a08a9b449d8dd8db9bb919 (commit) via 38e5f642e4a8d7eda4620c95cd0586022822709e (commit) from 62c2c74583cb64239f13d9ae9f93a903da1648a3 (commit) - Log ----------------------------------------------------------------- commit 7a3c021e854fe81494a08a9b449d8dd8db9bb919 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 11:58:13 2011 +0200 Add param types commit 38e5f642e4a8d7eda4620c95cd0586022822709e Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 11:58:07 2011 +0200 Lowercase to not trigger todo item in jenkins ----------------------------------------------------------------------- Summary of changes: changelog.php | 2 +- libraries/server_synchronize.lib.php | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/changelog.php b/changelog.php index 5c42e67..9892638 100644 --- a/changelog.php +++ b/changelog.php @@ -75,7 +75,7 @@ $replaces = array( => '<a href="https://sourceforge.net/support/tracker.php?aid=\\1">bug #\\1</a>', // all other 6+ digit numbers are treated as bugs - '/(?<!BUG|RFE|patch) #?([0-9]{6,})/i' + '/(?<!bug|RFE|patch) #?([0-9]{6,})/i' => ' <a href="https://sourceforge.net/support/tracker.php?aid=\\1">bug #\\1</a>', // CVE/CAN entries diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 3521d14..ffbbea7 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -67,21 +67,21 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo * Otherwise that entry is placed in the $insert_array. * * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $matching_table array containing matching table names - * @param &$matching_tables_fields A two dimensional array passed by reference to contain names of fields for each matching table - * @param $update_array A three dimensional array passed by reference to - * contain updates required for each matching table - * @param $insert_array A three dimensional array passed by reference to - * contain inserts required for each matching table - * @param $delete_array Unused - * @param $fields_num A two dimensional array passed by reference to - * contain number of fields for each matching table - * @param $matching_table_index Index of a table from $matching_table array - * @param &$matching_tables_keys A two dimensional array passed by reference to contain names of keys for each matching table + * @param string $src_db name of source database + * @param string $trg_db name of target database + * @param db_link $src_link connection established with source server + * @param db_link $trg_link connection established with target server + * @param array $matching_table array containing matching table names + * @param array &$matching_tables_fields A two dimensional array passed by reference to contain names of fields for each matching table + * @param array $update_array A three dimensional array passed by reference to + * contain updates required for each matching table + * @param array $insert_array A three dimensional array passed by reference to + * contain inserts required for each matching table + * @param array $delete_array Unused + * @param array $fields_num A two dimensional array passed by reference to + * contain number of fields for each matching table + * @param array $matching_table_index Index of a table from $matching_table array + * @param array &$matching_tables_keys A two dimensional array passed by reference to contain names of keys for each matching table */ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching_table, &$matching_tables_fields, &$update_array, &$insert_array, &$delete_array, &$fields_num, $matching_table_index, &$matching_tables_keys) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11137-g62c2c74
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 62c2c74583cb64239f13d9ae9f93a903da1648a3 (commit) via 719861c8a8ab7951ac3aa62c673e135d336583a1 (commit) via 037224c85e38c9536ee72126c3c5095cad1ada2f (commit) via e936ce72c568aa6acce6b26f6d8bf5a178d304bd (commit) from 8e511c16ff125c36dd27ceab0e1f93013bd81d75 (commit) - Log ----------------------------------------------------------------- commit 62c2c74583cb64239f13d9ae9f93a903da1648a3 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 11:54:30 2011 +0200 Allign comments commit 719861c8a8ab7951ac3aa62c673e135d336583a1 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 11:53:26 2011 +0200 Fix variable names commit 037224c85e38c9536ee72126c3c5095cad1ada2f Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 11:52:12 2011 +0200 if and elseif coding style commit e936ce72c568aa6acce6b26f6d8bf5a178d304bd Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 11:51:42 2011 +0200 Whitespace fixup ----------------------------------------------------------------------- Summary of changes: libraries/server_synchronize.lib.php | 52 +++++++++++++++++----------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index a2381b7..3521d14 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -17,9 +17,9 @@ */ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$uncommon_source_tables) { - for($k=0; $k< sizeof($src_tables); $k++) { + for ($k=0; $k< sizeof($src_tables); $k++) { $present_in_target = false; - for($l=0; $l < sizeof($trg_tables); $l++) { + for ($l=0; $l < sizeof($trg_tables); $l++) { if ($src_tables[$k] === $trg_tables[$l]) { $present_in_target = true; $matching_tables[] = $src_tables[$k]; @@ -43,9 +43,9 @@ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$un */ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommon_target_tables) { - for($c=0; $c<sizeof($trg_tables) ;$c++) { + for ($c=0; $c<sizeof($trg_tables) ;$c++) { $match = false; - for($d=0; $d < sizeof($matching_tables); $d++) + for ($d=0; $d < sizeof($matching_tables); $d++) { if ($trg_tables[$c] === $matching_tables[$d]) { $match=true; @@ -67,21 +67,21 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo * Otherwise that entry is placed in the $insert_array. * * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $matching_table array containing matching table names - * @param $matching_tables_fields A two dimensional array passed by reference to contain names of fields for each matching table - * @param $update_array A three dimensional array passed by reference to - * contain updates required for each matching table - * @param $insert_array A three dimensional array passed by reference to - * contain inserts required for each matching table - * @param $delete_array Unused - * @param $fields_num A two dimensional array passed by reference to - * contain number of fields for each matching table + * @param $src_db name of source database + * @param $trg_db name of target database + * @param $src_link connection established with source server + * @param $trg_link connection established with target server + * @param $matching_table array containing matching table names + * @param &$matching_tables_fields A two dimensional array passed by reference to contain names of fields for each matching table + * @param $update_array A three dimensional array passed by reference to + * contain updates required for each matching table + * @param $insert_array A three dimensional array passed by reference to + * contain inserts required for each matching table + * @param $delete_array Unused + * @param $fields_num A two dimensional array passed by reference to + * contain number of fields for each matching table * @param $matching_table_index Index of a table from $matching_table array - * @param $matching_tables_keys A two dimensional array passed by reference to contain names of keys for each matching table + * @param &$matching_tables_keys A two dimensional array passed by reference to contain names of keys for each matching table */ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching_table, &$matching_tables_fields, &$update_array, &$insert_array, &$delete_array, &$fields_num, $matching_table_index, &$matching_tables_keys) @@ -141,7 +141,7 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching } elseif (sizeof($is_key) > 1){ for ($k=0; $k < sizeof($is_key); $k++) { $trg_select_query .= $is_key[$k] . "='" . $source_result_set[$j][$is_key[$k]] . "'"; - if ($k < (sizeof($is_key)-1)){ + if ($k < (sizeof($is_key)-1)) { $trg_select_query .= " AND "; } } @@ -156,10 +156,10 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching if (sizeof($is_key) == 1) { $src_select_query .= $is_key[0] . "='" . $source_result_set[$j] . "'"; - } else if(sizeof($is_key) > 1){ + } elseif (sizeof($is_key) > 1) { for ($k=0; $k< sizeof($is_key); $k++) { $src_select_query .= $is_key[$k] . "='" . $source_result_set[$j][$is_key[$k]] . "'"; - if ($k < (sizeof($is_key) - 1)){ + if ($k < (sizeof($is_key) - 1)) { $src_select_query .= " AND "; } } @@ -259,7 +259,7 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching $insert_array[$matching_table_index][$insert_row][$is_key[0]] = $source_result_set[$j]; } } elseif (sizeof($is_key) > 1) { - for($l = 0; $l < sizeof($is_key); $l++) { + for ($l = 0; $l < sizeof($is_key); $l++) { if (isset($source_result_set[$j][$matching_tables_fields[$matching_table_index][$l]])) { $insert_array[$matching_table_index][$insert_row][$is_key[$l]] = $source_result_set[$j][$matching_tables_fields[$matching_table_index][$l]]; } @@ -681,10 +681,10 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom */ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_index, $target_tables_keys, $delete_array, $display) { - for($i = 0; $i < sizeof($delete_array[$table_index]); $i++) { + for ($i = 0; $i < sizeof($delete_array[$table_index]); $i++) { if (isset($target_tables_keys[$table_index])) { $delete_query = 'DELETE FROM ' . PMA_backquote($trg_db) . '.' .PMA_backquote($matching_tables[$table_index]) . ' WHERE '; - for($y = 0; $y < sizeof($target_tables_keys[$table_index]); $y++) { + for ($y = 0; $y < sizeof($target_tables_keys[$table_index]); $y++) { $delete_query .= $target_tables_keys[$table_index][$y] . " = '"; if (sizeof($target_tables_keys[$table_index]) == 1) { @@ -1030,7 +1030,7 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s } $check = false; $query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$matching_table_index]); - for($p = 0; $p < sizeof($matching_tables_keys[$matching_table_index]); $p++) { + for ($p = 0; $p < sizeof($matching_tables_keys[$matching_table_index]); $p++) { if ((isset($alter_str_array[$matching_table_index][$matching_tables_keys[$matching_table_index][$p]]['Key']))) { $check = true; $query .= ' MODIFY ' . $matching_tables_keys[$matching_table_index][$p] . ' ' @@ -1340,7 +1340,7 @@ function PMA_syncDisplayBeginTableRow($odd_row) { function PMA_get_column_values($database, $table, $column, $link = null) { $query = 'SELECT '; - for($i=0; $i< sizeof($column); $i++) + for ($i=0; $i< sizeof($column); $i++) { $query.= PMA_backquote($column[$i]); if($i < (sizeof($column)-1)) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11133-g8e511c1
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 8e511c16ff125c36dd27ceab0e1f93013bd81d75 (commit) from 578bb63d76378363bc7f10443dc6cde80d24171f (commit) - Log ----------------------------------------------------------------- commit 8e511c16ff125c36dd27ceab0e1f93013bd81d75 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 11:47:00 2011 +0200 I've simplified this too much Each test needs different params. ----------------------------------------------------------------------- Summary of changes: test/libraries/common/PMA_showDocu_test.php | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/test/libraries/common/PMA_showDocu_test.php b/test/libraries/common/PMA_showDocu_test.php index a0c12c4..b11f12d 100644 --- a/test/libraries/common/PMA_showDocu_test.php +++ b/test/libraries/common/PMA_showDocu_test.php @@ -17,12 +17,13 @@ class PMA_showDocu_test extends PHPUnit_Framework_TestCase { function setup() { - $GLOBALS['cfg']['ReplaceHelpImg'] = true; $GLOBALS['pmaThemeImage'] = 'theme/'; } function testShowDocuReplaceHelpImg() { + $GLOBALS['cfg']['ReplaceHelpImg'] = true; + $anchor = "relation"; $expected = '<a href="Documentation.html#' . $anchor . '" target="documentation"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>'; @@ -32,6 +33,8 @@ class PMA_showDocu_test extends PHPUnit_Framework_TestCase function testShowDocuNotReplaceHelpImg() { + $GLOBALS['cfg']['ReplaceHelpImg'] = false; + $anchor = "relation"; $expected = '[<a href="Documentation.html#' . $anchor . '" target="documentation">' . __('Documentation') . '</a>]'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11132-g578bb63
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 578bb63d76378363bc7f10443dc6cde80d24171f (commit) from b13d2a33edb4cdb95c3a43fbe5dc0f2569e36cd7 (commit) - Log ----------------------------------------------------------------- commit 578bb63d76378363bc7f10443dc6cde80d24171f Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 11:46:14 2011 +0200 Another variable needed for test ----------------------------------------------------------------------- Summary of changes: test/libraries/common/PMA_checkParameters_test.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/libraries/common/PMA_checkParameters_test.php b/test/libraries/common/PMA_checkParameters_test.php index 4bfcac9..5337650 100644 --- a/test/libraries/common/PMA_checkParameters_test.php +++ b/test/libraries/common/PMA_checkParameters_test.php @@ -20,7 +20,7 @@ class PMA_checkParameters_test extends PHPUnit_Extensions_OutputTestCase { $GLOBALS['PMA_Config'] = new PMA_Config(); $_SESSION['PMA_Theme'] = new PMA_Theme(); - $GLOBALS['cfg'] = array('ReplaceHelpImg' => true); + $GLOBALS['cfg'] = array('ReplaceHelpImg' => true, 'ServerDefault' => 1); $GLOBALS['pmaThemeImage'] = 'theme/'; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11131-gb13d2a3
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via b13d2a33edb4cdb95c3a43fbe5dc0f2569e36cd7 (commit) from aa270ae62b971e5ba0fb47f28d63ed051c5290a2 (commit) - Log ----------------------------------------------------------------- commit b13d2a33edb4cdb95c3a43fbe5dc0f2569e36cd7 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 11:41:31 2011 +0200 Fix indentation ----------------------------------------------------------------------- Summary of changes: scripts/decode_bug.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/decode_bug.php b/scripts/decode_bug.php index 5e29749..e5a645b 100644 --- a/scripts/decode_bug.php +++ b/scripts/decode_bug.php @@ -87,9 +87,9 @@ if (!empty($bug_encoded)) { $bug_decoded = base64_decode($bug_encoded); if (substr($bug_encoded, 0, 2) == 'eN') { if (function_exists('gzuncompress')) { - $result = PMA_printDecodedBug(gzuncompress($bug_decoded)); + $result = PMA_printDecodedBug(gzuncompress($bug_decoded)); } else { - $result = 'Error: "gzuncompress()" is unavailable!' . "\n"; + $result = 'Error: "gzuncompress()" is unavailable!' . "\n"; } } else { $result = PMA_printDecodedBug($bug_decoded); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11130-gaa270ae
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via aa270ae62b971e5ba0fb47f28d63ed051c5290a2 (commit) from f080342e7a46bfdcac1a5fca39772680ad51e19e (commit) - Log ----------------------------------------------------------------- commit aa270ae62b971e5ba0fb47f28d63ed051c5290a2 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 11:40:35 2011 +0200 Better title ----------------------------------------------------------------------- Summary of changes: scripts/decode_bug.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/decode_bug.php b/scripts/decode_bug.php index 2f55dcf..5e29749 100644 --- a/scripts/decode_bug.php +++ b/scripts/decode_bug.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Parser BUG decoder + * Parser bug report decoder * * This is the parser bug decoder system * Throw the bug data in teh query box, and hit submit for output. @@ -23,7 +23,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <title>phpMyAdmin - Parser BUG decoder</title> + <title>phpMyAdmin - Parser bug report decoder</title> <style type="text/css"> <!-- body, p { @@ -42,7 +42,7 @@ <body bgcolor="#FFFFFF"> -<h1>Parser BUG decoder</h1> +<h1>Parser bug report decoder</h1> <br /> <form method="post" action="./decode_bug.php"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11129-gf080342
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via f080342e7a46bfdcac1a5fca39772680ad51e19e (commit) from aaa8b69055e036c4dbf254be1214eda9f9b1bbb0 (commit) - Log ----------------------------------------------------------------- commit f080342e7a46bfdcac1a5fca39772680ad51e19e Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 11:39:15 2011 +0200 Add missing bits to test cases setup ----------------------------------------------------------------------- Summary of changes: .../common/PMA_buildActionTitles_test.php | 1 + test/libraries/common/PMA_checkParameters_test.php | 1 + test/libraries/common/PMA_showDocu_test.php | 10 ++++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/test/libraries/common/PMA_buildActionTitles_test.php b/test/libraries/common/PMA_buildActionTitles_test.php index 310bf8f..6f23544 100644 --- a/test/libraries/common/PMA_buildActionTitles_test.php +++ b/test/libraries/common/PMA_buildActionTitles_test.php @@ -18,6 +18,7 @@ class PMA_buildActionTitles_test extends PHPUnit_Framework_TestCase{ function setup() { $GLOBALS['cfg'] = array('PropertiesIconic' => 'both'); + $GLOBALS['pmaThemeImage'] = 'theme/'; } function testBuildActionTitles(){ diff --git a/test/libraries/common/PMA_checkParameters_test.php b/test/libraries/common/PMA_checkParameters_test.php index b18f498..4bfcac9 100644 --- a/test/libraries/common/PMA_checkParameters_test.php +++ b/test/libraries/common/PMA_checkParameters_test.php @@ -21,6 +21,7 @@ class PMA_checkParameters_test extends PHPUnit_Extensions_OutputTestCase $GLOBALS['PMA_Config'] = new PMA_Config(); $_SESSION['PMA_Theme'] = new PMA_Theme(); $GLOBALS['cfg'] = array('ReplaceHelpImg' => true); + $GLOBALS['pmaThemeImage'] = 'theme/'; } function testCheckParameterMissing() diff --git a/test/libraries/common/PMA_showDocu_test.php b/test/libraries/common/PMA_showDocu_test.php index b287ea1..a0c12c4 100644 --- a/test/libraries/common/PMA_showDocu_test.php +++ b/test/libraries/common/PMA_showDocu_test.php @@ -15,10 +15,14 @@ require_once 'libraries/common.lib.php'; class PMA_showDocu_test extends PHPUnit_Framework_TestCase { - function testShowDocuReplaceHelpImg() + function setup() { $GLOBALS['cfg']['ReplaceHelpImg'] = true; + $GLOBALS['pmaThemeImage'] = 'theme/'; + } + function testShowDocuReplaceHelpImg() + { $anchor = "relation"; $expected = '<a href="Documentation.html#' . $anchor . '" target="documentation"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>'; @@ -28,12 +32,10 @@ class PMA_showDocu_test extends PHPUnit_Framework_TestCase function testShowDocuNotReplaceHelpImg() { - $GLOBALS['cfg']['ReplaceHelpImg'] = false; - $anchor = "relation"; $expected = '[<a href="Documentation.html#' . $anchor . '" target="documentation">' . __('Documentation') . '</a>]'; $this->assertEquals($expected, PMA_showDocu($anchor)); } -} \ No newline at end of file +} hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11128-gaaa8b69
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via aaa8b69055e036c4dbf254be1214eda9f9b1bbb0 (commit) via ecfde7d878203975b5fb45f2b6f02aaa80ca36b0 (commit) from 8b9b538a6bb0ffa0f64e32824c6a3156799aa076 (commit) - Log ----------------------------------------------------------------- commit aaa8b69055e036c4dbf254be1214eda9f9b1bbb0 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 11:35:34 2011 +0200 Whitespace fixup commit ecfde7d878203975b5fb45f2b6f02aaa80ca36b0 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 11:34:45 2011 +0200 Function name to match coding standards ----------------------------------------------------------------------- Summary of changes: server_privileges.php | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index 5c74025..7433c46 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -161,7 +161,7 @@ function PMA_wildcardEscapeForGrant($db_and_table, $dbname, $tablename) { * @param string the user's initial * @return string the generated condition */ -function PMA_RangeOfUsers($initial = '') +function PMA_rangeOfUsers($initial = '') { // strtolower() is used because the User field // might be BINARY, so LIKE would be case sensitive @@ -1358,7 +1358,7 @@ $link_export = '<a class="export_user_anchor ' . $conditional_class . '" href="s * If we are in an Ajax request for Create User/Edit User/Revoke User/Flush Privileges, * show $message and exit. */ -if( $GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_REQUEST['adduser']) || $_add_user_error) && ! isset($_REQUEST['initial']) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog']) && ! isset($_REQUEST['db_specific'])) { +if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_REQUEST['adduser']) || $_add_user_error) && ! isset($_REQUEST['initial']) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog']) && ! isset($_REQUEST['db_specific'])) { if(isset($sql_query)) { $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); @@ -1457,7 +1457,7 @@ if (isset($_REQUEST['export'])) { } echo '</textarea>'; unset($username, $hostname, $grants, $one_grant); - if( $GLOBALS['is_ajax_request']) { + if ($GLOBALS['is_ajax_request']) { exit; } } @@ -1475,7 +1475,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs " IF(`Password` = _latin1 '', 'N', 'Y') AS 'Password'" . ' FROM `mysql`.`user`'; - $sql_query .= (isset($initial) ? PMA_RangeOfUsers($initial) : ''); + $sql_query .= (isset($initial) ? PMA_rangeOfUsers($initial) : ''); $sql_query .= ' ORDER BY `User` ASC, `Host` ASC;'; $res = PMA_DBI_try_query($sql_query, null, PMA_DBI_QUERY_STORE); @@ -1516,7 +1516,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $db_rights_sqls = array(); foreach ($tables_to_search_for_users as $table_search_in) { if (in_array($table_search_in, $tables)) { - $db_rights_sqls[] = 'SELECT DISTINCT `User`, `Host` FROM `mysql`.`' . $table_search_in . '` ' . (isset($initial) ? PMA_RangeOfUsers($initial) : ''); + $db_rights_sqls[] = 'SELECT DISTINCT `User`, `Host` FROM `mysql`.`' . $table_search_in . '` ' . (isset($initial) ? PMA_rangeOfUsers($initial) : ''); } } @@ -1552,7 +1552,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs * In an Ajax request, we don't need to show this. Also not necassary if there is less than 20 privileges */ - if( $GLOBALS['is_ajax_request'] != true && PMA_DBI_num_rows($res) > 20 ) { + if ($GLOBALS['is_ajax_request'] != true && PMA_DBI_num_rows($res) > 20 ) { // initialize to false the letters A-Z for ($letter_counter = 1; $letter_counter < 27; $letter_counter++) { @@ -1704,7 +1704,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . ' </fieldset>' . "\n"; } // end if (display overview) - if( $GLOBALS['is_ajax_request'] ) { + if ($GLOBALS['is_ajax_request']) { exit; } @@ -2119,7 +2119,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs '1' => __('Create database with same name and grant all privileges'), '2' => __('Grant all privileges on wildcard name (username\\_%)')); - if ( !empty($dbname) ) { + if (! empty($dbname) ) { $choices['3'] = sprintf( __('Grant all privileges on database "%s"'), htmlspecialchars($dbname)); $default_choice = 3; echo '<input type="hidden" name="dbname" value="' . htmlspecialchars($dbname) . '" />' . "\n"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11126-g8b9b538
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 8b9b538a6bb0ffa0f64e32824c6a3156799aa076 (commit) from 97daa8961099bfab57eb181019e2f671ec88e093 (commit) - Log ----------------------------------------------------------------- commit 8b9b538a6bb0ffa0f64e32824c6a3156799aa076 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 11:34:09 2011 +0200 Function name to match coding standards ----------------------------------------------------------------------- Summary of changes: server_privileges.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index f86450f..5c74025 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -139,7 +139,7 @@ $random_n = mt_rand(0,1000000); // a random number that will be appended to the * @param string $tablename * @return string the escaped (if necessary) $db_and_table */ -function PMA_WildcardEscapeForGrant($db_and_table, $dbname, $tablename) { +function PMA_wildcardEscapeForGrant($db_and_table, $dbname, $tablename) { if (! strlen($dbname)) { $db_and_table = '*.*'; @@ -1106,7 +1106,7 @@ if (isset($_REQUEST['change_copy'])) { * Updates privileges */ if (!empty($update_privs)) { - $db_and_table = PMA_WildcardEscapeForGrant($db_and_table, $dbname, (isset($tablename) ? $tablename : '')); + $db_and_table = PMA_wildcardEscapeForGrant($db_and_table, $dbname, (isset($tablename) ? $tablename : '')); $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table @@ -1182,7 +1182,7 @@ if (!empty($update_privs)) { * Revokes Privileges */ if (isset($_REQUEST['revokeall'])) { - $db_and_table = PMA_WildcardEscapeForGrant($db_and_table, $dbname, isset($tablename) ? $tablename : ''); + $db_and_table = PMA_wildcardEscapeForGrant($db_and_table, $dbname, isset($tablename) ? $tablename : ''); $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table hooks/post-receive -- phpMyAdmin

1 0