user_tracking.report.php (fogproject-1.5.7) | : | user_tracking.report.php (fogproject-1.5.8) | ||
---|---|---|---|---|
skipping to change at line 79 | skipping to change at line 79 | |||
); | ); | |||
$HostNames = array_values( | $HostNames = array_values( | |||
array_filter( | array_filter( | |||
array_unique( | array_unique( | |||
(array)$HostNames | (array)$HostNames | |||
) | ) | |||
) | ) | |||
); | ); | |||
natcasesort($UserNames); | natcasesort($UserNames); | |||
natcasesort($HostNames); | natcasesort($HostNames); | |||
if (count($UserNames) > 0) { | if (is_array($UserNames) && count($UserNames) > 0) { | |||
$userSelForm = self::selectForm( | $userSelForm = self::selectForm( | |||
'usersearch', | 'usersearch', | |||
$UserNames | $UserNames | |||
); | ); | |||
unset($UserNames); | unset($UserNames); | |||
} | } | |||
if (count($HostNames) > 0) { | if (is_array($HostNames) && count($HostNames) > 0) { | |||
$hostSelForm = self::selectForm( | $hostSelForm = self::selectForm( | |||
'hostsearch', | 'hostsearch', | |||
$HostNames | $HostNames | |||
); | ); | |||
unset($HostNames); | unset($HostNames); | |||
} | } | |||
$fields = array( | $fields = array( | |||
'<label for="usersearch">' | '<label for="usersearch">' | |||
. _('Enter a username to search for') | . _('Enter a username to search for') | |||
. '</label>' => $userSelForm, | . '</label>' => $userSelForm, | |||
skipping to change at line 340 | skipping to change at line 340 | |||
} | } | |||
$this->ReportMaker->appendHTML($this->process(12)); | $this->ReportMaker->appendHTML($this->process(12)); | |||
echo '<div class="col-xs-9">'; | echo '<div class="col-xs-9">'; | |||
echo '<div class="panel panel-info">'; | echo '<div class="panel panel-info">'; | |||
echo '<div class="panel-heading text-center">'; | echo '<div class="panel-heading text-center">'; | |||
echo '<h4 class="title">'; | echo '<h4 class="title">'; | |||
echo $this->title; | echo $this->title; | |||
echo '</h4>'; | echo '</h4>'; | |||
echo '</div>'; | echo '</div>'; | |||
echo '<div class="panel-body">'; | echo '<div class="panel-body">'; | |||
if (count($this->data) > 0) { | if (is_array($this->data) && count($this->data) > 0) { | |||
echo '<div class="text-center">'; | echo '<div class="text-center">'; | |||
printf( | printf( | |||
$this->reportString, | $this->reportString, | |||
'UserTrackingList', | 'UserTrackingList', | |||
_('Export CSV'), | _('Export CSV'), | |||
_('Export CSV'), | _('Export CSV'), | |||
self::$csvfile, | self::$csvfile, | |||
'UserTrackingList', | 'UserTrackingList', | |||
_('Export PDF'), | _('Export PDF'), | |||
_('Export PDF'), | _('Export PDF'), | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added |