diff --git a/plugins/dynamix/include/Browse.php b/plugins/dynamix/include/Browse.php index 2015bbf25..666ef5048 100644 --- a/plugins/dynamix/include/Browse.php +++ b/plugins/dynamix/include/Browse.php @@ -19,11 +19,9 @@ function parent_link() { return ($dir && dirname($dir)!='/' && dirname($dir)!='/mnt' && dirname($dir)!='/mnt/user') ? "Parent Directory..." : ""; } - function trim_slash($url){ return preg_replace('/\/\/+/','/',$url); } - extract(parse_plugin_cfg('dynamix',true)); $disks = parse_ini_file('state/disks.ini',true); $dir = $_GET['dir']; @@ -47,12 +45,12 @@ foreach ($file as $row) { $info = pathinfo($attr[1]); $disk = $user ? $set[++$i] : $fix; $rows = explode(',',$disk); - $type = preg_replace('/\d+/','',$rows[0]); + $tag = preg_replace('/\d+/','',$rows[0]); $show = false; $luks = ''; - foreach ($rows as $row) $show |= strpos($disks[$type.str_replace($type,'',$row)]['fsType'],'luks:')!==false; + foreach ($rows as $row) $show |= strpos($disks[$tag.str_replace($tag,'',$row)]['fsType'],'luks:')!==false; if ($show) foreach ($rows as $row) { - switch ($disks[$type.str_replace($type,'',$row)]['luksState']) { + switch ($disks[$tag.str_replace($tag,'',$row)]['luksState']) { case 0: $luks .= ""; break; case 1: $luks .= ""; break; case 2: $luks .= ""; break; @@ -86,13 +84,13 @@ foreach ($list as $row) { $dirs++; } else { if ($files==0 && $dirs>0) echo ""; - $type = strpos($row['disk'],',')===false ? '' : 'warning'; + $tag = strpos($row['disk'],',')===false ? '' : 'warning'; echo ""; - echo "
"; - echo "".htmlspecialchars($row['name']).""; - echo "".my_scale($row['size'],$unit)." $unit"; - echo "".my_time($row['time'],"%F {$display['time']}").""; - echo "{$row['disk']}"; + echo "
"; + echo "".htmlspecialchars($row['name']).""; + echo "".my_scale($row['size'],$unit)." $unit"; + echo "".my_time($row['time'],"%F {$display['time']}").""; + echo "{$row['disk']}"; echo ""; $files++; $total+=$row['size'];