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

XHTML 1.0 trans. compliance and more semantic XHTML output

Browse Source
This commit is contained in:
Sebastian Mendel
2005-10-11 11:49:17 +00:00
parent b4928863ff
commit 3143135a5c
13 changed files with 975 additions and 1305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -5,6 +5,18 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2005-10-11 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* footer.inc.php, index.php, left.php, queryframe.php, querywindow.php
server_databases.php, css/phpmyadmin.css.php, libraries/common.lib.php
libraries/left_header.inc.php, libraries/sql_query_form.lib.php
themes/darkblue_orange/css/theme_left.css.php
themes/original/css/theme_left.css.php:
XHTML 1.0 trans. compliance and more semantic XHTML output
CVS-Vorgang erfolgreich abgeschlossen
2005-10-09 Marc Delisle <lem9@users.sourceforge.net> 2005-10-09 Marc Delisle <lem9@users.sourceforge.net>
* tbl_properties_links.php: invalid js confirmation and operation feedback * tbl_properties_links.php: invalid js confirmation and operation feedback
when dropping a view when dropping a view

63
css/phpmyadmin.css.php
View File

@@ -43,7 +43,7 @@ table .name {
} }
div#tablestatistics { div#tablestatistics {
border-bottom: 0.1em solid silver; border-bottom: 0.1em solid #669999;
margin-bottom: 0.5em; margin-bottom: 0.5em;
padding-bottom: 0.5em; padding-bottom: 0.5em;
} }
@@ -62,20 +62,21 @@ div#pmalogo,
div#leftframelinks, div#leftframelinks,
div#databaseList { div#databaseList {
text-align: center; text-align: center;
border-bottom: 0.1em solid silver; border-bottom: 0.1em solid #669999;
margin-bottom: 0.5em; margin-bottom: 0.5em;
padding-bottom: 0.5em; padding-bottom: 0.5em;
} }
div#leftframelinks img {
vertical-align: middle;
}
div#leftframelinks a { div#leftframelinks a {
margin: 0.1em; padding: 0.1em;
padding: 0.2em;
border: 0.1em solid <?php echo $cfg['BgcolorTwo']; ?>;
} }
div#leftframelinks a:hover { div#leftframelinks a:hover {
border-color: gray; background-color: #669999;
background-color: silver;
} }
div#databaseList form { div#databaseList form {
@@ -98,6 +99,46 @@ div#querywindowcontainer fieldset {
} }
body#body_leftFrame {
background-color: <?php echo $GLOBALS['cfg']['LeftBgColor']; ?>;
}
/* leftdatabaselist */
div#left_tableList ul {
list-style-type: none;
list-style-position: outside;
margin: 0;
padding: 0;
background-color: <?php echo $GLOBALS['cfg']['LeftBgColor']; ?>;
}
div#left_tableList li {
margin: 0;
padding: 0;
white-space: nowrap;
}
<?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ) { ?>
div#left_tableList li:hover {
background-color: <?php echo $GLOBALS['cfg']['LeftPointerColor']; ?>;
}
<?php } ?>
div#left_tableList img {
height: 1em;
width: auto;
padding: 0;
vertical-align: middle;
}
div#left_tableList ul ul {
margin-left: 0em;
padding-left: 0.1em;
border-left: 0.1em solid #669999;
padding-bottom: 0.1em;
border-bottom: 0.1em solid #669999;
}
/* querybox */ /* querybox */
/* Gecko bug */ /* Gecko bug */
@@ -186,7 +227,7 @@ form.clock { text-align: center; }
/* Options, eg. on import page */ /* Options, eg. on import page */
fieldset { fieldset {
background-color: <?php echo $cfg['BgcolorOne']; ?>; background-color: <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>;
} }
fieldset legend { fieldset legend {
background-color: transparent; background-color: transparent;
@@ -258,7 +299,7 @@ a.tabactive {
/* default tab styles */ /* default tab styles */
.tab, .tabcaution, .tabactive { .tab, .tabcaution, .tabactive {
background-color: #E5E5E5; background-color: #E5E5E5;
border: 0.1em solid silver; border: 0.1em solid <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>;
border-bottom: 0.1em solid black; border-bottom: 0.1em solid black;
border-radius-topleft: 0.5em; border-radius-topleft: 0.5em;
border-radius-topright: 0.5em; border-radius-topright: 0.5em;
@@ -288,13 +329,13 @@ span.tab, span.tabcaution {
/* odd table rows 1,3,5,7,... */ /* odd table rows 1,3,5,7,... */
table tbody tr.odd td, table tbody tr.odd td,
table tbody tr.odd th { table tbody tr.odd th {
background-color: <?php echo $cfg['BgcolorOne']; ?>; background-color: <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>;
} }
/* even table rows 2,4,6,8,... */ /* even table rows 2,4,6,8,... */
table tbody tr.even td, table tbody tr.even td,
table tbody tr.even th { table tbody tr.even th {
background-color: <?php echo $cfg['BgcolorTwo']; ?>; background-color: <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>;
} }

129
footer.inc.php
View File

@@ -15,64 +15,29 @@ require_once('./libraries/relation.lib.php'); // for PMA_setHistory()
// If query window is wanted and open, update with latest selected db/table. // If query window is wanted and open, update with latest selected db/table.
if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) { if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
?>
// $is_drop_database comes from sql.php when we saw a DROP DATABASE
// $force_queryframe_reload comes from db_operations.php
if ( empty( $is_drop_database ) && empty( $force_queryframe_reload ) ) {
$force_queryframe_reload = 'false';
} else {
$force_queryframe_reload = 'true';
}
?>
<script type="text/javascript"> <script type="text/javascript">
<!-- <!--
<?php <?php
if (!isset($no_history) && !empty($db) && (!isset($error_message) || $error_message == '')) { if (!isset($no_history) && !empty($db) && (!isset($error_message) || $error_message == '')) {
$tables = PMA_DBI_try_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';', NULL, PMA_DBI_QUERY_STORE); $table = isset( $table ) ? $table : '';
$num_tables = ($tables) ? @PMA_DBI_num_rows($tables) : 0;
$common_url_query = PMA_generate_common_url($db);
// if we put a space before the left bracket, it causes a display
// problem in IE
if ($num_tables) {
$num_tables_disp = '(' . $num_tables . ')';
} else {
$num_tables_disp = '(-)';
}
?> ?>
var forceQueryFrameReload = false; // sets selection in left frame quick db selectbox to current db
<?php parent.frames[0].setTable( '<?php echo $db; ?>', '<?php echo $table; ?>' );
// $is_drop_database comes from sql.php when we saw a DROP DATABASE
// $force_queryframe_reload comes from db_operations.php
if ((isset($is_drop_database) && $is_drop_database) || (isset($force_queryframe_reload) && $force_queryframe_reload == TRUE)) {
?>
forceQueryFrameReload = true;
<?php
}
?>
var dbBoxSetupDone = false;
function dbBoxSetup() {
if (dbBoxSetupDone != true) {
if (parent.frames.queryframe && parent.frames.queryframe.document.left && parent.frames.queryframe.document.left.lightm_db) {
parent.frames.queryframe.document.left.lightm_db.value = '<?php echo addslashes($db); ?>';
dbBoxSetupDone = true;
} else {
setTimeout("dbBoxSetup();",500);
}
}
}
if (parent.frames.queryframe && parent.frames.queryframe.document && parent.frames.queryframe.document.queryframeform) {
parent.frames.queryframe.document.queryframeform.db.value = "<?php echo (isset($db) ? addslashes($db) : ''); ?>";
parent.frames.queryframe.document.queryframeform.table.value = "<?php echo (isset($table) ? addslashes($table) : ''); ?>";
}
if (parent.frames.queryframe && parent.frames.queryframe.document && parent.frames.queryframe.document.left && parent.frames.queryframe.document.left.lightm_db) {
selidx = parent.frames.queryframe.document.left.lightm_db.selectedIndex;
if (parent.frames.queryframe.document.left.lightm_db.options[selidx].value == "<?php echo addslashes($db); ?>" && forceQueryFrameReload == false) {
parent.frames.queryframe.document.left.lightm_db.options[selidx].text =
parent.frames.queryframe.document.left.lightm_db.options[selidx].text.replace(/(.*)\([0-9]+\)/,'$1<?php echo $num_tables_disp;?>');
} else {
parent.frames.queryframe.location.reload();
setTimeout("dbBoxSetup();",2000);
}
}
<?php <?php
} }
?> ?>
function reload_querywindow () { function reload_querywindow () {
if (parent.frames.queryframe && parent.frames.queryframe.querywindow && !parent.frames.queryframe.querywindow.closed && parent.frames.queryframe.querywindow.location) { if (parent.frames[0] && parent.frames[0].querywindow && !parent.frames[0].querywindow.closed && parent.frames[0].querywindow.location) {
<?php <?php
if (!isset($no_history) && (!isset($error_message) || $error_message == '')) { if (!isset($no_history) && (!isset($error_message) || $error_message == '')) {
if (isset($LockFromUpdate) && $LockFromUpdate == '1' && isset($sql_query)) { if (isset($LockFromUpdate) && $LockFromUpdate == '1' && isset($sql_query)) {
@@ -83,15 +48,15 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
} }
} }
?> ?>
if (!parent.frames.queryframe.querywindow.document.sqlform.LockFromUpdate || !parent.frames.queryframe.querywindow.document.sqlform.LockFromUpdate.checked) { if (!parent.frames[0].querywindow.document.sqlform.LockFromUpdate || !parent.frames[0].querywindow.document.sqlform.LockFromUpdate.checked) {
parent.frames.queryframe.querywindow.document.querywindow.db.value = "<?php echo (isset($db) ? addslashes($db) : '') ?>"; parent.frames[0].querywindow.document.querywindow.db.value = "<?php echo (isset($db) ? addslashes($db) : '') ?>";
parent.frames.queryframe.querywindow.document.querywindow.query_history_latest_db.value = "<?php echo (isset($db) ? addslashes($db) : '') ?>"; parent.frames[0].querywindow.document.querywindow.query_history_latest_db.value = "<?php echo (isset($db) ? addslashes($db) : '') ?>";
parent.frames.queryframe.querywindow.document.querywindow.table.value = "<?php echo (isset($table) ? addslashes($table) : '') ?>"; parent.frames[0].querywindow.document.querywindow.table.value = "<?php echo (isset($table) ? addslashes($table) : '') ?>";
parent.frames.queryframe.querywindow.document.querywindow.query_history_latest_table.value = "<?php echo (isset($table) ? addslashes($table) : '') ?>"; parent.frames[0].querywindow.document.querywindow.query_history_latest_table.value = "<?php echo (isset($table) ? addslashes($table) : '') ?>";
<?php echo (isset($sql_query) ? 'parent.frames.queryframe.querywindow.document.querywindow.query_history_latest.value = "' . urlencode($sql_query) . '";' : '// no sql query update') . "\n"; ?> <?php echo (isset($sql_query) ? 'parent.frames[0].querywindow.document.querywindow.query_history_latest.value = "' . urlencode($sql_query) . '";' : '// no sql query update') . "\n"; ?>
parent.frames.queryframe.querywindow.document.querywindow.submit(); parent.frames[0].querywindow.document.querywindow.submit();
} }
<?php <?php
} else { } else {
@@ -104,23 +69,23 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
} }
function focus_querywindow(sql_query) { function focus_querywindow(sql_query) {
if (parent.frames.queryframe && parent.frames.queryframe.querywindow && !parent.frames.queryframe.querywindow.closed && parent.frames.queryframe.querywindow.location) { if (parent.frames[0] && parent.frames[0].querywindow && !parent.frames[0].querywindow.closed && parent.frames[0].querywindow.location) {
if (parent.frames.queryframe.querywindow.document.querywindow.querydisplay_tab != 'sql') { if (parent.frames[0].querywindow.document.querywindow.querydisplay_tab != 'sql') {
parent.frames.queryframe.querywindow.document.querywindow.querydisplay_tab.value = "sql"; parent.frames[0].querywindow.document.querywindow.querydisplay_tab.value = "sql";
parent.frames.queryframe.querywindow.document.querywindow.query_history_latest.value = sql_query; parent.frames[0].querywindow.document.querywindow.query_history_latest.value = sql_query;
parent.frames.queryframe.querywindow.document.querywindow.submit(); parent.frames[0].querywindow.document.querywindow.submit();
parent.frames.queryframe.querywindow.focus(); parent.frames[0].querywindow.focus();
} else { } else {
parent.frames.queryframe.querywindow.focus(); parent.frames[0].querywindow.focus();
} }
return false; return false;
} else if (parent.frames.queryframe) { } else if (parent.frames[0]) {
new_win_url = 'querywindow.php?sql_query=' + sql_query + '&<?php echo PMA_generate_common_url(isset($db) ? addslashes($db) : '', isset($table) ? addslashes($table) : '', '&'); ?>'; new_win_url = 'querywindow.php?sql_query=' + sql_query + '&<?php echo PMA_generate_common_url(isset($db) ? addslashes($db) : '', isset($table) ? addslashes($table) : '', '&'); ?>';
parent.frames.queryframe.querywindow=window.open(new_win_url, '','toolbar=0,location=0,directories=0,status=1,menubar=0,scrollbars=yes,resizable=yes,width=<?php echo $cfg['QueryWindowWidth']; ?>,height=<?php echo $cfg['QueryWindowHeight']; ?>'); parent.frames[0].querywindow=window.open(new_win_url, '','toolbar=0,location=0,directories=0,status=1,menubar=0,scrollbars=yes,resizable=yes,width=<?php echo $cfg['QueryWindowWidth']; ?>,height=<?php echo $cfg['QueryWindowHeight']; ?>');
if (!parent.frames.queryframe.querywindow.opener) { if (!parent.frames[0].querywindow.opener) {
parent.frames.queryframe.querywindow.opener = parent.frames.queryframe; parent.frames[0].querywindow.opener = parent.frames[0];
} }
// reload_querywindow(); // reload_querywindow();
@@ -129,19 +94,19 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
} }
reload_querywindow(); reload_querywindow();
<?php <?php
if (isset($focus_querywindow) && $focus_querywindow == "true") { if (isset($focus_querywindow) && $focus_querywindow == "true") {
?> ?>
if (parent.frames.queryframe && parent.frames.queryframe.querywindow && !parent.frames.queryframe.querywindow.closed && parent.frames.queryframe.querywindow.location) { if (parent.frames[0] && parent.frames[0].querywindow && !parent.frames[0].querywindow.closed && parent.frames[0].querywindow.location) {
self.focus(); self.focus();
} }
<?php <?php
} }
?> ?>
//--> //-->
</script> </script>
<?php <?php
} }
@@ -154,26 +119,23 @@ if (isset($GLOBALS['dbh']) && $GLOBALS['dbh']) {
if (isset($GLOBALS['userlink']) && $GLOBALS['userlink']) { if (isset($GLOBALS['userlink']) && $GLOBALS['userlink']) {
@PMA_DBI_close($GLOBALS['userlink']); @PMA_DBI_close($GLOBALS['userlink']);
} }
?>
<?php include('./config.footer.inc.php'); ?> include('./config.footer.inc.php');
?>
<script type="text/javascript" language="javascript" src="libraries/tooltip.js"></script> <script type="text/javascript" language="javascript" src="libraries/tooltip.js"></script>
</body> </body>
</html> </html>
<?php <?php
/** /**
* Generates profiling data if requested * Generates profiling data if requested
*/ */
if (isset($GLOBALS['cfg']['DBG']['enable']) if ( ! empty( $GLOBALS['cfg']['DBG']['enable'] )
&& $GLOBALS['cfg']['DBG']['enable'] && ! empty( $GLOBALS['cfg']['DBG']['profile']['enable'] ) ) {
&& isset($GLOBALS['cfg']['DBG']['profile']['enable'])
&& $GLOBALS['cfg']['DBG']['profile']['enable']) {
//run the basic setup code first //run the basic setup code first
require_once('./libraries/dbg/setup.php'); require_once('./libraries/dbg/setup.php');
//if the setup ran fine, then do the profiling //if the setup ran fine, then do the profiling
if (isset($GLOBALS['DBG']) && $GLOBALS['DBG']) { if ( ! empty( $GLOBALS['DBG'] ) ) {
require_once('./libraries/dbg/profiling.php'); require_once('./libraries/dbg/profiling.php');
dbg_dump_profiling_results(); dbg_dump_profiling_results();
} }
@@ -182,8 +144,8 @@ if (isset($GLOBALS['cfg']['DBG']['enable'])
/** /**
* Sends bufferized data * Sends bufferized data
*/ */
if (isset($GLOBALS['cfg']['OBGzip']) && $GLOBALS['cfg']['OBGzip'] if ( ! empty( $GLOBALS['cfg']['OBGzip'] )
&& isset($GLOBALS['ob_mode']) && $GLOBALS['ob_mode']) { && ! empty( $GLOBALS['ob_mode'] ) ) {
PMA_outBufferPost($GLOBALS['ob_mode']); PMA_outBufferPost($GLOBALS['ob_mode']);
} }
@@ -191,5 +153,4 @@ if (isset($GLOBALS['cfg']['OBGzip']) && $GLOBALS['cfg']['OBGzip']
* Stops the script execution * Stops the script execution
*/ */
exit; exit;
?> ?>

214
index.php
View File

@@ -1,6 +1,39 @@
<?php <?php
/* $Id$ */ /* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4: // vim: expandtab sw=4 ts=4 sts=4:
/**
* forms frameset
*
* @uses libraries/grab_globals.lib.php import variables
* @uses libraries/common.lib.php global fnctions
* @uses libraries/select_theme.lib.php theme manager
* @uses libraries/relation.lib.php table relations
* @uses $GLOBALS['strNoFrames']
* @uses $GLOBALS['cfg']['QueryHistoryDB']
* @uses $GLOBALS['cfg']['Server']['user']
* @uses $GLOBALS['cfg']['DefaultTabServer'] as src for the mainframe
* @uses $GLOBALS['cfg']['DefaultTabDatabase'] as src for the mainframe
* @uses $GLOBALS['cfg']['LeftWidth'] for left frame width
* @uses $GLOBALS['collation_connection'] from $_REQUEST (grab_globals.lib.php)
* or common.lib.php
* @uses $GLOBALS['available_languages'] from common.lib.php (select_lang.lib.php)
* @uses $GLOBALS['cookie_path'] from common.lib.php
* @uses $GLOBALS['is_https'] from common.lib.php
* @uses $GLOBALS['db']
* @uses $GLOBALS['charset']
* @uses $GLOBALS['lang']
* @uses $GLOBALS['text_dir']
* @uses $_ENV['HTTP_HOST']
* @uses PMA_getRelationsParam()
* @uses PMA_purgeHistory()
* @uses PMA_generate_common_url()
* @uses PMA_VERSION
* @uses setcookie()
* @uses session_write_close()
* @uses time()
* @uses getenv()
* @uses header() to send charset
*/
/** /**
* Gets core libraries and defines some variables * Gets core libraries and defines some variables
@@ -11,22 +44,24 @@ require_once('./libraries/common.lib.php');
* Includes the ThemeManager if it hasn't been included yet * Includes the ThemeManager if it hasn't been included yet
*/ */
require_once('./libraries/select_theme.lib.php'); require_once('./libraries/select_theme.lib.php');
require_once('./libraries/relation.lib.php');
// hash for the window names, against window hijacking
$_SESSION['window_name_hash'] = time();
// free the session file, for the other frames to be loaded
session_write_close();
/** /**
* Saves collation_connection (coming from main.php) in a cookie * Saves collation_connection (coming from main.php) in a cookie
*/ */
// (from grab_globals) // (from grab_globals)
if (isset($collation_connection)) { // TODO: move into common.lib.php line #360
if (!isset($pma_uri_parts)) { if ( isset( $collation_connection ) ) {
$pma_uri_parts = parse_url($cfg['PmaAbsoluteUri']); setcookie( 'pma_collation_connection', $collation_connection,
$cookie_path = substr($pma_uri_parts['path'], 0, strrpos($pma_uri_parts['path'], '/')); time() + 60*60*24*30, $cookie_path, '', $is_https );
$is_https = (isset($pma_uri_parts['scheme']) && $pma_uri_parts['scheme'] == 'https') ? 1 : 0;
}
setcookie('pma_collation_connection', $collation_connection, time() + 60*60*24*30, $cookie_path, '', $is_https);
} }
// Gets the default font sizes
PMA_setFontSizes();
// Gets the host name // Gets the host name
// loic1 - 2001/25/11: use the new globals arrays defined with php 4.1+ // loic1 - 2001/25/11: use the new globals arrays defined with php 4.1+
@@ -41,121 +76,74 @@ if (empty($HTTP_HOST)) {
$HTTP_HOST = ''; $HTTP_HOST = '';
} }
} }
/**
* Defines the frameset
*/
// loic1: If left light mode -> urldecode the db name
if (isset($lightm_db)) {
// no longer urlencoded because of html entities in the db name
// $db = urldecode($lightm_db);
$db = $lightm_db;
unset($lightm_db);
}
$url_query = PMA_generate_common_url(isset($db) ? $db : '');
header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
require_once('./libraries/relation.lib.php');
// purge querywindow history
$cfgRelation = PMA_getRelationsParam(); $cfgRelation = PMA_getRelationsParam();
if ( $GLOBALS['cfg']['QueryHistoryDB'] && $cfgRelation['historywork'] ) {
if ($cfg['QueryHistoryDB'] && $cfgRelation['historywork']) { PMA_purgeHistory( $GLOBALS['cfg']['Server']['user'] );
PMA_purgeHistory($cfg['Server']['user']);
} }
$phpmain_hash = md5($cfg['PmaAbsoluteUri']); $drops = array( 'lang', 'server', 'convcharset', 'collation_connection',
$phpmain_hash_js = time(); 'db', 'table' );
$url_querys = array();
// pass variables to child pages
foreach( $_GET as $key => $val ) {
if ( ! in_array( $key, $drops ) ) {
$url_querys[] = urlencode( $key ) . '=' . urlencode( $val );
}
}
unset( $drops );
if ( count( $url_querys ) ) {
$url_query = implode( '&amp;', $url_querys ) . '&amp;';
} else {
$url_query = '';
}
unset( $url_querys );
if ( empty( $GLOBALS['db'] ) ) {
$url_query .= PMA_generate_common_url();
$main_target = $GLOBALS['cfg']['DefaultTabServer'];
} elseif ( empty( $GLOBALS['table'] ) ) {
$url_query .= PMA_generate_common_url( $GLOBALS['db'] );
$main_target = $GLOBALS['cfg']['DefaultTabDatabase'];
} else {
$url_query .= PMA_generate_common_url( $GLOBALS['db'], $GLOBALS['table'] );
$main_target = $GLOBALS['cfg']['DefaultTabTable'];
}
$main_target .= '?' . $url_query;
$lang_iso_code = $GLOBALS['available_languages'][$GLOBALS['lang']][2];
// start output
header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
?> ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $available_languages[$lang][2]; ?>" lang="<?php echo $available_languages[$lang][2]; ?>" dir="<?php echo $text_dir; ?>"> <html xmlns="http://www.w3.org/1999/xhtml"
xml:lang="<?php echo $lang_iso_code; ?>"
lang="<?php echo $lang_iso_code; ?>"
dir="<?php echo $GLOBALS['text_dir']; ?>">
<head> <head>
<title>phpMyAdmin <?php echo PMA_VERSION; ?> - <?php echo $HTTP_HOST; ?></title> <title>phpMyAdmin <?php echo PMA_VERSION; ?> - <?php echo $HTTP_HOST; ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" /> <meta http-equiv="Content-Type"
<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php?lang=<?php echo $lang; ?>&amp;js_frame=right" /> content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
</head> </head>
<frameset cols="<?php echo $GLOBALS['cfg']['LeftWidth']; ?>,*" rows="*" id="mainFrameset">
<?php <frame frameborder="0" id="leftFrame"
$logo_image = $GLOBALS['pmaThemeImage'] . 'logo_left.png'; src="left.php?<?php echo $url_query; ?>"
$query_frame_height = 0; name="nav<?php echo $_SESSION['window_name_hash']; ?>" />
if ($cfg['LeftDisplayLogo'] && @file_exists($logo_image)) { <frame frameborder="0" id="rightFrame"
$tmp_imgsize = @getimagesize($logo_image); src="<?php echo $main_target; ?>"
$query_frame_height = ($tmp_imgsize[1] + 60); name="phpmain<?php echo $_SESSION['window_name_hash']; ?>" />
// increase the height to take into account font size differences in
// theme 'original'? (TODO: improve with a parameter in layout.inc.php)
$query_frame_height += ((!isset($GLOBALS['theme']) || $GLOBALS['theme']=='original') ? 25 : 0);
}
if ($query_frame_height == 0) {
$query_frame_height = 60;
}
// increase the height to take into account font size differences in
// theme 'original'? (TODO: improve with a parameter in layout.inc.php)
$query_frame_height += ((!isset($GLOBALS['theme']) || $GLOBALS['theme']=='original') ? 20 : 10);
if ($cfg['LeftDisplayServers'] && !$cfg['DisplayServersList']) {
$query_frame_height += 40;
}
if ($server > 0) {
PMA_availableDatabases(); // this function is defined in "common.lib.php"
} else {
$num_dbs = 0;
}
if ($num_dbs > 1) {
if ($cfg['LeftFrameLight']) {
$query_frame_height += 20;
}
}
if ($cfg['QueryFrame']) {
/* Will we show list of servers? */
if ($cfg['LeftDisplayServers'] && $cfg['DisplayServersList'] && count($cfg['Servers']) > 1) {
$query_frame_height += (count($cfg['Servers']) + 1)*15;
}
if ($cfg['QueryFrameJS']) {
echo '<script type="text/javascript">' . "\n";
echo '<!--' . "\n";
echo ' document.writeln(\'<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*" border="1" frameborder="1" framespacing="1" name="mainFrameset" id="mainFrameset">\');' . "\n";
echo ' document.writeln(\' <frameset rows="' . $query_frame_height . ', *" framespacing="0" frameborder="0" border="0" name="leftFrameset" id="leftFrameset">\');' . "\n";
echo ' document.writeln(\' <frame src="queryframe.php?' . $url_query . '&amp;hash=' . $phpmain_hash . $phpmain_hash_js . '" name="queryframe" frameborder="0" scrolling="no" id="leftQueryframe" />\');' . "\n";
echo ' document.writeln(\' <frame src="left.php?' . $url_query . '&amp;hash=' . $phpmain_hash . $phpmain_hash_js . '" name="nav" frameborder="0" id="leftFrame" />\');' . "\n";
echo ' document.writeln(\' </frameset>\');' . "\n";
echo ' document.writeln(\' <frame src="' . (empty($db) ? $cfg['DefaultTabServer'] : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . $phpmain_hash_js . '" border="0" frameborder="0" style="border-left: 1px solid #000000;" id="rightFrame" />\');' . "\n";
echo ' document.writeln(\' <noframes>\');' . "\n";
echo ' document.writeln(\' <body bgcolor="#FFFFFF">\');' . "\n";
echo ' document.writeln(\' <p>' . str_replace("'", "\'", $strNoFrames) . '</p>\');' . "\n";
echo ' document.writeln(\' </body>\');' . "\n";
echo ' document.writeln(\' </noframes>\');' . "\n";
echo ' document.writeln(\'</frameset>\');' . "\n";
echo '//-->' . "\n";
echo '</script>' . "\n";
echo "\n";
echo '<noscript>' . "\n";
}
echo '<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*" border="1" frameborder="1" framespacing="1" name="mainFrameset" id="mainFrameset">' . "\n";
echo ' <frameset rows="' . $query_frame_height . ', *" framespacing="0" frameborder="0" border="0" name="leftFrameset" id="leftFrameset">' . "\n";
echo ' <frame src="queryframe.php?' . $url_query . '&amp;hash=' . $phpmain_hash . '" name="queryframe" frameborder="0" scrolling="no" id="leftQueryframe" />' . "\n";
echo ' <frame src="left.php?' . $url_query . '&amp;hash=' . $phpmain_hash . '" name="nav" frameborder="0" id="leftFrame" />' . "\n";
echo ' </frameset>' . "\n";
echo ' <frame src="' . (empty($db) ? $cfg['DefaultTabServer'] : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . '" frameborder="0" id="rightFrame" />' . "\n";
} else {
echo '<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*" border="1" frameborder="1" framespacing="1" id="leftFrameset" >' . "\n";
echo ' <frame src="left.php?' . $url_query . '&amp;hash=' . $phpmain_hash . '" name="nav" frameborder="0" id="leftFrame" />' . "\n";
echo ' <frame src="' . (empty($db) ? $cfg['DefaultTabServer'] : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . '" id="rightFrame" frameborder="1" />' . "\n";
}
?>
<noframes> <noframes>
<body bgcolor="#FFFFFF"> <body>
<p><?php echo $strNoFrames; ?></p> <p><?php echo $GLOBALS['strNoFrames']; ?></p>
</body> </body>
</noframes> </noframes>
</frameset> </frameset>
<?php
if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
echo '</noscript>' . "\n";
}
?>
</html> </html>

1169
left.php
View File

File diff suppressed because it is too large Load Diff

150
libraries/common.lib.php
View File

@@ -801,6 +801,10 @@ if ($is_minimum_common == FALSE) {
* @uses PMA_getTableCount() * @uses PMA_getTableCount()
* @uses PMA_getComments() * @uses PMA_getComments()
* @uses PMA_availableDatabases() * @uses PMA_availableDatabases()
* @uses is_array()
* @uses implode()
* @uses strstr()
* @uses explode()
* @return array db list * @return array db list
*/ */
function PMA_getDbList() { function PMA_getDbList() {
@@ -860,8 +864,8 @@ function PMA_getDbList() {
*/ */
function PMA_getHtmlSelectDb( $selected = '' ) { function PMA_getHtmlSelectDb( $selected = '' ) {
$dblist = PMA_getDbList(); $dblist = PMA_getDbList();
$return = '<select name="lightm_db" id="lightm_db"' $return = '<select name="db" id="lightm_db"'
.' onchange="remove_focus_select(); this.form.submit();">' . "\n" .' onchange="this.form.submit();">' . "\n"
.'<option value="">(' . $GLOBALS['strDatabases'] . ') ...</option>' .'<option value="">(' . $GLOBALS['strDatabases'] . ') ...</option>'
."\n"; ."\n";
foreach( $dblist as $group => $dbs ) { foreach( $dblist as $group => $dbs ) {
@@ -1549,34 +1553,130 @@ if ($is_minimum_common == FALSE) {
global $num_dbs; global $num_dbs;
global $cfg; global $cfg;
$num_dbs = count($dblist);
// 1. A list of allowed databases has already been defined by the // 1. A list of allowed databases has already been defined by the
// authentification process -> gets the available databases list // authentification process -> gets the available databases list
if ($num_dbs) { if ( count( $dblist ) ) {
$true_dblist = array(); foreach ( $dblist as $key => $db ) {
for ($i = 0; $i < $num_dbs; $i++) { if ( ! @PMA_DBI_select_db( $db ) ) {
$dblink = @PMA_DBI_select_db($dblist[$i]); unset( $dblist[$key] );
if ($dblink) {
$true_dblist[] = $dblist[$i];
} // end if } // end if
} // end for } // end for
$dblist = array();
$dblist = $true_dblist;
unset($true_dblist);
$num_dbs = count($dblist);
} // end if } // end if
// 2. Allowed database list is empty -> gets the list of all databases // 2. Allowed database list is empty -> gets the list of all databases
// on the server // on the server
else if (!isset($cfg['Server']['only_db']) || $cfg['Server']['only_db'] == '') { elseif ( empty( $cfg['Server']['only_db'] ) ) {
$dblist = PMA_DBI_get_dblist(); // needed? or PMA_mysqlDie('', 'SHOW DATABASES;', FALSE, $error_url); $dblist = PMA_DBI_get_dblist(); // needed? or PMA_mysqlDie('', 'SHOW DATABASES;', FALSE, $error_url);
$num_dbs = count($dblist);
} // end else } // end else
$num_dbs = count( $dblist );
// natural order for db list; but do not sort if user asked
// for a specific order with the 'only_db' mechanism
if ( ! is_array( $GLOBALS['cfg']['Server']['only_db'] )
&& $GLOBALS['cfg']['NaturalOrder'] ) {
natsort( $dblist );
}
return TRUE; return TRUE;
} // end of the 'PMA_availableDatabases()' function } // end of the 'PMA_availableDatabases()' function
/**
* returns array with tables of given db with extended infomation and grouped
*
* @uses $GLOBALS['cfg']['LeftFrameTableSeparator']
* @uses $GLOBALS['cfg']['LeftFrameTableLevel']
* @uses $GLOBALS['cfg']['ShowTooltipAliasTB']
* @uses $GLOBALS['cfg']['NaturalOrder']
* @uses PMA_DBI_fetch_result()
* @uses PMA_backquote()
* @uses count()
* @uses array_merge
* @uses uksort()
* @uses strstr()
* @uses explode()
* @param string $db name of db
* return array (rekursive) grouped table list
*/
function PMA_getTableList( $db ) {
$sep = $GLOBALS['cfg']['LeftFrameTableSeparator'];
$tables = PMA_DBI_fetch_result(
'SHOW TABLE STATUS FROM ' . PMA_backquote( $db ),
'Name' );
if ( count( $tables ) < 1 ) {
return $tables;
}
if ( $GLOBALS['cfg']['NaturalOrder'] ) {
uksort( $tables, 'strcmp' );
}
$default = array(
'Name' => '',
'Rows' => 0,
'Comment' => '',
'disp_name' => '',
);
$table_groups = array();
foreach ( $tables as $table_name => $table ) {
// in $group we save the reference to the place in $table_groups
// where to store the table info
if ( $GLOBALS['cfg']['LeftFrameDBTree']
&& $sep && strstr( $table_name, $sep ) )
{
$parts = explode( $sep, $table_name );
$group =& $table_groups;
$i = 0;
$group_name_full = '';
while ( $i < count( $parts ) - 1
&& $i < $GLOBALS['cfg']['LeftFrameTableLevel'] ) {
$group_name = $parts[$i] . $sep;
$group_name_full .= $group_name;
if ( ! isset( $group[$group_name] ) ) {
$group[$group_name] = array();
$group[$group_name]['is' . $sep . 'group'] = true;
$group[$group_name]['tab' . $sep . 'count'] = 1;
$group[$group_name]['tab' . $sep . 'group'] = $group_name_full;
} elseif ( ! isset( $group[$group_name]['is' . $sep . 'group'] ) ) {
$table = $group[$group_name];
$group[$group_name] = array();
$group[$group_name][$group_name] = $table;
unset( $table );
$group[$group_name]['is' . $sep . 'group'] = true;
$group[$group_name]['tab' . $sep . 'count'] = 1;
$group[$group_name]['tab' . $sep . 'group'] = $group_name_full;
} else {
$group[$group_name]['tab_count']++;
}
$group =& $group[$group_name];
$i++;
}
} else {
if ( ! isset( $table_groups[$table_name] ) ) {
$table_groups[$table_name] = array();
}
$group =& $table_groups;
}
if ( $GLOBALS['cfg']['ShowTooltipAliasTB']
&& $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested' ) {
// switch tooltip and name
$table['Comment'] = $table['Name'];
$table['disp_name'] = $table['Comment'];
} else {
$table['disp_name'] = $table['Name'];
}
$group[$table_name] = array_merge( $default, $table );
}
return $table_groups;
}
/* ----------------------- Set of misc functions ----------------------- */ /* ----------------------- Set of misc functions ----------------------- */
@@ -1734,8 +1834,8 @@ if ($is_minimum_common == FALSE) {
<script type="text/javascript" language="javascript1.2"> <script type="text/javascript" language="javascript1.2">
<!-- <!--
if (typeof(window.parent) != 'undefined' if (typeof(window.parent) != 'undefined'
&& typeof(window.parent.frames['nav']) != 'undefined') { && typeof(window.parent.frames[0]) != 'undefined') {
window.parent.frames['nav'].goTo('<?php echo $reload_url; ?>&hash=' + <?php echo (($cfg['QueryFrame'] && $cfg['QueryFrameJS']) ? 'window.parent.frames[\'queryframe\'].document.hashform.hash.value' : "'" . md5($cfg['PmaAbsoluteUri']) . "'"); ?>); window.parent.frames[0].goTo('<?php echo $reload_url; ?>');
} }
//--> //-->
</script> </script>
@@ -1770,18 +1870,18 @@ if (typeof(window.parent) != 'undefined'
: $tbl_status['Comment'] . ' '; : $tbl_status['Comment'] . ' ';
$tooltip .= '(' . $tbl_status['Rows'] . ' ' . $GLOBALS['strRows'] . ')'; $tooltip .= '(' . $tbl_status['Rows'] . ' ' . $GLOBALS['strRows'] . ')';
PMA_DBI_free_result($result); PMA_DBI_free_result($result);
$md5_tbl = md5($GLOBALS['table']); $uni_tbl = PMA_jsFormat( $GLOBALS['db'] . '.' . $GLOBALS['table'] );
echo "\n"; echo "\n";
?> ?>
<script type="text/javascript" language="javascript1.2"> <script type="text/javascript" language="javascript1.2">
<!-- <!--
if (typeof(document.getElementById) != 'undefined' if (typeof(document.getElementById) != 'undefined'
&& typeof(window.parent.frames['nav']) != 'undefined' && typeof(window.parent.frames[0]) != 'undefined'
&& typeof(window.parent.frames['nav'].document) != 'undefined' && typeof(window.parent.frames['nav'].document) != 'unknown' && typeof(window.parent.frames[0].document) != 'undefined' && typeof(window.parent.frames[0].document) != 'unknown'
&& (window.parent.frames['nav'].document.getElementById('<?php echo 'tbl_' . $md5_tbl; ?>')) && (window.parent.frames[0].document.getElementById('<?php echo $uni_tbl; ?>'))
&& typeof(window.parent.frames['nav'].document.getElementById('<?php echo 'tbl_' . $md5_tbl; ?>')) != 'undefined' && typeof(window.parent.frames[0].document.getElementById('<?php echo $uni_tbl; ?>')) != 'undefined'
&& typeof(window.parent.frames['nav'].document.getElementById('<?php echo 'tbl_' . $md5_tbl; ?>').title) == 'string') { && typeof(window.parent.frames[0].document.getElementById('<?php echo $uni_tbl; ?>').title) == 'string') {
window.parent.frames['nav'].document.getElementById('<?php echo 'tbl_' . $md5_tbl; ?>').title = '<?php echo PMA_jsFormat($tooltip, FALSE); ?>'; window.parent.frames[0].document.getElementById('<?php echo $uni_tbl; ?>').title = '<?php echo PMA_jsFormat($tooltip, FALSE); ?>';
} }
//--> //-->
</script> </script>

25
libraries/left_header.inc.php
View File

@@ -19,10 +19,10 @@ if ( $GLOBALS['cfg']['LeftDisplayLogo'] ) {
$logo = 'phpMyAdmin'; $logo = 'phpMyAdmin';
if ( @file_exists( $GLOBALS['pmaThemeImage'] . 'logo_left.png' ) ) { if ( @file_exists( $GLOBALS['pmaThemeImage'] . 'logo_left.png' ) ) {
$logo = '<img src="' . $GLOBALS['pmaThemeImage'] . 'logo_left.png" ' $logo = '<img src="' . $GLOBALS['pmaThemeImage'] . 'logo_left.png" '
.'alt="' . $logo . '" />'; .'alt="' . $logo . '" id="imgpmalogo" />';
} elseif ( @file_exists( $GLOBALS['pmaThemeImage'] . 'pma_logo2.png' ) ) { } elseif ( @file_exists( $GLOBALS['pmaThemeImage'] . 'pma_logo2.png' ) ) {
$logo = '<img src="' . $GLOBALS['pmaThemeImage'] . 'pma_logo2.png" ' $logo = '<img src="' . $GLOBALS['pmaThemeImage'] . 'pma_logo2.png" '
.'alt="' . $logo . '" />'; .'alt="' . $logo . '" id="imgpmalogo" />';
} }
echo '<div id="pmalogo">' . "\n" echo '<div id="pmalogo">' . "\n"
@@ -33,7 +33,7 @@ if ( $GLOBALS['cfg']['LeftDisplayLogo'] ) {
?> ?>
<div id="leftframelinks"> <div id="leftframelinks">
<?php <?php
echo '<a href="main.php?' . $query_url . '" target="phpmain' . $hash . '"' echo '<a href="main.php?' . $query_url . '"'
.' title="' . $strHome . '">' .' title="' . $strHome . '">'
.( $GLOBALS['cfg']['MainPageIconic'] .( $GLOBALS['cfg']['MainPageIconic']
? '<img src="' . $pmaThemeImage . 'b_home.png" width="16" ' ? '<img src="' . $pmaThemeImage . 'b_home.png" width="16" '
@@ -68,7 +68,6 @@ if ( $GLOBALS['cfg']['LeftDisplayLogo'] ) {
$query_frame_link_text = $strQueryFrame; $query_frame_link_text = $strQueryFrame;
} }
echo '<a href="' . $anchor . '&amp;no_js=true"' echo '<a href="' . $anchor . '&amp;no_js=true"'
.' target="phpmain' . $hash . '"'
.' title="' . $strQueryFrame . '"'; .' title="' . $strQueryFrame . '"';
if ( $GLOBALS['cfg']['QueryFrameJS'] ) { if ( $GLOBALS['cfg']['QueryFrameJS'] ) {
echo ' onclick="javascript:open_querywindow(\'' . $anchor . '\');' echo ' onclick="javascript:open_querywindow(\'' . $anchor . '\');'
@@ -94,22 +93,4 @@ if ( $GLOBALS['cfg']['LeftDisplayServers'] ) {
$show_server_left = TRUE; $show_server_left = TRUE;
include('./libraries/select_server.lib.php'); include('./libraries/select_server.lib.php');
} // end if LeftDisplayServers } // end if LeftDisplayServers
if ( $num_dbs > 1 && $cfg['LeftFrameLight'] ) {
?>
<div id="databaseList">
<form method="post" action="index.php" name="left" target="_parent"
onclick="this.form.target='nav'; this.form.action='left.php'; return true;">
<input type="hidden" name="hash" value="<?php echo $hash; ?>" />
<label for="lightm_db"><?php echo $strDatabase; ?></label>
<?php
echo PMA_generate_common_hidden_inputs() . "\n";
echo PMA_getHtmlSelectDb( $db ) . "\n";
echo '<noscript>' . "\n"
.'<input type="submit" name="Go" value="' . $strGo . '" />' . "\n"
.'</noscript>' . "\n"
.'</form>' . "\n"
.'</div>' . "\n";
}
?> ?>

2
libraries/sql_query_form.lib.php
View File

@@ -111,7 +111,7 @@ function PMA_sqlQueryForm( $query = true, $display_tab = false ) {
<form method="post" id="sqlqueryform" <form method="post" id="sqlqueryform"
target="phpmain<?php echo md5( $GLOBALS['cfg']['PmaAbsoluteUri'] ); ?>" target="phpmain<?php echo md5( $GLOBALS['cfg']['PmaAbsoluteUri'] ); ?>"
action="import.php"<?php echo $enctype; ?> name="sqlform" action="import.php"<?php echo $enctype; ?> name="sqlform"
onsubmit="this.target=window.opener.parent.frames[2].name; onsubmit="this.target=window.opener.parent.frames[1].name;
return checkSqlQuery(this);" > return checkSqlQuery(this);" >
<?php <?php
} else { } else {

3
queryframe.php
View File

@@ -173,9 +173,6 @@ require 'libraries/left_header.inc.php';
<input type="hidden" name="table" value="" /> <input type="hidden" name="table" value="" />
<input type="hidden" name="framename" value="queryframe" /> <input type="hidden" name="framename" value="queryframe" />
</form> </form>
<form name="hashform" action="queryframe.php">
<input type="hidden" name="hash" value="<?php echo $hash; ?>" />
</form>
</body> </body>
</html> </html>

5
querywindow.php
View File

@@ -70,6 +70,7 @@ var confirmMsg = '<?php echo(($GLOBALS['cfg']['Confirm']) ? str_replace('\'', '
<?php <?php
if ( empty( $querydisplay_tab ) ) { if ( empty( $querydisplay_tab ) ) {
$onload = 'onload="resize();"';
?> ?>
function resize() { function resize() {
@@ -95,6 +96,8 @@ function resize() {
} }
} }
<?php <?php
} else {
$onload = '';
} }
?> ?>
//--> //-->
@@ -102,7 +105,7 @@ function resize() {
<script src="libraries/functions.js" type="text/javascript" language="javascript"></script> <script src="libraries/functions.js" type="text/javascript" language="javascript"></script>
</head> </head>
<body id="bodyquerywindow" onload="resize();" bgcolor="<?php echo ($cfg['QueryFrameJS'] ? $cfg['LeftBgColor'] : $cfg['RightBgColor']); ?>"> <body id="bodyquerywindow" <?php echo $onload; ?> bgcolor="<?php echo ($cfg['QueryFrameJS'] ? $cfg['LeftBgColor'] : $cfg['RightBgColor']); ?>">
<div id="querywindowcontainer"> <div id="querywindowcontainer">
<?php <?php
if ( $cfg['QueryFrameJS'] && !isset($no_js) ) { if ( $cfg['QueryFrameJS'] && !isset($no_js) ) {

18
server_databases.php
View File

@@ -15,20 +15,6 @@ require_once('./libraries/grab_globals.lib.php');
$js_to_run = 'functions.js'; $js_to_run = 'functions.js';
require('./server_common.inc.php'); require('./server_common.inc.php');
?>
<script type="text/javascript" language="javascript1.2">
<!--
function reload_window(db) {
if (typeof(window.parent) != 'undefined'
&& typeof(window.parent.frames['nav']) != 'undefined') {
window.parent.frames['nav'].goTo('./left.php?<?php echo PMA_generate_common_url('','','&');?>&db=' + db + '&hash=' + <?php echo (($cfg['QueryFrame'] && $cfg['QueryFrameJS']) ? 'window.parent.frames[\'queryframe\'].document.hashform.hash.value' : "'" . md5($cfg['PmaAbsoluteUri']) . "'"); ?>);
}
}
//-->
</script>
<?php
/** /**
* Sorts the databases array according to the user's choice * Sorts the databases array according to the user's choice
* *
@@ -248,7 +234,7 @@ if (count($statistics) > 0) {
echo ' </td>' . "\n"; echo ' </td>' . "\n";
} }
echo ' <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . "\n" echo ' <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . "\n"
. ' <a onclick="reload_window(\'' . urlencode($current['db_name']) . '\'); return true;" href="' . $cfg['DefaultTabDatabase'] . '?' . $url_query . '&amp;db=' . urlencode($current['db_name']) . '" title="' . sprintf($strJumpToDB, htmlspecialchars($current['db_name'])) . '">' . "\n" . ' <a onclick="if ( window.parent.frames[0].openDb(\'' . urlencode($current['db_name']) . '\') ) return false;" href="index.php?' . $url_query . '&amp;db=' . urlencode($current['db_name']) . '" title="' . sprintf($strJumpToDB, htmlspecialchars($current['db_name'])) . '" target="_parent">' . "\n"
. ' ' . htmlspecialchars($current['db_name']) . "\n" . ' ' . htmlspecialchars($current['db_name']) . "\n"
. ' </a>' . "\n" . ' </a>' . "\n"
. ' </td>' . "\n"; . ' </td>' . "\n";
@@ -289,7 +275,7 @@ if (count($statistics) > 0) {
} }
if ($is_superuser) { if ($is_superuser) {
echo ' <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '" align="center">' . "\n" echo ' <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '" align="center">' . "\n"
. ' <a onclick="reload_window(\'' . urlencode($current['db_name']) . '\'); return true;" href="./server_privileges.php?' . $url_query . '&amp;checkprivs=' . urlencode($current['db_name']) . '" title="' . sprintf($strCheckPrivsLong, htmlspecialchars($current['db_name'])) . '">'. "\n" . ' <a onclick="window.parent.frames[0].openDb(\'' . urlencode($current['db_name']) . '\', true);" href="./server_privileges.php?' . $url_query . '&amp;checkprivs=' . urlencode($current['db_name']) . '" title="' . sprintf($strCheckPrivsLong, htmlspecialchars($current['db_name'])) . '">'. "\n"
. ' ' .($cfg['PropertiesIconic'] ? '<img src="' . $pmaThemeImage . 's_rights.png" width="16" height="16" hspace="2" border="0" alt=" ' .$strCheckPrivs . '" /> ' : $strCheckPrivs ). "\n" . ' ' .($cfg['PropertiesIconic'] ? '<img src="' . $pmaThemeImage . 's_rights.png" width="16" height="16" hspace="2" border="0" alt=" ' .$strCheckPrivs . '" /> ' : $strCheckPrivs ). "\n"
. ' </a>' . "\n" . ' </a>' . "\n"
. ' </td>' . "\n"; . ' </td>' . "\n";

304
themes/darkblue_orange/css/theme_left.css.php
View File

@@ -1,241 +1,91 @@
/************************************************************************************ body {
* LEFT FRAME
************************************************************************************/
/**
* Add styles for positioned layers
**/
/*
<?php
if (isset($num_dbs) && $num_dbs == '0') {
?>
*/
/* No layer effects neccessary */
div{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
color: #ffffff;
}
.heada{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
color: #ffffff;
}
.parent{
font-family: Verdana, Arial, Helvetica, sans-serif;
color: #ffffff;
text-decoration: none;
}
.item, .tblItem, .item:active, .item:hover, .tblItem, .tblItem:active{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
color: #ffffff;
text-decoration: none;
}
.tblItem:hover{
color: #ffffcc;
text-decoration: underline;
}
/*
<?php
} else {
if (isset($js_capable) && $js_capable != '0') {
// Brian Birtles : This is not the ideal method of doing this
// but under the 7th June '00 Mozilla build (and many before
// it) Mozilla did not treat text between <style> tags as
// style information unless it was written with the one call
// to write().
if (isset($js_isDOM) && $js_isDOM != '0') {
?>
*/
/* Layer effects neccessary: capable && is_DOM is set. We found a recent CSS-Browser */
div{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
color: #ffffff;
}
.heada{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
color: #ffffff;
}
.headaCnt{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
color: #ffffff;
}
.parent{
font-family: Verdana, Arial, Helvetica, sans-serif;
color: #ffffff;
text-decoration: none;
display: block;
}
.child{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
color: #ffffff;
text-decoration: none;
display: none;
}
.item, .item:active, .item:hover, .tblItem, .tblItem:active{
font-size: 10px;
color: #ffffff;
text-decoration: none;
}
.tblItem:hover{
color: #ffffcc;
text-decoration: underline;
}
/*
<?php
} else {
?>
*/
/* Layer effeccts neccessary: capable, but no is_DOM. We found an older CSS-Browser */
div{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
color: #000000;
}
.heada{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
color: #ffffff;
}
.headaCnt{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
color: #ffffff;
}
/*
<?php
if (isset($js_isIE4) && $js_isIE4 != '0') {
?>
*/
/* Additional effects for IE4 */
.parent{
font-family: Verdana, Arial, Helvetica, sans-serif;
color: #ffffff;
text-decoration: none;
display: block;
}
.child{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
color: #ffffff;
text-decoration: none;
display: none;
}
.item, .item:active, .item:hover, .tblItem, .tblItem:active{
font-size: 10px;
color: #ffffff;
text-decoration: none;
}
.tblItem:hover{
color: #ffffcc;
text-decoration: underline;
}
/*
<?php
} else {
?>
*/
/* Additional effects for NON-IE4 */
.parent{
font-family: Verdana, Arial, Helvetica, sans-serif;
color: #ffffff;
text-decoration: none;
position: absolute; /* don't edit! */
visibility: hidden; /* don't edit! */
}
.child{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
color: #ffffff;
position: absolute; /* don't edit! */
visibility: hidden; /* don't edit! */
}
.item, .tblItem{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
color: #ffffff;
text-decoration: none;
}
/*
<?php
}
}
} else {
?>
*/
/* Additional effects for left frame not required or not possible because of lacking CSS-capability. */
div{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
color: #ffffff;
}
.heada{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
color: #ffffff;
}
.headaCnt{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
color: #ffffff;
}
.parent{
font-family: Verdana, Arial, Helvetica, sans-serif;
color: #ffffff;
text-decoration: none;
}
.child{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
color: #ffffff;
text-decoration: none;
}
.item, .item:active, .item:hover, .tblItem, .tblItem:active{
font-size: 10px;
color: #ffffff;
text-decoration: none;
}
.tblItem:hover{
color: #ffffcc;
text-decoration: underline;
}
/*
<?php
}
}
?>
*/
/* Always enabled stylesheets (left frame) */
body{
font-family: Verdana, Arial, Helvetica, sans-serif; font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px; font-size: 10px;
background-color: #666699; background-color: #666699;
margin: 0px; margin: 0;
padding: 2px 2px 2px 2px; padding: 2px 2px 2px 2px;
} }
input{
font-family: Verdana, Arial, Helvetica, sans-serif; body#body_leftFrame {
font-size: 10px; background-color: <?php echo $cfg['LeftBgColor']; ?>;
} }
div {
color: #ffffff;
}
select{ select{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
background-color: #ffffff; background-color: #ffffff;
color: #000000; color: #000000;
width: 150px; width: 150px;
} }
hr{
color: #ffffff;
background-color: #ffffff;
border: 0;
height: 1px;
}
img, input, select, button { img, input, select, button {
vertical-align: middle; vertical-align: middle;
} }
div#pmalogo,
div#leftframelinks,
div#databaseList {
text-align: center;
border-bottom: 0.1em solid #ffffff;
margin-bottom: 0.5em;
padding-bottom: 0.5em;
}
div#leftframelinks a {
margin: 0.1em;
}
div#leftframelinks a:hover {
background-color: #ffffff;
}
div#databaseList form {
display: inline;
}
/* leftdatabaselist */
div#left_tableList {
list-style-type: none;
list-style-position: outside;
margin: 0;
padding: 0;
font-size: 10px;
}
div#left_tableList a {
color: #ffffff;
text-decoration: none;
}
div#left_tableList a:hover {
color: #ffffff;
text-decoration: underline;
}
div#left_tableList li {
margin: 0;
padding: 0;
white-space: nowrap;
}
<?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ) { ?>
div#left_tableList li:hover {
background-color: <?php echo $GLOBALS['cfg']['LeftPointerColor']; ?>;
}
<?php } ?>
div#left_tableList img {
height: 1em;
width: auto;
vertical-align: middle;
}
div#left_tableList ul ul {
margin-left: 0em;
padding-left: 0.1em;
border-left: 0.1em solid #ffffff;
padding-bottom: 0.1em;
border-bottom: 0.1em solid #ffffff;
}

160
themes/original/css/theme_left.css.php
View File

@@ -1,74 +1,92 @@
<?php body, input, select {
if (isset($num_dbs) && $num_dbs == '0') { font-family: <?php echo $left_font_family; ?>;
?> font-size: <?php echo $font_size; ?>;
/* No layer effects neccessary */ color: #000000
div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000} }
.heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none}
.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
.tblItem:hover {color: #FF0000; text-decoration: underline}
<?php
} else {
if (isset($js_capable) && $js_capable != '0') {
// Brian Birtles : This is not the ideal method of doing this
// but under the 7th June '00 Mozilla build (and many before
// it) Mozilla did not treat text between <style> tags as
// style information unless it was written with the one call
// to write().
if (isset($js_isDOM) && $js_isDOM != '0') {
?>
/* Layer effects neccessary: capable && is_DOM is set. We found a recent CSS-Browser */
div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
.heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
.headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none; display: block}
.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none; display: none}
.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
.tblItem:hover {color: #FF0000; text-decoration: underline}
<?php
} else {
?>
/* Layer effeccts neccessary: capable, but no is_DOM. We found an older CSS-Browser */
div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
.heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
.headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
<?php
if (isset($js_isIE4) && $js_isIE4 != '0') {
?>
/* Additional effects for IE4 */
.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none; display: block}
.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none; display: none}
.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
.tblItem:hover {color: #FF0000; text-decoration: underline}
<?php
} else {
?>
/* Additional effects for NON-IE4 */
.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none; position: absolute; visibility: hidden}
.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; position: absolute; visibility: hidden}
.item, .tblItem {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
<?php
}
}
} else {
?>
/* Additional effects for left frame not required or not possible because of lacking CSS-capability. */
div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
.heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
.headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none}
.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
.tblItem:hover {color: #FF0000; text-decoration: underline}
<?php
}
}
?>
/* Always enabled stylesheets (left frame) */
body {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; }
input {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>}
select {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; background-color: #ffffff; color: #000000}
img, input, select, button { body#body_leftFrame {
background-color: <?php echo $GLOBALS['cfg']['LeftBgColor']; ?>;
}
select {
background-color: #ffffff;
color: #000000;
}
div#pmalogo,
div#leftframelinks,
div#databaseList {
text-align: center;
border-bottom: 0.05em solid #669999;
margin-bottom: 0.5em;
padding-bottom: 0.5em;
}
div#pmalogo img#imgpmalogo {
width: 100%;
max-width: 11em;
height: auto;
}
div#leftframelinks img {
vertical-align: middle; vertical-align: middle;
} }
div#leftframelinks a {
margin: 0.1em;
padding: 0.2em;
border: 0.05em solid #669999;
}
div#leftframelinks a:hover {
background-color: #669999;
}
div#databaseList form {
display: inline;
}
/* leftdatabaselist */
div#left_tableList {
list-style-type: none;
list-style-position: outside;
margin: 0;
padding: 0;
font-size: <?php echo $font_smaller; ?>;
}
div#left_tableList a {
color: #333399;
text-decoration: none;
}
div#left_tableList a:hover {
color: #FF0000;
text-decoration: underline;
}
div#left_tableList li {
margin: 0;
padding: 0;
white-space: nowrap;
}
<?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ) { ?>
div#left_tableList li:hover {
background-color: <?php echo $GLOBALS['cfg']['LeftPointerColor']; ?>;
}
<?php } ?>
div#left_tableList img {
height: 1em;
width: auto;
vertical-align: middle;
}
div#left_tableList ul ul {
margin-left: 0em;
padding-left: 0.1em;
border-left: 0.1em solid #669999;
padding-bottom: 0.1em;
border-bottom: 0.1em solid #669999;
}