diff options
Diffstat (limited to 'frontends/php/report4.php')
| -rw-r--r-- | frontends/php/report4.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/frontends/php/report4.php b/frontends/php/report4.php index 4355bc86208..fb62bfb5475 100644 --- a/frontends/php/report4.php +++ b/frontends/php/report4.php @@ -35,7 +35,7 @@ $fields = array( ); check_fields($fields); -if (get_request('media_type')) { +if (getRequest('media_type')) { $mediaTypeData = API::MediaType()->get(array( 'mediatypeids' => array($_REQUEST['media_type']), 'countOutput' => true @@ -45,9 +45,9 @@ if (get_request('media_type')) { } } -$year = get_request('year', intval(date('Y'))); -$period = get_request('period', 'weekly'); -$media_type = get_request('media_type', 0); +$year = getRequest('year', intval(date('Y'))); +$period = getRequest('period', 'weekly'); +$media_type = getRequest('media_type', 0); $_REQUEST['year'] = $year; $_REQUEST['period'] = $period; @@ -130,7 +130,7 @@ else { case 'yearly': $minTime = mktime(0, 0, 0, 1, 1, $minYear); - $dateFormat = REPORT4_ANNUALLY_DATE_FORMAT; + $dateFormat = _x('Y', DATE_FORMAT_CONTEXT); array_unshift($header, new CCol(_('Year'), 'center')); for ($i = $minYear; $i <= date('Y'); $i++) { @@ -142,7 +142,7 @@ else { case 'monthly': $minTime = mktime(0, 0, 0, 1, 1, $year); - $dateFormat = REPORT4_MONTHLY_DATE_FORMAT; + $dateFormat = _x('F', DATE_FORMAT_CONTEXT); array_unshift($header, new CCol(_('Month'),'center')); $max = ($year == $currentYear) ? date('n') : 12; @@ -155,7 +155,7 @@ else { case 'daily': $minTime = mktime(0, 0, 0, 1, 1, $year); - $dateFormat = REPORT4_DAILY_DATE_FORMAT; + $dateFormat = DATE_FORMAT; array_unshift($header, new CCol(_('Day'),'center')); $max = ($year == $currentYear) ? date('z') : DAY_IN_YEAR; @@ -171,7 +171,7 @@ else { $wd = ($wd == 0) ? 6 : $wd - 1; $minTime = $time - $wd * SEC_PER_DAY; - $dateFormat = REPORT4_WEEKLY_DATE_FORMAT; + $dateFormat = DATE_TIME_FORMAT; array_unshift($header, new CCol(_('From'), 'center'), new CCol(_('Till'), 'center')); $max = ($year == $currentYear) ? date('W') - 1 : 52; @@ -192,7 +192,7 @@ else { 'output' => array('mediatypeid', 'userid', 'clock'), 'eventsource' => $sourceObject['source'], 'eventobject' => $sourceObject['object'], - 'mediatypeids' => (get_request('media_type')) ? get_request('media_type') : null, + 'mediatypeids' => (getRequest('media_type')) ? getRequest('media_type') : null, 'time_from' => $minTime, 'time_till' => $maxTime ))); @@ -249,7 +249,7 @@ else { $table->show(); if ($media_type == 0) { - echo SBR; + echo BR(); $links = array(); foreach ($media_types as $id => $description) { |