"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "packages/web/lib/reports/history_report.report.php" between
fogproject-1.5.7.tar.gz and fogproject-1.5.8.tar.gz

About: FOG is a Linux-based network computer cloning solution for Windows, Mac OSX and various Linux distributions that ties together a few open-source tools with a PHP-based web interface. FOG doesn’t use any boot disks, or CDs; everything is done via TFTP and PXE.

history_report.report.php  (fogproject-1.5.7):history_report.report.php  (fogproject-1.5.8)
skipping to change at line 51 skipping to change at line 51
); );
$userNames = self::getSubObjectIDs( $userNames = self::getSubObjectIDs(
'User', 'User',
'', '',
'name' 'name'
); );
$userNames = array_values( $userNames = array_values(
array_filter( array_filter(
array_unique( array_unique(
(array)$userNames (array)$userNames
) )
) )
); );
natcasesort($userNames); natcasesort($userNames);
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);
} }
$fields = array( $fields = array(
'<label for="usersearch">' '<label for="usersearch">'
. _('Enter an user name to search for') . _('Enter an user name to search for')
. '</label>' => $userSelForm, . '</label>' => $userSelForm,
'<label for="info">' '<label for="info">'
. _('Enter a term to search for') . _('Enter a term to search for')
. '</label>' => '<div class="input-group">' . '</label>' => '<div class="input-group">'
. '<input type="text" class="' . '<input type="text" class="'
skipping to change at line 159 skipping to change at line 159
array() array()
); );
Route::listem( Route::listem(
'history', 'history',
'id', 'id',
'false', 'false',
array( array(
'createdBy' => $usersearch, 'createdBy' => $usersearch,
'info' => $info 'info' => $info
) )
); );
$Historys = json_decode( $Historys = json_decode(
Route::getData() Route::getData()
); );
$Historys = $Historys->historys; $Historys = $Historys->historys;
$inventoryCsvHead = array( $inventoryCsvHead = array(
_('History ID') => 'id', _('History ID') => 'id',
_('History Info') => 'info', _('History Info') => 'info',
_('History User') => 'createdBy', _('History User') => 'createdBy',
_('History Time') => 'createdTime', _('History Time') => 'createdTime',
_('History IP') => 'ip' _('History IP') => 'ip'
skipping to change at line 199 skipping to change at line 199
} }
$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,
'HistoryReport', 'HistoryReport',
_('Export CSV'), _('Export CSV'),
_('Export CSV'), _('Export CSV'),
self::$csvfile, self::$csvfile,
'HistoryReport', 'HistoryReport',
_('Export PDF'), _('Export PDF'),
_('Export PDF'), _('Export PDF'),
 End of changes. 5 change blocks. 
6 lines changed or deleted 6 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)