Merge pull request 'release v5.0.2' (#420) from develop into master

Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/420

CHANGELOG.md

@@ -1,15 +1,5 @@
 ## [Unreleased]
 
-## 5.1.0
-### Added
-* fix #425: allow to set a color using hex code
-### Fixed
-* #422: usage of `OC\AppFramework\Http\Request` instead of `$_SERVER`
-
-## 5.0.3
-### Fixed
-* fix #422: undefined array key "HTTP_USER_AGENT"
-
 ## 5.0.2
 ### Fixed
 * fix #413: add user-agent check for memories mobile app

appinfo/info.xml

@@ -30,7 +30,7 @@ Notice
 Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
 In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
 ]]></description>
-    <version>5.1.0</version>
+    <version>5.0.2</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.fr/">Simon Vieille</author>
     <namespace>SideMenu</namespace>

lib/AppInfo/Application.php

@@ -2,9 +2,8 @@
 
 namespace OCA\SideMenu\AppInfo;
 
-use OC\AllConfig;
+use OC;
 use OC\App\AppStore\Fetcher\CategoryFetcher;
-use OC\AppFramework\Http\Request;
 use OC\Security\CSP\ContentSecurityPolicyNonceManager;
 use OC\User\User;
 use OCA\SideMenu\Service\AppRepository;
@@ -32,12 +31,23 @@ use Psr\Container\ContainerInterface;
 class Application extends App implements IBootstrap
 {
     public const APP_ID = 'side_menu';
+
     public const APP_NAME = 'Custom menu';
 
-    protected AllConfig $config;
+    /**
-    protected ContentSecurityPolicyNonceManager $cspnm;
+     * @var OC\AllConfig
-    protected Request $request;
+     */
-    protected ?User $user = null;
+    protected $config;
+
+    /**
+     * @var ContentSecurityPolicyNonceManager
+     */
+    protected $cspnm;
+
+    /**
+     * @var User
+     */
+    protected $user;
 
     public function __construct(array $urlParams = [])
     {
@@ -86,7 +96,6 @@ class Application extends App implements IBootstrap
         $this->config = \OC::$server->getConfig();
         $this->cspnm = \OC::$server->getContentSecurityPolicyNonceManager();
         $this->user = \OC::$server[IUserSession::class]->getUser();
-        $this->request = \OC::$server->getRequest();
 
         if (!$this->isEnabled()) {
             return;
@@ -97,7 +106,7 @@ class Application extends App implements IBootstrap
 
     protected function isEnabled(): bool
     {
-        if (isset($this->request->server['HTTP_USER_AGENT']) && preg_match('/MemoriesNative/', $this->request->server['HTTP_USER_AGENT'])) {
+        if (preg_match('/MemoriesNative/', $_SERVER['HTTP_USER_AGENT'])) {
             return false;
         }
 

src/components/settings/form/FormColorPicker.vue

@@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <template>
   <NcColorPicker
     v-model="model"
-    :advancedFields="true"
     class="cm-settings-form-colorpicker"
   >
     <div