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

bug #1811527 [display] Problem with links to the MySQL manual

Browse Source
This commit is contained in:
Marc Delisle
2007-10-22 12:15:53 +00:00
parent cb576daa05
commit 0df6102471
2 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -38,6 +38,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
default value to false to help cut&paste from a terminal window; also default value to false to help cut&paste from a terminal window; also
set focus to the textarea set focus to the textarea
- bug #1814463 [display] Wrong database size - bug #1814463 [display] Wrong database size
- bug #1811527 [display] Problem with links to the MySQL manual
2.11.1.2 (2007-10-17) 2.11.1.2 (2007-10-17)
- fixed XSS in server_status.php, thanks to Omer Singer, The DigiTrust Group - fixed XSS in server_status.php, thanks to Omer Singer, The DigiTrust Group

42
server_status.php
View File

@@ -234,7 +234,7 @@ $allocations = array(
$sections = array( $sections = array(
// section => section name (description) // section => section name (description)
'com' => array('title' => ''), 'com' => array('title' => ''),
'query' => array('title' => ''), 'query' => array('title' => $strSQLQuery),
'innodb' => array('title' => 'InnoDB'), 'innodb' => array('title' => 'InnoDB'),
'ndb' => array('title' => 'NDB'), 'ndb' => array('title' => 'NDB'),
'ssl' => array('title' => 'SSL'), 'ssl' => array('title' => 'SSL'),
@@ -271,39 +271,29 @@ $links['repl'][$strShowSlaveHosts]
$links['repl'][$strShowSlaveStatus] $links['repl'][$strShowSlaveStatus]
= 'sql.php?sql_query=' . urlencode('SHOW SLAVE STATUS') . = 'sql.php?sql_query=' . urlencode('SHOW SLAVE STATUS') .
'&goto=server_status.php&' . PMA_generate_common_url(); '&goto=server_status.php&' . PMA_generate_common_url();
$links['repl']['MySQL - ' . $strDocu] $links['repl']['doc'] = 'replication';
= $cfg['MySQLManualBase'] . '/replication.html';
$links['qcache'][$strFlushQueryCache] $links['qcache'][$strFlushQueryCache]
= $PMA_PHP_SELF . '?flush=' . urlencode('QUERY CACHE') . '&' . = $PMA_PHP_SELF . '?flush=' . urlencode('QUERY CACHE') . '&' .
PMA_generate_common_url(); PMA_generate_common_url();
$links['qcache']['MySQL - ' . $strDocu] $links['qcache']['doc'] = 'query_cache';
= $cfg['MySQLManualBase'] . '/query-cache.html';
$links['threads'][$strMySQLShowProcess] $links['threads'][$strMySQLShowProcess]
= 'server_processlist.php?' . PMA_generate_common_url(); = 'server_processlist.php?' . PMA_generate_common_url();
$links['threads']['MySQL - ' . $strDocu] $links['threads']['doc'] = 'mysql_threads';
= $cfg['MySQLManualBase'] . '/mysql-threads.html';
$links['key']['MySQL - ' . $strDocu] $links['key']['doc'] = 'myisam_key_cache';
= $cfg['MySQLManualBase'] . '/myisam-key-cache.html';
$links['slow_queries']['MySQL - ' . $strDocu] $links['binlog_cache']['doc'] = 'binary_log';
= $cfg['MySQLManualBase'] . '/slow-query-log.html';
$links['binlog_cache']['MySQL - ' . $strDocu] $links['Slow_queries']['doc'] = 'slow_query_log';
= $cfg['MySQLManualBase'] . '/binary-log.html';
$links['Slow_queries']['MySQL - ' . $strDocu]
= $cfg['MySQLManualBase'] . '/slow-query-log.html';
$links['innodb'][$strServerTabVariables] $links['innodb'][$strServerTabVariables]
= 'server_engines.php?engine=InnoDB&' . PMA_generate_common_url(); = 'server_engines.php?engine=InnoDB&' . PMA_generate_common_url();
$links['innodb'][$strInnodbStat] $links['innodb'][$strInnodbStat]
= 'server_engines.php?engine=InnoDB&page=Status&' . = 'server_engines.php?engine=InnoDB&page=Status&' .
PMA_generate_common_url(); PMA_generate_common_url();
$links['innodb']['MySQL - ' . $strDocu] $links['innodb']['doc'] = 'innodb';
= $cfg['MySQLManualBase'] . '/innodb.html';
// sort status vars into arrays // sort status vars into arrays
@@ -339,9 +329,7 @@ $hour_factor = 3600 / $server_status['Uptime'];
<a href="<?php echo <a href="<?php echo
$PMA_PHP_SELF . '?flush=STATUS&amp;' . PMA_generate_common_url(); ?>" $PMA_PHP_SELF . '?flush=STATUS&amp;' . PMA_generate_common_url(); ?>"
><?php echo $strShowStatusReset; ?></a> ><?php echo $strShowStatusReset; ?></a>
<a href="<?php echo <?php echo PMA_showMySQLDocu('server_status_variables','server_status_variables'); ?>
$cfg['MySQLManualBase']; ?>/server-status-variables.html"
target="documentation">MySQL - <?php echo $strDocu; ?></a>
</div> </div>
<p> <p>
@@ -608,7 +596,11 @@ if (! empty($section['title'])) {
<th colspan="3" class="tblFooters"> <th colspan="3" class="tblFooters">
<?php <?php
foreach ($links[$section_name] as $link_name => $link_url) { foreach ($links[$section_name] as $link_name => $link_url) {
echo '<a href="' . $link_url . '">' . $link_name . '</a>' . "\n"; if ('doc' == $link_name) {
echo PMA_showMySQLDocu($link_url, $link_url);
} else {
echo '<a href="' . $link_url . '">' . $link_name . '</a>' . "\n";
}
} }
unset($link_url, $link_name); unset($link_url, $link_name);
?> ?>
@@ -655,8 +647,12 @@ if (! empty($section['title'])) {
if (isset($links[$name])) { if (isset($links[$name])) {
foreach ($links[$name] as $link_name => $link_url) { foreach ($links[$name] as $link_name => $link_url) {
echo ' <a href="' . $link_url . '">' . $link_name . '</a>' . if ('doc' == $link_name) {
echo PMA_showMySQLDocu($link_url, $link_url);
} else {
echo ' <a href="' . $link_url . '">' . $link_name . '</a>' .
"\n"; "\n";
}
} }
unset($link_url, $link_name); unset($link_url, $link_name);
} }