August 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13015-gc64564b
by Piotr Przybylski 05 Aug '11

05 Aug '11

The branch, master has been updated via c64564baf77a99fc944560e6898b57214262062d (commit) from a73f1449ea1a18fac1853f93afa826b20811893d (commit) - Log ----------------------------------------------------------------- commit c64564baf77a99fc944560e6898b57214262062d Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 00:49:31 2011 +0200 Server synchronize: fix PMA_get_table_indexes to return null when there are no indexes instead of false Synchronize code depends on this behavior ----------------------------------------------------------------------- Summary of changes: libraries/server_synchronize.lib.php | 5 ++--- server_synchronize.php | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 513e7e9..5ddd07a 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -1378,13 +1378,12 @@ function PMA_get_column_values($database, $table, $column, $link = null) */ function PMA_get_table_indexes($database, $table, $link = null) { - $indexes = PMA_DBI_fetch_result( 'SHOW INDEXES FROM ' .PMA_backquote($database) . '.' . PMA_backquote($table), null, null, $link); - if (! is_array($indexes) || count($indexes) < 1) { - return false; + if (!is_array($indexes) || count($indexes) == 0) { + return null; } return $indexes; } diff --git a/server_synchronize.php b/server_synchronize.php index 89e50d8..4b4322c 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -210,6 +210,7 @@ if ((isset($_REQUEST['submit_connect']))) { */ PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_link, $j, $row_count); } + /** * Storing all arrays in session for use when page is reloaded for each button press */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13014-ga73f144
by Piotr Przybylski 05 Aug '11

05 Aug '11

The branch, master has been updated via a73f1449ea1a18fac1853f93afa826b20811893d (commit) from c8a147c4eed04c4d344aa9e45acce7411d2a5603 (commit) - Log ----------------------------------------------------------------- commit a73f1449ea1a18fac1853f93afa826b20811893d Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 00:37:49 2011 +0200 Coding style: space after for keyword ----------------------------------------------------------------------- Summary of changes: enum_editor.php | 4 ++-- libraries/advisor.lib.php | 2 +- libraries/replication.inc.php | 2 +- server_synchronize.php | 18 +++++++++--------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/enum_editor.php b/enum_editor.php index 9287bb3..77bf097 100644 --- a/enum_editor.php +++ b/enum_editor.php @@ -26,7 +26,7 @@ require_once './libraries/header_meta_style.inc.php'; if (isset($_GET['values'])) { // This page was displayed when the "add a new value" link or the link in tbl_alter.php was clicked $values = explode(',', urldecode($_GET['values'])); } elseif (isset($_GET['num_fields'])) { // This page was displayed from submitting this form - for($field_num = 1; $field_num <= $_GET['num_fields']; $field_num++) { + for ($field_num = 1; $field_num <= $_GET['num_fields']; $field_num++) { $values[] = "'" . str_replace(array("'", '\\'), array("''", '\\\\'), $_GET['field' . $field_num]) . "'"; } } @@ -43,7 +43,7 @@ require_once './libraries/header_meta_style.inc.php'; // If extra empty fields are added, display them if (isset($_GET['extra_fields'])) { $total_fields += $_GET['extra_fields']; - for($i = $field_counter+1; $i <= $total_fields; $i++) { + for ($i = $field_counter+1; $i <= $total_fields; $i++) { echo '<input type="text" size="30" name="field' . $i . '"/>'; } } else { diff --git a/libraries/advisor.lib.php b/libraries/advisor.lib.php index 165f068..038b4cf 100644 --- a/libraries/advisor.lib.php +++ b/libraries/advisor.lib.php @@ -132,7 +132,7 @@ class Advisor { $j = -1; $ruleLine = -1; - for($i = 0; $i<$numLines; $i++) { + for ($i = 0; $i<$numLines; $i++) { $line = $file[$i]; if($line[0] == '#' || $line[0] == "\n") continue; diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index 2b4309b..36e656c 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -379,7 +379,7 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true) /** * Generating Create Table query for all the non-matching tables present in Source but not in Target and populating tables. */ - for($q = 0; $q < sizeof($source_tables_uncommon); $q++) { + for ($q = 0; $q < sizeof($source_tables_uncommon); $q++) { if (isset($uncommon_tables[$q])) { PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $q, $uncommon_tables_fields, false); } diff --git a/server_synchronize.php b/server_synchronize.php index 8f79897..89e50d8 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -190,7 +190,7 @@ if ((isset($_REQUEST['submit_connect']))) { */ $criteria = array('Field', 'Type', 'Null', 'Collation', 'Key', 'Default', 'Comment'); - for($i = 0; $i < sizeof($matching_tables); $i++) { + for ($i = 0; $i < sizeof($matching_tables); $i++) { /** * Finding out all the differences structure, data and index diff for all the matching tables only */ @@ -204,7 +204,7 @@ if ((isset($_REQUEST['submit_connect']))) { $add_indexes_array, $alter_indexes_array, $remove_indexes_array, $i); } - for($j = 0; $j < sizeof($source_tables_uncommon); $j++) { + for ($j = 0; $j < sizeof($source_tables_uncommon); $j++) { /** * Finding out the number of rows to be added in tables that need to be added in target database */ @@ -518,7 +518,7 @@ if (isset($_REQUEST['Table_ids'])) { /** * Applying the structure difference on selected matching tables */ - for($q = 0; $q < sizeof($matching_table_structure_diff); $q++) + for ($q = 0; $q < sizeof($matching_table_structure_diff); $q++) { if (isset($alter_str_array[$matching_table_structure_diff[$q]])) { @@ -564,7 +564,7 @@ if (isset($_REQUEST['Table_ids'])) { * Applying the data difference. First checks if structure diff is applied or not. * If not, then apply structure difference first then apply data difference. */ - for($p = 0; $p < sizeof($matching_table_data_diff); $p++) + for ($p = 0; $p < sizeof($matching_table_data_diff); $p++) { if ($_REQUEST['checked'] == 'true') { @@ -643,7 +643,7 @@ if (isset($_REQUEST['Table_ids'])) { /** * Applying structure difference to selected non-matching tables (present in Source but absent from Target). */ - for($s = 0; $s < sizeof($uncommon_table_structure_diff); $s++) + for ($s = 0; $s < sizeof($uncommon_table_structure_diff); $s++) { PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $uncommon_table_structure_diff[$s], $uncommon_tables_fields, false); $_SESSION['uncommon_tables_fields'] = $uncommon_tables_fields; @@ -654,7 +654,7 @@ if (isset($_REQUEST['Table_ids'])) { * Applying data difference to selected non-matching tables (present in Source but absent from Target). * Before data synchronization, structure synchronization is confirmed. */ - for($r = 0; $r < sizeof($uncommon_table_data_diff); $r++) + for ($r = 0; $r < sizeof($uncommon_table_data_diff); $r++) { if (!(in_array($uncommon_table_data_diff[$r], $uncommon_table_structure_diff))) { if (isset($uncommon_tables[$uncommon_table_data_diff[$r]])) { @@ -680,7 +680,7 @@ if (isset($_REQUEST['Table_ids'])) { PMA_syncDisplayHeaderCompare($src_db, $trg_db); $rows = array(); - for($i = 0; $i < count($matching_tables); $i++) { + for ($i = 0; $i < count($matching_tables); $i++) { $num_alter_cols = 0; $num_insert_cols = 0; $num_remove_cols = 0; @@ -950,7 +950,7 @@ if (isset($_REQUEST['synchronize_db'])) { /** * Applying all sorts of differences for each matching table */ - for($p = 0; $p < sizeof($matching_tables); $p++) { + for ($p = 0; $p < sizeof($matching_tables); $p++) { /** * If the check box is checked for deleting previous rows from the target database tables then * first find out rows to be deleted and then delete the rows. @@ -1009,7 +1009,7 @@ if (isset($_REQUEST['synchronize_db'])) { /** * Creating and populating tables present in source but absent from target database. */ - for($q = 0; $q < sizeof($source_tables_uncommon); $q++) { + for ($q = 0; $q < sizeof($source_tables_uncommon); $q++) { if (isset($uncommon_tables[$q])) { PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $q, $uncommon_tables_fields, true); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13013-gc8a147c
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via c8a147c4eed04c4d344aa9e45acce7411d2a5603 (commit) via 9a938ed9867317474ae4bb63a17270c34040d2b5 (commit) from 872ddd034ff325e88caef9b8863bc5fa49734456 (commit) - Log ----------------------------------------------------------------- commit c8a147c4eed04c4d344aa9e45acce7411d2a5603 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 4 19:44:36 2011 +0200 Fix typo commit 9a938ed9867317474ae4bb63a17270c34040d2b5 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 4 19:44:22 2011 +0200 Fix comments ----------------------------------------------------------------------- Summary of changes: file_echo.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/file_echo.php b/file_echo.php index 58ff86b..5e92cb7 100644 --- a/file_echo.php +++ b/file_echo.php @@ -28,10 +28,10 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { $valid_match = '/^[^\n\r]*\.' . $extension . '$/'; if (! preg_match($valid_match, $_REQUEST['filename'])) { if (! preg_match('/^[^\n\r]*$/', $_REQUEST['filename'])) { - /* Add extension */ - $filename = 'dowload.' . $extension; - } else { /* Filename is unsafe, discard it */ + $filename = 'download.' . $extension; + } else { + /* Add extension */ $filename = $_REQUEST['filename'] . '.' . $extension; } } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13011-g872ddd0
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 872ddd034ff325e88caef9b8863bc5fa49734456 (commit) from 46cd0d6afad6ea9f2682420f1aa1c1da65fb6c1f (commit) - Log ----------------------------------------------------------------- commit 872ddd034ff325e88caef9b8863bc5fa49734456 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 4 19:43:29 2011 +0200 Fix comments ----------------------------------------------------------------------- Summary of changes: .../libraries/common/PMA_expandUserString_test.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/libraries/common/PMA_expandUserString_test.php b/test/libraries/common/PMA_expandUserString_test.php index c2b4f4d..748ddfe 100644 --- a/test/libraries/common/PMA_expandUserString_test.php +++ b/test/libraries/common/PMA_expandUserString_test.php @@ -38,7 +38,7 @@ class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase } /** - * Test case for parsing SHOW COLUMNS output + * Test case for expanding strings * * @dataProvider provider */ @@ -48,7 +48,7 @@ class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase } /** - * Test case for parsing SHOW COLUMNS output + * Test case for expanding strings with escaping * * @dataProvider provider */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13010-g46cd0d6
by Dieter Adriaenssens 04 Aug '11

04 Aug '11

The branch, master has been updated via 46cd0d6afad6ea9f2682420f1aa1c1da65fb6c1f (commit) from d1f124492ff0235ed1b23c26d3da52829b2fbc57 (commit) - Log ----------------------------------------------------------------- commit 46cd0d6afad6ea9f2682420f1aa1c1da65fb6c1f Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Aug 4 19:24:15 2011 +0200 fix typo ----------------------------------------------------------------------- Summary of changes: .../libraries/common/PMA_expandUserString_test.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/libraries/common/PMA_expandUserString_test.php b/test/libraries/common/PMA_expandUserString_test.php index 4b3e176..c2b4f4d 100644 --- a/test/libraries/common/PMA_expandUserString_test.php +++ b/test/libraries/common/PMA_expandUserString_test.php @@ -38,7 +38,7 @@ class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase } /** - * Test case for parsing SHOW COLUNS output + * Test case for parsing SHOW COLUMNS output * * @dataProvider provider */ @@ -48,7 +48,7 @@ class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase } /** - * Test case for parsing SHOW COLUNS output + * Test case for parsing SHOW COLUMNS output * * @dataProvider provider */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13009-gd1f1244
by Dieter Adriaenssens 04 Aug '11

04 Aug '11

The branch, master has been updated via d1f124492ff0235ed1b23c26d3da52829b2fbc57 (commit) from 4c62a5fed6efe79b9ab9c667458d365058a914dc (commit) - Log ----------------------------------------------------------------- commit d1f124492ff0235ed1b23c26d3da52829b2fbc57 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Aug 4 19:20:23 2011 +0200 fix typo ----------------------------------------------------------------------- Summary of changes: .../libraries/common/PMA_extractFieldSpec_test.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php index d87fdbc..ab789f4 100644 --- a/test/libraries/common/PMA_extractFieldSpec_test.php +++ b/test/libraries/common/PMA_extractFieldSpec_test.php @@ -19,7 +19,7 @@ require_once 'libraries/common.lib.php'; class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase { /** - * Test case for parsing SHOW COLUNS output + * Test case for parsing SHOW COLUMNS output * * @dataProvider provider */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13008-g4c62a5f
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 4c62a5fed6efe79b9ab9c667458d365058a914dc (commit) from fcb5b16adf5703079792db8f32ea30150b896951 (commit) - Log ----------------------------------------------------------------- commit 4c62a5fed6efe79b9ab9c667458d365058a914dc Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 17:41:30 2011 +0200 Another typo ----------------------------------------------------------------------- Summary of changes: libraries/export/texytext.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index 565907e..d24a8b2 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -259,7 +259,7 @@ if (isset($plugin_list)) { $type = ' '; } - $attribute = $extracted_fieldspec['attribute'] + $attribute = $extracted_fieldspec['attribute']; if (! isset($column['Default'])) { if ($column['Null'] != 'NO') { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13007-gfcb5b16
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via fcb5b16adf5703079792db8f32ea30150b896951 (commit) from d4c9e4135e6497d24e9b3d1070f649ae196f8ead (commit) - Log ----------------------------------------------------------------- commit fcb5b16adf5703079792db8f32ea30150b896951 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 17:37:39 2011 +0200 Fix typo ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 86b4b80..acfb531 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -196,7 +196,7 @@ while ($row = PMA_DBI_fetch_row($rowset)) { $type_nowrap = ' nowrap="nowrap"'; } $type = htmlspecialchars($extracted_fieldspec['print_type']); - $attribute = $extracted_fieldspec['attribute'] + $attribute = $extracted_fieldspec['attribute']; if (! isset($row['Default'])) { if ($row['Null'] != 'NO') { $row['Default'] = '<i>NULL</i>'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13006-gd4c9e41
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via d4c9e4135e6497d24e9b3d1070f649ae196f8ead (commit) via 85eb9c74a11279c31ec1a6b54b67f05679d8c119 (commit) from 22b46564e106dbc8aede393466b21eecc321883d (commit) - Log ----------------------------------------------------------------- commit d4c9e4135e6497d24e9b3d1070f649ae196f8ead Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 17:32:18 2011 +0200 Fix comments commit 85eb9c74a11279c31ec1a6b54b67f05679d8c119 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 17:31:55 2011 +0200 Add testcase for PMA_expandUserString ----------------------------------------------------------------------- Summary of changes: .../libraries/common/PMA_expandUserString_test.php | 74 ++++++++++++++++++++ .../libraries/common/PMA_extractFieldSpec_test.php | 3 +- 2 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 test/libraries/common/PMA_expandUserString_test.php diff --git a/test/libraries/common/PMA_expandUserString_test.php b/test/libraries/common/PMA_expandUserString_test.php new file mode 100644 index 0000000..4b3e176 --- /dev/null +++ b/test/libraries/common/PMA_expandUserString_test.php @@ -0,0 +1,74 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Test for PMA_expandUserString from common.lib.php + * + * @package phpMyAdmin-test + * @group common.lib-tests + */ + +/* + * Include to test. + */ +require_once 'libraries/core.lib.php'; +require_once 'libraries/common.lib.php'; + +if (!defined('PMA_VERSION')) { + define('PMA_VERSION', 'TEST'); +} + +/** + * Test for PMA_expandUserString function. + */ +class PMA_expandUserString_test extends PHPUnit_Extensions_OutputTestCase +{ + + /** + * Setup variables needed by test. + */ + public function setup() + { + $GLOBALS['cfg'] = array( + 'Server' => array( + 'host' => 'host&', + 'verbose' => 'verbose', + )); + $GLOBALS['db'] = 'database'; + $GLOBALS['table'] = 'table'; + } + + /** + * Test case for parsing SHOW COLUNS output + * + * @dataProvider provider + */ + public function testExpand($in, $out) + { + $this->assertEquals($out, PMA_expandUserString($in)); + } + + /** + * Test case for parsing SHOW COLUNS output + * + * @dataProvider provider + */ + public function testExpandEscape($in, $out) + { + $this->assertEquals(htmlspecialchars($out), PMA_expandUserString($in, 'htmlspecialchars')); + } + + /** + * Data provider + */ + public function provider() + { + return array( + array('@SERVER@', 'host&'), + array('@VSERVER@', 'verbose'), + array('@DATABASE@', 'database'), + array('@TABLE@', 'table'), + array('@IGNORE@', '@IGNORE@'), + array('@PHPMYADMIN@', 'phpMyAdmin ' . PMA_VERSION), + ); + } +} diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php index ecb9bd0..d87fdbc 100644 --- a/test/libraries/common/PMA_extractFieldSpec_test.php +++ b/test/libraries/common/PMA_extractFieldSpec_test.php @@ -2,10 +2,9 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Test for PMA_checkParameters from common.lib.php + * Test for PMA_extractFieldSpec from common.lib.php * * @package phpMyAdmin-test - * @version $Id: PMA_checkParameters_test.php * @group common.lib-tests */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13004-g22b4656
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 22b46564e106dbc8aede393466b21eecc321883d (commit) from 416277f3980f1bb56a513a106d28dbf4c902dee6 (commit) - Log ----------------------------------------------------------------- commit 22b46564e106dbc8aede393466b21eecc321883d Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 17:21:51 2011 +0200 Add testcase for another way of escaping ----------------------------------------------------------------------- Summary of changes: .../libraries/common/PMA_extractFieldSpec_test.php | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php index 9aa337d..ecb9bd0 100644 --- a/test/libraries/common/PMA_extractFieldSpec_test.php +++ b/test/libraries/common/PMA_extractFieldSpec_test.php @@ -62,6 +62,19 @@ class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase ), ), array( + "SET('''a','b')", + array( + 'type' => 'set', + 'print_type' => "set('''a', 'b')", + 'binary' => false, + 'unsigned' => false, + 'zerofill' => false, + 'spec_in_brackets' => "'''a','b'", + 'enum_set_values' => array("'a", 'b'), + 'attribute' => ' ', + ), + ), + array( "INT UNSIGNED zerofill", array( 'type' => 'int unsigned zerofill', hooks/post-receive -- phpMyAdmin

1 0