hosts_and_users.report.php (fogproject-1.5.6) | : | hosts_and_users.report.php (fogproject-1.5.7) | ||
---|---|---|---|---|
skipping to change at line 47 | skipping to change at line 47 | |||
array('class' => 'col-xs-4'), | array('class' => 'col-xs-4'), | |||
array('class' => 'col-xs-8 form-group') | array('class' => 'col-xs-8 form-group') | |||
); | ); | |||
$groupNames = self::getSubObjectIDs( | $groupNames = self::getSubObjectIDs( | |||
'Group', | 'Group', | |||
'', | '', | |||
'name' | 'name' | |||
); | ); | |||
$groupNames = array_values( | $groupNames = array_values( | |||
array_filter( | array_filter( | |||
array_unique( | array_unique( | |||
(array)$groupNames | (array)$groupNames | |||
) | ) | |||
) | ) | |||
); | ); | |||
if (in_array('location', (array)self::$pluginsinstalled)) { | if (in_array('location', (array)self::$pluginsinstalled)) { | |||
$locationNames = self::getSubObjectIDs( | $locationNames = self::getSubObjectIDs( | |||
'Location', | 'Location', | |||
'', | '', | |||
'name' | 'name' | |||
); | ); | |||
natcasesort($locationNames); | natcasesort($locationNames); | |||
skipping to change at line 298 | skipping to change at line 298 | |||
( | ( | |||
$Host->useAD == 1 ? | $Host->useAD == 1 ? | |||
_('Yes') : | _('Yes') : | |||
_('No') | _('No') | |||
) | ) | |||
); | ); | |||
break; | break; | |||
case _('Login Users'): | case _('Login Users'): | |||
$this->ReportMaker->addCSVCell( | $this->ReportMaker->addCSVCell( | |||
implode( | implode( | |||
' ', | ' ', | |||
self::getSubObjectIDs( | self::getSubObjectIDs( | |||
'UserTracking', | 'UserTracking', | |||
array('hostID' => $Host->id), | array('hostID' => $Host->id), | |||
'username' | 'username' | |||
) | ) | |||
) | ) | |||
); | ); | |||
break; | break; | |||
default: | default: | |||
$this->ReportMaker->addCSVCell($Host->$classGet); | $this->ReportMaker->addCSVCell($Host->$classGet); | |||
End of changes. 2 change blocks. | ||||
4 lines changed or deleted | 4 lines changed or added |