From f2567b035fe8e70e592f334a9ed401e1000f1c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20M=C3=BCller?= Date: Fri, 11 Jan 2002 15:59:32 +0000 Subject: [PATCH] started to work on the "LeftLight" concept (cf. Changelog) --- ChangeLog | 8 + Documentation.html | 6 + config.inc.php3 | 4 + db_details.php3 | 11 +- index.php3 | 10 +- leftlight.php3 | 325 ++++++++++++++++++++++++++++++++++++++ libraries/common.lib.php3 | 9 +- main.php3 | 11 +- 8 files changed, 380 insertions(+), 4 deletions(-) create mode 100755 leftlight.php3 diff --git a/ChangeLog b/ChangeLog index 70c3b842f..e41adb82d 100755 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,14 @@ $Source$ 2002-01-11 Olivier Müller * lang/*: added $strSelectAll / $strUnselectAll, used in db_details.php3 + * leftlight.php3, config.inc.php3, db_details.php3, index.php3, main.php3, + libraries/common.lib.php3, Documentation.html: + started to work on the "LeftLight" concept. TODO: + - better fonts & html + - add strings for leftlight.php specific messages + - javascript: update both frames on DB selection + - give the user the possibility to choose between the + "standard" and the "light" view. 2002-01-10 Marc Delisle * lang/slovak-iso updates, thanks to Lubos Klokner diff --git a/Documentation.html b/Documentation.html index cffb0507b..9b4b40762 100755 --- a/Documentation.html +++ b/Documentation.html @@ -556,6 +556,12 @@

+

$cfgLeftFrameLight boolean

+

+ Defines whether to use select-based menu and display only the + current tables in the left frame (smaller page). +

+

$cfgOBGzip boolean

diff --git a/config.inc.php3 b/config.inc.php3 index 116f924b2..35d5ed2c5 100755 --- a/config.inc.php3 +++ b/config.inc.php3 @@ -108,6 +108,10 @@ $cfgShowStats = TRUE; // allow to display statistics and space usa // properties $cfgShowTooltip = TRUE; // display table comment as tooltip in left frame +// Left frame setup +$cfgLeftFrameLight = TRUE; // use a select-based menu and display only the + // current tables in the left frame. (experimental) + // In the main frame, at startup... $cfgShowMysqlInfo = FALSE; // whether to display the "MySQL runtime $cfgShowMysqlVars = FALSE; // information", "MySQL system variables" and "PHP diff --git a/db_details.php3 b/db_details.php3 index 990595c8d..9c1059e36 100755 --- a/db_details.php3 +++ b/db_details.php3 @@ -37,6 +37,15 @@ if (!isset($is_db) || !$is_db) { } } // end if (ensures db exists) +// Select the file to be displayed + +if ($cfgLeftFrameLight) { + $leftFrame = "leftlight.php3"; +} else { + $leftFrame = "left.php3"; +} + + // Displays headers if (!isset($message)) { $js_to_run = 'functions.js'; @@ -47,7 +56,7 @@ if (!isset($message)) { ?> ; font-size: - + diff --git a/leftlight.php3 b/leftlight.php3 new file mode 100755 index 000000000..a81543138 --- /dev/null +++ b/leftlight.php3 @@ -0,0 +1,325 @@ +<?php +/* $Id$ */ + + +/** + * Gets the variables sent to this script, retains the db name that may have + * been defined as startup option and include a core library + */ +require('./libraries/grab_globals.lib.php3'); +if (!empty($db)) { + $db_start = $db; +} + + +/** + * Gets a core script and starts output buffering work + */ +require('./libraries/common.lib.php3'); +require('./libraries/ob.lib.php3'); +if ($cfgOBGzip) { + $ob_mode = PMA_outBufferModeGet(); + if ($ob_mode) { + PMA_outBufferPre($ob_mode); + } +} + + +/** + * Get the list and number of available databases. + * Skipped if no server selected: in this case no database should be displayed + * before the user choose among available ones at the welcome screen. + */ +if ($server > 0) { + PMA_availableDatabases(); // this function is defined in "common.lib.php3" +} else { + $num_dbs = 0; +} + + +/** + * Send http headers + */ +// Don't use cache (required for Opera) +$now = gmdate('D, d M Y H:i:s') . ' GMT'; +header('Expires: ' . $now); +header('Last-Modified: ' . $now); +header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1 +header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1 +header('Pragma: no-cache'); // HTTP/1.0 +// Define the charset to be used +header('Content-Type: text/html; charset=' . $charset); + + +/** + * Displays the frame + */ +// Gets the font sizes to use +PMA_setFontSizes(); +?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.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; ?>"> + +<head> + <title>phpMyAdmin</title> + <base target="phpmain" /> +<?php +// Expandable/collapsible databases list is only used if there is more than one +// database to display +if ($num_dbs > 1) { + echo "\n"; + ?> +  + <script type="text/javascript" language="javascript"> +  + </script> + <noscript> + <style type="text/css"> +  + </style> + </noscript> + + <style type="text/css"> +  + </style> + <?php +} // end if ($num_dbs > 1) + +else if ($num_dbs == 1) { + echo "\n"; + ?> + <style type="text/css"> +  + </style> + <?php +} // end if ($num_dbs == 1) + +else { + echo "\n"; + ?> + <style type="text/css"> +  + </style> + <?php +} // end if ($num_dbs < 1) + +echo "\n"; +?> +</head> + +<body bgcolor="<?php echo $cfgLeftBgColor; ?>"> +  + <div id="el1Parent" class="parent" style="margin-bottom: 5px"> + <nobr><a class="item" href="main.php3?lang=<?php echo $lang; ?>&server=<?php echo $server; ?>"> + <span class="heada"><b><?php echo $strHome; ?></b></span></a></nobr> + </div> + +  +<?php +// Don't display expansible/collapsible database info if: +// 1. $server == 0 (no server selected) +// This is the case when there are multiple servers and +// '$cfgServerDefault = 0' is set. In that case, we want the welcome screen +// to appear with no database info displayed. +// 2. there is only one database available (ie either only one database exists +// or $cfgServers['only_db'] is defined and is not an array) +// In this case, the database should not be collapsible/expandable +if ($num_dbs > 1) { + + echo '<form action="leftlight.php3" method="get" name="left" target="nav">'; + echo '<input type="hidden" name="lang" value="' . $lang . '">'; + echo '<input type="hidden" name="server" value="' . $server . '">'; + echo '<select name="db" onchange="this.form.submit();">'; + $table_list = ""; + $db_name = ""; + + // Gets the tables list per database + for ($i = 0; $i < $num_dbs; $i++) { + $db = $dblist[$i]; + $j = $i + 2; + + $tables = @mysql_list_tables($db); + $num_tables = @mysql_numrows($tables); + $common_url_query = 'lang=' . $lang + . '&server=' . $server + . '&db=' . urlencode($db); + if ($num_tables) { + $num_tables_disp = $num_tables; + } else { + $num_tables_disp = '-'; + } + + // Get additional infomation about tables for tooltip + if ($cfgShowTooltip && PMA_MYSQL_INT_VERSION >= 32303 + && $num_tables) { + $tooltip = array(); + $result = mysql_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db)); + while ($tmp = mysql_fetch_array($result)) { + $tooltip[$tmp['Name']] = (!empty($tmp['Comment']) ? $tmp['Comment'] . ' ' : '') + . '(' . (isset($tmp['Rows']) ? $tmp['Rows'] : '0') . ' ' . $strRows . ')'; + } // end while + } // end if + + + // Displays the database name + echo "\n"; + + if (!empty($db_start) && $db == $db_start) { + // Displays the list of tables from the current database + for ($j = 0; $j < $num_tables; $j++) { + $table = mysql_tablename($tables, $j); + $table_list .= '<nobr><img src="images/spacer.gif" border="0" width="9" height="9" alt="" />'; + $table_list .= '<a target="phpmain" href="sql.php3?' . $common_url_query . '&table=' . urlencode($table) . '&sql_query=' . urlencode('SELECT * FROM ' . PMA_backquote($table)) . '&pos=0&goto=tbl_properties.php3">'; + $table_list .= '<img src="images/browse.gif" border="0" alt="' . $strBrowse . ': ' . $table . '" /></a>'; + $table_list .= '<bdo dir="' . $text_dir . '"> </bdo>'; + $table_list .= '<nobr><a class="tblItem" title="' . str_replace('"', '"', $tooltip[$table]) . '" target="phpmain" href="tbl_properties.php3?' . $common_url_query . '&table=' . urlencode($table) . '">' . $table . '</a></nobr><br />' . "\n"; + } // end for $j (tables list) + + if (!$table_list) { + $table_list = "no tables in this db"; + } + $selected = ' SELECTED'; + + $db_name = '<a class="item" href="db_details.php3?' . $common_url_query .'">'; + $db_name .= '<span class="heada">' . $db . '<bdo dir="' . $text_dir . '">  </bdo></span>'; + $db_name .= '<span class="headaCnt">(' . $num_tables_disp . ')</span></a></nobr>'; + + } else { + $selected = ''; + } + + if (!empty($num_tables)) { + echo "<option value=\"" . urlencode($db) . "\"$selected>$db ($num_tables)</option>"; + } else { + echo "<option value=\"" . urlencode($db) . "\"$selected>$db (-)</option>"; + } + + ?> + <?php + } // end for $t (db list) + + echo '</select>'; + echo '<input type="submit" name="Go" value="Go">'; + echo '</form>'; + + if (!$table_list) { + $table_list = "please select a db"; + } + + echo "$db_name<hr noshade>$table_list<hr noshade>"; + +} // end if ($server > 1) + +// Case where only one database has to be displayed +else if ($num_dbs == 1) { + $db = $dblist[0]; + $tables = @mysql_list_tables($db); + $num_tables = @mysql_numrows($tables); + $common_url_query = 'lang=' . $lang + . '&server=' . $server + . '&db=' . urlencode($db); + if ($num_tables) { + $num_tables_disp = $num_tables; + } else { + $num_tables_disp = '-'; + } + + // Get additional infomation about tables for tooltip + if ($cfgShowTooltip && PMA_MYSQL_INT_VERSION >= 32303 + && $num_tables) { + $tooltip = array(); + $result = mysql_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db)); + while ($tmp = mysql_fetch_array($result)) { + $tooltip[$tmp['Name']] = (!empty($tmp['Comment']) ? $tmp['Comment'] . ' ' : '') + . '(' . (isset($tmp['Rows']) ? $tmp['Rows'] : '0') . ' ' . $strRows . ')'; + } // end while + } // end if + + // Displays the database name + echo "\n"; + ?> + <div id="el2Parent" class="parent"> + <nobr><a class="item" href="db_details.php3?<?php echo $common_url_query; ?>"> + <span class="heada"><?php echo $db; ?><bdo dir="<?php echo($text_dir); ?>">  </bdo></span><span class="headaCnt">(<?php echo $num_tables_disp; ?>)</span></a></nobr> + </div> + <div id="el2Child" class="child" style="margin-bottom: 5px"> + <?php + // Displays the list of tables from the current database + for ($j = 0; $j < $num_tables; $j++) { + $table = mysql_tablename($tables, $j); + echo "\n"; + ?> + <nobr><a target="phpmain" href="sql.php3?<?php echo $common_url_query; ?>&table=<?php echo urlencode($table); ?>&sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table)); ?>&pos=0&goto=tbl_properties.php3"> + <img src="images/browse.gif" border="0" alt="<?php echo "$strBrowse: $table"; ?>" /></a><bdo dir="<?php echo $text_dir; ?>"> </bdo> + <a class="tblItem" title="<?php echo str_replace('"', '"', $tooltip[$table]); ?>" target="phpmain" href="tbl_properties.php3?<?php echo $common_url_query; ?>&table=<?php echo urlencode($table); ?>"> + <?php echo $table; ?></a></nobr><br /> + <?php + } // end for $j (tables list) + echo "\n"; + ?> + </div> + <?php +} // end if ($num_dbs == 1) +else { + echo "\n"; + echo '<p>' . $strNoDatabases . '</p>'; +} // end if ($num_dbs == 0) +echo "\n"; +?> + +</body> +</html> + +<?php +/** + * Close MySql connections + */ +if (isset($dbh) && $dbh) { + @mysql_close($dbh); +} +if (isset($userlink) && $userlink) { + @mysql_close($userlink); +} + + +/** + * Sends bufferized data + */ +if (isset($cfgOBGzip) && $cfgOBGzip + && isset($ob_mode) && $ob_mode) { + PMA_outBufferPost($ob_mode); +} +?> diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index 20bb9241d..7db14aa65 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -807,10 +807,17 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){ */ function PMA_showMessage($message) { + + if (isset($GLOBALS['cfgLeftFrameLight']) && $GLOBALS['cfgLeftFrameLight']) { + $leftFrame = "leftlight.php3"; + } else { + $leftFrame = "left.php3"; + } + // Reloads the navigation frame via JavaScript if required if (isset($GLOBALS['reload']) && $GLOBALS['reload']) { echo "\n"; - $reload_url = './left.php3' + $reload_url = './' . $leftFrame . '?lang=' . $GLOBALS['lang'] . '&server=' . $GLOBALS['server'] . ((!empty($GLOBALS['db'])) ? '&db=' . urlencode($GLOBALS['db']) : ''); diff --git a/main.php3 b/main.php3 index 6bbfd5abb..61614e387 100755 --- a/main.php3 +++ b/main.php3 @@ -25,11 +25,20 @@ if (isset($message)) { } else if (isset($reload) && $reload) { // Reloads the navigation frame via JavaScript if required + + // Select the file to be displayed + + if ($cfgLeftFrameLight) { + $leftFrame = "leftlight.php3"; + } else { + $leftFrame = "left.php3"; + } + echo "\n"; ?> <script type="text/javascript" language="javascript1.2">  </script> <?php