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

patch #1246245, tree in databases selector

Browse Source
This commit is contained in:
Marc Delisle
2005-08-04 14:47:31 +00:00
parent a3c6610399
commit 7b1d7b42cc
6 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -19,6 +19,10 @@ $Source$
thanks to Sebastian Mendel
* Documentation.html: patch #1169308, FAQ 1.17a improved,
thanks to Isaac Bennetch
* queryframe.php, footer.inc.php, config.inc.php, Documentation.html,
libraries/common.lib.php, /config_import.lib.php:
patch #1246245, tree subgroups for databases (in selector),
thanks to Edward Rudd - urkle
2005-08-02 Marc Delisle <lem9@users.sourceforge.net>
* server_privileges.php: patch #1249363, remove unneeded wordwrap(),

2
config.inc.php
View File

@@ -228,6 +228,8 @@ $cfg['AllowArbitraryServer'] = FALSE; // allow login to any user entered ser
// Left frame setup
$cfg['LeftFrameLight'] = TRUE; // use a select-based menu and display only the
// current tables in the left frame.
$cfg['LeftFrameDBTree'] = TRUE; // turn the select-based light menu into a tree
$cfg['LeftFrameDBSeparator'] = '_'; // the separator to sub-tree the select-based light menu tree
$cfg['LeftFrameTableSeparator']= '__'; // Which string will be used to generate table prefixes
// to split/nest tables into multiple categories
$cfg['LeftFrameTableLevel'] = '1'; // How many sublevels should be displayed when splitting

3
footer.inc.php
View File

@@ -58,7 +58,8 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
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 = "<?php echo addslashes($db) . $num_tables_disp; ?>";
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);

2
libraries/common.lib.php
View File

@@ -145,7 +145,7 @@ if (isset($cfg['FileRevision'])) {
} else {
$cfg['FileRevision'] = array(1, 1);
}
if ($cfg['FileRevision'][0] < 2 || ($cfg['FileRevision'][0] == 2 && $cfg['FileRevision'][1] < 61)) {
if ($cfg['FileRevision'][0] < 2 || ($cfg['FileRevision'][0] == 2 && $cfg['FileRevision'][1] < 62)) {
require_once('./libraries/config_import.lib.php');
}

8
libraries/config_import.lib.php
View File

@@ -308,6 +308,14 @@ if (!isset($cfg['LeftFrameLight'])) {
}
}
if (!isset($cfg['LeftFrameDBTree'])) {
$cfg['LeftFrameDBTree'] = TRUE;
}
if (!isset($cfg['LeftFrameDBSeparator'])) {
$cfg['LeftFrameDBSeparator'] = '_';
}
if (!isset($cfg['LeftFrameTableSeparator'])) {
$cfg['LeftFrameTableSeparator'] = '__';
}

22
queryframe.php
View File

@@ -300,7 +300,7 @@ if ($num_dbs > 1) {
$i++;
}
}
$parent = '';
// Gets the tables list per database
for ($i = 0; $i < $num_dbs; $i++) {
$db = $dblist[$i];
@@ -360,6 +360,26 @@ if ($num_dbs > 1) {
$selected = '';
} // end if... else...
if ($cfg['LeftFrameDBTree']) {
$parts = explode($cfg['LeftFrameDBSeparator'],$db,2);
if (count($parts) == 1) {
if (!empty($parent)) {
echo ' '
. '</optgroup>'."\n";
$parent = '';
}
} else {
if ($parent != $parts[0]) {
if (!empty($parent)) {
echo ' '
. '</optgroup>'."\n";
}
echo ' '
. '<optgroup label="'.$parts[0].'">'."\n";
$parent = $parts[0];
}
}
}
if (!empty($num_tables)) {
echo ' '
. '<option value="' . htmlspecialchars($db) . '"' . $selected . '>'