From e4624d939824f5a0457fce8608fd10ef8d9fdbe7 Mon Sep 17 00:00:00 2001 From: Alexey Berezhok Date: Tue, 4 Feb 2025 23:34:14 +0300 Subject: [PATCH] Added support some webapp applications --- web/add/webapp/index.php | 3 +++ web/src/app/WebApp/Installers/BaseSetup.php | 20 +++++++++---------- .../Installers/DokuWiki/DokuWikiSetup.php | 4 ++-- .../WebApp/Installers/Drupal/DrupalSetup.php | 4 ++-- .../WebApp/Installers/Flarum/FlarumSetup.php | 2 +- .../app/WebApp/Installers/Grav/GravSetup.php | 2 +- .../Installers/Laravel/LaravelSetup.php | 2 +- .../Installers/MediaWiki/MediaWikiSetup.php | 4 ++-- .../Installers/Nextcloud/NextcloudSetup.php | 4 ++-- .../Installers/Opencart/OpencartSetup.php | 2 +- .../Installers/Prestashop/PrestashopSetup.php | 4 ++-- .../Installers/Symfony/SymfonySetup.php | 4 ++-- .../Installers/WordPress/WordPressSetup.php | 4 ++-- 13 files changed, 31 insertions(+), 28 deletions(-) diff --git a/web/add/webapp/index.php b/web/add/webapp/index.php index a2de04d..164dca5 100644 --- a/web/add/webapp/index.php +++ b/web/add/webapp/index.php @@ -123,6 +123,9 @@ if (!empty($installer)) { $appInstallerInfo = $app_installer->info(); $supported = false; $supported_versions = []; + if ($appInstallerInfo["enabled"] != true) { + continue; + } foreach ($php_versions as $version) { if (in_array($version, $appInstallerInfo["php_support"])) { $supported = true; diff --git a/web/src/app/WebApp/Installers/BaseSetup.php b/web/src/app/WebApp/Installers/BaseSetup.php index 8aba687..0281b83 100644 --- a/web/src/app/WebApp/Installers/BaseSetup.php +++ b/web/src/app/WebApp/Installers/BaseSetup.php @@ -38,20 +38,20 @@ abstract class BaseSetup implements InstallerInterface { } public function info() { - $this->appInfo["enabled"] = true; + //$this->appInfo["enabled"] = true; if (isset($this->config["server"]["php"]["supported"])) { $this->appInfo["php_support"] = $this->config["server"]["php"]["supported"]; } else { $this->appInfo["php_support"] = [ - "5.6", - "7.0", - "7.1", - "7.2", - "7.3", - "7.4", - "8.0", - "8.1", - "8.2", + "56", + "70", + "71", + "72", + "73", + "74", + "80", + "81", + "82", ]; } return $this->appInfo; diff --git a/web/src/app/WebApp/Installers/DokuWiki/DokuWikiSetup.php b/web/src/app/WebApp/Installers/DokuWiki/DokuWikiSetup.php index e95e617..87c56a3 100644 --- a/web/src/app/WebApp/Installers/DokuWiki/DokuWikiSetup.php +++ b/web/src/app/WebApp/Installers/DokuWiki/DokuWikiSetup.php @@ -9,7 +9,7 @@ class DokuWikiSetup extends BaseSetup { protected $appInfo = [ "name" => "DokuWiki", "group" => "wiki", - "enabled" => true, + "enabled" => false, "version" => "2023-04-04a", "thumbnail" => "dokuwiki-logo.svg", ]; @@ -57,7 +57,7 @@ class DokuWikiSetup extends BaseSetup { "template" => "default", ], "php" => [ - "supported" => ["7.3", "7.4", "8.0", "8.1"], + "supported" => ["73", "74", "80", "81"], ], ], ]; diff --git a/web/src/app/WebApp/Installers/Drupal/DrupalSetup.php b/web/src/app/WebApp/Installers/Drupal/DrupalSetup.php index cc06e73..cefa155 100644 --- a/web/src/app/WebApp/Installers/Drupal/DrupalSetup.php +++ b/web/src/app/WebApp/Installers/Drupal/DrupalSetup.php @@ -10,7 +10,7 @@ class DrupalSetup extends BaseSetup { protected $appInfo = [ "name" => "Drupal", "group" => "cms", - "enabled" => "yes", + "enabled" => false, "version" => "latest", "thumbnail" => "drupal-thumb.png", ]; @@ -30,7 +30,7 @@ class DrupalSetup extends BaseSetup { "template" => "drupal-composer", ], "php" => [ - "supported" => ["8.1", "8.2"], + "supported" => ["81", "82"], ], ], ]; diff --git a/web/src/app/WebApp/Installers/Flarum/FlarumSetup.php b/web/src/app/WebApp/Installers/Flarum/FlarumSetup.php index d372c6f..61aeb08 100644 --- a/web/src/app/WebApp/Installers/Flarum/FlarumSetup.php +++ b/web/src/app/WebApp/Installers/Flarum/FlarumSetup.php @@ -32,7 +32,7 @@ class FlarumSetup extends BaseSetup { "template" => "flarum", ], "php" => [ - "supported" => ["8.0", "8.1", "8.2"], + "supported" => ["80", "81", "82"], ], ], ]; diff --git a/web/src/app/WebApp/Installers/Grav/GravSetup.php b/web/src/app/WebApp/Installers/Grav/GravSetup.php index 5d047b2..52e7d28 100644 --- a/web/src/app/WebApp/Installers/Grav/GravSetup.php +++ b/web/src/app/WebApp/Installers/Grav/GravSetup.php @@ -32,7 +32,7 @@ class GravSetup extends BaseSetup { "template" => "grav", ], "php" => [ - "supported" => ["7.4", "8.0", "8.1"], + "supported" => ["74", "80", "81"], ], ], ]; diff --git a/web/src/app/WebApp/Installers/Laravel/LaravelSetup.php b/web/src/app/WebApp/Installers/Laravel/LaravelSetup.php index 4e7d46a..9700872 100644 --- a/web/src/app/WebApp/Installers/Laravel/LaravelSetup.php +++ b/web/src/app/WebApp/Installers/Laravel/LaravelSetup.php @@ -26,7 +26,7 @@ class LaravelSetup extends BaseSetup { "template" => "laravel", ], "php" => [ - "supported" => ["8.1", "8.2"], + "supported" => ["81", "82"], ], ], ]; diff --git a/web/src/app/WebApp/Installers/MediaWiki/MediaWikiSetup.php b/web/src/app/WebApp/Installers/MediaWiki/MediaWikiSetup.php index 67096d2..d6dbbeb 100644 --- a/web/src/app/WebApp/Installers/MediaWiki/MediaWikiSetup.php +++ b/web/src/app/WebApp/Installers/MediaWiki/MediaWikiSetup.php @@ -9,7 +9,7 @@ class MediaWikiSetup extends BaseSetup { protected $appInfo = [ "name" => "MediaWiki", "group" => "cms", - "enabled" => true, + "enabled" => false, "version" => "1.40.0", "thumbnail" => "MediaWiki-2020-logo.svg", //Max size is 300px by 300px ]; @@ -34,7 +34,7 @@ class MediaWikiSetup extends BaseSetup { "template" => "default", ], "php" => [ - "supported" => ["7.4", "8.0"], + "supported" => ["74", "80"], ], ], ]; diff --git a/web/src/app/WebApp/Installers/Nextcloud/NextcloudSetup.php b/web/src/app/WebApp/Installers/Nextcloud/NextcloudSetup.php index dd969b9..af116e8 100644 --- a/web/src/app/WebApp/Installers/Nextcloud/NextcloudSetup.php +++ b/web/src/app/WebApp/Installers/Nextcloud/NextcloudSetup.php @@ -8,7 +8,7 @@ class NextcloudSetup extends BaseSetup { protected $appInfo = [ "name" => "Nextcloud", "group" => "cloud", - "enabled" => true, + "enabled" => false, "version" => "latest", "thumbnail" => "nextcloud-thumb.png", ]; @@ -29,7 +29,7 @@ class NextcloudSetup extends BaseSetup { "template" => "owncloud", ], "php" => [ - "supported" => ["8.0", "8.1", "8.2"], + "supported" => ["80", "81", "82"], ], ], ]; diff --git a/web/src/app/WebApp/Installers/Opencart/OpencartSetup.php b/web/src/app/WebApp/Installers/Opencart/OpencartSetup.php index 0d8b523..50a84ce 100644 --- a/web/src/app/WebApp/Installers/Opencart/OpencartSetup.php +++ b/web/src/app/WebApp/Installers/Opencart/OpencartSetup.php @@ -34,7 +34,7 @@ class OpencartSetup extends BaseSetup { "template" => "opencart", ], "php" => [ - "supported" => ["7.4", "8.0", "8.1", "8.2"], + "supported" => ["74", "80", "81", "82"], ], ], ]; diff --git a/web/src/app/WebApp/Installers/Prestashop/PrestashopSetup.php b/web/src/app/WebApp/Installers/Prestashop/PrestashopSetup.php index 2ca9f05..aa00ca8 100644 --- a/web/src/app/WebApp/Installers/Prestashop/PrestashopSetup.php +++ b/web/src/app/WebApp/Installers/Prestashop/PrestashopSetup.php @@ -8,7 +8,7 @@ class PrestashopSetup extends BaseSetup { protected $appInfo = [ "name" => "Prestashop", "group" => "ecommerce", - "enabled" => true, + "enabled" => false, "version" => "8.1.0", "thumbnail" => "prestashop-thumb.png", ]; @@ -35,7 +35,7 @@ class PrestashopSetup extends BaseSetup { "template" => "prestashop", ], "php" => [ - "supported" => ["8.0", "8.1"], + "supported" => ["80", "81"], ], ], ]; diff --git a/web/src/app/WebApp/Installers/Symfony/SymfonySetup.php b/web/src/app/WebApp/Installers/Symfony/SymfonySetup.php index 3b22b3f..cca7dab 100644 --- a/web/src/app/WebApp/Installers/Symfony/SymfonySetup.php +++ b/web/src/app/WebApp/Installers/Symfony/SymfonySetup.php @@ -8,7 +8,7 @@ class SymfonySetup extends BaseSetup { protected $appInfo = [ "name" => "Symfony", "group" => "framework", - "enabled" => true, + "enabled" => false, "version" => "latest", "thumbnail" => "symfony-thumb.png", ]; @@ -26,7 +26,7 @@ class SymfonySetup extends BaseSetup { "template" => "symfony4-5", ], "php" => [ - "supported" => ["8.1", "8.2"], + "supported" => ["81", "82"], ], ], ]; diff --git a/web/src/app/WebApp/Installers/WordPress/WordPressSetup.php b/web/src/app/WebApp/Installers/WordPress/WordPressSetup.php index e82f615..3983014 100644 --- a/web/src/app/WebApp/Installers/WordPress/WordPressSetup.php +++ b/web/src/app/WebApp/Installers/WordPress/WordPressSetup.php @@ -10,7 +10,7 @@ class WordpressSetup extends BaseSetup { protected $appInfo = [ "name" => "WordPress", "group" => "cms", - "enabled" => true, + "enabled" => false, "version" => "latest", "thumbnail" => "wp-thumb.png", ]; @@ -61,7 +61,7 @@ class WordpressSetup extends BaseSetup { "template" => "wordpress", ], "php" => [ - "supported" => ["7.4", "8.0", "8.1", "8.2"], + "supported" => ["74", "80", "81", "82"], ], ], ];