From a567089e8ed82990f868e85f2db6269e7a87dc44 Mon Sep 17 00:00:00 2001
From: Thibault Dockx <thibault.dockx@fusiondirectory.org>
Date: Tue, 25 Feb 2025 14:05:09 +0000
Subject: [PATCH] Revert ":sparkles: (html) - html folder php82"

This reverts commit e7456f505f987a94f8c496357625596f429d3050.
---
 html/autocomplete.php | 10 +++++++++-
 html/index.php        | 19 +++++++++++++------
 html/setup.php        |  2 +-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/html/autocomplete.php b/html/autocomplete.php
index d5da39a6f..2b3194c49 100755
--- a/html/autocomplete.php
+++ b/html/autocomplete.php
@@ -42,7 +42,7 @@ if (isset($_GET['type']) && $_GET['type'] == "base") {
   if (session::is_set("pathMapping") && count($_POST) == 1) {
     $res          = "";
     $pathMapping  = session::get("pathMapping");
-    $search       = preg_replace('/&quot;/', '"', (string) current($_POST));
+    $search       = preg_replace('/&quot;/', '"', current($_POST));
 
     $config         = session::get('config');
     $departmentInfo = $config->getDepartmentInfo();
@@ -50,11 +50,19 @@ if (isset($_GET['type']) && $_GET['type'] == "base") {
       if (!isset($pathMapping[$dn])) {
         continue;
       }
+<<<<<<< HEAD
       if (mb_stristr((string) $info['name'], (string) $search) !== FALSE) {
         $res .= "<li>".mark($search, $pathMapping[$dn]).($info['description'] == '' ? "" : "<span class='informal'> [".mark($search, $info['description'])."]</span>")."</li>";
         continue;
       }
       if (mb_stristr((string) $info['description'], (string) $search) !== FALSE) {
+=======
+      if (mb_stristr($info['name'], $search) !== FALSE) {
+        $res .= "<li>".mark($search, $pathMapping[$dn]).($info['description'] == '' ? "" : "<span class='informal'> [".mark($search, $info['description'])."]</span>")."</li>";
+        continue;
+      }
+      if (mb_stristr($info['description'], $search) !== FALSE) {
+>>>>>>> parent of e7456f50 (:sparkles: (html) - html folder php82)
         $res .= "<li>".mark($search, $pathMapping[$dn]).($info['description'] == '' ? "" : "<span class='informal'> [".mark($search, $info['description'])."]</span>")."</li>";
         continue;
       }
diff --git a/html/index.php b/html/index.php
index 501f2404c..5659b9f38 100755
--- a/html/index.php
+++ b/html/index.php
@@ -146,12 +146,19 @@ if (($config->get_cfg_value('forcessl') == 'TRUE') && ($ssl != '')) {
 }
 
 if (isset($_REQUEST['message'])) {
-  $message = match ($_REQUEST['message']) {
-      'expired' => _('Your FusionDirectory session has expired!'),
-      'invalidparameter' => sprintf(_('Invalid plugin parameter "%s"!'), $_REQUEST['plug']),
-      'nosession' => _('No session found!'),
-      default => $_REQUEST['message'],
-  };
+  switch ($_REQUEST['message']) {
+    case 'expired':
+      $message = _('Your FusionDirectory session has expired!');
+      break;
+    case 'invalidparameter':
+      $message = sprintf(_('Invalid plugin parameter "%s"!'), $_REQUEST['plug']);
+      break;
+    case 'nosession':
+      $message = _('No session found!');
+      break;
+    default:
+      $message = $_REQUEST['message'];
+  }
 }
 
 LoginMethod::loginProcess();
diff --git a/html/setup.php b/html/setup.php
index a39929fec..305a076c6 100755
--- a/html/setup.php
+++ b/html/setup.php
@@ -82,7 +82,7 @@ if (isset($_POST['lang_selected']) && $_POST['lang_selected'] != '') {
   $lang = $_POST['lang_selected'];
 
   /* Append .UTF-8 to language string if necessary */
-  if (!preg_match('/utf(-)?8$/i', (string) $lang)) {
+  if (!preg_match('/utf(-)?8$/i', $lang)) {
     $lang .= '.UTF-8';
   }
 } elseif (session::is_set('lang')) {
-- 
GitLab