August 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12970-gff074b1
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via ff074b1d2f984b0467e8424110caee9769ff4c89 (commit) from a665c7d8a61ec56f76dd10c2815046113686e6f7 (commit) - Log ----------------------------------------------------------------- commit ff074b1d2f984b0467e8424110caee9769ff4c89 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 15:21:06 2011 +0200 Better parameter name ----------------------------------------------------------------------- Summary of changes: libraries/core.lib.php | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 7ba84d9..7befffb 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -562,15 +562,15 @@ function PMA_no_cache_header() /** * Sends header indicating file download. * - * @param string $filename Filename to include in headers. - * @param string $mimetype MIME type to include in headers. - * @param int $length Length of content (optional) - * @param bool $avoid_cache Whether to include no-caching headers. + * @param string $filename Filename to include in headers. + * @param string $mimetype MIME type to include in headers. + * @param int $length Length of content (optional) + * @param bool $no_cache Whether to include no-caching headers. * * @return nothing */ -function PMA_download_header($filename, $mimetype, $length = 0, $avoid_cache = true) { - if ($avoid_cache) { +function PMA_download_header($filename, $mimetype, $length = 0, $no_cache = true) { + if ($no_cache) { PMA_no_cache_header(); } header('Content-Description: File Transfer'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12969-ga665c7d
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via a665c7d8a61ec56f76dd10c2815046113686e6f7 (commit) from bffad989158bcf15409399ee5623d3611fb2f128 (commit) - Log ----------------------------------------------------------------- commit a665c7d8a61ec56f76dd10c2815046113686e6f7 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 15:20:19 2011 +0200 Fix docblock ----------------------------------------------------------------------- Summary of changes: libraries/core.lib.php | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 306ad2d..7ba84d9 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -562,10 +562,10 @@ function PMA_no_cache_header() /** * Sends header indicating file download. * - * @param $filename string Filename to include in headers. - * @param $mimetype string MIME type to include in headers. - * @param $length int Length of content (optional) - * @param $avoid_cache bool Whether to include no-caching headers. + * @param string $filename Filename to include in headers. + * @param string $mimetype MIME type to include in headers. + * @param int $length Length of content (optional) + * @param bool $avoid_cache Whether to include no-caching headers. * * @return nothing */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12968-gbffad98
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via bffad989158bcf15409399ee5623d3611fb2f128 (commit) from 6c92b02f81c2296382d60bd66653d296628e926e (commit) - Log ----------------------------------------------------------------- commit bffad989158bcf15409399ee5623d3611fb2f128 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 15:19:29 2011 +0200 Separate data decoding from output ----------------------------------------------------------------------- Summary of changes: file_echo.php | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/file_echo.php b/file_echo.php index 2add078..2756209 100644 --- a/file_echo.php +++ b/file_echo.php @@ -39,16 +39,20 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { $filename = $_REQUEST['filename']; } - /* Send download header */ - PMA_download_header($filename, $_REQUEST['type']); - - /* Send data */ + /* Decode data */ if ($extension != 'svg') { - echo base64_decode(substr($_REQUEST['image'], strpos($_REQUEST['image'],',') + 1)); + $data = substr($_REQUEST['image'], strpos($_REQUEST['image'],',') + 1); + $data = base64_decode($data); } else { - echo $_REQUEST['image']; + $data = $_REQUEST['image']; } + /* Send download header */ + PMA_download_header($filename, $_REQUEST['type'], strlen($data)); + + /* Send data */ + echo $data; + } else if (isset($_REQUEST['monitorconfig'])) { PMA_download_header('monitor.cfg', 'application/force-download'); echo urldecode($_REQUEST['monitorconfig']); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12967-g6c92b02
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 6c92b02f81c2296382d60bd66653d296628e926e (commit) from 8fcb4720e2138429df9f9c3a197187882c0c51ef (commit) - Log ----------------------------------------------------------------- commit 6c92b02f81c2296382d60bd66653d296628e926e Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 15:08:38 2011 +0200 Avoid using $_REQUEST all over the code ----------------------------------------------------------------------- Summary of changes: file_echo.php | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/file_echo.php b/file_echo.php index f829853..2add078 100644 --- a/file_echo.php +++ b/file_echo.php @@ -24,13 +24,15 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { * Check file name to match mime type and not contain new lines * to prevent response splitting. */ - if (! preg_match('/^[^\n\r]*\.' . $allowed[$_REQUEST['type']] . '$/', $_REQUEST['filename'])) { + $extension = $allowed[$_REQUEST['type']]; + $valid_match = '/^[^\n\r]*\.' . $extension . '$/'; + if (! preg_match($valid_match, $_REQUEST['filename'])) { if (! preg_match('/^[^\n\r]*$/', $_REQUEST['filename'])) { /* Add extension */ - $filename = 'dowload.' . $allowed[$_REQUEST['type']]; + $filename = 'dowload.' . $extension; } else { /* Filename is unsafe, discard it */ - $filename = $_REQUEST['filename'] . '.' . $allowed[$_REQUEST['type']]; + $filename = $_REQUEST['filename'] . '.' . $extension; } } else { /* Filename from request should be safe here */ @@ -41,7 +43,7 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { PMA_download_header($filename, $_REQUEST['type']); /* Send data */ - if ($allowed[$_REQUEST['type']] != 'svg') { + if ($extension != 'svg') { echo base64_decode(substr($_REQUEST['image'], strpos($_REQUEST['image'],',') + 1)); } else { echo $_REQUEST['image']; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12966-g8fcb472
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 8fcb4720e2138429df9f9c3a197187882c0c51ef (commit) via 99faf22237879cd5001043557f730c83b2268029 (commit) via 94ac586dba53e361d59503b1e934809539df454b (commit) via 3a10de866c257225ffb41a92d081b31489c305b2 (commit) from fa300e3887c8468ca738077594d6ef5fae459f46 (commit) - Log ----------------------------------------------------------------- commit 8fcb4720e2138429df9f9c3a197187882c0c51ef Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 15:06:09 2011 +0200 Include length in headers when we know it commit 99faf22237879cd5001043557f730c83b2268029 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 15:03:31 2011 +0200 Add missing docs commit 94ac586dba53e361d59503b1e934809539df454b Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 15:02:32 2011 +0200 Move avoid_cache to end, it is not used so often as size commit 3a10de866c257225ffb41a92d081b31489c305b2 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 15:00:38 2011 +0200 Include length in headers ----------------------------------------------------------------------- Summary of changes: bs_disp_as_mime_type.php | 2 +- libraries/core.lib.php | 9 ++++++--- libraries/schema/Dia_Relation_Schema.class.php | 2 +- libraries/schema/Eps_Relation_Schema.class.php | 2 +- libraries/schema/Pdf_Relation_Schema.class.php | 2 +- libraries/schema/Svg_Relation_Schema.class.php | 2 +- libraries/schema/Visio_Relation_Schema.class.php | 2 +- tbl_get_field.php | 5 ++++- tbl_tracking.php | 2 +- webapp.php | 2 +- 10 files changed, 18 insertions(+), 12 deletions(-) diff --git a/bs_disp_as_mime_type.php b/bs_disp_as_mime_type.php index fd75c4d..5284e55 100644 --- a/bs_disp_as_mime_type.php +++ b/bs_disp_as_mime_type.php @@ -43,7 +43,7 @@ if ($fHnd === false) { $f_size = $hdrs['Content-Length']; -PMA_download_header(basename($filename), $c_type, true, $f_size); +PMA_download_header(basename($filename), $c_type, $f_size); $pos = 0; $content = ""; diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 38473ff..306ad2d 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -562,11 +562,14 @@ function PMA_no_cache_header() /** * Sends header indicating file download. * - * @param $filename string Filename to include in headers. - * @param $mimetype string MIME type to include in headers. + * @param $filename string Filename to include in headers. + * @param $mimetype string MIME type to include in headers. + * @param $length int Length of content (optional) + * @param $avoid_cache bool Whether to include no-caching headers. + * * @return nothing */ -function PMA_download_header($filename, $mimetype, $avoid_cache = true, $length = 0) { +function PMA_download_header($filename, $mimetype, $length = 0, $avoid_cache = true) { if ($avoid_cache) { PMA_no_cache_header(); } diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php index 46e07d3..fa2884d 100644 --- a/libraries/schema/Dia_Relation_Schema.class.php +++ b/libraries/schema/Dia_Relation_Schema.class.php @@ -170,8 +170,8 @@ class PMA_DIA extends XMLWriter if(ob_get_clean()){ ob_end_clean(); } - PMA_download_header($fileName . '.dia', 'application/x-dia-diagram'); $output = $this->flush(); + PMA_download_header($fileName . '.dia', 'application/x-dia-diagram', strlen($output)); print $output; } } diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php index 91e4bfa..367b8c2 100644 --- a/libraries/schema/Eps_Relation_Schema.class.php +++ b/libraries/schema/Eps_Relation_Schema.class.php @@ -333,8 +333,8 @@ class PMA_EPS // if(ob_get_clean()){ //ob_end_clean(); //} - PMA_download_header($fileName . '.eps', 'image/x-eps'); $output = $this->stringCommands; + PMA_download_header($fileName . '.eps', 'image/x-eps', strlen($output)); print $output; } } diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index 68efc28..ec03d37 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -1068,7 +1068,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema } // instead of $pdf->Output(): $pdfData = $pdf->getPDFData(); - PMA_download_header($filename, 'application/pdf'); + PMA_download_header($filename, 'application/pdf', strlen($pdfData)); echo $pdfData; } diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php index 71f93c6..0593abd 100644 --- a/libraries/schema/Svg_Relation_Schema.class.php +++ b/libraries/schema/Svg_Relation_Schema.class.php @@ -168,8 +168,8 @@ class PMA_SVG extends XMLWriter function showOutput($fileName) { //ob_get_clean(); - PMA_download_header($fileName . '.svg', 'image/svg+xml'); $output = $this->flush(); + PMA_download_header($fileName . '.svg', 'image/svg+xml', strlen($output)); print $output; } diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php index aa18c06..cfe4424 100644 --- a/libraries/schema/Visio_Relation_Schema.class.php +++ b/libraries/schema/Visio_Relation_Schema.class.php @@ -155,8 +155,8 @@ class PMA_VISIO extends XMLWriter //if(ob_get_clean()){ //ob_end_clean(); //} - PMA_download_header($fileName . '.vdx', 'application/visio'); $output = $this->flush(); + PMA_download_header($fileName . '.vdx', 'application/visio', strlen($output)); print $output; } } diff --git a/tbl_get_field.php b/tbl_get_field.php index 8c6c163..f7efd4f 100644 --- a/tbl_get_field.php +++ b/tbl_get_field.php @@ -37,6 +37,9 @@ if ($result === false) { /* Avoid corrupting data */ @ini_set('url_rewriter.tags', ''); -PMA_download_header($table . '-' . $transform_key . '.bin', PMA_detectMIME($result)); +PMA_download_header( + $table . '-' . $transform_key . '.bin', + PMA_detectMIME($result), + strlen($result)); echo $result; ?> diff --git a/tbl_tracking.php b/tbl_tracking.php index 445976f..76ed16a 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -112,7 +112,7 @@ if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'sqldumpfil $dump .= $entry['statement']; } $filename = 'log_' . htmlspecialchars($_REQUEST['table']) . '.sql'; - PMA_download_header($filename, 'text/x-sql'); + PMA_download_header($filename, 'text/x-sql', strlen($dump)); echo $dump; exit(); diff --git a/webapp.php b/webapp.php index 8295efd..63ca1bf 100644 --- a/webapp.php +++ b/webapp.php @@ -44,7 +44,7 @@ foreach ($parameters as $key => $value) { $ini_file .= $key . '=' . $value . "\n"; } -PMA_download_header($name, 'application/webapp', false); +PMA_download_header($name, 'application/webapp', 0, false); $zip = new zipfile; $zip->setDoWrite(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12962-gfa300e3
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via fa300e3887c8468ca738077594d6ef5fae459f46 (commit) from 4acaf763128928760fd47e75de794a288dc99762 (commit) - Log ----------------------------------------------------------------- commit fa300e3887c8468ca738077594d6ef5fae459f46 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 14:59:45 2011 +0200 Missing doc ----------------------------------------------------------------------- Summary of changes: libraries/core.lib.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index fd8c39a..38473ff 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -539,6 +539,8 @@ function PMA_sendHeaderLocation($uri) /** * Outputs headers to prevent caching in browser (and on the way). + * + * @return nothing */ function PMA_no_cache_header() { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12961-g4acaf76
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 4acaf763128928760fd47e75de794a288dc99762 (commit) via f97b5aba9b9458a627503f164fd5dafdac750002 (commit) from 71db1cb416556dceb50cf984e9f8033d3487f15e (commit) - Log ----------------------------------------------------------------- commit 4acaf763128928760fd47e75de794a288dc99762 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 14:58:22 2011 +0200 Documentation commit f97b5aba9b9458a627503f164fd5dafdac750002 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 14:57:16 2011 +0200 Better check for valid filename ----------------------------------------------------------------------- Summary of changes: file_echo.php | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/file_echo.php b/file_echo.php index 7b27ffa..f829853 100644 --- a/file_echo.php +++ b/file_echo.php @@ -15,16 +15,32 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { 'image/svg+xml' => 'svg', ); + /* Check whether MIME type is allowed */ if (! isset($allowed[$_REQUEST['type']])) { die('Invalid export type'); } - if (! preg_match("/(".implode("|",$allowed).")$/i", $_REQUEST['filename'])) { - $_REQUEST['filename'] .= '.' . $allowed[$_REQUEST['type']]; + /* + * Check file name to match mime type and not contain new lines + * to prevent response splitting. + */ + if (! preg_match('/^[^\n\r]*\.' . $allowed[$_REQUEST['type']] . '$/', $_REQUEST['filename'])) { + if (! preg_match('/^[^\n\r]*$/', $_REQUEST['filename'])) { + /* Add extension */ + $filename = 'dowload.' . $allowed[$_REQUEST['type']]; + } else { + /* Filename is unsafe, discard it */ + $filename = $_REQUEST['filename'] . '.' . $allowed[$_REQUEST['type']]; + } + } else { + /* Filename from request should be safe here */ + $filename = $_REQUEST['filename']; } - PMA_download_header($_REQUEST['filename'], $_REQUEST['type']); + /* Send download header */ + PMA_download_header($filename, $_REQUEST['type']); + /* Send data */ if ($allowed[$_REQUEST['type']] != 'svg') { echo base64_decode(substr($_REQUEST['image'], strpos($_REQUEST['image'],',') + 1)); } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12959-g71db1cb
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 71db1cb416556dceb50cf984e9f8033d3487f15e (commit) from 440f72082fb21b418818b7331863af56094f7bcc (commit) - Log ----------------------------------------------------------------- commit 71db1cb416556dceb50cf984e9f8033d3487f15e Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 14:50:36 2011 +0200 Cleanup po files ----------------------------------------------------------------------- Summary of changes: po/ar.po | 1 - po/be.po | 1 - po/be(a)latin.po | 1 - po/bn.po | 1 - po/ca.po | 2 -- po/cy.po | 1 - po/en_GB.po | 1 - po/et.po | 1 - po/fi.po | 2 -- po/fr.po | 1 - po/gl.po | 2 -- po/he.po | 1 - po/hi.po | 2 -- po/hr.po | 1 - po/hu.po | 2 -- po/id.po | 1 - po/ka.po | 2 -- po/lt.po | 1 - po/lv.po | 1 - po/mk.po | 1 - po/mn.po | 1 - po/nb.po | 2 -- po/nl.po | 2 -- po/pl.po | 2 -- po/pt_BR.po | 1 - po/ro.po | 2 -- po/ru.po | 1 - po/si.po | 1 - po/sq.po | 1 - po/sr.po | 1 - po/sr(a)latin.po | 1 - po/sv.po | 1 - po/th.po | 1 - po/tt.po | 1 - po/ug.po | 1 - po/ur.po | 1 - po/uz.po | 2 -- po/uz(a)latin.po | 2 -- po/zh_CN.po | 2 -- po/zh_TW.po | 2 -- 40 files changed, 0 insertions(+), 54 deletions(-) diff --git a/po/ar.po b/po/ar.po index 3512867..d2813a1 100644 --- a/po/ar.po +++ b/po/ar.po @@ -11132,7 +11132,6 @@ msgid "Rename view to" msgstr "أعد تسمية العرض الـ" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "حدث" diff --git a/po/be.po b/po/be.po index 66b10e9..7937024 100644 --- a/po/be.po +++ b/po/be.po @@ -11768,7 +11768,6 @@ msgid "Rename view to" msgstr "Перайменаваць табліцу ў" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Абнавіць" diff --git a/po/be(a)latin.po b/po/be(a)latin.po index 08049cd..593647b 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -11735,7 +11735,6 @@ msgid "Rename view to" msgstr "" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Abnavić" diff --git a/po/bn.po b/po/bn.po index ef8b9e4..638fb46 100644 --- a/po/bn.po +++ b/po/bn.po @@ -11623,7 +11623,6 @@ msgid "Rename view to" msgstr "টেবিল রিনেম করুন" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Refresh" diff --git a/po/ca.po b/po/ca.po index 4fa960c..a7ac064 100644 --- a/po/ca.po +++ b/po/ca.po @@ -11628,12 +11628,10 @@ msgid "Rename view to" msgstr "Reanomena la vista a" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Refresca" #, fuzzy -#~| msgid "User for config auth" #~ msgid "Clear monitor config" #~ msgstr "Usuari per autenticació config" diff --git a/po/cy.po b/po/cy.po index c92840d..7847a57 100644 --- a/po/cy.po +++ b/po/cy.po @@ -11152,7 +11152,6 @@ msgid "Rename view to" msgstr "Ailenwch golwg i" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Adfywio" diff --git a/po/en_GB.po b/po/en_GB.po index 8dc54c0..40a58f5 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -11296,7 +11296,6 @@ msgstr "Rename view to" #~ msgid "Refresh rate:" #~ msgstr "Refresh rate:" -#~| msgid "User for config auth" #~ msgid "Clear monitor config" #~ msgstr "Clear monitor config" diff --git a/po/et.po b/po/et.po index 4156be8..4e1020a 100644 --- a/po/et.po +++ b/po/et.po @@ -11622,7 +11622,6 @@ msgid "Rename view to" msgstr "Nimeta tabel ümber" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Uuenda" diff --git a/po/fi.po b/po/fi.po index d1b4fb8..283ca84 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11974,12 +11974,10 @@ msgid "Rename view to" msgstr "Nimeä taulu uudelleen" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Päivitä" #, fuzzy -#~| msgid "User for config auth" #~ msgid "Clear monitor config" #~ msgstr "Config-todennuksen käyttäjä" diff --git a/po/fr.po b/po/fr.po index 9b56a00..599b6ce 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11447,7 +11447,6 @@ msgstr "Changer le nom de la vue pour" #~ msgid "Refresh rate:" #~ msgstr "Taux de rafraîchissement :" -#~| msgid "User for config auth" #~ msgid "Clear monitor config" #~ msgstr "Effacer la configuration de surveillance" diff --git a/po/gl.po b/po/gl.po index 3c71ed3..9e19697 100644 --- a/po/gl.po +++ b/po/gl.po @@ -12219,12 +12219,10 @@ msgid "Rename view to" msgstr "Mudar o nome da táboa para" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Refrescar" #, fuzzy -#~| msgid "User for config auth" #~ msgid "Clear monitor config" #~ msgstr "Usuario para config auth" diff --git a/po/he.po b/po/he.po index c08f74a..7daf7e3 100644 --- a/po/he.po +++ b/po/he.po @@ -11269,7 +11269,6 @@ msgid "Rename view to" msgstr "שינוי שם טבלה אל" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "רענון" diff --git a/po/hi.po b/po/hi.po index 2839d27..3ec47c8 100644 --- a/po/hi.po +++ b/po/hi.po @@ -11055,12 +11055,10 @@ msgid "Rename view to" msgstr "दृश्य का नाम बदलो" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "ताज़ा करना" #, fuzzy -#~| msgid "User for config auth" #~ msgid "Clear monitor config" #~ msgstr "विन्यास प्राधिकरण के लिए यूसर" diff --git a/po/hr.po b/po/hr.po index 783df81..57c2d8c 100644 --- a/po/hr.po +++ b/po/hr.po @@ -11722,7 +11722,6 @@ msgid "Rename view to" msgstr "Preimenuj prikaz u" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Osvježi" diff --git a/po/hu.po b/po/hu.po index 26a1a4d..e8151d5 100644 --- a/po/hu.po +++ b/po/hu.po @@ -11795,12 +11795,10 @@ msgid "Rename view to" msgstr "Nézet átnevezése" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Frissítés" #, fuzzy -#~| msgid "User for config auth" #~ msgid "Clear monitor config" #~ msgstr "A konfigurációs hitelesítés felhasználóneve" diff --git a/po/id.po b/po/id.po index d0f4597..2a1be9f 100644 --- a/po/id.po +++ b/po/id.po @@ -11372,7 +11372,6 @@ msgid "Rename view to" msgstr "Ubah nama tabel menjadi " #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Menyegarkan" diff --git a/po/ka.po b/po/ka.po index 2033aee..57a658b 100644 --- a/po/ka.po +++ b/po/ka.po @@ -12051,12 +12051,10 @@ msgid "Rename view to" msgstr "Rename table to" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "განახლება" #, fuzzy -#~| msgid "User for config auth" #~ msgid "Clear monitor config" #~ msgstr "User for config auth" diff --git a/po/lt.po b/po/lt.po index 2349622..0733b54 100644 --- a/po/lt.po +++ b/po/lt.po @@ -11469,7 +11469,6 @@ msgid "Rename view to" msgstr "Pervadinti lentelę į" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Atnaujinti" diff --git a/po/lv.po b/po/lv.po index 8f0cab4..215f6d9 100644 --- a/po/lv.po +++ b/po/lv.po @@ -11377,7 +11377,6 @@ msgid "Rename view to" msgstr "Pārsaukt tabulu uz" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Atjaunot" diff --git a/po/mk.po b/po/mk.po index 3a59579..535c66c 100644 --- a/po/mk.po +++ b/po/mk.po @@ -11446,7 +11446,6 @@ msgid "Rename view to" msgstr "Промени го името на табелата во " #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Освежи" diff --git a/po/mn.po b/po/mn.po index 4b81274..32ef804 100644 --- a/po/mn.po +++ b/po/mn.po @@ -11451,7 +11451,6 @@ msgid "Rename view to" msgstr "" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Да.дуудах" diff --git a/po/nb.po b/po/nb.po index bb0def6..2ba0653 100644 --- a/po/nb.po +++ b/po/nb.po @@ -11713,12 +11713,10 @@ msgid "Rename view to" msgstr "Endre tabellens navn" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Oppdater" #, fuzzy -#~| msgid "User for config auth" #~ msgid "Clear monitor config" #~ msgstr "Bruker for config autentisering" diff --git a/po/nl.po b/po/nl.po index 7e36e5d..e5a1f4e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11624,12 +11624,10 @@ msgid "Rename view to" msgstr "Hernoem view naar" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Vernieuw" #, fuzzy -#~| msg"Vernieuw":"id "Rename view to"�елата во "��िए यूसर"24]��@�*PRx��"�>�*��>�*�\x��@]x��>�*Ȅ�>�*�?�*��?�*@]x��@�*PRx�� Qx��>�*6 ��!�!�\x��@]x��x��?�*PSx��"�>�*�>�*�\x��>�*]x��_@�*��>�*�_@�*ؤ_@�*��_@�*Ȅ�>�*x��?�*PSx�� Rx��>�*�!�!�\x��@]x��}�?�*0Tx��"�>�*�>�*�\x��>�*]x��]x��\x��?�*�p�@]x��>�*Ȅ�>�*0Tx��Sx��>�*GHIJKMNOP�\x��@]x��H5�?�*�Ux��"�>�*�>�*�\x��0�_@�*��>�*��?�*�i�?�*�_@�*ؤ_@�*��_@�*Ȅ�>�*H5�?�*�Ux��Tx��>�*85�?�*�Ux��@Tx��>�*(5�?�*�Ux��pTx��>�*5�?�*�Ux��Tx��>�* ��_@�*��>�*��_@�* Ox��?�*��>�*ؤ_@�*@Ux��y��?�*��>�*�_@�*pUx��Z��?�*��>�*�d�?�*��?�*�i�?�*�_@�*��?�*ؤ_@�*��_@�*Ȅ�>�*୍?�*�Vx��Ux��>�*#%')*-.035678:<=�\x��@]x��p�Y?�*Xx��"�>�*8��?�*��>�*��?�*��?�*Ȅ�>�*cf-&?�*@]x��p�Y?�*Xx��Vx��>�*�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv��+?�*�^x��F��@�*F��@�*?)?�*@^x��Ux��`Yx��-&?�*��>�*�?�*�_x��B��@�*�^x��]x��?�*@]x��B��@�*H]x��>id "User for config auth" #~ msgid "Clear monitor config" #~ msgstr "Gebruiker voor 'config' authenticatie" diff --git a/po/pl.po b/po/pl.po index 5463f28..400ac82 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11997,12 +11997,10 @@ msgid "Rename view to" msgstr "Zmień nazwę perspektywy na" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Odśwież" #, fuzzy -#~| msgid "User for config auth" #~ msgid "Clear monitor config" #~ msgstr "Użytkownik dla uwierzytelniania typu config" diff --git a/po/pt_BR.po b/po/pt_BR.po index 9c0dd32..81bb42f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -11492,7 +11492,6 @@ msgid "Rename view to" msgstr "Renomear a visão para " #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Atualizar" diff --git a/po/ro.po b/po/ro.po index e5fc8c6..c3c93ea 100644 --- a/po/ro.po +++ b/po/ro.po @@ -11734,12 +11734,10 @@ msgid "Rename view to" msgstr "Redenumire tabel la" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Reîncarcă" #, fuzzy -#~| msgid "User for config auth" #~ msgid "Clear monitor config" #~ msgstr "Utilizator pentru „config auth”" diff --git a/po/ru.po b/po/ru.po index 01e25b3..acc267b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11550,7 +11550,6 @@ msgstr "Переименовать представление в" #~ msgstr "Частота обновления:" #, fuzzy -#~| msgid "User for config auth" #~ msgid "Clear monitor config" #~ msgstr "Прописанный пользователь" diff --git a/po/si.po b/po/si.po index 432f5bb..0a52e59 100644 --- a/po/si.po +++ b/po/si.po @@ -11288,7 +11288,6 @@ msgid "Rename view to" msgstr "දසුනේ නම වෙනස් කරන්න" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "අලුත් කරන්න" diff --git a/po/sq.po b/po/sq.po index 11bd98b..cf03b46 100644 --- a/po/sq.po +++ b/po/sq.po @@ -11366,7 +11366,6 @@ msgid "Rename view to" msgstr "Riemërto tabelën në" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Rifresko" diff --git a/po/sr.po b/po/sr.po index 378bb43..e5246b1 100644 --- a/po/sr.po +++ b/po/sr.po @@ -11643,7 +11643,6 @@ msgid "Rename view to" msgstr "Промени име табеле у " #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Освежи" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index aad6926..96212b9 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -11631,7 +11631,6 @@ msgid "Rename view to" msgstr "Promeni ime tabele u " #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Osveži" diff --git a/po/sv.po b/po/sv.po index c046493..73151ff 100644 --- a/po/sv.po +++ b/po/sv.po @@ -11322,7 +11322,6 @@ msgstr "Ändra namn till" #~ msgid "Refresh rate:" #~ msgstr "Uppdateringsfrekvens:" -#~| msgid "User for config auth" #~ msgid "Clear monitor config" #~ msgstr "Rensa monitor config" diff --git a/po/th.po b/po/th.po index 80c43d1..fc90686 100644 --- a/po/th.po +++ b/po/th.po @@ -11242,7 +11242,6 @@ msgid "Rename view to" msgstr "เปลี่ยนชื่อตารางเป็น" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "เรียกใหม่" diff --git a/po/tt.po b/po/tt.po index e5b9492..9a763cb 100644 --- a/po/tt.po +++ b/po/tt.po @@ -11451,7 +11451,6 @@ msgid "Rename view to" msgstr "Tüşämä adın üzgärtü" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Yañart" diff --git a/po/ug.po b/po/ug.po index b4f9b07..873f422 100644 --- a/po/ug.po +++ b/po/ug.po @@ -11005,7 +11005,6 @@ msgid "Rename view to" msgstr "" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "يېڭلاش" diff --git a/po/ur.po b/po/ur.po index 5041b9c..febc0ed 100644 --- a/po/ur.po +++ b/po/ur.po @@ -11020,7 +11020,6 @@ msgid "Rename view to" msgstr "" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "تازہ کریں" diff --git a/po/uz.po b/po/uz.po index 4869987..04afbf1 100644 --- a/po/uz.po +++ b/po/uz.po @@ -12237,12 +12237,10 @@ msgid "Rename view to" msgstr "Кўриниш номини ўзгартириш" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Янгилаш" #, fuzzy -#~| msgid "User for config auth" #~ msgid "Clear monitor config" #~ msgstr "\"config\" аутентификация усули фойдаланувчиси" diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index d146ab4..f932809 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -12301,12 +12301,10 @@ msgid "Rename view to" msgstr "Ko‘rinish nomini o‘zgartirish" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "Yangilash" #, fuzzy -#~| msgid "User for config auth" #~ msgid "Clear monitor config" #~ msgstr "\"config\" autentifikatsiya usuli foydalanuvchisi" diff --git a/po/zh_CN.po b/po/zh_CN.po index 794a34e..4e8e315 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -11141,12 +11141,10 @@ msgid "Rename view to" msgstr "将视图改名为" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "刷新" #, fuzzy -#~| msgid "User for config auth" #~ msgid "Clear monitor config" #~ msgstr "config 认证方式的用户名" diff --git a/po/zh_TW.po b/po/zh_TW.po index 6b5b74e..3c9be29 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -11112,12 +11112,10 @@ msgid "Rename view to" msgstr "將 view改名爲" #, fuzzy -#~| msgid "Refresh" #~ msgid "Refresh rate:" #~ msgstr "重新整理" #, fuzzy -#~| msgid "User for config auth" #~ msgid "Clear monitor config" #~ msgstr "config 認證方式的帳號" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12958-g440f720
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 440f72082fb21b418818b7331863af56094f7bcc (commit) from 73fb08d3d81f33edba2550ceaa1a8bfd3418f172 (commit) - Log ----------------------------------------------------------------- commit 440f72082fb21b418818b7331863af56094f7bcc Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 14:47:11 2011 +0200 Coding style, simplify flow, remove exit() calls ----------------------------------------------------------------------- Summary of changes: file_echo.php | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/file_echo.php b/file_echo.php index d2f7257..7b27ffa 100644 --- a/file_echo.php +++ b/file_echo.php @@ -9,11 +9,14 @@ require_once './libraries/common.inc.php'; -if(isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { - $allowed = Array( 'image/png'=>'png', 'image/svg+xml'=>'svg'); +if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { + $allowed = array( + 'image/png' => 'png', + 'image/svg+xml' => 'svg', + ); if (! isset($allowed[$_REQUEST['type']])) { - exit('Invalid export type'); + die('Invalid export type'); } if (! preg_match("/(".implode("|",$allowed).")$/i", $_REQUEST['filename'])) { @@ -28,17 +31,10 @@ if(isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { echo $_REQUEST['image']; } - exit(); -} - -if(isset($_REQUEST['monitorconfig'])) { +} else if (isset($_REQUEST['monitorconfig'])) { PMA_download_header('monitor.cfg', 'application/force-download'); echo urldecode($_REQUEST['monitorconfig']); - exit(); -} - -if(isset($_REQUEST['import'])) { +} else if (isset($_REQUEST['import'])) { echo '<html><body>' . file_get_contents($_FILES['file']['tmp_name']) . '</body></html>'; - exit(); } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12957-g73fb08d
by Michal Čihař 04 Aug '11

04 Aug '11

The branch, master has been updated via 73fb08d3d81f33edba2550ceaa1a8bfd3418f172 (commit) via 7ba944948654b6a25fa5d6d409320c1ffa76948b (commit) from a2fc059f985b681b72c4f6e43ef680c0901ed833 (commit) - Log ----------------------------------------------------------------- commit 73fb08d3d81f33edba2550ceaa1a8bfd3418f172 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 14:41:29 2011 +0200 Revert "Feature idea: Collapsible navigation frame" This reverts commit 5fb7f9cd1716ae747a6e898ee6e92c864d4da6dc. Conflicts: js/common.js commit 7ba944948654b6a25fa5d6d409320c1ffa76948b Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Aug 4 14:40:57 2011 +0200 Revert "Icons for collapsible frame" This reverts commit 05dd085aeb0334d1e9ee68037efb563866892164. ----------------------------------------------------------------------- Summary of changes: js/common.js | 66 ------------------------------- libraries/header.inc.php | 1 - navigation.php | 1 - themes/pmahomme/css/theme_left.css.php | 7 --- themes/pmahomme/css/theme_right.css.php | 7 --- themes/pmahomme/img/frame-collapse.png | Bin 3862 -> 0 bytes themes/pmahomme/img/frame-expand.png | Bin 1130 -> 0 bytes 7 files changed, 0 insertions(+), 82 deletions(-) delete mode 100644 themes/pmahomme/img/frame-collapse.png delete mode 100644 themes/pmahomme/img/frame-expand.png diff --git a/js/common.js b/js/common.js index 06b1609..b595108 100644 --- a/js/common.js +++ b/js/common.js @@ -14,8 +14,6 @@ var querywindow = ''; */ var query_to_load = ''; -var leftFrameWidth = -1; - /** * sets current selected db * @@ -365,67 +363,3 @@ function updateTableTitle( table_link_id, new_title ) { return false; } - -(function($) { - $.fn.extend({ - dom: function () { - var $this = $(this); - var getDom = function(o) { - if( !o || (!o.contentWindow && !o.contentDocument) ) { - return null; - } - - var doc = (o.contentWindow || o.contentDocument); - - return doc.document || doc; - }; - - var dom = getDom($this[0]); - - return dom === null ? $this : $(dom); - } - }); -})(jQuery); - -$(document).ready(function() { - $('frame#frame_navigation').load(function() { - $('frame#frame_navigation').dom().find('div#frameCollapse').show().click(toggleNavigation); - }); - $('frame#frame_content').load(function() { - $('frame#frame_content').dom().find('div#frameExpand').click(toggleNavigation); - }); -}); - -function toggleNavigation() { - if(leftFrameWidth == -1) leftFrameWidth = $('frame#frame_navigation').width(); - - var newWidth = leftFrameWidth - $('frame#frame_navigation').width(); - var $frameset = $('frameset'); - - if(newWidth == 0) { - $('frame#frame_navigation').dom().find('body').css('width',leftFrameWidth + 'px'); - $('frame#frame_navigation').dom().find('body').css('overflow','hidden'); - } else { - $('frame#frame_content').dom().find('div#frameExpand').hide(); - } - - $('frame#frame_navigation').animate( - { width: newWidth }, - { step: function(now, fx) { - $frameset.attr('cols',fx.now + ',*'); - }, - complete: function() { - if(newWidth != 0) { - $('frame#frame_navigation').dom().find('body').css('width',''); - $('frame#frame_navigation').dom().find('body').css('overflow',''); - } else { - $('frame#frame_content').dom().find('div#frameExpand').show(); - } - } - } - ); -} - -function currentWidth() { - return $('frame#frame_navigation').width(); -} \ No newline at end of file diff --git a/libraries/header.inc.php b/libraries/header.inc.php index ff63999..a6ed8ed 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -71,7 +71,6 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { </head> <body> - <div id="frameExpand" style="display:none;"><img src="themes/pmahomme/img/frame-expand.png"></div> <?php // Include possible custom headers diff --git a/navigation.php b/navigation.php index f684d11..0c5668b 100644 --- a/navigation.php +++ b/navigation.php @@ -156,7 +156,6 @@ require_once './libraries/header_http.inc.php'; </head> <body id="body_leftFrame"> -<div id="frameCollapse" style="display:none;"><img src="themes/pmahomme/img/frame-collapse.png"></div> <?php require './libraries/navigation_header.inc.php'; diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php index ea50e51..8ed6707 100644 --- a/themes/pmahomme/css/theme_left.css.php +++ b/themes/pmahomme/css/theme_left.css.php @@ -109,13 +109,6 @@ button { /******************************************************************************/ /* specific elements */ -div#frameCollapse { - position:absolute; - top: 50%; - right: 0; - cursor: pointer; -} - div#pmalogo { <?php //better echo $GLOBALS['cfg']['logoBGC']; ?> } diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 582f9a8..f7089af 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -956,13 +956,6 @@ form.login label { /******************************************************************************/ /* specific elements */ -div#frameExpand { - position:absolute; - top: 50%; - left: 0; - cursor: pointer; -} - /* topmenu */ #topmenu a { text-shadow:0px 1px 0px #fff; diff --git a/themes/pmahomme/img/frame-collapse.png b/themes/pmahomme/img/frame-collapse.png deleted file mode 100644 index cee63be..0000000 Binary files a/themes/pmahomme/img/frame-collapse.png and /dev/null differ diff --git a/themes/pmahomme/img/frame-expand.png b/themes/pmahomme/img/frame-expand.png deleted file mode 100644 index c99c0d1..0000000 Binary files a/themes/pmahomme/img/frame-expand.png and /dev/null differ hooks/post-receive -- phpMyAdmin

1 0