Verified Commit 54d1d345 authored by dockx thibault's avatar dockx thibault
Browse files

:sparkles: Feat(html) - html adapts to php8.2

Adapts html classes to php 8.2
No related merge requests found
Showing with 11 additions and 26 deletions
+11 -26
......@@ -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('/"/', '"', current($_POST));
$search = preg_replace('/"/', '"', (string) current($_POST));
$config = session::get('config');
$departmentInfo = $config->getDepartmentInfo();
......@@ -50,23 +50,15 @@ if (isset($_GET['type']) && $_GET['type'] == "base") {
if (!isset($pathMapping[$dn])) {
continue;
}
<<<<<<< HEAD
if (mb_stristr((string) $info['name'], (string) $search) !== FALSE) {
if (mb_stristr((string) $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((string) $info['description'], (string) $search) !== FALSE) {
=======
if (mb_stristr($info['name'], $search) !== FALSE) {
if (mb_stristr((string) $info['description'], $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;
}
if (mb_stristr($pathMapping[$dn], (string) $search) !== FALSE) {
if (mb_stristr($pathMapping[$dn], $search) !== FALSE) {
$res .= "<li>".mark($search, $pathMapping[$dn]).($info['description'] == '' ? "" : "<span class='informal'> [".mark($search, $info['description'])."]</span>")."</li>";
continue;
}
......
......@@ -146,19 +146,12 @@ if (($config->get_cfg_value('forcessl') == 'TRUE') && ($ssl != '')) {
}
if (isset($_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'];
}
$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'],
};
}
LoginMethod::loginProcess();
......@@ -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', $lang)) {
if (!preg_match('/utf(-)?8$/i', (string) $lang)) {
$lang .= '.UTF-8';
}
} elseif (session::is_set('lang')) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment