lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qual: removed useless code

Browse Source
This commit is contained in:
Laurent Destailleur 2012-03-21 21:30:08 +01:00
parent 3ef88384b8
commit fb6f3504e2
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
htdocs/core/lib/treeview.lib.php
View File

@ -72,68 +72,70 @@ function is_in_subtree($fulltree,$parentid,$childid)
/** /**
* Show picto of a tree view * Show indent and picto of a tree line. Return array with information of line.
* *
* @param array &$fulltree Array of entries in correct order * @param array &$fulltree Array of entries in correct order
* @param string $key Key of value to show picto * @param string $key Key of value to show picto
* @param int $selected Selected value * @param int $silent Do not output indent and picto, returns only value
* @return array (0 or 1 if at least one of this level after, 0 or 1 if at least one of higher level after) * @return array array(0 or 1 if at least one of this level after, 0 or 1 if at least one of higher level after, nbofdirinsub, nbofdocinsub)
*/ */
function tree_showpad(&$fulltree,$key,$selected=0) function tree_showpad(&$fulltree,$key,$silent=0)
{ {
$pos=1; $pos=1;
// Loop on each pos, because we will output an img for each pos // Loop on each pos, because we will output an img for each pos
while ($pos <= $fulltree[$key]['level'] && $fulltree[$key]['level'] > 0) while ($pos <= $fulltree[$key]['level'] && $fulltree[$key]['level'] > 0)
{ {
// Process picto for column $pos // Process for column $pos
$atleastonofthislevelafter=0; $atleastoneofthislevelafter=0;
$nbofhigherlevelafter=0;
$nbofdirinsub=0; $nbofdirinsub=0;
$nbofdocinsub=0; $nbofdocinsub=0;
$found=0; $found=0;
//print 'x'.$key; //print 'x'.$key;
foreach($fulltree as $key2 => $val2) foreach($fulltree as $key2 => $val2)
{ {
//print "x".$pos." ".$key2." ".$found." ".$fulltree[$key2]['level'];
if ($found == 1) // We are after the entry to show if ($found == 1) // We are after the entry to show
{ {
if ($fulltree[$key2]['level'] > $pos) if ($fulltree[$key2]['level'] > $pos)
{ {
$nbofdirinsub++; $nbofdirinsub++;
$nbofdocinsub+=$fulltree[$key2]['cachenbofdoc']; $nbofdocinsub+=$fulltree[$key2]['cachenbofdoc'];
$nbofhigherlevelafter++;
} }
if ($fulltree[$key2]['level'] == $pos) if ($fulltree[$key2]['level'] == $pos)
{ {
$atleastonofthislevelafter=1; $atleastoneofthislevelafter=1;
} }
if ($fulltree[$key2]['level'] <= $pos) if ($fulltree[$key2]['level'] <= $pos)
{ {
break; break;
} }
} }
if ($key2 == $key) if ($key2 == $key) // We found ourself, so now every lower level will be counted
{ {
$found=1; $found=1;
} }
} }
//print $atleastonofthislevelafter; //print $atleastoneofthislevelafter;
if ($atleastonofthislevelafter) if (! $silent)
{ {
if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branch.gif'); if ($atleastoneofthislevelafter)
else print img_picto_common('','treemenu/line.gif'); {
} if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branch.gif');
else else print img_picto_common('','treemenu/line.gif');
{ }
if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branchbottom.gif'); else
else print img_picto_common('','treemenu/linebottom.gif'); {
if ($fulltree[$key]['level'] == $pos) print img_picto_common('','treemenu/branchbottom.gif');
else print img_picto_common('','treemenu/linebottom.gif');
}
} }
$pos++; $pos++;
} }
return array($atleastonofthislevelafter,$nbofhigherlevelafter,$nbofdirinsub,$nbofdocinsub); return array($atleastoneofthislevelafter,$nbofdirinsub,$nbofdocinsub);
} }
@ -142,7 +144,7 @@ function tree_showpad(&$fulltree,$key,$selected=0)
/** /**
* Show an element with correct offset * Show an element with correct offset
* *
* @param array $tab Array of all elements * @param array $tab Array of all elements
* @param int $rang Level of offset * @param int $rang Level of offset
* @return void * @return void
@ -215,7 +217,7 @@ function tree_showline($tab,$rang)
/** /**
* Recursive function to output menu tree * Recursive function to output menu tree
* *
* @param array $tab Array of elements * @param array $tab Array of elements
* @param int $pere Id of parent * @param int $pere Id of parent
* @param int $rang Level of element * @param int $rang Level of element