- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] Planet phpMyAdmin branch, master, updated. 133c8f0eb8f36597834e9ee72de2eb2879552605
by Michal Čihař 27 Apr '10

27 Apr '10

The branch, master has been updated via 133c8f0eb8f36597834e9ee72de2eb2879552605 (commit) from 02aa95f4b89fbdcec026d84cbecc195ca0cc3fa7 (commit) - Log ----------------------------------------------------------------- commit 133c8f0eb8f36597834e9ee72de2eb2879552605 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Apr 27 16:12:46 2010 +0200 Remove old GSoC student blogs, they no longer seem to be interested in PMA. ----------------------------------------------------------------------- Summary of changes: planet.ini | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/planet.ini b/planet.ini index d6ab7a9..9eb9fcb 100644 --- a/planet.ini +++ b/planet.ini @@ -25,17 +25,5 @@ log_level = DEBUG [http://blog.cihar.com/rss.xml] name = Michal Čihař -[http://tomassrnka.wordpress.com/feed/] -name = Tomáš Srnka - -[http://www.derekschaefer.net/?feed=rss2] -name = Derek Schaefer - -[http://trackingchangesphp.blogspot.com/feeds/posts/default?alt=rss] -name = Zahra Naeem - -[http://trackingmech.blogspot.com/feeds/posts/default?alt=rss] -name = Alexander Rutkowski - [http://ankitgupt.wordpress.com/feed/] name = Ankit Gupta hooks/post-receive -- Planet phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] Planet phpMyAdmin branch, master, updated. 02aa95f4b89fbdcec026d84cbecc195ca0cc3fa7
by Michal Čihař 27 Apr '10

27 Apr '10

The branch, master has been updated via 02aa95f4b89fbdcec026d84cbecc195ca0cc3fa7 (commit) from 3e151d472c7073c0f4f9ba08d51b737a3b7f18bb (commit) - Log ----------------------------------------------------------------- commit 02aa95f4b89fbdcec026d84cbecc195ca0cc3fa7 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Apr 27 16:07:27 2010 +0200 Add student blog. ----------------------------------------------------------------------- Summary of changes: planet.ini | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/planet.ini b/planet.ini index ce9b304..d6ab7a9 100644 --- a/planet.ini +++ b/planet.ini @@ -37,3 +37,5 @@ name = Zahra Naeem [http://trackingmech.blogspot.com/feeds/posts/default?alt=rss] name = Alexander Rutkowski +[http://ankitgupt.wordpress.com/feed/] +name = Ankit Gupta hooks/post-receive -- Planet phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2086-gba0ca18
by Marc Delisle 26 Apr '10

26 Apr '10

The branch, master has been updated via ba0ca1851a2605c17f23bd850b5c1575a11f83bb (commit) via 06c8fa0abbe2ff3a9c05f8514e229f1a64eb514b (commit) via bd4e0b83d8f13060e8422c86dca1e4fa2babc7c4 (commit) from 5cb5afedbb580fd5e13c018a63e71be076e5ca16 (commit) - Log ----------------------------------------------------------------- commit ba0ca1851a2605c17f23bd850b5c1575a11f83bb Merge: 5cb5afedbb580fd5e13c018a63e71be076e5ca16 06c8fa0abbe2ff3a9c05f8514e229f1a64eb514b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Apr 26 16:38:46 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + tbl_tracking.php | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5fbcc6..c0866d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ $Id$ - bug #2974067 [display] non-binary fields shown as hex - bug #2983065 [operations] Error when changing from Maria to MyISAM engine - bug #2975408 [tracking] Data too long for column data_sql +- bug [tracking] Tracking report should obey MaxCharactersInDisplayedSQL 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/tbl_tracking.php b/tbl_tracking.php index f43bbcf..534d6d4 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -416,8 +416,11 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { <?php $style = 'odd'; foreach ($data['ddlog'] as $entry) { - $parsed_sql = PMA_SQP_parse($entry['statement']); - $statement = PMA_formatSql($parsed_sql); + if (strlen($entry['statement']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { + $statement = substr($entry['statement'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]'; + } else { + $statement = PMA_formatSql(PMA_SQP_parse($entry['statement'])); + } $timestamp = strtotime($entry['date']); if ($timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to && @@ -464,8 +467,11 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { <?php $style = 'odd'; foreach ($data['dmlog'] as $entry) { - $parsed_sql = PMA_SQP_parse($entry['statement']); - $statement = PMA_formatSql($parsed_sql); + if (strlen($entry['statement']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { + $statement = substr($entry['statement'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]'; + } else { + $statement = PMA_formatSql(PMA_SQP_parse($entry['statement'])); + } $timestamp = strtotime($entry['date']); if ($timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to && hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2-26-g06c8fa0
by Marc Delisle 26 Apr '10

26 Apr '10

The branch, QA_3_3 has been updated via 06c8fa0abbe2ff3a9c05f8514e229f1a64eb514b (commit) from bd4e0b83d8f13060e8422c86dca1e4fa2babc7c4 (commit) - Log ----------------------------------------------------------------- commit 06c8fa0abbe2ff3a9c05f8514e229f1a64eb514b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Apr 26 16:38:20 2010 -0400 Tracking report should obey MaxCharactersInDisplayedSQL ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + tbl_tracking.php | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f39c01f..46a7f1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2974067 [display] non-binary fields shown as hex - bug #2983065 [operations] Error when changing from Maria to MyISAM engine - bug #2975408 [tracking] Data too long for column data_sql +- bug [tracking] Tracking report should obey MaxCharactersInDisplayedSQL 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/tbl_tracking.php b/tbl_tracking.php index fbee82a..224ed87 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -417,8 +417,11 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { <?php $style = 'odd'; foreach ($data['ddlog'] as $entry) { - $parsed_sql = PMA_SQP_parse($entry['statement']); - $statement = PMA_formatSql($parsed_sql); + if (strlen($entry['statement']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { + $statement = substr($entry['statement'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]'; + } else { + $statement = PMA_formatSql(PMA_SQP_parse($entry['statement'])); + } $timestamp = strtotime($entry['date']); if ($timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to && @@ -465,8 +468,11 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { <?php $style = 'odd'; foreach ($data['dmlog'] as $entry) { - $parsed_sql = PMA_SQP_parse($entry['statement']); - $statement = PMA_formatSql($parsed_sql); + if (strlen($entry['statement']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { + $statement = substr($entry['statement'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]'; + } else { + $statement = PMA_formatSql(PMA_SQP_parse($entry['statement'])); + } $timestamp = strtotime($entry['date']); if ($timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to && hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2-25-gbd4e0b8
by Michal Čihař 26 Apr '10

26 Apr '10

The branch, QA_3_3 has been updated via bd4e0b83d8f13060e8422c86dca1e4fa2babc7c4 (commit) from f97fafea3dc55ba9a98a10fba1787c3cea4b953e (commit) - Log ----------------------------------------------------------------- commit bd4e0b83d8f13060e8422c86dca1e4fa2babc7c4 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Apr 26 14:33:05 2010 +0200 Fix mermissions. ----------------------------------------------------------------------- Summary of changes: 0 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 libraries/export/mediawiki.php diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php old mode 100755 new mode 100644 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2083-g5cb5afe
by Michal Čihař 26 Apr '10

26 Apr '10

The branch, master has been updated via 5cb5afedbb580fd5e13c018a63e71be076e5ca16 (commit) via f97fafea3dc55ba9a98a10fba1787c3cea4b953e (commit) from a9bfc2cd5b14561477689003c47d6972d4d49f4f (commit) - Log ----------------------------------------------------------------- commit 5cb5afedbb580fd5e13c018a63e71be076e5ca16 Merge: a9bfc2cd5b14561477689003c47d6972d4d49f4f f97fafea3dc55ba9a98a10fba1787c3cea4b953e Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Apr 26 14:20:51 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: scripts/create_tables.sql | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index 27c3e4d..bcb8b35 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -1,8 +1,8 @@ -- -------------------------------------------------------- -- SQL Commands to set up the pmadb as described in Documentation.html. --- +-- -- This file is meant for use with MySQL 5 and above! --- +-- -- This script expects the user pma to already be existing. If we would put a -- line here to create him too many users might just use this script and end -- up with having the same password for the controluser. @@ -173,9 +173,11 @@ CREATE TABLE IF NOT EXISTS `pma_designer_coords` ( ENGINE=MyISAM COMMENT='Table coordinates for Designer' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; --- +-- -------------------------------------------------------- + +-- -- Table structure for table `pma_tracking` --- +-- CREATE TABLE IF NOT EXISTS `pma_tracking` ( `db_name` varchar(64) collate utf8_bin NOT NULL, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2-24-gf97fafe
by Michal Čihař 26 Apr '10

26 Apr '10

The branch, QA_3_3 has been updated via f97fafea3dc55ba9a98a10fba1787c3cea4b953e (commit) from 6393fff59dfe8fdc7d43f434fe282378c91c10c9 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: scripts/create_tables.sql | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index 27c3e4d..bcb8b35 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -1,8 +1,8 @@ -- -------------------------------------------------------- -- SQL Commands to set up the pmadb as described in Documentation.html. --- +-- -- This file is meant for use with MySQL 5 and above! --- +-- -- This script expects the user pma to already be existing. If we would put a -- line here to create him too many users might just use this script and end -- up with having the same password for the controluser. @@ -173,9 +173,11 @@ CREATE TABLE IF NOT EXISTS `pma_designer_coords` ( ENGINE=MyISAM COMMENT='Table coordinates for Designer' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; --- +-- -------------------------------------------------------- + +-- -- Table structure for table `pma_tracking` --- +-- CREATE TABLE IF NOT EXISTS `pma_tracking` ( `db_name` varchar(64) collate utf8_bin NOT NULL, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2081-ga9bfc2c
by Marc Delisle 26 Apr '10

26 Apr '10

The branch, master has been updated via a9bfc2cd5b14561477689003c47d6972d4d49f4f (commit) via 6393fff59dfe8fdc7d43f434fe282378c91c10c9 (commit) from 2154120e3a3e3eb111772c69ddc1eec72c0345f1 (commit) - Log ----------------------------------------------------------------- commit a9bfc2cd5b14561477689003c47d6972d4d49f4f Merge: 2154120e3a3e3eb111772c69ddc1eec72c0345f1 6393fff59dfe8fdc7d43f434fe282378c91c10c9 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Apr 26 07:42:25 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + scripts/create_tables.sql | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40fa43b..c5fbcc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -99,6 +99,7 @@ $Id$ engine to Maria, thanks to Madhura Jayaratne. - bug #2974067 [display] non-binary fields shown as hex - bug #2983065 [operations] Error when changing from Maria to MyISAM engine +- bug #2975408 [tracking] Data too long for column data_sql 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index de225ee..27c3e4d 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -185,7 +185,7 @@ CREATE TABLE IF NOT EXISTS `pma_tracking` ( `date_updated` datetime NOT NULL, `schema_snapshot` text collate utf8_bin NOT NULL, `schema_sql` text collate utf8_bin, - `data_sql` text collate utf8_bin, + `data_sql` longtext collate utf8_bin, `tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') collate utf8_bin default NULL, `tracking_active` int(1) unsigned NOT NULL default '1', PRIMARY KEY (`db_name`,`table_name`,`version`) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2-23-g6393fff
by Marc Delisle 26 Apr '10

26 Apr '10

The branch, QA_3_3 has been updated via 6393fff59dfe8fdc7d43f434fe282378c91c10c9 (commit) from e9ee6cf1d12332d99095ce2a1b81d2bc3f0fa064 (commit) - Log ----------------------------------------------------------------- commit 6393fff59dfe8fdc7d43f434fe282378c91c10c9 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Apr 26 07:41:36 2010 -0400 bug #2975408 Data too long for column data_sql ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + scripts/create_tables.sql | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0679157..f39c01f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA engine to Maria, thanks to Madhura Jayaratne. - bug #2974067 [display] non-binary fields shown as hex - bug #2983065 [operations] Error when changing from Maria to MyISAM engine +- bug #2975408 [tracking] Data too long for column data_sql 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index de225ee..27c3e4d 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -185,7 +185,7 @@ CREATE TABLE IF NOT EXISTS `pma_tracking` ( `date_updated` datetime NOT NULL, `schema_snapshot` text collate utf8_bin NOT NULL, `schema_sql` text collate utf8_bin, - `data_sql` text collate utf8_bin, + `data_sql` longtext collate utf8_bin, `tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') collate utf8_bin default NULL, `tracking_active` int(1) unsigned NOT NULL default '1', PRIMARY KEY (`db_name`,`table_name`,`version`) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2079-g2154120
by Michal Čihař 25 Apr '10

25 Apr '10

The branch, master has been updated via 2154120e3a3e3eb111772c69ddc1eec72c0345f1 (commit) from ec263b9170f89b033374ae8a1281d779693d8200 (commit) - Log ----------------------------------------------------------------- commit 2154120e3a3e3eb111772c69ddc1eec72c0345f1 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Apr 25 16:51:53 2010 +0200 [core] Include Content Security Policy HTTP headers. See <https://wiki.mozilla.org/Security/CSP/Specification> for more details. I hope current rule is flexible enough to avoid impact on existing functionality. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/header_http.inc.php | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 06d98cb..40fa43b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,7 @@ $Id$ + rfe #2983207, patch #2988715 [interface] Use jQuery calendar dialog, thanks to Muhammad Adnan. + [doc] Incorporate synchronisation docs into main document. ++ [core] Include Content Security Policy HTTP headers. 3.3.3.0 (not yet released) - patch #2982480 [navi] Do not group if there would be one table in group, diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php index 2a1c445..46f8017 100644 --- a/libraries/header_http.inc.php +++ b/libraries/header_http.inc.php @@ -23,6 +23,7 @@ $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT'; /* Prevent against ClickJacking by allowing frames only from same origin */ if (!$GLOBALS['cfg']['AllowThirdPartyFraming']) { header('X-Frame-Options: SAMEORIGIN'); + header('X-Content-Security-Policy: allow \'self\'; options inline-script eval-script; frame-ancestors \'self\''); } header('Expires: ' . $GLOBALS['now']); // rfc2616 - Section 14.21 header('Last-Modified: ' . $GLOBALS['now']); hooks/post-receive -- phpMyAdmin

1 0