- changed output from div to textarea

joonlabs · joonlabs · commit 24e179ce6250 · 2021-01-11T16:10:19.000+01:00
diff --git a/commandline/library/lCommand.php b/commandline/library/lCommand.php
@@ -50,7 +50,7 @@ static function getResult(){
         }
         
         static function write($result){
-            $_SESSION["phpcommandline"]["commandresult"] .= (strlen($_SESSION["phpcommandline"]["commandresult"])==0 ? "" : "<br>").$result;
+            $_SESSION["phpcommandline"]["commandresult"] .= (strlen($_SESSION["phpcommandline"]["commandresult"])==0 ? "" : "\n").$result;
         }
         
         private static function popCommand(){
diff --git a/commandline/programs/help/init.php b/commandline/programs/help/init.php
@@ -1,15 +1,15 @@
 <?php
     function helpMain($args, $command){
         lCommand::write("> $command");
-        $content = "pre-installed programs:<br>";
+        $content = "pre-installed programs:\n";
         $dirs = array_filter(glob('programs/*'), 'is_dir');
         foreach($dirs as $i=>$s){
-            $content .= " - ".str_replace("programs/", "", $s).(($i<count($dirs)-1) ? "<br>" : "");
+            $content .= " - ".str_replace("programs/", "", $s).(($i<count($dirs)-1) ? "\n" : "");
         }
-        $content .= "<br>custom programs:<br>";
+        $content .= "\ncustom programs:\n";
         $dirs = array_filter(glob('../programs/*'), 'is_dir');
         foreach($dirs as $i=>$s){
-            $content .= " - ".str_replace("../programs/", "", $s).(($i<count($dirs)-1) ? "<br>" : "");
+            $content .= " - ".str_replace("../programs/", "", $s).(($i<count($dirs)-1) ? "\n" : "");
         }
         lCommand::write($content);    
     }
diff --git a/commandline/programs/more/init.php b/commandline/programs/more/init.php
@@ -3,7 +3,7 @@ function moreMain($args, $command){
         lCommand::write("> $command");
         if(count($args)==1){
             if(lSystem::fileExists(lSystem::getPWD()."/".$args[0])){
-                lCommand::write(nl2br(htmlentities(file_get_contents(lSystem::getPWD()."/".$args[0]))));
+                lCommand::write(htmlentities(file_get_contents(lSystem::getPWD()."/".$args[0])));
             }else{
                 lCommand::write("file not found");
             }
diff --git a/index.php b/index.php
@@ -14,7 +14,7 @@
             #content{
                 position: absolute;
                 bottom: 50px;
-                max-height: calc(100vh - 50px);
+                height: calc(100vh - 50px);
                 overflow: auto;
                 width: calc(100% - 32px);
             }
@@ -83,7 +83,7 @@ class CommandLine{
                     xhttp.send();
                 }
                 static print(content){
-                    document.getElementById("content").innerHTML += "<br>"+content;
+                    document.getElementById("content").innerHTML += "\n"+content;
                     document.getElementById("content").scrollTop = document.getElementById("content").scrollHeight;
                 }
                 static reset(content){
@@ -102,7 +102,7 @@ class CommandLine{
                         if (this.readyState == 4 && this.status == 200) {
                             let answer = JSON.parse(xhttp.responseText);
                             console.log(answer);
-                            if(answer["return"]!=null) document.getElementsByTagName('textarea')[0].value += answer["return"];
+                            if(answer["return"]!=null && answer["return"]!="") document.getElementsByTagName('textarea')[0].value += answer["return"];
                         }
                     };
                     xhttp.open("GET", "commandline/autocomplete.php?input="+encodeURIComponent(input), true);
@@ -114,7 +114,7 @@ class CommandLine{
         </script>
     </head>
     <body ondblclick="document.getElementsByTagName('textarea')[0].focus();">
-        <div id="content" class="content"></div>
         <div class="input"><span>$</span><textarea autocomplete="off" spellcheck="false" autofocus rows="1" onkeydown="CommandLine.parseCommand(event);"></textarea></div>
+        <textarea disabled id="content" class="content"></textarea>
     </body>
 </html>

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ static function getResult(){`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`static function write($result){`
`53`		`- $_SESSION["phpcommandline"]["commandresult"] .= (strlen($_SESSION["phpcommandline"]["commandresult"])==0 ? "" : "<br>").$result;`
	`53`	`+ $_SESSION["phpcommandline"]["commandresult"] .= (strlen($_SESSION["phpcommandline"]["commandresult"])==0 ? "" : "\n").$result;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`private static function popCommand(){`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ function moreMain($args, $command){`
`3`	`3`	`lCommand::write("> $command");`
`4`	`4`	`if(count($args)==1){`
`5`	`5`	`if(lSystem::fileExists(lSystem::getPWD()."/".$args[0])){`
`6`		`- lCommand::write(nl2br(htmlentities(file_get_contents(lSystem::getPWD()."/".$args[0]))));`
	`6`	`+ lCommand::write(htmlentities(file_get_contents(lSystem::getPWD()."/".$args[0])));`
`7`	`7`	`}else{`
`8`	`8`	`lCommand::write("file not found");`
`9`	`9`	`}`