- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1040-g7d93132
by Marc Delisle 25 Dec '10

25 Dec '10

The branch, master has been updated via 7d9313245b878bfde8fe4a1ac0d10ba35ac0de79 (commit) from 1059e281d16a3fee98aadded173a8f92b52e2e27 (commit) - Log ----------------------------------------------------------------- commit 7d9313245b878bfde8fe4a1ac0d10ba35ac0de79 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Dec 25 15:41:37 2010 -0500 rfe #3141330 [relation] When displaying results, show a link to the foreign table even when phpMyAdmin configuration storage is not active ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/display_tbl.lib.php | 32 ++++++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index a55a6b7..1e7c645 100644 --- a/ChangeLog +++ b/ChangeLog @@ -125,6 +125,8 @@ thanks to garas - garas - bug #3123433 [interface] Avoid double escaping of MySQL errors. - [interface] Use less noisy message and remove disable link on server charts and database statistics. ++ rfe #3141330 [relation] When displaying results, show a link to the foreign + table even when phpMyAdmin configuration storage is not active 3.3.10.0 (not yet released) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 7bbd4d8..ca56955 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -2014,20 +2014,24 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) } $tabs = '(\'' . join('\',\'', $target) . '\')'; - if ($cfgRelation['displaywork']) { - if (! strlen($table)) { - $exist_rel = false; - } else { - $exist_rel = PMA_getForeigners($db, $table, '', 'both'); - if ($exist_rel) { - foreach ($exist_rel AS $master_field => $rel) { - $display_field = PMA_getDisplayField($rel['foreign_db'], $rel['foreign_table']); - $map[$master_field] = array($rel['foreign_table'], - $rel['foreign_field'], - $display_field, - $rel['foreign_db']); - } // end while - } // end if + if (! strlen($table)) { + $exist_rel = false; + } else { + // To be able to later display a link to the related table, + // we verify both types of relations: either those that are + // native foreign keys or those defined in the phpMyAdmin + // configuration storage. If no PMA storage, we won't be able + // to use the "column to display" notion (for example show + // the name related to a numeric id). + $exist_rel = PMA_getForeigners($db, $table, '', 'both'); + if ($exist_rel) { + foreach ($exist_rel AS $master_field => $rel) { + $display_field = PMA_getDisplayField($rel['foreign_db'], $rel['foreign_table']); + $map[$master_field] = array($rel['foreign_table'], + $rel['foreign_field'], + $display_field, + $rel['foreign_db']); + } // end while } // end if } // end if // end 2b hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1039-g1059e28
by Marc Delisle 24 Dec '10

24 Dec '10

The branch, master has been updated via 1059e281d16a3fee98aadded173a8f92b52e2e27 (commit) from 90978114cda65a8c9a628af6cbd337858329e4ed (commit) - Log ----------------------------------------------------------------- commit 1059e281d16a3fee98aadded173a8f92b52e2e27 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Dec 24 08:13:02 2010 -0500 Remove extra wrapping of jQuery objects ----------------------------------------------------------------------- Summary of changes: js/sql.js | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/js/sql.js b/js/sql.js index c65876b..5a359c5 100644 --- a/js/sql.js +++ b/js/sql.js @@ -653,24 +653,23 @@ $(document).ready(function() { $input_siblings.each(function() { // Inline edit post has been successful. - if($(this).is(':not(.relation, .enum)')) { + $this_sibling = $(this); + if($this_sibling.is(':not(.relation, .enum)')) { /** * @var new_html String containing value of the data field after edit */ - var new_html = $(this).find('textarea').val(); - - if($(this).is('.transformed')) { - var field_name = getFieldName($(this), disp_mode); - var this_field = $(this); + var new_html = $this_sibling.find('textarea').val(); + if($this_sibling.is('.transformed')) { + var field_name = getFieldName($this_sibling, disp_mode); $.each(data.transformations, function(key, value) { if(key == field_name) { - if($(this_field).is('.text_plain, .application_octetstream')) { + if($this_sibling.is('.text_plain, .application_octetstream')) { new_html = value; return false; } else { - var new_value = $(this_field).find('textarea').val(); + var new_value = $this_sibling.find('textarea').val(); new_html = $(value).append(new_value); return false; } @@ -681,21 +680,19 @@ $(document).ready(function() { else { var new_html = ''; var new_value = ''; - $test_element = $(this).find('select'); + $test_element = $this_sibling.find('select'); if ($test_element.length != 0) { new_value = $test_element.val(); } - $test_element = $(this).find('span.curr_value'); + $test_element = $this_sibling.find('span.curr_value'); if ($test_element.length != 0) { new_value = $test_element.text(); } - if($(this).is('.relation')) { - var field_name = getFieldName($(this), disp_mode); - var this_field = $(this); - + if($this_sibling.is('.relation')) { + var field_name = getFieldName($this_sibling, disp_mode); $.each(data.relations, function(key, value) { if(key == field_name) { new_html = $(value).append(new_value); @@ -703,11 +700,11 @@ $(document).ready(function() { } }) } - if($(this).is('.enum')) { + if($this_sibling.is('.enum')) { new_html = new_value; } } - $(this).html(new_html); + $this_sibling.html(new_html); }) } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1036-gef8687b
by Marc Delisle 23 Dec '10

23 Dec '10

The branch, master has been updated via ef8687b5debc62bf62f2bb1421aa3bd0600be05c (commit) from fc37859b4206bb5721aae6f609b451df8e32b328 (commit) - Log ----------------------------------------------------------------- commit ef8687b5debc62bf62f2bb1421aa3bd0600be05c Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 23 13:07:32 2010 -0500 Missing question mark ----------------------------------------------------------------------- Summary of changes: libraries/navigation_header.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php index e34adc5..2b4606e 100644 --- a/libraries/navigation_header.inc.php +++ b/libraries/navigation_header.inc.php @@ -101,7 +101,7 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) { echo '</a>'; echo ' ' . PMA_showMySQLDocu('', '', TRUE) . "\n"; - echo '<a href="navigation.php' . PMA_generate_common_url($params) . '" target="frame_navigation">'; + echo '<a href="navigation.php?' . PMA_generate_common_url($params) . '" target="frame_navigation">'; if ($GLOBALS['cfg']['MainPageIconic']) { echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_reload.png"' . ' title="' . __('Reload navigation frame') . '"' hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1035-gfc37859
by Marc Delisle 23 Dec '10

23 Dec '10

The branch, master has been updated via fc37859b4206bb5721aae6f609b451df8e32b328 (commit) from 8b609dfe353cffd476f4f033ac895e7f42ec9882 (commit) - Log ----------------------------------------------------------------- commit fc37859b4206bb5721aae6f609b451df8e32b328 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 23 13:02:53 2010 -0500 RFE 3141334: Reload icon New icon by Michael Keck and move it with other navi frame icons ----------------------------------------------------------------------- Summary of changes: libraries/navigation_header.inc.php | 23 ++++++++++++++++++----- navigation.php | 12 ------------ themes/darkblue_orange/img/s_reload.png | Bin 245 -> 385 bytes themes/original/css/theme_left.css.php | 7 ------- themes/original/img/s_reload.png | Bin 245 -> 385 bytes 5 files changed, 18 insertions(+), 24 deletions(-) diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php index 6c5b266..e34adc5 100644 --- a/libraries/navigation_header.inc.php +++ b/libraries/navigation_header.inc.php @@ -91,13 +91,26 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) { echo '>' . $query_frame_link_text . '</a>' . "\n"; } // end if ($server != 0) -if ($GLOBALS['cfg']['MainPageIconic']) { echo ' <a href="Documentation.html" target="documentation"' - .' title="' . __('phpMyAdmin documentation') . '" >' - .'<img class="icon" src="' . $pmaThemeImage . 'b_docs.png" width="16" height="16"' - .' alt="' . __('phpMyAdmin documentation') . '" /></a>' . "\n"; + .' title="' . __('phpMyAdmin documentation') . '" >'; + + if ($GLOBALS['cfg']['MainPageIconic']) { + echo '<img class="icon" src="' . $pmaThemeImage . 'b_docs.png" width="16" height="16"' + .' alt="' . __('phpMyAdmin documentation') . '" />'; + } + echo '</a>'; echo ' ' . PMA_showMySQLDocu('', '', TRUE) . "\n"; -} + + echo '<a href="navigation.php' . PMA_generate_common_url($params) . '" target="frame_navigation">'; + if ($GLOBALS['cfg']['MainPageIconic']) { + echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_reload.png"' + . ' title="' . __('Reload navigation frame') . '"' + . ' alt="' . __('Reload navigation frame') . '" />'; + } else { + echo '<br />' . __('Reload navigation frame'); + } + echo '</a>'; + echo '</div>' . "\n"; /** diff --git a/navigation.php b/navigation.php index fdb6502..aa16e66 100644 --- a/navigation.php +++ b/navigation.php @@ -53,18 +53,6 @@ function PMA_exitNavigationFrame() if (!empty($GLOBALS['db'])) { $params['db'] = $GLOBALS['db']; } - echo '<div id="reloadlink">' . "\n"; - echo '<a href="navigation.php' . PMA_generate_common_url($params) . '" target="frame_navigation">'; - if ($GLOBALS['cfg']['NavigationBarIconic']) { - echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_reload.png"' - . ' title="' . __('Reload navigation frame') . '"' - . ' alt="' . __('Reload navigation frame') . '" />'; - } - if ($GLOBALS['cfg']['NavigationBarIconic'] !== true) { - echo __('Reload navigation frame'); - } - echo '</a>'; - echo '</div>' . "\n"; echo '</body></html>'; exit; } diff --git a/themes/darkblue_orange/img/s_reload.png b/themes/darkblue_orange/img/s_reload.png index 754361e..0113cbd 100644 Binary files a/themes/darkblue_orange/img/s_reload.png and b/themes/darkblue_orange/img/s_reload.png differ diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index 9bb3c39..ef0f53c 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -134,7 +134,6 @@ div#leftframelinks .icon { margin: 0; } -div#reloadlink a img, div#leftframelinks a img.icon { margin: 0; padding: 0.2em; @@ -231,12 +230,6 @@ div#left_tableList ul ul { background: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>; color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>; } -#reloadlink { - clear: both; - float: <?php echo $right; ?>; - display: block; - padding: 1em; -} #NavFilter { display: none; diff --git a/themes/original/img/s_reload.png b/themes/original/img/s_reload.png index 754361e..0113cbd 100644 Binary files a/themes/original/img/s_reload.png and b/themes/original/img/s_reload.png differ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1034-g8b609df
by Michal Čihař 23 Dec '10

23 Dec '10

The branch, master has been updated via 8b609dfe353cffd476f4f033ac895e7f42ec9882 (commit) via 0003a5eea7ab025880bd6432e338fdcaf8d909d9 (commit) via 339ccf54ea7ac6cb7867516469a1b5d33ee1c74b (commit) via a6f215ed8b98f57522b18cb8facba94ae71e8da9 (commit) via f3220c732492de3b0de64ba47af234c7a5027a98 (commit) via ebedc593b2c3ab0ec8c3658211fc0b1c8fcc90a1 (commit) via d61c37ce631e749e3530e7bc368ce8fbf2558331 (commit) via dcd50bb1c2ec47033d3c485bdc741aa276af5d01 (commit) via 6d9edc8eb14721d955f2da8143d7148c776b3b46 (commit) via 601ce65ea53f112711f69ca53ae86627b4b6b387 (commit) via b3ce3b998b442ec29077d2e59e2d39891f1ba1cf (commit) via 63a1407c6817579eddded1c20662fb4d55a92ba5 (commit) from 17b7ac6ac637a2fbd3b574b82b44f074bff11467 (commit) - Log ----------------------------------------------------------------- commit 8b609dfe353cffd476f4f033ac895e7f42ec9882 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 22 22:53:41 2010 +0200 Translation update done using Pootle. commit 0003a5eea7ab025880bd6432e338fdcaf8d909d9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 22 22:53:36 2010 +0200 Translation update done using Pootle. commit 339ccf54ea7ac6cb7867516469a1b5d33ee1c74b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 22 22:53:27 2010 +0200 Translation update done using Pootle. commit a6f215ed8b98f57522b18cb8facba94ae71e8da9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 22 22:53:22 2010 +0200 Translation update done using Pootle. commit f3220c732492de3b0de64ba47af234c7a5027a98 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 22 22:52:21 2010 +0200 Translation update done using Pootle. commit ebedc593b2c3ab0ec8c3658211fc0b1c8fcc90a1 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 22 22:48:17 2010 +0200 Translation update done using Pootle. commit d61c37ce631e749e3530e7bc368ce8fbf2558331 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 22 22:28:01 2010 +0200 Translation update done using Pootle. commit dcd50bb1c2ec47033d3c485bdc741aa276af5d01 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 22 22:26:45 2010 +0200 Translation update done using Pootle. commit 6d9edc8eb14721d955f2da8143d7148c776b3b46 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 22 22:09:47 2010 +0200 Translation update done using Pootle. commit 601ce65ea53f112711f69ca53ae86627b4b6b387 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 22 22:08:10 2010 +0200 Translation update done using Pootle. commit b3ce3b998b442ec29077d2e59e2d39891f1ba1cf Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 22 22:07:48 2010 +0200 Translation update done using Pootle. commit 63a1407c6817579eddded1c20662fb4d55a92ba5 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 22 22:01:42 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/po/tr.po b/po/tr.po index 5b68d02..038e741 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-14 11:27-0500\n" -"PO-Revision-Date: 2010-12-21 13:26+0200\n" +"PO-Revision-Date: 2010-12-22 22:53+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -327,7 +327,7 @@ msgstr "Kopyalanmış veritabanına geç" #: tbl_structure.php:199 tbl_structure.php:859 tbl_tracking.php:269 #: tbl_tracking.php:320 msgid "Collation" -msgstr "Tanımlama" +msgstr "Karşılaştırma" #: db_operations.php:548 #, php-format @@ -358,7 +358,7 @@ msgstr "Tablo" #: tbl_printview.php:391 tbl_structure.php:388 tbl_structure.php:475 #: tbl_structure.php:869 msgid "Rows" -msgstr "Satırlar" +msgstr "Satır" #: db_printview.php:107 libraries/db_structure.lib.php:58 tbl_indexes.php:188 msgid "Size" @@ -1599,9 +1599,9 @@ msgid "" "the administrator of the MySQL server." msgstr "" "phpMyAdmin MySQL sunucusuna bağlanmayı denedi ama sunucu bağlantıyı " -"reddetti. Yapılandırmanızdaki anamakine (host) adresini, kullanıcı adını ve " +"reddetti. Yapılandırma dosyanızdaki anamakine (host), kullanıcı adı ve " "parolayı kontrol edin ve MySQL sunucusu yöneticisi tarafından verilen " -"bilgiyle uyuştuğundan emin olun." +"bilgiye uyduğundan emin olun." #: libraries/auth/cookie.auth.lib.php:231 msgid "Log in" @@ -1833,7 +1833,7 @@ msgstr "Geçersiz sunucu indeksi: %s" #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -"%1$s sunucusu için geçersiz anamakine. Lütfen yapılandırmanızı gözden " +"%1$s sunucusu için geçersiz anamakine. Lütfen yapılandırma dosyanızı gözden " "geçirin." #: libraries/common.inc.php:637 libraries/config/messages.inc.php:482 @@ -4386,8 +4386,8 @@ msgstr "" #: libraries/dbi/mysql.dbi.lib.php:111 libraries/dbi/mysqli.dbi.lib.php:122 msgid "Connection for controluser as defined in your configuration failed." msgstr "" -"Yapılandırmanız içinde tanımlanmış denetim kullanıcıları için bağlantı " -"başarısız." +"Yapılandırma dosyanız içinde tanımlanmış denetim kullanıcıları için bağlantı " +"başarısız oldu." #: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 #: libraries/dbi/mysqli.dbi.lib.php:411 @@ -4461,7 +4461,7 @@ msgstr "Şu anki sunucudan veritabanları dışa aktarılıyor" #: libraries/display_export.lib.php:89 #, php-format msgid "Exporting tables from \"%s\" database" -msgstr "\"%s\" veritabanında tablolar dışa aktarılıyor" +msgstr "\"%s\" veritabanından tablolar dışa aktarılıyor" #: libraries/display_export.lib.php:91 #, php-format @@ -4566,7 +4566,7 @@ msgstr "Sıkıştırma:" #: libraries/export/sql.php:933 libraries/tbl_properties.inc.php:578 #: pmd_general.php:512 server_privileges.php:1966 server_processlist.php:74 msgid "None" -msgstr "Hiçbiri" +msgstr "Yok" #: libraries/display_export.lib.php:313 msgid "zipped" @@ -5689,7 +5689,7 @@ msgstr "" #: libraries/kanji-encoding.lib.php:142 msgctxt "None encoding conversion" msgid "None" -msgstr "Hiçbiri" +msgstr "Yok" #. l10n: This is currently used only in Japanese locales #: libraries/kanji-encoding.lib.php:148 @@ -6509,7 +6509,7 @@ msgstr "Daha fazla düzenleme alanı alın" #: libraries/tbl_properties.inc.php:396 msgctxt "for default" msgid "None" -msgstr "Hiçbiri" +msgstr "Yok" #: libraries/tbl_properties.inc.php:397 msgid "As defined:" @@ -7478,7 +7478,7 @@ msgstr "Yetkiniz yok." #: server_privileges.php:303 server_privileges.php:304 msgctxt "None privileges" msgid "None" -msgstr "Hiçbiri" +msgstr "Yok" #: server_privileges.php:432 server_privileges.php:567 #: server_privileges.php:1809 server_privileges.php:1815 @@ -7676,7 +7676,7 @@ msgstr "Kullanıcı için veritabanı" #: server_privileges.php:2129 msgctxt "Create none database for user" msgid "None" -msgstr "Hiçbiri" +msgstr "Yok" #: server_privileges.php:2130 msgid "Create database with same name and grant all privileges" @@ -9636,7 +9636,7 @@ msgstr "Belirgin değerlere gözat" #: tbl_structure.php:384 msgctxt "None for default" msgid "None" -msgstr "Hiçbiri" +msgstr "Yok" #: tbl_structure.php:397 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1022-g17b7ac6
by Marc Delisle 22 Dec '10

22 Dec '10

The branch, master has been updated via 17b7ac6ac637a2fbd3b574b82b44f074bff11467 (commit) from 30696bcbd0d5af3785ee4adf66a8602724febeb1 (commit) - Log ----------------------------------------------------------------- commit 17b7ac6ac637a2fbd3b574b82b44f074bff11467 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 22 12:58:59 2010 -0500 Add action verbs to More choices in Structure page ----------------------------------------------------------------------- Summary of changes: tbl_structure.php | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tbl_structure.php b/tbl_structure.php index b7663ec..17c2e73 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -162,14 +162,14 @@ $titles['BrowseDistinctValues'] = PMA_getIcon('b_browse.png', __('Browse distinc // hidden action titles (image and string) $hidden_titles = array(); $hidden_titles['BrowseDistinctValues'] = PMA_getIcon('b_browse.png', __('Browse distinct values'), false, true); -$hidden_titles['Primary'] = PMA_getIcon('b_primary.png', __('Primary'), false, true); -$hidden_titles['NoPrimary'] = PMA_getIcon('bd_primary.png', __('Primary'), false, true); -$hidden_titles['Index'] = PMA_getIcon('b_index.png', __('Index'), false, true); -$hidden_titles['NoIndex'] = PMA_getIcon('bd_index.png', __('Index'), false, true); -$hidden_titles['Unique'] = PMA_getIcon('b_unique.png', __('Unique'), false, true); -$hidden_titles['NoUnique'] = PMA_getIcon('bd_unique.png', __('Unique'), false, true); -$hidden_titles['IdxFulltext'] = PMA_getIcon('b_ftext.png', __('Fulltext'), false, true); -$hidden_titles['NoIdxFulltext'] = PMA_getIcon('bd_ftext.png', __('Fulltext'), false, true); +$hidden_titles['Primary'] = PMA_getIcon('b_primary.png', __('Add primary key'), false, true); +$hidden_titles['NoPrimary'] = PMA_getIcon('bd_primary.png', __('Add primary key'), false, true); +$hidden_titles['Index'] = PMA_getIcon('b_index.png', __('Add index'), false, true); +$hidden_titles['NoIndex'] = PMA_getIcon('bd_index.png', __('Add index'), false, true); +$hidden_titles['Unique'] = PMA_getIcon('b_unique.png', __('Add unique index'), false, true); +$hidden_titles['NoUnique'] = PMA_getIcon('bd_unique.png', __('Add unique index'), false, true); +$hidden_titles['IdxFulltext'] = PMA_getIcon('b_ftext.png', __('Add FULLTEXT index'), false, true); +$hidden_titles['NoIdxFulltext'] = PMA_getIcon('bd_ftext.png', __('Add FULLTEXT index'), false, true); /** * Displays the table structure ('show table' works correct since 3.23.03) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_4_0BETA1-29-ge795d42
by Marc Delisle 22 Dec '10

22 Dec '10

The branch, TESTING has been updated via e795d42205feea5032654414fb8618aa42343d44 (commit) via eaac45dfda2daa345edc5165b30bedea5a3f18a0 (commit) via 1ceccbd50cc0359ac2543e4283a70b2440752b59 (commit) via 8afdcbe2b89888b4e7e3ca58224cb01ebe8db73c (commit) via b6f717a6025c3785430c4cf317cfa5786564729b (commit) from 6a4a537c74868073819c04e7fd49bbeb81059666 (commit) - Log ----------------------------------------------------------------- commit e795d42205feea5032654414fb8618aa42343d44 Merge: 6a4a537c74868073819c04e7fd49bbeb81059666 eaac45dfda2daa345edc5165b30bedea5a3f18a0 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 22 12:32:50 2010 -0500 Merge branch 'MAINT_3_3_9' into TESTING ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- libraries/export/sql.php | 2 +- libraries/sqlparser.data.php | 23 +++++++++++++++++++---- libraries/sqlparser.lib.php | 38 ++++++++++++++++++-------------------- translators.html | 4 ++-- 8 files changed, 47 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb6911c..a12e057 100644 --- a/ChangeLog +++ b/ChangeLog @@ -137,6 +137,8 @@ - patch #3117535 [replication] Add quotes to database in initial statement, thanks to Craig Duncan - duncan3dc - bug #3112614 [pdf schema] Scratchboard for PDF pages not working +- bug #3125606 [parser] Query for table "level" causes strange display +- bug #3127904 [parser] Close all opened round brackets indents 3.3.8.1 (2010-11-29) - bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 diff --git a/Documentation.html b/Documentation.html index 2d53af6..4b44689 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.0-beta1 - Documentation</title> + <title>phpMyAdmin 3.3.9-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/">php<span class="myadmin">MyAdmin</span></a> - 3.4.0-beta1 + 3.3.9-rc1 Documentation </h1> </div> diff --git a/README b/README index 9f92b9a..9ccf2d5 100644 --- a/README +++ b/README @@ -25,8 +25,8 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2, as published by the Free Software Foundation. - Version 3.3.8.1 - --------------- + Version 3.3.9-rc1 + ----------------- http://www.phpmyadmin.net/ You should have received a copy of the GNU General Public License diff --git a/libraries/Config.class.php b/libraries/Config.class.php index b2bff78..40ff7ae 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.0-beta1'); + $this->set('PMA_VERSION', '3.3.9-rc1'); /** * @deprecated */ diff --git a/libraries/export/sql.php b/libraries/export/sql.php index cc8cc75..f155b6f 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -503,7 +503,7 @@ function PMA_exportDBFooter($db) * Returns a stand-in CREATE definition to resolve view dependencies * * @param string the database name - * @param string the vew name + * @param string the view name * @param string the end of line sequence * * @return string resulting definition diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index dffd6b1..90b4304 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -516,7 +516,6 @@ $PMA_SQPdata_reserved_word = array ( 'LAST_INSERT_ID', 'LEADING', 'LEFT', - 'LEVEL', 'LIKE', 'LIMIT', 'LINEAR', // 5.1 @@ -686,7 +685,24 @@ $PMA_SQPdata_reserved_word = array ( * * @global integer MySQL reserved words count */ -$PMA_SQPdata_reserved_word_cnt = 289; +$PMA_SQPdata_reserved_word_cnt = 287; +/** + * The previous array must be sorted so that the binary search work. + * Sometimes a word is not added in the correct order, so + * this debugging code shows the problem. The same should be + * done for all arrays. + */ +/* +$original = $PMA_SQPdata_reserved_word; +sort($PMA_SQPdata_reserved_word); +$difference = array_diff_assoc($original, $PMA_SQPdata_reserved_word); +echo '<pre>'; +print_r($difference); +echo '</pre>'; +echo '<pre>'; +print_r($PMA_SQPdata_reserved_word); +echo '</pre>'; +*/ /** * words forbidden to be used as column or table name wihtout quotes @@ -905,7 +921,6 @@ $PMA_SQPdata_forbidden_word = array ( 'LEAVE', 'LEAVES', 'LEFT', - 'LEVEL', 'LIKE', 'LIMIT', 'LINEAR', // 5.1 @@ -1184,7 +1199,7 @@ $PMA_SQPdata_forbidden_word = array ( * * @global integer MySQL forbidden words count */ -$PMA_SQPdata_forbidden_word_cnt = 483; +$PMA_SQPdata_forbidden_word_cnt = 482; /** * the MySQL column/data types diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index a6676e4..4c439b0 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -2197,7 +2197,6 @@ if (! defined('PMA_MINIMUM_COMMON')) { // DEBUG echo "Loop format <strong>" . $arr[$i]['data'] . "</strong> " . $arr[$i]['type'] . "<br />"; $before = ''; $after = ''; - $indent = 0; // array_shift($typearr); /* 0 prev2 @@ -2297,17 +2296,20 @@ if (! defined('PMA_MINIMUM_COMMON')) { } break; case 'punct_bracket_close_round': - $bracketlevel--; - if ($infunction == TRUE) { - $functionlevel--; - $after .= ' '; - $before .= ' '; - } else { - $indent--; - $before .= ($mode != 'query_only' ? '</div>' : ' '); - } - $infunction = ($functionlevel > 0) ? TRUE : FALSE; - break; + // only close bracket level when it was opened before + if ($bracketlevel > 0) { + $bracketlevel--; + if ($infunction == TRUE) { + $functionlevel--; + $after .= ' '; + $before .= ' '; + } else { + $indent--; + $before .= ($mode != 'query_only' ? '</div>' : ' '); + } + $infunction = ($functionlevel > 0) ? TRUE : FALSE; + } + break; case 'alpha_columnType': if ($docu) { switch ($arr[$i]['data']) { @@ -2610,14 +2612,10 @@ if (! defined('PMA_MINIMUM_COMMON')) { } $str .= $after; } // end for - /* End possibly unclosed documentation link */ - if ($close_docu_link) { - $str .= '</a>'; - $close_docu_link = false; - } - if ($mode!='query_only') { - // close inner_sql span - $str .= '</span>'; + // close unclosed indent levels + while ($indent > 0) { + $indent--; + $str .= ($mode != 'query_only' ? '</div>' : ' '); } if ($mode=='color') { // close syntax span diff --git a/translators.html b/translators.html index af0188e..fdefa36 100644 --- a/translators.html +++ b/translators.html @@ -10,7 +10,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.0-beta1 - Official translators</title> + <title>phpMyAdmin 3.3.9-rc1 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.0-beta1 + 3.3.9-rc1 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_3_9RC1, created. RELEASE_3_3_9RC1
by Marc Delisle 22 Dec '10

22 Dec '10

The annotated tag, RELEASE_3_3_9RC1 has been created at 5aea82b1575fb7334f069929ac8ee5783987e710 (tag) tagging eaac45dfda2daa345edc5165b30bedea5a3f18a0 (commit) replaces RELEASE_3_3_8 tagged by Marc Delisle on Wed Dec 22 12:32:49 2010 -0500 - Log ----------------------------------------------------------------- Released 3.3.9-rc1 Aamir Khan (1): fix typo Adnan (1): bug #3112614 [pdf schema] Scratchboard for PDF pages not working Craig Duncan (1): patch #3117535, replication : Add quotes to database in initial statement Dieter Adriaenssens (3): bug #3077463, Events were not copied when copying/renaming database bug #1762306, Copy database with view of a view bug #3127904, Close all opened round brackets indents Domen (1): Translation fixes. Herman van Rink (1): bug #3115519: fixed XSS on search Jaroslaw Glowacki (1): Polish translation update. Marc Delisle (8): 3.3.9-dev 3.3.8 release bug [doc] Fix references to MySQL doc bug #3103853 [js] Double quotes were not escaped in generated js; I think this only applies to 3.3.x fix merge conflicts 3.3.8.1 correct release date and PMASA ref bug #3125606 [parser] Query for table "level" causes strange display 3.3.9-rc1 release Michal Čihař (7): Merge remote branch 'origin/MAINT_3_3_8' into QA_3_3 Ignore new theme. Fix require path. Update from master. Drop documentation version. Fix markup. Revert this part of fix. jirand (1): patch #3101490 Default function for TIMESTAMP ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1021-g30696bc
by Marc Delisle 22 Dec '10

22 Dec '10

The branch, master has been updated via 30696bcbd0d5af3785ee4adf66a8602724febeb1 (commit) from eee76d640b86b036f38fb0df3ed1aa22ca9503f6 (commit) - Log ----------------------------------------------------------------- commit 30696bcbd0d5af3785ee4adf66a8602724febeb1 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 22 12:30:00 2010 -0500 3.3.10-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7eb6924..a55a6b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -126,6 +126,8 @@ - bug #3123433 [interface] Avoid double escaping of MySQL errors. - [interface] Use less noisy message and remove disable link on server charts and database statistics. +3.3.10.0 (not yet released) + 3.3.9.0 (not yet released) - bug [doc] Fix references to MySQL doc - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_8-25-gabbbd19
by Marc Delisle 22 Dec '10

22 Dec '10

The branch, QA_3_3 has been updated via abbbd192bfd054545d53600bcbc06be3bce7fbf1 (commit) from 1ceccbd50cc0359ac2543e4283a70b2440752b59 (commit) - Log ----------------------------------------------------------------- commit abbbd192bfd054545d53600bcbc06be3bce7fbf1 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 22 12:29:09 2010 -0500 3.3.10-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 988feaf..450f59a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +3.3.10.0 (not yet released) + 3.3.9.0 (not yet released) - bug [doc] Fix references to MySQL doc - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand diff --git a/Documentation.html b/Documentation.html index fb2c226..a80487a 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,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.3.9-dev - Documentation</title> + <title>phpMyAdmin 3.3.10-dev - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.9-dev + 3.3.10-dev Documentation </h1> </div> diff --git a/README b/README index 334d3dd..7849d82 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.9-dev - ----------------- + Version 3.3.10-dev + ------------------ http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index ba4aeb8..8e3ff8b 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.9-dev'); + $this->set('PMA_VERSION', '3.3.10-dev'); /** * @deprecated */ diff --git a/translators.html b/translators.html index bf2e2da..f47cdab 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.9-dev - Official translators</title> + <title>phpMyAdmin 3.3.10-dev - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.9-dev + 3.3.10-dev official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0