diff --git a/code/main.php b/code/main.php index 8834682..1ada078 100644 --- a/code/main.php +++ b/code/main.php @@ -7,14 +7,21 @@ include_once "console.php"; include_once "scanner.php"; function RenderDocument($filePath){ - $filename=pathinfo($filePath)["basename"]; - $filePathFixed=htmlentities($filePath,ENT_HTML5, "UTF-8"); - $filenameFixed=htmlentities($filename,ENT_HTML5, "UTF-8"); $render=""; - $render.='
'. - 'Download
'."\n"; - $render.=''; + if($filePath!=null){ + $filename=pathinfo($filePath)["basename"]; + $filePathFixed=htmlentities($filePath,ENT_HTML5, "UTF-8"); + $filenameFixed=htmlentities($filename,ENT_HTML5, "UTF-8"); + $render.='
'. + 'Download
'."\n"; + $render.=''; + }else{ + $render.='
'."\n"; + $render.=''; + } return $render; } @@ -58,11 +65,7 @@ $formFields.=RenderHidden("hidScanDevice",$Scanner["ScanDevice"]); $formFields.=RenderHidden("hidScanModel",$Scanner["ScanModel"]); $columns=""; $columns.=renderDiv("divColLeft",$formFields); -$result=""; -if($DestFile!=null){ - $result.=RenderDocument($DestFile); -} -$columns.=renderDiv("divColRight",$result); +$columns.=renderDiv("divColRight",RenderDocument($DestFile)); $columns.=RenderCommandLog(); $columns.=RenderDiv("divLoadBack",RenderDiv("divLoading","Loading","divLoading"),"divLoadBack","display:none;"); echo RenderForm("frmMain",$columns);