added welcome message with intial [init] command when not logged in

joonlabs · joonlabs · commit bd8fe4b1d42c · 2021-01-08T23:20:22.000+01:00
diff --git a/commandline/index.php b/commandline/index.php
@@ -6,10 +6,11 @@
 
 $command = (isset($_GET["command"]) and $_GET["command"]!="") ? trim($_GET["command"]) : null;
 if($command!=null){
-    lCommand::addToStack($command);
-}
-if(!lConnection::isAuthorized()){
-    lCommand::addToStackIfNotExists("login");
+    if($command=="init"){
+        if(!lConnection::isAuthorized()) lCommand::write("welcome to the php command line. please login via the command \"login\"");
+    }else{
+        lCommand::addToStack($command);
+    }
 }
 
 lCommand::performNextCommand();
diff --git a/commandline/library/lCommand.php b/commandline/library/lCommand.php
@@ -48,6 +48,7 @@ static function performNextCommand(){
             $args = array_slice($splits, 1);
             
             // call command
+            if($command=="") return;
             if(lConnection::isAuthorized() or $program=="login"){
                 if(file_exists("programms/$program/init.php")){
                     require_once("programms/$program/init.php");
diff --git a/commandline/programms/login/init.php b/commandline/programms/login/init.php
@@ -19,8 +19,8 @@ function loginMain($args, $command){
                     lCommand::write("welcome, ".$username);
                 }else{
                     lCommand::write("not authorized");
-                    lCommand::addToStack("login");
-                    lCommand::performNextCommand();
+//                    lCommand::addToStack("login");
+//                    lCommand::performNextCommand();
                 }
             }            
         }
diff --git a/index.php b/index.php
@@ -63,6 +63,7 @@ class CommandLine{
                     }
                 }
                 static sendCommand(command){
+                    console.log(command);
                     CommandLine.commandhistory.unshift(command);
                     let xhttp = new XMLHttpRequest();
                     xhttp.onreadystatechange = function() {
@@ -72,7 +73,7 @@ class CommandLine{
                             CommandLine.print(answer["return"]);
                         }
                     };
-                    xhttp.open("GET", "commandline/?command="+encodeURI(command), true);
+                    xhttp.open("GET", "commandline/?command="+encodeURIComponent(command), true);
                     xhttp.send();
                 }
                 static print(content){
@@ -87,6 +88,7 @@ class CommandLine{
             }
             CommandLine.commandhistory = []; 
             CommandLine.historyindex = -1; 
+            CommandLine.sendCommand("init");
         </script>
     </head>
     <body onclick="document.getElementsByTagName('textarea')[0].focus();">

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ function loginMain($args, $command){`
`19`	`19`	`lCommand::write("welcome, ".$username);`
`20`	`20`	`}else{`
`21`	`21`	`lCommand::write("not authorized");`
`22`		`- lCommand::addToStack("login");`
`23`		`- lCommand::performNextCommand();`
	`22`	`+// lCommand::addToStack("login");`
	`23`	`+// lCommand::performNextCommand();`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ class CommandLine{`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`static sendCommand(command){`
	`66`	`+ console.log(command);`
`66`	`67`	`CommandLine.commandhistory.unshift(command);`
`67`	`68`	`let xhttp = new XMLHttpRequest();`
`68`	`69`	`xhttp.onreadystatechange = function() {`
`@@ -72,7 +73,7 @@ class CommandLine{`
`72`	`73`	`CommandLine.print(answer["return"]);`
`73`	`74`	`}`
`74`	`75`	`};`
`75`		`- xhttp.open("GET", "commandline/?command="+encodeURI(command), true);`
	`76`	`+ xhttp.open("GET", "commandline/?command="+encodeURIComponent(command), true);`
`76`	`77`	`xhttp.send();`
`77`	`78`	`}`
`78`	`79`	`static print(content){`
`@@ -87,6 +88,7 @@ class CommandLine{`
`87`	`88`	`}`
`88`	`89`	`CommandLine.commandhistory = [];`
`89`	`90`	`CommandLine.historyindex = -1;`
	`91`	`+ CommandLine.sendCommand("init");`
`90`	`92`	`</script>`
`91`	`93`	`</head>`
`92`	`94`	`<body onclick="document.getElementsByTagName('textarea')[0].focus();">`