- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1384-g06bcb3e
by Marc Delisle 05 Apr '10

05 Apr '10

The branch, master has been updated via 06bcb3ecfdf915d17b3bae247b268a1282b2b5f3 (commit) from 6c1b328ef29c1b35474db1209fa4e4e0bb67ed91 (commit) - Log ----------------------------------------------------------------- commit 06bcb3ecfdf915d17b3bae247b268a1282b2b5f3 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Apr 5 17:00:42 2010 -0400 author names removal ----------------------------------------------------------------------- Summary of changes: js/functions.js | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/functions.js b/js/functions.js index 8dea75d..5c577a7 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1588,7 +1588,7 @@ function pdfPaperSize(format, axis) { } /** - * rajk - for playing media from the BLOB repository + * for playing media from the BLOB repository * * @param var * @param var url_params main purpose is to pass the token @@ -1612,7 +1612,7 @@ function popupBSMedia(url_params, bs_ref, m_type, is_cust_type, w_width, w_heigh } /** - * rajk - popups a request for changing MIME types for files in the BLOB repository + * popups a request for changing MIME types for files in the BLOB repository * * @param var db database name * @param var table table name @@ -1634,7 +1634,7 @@ function requestMIMETypeChange(db, table, reference, current_mime_type) } /** - * rajk - changes MIME types for files in the BLOB repository + * changes MIME types for files in the BLOB repository * * @param var db database name * @param var table table name hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1383-g6c1b328
by Marc Delisle 05 Apr '10

05 Apr '10

The branch, master has been updated via 6c1b328ef29c1b35474db1209fa4e4e0bb67ed91 (commit) from 6e68e2d149a90e4207a85730f425ad06930d8272 (commit) - Log ----------------------------------------------------------------- commit 6c1b328ef29c1b35474db1209fa4e4e0bb67ed91 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Apr 5 10:26:21 2010 -0400 XHTML compliance ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Documentation.html b/Documentation.html index 9f915f7..a472524 100644 --- a/Documentation.html +++ b/Documentation.html @@ -396,9 +396,7 @@ rm -rf config # remove not needed directory In cookie mode, the password is stored, encrypted with the blowfish algorithm, in a temporary cookie.</li> - <a name="pmausr"></a> - - <li>Note: starting with phpMyAdmin 2.6.1, this section is only applicable if + <li id="pmausr">Note: starting with phpMyAdmin 2.6.1, this section is only applicable if your MySQL server is running with <tt>--skip-show-database</tt>.<br /><br /> For '<abbr title="HyperText Transfer Protocol">HTTP</abbr>' and 'cookie' hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1382-g6e68e2d
by Marc Delisle 05 Apr '10

05 Apr '10

The branch, master has been updated via 6e68e2d149a90e4207a85730f425ad06930d8272 (commit) from 3ca82375d57cb84e37064c82e4291f06b5e4cce6 (commit) - Log ----------------------------------------------------------------- commit 6e68e2d149a90e4207a85730f425ad06930d8272 Author: Brian Douglass <bhdouglass(a)users.sourceforge.net> Date: Mon Apr 5 10:06:36 2010 -0400 Patch #2981165 Optionally disable the Type column ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 6 ++++++ libraries/config.default.php | 7 +++++++ tbl_change.php | 38 ++++++++++++++++++++++++++++---------- 4 files changed, 43 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index a87c0ca..f50e8bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,8 @@ $Id$ - [core] Provide way for vendors to easily change paths to config files. + patch #2979922, rfe #2804874 [interface] Add inline query editing, thanks to Muhammd Adnan. - bug #2966752 [setup] Allow to configure changes tracking in setup script. ++ patch #2981165 [edit] Optionally disable the Type column, + thanks to Brian Douglass - bhdouglass 3.3.2.0 (not yet released) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/Documentation.html b/Documentation.html index 4a4a360..9f915f7 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1551,6 +1551,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> displayed in edit/insert mode. Since version 2.10, the user can toggle this setting from the interface. </dd> + + <dt id="cfg_ShowFieldTypesInDataEditView">$cfg['ShowFieldTypesInDataEditView'] boolean</dt> + <dd>Defines whether or not type fields should be initially + displayed in edit/insert mode. The user can + toggle this setting from the interface. + </dd> <dt id="cfg_CharEditing">$cfg['CharEditing'] string</dt> <dd>Defines which type of editing controls should be used for CHAR and diff --git a/libraries/config.default.php b/libraries/config.default.php index 377d828..2d1ca1c 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -920,6 +920,13 @@ $cfg['ProtectBinary'] = 'blob'; $cfg['ShowFunctionFields'] = true; /** + * Display the type fields in edit/insert mode + * + * @global boolean $cfg['ShowFieldTypesInDataEditView'] + */ +$cfg['ShowFieldTypesInDataEditView'] = true; + +/** * Which editor should be used for CHAR/VARCHAR fields: * input - allows limiting of input length * textarea - allows newlines in fields diff --git a/tbl_change.php b/tbl_change.php index cbeda52..835ccf6 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -41,6 +41,9 @@ if (isset($_REQUEST['sql_query'])) { if (isset($_REQUEST['ShowFunctionFields'])) { $cfg['ShowFunctionFields'] = $_REQUEST['ShowFunctionFields']; } +if (isset($_REQUEST['ShowFieldTypesInDataEditView'])) { + $cfg['ShowFieldTypesInDataEditView'] = $_REQUEST['ShowFieldTypesInDataEditView']; +} /** * load relation data, foreign keys @@ -268,10 +271,18 @@ if (! empty($sql_query)) { $url_params['sql_query'] = $sql_query; } +if (! $cfg['ShowFunctionFields'] || ! $cfg['ShowFieldTypesInDataEditView']) { + echo $strShow; +} if (! $cfg['ShowFunctionFields']) { $this_url_params = array_merge($url_params, - array('ShowFunctionFields' => 1, 'goto' => 'sql.php')); - echo $strShow . ' : <a href="tbl_change.php' . PMA_generate_common_url($this_url_params) . '">' . $strFunction . '</a>' . "\n"; + array('ShowFunctionFields' => 1, 'ShowFieldTypesInDataEditView' => $cfg['ShowFieldTypesInDataEditView'], 'goto' => 'sql.php')); + echo ' : <a href="tbl_change.php' . PMA_generate_common_url($this_url_params) . '">' . $strFunction . '</a>' . "\n"; +} +if (! $cfg['ShowFieldTypesInDataEditView']) { + $this_other_url_params = array_merge($url_params, + array('ShowFieldTypesInDataEditView' => 1, 'ShowFunctionFields' => $cfg['ShowFunctionFields'], 'goto' => 'sql.php')); + echo ' : <a href="tbl_change.php' . PMA_generate_common_url($this_other_url_params) . '">' . $strType . '</a>' . "\n"; } foreach ($rows as $row_id => $vrow) { @@ -293,11 +304,17 @@ foreach ($rows as $row_id => $vrow) { <thead> <tr> <th><?php echo $strField; ?></th> - <th><?php echo $strType; ?></th> -<?php + + <?php + if ($cfg['ShowFieldTypesInDataEditView']) { + $this_url_params = array_merge($url_params, + array('ShowFieldTypesInDataEditView' => 0, 'ShowFunctionFields' => $cfg['ShowFunctionFields'], 'goto' => 'sql.php')); + echo ' <th><a href="tbl_change.php' . PMA_generate_common_url($this_url_params) . '" title="' . $strHide . '">' . $strType . '</a></th>' . "\n"; + } + if ($cfg['ShowFunctionFields']) { $this_url_params = array_merge($url_params, - array('ShowFunctionFields' => 0, 'goto' => 'sql.php')); + array('ShowFunctionFields' => 0, 'ShowFieldTypesInDataEditView' => $cfg['ShowFieldTypesInDataEditView'], 'goto' => 'sql.php')); echo ' <th><a href="tbl_change.php' . PMA_generate_common_url($this_url_params) . '" title="' . $strHide . '">' . $strFunction . '</a></th>' . "\n"; } ?> @@ -418,11 +435,12 @@ foreach ($rows as $row_id => $vrow) { <?php echo $field['Field_title']; ?> <input type="hidden" name="fields_name<?php echo $field_name_appendix; ?>" value="<?php echo $field['Field_html']; ?>"/> </td> - <td align="center"<?php echo $field['wrap']; ?>> - <?php echo $field['pma_type']; ?> - </td> - - <?php +<?php if ($cfg['ShowFieldTypesInDataEditView']) { ?> + <td align="center"<?php echo $field['wrap']; ?>> + <?php echo $field['pma_type']; ?> + </td> + + <?php } //End if // Prepares the field value $real_null_value = FALSE; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1381-g3ca8237
by Marc Delisle 05 Apr '10

05 Apr '10

The branch, master has been updated via 3ca82375d57cb84e37064c82e4291f06b5e4cce6 (commit) from 6b5f3b996201be64d344eded98db712aefa53417 (commit) - Log ----------------------------------------------------------------- commit 3ca82375d57cb84e37064c82e4291f06b5e4cce6 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Apr 5 09:16:36 2010 -0400 continue removing author names in code ----------------------------------------------------------------------- Summary of changes: config.sample.inc.php | 2 +- db_structure.php | 4 ++-- libraries/File.class.php | 6 +++--- libraries/common.inc.php | 8 ++++---- libraries/common.lib.php | 2 +- libraries/config.default.php | 2 +- libraries/core.lib.php | 2 +- libraries/display_tbl.lib.php | 2 +- tbl_change.php | 3 +-- tbl_replace.php | 2 +- 10 files changed, 16 insertions(+), 17 deletions(-) diff --git a/config.sample.inc.php b/config.sample.inc.php index b886ff3..f61b648 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -36,7 +36,7 @@ $cfg['Servers'][$i]['compress'] = false; $cfg['Servers'][$i]['extension'] = 'mysql'; $cfg['Servers'][$i]['AllowNoPassword'] = false; -/* rajk - for blobstreaming */ +/* for blobstreaming */ $cfg['Servers'][$i]['bs_garbage_threshold'] = 50; $cfg['Servers'][$i]['bs_repository_threshold'] = '32M'; $cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600; diff --git a/db_structure.php b/db_structure.php index 479980e..6bcc3bd 100644 --- a/db_structure.php +++ b/db_structure.php @@ -151,7 +151,7 @@ $hidden_fields = array(); $odd_row = true; $sum_row_count_pre = ''; -// added by rajk - for blobstreaming +// for blobstreaming $PMA_Config = $GLOBALS['PMA_Config']; if (!empty($PMA_Config)) @@ -473,7 +473,7 @@ if ($is_show_stats) { <th align="center" nowrap="nowrap"> <?php // for blobstreaming - if the number of tables is 0, set tableReductionCount to 0 - // (we don't want negative numbers here) - rajk + // (we don't want negative numbers here) if ($num_tables == 0) $tableReductionCount = 0; diff --git a/libraries/File.class.php b/libraries/File.class.php index 312f1f8..8f77fe4 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -283,7 +283,7 @@ class PMA_File $file = PMA_File::fetchUploadedFromTblChangeRequestMultiple($file, $primary); } - // rajk - for blobstreaming + // for blobstreaming $is_bs_upload = FALSE; // check if this field requires a repository upload @@ -491,7 +491,7 @@ class PMA_File if (! empty($_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$primary]) && is_string($_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$primary])) { // ... whether with multiple rows ... - // rajk - for blobstreaming + // for blobstreaming $is_bs_upload = FALSE; // check if this field requires a repository upload @@ -631,7 +631,7 @@ class PMA_File } } elseif (! empty($_REQUEST['fields_uploadlocal_' . $key]) && is_string($_REQUEST['fields_uploadlocal_' . $key])) { - // rajk - for blobstreaming + // for blobstreaming $is_bs_upload = FALSE; // check if this field requires a repository upload diff --git a/libraries/common.inc.php b/libraries/common.inc.php index b190f12..e37e288 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -471,9 +471,9 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST[' 'pma_lang', 'pma_charset', 'pma_collation_connection', /* Possible login form */ 'pma_servername', 'pma_username', 'pma_password', - /* rajk - for playing blobstreamable media */ + /* for playing blobstreamable media */ 'media_type', 'custom_type', 'bs_reference', - /* rajk - for changing BLOB repository file MIME type */ + /* for changing BLOB repository file MIME type */ 'bs_db', 'bs_table', 'bs_ref', 'bs_new_mime_type' ); /** @@ -966,10 +966,10 @@ if (! defined('PMA_MINIMUM_COMMON')) { unset($_SESSION['profiling']); } - // rajk - library file for blobstreaming + // library file for blobstreaming require_once './libraries/blobstreaming.lib.php'; - // rajk - checks for blobstreaming plugins and databases that support + // checks for blobstreaming plugins and databases that support // blobstreaming (by having the necessary tables for blobstreaming) if (checkBLOBStreamingPlugins()) { checkBLOBStreamableDatabases(); diff --git a/libraries/common.lib.php b/libraries/common.lib.php index d99793a..f161013 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -793,7 +793,7 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = $table_groups = array(); - // for blobstreaming - list of blobstreaming tables - rajk + // for blobstreaming - list of blobstreaming tables // load PMA configuration $PMA_Config = $GLOBALS['PMA_Config']; diff --git a/libraries/config.default.php b/libraries/config.default.php index d73bec7..377d828 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -138,7 +138,7 @@ $cfg['Servers'][$i]['connect_type'] = 'tcp'; */ $cfg['Servers'][$i]['extension'] = 'mysql'; -/* rajk - added for blobstreaming */ +/* added for blobstreaming */ $cfg['Servers'][$i]['bs_garbage_threshold'] = ''; $cfg['Servers'][$i]['bs_repository_threshold'] = ''; $cfg['Servers'][$i]['bs_temp_blob_timeout'] = ''; diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 88e5fb6..69a6aaf 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -298,7 +298,7 @@ function PMA_getTableCount($db) $num_tables = PMA_DBI_num_rows($tables); // for blobstreaming - get blobstreaming tables - // for use in determining if a table here is a blobstreaming table - rajk + // for use in determining if a table here is a blobstreaming table // load PMA configuration $PMA_Config = $GLOBALS['PMA_Config']; diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 13eb093..4e2ccc5 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1278,7 +1278,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if (!isset($row[$i]) || is_null($row[$i])) { $vertical_display['data'][$row_no][$i] = ' <td align="right"' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"><i>NULL</i></td>' . "\n"; } else { - // rajk - for blobstreaming + // for blobstreaming $bs_reference_exists = $allBSTablesExist = FALSE; diff --git a/tbl_change.php b/tbl_change.php index 263e4ab..cbeda52 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -818,7 +818,7 @@ foreach ($rows as $row_id => $vrow) { if (($cfg['ProtectBinary'] && $field['is_blob']) || ($cfg['ProtectBinary'] == 'all' && $field['is_binary'])) { echo "\n"; - // rajk - for blobstreaming + // for blobstreaming $bs_reference_exists = FALSE; if (isset ($tbl_type) && strlen ($tbl_type) > 0) @@ -917,7 +917,6 @@ foreach ($rows as $row_id => $vrow) { // (displayed whatever value the ProtectBinary has) if ($is_upload && $field['is_blob']) { - // added by rajk // check if field type is of longblob if ($field['pma_type'] == "longblob") { diff --git a/tbl_replace.php b/tbl_replace.php index 5e7b977..39bf6a2 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -226,7 +226,7 @@ foreach ($loop_array as $rowcount => $where_clause) { require './libraries/tbl_replace_fields.inc.php'; - // rajk - for blobstreaming + // for blobstreaming if ($blob_streaming_active && (NULL != $primary_field || strlen($primary_field) > 0)) { $remove_blob_repo = isset($_REQUEST['remove_blob_repo_' . $key]) ? $_REQUEST['remove_blob_repo_' . $key] : NULL; $upload_blob_repo = isset($_REQUEST['upload_blob_repo_' . $key]) ? $_REQUEST['upload_blob_repo_' . $key] : NULL; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1380-g6b5f3b9
by Marc Delisle 05 Apr '10

05 Apr '10

The branch, master has been updated via 6b5f3b996201be64d344eded98db712aefa53417 (commit) from 360101dbfb809d2ecd080a836e91f9d2d3a33ea3 (commit) - Log ----------------------------------------------------------------- commit 6b5f3b996201be64d344eded98db712aefa53417 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Apr 5 09:09:35 2010 -0400 finish conversion of Replication feature from Mootools to jQuery ----------------------------------------------------------------------- Summary of changes: js/replication.js | 27 ++++++++++++++++++++++++ libraries/common.lib.php | 26 ----------------------- libraries/replication.inc.php | 2 - libraries/replication_gui.lib.php | 41 ------------------------------------- server_replication.php | 4 +-- 5 files changed, 28 insertions(+), 72 deletions(-) diff --git a/js/replication.js b/js/replication.js index 0912125..c3e77e8 100644 --- a/js/replication.js +++ b/js/replication.js @@ -4,6 +4,30 @@ * */ $(document).ready(function() { + var conf_database_list = ""; + var random_server_id = Math.floor(Math.random() * 10000000); + var conf_prefix = "server-id=" + random_server_id + "<br />log-bin=mysql-bin<br />log-error=mysql-bin.err<br />"; + var conf_ignore = "binlog_ignore_db="; + var conf_do = "binlog_do_db="; + $('#rep').html(conf_prefix); + $('#db_type').change(function() { + if ($('#db_type option:selected').val() == 'all') + $('#rep').html(conf_prefix + conf_ignore + conf_database_list); + else + $('#rep').html(conf_prefix + conf_do + conf_database_list); + }); + $('#db_select').change(function() { + conf_database_list = $('#db_select option:selected:first').val(); + $('#db_select option:selected:not(:first)').each(function() { + conf_database_list += ',' + $(this).val(); + }); + // todo: avoid repeating these 5 lines: + if ($('#db_type option:selected').val() == 'all') + $('#rep').html(conf_prefix + conf_ignore + conf_database_list); + else + $('#rep').html(conf_prefix + conf_do + conf_database_list); + }); + $('#master_status_href').click(function() { $('#replication_master_section').toggle(); }); @@ -22,4 +46,7 @@ $(document).ready(function() { $('#slave_synchronization_href').click(function() { $('#slave_synchronization_gui').toggle(); }); + $('#db_reset_href').click(function() { + $('#db_select option:selected').attr('selected', false); + }); }); diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 3e8a180..d99793a 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2730,32 +2730,6 @@ function PMA_getTitleForTarget($target) { return $GLOBALS[$GLOBALS['cfg']['DefaultTabTranslationMapping'][$target]]; } -/** - * The function creates javascript and html code, which run given mootools/JS code when DOM is ready - * - * @param String $code - Mootools/JS code, which will be run - * @param boolena $print - If true, then the code is printed, otherwise is returned - * - * @return String - the code - */ -function PMA_js_mootools_domready($code, $print=true) -{ - // these generated newlines are needed - $out = ''; - $out .= '<script type="text/javascript">'; - $out .= "\n" . '// <![CDATA[' . "\n"; - $out .= 'window.addEvent(\'domready\',function() {'; - $out .= $code; - $out .= '});'; - $out .= "\n" . '// ]]>' . "\n"; - $out .= '</script>'; - - //if ($print) - // echo $out; - - return $out; -} - function PMA_js($code, $print=true) { // these generated newlines are needed diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index 0504428..f2681a6 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -90,8 +90,6 @@ $slave_variables_oks = array( 'Slave_SQL_Running' => 'Yes', ); -$serverid = time(); - // check which replication is available and set $server_{master/slave}_status and assign values foreach ($replication_types as $type) { if (count(${"server_{$type}_replication"}) > 0) { diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index 9a015ff..2f508ff 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -9,47 +9,6 @@ if (! defined('PHPMYADMIN')) { exit; } -// Add JS events to generate example my.cnf config lines -$jscode['configure_master'] = - 'var c_output = "";' . "\n" . - 'var c_text = "server-id=' . $serverid . '<br />log-bin=mysql-bin<br />log-error=mysql-bin.err<br />";' . "\n" . - 'var c_ignore = "binlog_ignore_db=";' . "\n" . - 'var c_do = "binlog_do_db=";' . "\n" . - - '$(\'db_reset_href\').addEvent(\'click\', function() {' . "\n" . - ' $(\'db_select\').getSelected().each(function(el) {' . "\n" . - ' el.selected = false;' . "\n" . - ' });' . "\n" . - ' $(\'rep\').set(\'html\', c_text);' . "\n" . - '});' . "\n" . - '$(\'db_type\').addEvent(\'change\',function() {' . "\n" . - ' if ($(\'db_type\').getSelected().get(\'value\')=="all")' . "\n" . - ' $(\'rep\').set(\'html\', c_text+c_ignore+c_output);' . "\n" . - ' else' . "\n" . - ' $(\'rep\').set(\'html\', c_text+c_do+c_output);' . "\n" . - '});' . "\n" . - - '$(\'db_select\').addEvent(\'change\',function() {' . "\n" . - ' var count = 0;' . "\n" . - - ' $(\'db_select\').getSelected().each(function(el) { ' . "\n" . - ' if (count==0)' . "\n" . - ' c_output = el.get(\'value\');' . "\n" . - ' else' . "\n" . - ' c_output = c_output + \',\' +el.get(\'value\');' . "\n" . - - ' count=count+1;' . "\n" . - - ' if ($(\'db_select\').getSelected().length==count) {' . "\n" . - ' if ($(\'db_type\').getSelected().get(\'value\')=="all")' . "\n" . - ' $(\'rep\').set(\'html\', c_text+c_ignore+c_output);' . "\n" . - ' else' . "\n" . - ' $(\'rep\').set(\'html\', c_text+c_do+c_output);' . "\n" . - ' count = 0;' . "\n" . - ' }' . "\n" . - ' });' . "\n" . - '});' . "\n"; - /** * returns code for selecting databases * diff --git a/server_replication.php b/server_replication.php index ddf681f..285bca7 100644 --- a/server_replication.php +++ b/server_replication.php @@ -16,7 +16,6 @@ require_once './libraries/common.inc.php'; */ $GLOBALS['js_include'][] = 'server_privileges.js'; $GLOBALS['js_include'][] = 'functions.js'; -$GLOBALS['js_include'][] = 'mootools-more.js'; $GLOBALS['js_include'][] = 'replication.js'; require './libraries/server_common.inc.php'; @@ -214,7 +213,6 @@ if ($server_master_status) { if (isset($GLOBALS['mr_configure'])) { // Render the 'Master configuration' section - echo PMA_js_mootools_domready($jscode['configure_master']); echo '<fieldset>'; echo '<legend>' . $GLOBALS['strReplicationMasterConfiguration'] . '</legend>'; echo $GLOBALS['strReplicationMasterChooseMode'] . '<br /><br />'; @@ -228,7 +226,7 @@ if (isset($GLOBALS['mr_configure'])) { echo PMA_replication_db_multibox(); echo '<br /><br />'; echo $GLOBALS['strReplicationAddLines'] . '<br />'; - echo '<pre id="rep">server-id='. $serverid . '<br />log-bin=mysql-bin<br />log-error=mysql-bin.err<br /></pre>'; + echo '<pre id="rep"></pre>'; echo $GLOBALS['strReplicationRestartServer']; echo '</fieldset>'; echo '<fieldset class="tblFooters">'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1379-g360101d
by Marc Delisle 04 Apr '10

04 Apr '10

The branch, master has been updated via 360101dbfb809d2ecd080a836e91f9d2d3a33ea3 (commit) via 1f62ea1932a3b4d39cbc64d5b2dcaab81ead78d7 (commit) via 44ec2ede9560fdb63d7d61708dfdffd5813869b6 (commit) from 97ee9b6754000622219e020e3984042dca1291d5 (commit) - Log ----------------------------------------------------------------- commit 360101dbfb809d2ecd080a836e91f9d2d3a33ea3 Merge: 97ee9b6754000622219e020e3984042dca1291d5 1f62ea1932a3b4d39cbc64d5b2dcaab81ead78d7 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Apr 4 17:30:36 2010 -0400 bug #2973949 SQL History broken (need to revert patch #2899969) ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ sql.php | 7 ------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7976e2..a87c0ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,8 @@ $Id$ - patch #2979234, bug #2960105 [import] Properly import unicode text from ODS. - bug #2973280 [export] Proper handling of temporary directory in XLS export. - bug #2980582 [interface] Properly format server status parameter. +- bug #2973949 [session] SQL History broken (revert patch #2899969), + thanks to Dieter Adriaenssens - ruleant 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/sql.php b/sql.php index ce9a0d2..16f47ac 100644 --- a/sql.php +++ b/sql.php @@ -294,13 +294,6 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { PMA_DBI_query('SET PROFILING=1;'); } - // fisharebest: release the session lock, otherwise we won't be able to run other - // scripts until the query has finished (which could take a very long time). - // Note: footer.inc.php writes debug info to $_SESSION, so debuggers will have to wait. - if (empty($_SESSION['debug'])) { - session_write_close(); - } - // Measure query time. // TODO-Item http://sourceforge.net/tracker/index.php?func=detail&aid=571934&group_id=23… $querytime_before = array_sum(explode(' ', microtime())); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-89-g1f62ea1
by Marc Delisle 04 Apr '10

04 Apr '10

The branch, QA_3_3 has been updated via 1f62ea1932a3b4d39cbc64d5b2dcaab81ead78d7 (commit) from 44ec2ede9560fdb63d7d61708dfdffd5813869b6 (commit) - Log ----------------------------------------------------------------- commit 1f62ea1932a3b4d39cbc64d5b2dcaab81ead78d7 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Apr 4 17:21:48 2010 -0400 bug #2973949 SQL History broken (need to revert patch #2899969) ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ sql.php | 7 ------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index c02f8c9..eb437d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - patch #2979234, bug #2960105 [import] Properly import unicode text from ODS. - bug #2973280 [export] Proper handling of temporary directory in XLS export. - bug #2980582 [interface] Properly format server status parameter. +- bug #2973949 [session] SQL History broken (revert patch #2899969), + thanks to Dieter Adriaenssens - ruleant 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/sql.php b/sql.php index 248ebe3..4898860 100644 --- a/sql.php +++ b/sql.php @@ -294,13 +294,6 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { PMA_DBI_query('SET PROFILING=1;'); } - // fisharebest: release the session lock, otherwise we won't be able to run other - // scripts until the query has finished (which could take a very long time). - // Note: footer.inc.php writes debug info to $_SESSION, so debuggers will have to wait. - if (empty($_SESSION['debug'])) { - session_write_close(); - } - // garvin: Measure query time. // TODO-Item http://sourceforge.net/tracker/index.php?func=detail&aid=571934&group_id=23… $querytime_before = array_sum(explode(' ', microtime())); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-88-g44ec2ed
by Marc Delisle 04 Apr '10

04 Apr '10

The branch, QA_3_3 has been updated via 44ec2ede9560fdb63d7d61708dfdffd5813869b6 (commit) from 366d50a79b53c827926f97e14ee2f6937f161909 (commit) - Log ----------------------------------------------------------------- commit 44ec2ede9560fdb63d7d61708dfdffd5813869b6 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Apr 4 17:04:41 2010 -0400 add locale to .gitignore for this branch too ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 83fc036..8a1aa74 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ phpmyadmin.wpj .buildpath .cache *.sw[op] +locale hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1376-g97ee9b6
by Michal Čihař 04 Apr '10

04 Apr '10

The branch, master has been updated via 97ee9b6754000622219e020e3984042dca1291d5 (commit) via aa4ff27445d600f0dcbc105a43672f1dfd314144 (commit) via c6b6364e18e3e75bef51fe3ee0f2a107213b91e5 (commit) via 66182dbf420e1d880e0aee6bd8afc19bab0e0d0d (commit) via 828d0ec3ebc0d75c0fa76997ee352d97ca0ceebf (commit) from 40f0926df3ff4241825f3b16657a3f03a443975c (commit) - Log ----------------------------------------------------------------- commit 97ee9b6754000622219e020e3984042dca1291d5 Merge: aa4ff27445d600f0dcbc105a43672f1dfd314144 40f0926df3ff4241825f3b16657a3f03a443975c Author: Michal Čihař <michal(a)cihar.com> Date: Sat Apr 3 14:40:15 2010 +0200 Merge remote branch 'origin/master' commit aa4ff27445d600f0dcbc105a43672f1dfd314144 Author: hitowerdigit <hitowerdigit(a)hotmail.com> Date: Sat Apr 3 11:44:39 2010 +0200 Translation update done using Pootle. commit c6b6364e18e3e75bef51fe3ee0f2a107213b91e5 Author: hitowerdigit <hitowerdigit(a)hotmail.com> Date: Sat Apr 3 11:43:47 2010 +0200 Translation update done using Pootle. commit 66182dbf420e1d880e0aee6bd8afc19bab0e0d0d Author: hitowerdigit <hitowerdigit(a)hotmail.com> Date: Sat Apr 3 11:39:39 2010 +0200 Translation update done using Pootle. commit 828d0ec3ebc0d75c0fa76997ee352d97ca0ceebf Author: hitowerdigit <hitowerdigit(a)hotmail.com> Date: Sat Apr 3 11:21:10 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/po/tr.po b/po/tr.po index 3250f3d..518603e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ 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-04-02 13:41+0200\n" -"PO-Revision-Date: 2010-04-02 21:25+0200\n" +"PO-Revision-Date: 2010-04-03 11:44+0200\n" "Last-Translator: <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -45,7 +45,6 @@ msgstr "" #. l10n: Language to use for MySQL 5.1 documentation, please use only languages which do exist in official documentation. #: libraries/common.lib.php:411 -#, fuzzy msgctxt "$mysql_5_1_doc_lang" msgid "en" msgstr "tr" @@ -81,12 +80,11 @@ msgid_plural "%1$d rows deleted." msgstr[0] "%1$d satır silindi." #: libraries/Message.class.php:320 -#, fuzzy, php-format +#, php-format #| msgid "%1$d row(s) inserted." msgid "%1$d row inserted." msgid_plural "%1$d rows inserted." msgstr[0] "%1$d satır eklendi." -msgstr[1] "%1$d satır eklendi." #. l10n: Text direction, use either ltr or rtl #: libraries/messages.inc.php:19 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1371-g40f0926
by Marc Delisle 03 Apr '10

03 Apr '10

The branch, master has been updated via 40f0926df3ff4241825f3b16657a3f03a443975c (commit) from fae8e48818084e3569e194f0f1a0bc07bbb49f70 (commit) - Log ----------------------------------------------------------------- commit 40f0926df3ff4241825f3b16657a3f03a443975c Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Apr 3 07:45:54 2010 -0400 Must not load the full common.inc.php in a PHP script that only generates js ----------------------------------------------------------------------- Summary of changes: js/messages.php | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/js/messages.php b/js/messages.php index f8239f7..4a19361 100644 --- a/js/messages.php +++ b/js/messages.php @@ -15,7 +15,12 @@ header('Content-Type: text/javascript; charset=UTF-8'); // file is reloaded when config changes header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT'); +// Avoid loading the full common.inc.php because this would add many +// non-js-compatible stuff like DOCTYPE +define('PMA_MINIMUM_COMMON', true); require_once './libraries/common.inc.php'; +// But this one is needed for PMA_escapeJsString() +require_once './libraries/js_escape.lib.php'; $js_messages['strFormEmpty'] = $GLOBALS['strFormEmpty']; $js_messages['strNotNumber'] = $GLOBALS['strNotNumber']; hooks/post-receive -- phpMyAdmin

1 0