diff --git a/code/scans.php b/code/scans.php index 203c4ba..1639285 100644 --- a/code/scans.php +++ b/code/scans.php @@ -18,16 +18,21 @@ function ExecCommand($command){ return $stdout; } -function ShowCommandLog(){ +function RenderCommandLog(){ global $Commands; + $renderLog=""; foreach($Commands as $loggedCommand){ - echo RenderParagraph($loggedCommand["Command"],"font-weight: bold;"); - echo RenderParagraph($loggedCommand["Result"]); - echo RenderParagraph($loggedCommand["Error"],"color: red;"); + $renderLog.=RenderParagraph($loggedCommand["Command"],"font-weight: bold;"); + $renderLog.=RenderParagraph($loggedCommand["Result"]); + $renderLog.=RenderParagraph($loggedCommand["Error"],"color: red;"); } + + return RenderDiv("divConsoleContainer", + RenderButton("btnToggle","Log","var elem=document.getElementById('divConsole');if(elem.style.display==''){elem.style.display='none';}else{elem.style.display='';}return false;"). + RenderDiv("divConsole",$renderLog,"display:none;") + ); } - function Scan($device,$resolution,$format,$size,$destFileBase){ global $PreviewDir; global $ScanImage; @@ -165,5 +170,6 @@ if($DestFile!=null){ } echo "\n"; -ShowCommandLog(); + +echo RenderCommandLog(); diff --git a/code/ui.php b/code/ui.php index 4467d9d..178f2d4 100644 --- a/code/ui.php +++ b/code/ui.php @@ -78,11 +78,17 @@ function RenderCombo($id,$options,$selected){ return $render; } -function RenderButton($id,$value){ +function RenderButton($id,$value,$onClick=""){ $idFixed=htmlentities($id,ENT_HTML5, "UTF-8"); $valueFixed=htmlentities($value,ENT_HTML5, "UTF-8"); - return ''; + $render=''."\n"; + return $render; } function RenderFieldInfo($text,$info){ @@ -125,10 +131,10 @@ function RenderFieldCombo($text,$idCombo,$options,$selected){ return $render; } -function RenderFieldButton($text,$idButton,$value){ +function RenderFieldButton($text,$idButton,$value,$onClick=""){ $render='
".$textFixed."
\n"; - }else{ - return "".$textFixed."
\n"; + $textLines=explode("\n",$text); + $render=""; + foreach ($textLines as $line) { + $textFixed=htmlentities($line,ENT_HTML5, "UTF-8"); + if($style==null){ + $render.="".$textFixed."
\n"; + }else{ + $render.="".$textFixed."
\n"; + } } + return $render; } - +function RenderDiv($idDiv,$innerHTML,$style=null){ + $idFixed=htmlentities($idDiv,ENT_HTML5, "UTF-8"); + if($style==null){ + $render='