mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-25 08:34:29 +00:00
Bugfix für Applikationen mit mehreren Shortcuts
This commit is contained in:
@@ -123,6 +123,7 @@ require_once('../../../config/cis.config.inc.php');
|
|||||||
// Applikation und Link lesen
|
// Applikation und Link lesen
|
||||||
$cAPPName=trim((isset($xml['APP'][$i]['NAME'])?$xml['APP'][$i]['NAME']:''));
|
$cAPPName=trim((isset($xml['APP'][$i]['NAME'])?$xml['APP'][$i]['NAME']:''));
|
||||||
$cAPPLink=trim((isset($xml['APP'][$i]['OSD'])?$xml['APP'][$i]['OSD']:''));
|
$cAPPLink=trim((isset($xml['APP'][$i]['OSD'])?$xml['APP'][$i]['OSD']:''));
|
||||||
|
//echo '<hr>'.$cAPPName.' - '.$cAPPLink.'<br>';
|
||||||
|
|
||||||
if (empty($cAPPName) || empty($cAPPLink))
|
if (empty($cAPPName) || empty($cAPPLink))
|
||||||
{
|
{
|
||||||
@@ -137,17 +138,22 @@ require_once('../../../config/cis.config.inc.php');
|
|||||||
// SHORTCUTLIST / SHORTCUT lesen
|
// SHORTCUTLIST / SHORTCUT lesen
|
||||||
$cAPPLocation='';
|
$cAPPLocation='';
|
||||||
$arrAPPShortcutlist=(array)$xml['APP'][$i];
|
$arrAPPShortcutlist=(array)$xml['APP'][$i];
|
||||||
|
|
||||||
if (isset($arrAPPShortcutlist['SHORTCUTLIST']) && is_array($arrAPPShortcutlist) )
|
if (isset($arrAPPShortcutlist['SHORTCUTLIST']) && is_array($arrAPPShortcutlist) )
|
||||||
{
|
{
|
||||||
// SHORTCUT lesen
|
// SHORTCUT lesen
|
||||||
$arrAPPShortcut=(array)$arrAPPShortcutlist['SHORTCUTLIST'];
|
$arrAPPShortcut=(array)$arrAPPShortcutlist['SHORTCUTLIST'];
|
||||||
|
if(isset($arrAPPShortcut['SHORTCUT']) && !isset($arrAPPShortcut['SHORTCUT']['LOCATION']))
|
||||||
|
$arrAPPShortcut['SHORTCUT']=$arrAPPShortcut['SHORTCUT'][0];
|
||||||
|
//var_dump($arrAPPShortcut);
|
||||||
|
|
||||||
if (isset($arrAPPShortcut['SHORTCUT']) && isset($arrAPPShortcut['SHORTCUT']['LOCATION']) )
|
if (isset($arrAPPShortcut['SHORTCUT']) && isset($arrAPPShortcut['SHORTCUT']['LOCATION']) )
|
||||||
{
|
{
|
||||||
// Location - Path zur Anwendung aufsplitten fuer Menue
|
// Location - Path zur Anwendung aufsplitten fuer Menue
|
||||||
$cAPPLocation=(string)$arrAPPShortcut['SHORTCUT']['LOCATION'];
|
$cAPPLocation=(string)$arrAPPShortcut['SHORTCUT']['LOCATION'];
|
||||||
// den APP-Path entfernen aus der Location - wird benoetigt fuer die Softwareunterteilung
|
// den APP-Path entfernen aus der Location - wird benoetigt fuer die Softwareunterteilung
|
||||||
$cAPPLocation=trim(str_ireplace($cSoftGridApplicationsRoot,'',$cAPPLocation));
|
$cAPPLocation=trim(str_ireplace($cSoftGridApplicationsRoot,'',$cAPPLocation));
|
||||||
|
|
||||||
$arrAPPRow['Error']=0;
|
$arrAPPRow['Error']=0;
|
||||||
|
|
||||||
// Softwarunterteilung
|
// Softwarunterteilung
|
||||||
@@ -166,9 +172,10 @@ require_once('../../../config/cis.config.inc.php');
|
|||||||
}
|
}
|
||||||
$arrAPPRow['SecondLevel']=trim((isset($arrLevel[0])?$arrLevel[0]:''));
|
$arrAPPRow['SecondLevel']=trim((isset($arrLevel[0])?$arrLevel[0]:''));
|
||||||
$arrAPPRow['ThirdLevel']=trim((isset($arrLevel[1])?$arrLevel[1]:''));
|
$arrAPPRow['ThirdLevel']=trim((isset($arrLevel[1])?$arrLevel[1]:''));
|
||||||
$arrAPPRow['FourthLevel']=trim((isset($arrLevel[2])?$arrLevel[2]:''));
|
$arrAPPRow['FourthLevel']=trim((isset($arrLevel[2])?$arrLevel[2]:''));
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// Sortkey umwandeln auf Kleinbuchstaben
|
// Sortkey umwandeln auf Kleinbuchstaben
|
||||||
$cSort=strtolower($arrAPPRow['SecondLevel'].$arrAPPRow['ThirdLevel'].$arrAPPRow['FourthLevel'].' '.$i);
|
$cSort=strtolower($arrAPPRow['SecondLevel'].$arrAPPRow['ThirdLevel'].$arrAPPRow['FourthLevel'].' '.$i);
|
||||||
|
|||||||
Reference in New Issue
Block a user