--- token.inc 2008-01-23 10:26:19.000000000 -0500 +++ token.inc 2008-07-24 10:32:27.000000000 -0400 @@ -13,14 +13,26 @@ $values['duration'] = $video['duration'] ? format_interval($video['duration']) : ''; + $values['duration-raw'] = $video['duration'] ? + $video['duration'] : ''; + $values['views'] = $video['flv_file'] != NULL ? $video['views'] . ' ' . format_plural($video['views'], 'view', 'views') : ''; + + $values['views-raw'] = $video['flv_file'] != NULL ? + $video['views'] : ''; $values['views_completed'] = $video['flv_file'] != NULL ? $video['views_completed'] . ' complete ' . format_plural($video['views'], 'view', 'views') : ''; + + $values['views_completed-raw'] = $video['flv_file'] != NULL ? + $video['views_completed'] : ''; $values['downloads'] = $video['downloads'] != NULL ? $video['downloads'] . ' ' . format_plural($video['downloads'], 'download', 'downloads') : ''; + + $values['downloads-raw'] = $video['downloads'] != NULL ? + $video['downloads'] : ''; $values['filename'] = $video['source_file']['filename'] ? $video['source_file']['filename'] : ''; @@ -30,6 +42,9 @@ $values['filesize'] = $video['source_file']['filesize'] ? _op_video_format_bytesize($video['source_file']['filesize'], 2) : ''; + + $values['filesize-raw'] = $video['source_file']['filesize'] ? + $video['source_file']['filesize'] : ''; $values['download'] = $video['source_file'] && !$video['source_file']['deleted'] ? l('Download', _op_video_download_path($video)) : ''; @@ -43,14 +58,19 @@ $list = array(); if($type == 'field' || $type == 'all') { - $list['Video']['duration'] = t("Video duration"); - $list['Video']['views'] = t("Views"); - $list['Video']['views_completed'] = t("Complete views"); - $list['Video']['downloads'] = t("Downloads"); - $list['Video']['filename'] = t("Filename"); - $list['Video']['filemime'] = t("File MIME"); - $list['Video']['filesize'] = t("File size"); - $list['Video']['download'] = t("Download link"); + $list['Video']['duration'] = t("Video duration (formatted)"); + $list['Video']['duration-raw'] = t("Video duration (raw value)"); + $list['Video']['views'] = t("Video views (formatted)"); + $list['Video']['views-raw'] = t("Video views (raw value)"); + $list['Video']['views_completed'] = t("Video views completed (formatted)"); + $list['Video']['views_completed-raw'] = t("Video views completed (raw value)"); + $list['Video']['downloads'] = t("Video downloads (formatted)"); + $list['Video']['downloads-raw'] = t("Video downloads (raw value)"); + $list['Video']['filename'] = t("Filename of original video file"); + $list['Video']['filemime'] = t("File MIME of original video file"); + $list['Video']['filesize'] = t("File size of original video file (formatted)"); + $list['Video']['filesize-raw'] = t("File size of original video file (raw value)"); + $list['Video']['download'] = t("Download link for original video file"); } return $list;