fix ssl issue & fix grav installer

fixes an issue where the install wouldn't work as expected when ssl was disabled

Author: PsychotherapistSam

web/src/app/WebApp/Installers/DokuWiki/DokuWikiSetup.php

@@ -55,16 +55,26 @@ class DokuWikiSetup extends BaseSetup {
 	public function install(array $options = null)
 	{
 		parent::install($options);
+		
+		//check if ssl is enabled 
+        $this->appcontext->run('v-list-web-domain', [$this->appcontext->user(), $this->domain, 'json'], $status);
+		
+        if($status->code !== 0) {
+            throw new \Exception("Cannot list domain");
+        }
+        
+		$sslEnabled = ($status->json[$this->domain]['SSL'] == 'no' ? 0 : 1);
 
-		$webDomain = "https://" . $this->domain . "/";
-
+		$webDomain = ($sslEnabled ? "https://" : "http://") . $this->domain . "/";
+		
 		$this->appcontext->runUser('v-copy-fs-directory',[
 			$this->getDocRoot($this->extractsubdir . "/dokuwiki-release_stable_2020-07-29/."),
 			$this->getDocRoot()], $result);
 
 		$installUrl = $webDomain . "install.php";
 
 		$cmd = "curl --request POST "
+		  . ($sslEnabled ? "" : "--insecure " )
 		  . "--url $installUrl "
 		  . "--header 'Content-Type: application/x-www-form-urlencoded' "
 		  . "--data l=en "

web/src/app/WebApp/Installers/Grav/GravSetup.php

@@ -18,7 +18,9 @@ class GravSetup extends BaseSetup {
 	protected $appname = 'grav';
 
 	protected $config = [
-		'form' => [],
+		'form' => [
+			"ignore this"=>"text",
+		],
 		'database' => false,
 		'resources' => [
 			'composer' => [ 'src' => 'getgrav/grav', 'dst' => '/']

web/src/app/WebApp/Installers/MediaWiki/MediaWikiSetup.php

@@ -35,14 +35,21 @@ public function install(array $options = null)
 	{
 		parent::install($options);
 
-		$webAddresss = "https://" . $this->domain;
+        //check if ssl is enabled 
+        $this->appcontext->run('v-list-web-domain', [$this->appcontext->user(), $this->domain, 'json'], $status);
+		
+        if($status->code !== 0) {
+            throw new \Exception("Cannot list domain");
+        }
+        
+		$sslEnabled = ($status->json[$this->domain]['SSL'] == 'no' ? 0 : 1);
+		
+		$webDomain = ($sslEnabled ? "https://" : "http://") . $this->domain . "/";
 
 		$this->appcontext->runUser('v-copy-fs-directory',[
 			$this->getDocRoot($this->extractsubdir . "/mediawiki-1.36.1/."),
 			$this->getDocRoot()], $result);		
 
-		$this->cleanup();
-
 		$this->appcontext->runUser('v-run-cli-cmd', ['/usr/bin/php',
 			$this->getDocRoot('maintenance/install.php'), 
 			'--dbserver=localhost',
@@ -58,7 +65,9 @@ public function install(array $options = null)
 			"MediaWiki", // A Space here would trigger the next argument and preemptively set the admin username
 			$options['admin_username'],
 			], $status);
-
+			
+		$this->cleanup();
+		
 		return ($status->code === 0);
 	}
 }