- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 9788c6157036ffacda4f44601608e3cc60407db9
by Michal Čihař 19 Aug '10

19 Aug '10

The branch, master has been updated via 9788c6157036ffacda4f44601608e3cc60407db9 (commit) from 3e56021aa43381b6ad1f74077cc9ee42020fecc0 (commit) - Log ----------------------------------------------------------------- commit 9788c6157036ffacda4f44601608e3cc60407db9 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Aug 19 10:44:55 2010 +0200 Better rendering of multi column pages with long text. ----------------------------------------------------------------------- Summary of changes: css/style.css | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/css/style.css b/css/style.css index c3b5278..efd063f 100644 --- a/css/style.css +++ b/css/style.css @@ -59,6 +59,7 @@ div.demo#body { #body { margin: 2em 1em 1em 1em; padding: 0px; + float: left; } a { @@ -163,6 +164,7 @@ ul#footer { padding: 0; margin: 0; max-width: none; + clear: both; } #footer li { hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 3e56021aa43381b6ad1f74077cc9ee42020fecc0
by Michal Čihař 19 Aug '10

19 Aug '10

The branch, master has been updated via 3e56021aa43381b6ad1f74077cc9ee42020fecc0 (commit) via 20fb4bbe812e69ae2d9914911d1e6cf038e53a2c (commit) from e554e94d715fbbe5dceac556dc61cb600bb063dd (commit) - Log ----------------------------------------------------------------- commit 3e56021aa43381b6ad1f74077cc9ee42020fecc0 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Aug 19 10:38:19 2010 +0200 Support for direct generating links to commits. commit 20fb4bbe812e69ae2d9914911d1e6cf038e53a2c Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Aug 19 10:34:50 2010 +0200 Fix template. ----------------------------------------------------------------------- Summary of changes: templates/security/_PMASA_ | 11 +++++++++++ templates/security/_page.tpl | 24 +++++++++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/templates/security/_PMASA_ b/templates/security/_PMASA_ index bf8e4c8..4995066 100644 --- a/templates/security/_PMASA_ +++ b/templates/security/_PMASA_ @@ -57,4 +57,15 @@ Upgrade to phpMyAdmin ???? or newer or apply patch listed below. <py:def function="announcement_patches"> </py:def> + + + + +<xi:include href="_page.tpl" /> </html> diff --git a/templates/security/_page.tpl b/templates/security/_page.tpl index 1de9e44..8f116d6 100644 --- a/templates/security/_page.tpl +++ b/templates/security/_page.tpl @@ -54,11 +54,33 @@ </p> </py:if> - <py:if test="defined('announcement_patches')"> + <py:if test="defined('announcement_patches') or defined('announcement_commits') or defined('announcement_commits_2_11')"> <h3>Patches</h3> + + <py:if test="defined('announcement_patches')"> <p>${announcement_patches()}</p> </py:if> + <py:if test="defined('announcement_commits')"> + <p>Following commits have been made to fix this issue:</p> + <ul> + <py:for each="hash in announcement_commits().next()[1].strip().split('\n')"> + <li><a href="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/phpmyadmi…">${hash}</a></li> + </py:for> + </ul> + </py:if> + + <py:if test="defined('announcement_commits_2_11')"> + <p>Following commits have been made on 2.11 branch to fix this issue:</p> + <ul> + <py:for each="hash in announcement_commits_2_11().next()[1].strip().split('\n')"> + <li><a href="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/phpmyadmi…">${hash}</a></li> + </py:for> + </ul> + </py:if> + + </py:if> + <p> For further information and in case of questions, please contact the phpMyAdmin team. Our website is <a href="http://www.phpmyadmin.net/"> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. e554e94d715fbbe5dceac556dc61cb600bb063dd
by Michal Čihař 19 Aug '10

19 Aug '10

The branch, master has been updated via e554e94d715fbbe5dceac556dc61cb600bb063dd (commit) from fc10460f74514d233859b45c6e66da48035e52f0 (commit) - Log ----------------------------------------------------------------- commit e554e94d715fbbe5dceac556dc61cb600bb063dd Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Aug 19 09:56:43 2010 +0200 Update template. ----------------------------------------------------------------------- Summary of changes: templates/security/_PMASA_ | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/security/_PMASA_ b/templates/security/_PMASA_ index 276ce94..bf8e4c8 100644 --- a/templates/security/_PMASA_ +++ b/templates/security/_PMASA_ @@ -3,16 +3,16 @@ <py:def function="announcement_id"> -PMASA-2008-? +PMASA-2010-? </py:def> <py:def function="announcement_date"> -2008-??-?? +2010-??-?? </py:def>  @@ -51,7 +51,7 @@ Upgrade to phpMyAdmin ???? or newer or apply patch listed below. </py:def>  -<py:def function="announcement_cve">CVE-200x-xxxx</py:def> +<py:def function="announcement_cve">CVE-201x-xxxx</py:def>  <py:def function="announcement_patches"> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] Planet phpMyAdmin branch, master, updated. 028d3dccec71a8d249cb8d53c00da6b13cb371e4
by Michal Čihař 19 Aug '10

19 Aug '10

The branch, master has been updated via 028d3dccec71a8d249cb8d53c00da6b13cb371e4 (commit) from 94b35f99a5d90bba0e2b20d9d298e5ad3185531b (commit) - Log ----------------------------------------------------------------- commit 028d3dccec71a8d249cb8d53c00da6b13cb371e4 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 19 08:08:50 2010 +0200 Adjust adbard url to use fixed javascript. ----------------------------------------------------------------------- Summary of changes: theme/index.html.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/theme/index.html.tmpl b/theme/index.html.tmpl index bcda699..8afdecd 100644 --- a/theme/index.html.tmpl +++ b/theme/index.html.tmpl @@ -177,7 +177,7 @@ new TWTR.Widget({ var ab_h = '22e342dc6a6a99267a46f18fc5dcecf1'; var ab_s = 'e837f957b30be6f80f9c06167253766a'; </script> -<script type='text/javascript' src='http://cdn1.adbard.net/js/ab1.js'></script> +<script type='text/javascript' src='http://cdn1.adbard.net/js/ab2.js'></script>  </p> hooks/post-receive -- Planet phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6485-g1f248cc
by Michal Čihař 18 Aug '10

18 Aug '10

The branch, master has been updated via 1f248cc2549a2f5c1a47d209f2062ccb1fa4682c (commit) from d928804684fb9480ecc971b306bdbfbb309ede0f (commit) - Log ----------------------------------------------------------------- commit 1f248cc2549a2f5c1a47d209f2062ccb1fa4682c Author: Michal Čihař <michal(a)cihar.com> Date: Wed Aug 18 13:58:52 2010 +0200 Simplify code to use native tcpdf functions. ----------------------------------------------------------------------- Summary of changes: libraries/export/pdf.php | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index 5bd4617..f478a11 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -45,17 +45,6 @@ class PMA_PDF extends TCPDF var $headerset; var $footerset; - // added because tcpdf for PHP 5 has a protected $buffer - public function getBuffer() - { - return $this->buffer; - } - - public function getState() - { - return $this->state; - } - // overloading of a tcpdf function: function _beginpage($orientation) { @@ -466,10 +455,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) $pdf->mysql_report($sql_query, $attr); // instead of $pdf->Output(): - if ($pdf->getState() < 3) { - $pdf->Close(); - } - if (!PMA_exportOutputHandler($pdf->getBuffer())) { + if (!PMA_exportOutputHandler($pdf->getPDFData())) { return FALSE; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6484-gd928804
by Michal Čihař 17 Aug '10

17 Aug '10

The branch, master has been updated via d928804684fb9480ecc971b306bdbfbb309ede0f (commit) from 0f39dc040ab9287f17ca267e84078748c7f96f62 (commit) - Log ----------------------------------------------------------------- commit d928804684fb9480ecc971b306bdbfbb309ede0f Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Aug 17 16:38:05 2010 +0200 Fix string escaping. ----------------------------------------------------------------------- Summary of changes: js/messages.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/messages.php b/js/messages.php index aeb93f5..4999002 100644 --- a/js/messages.php +++ b/js/messages.php @@ -32,7 +32,7 @@ $js_messages['strDropDatabaseStrongWarning'] = __('You are about to DESTROY a co /* For blobstreaming */ $js_messages['strBLOBRepositoryDisableStrongWarning'] = __('You are about to DISABLE a BLOB Repository!'); -$js_messages['strBLOBRepositoryDisableAreYouSure'] = sprintf(__('Are you sure you want to disable all BLOB references for database %s?'), $GLOBALS['db']); +$js_messages['strBLOBRepositoryDisableAreYouSure'] = sprintf(__('Are you sure you want to disable all BLOB references for database %s?'), PMA_escapeJsString($GLOBALS['db'])); /* For indexes */ $js_messages['strFormEmpty'] = __('Missing value in the form!'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6483-g0f39dc0
by Michal Čihař 17 Aug '10

17 Aug '10

The branch, master has been updated via 0f39dc040ab9287f17ca267e84078748c7f96f62 (commit) via e8cf1ac6773cf868ff79ed286494ea13b58da528 (commit) from 87fb4ea4cac849394d5acd434b0b64e03e8e088e (commit) - Log ----------------------------------------------------------------- commit 0f39dc040ab9287f17ca267e84078748c7f96f62 Merge: 87fb4ea4cac849394d5acd434b0b64e03e8e088e e8cf1ac6773cf868ff79ed286494ea13b58da528 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Aug 17 15:31:06 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: libraries/session.inc.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libraries/session.inc.php b/libraries/session.inc.php index 551668d..4f8caec 100644 --- a/libraries/session.inc.php +++ b/libraries/session.inc.php @@ -110,5 +110,6 @@ function PMA_secureSession() { // prevent session fixation and XSS session_regenerate_id(true); + $_SESSION[' PMA_token '] = md5(uniqid(rand(), true)); } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_5-20-ge8cf1ac
by Michal Čihař 17 Aug '10

17 Aug '10

The branch, QA_3_3 has been updated via e8cf1ac6773cf868ff79ed286494ea13b58da528 (commit) from 9e2a3f207b0d983d7c2998670232e7c0632146fb (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: libraries/session.inc.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libraries/session.inc.php b/libraries/session.inc.php index d222394..f1ae661 100644 --- a/libraries/session.inc.php +++ b/libraries/session.inc.php @@ -101,5 +101,6 @@ function PMA_secureSession() { // prevent session fixation and XSS session_regenerate_id(true); + $_SESSION[' PMA_token '] = md5(uniqid(rand(), true)); } -?> \ No newline at end of file +?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6481-g87fb4ea
by Michal Čihař 17 Aug '10

17 Aug '10

The branch, master has been updated via 87fb4ea4cac849394d5acd434b0b64e03e8e088e (commit) via 9e2a3f207b0d983d7c2998670232e7c0632146fb (commit) via 80cca2d68c0995a5c499f8b4ca8fa9d1a7c15fa6 (commit) via dda6de20d25f4622b36407c46e87d59d7820131c (commit) from 2f6370050b4e1aa9b1cb0c236c5cab87e04e4b03 (commit) - Log ----------------------------------------------------------------- commit 87fb4ea4cac849394d5acd434b0b64e03e8e088e Merge: 2f6370050b4e1aa9b1cb0c236c5cab87e04e4b03 9e2a3f207b0d983d7c2998670232e7c0632146fb Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Aug 17 13:40:55 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_5-19-g9e2a3f2
by Michal Čihař 17 Aug '10

17 Aug '10

The branch, QA_3_3 has been updated via 9e2a3f207b0d983d7c2998670232e7c0632146fb (commit) from 80cca2d68c0995a5c499f8b4ca8fa9d1a7c15fa6 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: themes/.gitignore | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) create mode 100644 themes/.gitignore diff --git a/themes/.gitignore b/themes/.gitignore new file mode 100644 index 0000000..2676970 --- /dev/null +++ b/themes/.gitignore @@ -0,0 +1,27 @@ +aqua +aqua_brushed +arctic_ocean +cactica_blues +clearview3 +crimson_gray +dark_lime +darkblue_gray +garvblue +graphivore +green_orange +grid +hillside +openphpnuke +original_small +paradice +pixeline +silk +silkline +smooth_yellow +very_small +xampp +xp_basic +xp_blue +xp_dirty +xp_green +xp_silver hooks/post-receive -- phpMyAdmin

1 0