April 2010 - Git - lists.phpmyadmin.net

[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

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1370-gfae8e48
by Michal Čihař 03 Apr '10

03 Apr '10

The branch, master has been updated via fae8e48818084e3569e194f0f1a0bc07bbb49f70 (commit) via 6d374e4db27f507f14dc5ff30005c081c87d219b (commit) via 781fca3e2fc6111649cdec9fc454ddd6378452c1 (commit) via 9dc1de34733199fb5db364f90d2eca7abce32782 (commit) via ab9ee1960a0ce185d940a3ce198325c36039c0f0 (commit) via 1ae1d3d452e85e4200eae04891003292109bcfbe (commit) via 46bbc8320ead2f7ef95777279cda4f76a5313757 (commit) via a97c189a2fe06cad144345be533c75a14e6d8830 (commit) via 69f7ffd6f9dcf61922bbd22da36c5d1880d324ea (commit) via 951f6ba9ae686420dfa7d93a4be6af04089bc850 (commit) via 783148d9f63cb096f18965a59d0dff21cac9927a (commit) via cbc61f2b55113ce50f394b31fb76c1e846a873c5 (commit) via c42b5c14724592588d25d9210a2c8d15a0b1f4ce (commit) from 5c263563796e5cb8e8c4b90d1b64104b0b705aaf (commit) - Log ----------------------------------------------------------------- commit fae8e48818084e3569e194f0f1a0bc07bbb49f70 Merge: 6d374e4db27f507f14dc5ff30005c081c87d219b 5c263563796e5cb8e8c4b90d1b64104b0b705aaf Author: Michal Čihař <michal(a)cihar.com> Date: Sat Apr 3 02:40:27 2010 +0200 Merge remote branch 'origin/master' commit 6d374e4db27f507f14dc5ff30005c081c87d219b Merge: 781fca3e2fc6111649cdec9fc454ddd6378452c1 f32e8001e21ffb5643a245bc615c65a9db1e71b7 Author: Michal Čihař <michal(a)cihar.com> Date: Sat Apr 3 00:40:19 2010 +0200 Merge remote branch 'origin/master' commit 781fca3e2fc6111649cdec9fc454ddd6378452c1 Author: hitowerdigit <hitowerdigit(a)hotmail.com> Date: Fri Apr 2 21:25:52 2010 +0200 Translation update done using Pootle. commit 9dc1de34733199fb5db364f90d2eca7abce32782 Author: hitowerdigit <hitowerdigit(a)hotmail.com> Date: Fri Apr 2 21:25:44 2010 +0200 Translation update done using Pootle. commit ab9ee1960a0ce185d940a3ce198325c36039c0f0 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Apr 2 18:26:51 2010 +0200 Translation update done using Pootle. commit 1ae1d3d452e85e4200eae04891003292109bcfbe Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Apr 2 18:26:17 2010 +0200 Translation update done using Pootle. commit 46bbc8320ead2f7ef95777279cda4f76a5313757 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Apr 2 18:25:58 2010 +0200 Translation update done using Pootle. commit a97c189a2fe06cad144345be533c75a14e6d8830 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Apr 2 18:25:36 2010 +0200 Translation update done using Pootle. commit 69f7ffd6f9dcf61922bbd22da36c5d1880d324ea Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Apr 2 18:25:22 2010 +0200 Translation update done using Pootle. commit 951f6ba9ae686420dfa7d93a4be6af04089bc850 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Apr 2 18:24:38 2010 +0200 Translation update done using Pootle. commit 783148d9f63cb096f18965a59d0dff21cac9927a Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Apr 2 18:24:22 2010 +0200 Translation update done using Pootle. commit cbc61f2b55113ce50f394b31fb76c1e846a873c5 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Apr 2 18:24:16 2010 +0200 Translation update done using Pootle. commit c42b5c14724592588d25d9210a2c8d15a0b1f4ce Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Apr 2 18:22:43 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/lt.po | 20 +++++++++----------- po/tr.po | 14 +++++++------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/po/lt.po b/po/lt.po index ad41470..21408aa 100644 --- a/po/lt.po +++ b/po/lt.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-04-02 13:41+0200\n" -"PO-Revision-Date: 2010-03-30 20:28+0200\n" -"Last-Translator: Rytis <rytis.s(a)gmail.com>\n" +"PO-Revision-Date: 2010-04-02 18:26+0200\n" +"Last-Translator: <edgaras.janusauskas(a)gmail.com>\n" "Language-Team: lithuanian <lt(a)li.org>\n" +"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: lt\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" "100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.1\n" @@ -313,11 +313,11 @@ msgstr "Sugrįžti į buvusį puslapį" #: libraries/messages.inc.php:55 msgid "Insert another new row" -msgstr "Įterpti sekančią naują eilutę" +msgstr "Įterpti kitą naują eilutę" #: libraries/messages.inc.php:56 msgid "Edit next row" -msgstr "Redaguoti sekantį įrašą" +msgstr "Redaguoti kitą įrašą" #: libraries/messages.inc.php:57 msgid "Go back to this page" @@ -343,7 +343,7 @@ msgstr "rodyti visas lenteles vienodo pločio?" #: libraries/messages.inc.php:61 msgid "Alter table order by" -msgstr "Pakeisti lentelės rūšiavimą pagal:" +msgstr "Pakeisti lentelės rikiavimą pagal:" #: libraries/messages.inc.php:62 msgid "Analyze" @@ -463,11 +463,11 @@ msgstr "Binarinis logas" #: libraries/messages.inc.php:91 msgid "Event type" -msgstr "Event'o tipas" +msgstr "Įvykio tipas" #: libraries/messages.inc.php:92 msgid "Information" -msgstr "Informatcija" +msgstr "Informacija" #: libraries/messages.inc.php:93 msgid "Log name" @@ -499,7 +499,6 @@ msgid "Are you sure you want to disable all BLOB references for database %s?" msgstr "" #: libraries/messages.inc.php:100 -#, fuzzy msgctxt "$strBLOBRepositoryDisabled" msgid "Disabled" msgstr "Išjungta" @@ -526,7 +525,6 @@ msgid "Remove BLOB Repository Reference" msgstr "" #: libraries/messages.inc.php:106 -#, fuzzy msgctxt "$strBLOBRepositoryRepair" msgid "Repair" msgstr "Taisyti" @@ -7462,7 +7460,7 @@ msgstr "" #: setup/lib/messages.inc.php:381 msgid "ZIP" -msgstr "" +msgstr "ZIP" #~ msgid "utf-8" #~ msgstr "utf-8" diff --git a/po/tr.po b/po/tr.po index 5ea5daf..3250f3d 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,13 +4,15 @@ 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-03-12 09:19+0100\n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2010-04-02 21:25+0200\n" +"Last-Translator: <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" -"X-Generator: Translate Toolkit 1.5.3\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Pootle 2.0.1\n" #: js/messages.php:45 libraries/messages.inc.php:372 msgid "Go" @@ -65,20 +67,18 @@ msgid "Inline" msgstr "Motorlar" #: libraries/Message.class.php:282 -#, fuzzy, php-format +#, php-format #| msgid "%1$d row(s) affected." msgid "%1$d row affected." msgid_plural "%1$d rows affected." msgstr[0] "%1$d satır etkilendi." -msgstr[1] "%1$d satır etkilendi." #: libraries/Message.class.php:301 -#, fuzzy, php-format +#, php-format #| msgid "%1$d row(s) deleted." msgid "%1$d row deleted." msgid_plural "%1$d rows deleted." msgstr[0] "%1$d satır silindi." -msgstr[1] "%1$d satır silindi." #: libraries/Message.class.php:320 #, fuzzy, php-format hooks/post-receive -- phpMyAdmin

1 0

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

03 Apr '10

The branch, master has been updated via 5c263563796e5cb8e8c4b90d1b64104b0b705aaf (commit) from f32e8001e21ffb5643a245bc615c65a9db1e71b7 (commit) - Log ----------------------------------------------------------------- commit 5c263563796e5cb8e8c4b90d1b64104b0b705aaf Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Apr 2 18:57:28 2010 -0400 start porting Replication to jQuery ----------------------------------------------------------------------- Summary of changes: js/replication.js | 25 +++++++++++++++++++++++++ libraries/common.lib.php | 4 ++-- libraries/replication_gui.lib.php | 11 ----------- server_replication.php | 4 +--- 4 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 js/replication.js diff --git a/js/replication.js b/js/replication.js new file mode 100644 index 0000000..0912125 --- /dev/null +++ b/js/replication.js @@ -0,0 +1,25 @@ +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * for server_replication.php + * + */ +$(document).ready(function() { + $('#master_status_href').click(function() { + $('#replication_master_section').toggle(); + }); + $('#master_slaves_href').click(function() { + $('#replication_slaves_section').toggle(); + }); + $('#slave_status_href').click(function() { + $('#replication_slave_section').toggle(); + }); + $('#slave_control_href').click(function() { + $('#slave_control_gui').toggle(); + }); + $('#slave_errormanagement_href').click(function() { + $('#slave_errormanagement_gui').toggle(); + }); + $('#slave_synchronization_href').click(function() { + $('#slave_synchronization_gui').toggle(); + }); +}); diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 816bdbe..3e8a180 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2750,8 +2750,8 @@ function PMA_js_mootools_domready($code, $print=true) $out .= "\n" . '// ]]>' . "\n"; $out .= '</script>'; - if ($print) - echo $out; + //if ($print) + // echo $out; return $out; } diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index 6027bec..9a015ff 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -9,9 +9,6 @@ if (! defined('PHPMYADMIN')) { exit; } -$jscode['master_replication'] = 'divShowHideFunc(\'master_status_href\', \'replication_master_section\');' . "\n" - . 'divShowHideFunc(\'master_slaves_href\', \'replication_slaves_section\');' . "\n"; - // Add JS events to generate example my.cnf config lines $jscode['configure_master'] = 'var c_output = "";' . "\n" . @@ -53,14 +50,6 @@ $jscode['configure_master'] = ' });' . "\n" . '});' . "\n"; -$jscode['slave_control'] = - 'divShowHideFunc(\'slave_status_href\', \'replication_slave_section\');' . "\n" . - 'divShowHideFunc(\'slave_control_href\', \'slave_control_gui\');' . "\n" . - 'divShowHideFunc(\'slave_errormanagement_href\',\'slave_errormanagement_gui\'); ' . "\n"; - -$jscode['slave_control_sync'] = - 'divShowHideFunc(\'slave_synchronization_href\', \'slave_synchronization_gui\');' . "\n"; - /** * returns code for selecting databases * diff --git a/server_replication.php b/server_replication.php index 7397d76..ddf681f 100644 --- a/server_replication.php +++ b/server_replication.php @@ -17,6 +17,7 @@ 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'; require './libraries/replication.inc.php'; @@ -177,7 +178,6 @@ if (isset($_SESSION['replication']['sr_action_status']) && isset($_SESSION['repl if ($server_master_status) { if (! isset($GLOBALS['repl_clear_scr'])) { - echo PMA_js_mootools_domready($jscode['master_replication']); echo '<fieldset>'; echo '<legend>' . $GLOBALS['strReplicationMaster'] . '</legend>'; echo $GLOBALS['strReplicationConfiguredMaster']; @@ -249,7 +249,6 @@ if (! isset($GLOBALS['repl_clear_scr'])) { echo '<fieldset>'; echo '<legend>' . $GLOBALS['strReplicationSlave'] . '</legend>'; if ($server_slave_status) { - echo PMA_js_mootools_domready($jscode['slave_control']); echo '<div id="slave_configuration_gui">'; $_url_params = $GLOBALS['url_params']; @@ -311,7 +310,6 @@ if (! isset($GLOBALS['repl_clear_scr'])) { echo ' <li><a href="#" id="slave_status_href">' . $GLOBALS['strReplicationSlaveSeeStatus'] . '</a></li>'; echo PMA_replication_print_status_table('slave', true, false); if (isset($_SESSION['replication']['m_correct']) && $_SESSION['replication']['m_correct'] == true) { - echo PMA_js_mootools_domready($jscode['slave_control_sync']); echo ' <li><a href="#" id="slave_synchronization_href">' . $GLOBALS['strReplicationSynchronize'] . '</a></li>'; echo ' <div id="slave_synchronization_gui" style="display: none">'; echo ' <form method="post" action="server_replication.php">'; hooks/post-receive -- phpMyAdmin

1 0

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

03 Apr '10

The branch, master has been updated via f32e8001e21ffb5643a245bc615c65a9db1e71b7 (commit) from 85ca96cb9d129148557380ab8e90a39ead00a873 (commit) - Log ----------------------------------------------------------------- commit f32e8001e21ffb5643a245bc615c65a9db1e71b7 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Apr 2 18:02:08 2010 -0400 leaner jQuery way ----------------------------------------------------------------------- Summary of changes: js/server_synchronize.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/server_synchronize.js b/js/server_synchronize.js index e8e626b..6aa0a37 100644 --- a/js/server_synchronize.js +++ b/js/server_synchronize.js @@ -5,6 +5,6 @@ */ $(document).ready(function() { $('.server_selector').change(function() { - $(this).parent().parent().parent().children('.toggler').toggle(); + $(this).closest('tbody').children('.toggler').toggle(); }); }); hooks/post-receive -- phpMyAdmin

1 0