Bug #21766 » 12874.patch
| typo3/sysext/belog/mod/index.php (working copy) | ||
|---|---|---|
|
var $theTime = 0;
|
||
|
var $theTime_end = 0;
|
||
|
protected $dateFormat;
|
||
|
/**
|
||
|
* Initialize module
|
||
| ... | ... | |
|
$this->MCONF = $GLOBALS['MCONF'];
|
||
|
$this->lF = t3lib_div::makeInstance('t3lib_BEDisplayLog');
|
||
|
$this->menuConfig();
|
||
|
$this->doc = t3lib_div::makeInstance('template');
|
||
|
$this->doc->backPath = $BACK_PATH;
|
||
|
$this->doc->setModuleTemplate('templates/belog.html');
|
||
|
// JavaScript
|
||
|
// Load necessary JavaScript
|
||
|
/** @var $pageRenderer t3lib_PageRenderer */
|
||
|
$pageRenderer = $this->doc->getPageRenderer();
|
||
|
$pageRenderer->loadExtJS();
|
||
|
$pageRenderer->addJsFile($this->backPath . '../t3lib/js/extjs/tceforms.js');
|
||
|
// Define settings for Date Picker
|
||
|
$dateFormat = $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'];
|
||
|
$this->dateFormat = $dateFormat . ' ' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm'];
|
||
|
$typo3Settings = array(
|
||
|
'datePickerUSmode' => 0,
|
||
|
'dateFormat' => array($dateFormat, $this->dateFormat),
|
||
|
);
|
||
|
$pageRenderer->addInlineSettingArray('', $typo3Settings);
|
||
|
$this->doc->JScode = '
|
||
|
<script language="javascript" type="text/javascript">
|
||
|
script_ended = 0;
|
||
| ... | ... | |
|
$this->doc->table_TABLE = '<table border="0" cellspacing="0" cellpadding="0" class="typo3-dblist">';
|
||
|
$this->doc->form = '<form action="" method="post">';
|
||
|
$this->menuConfig();
|
||
|
$this->be_user_Array = t3lib_BEfunc::getUserNames();
|
||
|
$this->lF->be_user_Array = &$this->be_user_Array;
|
||
|
}
|
||
| ... | ... | |
|
10 => $GLOBALS['LANG']->getLL('thisMonth'),
|
||
|
11 => $GLOBALS['LANG']->getLL('lastMonth'),
|
||
|
12 => $GLOBALS['LANG']->getLL('last31Days'),
|
||
|
20 => $GLOBALS['LANG']->getLL('noLimit')
|
||
|
20 => $GLOBALS['LANG']->getLL('noLimit'),
|
||
|
30 => $GLOBALS['LANG']->getLL('userdefined')
|
||
|
),
|
||
|
'max' => array(
|
||
|
20 => $GLOBALS['LANG']->getLL('20'),
|
||
| ... | ... | |
|
// CLEANSE SETTINGS
|
||
|
$this->MOD_SETTINGS = t3lib_BEfunc::getModuleData($this->MOD_MENU, t3lib_div::_GP('SET'), $this->MCONF['name']);
|
||
|
//
|
||
|
if (!trim($this->MOD_SETTINGS['manualdate'])) {
|
||
|
$this->MOD_SETTINGS['manualdate'] = 'YYYY-MM-DD';//"-HH-MM-SS";
|
||
|
} else {
|
||
|
$parts = t3lib_div::trimExplode('-',trim($this->MOD_SETTINGS['manualdate']));
|
||
|
$this->theTime = mktime((int)$parts[3],(int)$parts[4],(int)$parts[5],$parts[1]?(int)$parts[1]:1,$parts[2]?(int)$parts[2]:1,(int)$parts[0]);
|
||
|
$this->MOD_SETTINGS['manualdate'] = date('Y-m-d-H-i-s',$this->theTime);
|
||
|
}
|
||
|
// manual dates
|
||
|
if ($this->MOD_SETTINGS['time'] == 30) {
|
||
|
if (!trim($this->MOD_SETTINGS['manualdate'])) {
|
||
|
$this->theTime = $this->MOD_SETTINGS['manualdate'] = 0;
|
||
|
} else {
|
||
|
$this->theTime = $this->parseDate($this->MOD_SETTINGS['manualdate']);
|
||
|
if (!$this->theTime) {
|
||
|
$this->MOD_SETTINGS['manualdate'] = '';
|
||
|
} else {
|
||
|
$this->MOD_SETTINGS['manualdate'] = date($this->dateFormat, $this->theTime);
|
||
|
}
|
||
|
}
|
||
|
if (!trim($this->MOD_SETTINGS['manualdate_end'])) {
|
||
|
$this->MOD_SETTINGS['manualdate_end'] = 'YYYY-MM-DD';//"-HH-MM-SS";
|
||
|
} else {
|
||
|
$parts = t3lib_div::trimExplode('-',trim($this->MOD_SETTINGS['manualdate_end']));
|
||
|
$this->theTime_end = mktime((int)$parts[3],(int)$parts[4],(int)$parts[5],$parts[1]?(int)$parts[1]:1,$parts[2]?(int)$parts[2]:1,(int)$parts[0]);
|
||
|
$this->MOD_SETTINGS['manualdate_end'] = date('Y-m-d-H-i-s',$this->theTime_end);
|
||
|
if (!trim($this->MOD_SETTINGS['manualdate_end'])) {
|
||
|
$this->theTime_end = $this->MOD_SETTINGS['manualdate_end'] = 0;
|
||
|
} else {
|
||
|
$this->theTime_end = $this->parseDate($this->MOD_SETTINGS['manualdate_end']);
|
||
|
if (!$this->theTime_end) {
|
||
|
$this->MOD_SETTINGS['manualdate_end'] = '';
|
||
|
} else {
|
||
|
$this->MOD_SETTINGS['manualdate_end'] = date($this->dateFormat, $this->theTime_end);
|
||
|
}
|
||
|
}
|
||
|
}
|
||
|
}
|
||
| ... | ... | |
|
$menuA= t3lib_BEfunc::getFuncMenu(0,'SET[action]',$this->MOD_SETTINGS['action'],$this->MOD_MENU['action']);
|
||
|
$menuW= t3lib_BEfunc::getFuncMenu(0,'SET[workspaces]',$this->MOD_SETTINGS['workspaces'],$this->MOD_MENU['workspaces']);
|
||
|
$groupByPage= t3lib_BEfunc::getFuncCheck(0,'SET[groupByPage]',$this->MOD_SETTINGS['groupByPage']);
|
||
|
$inputDate= t3lib_BEfunc::getFuncInput(0,'SET[manualdate]',$this->MOD_SETTINGS['manualdate'],20);
|
||
|
$inputDate_end= t3lib_BEfunc::getFuncInput(0,'SET[manualdate_end]',$this->MOD_SETTINGS['manualdate_end'],20);
|
||
|
$groupByPage= t3lib_BEfunc::getFuncCheck(0, 'SET[groupByPage]',$this->MOD_SETTINGS['groupByPage']);
|
||
|
$style = ' style="margin:4px 2px;padding:1px;vertical-align:middle;width: 115px;"';
|
||
|
$inputDate = '<input type="text" value="' . ($this->MOD_SETTINGS['manualdate'] ? $this->MOD_SETTINGS['manualdate'] : '') .'" name="SET[manualdate]" id="tceforms-datetimefield-manualdate"' . $style . ' />';
|
||
|
$pickerInputDate = '<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/datepicker.gif', '', 0) . ' style="cursor:pointer; vertical-align:middle;" alt=""' . ' id="picker-tceforms-datetimefield-manualdate" />';
|
||
|
$inputDate_end = '<input type="text" value="' . ($this->MOD_SETTINGS['manualdate_end'] ? $this->MOD_SETTINGS['manualdate_end'] : '') .'" name="SET[manualdate]" id="tceforms-datetimefield-manualdate_end"' . $style . ' />';
|
||
|
$pickerInputDate_end = '<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/datepicker.gif', '', 0) . ' style="cursor:pointer; vertical-align:middle;" alt=""' . ' id="picker-tceforms-datetimefield-manualdate_end" />';
|
||
|
$setButton = '<input type="button" value="' . $GLOBALS['LANG']->getLL('set') . '" onclick="jumpToUrl(\'mod.php?&id=0&M=tools_log&SET[manualdate]=\'+escape($(\'tceforms-datetimefield-manualdate\').value)+\'&SET[manualdate_end]=\'+escape($(\'tceforms-datetimefield-manualdate_end\').value),this);" />';
|
||
|
$this->content.=$this->doc->section('',$this->doc->menuTable(
|
||
|
array(
|
||
|
array($GLOBALS['LANG']->getLL('users'), $menuU),
|
||
|
array($GLOBALS['LANG']->getLL('time'), ($this->MOD_SETTINGS['manualdate'] == 'YYYY-MM-DD' ? $menuT : '') . $inputDate . ($this->MOD_SETTINGS['manualdate'] != 'YYYY-MM-DD' ? '<br /> - ' . $inputDate_end : ''))
|
||
|
array($GLOBALS['LANG']->getLL('time'), $menuT . ($this->MOD_SETTINGS['time'] == 30 ?
|
||
|
'<br />from ' . $inputDate . $pickerInputDate . ' to ' . $inputDate_end . $pickerInputDate_end . ' ' . $setButton : ''))
|
||
|
),
|
||
|
array(
|
||
|
array($GLOBALS['LANG']->getLL('max'), $menuM),
|
||
| ... | ... | |
|
array('Group by page:',$groupByPage)
|
||
|
)
|
||
|
));
|
||
|
#$this->content.=$this->doc->divider(5);
|
||
|
$codeArr = $this->lF->initArray();
|
||
| ... | ... | |
|
$starttime=0;
|
||
|
$endtime = $GLOBALS['EXEC_TIME'];
|
||
|
// Time:
|
||
|
if ($this->theTime) {
|
||
|
$starttime = $this->theTime;
|
||
|
if ($this->theTime_end) {
|
||
|
$endtime = $this->theTime_end;
|
||
|
} else {
|
||
|
$endtime = $GLOBALS['EXEC_TIME'];
|
||
|
}
|
||
|
} else {
|
||
|
switch($this->MOD_SETTINGS['time']) {
|
||
|
case 0:
|
||
|
// This week
|
||
|
$week = (date('w') ? date('w') : 7)-1;
|
||
|
$starttime = mktime (0,0,0)-$week*3600*24;
|
||
|
break;
|
||
|
case 1:
|
||
|
// Last week
|
||
|
$week = (date('w') ? date('w') : 7)-1;
|
||
|
$starttime = mktime (0,0,0)-($week+7)*3600*24;
|
||
|
$endtime = mktime (0,0,0)-$week*3600*24;
|
||
|
break;
|
||
|
case 2:
|
||
|
// Last 7 days
|
||
|
$starttime = mktime (0,0,0)-7*3600*24;
|
||
|
break;
|
||
|
case 10:
|
||
|
// This month
|
||
|
$starttime = mktime (0,0,0, date('m'),1);
|
||
|
break;
|
||
|
case 11:
|
||
|
// Last month
|
||
|
$starttime = mktime (0,0,0, date('m')-1,1);
|
||
|
$endtime = mktime (0,0,0, date('m'),1);
|
||
|
break;
|
||
|
case 12:
|
||
|
// Last 31 days
|
||
|
$starttime = mktime (0,0,0)-31*3600*24;
|
||
|
break;
|
||
|
}
|
||
|
// Time:
|
||
|
switch($this->MOD_SETTINGS['time']) {
|
||
|
case 0:
|
||
|
// This week
|
||
|
$week = (date('w') ? date('w') : 7)-1;
|
||
|
$starttime = mktime (0,0,0)-$week*3600*24;
|
||
|
break;
|
||
|
case 1:
|
||
|
// Last week
|
||
|
$week = (date('w') ? date('w') : 7)-1;
|
||
|
$starttime = mktime (0,0,0)-($week+7)*3600*24;
|
||
|
$endtime = mktime (0,0,0)-$week*3600*24;
|
||
|
break;
|
||
|
case 2:
|
||
|
// Last 7 days
|
||
|
$starttime = mktime (0,0,0)-7*3600*24;
|
||
|
break;
|
||
|
case 10:
|
||
|
// This month
|
||
|
$starttime = mktime (0,0,0, date('m'),1);
|
||
|
break;
|
||
|
case 11:
|
||
|
// Last month
|
||
|
$starttime = mktime (0,0,0, date('m')-1,1);
|
||
|
$endtime = mktime (0,0,0, date('m'),1);
|
||
|
break;
|
||
|
case 12:
|
||
|
// Last 31 days
|
||
|
$starttime = mktime (0,0,0)-31*3600*24;
|
||
|
break;
|
||
|
case 30:
|
||
|
$starttime = $this->theTime;
|
||
|
if ($this->theTime_end) {
|
||
|
$endtime = $this->theTime_end;
|
||
|
} else {
|
||
|
$endtime = $GLOBALS['EXEC_TIME'];
|
||
|
}
|
||
|
}
|
||
|
if ($starttime) {
|
||
|
$where_part.=' AND tstamp>='.$starttime.' AND tstamp<'.$endtime;
|
||
|
}
|
||
| ... | ... | |
|
}
|
||
|
sort($overviewList);
|
||
|
$this->content.=$this->doc->divider(5);
|
||
|
$this->content.= $this->doc->section('Overview', 'These pages have log messages from ' . date('Y-m-d H:i:s', $starttime) . ' to ' . date('Y-m-d H:i:s', $endtime) . '<br /><br /><br />' . implode('<br />', $overviewList), 1, 1, 0);
|
||
|
$this->content.= $this->doc->section('Overview', 'These pages have log messages from ' . date($this->dateFormat, $starttime) . ' to ' . date($this->dateFormat, $endtime) . '<br /><br /><br />' . implode('<br />', $overviewList), 1, 1, 0);
|
||
|
$this->content.=$this->doc->spacer(30);
|
||
|
} else $logPids[] = '_SINGLE';
|
||
| ... | ... | |
|
$insertMsg = ' for PAGE "'.t3lib_BEfunc::getRecordPath($pid,'',20).'" ('.$pid.') ';
|
||
|
break;
|
||
|
}
|
||
|
$this->content.=$this->doc->section('Log '.$insertMsg.'from '.date('Y-m-d H:i:s',$starttime).' to '.date('Y-m-d H:i:s',$endtime),'',1,1,0);
|
||
|
$this->content.=$this->doc->section('Log '.$insertMsg.'from '.date($this->dateFormat, $starttime).' to '.date($this->dateFormat, $endtime),'',1,1,0);
|
||
|
$log = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'sys_log', '1=1'.$where_part.($pid!='_SINGLE'?' AND event_pid='.intval($pid):''), '', 'uid DESC', intval($this->MOD_SETTINGS['max']));
|
||
| ... | ... | |
|
}
|
||
|
/**
|
||
|
* Parse the manual date
|
||
|
*
|
||
|
* @param string $date
|
||
|
* @return int timestamp
|
||
|
*/
|
||
|
function parseDate($date) {
|
||
|
if (strpos($date, ' ') === FALSE) {
|
||
|
$date .= ' 0:00';
|
||
|
}
|
||
|
$parts = t3lib_div::trimExplode(' ', $date, TRUE);
|
||
|
$dateParts = preg_split('/[-\.\/]/', $parts[0]);
|
||
|
if (count($dateParts) < 3) {
|
||
|
return 0;
|
||
|
}
|
||
|
$timeParts = preg_split('/[\.:]/', $parts[1]);
|
||
|
return mktime($timeParts[0], $timeParts[1], 0, $dateParts[1], $dateParts[0], $dateParts[2]);
|
||
|
}
|
||
|
/**
|
||
|
* Output content
|
||
|
*
|
||
|
* @return string HTML
|
||
| typo3/sysext/belog/mod/locallang.xml (working copy) | ||
|---|---|---|
|
<label index="lastMonth">Last month</label>
|
||
|
<label index="last31Days">Last 31 days</label>
|
||
|
<label index="noLimit">No limit</label>
|
||
|
<label index="userdefined">User defined</label>
|
||
|
<label index="set">Set</label>
|
||
|
<label index="20">20</label>
|
||
|
<label index="50">50</label>
|
||
|
<label index="100">100</label>
|
||
