Git December 2011

git@phpmyadmin.net

5 participants
151 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24494-g7c3c2e9
by Michal Čihař 08 Dec '11

08 Dec '11

The branch, master has been updated via 7c3c2e9250764f6746b49cbdc79983e7b8a82c28 (commit) via ffd4959edf49c8b423b04c66493ca3e93e96003e (commit) via ca8e36611a8b1d1675ed69119e530bd47fae5511 (commit) via dd6861ac0ec8f366bac70d4ab63ae782a599a6dd (commit) via edfa505d8b917a28148947d3f7738e8274d7541a (commit) via b0df69659ec66dc7f1bb98cf92ad888bca3f73d8 (commit) via d6dc2bf1ae5bfbcf51151862ad1fdf194f9150b6 (commit) via bdc5e5fa71ea806fa979db5f90752137ced463a2 (commit) via ce33f19be472929f5a141ee4859a579a1b69d445 (commit) via fb65975d37beace4787b4f7f89fb45e38046544f (commit) via d740606f3449ac4b482bf5084a0c8e89fe1a6c30 (commit) via d2b46e6c8309f63cddad55b07bff56e8055e78c4 (commit) via 450f2012f67aa1b70bd44f0e9d6941723e7c4c74 (commit) via 17c4b342909a56efb06b8967d055c47dfd86a6f0 (commit) via 7c69c704c00ee10a9f364e39fd068c99f71e8a00 (commit) via 814cf9fadcb8049bb8ba1afcf5ffb9bdb020d3f3 (commit) via 23d3ec90aa2753d8d3c181a0e36b3e0e019e52ce (commit) via 920ea09097b027ac2256386e3cbd9ebe11723d06 (commit) via 6118f87d4853a3f69841ebbc0999e7efde6c185a (commit) via 9c177ca4a0f4fffa356f4fabc444aa27c664d676 (commit) via cba2d0f1e1886941b509b8bba6827082162bc64e (commit) via 708448401e6ab3a34ee774ffa82de301458bec32 (commit) from 173e5926a01c1dd421150e0b47408dd24e89523b (commit) - Log ----------------------------------------------------------------- commit 7c3c2e9250764f6746b49cbdc79983e7b8a82c28 Author: oleg-ilnytskyi <ukraine.oleg(a)gmail.com> Date: Thu Dec 8 14:19:31 2011 +0200 Translation update done using Pootle. commit ffd4959edf49c8b423b04c66493ca3e93e96003e Author: oleg-ilnytskyi <ukraine.oleg(a)gmail.com> Date: Thu Dec 8 14:18:18 2011 +0200 Translation update done using Pootle. commit ca8e36611a8b1d1675ed69119e530bd47fae5511 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Dec 8 11:46:46 2011 +0200 Translation update done using Pootle. commit dd6861ac0ec8f366bac70d4ab63ae782a599a6dd Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Dec 8 11:45:36 2011 +0200 Translation update done using Pootle. commit edfa505d8b917a28148947d3f7738e8274d7541a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Dec 8 11:41:01 2011 +0200 Translation update done using Pootle. commit b0df69659ec66dc7f1bb98cf92ad888bca3f73d8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Dec 8 11:40:30 2011 +0200 Translation update done using Pootle. commit d6dc2bf1ae5bfbcf51151862ad1fdf194f9150b6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Dec 8 11:39:53 2011 +0200 Translation update done using Pootle. commit bdc5e5fa71ea806fa979db5f90752137ced463a2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Dec 8 11:39:24 2011 +0200 Translation update done using Pootle. commit ce33f19be472929f5a141ee4859a579a1b69d445 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Dec 8 11:38:56 2011 +0200 Translation update done using Pootle. commit fb65975d37beace4787b4f7f89fb45e38046544f Merge: d740606 173e592 Author: Pootle server <pootle(a)cihar.com> Date: Wed Dec 7 20:40:13 2011 +0100 Merge remote-tracking branch 'origin/master' commit d740606f3449ac4b482bf5084a0c8e89fe1a6c30 Merge: d2b46e6 03436f6 Author: Pootle server <pootle(a)cihar.com> Date: Wed Dec 7 14:43:11 2011 +0100 Merge remote-tracking branch 'origin/master' commit d2b46e6c8309f63cddad55b07bff56e8055e78c4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:06:34 2011 +0200 Translation update done using Pootle. commit 450f2012f67aa1b70bd44f0e9d6941723e7c4c74 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:06:07 2011 +0200 Translation update done using Pootle. commit 17c4b342909a56efb06b8967d055c47dfd86a6f0 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:05:52 2011 +0200 Translation update done using Pootle. commit 7c69c704c00ee10a9f364e39fd068c99f71e8a00 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:05:47 2011 +0200 Translation update done using Pootle. commit 814cf9fadcb8049bb8ba1afcf5ffb9bdb020d3f3 Author: oleg-ilnytskyi <ukraine.oleg(a)gmail.com> Date: Wed Dec 7 14:57:01 2011 +0200 Translation update done using Pootle. commit 23d3ec90aa2753d8d3c181a0e36b3e0e019e52ce Author: oleg-ilnytskyi <ukraine.oleg(a)gmail.com> Date: Wed Dec 7 14:55:56 2011 +0200 Translation update done using Pootle. commit 920ea09097b027ac2256386e3cbd9ebe11723d06 Author: oleg-ilnytskyi <ukraine.oleg(a)gmail.com> Date: Wed Dec 7 14:55:11 2011 +0200 Translation update done using Pootle. commit 6118f87d4853a3f69841ebbc0999e7efde6c185a Author: oleg-ilnytskyi <ukraine.oleg(a)gmail.com> Date: Wed Dec 7 14:53:34 2011 +0200 Translation update done using Pootle. commit 9c177ca4a0f4fffa356f4fabc444aa27c664d676 Author: oleg-ilnytskyi <ukraine.oleg(a)gmail.com> Date: Wed Dec 7 14:53:08 2011 +0200 Translation update done using Pootle. commit cba2d0f1e1886941b509b8bba6827082162bc64e Author: oleg-ilnytskyi <ukraine.oleg(a)gmail.com> Date: Wed Dec 7 14:49:50 2011 +0200 Translation update done using Pootle. commit 708448401e6ab3a34ee774ffa82de301458bec32 Author: oleg-ilnytskyi <ukraine.oleg(a)gmail.com> Date: Wed Dec 7 14:48:43 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 24 +++++++++++------------- po/tr.po | 10 +++++----- po/uk.po | 21 ++++++++++++++------- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/po/ja.po b/po/ja.po index 8f037eb..53f02d0 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-04 10:35+0100\n" -"PO-Revision-Date: 2011-12-05 11:15+0200\n" +"PO-Revision-Date: 2011-12-08 11:45+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -1687,7 +1687,7 @@ msgstr "読み込み中" #: js/messages.php:223 msgid "Processing Request" -msgstr "要求を処理中" +msgstr "要求を処理しています" #: js/messages.php:224 libraries/rte/rte_export.lib.php:39 msgid "Error in Processing Request" @@ -2931,7 +2931,7 @@ msgstr "最後" #: libraries/common.lib.php:2549 #, php-format msgid "Jump to database "%s"." -msgstr ""%s" データベースに移動" +msgstr "データベース「%s」に移動する" #: libraries/common.lib.php:2569 #, php-format @@ -6696,7 +6696,7 @@ msgstr "返り値が空でした(行数0)" #: libraries/import.lib.php:1100 msgid "" "The following structures have either been created or altered. Here you can:" -msgstr "下に示す構成が、作成もしくは変更されました。ここで次のことが行えます。" +msgstr "以下に示す構成が、作成もしくは変更されました。ここで次のことが行えます。" #: libraries/import.lib.php:1101 msgid "View a structure's contents by clicking on its name" @@ -6717,20 +6717,20 @@ msgid "Go to database" msgstr "データベースに移動" #: libraries/import.lib.php:1109 libraries/import.lib.php:1132 -#, fuzzy, php-format +#, php-format #| msgid "Missing data for %s" msgid "Edit settings for %s" -msgstr "%s ためのデータがありません" +msgstr "%s に対する設定の変更を行います" #: libraries/import.lib.php:1127 msgid "Go to table" msgstr "テーブルに移動" #: libraries/import.lib.php:1130 -#, fuzzy, php-format +#, php-format #| msgid "Structure only" msgid "Structure of %s" -msgstr "構造のみ" +msgstr "%s の構造" #: libraries/import.lib.php:1136 msgid "Go to view" @@ -8452,9 +8452,7 @@ msgstr "" #: main.php:308 msgid "The configuration file now needs a secret passphrase (blowfish_secret)." -msgstr "" -"設定ファイルが秘密のパスフレーズ (blowfish_secret) を必要とするようになりまし" -"た" +msgstr "設定ファイルに、暗号化 (blowfish_secret) 用のパスフレーズの設定を必要とするようになりました。" #: main.php:316 msgid "" @@ -12652,8 +12650,8 @@ msgid "" "Opening tables requires disk I/O which is costly. Increasing " "{table_open_cache} might avoid this." msgstr "" -"テーブルを開くことは、負荷がかかるディスクへの入出力を必要とします。" -"{table_open_cache} を大きくすることで、これを緩和できることがあります。" +"テーブルを開くというのは、負荷がかかるディスクへの入出力を行うということです。{table_open_cache} " +"を大きくすることで、これを緩和できることがあります。" #: po/advisory_rules.php:183 #, php-format diff --git a/po/tr.po b/po/tr.po index 974a6db..873b50c 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-04 10:35+0100\n" -"PO-Revision-Date: 2011-12-06 22:32+0200\n" +"PO-Revision-Date: 2011-12-07 15:06+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -11247,25 +11247,25 @@ msgstr "%s satırla eklemeye devam et" #| msgid "Bar" msgctxt "Chart type" msgid "Bar" -msgstr "" +msgstr "Çubuk" #: tbl_chart.php:89 #| msgid "Column" msgctxt "Chart type" msgid "Column" -msgstr "" +msgstr "Sütun" #: tbl_chart.php:90 #| msgid "Line" msgctxt "Chart type" msgid "Line" -msgstr "" +msgstr "Çizgi" #: tbl_chart.php:91 #| msgid "Spline" msgctxt "Chart type" msgid "Spline" -msgstr "" +msgstr "Şerit" #: tbl_chart.php:92 #| msgid "Pie" diff --git a/po/uk.po b/po/uk.po index e6b4bb4..7a1aa5d 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-04 10:35+0100\n" -"PO-Revision-Date: 2011-12-06 17:47+0200\n" +"PO-Revision-Date: 2011-12-08 14:18+0200\n" "Last-Translator: oleg-ilnytskyi <ukraine.oleg(a)gmail.com>\n" "Language-Team: ukrainian <uk(a)li.org>\n" "Language: uk\n" @@ -3299,32 +3299,36 @@ msgid "" "Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] " "authentication" msgstr "" +"Секретна фраза використовується для шифрування кукі в [kbd]cookie[/kbd] " +"аутентифікації" #: libraries/config/messages.inc.php:25 msgid "Blowfish secret" -msgstr "" +msgstr "Blowfish секрет" #: libraries/config/messages.inc.php:26 msgid "Highlight selected rows" -msgstr "" +msgstr "Виділити обрані рядки" #: libraries/config/messages.inc.php:27 msgid "Row marker" -msgstr "" +msgstr "Маркер рядка" #: libraries/config/messages.inc.php:28 msgid "Highlight row pointed by the mouse cursor" -msgstr "" +msgstr "Виділяти радок курсором миші" #: libraries/config/messages.inc.php:29 msgid "Highlight pointer" -msgstr "" +msgstr "Покажчик виділення" #: libraries/config/messages.inc.php:30 msgid "" "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " "import and export operations" msgstr "" +"Вімкнути [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] компресію для " +"операцій імпорту та експорту" #: libraries/config/messages.inc.php:31 msgid "Bzip2" @@ -3336,10 +3340,13 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" +"Визначає, який тип редагування контролю повинен бути використаний для CHAR і " +"VARCHAR стовпців; [kbd]input[/kbd] - довжина тексту, [kbd]textarea[/kbd] - " +"дозволена кількість рядків в стовпцях" #: libraries/config/messages.inc.php:33 msgid "CHAR columns editing" -msgstr "" +msgstr "CHAR редагування стовпців" #: libraries/config/messages.inc.php:34 msgid "" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 0f8b2603b5a9b1d6765804deee11d056e549404b
by Marc Delisle 08 Dec '11

08 Dec '11

The branch, master has been updated via 0f8b2603b5a9b1d6765804deee11d056e549404b (commit) from 4a0c2d3e09961ce3717d0b2ecb20a1e744c79826 (commit) - Log ----------------------------------------------------------------- commit 0f8b2603b5a9b1d6765804deee11d056e549404b Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 8 05:42:01 2011 -0500 Incorrect tag for commit reference ----------------------------------------------------------------------- Summary of changes: templates/security/PMASA-2011-16 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/security/PMASA-2011-16 b/templates/security/PMASA-2011-16 index d82b828..ae8b644 100644 --- a/templates/security/PMASA-2011-16 +++ b/templates/security/PMASA-2011-16 @@ -44,7 +44,7 @@ Thanks to Jakub Gałczyk (<a href="http://hauntit.blogspot.com">http://hauntit.b <py:def function="announcement_cwe">661 79</py:def> -<py:def function="announcement_commits_3_4"> +<py:def function="announcement_commits"> ca597dc423f3eebcca95ff33b088a03e39109115 1af420e22367ae72ff4091adb1620e59ddad5ba6 </py:def> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24472-g173e592
by Madhura Jayaratne 07 Dec '11

07 Dec '11

The branch, master has been updated via 173e5926a01c1dd421150e0b47408dd24e89523b (commit) via 35b18e57a26331c3f4a124ca21b37f82b006faa6 (commit) via a7c00f719f1ba7725db25aa66741536dceb2ead2 (commit) via 334b268f50d28c5100dc95c0d12d1c0eff49019e (commit) from 03436f6511041f4fd9028ca3c01d95f7a94b14ed (commit) - Log ----------------------------------------------------------------- commit 173e5926a01c1dd421150e0b47408dd24e89523b Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Dec 8 00:01:02 2011 +0530 More coding style improvements commit 35b18e57a26331c3f4a124ca21b37f82b006faa6 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Dec 7 23:28:50 2011 +0530 Coding style improvements - Multiline assignments commit a7c00f719f1ba7725db25aa66741536dceb2ead2 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Dec 7 22:45:13 2011 +0530 Coding style improvements - Control structures commit 334b268f50d28c5100dc95c0d12d1c0eff49019e Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Dec 7 22:16:53 2011 +0530 Coding style improvements - Correct indenting ----------------------------------------------------------------------- Summary of changes: browse_foreigners.php | 17 +- db_search.php | 4 +- db_structure.php | 4 +- enum_editor.php | 6 +- js/functions.js | 22 ++-- js/tbl_structure.js | 14 +- libraries/Config.class.php | 4 +- libraries/RecentTable.class.php | 16 +- libraries/StorageEngine.class.php | 4 +- libraries/Table.class.php | 4 +- libraries/auth/swekey/swekey.auth.lib.php | 5 +- libraries/auth/swekey/swekey.php | 102 +++++------ libraries/database_interface.lib.php | 18 ++- libraries/export/latex.php | 276 +++++++++++++++++------------ libraries/export/odt.php | 152 +++++++++------- libraries/gis/pma_gis_visualization.php | 4 +- libraries/import/csv.php | 27 ++- libraries/mysql_charsets.lib.php | 8 +- libraries/pmd_common.php | 12 +- libraries/sqlparser.lib.php | 23 ++-- libraries/tbl_properties.inc.php | 4 +- navigation.php | 4 +- server_privileges.php | 12 +- server_status.php | 12 +- tbl_change.php | 10 +- tbl_indexes.php | 4 +- tbl_replace.php | 38 ++-- 27 files changed, 441 insertions(+), 365 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index 74e4e99..dd9979b 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -223,22 +223,23 @@ if (is_array($foreignData['disp_row'])) { $val_ordered_current_val = htmlspecialchars($val_ordered_current_val); $val_ordered_current_val_title = ''; } else { - $val_ordered_current_val_title = - htmlspecialchars($val_ordered_current_val); + $val_ordered_current_val_title + = htmlspecialchars($val_ordered_current_val); $val_ordered_current_val = htmlspecialchars( PMA_substr($val_ordered_current_val, 0, $cfg['LimitChars']) . '...' - ); + ); } if (PMA_strlen($key_ordered_current_val) <= $cfg['LimitChars']) { $key_ordered_current_val = htmlspecialchars($key_ordered_current_val); $key_ordered_current_val_title = ''; } else { - $key_ordered_current_val_title = - htmlspecialchars($key_ordered_current_val); - $key_ordered_current_val = - htmlspecialchars(PMA_substr($key_ordered_current_val, 0, - $cfg['LimitChars']) . '...'); + $key_ordered_current_val_title + = htmlspecialchars($key_ordered_current_val); + $key_ordered_current_val + = htmlspecialchars( + PMA_substr($key_ordered_current_val, 0, $cfg['LimitChars']) . '...' + ); } if (! empty($data)) { diff --git a/db_search.php b/db_search.php index 041242f..68cb463 100644 --- a/db_search.php +++ b/db_search.php @@ -314,8 +314,8 @@ foreach ($tables_names_only as $each_table) { } // end while echo ' </select>' . "\n"; -$alter_select = - '<a href="db_search.php' . PMA_generate_common_url(array_merge($url_params, array('selectall' => 1))) . '#db_search"' +$alter_select + = '<a href="db_search.php' . PMA_generate_common_url(array_merge($url_params, array('selectall' => 1))) . '#db_search"' . ' onclick="setSelectOptions(\'db_search\', \'table_select[]\', true); return false;">' . __('Select All') . '</a>' . ' / ' . '<a href="db_search.php' . PMA_generate_common_url(array_merge($url_params, array('unselectall' => 1))) . '#db_search"' diff --git a/db_structure.php b/db_structure.php index aae36e6..3baad46 100644 --- a/db_structure.php +++ b/db_structure.php @@ -496,8 +496,8 @@ foreach ($tables as $keyname => $each_table) { // Show Summary if ($is_show_stats) { list($sum_formatted, $unit) = PMA_formatByteDown($sum_size, 3, 1); - list($overhead_formatted, $overhead_unit) = - PMA_formatByteDown($overhead_size, 3, 1); + list($overhead_formatted, $overhead_unit) + = PMA_formatByteDown($overhead_size, 3, 1); } ?> </tbody> diff --git a/enum_editor.php b/enum_editor.php index 143d3c4..10e0ba3 100644 --- a/enum_editor.php +++ b/enum_editor.php @@ -36,13 +36,15 @@ require_once './libraries/header_meta_style.inc.php'; <?php // Get the enum values $values = array(); - if (isset($_GET['values']) && is_array($_GET['values'])) { // If the values are in an array + // If the values are in an array + if (isset($_GET['values']) && is_array($_GET['values'])) { // then this page was called from itself via the "Add a value", "Drop" or "Go" buttons $values = $_GET['values']; foreach ($values as $key => $value) { $values[$key] = htmlentities($value); } - } else if (isset($_GET['values']) && is_string($_GET['values'])){ // If the values are in a string + // If the values are in a string + } elseif (isset($_GET['values']) && is_string($_GET['values'])) { // then this page was called via a link from some external page $values_string = htmlentities($_GET['values']); // There is a JS port of the below parser in functions.js diff --git a/js/functions.js b/js/functions.js index 829ae58..b51ef7c 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2722,17 +2722,17 @@ $(document).ready(function() { }); // slider for choosing how many fields to add $enum_editor_dialog.find(".slider").slider({ - animate: true, - range: "min", - value: 1, - min: 1, - max: 9, - slide: function( event, ui ) { - $(this).closest('table').find('input[type=submit]').val( - PMA_messages['enum_addValue'].replace(/%d/, ui.value) - ); - } - }); + animate: true, + range: "min", + value: 1, + min: 1, + max: 9, + slide: function( event, ui ) { + $(this).closest('table').find('input[type=submit]').val( + PMA_messages['enum_addValue'].replace(/%d/, ui.value) + ); + } + }); // Focus the slider, otherwise it looks nearly transparent $('.ui-slider-handle').addClass('ui-state-focus'); return false; diff --git a/js/tbl_structure.js b/js/tbl_structure.js index c9fd93b..651cab0 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -301,16 +301,16 @@ $(document).ready(function() { PMA_convertFootnotesToTooltips($div); // Add a slider for selecting how many columns to add to the index $div.find('.slider').slider({ - animate: true, - value: 1, - min: 1, - max: 16, - slide: function( event, ui ) { + animate: true, + value: 1, + min: 1, + max: 16, + slide: function( event, ui ) { $(this).closest('fieldset').find('input[type=submit]').val( PMA_messages['strAddToIndex'].replace(/%d/, ui.value) ); - } - }); + } + }); // Focus the slider, otherwise it looks nearly transparent $('.ui-slider-handle').addClass('ui-state-focus'); } diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 2d4b978..8364a65 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -958,8 +958,8 @@ class PMA_Config if (substr($pma_absolute_uri, 0, 7) != 'http://' && substr($pma_absolute_uri, 0, 8) != 'https://' ) { - $pma_absolute_uri = - ($is_https ? 'https' : 'http') + $pma_absolute_uri + = ($is_https ? 'https' : 'http') . ':' . (substr($pma_absolute_uri, 0, 2) == '//' ? '' : '//') . $pma_absolute_uri; } diff --git a/libraries/RecentTable.class.php b/libraries/RecentTable.class.php index 1e85899..6642acb 100644 --- a/libraries/RecentTable.class.php +++ b/libraries/RecentTable.class.php @@ -76,9 +76,9 @@ class PMA_RecentTable public function getFromDb() { // Read from phpMyAdmin database, if recent tables is not in session - $sql_query = - " SELECT `tables` FROM " . $this->pma_table . - " WHERE `username` = '" . $GLOBALS['cfg']['Server']['user'] . "'"; + $sql_query + = " SELECT `tables` FROM " . $this->pma_table . + " WHERE `username` = '" . $GLOBALS['cfg']['Server']['user'] . "'"; $row = PMA_DBI_fetch_array(PMA_query_as_controluser($sql_query)); if (isset($row[0])) { @@ -91,15 +91,15 @@ class PMA_RecentTable /** * Save recent tables into phpMyAdmin database. * - * + * * @return true|PMA_Message */ public function saveToDb() { $username = $GLOBALS['cfg']['Server']['user']; - $sql_query = - " REPLACE INTO " . $this->pma_table . " (`username`, `tables`)" . - " VALUES ('" . $username . "', '" . PMA_sqlAddSlashes(json_encode($this->tables)) . "')"; + $sql_query + = " REPLACE INTO " . $this->pma_table . " (`username`, `tables`)" . + " VALUES ('" . $username . "', '" . PMA_sqlAddSlashes(json_encode($this->tables)) . "')"; $success = PMA_DBI_try_query($sql_query, $GLOBALS['controllink']); @@ -163,7 +163,7 @@ class PMA_RecentTable $html .= '<select name="selected_recent_table" id="recentTable">'; $html .= $this->getHtmlSelectOption(); $html .= '</select>'; - + return $html; } diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php index 4f98a4a..b325935 100644 --- a/libraries/StorageEngine.class.php +++ b/libraries/StorageEngine.class.php @@ -274,8 +274,8 @@ class PMA_StorageEngine if (!empty($storage_engines[$engine])) { $this->engine = $engine; $this->title = $storage_engines[$engine]['Engine']; - $this->comment = - (isset($storage_engines[$engine]['Comment']) + $this->comment + = (isset($storage_engines[$engine]['Comment']) ? $storage_engines[$engine]['Comment'] : ''); switch ($storage_engines[$engine]['Support']) { diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 16ccfc3..a2db8b2 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1391,8 +1391,8 @@ class PMA_Table $max_rows = $GLOBALS['cfg']['Server']['MaxTableUiprefs']; if ($rows_count > $max_rows) { $num_rows_to_delete = $rows_count - $max_rows; - $sql_query = - ' DELETE FROM ' . $pma_table . + $sql_query + = ' DELETE FROM ' . $pma_table . ' ORDER BY last_update ASC' . ' LIMIT ' . $num_rows_to_delete; $success = PMA_DBI_try_query($sql_query, $GLOBALS['controllink']); diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php index f7299d1..78356fa 100644 --- a/libraries/auth/swekey/swekey.auth.lib.php +++ b/libraries/auth/swekey/swekey.auth.lib.php @@ -161,12 +161,11 @@ function Swekey_auth_error() } } else { $result = __('No valid authentication key plugged'); - if ($_SESSION['SWEKEY']['CONF_DEBUG']) - { + if ($_SESSION['SWEKEY']['CONF_DEBUG']) { $result .= "<br>" . htmlspecialchars($swekey_id); } unset($_SESSION['SWEKEY']['CONF_LOADED']); // reload the conf file - } + } } } else { unset($_SESSION['SWEKEY']); diff --git a/libraries/auth/swekey/swekey.php b/libraries/auth/swekey/swekey.php index 453437e..3c6bd80 100644 --- a/libraries/auth/swekey/swekey.php +++ b/libraries/auth/swekey/swekey.php @@ -187,33 +187,28 @@ function Swekey_HttpGet($url, &$response_code) $gSwekeyLastResult = "<not set>"; // use curl if available - if (function_exists('curl_init')) - { + if (function_exists('curl_init')) { $sess = curl_init($url); - if (substr($url, 0, 8) == "https://") - { + if (substr($url, 0, 8) == "https://") { global $gSwekeyCA; - if (! empty($gSwekeyCA)) - { - if (file_exists($gSwekeyCA)) - { - if (! curl_setopt($sess, CURLOPT_CAINFO, $gSwekeyCA)) + if (! empty($gSwekeyCA)) { + if (file_exists($gSwekeyCA)) { + if (! curl_setopt($sess, CURLOPT_CAINFO, $gSwekeyCA)) { error_log("SWEKEY_ERROR:Could not set CA file : ".curl_error($sess)); - else + } else { $caFileOk = true; - } - else + } + } else { error_log("SWEKEY_ERROR:Could not find CA file $gSwekeyCA getting $url"); + } } curl_setopt($sess, CURLOPT_SSL_VERIFYHOST, '2'); curl_setopt($sess, CURLOPT_SSL_VERIFYPEER, '2'); curl_setopt($sess, CURLOPT_CONNECTTIMEOUT, '20'); curl_setopt($sess, CURLOPT_TIMEOUT, '20'); - } - else - { + } else { curl_setopt($sess, CURLOPT_CONNECTTIMEOUT, '3'); curl_setopt($sess, CURLOPT_TIMEOUT, '5'); } @@ -224,18 +219,16 @@ function Swekey_HttpGet($url, &$response_code) $curlerr = curl_error($sess); curl_close($sess); - if ($response_code == 200) - { + if ($response_code == 200) { $gSwekeyLastResult = $res; return $res; } - if (! empty($response_code)) - { + if (! empty($response_code)) { $gSwekeyLastError = $response_code; error_log("SWEKEY_ERROR:Error $gSwekeyLastError ($curlerr) getting $url"); return ""; - } + } $response_code = 408; // Request Timeout $gSwekeyLastError = $response_code; @@ -244,28 +237,28 @@ function Swekey_HttpGet($url, &$response_code) } // use pecl_http if available - if (class_exists('HttpRequest')) - { + if (class_exists('HttpRequest')) { // retry if one of the server is down - for ($num=1; $num <= 3; $num++ ) - { + for ($num=1; $num <= 3; $num++ ) { $r = new HttpRequest($url); $options = array('timeout' => '3'); - if (substr($url, 0, 6) == "https:") - { + if (substr($url, 0, 6) == "https:") { $sslOptions = array(); $sslOptions['verifypeer'] = true; $sslOptions['verifyhost'] = true; $capath = __FILE__; $name = strrchr($capath, '/'); - if (empty($name)) // windows + // windows + if (empty($name)) { $name = strrchr($capath, '\\'); + } $capath = substr($capath, 0, strlen($capath) - strlen($name) + 1).'musbe-ca.crt'; - if (! empty($gSwekeyCA)) + if (! empty($gSwekeyCA)) { $sslOptions['cainfo'] = $gSwekeyCA; + } $options['ssl'] = $sslOptions; } @@ -304,8 +297,7 @@ function Swekey_HttpGet($url, &$response_code) global $http_response_header; $res = @file_get_contents($url); $response_code = substr($http_response_header[0], 9, 3); //HTTP/1.0 - if ($response_code == 200) - { + if ($response_code == 200) { $gSwekeyLastResult = $res; return $res; } @@ -355,51 +347,47 @@ function Swekey_GetFastHalfRndToken() $cachefile = ""; // We check if we have a valid RT is the session - if (isset($_SESSION['rnd-token-date'])) - if (time() - $_SESSION['rnd-token-date'] < 30) + if (isset($_SESSION['rnd-token-date'])) { + if (time() - $_SESSION['rnd-token-date'] < 30) { $res = $_SESSION['rnd-token']; + } + } // If not we try to get it from a temp file (PHP >= 5.2.1 only) - if (strlen($res) != 32 && $gSwekeyTokenCacheEnabled) - { - if (function_exists('sys_get_temp_dir')) - { + if (strlen($res) != 32 && $gSwekeyTokenCacheEnabled) { + if (function_exists('sys_get_temp_dir')) { $tempdir = sys_get_temp_dir(); $cachefile = $tempdir."/swekey-rnd-token-".get_current_user(); $modif = filemtime($cachefile); - if ($modif != false) - if (time() - $modif < 30) - { + if ($modif != false) { + if (time() - $modif < 30) { $res = @file_get_contents($cachefile); - if (strlen($res) != 32) - $res = ""; - else - { - $_SESSION['rnd-token'] = $res; - $_SESSION['rnd-token-date'] = $modif; - } + if (strlen($res) != 32) { + $res = ""; + } else { + $_SESSION['rnd-token'] = $res; + $_SESSION['rnd-token-date'] = $modif; + } } + } } - } + } - // If we don't have a valid RT here we have to get it from the server - if (strlen($res) != 32) - { + // If we don't have a valid RT here we have to get it from the server + if (strlen($res) != 32) { $res = substr(Swekey_GetHalfRndToken(), 0, 32); $_SESSION['rnd-token'] = $res; $_SESSION['rnd-token-date'] = time(); - if (! empty($cachefile)) - { + if (! empty($cachefile)) { // we unlink the file so no possible tempfile race attack unlink($cachefile); - $file = fopen($cachefile, "x"); - if ($file != false) - { - @fwrite($file, $res); + $file = fopen($cachefile, "x"); + if ($file != false) { + @fwrite($file, $res); @fclose($file); } } - } + } return $res."00000000000000000000000000000000"; } diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index c356b90..a142249 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -942,9 +942,12 @@ function PMA_DBI_get_columns_full($database = null, $table = null, $columns[$column_name]['TABLE_SCHEMA'] = $database; $columns[$column_name]['TABLE_NAME'] = $table; $columns[$column_name]['ORDINAL_POSITION'] = $ordinal_position; - $columns[$column_name]['DATA_TYPE'] = - substr($columns[$column_name]['COLUMN_TYPE'], 0, - strpos($columns[$column_name]['COLUMN_TYPE'], '(')); + $columns[$column_name]['DATA_TYPE'] + = substr( + $columns[$column_name]['COLUMN_TYPE'], + 0, + strpos($columns[$column_name]['COLUMN_TYPE'], '(') + ); /** * @todo guess CHARACTER_MAXIMUM_LENGTH from COLUMN_TYPE */ @@ -955,9 +958,12 @@ function PMA_DBI_get_columns_full($database = null, $table = null, $columns[$column_name]['CHARACTER_OCTET_LENGTH'] = null; $columns[$column_name]['NUMERIC_PRECISION'] = null; $columns[$column_name]['NUMERIC_SCALE'] = null; - $columns[$column_name]['CHARACTER_SET_NAME'] = - substr($columns[$column_name]['COLLATION_NAME'], 0, - strpos($columns[$column_name]['COLLATION_NAME'], '_')); + $columns[$column_name]['CHARACTER_SET_NAME'] + = substr( + $columns[$column_name]['COLLATION_NAME'], + 0, + strpos($columns[$column_name]['COLLATION_NAME'], '_') + ); $ordinal_position++; } diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 1dbe21a..2792644 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -20,7 +20,7 @@ $GLOBALS['strLatexStructure'] = __('Structure of table @TABLE@'); */ if (isset($plugin_list)) { $hide_structure = false; - if ($plugin_param['export_type'] == 'table' && !$plugin_param['single_table']) { + if ($plugin_param['export_type'] == 'table' && ! $plugin_param['single_table']) { $hide_structure = true; } $plugin_list['latex'] = array( @@ -36,62 +36,63 @@ if (isset($plugin_list)) { ); /* what to dump (structure/data/both) */ - $plugin_list['latex']['options'][] = - array('type' => 'begin_group', 'name' => 'dump_what', 'text' => __('Dump table')); - $plugin_list['latex']['options'][] = - array('type' => 'radio', 'name' => 'structure_or_data', 'values' => array('structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data'))); + $plugin_list['latex']['options'][] + = array('type' => 'begin_group', 'name' => 'dump_what', 'text' => __('Dump table')); + $plugin_list['latex']['options'][] + = array('type' => 'radio', 'name' => 'structure_or_data', 'values' => array('structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data'))); $plugin_list['latex']['options'][] = array('type' => 'end_group'); /* Structure options */ - if (!$hide_structure) { - $plugin_list['latex']['options'][] = - array('type' => 'begin_group', 'name' => 'structure', 'text' => __('Object creation options'), 'force' => 'data'); - $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'structure_caption', 'text' => __('Table caption'), 'doc' => 'faq6_27'); - $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'structure_continued_caption', 'text' => __('Table caption (continued)'), 'doc' => 'faq6_27'); - $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'structure_label', 'text' => __('Label key'), 'doc' => 'faq6_27'); - if (!empty($GLOBALS['cfgRelation']['relation'])) { - $plugin_list['latex']['options'][] = - array('type' => 'bool', 'name' => 'relation', 'text' => __('Display foreign key relationships')); + if (! $hide_structure) { + $plugin_list['latex']['options'][] + = array('type' => 'begin_group', 'name' => 'structure', 'text' => __('Object creation options'), 'force' => 'data'); + $plugin_list['latex']['options'][] + = array('type' => 'text', 'name' => 'structure_caption', 'text' => __('Table caption'), 'doc' => 'faq6_27'); + $plugin_list['latex']['options'][] + = array('type' => 'text', 'name' => 'structure_continued_caption', 'text' => __('Table caption (continued)'), 'doc' => 'faq6_27'); + $plugin_list['latex']['options'][] + = array('type' => 'text', 'name' => 'structure_label', 'text' => __('Label key'), 'doc' => 'faq6_27'); + if (! empty($GLOBALS['cfgRelation']['relation'])) { + $plugin_list['latex']['options'][] + = array('type' => 'bool', 'name' => 'relation', 'text' => __('Display foreign key relationships')); } - $plugin_list['latex']['options'][] = - array('type' => 'bool', 'name' => 'comments', 'text' => __('Display comments')); - if (!empty($GLOBALS['cfgRelation']['mimework'])) { - $plugin_list['latex']['options'][] = - array('type' => 'bool', 'name' => 'mime', 'text' => __('Display MIME types')); + $plugin_list['latex']['options'][] + = array('type' => 'bool', 'name' => 'comments', 'text' => __('Display comments')); + if (! empty($GLOBALS['cfgRelation']['mimework'])) { + $plugin_list['latex']['options'][] + = array('type' => 'bool', 'name' => 'mime', 'text' => __('Display MIME types')); } - $plugin_list['latex']['options'][] = - array('type' => 'end_group'); + $plugin_list['latex']['options'][] + = array('type' => 'end_group'); } /* Data */ - $plugin_list['latex']['options'][] = - array('type' => 'begin_group', 'name' => 'data', 'text' => __('Data dump options'), 'force' => 'structure'); - $plugin_list['latex']['options'][] = - array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')); - $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'data_caption', 'text' => __('Table caption'), 'doc' => 'faq6_27'); - $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'data_continued_caption', 'text' => __('Table caption (continued)'), 'doc' => 'faq6_27'); - $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'data_label', 'text' => __('Label key'), 'doc' => 'faq6_27'); - $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL with:')); - $plugin_list['latex']['options'][] = - array('type' => 'end_group'); + $plugin_list['latex']['options'][] + = array('type' => 'begin_group', 'name' => 'data', 'text' => __('Data dump options'), 'force' => 'structure'); + $plugin_list['latex']['options'][] + = array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')); + $plugin_list['latex']['options'][] + = array('type' => 'text', 'name' => 'data_caption', 'text' => __('Table caption'), 'doc' => 'faq6_27'); + $plugin_list['latex']['options'][] + = array('type' => 'text', 'name' => 'data_continued_caption', 'text' => __('Table caption (continued)'), 'doc' => 'faq6_27'); + $plugin_list['latex']['options'][] + = array('type' => 'text', 'name' => 'data_label', 'text' => __('Label key'), 'doc' => 'faq6_27'); + $plugin_list['latex']['options'][] + = array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL with:')); + $plugin_list['latex']['options'][] + = array('type' => 'end_group'); } else { /** * Escapes some special characters for use in TeX/LaTeX * - * @param string the string to convert + * @param string $string the string to convert * * @return string the converted string with escape codes * * @access private */ - function PMA_texEscape($string) { + function PMA_texEscape($string) + { $escape = array('$', '%', '{', '}', '&', '#', '_', '^'); $cnt_escape = count($escape); for ($k=0; $k < $cnt_escape; $k++) { @@ -107,18 +108,20 @@ if (isset($plugin_list)) { * * @access public */ - function PMA_exportFooter() { + function PMA_exportFooter() + { return true; } /** * Outputs export header * - * @return bool Whether it suceeded + * @return bool Whether it suceeded * - * @access public + * @access public */ - function PMA_exportHeader() { + function PMA_exportHeader() + { global $crlf; global $cfg; @@ -127,7 +130,7 @@ if (isset($plugin_list)) { . '% http://www.phpmyadmin.net' . $crlf . '%' . $crlf . '% ' . __('Host') . ': ' . $cfg['Server']['host']; - if (!empty($cfg['Server']['port'])) { + if (! empty($cfg['Server']['port'])) { $head .= ':' . $cfg['Server']['port']; } $head .= $crlf @@ -140,12 +143,14 @@ if (isset($plugin_list)) { /** * Outputs database header * - * @param string $db Database name - * @return bool Whether it suceeded + * @param string $db Database name * - * @access public + * @return bool Whether it suceeded + * + * @access public */ - function PMA_exportDBHeader($db) { + function PMA_exportDBHeader($db) + { global $crlf; $head = '% ' . $crlf . '% ' . __('Database') . ': ' . '\'' . $db . '\'' . $crlf @@ -156,40 +161,46 @@ if (isset($plugin_list)) { /** * Outputs database footer * - * @param string $db Database name - * @return bool Whether it suceeded + * @param string $db Database name * - * @access public + * @return bool Whether it suceeded + * + * @access public */ - function PMA_exportDBFooter($db) { + function PMA_exportDBFooter($db) + { return true; } /** * Outputs CREATE DATABASE statement * - * @param string $db Database name - * @return bool Whether it suceeded + * @param string $db Database name * - * @access public + * @return bool Whether it suceeded + * + * @access public */ - function PMA_exportDBCreate($db) { + function PMA_exportDBCreate($db) + { return true; } /** * Outputs the content of a table in LaTeX table/sideways table environment * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data - * @return bool Whether it suceeded + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * - * @access public + * @return bool Whether it suceeded + * + * @access public */ - function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { + function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) + { $result = PMA_DBI_try_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); $columns_cnt = PMA_DBI_num_fields($result); @@ -198,20 +209,31 @@ if (isset($plugin_list)) { } unset($i); - $buffer = $crlf . '%' . $crlf . '% ' . __('Data') . ': ' . $table . $crlf . '%' . $crlf - . ' \\begin{longtable}{|'; + $buffer = $crlf . '%' . $crlf . '% ' . __('Data') . ': ' . $table + . $crlf . '%' . $crlf . ' \\begin{longtable}{|'; - for ($index=0;$index<$columns_cnt;$index++) { - $buffer .= 'l|'; + for ($index = 0; $index < $columns_cnt; $index++) { + $buffer .= 'l|'; } $buffer .= '} ' . $crlf ; $buffer .= ' \\hline \\endhead \\hline \\endfoot \\hline ' . $crlf; if (isset($GLOBALS['latex_caption'])) { - $buffer .= ' \\caption{' . PMA_expandUserString($GLOBALS['latex_data_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) - . '} \\label{' . PMA_expandUserString($GLOBALS['latex_data_label'], null, array('table' => $table, 'database' => $db)) . '} \\\\'; + $buffer .= ' \\caption{' + . PMA_expandUserString( + $GLOBALS['latex_data_caption'], + 'PMA_texEscape', + array('table' => $table, 'database' => $db) + ) + . '} \\label{' + . PMA_expandUserString( + $GLOBALS['latex_data_label'], + null, + array('table' => $table, 'database' => $db) + ) + . '} \\\\'; } - if (!PMA_exportOutputHandler($buffer)) { + if (! PMA_exportOutputHandler($buffer)) { return false; } @@ -219,21 +241,32 @@ if (isset($plugin_list)) { if (isset($GLOBALS['latex_columns'])) { $buffer = '\\hline '; for ($i = 0; $i < $columns_cnt; $i++) { - $buffer .= '\\multicolumn{1}{|c|}{\\textbf{' . PMA_texEscape(stripslashes($columns[$i])) . '}} & '; - } + $buffer .= '\\multicolumn{1}{|c|}{\\textbf{' + . PMA_texEscape(stripslashes($columns[$i])) . '}} & '; + } $buffer = substr($buffer, 0, -2) . '\\\\ \\hline \hline '; - if (!PMA_exportOutputHandler($buffer . ' \\endfirsthead ' . $crlf)) { + if (! PMA_exportOutputHandler($buffer . ' \\endfirsthead ' . $crlf)) { return false; } if (isset($GLOBALS['latex_caption'])) { - if (!PMA_exportOutputHandler('\\caption{' . PMA_expandUserString($GLOBALS['latex_data_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) . '} \\\\ ')) return false; + if (! PMA_exportOutputHandler( + '\\caption{' + . PMA_expandUserString( + $GLOBALS['latex_data_continued_caption'], + 'PMA_texEscape', + array('table' => $table, 'database' => $db) + ) + . '} \\\\ ' + )) { + return false; + } } - if (!PMA_exportOutputHandler($buffer . '\\endhead \\endfoot' . $crlf)) { + if (! PMA_exportOutputHandler($buffer . '\\endhead \\endfoot' . $crlf)) { return false; } } else { - if (!PMA_exportOutputHandler('\\\\ \hline')) { + if (! PMA_exportOutputHandler('\\\\ \hline')) { return false; } } @@ -245,7 +278,8 @@ if (isset($plugin_list)) { // print each row for ($i = 0; $i < $columns_cnt; $i++) { if (isset($record[$columns[$i]]) - && (! function_exists('is_null') || !is_null($record[$columns[$i]]))) { + && (! function_exists('is_null') || ! is_null($record[$columns[$i]])) + ) { $column_value = PMA_texEscape(stripslashes($record[$columns[$i]])); } else { $column_value = $GLOBALS['latex_null']; @@ -259,13 +293,13 @@ if (isset($plugin_list)) { } } $buffer .= ' \\\\ \\hline ' . $crlf; - if (!PMA_exportOutputHandler($buffer)) { + if (! PMA_exportOutputHandler($buffer)) { return false; } } $buffer = ' \\end{longtable}' . $crlf; - if (!PMA_exportOutputHandler($buffer)) { + if (! PMA_exportOutputHandler($buffer)) { return false; } @@ -277,23 +311,24 @@ if (isset($plugin_list)) { /** * Outputs table's structure * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $do_relation whether to include relation comments - * @param bool $do_comments whether to include the pmadb-style column comments - * as comments in the structure; this is deprecated - * but the parameter is left here because export.php - * calls PMA_exportStructure() also for other export - * types which use this parameter - * @param bool $do_mime whether to include mime comments - * @param bool $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' - * @param string $export_type 'server', 'database', 'table' - * @return bool Whether it suceeded + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments + * as comments in the structure; this is deprecated + * but the parameter is left here because export.php + * calls PMA_exportStructure() also for other export + * types which use this parameter + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' * - * @access public + * @return bool Whether it suceeded + * + * @access public */ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type) { @@ -316,7 +351,7 @@ if (isset($plugin_list)) { PMA_DBI_select_db($db); // Check if we can use Relations - if ($do_relation && !empty($cfgRelation['relation'])) { + if ($do_relation && ! empty($cfgRelation['relation'])) { // Find which tables are related with the current one and write it in // an array $res_rel = PMA_getForeigners($db, $table); @@ -333,9 +368,9 @@ if (isset($plugin_list)) { /** * Displays the table structure */ - $buffer = $crlf . '%' . $crlf . '% ' . __('Structure') . ': ' . $table . $crlf . '%' . $crlf - . ' \\begin{longtable}{'; - if (!PMA_exportOutputHandler($buffer)) { + $buffer = $crlf . '%' . $crlf . '% ' . __('Structure') . ': ' . $table + . $crlf . '%' . $crlf . ' \\begin{longtable}{'; + if (! PMA_exportOutputHandler($buffer)) { return false; } @@ -356,7 +391,10 @@ if (isset($plugin_list)) { $buffer = $alignment . '} ' . $crlf ; $header = ' \\hline '; - $header .= '\\multicolumn{1}{|c|}{\\textbf{' . __('Column') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Type') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Null') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Default') . '}}'; + $header .= '\\multicolumn{1}{|c|}{\\textbf{' . __('Column') + . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Type') + . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Null') + . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Default') . '}}'; if ($do_relation && $have_rel) { $header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . __('Links to') . '}}'; } @@ -371,19 +409,34 @@ if (isset($plugin_list)) { // Table caption for first page and label if (isset($GLOBALS['latex_caption'])) { - $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) - . '} \\label{' . PMA_expandUserString($GLOBALS['latex_structure_label'], null, array('table' => $table, 'database' => $db)) - . '} \\\\' . $crlf; + $buffer .= ' \\caption{' + . PMA_expandUserString( + $GLOBALS['latex_structure_caption'], + 'PMA_texEscape', + array('table' => $table, 'database' => $db) + ) + . '} \\label{' + . PMA_expandUserString( + $GLOBALS['latex_structure_label'], + null, + array('table' => $table, 'database' => $db) + ) + . '} \\\\' . $crlf; } $buffer .= $header . ' \\\\ \\hline \\hline' . $crlf . '\\endfirsthead' . $crlf; // Table caption on next pages if (isset($GLOBALS['latex_caption'])) { - $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) - . '} \\\\ ' . $crlf; + $buffer .= ' \\caption{' + . PMA_expandUserString( + $GLOBALS['latex_structure_continued_caption'], + 'PMA_texEscape', + array('table' => $table, 'database' => $db) + ) + . '} \\\\ ' . $crlf; } $buffer .= $header . ' \\\\ \\hline \\hline \\endhead \\endfoot ' . $crlf; - if (!PMA_exportOutputHandler($buffer)) { + if (! PMA_exportOutputHandler($buffer)) { return false; } @@ -395,7 +448,7 @@ if (isset($plugin_list)) { $type = ' '; } - if (!isset($row['Default'])) { + if (! isset($row['Default'])) { if ($row['Null'] != 'NO') { $row['Default'] = 'NULL'; } @@ -410,7 +463,8 @@ if (isset($plugin_list)) { if ($do_relation && $have_rel) { $local_buffer .= "\000"; if (isset($res_rel[$field_name])) { - $local_buffer .= $res_rel[$field_name]['foreign_table'] . ' (' . $res_rel[$field_name]['foreign_field'] . ')'; + $local_buffer .= $res_rel[$field_name]['foreign_table'] . ' (' + . $res_rel[$field_name]['foreign_field'] . ')'; } } if ($do_comments && $cfgRelation['commwork']) { @@ -437,7 +491,7 @@ if (isset($plugin_list)) { $buffer = str_replace("\000", ' & ', $local_buffer); $buffer .= ' \\\\ \\hline ' . $crlf; - if (!PMA_exportOutputHandler($buffer)) { + if (! PMA_exportOutputHandler($buffer)) { return false; } } // end while diff --git a/libraries/export/odt.php b/libraries/export/odt.php index 94a01fc..7ee3ef7 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -28,38 +28,38 @@ if (isset($plugin_list)) { ); /* what to dump (structure/data/both) */ - $plugin_list['odt']['options'][] = - array('type' => 'begin_group', 'text' => __('Dump table') , 'name' => 'general_opts'); - $plugin_list['odt']['options'][] = - array('type' => 'radio', 'name' => 'structure_or_data', 'values' => array('structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data'))); + $plugin_list['odt']['options'][] + = array('type' => 'begin_group', 'text' => __('Dump table') , 'name' => 'general_opts'); + $plugin_list['odt']['options'][] + = array('type' => 'radio', 'name' => 'structure_or_data', 'values' => array('structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data'))); $plugin_list['odt']['options'][] = array('type' => 'end_group'); /* Structure options */ if (!$hide_structure) { - $plugin_list['odt']['options'][] = - array('type' => 'begin_group', 'name' => 'structure', 'text' => __('Object creation options'), 'force' => 'data'); + $plugin_list['odt']['options'][] + = array('type' => 'begin_group', 'name' => 'structure', 'text' => __('Object creation options'), 'force' => 'data'); if (!empty($GLOBALS['cfgRelation']['relation'])) { - $plugin_list['odt']['options'][] = - array('type' => 'bool', 'name' => 'relation', 'text' => __('Display foreign key relationships')); + $plugin_list['odt']['options'][] + = array('type' => 'bool', 'name' => 'relation', 'text' => __('Display foreign key relationships')); } - $plugin_list['odt']['options'][] = - array('type' => 'bool', 'name' => 'comments', 'text' => __('Display comments')); + $plugin_list['odt']['options'][] + = array('type' => 'bool', 'name' => 'comments', 'text' => __('Display comments')); if (!empty($GLOBALS['cfgRelation']['mimework'])) { - $plugin_list['odt']['options'][] = - array('type' => 'bool', 'name' => 'mime', 'text' => __('Display MIME types')); + $plugin_list['odt']['options'][] + = array('type' => 'bool', 'name' => 'mime', 'text' => __('Display MIME types')); } - $plugin_list['odt']['options'][] = - array('type' => 'end_group'); + $plugin_list['odt']['options'][] + = array('type' => 'end_group'); } /* Data */ - $plugin_list['odt']['options'][] = - array('type' => 'begin_group', 'name' => 'data', 'text' => __('Data dump options'), 'force' => 'structure'); - $plugin_list['odt']['options'][] = - array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')); - $plugin_list['odt']['options'][] = - array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL with:')); - $plugin_list['odt']['options'][] = - array('type' => 'end_group'); + $plugin_list['odt']['options'][] + = array('type' => 'begin_group', 'name' => 'data', 'text' => __('Data dump options'), 'force' => 'structure'); + $plugin_list['odt']['options'][] + = array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')); + $plugin_list['odt']['options'][] + = array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL with:')); + $plugin_list['odt']['options'][] + = array('type' => 'end_group'); } else { $GLOBALS['odt_buffer'] = ''; @@ -68,15 +68,16 @@ if (isset($plugin_list)) { /** * Outputs export footer * - * @return bool Whether it suceeded + * @return bool Whether it suceeded * - * @access public + * @access public */ - function PMA_exportFooter() { + function PMA_exportFooter() + { $GLOBALS['odt_buffer'] .= '</office:text>' . '</office:body>' . '</office:document-content>'; - if (!PMA_exportOutputHandler(PMA_createOpenDocument('application/vnd.oasis.opendocument.text', $GLOBALS['odt_buffer']))) { + if (! PMA_exportOutputHandler(PMA_createOpenDocument('application/vnd.oasis.opendocument.text', $GLOBALS['odt_buffer']))) { return false; } return true; @@ -85,11 +86,12 @@ if (isset($plugin_list)) { /** * Outputs export header * - * @return bool Whether it suceeded + * @return bool Whether it suceeded * - * @access public + * @access public */ - function PMA_exportHeader() { + function PMA_exportHeader() + { $GLOBALS['odt_buffer'] .= '<?xml version="1.0" encoding="utf-8"?' . '>' . '<office:document-content '. $GLOBALS['OpenDocumentNS'] . 'office:version="1.0">' . '<office:body>' @@ -100,53 +102,62 @@ if (isset($plugin_list)) { /** * Outputs database header * - * @param string $db Database name - * @return bool Whether it suceeded + * @param string $db Database name + * + * @return bool Whether it suceeded * - * @access public + * @access public */ - function PMA_exportDBHeader($db) { - $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="1" text:style-name="Heading_1" text:is-list-header="true">' . __('Database') . ' ' . htmlspecialchars($db) . '</text:h>'; + function PMA_exportDBHeader($db) + { + $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="1" text:style-name="Heading_1" text:is-list-header="true">' + . __('Database') . ' ' . htmlspecialchars($db) . '</text:h>'; return true; } /** * Outputs database footer * - * @param string $db Database name - * @return bool Whether it suceeded + * @param string $db Database name + * + * @return bool Whether it suceeded * - * @access public + * @access public */ - function PMA_exportDBFooter($db) { + function PMA_exportDBFooter($db) + { return true; } /** * Outputs CREATE DATABASE statement * - * @param string $db Database name - * @return bool Whether it suceeded + * @param string $db Database name * - * @access public + * @return bool Whether it suceeded + * + * @access public */ - function PMA_exportDBCreate($db) { + function PMA_exportDBCreate($db) + { return true; } /** * Outputs the content of a table in ODT format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data - * @return bool Whether it suceeded + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data + * + * @return bool Whether it suceeded * - * @access public + * @access public */ - function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { + function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) + { global $what; // Gets the data from the database @@ -158,7 +169,8 @@ if (isset($plugin_list)) { $field_flags[$j] = PMA_DBI_field_flags($result, $j); } - $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . __('Dumping data for table') . ' ' . htmlspecialchars($table) . '</text:h>'; + $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' + . __('Dumping data for table') . ' ' . htmlspecialchars($table) . '</text:h>'; $GLOBALS['odt_buffer'] .= '<table:table table:name="' . htmlspecialchars($table) . '_structure">'; $GLOBALS['odt_buffer'] .= '<table:table-column table:number-columns-repeated="' . $fields_cnt . '"/>'; @@ -209,30 +221,32 @@ if (isset($plugin_list)) { /** * Outputs table's structure * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param bool $do_relation whether to include relation comments - * @param bool $do_comments whether to include the pmadb-style column comments - * as comments in the structure; this is deprecated - * but the parameter is left here because export.php - * calls PMA_exportStructure() also for other export - * types which use this parameter - * @param bool $do_mime whether to include mime comments - * @param bool $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' - * @param string $export_type 'server', 'database', 'table' - * @return bool Whether it suceeded + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param bool $do_relation whether to include relation comments + * @param bool $do_comments whether to include the pmadb-style column comments + * as comments in the structure; this is deprecated + * but the parameter is left here because export.php + * calls PMA_exportStructure() also for other export + * types which use this parameter + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in' + * @param string $export_type 'server', 'database', 'table' + * + * @return bool Whether it suceeded * - * @access public + * @access public */ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type) { global $cfgRelation; /* Heading */ - $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . __('Table structure for table') . ' ' . htmlspecialchars($table) . '</text:h>'; + $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' + . __('Table structure for table') . ' ' . htmlspecialchars($table) . '</text:h>'; /** * Get the unique keys in the table diff --git a/libraries/gis/pma_gis_visualization.php b/libraries/gis/pma_gis_visualization.php index f69d6d2..32a5728 100644 --- a/libraries/gis/pma_gis_visualization.php +++ b/libraries/gis/pma_gis_visualization.php @@ -254,8 +254,8 @@ class PMA_GIS_Visualization { $this->init(); $scale_data = $this->_scaleDataSet($this->_data); - $output = - 'var options = {' + $output + = 'var options = {' . 'projection: new OpenLayers.Projection("EPSG:900913"),' . 'displayProjection: new OpenLayers.Projection("EPSG:4326"),' . 'units: "m",' diff --git a/libraries/import/csv.php b/libraries/import/csv.php index 9d0e2aa..019412d 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -34,12 +34,12 @@ if (isset($plugin_list)) { ); if ($plugin_param !== 'table') { - $plugin_list['csv']['options'][] = - array('type' => 'bool', 'name' => 'col_names', 'text' => __('The first line of the file contains the table column names <i>(if this is unchecked, the first line will become part of the data)</i>')); + $plugin_list['csv']['options'][] + = array('type' => 'bool', 'name' => 'col_names', 'text' => __('The first line of the file contains the table column names <i>(if this is unchecked, the first line will become part of the data)</i>')); } else { $hint = new PMA_Message(__('If the data in each row of the file is not in the same order as in the database, list the corresponding column names here. Column names must be separated by commas and not enclosed in quotations.')); - $plugin_list['csv']['options'][] = - array('type' => 'text', 'name' => 'columns', 'text' => __('Column names: ') . PMA_showHint($hint)); + $plugin_list['csv']['options'][] + = array('type' => 'text', 'name' => 'columns', 'text' => __('Column names: ') . PMA_showHint($hint)); } $plugin_list['csv']['options'][] = array('type' => 'end_group'); @@ -129,7 +129,7 @@ if (!$analyze) { } } if (!$found) { - $message = PMA_Message::error(__('Invalid column (%s) specified! Ensure that columns names are spelled correctly, separated by commas, and not enclosed in quotes.' )); + $message = PMA_Message::error(__('Invalid column (%s) specified! Ensure that columns names are spelled correctly, separated by commas, and not enclosed in quotes.')); $message->addParam($val); $error = true; break; @@ -175,7 +175,8 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { unset($data); // Do not parse string when we're not at the end and don't have new line inside if (($csv_new_line == 'auto' && strpos($buffer, "\r") === false && strpos($buffer, "\n") === false) - || ($csv_new_line != 'auto' && strpos($buffer, $csv_new_line) === false)) { + || ($csv_new_line != 'auto' && strpos($buffer, $csv_new_line) === false) + ) { continue; } } @@ -269,7 +270,10 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { } } // Are we at the end? - if ($ch == $csv_new_line || ($csv_new_line == 'auto' && ($ch == "\r" || $ch == "\n")) || ($finished && $i == $len - 1)) { + if ($ch == $csv_new_line + || ($csv_new_line == 'auto' && ($ch == "\r" || $ch == "\n")) + || ($finished && $i == $len - 1) + ) { $csv_finish = true; } // Go to next char @@ -287,7 +291,10 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { } // End of line - if ($csv_finish || $ch == $csv_new_line || ($csv_new_line == 'auto' && ($ch == "\r" || $ch == "\n"))) { + if ($csv_finish + || $ch == $csv_new_line + || ($csv_new_line == 'auto' && ($ch == "\r" || $ch == "\n")) + ) { if ($csv_new_line == 'auto' && $ch == "\r") { // Handle "\r\n" if ($i >= ($len - 2) && !$finished) { break; // We need more data to decide new line @@ -377,7 +384,9 @@ if ($analyze) { $col_names = $col_names[0]; } - if ((isset($col_names) && count($col_names) != $max_cols) || !isset($col_names)) { + if ((isset($col_names) && count($col_names) != $max_cols) + || ! isset($col_names) + ) { // Fill out column names for ($i = 0; $i < $max_cols; ++$i) { $col_names[] = 'COL '.($i+1); diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 83d7d77..5af1bf7 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -47,8 +47,8 @@ if (! PMA_cacheExists('mysql_charsets', true)) { } //$mysql_collations_available[$row['Collation']] = ! isset($row['Compiled']) || $row['Compiled'] == 'Yes'; $mysql_collations_available[$row['COLLATION_NAME']] = true; - $mysql_charsets_available[$row['CHARACTER_SET_NAME']] = - !empty($mysql_charsets_available[$row['CHARACTER_SET_NAME']]) + $mysql_charsets_available[$row['CHARACTER_SET_NAME']] + = !empty($mysql_charsets_available[$row['CHARACTER_SET_NAME']]) || !empty($mysql_collations_available[$row['COLLATION_NAME']]); } PMA_DBI_free_result($res); @@ -118,8 +118,8 @@ function PMA_generateCharsetDropdownBox($type = PMA_CSDROPDOWN_COLLATION, if (!$mysql_charsets_available[$current_charset]) { continue; } - $current_cs_descr = - empty($mysql_charsets_descriptions[$current_charset]) + $current_cs_descr + = empty($mysql_charsets_descriptions[$current_charset]) ? $current_charset : $mysql_charsets_descriptions[$current_charset]; diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index 0a09d28..d5f13e2 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -15,8 +15,8 @@ $GLOBALS['PMD']['STYLE'] = 'default'; $cfgRelation = PMA_getRelationsParam(); -$GLOBALS['script_display_field'] = - '<script type="text/javascript">' . "\n" . +$GLOBALS['script_display_field'] + = '<script type="text/javascript">' . "\n" . '// <![CDATA[' . "\n" . 'var display_field = new Array();' . "\n"; @@ -129,8 +129,8 @@ function get_script_contr() } $ti = 0; - $script_contr = - '<script type="text/javascript">' . "\n" . + $script_contr + = '<script type="text/javascript">' . "\n" . '// <![CDATA[' . "\n" . 'var contr = new Array();' . "\n"; for ($i = 0, $cnt = count($con["C_NAME"]); $i < $cnt; $i++) { @@ -199,8 +199,8 @@ function get_all_keys($unique_only = false) */ function get_script_tabs() { - $script_tabs = - '<script type="text/javascript">' . "\n" . + $script_tabs + = '<script type="text/javascript">' . "\n" . '// <![CDATA[' . "\n" . 'var j_tabs = new Array();' . "\n" . 'var h_tabs = new Array();' . "\n" ; diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 6ddcaa5..ca30471 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -1277,16 +1277,16 @@ if (! defined('PMA_MINIMUM_COMMON')) { // we assume for now that this is also the true name $subresult['select_expr'][$current_select_expr]['table_true_name'] = $chain[$size_chain - 2]; $subresult['select_expr'][$current_select_expr]['expr'] - = $subresult['select_expr'][$current_select_expr]['table_name'] - . '.' . $subresult['select_expr'][$current_select_expr]['expr']; + = $subresult['select_expr'][$current_select_expr]['table_name'] + . '.' . $subresult['select_expr'][$current_select_expr]['expr']; } // end if ($size_chain > 1) // maybe a db if ($size_chain > 2) { $subresult['select_expr'][$current_select_expr]['db'] = $chain[$size_chain - 3]; $subresult['select_expr'][$current_select_expr]['expr'] - = $subresult['select_expr'][$current_select_expr]['db'] - . '.' . $subresult['select_expr'][$current_select_expr]['expr']; + = $subresult['select_expr'][$current_select_expr]['db'] + . '.' . $subresult['select_expr'][$current_select_expr]['expr']; } // end if ($size_chain > 2) unset($chain); @@ -1336,13 +1336,13 @@ if (! defined('PMA_MINIMUM_COMMON')) { // we assume for now that this is also the true name $subresult['table_ref'][$current_table_ref]['table_true_name'] = $chain[$size_chain - 1]; $subresult['table_ref'][$current_table_ref]['expr'] - = $subresult['table_ref'][$current_table_ref]['table_name']; + = $subresult['table_ref'][$current_table_ref]['table_name']; // maybe a db if ($size_chain > 1) { $subresult['table_ref'][$current_table_ref]['db'] = $chain[$size_chain - 2]; $subresult['table_ref'][$current_table_ref]['expr'] - = $subresult['table_ref'][$current_table_ref]['db'] - . '.' . $subresult['table_ref'][$current_table_ref]['expr']; + = $subresult['table_ref'][$current_table_ref]['db'] + . '.' . $subresult['table_ref'][$current_table_ref]['expr']; } // end if ($size_chain > 1) // add the table alias into the whole expression @@ -1365,10 +1365,11 @@ if (! defined('PMA_MINIMUM_COMMON')) { $alias = $subresult['table_ref'][$tr]['table_alias']; $truename = $subresult['table_ref'][$tr]['table_true_name']; for ($se=0; $se <= $current_select_expr; $se++) { - if (isset($alias) && strlen($alias) && $subresult['select_expr'][$se]['table_true_name'] - == $alias) { - $subresult['select_expr'][$se]['table_true_name'] - = $truename; + if (isset($alias) + && strlen($alias) + && $subresult['select_expr'][$se]['table_true_name'] == $alias + ) { + $subresult['select_expr'][$se]['table_true_name'] = $truename; } // end if (found the alias) } // end for (select expressions) diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 336545b..fb31287 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -340,8 +340,8 @@ for ($i = 0; $i < $num_fields; $i++) { // old column default if ($is_backup) { - $_form_params['field_default_orig[' . $i . ']'] = - (isset($row['Default']) ? $row['Default'] : ''); + $_form_params['field_default_orig[' . $i . ']'] + = (isset($row['Default']) ? $row['Default'] : ''); } // here we put 'NONE' as the default value of drop-down; otherwise diff --git a/navigation.php b/navigation.php index 4966c73..6127977 100644 --- a/navigation.php +++ b/navigation.php @@ -464,8 +464,8 @@ function PMA_displayDbList($ext_dblist, $offset, $count) } else { $tables = PMA_getTableList($db['name']); } - $child_visible = - (bool) (count($GLOBALS['pma']->databases) === 1 || $db_start == $db['name']); + $child_visible + = (bool) (count($GLOBALS['pma']->databases) === 1 || $db_start == $db['name']); PMA_displayTableList($tables, $child_visible, '', $db['name']); } elseif ($GLOBALS['cfg']['LeftFrameLight']) { // no tables and LeftFrameLight: diff --git a/server_privileges.php b/server_privileges.php index d653efc..46487fd 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1630,8 +1630,8 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs while ($db_rights_row = PMA_DBI_fetch_assoc($db_rights_result)) { $db_rights_row = array_merge($user_defaults, $db_rights_row); - $db_rights[$db_rights_row['User']][$db_rights_row['Host']] = - $db_rights_row; + $db_rights[$db_rights_row['User']][$db_rights_row['Host']] + = $db_rights_row; } PMA_DBI_free_result($db_rights_result); unset($db_rights_sql, $db_rights_sqls, $db_rights_result, $db_rights_row); @@ -2260,8 +2260,8 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs unset($row, $row1, $row2); // now, we build the table... - $list_of_privileges = - '`User`, ' + $list_of_privileges + = '`User`, ' . '`Host`, ' . '`Select_priv`, ' . '`Insert_priv`, ' @@ -2281,8 +2281,8 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . '`Alter_routine_priv`, ' . '`Execute_priv`'; - $list_of_compared_privileges = - '`Select_priv` = \'N\'' + $list_of_compared_privileges + = '`Select_priv` = \'N\'' . ' AND `Insert_priv` = \'N\'' . ' AND `Update_priv` = \'N\'' . ' AND `Delete_priv` = \'N\'' diff --git a/server_status.php b/server_status.php index aced914..536c215 100644 --- a/server_status.php +++ b/server_status.php @@ -486,16 +486,16 @@ cleanDeprecated($server_status); if (isset($server_status['Key_blocks_unused']) && isset($server_variables['key_cache_block_size']) && isset($server_variables['key_buffer_size'])) { - $server_status['Key_buffer_fraction_%'] = - 100 + $server_status['Key_buffer_fraction_%'] + = 100 - $server_status['Key_blocks_unused'] * $server_variables['key_cache_block_size'] / $server_variables['key_buffer_size'] * 100; } elseif (isset($server_status['Key_blocks_used']) && isset($server_variables['key_buffer_size'])) { - $server_status['Key_buffer_fraction_%'] = - $server_status['Key_blocks_used'] + $server_status['Key_buffer_fraction_%'] + = $server_status['Key_blocks_used'] * 1024 / $server_variables['key_buffer_size']; } @@ -518,8 +518,8 @@ if (isset($server_status['Threads_created']) && isset($server_status['Connections']) && $server_status['Connections'] > 0) { - $server_status['Threads_cache_hitrate_%'] = - 100 - $server_status['Threads_created'] / $server_status['Connections'] * 100; + $server_status['Threads_cache_hitrate_%'] + = 100 - $server_status['Threads_created'] / $server_status['Connections'] * 100; } /** diff --git a/tbl_change.php b/tbl_change.php index 660adff..2cffd16 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -376,8 +376,8 @@ foreach ($rows as $row_id => $vrow) { $table_fields[$i]['Default'] = null; } - $table_fields[$i]['len'] = - preg_match('@float|double@', $table_fields[$i]['Type']) ? 100 : -1; + $table_fields[$i]['len'] + = preg_match('@float|double@', $table_fields[$i]['Type']) ? 100 : -1; if (isset($comments_map[$table_fields[$i]['Field']])) { @@ -918,11 +918,11 @@ foreach ($rows as $row_id => $vrow) { $fieldsize = $extracted_fieldspec['spec_in_brackets']; } else { /** - * This case happens for example for INT or DATE columns; - * in these situations, the value returned in $field['len'] + * This case happens for example for INT or DATE columns; + * in these situations, the value returned in $field['len'] * seems appropriate. */ - $fieldsize = $field['len']; + $fieldsize = $field['len']; } $fieldsize = min(max($fieldsize, $cfg['MinSizeForInputField']), $cfg['MaxSizeForInputField']); echo $backup_field . "\n"; diff --git a/tbl_indexes.php b/tbl_indexes.php index bcdc59c..8552783 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -130,8 +130,8 @@ if ($GLOBALS['is_ajax_request'] != true) { if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) { // coming already from form - $add_fields = - count($_REQUEST['index']['columns']['names']) - $index->getColumnCount(); + $add_fields + = count($_REQUEST['index']['columns']['names']) - $index->getColumnCount(); if (isset($_REQUEST['add_fields'])) { $add_fields += $_REQUEST['added_fields']; } diff --git a/tbl_replace.php b/tbl_replace.php index 2505461..60dc7cf 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -185,36 +185,36 @@ foreach ($loop_array as $rownumber => $where_clause) { $query_values = array(); // Map multi-edit keys to single-level arrays, dependent on how we got the fields - $me_fields = - isset($_REQUEST['fields']['multi_edit'][$rownumber]) + $me_fields + = isset($_REQUEST['fields']['multi_edit'][$rownumber]) ? $_REQUEST['fields']['multi_edit'][$rownumber] : array(); - $me_fields_name = - isset($_REQUEST['fields_name']['multi_edit'][$rownumber]) + $me_fields_name + = isset($_REQUEST['fields_name']['multi_edit'][$rownumber]) ? $_REQUEST['fields_name']['multi_edit'][$rownumber] : null; - $me_fields_prev = - isset($_REQUEST['fields_prev']['multi_edit'][$rownumber]) + $me_fields_prev + = isset($_REQUEST['fields_prev']['multi_edit'][$rownumber]) ? $_REQUEST['fields_prev']['multi_edit'][$rownumber] : null; - $me_funcs = - isset($_REQUEST['funcs']['multi_edit'][$rownumber]) + $me_funcs + = isset($_REQUEST['funcs']['multi_edit'][$rownumber]) ? $_REQUEST['funcs']['multi_edit'][$rownumber] : null; - $me_fields_type = - isset($_REQUEST['fields_type']['multi_edit'][$rownumber]) + $me_fields_type + = isset($_REQUEST['fields_type']['multi_edit'][$rownumber]) ? $_REQUEST['fields_type']['multi_edit'][$rownumber] : null; - $me_fields_null = - isset($_REQUEST['fields_null']['multi_edit'][$rownumber]) + $me_fields_null + = isset($_REQUEST['fields_null']['multi_edit'][$rownumber]) ? $_REQUEST['fields_null']['multi_edit'][$rownumber] : null; - $me_fields_null_prev = - isset($_REQUEST['fields_null_prev']['multi_edit'][$rownumber]) + $me_fields_null_prev + = isset($_REQUEST['fields_null_prev']['multi_edit'][$rownumber]) ? $_REQUEST['fields_null_prev']['multi_edit'][$rownumber] : null; - $me_auto_increment = - isset($_REQUEST['auto_increment']['multi_edit'][$rownumber]) + $me_auto_increment + = isset($_REQUEST['auto_increment']['multi_edit'][$rownumber]) ? $_REQUEST['auto_increment']['multi_edit'][$rownumber] : null; @@ -405,8 +405,10 @@ foreach ($query as $single_query) { } // end if foreach (PMA_DBI_get_warnings() as $warning) { - $warning_messages[] = PMA_Message::sanitize($warning['Level'] . ': #' . $warning['Code'] - . ' ' . $warning['Message']); + $warning_messages[] + = PMA_Message::sanitize( + $warning['Level'] . ': #' . $warning['Code'] . ' ' . $warning['Message'] + ); } unset($result); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24468-g03436f6
by Rouslan Placella 07 Dec '11

07 Dec '11

The branch, master has been updated via 03436f6511041f4fd9028ca3c01d95f7a94b14ed (commit) from 9bb001b556f491cf1ffa292e909366bb1ad3f36c (commit) - Log ----------------------------------------------------------------- commit 03436f6511041f4fd9028ca3c01d95f7a94b14ed Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Dec 7 12:59:03 2011 +0000 Patch #3453408 - Fixed text overflow in the toggle switch of the Event Scheduler ----------------------------------------------------------------------- Summary of changes: js/functions.js | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/js/functions.js b/js/functions.js index 1e2bbad..829ae58 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3137,8 +3137,9 @@ var toggleButton = function ($obj) { var on = $('.toggleOn', $obj).width(); var off = $('.toggleOff', $obj).width(); // Make the "ON" and "OFF" parts of the switch the same size - $('.toggleOn > div', $obj).width(Math.max(on, off)); - $('.toggleOff > div', $obj).width(Math.max(on, off)); + // + 2 pixels to avoid overflowed + $('.toggleOn > div', $obj).width(Math.max(on, off) + 2); + $('.toggleOff > div', $obj).width(Math.max(on, off) + 2); /** * var w Width of the central part of the switch */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24467-g9bb001b
by Rouslan Placella 07 Dec '11

07 Dec '11

The branch, master has been updated via 9bb001b556f491cf1ffa292e909366bb1ad3f36c (commit) via 2f342d7231e9c907c026aea5edbf33966594d30e (commit) from 3813b62611009e9cde2e36e3a5865402ea0275ed (commit) - Log ----------------------------------------------------------------- commit 9bb001b556f491cf1ffa292e909366bb1ad3f36c Merge: 3813b62 2f342d7 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Dec 7 12:32:52 2011 +0000 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/update-location.js | 12 ++++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index a200eb8..220da9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ phpMyAdmin - ChangeLog - bug #3306875 [edit] Can't rename a database that contains views - bug #3452506 [edit] Unable to move tables with triggers - bug #3449659 [navi] Fast filter broken with table tree +- bug #3448485 [GUI] Firefox favicon frameset regression 3.4.8.0 (2011-12-01) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/js/update-location.js b/js/update-location.js index 3b9c51d..18e9851 100644 --- a/js/update-location.js +++ b/js/update-location.js @@ -32,12 +32,23 @@ function setURLHash(hash) } if (hash_init_done) { window.location.hash = "PMAURL:" + hash; + fix_favicon(); } else { hash_to_set = "PMAURL:" + hash; } } } +// Fix favicon disappearing in Firefox when setting location.hash +// See bug #3448485 +function fix_favicon() { + if (jQuery.browser.mozilla) { + // Move the link tags for the favicon to the bottom + // of the head element to force a reload of the favicon + $('head > link[href=\\.\\/favicon\\.ico]').appendTo('head'); + } +} + /** * Handler for changing url according to the hash part, which is updated * on each page to allow bookmarks. @@ -56,6 +67,7 @@ $(document).ready(function(){ if (hash_to_set != "") { window.location.hash = hash_to_set; hash_to_set = ""; + fix_favicon(); } /* Indicate that we're done (and we are not going to change location */ hash_init_done = 1; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_8-13-g2f342d7
by Rouslan Placella 07 Dec '11

07 Dec '11

The branch, QA_3_4 has been updated via 2f342d7231e9c907c026aea5edbf33966594d30e (commit) from 3713680c374b90163dae6db227611d1d609d2947 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/update-location.js | 12 ++++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1b15b4..b2cdf5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ phpMyAdmin - ChangeLog - bug #3306875 [edit] Can't rename a database that contains views - bug #3452506 [edit] Unable to move tables with triggers - bug #3449659 [navi] Fast filter broken with table tree +- bug #3448485 [GUI] Firefox favicon frameset regression 3.4.8.0 (2011-12-01) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/js/update-location.js b/js/update-location.js index d271cc8..0f1e372 100644 --- a/js/update-location.js +++ b/js/update-location.js @@ -31,12 +31,23 @@ function setURLHash(hash) { } if (hash_init_done) { window.location.hash = "PMAURL:" + hash; + fix_favicon(); } else { hash_to_set = "PMAURL:" + hash; } } } +// Fix favicon disappearing in Firefox when setting location.hash +// See bug #3448485 +function fix_favicon() { + if (jQuery.browser.mozilla) { + // Move the link tags for the favicon to the bottom + // of the head element to force a reload of the favicon + $('head > link[href=\\.\\/favicon\\.ico]').appendTo('head'); + } +} + /** * Handler for changing url according to the hash part, which is updated * on each page to allow bookmarks. @@ -55,6 +66,7 @@ $(document).ready(function(){ if (hash_to_set != "") { window.location.hash = hash_to_set; hash_to_set = ""; + fix_favicon(); } /* Indicate that we're done (and we are not going to change location */ hash_init_done = 1; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24465-g3813b62
by Madhura Jayaratne 07 Dec '11

07 Dec '11

The branch, master has been updated via 3813b62611009e9cde2e36e3a5865402ea0275ed (commit) via 3713680c374b90163dae6db227611d1d609d2947 (commit) from 3121006d8f5575150587ba26e326557120cc8190 (commit) - Log ----------------------------------------------------------------- commit 3813b62611009e9cde2e36e3a5865402ea0275ed Merge: 3121006 3713680 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Dec 7 16:17:26 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/navigation.js | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b68aeb1..a200eb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -71,6 +71,7 @@ phpMyAdmin - ChangeLog - bug #3384035 [display] Problems regarding ShowTooltipAliasTB - bug #3306875 [edit] Can't rename a database that contains views - bug #3452506 [edit] Unable to move tables with triggers +- bug #3449659 [navi] Fast filter broken with table tree 3.4.8.0 (2011-12-01) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/js/navigation.js b/js/navigation.js index af5146a..15ac62a 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -160,7 +160,7 @@ function fast_filter(value) if (value && $elem.html().toLowerCase().indexOf(lowercase_value) == -1) { $elem.parent().hide(); } else { - $elem.parent().show(); + $elem.parents('li').show(); } }); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_8-12-g3713680
by Madhura Jayaratne 07 Dec '11

07 Dec '11

The branch, QA_3_4 has been updated via 3713680c374b90163dae6db227611d1d609d2947 (commit) from 6e0a10494f6670b3e67d6fb219a96c8001dcea2c (commit) - Log ----------------------------------------------------------------- commit 3713680c374b90163dae6db227611d1d609d2947 Author: dimka <dimka20(a)users.sourceforge.net> Date: Wed Dec 7 16:13:16 2011 +0530 bug #3449659 [navi] Fast filter broken with table tree ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/navigation.js | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c3ce00..a1b15b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - bug #3384035 [display] Problems regarding ShowTooltipAliasTB - bug #3306875 [edit] Can't rename a database that contains views - bug #3452506 [edit] Unable to move tables with triggers +- bug #3449659 [navi] Fast filter broken with table tree 3.4.8.0 (2011-12-01) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/js/navigation.js b/js/navigation.js index 5052848..cec60e2 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -152,7 +152,7 @@ function fast_filter(value){ if (value && $elem.html().toLowerCase().indexOf(lowercase_value) == -1) { $elem.parent().hide(); } else { - $elem.parent().show(); + $elem.parents('li').show(); } }); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24463-g3121006
by Madhura Jayaratne 07 Dec '11

07 Dec '11

The branch, master has been updated via 3121006d8f5575150587ba26e326557120cc8190 (commit) via c4944f560fcb42d0fbd6c8e90895f6020d2daf48 (commit) via 7ac39c04c26394a8d7daa9ce8715f51dc359a61e (commit) via 6e0a10494f6670b3e67d6fb219a96c8001dcea2c (commit) from b9fbeecda46084e5ca271daa7efcee2edebfc50b (commit) - Log ----------------------------------------------------------------- commit 3121006d8f5575150587ba26e326557120cc8190 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Dec 7 12:24:04 2011 +0530 Already contains a semicolon commit c4944f560fcb42d0fbd6c8e90895f6020d2daf48 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Dec 7 08:59:19 2011 +0530 Record trigger creation commit 7ac39c04c26394a8d7daa9ce8715f51dc359a61e Merge: b9fbeec 6e0a104 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Dec 7 08:53:13 2011 +0530 Merge branch 'QA_3_4' Conflicts: libraries/Table.class.php ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + db_operations.php | 3 ++- libraries/Table.class.php | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b318d40..b68aeb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ phpMyAdmin - ChangeLog - bug #3398788 [session] No feedback when result is empty (signon auth_type) - bug #3384035 [display] Problems regarding ShowTooltipAliasTB - bug #3306875 [edit] Can't rename a database that contains views +- bug #3452506 [edit] Unable to move tables with triggers 3.4.8.0 (2011-12-01) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/db_operations.php b/db_operations.php index b20c2f6..e4c5591 100644 --- a/db_operations.php +++ b/db_operations.php @@ -134,7 +134,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { $sql_view_standin = PMA_getTableDefStandIn($db, $each_table, "\n"); PMA_DBI_select_db($newname); PMA_DBI_query($sql_view_standin); - $GLOBALS['sql_query'] .= "\n" . $sql_view_standin . ';'; + $GLOBALS['sql_query'] .= "\n" . $sql_view_standin; } } @@ -180,6 +180,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { PMA_DBI_select_db($newname); foreach ($triggers as $trigger) { PMA_DBI_query($trigger['create']); + $GLOBALS['sql_query'] .= "\n" . $trigger['create'] . ';'; } unset($trigger); } diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 0f91593..16ccfc3 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1131,6 +1131,17 @@ class PMA_Table return false; } + // If the table is moved to a different database drop its triggers first + $triggers = PMA_DBI_get_triggers($this->getDbName(), $this->getName(), ''); + $handle_triggers = $this->getDbName() != $new_db && $triggers; + if ($handle_triggers) { + foreach ($triggers as $trigger) { + $sql = 'DROP TRIGGER IF EXISTS ' . PMA_backquote($this->getDbName()) . '.' + . PMA_backquote($trigger['name']) . ';'; + PMA_DBI_query($sql); + } + } + /* * tested also for a view, in MySQL 5.0.92, 5.1.55 and 5.5.13 */ @@ -1139,6 +1150,13 @@ class PMA_Table TO ' . $new_table->getFullName(true) . ';'; // I don't think a specific error message for views is necessary if (! PMA_DBI_query($GLOBALS['sql_query'])) { + // Restore triggers in the old database + if ($handle_triggers) { + PMA_DBI_select_db($this->getDbName()); + foreach ($triggers as $trigger) { + PMA_DBI_query($trigger['create']); + } + } $this->errors[] = sprintf( __('Error renaming table %1$s to %2$s'), $this->getFullName(), hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_8-11-g6e0a104
by Madhura Jayaratne 07 Dec '11

07 Dec '11

The branch, QA_3_4 has been updated via 6e0a10494f6670b3e67d6fb219a96c8001dcea2c (commit) from 5f78897bc8eadf5b399b9b4118bdb575f9f3e0a3 (commit) - Log ----------------------------------------------------------------- commit 6e0a10494f6670b3e67d6fb219a96c8001dcea2c Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Dec 7 08:33:28 2011 +0530 bug #3452506 [edit] Unable to move tables with triggers ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/Table.class.php | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70621d8..0c3ce00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - bug #3398788 [session] No feedback when result is empty (signon auth_type) - bug #3384035 [display] Problems regarding ShowTooltipAliasTB - bug #3306875 [edit] Can't rename a database that contains views +- bug #3452506 [edit] Unable to move tables with triggers 3.4.8.0 (2011-12-01) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index d7af2d7..5cb46fa 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1033,6 +1033,17 @@ class PMA_Table return false; } + // If the table is moved to a different database drop its triggers first + $triggers = PMA_DBI_get_triggers($this->getDbName(), $this->getName(), ''); + $handle_triggers = $this->getDbName() != $new_db && $triggers; + if ($handle_triggers) { + foreach ($triggers as $trigger) { + $sql = 'DROP TRIGGER IF EXISTS ' . PMA_backquote($this->getDbName()) . '.' + . PMA_backquote($trigger['name']) . ';'; + PMA_DBI_query($sql); + } + } + /* * tested also for a view, in MySQL 5.0.92, 5.1.55 and 5.5.13 */ @@ -1041,6 +1052,13 @@ class PMA_Table TO ' . $new_table->getFullName(true) . ';'; // I don't think a specific error message for views is necessary if (! PMA_DBI_query($GLOBALS['sql_query'])) { + // Restore triggers in the old database + if ($handle_triggers) { + PMA_DBI_select_db($this->getDbName()); + foreach ($triggers as $trigger) { + PMA_DBI_query($trigger['create']); + } + } $this->errors[] = sprintf(__('Error renaming table %1$s to %2$s'), $this->getFullName(), $new_table->getFullName()); return false; } hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
...
8
9
10
11
12
13
14
15
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git December 2011