%s
"),$filename); - - if ($perm->have_perm_area_action('style', $sActionDelete)) - { - $tpl->set('d', 'DELETE', '
');
- }else
- {
- $tpl->set('d', 'DELETE', '');
+ $delDescr = sprintf(i18n("Do you really want to delete the following file:%s
"), $filename); + + if ($perm->have_perm_area_action('style', $sActionDelete)) { + $tpl->set('d', 'DELETE', '
');
+ } else {
+ $tpl->set('d', 'DELETE', '');
}
-
+
if (stripslashes($_REQUEST['file']) == $filename) {
$tpl->set('d', 'ID', 'id="marked"');
} else {
$tpl->set('d', 'ID', '');
}
-
+
$tpl->next();
-
- }
+ }
}
-}else
-{
+} else {
if ((int) $client > 0) {
- $notification->displayNotification("error", i18n("Directory is not existing or readable!")."$path"); + $notification->displayNotification("error", i18n("Directory is not existing or readable!") . "
$path"); } } $tpl->generate($cfg['path']['templates'] . $cfg['templates']['files_overview']); - ?> \ No newline at end of file diff --git a/conlite/includes/include.upl_dirs_overview.php b/conlite/includes/include.upl_dirs_overview.php index d5c481f..d9535ee 100644 --- a/conlite/includes/include.upl_dirs_overview.php +++ b/conlite/includes/include.upl_dirs_overview.php @@ -1,4 +1,5 @@ 0) { - #if there is no client selected, display empty page - $oPage = new cPage; - $oPage->render(); - return; + #if there is no client selected, display empty page + $oPage = new cPage; + $oPage->render(); + return; } -function getExpandCollapseButton($item) -{ - global $sess, $PHP_SELF, $frame, $area, $appendparameters; - $selflink = "main.php"; +function getExpandCollapseButton($item) { + global $sess, $PHP_SELF, $frame, $area, $appendparameters; + $selflink = "main.php"; - if (count($item->subitems) > 0) - { - if ($item->collapsed == true) - { - $expandlink = $sess->url($selflink."?area=$area&frame=$frame&appendparameters=$appendparameters&expand=".$item->id); - return ('
';
- } else
- {
- return '
';
- }
- }
+ if (count($item->subitems) > 0) {
+ if ($item->collapsed == true) {
+ $expandlink = $sess->url($selflink . "?area=$area&frame=$frame&appendparameters=$appendparameters&expand=" . $item->id);
+ return ('';
+ } else {
+ return '';
+ }
+ }
}
#################
@@ -76,44 +69,38 @@ function getExpandCollapseButton($item)
#################
#Fixxed by Timo Trautmann double database entries also called by action upl_mkdir
// Use remembered path from upl_last_path (from session)
-if (!isset($path) && $sess->is_registered("upl_last_path"))
-{
- $path = $upl_last_path;
+if (!isset($path) && $sess->is_registered("upl_last_path")) {
+ $path = $upl_last_path;
}
-$appendparameters = $_REQUEST["appendparameters"];
+$appendparameters = $_REQUEST["appendparameters"];
-if (!isset ($action))
- $action = "";
+if (!isset($action))
+ $action = "";
if ($tmp_area == "") {
- $tmp_area = $area; // $tmp_area used at two places for unknown reasons...
+ $tmp_area = $area; // $tmp_area used at two places for unknown reasons...
}
-$uplexpandedList = unserialize($currentuser->getUserProperty("system", "upl_expandstate"));
-$upldbfsexpandedList = unserialize($currentuser->getUserProperty("system", "upl_dbfs_expandstate"));
+$uplexpandedList = unserialize($currentuser->getUserProperty("system", "upl_expandstate"));
+$upldbfsexpandedList = unserialize($currentuser->getUserProperty("system", "upl_dbfs_expandstate"));
-if (!is_array($uplexpandedList))
-{
- $uplexpandedList = array ();
+if (!is_array($uplexpandedList)) {
+ $uplexpandedList = array();
}
-if (!is_array($upldbfsexpandedList))
-{
- $upldbfsexpandedList = array ();
+if (!is_array($upldbfsexpandedList)) {
+ $upldbfsexpandedList = array();
}
-if ($action == "upl_renamedir")
-{
- if ($perm->have_perm_area_action("upl", "upl_renamedir"))
- {
- uplRenameDirectory($oldname, $newname, $parent);
- $path = $cfgClient[$client]['upl']['path'].$parent.$newname."/";
- if (in_array($cfgClient[$client]['upl']['path'].$parent.$oldname."/", $uplexpandedList))
- {
- $uplexpandedList[] = $cfgClient[$client]['upl']['path'].$parent.$newname."/";
- }
- }
+if ($action == "upl_renamedir") {
+ if ($perm->have_perm_area_action("upl", "upl_renamedir")) {
+ uplRenameDirectory($oldname, $newname, $parent);
+ $path = $cfgClient[$client]['upl']['path'] . $parent . $newname . "/";
+ if (in_array($cfgClient[$client]['upl']['path'] . $parent . $oldname . "/", $uplexpandedList)) {
+ $uplexpandedList[] = $cfgClient[$client]['upl']['path'] . $parent . $newname . "/";
+ }
+ }
}
###################
@@ -121,45 +108,35 @@ if ($action == "upl_renamedir")
###################
$dbfs = new DBFSCollection;
-if ($action == "upl_delete")
-{
- if (is_dbfs($path))
- {
- $dbfs->remove($path."/.");
- } else
- {
- /* Check for files */
- if (uplHasFiles($path))
- {
- $failedFiles = array ();
+if ($action == "upl_delete") {
+ if (is_dbfs($path)) {
+ $dbfs->remove($path . "/.");
+ } else {
+ /* Check for files */
+ if (uplHasFiles($path)) {
+ $failedFiles = array();
- $directory = opendir($cfgClient[$client]["upl"]["path"].$path);
- while (false !== ($dir_entry = readdir($directory)))
- {
- if ($dir_entry != "." && $dir_entry != "..")
- {
- $res = @ unlink($cfgClient[$client]["upl"]["path"].$path.$dir_entry);
+ $directory = opendir($cfgClient[$client]["upl"]["path"] . $path);
+ while (false !== ($dir_entry = readdir($directory))) {
+ if ($dir_entry != "." && $dir_entry != "..") {
+ $res = @ unlink($cfgClient[$client]["upl"]["path"] . $path . $dir_entry);
- if ($res == false)
- {
- $failedFiles[] = $dir_entry;
- }
- }
- }
- }
+ if ($res == false) {
+ $failedFiles[] = $dir_entry;
+ }
+ }
+ }
+ }
- if (count($failedFiles) > 0)
- {
- $notification->displayNotification("warning", i18n("Failed to delete the following files:")."".implode("
", $failedFiles)); - } else - { - $res = @ rmdir($cfgClient[$client]['upl']['path'].$path); - if ($res == false) - { - $notification->displayNotification("warning", sprintf(i18n("Failed to remove directory %s"), $path)); - } - } - } + if (count($failedFiles) > 0) { + $notification->displayNotification("warning", i18n("Failed to delete the following files:") . "
" . implode("
", $failedFiles)); + } else { + $res = @ rmdir($cfgClient[$client]['upl']['path'] . $path); + if ($res == false) { + $notification->displayNotification("warning", sprintf(i18n("Failed to remove directory %s"), $path)); + } + } + } } $tpl->reset(); @@ -167,28 +144,28 @@ $tpl->reset(); $file = 'Upload'; $pathstring = ''; /* -$rootTreeItem = new TreeItem; -$rootTreeItem->custom["level"] = 0; -$rootTreeItem->name = i18n("Upload directory"); -*/ -$user_upload_path = getEffectiveSetting("upload","userpath"); + $rootTreeItem = new TreeItem; + $rootTreeItem->custom["level"] = 0; + $rootTreeItem->name = i18n("Upload directory"); + */ +$user_upload_path = getEffectiveSetting("upload", "userpath"); -if (is_string($user_upload_path) AND !empty($user_upload_path)) { - trim($user_upload_path); - $file = $user_upload_path; - if (substr($user_upload_path, -1) != "/") { - $user_upload_path .= "/"; +if (is_string($user_upload_path) AND!empty($user_upload_path)) { + trim($user_upload_path); + $file = $user_upload_path; + if (substr($user_upload_path, -1) != "/") { + $user_upload_path .= "/"; } - $pathstring = $user_upload_path; - if (substr($cfgClient[$client]["upl"]["path"], -1) != "/" AND substr($user_upload_path, 0, 1) == "/") { - $user_upload_path = substr($user_upload_path, 1); + $pathstring = $user_upload_path; + if (substr($cfgClient[$client]["upl"]["path"], -1) != "/" AND substr($user_upload_path, 0, 1) == "/") { + $user_upload_path = substr($user_upload_path, 1); } } $rootTreeItem = new TreeItem; $rootTreeItem->custom["level"] = 0; $rootTreeItem->name = i18n("Upload directory"); -$aInvalidDirectories = uplRecursiveDirectoryList($cfgClient[$client]["upl"]["path"].$user_upload_path, $rootTreeItem, 2); +$aInvalidDirectories = uplRecursiveDirectoryList($cfgClient[$client]["upl"]["path"] . $user_upload_path, $rootTreeItem, 2); if (count($aInvalidDirectories) > 0) { $sWarningInfo = i18n('The following directories contains invalid characters and were ignored: '); @@ -196,9 +173,9 @@ if (count($aInvalidDirectories) > 0) { $sFiles = implode(', ', $aInvalidDirectories); $sRenameString = i18n('Please click here in order to rename automatically.'); $sRenameHref = $sess->url("main.php?area=$area&frame=$frame&force_rename=true"); - $sRemameLink = ''.$sRenameString.''; - $sNotificationString = $sWarningInfo.$sSeperator.$sFiles.$sSeperator.$sSeperator.$sRemameLink; - + $sRemameLink = '' . $sRenameString . ''; + $sNotificationString = $sWarningInfo . $sSeperator . $sFiles . $sSeperator . $sSeperator . $sRemameLink; + $sErrorString = $notification->returnNotification("warning", $sNotificationString, 1); $tpl->set('s', 'WARNING', $sErrorString); } else { @@ -206,139 +183,114 @@ if (count($aInvalidDirectories) > 0) { } /* Mark all items in the expandedList as expanded */ -foreach ($uplexpandedList as $key => $value) -{ - $rootTreeItem->markExpanded($value); +foreach ($uplexpandedList as $key => $value) { + $rootTreeItem->markExpanded($value); } /* Collapse and expand the tree */ -if (is_string($collapse)) -{ - $rootTreeItem->markCollapsed($collapse); +if (is_string($collapse)) { + $rootTreeItem->markCollapsed($collapse); } -if (is_string($expand)) -{ - $rootTreeItem->markExpanded($expand); +if (is_string($expand)) { + $rootTreeItem->markExpanded($expand); } -$uplexpandedList = Array (); +$uplexpandedList = Array(); $rootTreeItem->getExpandedList($uplexpandedList); $currentuser->setUserProperty("system", "upl_expandstate", serialize($uplexpandedList)); -$objects = Array (); +$objects = Array(); $rootTreeItem->traverse($objects); -unset ($objects[0]); +unset($objects[0]); $bgcolor = (is_int($tpl->dyn_cnt / 2)) ? $cfg["color"]["table_light"] : $cfg["color"]["table_dark"]; -if ($appendparameters == "filebrowser") -{ - $mtree = new cWidgetTreeView("b58f0ae3-8d4e-4bb3-a754-5f0628863364"); - $cattree = conFetchCategoryTree(); - $marray = array (); +if ($appendparameters == "filebrowser") { + $mtree = new cWidgetTreeView("b58f0ae3-8d4e-4bb3-a754-5f0628863364"); + $cattree = conFetchCategoryTree(); + $marray = array(); - foreach ($cattree as $key => $catitem) - { - $no_start = true; - $no_online = true; - $no_start = !strHasStartArticle($catitem["idcat"], $lang); - - $no_online = !$catitem["visible"]; - - if ($catitem["visible"] == 1) - { - if ($catitem["public"] == 0) - { - if ($no_start || $no_online) - { - # Error found - $tmp_img = "folder_on_error_locked.gif"; - } else - { - # No error found - $tmp_img = "folder_on_locked.gif"; - } - } else - { - # Category is public - if ($no_start || $no_online) - { - # Error found - $tmp_img = "folder_on_error.gif"; - } else - { - # No error found - $tmp_img = "folder_on.gif"; - } - } - } else - { - # Category is offline - if ($catitem['public'] == 0) - { - # Category is locked - if ($no_start || $no_online) - { - # Error found - $tmp_img = "folder_off_error_locked.gif"; + foreach ($cattree as $key => $catitem) { + $no_start = true; + $no_online = true; + $no_start = !strHasStartArticle($catitem["idcat"], $lang); - } else - { - # No error found - $tmp_img = "folder_off_locked.gif"; + $no_online = !$catitem["visible"]; - } + if ($catitem["visible"] == 1) { + if ($catitem["public"] == 0) { + if ($no_start || $no_online) { + # Error found + $tmp_img = "folder_on_error_locked.gif"; + } else { + # No error found + $tmp_img = "folder_on_locked.gif"; + } + } else { + # Category is public + if ($no_start || $no_online) { + # Error found + $tmp_img = "folder_on_error.gif"; + } else { + # No error found + $tmp_img = "folder_on.gif"; + } + } + } else { + # Category is offline + if ($catitem['public'] == 0) { + # Category is locked + if ($no_start || $no_online) { + # Error found + $tmp_img = "folder_off_error_locked.gif"; + } else { + # No error found + $tmp_img = "folder_off_locked.gif"; + } + } else { + # Category is public + if ($no_start || $no_online) { + # Error found + $tmp_img = "folder_off_error.gif"; + } else { + # No error found + $tmp_img = "folder_off.gif"; + } + } + } - } else - { - # Category is public - if ($no_start || $no_online) - { - # Error found - $tmp_img = "folder_off_error.gif"; + $icon = "./images/" . $tmp_img; - } else - { - # No error found - $tmp_img = "folder_off.gif"; + $idcat = $catitem["idcat"]; - } - } - } - - $icon = "./images/".$tmp_img; + $name = ' ' . $catitem["name"] . ''; + $marray[] = array("id" => $catitem["idcat"], "name" => $name, "level" => $catitem["level"], "attributes" => array("icon" => $icon)); + } - $idcat = $catitem["idcat"]; - - $name = ' '.$catitem["name"].''; - $marray[] = array ("id" => $catitem["idcat"], "name" => $name, "level" => $catitem["level"], "attributes" => array ("icon" => $icon)); - } + $mtree->setTreeName(i18n("Categories")); + $mtree->setIcon("images/grid_folder.gif"); + $mtree->importTable($marray); - $mtree->setTreeName(i18n("Categories")); - $mtree->setIcon("images/grid_folder.gif"); - $mtree->importTable($marray); + $baselink = new cHTMLLink; + $baselink->setCLink($area, $frame, ""); + $baselink->setCustom("appendparameters", $appendparameters); - $baselink = new cHTMLLink; - $baselink->setCLink($area, $frame, ""); - $baselink->setCustom("appendparameters", $appendparameters); + $mtree->setBaseLink($baselink); + $mtree->setBackgroundMode(TREEVIEW_BACKGROUND_SHADED); + $mtree->setMouseoverMode(TREEVIEW_MOUSEOVER_NONE); + $mtree->setCollapsed($collapsed); + $mtree->processParameters(); - $mtree->setBaseLink($baselink); - $mtree->setBackgroundMode(TREEVIEW_BACKGROUND_SHADED); - $mtree->setMouseoverMode(TREEVIEW_MOUSEOVER_NONE); - $mtree->setCollapsed($collapsed); - $mtree->processParameters(); + $collapsed = array(); + $mtree->getCollapsedList($collapsed); - $collapsed = array (); - $mtree->getCollapsedList($collapsed); - - $tpl->set('s', 'CATBROWSER', $mtree->render()); - $tpl->set('s', 'APPENDPARAMETERS', 'url += \'&appendparameters='.$appendparameters.'\''); -} else -{ - $tpl->set('s', 'CATBROWSER', ''); - $tpl->set('s', 'APPENDPARAMETERS', 'url += \'&appendparameters='.$appendparameters.'\''); + $tpl->set('s', 'CATBROWSER', $mtree->render()); + $tpl->set('s', 'APPENDPARAMETERS', 'url += \'&appendparameters=' . $appendparameters . '\''); +} else { + $tpl->set('s', 'CATBROWSER', ''); + $tpl->set('s', 'APPENDPARAMETERS', 'url += \'&appendparameters=' . $appendparameters . '\''); } chdir($cfg['path']['contenido']); @@ -347,9 +299,9 @@ $tpl->set('s', 'SID', $sess->id); # create javascript multilink $tmp_mstr = '%s'; -$mstr = sprintf($tmp_mstr, 'right_top', $sess->url("main.php?area=$area&frame=3&path=$pathstring&appendparameters=$appendparameters"), - 'right_bottom', $sess->url("main.php?area=$area&frame=4&path=$pathstring&appendparameters=$appendparameters"), - '
'.$file);
+$mstr = sprintf($tmp_mstr, 'right_top', $sess->url("main.php?area=$area&frame=3&path=$pathstring&appendparameters=$appendparameters"),
+ 'right_bottom', $sess->url("main.php?area=$area&frame=4&path=$pathstring&appendparameters=$appendparameters"),
+ '' . $file);
$tpl->set('d', 'PATH', $pathstring);
$tpl->set('d', 'BGCOLOR', $bgcolor);
@@ -360,86 +312,74 @@ $tpl->set('d', 'DELETEBUTTON', '');
$tpl->set('d', 'COLLAPSE', '');
$tpl->next();
+if (is_array($objects)) {
+ foreach ($objects as $a_file) {
+ $file = $a_file->name;
+ $depth = $a_file->custom["level"] - 1;
+ $pathstring = str_replace($cfgClient[$client]['upl']['path'], "", $a_file->id);
+ $a_file->collapsed_icon = "images/grid_expand.gif";
+ $a_file->expanded_icon = "images/grid_collapse.gif";
+ $dlevels[$depth] = $a_file->custom["lastitem"];
+ $imgcollapse = getExpandCollapseButton($a_file);
+ $fileurl = rawurlencode($path . $file . '/');
+ $pathurl = rawurlencode($path);
-if (is_array($objects))
-{
- foreach ($objects as $a_file)
- {
- $file = $a_file->name;
- $depth = $a_file->custom["level"] - 1;
- $pathstring = str_replace($cfgClient[$client]['upl']['path'], "", $a_file->id);
- $a_file->collapsed_icon = "images/grid_expand.gif";
- $a_file->expanded_icon = "images/grid_collapse.gif";
- $dlevels[$depth] = $a_file->custom["lastitem"];
- $imgcollapse = getExpandCollapseButton($a_file);
- $fileurl = rawurlencode($path.$file.'/');
- $pathurl = rawurlencode($path);
+ # Indent for every level
+ $cnt = $depth;
+ $indent = 18;
- # Indent for every level
- $cnt = $depth;
- $indent = 18;
+ for ($i = 0; $i < $cnt; $i++) {
+ $indent += 18;
+ }
- for ($i = 0; $i < $cnt; $i ++)
- {
- $indent += 18;
- }
+ # create javascript multilink # -> better create meaningful comments
+ $tmp_mstr = '%s';
+ $mstr = sprintf(
+ $tmp_mstr,
+ 'right_bottom', $sess->url("main.php?area=$area&frame=4&path=$pathstring&appendparameters=$appendparameters"),
+ 'right_top', $sess->url("main.php?area=$area&frame=3&path=$pathstring&appendparameters=$appendparameters"),
+ '
' . $file);
- # create javascript multilink # -> better create meaningful comments
- $tmp_mstr = '%s';
- $mstr = sprintf(
- $tmp_mstr,
- 'right_bottom', $sess->url("main.php?area=$area&frame=4&path=$pathstring&appendparameters=$appendparameters"),
- 'right_top', $sess->url("main.php?area=$area&frame=3&path=$pathstring&appendparameters=$appendparameters"),
- ''.$file);
-
- $hasFiles = uplHasFiles($pathstring);
- $hasSubdirs = uplHasSubdirs($pathstring);
+ $hasFiles = uplHasFiles($pathstring);
+ $hasSubdirs = uplHasSubdirs($pathstring);
- if ((!$hasSubdirs) && (!$hasFiles) && $perm->have_perm_area_action($tmp_area, "upl_rmdir"))
- {
- $deletebutton = ''.$file.'\', \'deleteDirectory(\\\''.$pathstring.'\\\')\')">';
- } else
- {
- if ($hasFiles)
- {
- $message = i18n("Directory contains files");
- } else
- {
- $message = i18n("Permission denied");
- }
+ if ((!$hasSubdirs) && (!$hasFiles) && $perm->have_perm_area_action($tmp_area, "upl_rmdir")) {
+ $deletebutton = '' . $file . '\', \'deleteDirectory(\\\'' . $pathstring . '\\\')\')">';
+ } else {
+ if ($hasFiles) {
+ $message = i18n("Directory contains files");
+ } else {
+ $message = i18n("Permission denied");
+ }
- $deletebutton = "![\"".$message."\"](\"".$cfg["path"]["images"]."delete_inact.gif\" "\\"\".$message.\"\\"")
";
- }
+ $deletebutton = "
';
- } else
- {
- $gline .= '';
- }
- }
+ for ($i = 1; $i < $depth; $i++) {
+ if ($dlevels[$i] == false && $i != 0) {
+ $gline .= '';
+ } else {
+ $gline .= '';
+ }
+ }
- $parent = str_replace($cfgClient[$client]['upl']['path'], "", $a_file->custom["parent"]);
+ $parent = str_replace($cfgClient[$client]['upl']['path'], "", $a_file->custom["parent"]);
- $tpl->set('d', 'DIRNAME', $mstr);
- $tpl->set('d', 'EDITBUTTON', '');
- $tpl->set('d', 'DELETEBUTTON', $deletebutton);
+ $tpl->set('d', 'DIRNAME', $mstr);
+ $tpl->set('d', 'EDITBUTTON', '');
+ $tpl->set('d', 'DELETEBUTTON', $deletebutton);
- $tpl->set('d', 'COLLAPSE', $gline.$imgcollapse);
- $tpl->next();
-
- }
+ $tpl->set('d', 'COLLAPSE', $gline . $imgcollapse);
+ $tpl->next();
+ }
}
$tpl->set('d', 'DELETEBUTTON', ' ');
@@ -459,38 +399,35 @@ $rootTreeItem->custom["level"] = 0;
uplRecursiveDBDirectoryList("", $rootTreeItem, 2);
/* Mark all items in the expandedList as expanded */
-foreach ($upldbfsexpandedList as $key => $value)
-{
- $rootTreeItem->markExpanded($value);
+foreach ($upldbfsexpandedList as $key => $value) {
+ $rootTreeItem->markExpanded($value);
}
/* Collapse and expand the tree */
-if (is_string($collapse))
-{
- $rootTreeItem->markCollapsed($collapse);
+if (is_string($collapse)) {
+ $rootTreeItem->markCollapsed($collapse);
}
-if (is_string($expand))
-{
- $rootTreeItem->markExpanded($expand);
+if (is_string($expand)) {
+ $rootTreeItem->markExpanded($expand);
}
-$upldbfsexpandedList = Array ();
+$upldbfsexpandedList = Array();
$rootTreeItem->getExpandedList($upldbfsexpandedList);
$currentuser->setUserProperty("system", "upl_dbfs_expandstate", serialize($upldbfsexpandedList));
-$objects = Array ();
+$objects = Array();
$rootTreeItem->traverse($objects);
-unset ($objects[0]);
+unset($objects[0]);
$bgcolor = (is_int($tpl->dyn_cnt / 2)) ? $cfg["color"]["table_light"] : $cfg["color"]["table_dark"];
$tmp_mstr = '%s';
-$mstr = sprintf($tmp_mstr, 'right_top', $sess->url("main.php?area=$area&frame=3&path=$pathstring&appendparameters=$appendparameters"),
- 'right_bottom', $sess->url("main.php?area=$area&frame=4&path=$pathstring&appendparameters=$appendparameters"),
- ''.$file);
+$mstr = sprintf($tmp_mstr, 'right_top', $sess->url("main.php?area=$area&frame=3&path=$pathstring&appendparameters=$appendparameters"),
+ 'right_bottom', $sess->url("main.php?area=$area&frame=4&path=$pathstring&appendparameters=$appendparameters"),
+ '' . $file);
$tpl->set('d', 'PATH', $pathstring);
$tpl->set('d', 'BGCOLOR', $bgcolor);
@@ -503,92 +440,79 @@ $tpl->next();
$dbfsc = new DBFSCollection;
-$dlevels = array ();
+$dlevels = array();
-if (is_array($objects))
-{
- foreach ($objects as $a_file)
- {
- $file = $a_file->name;
- $depth = $a_file->custom["level"] - 1;
- $pathstring = $a_file->id;
- $a_file->collapsed_icon = "images/grid_expand.gif";
- $a_file->expanded_icon = "images/grid_collapse.gif";
- $dlevels[$depth] = $a_file->custom["lastitem"];
- $collapse = getExpandCollapseButton($a_file);
- $fileurl = rawurlencode($path.$file.'/');
- $pathurl = rawurlencode($path);
+if (is_array($objects)) {
+ foreach ($objects as $a_file) {
+ $file = $a_file->name;
+ $depth = $a_file->custom["level"] - 1;
+ $pathstring = $a_file->id;
+ $a_file->collapsed_icon = "images/grid_expand.gif";
+ $a_file->expanded_icon = "images/grid_collapse.gif";
+ $dlevels[$depth] = $a_file->custom["lastitem"];
+ $collapse = getExpandCollapseButton($a_file);
+ $fileurl = rawurlencode($path . $file . '/');
+ $pathurl = rawurlencode($path);
- if($file == 'tmp')
- {
- echo 'tmp2'; + if ($file == 'tmp') { + echo 'tmp2
'; + } + + # Indent for every level + $cnt = $depth; + $indent = 18; + + for ($i = 0; $i < $cnt; $i++) { + # 18 px for every level + $indent += 18; + } + + # create javascript multilink + $tmp_mstr = '%s'; + $mstr = sprintf($tmp_mstr, 'right_bottom', $sess->url("main.php?area=$area&frame=4&path=$pathstring&appendparameters=$appendparameters"), + 'right_top', $sess->url("main.php?area=$area&frame=3&path=$pathstring&appendparameters=$appendparameters"), + '
' . $file);
+
+ $hasFiles = $dbfsc->hasFiles($pathstring);
+
+ if (!$hasFiles && $perm->have_perm_area_action($tmp_area, "upl_rmdir")) {
+ $deletebutton = '' . $file . '\', \'deleteDirectory(\\\'' . $pathstring . '\\\')\')">';
+ } else {
+ if ($hasFiles) {
+ $message = i18n("Directory contains files");
+ } else {
+ $message = i18n("Permission denied");
+ }
+
+ $deletebutton = "';
+ } else {
+ $gline .= '';
+ }
+ }
+
+ $parent = str_replace($cfgClient[$client]['upl']['path'], "", $a_file->custom["parent"]);
+ $tpl->set('d', 'DIRNAME', $mstr);
+ $tpl->set('d', 'EDITBUTTON', '');
+ $tpl->set('d', 'DELETEBUTTON', $deletebutton);
+ $tpl->set('d', 'COLLAPSE', $gline . $collapse);
+ $tpl->next();
}
-
- # Indent for every level
- $cnt = $depth;
- $indent = 18;
-
- for ($i = 0; $i < $cnt; $i ++)
- {
- # 18 px for every level
- $indent += 18;
- }
-
- # create javascript multilink
- $tmp_mstr = '%s';
- $mstr = sprintf($tmp_mstr, 'right_bottom', $sess->url("main.php?area=$area&frame=4&path=$pathstring&appendparameters=$appendparameters"),
- 'right_top', $sess->url("main.php?area=$area&frame=3&path=$pathstring&appendparameters=$appendparameters"),
- ''.$file);
-
- $hasFiles = $dbfsc->hasFiles($pathstring);
-
- if (!$hasFiles && $perm->have_perm_area_action($tmp_area, "upl_rmdir"))
- {
- $deletebutton = ''.$file.'\', \'deleteDirectory(\\\''.$pathstring.'\\\')\')">';
- } else
- {
- if ($hasFiles)
- {
- $message = i18n("Directory contains files");
- } else
- {
- $message = i18n("Permission denied");
- }
-
- $deletebutton = "";
- }
-
- $bgcolor = (is_int($tpl->dyn_cnt / 2)) ? $cfg["color"]["table_light"] : $cfg["color"]["table_dark"];
-
- $tpl->set('d', 'PATH', $pathstring);
- $tpl->set('d', 'BGCOLOR', $bgcolor);
- $tpl->set('d', 'INDENT', 0);
-
- $gline = "";
-
- for ($i = 1; $i < $depth; $i ++)
- {
- if ($dlevels[$i] == false && $i != 0)
- {
- $gline .= '';
- } else
- {
- $gline .= '';
- }
- }
-
- $parent = str_replace($cfgClient[$client]['upl']['path'], "", $a_file->custom["parent"]);
- $tpl->set('d', 'DIRNAME', $mstr);
- $tpl->set('d', 'EDITBUTTON', '');
- $tpl->set('d', 'DELETEBUTTON', $deletebutton);
- $tpl->set('d', 'COLLAPSE', $gline.$collapse);
- $tpl->next();
-
- }
}
$tpl->set('s', 'ID_PATH', $path);
chdir($cfg["path"]["contenido"]);
-$tpl->generate($cfg['path']['templates'].$cfg['templates']['upl_dirs_overview']);
-
+$tpl->generate($cfg['path']['templates'] . $cfg['templates']['upl_dirs_overview']);
?>
\ No newline at end of file
diff --git a/conlite/templates/standard/template.files_overview.html b/conlite/templates/standard/template.files_overview.html
index b46f5ad..135461e 100644
--- a/conlite/templates/standard/template.files_overview.html
+++ b/conlite/templates/standard/template.files_overview.html
@@ -1,35 +1,35 @@
-
-