August 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 90f09a3253f558425ca72c85177defb91fd91d5f
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 90f09a3253f558425ca72c85177defb91fd91d5f (commit) from e00c7de9627881d16286d5f63b34c113082df12e (commit) - Log ----------------------------------------------------------------- commit 90f09a3253f558425ca72c85177defb91fd91d5f Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 13:27:39 2011 +0200 Update ----------------------------------------------------------------------- Summary of changes: output/tr/Documentation.html | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/output/tr/Documentation.html b/output/tr/Documentation.html index 6c9ad73..7416164 100644 --- a/output/tr/Documentation.html +++ b/output/tr/Documentation.html @@ -2299,17 +2299,18 @@ doldurulmasada gösterilmesini tanımlar. <span id="cfg_QueryHistoryMax">$cfg['QueryHistoryMax']</span> tam sayı </dt> <dd> - All those variables affect the query window feature. A <tt><abbr -title="structured query language">SQL</abbr></tt> link or icon is always -displayed on the left panel. If JavaScript is enabled in your browser, a -click on this opens a distinct query window, which is a direct interface to -enter <abbr title="structured query language">SQL</abbr> queries. Otherwise, -the right panel changes to display a query box.<br /><br /> - - The size of this query window can be customized with -<tt>$cfg['QueryWindowWidth']</tt> and <tt>$cfg['QueryWindowHeight']</tt> - -both integers for the size in pixels. Note that normally, those parameters -will be modified in <tt>layout.inc.php</tt> for the theme you are using.<br /><br /> + Tüm bu değişkenler sorgu penceresi özelliğini etkiler. <tt><abbr +title="structured query language">SQL</abbr></tt> bağlantısı ve simgesi +daima sol panelde görüntülenir. Eğer tarayıcınızda JavaScript etkinse, bunun +üzerine tıklamak <abbr title="structured query language">SQL</abbr> +sorgularını girmek için doğrudan arabirim olan ayrı sorgu penceresi +açar. Yoksa sağ panel sorgu kutusunu görüntülemek için değişir.<br /><br /> + + Sorgu penceresinin boyutu <tt>$cfg['QueryWindowWidth']</tt> ve +<tt>$cfg['QueryWindowHeight']</tt> ile özelleştirilebilir - her iki tam sayı +piksel cinsinden boyut içindir. Normalde unutmayın, bu parametreler +kullandığınız temalar için <tt>layout.inc.php</tt> içinden +değiştirilecektir.<br /><br /> If <tt>$cfg['EditInWindow']</tt> is set to true, a click on [Edit] from the results page (in the "Showing Rows" section) opens the query hooks/post-receive -- phpMyAdmin localized documentation

1 0

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

04 Aug '11

The branch, master has been updated via 8bd454a47f8c5b5bee2fc9f1c5c30ea5f0050576 (commit) via 58a43a0a076047d349472408608c050e11db6594 (commit) via 2a60c4a63f219d5b26fb1a8a2ba261f197a0c35a (commit) via 93f06e74496c2fba29930070b1766ab1acdf320e (commit) via 2f926bfc202e49659b34917d4d8380b1553e7e65 (commit) via 2e4de7e14401296314127fe9260005e37171f21c (commit) via c5d73fb6fb221858946676b03dab03ef807f627b (commit) via c79c1d3259cb865ef5ab7017f66e53b6d72c575b (commit) from ae1d967043caa926e1db8eafaa5e98ccca0c8f97 (commit) - Log ----------------------------------------------------------------- commit 8bd454a47f8c5b5bee2fc9f1c5c30ea5f0050576 Author: Chung-Ook Lee <hantip(a)gmail.com> Date: Thu Aug 4 11:57:27 2011 +0200 Translation update done using Pootle. commit 58a43a0a076047d349472408608c050e11db6594 Author: Chung-Ook Lee <hantip(a)gmail.com> Date: Thu Aug 4 11:57:19 2011 +0200 Translation update done using Pootle. commit 2a60c4a63f219d5b26fb1a8a2ba261f197a0c35a Author: Chung-Ook Lee <hantip(a)gmail.com> Date: Thu Aug 4 11:55:57 2011 +0200 Translation update done using Pootle. commit 93f06e74496c2fba29930070b1766ab1acdf320e Author: Chung-Ook Lee <hantip(a)gmail.com> Date: Thu Aug 4 11:55:18 2011 +0200 Translation update done using Pootle. commit 2f926bfc202e49659b34917d4d8380b1553e7e65 Author: Chung-Ook Lee <hantip(a)gmail.com> Date: Thu Aug 4 11:54:47 2011 +0200 Translation update done using Pootle. commit 2e4de7e14401296314127fe9260005e37171f21c Author: Chung-Ook Lee <hantip(a)gmail.com> Date: Thu Aug 4 11:53:01 2011 +0200 Translation update done using Pootle. commit c5d73fb6fb221858946676b03dab03ef807f627b Author: Chung-Ook Lee <hantip(a)gmail.com> Date: Thu Aug 4 11:51:11 2011 +0200 Translation update done using Pootle. commit c79c1d3259cb865ef5ab7017f66e53b6d72c575b Author: Chung-Ook Lee <hantip(a)gmail.com> Date: Thu Aug 4 11:50:55 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ko.po | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/po/ko.po b/po/ko.po index 3957bf5..bf99ec4 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,15 +4,15 @@ 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-07-30 14:14-0400\n" -"PO-Revision-Date: 2010-06-16 18:18+0200\n" -"Last-Translator: <cihar(a)nvyu.net>\n" +"PO-Revision-Date: 2011-08-04 11:57+0200\n" +"Last-Translator: Chung-Ook Lee <hantip(a)gmail.com>\n" "Language-Team: korean <ko(a)li.org>\n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.1\n" +"X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:35 browse_foreigners.php:53 #: libraries/display_tbl.lib.php:351 libraries/display_tbl.lib.php:418 @@ -27,7 +27,7 @@ msgstr "모두 보기" #: libraries/schema/Pdf_Relation_Schema.class.php:1105 #: libraries/schema/User_Schema.class.php:355 msgid "Page number:" -msgstr "페이지:" +msgstr "페이지 번호:" #: browse_foreigners.php:133 msgid "" @@ -110,14 +110,14 @@ msgstr "디스크 쓰기에 실패했습니다." #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" -msgstr "" +msgstr "원격 URL 열기 실패했습니다" #: changelog.php:32 license.php:28 #, php-format msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." -msgstr "" +msgstr "%s 파일은 사용할 수 없습니다. www.phpmyadmin.net에 방문하여 정보를 확인하세요." #: db_create.php:58 #, php-format @@ -279,10 +279,9 @@ msgid "Rename database to" msgstr "데이터베이스 이름 변경" #: db_operations.php:427 -#, fuzzy #| msgid "Rename database to" msgid "Remove database" -msgstr "데이터베이스 이름 변경" +msgstr "데이터베이스 제거" #: db_operations.php:439 #, php-format @@ -290,9 +289,8 @@ msgid "Database %s has been dropped." msgstr "데이터베이스 %s 를 제거했습니다." #: db_operations.php:444 -#, fuzzy msgid "Drop the database (DROP)" -msgstr "데이터베이스가 없습니다" +msgstr "데이터베이스 제거" #: db_operations.php:473 msgid "Copy database to" @@ -635,13 +633,13 @@ msgstr "" #: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:151 #: libraries/tbl_info.inc.php:60 tbl_structure.php:212 msgid "View" -msgstr "" +msgstr "뷰" #: db_structure.php:438 libraries/db_structure.lib.php:35 #: libraries/server_links.inc.php:90 server_replication.php:31 #: server_replication.php:162 server_status.php:477 msgid "Replication" -msgstr "" +msgstr "복제" #: db_structure.php:442 msgid "Sum" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. e00c7de9627881d16286d5f63b34c113082df12e
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via e00c7de9627881d16286d5f63b34c113082df12e (commit) via c448dfb44eb738fecb4a1158c150501f4c2af2da (commit) via ea0673530afd0f2f8ad862494ca962e025b6e9cd (commit) from 78caa8533e9f47b061ba152eada574ecb34c5123 (commit) - Log ----------------------------------------------------------------- commit e00c7de9627881d16286d5f63b34c113082df12e Merge: 78caa8533e9f47b061ba152eada574ecb34c5123 c448dfb44eb738fecb4a1158c150501f4c2af2da Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 11:07:27 2011 +0200 Merge remote-tracking branch 'pootle/master' Conflicts: po/tr.po commit c448dfb44eb738fecb4a1158c150501f4c2af2da Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 2 18:54:59 2011 +0200 Translation update done using Pootle. commit ea0673530afd0f2f8ad862494ca962e025b6e9cd Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Aug 2 18:51:18 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/po/tr.po b/po/tr.po index 8049e30..e45c0dd 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-02 17:04+0300\n" -"PO-Revision-Date: 2011-08-02 11:58+0200\n" +"PO-Revision-Date: 2011-08-02 18:54+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -6072,6 +6072,12 @@ msgid "" "enter <abbr title=\"structured query language\">SQL</abbr> queries. " "Otherwise, the right panel changes to display a query box." msgstr "" +"Tüm bu değişkenler sorgu penceresi özelliğini etkiler. <tt><abbr " +"title=\"structured query language\">SQL</abbr></tt> bağlantısı ve simgesi " +"daima sol panelde görüntülenir. Eğer tarayıcınızda JavaScript etkinse, bunun " +"üzerine tıklamak <abbr title=\"structured query language\">SQL</abbr> " +"sorgularını girmek için doğrudan arabirim olan ayrı sorgu penceresi açar. " +"Yoksa sağ panel sorgu kutusunu görüntülemek için değişir." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2171 @@ -6081,6 +6087,11 @@ msgid "" "integers for the size in pixels. Note that normally, those parameters will " "be modified in <tt>layout.inc.php</tt> for the theme you are using." msgstr "" +"Sorgu penceresinin boyutu <tt>$cfg['QueryWindowWidth']</tt> ve " +"<tt>$cfg['QueryWindowHeight']</tt> ile özelleştirilebilir - her iki tam sayı " +"piksel cinsinden boyut içindir. Normalde unutmayın, bu parametreler " +"kullandığınız temalar için <tt>layout.inc.php</tt> içinden " +"değiştirilecektir." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2177 hooks/post-receive -- phpMyAdmin localized documentation

1 0

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

04 Aug '11

The branch, master has been updated via ae1d967043caa926e1db8eafaa5e98ccca0c8f97 (commit) via 37d739f1566af5b890471cc6e69399b5226e1fef (commit) via 3ff348b7527e666f2e40cf5df4ff7456dcac9090 (commit) via 92cfe546dcb01f7c99dae990a38984454201b341 (commit) via caa620e4798726bce6d198d934818d3fd8588f2c (commit) via 7dacff102481122a44e7185bcf3b8e1d0c1e667e (commit) via 025d97b562113203725a6c8a560032d36cf07a98 (commit) via bfdd44ca03313058738989f78d1a8404be96257a (commit) via 255d7051c65af467a1b5557f3d220e2404129f8a (commit) via de77bdd48d014d28392f39f3e3000c27f1d2b9ed (commit) from 95e90bbba40f90f183b659d8c2d5db5cdfc415d6 (commit) - Log ----------------------------------------------------------------- commit ae1d967043caa926e1db8eafaa5e98ccca0c8f97 Merge: 37d739f1566af5b890471cc6e69399b5226e1fef 95e90bbba40f90f183b659d8c2d5db5cdfc415d6 Author: Pootle server <pootle(a)cihar.com> Date: Thu Aug 4 00:40:13 2011 +0200 Merge remote-tracking branch 'origin/master' commit 37d739f1566af5b890471cc6e69399b5226e1fef Merge: 3ff348b7527e666f2e40cf5df4ff7456dcac9090 55c6eacf3e56da064dae69650480d84acd92d5a3 Author: Pootle server <pootle(a)cihar.com> Date: Wed Aug 3 22:40:08 2011 +0200 Merge remote-tracking branch 'origin/master' commit 3ff348b7527e666f2e40cf5df4ff7456dcac9090 Merge: 92cfe546dcb01f7c99dae990a38984454201b341 c1f586b9fdc399ddc2cf86faa5a5e05194afa2e5 Author: Pootle server <pootle(a)cihar.com> Date: Wed Aug 3 18:40:15 2011 +0200 Merge remote-tracking branch 'origin/master' commit 92cfe546dcb01f7c99dae990a38984454201b341 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Aug 3 12:39:06 2011 +0200 Translation update done using Pootle. commit caa620e4798726bce6d198d934818d3fd8588f2c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Aug 3 12:36:20 2011 +0200 Translation update done using Pootle. commit 7dacff102481122a44e7185bcf3b8e1d0c1e667e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Aug 3 12:32:40 2011 +0200 Translation update done using Pootle. commit 025d97b562113203725a6c8a560032d36cf07a98 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Aug 3 12:26:33 2011 +0200 Translation update done using Pootle. commit bfdd44ca03313058738989f78d1a8404be96257a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Aug 3 12:20:28 2011 +0200 Translation update done using Pootle. commit 255d7051c65af467a1b5557f3d220e2404129f8a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Aug 3 12:04:23 2011 +0200 Translation update done using Pootle. commit de77bdd48d014d28392f39f3e3000c27f1d2b9ed Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Aug 3 11:57:18 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/po/ja.po b/po/ja.po index a6d0479..97d14b9 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-07-30 14:14-0400\n" -"PO-Revision-Date: 2011-08-02 16:09+0200\n" +"PO-Revision-Date: 2011-08-03 12:39+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -1321,6 +1321,8 @@ msgid "" "However only the SQL query itself has been used as a grouping criteria, so " "the other attributes of queries, such as start time, may differ." msgstr "" +"この列は、グループ化された同一のクエリの数を示しています。しかし、１つの SQL " +"クエリをグループの基準として使用しています。そのため、開始時刻いったような属性は、他クエリでは異なる場合があります。" #: js/messages.php:144 msgid "" @@ -1328,6 +1330,8 @@ msgid "" "same table are also being grouped together, disregarding of the inserted " "data." msgstr "" +"INSERT クエリのグループ化が選択されています。そのため、同じテーブルへの INSERT " +"クエリは挿入されたデータ部は同一のようにみなされて、グループ化が行われます。" #: js/messages.php:145 msgid "Log data loaded. Queries executed in this time span:" @@ -1354,17 +1358,16 @@ msgstr "フィルタ" #: js/messages.php:154 msgid "Filter queries by word/regexp:" -msgstr "" +msgstr "単語／正規表現でクエリをフィルタ：" #: js/messages.php:155 msgid "Group queries, ignoring variable data in WHERE clauses" -msgstr "クエリをまとめる（WHERE 句内のデータ部（文字列や数値など）は同一として扱われます）" +msgstr "WHERE 句内のデータ部（文字列や数値など）は同一として扱いクエリをまとめる" #: js/messages.php:156 -#, fuzzy #| msgid "Number of inserted rows" msgid "Sum of grouped rows:" -msgstr "挿入する行数" +msgstr "グループ後の件数：" #: js/messages.php:157 #| msgid "Total" @@ -9938,7 +9941,7 @@ msgstr "SELECT、INSERT、UPDATE、DELETE 文のみ取得する" #: server_status.php:1459 msgid "Remove variable data in INSERT statements for better grouping" -msgstr "" +msgstr "結果を扱いやすくするために INSERT 文におけるデータ部を同一のように扱う" #: server_status.php:1462 msgid "" @@ -9947,10 +9950,9 @@ msgid "" msgstr "<p>ログの統計元を選択することができます。</p>結果はクエリ文でグループ化されます。" #: server_status.php:1465 -#, fuzzy #| msgid "Query type" msgid "Query analyzer" -msgstr "クエリ種別" +msgstr "クエリの解析" #: server_status.php:1501 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12877-g95e90bb
by Piotr Przybylski 03 Aug '11

03 Aug '11

The branch, master has been updated via 95e90bbba40f90f183b659d8c2d5db5cdfc415d6 (commit) from 55c6eacf3e56da064dae69650480d84acd92d5a3 (commit) - Log ----------------------------------------------------------------- commit 95e90bbba40f90f183b659d8c2d5db5cdfc415d6 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Aug 3 23:56:02 2011 +0200 Comments and formatting ----------------------------------------------------------------------- Summary of changes: libraries/database_interface.lib.php | 30 ++-- libraries/server_synchronize.lib.php | 309 ++++++++++++++++------------------ 2 files changed, 161 insertions(+), 178 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 288743e..4eb1819 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -67,7 +67,13 @@ if (! PMA_DBI_checkMysqlExtension($GLOBALS['cfg']['Server']['extension'])) { require_once './libraries/dbi/' . $GLOBALS['cfg']['Server']['extension'] . '.dbi.lib.php'; /** - * Common Functions + * runs a query + * + * @param string $query + * @param mixed $link + * @param int $options + * @param bool $cache_affected_rows + * @return mixed */ function PMA_DBI_query($query, $link = null, $options = 0, $cache_affected_rows = true) { $res = PMA_DBI_try_query($query, $link, $options, $cache_affected_rows) @@ -78,9 +84,10 @@ function PMA_DBI_query($query, $link = null, $options = 0, $cache_affected_rows /** * runs a query and returns the result * - * @param string $query query to run + * @param string $query query to run * @param resource $link mysql link resource - * @param integer $options + * @param integer $options + * @param bool $cache_affected_rows * @return mixed */ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_rows = true) @@ -237,9 +244,6 @@ function PMA_DBI_get_tables($database, $link = null) * @return integer a value representing whether $a should be before $b in the * sorted array or not * - * @global string the column the array shall be sorted by - * @global string the sorting order ('ASC' or 'DESC') - * * @access private */ function PMA_usort_comparison_callback($a, $b) @@ -276,9 +280,9 @@ function PMA_usort_comparison_callback($a, $b) * * @todo move into PMA_Table * @param string $database database - * @param string|false $table table + * @param string|bool $table table or false * @param boolean|string $tbl_is_group $table is a table group - * @param resource $link mysql link + * @param mixed $link mysql link * @param integer $limit_offset zero-based offset for the count * @param boolean|integer $limit_count number of tables to return * @param string $sort_by table attribute to sort by @@ -438,12 +442,12 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals } if (! isset($each_tables[$table_name]['Type']) - && isset($each_tables[$table_name]['Engine'])) { + && isset($each_tables[$table_name]['Engine'])) { // pma BC, same parts of PMA still uses 'Type' $each_tables[$table_name]['Type'] =& $each_tables[$table_name]['Engine']; } elseif (! isset($each_tables[$table_name]['Engine']) - && isset($each_tables[$table_name]['Type'])) { + && isset($each_tables[$table_name]['Type'])) { // old MySQL reports Type, newer MySQL reports Engine $each_tables[$table_name]['Engine'] =& $each_tables[$table_name]['Type']; @@ -851,8 +855,6 @@ function PMA_DBI_get_columns($database, $table, $full = false, $link = null) * @param mixed $link mysql link resource|object * @return mixed value for mysql server variable */ - - function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = null) { if ($link === null) { @@ -878,8 +880,8 @@ function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = null } /** - * Function called just after a connection to the MySQL database server has been established - * It sets the connection collation, and determins the version of MySQL which is running. + * Function called just after a connection to the MySQL database server has been established + * It sets the connection collation, and determins the version of MySQL which is running. * * @param mixed $link mysql link resource|object * @param boolean $is_controluser diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index b7b332c..513e7e9 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -19,7 +19,6 @@ * @param array &$uncommon_source_tables empty array passed by reference to save * names of tables present in source database * but absent from target database - * @return nothing */ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$uncommon_source_tables) { @@ -46,7 +45,6 @@ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$un * @param array &$uncommon_target_tables empty array passed by reference to save * names of tables presnet in target database * but absent from source database - * @return nothing */ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommon_target_tables) { @@ -85,9 +83,8 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo * @param array &$delete_array Unused * @param array &$fields_num A two dimensional array passed by reference to * contain number of fields for each matching table - * @param array $matching_table_index Index of a table from $matching_table array + * @param int $matching_table_index Index of a table from $matching_table array * @param array &$matching_tables_keys A two dimensional array passed by reference to contain names of keys for each matching table - * @return nothing */ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching_table, &$matching_tables_fields, &$update_array, &$insert_array, &$delete_array, &$fields_num, $matching_table_index, &$matching_tables_keys) @@ -305,7 +302,6 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching * @param db_link $trg_link connection established with target server * @param string $src_db name of source database * @param db_link $src_link connection established with source server - * @return nothing */ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $matching_table_index, $trg_keys, $src_keys, $trg_db, $trg_link, $src_db, $src_link) { @@ -372,12 +368,11 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma /** * PMA_dataDiffInUncommonTables() finds the data difference in $source_tables_uncommon * - * @param $source_tables_uncommon array of table names; containing table names that are in source db and not in target db - * @param $src_db name of source database - * @param $src_link connection established with source server - * @param $index index of a table from $matching_table array - * @param $row_count number of rows - * @return nothing + * @param array $source_tables_uncommon table names that are in source db and not in target db + * @param string $src_db name of source database + * @param mixed $src_link connection established with source server + * @param int $index index of a table from $matching_table array + * @param array $row_count number of rows */ function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_link, $index, &$row_count) { @@ -390,16 +385,15 @@ function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_lin * PMA_updateTargetTables() sets the updated field values to target table rows using $update_array[$matching_table_index] * * - * @param $table Array containing matching tables' names - * @param $update_array A three dimensional array containing field - * value updates required for each matching table - * @param $src_db Name of source database - * @param $trg_db Name of target database - * @param $trg_link Connection established with target server - * @param $matching_table_index index of matching table in matching_table_array - * @param $matching_table_keys - * @param $display true/false value - * @return nothing + * @param array $table Matching tables' names + * @param array $update_array A three dimensional array containing field + * value updates required for each matching table + * @param string $src_db Name of source database + * @param string $trg_db Name of target database + * @param mixed $trg_link Connection established with target server + * @param int $matching_table_index index of matching table in matching_table_array + * @param array $matching_table_keys + * @param boolean $display */ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_link, $matching_table_index, $matching_table_keys, $display) { @@ -447,34 +441,33 @@ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_li /** * PMA_insertIntoTargetTable() inserts missing rows in the target table using $array_insert[$matching_table_index] * - * @param $matching_table array containing matching table names - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $table_fields array containing field names of a table - * @param $array_insert - * @param $matching_table_index index of matching table in matching_table_array - * @param $matching_tables_keys array containing field names that are keys in the matching table - * @param $source_columns array containing source column information - * @param $add_column_array array containing column names that are to be added in target table - * @param $criteria array containing criterias like type, null, collation, default etc - * @param $target_tables_keys array containing field names that are keys in the target table - * @param $uncommon_tables array containing table names that are present in source db but not in targt db - * @param $uncommon_tables_fields array containing field names of the uncommon tables - * @param $uncommon_cols column names that are present in target table and not in source table - * @param $alter_str_array array containing column names that are to be altered - * @param $source_indexes column names on which indexes are made in source table - * @param $target_indexes column names on which indexes are made in target table - * @param $add_indexes_array array containing column names on which index is to be added in target table - * @param $alter_indexes_array array containing column names whose indexes are to be altered. Only index name and uniqueness of an index can be changed - * @param $delete_array array containing rows that are to be deleted - * @param $update_array array containing rows that are to be updated in target - * @param $display true/false value - * @return nothing + * @param array $matching_table matching table names + * @param string $src_db name of source database + * @param string $trg_db name of target database + * @param mixed $src_link connection established with source server + * @param mixed $trg_link connection established with target server + * @param array $table_fields field names of a table + * @param array &$array_insert + * @param int $matching_table_index index of matching table in matching_table_array + * @param array $matching_tables_keys field names that are keys in the matching table + * @param array $source_columns source column information + * @param array &$add_column_array column names that are to be added in target table + * @param array $criteria criteria like type, null, collation, default etc + * @param array $target_tables_keys field names that are keys in the target table + * @param array $uncommon_tables table names that are present in source db but not in targt db + * @param array &$uncommon_tables_fields field names of the uncommon tables + * @param array $uncommon_cols column names that are present in target table and not in source table + * @param array &$alter_str_array column names that are to be altered + * @param array &$source_indexes column names on which indexes are made in source table + * @param array &$target_indexes column names on which indexes are made in target table + * @param array &$add_indexes_array column names on which index is to be added in target table + * @param array &$alter_indexes_array column names whose indexes are to be altered. Only index name and uniqueness of an index can be changed + * @param array &$delete_array rows that are to be deleted + * @param array &$update_array rows that are to be updated in target + * @param bool $display */ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, $trg_link, $table_fields, &$array_insert, $matching_table_index, - $matching_tables_keys, $source_columns, &$add_column_array, $criteria, $target_tables_keys, $uncommon_tables, &$uncommon_tables_fields,$uncommon_cols, + $matching_tables_keys, $source_columns, &$add_column_array, $criteria, $target_tables_keys, $uncommon_tables, &$uncommon_tables_fields, $uncommon_cols, &$alter_str_array,&$source_indexes, &$target_indexes, &$add_indexes_array, &$alter_indexes_array, &$delete_array, &$update_array, $display) { if (isset($array_insert[$matching_table_index])) { @@ -587,15 +580,14 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, /** * PMA_createTargetTables() Create the missing table $uncommon_table in target database * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $uncommon_tables names of tables present in source but not in target - * @param $table_index index of table in $uncommon_tables array - * @param $uncommon_tables_fields field names of the uncommon table - * @param $display true/false value - * @return nothing + * @param string $src_db name of source database + * @param string $trg_db name of target database + * @param mixed $src_link connection established with source server + * @param mixed $trg_link connection established with target server + * @param array &$uncommon_tables names of tables present in source but not in target + * @param int $table_index index of table in $uncommon_tables array + * @param array &$uncommon_tables_fields field names of the uncommon table + * @param bool $display */ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncommon_tables, $table_index, &$uncommon_tables_fields, $display) { @@ -640,16 +632,14 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm /** * PMA_populateTargetTables() inserts data into uncommon tables after they have been created * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $uncommon_tables array containing uncommon table names (table names that are present in source but not in target db) - * @param $table_index index of table in matching_table_array - * @param $uncommon_tables_fields field names of the uncommon table - * @param $display true/false value - * - * @return nothing + * @param string $src_db name of source database + * @param string $trg_db name of target database + * @param mixed $src_link connection established with source server + * @param mixed $trg_link connection established with target server + * @param array $uncommon_tables uncommon table names (table names that are present in source but not in target db) + * @param int $table_index index of table in matching_table_array + * @param array $uncommon_tables_fields field names of the uncommon table + * @param bool $display * * @todo This turns NULL values into '' (empty string) */ @@ -682,14 +672,13 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom /** * PMA_deleteFromTargetTable() delete rows from target table * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing matching table names - * @param $table_index index of table in matching_table_array - * @param $target_tables_keys primary key names of the target tables - * @param $delete_array array containing the key values of rows that are to be deleted - * @param $display true/false value - * @return nothing + * @param string $trg_db name of target database + * @param mixed $trg_link connection established with target server + * @param array $matching_tables matching table names + * @param int $table_index index of table in matching_table_array + * @param array $target_tables_keys primary key names of the target tables + * @param array $delete_array key values of rows that are to be deleted + * @param bool $display */ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_index, $target_tables_keys, $delete_array, $display) { @@ -739,22 +728,21 @@ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_ * Keys for all the source tables that have a corresponding target table are placed in $matching_tables_keys. * Keys for all the target tables that have a corresponding source table are placed in $target_tables_keys. * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $source_columns array containing columns information of the source tables - * @param $target_columns array containing columns information of the target tables - * @param $alter_str_array three dimensional associative array first index being the matching table index, second index being column name for which target - * column have some criteria different and third index containing the criteria which is different. - * @param $add_column_array two dimensional associative array, first index of the array contain the matching table number and second index contain the - * column name which is to be added in the target table - * @param $uncommon_columns array containing the columns that are present in the target table but not in the source table - * @param $criteria array containing the criterias which are to be checked for field that is present in source table and target table - * @param $target_tables_keys array containing the field names which is key in the target table - * @param $matching_table_index integer number of the matching table - * @return nothing + * @param string $src_db name of source database + * @param string $trg_db name of target database + * @param mixed $src_link connection established with source server + * @param mixed $trg_link connection established with target server + * @param array $matching_tables names of matching tables + * @param array &$source_columns columns information of the source tables + * @param array &$target_columns columns information of the target tables + * @param array &$alter_str_array three dimensional associative array first index being the matching table index, second index being column name for which target + * column have some criteria different and third index containing the criteria which is different. + * @param array &$add_column_array two dimensional associative array, first index of the array contain the matching table number and second index contain the + * column name which is to be added in the target table + * @param array &$uncommon_columns columns that are present in the target table but not in the source table + * @param array $criteria criteria which are to be checked for field that is present in source table and target table + * @param array &$target_tables_keys field names which is key in the target table + * @param int $matching_table_index number of the matching table */ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, &$source_columns, &$target_columns, &$alter_str_array, &$add_column_array, &$uncommon_columns, $criteria, &$target_tables_keys, $matching_table_index) @@ -764,7 +752,7 @@ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matc $target_columns[$matching_table_index] = PMA_DBI_get_columns_full($trg_db, $matching_tables[$matching_table_index], null, $trg_link); foreach ($source_columns[$matching_table_index] as $column_name => $each_column) { if (isset($target_columns[$matching_table_index][$column_name]['Field'])) { - //If column exists in target table then matches criterias like type, null, collation, key, default, comment of the column + //If column exists in target table then matches criteria like type, null, collation, key, default, comment of the column for ($i = 0; $i < sizeof($criteria); $i++) { if ($source_columns[$matching_table_index][$column_name][$criteria[$i]] != $target_columns[$matching_table_index][$column_name][$criteria[$i]]) { if (($criteria[$i] == 'Default') && ($source_columns[$matching_table_index][$column_name][$criteria[$i]] == '' )) { @@ -802,23 +790,22 @@ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matc /** * PMA_addColumnsInTargetTable() adds column that are present in source table but not in target table * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $source_columns array containing columns information of the source tables - * @param $add_column_array array containing the names of the column(field) that are to be added in the target - * @param $matching_tables_fields - * @param $criteria array containing the criterias - * @param $matching_tables_keys array containing the field names which is key in the source table - * @param $target_tables_keys array containing the field names which is key in the target table - * @param $uncommon_tables array containing the table names that are present in source db and not in target db - * @param $uncommon_tables_fields array containing the names of the fields of the uncommon tables - * @param $table_counter integer number of the matching table - * @param $uncommon_cols - * @param $display true/false value - * @return nothing + * @param string $src_db name of source database + * @param string $trg_db name of target database + * @param mixed $src_link connection established with source server + * @param mixed $trg_link connection established with target server + * @param array $matching_tables names of matching tables + * @param array $source_columns columns information of the source tables + * @param array &$add_column_array the names of the column(field) that are to be added in the target + * @param array $matching_tables_fields + * @param array $criteria criteria + * @param array $matching_tables_keys field names which is key in the source table + * @param array $target_tables_keys field names which is key in the target table + * @param array $uncommon_tables table names that are present in source db and not in target db + * @param array &$uncommon_tables_fields names of the fields of the uncommon tables + * @param int $table_counter number of the matching table + * @param array $uncommon_cols + * @param bool $display */ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns, &$add_column_array, $matching_tables_fields, $criteria, $matching_tables_keys, $target_tables_keys, $uncommon_tables, &$uncommon_tables_fields, $table_counter, $uncommon_cols, $display) @@ -901,17 +888,16 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma * PMA_checkForeignKeys() checks if the referenced table have foreign keys. * uses PMA_createTargetTables() * - * @param $src_db name of source database - * @param $src_link connection established with source server - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $referenced_table table whose column is a foreign key in another table - * @param $uncommon_tables array containing names that are uncommon - * @param $uncommon_tables_fields field names of the uncommon table - * @param $display true/false value - * @return nothing + * @param string $src_db name of source database + * @param mixed $src_link connection established with source server + * @param string $trg_db name of target database + * @param mixed $trg_link connection established with target server + * @param string $referenced_table table whose column is a foreign key in another table + * @param array &$uncommon_tables names that are uncommon + * @param array &$uncommon_tables_fields field names of the uncommon table + * @param bool $display */ -function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$referenced_table, &$uncommon_tables, &$uncommon_tables_fields, $display) +function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link, $referenced_table, &$uncommon_tables, &$uncommon_tables_fields, $display) { $is_fk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $src_db . "' AND TABLE_NAME = '" . $referenced_table . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;"; @@ -932,18 +918,17 @@ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$reference /** * PMA_alterTargetTableStructure() alters structure of the target table using $alter_str_array * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $source_columns array containing columns information of the source table - * @param $alter_str_array array containing the column name and criteria which is to be altered for the targert table - * @param $matching_tables_fields array containing the name of the fields for the matching table - * @param $criteria array containing the criterias - * @param $matching_tables_keys array containing the field names which is key in the source table - * @param $target_tables_keys array containing the field names which is key in the target table - * @param $matching_table_index integer number of the matching table - * @param $display true/false value - * @return nothing + * @param string $trg_db name of target database + * @param mixed $trg_link connection established with target server + * @param array $matching_tables names of matching tables + * @param array &$source_columns columns information of the source table + * @param array &$alter_str_array column name and criteria which is to be altered for the targert table + * @param array $matching_tables_fields name of the fields for the matching table + * @param array $criteria criteria + * @param array &$matching_tables_keys field names which is key in the source table + * @param array &$target_tables_keys field names which is key in the target table + * @param int $matching_table_index number of the matching table + * @param bool $display */ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$source_columns, &$alter_str_array, $matching_tables_fields, $criteria, &$matching_tables_keys, &$target_tables_keys, $matching_table_index, $display) @@ -960,7 +945,8 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s } } } - $pri_query; + + $pri_query = null; if (! $check) { $pri_query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$matching_table_index]); if (sizeof($target_tables_keys[$matching_table_index]) > 0) { @@ -1067,13 +1053,12 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s /** * PMA_removeColumnsFromTargetTable() removes the columns which are present in target table but not in source table. * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing names of matching tables - * @param $uncommon_columns array containing the names of the column which are to be dropped from the target table - * @param $table_counter index of the matching table as in $matchiing_tables array - * @param $display true/false value - * @return nothing + * @param string $trg_db name of target database + * @param mixed $trg_link connection established with target server + * @param array $matching_tables names of matching tables + * @param array $uncommon_columns array containing the names of the column which are to be dropped from the target table + * @param int $table_counter index of the matching table as in $matchiing_tables array + * @param bool $display */ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $table_counter, $display) { @@ -1123,18 +1108,17 @@ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, * indexes to be altered in $alter_indexes_array and indexes to be removed from target table in $remove_indexes_array. * Only keyname and uniqueness characteristic of the indexes are altered. * - * @param $src_db name of source database - * @param $trg_db name of target database - * @param $src_link connection established with source server - * @param $trg_link connection established with target server - * @param $matching_tables array containing the matching tables name - * @param $source_indexes array containing the indexes of the source table - * @param $target_indexes array containing the indexes of the target table - * @param $add_indexes_array array containing the name of the column on which the index is to be added in the target table - * @param $alter_indexes_array array containing the key name which needs to be altered - * @param $remove_indexes_array array containing the key name of the index which is to be removed from the target table - * @param $table_counter number of the matching table - * @return nothing + * @param string $src_db name of source database + * @param string $trg_db name of target database + * @param mixed $src_link connection established with source server + * @param mixed $trg_link connection established with target server + * @param array $matching_tables matching tables name + * @param array &$source_indexes indexes of the source table + * @param array &$target_indexes indexes of the target table + * @param array &$add_indexes_array name of the column on which the index is to be added in the target table + * @param array &$alter_indexes_array key name which needs to be altered + * @param array &$remove_indexes_array key name of the index which is to be removed from the target table + * @param int $table_counter number of the matching table */ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, &$source_indexes, &$target_indexes, &$add_indexes_array, &$alter_indexes_array, &$remove_indexes_array, $table_counter) @@ -1188,17 +1172,16 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi /** * PMA_applyIndexesDiff() create indexes, alters indexes and remove indexes. * - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $matching_tables array containing the matching tables name - * @param $source_indexes array containing the indexes of the source table - * @param $target_indexes array containing the indexes of the target table - * @param $add_indexes_array array containing the column names on which indexes are to be created in target table - * @param $alter_indexes_array array containing the column names for which indexes are to be altered - * @param $remove_indexes_array array containing the key name of the indexes which are to be removed from the target table - * @param $table_counter number of the matching table - * @param $display true/false value - * @return nothing + * @param string $trg_db name of target database + * @param mixed $trg_link connection established with target server + * @param array $matching_tables matching tables name + * @param array $source_indexes indexes of the source table + * @param array $target_indexes indexes of the target table + * @param array $add_indexes_array column names on which indexes are to be created in target table + * @param array $alter_indexes_array column names for which indexes are to be altered + * @param array $remove_indexes_array key name of the indexes which are to be removed from the target table + * @param int $table_counter number of the matching table + * @param $display */ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, $remove_indexes_array, $table_counter, $display) @@ -1276,8 +1259,7 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind * PMA_displayQuery() displays a query, taking the maximum display size * into account * - * @param $query the query to display - * @return nothing + * @param string $query the query to display */ function PMA_displayQuery($query) { if (strlen($query) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { @@ -1291,7 +1273,6 @@ function PMA_displayQuery($query) { * * @param string $src_db source db name * @param string $trg_db target db name - * @return nothing */ function PMA_syncDisplayHeaderCompare($src_db, $trg_db) { echo '<fieldset style="padding:0"><div style="padding:1.5em; overflow:auto; height:220px">'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12876-g55c6eac
by Madhura Jayaratne 03 Aug '11

03 Aug '11

The branch, master has been updated via 55c6eacf3e56da064dae69650480d84acd92d5a3 (commit) via 68e21b05e46f144735faa849b80734d83812c7e6 (commit) via 7909da2ea01b15aad44689c9cc59051d747d0381 (commit) from c1f586b9fdc399ddc2cf86faa5a5e05194afa2e5 (commit) - Log ----------------------------------------------------------------- commit 55c6eacf3e56da064dae69650480d84acd92d5a3 Merge: c1f586b9fdc399ddc2cf86faa5a5e05194afa2e5 68e21b05e46f144735faa849b80734d83812c7e6 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Aug 4 00:07:04 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_tbl.lib.php | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3cd0d8f..eea949e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ phpMyAdmin - ChangeLog - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced - bug #3374802 [interface] Comment on a column breaks inline editing +- bug #3383711 [display] Order by a column in a view doesn't work in some cases 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index af5dc89..b29b36a 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -842,8 +842,10 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ // the orgname member does not exist for all MySQL versions // but if found, it's the one on which to sort $name_to_use_in_sort = $fields_meta[$i]->name; + $is_orgname = false; if (isset($fields_meta[$i]->orgname) && strlen($fields_meta[$i]->orgname)) { $name_to_use_in_sort = $fields_meta[$i]->orgname; + $is_orgname = true; } // $name_to_use_in_sort might contain a space due to // formatting of function expressions like "COUNT(name )" @@ -870,12 +872,15 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ // 2.1.3 Check the field name for a bracket. // If it contains one, it's probably a function column // like 'COUNT(`field`)' - if (strpos($name_to_use_in_sort, '(') !== false) { + // It still might be a column name of a view. See bug #3383711 + // Check is_orgname. + if (strpos($name_to_use_in_sort, '(') !== false && ! $is_orgname) { $sort_order = ' ORDER BY ' . $name_to_use_in_sort . ' '; } else { $sort_order = ' ORDER BY ' . $sort_tbl . PMA_backquote($name_to_use_in_sort) . ' '; } unset($name_to_use_in_sort); + unset($is_orgname); // 2.1.4 Do define the sorting URL if (! $is_in_sort) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-62-g68e21b0
by Madhura Jayaratne 03 Aug '11

03 Aug '11

The branch, QA_3_4 has been updated via 68e21b05e46f144735faa849b80734d83812c7e6 (commit) via 7909da2ea01b15aad44689c9cc59051d747d0381 (commit) from e466dec53b4fca185e03d0a66b434f491355c274 (commit) - Log ----------------------------------------------------------------- commit 68e21b05e46f144735faa849b80734d83812c7e6 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Aug 4 00:04:16 2011 +0530 Changelog entry for bug #3383711. Some formatting commit 7909da2ea01b15aad44689c9cc59051d747d0381 Author: Sven Strickroth <email(a)cs-ware.de> Date: Mon Aug 1 16:05:36 2011 +0200 quick fix for issue #3383711 Signed-off-by: Sven Strickroth <email(a)cs-ware.de> ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_tbl.lib.php | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index dbcc2ad..77d630c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced - bug #3374802 [interface] Comment on a column breaks inline editing +- bug #3383711 [display] Order by a column in a view doesn't work in some cases 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index c871612..3fa26c1 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -766,8 +766,10 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ // the orgname member does not exist for all MySQL versions // but if found, it's the one on which to sort $name_to_use_in_sort = $fields_meta[$i]->name; + $is_orgname = false; if (isset($fields_meta[$i]->orgname) && strlen($fields_meta[$i]->orgname)) { $name_to_use_in_sort = $fields_meta[$i]->orgname; + $is_orgname = true; } // $name_to_use_in_sort might contain a space due to // formatting of function expressions like "COUNT(name )" @@ -794,12 +796,15 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ // 2.1.3 Check the field name for a bracket. // If it contains one, it's probably a function column // like 'COUNT(`field`)' - if (strpos($name_to_use_in_sort, '(') !== false) { + // It still might be a column name of a view. See bug #3383711 + // Check is_orgname. + if (strpos($name_to_use_in_sort, '(') !== false && ! $is_orgname) { $sort_order = ' ORDER BY ' . $name_to_use_in_sort . ' '; } else { $sort_order = ' ORDER BY ' . $sort_tbl . PMA_backquote($name_to_use_in_sort) . ' '; } unset($name_to_use_in_sort); + unset($is_orgname); // 2.1.4 Do define the sorting URL if (! $is_in_sort) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12873-gc1f586b
by Madhura Jayaratne 03 Aug '11

03 Aug '11

The branch, master has been updated via c1f586b9fdc399ddc2cf86faa5a5e05194afa2e5 (commit) from 54fbcaa1403e9d97e41fb28c1751f6051037a295 (commit) - Log ----------------------------------------------------------------- commit c1f586b9fdc399ddc2cf86faa5a5e05194afa2e5 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Aug 3 20:48:28 2011 +0530 Bug #3383904 - Column comments are not displayed ----------------------------------------------------------------------- Summary of changes: libraries/relation.lib.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 86d4ab1..3534840 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -277,7 +277,7 @@ function PMA__getRelationsParam() $cfgRelation['displaywork'] = true; } } - + if (isset($cfgRelation['table_coords']) && isset($cfgRelation['pdf_pages'])) { $cfgRelation['pdfwork'] = true; } @@ -513,7 +513,7 @@ function PMA_getComments($db, $table = '') if ($table != '') { // MySQL native column comments - $fields = PMA_DBI_get_columns($db, $table); + $fields = PMA_DBI_get_columns($db, $table, true); if ($fields) { foreach ($fields as $field) { if (! empty($field['Comment'])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12872-g54fbcaa
by Piotr Przybylski 02 Aug '11

02 Aug '11

The branch, master has been updated via 54fbcaa1403e9d97e41fb28c1751f6051037a295 (commit) from 0427378a0531e3d568a6ae60266d49318ff2310b (commit) - Log ----------------------------------------------------------------- commit 54fbcaa1403e9d97e41fb28c1751f6051037a295 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 2 23:30:51 2011 +0200 Server synchronize: * change icons to 16x16 * fix tables layout * merge 'Source' and 'Target' tables ----------------------------------------------------------------------- Summary of changes: js/server_synchronize.js | 24 +- libraries/server_synchronize.lib.php | 85 ++++--- server_synchronize.php | 283 ++++++++------------ themes/original/img/new_data.jpg | Bin 1925 -> 0 bytes themes/original/img/new_data.png | Bin 0 -> 1187 bytes themes/original/img/new_data_hovered.jpg | Bin 1558 -> 0 bytes themes/original/img/new_data_hovered.png | Bin 0 -> 1187 bytes themes/original/img/new_data_selected.jpg | Bin 1450 -> 0 bytes themes/original/img/new_data_selected.png | Bin 0 -> 1173 bytes themes/original/img/new_data_selected_hovered.jpg | Bin 1456 -> 0 bytes themes/original/img/new_data_selected_hovered.png | Bin 0 -> 1178 bytes themes/original/img/new_struct.jpg | Bin 1118 -> 0 bytes themes/original/img/new_struct.png | Bin 0 -> 1219 bytes themes/original/img/new_struct_hovered.jpg | Bin 1643 -> 0 bytes themes/original/img/new_struct_hovered.png | Bin 0 -> 1220 bytes themes/original/img/new_struct_selected.jpg | Bin 1431 -> 0 bytes themes/original/img/new_struct_selected.png | Bin 0 -> 1189 bytes .../original/img/new_struct_selected_hovered.jpg | Bin 1463 -> 0 bytes .../original/img/new_struct_selected_hovered.png | Bin 0 -> 1210 bytes themes/pmahomme/img/new_data.jpg | Bin 1925 -> 0 bytes themes/pmahomme/img/new_data.png | Bin 0 -> 1187 bytes themes/pmahomme/img/new_data_hovered.jpg | Bin 1558 -> 0 bytes themes/pmahomme/img/new_data_hovered.png | Bin 0 -> 1187 bytes themes/pmahomme/img/new_data_selected.jpg | Bin 1450 -> 0 bytes themes/pmahomme/img/new_data_selected.png | Bin 0 -> 1173 bytes themes/pmahomme/img/new_data_selected_hovered.jpg | Bin 1456 -> 0 bytes themes/pmahomme/img/new_data_selected_hovered.png | Bin 0 -> 1178 bytes themes/pmahomme/img/new_struct.jpg | Bin 1118 -> 0 bytes themes/pmahomme/img/new_struct.png | Bin 0 -> 1219 bytes themes/pmahomme/img/new_struct_hovered.jpg | Bin 1643 -> 0 bytes themes/pmahomme/img/new_struct_hovered.png | Bin 0 -> 1220 bytes themes/pmahomme/img/new_struct_selected.jpg | Bin 1431 -> 0 bytes themes/pmahomme/img/new_struct_selected.png | Bin 0 -> 1189 bytes .../pmahomme/img/new_struct_selected_hovered.jpg | Bin 1463 -> 0 bytes .../pmahomme/img/new_struct_selected_hovered.png | Bin 0 -> 1210 bytes 35 files changed, 175 insertions(+), 217 deletions(-) delete mode 100644 themes/original/img/new_data.jpg create mode 100644 themes/original/img/new_data.png delete mode 100644 themes/original/img/new_data_hovered.jpg create mode 100644 themes/original/img/new_data_hovered.png delete mode 100644 themes/original/img/new_data_selected.jpg create mode 100644 themes/original/img/new_data_selected.png delete mode 100644 themes/original/img/new_data_selected_hovered.jpg create mode 100644 themes/original/img/new_data_selected_hovered.png delete mode 100644 themes/original/img/new_struct.jpg create mode 100644 themes/original/img/new_struct.png delete mode 100644 themes/original/img/new_struct_hovered.jpg create mode 100644 themes/original/img/new_struct_hovered.png delete mode 100644 themes/original/img/new_struct_selected.jpg create mode 100644 themes/original/img/new_struct_selected.png delete mode 100644 themes/original/img/new_struct_selected_hovered.jpg create mode 100644 themes/original/img/new_struct_selected_hovered.png delete mode 100644 themes/pmahomme/img/new_data.jpg create mode 100644 themes/pmahomme/img/new_data.png delete mode 100644 themes/pmahomme/img/new_data_hovered.jpg create mode 100644 themes/pmahomme/img/new_data_hovered.png delete mode 100644 themes/pmahomme/img/new_data_selected.jpg create mode 100644 themes/pmahomme/img/new_data_selected.png delete mode 100644 themes/pmahomme/img/new_data_selected_hovered.jpg create mode 100644 themes/pmahomme/img/new_data_selected_hovered.png delete mode 100644 themes/pmahomme/img/new_struct.jpg create mode 100644 themes/pmahomme/img/new_struct.png delete mode 100644 themes/pmahomme/img/new_struct_hovered.jpg create mode 100644 themes/pmahomme/img/new_struct_hovered.png delete mode 100644 themes/pmahomme/img/new_struct_selected.jpg create mode 100644 themes/pmahomme/img/new_struct_selected.png delete mode 100644 themes/pmahomme/img/new_struct_selected_hovered.jpg create mode 100644 themes/pmahomme/img/new_struct_selected_hovered.png diff --git a/js/server_synchronize.js b/js/server_synchronize.js index 1dfd3d2..2cc0365 100644 --- a/js/server_synchronize.js +++ b/js/server_synchronize.js @@ -33,17 +33,17 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem // The image source is changed when the showDetails function is called. if ($img.hasClass('selected')) { if ($img.hasClass('struct_img')) { - $img.attr('src', pmaThemeImage + 'new_struct_selected.jpg'); + $img.attr('src', pmaThemeImage + 'new_struct_selected.png'); } if ($img.hasClass('data_img')) { - $img.attr('src', pmaThemeImage + 'new_data_selected.jpg'); + $img.attr('src', pmaThemeImage + 'new_data_selected.png'); } } else { if ($img.hasClass('struct_img')) { - $img.attr('src', pmaThemeImage + 'new_struct.jpg'); + $img.attr('src', pmaThemeImage + 'new_struct.png'); } if ($img.hasClass('data_img')) { - $img.attr('src', pmaThemeImage + 'new_data.jpg'); + $img.attr('src', pmaThemeImage + 'new_data.png'); } } @@ -347,9 +347,9 @@ $(document).ready(function() { var $img = $(this); $img.addClass('hover'); if ($img.hasClass('selected')) { - $img.attr('src', pmaThemeImage + 'new_struct_selected_hovered.jpg'); + $img.attr('src', pmaThemeImage + 'new_struct_selected_hovered.png'); } else { - $img.attr('src', pmaThemeImage + 'new_struct_hovered.jpg'); + $img.attr('src', pmaThemeImage + 'new_struct_hovered.png'); } }, function() { @@ -357,9 +357,9 @@ $(document).ready(function() { var $img = $(this); $img.removeClass('hover'); if ($img.hasClass('selected')) { - $img.attr('src', pmaThemeImage + 'new_struct_selected.jpg'); + $img.attr('src', pmaThemeImage + 'new_struct_selected.png'); } else { - $img.attr('src', pmaThemeImage + 'new_struct.jpg'); + $img.attr('src', pmaThemeImage + 'new_struct.png'); } } ); @@ -370,9 +370,9 @@ $(document).ready(function() { var $img = $(this); $img.addClass('hover'); if ($img.hasClass('selected')) { - $img.attr('src', pmaThemeImage + 'new_data_selected_hovered.jpg'); + $img.attr('src', pmaThemeImage + 'new_data_selected_hovered.png'); } else { - $img.attr('src', pmaThemeImage + 'new_data_hovered.jpg'); + $img.attr('src', pmaThemeImage + 'new_data_hovered.png'); } }, function() { @@ -380,9 +380,9 @@ $(document).ready(function() { var $img = $(this); $img.removeClass('hover'); if ($img.hasClass('selected')) { - $img.attr('src', pmaThemeImage + 'new_data_selected.jpg'); + $img.attr('src', pmaThemeImage + 'new_data_selected.png'); } else { - $img.attr('src', pmaThemeImage + 'new_data.jpg'); + $img.attr('src', pmaThemeImage + 'new_data.png'); } } ); diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 12cea2a..b7b332c 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -1287,66 +1287,75 @@ function PMA_displayQuery($query) { } /** - * PMA_syncDisplayHeaderSource() shows the header for source database + * PMA_syncDisplayHeaderCompare() shows the header for source database * - * @param string $src_db source db name + * @param string $src_db source db name + * @param string $trg_db target db name * @return nothing */ -function PMA_syncDisplayHeaderSource($src_db) { - echo '<div id="serverstatus" style = "overflow: auto; width: 1020px; height: 220px; border-left: 1px gray solid; border-bottom: 1px gray solid; padding:0; margin-bottom: 1em "> '; +function PMA_syncDisplayHeaderCompare($src_db, $trg_db) { + echo '<fieldset style="padding:0"><div style="padding:1.5em; overflow:auto; height:220px">'; - echo '<table id="serverstatusconnections" class="data" width="55%">'; + echo '<table class="data">'; echo '<tr>'; - echo '<th>' . __('Source database') . ': ' . $src_db . '<br />('; + echo '<th>' . __('Source database') . ': ' . htmlspecialchars($src_db) . '<br />('; if ('cur' == $_SESSION['src_type']) { echo __('Current server'); } else { - echo __('Remote server') . ' ' . $_SESSION['src_server']['host']; + echo __('Remote server') . ' ' . htmlspecialchars($_SESSION['src_server']['host']); } echo ')</th>'; echo '<th>' . __('Difference') . '</th>'; - echo '</tr>'; -} - -/** - * PMA_syncDisplayHeaderTargetAndMatchingTables() shows the header for target database and the matching tables - * - * @param string $trg_db target db name - * @param array $matching_tables - * @return boolean $odd_row current value of this toggle - */ -function PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables) { - echo '<table id="serverstatusconnections" class="data" width="43%">'; - echo '<tr>'; - echo '<th>' . __('Target database') . ': '. $trg_db . '<br />('; + echo '<th>' . __('Target database') . ': '. htmlspecialchars($trg_db) . '<br />('; if ('cur' == $_SESSION['trg_type']) { echo __('Current server'); } else { - echo __('Remote server') . ' ' . $_SESSION['trg_server']['host']; + echo __('Remote server') . ' ' . htmlspecialchars($_SESSION['trg_server']['host']); } echo ')</th>'; echo '</tr>'; - $odd_row = false; - foreach ($matching_tables as $tbl_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td> ' . htmlspecialchars($tbl_name) . '</td>'; - echo '</tr>'; - } - return $odd_row; } /** - * PMA_syncDisplayBeginTableRow() displays the TR tag for alternating colors + * Prints table row + * + * $rows contains following keys: + * - src_table_name - source server table name + * - dst_table_name - target server table name + * - btn_type - 'M' or 'U' + * - btn_structure - null or arguments for showDetails in server_synchronize.js (without img_obj and table_name): + * i, update_size, insert_size, remove_size, insert_index, remove_index * - * @param boolean $odd_row current status of the toggle - * @return boolean $odd_row final status of the toggle + * @param array $rows */ -function PMA_syncDisplayBeginTableRow($odd_row) { - $odd_row = ! $odd_row; - echo '<tr height="32" class=" '; - echo $odd_row ? 'odd' : 'even'; - echo '">'; - return $odd_row; +function PMA_syncDisplayDataCompare($rows) { + global $pmaThemeImage; + + $odd_row = true; + foreach ($rows as $row) { + echo '<tr class=" ' . ($odd_row ? 'odd' : 'even') . '">'; + echo '<td>' . htmlspecialchars($row['src_table_name']) . '</td><td style="text-align:center">'; + if (isset($row['btn_structure']) && $row['btn_structure']) { + // parameters: i, update_size, insert_size, remove_size, insert_index, remove_index + $p = $row['btn_structure']; + $p[0] = $row['btn_type'] . 'S' . $p[0]; + echo '<img class="icon struct_img" src="' . $pmaThemeImage . 'new_struct.png" width="16" height="16" + alt="Structure" title="' . __('Click to select') . '" style="cursor:pointer" onclick="showDetails(' + . "'" . implode($p, "','") . "'" + . ', this, ' . "'" . PMA_escapeJsString(htmlspecialchars($row['src_table_name'])) . "'" . ')" /> '; + } + if (isset($row['btn_data']) && $row['btn_data']) { + // parameters: i, update_size, insert_size, remove_size, insert_index, remove_index + $p = $row['btn_data']; + $p[0] = $row['btn_type'] . 'D' . $p[0]; + echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.png" width="16" height="16" + alt="Data" title="' . __('Click to select') . '" style="cursor:pointer" onclick="showDetails(' + . "'" . implode($p, "','") . "'" + . ', this, ' . "'" . PMA_escapeJsString(htmlspecialchars($row['src_table_name'])) . "'" . ')" />'; + } + echo '</td><td>' . htmlspecialchars($row['dst_table_name']) . '</td></tr>'; + $odd_row = !$odd_row; + } } /** diff --git a/server_synchronize.php b/server_synchronize.php index 6c23d97..8f79897 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -251,33 +251,32 @@ if ((isset($_REQUEST['submit_connect']))) { /** * Displays the sub-heading and icons showing Structure Synchronization and Data Synchronization */ - echo '<form name="synchronize_form" id="synchronize_form" method="post" action="server_synchronize.php">' - . PMA_generate_common_hidden_inputs('', ''); - echo '<table id="serverstatustraffic" class="data" width = "40%"> + ?> + <form name="synchronize_form" id="synchronize_form" method="post" action="server_synchronize.php"> + <?php PMA_generate_common_hidden_inputs('', ''); ?> + <table width="40%"> <tr> - <td>' - . '<img class="icon" src="' . $pmaThemeImage . 'new_struct.jpg" width="32"' - . ' height="32" alt="" />' - . __('Structure Synchronization') - .'</td>'; - echo '<td>' - . '<img class="icon" src="' . $pmaThemeImage . 'new_data.jpg" width="32"' - . ' height="32" alt="" />' - . __('Data Synchronization') - . '</td>'; - echo '</tr> - </table>'; - + <td> + <img class="icon" src="<?php echo $pmaThemeImage; ?>new_struct.png" width="16" height="16" alt="" /> + <?php echo __('Structure Synchronization'); ?> + </td> + <td> + <img class="icon" src="<?php echo $pmaThemeImage; ?>new_data.png" width="16" height="16" alt="" /> + <?php echo __('Data Synchronization'); ?> + </td> + </tr> + </table> + <?php /** * Displays the tables containing the source tables names, their difference with the target tables and target tables names */ - PMA_syncDisplayHeaderSource($src_db); - $odd_row = false; + PMA_syncDisplayHeaderCompare($src_db, $trg_db); + $rows = array(); /** * Display the matching tables' names and difference, first */ - for($i = 0; $i < count($matching_tables); $i++) { + for ($i = 0; $i < count($matching_tables); $i++) { /** * Calculating the number of updates for each matching table */ @@ -296,12 +295,7 @@ if ((isset($_REQUEST['submit_connect']))) { } else { $num_of_insertions = 0; } - /** - * Displays the name of the matching table - */ - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td>' . htmlspecialchars($matching_tables[$i]) . '</td> - <td align="center">'; + /** * Calculating the number of alter columns, number of columns to be added, number of columns to be removed, * number of index to be added and removed. @@ -331,86 +325,70 @@ if ((isset($_REQUEST['submit_connect']))) { $num_add_index += sizeof($alter_indexes_array[$i]); $num_remove_index += sizeof($alter_indexes_array[$i]); } + + $btn_structure_params = null; + $btn_data_params = null; + /** * Display the red button of structure synchronization if there exists any structure difference or index difference. */ if (($num_alter_cols > 0) || ($num_insert_cols > 0) || ($num_remove_cols > 0) || ($num_add_index > 0) || ($num_remove_index > 0)) { - - echo '<img class="icon struct_img" src="' . $pmaThemeImage . 'new_struct.jpg" width="29" height="29" - alt="' . __('Click to select') . '" - onclick="showDetails(' . "'MS" . $i . "','" . $num_alter_cols . "','" .$num_insert_cols . - "','" . $num_remove_cols . "','" . $num_add_index . "','" . $num_remove_index . "'" - . ', this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')"/>'; + $btn_structure_params = array($i, $num_alter_cols, $num_insert_cols, + $num_remove_cols, $num_add_index, $num_remove_index); } + /** * Display the green button of data synchronization if there exists any data difference. */ if (isset($update_array[$i]) || isset($insert_array[$i])) { if (isset($update_array[$i][0][$matching_tables_keys[$i][0]]) || isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) { - - echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29" - alt="' . __('Click to select') . '" - onclick="showDetails('. "'MD" . $i . "','" . $num_of_updates . "','" . $num_of_insertions . - "','" . null . "','" . null . "','" . null . "'" . ', this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')" />'; + $btn_data_params = array($i, $num_of_updates, $num_of_insertions, null, null, null); } } - echo '</td> - </tr>'; + + $rows[] = array( + 'src_table_name' => $matching_tables[$i], + 'dst_table_name' => $matching_tables[$i], + 'btn_type' => 'M', + 'btn_structure' => $btn_structure_params, + 'btn_data' => $btn_data_params + ); } /** * Displays the tables' names present in source but missing from target */ for ($j = 0; $j < count($source_tables_uncommon); $j++) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td> + ' . htmlspecialchars($source_tables_uncommon[$j]) . '</td> '; - - echo '<td align="center"><img class="icon struct_img" src="' . $pmaThemeImage . 'new_struct.jpg" width="29" height="29" - alt="' . __('Click to select') . '" - onclick="showDetails(' . "'US" . $j . "','" . null . "','" . null . "','" . null . "','" . null . "','" . null . "'" . ', this ,' - . "'" . htmlspecialchars($source_tables_uncommon[$j]) . "'" . ')"/>'; - - if ($row_count[$j] > 0) - { - echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29" - alt="' . __('Click to select') . '" - onclick="showDetails(' . "'UD" . $j . "','" . null . "','" . $row_count[$j] . "','" . null . - "','" . null . "','" . null . "'" . ', this ,' . "'" . htmlspecialchars($source_tables_uncommon[$j]) . "'" . ')" />'; + $row = array( + 'src_table_name' => '+ ' . $source_tables_uncommon[$j], + 'dst_table_name' => $source_tables_uncommon[$j] . ' (' . __('not present') . ')', + 'btn_type' => 'U', + 'btn_structure' => array($j, null, null, null, null, null), + 'btn_data' => null + ); + if ($row_count[$j] > 0) { + $row['btn_data'] = array($j, null, $row_count[$j], null, null, null); } - echo '</td> - </tr>'; + $rows[] = $row; } foreach ($target_tables_uncommon as $tbl_nc_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td height="32">      </td><td></td>'; - echo '</tr>'; + $rows[] = array( + 'src_table_name' => '', + 'dst_table_name' => $tbl_nc_name); } /** * Displays the target tables names */ - echo '</table>'; - - $odd_row = PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables); - foreach ($source_tables_uncommon as $tbl_nc_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td height="32">' . htmlspecialchars($tbl_nc_name) . ' (' . __('not present') . ')</td> - </tr>'; - } - foreach ($target_tables_uncommon as $tbl_nc_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td> - ' . htmlspecialchars($tbl_nc_name) . '</td>'; - echo '</tr>'; - } - echo '</table>'; - echo '</div>'; + PMA_syncDisplayDataCompare($rows); + echo '</table> + </div> + </fieldset>'; /** * This "list" div will contain a table and each row will depict information about structure/data diffrence in tables. * Rows will be generated dynamically as soon as the colored buttons "D" or "S" are clicked. */ - echo '<div id="list" style = "overflow: auto; width: 1020px; height: 140px; - border-left: 1px gray solid; border-bottom: 1px gray solid; - padding:0px; margin: 0px"> + echo '<fieldset style="padding:0"><div id="list" style="overflow:auto; height:140px; padding:1em"> <table> <thead> @@ -433,7 +411,7 @@ if ((isset($_REQUEST['submit_connect']))) { </thead> <tbody></tbody> </table> - </div>'; + </div></fieldset>'; /** * This fieldset displays the checkbox to confirm deletion of previous rows from target tables */ @@ -700,13 +678,9 @@ if (isset($_REQUEST['Table_ids'])) { echo '<form name="applied_difference" id="synchronize_form" method="post" action="server_synchronize.php">' . PMA_generate_common_hidden_inputs('', ''); - PMA_syncDisplayHeaderSource($src_db); - $odd_row = false; + PMA_syncDisplayHeaderCompare($src_db, $trg_db); + $rows = array(); for($i = 0; $i < count($matching_tables); $i++) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td align="center">' . htmlspecialchars($matching_tables[$i]) . '</td> - <td align="center">'; - $num_alter_cols = 0; $num_insert_cols = 0; $num_remove_cols = 0; @@ -729,11 +703,12 @@ if (isset($_REQUEST['Table_ids'])) { $num_remove_index = sizeof($remove_indexes_array[$i]); } + $btn_structure_params = null; + $btn_data_params = null; + if (($num_alter_cols > 0) || ($num_insert_cols > 0) || ($num_remove_cols > 0) || ($num_add_index > 0) || ($num_remove_index > 0)) { - echo '<img class="icon struct_img" src="' . $pmaThemeImage . 'new_struct.jpg" width="29" height="29" - alt="' . __('Click to select') . '" - onclick="showDetails(' . "'MS" . $i . "','" . $num_alter_cols . "','" . $num_insert_cols . "','" . $num_remove_cols . "','" . $num_add_index . "','" . $num_remove_index . "'" .', - this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')"/>'; + $btn_structure_params = array($i, $num_alter_cols, $num_insert_cols, + $num_remove_cols, $num_add_index, $num_remove_index); } if (!(in_array($i, $matching_table_data_diff))) { @@ -757,18 +732,20 @@ if (isset($_REQUEST['Table_ids'])) { } if ((isset($matching_tables_keys[$i][0]) && isset($update_array[$i][0][$matching_tables_keys[$i][0]])) - || (isset($matching_tables_keys[$i][0]) && isset($insert_array[$i][0][$matching_tables_keys[$i][0]]))) { - echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29" - alt="' . __('Click to select') . '" - onclick="showDetails(' . "'MD" . $i . "','" . $num_of_updates . "','" . $num_of_insertions . - "','" . null . "','" . null . "','" . null . "'" .', this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')" />'; + || (isset($matching_tables_keys[$i][0]) && isset($insert_array[$i][0][$matching_tables_keys[$i][0]]))) { + $btn_data_params = array($i, $num_of_updates, $num_of_insertions, + null, null, null); } } else { unset($update_array[$i]); unset($insert_array[$i]); } - echo '</td> - </tr>'; + $rows[] = array( + 'src_table_name' => $matching_tables[$i], + 'btn_type' => 'M', + 'btn_structure' => $btn_structure_params, + 'btn_data' => $btn_data_params + ); } /** * placing updated value of arrays in session @@ -778,37 +755,39 @@ if (isset($_REQUEST['Table_ids'])) { $_SESSION['insert_array'] = $insert_array; for ($j = 0; $j < count($source_tables_uncommon); $j++) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td align="center"> + ' . htmlspecialchars($source_tables_uncommon[$j]) . '</td> - <td align="center">'; + $btn_structure_params = null; + $btn_data_params = null; + /** * Display the difference only when it has not been applied */ if (!(in_array($j, $uncommon_table_structure_diff))) { if (isset($uncommon_tables[$j])) { - echo '<img class="icon struct_img" src="' . $pmaThemeImage . 'new_struct.jpg" width="29" height="29" - alt="' . __('Click to select') . '" - onclick="showDetails(' . "'US" . $j . "','" . null . "','" . null . "','" . null . "','" . null . "','" . null . "'" . ', this ,' . "'" . htmlspecialchars($source_tables_uncommon[$j]) . "'" . ')"/>' .' '; + $btn_structure_params = array($j, null, null, null, null, null); } + $dst_table_name = $source_tables_uncommon[$j] . ' (' . __('not present') . ')'; } else { unset($uncommon_tables[$j]); + $dst_table_name = $source_tables_uncommon[$j]; } /** * Display the difference only when it has not been applied */ if (!(in_array($j, $uncommon_table_data_diff))) { - if (isset($row_count[$j]) && ($row_count > 0)) { - echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29" - alt="' . __('Click to select') . '" - onclick="showDetails(' . "'UD" . $j . "','" . null ."','" . $row_count[$j] ."','" - . null . "','" . null . "','" . null . "'" . ', this ,' . "'". htmlspecialchars($source_tables_uncommon[$j]) . "'" . ')" />'; + if (isset($row_count[$j]) && ($row_count[$j] > 0)) { + $btn_data_params = array($j, null, $row_count[$j], null, null, null); } } else { unset($row_count[$j]); } - echo '</td> - </tr>'; + $rows[] = array( + 'src_table_name' => $source_tables_uncommon[$j], + 'dst_table_name' => $dst_table_name, + 'btn_type' => 'U', + 'btn_structure' => $btn_structure_params, + 'btn_data' => $btn_data_params + ); } /** * placing the latest values of arrays in session @@ -822,39 +801,21 @@ if (isset($_REQUEST['Table_ids'])) { * Displaying the target database tables */ foreach ($target_tables_uncommon as $tbl_nc_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td>      </td><td></td>'; - echo '</tr>'; - } - echo '</table>'; - $odd_row = PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables); - foreach ($source_tables_uncommon as $tbl_nc_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - if (in_array($tbl_nc_name, $uncommon_tables)) { - echo '<td>' . htmlspecialchars($tbl_nc_name) . ' (' . __('not present') . ')</td>'; - } else { - echo '<td>' . htmlspecialchars($tbl_nc_name) . '</td>'; - } - echo ' - </tr>'; - } - foreach ($target_tables_uncommon as $tbl_nc_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td> - ' . htmlspecialchars($tbl_nc_name) . '</td>'; - echo '</tr>'; + $rows[] = array( + 'src_table_name' => '', + 'dst_table_name' => $tbl_nc_name); } + PMA_syncDisplayDataCompare($rows); echo '</table> - </div>'; + </div> + </fieldset>'; /** * This "list" div will contain a table and each row will depict information about structure/data diffrence in tables. * Rows will be generated dynamically as soon as the colored buttons "D" or "S" are clicked. */ - echo '<div id="list" style = "overflow: auto; width: 1020px; height: 140px; - border-left: 1px gray solid; border-bottom: 1px gray solid; - padding:0px; margin: 0px">'; - + echo '<fieldset style="padding:0"><div id="list" style = "overflow:auto; height:140px; padding:1em">'; echo '<table> <thead> <tr style="width: 100%;"> @@ -876,7 +837,7 @@ if (isset($_REQUEST['Table_ids'])) { </thead> <tbody></tbody> </table> - </div>'; + </div></fieldset>'; /** * This fieldset displays the checkbox to confirm deletion of previous rows from target tables @@ -938,40 +899,28 @@ if (isset($_REQUEST['synchronize_db'])) { /** * Displaying all the tables of source and target database and now no difference is there. */ - PMA_syncDisplayHeaderSource($src_db); - - $odd_row = false; - for($i = 0; $i < count($matching_tables); $i++) - { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td>' . htmlspecialchars($matching_tables[$i]) . '</td> - <td></td> - </tr>'; - } - for ($j = 0; $j < count($source_tables_uncommon); $j++) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td> + ' . htmlspecialchars($source_tables_uncommon[$j]) . '</td> '; - echo '<td></td> - </tr>'; - } - foreach ($target_tables_uncommon as $tbl_nc_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td>      </td><td></td>'; - echo '</tr>'; - } - echo '</table>'; - $odd_row = PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables); - foreach ($source_tables_uncommon as $tbl_nc_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td>' . htmlspecialchars($tbl_nc_name) . ' </td> - </tr>'; - } - foreach ($target_tables_uncommon as $tbl_nc_name) { - $odd_row = PMA_syncDisplayBeginTableRow($odd_row); - echo '<td> ' . htmlspecialchars($tbl_nc_name) . '</td>'; - echo '</tr>'; - } - echo '</table> </div>'; + PMA_syncDisplayHeaderCompare($src_db, $trg_db); + $rows = array(); + for ($i = 0; $i < count($matching_tables); $i++) + { + $rows[] = array( + 'src_table_name' => $matching_tables[$i], + 'dst_table_name' => $matching_tables[$i]); + } + foreach ($source_tables_uncommon as $tbl_nc_name) { + $rows[] = array( + 'src_table_name' => '+ ' + $tbl_nc_name, + 'dst_table_name' => $tbl_nc_name); + } + foreach ($target_tables_uncommon as $tbl_nc_name) { + $rows[] = array( + 'src_table_name' => '', + 'dst_table_name' => $tbl_nc_name); + } + PMA_syncDisplayDataCompare($rows); + echo '</table> + </div> + </fieldset>'; /** * connecting the source and target servers @@ -1114,7 +1063,7 @@ if (isset($_REQUEST['synchronize_db'])) { $database_header .= PMA_showHint(PMA_sanitize(sprintf('%sAllowArbitraryServer%s', '[a@./Documentation.html#AllowArbitraryServer@_blank]', '[/a]'))); ?> - <table id="serverconnection_<?php echo $type; ?>_remote" class="data"> + <table id="serverconnection_<?php echo $type; ?>_remote" class="data noclick"> <caption class="tblHeaders"><?php echo $database_header; ?></caption> <tr class="odd"> <td colspan="2" style="text-align: center"> diff --git a/themes/original/img/new_data.jpg b/themes/original/img/new_data.jpg deleted file mode 100644 index 08d30d3..0000000 Binary files a/themes/original/img/new_data.jpg and /dev/null differ diff --git a/themes/original/img/new_data.png b/themes/original/img/new_data.png new file mode 100644 index 0000000..6533571 Binary files /dev/null and b/themes/original/img/new_data.png differ diff --git a/themes/original/img/new_data_hovered.jpg b/themes/original/img/new_data_hovered.jpg deleted file mode 100644 index c385872..0000000 Binary files a/themes/original/img/new_data_hovered.jpg and /dev/null differ diff --git a/themes/original/img/new_data_hovered.png b/themes/original/img/new_data_hovered.png new file mode 100644 index 0000000..b1cbdcd Binary files /dev/null and b/themes/original/img/new_data_hovered.png differ diff --git a/themes/original/img/new_data_selected.jpg b/themes/original/img/new_data_selected.jpg deleted file mode 100644 index caabf67..0000000 Binary files a/themes/original/img/new_data_selected.jpg and /dev/null differ diff --git a/themes/original/img/new_data_selected.png b/themes/original/img/new_data_selected.png new file mode 100644 index 0000000..39aa50f Binary files /dev/null and b/themes/original/img/new_data_selected.png differ diff --git a/themes/original/img/new_data_selected_hovered.jpg b/themes/original/img/new_data_selected_hovered.jpg deleted file mode 100644 index a34ba21..0000000 Binary files a/themes/original/img/new_data_selected_hovered.jpg and /dev/null differ diff --git a/themes/original/img/new_data_selected_hovered.png b/themes/original/img/new_data_selected_hovered.png new file mode 100644 index 0000000..7105a2d Binary files /dev/null and b/themes/original/img/new_data_selected_hovered.png differ diff --git a/themes/original/img/new_struct.jpg b/themes/original/img/new_struct.jpg deleted file mode 100644 index 283a5e9..0000000 Binary files a/themes/original/img/new_struct.jpg and /dev/null differ diff --git a/themes/original/img/new_struct.png b/themes/original/img/new_struct.png new file mode 100644 index 0000000..14f7969 Binary files /dev/null and b/themes/original/img/new_struct.png differ diff --git a/themes/original/img/new_struct_hovered.jpg b/themes/original/img/new_struct_hovered.jpg deleted file mode 100644 index 7a7c704..0000000 Binary files a/themes/original/img/new_struct_hovered.jpg and /dev/null differ diff --git a/themes/original/img/new_struct_hovered.png b/themes/original/img/new_struct_hovered.png new file mode 100644 index 0000000..5746ac1 Binary files /dev/null and b/themes/original/img/new_struct_hovered.png differ diff --git a/themes/original/img/new_struct_selected.jpg b/themes/original/img/new_struct_selected.jpg deleted file mode 100644 index 16b2b8c..0000000 Binary files a/themes/original/img/new_struct_selected.jpg and /dev/null differ diff --git a/themes/original/img/new_struct_selected.png b/themes/original/img/new_struct_selected.png new file mode 100644 index 0000000..618ba81 Binary files /dev/null and b/themes/original/img/new_struct_selected.png differ diff --git a/themes/original/img/new_struct_selected_hovered.jpg b/themes/original/img/new_struct_selected_hovered.jpg deleted file mode 100644 index 77a5371..0000000 Binary files a/themes/original/img/new_struct_selected_hovered.jpg and /dev/null differ diff --git a/themes/original/img/new_struct_selected_hovered.png b/themes/original/img/new_struct_selected_hovered.png new file mode 100644 index 0000000..4e0947e Binary files /dev/null and b/themes/original/img/new_struct_selected_hovered.png differ diff --git a/themes/pmahomme/img/new_data.jpg b/themes/pmahomme/img/new_data.jpg deleted file mode 100644 index 08d30d3..0000000 Binary files a/themes/pmahomme/img/new_data.jpg and /dev/null differ diff --git a/themes/pmahomme/img/new_data.png b/themes/pmahomme/img/new_data.png new file mode 100644 index 0000000..6533571 Binary files /dev/null and b/themes/pmahomme/img/new_data.png differ diff --git a/themes/pmahomme/img/new_data_hovered.jpg b/themes/pmahomme/img/new_data_hovered.jpg deleted file mode 100644 index c385872..0000000 Binary files a/themes/pmahomme/img/new_data_hovered.jpg and /dev/null differ diff --git a/themes/pmahomme/img/new_data_hovered.png b/themes/pmahomme/img/new_data_hovered.png new file mode 100644 index 0000000..b1cbdcd Binary files /dev/null and b/themes/pmahomme/img/new_data_hovered.png differ diff --git a/themes/pmahomme/img/new_data_selected.jpg b/themes/pmahomme/img/new_data_selected.jpg deleted file mode 100644 index caabf67..0000000 Binary files a/themes/pmahomme/img/new_data_selected.jpg and /dev/null differ diff --git a/themes/pmahomme/img/new_data_selected.png b/themes/pmahomme/img/new_data_selected.png new file mode 100644 index 0000000..39aa50f Binary files /dev/null and b/themes/pmahomme/img/new_data_selected.png differ diff --git a/themes/pmahomme/img/new_data_selected_hovered.jpg b/themes/pmahomme/img/new_data_selected_hovered.jpg deleted file mode 100644 index a34ba21..0000000 Binary files a/themes/pmahomme/img/new_data_selected_hovered.jpg and /dev/null differ diff --git a/themes/pmahomme/img/new_data_selected_hovered.png b/themes/pmahomme/img/new_data_selected_hovered.png new file mode 100644 index 0000000..7105a2d Binary files /dev/null and b/themes/pmahomme/img/new_data_selected_hovered.png differ diff --git a/themes/pmahomme/img/new_struct.jpg b/themes/pmahomme/img/new_struct.jpg deleted file mode 100644 index 283a5e9..0000000 Binary files a/themes/pmahomme/img/new_struct.jpg and /dev/null differ diff --git a/themes/pmahomme/img/new_struct.png b/themes/pmahomme/img/new_struct.png new file mode 100644 index 0000000..14f7969 Binary files /dev/null and b/themes/pmahomme/img/new_struct.png differ diff --git a/themes/pmahomme/img/new_struct_hovered.jpg b/themes/pmahomme/img/new_struct_hovered.jpg deleted file mode 100644 index 7a7c704..0000000 Binary files a/themes/pmahomme/img/new_struct_hovered.jpg and /dev/null differ diff --git a/themes/pmahomme/img/new_struct_hovered.png b/themes/pmahomme/img/new_struct_hovered.png new file mode 100644 index 0000000..5746ac1 Binary files /dev/null and b/themes/pmahomme/img/new_struct_hovered.png differ diff --git a/themes/pmahomme/img/new_struct_selected.jpg b/themes/pmahomme/img/new_struct_selected.jpg deleted file mode 100644 index 16b2b8c..0000000 Binary files a/themes/pmahomme/img/new_struct_selected.jpg and /dev/null differ diff --git a/themes/pmahomme/img/new_struct_selected.png b/themes/pmahomme/img/new_struct_selected.png new file mode 100644 index 0000000..618ba81 Binary files /dev/null and b/themes/pmahomme/img/new_struct_selected.png differ diff --git a/themes/pmahomme/img/new_struct_selected_hovered.jpg b/themes/pmahomme/img/new_struct_selected_hovered.jpg deleted file mode 100644 index 77a5371..0000000 Binary files a/themes/pmahomme/img/new_struct_selected_hovered.jpg and /dev/null differ diff --git a/themes/pmahomme/img/new_struct_selected_hovered.png b/themes/pmahomme/img/new_struct_selected_hovered.png new file mode 100644 index 0000000..4e0947e Binary files /dev/null and b/themes/pmahomme/img/new_struct_selected_hovered.png differ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12871-g0427378
by Piotr Przybylski 02 Aug '11

02 Aug '11

The branch, master has been updated via 0427378a0531e3d568a6ae60266d49318ff2310b (commit) from 663d073e6be9630bd99e3684705d9182c36112b1 (commit) - Log ----------------------------------------------------------------- commit 0427378a0531e3d568a6ae60266d49318ff2310b Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 2 23:13:39 2011 +0200 Allow to use noclick class on table level ----------------------------------------------------------------------- Summary of changes: js/functions.js | 2 +- libraries/display_change_password.lib.php | 6 ++-- libraries/tbl_properties.inc.php | 6 ++-- server_collations.php | 6 ++-- server_engines.php | 6 ++-- server_status.php | 30 ++++++++++++++-------------- server_variables.php | 6 ++-- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/js/functions.js b/js/functions.js index bc94a89..287195d 100644 --- a/js/functions.js +++ b/js/functions.js @@ -597,7 +597,7 @@ $(document).ready(function() { * next pages reached via AJAX); a tr may have the class noclick to remove * this behavior. */ - $('tr.odd:not(.noclick), tr.even:not(.noclick)').live('click',function(e) { + $('table:not(.noclick) tr.odd:not(.noclick), table:not(.noclick) tr.even:not(.noclick)').live('click',function(e) { // do not trigger when clicked on anchor if ($(e.target).is('a, img, a *')) { return; diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php index 4dcb2c9..48444a6 100644 --- a/libraries/display_change_password.lib.php +++ b/libraries/display_change_password.lib.php @@ -27,14 +27,14 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5) }?> <fieldset id="fieldset_change_password"> <legend><?php echo __('Change password'); ?></legend> - <table class="data"> - <tr class="odd noclick"> + <table class="data noclick"> + <tr class="odd"> <td colspan="2"> <input type="radio" name="nopass" value="1" id="nopass_1" onclick="pma_pw.value = ''; pma_pw2.value = ''; this.checked = true" /> <label for="nopass_1"><?php echo __('No Password') . "\n"; ?></label> </td> </tr> - <tr class="even noclick"> + <tr class="even"> <td> <input type="radio" name="nopass" value="0" id="nopass_0" onclick="document.getElementById('text_pma_pw').focus();" checked="checked " /> <label for="nopass_0"><?php echo __('Password'); ?>: </label> diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index f4ade94..7208ea3 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -622,7 +622,7 @@ if (is_array($content_cells) && is_array($header_cells)) { // last row is for javascript insert //$empty_row = array_pop($content_cells); - echo '<table id="table_columns">'; + echo '<table id="table_columns" class="noclick">'; echo '<caption class="tblHeaders">' . __('Structure') . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_TABLE') . '</caption>'; if ($display_type == 'horizontal') { @@ -636,7 +636,7 @@ if (is_array($content_cells) && is_array($header_cells)) { $odd_row = true; foreach ($content_cells as $content_row) { - echo '<tr class="' . ($odd_row ? 'odd' : 'even') . ' noclick">'; + echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">'; $odd_row = ! $odd_row; if (is_array($content_row)) { @@ -652,7 +652,7 @@ if (is_array($content_cells) && is_array($header_cells)) { $i = 0; $odd_row = true; foreach ($header_cells as $header_val) { - echo '<tr class="' . ($odd_row ? 'odd' : 'even') . ' noclick">'; + echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">'; $odd_row = ! $odd_row; ?> <th><?php echo $header_val; ?></th> diff --git a/server_collations.php b/server_collations.php index ccd41d4..71508be 100644 --- a/server_collations.php +++ b/server_collations.php @@ -49,7 +49,7 @@ require_once './libraries/mysql_charsets.lib.php'; * Outputs the result */ echo '<div id="div_mysql_charset_collations">' . "\n" - . '<table class="data">' . "\n" + . '<table class="data noclick">' . "\n" . '<tr><th>' . __('Collation') . '</th>' . "\n" . ' <th>' . __('Description') . '</th>' . "\n" . '</tr>' . "\n"; @@ -61,7 +61,7 @@ foreach ($mysql_charsets as $current_charset) { if ($i >= $table_row_count / 2) { $i = 0; echo '</table>' . "\n" - . '<table class="data">' . "\n" + . '<table class="data noclick">' . "\n" . '<tr><th>' . __('Collation') . '</th>' . "\n" . ' <th>' . __('Description') . '</th>' . "\n" . '</tr>' . "\n"; @@ -78,7 +78,7 @@ foreach ($mysql_charsets as $current_charset) { $odd_row = true; foreach ($mysql_collations[$current_charset] as $current_collation) { $i++; - echo '<tr class="noclick ' + echo '<tr class="' . ($odd_row ? 'odd' : 'even') . ($mysql_default_collations[$current_charset] == $current_collation ? ' marked' diff --git a/server_engines.php b/server_engines.php index c668777..4e5eeb3 100644 --- a/server_engines.php +++ b/server_engines.php @@ -50,7 +50,7 @@ if (empty($_REQUEST['engine']) /** * Displays the table header */ - echo '<table>' . "\n" + echo '<table class="noclick">' . "\n" . '<thead>' . "\n" . '<tr><th>' . __('Storage Engine') . '</th>' . "\n" . ' <th>' . __('Description') . '</th>' . "\n" @@ -64,7 +64,7 @@ if (empty($_REQUEST['engine']) */ $odd_row = true; foreach (PMA_StorageEngine::getStorageEngines() as $engine => $details) { - echo '<tr class="noclick ' + echo '<tr class="' . ($odd_row ? 'odd' : 'even') . ($details['Support'] == 'NO' || $details['Support'] == 'DISABLED' ? ' disabled' @@ -82,7 +82,7 @@ if (empty($_REQUEST['engine']) $PMA_Config = $GLOBALS['PMA_Config']; if ($PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST')) { // Special case for PBMS daemon which is not listed as an engine - echo '<tr class="noclick ' + echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n" . ' <td><a href="./server_engines.php' diff --git a/server_status.php b/server_status.php index e5bb06f..877f0a5 100644 --- a/server_status.php +++ b/server_status.php @@ -767,7 +767,7 @@ function printQueryStatistics() { ?> - <table id="serverstatusqueriesdetails" class="data sortable"> + <table id="serverstatusqueriesdetails" class="data sortable noclick"> <col class="namecol" /> <col class="valuecol" span="3" /> <thead> @@ -799,7 +799,7 @@ function printQueryStatistics() { $other_sum += $value; else $chart_json[$name] = $value; ?> - <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; ?>"> + <tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>"> <th class="name"><?php echo htmlspecialchars($name); ?></th> <td class="value"><?php echo PMA_formatNumber($value, 5, 0, true); ?></td> <td class="value"><?php echo @@ -888,7 +888,7 @@ function printServerTraffic() { } ?> - <table id="serverstatustraffic" class="data"> + <table id="serverstatustraffic" class="data noclick"> <thead> <tr> <th colspan="2"><?php echo __('Traffic') . ' ' . PMA_showHint(__('On a busy server, the byte counters may overrun, so those statistics as reported by the MySQL server may be incorrect.')); ?></th> @@ -896,7 +896,7 @@ function printServerTraffic() { </tr> </thead> <tbody> - <tr class="noclick odd"> + <tr class="odd"> <th class="name"><?php echo __('Received'); ?></th> <td class="value"><?php echo implode(' ', @@ -906,7 +906,7 @@ function printServerTraffic() { PMA_formatByteDown( $server_status['Bytes_received'] * $hour_factor, 3, 1)); ?></td> </tr> - <tr class="noclick even"> + <tr class="even"> <th class="name"><?php echo __('Sent'); ?></th> <td class="value"><?php echo implode(' ', @@ -916,7 +916,7 @@ function printServerTraffic() { PMA_formatByteDown( $server_status['Bytes_sent'] * $hour_factor, 3, 1)); ?></td> </tr> - <tr class="noclick odd"> + <tr class="odd"> <th class="name"><?php echo __('Total'); ?></th> <td class="value"><?php echo implode(' ', @@ -933,7 +933,7 @@ function printServerTraffic() { </tbody> </table> - <table id="serverstatusconnections" class="data"> + <table id="serverstatusconnections" class="data noclick"> <thead> <tr> <th colspan="2"><?php echo __('Connections'); ?></th> @@ -942,14 +942,14 @@ function printServerTraffic() { </tr> </thead> <tbody> - <tr class="noclick odd"> + <tr class="odd"> <th class="name"><?php echo __('max. concurrent connections'); ?></th> <td class="value"><?php echo PMA_formatNumber($server_status['Max_used_connections'], 0); ?> </td> <td class="value">--- </td> <td class="value">--- </td> </tr> - <tr class="noclick even"> + <tr class="even"> <th class="name"><?php echo __('Failed attempts'); ?></th> <td class="value"><?php echo PMA_formatNumber($server_status['Aborted_connects'], 4, 1, true); ?></td> @@ -963,7 +963,7 @@ function printServerTraffic() { 0, 2, true) . '%' : '--- '; ?></td> </tr> - <tr class="noclick odd"> + <tr class="odd"> <th class="name"><?php echo __('Aborted'); ?></th> <td class="value"><?php echo PMA_formatNumber($server_status['Aborted_clients'], 4, 1, true); ?></td> @@ -977,7 +977,7 @@ function printServerTraffic() { 0, 2, true) . '%' : '--- '; ?></td> </tr> - <tr class="noclick even"> + <tr class="even"> <th class="name"><?php echo __('Total'); ?></th> <td class="value"><?php echo PMA_formatNumber($server_status['Connections'], 4, 0); ?></td> @@ -1007,7 +1007,7 @@ function printServerTraffic() { * Displays the page */ ?> - <table id="tableprocesslist" class="data clearfloat"> + <table id="tableprocesslist" class="data clearfloat noclick"> <thead> <tr> <th><?php echo __('Processes'); ?></th> @@ -1046,7 +1046,7 @@ function printServerTraffic() { $url_params['kill'] = $process['Id']; $kill_process = 'server_status.php' . PMA_generate_common_url($url_params); ?> - <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; ?>"> + <tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>"> <td><a href="<?php echo $kill_process ; ?>"><?php echo __('Kill'); ?></a></td> <td class="value"><?php echo $process['Id']; ?></td> <td><?php echo $process['User']; ?></td> @@ -1251,7 +1251,7 @@ function printVariablesTable() { ); ?> -<table class="data sortable" id="serverstatusvariables"> +<table class="data sortable noclick" id="serverstatusvariables"> <col class="namecol" /> <col class="valuecol" /> <col class="descrcol" /> @@ -1269,7 +1269,7 @@ function printVariablesTable() { foreach ($server_status as $name => $value) { $odd_row = !$odd_row; ?> - <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; echo isset($allocationMap[$name])?' s_'.$allocationMap[$name]:''; ?>"> + <tr class="<?php echo $odd_row ? 'odd' : 'even'; echo isset($allocationMap[$name])?' s_'.$allocationMap[$name]:''; ?>"> <th class="name"><?php echo htmlspecialchars(str_replace('_',' ',$name)) . PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_' . $name); ?> </th> <td class="value"><?php diff --git a/server_variables.php b/server_variables.php index dcbe192..ceced14 100644 --- a/server_variables.php +++ b/server_variables.php @@ -102,7 +102,7 @@ isSuperuser = <?php echo PMA_isSuperuser()?'true':'false'; ?>; <input name="filterText" type="text" id="filterText" style="vertical-align: baseline;" /> </div> </fieldset> -<table id="serverVariables" class="data filteredData"> +<table id="serverVariables" class="data filteredData noclick"> <thead> <tr><th><?php echo __('Variable'); ?></th> <th class="valueHeader"> @@ -118,7 +118,7 @@ echo __('Session value') . ' / ' . __('Global value'); $odd_row = true; foreach ($serverVars as $name => $value) { ?> -<tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; ?>"> +<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>"> <th nowrap="nowrap"><?php echo htmlspecialchars(str_replace('_', ' ', $name)); ?></th> <td class="value"><?php echo formatVariable($name,$value); ?></td> <td class="value"><?php @@ -129,7 +129,7 @@ foreach ($serverVars as $name => $value) { if (isset($serverVarsSession[$name]) && $serverVarsSession[$name] != $value) { ?> </tr> -<tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; ?> "> +<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?> "> <td>(<?php echo __('Session value'); ?>)</td> <td class="value"><?php echo formatVariable($name,$serverVarsSession[$name]); ?></td> <td class="value"></td> hooks/post-receive -- phpMyAdmin

1 0