diff --git a/xtrn/ddfilelister/ddfilelister.js b/xtrn/ddfilelister/ddfilelister.js index 01cbe53a133aa35c58962a1d3897aa61fd51526e..28eda16bda163ce08280132b232a9d6250658e4a 100644 --- a/xtrn/ddfilelister/ddfilelister.js +++ b/xtrn/ddfilelister/ddfilelister.js @@ -63,9 +63,9 @@ * Scan Dirs and List Files * 2023-02-27 Eric Oulashin Version 2.10 * Now allows downloading a single selected file with the D key. - * Also, ddfilelister now checks whether the user has permission (based - * on ARS) to download before allowing adding files to their batch - * download queue (and downloading a single file as well). + * Also, ddfilelister now checks whether the user has permission to + * download before allowing adding files to their batch download queue + * (and downloading a single file as well). */ "use strict"; @@ -516,13 +516,25 @@ function doAction_ANSI(pActionCode, pFileList, pFileListMenu) if (userCanDownloadFromFileArea_ShowErrorIfNot(fileMetadata.dirCode)) retObj = addSelectedFilesToBatchDLQueue_ANSI(fileMetadata, pFileList); else + { retObj = getDefaultActionRetObj(); + retObj.reDrawListerHeader = true; + retObj.reDrawHeaderTextOnly = false; + retObj.reDrawMainScreenContent = true; + retObj.reDrawCmdBar = true; + } break; case FILE_DOWNLOAD_SINGLE: if (userCanDownloadFromFileArea_ShowErrorIfNot(fileMetadata.dirCode) && pFileListMenu.selectedItemIdx >= 0 && pFileListMenu.selectedItemIdx < pFileListMenu.NumItems()) retObj = letUserDownloadSelectedFile_ANSI(fileMetadata); else + { retObj = getDefaultActionRetObj(); + retObj.reDrawListerHeader = true; + retObj.reDrawHeaderTextOnly = false; + retObj.reDrawMainScreenContent = true; + retObj.reDrawCmdBar = true; + } break; case HELP: retObj = displayHelpScreen(); @@ -4178,13 +4190,12 @@ function fileInfoSortDLTime(pA, pB) // Return value: Boolean - Whether or not the user can download from the file directory given function userCanDownloadFromFileArea_ShowErrorIfNot(pDirCode) { - var userCanDownload = bbs.compare_ars(file_area.dir[pDirCode].download_ars); + var userCanDownload = file_area.dir[pDirCode].can_download; if (!userCanDownload) { // The user doesn't have permission to download from this directory - //file_area.dir[pFileMetadata.dirCode].name - var areaFullDesc = file_area.dir[pFileMetadata.dirCode].lib_name + ": " - + file_area.dir[pFileMetadata.dirCode].description; + //file_area.dir[pDirCode].name + var areaFullDesc = file_area.dir[pDirCode].lib_name + ": " + file_area.dir[pDirCode].description; areaFullDesc = word_wrap(areaFullDesc, console.screen_columns-1, areaFullDesc.length).replace(/\r|\n/g, "\r\n"); while (areaFullDesc.lastIndexOf("\r\n") == areaFullDesc.length-2) areaFullDesc = areaFullDesc.substr(0, areaFullDesc.length-2);