Git October 2010

git@phpmyadmin.net

4 participants
92 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10534-g3620dca

by Marc Delisle

The branch, master has been updated via 3620dca510de97776f0975020ffe102f16b406d9 (commit) via 111faf4009ec357bb1342738688b1b0921971190 (commit) from b9fe8fc6f8fa583ce6b88d8e059b0912c1f7b676 (commit) - Log ----------------------------------------------------------------- commit 3620dca510de97776f0975020ffe102f16b406d9 Merge: 111faf4009ec357bb1342738688b1b0921971190 b9fe8fc6f8fa583ce6b88d8e059b0912c1f7b676 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Oct 5 08:05:37 2010 -0400 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 111faf4009ec357bb1342738688b1b0921971190 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Oct 5 08:04:59 2010 -0400 bug 3055906 error when running SQL query over AJAX ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 7 +++++-- libraries/mult_submits.inc.php | 4 +++- tbl_row_action.php | 4 +++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index da88087..b68e78b 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -2085,8 +2085,11 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) echo '<input type="hidden" name="sql_query"' .' value="' . htmlspecialchars($sql_query) . '" />' . "\n"; - echo '<input type="hidden" name="url_query"' - .' value="' . $GLOBALS['url_query'] . '" />' . "\n"; + + if (! empty($GLOBALS['url_query'])) { + echo '<input type="hidden" name="url_query"' + .' value="' . $GLOBALS['url_query'] . '" />' . "\n"; + } echo '<input type="hidden" name="clause_is_unique"' .' value="' . $clause_is_unique . '" />' . "\n"; diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index fe614e7..e473192 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -245,7 +245,9 @@ if (!empty($submit_mult) && !empty($what)) { } if ($what == 'row_delete') { $_url_params['original_sql_query'] = $original_sql_query; - $_url_params['original_url_query'] = $original_url_query; + if (! empty($original_url_query)) { + $_url_params['original_url_query'] = $original_url_query; + } } ?> <form action="<?php echo $action; ?>" method="post"> diff --git a/tbl_row_action.php b/tbl_row_action.php index 8a9db7a..d44e808 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -113,7 +113,9 @@ if (!empty($submit_mult)) { $err_url = 'tbl_row_action.php' . PMA_generate_common_url($GLOBALS['url_params']); if (! isset($_REQUEST['mult_btn'])) { $original_sql_query = $sql_query; - $original_url_query = $url_query; + if (! empty($url_query)) { + $original_url_query = $url_query; + } } require './libraries/mult_submits.inc.php'; $_url_params = $GLOBALS['url_params']; hooks/post-receive -- phpMyAdmin

13 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10532-gb9fe8fc

by Piotr Przybylski

The branch, master has been updated via b9fe8fc6f8fa583ce6b88d8e059b0912c1f7b676 (commit) via 9a3120d185442e1389c642798253b10e32fc0d4d (commit) via 48c9d0a8eec66b0140c9c926bf4710f751e16402 (commit) via da0039bb445406a957dbe96d9d9f20798bb2f3c4 (commit) from bbe9bb7a76f297277dbb042e8cd7b2849620f045 (commit) - Log ----------------------------------------------------------------- commit b9fe8fc6f8fa583ce6b88d8e059b0912c1f7b676 Author: Crack <piotrprz(a)gmail.com> Date: Tue Oct 5 13:53:56 2010 +0200 Warn if LoginCookieStore < LoginCookieValidity commit 9a3120d185442e1389c642798253b10e32fc0d4d Merge: 48c9d0a8eec66b0140c9c926bf4710f751e16402 bbe9bb7a76f297277dbb042e8cd7b2849620f045 Author: Crack <piotrprz(a)gmail.com> Date: Tue Oct 5 13:43:50 2010 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 48c9d0a8eec66b0140c9c926bf4710f751e16402 Merge: da0039bb445406a957dbe96d9d9f20798bb2f3c4 2fef94a4e50d5f7d3e0e7cc608f65bbf72d8689d Author: Crack <piotrprz(a)gmail.com> Date: Tue Sep 21 15:47:20 2010 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit da0039bb445406a957dbe96d9d9f20798bb2f3c4 Author: Crack <piotrprz(a)gmail.com> Date: Tue Sep 21 14:09:57 2010 +0200 fix message ----------------------------------------------------------------------- Summary of changes: main.php | 7 +++++++ setup/lib/index.lib.php | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/main.php b/main.php index dbf1da3..0cd46f5 100644 --- a/main.php +++ b/main.php @@ -271,6 +271,13 @@ if ($gc_time < $GLOBALS['cfg']['LoginCookieValidity'] ) { } /** + * Check whether LoginCookieValidity is limited by LoginCookieStore. + */ +if ($GLOBALS['cfg']['LoginCookieStore'] != 0 && $GLOBALS['cfg']['LoginCookieStore'] < $GLOBALS['cfg']['LoginCookieValidity']) { + trigger_error(PMA_Message::decodeBB(__('Login cookie store is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.')), E_USER_WARNING); +} + +/** * Check if user does not have defined blowfish secret and it is being used. */ if (!empty($_SESSION['auto_blowfish_secret']) && diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index b5df478..c8e7fbb 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -261,7 +261,7 @@ function perform_config_checks() $strLoginCookieValidityWarning = sprintf($strLoginCookieValidityWarning, '[a@?page=form&formset=Features#tab_Security]', '[/a]', '[a@http://www.php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime]', '[/a]', ini_get('session.gc_maxlifetime')); $strLoginCookieValidityWarning2 = __('%sLogin cookie validity%s should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.'); $strLoginCookieValidityWarning2 = sprintf($strLoginCookieValidityWarning2, '[a@?page=form&formset=Features#tab_Security]', '[/a]'); - $strLoginCookieValidityWarning3 = __('%sLogin cookie validity%s must be set to a value less or equal to %sLogin cookie store%s.'); + $strLoginCookieValidityWarning3 = __('If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin cookie validity%s must be set to a value less or equal to it.'); $strLoginCookieValidityWarning3 = sprintf($strLoginCookieValidityWarning3, '[a@?page=form&formset=Features#tab_Security]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '[/a]'); $strSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - %shost authentication%s settings and %strusted proxies list%s. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'); $strSecurityInfoMsg = sprintf($strSecurityInfoMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server_config]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '%s'); hooks/post-receive -- phpMyAdmin

13 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10528-gbbe9bb7

by Michal Čihař

The branch, master has been updated via bbe9bb7a76f297277dbb042e8cd7b2849620f045 (commit) via cb9494e3148c856f963f9e1a060843d0bbe48bae (commit) via 438165a769ce8cfab4662f576c95ddb64901ebf4 (commit) from 3a3ac7caaba1a8a8d4a69900c943c1a3c7c70151 (commit) - Log ----------------------------------------------------------------- commit bbe9bb7a76f297277dbb042e8cd7b2849620f045 Merge: cb9494e3148c856f963f9e1a060843d0bbe48bae 3a3ac7caaba1a8a8d4a69900c943c1a3c7c70151 Author: Pootle server <pootle(a)cihar.com> Date: Mon Oct 4 22:40:09 2010 +0200 Merge remote branch 'origin/master' commit cb9494e3148c856f963f9e1a060843d0bbe48bae Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Oct 4 21:24:56 2010 +0200 Translation update done using Pootle. commit 438165a769ce8cfab4662f576c95ddb64901ebf4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Oct 4 21:24:44 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/po/tr.po b/po/tr.po index ecaabde..4d95fb2 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-10-04 08:08-0400\n" -"PO-Revision-Date: 2010-09-30 20:03+0200\n" +"PO-Revision-Date: 2010-10-04 21:24+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tr\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.5\n" @@ -1071,16 +1071,14 @@ msgid "Searching" msgstr "Aranıyor" #: js/messages.php:84 -#, fuzzy #| msgid "SQL Query box" msgid "Hide query box" -msgstr "SQL Sorgu kutusu" +msgstr "Sorgu kutusunu gizle" #: js/messages.php:85 -#, fuzzy #| msgid "SQL Query box" msgid "Show query box" -msgstr "SQL Sorgu kutusu" +msgstr "Sorgu kutusunu göster" #: js/messages.php:86 msgid "Inline Edit" hooks/post-receive -- phpMyAdmin

13 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10525-g3a3ac7c

by Dieter Adriaenssens

The branch, master has been updated via 3a3ac7caaba1a8a8d4a69900c943c1a3c7c70151 (commit) from 76a864be5caf24a319d5946ed4bfafe67981e54f (commit) - Log ----------------------------------------------------------------- commit 3a3ac7caaba1a8a8d4a69900c943c1a3c7c70151 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Mon Oct 4 20:49:05 2010 +0200 bug #3077454, don't apply inner_sql span to query_only mode, this breaks copying databases and rowcount of queries ----------------------------------------------------------------------- Summary of changes: libraries/sqlparser.lib.php | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 793ae26..a9568c4 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -2119,10 +2119,12 @@ if (! defined('PMA_MINIMUM_COMMON')) { $docu = TRUE; break; } // end switch - // inner_sql is a span that exists for all cases + // inner_sql is a span that exists for all cases, except query_only // of $cfg['SQP']['fmtType'] to make possible a replacement // for inline editing - $str .= '<span class="inner_sql">'; + if ($mode!='query_only') { + $str .= '<span class="inner_sql">'; + } $close_docu_link = false; $indent = 0; $bracketlevel = 0; @@ -2617,8 +2619,10 @@ if (! defined('PMA_MINIMUM_COMMON')) { $str .= '</a>'; $close_docu_link = false; } - // close inner_sql span - $str .= '</span>'; + if ($mode!='query_only') { + // close inner_sql span + $str .= '</span>'; + } if ($mode=='color') { // close syntax span $str .= '</span>'; hooks/post-receive -- phpMyAdmin

13 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10524-g76a864b

by Marc Delisle

The branch, master has been updated via 76a864be5caf24a319d5946ed4bfafe67981e54f (commit) from 51129bc12f448883f39e863e1ad25aabed67a514 (commit) - Log ----------------------------------------------------------------- commit 76a864be5caf24a319d5946ed4bfafe67981e54f Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Oct 4 12:39:20 2010 -0400 bug 3056712 Two inline edit links when browsing pma_bookmark; I removed this minor feature of seeing a link to execute a bookmark when browsing this table ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 20 -------------------- libraries/display_tbl_links.lib.php | 2 -- 2 files changed, 0 insertions(+), 22 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index c3d833d..da88087 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1118,25 +1118,6 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { } } // end if (1.2.1) - if (isset($GLOBALS['cfg']['Bookmark']['table']) && isset($GLOBALS['cfg']['Bookmark']['db']) && $table == $GLOBALS['cfg']['Bookmark']['table'] && $db == $GLOBALS['cfg']['Bookmark']['db'] && isset($row[1]) && isset($row[0])) { - $_url_params = array( - 'db' => $row[1], - 'id_bookmark' => $row[0], - 'action_bookmark' => '0', - 'action_bookmark_all' => '1', - 'SQL' => __('Execute bookmarked query'), - ); - $bookmark_go = '<a href="import.php' - . PMA_generate_common_url($_url_params) - .' " title="' . __('Execute bookmarked query') . '">'; - - $bookmark_go .= PMA_getIcon('b_bookmark.png', __('Execute bookmarked query'), true); - - $bookmark_go .= '</a>'; - } else { - $bookmark_go = ''; - } - // 1.2.2 Delete/Kill link(s) if ($is_display['del_lnk'] == 'dr') { // delete row case $_url_params = array( @@ -1448,7 +1429,6 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if (isset($edit_url)) { $vertical_display['edit'][$row_no] .= ' <td align="center" class="' . $class . ' ' . $edit_anchor_class . '" ' . $column_style_vertical . '>' . "\n" . PMA_linkOrButton($edit_url, $edit_str, array(), false) - . $bookmark_go . ' </td>' . "\n"; } else { unset($vertical_display['edit'][$row_no]); diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php index d261fd0..7398910 100644 --- a/libraries/display_tbl_links.lib.php +++ b/libraries/display_tbl_links.lib.php @@ -28,7 +28,6 @@ if ($doWriteModifyAt == 'left') { if (!empty($edit_url)) { echo ' <td class="' . $edit_anchor_class . '" align="center">' . "\n" . PMA_linkOrButton($edit_url, $edit_str, '', FALSE) - . $bookmark_go . ' </td>' . "\n"; } if (!empty($del_url)) { @@ -45,7 +44,6 @@ if ($doWriteModifyAt == 'left') { if (!empty($edit_url)) { echo ' <td class="' . $edit_anchor_class . '" align="center">' . "\n" . PMA_linkOrButton($edit_url, $edit_str, '', FALSE) - . $bookmark_go . ' </td>' . "\n"; } if (!empty($del_url) && $is_display['del_lnk'] != 'kp') { hooks/post-receive -- phpMyAdmin

13 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10523-g51129bc

by Michal Čihař

The branch, master has been updated via 51129bc12f448883f39e863e1ad25aabed67a514 (commit) via b4e8007d572fb361143454d7007112be2d4ccab9 (commit) via c7ec6ed3cfa02e945a111ad89bd5b10fbfb1ef39 (commit) from 77e5bd4e07d8c93f62c47a58a4a44f82e8365bf6 (commit) - Log ----------------------------------------------------------------- commit 51129bc12f448883f39e863e1ad25aabed67a514 Merge: 77e5bd4e07d8c93f62c47a58a4a44f82e8365bf6 b4e8007d572fb361143454d7007112be2d4ccab9 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Oct 4 14:49:30 2010 +0200 Merge remote branch 'pootle/master' Conflicts: po/en_GB.po commit b4e8007d572fb361143454d7007112be2d4ccab9 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Mon Oct 4 13:11:11 2010 +0200 Translation update done using Pootle. commit c7ec6ed3cfa02e945a111ad89bd5b10fbfb1ef39 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Mon Oct 4 13:11:08 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/en_GB.po | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index ec8ea0f..85799e3 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-10-04 08:08-0400\n" -"PO-Revision-Date: 2010-09-23 18:12+0200\n" -"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" +"PO-Revision-Date: 2010-10-04 13:11+0200\n" +"Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -1070,16 +1070,14 @@ msgid "Searching" msgstr "Searching" #: js/messages.php:84 -#, fuzzy #| msgid "SQL Query box" msgid "Hide query box" -msgstr "SQL Query box" +msgstr "Hide query box" #: js/messages.php:85 -#, fuzzy #| msgid "SQL Query box" msgid "Show query box" -msgstr "SQL Query box" +msgstr "Show query box" #: js/messages.php:86 msgid "Inline Edit" hooks/post-receive -- phpMyAdmin

13 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10519-g38334e4

by Marc Delisle

The branch, master has been updated via 38334e4f9183d94d987f89140be115a678e0a9ba (commit) from 04f1307a45e4a1088c28458d5bb58dfea72f20b5 (commit) - Log ----------------------------------------------------------------- commit 38334e4f9183d94d987f89140be115a678e0a9ba Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Oct 4 08:07:48 2010 -0400 CtrlArrowsMoving not really needed as an option, now always active ----------------------------------------------------------------------- Summary of changes: Documentation.html | 9 +-------- libraries/config.default.php | 7 ------- libraries/config/messages.inc.php | 1 - libraries/config/user_preferences.forms.php | 1 - libraries/tbl_properties.inc.php | 4 ---- tbl_change.php | 2 -- 6 files changed, 1 insertions(+), 23 deletions(-) diff --git a/Documentation.html b/Documentation.html index 71cd175..5910cc3 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1868,11 +1868,6 @@ $cfg['TrustedProxies'] = </dt> <dd>Defines if the whole textarea of the query box will be selected on click.</dd> - <dt id="CtrlArrowsMoving"> - <span id="cfg_CtrlArrowsMoving">$cfg['CtrlArrowsMoving'] </span>boolean - </dt> - <dd>Enable Ctrl+Arrows (Option+Arrows in Safari) moving between fields when - editing.</dd> <dt id="cfg_LimitChars">$cfg['LimitChars'] integer</dt> <dd>Maximum number of characters shown in any non-numeric field on browse view. @@ -4082,9 +4077,7 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal'); editing fields?</a></h4> <p> You can use Ctrl+arrows (Option+Arrows in Safari) for moving on most pages - with many editing fields (table structure changes, row editing, etc.) - (must be enabled in configuration - see. - <a href="#CtrlArrowsMoving" class="configrule">$cfg['CtrlArrowsMoving']</a>). + with many editing fields (table structure changes, row editing, etc.). You can also have a look at the directive <a href="#DefaultPropDisplay" class="configrule">$cfg['DefaultPropDisplay']</a> ('vertical') and see if this eases up editing for you.</p> diff --git a/libraries/config.default.php b/libraries/config.default.php index 339a40d..cc23cee 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2199,13 +2199,6 @@ $cfg['CharTextareaCols'] = 40; $cfg['CharTextareaRows'] = 2; /** - * Enable Ctrl+Arrows moving between fields when editing? - * - * @global boolean $cfg['CtrlArrowsMoving'] - */ -$cfg['CtrlArrowsMoving'] = true; - -/** * Max field data length in browse mode for all non-numeric fields * * @global integer $cfg['LimitChars'] diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 26d5a78..65545b7 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -39,7 +39,6 @@ $strConfigCompressOnFly_name = __('Compress on the fly'); $strConfigConfigurationFile = __('Configuration file'); $strConfigConfirm_desc = __('Whether a warning ("Are your really sure...") should be displayed when you\'re about to lose data'); $strConfigConfirm_name = __('Confirm DROP queries'); -$strConfigCtrlArrowsMoving_name = __('Field navigation using Ctrl+Arrows'); $strConfigDBG_sql_name = __('Debug SQL'); $strConfigDefaultDisplay_name = __('Default display direction'); $strConfigDefaultPropDisplay_desc = __('[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates maximum number for which vertical model is used'); diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php index 025c021..cd9e673 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -115,7 +115,6 @@ $forms['Main_frame']['Edit'] = array( 'InsertRows', 'ForeignKeyDropdownOrder', 'ForeignKeyMaxLimit', - 'CtrlArrowsMoving', 'DefaultPropDisplay'); $forms['Main_frame']['Tabs'] = array( 'LightTabs', diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 001fea6..a00a164 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -597,7 +597,6 @@ for ($i = 0; $i < $num_fields; $i++) { } } // end for -if ($cfg['CtrlArrowsMoving']) { ?> <script src="./js/keyhandler.js" type="text/javascript"></script> <script type="text/javascript"> @@ -606,9 +605,6 @@ var switch_movement = <?php echo $display_type == 'horizontal' ? '0' : '1'; ?>; document.onkeydown = onKeyDownArrowsHandler; // ]]> </script> - <?php -} -?> <form id="<?php echo ($action == 'tbl_create.php' ? 'create_table' : 'append_fields'); ?>_form" method="post" action="<?php echo $action; ?>"> <?php diff --git a/tbl_change.php b/tbl_change.php index bcc0b76..41e8230 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -207,7 +207,6 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5 && // Had to put the URI because when hosted on an https server, // some browsers send wrongly this form to the http server. -if ($cfg['CtrlArrowsMoving']) { ?>  <script src="./js/keyhandler.js" type="text/javascript"></script> @@ -218,7 +217,6 @@ document.onkeydown = onKeyDownArrowsHandler; //]]> </script> <?php -} $_form_params = array( 'db' => $db, hooks/post-receive -- phpMyAdmin

13 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10516-gd1bebc6

by Marc Delisle

The branch, master has been updated via d1bebc67f6309fcc6fda946953816951d3799bc7 (commit) via 1c49cd3d6422630be2549ce925cd91971565c5c7 (commit) via 1623c7e06593a7b95b9654c51537e29602c5b3a4 (commit) from e91e87861b7e7dff68780fcfc056ac0f0c35885d (commit) - Log ----------------------------------------------------------------- commit d1bebc67f6309fcc6fda946953816951d3799bc7 Merge: e91e87861b7e7dff68780fcfc056ac0f0c35885d 1c49cd3d6422630be2549ce925cd91971565c5c7 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 3 09:42:40 2010 -0400 fix merge conflicts ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/dbi/mysqli.dbi.lib.php | 2 +- libraries/display_tbl.lib.php | 10 ++++++++-- tbl_change.php | 6 +++++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d5e79a..49dac18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,6 +124,7 @@ - bug #3062455 [core] copy procedures and routines before tables - bug #3062455 [export] with SQL, export procedures and routines before tables - bug #3056023 [import] USE query not working +- bug #3038193 [display] Error when editing row with GEOMETRY column 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 086b47a..e027f23 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -524,7 +524,7 @@ function PMA_DBI_get_fields_meta($result) // so this would override TINYINT and mark all TINYINT as string // https://sf.net/tracker/?func=detail&aid=1532111&group_id=23067&atid=377408 //$typeAr[MYSQLI_TYPE_CHAR] = 'string'; - $typeAr[MYSQLI_TYPE_GEOMETRY] = 'unknown'; + $typeAr[MYSQLI_TYPE_GEOMETRY] = 'geometry'; $typeAr[MYSQLI_TYPE_BIT] = 'bit'; $fields = mysqli_fetch_fields($result); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 3520257..c3d833d 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1330,7 +1330,13 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $vertical_display['data'][$row_no][$i] = ' <td' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"> </td>' . "\n"; } } - // n o t n u m e r i c a n d n o t B L O B + // g e o m e t r y + } elseif ($meta->type == 'geometry') { + $geometry_text = PMA_handle_non_printable_contents('GEOMETRY', (isset($row[$i]) ? $row[$i] : ''), $transform_function, $transform_options, $default_function, $meta); + $vertical_display['data'][$row_no][$i] = ' <td align="left"' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '">' . $geometry_text . '</td>'; + unset($geometry_text); + + // n o t n u m e r i c a n d n o t B L O B } else { if (!isset($row[$i]) || is_null($row[$i])) { $vertical_display['data'][$row_no][$i] = ' <td' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"><i>NULL</i></td>' . "\n"; @@ -2266,7 +2272,7 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { * @uses PMA_formatByteDown() * @uses strpos() * @uses str_replace() - * @param string $category BLOB|BINARY + * @param string $category BLOB|BINARY|GEOMETRY * @param string $content the binary content * @param string $transform_function * @param string $transform_options diff --git a/tbl_change.php b/tbl_change.php index 54e0d7f..bcc0b76 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -509,7 +509,7 @@ foreach ($rows as $row_id => $vrow) { if (($cfg['ProtectBinary'] && $field['is_blob'] && !$is_upload) || ($cfg['ProtectBinary'] == 'all' && $field['is_binary'])) { echo ' <td align="center">' . __('Binary') . '</td>' . "\n"; - } elseif (strstr($field['True_Type'], 'enum') || strstr($field['True_Type'], 'set')) { + } elseif (strstr($field['True_Type'], 'enum') || strstr($field['True_Type'], 'set') || 'geometry' == $field['pma_type']) { echo ' <td align="center">--</td>' . "\n"; } else { ?> @@ -934,6 +934,10 @@ foreach ($rows as $row_id => $vrow) { } } // end if (web-server upload directory) } // end elseif (binary or blob) + + elseif ('geometry' == $field['pma_type']) { + // ignore this column to avoid changing it + } else { // field size should be at least 4 and max 40 $fieldsize = min(max($field['len'], 4), 40); hooks/post-receive -- phpMyAdmin

13 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_7-15-g1c49cd3

by Marc Delisle

The branch, QA_3_3 has been updated via 1c49cd3d6422630be2549ce925cd91971565c5c7 (commit) via 1623c7e06593a7b95b9654c51537e29602c5b3a4 (commit) from 22fa5adee3cece9229f457d724d516eb96975186 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/dbi/mysqli.dbi.lib.php | 2 +- libraries/display_tbl.lib.php | 8 +++++++- tbl_change.php | 6 +++++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7c8d83..d6f020b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #3062455 [core] copy procedures and routines before tables - bug #3062455 [export] with SQL, export procedures and routines before tables - bug #3056023 [import] USE query not working +- bug #3038193 [display] Error when editing row with GEOMETRY column 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 2c00bcd..b064953 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -529,7 +529,7 @@ function PMA_DBI_get_fields_meta($result) // so this would override TINYINT and mark all TINYINT as string // https://sf.net/tracker/?func=detail&aid=1532111&group_id=23067&atid=377408 //$typeAr[MYSQLI_TYPE_CHAR] = 'string'; - $typeAr[MYSQLI_TYPE_GEOMETRY] = 'unknown'; + $typeAr[MYSQLI_TYPE_GEOMETRY] = 'geometry'; $typeAr[MYSQLI_TYPE_BIT] = 'bit'; $fields = mysqli_fetch_fields($result); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index d6d93b0..7ef333d 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1343,6 +1343,12 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $vertical_display['data'][$row_no][$i] = ' <td' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"> </td>' . "\n"; } } + // g e o m e t r y + } elseif ($meta->type == 'geometry') { + $geometry_text = PMA_handle_non_printable_contents('GEOMETRY', (isset($row[$i]) ? $row[$i] : ''), $transform_function, $transform_options, $default_function, $meta); + $vertical_display['data'][$row_no][$i] = ' <td align="left"' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '">' . $geometry_text . '</td>'; + unset($geometry_text); + // n o t n u m e r i c a n d n o t B L O B } else { if (!isset($row[$i]) || is_null($row[$i])) { @@ -2246,7 +2252,7 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { * @uses PMA_formatByteDown() * @uses strpos() * @uses str_replace() - * @param string $category BLOB|BINARY + * @param string $category BLOB|BINARY|GEOMETRY * @param string $content the binary content * @param string $transform_function * @param string $transform_options diff --git a/tbl_change.php b/tbl_change.php index aa1a74f..f419bb1 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -497,7 +497,7 @@ foreach ($rows as $row_id => $vrow) { if (($cfg['ProtectBinary'] && $field['is_blob'] && !$is_upload) || ($cfg['ProtectBinary'] == 'all' && $field['is_binary'])) { echo ' <td align="center">' . $strBinary . '</td>' . "\n"; - } elseif (strstr($field['True_Type'], 'enum') || strstr($field['True_Type'], 'set')) { + } elseif (strstr($field['True_Type'], 'enum') || strstr($field['True_Type'], 'set') || 'geometry' == $field['pma_type']) { echo ' <td align="center">--</td>' . "\n"; } else { ?> @@ -1027,6 +1027,10 @@ foreach ($rows as $row_id => $vrow) { } } // end if (web-server upload directory) } // end elseif (binary or blob) + + elseif ('geometry' == $field['pma_type']) { + // ignore this column to avoid changing it + } else { // field size should be at least 4 and max 40 $fieldsize = min(max($field['len'], 4), 40); hooks/post-receive -- phpMyAdmin

13 years, 11 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10513-ge91e878

by Marc Delisle

The branch, master has been updated via e91e87861b7e7dff68780fcfc056ac0f0c35885d (commit) via 0df2fcd70d5d8f3c2671d38f9fad668f6937251a (commit) via f503d5667e481b65b6249966e3d5da97b013ea3f (commit) via 22fa5adee3cece9229f457d724d516eb96975186 (commit) from 864fb1a0038d1c3c3a7c2e649176e0e86fbdd622 (commit) - Log ----------------------------------------------------------------- commit e91e87861b7e7dff68780fcfc056ac0f0c35885d Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 3 07:45:15 2010 -0400 make USE work in the context of ajaxification commit 0df2fcd70d5d8f3c2671d38f9fad668f6937251a Merge: f503d5667e481b65b6249966e3d5da97b013ea3f 864fb1a0038d1c3c3a7c2e649176e0e86fbdd622 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Oct 2 16:34:55 2010 -0400 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit f503d5667e481b65b6249966e3d5da97b013ea3f Merge: 15eda6f4414fc3d2ff0d16346db28a698f52bc00 22fa5adee3cece9229f457d724d516eb96975186 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 29 08:04:47 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 37 ++++++++++++++++++++++++++----------- libraries/import.lib.php | 27 +++++++++++++++++++++++---- sql.php | 5 ++++- 4 files changed, 54 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index d187e2a..8d5e79a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -123,6 +123,7 @@ - [core] Update library PHPExcel to version 1.7.4 - bug #3062455 [core] copy procedures and routines before tables - bug #3062455 [export] with SQL, export procedures and routines before tables +- bug #3056023 [import] USE query not working 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after diff --git a/js/sql.js b/js/sql.js index 126784d..285df0f 100644 --- a/js/sql.js +++ b/js/sql.js @@ -155,14 +155,17 @@ $(document).ready(function() { * @memberOf jQuery * @name appendToggleSpan */ - $('<span id="togglequerybox"></span>') - .html(PMA_messages['strToggleQueryBox']) - .appendTo("#sqlqueryform"); - - // Attach the toggling of the query box visibility to a click - $("#togglequerybox").live('click', function() { - $(this).siblings().slideToggle("medium"); - }) + // do not add this span more than once + if (! $('#sqlqueryform').find('span').is('#togglequerybox')) { + $('<span id="togglequerybox"></span>') + .html(PMA_messages['strToggleQueryBox']) + .appendTo("#sqlqueryform"); + + // Attach the toggling of the query box visibility to a click + $("#togglequerybox").bind('click', function() { + $(this).siblings().slideToggle("medium"); + }) + } /** * Ajax Event handler for 'SQL Query Submit' @@ -173,17 +176,29 @@ $(document).ready(function() { */ $("#sqlqueryform").live('submit', function(event) { event.preventDefault(); - + $form = $(this); PMA_ajaxShowMessage(); - $(this).append('<input type="hidden" name="ajax_request" value="true" />'); + if (! $form.find('input:hidden').is('#ajax_request_hidden')) { + $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); + } $.post($(this).attr('action'), $(this).serialize() , function(data) { if(data.success == true) { PMA_ajaxShowMessage(data.message); + // this happens if a USE command was typed + if (typeof data.reload != 'undefined') { + $form.find('input[name=db]').val(data.db); + // need to regenerate the whole upper part + $form.find('input[name=ajax_request]').remove(); + $form.append('<input type="hidden" name="reload" value="true" />'); + $.post('db_sql.php', $form.serialize(), function(data) { + $('body').html(data); + }); // end inner post + } } else if (data.success == false ) { - PMA_ajaxShowMessage(data.error); + PMA_ajaxShowMessage(data.error, 50000); } else { $("#sqlqueryresults").html(data); diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 98221de..79a43b7 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -117,6 +117,8 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) $display_query = ''; } $sql_query = $import_run_buffer['sql']; + // If a 'USE <db>' SQL-clause was found, set our current $db to the new one + list($db, $reload) = PMA_lookForUse($import_run_buffer['sql'], $db, $reload); } elseif ($run_query) { if ($controluser) { $result = PMA_query_as_controluser($import_run_buffer['sql']); @@ -156,10 +158,8 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) } // If a 'USE <db>' SQL-clause was found and the query succeeded, set our current $db to the new one - if ($result != FALSE && preg_match('@^[\s]*USE[[:space:]]*([\S]+)@i', $import_run_buffer['sql'], $match)) { - $db = trim($match[1]); - $db = trim($db,';'); // for example, USE abc; - $reload = TRUE; + if ($result != FALSE) { + list($db, $reload) = PMA_lookForUse($import_run_buffer['sql'], $db, $reload); } if ($result != FALSE && preg_match('@^[\s]*(DROP|CREATE)[\s]+(IF EXISTS[[:space:]]+)?(TABLE|DATABASE)[[:space:]]+(.+)@im', $import_run_buffer['sql'])) { @@ -205,6 +205,25 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) } } +/** + * Looks for the presence of USE to possibly change current db + * + * @param string buffer to examine + * @param string current db + * @param boolean reload + * @return array (current or new db, whether to reload) + * @access public + */ +function PMA_lookForUse($buffer, $db, $reload) +{ + if (preg_match('@^[\s]*USE[[:space:]]*([\S]+)@i', $buffer, $match)) { + $db = trim($match[1]); + $db = trim($db,';'); // for example, USE abc; + $reload = TRUE; + } + return(array($db, $reload)); +} + /** * Returns next part of imported file/buffer diff --git a/sql.php b/sql.php index 698ca8a..898c893 100644 --- a/sql.php +++ b/sql.php @@ -677,7 +677,10 @@ if (0 == $num_rows || $is_affected) { if(isset($GLOBALS['display_query'])) { $extra_data['sql_query'] = PMA_showMessage(NULL, $GLOBALS['display_query']); } - + if ($GLOBALS['reload'] == 1) { + $extra_data['reload'] = 1; + $extra_data['db'] = $GLOBALS['db']; + } PMA_ajaxResponse($message, $message->isSuccess(), (isset($extra_data) ? $extra_data : '')); } hooks/post-receive -- phpMyAdmin

13 years, 11 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git October 2010