August 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_3_10_4, created. RELEASE_3_3_10_4
by Marc Delisle 24 Aug '11

24 Aug '11

The annotated tag, RELEASE_3_3_10_4 has been created at 14fb65df96ece01b7f711c0d83f623a106039fba (tag) tagging bd92c092cd422667097e98a3cd8ebc0140338244 (commit) replaces RELEASE_3_3_10_3 tagged by Marc Delisle on Wed Aug 24 12:20:01 2011 -0400 - Log ----------------------------------------------------------------- Released 3.3.10.4 Herman van Rink (5): XSS fixes XSS fixes XSS fixes Make better use of PMA_generate_common_url to prevent XSS Slightly far fetched XSS prevention Marc Delisle (3): Sanitize filenames before using in Content-Disposition header ChangeLog for 3.3.10.4 3.3.10.4 release ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_10_3-21-ga60420a
by Marc Delisle 24 Aug '11

24 Aug '11

The branch, QA_3_3 has been updated via a60420aa5003426174dde15a0cecfc05579a37bb (commit) via be8cb6c27ffd7c63842cfc30fc61d29f176c8d66 (commit) via 6aefed1fbc9271afb43ebc72675420a93472f313 (commit) via 555e0db0ac9c7ad2ef8d6cecdffa79716f469c60 (commit) via a5716cb3892f1714a97d8808cde9229ccc8752c8 (commit) via ae20845e36e0e019715842c71eed9e4a9ff99223 (commit) via e11e55cb0689b4a6de5f0d996166668a47f96da9 (commit) via 9d54e57fc8946db9b04666a93541871c80867fe7 (commit) via c78da1582799f35c8f12ca930062ea987a350282 (commit) via a6c8a8fe8ac03f4f36e5aaa7f7fb3bf0e11654f8 (commit) via 3e95b08ceddaad36a3633920d7b0bcf85ce2f565 (commit) from 8a5c5c8ef525e59f3368f993d3cc0ab2bb57ea7e (commit) - Log ----------------------------------------------------------------- commit a60420aa5003426174dde15a0cecfc05579a37bb Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Aug 24 12:13:37 2011 -0400 ChangeLog for 3.3.10.4 commit be8cb6c27ffd7c63842cfc30fc61d29f176c8d66 Merge: 555e0db 6aefed1 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Aug 24 12:12:47 2011 -0400 Merge branch 'MAINT_3_3_10' into QA_3_3 commit 555e0db0ac9c7ad2ef8d6cecdffa79716f469c60 Merge: 8a5c5c8 a5716cb Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Aug 24 12:10:12 2011 -0400 Merge branch 'MAINT_3_3_10' into QA_3_3 ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 ++ tbl_tracking.php | 72 +++++++++++++++++++++++-------------------- transformation_wrapper.php | 2 +- 3 files changed, 42 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0200a5..ec15343 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,9 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.11.0 (not yet released) +3.3.10.4 (2011-08-24) +- [security] Missing sanitization on the table, column and index names leads to XSS vulnerabilities, see PMASA-2011-13 + 3.3.10.3 (2011-07-23) - [security] Fixed XSS vulnerability, see PMASA-2011-9 - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-12 diff --git a/tbl_tracking.php b/tbl_tracking.php index b3ac4f3..ab5bd31 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -288,17 +288,17 @@ if (isset($_REQUEST['snapshot'])) { <tr class="<?php echo $style; ?>"> <?php if ($field['Key'] == 'PRI') { - echo '<td><b><u>' . $field['Field'] . '</u></b></td>' . "\n"; + echo '<td><b><u>' . htmlspecialchars($field['Field']) . '</u></b></td>' . "\n"; } else { - echo '<td><b>' . $field['Field'] . '</b></td>' . "\n"; + echo '<td><b>' . htmlspecialchars($field['Field']) . '</b></td>' . "\n"; } ?> - <td><?php echo $field['Type'];?></td> - <td><?php echo $field['Collation'];?></td> - <td><?php echo $field['Null'];?></td> - <td><?php echo $field['Default'];?></td> - <td><?php echo $field['Extra'];?></td> - <td><?php echo $field['Comment'];?></td> + <td><?php echo htmlspecialchars($field['Type']);?></td> + <td><?php echo htmlspecialchars($field['Collation']);?></td> + <td><?php echo htmlspecialchars($field['Null']);?></td> + <td><?php echo htmlspecialchars($field['Default']);?></td> + <td><?php echo htmlspecialchars($field['Extra']);?></td> + <td><?php echo htmlspecialchars($field['Comment']);?></td> </tr> <?php if ($style == 'even') { @@ -344,15 +344,15 @@ if (isset($_REQUEST['snapshot'])) { } ?> <tr class="<?php echo $style; ?>"> - <td><b><?php echo $index['Key_name'];?></b></td> - <td><?php echo $index['Index_type'];?></td> + <td><b><?php echo htmlspecialchars($index['Key_name']);?></b></td> + <td><?php echo htmlspecialchars($index['Index_type']);?></td> <td><?php echo $str_unique;?></td> <td><?php echo $str_packed;?></td> - <td><?php echo $index['Column_name'];?></td> - <td><?php echo $index['Cardinality'];?></td> - <td><?php echo $index['Collation'];?></td> - <td><?php echo $index['Null'];?></td> - <td><?php echo $index['Comment'];?></td> + <td><?php echo htmlspecialchars($index['Column_name']);?></td> + <td><?php echo htmlspecialchars($index['Cardinality']);?></td> + <td><?php echo htmlspecialchars($index['Collation']);?></td> + <td><?php echo htmlspecialchars($index['Null']);?></td> + <td><?php echo htmlspecialchars($index['Comment']);?></td> </tr> <?php if ($style == 'even') { @@ -379,10 +379,10 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { ?> <h3><?php echo $strTrackingReport;?> [<a href="tbl_tracking.php?<?php echo $url_query;?>"><?php echo $strTrackingReportClose;?></a>]</h3> - <small><?php echo $strTrackingStatements . ' ' . $data['tracking']; ?></small><br/> + <small><?php echo $strTrackingStatements . ' ' . htmlspecialchars($data['tracking']); ?></small><br/> <br/> - <form method="post" action="tbl_tracking.php?<?php echo $url_query; ?>&report=true&version=<?php echo $_REQUEST['version'];?>"> + <form method="post" action="tbl_tracking.php<?php echo PMA_generate_common_url($url_params + array('report' => 'true', 'version' => $_REQUEST['version'])); ?>"> <?php $str1 = '<select name="logtype">' . @@ -390,9 +390,9 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { '<option value="data"' . ($selection_data ? ' selected="selected"' : ''). '>' . $strDataOnly . '</option>' . '<option value="schema_and_data"' . ($selection_both ? ' selected="selected"' : '') . '>' . $strStrucData . '</option>' . '</select>'; - $str2 = '<input type="text" name="date_from" value="' . $_REQUEST['date_from'] . '" size="19" />'; - $str3 = '<input type="text" name="date_to" value="' . $_REQUEST['date_to'] . '" size="19" />'; - $str4 = '<input type="text" name="users" value="' . $_REQUEST['users'] . '" />'; + $str2 = '<input type="text" name="date_from" value="' . htmlspecialchars($_REQUEST['date_from']) . '" size="19" />'; + $str3 = '<input type="text" name="date_to" value="' . htmlspecialchars($_REQUEST['date_to']) . '" size="19" />'; + $str4 = '<input type="text" name="users" value="' . htmlspecialchars($_REQUEST['users']) . '" />'; $str5 = '<input type="submit" name="list_report" value="' . $strGo . '" />'; printf($strTrackingShowLogDateUsers, $str1, $str2, $str3, $str4, $str5); @@ -429,8 +429,8 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { ?> <tr class="<?php echo $style; ?>"> <td><small><?php echo $i;?></small></td> - <td><small><?php echo $entry['date'];?></small></td> - <td><small><?php echo $entry['username']; ?></small></td> + <td><small><?php echo htmlspecialchars($entry['date']);?></small></td> + <td><small><?php echo htmlspecialchars($entry['username']); ?></small></td> <td><?php echo $statement; ?></td> </tr> <?php @@ -480,8 +480,8 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { ?> <tr class="<?php echo $style; ?>"> <td><small><?php echo $i; ?></small></td> - <td><small><?php echo $entry['date']; ?></small></td> - <td><small><?php echo $entry['username']; ?></small></td> + <td><small><?php echo htmlspecialchars($entry['date']); ?></small></td> + <td><small><?php echo htmlspecialchars($entry['username']); ?></small></td> <td><?php echo $statement; ?></td> </tr> <?php @@ -500,7 +500,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { } ?> </form> - <form method="post" action="tbl_tracking.php?<?php echo $url_query; ?>&report=true&version=<?php echo $_REQUEST['version'];?>"> + <form method="post" action="tbl_tracking.php<?php echo PMA_generate_common_url($url_params + array('report' => 'true', 'version' => $_REQUEST['version'])); ?>"> <?php printf($strTrackingShowLogDateUsers, $str1, $str2, $str3, $str4, $str5); @@ -513,11 +513,11 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { $str_export2 = '<input type="submit" name="report_export" value="' . $strGo .'" />'; ?> </form> - <form method="post" action="tbl_tracking.php?<?php echo $url_query; ?>&report=true&version=<?php echo $_REQUEST['version'];?>"> - <input type="hidden" name="logtype" value="<?php echo $_REQUEST['logtype'];?>" /> - <input type="hidden" name="date_from" value="<?php echo $_REQUEST['date_from'];?>" /> - <input type="hidden" name="date_to" value="<?php echo $_REQUEST['date_to'];?>" /> - <input type="hidden" name="users" value="<?php echo $_REQUEST['users'];?>" /> + <form method="post" action="tbl_tracking.php<?php echo PMA_generate_common_url($url_params + array('report' => 'true', 'version' => $_REQUEST['version'])); ?>"> + <input type="hidden" name="logtype" value="<?php echo htmlspecialchars($_REQUEST['logtype']);?>" /> + <input type="hidden" name="date_from" value="<?php echo htmlspecialchars($_REQUEST['date_from']);?>" /> + <input type="hidden" name="date_to" value="<?php echo htmlspecialchars($_REQUEST['date_to']);?>" /> + <input type="hidden" name="users" value="<?php echo htmlspecialchars($_REQUEST['users']);?>" /> <?php echo "<br/>" . sprintf($strTrackingExportAs, $str_export1) . $str_export2 . "<br/>"; ?> @@ -618,11 +618,15 @@ if ($last_version > 0) { <tr class="<?php echo $style;?>"> <td><?php echo htmlspecialchars($version['db_name']);?></td> <td><?php echo htmlspecialchars($version['table_name']);?></td> - <td><?php echo $version['version'];?></td> - <td><?php echo $version['date_created'];?></td> - <td><?php echo $version['date_updated'];?></td> + <td><?php echo htmlspecialchars($version['version']);?></td> + <td><?php echo htmlspecialchars($version['date_created']);?></td> + <td><?php echo htmlspecialchars($version['date_updated']);?></td> <td><?php echo $version_status;?></td> - <td> <a href="tbl_tracking.php?<?php echo $url_query;?>&report=true&version=<?php echo $version['version'];?>"><?php echo $strTrackingReport;?></a> | <a href="tbl_tracking.php?<?php echo $url_query;?>&snapshot=true&version=<?php echo $version['version'];?>"><?php echo $strTrackingStructureSnapshot;?></a></td> + <td> <a href="tbl_tracking.php<?php echo PMA_generate_common_url($url_params + array('report' => 'true', 'version' => $version['version']) +);?>"><?php echo $strTrackingReport;?></a> + | <a href="tbl_tracking.php<?php echo PMA_generate_common_url($url_params + array('snapshot' => 'true', 'version' => $version['version']) +);?>"><?php echo $strTrackingStructureSnapshot;?></a> + </td> </tr> <?php if ($style == 'even') { diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 011effe..6f06450 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -70,7 +70,7 @@ if (isset($ct) && !empty($ct)) { header($content_type); if (isset($cn) && !empty($cn)) { - header('Content-Disposition: attachment; filename=' . $cn); + header('Content-Disposition: attachment; filename=' . PMA_sanitize_filename($cn)); } if (!isset($resize)) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_10, updated. RELEASE_3_3_10_3-8-gbd92c09
by Marc Delisle 24 Aug '11

24 Aug '11

The branch, MAINT_3_3_10 has been updated via bd92c092cd422667097e98a3cd8ebc0140338244 (commit) via 6aefed1fbc9271afb43ebc72675420a93472f313 (commit) via a5716cb3892f1714a97d8808cde9229ccc8752c8 (commit) via ae20845e36e0e019715842c71eed9e4a9ff99223 (commit) via e11e55cb0689b4a6de5f0d996166668a47f96da9 (commit) via 9d54e57fc8946db9b04666a93541871c80867fe7 (commit) via c78da1582799f35c8f12ca930062ea987a350282 (commit) via a6c8a8fe8ac03f4f36e5aaa7f7fb3bf0e11654f8 (commit) from 3e95b08ceddaad36a3633920d7b0bcf85ce2f565 (commit) - Log ----------------------------------------------------------------- commit bd92c092cd422667097e98a3cd8ebc0140338244 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Aug 24 12:16:07 2011 -0400 3.3.10.4 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 ++ Documentation.html | 4 +- README | 2 +- libraries/Config.class.php | 2 +- tbl_tracking.php | 72 +++++++++++++++++++++++-------------------- transformation_wrapper.php | 2 +- translators.html | 4 +- 7 files changed, 48 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index 54ef4ec..ddc085d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +3.3.10.4 (2011-08-24) +- [security] Missing sanitization on the table, column and index names leads to XSS vulnerabilities, see PMASA-2011-13 + 3.3.10.3 (2011-07-23) - [security] Fixed XSS vulnerability, see PMASA-2011-9 - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-12 diff --git a/Documentation.html b/Documentation.html index f92b46b..7ee8e50 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.10.3 - Documentation</title> + <title>phpMyAdmin 3.3.10.4 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.10.3 + 3.3.10.4 Documentation </h1> </div> diff --git a/README b/README index f5967ed..4d2bcbd 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.10.3 + Version 3.3.10.4 ---------------- http://www.phpmyadmin.net/ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 68b9663..0ace890 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.10.3'); + $this->set('PMA_VERSION', '3.3.10.4'); /** * @deprecated */ diff --git a/tbl_tracking.php b/tbl_tracking.php index b3ac4f3..ab5bd31 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -288,17 +288,17 @@ if (isset($_REQUEST['snapshot'])) { <tr class="<?php echo $style; ?>"> <?php if ($field['Key'] == 'PRI') { - echo '<td><b><u>' . $field['Field'] . '</u></b></td>' . "\n"; + echo '<td><b><u>' . htmlspecialchars($field['Field']) . '</u></b></td>' . "\n"; } else { - echo '<td><b>' . $field['Field'] . '</b></td>' . "\n"; + echo '<td><b>' . htmlspecialchars($field['Field']) . '</b></td>' . "\n"; } ?> - <td><?php echo $field['Type'];?></td> - <td><?php echo $field['Collation'];?></td> - <td><?php echo $field['Null'];?></td> - <td><?php echo $field['Default'];?></td> - <td><?php echo $field['Extra'];?></td> - <td><?php echo $field['Comment'];?></td> + <td><?php echo htmlspecialchars($field['Type']);?></td> + <td><?php echo htmlspecialchars($field['Collation']);?></td> + <td><?php echo htmlspecialchars($field['Null']);?></td> + <td><?php echo htmlspecialchars($field['Default']);?></td> + <td><?php echo htmlspecialchars($field['Extra']);?></td> + <td><?php echo htmlspecialchars($field['Comment']);?></td> </tr> <?php if ($style == 'even') { @@ -344,15 +344,15 @@ if (isset($_REQUEST['snapshot'])) { } ?> <tr class="<?php echo $style; ?>"> - <td><b><?php echo $index['Key_name'];?></b></td> - <td><?php echo $index['Index_type'];?></td> + <td><b><?php echo htmlspecialchars($index['Key_name']);?></b></td> + <td><?php echo htmlspecialchars($index['Index_type']);?></td> <td><?php echo $str_unique;?></td> <td><?php echo $str_packed;?></td> - <td><?php echo $index['Column_name'];?></td> - <td><?php echo $index['Cardinality'];?></td> - <td><?php echo $index['Collation'];?></td> - <td><?php echo $index['Null'];?></td> - <td><?php echo $index['Comment'];?></td> + <td><?php echo htmlspecialchars($index['Column_name']);?></td> + <td><?php echo htmlspecialchars($index['Cardinality']);?></td> + <td><?php echo htmlspecialchars($index['Collation']);?></td> + <td><?php echo htmlspecialchars($index['Null']);?></td> + <td><?php echo htmlspecialchars($index['Comment']);?></td> </tr> <?php if ($style == 'even') { @@ -379,10 +379,10 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { ?> <h3><?php echo $strTrackingReport;?> [<a href="tbl_tracking.php?<?php echo $url_query;?>"><?php echo $strTrackingReportClose;?></a>]</h3> - <small><?php echo $strTrackingStatements . ' ' . $data['tracking']; ?></small><br/> + <small><?php echo $strTrackingStatements . ' ' . htmlspecialchars($data['tracking']); ?></small><br/> <br/> - <form method="post" action="tbl_tracking.php?<?php echo $url_query; ?>&report=true&version=<?php echo $_REQUEST['version'];?>"> + <form method="post" action="tbl_tracking.php<?php echo PMA_generate_common_url($url_params + array('report' => 'true', 'version' => $_REQUEST['version'])); ?>"> <?php $str1 = '<select name="logtype">' . @@ -390,9 +390,9 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { '<option value="data"' . ($selection_data ? ' selected="selected"' : ''). '>' . $strDataOnly . '</option>' . '<option value="schema_and_data"' . ($selection_both ? ' selected="selected"' : '') . '>' . $strStrucData . '</option>' . '</select>'; - $str2 = '<input type="text" name="date_from" value="' . $_REQUEST['date_from'] . '" size="19" />'; - $str3 = '<input type="text" name="date_to" value="' . $_REQUEST['date_to'] . '" size="19" />'; - $str4 = '<input type="text" name="users" value="' . $_REQUEST['users'] . '" />'; + $str2 = '<input type="text" name="date_from" value="' . htmlspecialchars($_REQUEST['date_from']) . '" size="19" />'; + $str3 = '<input type="text" name="date_to" value="' . htmlspecialchars($_REQUEST['date_to']) . '" size="19" />'; + $str4 = '<input type="text" name="users" value="' . htmlspecialchars($_REQUEST['users']) . '" />'; $str5 = '<input type="submit" name="list_report" value="' . $strGo . '" />'; printf($strTrackingShowLogDateUsers, $str1, $str2, $str3, $str4, $str5); @@ -429,8 +429,8 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { ?> <tr class="<?php echo $style; ?>"> <td><small><?php echo $i;?></small></td> - <td><small><?php echo $entry['date'];?></small></td> - <td><small><?php echo $entry['username']; ?></small></td> + <td><small><?php echo htmlspecialchars($entry['date']);?></small></td> + <td><small><?php echo htmlspecialchars($entry['username']); ?></small></td> <td><?php echo $statement; ?></td> </tr> <?php @@ -480,8 +480,8 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { ?> <tr class="<?php echo $style; ?>"> <td><small><?php echo $i; ?></small></td> - <td><small><?php echo $entry['date']; ?></small></td> - <td><small><?php echo $entry['username']; ?></small></td> + <td><small><?php echo htmlspecialchars($entry['date']); ?></small></td> + <td><small><?php echo htmlspecialchars($entry['username']); ?></small></td> <td><?php echo $statement; ?></td> </tr> <?php @@ -500,7 +500,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { } ?> </form> - <form method="post" action="tbl_tracking.php?<?php echo $url_query; ?>&report=true&version=<?php echo $_REQUEST['version'];?>"> + <form method="post" action="tbl_tracking.php<?php echo PMA_generate_common_url($url_params + array('report' => 'true', 'version' => $_REQUEST['version'])); ?>"> <?php printf($strTrackingShowLogDateUsers, $str1, $str2, $str3, $str4, $str5); @@ -513,11 +513,11 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { $str_export2 = '<input type="submit" name="report_export" value="' . $strGo .'" />'; ?> </form> - <form method="post" action="tbl_tracking.php?<?php echo $url_query; ?>&report=true&version=<?php echo $_REQUEST['version'];?>"> - <input type="hidden" name="logtype" value="<?php echo $_REQUEST['logtype'];?>" /> - <input type="hidden" name="date_from" value="<?php echo $_REQUEST['date_from'];?>" /> - <input type="hidden" name="date_to" value="<?php echo $_REQUEST['date_to'];?>" /> - <input type="hidden" name="users" value="<?php echo $_REQUEST['users'];?>" /> + <form method="post" action="tbl_tracking.php<?php echo PMA_generate_common_url($url_params + array('report' => 'true', 'version' => $_REQUEST['version'])); ?>"> + <input type="hidden" name="logtype" value="<?php echo htmlspecialchars($_REQUEST['logtype']);?>" /> + <input type="hidden" name="date_from" value="<?php echo htmlspecialchars($_REQUEST['date_from']);?>" /> + <input type="hidden" name="date_to" value="<?php echo htmlspecialchars($_REQUEST['date_to']);?>" /> + <input type="hidden" name="users" value="<?php echo htmlspecialchars($_REQUEST['users']);?>" /> <?php echo "<br/>" . sprintf($strTrackingExportAs, $str_export1) . $str_export2 . "<br/>"; ?> @@ -618,11 +618,15 @@ if ($last_version > 0) { <tr class="<?php echo $style;?>"> <td><?php echo htmlspecialchars($version['db_name']);?></td> <td><?php echo htmlspecialchars($version['table_name']);?></td> - <td><?php echo $version['version'];?></td> - <td><?php echo $version['date_created'];?></td> - <td><?php echo $version['date_updated'];?></td> + <td><?php echo htmlspecialchars($version['version']);?></td> + <td><?php echo htmlspecialchars($version['date_created']);?></td> + <td><?php echo htmlspecialchars($version['date_updated']);?></td> <td><?php echo $version_status;?></td> - <td> <a href="tbl_tracking.php?<?php echo $url_query;?>&report=true&version=<?php echo $version['version'];?>"><?php echo $strTrackingReport;?></a> | <a href="tbl_tracking.php?<?php echo $url_query;?>&snapshot=true&version=<?php echo $version['version'];?>"><?php echo $strTrackingStructureSnapshot;?></a></td> + <td> <a href="tbl_tracking.php<?php echo PMA_generate_common_url($url_params + array('report' => 'true', 'version' => $version['version']) +);?>"><?php echo $strTrackingReport;?></a> + | <a href="tbl_tracking.php<?php echo PMA_generate_common_url($url_params + array('snapshot' => 'true', 'version' => $version['version']) +);?>"><?php echo $strTrackingStructureSnapshot;?></a> + </td> </tr> <?php if ($style == 'even') { diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 011effe..6f06450 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -70,7 +70,7 @@ if (isset($ct) && !empty($ct)) { header($content_type); if (isset($cn) && !empty($cn)) { - header('Content-Disposition: attachment; filename=' . $cn); + header('Content-Disposition: attachment; filename=' . PMA_sanitize_filename($cn)); } if (!isset($resize)) { diff --git a/translators.html b/translators.html index 5ca2669..24096d7 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.10.2 - Official translators</title> + <title>phpMyAdmin 3.3.10.4 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.10.2 + 3.3.10.4 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-17005-gdf4f5b7
by Piotr Przybylski 24 Aug '11

24 Aug '11

The branch, master has been updated via df4f5b7c96a0846a9a98241a5e7d567917d8db0b (commit) from f42b1d14dca8d982ed2305f28a2b6818fea8cadd (commit) - Log ----------------------------------------------------------------- commit df4f5b7c96a0846a9a98241a5e7d567917d8db0b Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Aug 24 13:13:59 2011 +0200 Whitespace ----------------------------------------------------------------------- Summary of changes: libraries/auth/swekey/swekey.auth.lib.php | 30 ++++++++++++++-------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php index fae3531..db60e13 100644 --- a/libraries/auth/swekey/swekey.auth.lib.php +++ b/libraries/auth/swekey/swekey.auth.lib.php @@ -143,8 +143,8 @@ function Swekey_auth_error() return "Internal Error: CA File $caFile not found"; $result = null; - $swekey_id = $_GET['swekey_id']; - $swekey_otp = $_GET['swekey_otp']; + $swekey_id = $_GET['swekey_id']; + $swekey_otp = $_GET['swekey_otp']; if (isset($swekey_id)) { unset($_SESSION['SWEKEY']['AUTHENTICATED_SWEKEY']); @@ -186,19 +186,19 @@ function Swekey_auth_error() if (! isset($swekey_id)) { ?> <script> - if (key.length != 32) - { - window.location.search="?swekey_id=" + key + "&token=<?php echo $_SESSION[' PMA_token ']; ?>"; - } - else - { - var url = "" + window.location; - if (url.indexOf("?") > 0) - url = url.substr(0, url.indexOf("?")); - Swekey_SetUnplugUrl(key, "pma_login", url + "?session_to_unset=<?php echo session_id();?>&token=<?php echo $_SESSION[' PMA_token ']; ?>"); - var otp = Swekey_GetOtp(key, <?php echo '"'.$_SESSION['SWEKEY']['RND_TOKEN'].'"';?>); - window.location.search="?swekey_id=" + key + "&swekey_otp=" + otp + "&token=<?php echo $_SESSION[' PMA_token ']; ?>"; - } + if (key.length != 32) + { + window.location.search="?swekey_id=" + key + "&token=<?php echo $_SESSION[' PMA_token ']; ?>"; + } + else + { + var url = "" + window.location; + if (url.indexOf("?") > 0) + url = url.substr(0, url.indexOf("?")); + Swekey_SetUnplugUrl(key, "pma_login", url + "?session_to_unset=<?php echo session_id();?>&token=<?php echo $_SESSION[' PMA_token ']; ?>"); + var otp = Swekey_GetOtp(key, <?php echo '"'.$_SESSION['SWEKEY']['RND_TOKEN'].'"';?>); + window.location.search="?swekey_id=" + key + "&swekey_otp=" + otp + "&token=<?php echo $_SESSION[' PMA_token ']; ?>"; + } </script> <?php return __('Authenticating...'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-17004-gf42b1d1
by Piotr Przybylski 24 Aug '11

24 Aug '11

The branch, master has been updated via f42b1d14dca8d982ed2305f28a2b6818fea8cadd (commit) from 1fddc1891bdef030fc10eb66eaf78eb2a2d42335 (commit) - Log ----------------------------------------------------------------- commit f42b1d14dca8d982ed2305f28a2b6818fea8cadd Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Aug 24 12:12:04 2011 +0200 PMA_DBI_fetch_single_row() shouldn't allow to set the $options argument ----------------------------------------------------------------------- Summary of changes: libraries/database_interface.lib.php | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 074715d..1b10c04 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1004,14 +1004,13 @@ function PMA_DBI_fetch_value($result, $row_number = 0, $field = 0, $link = null) * returned array should either numeric * associativ or booth * @param resource $link mysql link - * @param mixed $options * @return array|boolean first row from result * or false if result is empty */ -function PMA_DBI_fetch_single_row($result, $type = 'ASSOC', $link = null, $options = 0) +function PMA_DBI_fetch_single_row($result, $type = 'ASSOC', $link = null) { if (is_string($result)) { - $result = PMA_DBI_try_query($result, $link, $options | PMA_DBI_QUERY_STORE, false); + $result = PMA_DBI_try_query($result, $link, PMA_DBI_QUERY_STORE, false); } // return null if result is empty or false hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-17003-g1fddc18
by Madhura Jayaratne 24 Aug '11

24 Aug '11

The branch, master has been updated via 1fddc1891bdef030fc10eb66eaf78eb2a2d42335 (commit) from b768e4de821ee8b1082beedf10124d0a3dab70ef (commit) - Log ----------------------------------------------------------------- commit 1fddc1891bdef030fc10eb66eaf78eb2a2d42335 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Aug 24 10:26:47 2011 +0530 more tests for scaleRow function for better test coverage ----------------------------------------------------------------------- Summary of changes: test/classes/gis/PMA_GIS_Multipolygon_test.php | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/test/classes/gis/PMA_GIS_Multipolygon_test.php b/test/classes/gis/PMA_GIS_Multipolygon_test.php index 6e92e86..19a09dc 100644 --- a/test/classes/gis/PMA_GIS_Multipolygon_test.php +++ b/test/classes/gis/PMA_GIS_Multipolygon_test.php @@ -243,6 +243,16 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest 'minY' => 0, 'maxY' => 83 ) + ), + array( + 'MULTIPOLYGON(((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20' + . ',20 30)),((105 0,56 20,78 73,105 0)))', + array( + 'minX' => 10, + 'maxX' => 105, + 'minY' => 0, + 'maxY' => 73 + ) ) ); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-17002-gb768e4d
by Madhura Jayaratne 24 Aug '11

24 Aug '11

The branch, master has been updated via b768e4de821ee8b1082beedf10124d0a3dab70ef (commit) from 136921c9cd6deb049de02868a2d0231f9652a788 (commit) - Log ----------------------------------------------------------------- commit b768e4de821ee8b1082beedf10124d0a3dab70ef Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Aug 24 10:06:23 2011 +0530 Typo ----------------------------------------------------------------------- Summary of changes: libraries/gis/pma_gis_multipolygon.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/gis/pma_gis_multipolygon.php b/libraries/gis/pma_gis_multipolygon.php index 4932eb5..2c247b9 100644 --- a/libraries/gis/pma_gis_multipolygon.php +++ b/libraries/gis/pma_gis_multipolygon.php @@ -368,7 +368,7 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry // Determines whether each line ring is an inner ring or an outer ring. // If it's an inner ring get a point on the surface which can be used to // correctly classify inner rings to their respective outer rings. - include_once 'libraries/gis/pma_gis_polygon.php'; + include_once './libraries/gis/pma_gis_polygon.php'; foreach ($row_data['parts'] as $i => $ring) { $row_data['parts'][$i]['isOuter'] = PMA_GIS_Polygon::isOuterRing($ring['points']); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-17001-g136921c
by Madhura Jayaratne 24 Aug '11

24 Aug '11

The branch, master has been updated via 136921c9cd6deb049de02868a2d0231f9652a788 (commit) via 361544ecf7eb0bc988c8e5808ed65fc5f4d9dfed (commit) via 98a770b415007e5320b3972b73c76aae26e69aa8 (commit) via 936461597eb279034f01143b635260e2eb1c51ca (commit) via 9b007f992029e37e8e2ac1e0bd4f239f54961c07 (commit) from 9e566cdd350cd2516447f1a453a7e3bbca53f223 (commit) - Log ----------------------------------------------------------------- commit 136921c9cd6deb049de02868a2d0231f9652a788 Merge: 361544e 9e566cd Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Aug 24 10:01:46 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 361544ecf7eb0bc988c8e5808ed65fc5f4d9dfed Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Aug 24 10:00:35 2011 +0530 Take common code to PMA_GIS_GeomTest class commit 98a770b415007e5320b3972b73c76aae26e69aa8 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Aug 24 09:58:00 2011 +0530 More tests for scaleRow method commit 936461597eb279034f01143b635260e2eb1c51ca Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Aug 24 09:51:44 2011 +0530 tests for scaleRow method commit 9b007f992029e37e8e2ac1e0bd4f239f54961c07 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Aug 24 09:40:08 2011 +0530 Min-max calculation for polygons needs not consider inner rings ----------------------------------------------------------------------- Summary of changes: libraries/gis/pma_gis_multipolygon.php | 18 ++++-------- libraries/gis/pma_gis_polygon.php | 19 +++---------- test/classes/gis/PMA_GIS_Geom_test.php | 14 ++++++++++ test/classes/gis/PMA_GIS_Linestring_test.php | 14 ---------- test/classes/gis/PMA_GIS_Multilinestring_test.php | 20 ++++++++++++++ test/classes/gis/PMA_GIS_Multipoint_test.php | 20 ++++++++++++++ test/classes/gis/PMA_GIS_Multipolygon_test.php | 20 ++++++++++++++ test/classes/gis/PMA_GIS_Point_test.php | 20 ++++++++++++++ test/classes/gis/PMA_GIS_Polygon_test.php | 29 +++++++++++++++++++++ 9 files changed, 134 insertions(+), 40 deletions(-) diff --git a/libraries/gis/pma_gis_multipolygon.php b/libraries/gis/pma_gis_multipolygon.php index d04ccde..4932eb5 100644 --- a/libraries/gis/pma_gis_multipolygon.php +++ b/libraries/gis/pma_gis_multipolygon.php @@ -48,21 +48,15 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry $polygons = explode(")),((", $multipolygon); foreach ($polygons as $polygon) { - // If the polygon doesnt have an inner polygon + // If the polygon doesn't have an inner ring, use polygon itself if (strpos($polygon, "),(") === false) { - $min_max = $this->setMinMax($polygon, $min_max); + $ring = $polygon; } else { - // Seperate outer and inner polygons + // Seperate outer ring and use it to determin min-max $parts = explode("),(", $polygon); - $outer = $parts[0]; - $inner = array_slice($parts, 1); - - $min_max = $this->setMinMax($outer, $min_max); - - foreach ($inner as $inner_poly) { - $min_max = $this->setMinMax($inner_poly, $min_max); - } + $ring = $parts[0]; } + $min_max = $this->setMinMax($ring, $min_max); } return $min_max; @@ -374,7 +368,7 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry // Determines whether each line ring is an inner ring or an outer ring. // If it's an inner ring get a point on the surface which can be used to // correctly classify inner rings to their respective outer rings. - include_once './libraries/gis/pma_gis_polygon.php'; + include_once 'libraries/gis/pma_gis_polygon.php'; foreach ($row_data['parts'] as $i => $ring) { $row_data['parts'][$i]['isOuter'] = PMA_GIS_Polygon::isOuterRing($ring['points']); } diff --git a/libraries/gis/pma_gis_polygon.php b/libraries/gis/pma_gis_polygon.php index 8f461ad..b8594aa 100644 --- a/libraries/gis/pma_gis_polygon.php +++ b/libraries/gis/pma_gis_polygon.php @@ -40,27 +40,18 @@ class PMA_GIS_Polygon extends PMA_GIS_Geometry */ public function scaleRow($spatial) { - $min_max = array(); - // Trim to remove leading 'POLYGON((' and trailing '))' $polygon = substr($spatial, 9, (strlen($spatial) - 11)); - // If the polygon doesnt have an inner polygon + // If the polygon doesn't have an inner ring, use polygon itself if (strpos($polygon, "),(") === false) { - $min_max = $this->setMinMax($polygon, $min_max); + $ring = $polygon; } else { - // Seperate outer and inner polygons + // Seperate outer ring and use it to determin min-max $parts = explode("),(", $polygon); - $outer = $parts[0]; - $inner = array_slice($parts, 1); - - $min_max = $this->setMinMax($outer, $min_max); - - foreach ($inner as $inner_poly) { - $min_max = $this->setMinMax($inner_poly, $min_max); - } + $ring = $parts[0]; } - return $min_max; + return $this->setMinMax($ring, array()); } /** diff --git a/test/classes/gis/PMA_GIS_Geom_test.php b/test/classes/gis/PMA_GIS_Geom_test.php index d7637eb..8176a92 100644 --- a/test/classes/gis/PMA_GIS_Geom_test.php +++ b/test/classes/gis/PMA_GIS_Geom_test.php @@ -56,5 +56,19 @@ abstract class PMA_GIS_GeomTest extends PHPUnit_Framework_TestCase ); } } + + /** + * test scaleRow method + * + * @param string $spatial spatial data of a row + * @param array $min_max expected results + * + * @dataProvider providerForTestScaleRow + * @return nothing + */ + public function testScaleRow($spatial, $min_max) + { + $this->assertEquals($this->object->scaleRow($spatial), $min_max); + } } ?> \ No newline at end of file diff --git a/test/classes/gis/PMA_GIS_Linestring_test.php b/test/classes/gis/PMA_GIS_Linestring_test.php index 05413e1..76bfe05 100644 --- a/test/classes/gis/PMA_GIS_Linestring_test.php +++ b/test/classes/gis/PMA_GIS_Linestring_test.php @@ -140,20 +140,6 @@ class PMA_GIS_LinestringTest extends PMA_GIS_GeomTest } /** - * test scaleRow method - * - * @param string $spatial spatial data of a row - * @param array $min_max expected results - * - * @dataProvider providerForTestScaleRow - * @return nothing - */ - public function testScaleRow($spatial, $min_max) - { - $this->assertEquals($this->object->scaleRow($spatial), $min_max); - } - - /** * data provider for testScaleRow * * @return data for testScaleRow diff --git a/test/classes/gis/PMA_GIS_Multilinestring_test.php b/test/classes/gis/PMA_GIS_Multilinestring_test.php index a0ab50f..636c028 100644 --- a/test/classes/gis/PMA_GIS_Multilinestring_test.php +++ b/test/classes/gis/PMA_GIS_Multilinestring_test.php @@ -198,5 +198,25 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest ) ); } + + /** + * data provider for testScaleRow + * + * @return data for testScaleRow + */ + public function providerForTestScaleRow() + { + return array( + array( + 'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))', + array( + 'minX' => 17, + 'maxX' => 178, + 'minY' => 10, + 'maxY' => 75 + ) + ) + ); + } } ?> \ No newline at end of file diff --git a/test/classes/gis/PMA_GIS_Multipoint_test.php b/test/classes/gis/PMA_GIS_Multipoint_test.php index 1d5fcdf..57b7594 100644 --- a/test/classes/gis/PMA_GIS_Multipoint_test.php +++ b/test/classes/gis/PMA_GIS_Multipoint_test.php @@ -142,5 +142,25 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest ) ); } + + /** + * data provider for testScaleRow + * + * @return data for testScaleRow + */ + public function providerForTestScaleRow() + { + return array( + array( + 'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)', + array( + 'minX' => 12, + 'maxX' => 69, + 'minY' => 23, + 'maxY' => 78 + ) + ) + ); + } } ?> \ No newline at end of file diff --git a/test/classes/gis/PMA_GIS_Multipolygon_test.php b/test/classes/gis/PMA_GIS_Multipolygon_test.php index 1589f9d..6e92e86 100644 --- a/test/classes/gis/PMA_GIS_Multipolygon_test.php +++ b/test/classes/gis/PMA_GIS_Multipolygon_test.php @@ -226,5 +226,25 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest ) ); } + + /** + * data provider for testScaleRow + * + * @return data for testScaleRow + */ + public function providerForTestScaleRow() + { + return array( + array( + 'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),((105 0,56 20,78 73,105 0)))', + array( + 'minX' => 16, + 'maxX' => 147, + 'minY' => 0, + 'maxY' => 83 + ) + ) + ); + } } ?> diff --git a/test/classes/gis/PMA_GIS_Point_test.php b/test/classes/gis/PMA_GIS_Point_test.php index 9f9ef21..bca1e4c 100644 --- a/test/classes/gis/PMA_GIS_Point_test.php +++ b/test/classes/gis/PMA_GIS_Point_test.php @@ -144,5 +144,25 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest ) ); } + + /** + * data provider for testScaleRow + * + * @return data for testScaleRow + */ + public function providerForTestScaleRow() + { + return array( + array( + 'POINT(12 35)', + array( + 'minX' => 12, + 'maxX' => 12, + 'minY' => 35, + 'maxY' => 35, + ) + ) + ); + } } ?> \ No newline at end of file diff --git a/test/classes/gis/PMA_GIS_Polygon_test.php b/test/classes/gis/PMA_GIS_Polygon_test.php index e4941d3..0686295 100644 --- a/test/classes/gis/PMA_GIS_Polygon_test.php +++ b/test/classes/gis/PMA_GIS_Polygon_test.php @@ -315,5 +315,34 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest ) ); } + + /** + * data provider for testScaleRow + * + * @return data for testScaleRow + */ + public function providerForTestScaleRow() + { + return array( + array( + 'POLYGON((123 0,23 30,17 63,123 0))', + array( + 'minX' => 17, + 'maxX' => 123, + 'minY' => 0, + 'maxY' => 63, + ) + ), + array( + 'POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30)))', + array( + 'minX' => 10, + 'maxX' => 45, + 'minY' => 10, + 'maxY' => 45 + ) + ), + ); + } } ?> \ No newline at end of file hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16996-g9e566cd
by Marc Delisle 24 Aug '11

24 Aug '11

The branch, master has been updated via 9e566cdd350cd2516447f1a453a7e3bbca53f223 (commit) via 471e10a458940c4c2fa8453ead75a7178e1a01ee (commit) from 0bf475bce1b909dd654255e1265cc767cde51d07 (commit) - Log ----------------------------------------------------------------- commit 9e566cdd350cd2516447f1a453a7e3bbca53f223 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Aug 23 19:45:17 2011 -0400 Other XHTML fixes commit 471e10a458940c4c2fa8453ead75a7178e1a01ee Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Aug 23 19:36:13 2011 -0400 Fix some of the XHTML problems ----------------------------------------------------------------------- Summary of changes: tbl_zoom_select.php | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 47d9b84..7b11889 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -118,7 +118,7 @@ if (isset($inputs) && ($inputs[0] != 'pma_null' || $inputs[1] != 'pma_null')) { <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <input type="hidden" name="goto" value="<?php echo $goto; ?>" /> <input type="hidden" name="back" value="tbl_zoom_select.php" /> -<input type="hidden" name="flag" id="id_flag" value=<?php echo $flag; ?> /> +<input type="hidden" name="flag" id="id_flag" value="<?php echo $flag; ?>" /> <fieldset id="inputSection"> @@ -137,15 +137,15 @@ for ($i = 0; $i < 4; $i++) { } ?> <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>"> - <th><select name="inputs[]" id=<?php echo 'tableid_' . $i?> > - <option value= <?php echo 'pma_null'?>><?php echo __('None'); ?> </option> + <th><select name="inputs[]" id="<?php echo 'tableid_' . $i; ?>" > + <option value="<?php echo 'pma_null'; ?>"><?php echo __('None'); ?> </option> <?php for ($j = 0 ; $j < $fields_cnt ; $j++) { if (isset($inputs[$i]) && $inputs[$i] == htmlspecialchars($fields_list[$j])) {?> - <option value=<?php echo htmlspecialchars($fields_list[$j]);?> Selected> <?php echo htmlspecialchars($fields_list[$j]);?></option> + <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" selected="selected"> <?php echo htmlspecialchars($fields_list[$j]);?></option> <?php } else { ?> - <option value=<?php echo htmlspecialchars($fields_list[$j]);?> > <?php echo htmlspecialchars($fields_list[$j]);?></option> + <option value="<?php echo htmlspecialchars($fields_list[$j]);?> "> <?php echo htmlspecialchars($fields_list[$j]);?></option> <?php } } ?> @@ -162,7 +162,7 @@ for ($i = 0; $i < 4; $i++) { foreach ($GLOBALS['cfg']['EnumOperators'] as $fc) { if (isset($zoomFunc[$i]) && $zoomFunc[$i] == htmlspecialchars($fc)) { echo "\n" . ' ' - . '<option value="' . htmlspecialchars($fc) . '" Selected>' + . '<option value="' . htmlspecialchars($fc) . '" selected="selected">' . htmlspecialchars($fc) . '</option>'; } else { echo "\n" . ' ' @@ -174,7 +174,7 @@ for ($i = 0; $i < 4; $i++) { foreach ($GLOBALS['cfg']['TextOperators'] as $fc) { if (isset($zoomFunc[$i]) && $zoomFunc[$i] == $fc) { echo "\n" . ' ' - . '<option value="' . htmlspecialchars($fc) . '" Selected>' + . '<option value="' . htmlspecialchars($fc) . '" selected="selected">' . htmlspecialchars($fc) . '</option>'; } else { echo "\n" . ' ' @@ -186,7 +186,7 @@ for ($i = 0; $i < 4; $i++) { foreach ($GLOBALS['cfg']['NumOperators'] as $fc) { if (isset($zoomFunc[$i]) && $zoomFunc[$i] == $fc) { echo "\n" . ' ' - . '<option value="' . htmlspecialchars($fc) . '" Selected>' + . '<option value="' . htmlspecialchars($fc) . '" selected="selected">' . htmlspecialchars($fc) . '</option>'; } else { echo "\n" . ' ' @@ -200,7 +200,7 @@ for ($i = 0; $i < 4; $i++) { foreach ($GLOBALS['cfg']['NullOperators'] as $fc) { if (isset($zoomFunc[$i]) && $zoomFunc[$i] == $fc) { echo "\n" . ' ' - . '<option value="' . htmlspecialchars($fc) . '" Selected>' + . '<option value="' . htmlspecialchars($fc) . '" selected="selected">' . htmlspecialchars($fc) . '</option>'; } else { echo "\n" . ' ' @@ -255,36 +255,34 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null') } ?> <table class="data"> - <tr><td><label for="label"><?php echo __("Data Label"); ?></label>&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp</td> + <tr><td><label for="dataLabel"><?php echo __("Data Label"); ?></label>&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp</td> <td><select name="dataLabel" id='dataLabel' > <option value = ''> <?php echo __('None'); ?> </option> <?php for ($j = 0; $j < $fields_cnt; $j++) { if (isset($dataLabel) && $dataLabel == htmlspecialchars($fields_list[$j])) { ?> - <option value=<?php echo htmlspecialchars($fields_list[$j]);?> selected="selected"> <?php echo htmlspecialchars($fields_list[$j]);?></option> + <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" selected="selected"> <?php echo htmlspecialchars($fields_list[$j]);?></option> <?php } else { ?> - <option value=<?php echo htmlspecialchars($fields_list[$j]);?> > <?php echo htmlspecialchars($fields_list[$j]);?></option> + <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" > <?php echo htmlspecialchars($fields_list[$j]);?></option> <?php } } ?> </select> </td></tr> - <tr><td><label for="label"><?php echo __("Maximum rows to plot"); ?></label></td> + <tr><td><label for="maxRowPlotLimit"><?php echo __("Maximum rows to plot"); ?></label></td> <td> <?php -if (isset($maxPlotLimit)) { -?> - <input type="text" name="maxPlotLimit" value="<?php echo $maxPlotLimit; ?>" /></td></tr> -<?php -} else { -?> - <input type="text" name="maxPlotLimit" value="<?php echo $GLOBALS['cfg']['maxRowPlotLimit']; ?>" /></td></tr> -<?php +echo '<input type="text" name="maxPlotLimit" id="maxRowPlotLimit" value="'; +if (! empty($maxPlotLimit)) { + echo $maxPlotLimit; +} else { + echo $GLOBALS['cfg']['maxRowPlotLimit']; } +echo '" /></td></tr>'; ?> </table> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16994-g0bf475b
by Marc Delisle 24 Aug '11

24 Aug '11

The branch, master has been updated via 0bf475bce1b909dd654255e1265cc767cde51d07 (commit) from e7994a364e811c0fcbbd58fbbd2fa6a088bd0a3c (commit) - Log ----------------------------------------------------------------- commit 0bf475bce1b909dd654255e1265cc767cde51d07 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Aug 23 19:08:50 2011 -0400 Coding style ----------------------------------------------------------------------- Summary of changes: tbl_zoom_select.php | 146 ++++++++++++++++++++++++++------------------------ 1 files changed, 76 insertions(+), 70 deletions(-) diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index ad90043..47d9b84 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -248,38 +248,44 @@ for ($i = 0; $i < 4; $i++) { */ //Set default datalabel if not selected - if(isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null') { - if ($dataLabel == '') - $dataLabel = PMA_getDisplayField($db,$table); +if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null') { + if ($dataLabel == '') { + $dataLabel = PMA_getDisplayField($db,$table); } - ?> +} +?> <table class="data"> <tr><td><label for="label"><?php echo __("Data Label"); ?></label>&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp</td> <td><select name="dataLabel" id='dataLabel' > <option value = ''> <?php echo __('None'); ?> </option> - <?php - for ($j = 0 ; $j < $fields_cnt ; $j++){ - if(isset($dataLabel) && $dataLabel == htmlspecialchars($fields_list[$j])){?> - <option value=<?php echo htmlspecialchars($fields_list[$j]);?> Selected> <?php echo htmlspecialchars($fields_list[$j]);?></option> - <?php - } - else{ ?> - <option value=<?php echo htmlspecialchars($fields_list[$j]);?> > <?php echo htmlspecialchars($fields_list[$j]);?></option> - <?php - } - } ?> +<?php +for ($j = 0; $j < $fields_cnt; $j++) { + if (isset($dataLabel) && $dataLabel == htmlspecialchars($fields_list[$j])) { +?> + <option value=<?php echo htmlspecialchars($fields_list[$j]);?> selected="selected"> <?php echo htmlspecialchars($fields_list[$j]);?></option> +<?php + } else { +?> + <option value=<?php echo htmlspecialchars($fields_list[$j]);?> > <?php echo htmlspecialchars($fields_list[$j]);?></option> +<?php + } +} +?> </select> </td></tr> <tr><td><label for="label"><?php echo __("Maximum rows to plot"); ?></label></td> <td> - <?php if(isset($maxPlotLimit)) { ?> - <input type="text" name="maxPlotLimit" value="<?php echo $maxPlotLimit; ?>" /></td></tr> - <?php - } - else { ?> -<input type="text" name="maxPlotLimit" value="<?php echo $GLOBALS['cfg']['maxRowPlotLimit']; ?>" /></td></tr> - <?php -} ?> +<?php +if (isset($maxPlotLimit)) { +?> + <input type="text" name="maxPlotLimit" value="<?php echo $maxPlotLimit; ?>" /></td></tr> +<?php +} else { +?> + <input type="text" name="maxPlotLimit" value="<?php echo $GLOBALS['cfg']['maxRowPlotLimit']; ?>" /></td></tr> +<?php +} +?> </table> </fieldset> @@ -293,10 +299,10 @@ for ($i = 0; $i < 4; $i++) { <?php /* - * Handle the input criteria and gerate the query result + * Handle the input criteria and generate the query result * Form for displaying query results */ -if(isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' && $inputs[0] != $inputs[1]) { +if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' && $inputs[0] != $inputs[1]) { /* * Query generation part @@ -305,11 +311,11 @@ if(isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' & $sql_query = 'SELECT *'; //Add the table - $sql_query .= ' FROM ' . PMA_backquote($table); - for($i = 0 ; $i < 4 ; $i++){ - if($inputs[$i] == 'pma_null') - continue; + for ($i = 0; $i < 4; $i++) { + if ($inputs[$i] == 'pma_null') { + continue; + } $tmp = array(); // The where clause $charsets = array(); @@ -318,41 +324,39 @@ if(isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' & list($charsets[$i]) = explode('_', $collations[$i]); $unaryFlag = (isset($GLOBALS['cfg']['UnaryOperators'][$func_type]) && $GLOBALS['cfg']['UnaryOperators'][$func_type] == 1) ? true : false; $whereClause = PMA_tbl_search_getWhereClause($fields[$i],$inputs[$i], $types[$i], $collations[$i], $func_type, $unaryFlag); - if($whereClause) - $w[] = $whereClause; - - } // end for - if ($w) { - $sql_query .= ' WHERE ' . implode(' AND ', $w); + if ($whereClause) { + $w[] = $whereClause; } -$sql_query .= ' LIMIT ' . $maxPlotLimit; + } // end for + if ($w) { + $sql_query .= ' WHERE ' . implode(' AND ', $w); + } + $sql_query .= ' LIMIT ' . $maxPlotLimit; /* * Query execution part */ - $result = PMA_DBI_query( $sql_query . ";" , null, PMA_DBI_QUERY_STORE); + $result = PMA_DBI_query($sql_query . ";" , null, PMA_DBI_QUERY_STORE); $fields_meta = PMA_DBI_get_fields_meta($result); while ($row = PMA_DBI_fetch_assoc($result)) { //Need a row with indexes as 0,1,2 for the PMA_getUniqueCondition hence using a temporary array -$tmpRow = array(); -foreach($row as $val) - $tmpRow[] = $val; + $tmpRow = array(); + foreach ($row as $val) { + $tmpRow[] = $val; + } //Get unique conditon on each row (will be needed for row update) -$uniqueCondition = PMA_getUniqueCondition($result, $fields_cnt, $fields_meta, $tmpRow, true); + $uniqueCondition = PMA_getUniqueCondition($result, $fields_cnt, $fields_meta, $tmpRow, true); -//Append it to row array as where_clause -$row['where_clause'] = $uniqueCondition[0]; -if($dataLabel == $inputs[0] || $dataLabel == $inputs[1]) + //Append it to row array as where_clause + $row['where_clause'] = $uniqueCondition[0]; + if ($dataLabel == $inputs[0] || $dataLabel == $inputs[1]) { $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], 'where_clause' => $uniqueCondition[0]); -else if($dataLabel) + } elseif ($dataLabel) { $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], $dataLabel => $row[$dataLabel], 'where_clause' => $uniqueCondition[0]); -else + } else { $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], $dataLabel => '', 'where_clause' => $uniqueCondition[0]); + } } - -?> - -<?php /* * Form for displaying point data and also the scatter plot */ @@ -365,18 +369,22 @@ else <fieldset id="displaySection"> <legend><?php echo __('Browse/Edit the points') ?></legend> <center> - <?php - //JSON encode the data(query result) - if(isset($zoom_submit) && !empty($data)){ ?> +<?php + //JSON encode the data(query result) + if (isset($zoom_submit) && ! empty($data)) { +?> <div id='resizer' style="width:600px;height:400px"> - <?php if (isset($data)) ?><center> <a href="#" onClick="displayHelp();"><?php echo __('How to use'); ?></a> </center> +<center> <a href="#" onClick="displayHelp();"><?php echo __('How to use'); ?></a> </center> <div id="querydata" style="display:none"> - <?php if(isset($data)) echo json_encode($data); ?> +<?php + echo json_encode($data); +?> </div> <div id="querychart" style="float:right"></div> </div> <?php - } ?> + } +?> </center> <fieldset id='dataDisplay' style="display:none"> <fieldset> @@ -389,20 +397,21 @@ else </tr> </thead> <tbody> - <?php - $odd_row = true; - for ($i = 4; $i < $fields_cnt + 4 ; $i++) { - $tbl_fields_type[$i] = $fields_type[$i - 4]; - $fieldpopup = $fields_list[$i - 4]; - $foreignData = PMA_getForeignData($foreigners, $fieldpopup, false, '', ''); - ?> +<?php + $odd_row = true; + for ($i = 4; $i < $fields_cnt + 4; $i++) { + $tbl_fields_type[$i] = $fields_type[$i - 4]; + $fieldpopup = $fields_list[$i - 4]; + $foreignData = PMA_getForeignData($foreigners, $fieldpopup, false, '', ''); +?> <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>"> <th><?php echo htmlspecialchars($fields_list[$i - 4]); ?></th> <th><?php echo '<input type="checkbox" class="checkbox_null" name="fields_null[ ' . $i . ' ]" id="fields_null_id_' . $i . '" />'; ?></th> <th><?php echo PMA_getForeignFields_Values($foreigners, $foreignData, $fieldpopup, $tbl_fields_type, $i, $db, $table, $titles,$GLOBALS['cfg']['ForeignKeyMaxLimit'], '' ); ?> </th> </tr> - <?php -} ?> +<?php + } +?> </tbody> </table> </fieldset> @@ -415,10 +424,7 @@ else <input type="hidden" id="queryID" name="sql_query" /> </form> </fieldset> - <?php +<?php } -?> - - <?php - require './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> hooks/post-receive -- phpMyAdmin

1 0