nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MAINT_3_3_10' into QA_3_3

Browse Source
This commit is contained in:
Marc Delisle
2011-08-24 12:10:12 -04:00
parent 8a5c5c8ef5 a5716cb389
commit 555e0db0ac
2 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
tbl_tracking.php
View File

@@ -288,17 +288,17 @@ if (isset($_REQUEST['snapshot'])) {
<tr class="<?php echo $style; ?>"> <tr class="<?php echo $style; ?>">
<?php <?php
if ($field['Key'] == 'PRI') { 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 { } 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 htmlspecialchars($field['Type']);?></td>
<td><?php echo $field['Collation'];?></td> <td><?php echo htmlspecialchars($field['Collation']);?></td>
<td><?php echo $field['Null'];?></td> <td><?php echo htmlspecialchars($field['Null']);?></td>
<td><?php echo $field['Default'];?></td> <td><?php echo htmlspecialchars($field['Default']);?></td>
<td><?php echo $field['Extra'];?></td> <td><?php echo htmlspecialchars($field['Extra']);?></td>
<td><?php echo $field['Comment'];?></td> <td><?php echo htmlspecialchars($field['Comment']);?></td>
</tr> </tr>
<?php <?php
if ($style == 'even') { if ($style == 'even') {
@@ -344,15 +344,15 @@ if (isset($_REQUEST['snapshot'])) {
} }
?> ?>
<tr class="<?php echo $style; ?>"> <tr class="<?php echo $style; ?>">
<td><b><?php echo $index['Key_name'];?></b></td> <td><b><?php echo htmlspecialchars($index['Key_name']);?></b></td>
<td><?php echo $index['Index_type'];?></td> <td><?php echo htmlspecialchars($index['Index_type']);?></td>
<td><?php echo $str_unique;?></td> <td><?php echo $str_unique;?></td>
<td><?php echo $str_packed;?></td> <td><?php echo $str_packed;?></td>
<td><?php echo $index['Column_name'];?></td> <td><?php echo htmlspecialchars($index['Column_name']);?></td>
<td><?php echo $index['Cardinality'];?></td> <td><?php echo htmlspecialchars($index['Cardinality']);?></td>
<td><?php echo $index['Collation'];?></td> <td><?php echo htmlspecialchars($index['Collation']);?></td>
<td><?php echo $index['Null'];?></td> <td><?php echo htmlspecialchars($index['Null']);?></td>
<td><?php echo $index['Comment'];?></td> <td><?php echo htmlspecialchars($index['Comment']);?></td>
</tr> </tr>
<?php <?php
if ($style == 'even') { 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> <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/> <br/>
<form method="post" action="tbl_tracking.php?<?php echo $url_query; ?>&amp;report=true&amp;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 <?php
$str1 = '<select name="logtype">' . $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="data"' . ($selection_data ? ' selected="selected"' : ''). '>' . $strDataOnly . '</option>' .
'<option value="schema_and_data"' . ($selection_both ? ' selected="selected"' : '') . '>' . $strStrucData . '</option>' . '<option value="schema_and_data"' . ($selection_both ? ' selected="selected"' : '') . '>' . $strStrucData . '</option>' .
'</select>'; '</select>';
$str2 = '<input type="text" name="date_from" value="' . $_REQUEST['date_from'] . '" size="19" />'; $str2 = '<input type="text" name="date_from" value="' . htmlspecialchars($_REQUEST['date_from']) . '" size="19" />';
$str3 = '<input type="text" name="date_to" value="' . $_REQUEST['date_to'] . '" size="19" />'; $str3 = '<input type="text" name="date_to" value="' . htmlspecialchars($_REQUEST['date_to']) . '" size="19" />';
$str4 = '<input type="text" name="users" value="' . $_REQUEST['users'] . '" />'; $str4 = '<input type="text" name="users" value="' . htmlspecialchars($_REQUEST['users']) . '" />';
$str5 = '<input type="submit" name="list_report" value="' . $strGo . '" />'; $str5 = '<input type="submit" name="list_report" value="' . $strGo . '" />';
printf($strTrackingShowLogDateUsers, $str1, $str2, $str3, $str4, $str5); printf($strTrackingShowLogDateUsers, $str1, $str2, $str3, $str4, $str5);
@@ -429,8 +429,8 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
?> ?>
<tr class="<?php echo $style; ?>"> <tr class="<?php echo $style; ?>">
<td><small><?php echo $i;?></small></td> <td><small><?php echo $i;?></small></td>
<td><small><?php echo $entry['date'];?></small></td> <td><small><?php echo htmlspecialchars($entry['date']);?></small></td>
<td><small><?php echo $entry['username']; ?></small></td> <td><small><?php echo htmlspecialchars($entry['username']); ?></small></td>
<td><?php echo $statement; ?></td> <td><?php echo $statement; ?></td>
</tr> </tr>
<?php <?php
@@ -480,8 +480,8 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
?> ?>
<tr class="<?php echo $style; ?>"> <tr class="<?php echo $style; ?>">
<td><small><?php echo $i; ?></small></td> <td><small><?php echo $i; ?></small></td>
<td><small><?php echo $entry['date']; ?></small></td> <td><small><?php echo htmlspecialchars($entry['date']); ?></small></td>
<td><small><?php echo $entry['username']; ?></small></td> <td><small><?php echo htmlspecialchars($entry['username']); ?></small></td>
<td><?php echo $statement; ?></td> <td><?php echo $statement; ?></td>
</tr> </tr>
<?php <?php
@@ -500,7 +500,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
} }
?> ?>
</form> </form>
<form method="post" action="tbl_tracking.php?<?php echo $url_query; ?>&amp;report=true&amp;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 <?php
printf($strTrackingShowLogDateUsers, $str1, $str2, $str3, $str4, $str5); 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 .'" />'; $str_export2 = '<input type="submit" name="report_export" value="' . $strGo .'" />';
?> ?>
</form> </form>
<form method="post" action="tbl_tracking.php?<?php echo $url_query; ?>&amp;report=true&amp;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'])); ?>">
<input type="hidden" name="logtype" value="<?php echo $_REQUEST['logtype'];?>" /> <input type="hidden" name="logtype" value="<?php echo htmlspecialchars($_REQUEST['logtype']);?>" />
<input type="hidden" name="date_from" value="<?php echo $_REQUEST['date_from'];?>" /> <input type="hidden" name="date_from" value="<?php echo htmlspecialchars($_REQUEST['date_from']);?>" />
<input type="hidden" name="date_to" value="<?php echo $_REQUEST['date_to'];?>" /> <input type="hidden" name="date_to" value="<?php echo htmlspecialchars($_REQUEST['date_to']);?>" />
<input type="hidden" name="users" value="<?php echo $_REQUEST['users'];?>" /> <input type="hidden" name="users" value="<?php echo htmlspecialchars($_REQUEST['users']);?>" />
<?php <?php
echo "<br/>" . sprintf($strTrackingExportAs, $str_export1) . $str_export2 . "<br/>"; echo "<br/>" . sprintf($strTrackingExportAs, $str_export1) . $str_export2 . "<br/>";
?> ?>
@@ -618,11 +618,15 @@ if ($last_version > 0) {
<tr class="<?php echo $style;?>"> <tr class="<?php echo $style;?>">
<td><?php echo htmlspecialchars($version['db_name']);?></td> <td><?php echo htmlspecialchars($version['db_name']);?></td>
<td><?php echo htmlspecialchars($version['table_name']);?></td> <td><?php echo htmlspecialchars($version['table_name']);?></td>
<td><?php echo $version['version'];?></td> <td><?php echo htmlspecialchars($version['version']);?></td>
<td><?php echo $version['date_created'];?></td> <td><?php echo htmlspecialchars($version['date_created']);?></td>
<td><?php echo $version['date_updated'];?></td> <td><?php echo htmlspecialchars($version['date_updated']);?></td>
<td><?php echo $version_status;?></td> <td><?php echo $version_status;?></td>
<td> <a href="tbl_tracking.php?<?php echo $url_query;?>&amp;report=true&amp;version=<?php echo $version['version'];?>"><?php echo $strTrackingReport;?></a> | <a href="tbl_tracking.php?<?php echo $url_query;?>&amp;snapshot=true&amp;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> </tr>
<?php <?php
if ($style == 'even') { if ($style == 'even') {

2
transformation_wrapper.php
View File

@@ -70,7 +70,7 @@ if (isset($ct) && !empty($ct)) {
header($content_type); header($content_type);
if (isset($cn) && !empty($cn)) { if (isset($cn) && !empty($cn)) {
header('Content-Disposition: attachment; filename=' . $cn); header('Content-Disposition: attachment; filename=' . PMA_sanitize_filename($cn));
} }
if (!isset($resize)) { if (!isset($resize)) {