Set cwd in session initially and chdir to it always

mattpass · mattpass · commit 9b881cf77486 · 2020-10-23T11:09:51.000+01:00
diff --git a/lib/terminal-xhr.php b/lib/terminal-xhr.php
@@ -8,11 +8,14 @@
     'll' 	=> 'ls -lvhF',
 );
 
-// If we have a current working dir in session, change to that dir
-if (true === isset($_SESSION['cwd'])) {
-    chdir($_SESSION['cwd']);
+// If we have no cwd set in session, set it now
+if (false === isset($_SESSION['cwd'])) {
+	$_SESSION['cwd'] = $docRoot . $iceRoot;
 }
 
+// Change to cwd
+chdir($_SESSION['cwd']);
+
 // Get current user and cwd
 $user = str_replace("\n", "", shell_exec("whoami"));
 $cwd = str_replace("\n", "", shell_exec("pwd"));
@@ -138,9 +141,10 @@ function returnHTMLPromptCommand($cmd) {
 
 // Change to the cwd in session
 chdir($_SESSION['cwd']);
+
 // and again ask for current user and working dir
-$user = str_replace("\n","",shell_exec("whoami"));
-$cwd = str_replace("\n","",shell_exec("pwd"));
+$user = str_replace("\n", "", shell_exec("whoami"));
+$cwd = str_replace("\n", "", shell_exec("pwd"));
 
 // Finally, output our JSON data
 echo json_encode([
diff --git a/terminal.php b/terminal.php
@@ -93,9 +93,15 @@
 
 <body onclick="document.getElementById('command').focus()">
 <?php
-if (true === isset($_SESSION['cwd'])) {
-    chdir($_SESSION['cwd']);
+// If we have no cwd set in session, set it now
+if (false === isset($_SESSION['cwd'])) {
+	$_SESSION['cwd'] = $docRoot . $iceRoot;
 }
+
+// Change to cwd
+chdir($_SESSION['cwd']);
+
+// Get current user and cwd
 $user = str_replace("\n", "", shell_exec("whoami"));
 $cwd = str_replace("\n", "", shell_exec("pwd"));
 ?>
