Git March 2011

git@phpmyadmin.net

6 participants
171 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-396-gf5954a7
by Marc Delisle 19 Mar '11

19 Mar '11

The branch, master has been updated via f5954a7d2f1ba1ca115ef057a6e0e47e01698678 (commit) from cd29417260525a9768df0b9539c9c709214c668d (commit) - Log ----------------------------------------------------------------- commit f5954a7d2f1ba1ca115ef057a6e0e47e01698678 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Mar 19 07:04:43 2011 -0400 Revert "Improve display of the Show dialog in Browse mode" This reverts commit cd29417260525a9768df0b9539c9c709214c668d. ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 0e88a36..9c98f61 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -303,10 +303,10 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <input type="hidden" name="sql_query" value="<?php echo $html_sql_query; ?>" /> <input type="hidden" name="goto" value="<?php echo $goto; ?>" /> - <span class="nowrap"><input type="submit" name="navig" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?> value="<?php echo __('Show'); ?> :" /> + <input type="submit" name="navig" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?> value="<?php echo __('Show'); ?> :" /> <input type="text" name="session_max_rows" size="3" value="<?php echo (($_SESSION['tmp_user_values']['max_rows'] != 'all') ? $_SESSION['tmp_user_values']['max_rows'] : $GLOBALS['cfg']['MaxRows']); ?>" class="textfield" onfocus="this.select()" /> <?php echo __('row(s) starting from row #') . "\n"; ?> - <input type="text" name="pos" size="6" value="<?php echo (($pos_next >= $unlim_num_rows) ? 0 : $pos_next); ?>" class="textfield" onfocus="this.select()" /></span> + <input type="text" name="pos" size="6" value="<?php echo (($pos_next >= $unlim_num_rows) ? 0 : $pos_next); ?>" class="textfield" onfocus="this.select()" /> <br /> <?php // Display mode (horizontal/vertical and repeat headers) @@ -317,8 +317,9 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo $param1 = PMA_generate_html_dropdown('disp_direction', $choices, $_SESSION['tmp_user_values']['disp_direction'], $id_for_direction_dropdown); unset($choices); - $param2 = '<input type="text" size="3" name="repeat_cells" value="' . $_SESSION['tmp_user_values']['repeat_cells'] . '" class="textfield" />'; - echo '<span class="nowrap">' . sprintf(__('in %s mode and repeat headers after %s cells'), "\n" . $param1, "\n" . $param2) . "</span>"; + $param2 = ' <input type="text" size="3" name="repeat_cells" value="' . $_SESSION['tmp_user_values']['repeat_cells'] . '" class="textfield" />' . "\n" + . ' '; + echo ' ' . sprintf(__('in %s mode and repeat headers after %s cells'), "\n" . $param1, "\n" . $param2) . "\n"; ?> </form> </td> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-395-gcd29417
by Marc Delisle 18 Mar '11

18 Mar '11

The branch, master has been updated via cd29417260525a9768df0b9539c9c709214c668d (commit) from 8fb267930eebb72e0f5eb23044ac439c950461e3 (commit) - Log ----------------------------------------------------------------- commit cd29417260525a9768df0b9539c9c709214c668d Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Mar 18 12:34:13 2011 -0400 Improve display of the Show dialog in Browse mode ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 9c98f61..0e88a36 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -303,10 +303,10 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <input type="hidden" name="sql_query" value="<?php echo $html_sql_query; ?>" /> <input type="hidden" name="goto" value="<?php echo $goto; ?>" /> - <input type="submit" name="navig" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?> value="<?php echo __('Show'); ?> :" /> + <span class="nowrap"><input type="submit" name="navig" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?> value="<?php echo __('Show'); ?> :" /> <input type="text" name="session_max_rows" size="3" value="<?php echo (($_SESSION['tmp_user_values']['max_rows'] != 'all') ? $_SESSION['tmp_user_values']['max_rows'] : $GLOBALS['cfg']['MaxRows']); ?>" class="textfield" onfocus="this.select()" /> <?php echo __('row(s) starting from row #') . "\n"; ?> - <input type="text" name="pos" size="6" value="<?php echo (($pos_next >= $unlim_num_rows) ? 0 : $pos_next); ?>" class="textfield" onfocus="this.select()" /> + <input type="text" name="pos" size="6" value="<?php echo (($pos_next >= $unlim_num_rows) ? 0 : $pos_next); ?>" class="textfield" onfocus="this.select()" /></span> <br /> <?php // Display mode (horizontal/vertical and repeat headers) @@ -317,9 +317,8 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo $param1 = PMA_generate_html_dropdown('disp_direction', $choices, $_SESSION['tmp_user_values']['disp_direction'], $id_for_direction_dropdown); unset($choices); - $param2 = ' <input type="text" size="3" name="repeat_cells" value="' . $_SESSION['tmp_user_values']['repeat_cells'] . '" class="textfield" />' . "\n" - . ' '; - echo ' ' . sprintf(__('in %s mode and repeat headers after %s cells'), "\n" . $param1, "\n" . $param2) . "\n"; + $param2 = '<input type="text" size="3" name="repeat_cells" value="' . $_SESSION['tmp_user_values']['repeat_cells'] . '" class="textfield" />'; + echo '<span class="nowrap">' . sprintf(__('in %s mode and repeat headers after %s cells'), "\n" . $param1, "\n" . $param2) . "</span>"; ?> </form> </td> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 867c9423bb1b8e412f7870d331128e9fd81d3f77
by Michal Čihař 18 Mar '11

18 Mar '11

The branch, master has been updated via 867c9423bb1b8e412f7870d331128e9fd81d3f77 (commit) via c7e1f6c2b0d47ad020ed4f91790a6698f744ff4e (commit) via c83fbac43685ae00bb4b00ac30b795cc4a2f6ec0 (commit) via ac617dcb542151f4c60b542fb8a3e17652fc28ae (commit) via 38d48e295e6a2850a54f73532fb22588903f23cd (commit) via a11b91092a847d47e3e196155ba98b06afe28db3 (commit) via 09fcda807051e7a7e7e08017980a44a07f4229c2 (commit) via b6407f2fcc09a8d1156d8e5dff4b887a4e6c941b (commit) via 5ebfcd09e53c970890de9f6914f8f86d903cd994 (commit) via a016d73eded468c2696c12f90f806a57d29d3cd9 (commit) via b792c8eb6ee9aead5920dfd27f1584dc60f2445b (commit) via fe2a09926072cbc510265b4233e2050bfa8b2b89 (commit) via cc83f3f1b2e94499b301c82f5ae0d56b47d5d0e9 (commit) from ddf344ad28fc2858d230fb37ea34c6eafae88d4b (commit) - Log ----------------------------------------------------------------- commit 867c9423bb1b8e412f7870d331128e9fd81d3f77 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:58:33 2011 +0200 Translation update done using Pootle. commit c7e1f6c2b0d47ad020ed4f91790a6698f744ff4e Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:58:23 2011 +0200 Translation update done using Pootle. commit c83fbac43685ae00bb4b00ac30b795cc4a2f6ec0 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:58:19 2011 +0200 Translation update done using Pootle. commit ac617dcb542151f4c60b542fb8a3e17652fc28ae Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:58:10 2011 +0200 Translation update done using Pootle. commit 38d48e295e6a2850a54f73532fb22588903f23cd Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:58:03 2011 +0200 Translation update done using Pootle. commit a11b91092a847d47e3e196155ba98b06afe28db3 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:57:58 2011 +0200 Translation update done using Pootle. commit 09fcda807051e7a7e7e08017980a44a07f4229c2 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:57:49 2011 +0200 Translation update done using Pootle. commit b6407f2fcc09a8d1156d8e5dff4b887a4e6c941b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:57:18 2011 +0200 Translation update done using Pootle. commit 5ebfcd09e53c970890de9f6914f8f86d903cd994 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:57:13 2011 +0200 Translation update done using Pootle. commit a016d73eded468c2696c12f90f806a57d29d3cd9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:57:07 2011 +0200 Translation update done using Pootle. commit b792c8eb6ee9aead5920dfd27f1584dc60f2445b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:57:00 2011 +0200 Translation update done using Pootle. commit fe2a09926072cbc510265b4233e2050bfa8b2b89 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:56:54 2011 +0200 Translation update done using Pootle. commit cc83f3f1b2e94499b301c82f5ae0d56b47d5d0e9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:56:48 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/po/tr.po b/po/tr.po index ef21d0a..dad82de 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-03-02 13:51+0100\n" -"PO-Revision-Date: 2011-03-18 15:53+0200\n" +"PO-Revision-Date: 2011-03-18 15:58+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -6072,7 +6072,7 @@ msgstr "" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2435 msgid "<tt>[mimetype]_[subtype]__[transform].inc.php</tt>" -msgstr "" +msgstr "<tt>[mimetype]_[subtype]__[transform].inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2437 @@ -6100,12 +6100,12 @@ msgstr "" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2447 msgid "<tt>text_html__formatted.inc.php</tt>" -msgstr "" +msgstr "<tt>text_html__formatted.inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2448 msgid "<tt>PMA_transform_text_html__formatted()</tt>" -msgstr "" +msgstr "<tt>PMA_transform_text_html__formatted()</tt>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2450 @@ -6115,7 +6115,7 @@ msgstr "" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2452 msgid "<tt>[mimetype]__[transform].inc.php</tt>" -msgstr "" +msgstr "<tt>[mimetype]__[transform].inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2454 @@ -6135,12 +6135,12 @@ msgstr "" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2464 msgid "<tt>text__formatted.inc.php</tt>" -msgstr "" +msgstr "<tt>text__formatted.inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2465 msgid "<tt>PMA_transform_text__formatted()</tt>" -msgstr "" +msgstr "<tt>PMA_transform_text__formatted()</tt>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2467 @@ -6150,7 +6150,7 @@ msgstr "" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2469 msgid "<tt>[mimetype]_[subtype].inc.php</tt>" -msgstr "" +msgstr "<tt>[mimetype]_[subtype].inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2471 @@ -6167,7 +6167,7 @@ msgstr "" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2479 msgid "<tt>text_plain.inc.php</tt>" -msgstr "" +msgstr "<tt>text_plain.inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2480 orig-docs/Documentation.html:2495 @@ -6182,7 +6182,7 @@ msgstr "" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2484 msgid "<tt>[mimetype].inc.php</tt>" -msgstr "" +msgstr "<tt>[mimetype].inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2486 @@ -6194,7 +6194,7 @@ msgstr "" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2494 msgid "<tt>text.inc.php</tt>" -msgstr "" +msgstr "<tt>text.inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2497 @@ -6204,7 +6204,7 @@ msgstr "" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2499 msgid "<tt>global__[transform].inc.php</tt>" -msgstr "" +msgstr "<tt>global__[transform].inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2501 @@ -6216,12 +6216,12 @@ msgstr "" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2506 msgid "<tt>global__formatted</tt>" -msgstr "" +msgstr "<tt>global__formatted</tt>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2507 msgid "<tt>PMA_transform_global__formatted()</tt>" -msgstr "" +msgstr "<tt>PMA_transform_global__formatted()</tt>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2510 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-394-g8fb2679
by Michal Čihař 18 Mar '11

18 Mar '11

The branch, master has been updated via 8fb267930eebb72e0f5eb23044ac439c950461e3 (commit) from efd8db8298bbf288ad596efd918661a3d3e8492d (commit) - Log ----------------------------------------------------------------- commit 8fb267930eebb72e0f5eb23044ac439c950461e3 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 16:12:16 2011 +0100 bug #3039384 [auth] Force signon auth on signon URL change. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/auth/signon.auth.lib.php | 11 +++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8973673..d9897e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -149,6 +149,7 @@ - bug #3206876 [core] Work without mbstring installed. - rfe #3196075, patch #3212068 [interface] Add links to variables documentation. - bug #3208723 [import] Fix import of utf-8 XML files. +- bug #3039384 [auth] Force signon auth on signon URL change. 3.3.10.0 (not yet released) - patch #3147400 [structure] Aria table size printed as unknown, diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php index 6eb0ead..3e0d64b 100644 --- a/libraries/auth/signon.auth.lib.php +++ b/libraries/auth/signon.auth.lib.php @@ -19,6 +19,7 @@ * @access public */ function PMA_auth() { + unset($_SESSION['LAST_SIGNON_URL']); if (empty($GLOBALS['cfg']['Server']['SignonURL'])) { PMA_fatalError('You must set SignonURL!'); } elseif (!empty($_REQUEST['old_usr']) && !empty($GLOBALS['cfg']['Server']['LogoutURL'])) { @@ -54,9 +55,17 @@ function PMA_auth_check() { global $PHP_AUTH_USER, $PHP_AUTH_PW; + /* Check if we're using same sigon server */ + if (isset($_SESSION['LAST_SIGNON_URL']) && $_SESSION['LAST_SIGNON_URL'] != $GLOBALS['cfg']['Server']['SignonURL']) { + return false; + } + /* Session name */ $session_name = $GLOBALS['cfg']['Server']['SignonSession']; + /* Login URL */ + $signon_url = $GLOBALS['cfg']['Server']['SignonURL']; + /* Current host */ $single_signon_host = $GLOBALS['cfg']['Server']['host']; @@ -150,8 +159,10 @@ function PMA_auth_check() // Returns whether we get authentication settings or not if (empty($PHP_AUTH_USER)) { + unset($_SESSION['LAST_SIGNON_URL']); return false; } else { + $_SESSION['LAST_SIGNON_URL'] = $GLOBALS['cfg']['Server']['SignonURL']; return true; } } // end of the 'PMA_auth_check()' function hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-393-gefd8db8
by Michal Čihař 18 Mar '11

18 Mar '11

The branch, master has been updated via efd8db8298bbf288ad596efd918661a3d3e8492d (commit) from 186426cbaf0262b49dfc4a67e4b1347296ef0219 (commit) - Log ----------------------------------------------------------------- commit efd8db8298bbf288ad596efd918661a3d3e8492d Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 15:36:04 2011 +0100 bug #3208723 [import] Fix import of utf-8 XML files. The string should be already in utf-8. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/import/xml.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e570b21..8973673 100644 --- a/ChangeLog +++ b/ChangeLog @@ -148,6 +148,7 @@ - [core] Update library PHPExcel to version 1.7.6 - bug #3206876 [core] Work without mbstring installed. - rfe #3196075, patch #3212068 [interface] Add links to variables documentation. +- bug #3208723 [import] Fix import of utf-8 XML files. 3.3.10.0 (not yet released) - patch #3147400 [structure] Aria table size printed as unknown, diff --git a/libraries/import/xml.php b/libraries/import/xml.php index 4984e45..640aac8 100644 --- a/libraries/import/xml.php +++ b/libraries/import/xml.php @@ -63,7 +63,7 @@ unset($data); * result in increased performance without the need to * alter the code in any way. It's basically a freebee. */ -$xml = simplexml_load_string(utf8_encode($buffer), "SimpleXMLElement", LIBXML_COMPACT); +$xml = simplexml_load_string($buffer, "SimpleXMLElement", LIBXML_COMPACT); unset($buffer); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-392-g186426c
by Michal Čihař 18 Mar '11

18 Mar '11

The branch, master has been updated via 186426cbaf0262b49dfc4a67e4b1347296ef0219 (commit) from 724f11f20d7b05963fcf9c1a4e1a462fa6488c93 (commit) - Log ----------------------------------------------------------------- commit 186426cbaf0262b49dfc4a67e4b1347296ef0219 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 15:29:18 2011 +0100 Ignore NULL charset ----------------------------------------------------------------------- Summary of changes: libraries/import.lib.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 79a43b7..f0a431e 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -908,13 +908,13 @@ $import_notice = NULL; */ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = NULL, $options = NULL) { /* Take care of the options */ - if (isset($options['db_collation'])) { + if (isset($options['db_collation'])&& ! is_null($options['db_collation'])) { $collation = $options['db_collation']; } else { $collation = "utf8_general_ci"; } - if (isset($options['db_charset'])) { + if (isset($options['db_charset']) && ! is_null($options['db_charset'])) { $charset = $options['db_charset']; } else { $charset = "utf8"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-391-g724f11f
by Michal Čihař 18 Mar '11

18 Mar '11

The branch, master has been updated via 724f11f20d7b05963fcf9c1a4e1a462fa6488c93 (commit) from 33e4c3f7e906273cbe4a8d8a8d83d7cad985e455 (commit) - Log ----------------------------------------------------------------- commit 724f11f20d7b05963fcf9c1a4e1a462fa6488c93 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 15:06:48 2011 +0100 No need for extra loading of js and headers here (bug#3222746). All cases bellow does it as well and this breaks export page. ----------------------------------------------------------------------- Summary of changes: tbl_row_action.php | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tbl_row_action.php b/tbl_row_action.php index e5217bf..cce3f7b 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -69,10 +69,6 @@ switch($submit_mult) { break; } -$GLOBALS['js_include'][] = 'tbl_change.js'; - -require_once './libraries/header.inc.php'; - if (!empty($submit_mult)) { switch($submit_mult) { case 'row_edit': hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. ddf344ad28fc2858d230fb37ea34c6eafae88d4b
by Michal Čihař 18 Mar '11

18 Mar '11

The branch, master has been updated via ddf344ad28fc2858d230fb37ea34c6eafae88d4b (commit) via b67b6872bc06e637f2de505ef6b0f380af015f60 (commit) via d8996e9400e96c6f7ff7ec9c3c2504aa219b6719 (commit) via 5f0ba8a6724202de64a4c3e3cc29ebb998996d0a (commit) via 22bb766977a3acd679058d6be1bc7b129ec45b7f (commit) via 3a0d7d5920e4b908ebc84fc2903db2c9f2f783ee (commit) via bb753c7cabe2105e1cb5b5724d09cbefc979e219 (commit) via 84def85a2169f574350ac169455f03af21ea32ef (commit) via 99bfaec99380fd1a6b195281809c933e535ba8fe (commit) via 781ce357af60169f6d9bb257114866810126f1c1 (commit) via 3f26f97bbdc124f6a7bd7be2cb2c2e8b41c64b1f (commit) via b38e455ee4ec1ccbfaa9128962ff35a1dc7877f2 (commit) via 9fc8ca8489fa4adbf59f0f7e07b815add025fba7 (commit) via d4bbb0a93e1ad7e0432eb6b1ccf78de5e72f5a36 (commit) via 43b8aafc5ca071e1d99a16aa09a5bb99a916cd9b (commit) via ddea734037835680044bb68b82e78630adb6126a (commit) via 9463991f7c1eb9ace26da85b1eb1f49b14083b41 (commit) via 1f770d157c4a851192066e84073a52549fd2eaec (commit) via 1632c04f2790507499ef02a53f26f3554be0a696 (commit) via 0c864e63ca9fa7c7c1d189d74f3e67743715cb26 (commit) via ed21a85f046f851015163f7d509064f20501c93a (commit) via abff54790b35022eeb2cbf1f5d1cc3db328b1073 (commit) via 728e8ed6169d401e144f5e435fdf071a3eda2aaa (commit) via b59300edb0282558d47b2485b9737abc43db3527 (commit) via 67bd9010f49614318b9cc5826486bcb6f19d446b (commit) via 6dee9774cb699e08c03a121111dbb59498385811 (commit) via 9437bb6c92d0cafa592bddffbaa88361532ce0d4 (commit) from eb0b8523cfdb63dea14b75c56b9f7f3f3afcbdd7 (commit) - Log ----------------------------------------------------------------- commit ddf344ad28fc2858d230fb37ea34c6eafae88d4b Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:56:30 2011 +0100 Update translated docs commit b67b6872bc06e637f2de505ef6b0f380af015f60 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:53:16 2011 +0200 Translation update done using Pootle. commit d8996e9400e96c6f7ff7ec9c3c2504aa219b6719 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:52:43 2011 +0200 Translation update done using Pootle. commit 5f0ba8a6724202de64a4c3e3cc29ebb998996d0a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:52:29 2011 +0200 Translation update done using Pootle. commit 22bb766977a3acd679058d6be1bc7b129ec45b7f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:52:05 2011 +0200 Translation update done using Pootle. commit 3a0d7d5920e4b908ebc84fc2903db2c9f2f783ee Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:51:35 2011 +0200 Translation update done using Pootle. commit bb753c7cabe2105e1cb5b5724d09cbefc979e219 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:51:16 2011 +0200 Translation update done using Pootle. commit 84def85a2169f574350ac169455f03af21ea32ef Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:50:24 2011 +0200 Translation update done using Pootle. commit 99bfaec99380fd1a6b195281809c933e535ba8fe Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:50:15 2011 +0200 Translation update done using Pootle. commit 781ce357af60169f6d9bb257114866810126f1c1 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:49:51 2011 +0200 Translation update done using Pootle. commit 3f26f97bbdc124f6a7bd7be2cb2c2e8b41c64b1f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:49:48 2011 +0200 Translation update done using Pootle. commit b38e455ee4ec1ccbfaa9128962ff35a1dc7877f2 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:49:39 2011 +0200 Translation update done using Pootle. commit 9fc8ca8489fa4adbf59f0f7e07b815add025fba7 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:48:39 2011 +0200 Translation update done using Pootle. commit d4bbb0a93e1ad7e0432eb6b1ccf78de5e72f5a36 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:47:11 2011 +0200 Translation update done using Pootle. commit 43b8aafc5ca071e1d99a16aa09a5bb99a916cd9b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:46:53 2011 +0200 Translation update done using Pootle. commit ddea734037835680044bb68b82e78630adb6126a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:46:49 2011 +0200 Translation update done using Pootle. commit 9463991f7c1eb9ace26da85b1eb1f49b14083b41 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:46:32 2011 +0200 Translation update done using Pootle. commit 1f770d157c4a851192066e84073a52549fd2eaec Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:46:29 2011 +0200 Translation update done using Pootle. commit 1632c04f2790507499ef02a53f26f3554be0a696 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:46:16 2011 +0200 Translation update done using Pootle. commit 0c864e63ca9fa7c7c1d189d74f3e67743715cb26 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:46:12 2011 +0200 Translation update done using Pootle. commit ed21a85f046f851015163f7d509064f20501c93a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:46:00 2011 +0200 Translation update done using Pootle. commit abff54790b35022eeb2cbf1f5d1cc3db328b1073 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:45:54 2011 +0200 Translation update done using Pootle. commit 728e8ed6169d401e144f5e435fdf071a3eda2aaa Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:45:45 2011 +0200 Translation update done using Pootle. commit b59300edb0282558d47b2485b9737abc43db3527 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:45:41 2011 +0200 Translation update done using Pootle. commit 67bd9010f49614318b9cc5826486bcb6f19d446b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:45:31 2011 +0200 Translation update done using Pootle. commit 6dee9774cb699e08c03a121111dbb59498385811 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:45:26 2011 +0200 Translation update done using Pootle. commit 9437bb6c92d0cafa592bddffbaa88361532ce0d4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:45:03 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/tr/Documentation.html | 36 +++++++++--------- po/tr.po | 83 +++++++++++++++++++++++++++++++----------- 2 files changed, 80 insertions(+), 39 deletions(-) diff --git a/output/tr/Documentation.html b/output/tr/Documentation.html index 605ddd6..44f3ec3 100644 --- a/output/tr/Documentation.html +++ b/output/tr/Documentation.html @@ -3444,7 +3444,7 @@ dump you have to turn it into valid MySQL. This means, you have to add a whitespace after the first two dashes of the line or add a # before it: <br /> <code> -- -------------------------------------------------------<br /> - </code> or<br /> + </code> ya da<br /> <code> #--------------------------------------------------------- </code> </p> @@ -4010,28 +4010,28 @@ tables:</p> <pre> CREATE TABLE REL_countries ( - country_code char(1) NOT NULL default '', - description varchar(10) NOT NULL default '', - PRIMARY KEY (country_code) +country_code char(1) NOT NULL default '', +description varchar(10) NOT NULL default '', +PRIMARY KEY (country_code) ) TYPE=MyISAM; INSERT INTO REL_countries VALUES ('C', 'Canada'); CREATE TABLE REL_persons ( - id tinyint(4) NOT NULL auto_increment, - person_name varchar(32) NOT NULL default '', - town_code varchar(5) default '0', - country_code char(1) NOT NULL default '', - PRIMARY KEY (id) +id tinyint(4) NOT NULL auto_increment, +person_name varchar(32) NOT NULL default '', +town_code varchar(5) default '0', +country_code char(1) NOT NULL default '', +PRIMARY KEY (id) ) TYPE=MyISAM; INSERT INTO REL_persons VALUES (11, 'Marc', 'S', ''); INSERT INTO REL_persons VALUES (15, 'Paul', 'S', 'C'); CREATE TABLE REL_towns ( - town_code varchar(5) NOT NULL default '0', - description varchar(30) NOT NULL default '', - PRIMARY KEY (town_code) +town_code varchar(5) NOT NULL default '0', +description varchar(30) NOT NULL default '', +PRIMARY KEY (town_code) ) TYPE=MyISAM; INSERT INTO REL_towns VALUES ('S', 'Sherbrooke'); @@ -4435,22 +4435,22 @@ you can not get the table name), but the following variables can be used: </p> <dl> <dt><code>@HTTP_HOST@</code></dt> - <dd>HTTP host that runs phpMyAdmin</dd> + <dd>phpMyAdmin'i çalıştıran HTTP anamakinesi</dd> <dt><code>@SERVER@</code></dt> - <dd>MySQL server name</dd> + <dd>MySQL sunucu adı</dd> <dt><code>@VERBOSE@</code></dt> <dd>Verbose MySQL server name as defined in <a href="#cfg_Servers_verbose">server configuration</a></dd> <dt><code>@VSERVER@</code></dt> <dd>Verbose MySQL server name if set, otherwise normal</dd> <dt><code>@DATABASE@</code></dt> - <dd>Currently opened database</dd> + <dd>Şu anda açık olan veritabanı</dd> <dt><code>@TABLE@</code></dt> - <dd>Currently opened table</dd> + <dd>Şu anda açık olan tablo</dd> <dt><code>@FIELDS@</code></dt> - <dd>Fields of currently opened table</dd> + <dd>Şu anda açık olan tablo alanı</dd> <dt><code>@PHPMYADMIN@</code></dt> - <dd>phpMyAdmin with version</dd> + <dd>phpMyAdmin ile birlikte sürümü</dd> </dl> <h4 id="wysiwyg"> diff --git a/po/tr.po b/po/tr.po index a9c86df..ef21d0a 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-03-02 13:51+0100\n" -"PO-Revision-Date: 2011-03-15 11:58+0200\n" +"PO-Revision-Date: 2011-03-18 15:53+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -6854,7 +6854,7 @@ msgstr "" #: orig-docs/Documentation.html:2827 #, no-wrap msgid "set-variable = lower_case_table_names=0" -msgstr "" +msgstr "set-variable = lower_case_table_names=0" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2829 @@ -6867,7 +6867,7 @@ msgstr "" #: orig-docs/Documentation.html:2832 #, no-wrap msgid "SHOW VARIABLES LIKE 'lower_case_table_names';" -msgstr "" +msgstr "SHOW VARIABLES LIKE 'lower_case_table_names';" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2835 @@ -6896,6 +6896,8 @@ msgid "" "# mod_gzip_item_include file \\.php$\n" "# mod_gzip_item_include mime \"application/x-httpd-php.*\"\n" msgstr "" +"# mod_gzip_item_include file \\.php$\n" +"# mod_gzip_item_include mime \"application/x-httpd-php.*\"\n" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2850 @@ -7137,6 +7139,15 @@ msgid "" "RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)$ index.php?db=$1&table=$2 [R]\n" "RewriteRule ^([a-zA-Z0-9_]+)$ index.php?db=$1 [R]\n" msgstr "" +"RewriteEngine On\n" +"RewriteBase /path_to_phpMyAdmin\n" +"RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/([a-z_]+\\.php)$ " +"index.php?db=$1&table=$2&target=$3 [R]\n" +"RewriteRule ^([a-zA-Z0-9_]+)/([a-z_]+\\.php)$ index.php?db=$1&target=$2 " +"[R]\n" +"RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)$ index.php?db=$1&table=$2 " +"[R]\n" +"RewriteRule ^([a-zA-Z0-9_]+)$ index.php?db=$1 [R]\n" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2979 @@ -7160,6 +7171,8 @@ msgid "" "RewriteEngine On\n" "RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]\n" msgstr "" +"RewriteEngine On\n" +"RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]\n" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2990 @@ -7439,7 +7452,7 @@ msgstr "" #: orig-docs/Documentation.html:3120 #, no-wrap msgid "mysql.default_socket = /tmp/mysql.sock" -msgstr "" +msgstr "mysql.default_socket = /tmp/mysql.sock" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3122 @@ -7450,7 +7463,7 @@ msgstr "" #: orig-docs/Documentation.html:3124 #, no-wrap msgid "mysql.default_socket = /var/lib/mysql/mysql.sock" -msgstr "" +msgstr "mysql.default_socket = /var/lib/mysql/mysql.sock" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3126 @@ -7853,18 +7866,19 @@ msgstr "" #. type: Content of: <html><body><div><p><code> #: orig-docs/Documentation.html:3322 msgid "<code> -- -------------------------------------------------------" -msgstr "" +msgstr "<code> -- -------------------------------------------------------" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3324 msgid "</code> or" -msgstr "" +msgstr "</code> ya da" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3326 msgid "" "<code> #--------------------------------------------------------- </code>" msgstr "" +"<code> #--------------------------------------------------------- </code>" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3332 @@ -8847,6 +8861,33 @@ msgid "" "INSERT INTO REL_towns VALUES ('S', 'Sherbrooke');\n" "INSERT INTO REL_towns VALUES ('M', 'Montréal');\n" msgstr "" +"CREATE TABLE REL_countries (\n" +"country_code char(1) NOT NULL default '',\n" +"description varchar(10) NOT NULL default '',\n" +"PRIMARY KEY (country_code)\n" +") TYPE=MyISAM;\n" +"\n" +"INSERT INTO REL_countries VALUES ('C', 'Canada');\n" +"\n" +"CREATE TABLE REL_persons (\n" +"id tinyint(4) NOT NULL auto_increment,\n" +"person_name varchar(32) NOT NULL default '',\n" +"town_code varchar(5) default '0',\n" +"country_code char(1) NOT NULL default '',\n" +"PRIMARY KEY (id)\n" +") TYPE=MyISAM;\n" +"\n" +"INSERT INTO REL_persons VALUES (11, 'Marc', 'S', '');\n" +"INSERT INTO REL_persons VALUES (15, 'Paul', 'S', 'C');\n" +"\n" +"CREATE TABLE REL_towns (\n" +"town_code varchar(5) NOT NULL default '0',\n" +"description varchar(30) NOT NULL default '',\n" +"PRIMARY KEY (town_code)\n" +") TYPE=MyISAM;\n" +"\n" +"INSERT INTO REL_towns VALUES ('S', 'Sherbrooke');\n" +"INSERT INTO REL_towns VALUES ('M', 'Montréal');\n" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3884 @@ -9649,27 +9690,27 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:4268 msgid "<code>@HTTP_HOST@</code>" -msgstr "" +msgstr "<code>@HTTP_HOST@</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:4269 msgid "HTTP host that runs phpMyAdmin" -msgstr "" +msgstr "phpMyAdmin'i çalıştıran HTTP anamakinesi" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:4270 msgid "<code>@SERVER@</code>" -msgstr "" +msgstr "<code>@SERVER@</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:4271 msgid "MySQL server name" -msgstr "" +msgstr "MySQL sunucu adı" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:4272 msgid "<code>@VERBOSE@</code>" -msgstr "" +msgstr "<code>@VERBOSE@</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:4273 @@ -9681,7 +9722,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:4274 msgid "<code>@VSERVER@</code>" -msgstr "" +msgstr "<code>@VSERVER@</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:4275 @@ -9691,42 +9732,42 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:4276 msgid "<code>@DATABASE@</code>" -msgstr "" +msgstr "<code>@DATABASE@</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:4277 msgid "Currently opened database" -msgstr "" +msgstr "Şu anda açık olan veritabanı" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:4278 msgid "<code>@TABLE@</code>" -msgstr "" +msgstr "<code>@TABLE@</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:4279 msgid "Currently opened table" -msgstr "" +msgstr "Şu anda açık olan tablo" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:4280 msgid "<code>@FIELDS@</code>" -msgstr "" +msgstr "<code>@FIELDS@</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:4281 msgid "Fields of currently opened table" -msgstr "" +msgstr "Şu anda açık olan tablo alanı" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:4282 msgid "<code>@PHPMYADMIN@</code>" -msgstr "" +msgstr "<code>@PHPMYADMIN@</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:4283 msgid "phpMyAdmin with version" -msgstr "" +msgstr "phpMyAdmin ile birlikte sürümü" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:4287 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-389-g54942a7
by Michal Čihař 18 Mar '11

18 Mar '11

The branch, master has been updated via 54942a7cf0802f313caa10740941fce6443bbbf1 (commit) via 0e63bd04874accd13eaa83bade8f28c937b01f40 (commit) via 5f1f0a8bdba101444067470b23b8e82ba422f83d (commit) via 24396fe0244bb8e17315b3c3d9bd71f2835dd041 (commit) via 7899b0f199acc67214598b30bdd1b78544656063 (commit) from 13f919da6ad9217e5cc349d2501782fbf7291749 (commit) - Log ----------------------------------------------------------------- commit 54942a7cf0802f313caa10740941fce6443bbbf1 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:55:42 2011 +0100 Fix typo commit 0e63bd04874accd13eaa83bade8f28c937b01f40 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:55:27 2011 +0100 Fix multi submits for MSIE with <input type="image".. commit 5f1f0a8bdba101444067470b23b8e82ba422f83d Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:53:05 2011 +0100 Forgotten use of translated string commit 24396fe0244bb8e17315b3c3d9bd71f2835dd041 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:52:08 2011 +0100 There are no empty/drop tabs anymore commit 7899b0f199acc67214598b30bdd1b78544656063 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:48:55 2011 +0100 Avoid comparing translated strings and simplify the code. ----------------------------------------------------------------------- Summary of changes: db_structure.php | 2 +- libraries/common.lib.php | 5 +---- libraries/mult_submits.inc.php | 4 ++-- tbl_structure.php | 16 ++++++++-------- tbl_tracking.php | 11 ++++++----- 5 files changed, 18 insertions(+), 20 deletions(-) diff --git a/db_structure.php b/db_structure.php index 03a31be..d81af5d 100644 --- a/db_structure.php +++ b/db_structure.php @@ -501,7 +501,7 @@ echo ' <option value="' . __('With selected:') . '" selected="selected">' . __('With selected:') . '</option>' . "\n"; echo ' <option value="export" >' . __('Export') . '</option>' . "\n"; -echo ' <option value="' . __('Print view') . '" >' +echo ' <option value="print" >' . __('Print view') . '</option>' . "\n"; if (!$db_is_information_schema) { diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 7451df4..bea2c65 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1660,10 +1660,7 @@ function PMA_generate_html_tab($tab, $url_params = array()) // determine additionnal style-class if (empty($tab['class'])) { - if ($tab['text'] == __('Empty') - || $tab['text'] == __('Drop')) { - $tab['class'] = 'caution'; - } elseif (! empty($tab['active']) + if (! empty($tab['active']) || PMA_isValid($GLOBALS['active_page'], 'identical', $tab['link'])) { $tab['class'] = 'active'; } elseif (is_null($tab['active']) && empty($GLOBALS['active_page']) diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index e566576..665b76d 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -24,7 +24,7 @@ if (! empty($submit_mult) $what = 'drop_db'; } elseif (isset($selected_tbl) && !empty($selected_tbl)) { // coming from database structure view - do something with selected tables - if ($submit_mult == __('Print view')) { + if ($submit_mult == 'print') { require './tbl_printview.php'; } else { $selected = $selected_tbl; @@ -100,7 +100,7 @@ if (! empty($submit_mult) // this should already be handled by tbl_structure.php } } else { - // coming from borwsing - do something with selected rows + // coming from browsing - do something with selected rows $what = 'row_delete'; $selected = $rows_to_delete; } diff --git a/tbl_structure.php b/tbl_structure.php index 18eedee..73a45fc 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -21,19 +21,19 @@ $GLOBALS['js_include'][] = 'tbl_structure.js'; * submit_mult_*_x comes from IE if <input type="img" ...> is used */ if (isset($_REQUEST['submit_mult_change_x'])) { - $submit_mult = __('Change'); + $submit_mult = 'change'; } elseif (isset($_REQUEST['submit_mult_drop_x'])) { - $submit_mult = __('Drop'); + $submit_mult = 'drop'; } elseif (isset($_REQUEST['submit_mult_primary_x'])) { - $submit_mult = __('Primary'); + $submit_mult = 'primary'; } elseif (isset($_REQUEST['submit_mult_index_x'])) { - $submit_mult = __('Index'); + $submit_mult = 'index'; } elseif (isset($_REQUEST['submit_mult_unique_x'])) { - $submit_mult = __('Unique'); + $submit_mult = 'unique'; } elseif (isset($_REQUEST['submit_mult_fulltext_x'])) { - $submit_mult = __('Fulltext'); + $submit_mult = 'ftext'; } elseif (isset($_REQUEST['submit_mult_browse_x'])) { - $submit_mult = __('Browse'); + $submit_mult = 'browse'; } elseif (isset($_REQUEST['submit_mult'])) { $submit_mult = $_REQUEST['submit_mult']; } elseif (isset($_REQUEST['mult_btn']) && $_REQUEST['mult_btn'] == __('Yes')) { @@ -45,7 +45,7 @@ if (isset($_REQUEST['submit_mult_change_x'])) { if (! empty($submit_mult) && isset($_REQUEST['selected_fld'])) { $err_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table); - if ($submit_mult == __('Browse')) { + if ($submit_mult == 'browse') { // browsing the table displaying only selected fields/columns $GLOBALS['active_page'] = 'sql.php'; $sql_query = ''; diff --git a/tbl_tracking.php b/tbl_tracking.php index b651986..757456b 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -601,11 +601,12 @@ if ($last_version > 0) { } else { $version_status = __('not active'); } - if (($version['version'] == $last_version) && ($version_status == __('not active'))) { - $tracking_active = false; - } - if (($version['version'] == $last_version) && ($version_status == __('active'))) { - $tracking_active = true; + if ($version['version'] == $last_version){ + if ($version['tracking_active'] == 1) { + $tracking_active = true; + } else { + $tracking_active = false; + } } ?> <tr class="noclick <?php echo $style;?>"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-384-g13f919d
by Michal Čihař 18 Mar '11

18 Mar '11

The branch, master has been updated via 13f919da6ad9217e5cc349d2501782fbf7291749 (commit) via ff80c4d7f1aac7086733a1b8d8afe6b3071ce0b8 (commit) via cb377c360c79790aefc2427c363c3ca60900503d (commit) via 95bc3c92aa9d3741110d64986ae0f64f2824bd0d (commit) via fc965daabdb1de08fdb346aef0e7d5030e60c4f3 (commit) from 65e53a8bb8afd76d4779b0d0e536d7ab2690b439 (commit) - Log ----------------------------------------------------------------- commit 13f919da6ad9217e5cc349d2501782fbf7291749 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:42:24 2011 +0100 Another replacement of translated strings by fixed ones commit ff80c4d7f1aac7086733a1b8d8afe6b3071ce0b8 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:42:07 2011 +0100 Whitespace cleanup commit cb377c360c79790aefc2427c363c3ca60900503d Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:38:19 2011 +0100 Use non translated string for identification of submited value in table properties commit 95bc3c92aa9d3741110d64986ae0f64f2824bd0d Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:35:30 2011 +0100 Allow to specify value parameter for PMA_buttonOrImage commit fc965daabdb1de08fdb346aef0e7d5030e60c4f3 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:32:36 2011 +0100 Do not pass translated strings as parameter. This can cause problem for non ascii languages and breaks if user meanwhile switches language. ----------------------------------------------------------------------- Summary of changes: db_structure.php | 14 +++++----- libraries/common.lib.php | 11 +++++--- libraries/display_tbl.lib.php | 6 ++-- libraries/mult_submits.inc.php | 48 +++++++++++++-------------------------- tbl_row_action.php | 15 +++++------ tbl_structure.php | 14 +++++----- 6 files changed, 47 insertions(+), 61 deletions(-) diff --git a/db_structure.php b/db_structure.php index dcce45b..03a31be 100644 --- a/db_structure.php +++ b/db_structure.php @@ -499,23 +499,23 @@ $checkall_url = 'db_structure.php?' . PMA_generate_common_url($db); <?php echo ' <option value="' . __('With selected:') . '" selected="selected">' . __('With selected:') . '</option>' . "\n"; -echo ' <option value="' . __('Export') . '" >' +echo ' <option value="export" >' . __('Export') . '</option>' . "\n"; echo ' <option value="' . __('Print view') . '" >' . __('Print view') . '</option>' . "\n"; if (!$db_is_information_schema) { - echo ' <option value="' . __('Empty') . '" >' + echo ' <option value="empty_tbl" >' . __('Empty') . '</option>' . "\n"; - echo ' <option value="' . __('Drop') . '" >' + echo ' <option value="drop_tbl" >' . __('Drop') . '</option>' . "\n"; - echo ' <option value="' . __('Check table') . '" >' + echo ' <option value="check_tbl" >' . __('Check table') . '</option>' . "\n"; - echo ' <option value="' . __('Optimize table') . '" >' + echo ' <option value="optimize_tbl" >' . __('Optimize table') . '</option>' . "\n"; - echo ' <option value="' . __('Repair table') . '" >' + echo ' <option value="repair_tbl" >' . __('Repair table') . '</option>' . "\n"; - echo ' <option value="' . __('Analyze table') . '" >' + echo ' <option value="analyze_tbl" >' . __('Analyze table') . '</option>' . "\n"; } ?> diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 2b7f738..7451df4 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2180,11 +2180,14 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force * @access public */ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text, - $image) + $image, $value = '') { + if ($value == '') { + $value = $text; + } if (false === $GLOBALS['cfg']['PropertiesIconic']) { echo ' <input type="submit" name="' . $button_name . '"' - .' value="' . htmlspecialchars($text) . '"' + .' value="' . htmlspecialchars($value) . '"' .' title="' . htmlspecialchars($text) . '" />' . "\n"; return; } @@ -2193,13 +2196,13 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text, /* IE has trouble with <button> */ if (PMA_USR_BROWSER_AGENT != 'IE') { echo '<button class="' . $button_class . '" type="submit"' - .' name="' . $button_name . '" value="' . htmlspecialchars($text) . '"' + .' name="' . $button_name . '" value="' . htmlspecialchars($value) . '"' .' title="' . htmlspecialchars($text) . '">' . "\n" . PMA_getIcon($image, $text) .'</button>' . "\n"; } else { echo '<input type="image" name="' . $image_name . '" value="' - . htmlspecialchars($text) . '" title="' . htmlspecialchars($text) . '" src="' . $GLOBALS['pmaThemeImage'] + . htmlspecialchars($value) . '" title="' . htmlspecialchars($text) . '" src="' . $GLOBALS['pmaThemeImage'] . $image . '" />' . ($GLOBALS['cfg']['PropertiesIconic'] === 'both' ? ' ' . htmlspecialchars($text) : '') . "\n"; } diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index ef9e397..9c98f61 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -2161,13 +2161,13 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) .'<i>' . __('With selected:') . '</i>' . "\n"; PMA_buttonOrImage('submit_mult', 'mult_submit', - 'submit_mult_change', __('Change'), 'b_edit.png'); + 'submit_mult_change', __('Change'), 'b_edit.png', 'edit'); PMA_buttonOrImage('submit_mult', 'mult_submit', - 'submit_mult_delete', $delete_text, 'b_drop.png'); + 'submit_mult_delete', $delete_text, 'b_drop.png', 'delete'); if (isset($analyzed_sql[0]) && $analyzed_sql[0]['querytype'] == 'SELECT') { PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_export', __('Export'), - 'b_tblexport.png'); + 'b_tblexport.png', 'export'); } echo "\n"; diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index e473192..e566576 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -30,35 +30,19 @@ if (! empty($submit_mult) $selected = $selected_tbl; switch ($submit_mult) { case 'drop_db': - $what = 'drop_db'; + case 'drop_tbl': + case 'empty_tbl': + $what = $submit_mult; break; - case __('Drop'): - $what = 'drop_tbl'; - break; - case __('Empty'): - $what = 'empty_tbl'; - break; - case __('Check table'): - unset($submit_mult); - $query_type = 'check_tbl'; - $mult_btn = __('Yes'); - break; - case __('Optimize table'): - unset($submit_mult); - $query_type = 'optimize_tbl'; - $mult_btn = __('Yes'); - break; - case __('Repair table'): - unset($submit_mult); - $query_type = 'repair_tbl'; - $mult_btn = __('Yes'); - break; - case __('Analyze table'): + case 'check_tbl': + case 'optimize_tbl': + case 'repair_tbl': + case 'analyze_tbl': + $query_type = $submit_mult; unset($submit_mult); - $query_type = 'analyze_tbl'; $mult_btn = __('Yes'); break; - case __('Export'): + case 'export': unset($submit_mult); require('db_export.php'); exit; @@ -69,10 +53,10 @@ if (! empty($submit_mult) // coming from table structure view - do something with selected columns/fileds $selected = $selected_fld; switch ($submit_mult) { - case __('Drop'): + case 'drop': $what = 'drop_fld'; break; - case __('Primary'): + case 'primary': // Gets table primary key PMA_DBI_select_db($db); $result = PMA_DBI_query('SHOW KEYS FROM ' . PMA_backquote($table) . ';'); @@ -94,25 +78,25 @@ if (! empty($submit_mult) $what = 'primary_fld'; } break; - case __('Index'): + case 'index': unset($submit_mult); $query_type = 'index_fld'; $mult_btn = __('Yes'); break; - case __('Unique'): + case 'unique': unset($submit_mult); $query_type = 'unique_fld'; $mult_btn = __('Yes'); break; - case __('Fulltext'): + case 'ftext': unset($submit_mult); $query_type = 'fulltext_fld'; $mult_btn = __('Yes'); break; - case __('Change'): + case 'change': require './tbl_alter.php'; break; - case __('Browse'): + case 'browse': // this should already be handled by tbl_structure.php } } else { diff --git a/tbl_row_action.php b/tbl_row_action.php index d44e808..e5217bf 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -55,17 +55,16 @@ switch($submit_mult) { // leave as is break; - case __('Export'): + case 'export': $submit_mult = 'row_export'; break; - case __('Delete'): - case __('Kill'): + case 'delete': $submit_mult = 'row_delete'; break; default: - case __('Edit'): + case 'edit': $submit_mult = 'row_edit'; break; } @@ -77,9 +76,9 @@ require_once './libraries/header.inc.php'; if (!empty($submit_mult)) { switch($submit_mult) { case 'row_edit': - // As we got the fields to be edited from the + // As we got the fields to be edited from the // 'rows_to_delete' checkbox, we use the index of it as the - // indicating WHERE clause. Then we build the array which is used + // indicating WHERE clause. Then we build the array which is used // for the tbl_change.php script. $where_clause = array(); foreach ($_REQUEST['rows_to_delete'] as $i_where_clause => $del_query) { @@ -94,9 +93,9 @@ if (!empty($submit_mult)) { // Needed to allow SQL export $single_table = TRUE; - // As we got the fields to be edited from the + // As we got the fields to be edited from the // 'rows_to_delete' checkbox, we use the index of it as the - // indicating WHERE clause. Then we build the array which is used + // indicating WHERE clause. Then we build the array which is used // for the tbl_change.php script. $where_clause = array(); foreach ($_REQUEST['rows_to_delete'] as $i_where_clause => $del_query) { diff --git a/tbl_structure.php b/tbl_structure.php index cd5b9be..18eedee 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -554,19 +554,19 @@ $checkall_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table); <i><?php echo __('With selected:'); ?></i> <?php -PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_browse', __('Browse'), 'b_browse.png'); +PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_browse', __('Browse'), 'b_browse.png', 'browse'); if (! $tbl_is_view && ! $db_is_information_schema) { - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_change', __('Change'), 'b_edit.png'); - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_drop', __('Drop'), 'b_drop.png'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_change', __('Change'), 'b_edit.png', 'change'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_drop', __('Drop'), 'b_drop.png', 'drop'); if ('ARCHIVE' != $tbl_type) { - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_primary', __('Primary'), 'b_primary.png'); - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_unique', __('Unique'), 'b_unique.png'); - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_index', __('Index'), 'b_index.png'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_primary', __('Primary'), 'b_primary.png', 'primary'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_unique', __('Unique'), 'b_unique.png', 'unique'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_index', __('Index'), 'b_index.png', 'index'); } if (! empty($tbl_type) && ($tbl_type == 'MYISAM' || $tbl_type == 'ARIA' || $tbl_type == 'MARIA')) { - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_fulltext', __('Fulltext'), 'b_ftext.png'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_fulltext', __('Fulltext'), 'b_ftext.png', 'ftext'); } } ?> hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git March 2011