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

Factor out tree walking into separate method to share the code

Browse Source 
Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2014-05-10 09:40:22 +02:00
parent e82c53f93d
commit e320d423e2
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
libraries/navigation/NavigationTree.class.php
View File

@ -796,6 +796,31 @@ class PMA_NavigationTree
return $retval;
}
/**
* Finds whether given tree matches this tree.
*
* @param array $tree Tree to check
* @param string $attribute Attribute to walk
*
* @return boolean
*/
private function _findTreeMatch($tree, $attribute)
{
foreach ($tree as $path) {
$match = true;
foreach ($paths[$attribute] as $key => $part) {
if (! isset($path[$key]) || $part != $path[$key]) {
$match = false;
break;
}
}
if ($match) {
break;
}
}
return $match;
}
/**
* Renders a single node or a branch of the tree
*
@ -849,36 +874,13 @@ class PMA_NavigationTree
$retval .= "<b></b>";
}
$icon = PMA_Util::getImage('b_plus.png', __('Expand/Collapse'));
foreach ($this->_aPath as $path) {
$match = 1;
foreach ($paths['aPath_clean'] as $key => $part) {
if (! isset($path[$key]) || $part != $path[$key]) {
$match = 0;
break;
}
}
if ($match) {
if (! $node->is_group) {
$icon = PMA_Util::getImage(
'b_minus.png'
);
}
break;
}
}
foreach ($this->_vPath as $path) {
$match = 1;
foreach ($paths['vPath_clean'] as $key => $part) {
if ((! isset($path[$key]) || $part != $path[$key])) {
$match = 0;
break;
}
}
if ($match) {
$icon = PMA_Util::getImage('b_minus.png');
break;
}
$match = $this->_findTreeMatch($this->_aPath, 'aPath_clean');
$match |= $this->_findTreeMatch($this->_vPath, 'vPath_clean');
if ($match && ! $node->is_group) {
$icon = PMA_Util::getImage(
'b_minus.png'
);
}
$retval .= '<a class="' . $note->getCssClasses($match) . '"';