extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix PHP 8 error: Cannot use positional argument after named argument

Browse Source
This commit is contained in:
Ralf Becker 2021-04-14 12:59:47 +02:00
parent c7effbf7b9
commit 68a0bb9ac9
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
setup/applications.php
View File

@ -7,13 +7,12 @@
* @author Miles Lott <milos@groupwhere.org> * @author Miles Lott <milos@groupwhere.org>
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$
*/ */
use EGroupware\Api; use EGroupware\Api;
use EGroupware\Api\Framework; use EGroupware\Api\Framework;
$DEBUG = @$_POST['debug'] || @$_GET['debug']; $DEBUG = !empty($_REQUEST['debug']);
/* /*
TODO: We allow a user to hose their setup here, need to make use TODO: We allow a user to hose their setup here, need to make use
of dependencies so they are warned that they are pulling the rug of dependencies so they are warned that they are pulling the rug
@ -212,9 +211,7 @@ if(@$_GET['hooks'])
echo lang('Cached cleared') . '<br />'; echo lang('Cached cleared') . '<br />';
} }
$detail = $_GET['detail']; if (!empty($detail = $_GET['detail']))
$resolve = $_GET['resolve'];
if(@$detail)
{ {
@ksort($setup_info[$detail]); @ksort($setup_info[$detail]);
$setup_tpl->set_var('description',lang('App details') . ':'); $setup_tpl->set_var('description',lang('App details') . ':');
@ -244,7 +241,7 @@ if(@$detail)
{ {
$hooks = (array)$hooks; $hooks = (array)$hooks;
} }
$val = str_replace('EGroupware\\', '', implode(', ', call_user_func_array('array_merge', $val))); $val = str_replace('EGroupware\\', '', json_encode($val));
break; break;
case 'depends': case 'depends':
foreach($val as &$dep) foreach($val as &$dep)
@ -254,7 +251,7 @@ if(@$detail)
$val = implode('; ', $val); $val = implode('; ', $val);
break; break;
case 'check_install': case 'check_install':
$val = array2string($val); $val = json_encode($val, JSON_UNESCAPED_SLASHES);
break; break;
default: default:
if (is_array($val)) $val = implode(', ', $val); if (is_array($val)) $val = implode(', ', $val);
@ -270,13 +267,13 @@ if(@$detail)
$setup_tpl->pparse('out','footer'); $setup_tpl->pparse('out','footer');
exit; exit;
} }
elseif (@$resolve) elseif (!empty($resolve = $_GET['resolve']))
{ {
$version = $_GET['version']; $version = $_GET['version'];
$notables = $_GET['notables']; $notables = $_GET['notables'];
$setup_tpl->set_var('description',lang('Problem resolution'). ':'); $setup_tpl->set_var('description',lang('Problem resolution'). ':');
$setup_tpl->pparse('out','header'); $setup_tpl->pparse('out','header');
$app_title = $setup_info[$resolve]['title'] ? $setup_info[$resolve]['title'] : $setup_info[$resolve]['name']; $app_title = $setup_info[$resolve]['title'] ?: $setup_info[$resolve]['name'];
if($_GET['post']) if($_GET['post'])
{ {