App install progress screen

webadmin/installappconfirm.php

@@ -57,10 +57,24 @@ if (isset($_POST['installconfirmsubmit'])) {
                 }
 
                 if(! exec('grep '.escapeshellarg("install_".$app_name).' ./pending_installs.txt')) {
+                    if(! file_exists("index_app_installing.html")) {
+                        exec('cp index.html index_app_installing.html');
+                        exec('cp app_installing_progress.html index.html');
+                    }
                     $pending_installs = fopen("pending_installs.txt", "a") or die("Unable to append to installs file");
                     fwrite($pending_installs, "install_".$app_name.",".$install_domain.",".$freedns_code."\n");
                     fclose($pending_installs);
-                    $output_filename = "app_installing.html";
+                    $output_filename = "index.html";
+
+                    # remain on this screen
+                    $host  = $_SERVER['HTTP_HOST'];
+                    $uri   = rtrim(dirname($_SERVER['PHP_SELF']), '/\\');
+                    if (endsWith($uri, 'admin')) {
+                        header("Location: http://$host$uri/index.html");
+                    }
+                    else {
+                        header("Location: http://$host$uri/admin/index.html");
+                    }
                 }
                 else {
                     // The app is already scheduled for installation