- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23463-g3c4e231
by Madhura Jayaratne 27 Nov '11

27 Nov '11

The branch, master has been updated via 3c4e231867e0ea547ad7447696bbf253a64f2899 (commit) via e095e926c1462c78ff82f7e3d964dd83be5ec655 (commit) from 3dce618b7bd49c275584169882de61ce079eebdb (commit) - Log ----------------------------------------------------------------- commit 3c4e231867e0ea547ad7447696bbf253a64f2899 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Nov 27 14:17:07 2011 +0530 A forgotten change in making JS files load dynamically. commit e095e926c1462c78ff82f7e3d964dd83be5ec655 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Nov 27 14:13:57 2011 +0530 styles for #popup_background is still needed for gis data editor ----------------------------------------------------------------------- Summary of changes: js/tbl_select.js | 7 ++++++- themes/original/css/theme_right.css.php | 15 ++++++++++++++- themes/pmahomme/css/theme_right.css.php | 15 ++++++++++++++- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/js/tbl_select.js b/js/tbl_select.js index faffeef..03d611a 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -173,7 +173,12 @@ $(document).ready(function() { //Token var token = $("input[name='token']").val(); - openGISEditor(value, field, type, input_name, token); + openGISEditor(); + if (!gisEditorLoaded) { + loadJSAndGISEditor(value, field, type, input_name, token); + } else { + loadGISEditor(value, field, type, input_name, token); + } }); }, 'top.frame_content'); // end $(document).ready() diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 1284ae1..2b30f3a 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1618,7 +1618,7 @@ a.close_gis_editor { display: none; position: fixed; _position: absolute; /* hack for IE */ - z-index: 101; + z-index: 1001; overflow-y: auto; overflow-x: hidden; } @@ -1645,6 +1645,19 @@ a.close_gis_editor { width: 75px; } +#popup_background { + display: none; + position: fixed; + _position: absolute; /* hack for IE6 */ + width: 100%; + height: 100%; + top: 0; + left: 0; + background: #000; + z-index: 1000; + overflow: hidden; +} + /** * ENUM/SET editor styles */ diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 5d4c3f3..e47b4fd 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -1999,7 +1999,7 @@ a.close_gis_editor { display: none; position: fixed; _position: absolute; /* hack for IE */ - z-index: 101; + z-index: 1001; overflow-y: auto; overflow-x: hidden; } @@ -2026,6 +2026,19 @@ a.close_gis_editor { width: 75px; } +#popup_background { + display: none; + position: fixed; + _position: absolute; /* hack for IE6 */ + width: 100%; + height: 100%; + top: 0; + left: 0; + background: #000; + z-index: 1000; + overflow: hidden; +} + /** * ENUM/SET editor styles */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23461-g3dce618
by Marc Delisle 26 Nov '11

26 Nov '11

The branch, master has been updated via 3dce618b7bd49c275584169882de61ce079eebdb (commit) via 5e6173015709d67c40877bcf51a5c4520e83f9de (commit) from 277b6a96fa8046fe9eaaec61cee50ad675766262 (commit) - Log ----------------------------------------------------------------- commit 3dce618b7bd49c275584169882de61ce079eebdb Merge: 277b6a9 5e61730 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 26 06:54:49 2011 -0500 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/common.inc.php | 30 ++++++++++++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 430c97b..9fb4838 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ phpMyAdmin - ChangeLog 3.4.9.0 (not yet released) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown - bug #3442004 [interface] DB suggestion not correct for user with underscore +- bug #3438420 [core] Magic quotes removed in PHP 5.4 3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 730cf19..ad5d613 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -69,11 +69,15 @@ if (version_compare(phpversion(), '5.3', 'lt')) { } /** - * Avoid problems with magic_quotes_runtime - * (in the future, this setting will be removed but it's not yet - * known in which PHP version) + * This setting was removed in PHP 5.4. But at this point PMA_PHP_INT_VERSION + * is not yet defined so we use another way to find out the PHP version. */ -@ini_set('magic_quotes_runtime', false); +if (version_compare(phpversion(), '5.4', 'lt')) { + /** + * Avoid problems with magic_quotes_runtime + */ + @ini_set('magic_quotes_runtime', false); +} /** * for verification in all procedural scripts under libraries @@ -253,12 +257,18 @@ if (isset($_POST['usesubform'])) { } // end check if a subform is submitted -// remove quotes added by php -if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { - PMA_arrayWalkRecursive($_GET, 'stripslashes', true); - PMA_arrayWalkRecursive($_POST, 'stripslashes', true); - PMA_arrayWalkRecursive($_COOKIE, 'stripslashes', true); - PMA_arrayWalkRecursive($_REQUEST, 'stripslashes', true); +/** + * This setting was removed in PHP 5.4. But at this point PMA_PHP_INT_VERSION + * is not yet defined so we use another way to find out the PHP version. + */ +if (version_compare(phpversion(), '5.4', 'lt')) { + // remove quotes added by PHP + if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { + PMA_arrayWalkRecursive($_GET, 'stripslashes', true); + PMA_arrayWalkRecursive($_POST, 'stripslashes', true); + PMA_arrayWalkRecursive($_COOKIE, 'stripslashes', true); + PMA_arrayWalkRecursive($_REQUEST, 'stripslashes', true); + } } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7_1-47-g5e61730
by Marc Delisle 26 Nov '11

26 Nov '11

The branch, QA_3_4 has been updated via 5e6173015709d67c40877bcf51a5c4520e83f9de (commit) from dddcddbf38729f3362b2562671b510107df72b9b (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/common.inc.php | 30 ++++++++++++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 343d6da..5355551 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 3.4.9.0 (not yet released) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown - bug #3442004 [interface] DB suggestion not correct for user with underscore +- bug #3438420 [core] Magic quotes removed in PHP 5.4 3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index b695022..53eeb79 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -69,11 +69,15 @@ if (version_compare(phpversion(), '5.3', 'lt')) { } /** - * Avoid problems with magic_quotes_runtime - * (in the future, this setting will be removed but it's not yet - * known in which PHP version) + * This setting was removed in PHP 5.4. But at this point PMA_PHP_INT_VERSION + * is not yet defined so we use another way to find out the PHP version. */ -@ini_set('magic_quotes_runtime', false); +if (version_compare(phpversion(), '5.4', 'lt')) { + /** + * Avoid problems with magic_quotes_runtime + */ + @ini_set('magic_quotes_runtime', false); +} /** * for verification in all procedural scripts under libraries @@ -253,12 +257,18 @@ if (isset($_POST['usesubform'])) { } // end check if a subform is submitted -// remove quotes added by php -if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { - PMA_arrayWalkRecursive($_GET, 'stripslashes', true); - PMA_arrayWalkRecursive($_POST, 'stripslashes', true); - PMA_arrayWalkRecursive($_COOKIE, 'stripslashes', true); - PMA_arrayWalkRecursive($_REQUEST, 'stripslashes', true); +/** + * This setting was removed in PHP 5.4. But at this point PMA_PHP_INT_VERSION + * is not yet defined so we use another way to find out the PHP version. + */ +if (version_compare(phpversion(), '5.4', 'lt')) { + // remove quotes added by PHP + if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { + PMA_arrayWalkRecursive($_GET, 'stripslashes', true); + PMA_arrayWalkRecursive($_POST, 'stripslashes', true); + PMA_arrayWalkRecursive($_COOKIE, 'stripslashes', true); + PMA_arrayWalkRecursive($_REQUEST, 'stripslashes', true); + } } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23459-g277b6a9
by Marc Delisle 26 Nov '11

26 Nov '11

The branch, master has been updated via 277b6a96fa8046fe9eaaec61cee50ad675766262 (commit) via dddcddbf38729f3362b2562671b510107df72b9b (commit) from bbc44c410c0ee31207821be28f57bb203749801d (commit) - Log ----------------------------------------------------------------- commit 277b6a96fa8046fe9eaaec61cee50ad675766262 Merge: bbc44c4 dddcddb Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 26 06:17:16 2011 -0500 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/check_user_privileges.lib.php | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b4bfec6..430c97b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ phpMyAdmin - ChangeLog 3.4.9.0 (not yet released) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown +- bug #3442004 [interface] DB suggestion not correct for user with underscore 3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php index 1de903e..daef278 100644 --- a/libraries/check_user_privileges.lib.php +++ b/libraries/check_user_privileges.lib.php @@ -107,8 +107,11 @@ function PMA_analyseShowGrant() && substr(PMA_DBI_getError(), 1, 4) != 1044) ) { if ($GLOBALS['cfg']['SuggestDBName']) { - $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '_/', '\\1?', $show_grants_dbname); - $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '%/', '\\1...', $GLOBALS['db_to_create']); + /** + * Do not handle the underscore wildcard + * (this case must be rare anyway) + */ + $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '%/', '\\1...', $show_grants_dbname); $GLOBALS['db_to_create'] = preg_replace('/' . $re1 . '(%|_)/', '\\1\\3', $GLOBALS['db_to_create']); } $GLOBALS['is_create_db_priv'] = true; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7_1-46-gdddcddb
by Marc Delisle 26 Nov '11

26 Nov '11

The branch, QA_3_4 has been updated via dddcddbf38729f3362b2562671b510107df72b9b (commit) from 9c278d020cde6ee32e830b2d0d7f11de8b59e68e (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/check_user_privileges.lib.php | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5133a9b..343d6da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 3.4.9.0 (not yet released) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown +- bug #3442004 [interface] DB suggestion not correct for user with underscore 3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php index 6dbc251..291213c 100644 --- a/libraries/check_user_privileges.lib.php +++ b/libraries/check_user_privileges.lib.php @@ -128,8 +128,11 @@ function PMA_analyseShowGrant() && substr(PMA_DBI_getError(), 1, 4) != 1044) ) { if ($GLOBALS['cfg']['SuggestDBName']) { - $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '_/', '\\1?', $show_grants_dbname); - $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '%/', '\\1...', $GLOBALS['db_to_create']); + /** + * Do not handle the underscore wildcard + * (this case must be rare anyway) + */ + $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '%/', '\\1...', $show_grants_dbname); $GLOBALS['db_to_create'] = preg_replace('/' . $re1 . '(%|_)/', '\\1\\3', $GLOBALS['db_to_create']); } $GLOBALS['is_create_db_priv'] = true; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23457-gbbc44c4
by Madhura Jayaratne 25 Nov '11

25 Nov '11

The branch, master has been updated via bbc44c410c0ee31207821be28f57bb203749801d (commit) via 9c278d020cde6ee32e830b2d0d7f11de8b59e68e (commit) via c43babad7cbde73098ded7fe502027a1af731f4b (commit) from b82662961f049474db17fc4af0f848e40c01498a (commit) - Log ----------------------------------------------------------------- commit bbc44c410c0ee31207821be28f57bb203749801d Merge: b826629 9c278d0 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Nov 25 18:25:13 2011 +0530 Merge branch 'QA_3_4' Conflicts: ChangeLog Documentation.html README libraries/Config.class.php libraries/display_tbl.lib.php ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_tbl.lib.php | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index c895ddb..b4bfec6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ phpMyAdmin - ChangeLog + [interface] Improved index editor 3.4.9.0 (not yet released) +- bug #3442028 [edit] Inline editing enum fields with null shows no dropdown 3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index e85ec3f..5b39565 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1146,13 +1146,15 @@ function PMA_buildValueDisplay($class, $condition_field, $value) * * @param string $class class of table cell * @param bool $condition_field whether to add CSS class condition + * @param object $meta the meta-information about this field + * @param string $align cell allignment * * @return string the td */ -function PMA_buildNullDisplay($class, $condition_field) +function PMA_buildNullDisplay($class, $condition_field, $meta, $align = '') { // the null class is needed for grid editing - return '<td align="right"' . ' class="' . $class . ($condition_field ? ' condition' : '') . ' null">NULL</td>'; + return '<td ' . $align . ' class="' . PMA_addClass($class, $condition_field, $meta, '') . ' null">NULL</td>'; } /** @@ -1546,7 +1548,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) // so use the $pointer if (! isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta, 'align="right"'); } elseif ($row[$i] != '') { $nowrap = ' nowrap'; @@ -1569,7 +1571,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) $class = str_replace('grid_edit', '', $class); if (! isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } else { // for blobstreaming // if valid BS reference exists @@ -1585,7 +1587,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) // not binary: } else { if (! isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } elseif ($row[$i] != '') { // if a transform function for blob is set, none of these replacements will be made if (PMA_strlen($row[$i]) > $GLOBALS['cfg']['LimitChars'] && $_SESSION['tmp_user_values']['display_text'] == 'P') { @@ -1612,7 +1614,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) $class = str_replace('grid_edit', '', $class); if (! isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } elseif ($row[$i] != '') { // Display as [GEOMETRY - (size)] if ('GEOM' == $_SESSION['tmp_user_values']['geometry_display']) { @@ -1681,7 +1683,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) // n o t n u m e r i c a n d n o t B L O B } else { if (! isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } elseif ($row[$i] != '') { // support blanks in the key $relation_id = $row[$i]; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7_1-45-g9c278d0
by Madhura Jayaratne 25 Nov '11

25 Nov '11

The branch, QA_3_4 has been updated via 9c278d020cde6ee32e830b2d0d7f11de8b59e68e (commit) from c43babad7cbde73098ded7fe502027a1af731f4b (commit) - Log ----------------------------------------------------------------- commit 9c278d020cde6ee32e830b2d0d7f11de8b59e68e Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Nov 25 18:12:53 2011 +0530 bug #3442028 [edit] Inline editing enum fields with null shows no dropdown ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_tbl.lib.php | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index dd66822..5133a9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 3.4.9.0 (not yet released) +- bug #3442028 [edit] Inline editing enum fields with null shows no dropdown 3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index d73129f..32e6a0c 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -996,14 +996,16 @@ function PMA_buildValueDisplay($class, $condition_field, $value) { /** * Prepares the display for a null value * - * @param string $class - * @param string $condition_field + * @param string $class class of table cell + * @param bool $condition_field whether to add CSS class condition + * @param object $meta the meta-information about this field + * @param string $align cell allignment * * @return string the td */ -function PMA_buildNullDisplay($class, $condition_field) { +function PMA_buildNullDisplay($class, $condition_field, $meta, $align = '') { // the null class is needed for inline editing - return '<td align="right"' . ' class="' . $class . ($condition_field ? ' condition' : '') . ' null">NULL</td>'; + return '<td ' . $align . ' class="' . PMA_addClass($class, $condition_field, $meta, '') . ' null">NULL</td>'; } /** @@ -1359,7 +1361,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // so use the $pointer if (!isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta, 'align="right"'); } elseif ($row[$i] != '') { $nowrap = ' nowrap'; @@ -1382,7 +1384,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if (stristr($field_flags, 'BINARY')) { if (!isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } else { // for blobstreaming // if valid BS reference exists @@ -1398,7 +1400,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // not binary: } else { if (!isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } elseif ($row[$i] != '') { // if a transform function for blob is set, none of these replacements will be made if (PMA_strlen($row[$i]) > $GLOBALS['cfg']['LimitChars'] && $_SESSION['tmp_user_values']['display_text'] == 'P') { @@ -1426,7 +1428,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // n o t n u m e r i c a n d n o t B L O B } else { if (!isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } elseif ($row[$i] != '') { // support blanks in the key $relation_id = $row[$i]; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23454-gb826629
by Marc Delisle 24 Nov '11

24 Nov '11

The branch, master has been updated via b82662961f049474db17fc4af0f848e40c01498a (commit) from 7d553e1bc8b7aec7701c1cf045b297cf0685c8f4 (commit) - Log ----------------------------------------------------------------- commit b82662961f049474db17fc4af0f848e40c01498a Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 24 17:34:41 2011 -0500 Freshmeat.net renamed to freecode.com ----------------------------------------------------------------------- Summary of changes: scripts/create-release.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index d411a67..72c7495 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -282,7 +282,7 @@ Todo now: ./scripts/upload-release \$USER $version release 4. add SF news item to phpMyAdmin project - 5. announce release on freshmeat (http://freshmeat.net/projects/phpmyadmin/) + 5. announce release on freecode (http://freecode.com/projects/phpmyadmin/) 6. send a short mail (with list of major changes) to phpmyadmin-devel(a)lists.sourceforge.net phpmyadmin-news(a)lists.sourceforge.net hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_4_8RC1-50-g230f4ed
by Marc Delisle 24 Nov '11

24 Nov '11

The branch, TESTING has been updated via 230f4ed39612515c20b1e91c05c2d0198a356567 (commit) via b00745d352c89a5e52673e717e6cbef43dc229d6 (commit) via 29455fe79bc9896129d7004e0242c451f4a32cc8 (commit) via ff0ea2f9b960359234fab02a74b156bc9bb1e383 (commit) via cf5faa1dd1bcae329eddb793765ad2ba3e4471dc (commit) via f414a0ec32626c3f0084bd020daba2b4553d244b (commit) via 035c112eafeb57201c63f0b94d7485d41762922f (commit) via 077c10020e349e8c1beb46309098992fde616913 (commit) via dac8d6ce256333ff45b5f46270304b8657452740 (commit) via bc45a1048d2f5ca8a532f774ddb1dd80985dff3d (commit) via 1490533d91e9d3820e78ca4eac7981886eaea2cb (commit) via b289fe082441dc739939b0ba15dae0d9dc6cee92 (commit) via e2b6af5a99b9a053609ff76724fdc4a6a48dd14e (commit) via e7877fba46743be0b351c526ccac216731ab8c1e (commit) via 81f6766f962d6cea3742f3936032d234e6ce9d53 (commit) via b5c45d0d35c203fe1b8e1c720ae8af7e40f4ce6c (commit) via 8219f7c544c8ffd2ba0df2034900a7f591af3219 (commit) via 2e92b86f92df4dc4d295e7ad7250ab4a3c29bbf2 (commit) via ac430ea21d6f49b781a9cda9940a5675d56f168e (commit) via b6f02c7aed3af85a00fbf05c47a5ccade75fa076 (commit) via 0212c7c01562418410c559ca081ef6239e6b13cb (commit) via 849b6818f81cae1d5ae0a6857b6e5839a8b3ea10 (commit) via e51a1cb73df8f3706fe0bb50ccdcae7fa2f893eb (commit) via f674e3dbe952d9c4a7864067d7c286e9b01f527a (commit) via edea25b07b51c2c5e277323f8047fcd82e695f7e (commit) via bd0ad7377e92325d92d1de40ba52b8e89bc19664 (commit) via 2dfd1dca1490959f4ee594eb7de9e3e996fd6b4c (commit) via efc03d8c8cfa354f703c7a40780035efa93235a4 (commit) via cc2fe91e767d2c38855f1bb866d71c4a721b82cd (commit) via 19c0de6be237e3393b65b93ee4ef67ee3be68c18 (commit) via c51353df21ea86afb8b6197b70560489bfee0e1d (commit) via 8721f7b1601295186f4b9df5dee285911c8aaaf7 (commit) via 8170d03d3cd4892f71db9b89cdf442006bcc1167 (commit) via b94febeb89b208e935b58dc80d2b07446d35d9b0 (commit) via d22fae4201f299d4f3fcac1ac4bc136a422c5d26 (commit) via 0b24e6943505fad97e7fba3263bf863cdb7c01dd (commit) via e2cb83aa24e1b750af2a4f83cfdfa9cab043988b (commit) via a691fce64ca56c90d0d4b9af525a785d95eabd6b (commit) via f7cb55cb626158d81ac606927142d8f55444b9ff (commit) via 694c1cdf751e1fcbe2435087e3cea0dcd85ca458 (commit) via d590bccda2409f3d1e168c470a6af3fe38531106 (commit) via bdfd9ead762a3003dcbdbb043a3288bfe1f1eecc (commit) via 0112ff6ba522b6d18fee298357a3fda1d9cea0cf (commit) via d4cce87b263ed00654588fa068c7ec73422fd465 (commit) via a3132f6e91f04dc8f885f4141e6d397460421fa4 (commit) from bced70f81d0868f163189d06a49aa2da676dc98b (commit) - Log ----------------------------------------------------------------- commit 230f4ed39612515c20b1e91c05c2d0198a356567 Merge: bced70f b00745d Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 24 17:12:06 2011 -0500 Merge branch 'MAINT_3_4_8' into TESTING ----------------------------------------------------------------------- Summary of changes: ChangeLog | 29 ++- Documentation.html | 12 +- README | 2 +- browse_foreigners.php | 5 + db_structure.php | 64 +++- import.php | 2 +- js/db_operations.js | 2 +- js/db_search.js | 24 +- js/functions.js | 68 ++-- js/sql.js | 5 + js/tbl_change.js | 19 +- js/tbl_structure.js | 5 + libraries/Config.class.php | 2 +- libraries/Error.class.php | 2 +- libraries/auth/cookie.auth.lib.php | 4 + libraries/auth/http.auth.lib.php | 4 + libraries/common.lib.php | 5 +- libraries/db_info.inc.php | 4 + libraries/import/ods.php | 3 - libraries/import/xml.php | 3 - libraries/select_lang.lib.php | 2 +- libraries/server_synchronize.lib.php | 639 ++++++++++++++++--------------- libraries/sqlparser.data.php | 3 +- libraries/vendor_config.php | 6 + po/af.po | 2 +- po/ar.po | 2 +- po/az.po | 2 +- po/be.po | 2 +- po/be(a)latin.po | 2 +- po/bg.po | 16 +- po/bn.po | 2 +- po/br.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en_GB.po | 2 +- po/es.po | 2 +- po/et.po | 2 +- po/eu.po | 79 +++-- po/fa.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/he.po | 2 +- po/hi.po | 2 +- po/hr.po | 2 +- po/hu.po | 95 ++++-- po/id.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ka.po | 2 +- po/ko.po | 2 +- po/lt.po | 2 +- po/lv.po | 2 +- po/mk.po | 2 +- po/ml.po | 2 +- po/mn.po | 2 +- po/ms.po | 2 +- po/nb.po | 2 +- po/nl.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 4 +- po/ru.po | 2 +- po/si.po | 2 +- po/sk.po | 2 +- po/sl.po | 2 +- po/sq.po | 2 +- po/sr.po | 2 +- po/sr(a)latin.po | 2 +- po/sv.po | 2 +- po/ta.po | 2 +- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/tt.po | 2 +- po/ug.po | 2 +- po/uk.po | 2 +- po/ur.po | 2 +- po/uz.po | 2 +- po/uz(a)latin.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- tbl_indexes.php | 4 +- tbl_select.php | 4 +- themes/pmahomme/css/theme_right.css.php | 6 +- 91 files changed, 700 insertions(+), 542 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2797494..f45b137 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,35 @@ phpMyAdmin - ChangeLog ====================== +3.4.8.0 (not yet released) +- bug #3425230 [interface] enum data split at space char (more space to edit) +- bug #3426840 [interface] ENUM/SET editor can't handle commas in values +- bug #3427256 [interface] no links to browse/empty views and tables +- bug #3430377 [interface] Deleted search results remain visible +- bug #3428627 [import] ODS import ignores memory limits +- bug #3426836 [interface] Visual column separation +- bug #3428065 [parser] TRUE not recognized by parser ++ patch #3433770 [config] Make location of php-gettext configurable +- patch #3430291 [import] Handle conflicts in some open_basedir situations +- bug #3431427 [display] Dropdown results - setting NULL does not work +- patch #3428764 [edit] Inline edit on multi-server configuration +- patch #3437354 [core] Notice: Array to string conversion in PHP 5.4 +- [interface] When ShowTooltipAliasTB is true, VIEW is wrongly shown as the + view name in main panel db Structure page +- bug #3439292 [core] Fail to synchronize column with name of keyword +- bug #3425156 [interface] Add column after drop +- [interface] Avoid showing the password in phpinfo()'s output +- bug #3441572 [GUI] 'newer version of phpMyAdmin' message not shown in IE8 +- bug #3407235 [interface] Entering the key through a lookup window does not reset NULL +- [security] Self-XSS on database names (Synchronize), see PMASA-2011-18 +- [security] Self-XSS on database names (Operations/rename), see PMASA-2011-18 +- [security] Self-XSS on column type (Create index), see PMASA-2011-18 +- [security] Self-XSS on column type (table Search), see PMASA-2011-18 +- [security] Self-XSS on invalid query (table overview), see PMASA-2011-18 + 3.4.7.1 (2011-11-10) -- [security] Fixed possible local file inclusion in XML import (CVE-2011-4107). +- [security] Fixed possible local file inclusion in XML import +(CVE-2011-4107). 3.4.7.0 (2011-10-23) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false diff --git a/Documentation.html b/Documentation.html index 083da6e..3d9f3c3 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <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=utf-8" /> - <title>phpMyAdmin 3.4.7.1 - Documentation</title> + <title>phpMyAdmin 3.4.8-rc1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">phpMyAdmin</a> - 3.4.7.1 + 3.4.8-rc1 Documentation </h1> </div> @@ -1446,7 +1446,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> </dd> <dt id="cfg_LeftFrameDBTree">$cfg['LeftFrameDBTree'] boolean</dt> - <dd>In light mode, defines whether to display the names of databases (in the + <dd>Defines whether to display the names of databases (in the selector) using a tree, see also <a href="#cfg_LeftFrameDBSeparator" class="configrule">$cfg['LeftFrameDBSeparator']</a>. </dd> @@ -3510,8 +3510,7 @@ LeftFrameDBSeparator" class="configrule">$cfg['LeftFrameDBSeparator']</a>.��*r��*�I�/�0J�/�u��*��*��*��*0J�/��* ?�/��=�/�k��*6 ��!�!�I�/�0J�/�xd��* @�/��*��*�I�/�`��*�I�/��_T�*u��*PT�*�TT�*�YT�*��*xd��* @�/��>�/�k��*�!�!�I�/�0J�/�H.��*A�/��*��*�I�/�`��*�I�/��I�/��I�/�8��*�p�0J�/�u��*��*A�/��?�/�k��*GHIJKMNOP�I�/�0J�/�H��*�B�/��*��*�I�/�0_T�*u��*p��*��*PT�*�TT�*�YT�*��*H��*�B�/��@�/�k��*8��*�B�/�A�/�k��*(��*�B�/�@A�/�k��*��*�B�/�pA�/�k��* �^T�*u��*�YT�*�;�/��h��*e��*�TT�*B�/�yh��*e��*PT�*@B�/�Zh��*e��*��*p��*��*PT�*�t��*�TT�*�YT�*��*8��*�O�*0J�/�p��*�C�/��B�/�k��*5678:<=>?@BD�I�/�0J�/��L�*0J�/�u��*��*pB�/��O�*e��*��*�_@f�S Q��l��*0J�/��L�*E�/��C�/�k��*u]�� 4Q��U^Qʉ��u��*ēv�I�/�0J�/�H.�*tU�*pK�/��*��*��R�*�I�/�0K�/��I�/�PF�/��*u��*�t��*�L�/��*�K�/�G�/��*8J�/�have either the <a href="http://pecl.php.net/package/APC">APC</a> extension group under which Apache runs. </li> <li> - You should use PHP safe mode, to protect from other users that try - to include your config.inc.php in their scripts. + Follow security recommendations for PHP and your webserver. </li> </ul> @@ -4585,7 +4584,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA <li>Marc Delisle <marc_at_infomarc.info> <ul> - <li>multi-language version</li> + <li>multi-language version in December 1998</li> <li>various fixes and improvements</li> <li><abbr title="structured query language">SQL</abbr> analyser (most of it)</li> <li>current project maintainer</li> @@ -4596,7 +4595,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA <li>started SourceForge phpMyAdmin project in March 2001</li> <li>sync'ed different existing CVS trees with new features and bugfixes</li> <li>multi-language improvements, dynamic language selection</li> - <li>current project maintainer</li> <li>many bugfixes and improvements</li> </ul></li> diff --git a/README b/README index 488cb04..65349d8 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.7.1 +Version 3.4.8-rc1 A set of PHP-scripts to manage MySQL over the web. diff --git a/browse_foreigners.php b/browse_foreigners.php index c8867af..e88c20f 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -104,9 +104,11 @@ require_once './libraries/header_scripts.inc.php'; if (opener && opener.document && opener.document.insertForm) { var field = 'fields'; + var field_null = 'fields_null'; <?php if (isset($rownumber)) { ?> var element_name = field + '[multi_edit][<?php echo htmlspecialchars($rownumber); ?>][' + fieldmd5 + ']'; + var null_name = field_null + '[multi_edit][<?php echo htmlspecialchars($rownumber); ?>][' + fieldmd5 + ']'; <?php } else { ?> var element_name = field + '[]'; <?php } ?> @@ -120,6 +122,9 @@ require_once './libraries/header_scripts.inc.php'; if (opener.document.insertForm.elements[element_name]) { // Edit/Insert form opener.document.insertForm.elements[element_name].value = key; + if (opener.document.insertForm.elements[null_name]) { + opener.document.insertForm.elements[null_name].checked = false; + } self.close(); return false; } else if (opener.document.insertForm.elements[element_name_alt]) { diff --git a/db_structure.php b/db_structure.php index d81af5d..b704759 100644 --- a/db_structure.php +++ b/db_structure.php @@ -254,31 +254,57 @@ foreach ($tables as $keyname => $each_table) { $hidden_fields[] = '<input type="hidden" name="views[]" value="' . htmlspecialchars($each_table['TABLE_NAME']) . '" />'; } - if ($each_table['TABLE_ROWS'] > 0) { - $browse_table = '<a href="sql.php?' . $tbl_url_query . '&pos=0">' . $titles['Browse'] . '</a>'; - $search_table = '<a href="tbl_select.php?' . $tbl_url_query . '">' . $titles['Search'] . '</a>'; - $browse_table_label = '<a href="sql.php?' . $tbl_url_query . '&pos=0">' . $truename . '</a>'; + /* + * Always activate links for Browse, Search and Empty, even if + * the icons are greyed, because + * 1. for views, we don't know the number of rows at this point + * 2. for tables, another source could have populated them since the + * page was generated + * + * I could have used the PHP ternary conditional operator but I find + * the code easier to read without this operator. + */ + if ($each_table['TABLE_ROWS'] > 0 || $table_is_view) { + $may_have_rows = true; } else { - $browse_table = $titles['NoBrowse']; - $search_table = $titles['NoSearch']; - $browse_table_label = '<a href="tbl_structure.php?' . $tbl_url_query . '">' . $truename . '</a>'; + $may_have_rows = false; } + $browse_table = '<a href="sql.php?' . $tbl_url_query . '&pos=0">'; + if ($may_have_rows) { + $browse_table .= $titles['Browse']; + } else { + $browse_table .= $titles['NoBrowse']; + } + $browse_table .= '</a>'; + + $search_table = '<a href="tbl_select.php?' . $tbl_url_query . '">'; + if ($may_have_rows) { + $search_table .= $titles['Search']; + } else { + $search_table .= $titles['NoSearch']; + } + $search_table .= '</a>'; + + $browse_table_label = '<a href="sql.php?' . $tbl_url_query . '&pos=0">' . $truename . '</a>'; if (! $db_is_information_schema) { - if (! empty($each_table['TABLE_ROWS'])) { - $empty_table = '<a '; - if ($GLOBALS['cfg']['AjaxEnable']) { - $empty_table .= 'class="truncate_table_anchor"'; - } - $empty_table .= ' href="sql.php?' . $tbl_url_query - . '&sql_query='; - $empty_table .= urlencode('TRUNCATE ' . PMA_backquote($each_table['TABLE_NAME'])) - . '&message_to_show=' - . urlencode(sprintf(__('Table %s has been emptied'), htmlspecialchars($each_table['TABLE_NAME']))) - .'">' . $titles['Empty'] . '</a>'; + $empty_table = '<a '; + if ($GLOBALS['cfg']['AjaxEnable']) { + $empty_table .= 'class="truncate_table_anchor"'; + } + $empty_table .= ' href="sql.php?' . $tbl_url_query + . '&sql_query='; + $empty_table .= urlencode('TRUNCATE ' . PMA_backquote($each_table['TABLE_NAME'])) + . '&message_to_show=' + . urlencode(sprintf(__('Table %s has been emptied'), htmlspecialchars($each_table['TABLE_NAME']))) + .'">'; + if ($may_have_rows) { + $empty_table .= $titles['Empty']; } else { - $empty_table = $titles['NoEmpty']; + $empty_table .= $titles['NoEmpty']; } + $empty_table .= '</a>'; + $drop_query = 'DROP ' . ($table_is_view ? 'VIEW' : 'TABLE') . ' ' . PMA_backquote($each_table['TABLE_NAME']); diff --git a/import.php b/import.php index d706b60..07e5d18 100644 --- a/import.php +++ b/import.php @@ -259,7 +259,7 @@ if ($import_file != 'none' && !$error) { if (is_writable($tmp_subdir)) { - $import_file_new = $tmp_subdir . basename($import_file); + $import_file_new = $tmp_subdir . basename($import_file) . uniqid(); if (move_uploaded_file($import_file, $import_file_new)) { $import_file = $import_file_new; $file_to_unlink = $import_file_new; diff --git a/js/db_operations.js b/js/db_operations.js index b053694..ad39635 100644 --- a/js/db_operations.js +++ b/js/db_operations.js @@ -32,7 +32,7 @@ $(document).ready(function() { var $form = $(this); - var question = 'CREATE DATABASE ' + $('#new_db_name').val() + ' / DROP DATABASE ' + window.parent.db; + var question = escapeHtml('CREATE DATABASE ' + $('#new_db_name').val() + ' / DROP DATABASE ' + window.parent.db); PMA_prepareForAjaxRequest($form); /** diff --git a/js/db_search.js b/js/db_search.js index 79c444e..f9a9416 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -48,18 +48,20 @@ function deleteResult(result_path , msg , ajaxEnable){ { if(ajaxEnable) { + var $msg = PMA_ajaxShowMessage(PMA_messages['strDeleting']); /** Load the deleted option to the page*/ - $('#browse-results').load(result_path + " '"+'#result_query' + "'"); - $('#sqlqueryform').load(result_path + " '"+'#sqlqueryform' + "'"); - $('#togglequerybox').html(PMA_messages['strHideQueryBox']); - - /** Refresh the search results after the deletion */ - document.getElementById('buttonGo'). click(); - //PMA_ajaxShowMessage(PMA_messages['strDeleting']); - /** Show the results of the deletion option */ - $('#browse-results').show(); - $('#sqlqueryform').show(); - $('#togglequerybox').show(); + $('#browse-results').load(result_path + " '"+'#result_query' + "'", function () { // FIXME: no need for two ajax reqests here + $('#sqlqueryform').load(result_path + " '"+'#sqlqueryform' + "'", function () { // since they both fetch the same page + /** Refresh the search results after the deletion */ + document.getElementById('buttonGo').click(); + $('#togglequerybox').html(PMA_messages['strHideQueryBox']); + PMA_ajaxRemoveMessage($msg); + /** Show the results of the deletion option */ + $('#browse-results').show(); + $('#sqlqueryform').show(); + $('#togglequerybox').show(); + }); + }); } else { diff --git a/js/functions.js b/js/functions.js index b076661..824c174 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1842,24 +1842,48 @@ $(document).ready(function() { $("#popup_background").fadeIn("fast"); $("#enum_editor").fadeIn("fast"); - // Get the values - var values = $(this).parent().prev("input").attr("value").split(","); - $.each(values, function(index, val) { - if(jQuery.trim(val) != "") { - // enclose the string in single quotes if it's not already - if(val.substr(0, 1) != "'") { - val = "'" + val; - } - if(val.substr(val.length-1, val.length) != "'") { - val = val + "'"; - } - // escape the single quotes, except the mandatory ones enclosing the entire string - val = val.substr(1, val.length-2).replace(/''/g, "'").replace(/\\\\/g, '\\').replace(/\\'/g, "'").replace(/'/g, "'"); - // escape the greater-than symbol - val = val.replace(/>/g, ">"); - $("#enum_editor #values").append("<input type='text' value=" + val + " />"); + // Get the values as a string + var inputstring = $(this) + .parent() + .prev("input") + .val(); + // Escape html entities + inputstring = $('<div/>') + .text(inputstring) + .html(); + // Parse the values, escaping quotes and + // slashes on the fly, into an array + var values = []; + var in_string = false; + var curr, next, buffer = ''; + for (var i=0; i<inputstring.length; i++) { + curr = inputstring.charAt(i); + next = i == inputstring.length ? '' : inputstring.charAt(i+1); + if (! in_string && curr == "'") { + in_string = true; + } else if (in_string && curr == "\\" && next == "\\") { + buffer += "\"; + i++; + } else if (in_string && next == "'" && (curr == "'" || curr == "\\")) { + buffer += "'"; + i++; + } else if (in_string && curr == "'") { + in_string = false; + values.push(buffer); + buffer = ''; + } else if (in_string) { + buffer += curr; } - }); + } + if (buffer.length > 0) { + values.push(buffer); + } + // Add the parsed values to the editor + for (var i=0; i<values.length; i++) { + $("#enum_editor #values").append( + "<input type='text' value='" + values[i] + "' />" + ); + } // So we know which column's data is being edited $("#enum_editor").append("<input type='hidden' value='" + $(this).parent().prev("input").attr("id") + "' />"); return false; @@ -2249,15 +2273,7 @@ $(document).ready(function() { * Load version information asynchronously. */ if ($('.jsversioncheck').length > 0) { - (function() { - var s = document.createElement('script'); - s.type = 'text/javascript'; - s.async = true; - s.src = 'http://www.phpmyadmin.net/home_page/version.js'; - s.onload = PMA_current_version; - var x = document.getElementsByTagName('script')[0]; - x.parentNode.insertBefore(s, x); - })(); + $.getScript('http://www.phpmyadmin.net/home_page/version.js', PMA_current_version); } /** diff --git a/js/sql.js b/js/sql.js index ad91104..3ad3d6e 100644 --- a/js/sql.js +++ b/js/sql.js @@ -705,6 +705,7 @@ $(document).ready(function() { // Make the Ajax call and get the data, wrap it and insert it $.post('sql.php', { 'token' : window.parent.token, + 'server' : window.parent.server, 'db' : window.parent.db, 'ajax_request' : true, 'sql_query' : sql_query, @@ -728,6 +729,7 @@ $(document).ready(function() { var post_params = { 'ajax_request' : true, 'get_relational_values' : true, + 'server' : window.parent.server, 'db' : window.parent.db, 'table' : window.parent.table, 'column' : field_name, @@ -753,6 +755,7 @@ $(document).ready(function() { var post_params = { 'ajax_request' : true, 'get_enum_values' : true, + 'server' : window.parent.server, 'db' : window.parent.db, 'table' : window.parent.table, 'column' : field_name, @@ -776,6 +779,7 @@ $(document).ready(function() { var post_params = { 'ajax_request' : true, 'get_set_values' : true, + 'server' : window.parent.server, 'db' : window.parent.db, 'table' : window.parent.table, 'column' : field_name, @@ -991,6 +995,7 @@ $(document).ready(function() { 'sql_query' : sql_query, 'disp_direction' : disp_mode, 'token' : window.parent.token, + 'server' : window.parent.server, 'db' : window.parent.db, 'table' : window.parent.table, 'clause_is_unique' : nonunique, diff --git a/js/tbl_change.js b/js/tbl_change.js index 8fc7eca..234e4e1 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -26,14 +26,13 @@ function nullify(theType, urlField, md5Field, multi_edit) rowForm.elements['funcs' + multi_edit + '[' + md5Field + ']'].selectedIndex = -1; } - // "SET" field , "ENUM" field with more than 20 characters - // or foreign key field (drop-down) - if (theType == 1 || theType == 3 || theType == 4) { - rowForm.elements['field_' + md5Field + multi_edit + '[]'].selectedIndex = -1; + // "ENUM" field with more than 20 characters + if (theType == 1) { + rowForm.elements['fields' + multi_edit + '[' + md5Field + ']'][1].selectedIndex = -1; } // Other "ENUM" field else if (theType == 2) { - var elts = rowForm.elements['field_' + md5Field + multi_edit + '[]']; + var elts = rowForm.elements['fields' + multi_edit + '[' + md5Field + ']']; // when there is just one option in ENUM: if (elts.checked) { elts.checked = false; @@ -45,9 +44,17 @@ function nullify(theType, urlField, md5Field, multi_edit) } // end if } + // "SET" field + else if (theType == 3) { + rowForm.elements['fields' + multi_edit + '[' + md5Field + '][]'].selectedIndex = -1; + } + // Foreign key field (drop-down) + else if (theType == 4) { + rowForm.elements['fields' + multi_edit + '[' + md5Field + ']'].selectedIndex = -1; + } // foreign key field (with browsing icon for foreign values) else if (theType == 6) { - rowForm.elements['field_' + md5Field + multi_edit + '[]'].value = ''; + rowForm.elements['fields' + multi_edit + '[' + md5Field + ']'].value = ''; } // Other field types else /*if (theType == 5)*/ { diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 493f0eb..97ec6c2 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -42,6 +42,10 @@ $(document).ready(function() { */ var curr_column_name = $(curr_row).children('th').children('label').text(); /** + * @var $after_field_item Corresponding entry in the 'After' field. + */ + var $after_field_item = $("select[name='after_field'] option[value='" + curr_column_name + "']"); + /** * @var question String containing the question to be asked for confirmation */ var question = PMA_messages['strDoYouReally'] + ' :\n ALTER TABLE `' + escapeHtml(curr_table_name) + '` DROP `' + escapeHtml(curr_column_name) + '`'; @@ -53,6 +57,7 @@ $(document).ready(function() { $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) { if(data.success == true) { PMA_ajaxShowMessage(data.message); + $after_field_item.remove(); $(curr_row).hide("medium").remove(); } else { diff --git a/libraries/Config.class.php b/libraries/Config.class.php index f42ad6e..bd02527 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.7.1'); + $this->set('PMA_VERSION', '3.4.8-rc1'); /** * @deprecated */ diff --git a/libraries/Error.class.php b/libraries/Error.class.php index 2cfd5fe..595799b 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -175,7 +175,7 @@ class PMA_Error extends PMA_Message $this->getMessage() . $this->getFile() . $this->getLine() . - $this->getBacktrace() + serialize($this->getBacktrace()) ); } diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index c04d5a2..93b567a 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -549,6 +549,10 @@ function PMA_auth_set_user() $cfg['Server']['user'] = $GLOBALS['PHP_AUTH_USER']; $cfg['Server']['password'] = $GLOBALS['PHP_AUTH_PW']; + // Avoid showing the password in phpinfo()'s output + unset($GLOBALS['PHP_AUTH_PW']); + unset($_SERVER['PHP_AUTH_PW']); + $_SESSION['last_access_time'] = time(); // Name and password cookies need to be refreshed each time diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php index b3d305a..b4bc030 100644 --- a/libraries/auth/http.auth.lib.php +++ b/libraries/auth/http.auth.lib.php @@ -207,6 +207,10 @@ function PMA_auth_set_user() $cfg['Server']['user'] = $PHP_AUTH_USER; $cfg['Server']['password'] = $PHP_AUTH_PW; + // Avoid showing the password in phpinfo()'s output + unset($GLOBALS['PHP_AUTH_PW']); + unset($_SERVER['PHP_AUTH_PW']); + return true; } // end of the 'PMA_auth_set_user()' function diff --git a/libraries/common.lib.php b/libraries/common.lib.php index ad38266..caeeee2 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1059,13 +1059,10 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view } else { // Parse SQL if needed $parsed_sql = PMA_SQP_parse($query_base); - if (PMA_SQP_isError()) { - unset($parsed_sql); - } } // Analyze it - if (isset($parsed_sql)) { + if (isset($parsed_sql) && ! PMA_SQP_isError()) { $analyzed_display_query = PMA_SQP_analyze($parsed_sql); // Here we append the LIMIT added for navigation, to // enable its display. Adding it higher in the code diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index 44dc3a8..4dc7eb0 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -75,6 +75,10 @@ function PMA_fillTooltip(&$tooltip_truename, &$tooltip_aliasname, $table) // remove InnoDB comment from end, just the minimal part (*? is non greedy) $table['Comment'] = preg_replace('@; InnoDB free:.*?$@', '', $table['Comment']); } + // views have VIEW as comment so it's not a real comment put by a user + if ('VIEW' == $table['Comment']) { + $table['Comment'] = ''; + } if (empty($table['Comment'])) { $table['Comment'] = $table['Name']; } else { diff --git a/libraries/import/ods.php b/libraries/import/ods.php index 9016016..cd48f68 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -42,9 +42,6 @@ if (isset($plugin_list)) { return; } -ini_set('memory_limit', '128M'); -set_time_limit(120); - $i = 0; $len = 0; $buffer = ""; diff --git a/libraries/import/xml.php b/libraries/import/xml.php index ce20fe7..0afbd15 100644 --- a/libraries/import/xml.php +++ b/libraries/import/xml.php @@ -35,9 +35,6 @@ if (isset($plugin_list)) { return; } -ini_set('memory_limit', '128M'); -set_time_limit(120); - $i = 0; $len = 0; $buffer = ""; diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 137b83a..530f150 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -373,7 +373,7 @@ $GLOBALS['lang_path'] = './locale/'; /** * Load gettext functions. */ -require './libraries/php-gettext/gettext.inc'; +require GETTEXT_INC; /** * @global string interface language diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index c9f1242..53ad9d7 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -1,27 +1,27 @@ -<?php +<?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** -* PMA_getMatchingTables places matching tables in source +* PMA_getMatchingTables places matching tables in source * and target databases in $matching_tables array whereas * $uncommon_source_tables array gets the tables present in * source database but are absent from target database. * Criterion for matching tables is just comparing their names. -* -* @param $trg_tables array of target database table names, -* @param $src_tables array of source database table names, -* -* @param &$matching_tables empty array passed by reference to save names of matching tables, -* @param &$uncommon_source_tables empty array passed by reference to save names of tables present in +* +* @param $trg_tables array of target database table names, +* @param $src_tables array of source database table names, +* +* @param &$matching_tables empty array passed by reference to save names of matching tables, +* @param &$uncommon_source_tables empty array passed by reference to save names of tables present in * source database but absent from target database */ - + function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$uncommon_source_tables) { - for($k=0; $k< sizeof($src_tables); $k++) { - $present_in_target = false; - for($l=0; $l < sizeof($trg_tables); $l++) { - if ($src_tables[$k] === $trg_tables[$l]) { + for($k=0; $k< sizeof($src_tables); $k++) { + $present_in_target = false; + for($l=0; $l < sizeof($trg_tables); $l++) { + if ($src_tables[$k] === $trg_tables[$l]) { $present_in_target = true; $matching_tables[] = $src_tables[$k]; } @@ -35,30 +35,30 @@ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$un /** * PMA_getNonMatchingTargetTables() places tables present * in target database but are absent from source database -* -* @param $trg_tables array of target database table names, -* -* @param $matching_tables $matching tables array containing names of matching tables, -* @param &$uncommon_target_tables empty array passed by reference to save names of tables presnet in +* +* @param $trg_tables array of target database table names, +* +* @param $matching_tables $matching tables array containing names of matching tables, +* @param &$uncommon_target_tables empty array passed by reference to save names of tables presnet in * target database but absent from source database */ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommon_target_tables) { for($c=0; $c<sizeof($trg_tables) ;$c++) { - $match = false; + $match = false; for($d=0; $d < sizeof($matching_tables); $d++) { if ($trg_tables[$c] === $matching_tables[$d]) { $match=true; - } + } } if ($match === false) { $uncommon_target_tables[] = $trg_tables[$c]; - } + } } } - + /** * PMA_dataDiffInTables() finds the difference in source and target matching tables by * first comparing source table's primary key entries with target table enteries. @@ -67,32 +67,32 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo * field values also, in order to check whether update is required or not. * If update is required, it is placed in $update_array * Otherwise that entry is placed in the $insert_array. - * + * * @uses PMA_DBI_get_fields() * @uses PMA_DBI_get_column_values() * @uses PMA_DBI_fetch_result() - * + * * @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 $index Index of a table from $matching_table array - * - * @param $update_array A three dimensional array passed by reference to + * @param $index Index of a table from $matching_table array + * + * @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 + * @param $insert_array A three dimensional array passed by reference to * contain inserts required for each matching table - * @param $fields_num A two dimensional array passed by reference to + * @param $fields_num A two dimensional array passed by reference to * contain number of fields for each matching table * @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 $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) -{ +{ if (isset($matching_table[$matching_table_index])) { $fld = array(); $fld_results = PMA_DBI_get_fields($src_db, $matching_table[$matching_table_index], $src_link); @@ -104,80 +104,80 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching $is_key[] = $field_name; } $fld[] = $field_name; - } + } } - $matching_tables_fields[$matching_table_index] = $fld; + $matching_tables_fields[$matching_table_index] = $fld; $fields_num[$matching_table_index] = sizeof($fld); $matching_tables_keys[$matching_table_index] = $is_key; - - $source_result_set = PMA_DBI_get_column_values($src_db, $matching_table[$matching_table_index], $is_key, $src_link); + + $source_result_set = PMA_DBI_get_column_values($src_db, $matching_table[$matching_table_index], $is_key, $src_link); $source_size = sizeof($source_result_set); - + $trg_fld_results = PMA_DBI_get_fields($trg_db, $matching_table[$matching_table_index], $trg_link); $all_keys_match = true; $trg_keys = array(); - + if (isset($trg_fld_results)) { foreach ($trg_fld_results as $each_field) { if ($each_field['Key'] == 'PRI') { - $trg_keys[] = $each_field['Field']; + $trg_keys[] = $each_field['Field']; if (! (in_array($each_field['Field'], $is_key))) { $all_keys_match = false; - } - } - } + } + } + } } $update_row = 0; $insert_row = 0; $update_field = 0; $insert_field = 0; - $starting_index = 0; - - for ($j = 0; $j < $source_size; $j++) { + $starting_index = 0; + + for ($j = 0; $j < $source_size; $j++) { $starting_index = 0; - $update_field = 0; + $update_field = 0; if (isset($source_result_set[$j]) && ($all_keys_match)) { // Query the target server to see which rows already exist - $trg_select_query = "SELECT * FROM " . PMA_backquote($trg_db) . "." + $trg_select_query = "SELECT * FROM " . PMA_backquote($trg_db) . "." . PMA_backquote($matching_table[$matching_table_index]) . " WHERE "; - + if (sizeof($is_key) == 1) { - $trg_select_query .= $is_key[0]. "='" . $source_result_set[$j] . "'"; + $trg_select_query .= PMA_backquote($is_key[0]). "='" . $source_result_set[$j] . "'"; } 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]] . "'"; + $trg_select_query .= PMA_backquote($is_key[$k]) . "='" . $source_result_set[$j][$is_key[$k]] . "'"; if ($k < (sizeof($is_key)-1)){ - $trg_select_query .= " AND "; + $trg_select_query .= " AND "; } - } + } } - + $target_result_set = PMA_DBI_fetch_result($trg_select_query, null, null, $trg_link); if ($target_result_set) { // Fetch the row from the source server to do a comparison - $src_select_query = "SELECT * FROM " . PMA_backquote($src_db) . "." + $src_select_query = "SELECT * FROM " . PMA_backquote($src_db) . "." . PMA_backquote($matching_table[$matching_table_index]) . " WHERE "; - + if (sizeof($is_key) == 1) { - $src_select_query .= $is_key[0] . "='" . $source_result_set[$j] . "'"; + $src_select_query .= PMA_backquote($is_key[0]) . "='" . $source_result_set[$j] . "'"; } else if(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]] . "'"; + $src_select_query .= PMA_backquote($is_key[$k]) . "='" . $source_result_set[$j][$is_key[$k]] . "'"; if ($k < (sizeof($is_key) - 1)){ - $src_select_query .= " AND "; + $src_select_query .= " AND "; } } - } - + } + $src_result_set = PMA_DBI_fetch_result($src_select_query, null, null, $src_link); - + /** * Comparing each corresponding field of the source and target matching rows. - * Placing the primary key, value of primary key, field to be updated, and the - * new value of field to be updated in each row of the update array. + * Placing the primary key, value of primary key, field to be updated, and the + * new value of field to be updated in each row of the update array. */ for ($m = 0; ($m < $fields_num[$matching_table_index]) && ($starting_index == 0) ; $m++) { if (isset($src_result_set[0][$fld[$m]])) { @@ -187,19 +187,19 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching if ($source_result_set[$j]) { $update_array[$matching_table_index][$update_row][$is_key[0]] = $source_result_set[$j]; } - } elseif (sizeof($is_key) > 1) { + } elseif (sizeof($is_key) > 1) { for ($n=0; $n < sizeof($is_key); $n++) { if (isset($src_result_set[0][$is_key[$n]])) { $update_array[$matching_table_index][$update_row][$is_key[$n]] = $src_result_set[0][$is_key[$n]]; } } } - + $update_array[$matching_table_index][$update_row][$update_field] = $fld[$m]; - + $update_field++; if (isset($src_result_set[0][$fld[$m]])) { - $update_array[$matching_table_index][$update_row][$update_field] = $src_result_set[0][$fld[$m]]; + $update_array[$matching_table_index][$update_row][$update_field] = $src_result_set[0][$fld[$m]]; $update_field++; } $starting_index = $m; @@ -209,21 +209,21 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching if (sizeof($is_key) == 1) { if ($source_result_set[$j]) { $update_array[$matching_table_index][$update_row][$is_key[0]] = $source_result_set[$j]; - + } - } elseif (sizeof($is_key) > 1) { + } elseif (sizeof($is_key) > 1) { for ($n = 0; $n < sizeof($is_key); $n++) { if (isset($src_result_set[0][$is_key[$n]])) { $update_array[$matching_table_index][$update_row][$is_key[$n]] = $src_result_set[0][$is_key[$n]]; } } } - + $update_array[$matching_table_index][$update_row][$update_field] = $fld[$m]; - + $update_field++; if (isset($src_result_set[0][$fld[$m]])) { - $update_array[$matching_table_index][$update_row][$update_field] = $src_result_set[0][$fld[$m]]; + $update_array[$matching_table_index][$update_row][$update_field] = $src_result_set[0][$fld[$m]]; $update_field++; } $starting_index = $m; @@ -232,28 +232,28 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching } } for ($m = $starting_index + 1; $m < $fields_num[$matching_table_index] ; $m++) - { + { if (isset($src_result_set[0][$fld[$m]])) { - if (isset($target_result_set[0][$fld[$m]])) { + if (isset($target_result_set[0][$fld[$m]])) { if (($src_result_set[0][$fld[$m]] != $target_result_set[0][$fld[$m]]) && (!(in_array($fld[$m], $is_key)))) { - $update_row--; + $update_row--; $update_array[$matching_table_index][$update_row][$update_field] = $fld[$m]; $update_field++; if ($src_result_set[0][$fld[$m]]) { $update_array[$matching_table_index][$update_row][$update_field] = $src_result_set[0][$fld[$m]]; $update_field++; } - $update_row++; + $update_row++; } } else { - $update_row--; + $update_row--; $update_array[$matching_table_index][$update_row][$update_field] = $fld[$m]; $update_field++; if ($src_result_set[0][$fld[$m]]) { $update_array[$matching_table_index][$update_row][$update_field] = $src_result_set[0][$fld[$m]]; $update_field++; } - $update_row++; + $update_row++; } } } @@ -265,7 +265,7 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching if (isset($source_result_set[$j])) { $insert_array[$matching_table_index][$insert_row][$is_key[0]] = $source_result_set[$j]; } - } elseif (sizeof($is_key) > 1) { + } elseif (sizeof($is_key) > 1) { 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]]; @@ -277,13 +277,13 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching } else { /** * Placing the primary key, and the value of primary key of the row that is to be inserted in the target table - * This condition is met when there is an additional column in the source table + * This condition is met when there is an additional column in the source table */ if (sizeof($is_key) == 1) { if (isset($source_result_set[$j])) { $insert_array[$matching_table_index][$insert_row][$is_key[0]] = $source_result_set[$j]; } - } elseif (sizeof($is_key) > 1) { + } elseif (sizeof($is_key) > 1) { 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]]; @@ -293,34 +293,34 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching $insert_row++; } } // for loop ends - } -} + } +} /** * PMA_findDeleteRowsFromTargetTables finds the rows which are to be deleted from target table. * @uses sizeof() * @uses PMA_DBI_get_column_values() * @uses in_array() -* -* @param $delete_array array containing rows that are to be deleted +* +* @param $delete_array array containing rows that are to be deleted * @param $matching_table array containing matching table names * @param $matching_table_index index of a table from $matching_table array * @param $trg_keys array of target table keys * @param $src_keys array of source table keys * @param $trg_db name of target database * @param $trg_link connection established with target server -* @param $src_db name of source database +* @param $src_db name of source database * @param $src_link connection established with source server -* +* */ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $matching_table_index, $trg_keys, $src_keys, $trg_db, $trg_link,$src_db, $src_link) { if (isset($trg_keys[$matching_table_index])) { - $target_key_values = PMA_DBI_get_column_values($trg_db, $matching_table[$matching_table_index], $trg_keys[$matching_table_index], $trg_link); - $target_row_size = sizeof($target_key_values); + $target_key_values = PMA_DBI_get_column_values($trg_db, $matching_table[$matching_table_index], $trg_keys[$matching_table_index], $trg_link); + $target_row_size = sizeof($target_key_values); } if (isset($src_keys[$matching_table_index])) { - $source_key_values = PMA_DBI_get_column_values($src_db, $matching_table[$matching_table_index], $src_keys[$matching_table_index], $src_link); - $source_size = sizeof($source_key_values); + $source_key_values = PMA_DBI_get_column_values($src_db, $matching_table[$matching_table_index], $src_keys[$matching_table_index], $src_link); + $source_size = sizeof($source_key_values); } $all_keys_match = 1; for ($a = 0; $a < sizeof($trg_keys[$matching_table_index]); $a++) { @@ -328,7 +328,7 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma if (! (in_array($trg_keys[$matching_table_index][$a], $src_keys[$matching_table_index]))) { $all_keys_match = 0; } - } + } } if (! ($all_keys_match)) { if (isset($target_key_values)) { @@ -337,17 +337,17 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma } if (isset($trg_keys[$matching_table_index])) { if ((sizeof($trg_keys[$matching_table_index]) == 1) && $all_keys_match) { - $row = 0; + $row = 0; if (isset($target_key_values)) { for ($i = 0; $i < sizeof($target_key_values); $i++) { if (! (in_array($target_key_values[$i], $source_key_values))) { $delete_array[$matching_table_index][$row] = $target_key_values[$i]; - $row++; + $row++; } - } + } } } elseif ((sizeof($trg_keys[$matching_table_index]) > 1) && $all_keys_match) { - $row = 0; + $row = 0; if (isset($target_key_values)) { for ($i = 0; $i < sizeof($target_key_values); $i++) { $is_present = false; @@ -356,7 +356,7 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma for ($k = 0; $k < sizeof($trg_keys[$matching_table_index]); $k++) { if ($target_key_values[$i][$trg_keys[$matching_table_index][$k]] != $source_key_values[$j][$trg_keys[$matching_table_index][$k]]) { $check = false; - } + } } if ($check) { $is_present = true; @@ -368,16 +368,16 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma } $row++; } - } - } + } + } } - } + } } /** * PMA_dataDiffInUncommonTables() finds the data difference in $source_tables_uncommon * @uses PMA_DBI_fetch_result() -* +* * @param $source_tables_uncommon array of table names; containing table names that are in source db and not in target db * @param $src_db name of source database * @param $src_link connection established with source server @@ -387,9 +387,9 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_link, $index, &$row_count) { - $query = "SELECT COUNT(*) FROM " . PMA_backquote($src_db) . "." . PMA_backquote($source_tables_uncommon[$index]); - $rows = PMA_DBI_fetch_result($query, null, null, $src_link); - $row_count[$index] = $rows[0]; + $query = "SELECT COUNT(*) FROM " . PMA_backquote($src_db) . "." . PMA_backquote($source_tables_uncommon[$index]); + $rows = PMA_DBI_fetch_result($query, null, null, $src_link); + $row_count[$index] = $rows[0]; } /** @@ -397,35 +397,35 @@ function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_lin * * @uses PMA_DBI_fetch_result() * @uses PMA_backquote() -* -* @param $table Array containing matching tables' names +* +* @param $table Array containing matching tables' names * @param $update_array A three dimensional array containing field * value updates required for each matching table -* @param $src_db Name of source database +* @param $src_db Name of source database * @param $trg_db Name of target database * @param $trg_link Connection established with target server -* @param $matching_table_index index of matching table in matching_table_array +* @param $matching_table_index index of matching table in matching_table_array * @param $display true/false value -*/ +*/ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_link, $matching_table_index, $matching_table_keys, $display) -{ +{ if (isset($update_array[$matching_table_index])) { if (sizeof($update_array[$matching_table_index])) { - + for ($update_row = 0; $update_row < sizeof($update_array[$matching_table_index]); $update_row++) { - - if (isset($update_array[$matching_table_index][$update_row])) { + + if (isset($update_array[$matching_table_index][$update_row])) { $update_fields_num = sizeof($update_array[$matching_table_index][$update_row])-sizeof($matching_table_keys[$matching_table_index]); if ($update_fields_num > 0) { - $query = "UPDATE " . PMA_backquote($trg_db) . "." .PMA_backquote($table[$matching_table_index]) . " SET "; - + $query = "UPDATE " . PMA_backquote($trg_db) . "." .PMA_backquote($table[$matching_table_index]) . " SET "; + for ($update_field = 0; $update_field < $update_fields_num; $update_field = $update_field+2) { if (isset($update_array[$matching_table_index][$update_row][$update_field]) && isset($update_array[$matching_table_index][$update_row][$update_field+1])) { - $query .= $update_array[$matching_table_index][$update_row][$update_field] . "='" . $update_array[$matching_table_index][$update_row][$update_field+1] . "'"; + $query .= PMA_backquote($update_array[$matching_table_index][$update_row][$update_field]) . "='" . $update_array[$matching_table_index][$update_row][$update_field+1] . "'"; } if ($update_field < ($update_fields_num - 2)) { - $query .= ", "; + $query .= ", "; } } $query .= " WHERE "; @@ -433,8 +433,8 @@ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_li for ($key = 0; $key < sizeof($matching_table_keys[$matching_table_index]); $key++) { if (isset($matching_table_keys[$matching_table_index][$key])) { - - $query .= $matching_table_keys[$matching_table_index][$key] . "='" . $update_array[$matching_table_index][$update_row][$matching_table_keys[$matching_table_index][$key]] . "'"; + + $query .= PMA_backquote($matching_table_keys[$matching_table_index][$key]) . "='" . $update_array[$matching_table_index][$update_row][$matching_table_keys[$matching_table_index][$key]] . "'"; } if ($key < (sizeof($matching_table_keys[$matching_table_index]) - 1)) { $query .= " AND "; @@ -443,29 +443,29 @@ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_li } if ($display == true) { echo "" . $query . ""; - } + } PMA_DBI_try_query($query, $trg_link, 0); } - } + } } } } } /** * PMA_insertIntoTargetTable() inserts missing rows in the target table using $array_insert[$matching_table_index] -* +* * @uses PMA_DBI_fetch_result() * @uses PMA_backquote() -* -* +* +* * @param $matching_table array containing matching table names * @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 $table_fields array containing field names of a table -* @param $array_insert -* @param $matching_table_index index of matching table in matching_table_array +* @param $array_insert +* @param $matching_table_index index of matching table in matching_table_array * @param $matching_tables_keys array containing field names that are keys in the matching table * @param $source_columns array containing source column information * @param $add_column_array array containing column names that are to be added in target table @@ -474,79 +474,79 @@ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_li * @param $uncommon_tables array containing table names that are present in source db but not in targt db * @param $uncommon_tables_fields array containing field names of the uncommon tables * @param $uncommon_cols column names that are present in target table and not in source table -* @param $alter_str_array array containing column names that are to be altered -* @param $source_indexes column names on which indexes are made in source table -* @param $target_indexes column names on which indexes are made in target table +* @param $alter_str_array array containing column names that are to be altered +* @param $source_indexes column names on which indexes are made in source table +* @param $target_indexes column names on which indexes are made in target table * @param $add_indexes_array array containing column names on which index is to be added in target table -* @param $alter_indexes_array array containing column names whose indexes are to be altered. Only index name and uniqueness of an index can be changed +* @param $alter_indexes_array array containing column names whose indexes are to be altered. Only index name and uniqueness of an index can be changed * @param $delete_array array containing rows that are to be deleted * @param $update_array array containing rows that are to be updated in target * @param $display true/false value * */ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, $trg_link, $table_fields, &$array_insert, $matching_table_index, - $matching_tables_keys, $source_columns, &$add_column_array, $criteria, $target_tables_keys, $uncommon_tables, &$uncommon_tables_fields,$uncommon_cols, + $matching_tables_keys, $source_columns, &$add_column_array, $criteria, $target_tables_keys, $uncommon_tables, &$uncommon_tables_fields,$uncommon_cols, &$alter_str_array,&$source_indexes, &$target_indexes, &$add_indexes_array, &$alter_indexes_array, &$delete_array, &$update_array, $display) -{ +{ if(isset($array_insert[$matching_table_index])) { if (sizeof($array_insert[$matching_table_index])) { for ($insert_row = 0; $insert_row< sizeof($array_insert[$matching_table_index]); $insert_row++) { if (isset($array_insert[$matching_table_index][$insert_row][$matching_tables_keys[$matching_table_index][0]])) { - + $select_query = "SELECT * FROM " . PMA_backquote($src_db) . "." . PMA_backquote($matching_table[$matching_table_index]) . " WHERE "; for ($i = 0; $i < sizeof($matching_tables_keys[$matching_table_index]); $i++) { $select_query .= $matching_tables_keys[$matching_table_index][$i] . "='"; $select_query .= $array_insert[$matching_table_index][$insert_row][$matching_tables_keys[$matching_table_index][$i]] . "'" ; - + if ($i < (sizeof($matching_tables_keys[$matching_table_index]) - 1)) { - $select_query.= " AND "; + $select_query.= " AND "; } } $select_query .= "; "; $result = PMA_DBI_fetch_result ($select_query, null, null, $src_link); $insert_query = "INSERT INTO " . PMA_backquote($trg_db) . "." . PMA_backquote($matching_table[$matching_table_index]) ." ("; - - for ($field_index = 0; $field_index < sizeof($table_fields[$matching_table_index]); $field_index++) + + for ($field_index = 0; $field_index < sizeof($table_fields[$matching_table_index]); $field_index++) { - $insert_query .= $table_fields[$matching_table_index][$field_index]; - - $is_fk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $trg_db ."' + $insert_query .= PMA_backquote($table_fields[$matching_table_index][$field_index]); + + $is_fk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $trg_db ."' AND TABLE_NAME = '" . $matching_table[$matching_table_index]. "'AND COLUMN_NAME = '" . $table_fields[$matching_table_index][$field_index] . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;" ; - + $is_fk_result = PMA_DBI_fetch_result($is_fk_query, null, null, $trg_link); if (sizeof($is_fk_result) > 0) { for ($j = 0; $j < sizeof($is_fk_result); $j++) { $table_index = array_keys($matching_table, $is_fk_result[$j]['REFERENCED_TABLE_NAME']); - + if (isset($alter_str_array[$table_index[0]])) { PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, $source_columns, $alter_str_array, $matching_tables_fields, $criteria, $matching_tables_keys, $target_tables_keys, $table_index[0], $display); - unset($alter_str_array[$table_index[0]]); - } + unset($alter_str_array[$table_index[0]]); + } if (isset($uncommon_columns[$table_index[0]])) { PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $table_index[0], $display); - unset($uncommon_columns[$table_index[0]]); - } + unset($uncommon_columns[$table_index[0]]); + } if (isset($add_column_array[$table_index[0]])) { PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $table_index[0], $target_tables_keys, $matching_tables_keys, $trg_db, $trg_link, $src_db, $src_link); - + if (isset($delete_array[$table_index[0]])) { PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_index[0], $target_tables_keys, $delete_array, $display); - unset($delete_array[$table_index[0]]); - } - PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns, $add_column_array, + unset($delete_array[$table_index[0]]); + } + PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns, $add_column_array, $matching_tables_fields, $criteria, $matching_tables_keys, $target_tables_keys, $uncommon_tables,$uncommon_tables_fields, $table_index[0], $uncommon_cols, $display); unset($add_column_array[$table_index[0]]); } - if (isset($add_indexes_array[$table_index[0]]) || isset($remove_indexes_array[$table_index[0]]) + if (isset($add_indexes_array[$table_index[0]]) || isset($remove_indexes_array[$table_index[0]]) || isset($alter_indexes_array[$table_index[0]])) { - PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, - $remove_indexes_array, $table_index[0], $display); - + PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, + $remove_indexes_array, $table_index[0], $display); + unset($add_indexes_array[$table_index[0]]); unset($alter_indexes_array[$table_index[0]]); unset($remove_indexes_array[$table_index[0]]); @@ -559,16 +559,16 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, if (isset($array_insert[$table_index[0]])) { PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, $trg_link, $table_fields, $array_insert, $table_index[0], $matching_tables_keys, $source_columns, $add_column_array, $criteria, $target_tables_keys, $uncommon_tables, - $uncommon_tables_fields, $uncommon_cols, $alter_str_array, $source_indexes, $target_indexes, $add_indexes_array, - $alter_indexes_array, $delete_array, $update_array, $display); + $uncommon_tables_fields, $uncommon_cols, $alter_str_array, $source_indexes, $target_indexes, $add_indexes_array, + $alter_indexes_array, $delete_array, $update_array, $display); unset($array_insert[$table_index[0]]); - } + } } } if ($field_index < sizeof($table_fields[$matching_table_index])-1) { $insert_query .= ", "; } - } + } $insert_query .= ") VALUES("; if (sizeof($table_fields[$matching_table_index]) == 1) { $insert_query .= "'" . PMA_sqlAddslashes($result[0]) . "'"; @@ -581,35 +581,35 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, } if ($field_index < (sizeof($table_fields[$matching_table_index])) - 1) { $insert_query .= " ," ; - } + } } - } + } $insert_query .= ");"; if ($display == true) { PMA_displayQuery($insert_query); } PMA_DBI_try_query($insert_query, $trg_link, 0); - } + } } } } -} +} /** -* PMA_createTargetTables() Create the missing table $uncommon_table in target database -* +* PMA_createTargetTables() Create the missing table $uncommon_table in target database +* * @uses PMA_DBI_get_fields() * @uses PMA_backquote() * @uses PMA_DBI_fetch_result() -* -* @param $src_db name of source database +* +* @param $src_db name of source database * @param $trg_db name of target database * @param $trg_link connection established with target server * @param $src_link connection established with source server * @param $uncommon_table name of table present in source but not in target -* @param $table_index index of table in matching_table_array +* @param $table_index index of table in matching_table_array * @param $uncommon_tables_fields field names of the uncommon table * @param $display true/false value -*/ +*/ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncommon_tables, $table_index, &$uncommon_tables_fields, $display) { if (isset($uncommon_tables[$table_index])) { @@ -619,20 +619,20 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm $field_name = $each_field['Field']; $fields[] = $field_name; } - $uncommon_tables_fields[$table_index] = $fields; - + $uncommon_tables_fields[$table_index] = $fields; + $Create_Query = PMA_DBI_fetch_value("SHOW CREATE TABLE " . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), 0, 1, $src_link); // Replace the src table name with a `dbname`.`tablename` - $Create_Table_Query = preg_replace('/' . preg_quote(PMA_backquote($uncommon_tables[$table_index]), '/') . '/', + $Create_Table_Query = preg_replace('/' . preg_quote(PMA_backquote($uncommon_tables[$table_index]), '/') . '/', PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]), $Create_Query, $limit = 1 ); - $is_fk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $src_db . "' + $is_fk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $src_db . "' AND TABLE_NAME = '" . $uncommon_tables[$table_index] . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;" ; - + $is_fk_result = PMA_DBI_fetch_result($is_fk_query, null, null, $src_link); if (sizeof($is_fk_result) > 0) { for ($j = 0; $j < sizeof($is_fk_result); $j++) @@ -641,14 +641,14 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm $table_index = array_keys($uncommon_tables, $is_fk_result[$j]['REFERENCED_TABLE_NAME']); PMA_createTargetTables($src_db, $trg_db, $trg_link, $src_link, $uncommon_tables, $table_index[0], $uncommon_tables_fields, $display); unset($uncommon_tables[$table_index[0]]); - } + } } } if ($display == true) { echo '' . $Create_Table_Query . ''; } PMA_DBI_try_query($Create_Table_Query, $trg_link, 0); - } + } } /** * PMA_populateTargetTables() inserts data into uncommon tables after they have been created @@ -656,24 +656,24 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm * @uses PMA_backquote() * @uses sizeof() * @uses PMA_DBI_try_query() -* +* * @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 $uncommon_tables array containing uncommon table names (table names that are present in source but not in target db) -* @param $table_index index of table in matching_table_array +* @param $uncommon_tables array containing uncommon table names (table names that are present in source but not in target db) +* @param $table_index index of table in matching_table_array * @param $uncommon_tables_fields field names of the uncommon table * @param $display true/false value * * FIXME: This turns NULL values into '' (empty string) */ -function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $table_index, $uncommon_tables_fields, $display) -{ +function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $table_index, $uncommon_tables_fields, $display) +{ $display = false; // todo: maybe display some of the queries if they are not too numerous $unbuffered_result = PMA_DBI_try_query('SELECT * FROM ' . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), $src_link, PMA_DBI_QUERY_UNBUFFERED); if (false !== $unbuffered_result) { - $insert_query = 'INSERT INTO ' . PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]) . ' VALUES'; + $insert_query = 'INSERT INTO ' . PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]) . ' VALUES'; while ($one_row = PMA_DBI_fetch_row($unbuffered_result)) { $insert_query .= '('; $key_of_last_value = count($one_row) - 1; @@ -694,53 +694,54 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom } } /** -* PMA_deleteFromTargetTable() delete rows from target table +* PMA_deleteFromTargetTable() delete rows from target table * @uses sizeof() * @uses PMA_backquote() * @uses PMA_DBI_try_query() -* -* +* +* * @param $trg_db name of target database * @param $trg_link connection established with target server * @param $matching_tables array containing matching table names * @param $table_index index of table in matching_table_array * @param $target_table_keys primary key names of the target tables -* @param $delete array array containing the key values of rows that are to be deleted +* @param $delete array array containing the key values of rows that are to be deleted * @param $display true/false value */ -function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_index, $target_tables_keys, $delete_array, $display) +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++) { if (isset($target_tables_keys[$table_index])) { - $delete_query = 'DELETE FROM ' . PMA_backquote($trg_db) . '.' .PMA_backquote($matching_tables[$table_index]) . ' WHERE '; + $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++) { - $delete_query .= $target_tables_keys[$table_index][$y] . " = '"; - + + $delete_query .= PMA_backquote($target_tables_keys[$table_index][$y]) . " = '"; + if (sizeof($target_tables_keys[$table_index]) == 1) { - $delete_query .= $delete_array[$table_index][$i] . "'"; + $delete_query .= $delete_array[$table_index][$i] . "'"; } elseif (sizeof($target_tables_keys[$table_index]) > 1) { $delete_query .= $delete_array[$table_index][$i][$target_tables_keys[$table_index][$y]] . "'"; } if ($y < (sizeof($target_tables_keys[$table_index]) - 1)) { $delete_query .= ' AND '; } - $pk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE REFERENCED_TABLE_SCHEMA = '" . $trg_db . "' + $pk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE REFERENCED_TABLE_SCHEMA = '" . $trg_db . "' AND REFERENCED_TABLE_NAME = '" . $matching_tables[$table_index]."' AND REFERENCED_COLUMN_NAME = '" . $target_tables_keys[$table_index][$y] . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;"; - + $pk_query_result = PMA_DBI_fetch_result($pk_query, null, null, $trg_link); $result_size = sizeof($pk_query_result); - + if ($result_size > 0) { for ($b = 0; $b < $result_size; $b++) { - $drop_pk_query = "DELETE FROM " . PMA_backquote($pk_query_result[$b]['TABLE_SCHEMA']) . "." . PMA_backquote($pk_query_result[$b]['TABLE_NAME']) . " WHERE " . $pk_query_result[$b]['COLUMN_NAME'] . " = " . $target_tables_keys[$table_index][$y] . ";"; + $drop_pk_query = "DELETE FROM " . PMA_backquote($pk_query_result[$b]['TABLE_SCHEMA']) . "." . PMA_backquote($pk_query_result[$b]['TABLE_NAME']) . " WHERE " . PMA_backquote($pk_query_result[$b]['COLUMN_NAME']) . " = " . $target_tables_keys[$table_index][$y] . ";"; PMA_DBI_try_query($drop_pk_query, $trg_link, 0); - } - } - } + } + } + } } if ($display == true) { - echo '' . $delete_query . ''; + echo '' . $delete_query . ''; } PMA_DBI_try_query($delete_query, $trg_link, 0); } @@ -753,45 +754,45 @@ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_ * If column exists in target table but criteria is different then it is palced in $alter_str_array. * If column does not exist in source table but is present in target table then it is placed in $uncommon_columns. * Keys for all the source tables that have a corresponding target table are placed in $matching_tables_keys. -* Keys for all the target tables that have a corresponding source table are placed in $target_tables_keys. -* +* Keys for all the target tables that have a corresponding source table are placed in $target_tables_keys. +* * @uses PMA_DBI_get_columns_full() -* @uses sizeof() -* -* @param $src_db name of source database +* @uses sizeof() +* +* @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_tables array containing names of matching tables * @param $source_columns array containing columns information of the source tables * @param $target_columns array containing columns information of the target tables -* @param $alter_str_array three dimensional associative array first index being the matching table index, second index being column name for which target +* @param $alter_str_array three dimensional associative array first index being the matching table index, second index being column name for which target * column have some criteria different and third index containing the criteria which is different. -* @param $add_column_array two dimensional associative array, first index of the array contain the matching table number and second index contain the +* @param $add_column_array two dimensional associative array, first index of the array contain the matching table number and second index contain the * column name which is to be added in the target table * @param $uncommon_columns array containing the columns that are present in the target table but not in the source table * @param $criteria array containing the criterias which are to be checked for field that is present in source table and target table * @param $target_tables_keys array containing the field names which is key in the target table -* @param $matching_table_index integer number of the matching table -* +* @param $matching_table_index integer number of the matching table +* */ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, &$source_columns, &$target_columns, &$alter_str_array, - &$add_column_array, &$uncommon_columns, $criteria, &$target_tables_keys, $matching_table_index) + &$add_column_array, &$uncommon_columns, $criteria, &$target_tables_keys, $matching_table_index) { //Gets column information for source and target table $source_columns[$matching_table_index] = PMA_DBI_get_columns_full($src_db, $matching_tables[$matching_table_index], null, $src_link); $target_columns[$matching_table_index] = PMA_DBI_get_columns_full($trg_db, $matching_tables[$matching_table_index], null, $trg_link); foreach ($source_columns[$matching_table_index] as $column_name => $each_column) { if (isset($target_columns[$matching_table_index][$column_name]['Field'])) { - //If column exists in target table then matches criterias like type, null, collation, key, default, comment of the column + //If column exists in target table then matches criterias like type, null, collation, key, default, comment of the column for ($i = 0; $i < sizeof($criteria); $i++) { if ($source_columns[$matching_table_index][$column_name][$criteria[$i]] != $target_columns[$matching_table_index][$column_name][$criteria[$i]]) { if (($criteria[$i] == 'Default') && ($source_columns[$matching_table_index][$column_name][$criteria[$i]] == '' )) { - $alter_str_array[$matching_table_index][$column_name][$criteria[$i]] = 'None'; + $alter_str_array[$matching_table_index][$column_name][$criteria[$i]] = 'None'; } else { if (! (($criteria[$i] == 'Key') && (($source_columns[$matching_table_index][$column_name][$criteria[$i]] == 'MUL') - || ($target_columns[$matching_table_index][$column_name][$criteria[$i]] == 'MUL') - || ($source_columns[$matching_table_index][$column_name][$criteria[$i]] == 'UNI') + || ($target_columns[$matching_table_index][$column_name][$criteria[$i]] == 'MUL') + || ($source_columns[$matching_table_index][$column_name][$criteria[$i]] == 'UNI') || ($target_columns[$matching_table_index][$column_name][$criteria[$i]] == 'UNI')))) { $alter_str_array[$matching_table_index][$column_name][$criteria[$i]] = $source_columns[$matching_table_index][$column_name][$criteria[$i]]; } @@ -805,17 +806,17 @@ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matc //Finds column names that are present in target table but not in source table foreach ($target_columns[$matching_table_index] as $fld_name => $each_column) { if (! (isset($source_columns[$matching_table_index][$fld_name]['Field']))) { - $fields_uncommon[] = $fld_name; + $fields_uncommon[] = $fld_name; } if ($target_columns[$matching_table_index][$fld_name]['Key'] == 'PRI') { $keys[] = $fld_name; } } if (isset($fields_uncommon)) { - $uncommon_columns[$matching_table_index] = $fields_uncommon; + $uncommon_columns[$matching_table_index] = $fields_uncommon; } if (isset($keys)) { - $target_tables_keys[$matching_table_index] = $keys; + $target_tables_keys[$matching_table_index] = $keys; } } /** @@ -827,8 +828,8 @@ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matc * @uses PMA_createTargetTables() * @uses PMA_DBI_try_query() * @uses PMA_DBI_fetch_result() -* -* @param $src_db name of source database +* +* @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 @@ -836,7 +837,7 @@ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matc * @param $source_columns array containing columns information of the source tables * @param $add_column_array array containing the names of the column(field) that are to be added in the target * @param $matching_tables_fields -* @param $criteria array containing the criterias +* @param $criteria array containing the criterias * @param $matching_tables_keys array containing the field names which is key in the source table * @param $target_tables_keys array containing the field names which is key in the target table * @param $uncommon_tables array containing the table names that are present in source db and not in target db @@ -851,12 +852,12 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma for ($i = 0; $i < sizeof($matching_tables_fields[$table_counter]); $i++) { if (isset($add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]])) { $query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$table_counter]). " ADD COLUMN " . - $add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]] . " " . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Type']; - + PMA_backquote($add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]]) . " " . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Type']; + if($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Null'] == 'NO') { $query .= ' Not Null '; } elseif ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Null'] == 'YES') { - $query .= ' Null '; + $query .= ' Null '; } if ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Collation'] != '') { $query .= ' COLLATE ' . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Collation']; @@ -865,45 +866,45 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma $query .= " DEFAULT " . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Default']; } if ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Comment'] != '') { - $query .= " COMMENT " . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Comment']; - } - if ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Key'] == 'PRI' ) { + $query .= " COMMENT " . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Comment']; + } + if ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Key'] == 'PRI' ) { $trg_key_size = sizeof($target_tables_keys[$table_counter]); if ($trg_key_size) { $check = true; - for ($a = 0; ($a < $trg_key_size) && ($check); $a++) { + for ($a = 0; ($a < $trg_key_size) && ($check); $a++) { if (! (in_array($target_tables_keys[$table_counter], $uncommon_cols))) { $check = false; - } + } } if (! $check) { - $query .= " ,DROP PRIMARY KEY " ; + $query .= " ,DROP PRIMARY KEY " ; } - } + } $query .= " , ADD PRIMARY KEY ("; for ($t = 0; $t < sizeof($matching_tables_keys[$table_counter]); $t++) { - $query .= $matching_tables_keys[$table_counter][$t]; + $query .= PMA_backquote($matching_tables_keys[$table_counter][$t]); if ($t < (sizeof($matching_tables_keys[$table_counter]) - 1)) { $query .= " , " ; } } $query .= ")"; } - + $query .= ";"; if ($display == true) { echo '' . $query . ''; } PMA_DBI_try_query($query, $trg_link, 0); - + //Checks if column to be added is a foreign key or not $is_fk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $trg_db . "' AND TABLE_NAME = '" . $matching_tables[$table_counter] . "' AND COLUMN_NAME ='" . $add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]] . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;"; - + $is_fk_result = PMA_DBI_fetch_result($is_fk_query, null, null, $src_link); - - //If column is a foreign key then it is checked that referenced table exist in target db. If referenced table does not exist in target db then + + //If column is a foreign key then it is checked that referenced table exist in target db. If referenced table does not exist in target db then //it is created first. if (isset($is_fk_result)) { if (in_array($is_fk_result[0]['REFERENCED_TABLE_NAME'], $uncommon_tables)) { @@ -912,12 +913,12 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma PMA_createTargetTables($src_db, $trg_db, $trg_link, $src_link, $uncommon_tables, $table_index[0], $uncommon_tables_fields); unset($uncommon_tables[$table_index[0]]); } - $fk_query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$table_counter]) . - "ADD CONSTRAINT FOREIGN KEY " . $add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]] . " + $fk_query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$table_counter]) . + "ADD CONSTRAINT FOREIGN KEY " . PMA_backquote($add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]]) . " (" . $add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]] . ") REFERENCES " . PMA_backquote($trg_db) . '.' . PMA_backquote($is_fk_result[0]['REFERENCED_TABLE_NAME']) . " (" . $is_fk_result[0]['REFERENCED_COLUMN_NAME'] . ");"; - - PMA_DBI_try_query($fk_query, $trg_link, null); + + PMA_DBI_try_query($fk_query, $trg_link, null); } } } @@ -929,31 +930,31 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma * @uses array_keys() * @uses PMA_checkForeignKeys() * uses PMA_createTargetTables() -* +* * @param $src_db name of source database * @param $src_link connection established with source server * @param $trg_db name of target database * @param $trg_link connection established with target server * @param $referenced_table table whose column is a foreign key in another table -* @param $uncommon_tables array containing names that are uncommon +* @param $uncommon_tables array containing names that are uncommon * @param $uncommon_tables_fields field names of the uncommon table * @param $display true/false value */ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$referenced_table, &$uncommon_tables, &$uncommon_tables_fields, $display) { - $is_fk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $src_db . "' + $is_fk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $src_db . "' AND TABLE_NAME = '" . $referenced_table . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;"; - + $is_fk_result = PMA_DBI_fetch_result($is_fk_query, null, null, $src_link); if (sizeof($is_fk_result) > 0) { for ($j = 0; $j < sizeof($is_fk_result); $j++) { if (in_array($is_fk_result[$j]['REFERENCED_TABLE_NAME'], $uncommon_tables)) { $table_index = array_keys($uncommon_tables, $is_fk_result[$j]['REFERENCED_TABLE_NAME']); - PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link, $is_fk_result[$j]['REFERENCED_TABLE_NAME'], $uncommon_tables, - $uncommon_tables_fields, $display); + PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link, $is_fk_result[$j]['REFERENCED_TABLE_NAME'], $uncommon_tables, + $uncommon_tables_fields, $display); PMA_createTargetTables($src_db, $trg_db, $trg_link, $src_link, $uncommon_tables, $table_index[0], $uncommon_tables_fields, $display); unset($uncommon_tables[$table_index[0]]); - } + } } } } @@ -964,14 +965,14 @@ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$reference * @uses is_string() * @uses is_numeric() * @uses PMA_DBI_try_query() -* -* +* +* * @param $trg_db name of target database * @param $trg_link connection established with target server * @param $matching_tables array containing names of matching tables * @param $source_columns array containing columns information of the source table * @param $alter_str_array array containing the column name and criteria which is to be altered for the targert table -* @param $matching_tables_fields array containing the name of the fields for the matching table +* @param $matching_tables_fields array containing the name of the fields for the matching table * @param $criteria array containing the criterias * @param $matching_tables_keys array containing the field names which is key in the source table * @param $target_tables_keys array containing the field names which is key in the target table @@ -979,7 +980,7 @@ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$reference * @param $display true/false value */ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$source_columns, &$alter_str_array, $matching_tables_fields, $criteria, - &$matching_tables_keys, &$target_tables_keys, $matching_table_index, $display) + &$matching_tables_keys, &$target_tables_keys, $matching_table_index, $display) { $check = true; $sql_query = ''; @@ -1001,29 +1002,29 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s } $pri_query .= " ADD PRIMARY KEY ("; for ($z = 0; $z < sizeof($matching_tables_keys[$matching_table_index]); $z++) { - $pri_query .= $matching_tables_keys[$matching_table_index][$z]; + $pri_query .= PMA_backquote($matching_tables_keys[$matching_table_index][$z]); if ($z < (sizeof($matching_tables_keys[$matching_table_index]) - 1)) { $pri_query .= " , " ; } } $pri_query .= ");"; } - + if (isset($pri_query)) { if ($display == true) { echo '' . $pri_query . ''; } - PMA_DBI_try_query($pri_query, $trg_link, 0); + PMA_DBI_try_query($pri_query, $trg_link, 0); } for ($t = 0; $t < sizeof($matching_tables_fields[$matching_table_index]); $t++) { if ((isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]])) && (sizeof($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]) > 0)) { - $sql_query = 'ALTER TABLE ' . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$matching_table_index]) . ' MODIFY ' . - $matching_tables_fields[$matching_table_index][$t] . ' ' . $source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type']; + $sql_query = 'ALTER TABLE ' . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$matching_table_index]) . ' MODIFY ' . + PMA_backquote($matching_tables_fields[$matching_table_index][$t]) . ' ' . $source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type']; $found = false; for ($i = 0; $i < sizeof($criteria); $i++) { if (isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]]) && $criteria[$i] != 'Key') { - $found = true; + $found = true; if (($criteria[$i] == 'Type') && (! isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i+1]]))) { if ($source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i + 1]] == 'NO') { $sql_query .= " Not Null" ; @@ -1049,12 +1050,12 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s } elseif($criteria[$i] == 'Default') { if(! (isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) { $sql_query .= " Not Null " ; - } + } if (is_string($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]])) { if ($source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type'] != 'timestamp') { $sql_query .= " DEFAULT '" . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]] . "'"; } elseif($source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type'] == 'timestamp') { - $sql_query .= " DEFAULT " . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]]; + $sql_query .= " DEFAULT " . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]]; } } elseif (is_numeric($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]])) { $sql_query .= " DEFAULT " . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]]; @@ -1082,7 +1083,7 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s 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] . ' ' + $query .= ' MODIFY ' . PMA_backquote($matching_tables_keys[$matching_table_index][$p]) . ' ' . $source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$p]]['Type'] . ' Not Null '; if ($p < (sizeof($matching_tables_keys[$matching_table_index]) - 1)) { $query .= ', '; @@ -1092,7 +1093,7 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s if ($check) { if ($display == true) { echo '' . $query . ''; - } + } PMA_DBI_try_query($query, $trg_link, 0); } } @@ -1101,13 +1102,13 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s * PMA_removeColumnsFromTargetTable() removes the columns which are present in target table but not in source table. * @uses sizeof() * @uses PMA_DBI_try_query() -* @uses PMA_DBI_fetch_result() -* +* @uses PMA_DBI_fetch_result() +* * @param $trg_db name of target database * @param $trg_link connection established with target server * @param $matching_tables array containing names of matching tables * @param $uncommon_columns array containing the names of the column which are to be dropped from the target table -* @param $table_counter index of the matching table as in $matchiing_tables array +* @param $table_counter index of the matching table as in $matchiing_tables array * @param $display true/false value */ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $table_counter, $display) @@ -1116,67 +1117,67 @@ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $drop_query = "ALTER TABLE " . PMA_backquote($trg_db) . "." . PMA_backquote($matching_tables[$table_counter]); for ($a = 0; $a < sizeof($uncommon_columns[$table_counter]); $a++) { //Checks if column to be removed is a foreign key in any table - $pk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE REFERENCED_TABLE_SCHEMA = '" . $trg_db . "' + $pk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE REFERENCED_TABLE_SCHEMA = '" . $trg_db . "' AND REFERENCED_TABLE_NAME = '" . $matching_tables[$table_counter]."' AND REFERENCED_COLUMN_NAME = '" . $uncommon_columns[$table_counter][$a] . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;"; - + $pk_query_result = PMA_DBI_fetch_result($pk_query, null, null, $trg_link); $result_size = sizeof($pk_query_result); - + if ($result_size > 0) { for ($b = 0; $b < $result_size; $b++) { $drop_pk_query = "ALTER TABLE " . PMA_backquote($pk_query_result[$b]['TABLE_SCHEMA']) . "." . PMA_backquote($pk_query_result[$b]['TABLE_NAME']) . " - DROP FOREIGN KEY " . $pk_query_result[$b]['CONSTRAINT_NAME'] . ", DROP COLUMN " . $pk_query_result[$b]['COLUMN_NAME'] . ";"; - PMA_DBI_try_query($drop_pk_query, $trg_link, 0); - } - } - $query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $trg_db . "' AND TABLE_NAME = '" + DROP FOREIGN KEY " . PMA_backquote($pk_query_result[$b]['CONSTRAINT_NAME']) . ", DROP COLUMN " . PMA_backquote($pk_query_result[$b]['COLUMN_NAME']) . ";"; + PMA_DBI_try_query($drop_pk_query, $trg_link, 0); + } + } + $query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $trg_db . "' AND TABLE_NAME = '" . $matching_tables[$table_counter]. "' AND COLUMN_NAME = '" . $uncommon_columns[$table_counter][$a] . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;"; $result = PMA_DBI_fetch_result($query, null, null, $trg_link); if (sizeof($result) > 0) { - $drop_query .= " DROP FOREIGN KEY " . $result[0]['CONSTRAINT_NAME'] . ","; + $drop_query .= " DROP FOREIGN KEY " . PMA_backquote($result[0]['CONSTRAINT_NAME']) . ","; } - $drop_query .= " DROP COLUMN " . $uncommon_columns[$table_counter][$a]; + $drop_query .= " DROP COLUMN " . PMA_backquote($uncommon_columns[$table_counter][$a]); if ($a < (sizeof($uncommon_columns[$table_counter]) - 1)) { $drop_query .= " , " ; - } + } } $drop_query .= ";" ; - + if ($display == true) { echo '' . $drop_query . ''; } - PMA_DBI_try_query($drop_query, $trg_link, 0); - } -} + PMA_DBI_try_query($drop_query, $trg_link, 0); + } +} /** * PMA_indexesDiffInTables() compares the source table indexes with target table indexes and keep the indexes to be added in target table in $add_indexes_array * indexes to be altered in $alter_indexes_array and indexes to be removed from target table in $remove_indexes_array. * Only keyname and uniqueness characteristic of the indexes are altered. * @uses sizeof() * @uses PMA_DBI_get_table_indexes() -* -* @param $src_db name of source database +* +* @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_tables array containing the matching tables name -* @param $source_indexes array containing the indexes of the source table +* @param $source_indexes array containing the indexes of the source table * @param $target_indexes array containing the indexes of the target table * @param $add_indexes_array array containing the name of the column on which the index is to be added in the target table * @param $alter_indexes_array array containing the key name which needs to be altered * @param $remove_indexes_array array containing the key name of the index which is to be removed from the target table -* @param $table_counter number of the matching table +* @param $table_counter number of the matching table */ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, &$source_indexes, &$target_indexes, &$add_indexes_array, &$alter_indexes_array, &$remove_indexes_array, $table_counter) { //Gets indexes information for source and target table $source_indexes[$table_counter] = PMA_DBI_get_table_indexes($src_db, $matching_tables[$table_counter],$src_link); - $target_indexes[$table_counter] = PMA_DBI_get_table_indexes($trg_db, $matching_tables[$table_counter],$trg_link); + $target_indexes[$table_counter] = PMA_DBI_get_table_indexes($trg_db, $matching_tables[$table_counter],$trg_link); for ($a = 0; $a < sizeof($source_indexes[$table_counter]); $a++) { $found = false; $z = 0; @@ -1194,15 +1195,15 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi } } } - $z++; + $z++; } if ($found === false) { if(! ($source_indexes[$table_counter][$a]['Key_name'] == 'PRIMARY')) { - $add_indexes_array [$table_counter][] = $source_indexes[$table_counter][$a]['Column_name']; + $add_indexes_array [$table_counter][] = $source_indexes[$table_counter][$a]['Column_name']; } } } - + //Finds indexes that exist on target table but not on source table for ($b = 0; $b < sizeof($target_indexes[$table_counter]); $b++) { $found = false; @@ -1212,31 +1213,31 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi if ($target_indexes[$table_counter][$b]['Column_name'] == $source_indexes[$table_counter][$c]['Column_name']) { $found = true; } - $c++; + $c++; } if ($found === false) { - $remove_indexes_array[$table_counter][] = $target_indexes[$table_counter][$b]['Key_name']; + $remove_indexes_array[$table_counter][] = $target_indexes[$table_counter][$b]['Key_name']; } } } /** -* PMA_applyIndexesDiff() create indexes, alters indexes and remove indexes. +* PMA_applyIndexesDiff() create indexes, alters indexes and remove indexes. * @uses sizeof() * @uses PMA_DBI_try_query() -* +* * @param $trg_db name of target database * @param $trg_link connection established with target server * @param $matching_tables array containing the matching tables name -* @param $source_indexes array containing the indexes of the source table +* @param $source_indexes array containing the indexes of the source table * @param $target_indexes array containing the indexes of the target table * @param $add_indexes_array array containing the column names on which indexes are to be created in target table * @param $alter_indexes_array array containing the column names for which indexes are to be altered * @param $remove_indexes_array array containing the key name of the indexes which are to be removed from the target table -* @param $table_counter number of the matching table +* @param $table_counter number of the matching table * @param $display true/false value */ -function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, +function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, $remove_indexes_array, $table_counter, $display) { //Adds indexes on target table @@ -1244,12 +1245,12 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind $sql = "ALTER TABLE " . PMA_backquote($trg_db) . "." . PMA_backquote($matching_tables[$table_counter]) . " ADD" ; for ($a = 0; $a < sizeof($source_indexes[$table_counter]); $a++) { if (isset($add_indexes_array[$table_counter][$a])) { - for ($b = 0; $b < sizeof($source_indexes[$table_counter]); $b++) { + for ($b = 0; $b < sizeof($source_indexes[$table_counter]); $b++) { if ($source_indexes[$table_counter][$b]['Column_name'] == $add_indexes_array[$table_counter][$a]) { if ($source_indexes[$table_counter][$b]['Non_unique'] == '0') { $sql .= " UNIQUE "; } - $sql .= " INDEX " . $source_indexes[$table_counter][$b]['Key_name'] . " (" . $add_indexes_array[$table_counter][$a] . " );"; + $sql .= " INDEX " . PMA_backquote($source_indexes[$table_counter][$b]['Key_name']) . " (" . $add_indexes_array[$table_counter][$a] . " );"; if ($display == true) { echo '' . $sql . ''; } @@ -1265,9 +1266,9 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind $query = "ALTER TABLE " . PMA_backquote($trg_db) . "." . PMA_backquote($matching_tables[$table_counter]); for ($a = 0; $a < sizeof($alter_indexes_array[$table_counter]); $a++) { if (isset($alter_indexes_array[$table_counter][$a])) { - $query .= ' DROP INDEX ' . PMA_backquote($alter_indexes_array[$table_counter][$a]) . " , ADD "; + $query .= ' DROP INDEX ' . PMA_backquote($alter_indexes_array[$table_counter][$a]) . " , ADD "; $got_first_index_column = false; - for ($z = 0; $z < sizeof($source_indexes[$table_counter]); $z++) { + for ($z = 0; $z < sizeof($source_indexes[$table_counter]); $z++) { if ($source_indexes[$table_counter][$z]['Key_name'] == $alter_indexes_array[$table_counter][$a]) { if (! $got_first_index_column) { if ($source_indexes[$table_counter][$z]['Non_unique'] == '0') { @@ -1294,26 +1295,26 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind $drop_index_query = "ALTER TABLE " . PMA_backquote($trg_db) . "." . PMA_backquote($matching_tables[$table_counter]); for ($a = 0; $a < sizeof($target_indexes[$table_counter]); $a++) { if (isset($remizeof($target_indexes[$table_counter]); $a++) {PMA_backquote($matching_tables[$table_counter]); er][$a] . " );";[$b]['COLUMN_NAME']) . ";";ing_table_index][$t]]) > 0)) {AME']) . " = " . $target_tables_keys[$table_index][$y] . ";";�!�!�I�/�0J�/�xd��* @�/��*��*�I�/�`��*�I�/��_T�*u��*PT�*�TT�*�YT�*��*xd��* @�/��>�/�k��*�!�!�I�/�0J�/�H.��*A�/��*��*�I�/�`��*�I�/��I�/��I�/�8��*�p�0J�/�u��*��*A�/��?�/�k��*GHIJKMNOP�I�/�0J�/�H��*�B�/��*��*�I�/�0_T�*u��*p��*��*PT�*�TT�*�YT�*��*H��*�B�/��@�/�k��*8��*�B�/�A�/�k��*(��*�B�/�@A�/�k��*��*�B�/�pA�/�k��* �^T�*u��*�YT�*�;�/��h��*e��*�TT�*B�/�yh��*e��*PT�*@B�/�Zh��*e��*��*p��*��*PT�*�t��*�TT�*�YT�*��*8��*�O�*0J�/�p��*�C�/��B�/�k��*5678:<=>?@BD�I�/�0J�/��L�*0J�/�u��*��*pB�/��O�*e��*��*�_@f�S Q��l��*0J�/��L�*E�/��C�/�k��*u]�� 4Q��U^Qʉ��u��*ēv�I�/�0J�/�H.�*tU�*pK�/��*��*��R�*�I�/�0K�/��I�/�PF�/��*u��*�t��*�L�/��*�K�/�G�/��*8J�/�ove_indexes_array[$table_counter][$a])) { - $drop_index_query .= " DROP INDEX " . $remove_indexes_array[$table_counter][$a]; + $drop_index_query .= " DROP INDEX " . PMA_backquote($remove_indexes_array[$table_counter][$a]); } if ($a < (sizeof($remove_indexes_array[$table_counter]) - 1)) { $drop_index_query .= " , " ; } } - $drop_index_query .= " ; " ; + $drop_index_query .= " ; " ; if ($display == true) { echo '' . $drop_index_query . ''; } - PMA_DBI_try_query($drop_index_query, $trg_link, 0); + PMA_DBI_try_query($drop_index_query, $trg_link, 0); } } /** * PMA_displayQuery() displays a query, taking the maximum display size - * into account - * @uses $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] - * - * @param $query the query to display + * into account + * @uses $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] + * + * @param $query the query to display */ function PMA_displayQuery($query) { if (strlen($query) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { @@ -1323,18 +1324,18 @@ function PMA_displayQuery($query) { } /** - * PMA_syncDisplayHeaderSource() shows the header for source database - * @uses $_SESSION['src_type'] - * @uses $_SESSION['src_server']['host'] + * PMA_syncDisplayHeaderSource() shows the header for source database + * @uses $_SESSION['src_type'] + * @uses $_SESSION['src_server']['host'] * - * @param string $src_db source db name + * @param string $src_db source db name */ function PMA_syncDisplayHeaderSource($src_db) { echo '<div id="serverstatus" style = "overflow: auto; width: 1020px; height: 220px; border-left: 1px gray solid; border-bottom: 1px gray solid; padding:0px; margin-bottom: 1em "> '; echo '<table id="serverstatusconnections" class="data" width="55%">'; echo '<tr>'; - echo '<th>' . __('Source database') . ': ' . $src_db . ' ('; + echo '<th>' . __('Source database') . ': ' . htmlspecialchars($src_db) . ' ('; if ('cur' == $_SESSION['src_type']) { echo __('Current server'); } else { @@ -1347,17 +1348,17 @@ function PMA_syncDisplayHeaderSource($src_db) { /** * PMA_syncDisplayHeaderTargetAndMatchingTables() shows the header for target database and the matching tables - * @uses $_SESSION['trg_type'] - * @uses $_SESSION['trg_server']['host'] - * - * @param string $trg_db target db name + * @uses $_SESSION['trg_type'] + * @uses $_SESSION['trg_server']['host'] + * + * @param string $trg_db target db name * @param array $matching_tables - * @return boolean $odd_row current value of this toggle + * @return boolean $odd_row current value of this toggle */ function PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables) { echo '<table id="serverstatusconnections" class="data" width="43%">'; echo '<tr>'; - echo '<th>' . __('Target database') . ': '. $trg_db . ' ('; + echo '<th>' . __('Target database') . ': '. htmlspecialchars($trg_db) . ' ('; if ('cur' == $_SESSION['trg_type']) { echo __('Current server'); } else { @@ -1375,10 +1376,10 @@ function PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables) } /** - * PMA_syncDisplayBeginTableRow() displays the TR tag for alternating colors - * - * @param boolean $odd_row current status of the toggle - * @return boolean $odd_row final status of the toggle + * PMA_syncDisplayBeginTableRow() displays the TR tag for alternating colors + * + * @param boolean $odd_row current status of the toggle + * @return boolean $odd_row final status of the toggle */ function PMA_syncDisplayBeginTableRow($odd_row) { $odd_row = ! $odd_row; diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index c7dacc6..9f2ea12 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -657,6 +657,7 @@ $PMA_SQPdata_reserved_word = array ( 'TO', 'TRAILING', 'TRANSACTIONAL', // 5.1 ? + 'TRUE', 'TRUNCATE', 'TYPE', 'TYPES', @@ -684,7 +685,7 @@ $PMA_SQPdata_reserved_word = array ( * * @global integer MySQL reserved words count */ -$PMA_SQPdata_reserved_word_cnt = 287; +$PMA_SQPdata_reserved_word_cnt = 288; /** * words forbidden to be used as column or table name wihtout quotes diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php index 41f7c23..7983b9f 100644 --- a/libraries/vendor_config.php +++ b/libraries/vendor_config.php @@ -59,4 +59,10 @@ define('CUSTOM_FOOTER_FILE', CONFIG_DIR . 'config.footer.inc.php'); * Default value for check for version upgrades. */ define('VERSION_CHECK_DEFAULT', true); + +/** + * Path to gettext.inc file. Useful when you want php-gettext somewhere else, + * eg. /usr/share/php/gettext/gettext.inc. + */ +define('GETTEXT_INC', './libraries/php-gettext/gettext.inc'); ?> diff --git a/po/af.po b/po/af.po index eaec6ec..dd7e3b5 100644 --- a/po/af.po +++ b/po/af.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-03-30 23:04+0200\n" diff --git a/po/ar.po b/po/ar.po index 66c10c9..826bfed 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-04-21 13:56+0200\n" diff --git a/po/az.po b/po/az.po index 27757c3..127733d 100644 --- a/po/az.po +++ b/po/az.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" diff --git a/po/be.po b/po/be.po index 3e63938..1479c8f 100644 --- a/po/be.po +++ b/po/be.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" diff --git a/po/be(a)latin.po b/po/be(a)latin.po index 0af0310..656f933 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-03-30 23:09+0200\n" diff --git a/po/bg.po b/po/bg.po index 5dee1d4..0dadff3 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-03-22 12:51+0200\n" @@ -4193,7 +4193,7 @@ msgstr "CSV за MS Excel данни" #: libraries/config/user_preferences.forms.php:239 #: libraries/export/htmlword.php:17 msgid "Microsoft Word 2000" -msgstr "" +msgstr "Microsoft Word 2000" #: libraries/config/setup.forms.php:346 #: libraries/config/user_preferences.forms.php:248 libraries/export/odt.php:21 @@ -6820,7 +6820,7 @@ msgstr "Покажи всички" #: pmd_general.php:141 msgid "Hide/Show Tables with no relation" -msgstr "" +msgstr "Показване/скриване таблици без релации" #: pmd_general.php:181 #, fuzzy @@ -9273,7 +9273,7 @@ msgstr "Заявление" #: tbl_printview.php:377 tbl_structure.php:834 msgid "static" -msgstr "" +msgstr "статичен" #: tbl_printview.php:379 tbl_structure.php:836 msgid "dynamic" @@ -9511,7 +9511,7 @@ msgstr "Версия" #: tbl_tracking.php:640 #, php-format msgid "Deactivate tracking for %s.%s" -msgstr "" +msgstr "Изключване проследяването за %s.%s" #: tbl_tracking.php:642 msgid "Deactivate now" @@ -9520,7 +9520,7 @@ msgstr "Деактивиране сега" #: tbl_tracking.php:653 #, php-format msgid "Activate tracking for %s.%s" -msgstr "" +msgstr "Включване проследяването за %s.%s" #: tbl_tracking.php:655 msgid "Activate now" @@ -9533,11 +9533,11 @@ msgstr "Създаване на версия %s от %s.%s" #: tbl_tracking.php:672 msgid "Track these data definition statements:" -msgstr "" +msgstr "Проследяване следните изрази за дефиниране на данни" #: tbl_tracking.php:680 msgid "Track these data manipulation statements:" -msgstr "" +msgstr "Проследяване следните изрази за манипулиране на данни" #: tbl_tracking.php:688 #, fuzzy diff --git a/po/bn.po b/po/bn.po index 6c8eb47..98394ea 100644 --- a/po/bn.po +++ b/po/bn.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-10-21 01:36+0200\n" diff --git a/po/br.po b/po/br.po index a47a222..e3dfe9f 100644 --- a/po/br.po +++ b/po/br.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-07-02 22:10+0200\n" diff --git a/po/bs.po b/po/bs.po index 34bb0ac..fc66516 100644 --- a/po/bs.po +++ b/po/bs.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" diff --git a/po/ca.po b/po/ca.po index 3f46db1..53ecba4 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-02-23 09:57+0200\n" diff --git a/po/cs.po b/po/cs.po index 3fd0a83..2ce082d 100644 --- a/po/cs.po +++ b/po/cs.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" diff --git a/po/cy.po b/po/cy.po index 03af559..0eb721c 100644 --- a/po/cy.po +++ b/po/cy.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-06-07 20:23+0200\n" diff --git a/po/da.po b/po/da.po index 66e1507..f66dea5 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-03-07 01:17+0200\n" diff --git a/po/de.po b/po/de.po index 4fa3e3c..f75a2d7 100644 --- a/po/de.po +++ b/po/de.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-04-23 04:28+0200\n" diff --git a/po/el.po b/po/el.po index dd06b6d..84a471e 100644 --- a/po/el.po +++ b/po/el.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-04-05 11:15+0200\n" diff --git a/po/en_GB.po b/po/en_GB.po index 66f06b4..b2d3192 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-02-10 16:24+0200\n" diff --git a/po/es.po b/po/es.po index 82a9fa0..ef7a1de 100644 --- a/po/es.po +++ b/po/es.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-04-02 11:10+0200\n" diff --git a/po/et.po b/po/et.po index a665761..7382be4 100644 --- a/po/et.po +++ b/po/et.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" diff --git a/po/eu.po b/po/eu.po index 5f96bc0..ddfd21a 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-07-21 14:53+0200\n" @@ -95,23 +95,28 @@ msgstr "Erabili balio hau" #: bs_disp_as_mime_type.php:29 bs_play_media.php:35 #: libraries/blobstreaming.lib.php:331 +#, fuzzy msgid "No blob streaming server configured!" -msgstr "" +msgstr "Ez dago blob streaming zerbitzaria konfiguraturik!" #: bs_disp_as_mime_type.php:35 +#, fuzzy msgid "Failed to fetch headers" -msgstr "" +msgstr "Akatsa goiburuak bilatzerakoan" #: bs_disp_as_mime_type.php:41 +#, fuzzy msgid "Failed to open remote URL" -msgstr "" +msgstr "Akatsa kompo esteka zabaltzerakoan" #: changelog.php:32 license.php:28 -#, php-format +#, fuzzy, php-format msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." msgstr "" +"%s filtxategia ez dago eskuragarri sisteman, joan www.phpmyadmin.net " +"informazio gehiagorako" #: db_create.php:58 #, fuzzy, php-format @@ -308,7 +313,7 @@ msgstr "Datuak soilik" #: db_operations.php:493 msgid "CREATE DATABASE before copying" -msgstr "" +msgstr "DATU-BASEA SORTU kopiatu aurretik " #: db_operations.php:496 libraries/config/messages.inc.php:124 #: libraries/config/messages.inc.php:125 libraries/config/messages.inc.php:127 @@ -622,11 +627,11 @@ msgstr "%s taula ezabatu egin da" #: db_structure.php:293 tbl_create.php:295 msgid "Tracking is active." -msgstr "" +msgstr "Jarraipena aktibatuta dago." #: db_structure.php:295 tbl_create.php:297 msgid "Tracking is not active." -msgstr "" +msgstr "Jarraipena ez dago aktibatuta." #: db_structure.php:379 libraries/display_tbl.lib.php:2076 #, php-format @@ -634,11 +639,13 @@ msgid "" "This view has at least this number of rows. Please refer to %sdocumentation" "%s." msgstr "" +"Ikuspegi honek gutxienez errenkada kopuru hau dauka. Mesedez %sdocumentation" +"%s erreferentzia egin." #: db_structure.php:393 db_structure.php:407 libraries/header.inc.php:137 #: libraries/tbl_info.inc.php:60 tbl_structure.php:206 test/theme.php:73 msgid "View" -msgstr "" +msgstr "Ikusipegia" #: db_structure.php:444 libraries/db_structure.lib.php:40 #: libraries/server_links.inc.php:90 server_replication.php:31 @@ -652,9 +659,9 @@ msgid "Sum" msgstr "Gehiketa" #: db_structure.php:455 libraries/StorageEngine.class.php:351 -#, php-format +#, fuzzy, php-format msgid "%s is the default storage engine on this MySQL server." -msgstr "" +msgstr "%s da MySQL zerbitzarian lehenetsitako biltegiratzeko mota." #: db_structure.php:483 db_structure.php:500 db_structure.php:501 #: libraries/display_tbl.lib.php:2217 libraries/display_tbl.lib.php:2222 @@ -729,7 +736,7 @@ msgstr "Datu-hiztegia" #: db_tracking.php:79 msgid "Tracked tables" -msgstr "" +msgstr "Taulak jarraipenarekin" #: db_tracking.php:84 libraries/config/messages.inc.php:482 #: libraries/export/htmlword.php:89 libraries/export/latex.php:162 @@ -746,7 +753,7 @@ msgstr "Datu-basea" #: db_tracking.php:86 msgid "Last version" -msgstr "" +msgstr "Azken bertsioa" #: db_tracking.php:87 tbl_tracking.php:589 #, fuzzy @@ -755,7 +762,7 @@ msgstr "Sortu" #: db_tracking.php:88 tbl_tracking.php:590 msgid "Updated" -msgstr "" +msgstr "Eguneratua" #: db_tracking.php:89 libraries/common.lib.php:1354 #: libraries/server_links.inc.php:50 server_processlist.php:71 @@ -772,15 +779,15 @@ msgstr "Ekintza" #: db_tracking.php:101 js/messages.php:34 msgid "Delete tracking data for this table" -msgstr "" +msgstr "Ezabatu taula honetako jarraipen datuak" #: db_tracking.php:119 tbl_tracking.php:543 tbl_tracking.php:601 msgid "active" -msgstr "" +msgstr "Aktibo" #: db_tracking.php:121 tbl_tracking.php:545 tbl_tracking.php:603 msgid "not active" -msgstr "" +msgstr "Ez aktibo" #: db_tracking.php:134 #, fuzzy @@ -789,7 +796,7 @@ msgstr "Eragiketak" #: db_tracking.php:135 tbl_tracking.php:374 tbl_tracking.php:621 msgid "Tracking report" -msgstr "" +msgstr "Jarraipen informea " #: db_tracking.php:136 tbl_tracking.php:246 tbl_tracking.php:623 #, fuzzy @@ -798,7 +805,7 @@ msgstr "Egitura soilik" #: db_tracking.php:181 msgid "Untracked tables" -msgstr "" +msgstr "Jarraipen gabeko taulak" #: db_tracking.php:201 db_tracking.php:203 tbl_structure.php:626 #: tbl_structure.php:628 @@ -821,20 +828,21 @@ msgid "Enter each value in a separate field." msgstr "" #: enum_editor.php:57 +#, fuzzy msgid "+ Restart insertion and add a new value" -msgstr "" +msgstr "+ Berriz hasi txertatzen eta gehitu balio berria" #: enum_editor.php:67 msgid "Output" -msgstr "" +msgstr "Irteera" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" -msgstr "" +msgstr "Kopiatu eta itsatsi batutako balioak \"Luzera/Balioak\" eremuan" #: export.php:73 msgid "Selected export type has to be saved in file!" -msgstr "" +msgstr "Aukeratutako esportatze formatuak fitxategian gorde behar da!" #: export.php:164 export.php:189 export.php:670 #, php-format @@ -896,18 +904,19 @@ msgid "The bookmark has been deleted." msgstr "Gordetako kontsulta ezabatu da." #: import.php:400 +#, fuzzy msgid "Showing bookmark" -msgstr "" +msgstr "Erakutsi laster-markak" #: import.php:402 sql.php:885 -#, php-format +#, fuzzy, php-format msgid "Bookmark %s created" -msgstr "" +msgstr "%s laster-marka sortu da" #: import.php:408 import.php:414 #, php-format msgid "Import has been successfully finished, %d queries executed." -msgstr "" +msgstr "Inportatzea zuzen burutu da, %d kontsulta exekutatuta_." #: import.php:423 msgid "" @@ -944,11 +953,11 @@ msgstr "" #: server_synchronize.php:734 server_synchronize.php:762 #: server_synchronize.php:790 server_synchronize.php:802 msgid "Click to select" -msgstr "" +msgstr "Egin klik hautatzeko" #: js/messages.php:26 msgid "Click to unselect" -msgstr "" +msgstr "Klik desautatzeko" #: js/messages.php:27 libraries/import.lib.php:103 sql.php:195 msgid "\"DROP DATABASE\" statements are disabled." @@ -960,7 +969,7 @@ msgstr "Benetan nahi al duzu " #: js/messages.php:31 libraries/mult_submits.inc.php:242 sql.php:278 msgid "You are about to DESTROY a complete database!" -msgstr "" +msgstr "Datu-base osoa SUNTSITZERA zoaz!" #: js/messages.php:32 msgid "Dropping Event" @@ -978,16 +987,18 @@ msgid "Deleting tracking data" msgstr "Datuak txertatu eta ordezkatzea baimentzen du." #: js/messages.php:36 +#, fuzzy msgid "Dropping Primary Key/Index" -msgstr "" +msgstr "Ezabatu Giltza nagusi/Indizea" #: js/messages.php:37 +#, fuzzy msgid "This operation could take a long time. Proceed anyway?" -msgstr "" +msgstr "Eragiketa honek luze jo lezake. Jarraitu nahi?" #: js/messages.php:40 msgid "You are about to DISABLE a BLOB Repository!" -msgstr "" +msgstr "BLOG biltegi bat DESGAITZERA zoaz!" #: js/messages.php:41 #, php-format @@ -1044,7 +1055,7 @@ msgstr "Hautatutako erabiltzaileak baztertu" #: js/messages.php:56 libraries/tbl_properties.inc.php:792 #: tbl_tracking.php:246 tbl_tracking.php:374 msgid "Close" -msgstr "" +msgstr "Itxi" #: js/messages.php:60 libraries/tbl_properties.inc.php:797 pmd_general.php:388 #: pmd_general.php:425 pmd_general.php:545 pmd_general.php:593 diff --git a/po/fa.po b/po/fa.po index ff3652a..fd23feb 100644 --- a/po/fa.po +++ b/po/fa.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-05-19 03:54+0200\n" diff --git a/po/fi.po b/po/fi.po index 5f8c034..099b180 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-11-26 21:29+0200\n" diff --git a/po/fr.po b/po/fr.po index 52cfa13..72759c6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-02-10 19:23+0200\n" diff --git a/po/gl.po b/po/gl.po index 9848a68..986f478 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-07-21 14:50+0200\n" diff --git a/po/he.po b/po/he.po index 25f74cf..2922095 100644 --- a/po/he.po +++ b/po/he.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-03-02 20:17+0200\n" diff --git a/po/hi.po b/po/hi.po index a748d8d..42364d7 100644 --- a/po/hi.po +++ b/po/hi.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-04-24 00:23+0200\n" diff --git a/po/hr.po b/po/hr.po index 1e9d274..128117e 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-07-21 14:54+0200\n" diff --git a/po/hu.po b/po/hu.po index 89f4d3a..5071e4a 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-05-05 12:49+0200\n" @@ -2675,7 +2675,7 @@ msgstr "SQL kompatibilitási mód" #: libraries/config/messages.inc.php:120 libraries/export/sql.php:111 msgid "<code>CREATE TABLE</code> options:" -msgstr "" +msgstr "<code>CREATE TABLE</code> beállítások:" #: libraries/config/messages.inc.php:121 msgid "Creation/Update/Check dates" @@ -4825,13 +4825,15 @@ msgstr "Importálandó fájl" #: libraries/display_import.lib.php:156 #, php-format msgid "File may be compressed (%s) or uncompressed." -msgstr "" +msgstr "A fájl lehet tömörített (%s) vagy tömörítetlen." #: libraries/display_import.lib.php:158 msgid "" "A compressed file's name must end in .[format].[compression]. " "Example: .sql.zip" msgstr "" +"A tömörített fájl nevének .[formátum].[tömörítés] végződésűnek kell " +"lennie. Például: .sql.zip" #: libraries/display_import.lib.php:178 msgid "File uploads are not allowed on this server." @@ -4874,7 +4876,7 @@ msgstr "Az elejétől kihagyandó rekordok (lekérdezések) száma" #: libraries/display_import.lib.php:250 msgid "Format-Specific Options:" -msgstr "" +msgstr "Formátum specifikus beállítások:" #: libraries/display_select_lang.lib.php:44 #: libraries/display_select_lang.lib.php:45 setup/frames/index.inc.php:71 @@ -4966,7 +4968,7 @@ msgstr "Böngésző átalakítása" #: libraries/display_tbl.lib.php:1218 msgid "Copy" -msgstr "" +msgstr "Másolás" #: libraries/display_tbl.lib.php:1233 libraries/display_tbl.lib.php:1245 msgid "The row has been deleted" @@ -5610,7 +5612,7 @@ msgstr "PHP verzió" #: libraries/export/mediawiki.php:15 msgid "MediaWiki Table" -msgstr "" +msgstr "MediaWiki tábla" #: libraries/export/pdf.php:17 msgid "PDF" @@ -5628,13 +5630,15 @@ msgstr "A jelentés címe" #: libraries/export/php_array.php:16 msgid "PHP array" -msgstr "" +msgstr "PHP tömb" #: libraries/export/sql.php:33 msgid "" "Display comments (includes info such as export timestamp, PHP version, " "and server version)" msgstr "" +"Megjegyzések megjelenítése (olyan információk, mint az exportálás " +"időbélyege, a PHP verziója és a szerver verziója)" #: libraries/export/sql.php:35 #, fuzzy @@ -5647,11 +5651,15 @@ msgid "" "Include a timestamp of when databases were created, last updated, and last " "checked" msgstr "" +"Tartalmazza azokat az időbélyegeket, amikor az adatbázis létrejött, utoljára " +"frissült és utoljára ellenőrizve lett" #: libraries/export/sql.php:65 msgid "" "Database system or older MySQL server to maximize output compatibility with:" msgstr "" +"Adatbázis rendszer vagy régebbi MySQL szerver a kimenet kompatibilitásának " +"maximalizálása ezzel:" #: libraries/export/sql.php:72 libraries/export/sql.php:105 #: libraries/export/sql.php:107 @@ -5674,19 +5682,19 @@ msgstr "" #: libraries/export/sql.php:136 msgid "Instead of <code>INSERT</code> statements, use:" -msgstr "" +msgstr "Az <code>INSERT</code> utasítás helyett használjon:" #: libraries/export/sql.php:138 msgid "<code>INSERT DELAYED</code> statements" -msgstr "" +msgstr "<code>INSERT DELAYED</code> utasítások" #: libraries/export/sql.php:140 msgid "<code>INSERT IGNORE</code> statements" -msgstr "" +msgstr "<code>INSERT IGNORE</code> utasítások" #: libraries/export/sql.php:147 msgid "Function to use when dumping data:" -msgstr "" +msgstr "Adatkiíráskor használt függvények:" #: libraries/export/sql.php:151 msgid "Syntax to use when inserting data:" @@ -5698,6 +5706,9 @@ msgid "" "    Example: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES " "(1,2,3)</code>" msgstr "" +"tartalmazza az oszlopneveket minden <code>INSERT</code> utasítás " +"      Példa: <code>INSERT INTO tbl_name (col_A,col_B,col_C) " +"VALUES (1,2,3)</code>" #: libraries/export/sql.php:155 msgid "" @@ -5705,30 +5716,41 @@ msgid "" "    Example: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), " "(7,8,9)</code>" msgstr "" +"több sor beszúrása minden <code>INSERT</code> utasításba     " +"  Példa: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), (7,8,9)</" +"code>" #: libraries/export/sql.php:156 msgid "" "both of the above       Example: <code>INSERT INTO " "tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>" msgstr "" +"mindkettő a fentiek közül       Példa: <code>INSERT " +"INTO tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>" #: libraries/export/sql.php:157 msgid "" "neither of the above       Example: <code>INSERT INTO " "tbl_name VALUES (1,2,3)</code>" msgstr "" +"egyik sem a fentiek közül       Példa: <code>INSERT " +"INTO tbl_name VALUES (1,2,3)</code>" #: libraries/export/sql.php:167 msgid "" "Dump binary columns in hexadecimal notation (for example, \"abc\" becomes " "0x616263)" msgstr "" +"Bináris oszlopok kiírása hexadecimális átírással (például, \"abc\" " +"helyett 0x616263)" #: libraries/export/sql.php:171 msgid "" "Dump TIMESTAMP columns in UTC (enables TIMESTAMP columns to be dumped and " "reloaded between servers in different time zones)" msgstr "" +"A TIMESTAMP oszlopok kiírása UTC-ben (engedélyezi a TIMESTAMP oszlopok " +"kiírását és újratölti a különböző időzónában lévő szerverek között)" #: libraries/export/sql.php:209 libraries/export/xml.php:34 msgid "Procedures" @@ -5773,7 +5795,7 @@ msgstr "XML" #: libraries/export/xml.php:30 msgid "Object creation options (all are recommended)" -msgstr "" +msgstr "Objektum-létrehozási beállítások (mindegyik javasolt)" #: libraries/export/xml.php:40 #, fuzzy @@ -5844,6 +5866,8 @@ msgid "" "The first line of the file contains the table column names (if this is " "unchecked, the first line will become part of the data)" msgstr "" +"A fájl első sora tartalmazza a tábla oszlopneveit (ha ez nincs " +"kiválasztva, az első sor az adat része lesz)" #: libraries/import/csv.php:39 msgid "" @@ -5903,10 +5927,12 @@ msgstr "Ez a beépülő modul nem támogatja a tömörített importálásokat!" #: libraries/import/ods.php:28 msgid "Import percentages as proper decimals (ex. 12.00% to .12)" msgstr "" +"Százalékos értékek importálása pontos tizedestörtként (pl. 12.00% " +"helyett .12)" #: libraries/import/ods.php:29 msgid "Import currencies (ex. $5.00 to 5.00)" -msgstr "" +msgstr "Valuták importálása (pl. $5.00 helyett 5.00)" #: libraries/import/sql.php:32 #, fuzzy @@ -6201,30 +6227,36 @@ msgstr "SQL-előzmények" #: libraries/relation.lib.php:147 msgid "User preferences" -msgstr "" +msgstr "Felhasználói beállítások" #: libraries/relation.lib.php:151 msgid "Quick steps to setup advanced features:" -msgstr "" +msgstr "Gyors lépések a haladó funkciók beállításához:" #: libraries/relation.lib.php:153 msgid "" "Create the needed tables with the <code>script/create_tables.sql</code>." msgstr "" +"Hozza létre a kívánt táblákat a <code>script/create_tables.sql</code> " +"használatával." #: libraries/relation.lib.php:154 msgid "Create a pma user and give access to these tables." msgstr "" +"Hozzon létre egy pma felhasználót és adjon hozzáférést ezekhez a táblákhoz." #: libraries/relation.lib.php:155 msgid "" "Enable advanced features in configuration file (<code>config.inc.php</" "code>), for example by starting from <code>config.sample.inc.php</code>." msgstr "" +"Engedélyezze a haladó funkciókat a beállító fájlban (<code>config.inc.php</" +"code>), például induljon ki a <code>config.sample.inc.php</code> fájlból." #: libraries/relation.lib.php:156 msgid "Re-login to phpMyAdmin to load the updated configuration file." msgstr "" +"Jelentkezzen be újra a phpMyAdminba a frissített beállítófájl betöltéséhez." #: libraries/relation.lib.php:1175 msgid "no description" @@ -6362,7 +6394,7 @@ msgstr "A(z) %s fájl nem tartalmaz semmilyen kulcsazonosítót" #: libraries/schema/Export_Relation_Schema.class.php:207 msgid "SCHEMA ERROR: " -msgstr "" +msgstr "SÉMA HIBA: " #: libraries/schema/Pdf_Relation_Schema.class.php:877 #: libraries/schema/Pdf_Relation_Schema.class.php:1118 @@ -6552,7 +6584,7 @@ msgstr "Új szerver" #: libraries/server_synchronize.lib.php:1344 msgid "Difference" -msgstr "" +msgstr "Különbség" #: libraries/server_synchronize.lib.php:1360 server_synchronize.php:1118 #, fuzzy @@ -6768,7 +6800,7 @@ msgstr "" #: libraries/tbl_properties.inc.php:371 msgid "ENUM or SET data too long?" -msgstr "" +msgstr "ENUM vagy SET adat túl nagy?" #: libraries/tbl_properties.inc.php:373 msgid "Get more editing space" @@ -7030,6 +7062,8 @@ msgid "" "Your preferences will be saved for current session only. Storing them " "permanently requires %sphpMyAdmin configuration storage%s." msgstr "" +"A beállításai csak a jelenlegi munkamenethez lesznek elmentve. A végleges " +"tároláshoz szükséges a %sphpMyAdmin beállítás tároló%s." #: libraries/user_preferences.lib.php:142 #, fuzzy @@ -7222,6 +7256,9 @@ msgid "" "functionality will be missing. For example navigation frame will not refresh " "automatically." msgstr "" +"A JavaScript támogatás hiányzik vagy le van tiltva a böngészőben, ezért " +"néhány phpMyAdmin funkcionalitás hiányozni fog. Például a navigációs keret " +"nem fog automatikusan frissülni." #: main.php:331 #, php-format @@ -7417,7 +7454,7 @@ msgstr "A(z) %1$s tábla elkészült." #: pmd_pdf.php:37 msgid "Page creation failed" -msgstr "" +msgstr "Az oldal létrehozása meghiúsult" #: pmd_pdf.php:89 #, fuzzy @@ -7500,11 +7537,11 @@ msgstr "" #: prefs_manage.php:112 msgid "Configuration contains incorrect data for some fields." -msgstr "" +msgstr "A beállítás rossz adatot tartalmaz néhány mezőben." #: prefs_manage.php:128 msgid "Do you want to import remaining settings?" -msgstr "" +msgstr "Szeretné importálni a megmaradt beállításokat?" #: prefs_manage.php:225 prefs_manage.php:251 msgid "Saved on: @DATE@" @@ -7522,7 +7559,7 @@ msgstr "Importálás a böngészőből" #: prefs_manage.php:248 msgid "Settings will be imported from your browser's local storage." -msgstr "" +msgstr "A beállítások a böngészője helyi tárolójából lesznek importálva." #: prefs_manage.php:254 #, fuzzy @@ -7532,7 +7569,7 @@ msgstr "Egyéb alapbeállítások" #: prefs_manage.php:258 prefs_manage.php:312 msgid "This feature is not supported by your web browser" -msgstr "" +msgstr "Az ön web böngészője nem támogatja ezt a szolgáltatást" #: prefs_manage.php:263 #, fuzzy @@ -7546,22 +7583,26 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" +"További beállításokat állíthat be a config.inc.php modosításával, pl. " +"%sBeállító parancsfájl%s használatával." #: prefs_manage.php:302 msgid "Save to browser's storage" -msgstr "" +msgstr "Mentés a böngésző tárolójába" #: prefs_manage.php:306 msgid "Settings will be saved in your browser's local storage." -msgstr "" +msgstr "A beállítások a böngészője helyi tárolójába lesznek mentve." #: prefs_manage.php:308 msgid "Existing settings will be overwritten!" -msgstr "" +msgstr "A meglévő beállítások felülíródnak!" #: prefs_manage.php:323 msgid "You can reset all your settings and restore them to default values." msgstr "" +"Alaphelyzetbe állíthatja az összes beállítását és visszaállíthatja azokat az " +"alapértelmezett értékekre." #: querywindow.php:93 msgid "Import files" @@ -9165,7 +9206,7 @@ msgstr "Nézet szerkezete" #: server_synchronize.php:420 server_synchronize.php:863 msgid "Data Difference" -msgstr "" +msgstr "Adatkülönbség" #: server_synchronize.php:425 server_synchronize.php:868 msgid "Add column(s)" diff --git a/po/id.po b/po/id.po index e544cd3..4198ee4 100644 --- a/po/id.po +++ b/po/id.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-04-16 22:04+0200\n" diff --git a/po/it.po b/po/it.po index 798b614..488298d 100644 --- a/po/it.po +++ b/po/it.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-04-05 14:27+0200\n" diff --git a/po/ja.po b/po/ja.po index 5834858..676b419 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-05-05 11:38+0200\n" diff --git a/po/ka.po b/po/ka.po index a10c457..fd25b5a 100644 --- a/po/ka.po +++ b/po/ka.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" diff --git a/po/ko.po b/po/ko.po index 91da7de..6007848 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-06-16 18:18+0200\n" diff --git a/po/lt.po b/po/lt.po index a320cbb..a3a8daf 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-04-05 15:52+0200\n" diff --git a/po/lv.po b/po/lv.po index 8a2f5d4..1810279 100644 --- a/po/lv.po +++ b/po/lv.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" diff --git a/po/mk.po b/po/mk.po index 7aba17b..66d2fee 100644 --- a/po/mk.po +++ b/po/mk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" diff --git a/po/ml.po b/po/ml.po index fb12ba5..13fe780 100644 --- a/po/ml.po +++ b/po/ml.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the phpMyAdmin package. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" diff --git a/po/mn.po b/po/mn.po index d3567f7..e64e264 100644 --- a/po/mn.po +++ b/po/mn.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" diff --git a/po/ms.po b/po/ms.po index a75bcc5..d256d6f 100644 --- a/po/ms.po +++ b/po/ms.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" diff --git a/po/nb.po b/po/nb.po index d94eb70..22b5307 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-03-07 11:21+0200\n" diff --git a/po/nl.po b/po/nl.po index 0b63c7f..2268c56 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-03-16 20:18+0200\n" diff --git a/po/pl.po b/po/pl.po index f3d2a06..fe81bcd 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-02-24 16:21+0200\n" diff --git a/po/pt.po b/po/pt.po index 1fa8a6a..a53d8ef 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-03-26 03:23+0200\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 2d05d94..154d6b1 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-04-14 17:44+0200\n" diff --git a/po/ro.po b/po/ro.po index daf13c4..8df7f70 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-07-22 02:28+0200\n" @@ -97,7 +97,7 @@ msgstr "Folosește această valoare" #: bs_disp_as_mime_type.php:29 bs_play_media.php:35 #: libraries/blobstreaming.lib.php:331 msgid "No blob streaming server configured!" -msgstr "" +msgstr "Nici un server de streaming aglomerat nu a fost configurat!" #: bs_disp_as_mime_type.php:35 #, fuzzy diff --git a/po/ru.po b/po/ru.po index e8cb0a1..0b6eac4 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-03-13 21:17+0200\n" diff --git a/po/si.po b/po/si.po index eb59166..f7e29c2 100644 --- a/po/si.po +++ b/po/si.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-05-04 14:56+0200\n" diff --git a/po/sk.po b/po/sk.po index 5fe4596..bab233c 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmo56+0200\n"sourceforge.net\n"!"ckage.azokat az "�lásokat!"ни"lid; border-bottom: 1px gray solid; padding:0px; margin-bottom: 1em "> '; ";";ing_table_index][$t]]) > 0)) {AME']) . " = " . $target_tables_keys[$table_index][$y] . ";";�!�!�I�/�0J�/�xd��* @�/��*��*�I�/�`��*�I�/��_T�*u��*PT�*�TT�*�YT�*��*xd��* @�/��>�/�k��*�!�!�I�/�0J�/�H.��*A�/��*��*�I�/�`��*�I�/��I�/��I�/�8��*�p�0J�/�u��*��*A�/��?�/�k��*GHIJKMNOP�I�/�0J�/�H��*�B�/��*��*�I�/�0_T�*u��*p��*��*PT�*�TT�*�YT�*��*H��*�B�/��@�/�k��*8��*�B�/�A�/�k��*(��*�B�/�@A�/�k��*��*�B�/�pA�/�k��* �^T�*u��*�YT�*�;�/��h��*e��*�TT�*B�/�yh��*e��*PT�*@B�/�Zh��*e��*��*p��*��*PT�*�t��*�TT�*�YT�*��*8��*�O�*0J�/�p��*�C�/��B�/�k��*5678:<=>?@BD�I�/�0J�/��L�*0J�/�u��*��*pB�/��O�*e��*��*�_@f�S Q��l��*0J�/��L�*E�/��C�/�k��*u]�� 4Q��U^Qʉ��u��*ēv�I�/�0J�/�H.�*tU�*pK�/��*��*��R�*�I�/�0K�/��I�/�PF�/��*u��*�t��*�L�/��*�K�/�G�/��*8J�/�in 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-07-22 02:26+0200\n" diff --git a/po/sl.po b/po/sl.po index 8aa1bcb..1b22603 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-03-24 22:38+0200\n" diff --git a/po/sq.po b/po/sq.po index 4353ceb..904de0b 100644 --- a/po/sq.po +++ b/po/sq.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-07-21 14:51+0200\n" diff --git a/po/sr.po b/po/sr.po index 008157b..967e007 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-04-06 18:43+0200\n" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index 2053fd6..4656025 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-12-02 14:49+0200\n" diff --git a/po/sv.po b/po/sv.po index 23c2200..0d5555c 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-02-16 21:42+0200\n" diff --git a/po/ta.po b/po/ta.po index 3ee7147..897151d 100644 --- a/po/ta.po +++ b/po/ta.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-04-16 10:43+0200\n" diff --git a/po/te.po b/po/te.po index 9b0f4e2..b6e31e3 100644 --- a/po/te.po +++ b/po/te.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-04-07 17:06+0200\n" diff --git a/po/th.po b/po/th.po index d75e282..2f99797 100644 --- a/po/th.po +++ b/po/th.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" diff --git a/po/tr.po b/po/tr.po index 076883c..bb25dbb 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-04-17 19:11+0200\n" diff --git a/po/tt.po b/po/tt.po index b26519d..a71a452 100644 --- a/po/tt.po +++ b/po/tt.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-07-22 02:25+0200\n" diff --git a/po/ug.po b/po/ug.po index acaf125..787d793 100644 --- a/po/ug.po +++ b/po/ug.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-08-26 11:59+0200\n" diff --git a/po/uk.po b/po/uk.po index 91e457a..c79afcd 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-12-28 22:26+0200\n" diff --git a/po/ur.po b/po/ur.po index 83fd683..ad07264 100644 --- a/po/ur.po +++ b/po/ur.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-04-23 08:37+0200\n" diff --git a/po/uz.po b/po/uz.po index d666d5d..6022af9 100644 --- a/po/uz.po +++ b/po/uz.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-07-22 02:31+0200\n" diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index 01a9094..8d96a43 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2010-07-22 02:30+0200\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 304d0b9..a4d7900 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-03-04 09:47+0200\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 6096617..e03674c 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.7-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.8-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-06 09:23+0200\n" "PO-Revision-Date: 2011-05-31 09:47+0800\n" diff --git a/tbl_indexes.php b/tbl_indexes.php index 54923a0..ac32387 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -200,7 +200,7 @@ foreach ($index->getColumns() as $column) { || preg_match('/(char|text)/i', $field_type)) { echo '<option value="' . htmlspecialchars($field_name) . '"' . (($field_name == $column->getName()) ? ' selected="selected"' : '') . '>' - . htmlspecialchars($field_name) . ' [' . $field_type . ']' + . htmlspecialchars($field_name) . ' [' . htmlspecialchars($field_type) . ']' . '</option>' . "\n"; } } // end foreach $fields @@ -222,7 +222,7 @@ for ($i = 0; $i < $add_fields; $i++) { <?php foreach ($fields as $field_name => $field_type) { echo '<option value="' . htmlspecialchars($field_name) . '">' - . htmlspecialchars($field_name) . ' [' . $field_type . ']' + . htmlspecialchars($field_name) . ' [' . htmlspecialchars($field_type) . ']' . '</option>' . "\n"; } // end foreach $fields ?> diff --git a/tbl_select.php b/tbl_select.php index 2cb0086..8414222 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -124,7 +124,7 @@ if (!isset($param) || $param[0] == '') { ?> <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>"> <th><?php echo htmlspecialchars($fields_list[$i]); ?></th> - <td><?php echo $fields_type[$i]; ?></td> + <td><?php echo htmlspecialchars($fields_type[$i]); ?></td> <td><?php echo $fields_collation[$i]; ?></td> <td><select name="func[]"> <?php @@ -190,7 +190,7 @@ if (!isset($param) || $param[0] == '') { <?php } elseif (strncasecmp($fields_type[$i], 'enum', 4) == 0) { // e n u m s - $enum_value=explode(', ', str_replace("'", '', substr($fields_type[$i], 5, -1))); + $enum_value=explode(', ', str_replace("'", '', substr(htmlspecialchars($fields_type[$i]), 5, -1))); $cnt_enum_value = count($enum_value); echo ' <select name="fields[' . $i . '][]"' .' multiple="multiple" size="' . min(3, $cnt_enum_value) . '">' . "\n"; diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index fba2f23..08f8ca5 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -65,7 +65,10 @@ h2 a img{display:inline;} .data{ margin: 0 0 12px 0; +} +#table_results td.data { +border-right: 1px solid #BBBBBB; } h3 { @@ -372,9 +375,10 @@ table tr.odd th, } /* even items 2,4,6,8,... */ +/* (tested on CRTs and ACLs) */ table tr.even th, .even { - background: #f3f3f3; + background: #DFDFDF; } /* odd table rows 1,3,5,7,... */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_4_8RC1, created. RELEASE_3_4_8RC1
by Marc Delisle 24 Nov '11

24 Nov '11

The annotated tag, RELEASE_3_4_8RC1 has been created at 0fe6b554885d3b4568f0b3eb7f7b6ed59935e467 (tag) tagging b00745d352c89a5e52673e717e6cbef43dc229d6 (commit) replaces RELEASE_3_4_7_1 tagged by Marc Delisle on Thu Nov 24 17:12:05 2011 -0500 - Log ----------------------------------------------------------------- Released 3.4.8-rc1 Aris Feryanto (2): Fix bug #3431427: Dropdown displaying results - setting NULL does not work Added Changelog entry Dieter Adriaenssens (1): [security] Self-XSS on invalid query (table overview), see PMASA-2011-18 Gabor Gyorvari (1): patch #3430291 [import] Handle conflicts in some open_basedir situations Madhura Jayaratne (6): White space cleanup bug #3439292 [core] Fail to synchronize column with name of keyword bug #3425156 [interface] Add column after drop bug #3407235 [interface] Entering the key through a lookup window does not reset NULL bug #3431427: Fix for enum and set columns Merge branch 'QA_3_4' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into QA_3_4 Marc Delisle (21): 3.4.8-dev Merge branch 'MAINT_3_4_7' into QA_3_4 3.4.7 bug #3427256 [interface] no links to browse/empty views and tables bug #3428627 [import] ODS import ignores memory limits bug #3426836 [interface] Visual column separation bug #3428065 [parser] TRUE not recognized by parser Update credits Less intense vertical border for data Merge branch 'MAINT_3_4_7' into QA_3_4 Merge branch 'MAINT_3_4_7' into QA_3_4 ChangeLog for 3.4.7.1 3.4.7.1 release This feature does not apply only to light mode When ShowTooltipAliasTB is true, VIEW is wrongly shown as the view name in main panel db Structure page Avoid showing the password in phpinfo()'s output [security] Self-XSS on database names (Synchronize), see PMASA-2011-18 [security] Self-XSS on database names (Operations/rename), see PMASA-2011-18 [security] Self-XSS on column type (table Search), see PMASA-2011-18 Fix merge conflicts 3.4.8-rc1 Michal Čihař (5): Update translations from master Merge translations from master Merge branch 'MAINT_3_4_7' into QA_3_4 Remove mention of safe mode as it is not recommended anymore (rfe #3313257). Merge remote-tracking branch 'origin/MAINT_3_4_7' into QA_3_4 Remi COLLET (1): patch #3437354 [core] Notice: Array to string conversion in PHP 5.4 Robert Scheck (1): Patch by Robert Scheck <robert(a)fedoraproject.org> Rouslan Placella (5): Fixed bug #3425230 - enum data split at space char (more space to edit) Fixed bug #3426840 - ENUM/SET editor can't handle commas in values Fixed bug #3430377 - Deleted search results remain visible [security] Self-XSS on column type (Create index), see PMASA-2011-18 Fixed bug #3441572 - 'newer version of phpMyAdmin' message not shown in IE8 coupling (1): patch #3428764 [edit] Inline edit on multi-server configuration ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0