- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2RC1-1417-ga63410c
by Marc Delisle 10 Apr '10

10 Apr '10

The branch, master has been updated via a63410cfbfd06dc6df6017a81d8e41cd936f1ff9 (commit) from 3c475d85992a844f416f63c8d49c21217532c7e3 (commit) - Log ----------------------------------------------------------------- commit a63410cfbfd06dc6df6017a81d8e41cd936f1ff9 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Apr 10 09:41:40 2010 -0400 Use input field instead of textarea for additional criteria ----------------------------------------------------------------------- Summary of changes: db_qbe.php | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/db_qbe.php b/db_qbe.php index 04a7e55..5b8c817 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -384,7 +384,7 @@ for ($y = 0; $y <= $row; $y++) { $or = 'Or' . $w . '[' . $z . ']'; ?> <td align="center"> - <textarea cols="20" rows="2" style="width: <?php echo $realwidth; ?>" name="<?php echo $or; ?>" dir="<?php echo $text_dir; ?>"></textarea> + <input type="text" name="Or<?php echo $or; ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" /> </td> <?php $z++; @@ -397,7 +397,7 @@ for ($y = 0; $y <= $row; $y++) { $or = 'Or' . $w . '[' . $z . ']'; ?> <td align="center"> - <textarea cols="20" rows="2" style="width: <?php echo $realwidth; ?>" name="<?php echo $or; ?>" dir="<?php echo $text_dir; ?>"></textarea> + <input type="text" name="Or<?php echo $or; ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" /> </td> <?php $z++; @@ -464,7 +464,7 @@ for ($y = 0; $y <= $row; $y++) { $or = 'Or' . $w . '[' . $z . ']'; ?> <td align="center"> - <textarea cols="20" rows="2" style="width: <?php echo $realwidth; ?>" name="<?php echo $or; ?>" dir="<?php echo $text_dir; ?>"></textarea> + <input type="text" name="Or<?php echo $or; ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" /> </td> <?php $z++; @@ -485,7 +485,7 @@ for ($y = 0; $y <= $row; $y++) { } ?> <td align="center"> - <textarea cols="20" rows="2" style="width: <?php echo $realwidth; ?>" name="Or<?php echo $w . '[' . $z . ']'; ?>" dir="<?php echo $text_dir; ?>"><?php echo htmlspecialchars($stripped_or); ?></textarea> + <input type="text" name="Or<?php echo $w . '[' . $z . ']'; ?>" value="<?php echo htmlspecialchars($stripped_or); ?>" class="textfield" style="width: <?php echo $realwidth; ?>" size="20" /> </td> <?php if (!empty(${$or}) && isset(${$or}[$x])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2RC1-1416-g3c475d8
by Marc Delisle 10 Apr '10

10 Apr '10

The branch, master has been updated via 3c475d85992a844f416f63c8d49c21217532c7e3 (commit) via d0d24a6e714646a3660c64549382c07375967feb (commit) from 1d111e12b10a9908307fcb94ac2aa829ec56adb9 (commit) - Log ----------------------------------------------------------------- commit 3c475d85992a844f416f63c8d49c21217532c7e3 Merge: 1d111e12b10a9908307fcb94ac2aa829ec56adb9 d0d24a6e714646a3660c64549382c07375967feb Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Apr 10 07:25:42 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/engines/innodb.lib.php | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index cbf532c..9d9b8ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,8 @@ $Id$ thanks to Lorikeet Lee. - patch #2983492 [sync] When asking to synchronize Structure and Data, only Structure is done, thanks to Ankit Gupta - ankitgupta3 +- patch #2984893 [engines] InnoDB storage page emits a warning, + thanks to Madhura Jayaratne - madhuracj 3.3.2.0 (not yet released) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php index 4d7caba..b2301c1 100644 --- a/libraries/engines/innodb.lib.php +++ b/libraries/engines/innodb.lib.php @@ -109,7 +109,7 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC, ), 'innodb_table_locks' => array( - 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC, + 'type' => PMA_ENGINE_DETAILS_TYPE_BOOLEAN, ), 'innodb_thread_concurrency' => array( 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2RC1-19-gd0d24a6
by Marc Delisle 10 Apr '10

10 Apr '10

The branch, QA_3_3 has been updated via d0d24a6e714646a3660c64549382c07375967feb (commit) from a59d10027bd7fb5a54c8458ed55612dbbcaf2a67 (commit) - Log ----------------------------------------------------------------- commit d0d24a6e714646a3660c64549382c07375967feb Author: Madhura Jayaratne <madhuracj(a)users.sourceforge.net> Date: Sat Apr 10 07:22:37 2010 -0400 Patch #2984893 - InnoDB storage page emits warning ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/engines/innodb.lib.php | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 718ac6b..ab8e8c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to Lorikeet Lee. - patch #2983492 [sync] When asking to synchronize Structure and Data, only Structure is done, thanks to Ankit Gupta - ankitgupta3 +- patch #2984893 [engines] InnoDB storage page emits a warning, + thanks to Madhura Jayaratne - madhuracj 3.3.2.0 (not yet released) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php index 894d7ed..44e53f7 100644 --- a/libraries/engines/innodb.lib.php +++ b/libraries/engines/innodb.lib.php @@ -109,7 +109,7 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC, ), 'innodb_table_locks' => array( - 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC, + 'type' => PMA_ENGINE_DETAILS_TYPE_BOOLEAN, ), 'innodb_thread_concurrency' => array( 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2RC1-1414-g1d111e1
by Michal Čihař 09 Apr '10

09 Apr '10

The branch, master has been updated via 1d111e12b10a9908307fcb94ac2aa829ec56adb9 (commit) from 2142f5f70be44da2a169da402bf262ad654b8212 (commit) - Log ----------------------------------------------------------------- commit 1d111e12b10a9908307fcb94ac2aa829ec56adb9 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 9 16:57:51 2010 +0200 Improve Czech translation. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/po/cs.po b/po/cs.po index d380d91..1606989 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,7 +5,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-09 14:06+0200\n" -"PO-Revision-Date: 2010-04-09 14:15+0200\n" +"PO-Revision-Date: 2010-04-09 16:57+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -3592,6 +3592,8 @@ msgid "" "Only slaves started with the --report-host=host_name option are visible in " "this list." msgstr "" +"V tomto seznamu jsou zobrazeny jen podřízené servery spuštěné s parametrem --" +"report-host=host_name." #: libraries/messages.inc.php:797 msgid "Show connected slaves" @@ -3618,7 +3620,7 @@ msgstr "Nastavení podřízeného" #: libraries/messages.inc.php:802 msgid "" "Server is configured as slave in a replication process. Would you like to:" -msgstr "" +msgstr "Server je nastaven jako podřízený v replikačním procesu. Přejete si:" #: libraries/messages.inc.php:803 msgid "Error management:" @@ -3627,11 +3629,11 @@ msgstr "Práce s chybami:" #: libraries/messages.inc.php:804 #, php-format msgid "IO Thread %s only" -msgstr "" +msgstr "%s jen IO vlákno" #: libraries/messages.inc.php:805 msgid "Slave IO Thread not running!" -msgstr "" +msgstr "IO vlákno pro podřízený server neběží!" #: libraries/messages.inc.php:806 #, php-format @@ -3666,12 +3668,12 @@ msgstr "Replikace podřízeného" #: libraries/messages.inc.php:813 msgid "Slave SQL Thread not running!" -msgstr "Vlákno pro podřízený SQL server neběží!" +msgstr "SQL vlákno pro podřízený server neběží!" #: libraries/messages.inc.php:814 #, php-format msgid "SQL Thread %s only" -msgstr "" +msgstr "%s jen SQL vlákno" #: libraries/messages.inc.php:815 #, php-format @@ -7169,6 +7171,8 @@ msgid "" "Leave blank for no Designer support, suggested: [kbd]pma_designer_coords[/" "kbd]" msgstr "" +"Nechte prázné pro vypnutí návrháře, výchozí nastavení: [kbd]" +"pma_designer_coords[/kbd]" #: setup/lib/messages.inc.php:268 msgid "Designer table" @@ -7229,21 +7233,22 @@ msgid "" "Leave blank for no SQL query history support, suggested: [kbd]pma_history[/" "kbd]" msgstr "" +"Nechte prázné pro vypnutí SQL historie, výchozí hodnota [kbd]pma_history[/" +"kbd]" #: setup/lib/messages.inc.php:278 msgid "SQL query history table" msgstr "Tabulka pro historii SQL dotazů" #: setup/lib/messages.inc.php:279 -#, fuzzy #| msgid "" #| "Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]" msgid "" "Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/" "kbd]" msgstr "" -"Nechte prázdné pro vypnutí podpory pro PDF schémata, výchozí nastavení: [kbd]" -"pma_table_pages[/kbd]" +"Nechte prázdné pro vypnutí podpory pro sledování SQL dotazů, výchozí " +"nastavení: [kbd]pma_tracking[/kbd]" #: setup/lib/messages.inc.php:280 msgid "SQL query tracking table" @@ -7441,6 +7446,8 @@ msgid "" "Table to describe the display fields, leave blank for no support; suggested: " "[kbd]pma_table_info[/kbd]" msgstr "" +"Tabulka obsahující popisy sloupců, nechte prázdnou pro vypnutí této funkce. " +"Výchozí hodnota: [kbd]pma_table_info[/kbd]" #: setup/lib/messages.inc.php:321 msgid "Display fields table" @@ -7523,6 +7530,8 @@ msgid "" "Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] " "output" msgstr "" +"Zobrazí link na výstup funkce [a@http://php.net/manual/function.phpinfo.php]" +"phpinfo()[/a]" #: setup/lib/messages.inc.php:339 msgid "Show phpinfo() link" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2RC1-1413-g2142f5f
by Michal Čihař 09 Apr '10

09 Apr '10

The branch, master has been updated via 2142f5f70be44da2a169da402bf262ad654b8212 (commit) via ab325e609a6c2845329ebe5cf18b88821648811c (commit) from ea8cc56becd008beb4cb9c5e7a4eb39195c2128a (commit) - Log ----------------------------------------------------------------- commit 2142f5f70be44da2a169da402bf262ad654b8212 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 9 16:09:29 2010 +0200 Rewrite generating master configuration. - Avoid code duplication. - Fix case when user unselected all databases. commit ab325e609a6c2845329ebe5cf18b88821648811c Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 9 15:39:56 2010 +0200 Whitespace cleanup. ----------------------------------------------------------------------- Summary of changes: js/replication.js | 43 +++++++++++++++++++------------------ libraries/display_import.lib.php | 30 +++++++++++++------------- 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/js/replication.js b/js/replication.js index c3e77e8..1a7c785 100644 --- a/js/replication.js +++ b/js/replication.js @@ -3,30 +3,31 @@ * for server_replication.php * */ -$(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 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 />"; + +function update_config() { var conf_ignore = "binlog_ignore_db="; var conf_do = "binlog_do_db="; + var database_list = $('#db_select option:selected:first').val(); + $('#db_select option:selected:not(:first)').each(function() { + database_list += ',' + $(this).val(); + }); + + if ($('#db_select option:selected').size() == 0) { + $('#rep').html(conf_prefix); + } else if ($('#db_type option:selected').val() == 'all') { + $('#rep').html(conf_prefix + conf_ignore + database_list); + } else { + $('#rep').html(conf_prefix + conf_do + database_list); + } +} + +$(document).ready(function() { $('#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); - }); + $('#db_type').change(update_config); + $('#db_select').change(update_config); $('#master_status_href').click(function() { $('#replication_master_section').toggle(); diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index b99a8e2..a1989cb 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -29,7 +29,7 @@ if (empty($import_list)) { <iframe id="import_upload_iframe" name="import_upload_iframe" width="1" height="1" style="display: none"></iframe> <div id="import_form_status" style="display: none;"></div> <div id="importmain"> -<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" style="display: none;" /> +<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" style="display: none;" /> <script type="text/javascript"> //<![CDATA[ window.addEvent('domready', function() { @@ -42,12 +42,12 @@ window.addEvent('domready', function() { if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { ?> $('upload_form_status').set('html', '<div class="upload_progress_bar_outer"><div id="status" class="upload_progress_bar_inner"></div></div>'); // add the progress bar - + var finished = false; var percent = 0.0; var total = 0; var complete = 0; - + var perform_upload; var periodical_upload; @@ -57,9 +57,9 @@ window.addEvent('domready', function() { update: 'upload_form_status', onComplete: function(response) { objectsReturned = JSON.decode(response); - + $each(objectsReturned, function(item, index) { - + if (index=="finished") { finished = item; if (finished==true) { @@ -68,19 +68,19 @@ window.addEvent('domready', function() { $('import_form_status').setStyle('display', 'inline'); $('import_form_status').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo $strImportProceedingFile; ?> '); $('import_form_status').load('import_status.php?message=true&<?php echo PMA_generate_common_url(); ?>'); // loads the message, either success or mysql error - <?php + <?php // reload the left sidebar when the import is finished - $GLOBALS['reload']=true; - PMA_reloadNavigation(true); + $GLOBALS['reload']=true; + PMA_reloadNavigation(true); ?> } // if finished==item - } // if index==finished + } // if index==finished if (index=="percent") percent = item; if (index=="total") total = item; if (index=="complete") - complete = item; + complete = item; }); // $each if (total==0 && complete==0 && percent==0) { $('upload_form_status_info').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat($strImportLargeFileUploading); ?>'); @@ -91,8 +91,8 @@ window.addEvent('domready', function() { } // else } // onComplete }); // [equest - perform_upload = function () { - request_upload.send('r=' + $time() + $random(0, 100)); // hack for IE7,8 & webkit (Safari, Chrome, Arora...) + perform_upload = function () { + request_upload.send('r=' + $time() + $random(0, 100)); // hack for IE7,8 & webkit (Safari, Chrome, Arora...) } periodical_upload = perform_upload.periodical(1000); <?php @@ -101,8 +101,8 @@ window.addEvent('domready', function() { $('upload_form_status_info').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo $strImportUploadInfoNotAvailable . PMA_showDocu('faq2_9'); ?>'); $('upload_form_status').setStyle("display", "none"); <?php - } // else - ?> + } // else + ?> }); // if click }); // domready @@ -112,7 +112,7 @@ window.addEvent('domready', function() { <noscript> <form action="import.php" method="post" enctype="multipart/form-data" name="import"> </noscript> -<input type="hidden" name="<?php echo $ID_KEY; ?>" value="<?php echo $upload_id ; ?>" /> +<input type="hidden" name="<?php echo $ID_KEY; ?>" value="<?php echo $upload_id ; ?>" /> <?php if ($import_type == 'server') { echo PMA_generate_common_hidden_inputs('', '', 1); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2RC1-1411-gea8cc56
by Michal Čihař 09 Apr '10

09 Apr '10

The branch, master has been updated via ea8cc56becd008beb4cb9c5e7a4eb39195c2128a (commit) via a59d10027bd7fb5a54c8458ed55612dbbcaf2a67 (commit) via e5ceb497df8563f73296d7fc894ff00101e21bde (commit) via 62c149e38dba1fe6ebfb604c86d6167f9b052b46 (commit) from 7337fe5a0c74817214004b5524850f5a166046d4 (commit) - Log ----------------------------------------------------------------- commit ea8cc56becd008beb4cb9c5e7a4eb39195c2128a Merge: 62c149e38dba1fe6ebfb604c86d6167f9b052b46 a59d10027bd7fb5a54c8458ed55612dbbcaf2a67 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 9 15:27:39 2010 +0200 Merge branch 'QA_3_3' commit 62c149e38dba1fe6ebfb604c86d6167f9b052b46 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 9 15:26:37 2010 +0200 Revert part of eb5e03880e579d572ec8e45a8fc0777929defddc. XLSX writer does not have setTempDir method. ----------------------------------------------------------------------- Summary of changes: libraries/export/xlsx.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php index 86a17a9..1b24c4c 100644 --- a/libraries/export/xlsx.php +++ b/libraries/export/xlsx.php @@ -59,7 +59,6 @@ function PMA_exportFooter() { $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xlsx_'); $workbookWriter = new PHPExcel_Writer_Excel2007($workbook); - $workbookWriter->setTempDir(realpath($GLOBALS['cfg']['TempDir'])); $workbookWriter->save($tmp_filename); if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2RC1-18-ga59d100
by Michal Čihař 09 Apr '10

09 Apr '10

The branch, QA_3_3 has been updated via a59d10027bd7fb5a54c8458ed55612dbbcaf2a67 (commit) via e5ceb497df8563f73296d7fc894ff00101e21bde (commit) from b3c041bb997b939f96c58a330f9ea9168aef738b (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: libraries/export/xlsx.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php index 86a17a9..1b24c4c 100644 --- a/libraries/export/xlsx.php +++ b/libraries/export/xlsx.php @@ -59,7 +59,6 @@ function PMA_exportFooter() { $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xlsx_'); $workbookWriter = new PHPExcel_Writer_Excel2007($workbook); - $workbookWriter->setTempDir(realpath($GLOBALS['cfg']['TempDir'])); $workbookWriter->save($tmp_filename); if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_2, updated. RELEASE_3_3_2RC1-7-ge5ceb49
by Michal Čihař 09 Apr '10

09 Apr '10

The branch, MAINT_3_3_2 has been updated via e5ceb497df8563f73296d7fc894ff00101e21bde (commit) from b68b7d1cdd48d48e4b2009a1cfd24e81a09a127d (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: libraries/export/xlsx.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php index 86a17a9..1b24c4c 100644 --- a/libraries/export/xlsx.php +++ b/libraries/export/xlsx.php @@ -59,7 +59,6 @@ function PMA_exportFooter() { $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xlsx_'); $workbookWriter = new PHPExcel_Writer_Excel2007($workbook); - $workbookWriter->setTempDir(realpath($GLOBALS['cfg']['TempDir'])); $workbookWriter->save($tmp_filename); if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2RC1-1407-g7337fe5
by Michal Čihař 09 Apr '10

09 Apr '10

The branch, master has been updated via 7337fe5a0c74817214004b5524850f5a166046d4 (commit) from f5a11a3f647332fe109af17c1af4246aec096648 (commit) - Log ----------------------------------------------------------------- commit 7337fe5a0c74817214004b5524850f5a166046d4 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 9 15:14:54 2010 +0200 Factor out code for getting language name. ----------------------------------------------------------------------- Summary of changes: libraries/display_select_lang.lib.php | 8 +------- libraries/select_lang.lib.php | 14 ++++++++++++++ setup/frames/index.inc.php | 14 ++------------ 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php index f91ea0a..b9a164c 100644 --- a/libraries/display_select_lang.lib.php +++ b/libraries/display_select_lang.lib.php @@ -62,13 +62,7 @@ function PMA_select_language($use_fieldset = FALSE, $show_doc = TRUE) { uasort($GLOBALS['available_languages'], 'PMA_language_cmp'); foreach ($GLOBALS['available_languages'] as $id => $tmplang) { - $lang_name = ucfirst(substr(strrchr($tmplang[0], '|'), 1)); - - // Include native name if non empty - if (!empty($tmplang[2])) { - $lang_name = $tmplang[2] . ' - ' - . $lang_name; - } + $lang_name = PMA_langName($tmplang); //Is current one active? if ($lang == $id) { diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 0f1ba8a..25ba464 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -11,6 +11,20 @@ if (! defined('PHPMYADMIN')) { } /** + * Returns language name + */ +function PMA_langName($tmplang) { + $lang_name = ucfirst(substr(strrchr($tmplang[0], '|'), 1)); + + // Include native name if non empty + if (!empty($tmplang[2])) { + $lang_name = $tmplang[2] . ' - ' . $lang_name; + } + + return $lang_name; +} + +/** * tries to find the language to use * * @uses $GLOBALS['cfg']['lang'] diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php index 2da815b..aaa44be 100644 --- a/setup/frames/index.inc.php +++ b/setup/frames/index.inc.php @@ -74,13 +74,7 @@ if (!$is_https) { // create language list $lang_list = array(); foreach ($all_languages as $each_lang_key => $each_lang) { - - $lang_name = ucfirst(substr(strrchr($each_lang[0], '|'), 1)); - // Include native name if non empty - if (!empty($each_lang[2])) { - $lang_name = $each_lang[2] . ' - ' . $lang_name; - } - + $lang_name = PMA_langName($each_lang); //Is current one active? $selected = ($GLOBALS['lang'] == $each_lang_key) ? ' selected="selected"' : ''; echo '<option value="' . $each_lang_key . '"' . $selected . '>' . $lang_name @@ -172,11 +166,7 @@ $opts = array( 'values' => array(), 'values_escaped' => true); foreach ($all_languages as $each_lang_key => $each_lang) { - $lang_name = ucfirst(substr(strrchr($each_lang[0], '|'), 1)); - // Include native name if non empty - if (!empty($each_lang[2])) { - $lang_name = $each_lang[2] . ' - ' . $lang_name; - } + $lang_name = PMA_langName($each_lang); $opts['values'][$each_lang_key] = $lang_name; } display_input('DefaultLang', $GLOBALS['strSetupDefaultLanguage'], '', 'select', hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2RC1-1406-gf5a11a3
by Michal Čihař 09 Apr '10

09 Apr '10

The branch, master has been updated via f5a11a3f647332fe109af17c1af4246aec096648 (commit) from 5309444bba069bab9e744dd4a42d329bd1e54169 (commit) - Log ----------------------------------------------------------------- commit f5a11a3f647332fe109af17c1af4246aec096648 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 9 15:08:05 2010 +0200 Bind event externally. ----------------------------------------------------------------------- Summary of changes: js/functions.js | 5 +++++ libraries/sql_query_form.lib.php | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/js/functions.js b/js/functions.js index 699a0fe..447d1c6 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1718,5 +1718,10 @@ $(document).ready(function(){ $("#btnDiscard").live("click",function(){ $(".sql").html("<span class=\"syntax\">"+$oldText+"</span>"); }); + + jQuery('.sqlbutton').click(function(evt){ + insertQuery(evt.target.id); + return false; + }); }); diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index f7638ec..e00c1b8 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -298,11 +298,11 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter .$auto_sel . $locking . '>' . htmlspecialchars($query) . '</textarea>' . "\n"; // Add buttons to generate query easily for select all,single select,insert,update and delete if(count($fields_list)) { - echo '<input type="button" value="' . __('SELECT *') . '" id="selectall" onclick="insertQuery(this.id)" />'; - echo '<input type="button" value="' . __('SELECT') . '" id="select" onclick="insertQuery(this.id)" />'; - echo '<input type="button" value="' . __('INSERT') . '" id="insert" onclick="insertQuery(this.id)" />'; - echo '<input type="button" value="' . __('UPDATE') . '" id="update" onclick="insertQuery(this.id)" />'; - echo '<input type="button" value="' . __('DELETE') . '" id="delete" onclick="insertQuery(this.id)" />'; + echo '<input type="button" value="' . __('SELECT *') . '" id="selectall" class="sqlbutton" />'; + echo '<input type="button" value="' . __('SELECT') . '" id="select" class="sqlbutton" />'; + echo '<input type="button" value="' . __('INSERT') . '" id="insert" class="sqlbutton" />'; + echo '<input type="button" value="' . __('UPDATE') . '" id="update" class="sqlbutton" />'; + echo '<input type="button" value="' . __('DELETE') . '" id="delete" class="sqlbutton" />'; } echo '</div>' . "\n"; hooks/post-receive -- phpMyAdmin

1 0