Merge pull request #18 from gn36/ticket/12

[ticket/12] Add snippet creation/deletion times to display

Author: gn36

controller/main.php

@@ -213,6 +213,7 @@ private function display_pb()
 				'URL'			=> $this->helper->route('phpbbde_pastebin_main_controller', array('mode'=>'view', 's' => $row['snippet_id'])),
 				'DESC'			=> $row['snippet_desc'],
 				'TITLE'			=> $row['snippet_title'],
+				'SNIPPET_TIME'	=> $this->user->format_date($row['snippet_time']),
 				'TITLE_SHORT'	=> (utf8_strlen($row['snippet_title']) > 50) ? utf8_substr($row['snippet_title'], 0, 50) . '...' : $row['snippet_title'],
 				'AUTHOR_FULL'	=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
 			));
@@ -404,6 +405,8 @@ private function display_pb()
 						'SNIPPET_TEXT_ORIG'		=> $snippet_text,
 						'SNIPPET_TEXT_DISPLAY'	=> $snippet_text_display,
 
+						'SNIPPET_TIME'			=> $this->user->format_date($data['snippet_time']),
+						'SNIPPET_PRUNE_ON'		=> $data['snippet_prunable'] ? $this->user->format_date($data['snippet_prune_on']) : $this->user->lang['NEVER'],
 						'SNIPPET_DESC_V'		=> $data['snippet_desc'],
 						'SNIPPET_TITLE_V'		=> $data['snippet_title'],
 						'SNIPPET_AUTHOR'		=> $data['username'],

language/de/pastebin.php

@@ -92,6 +92,8 @@
 	'SNIPPET_MODERATED'			=> 'Das Snippet wurde erfolgreich bearbeitet.',
 	'SNIPPET_TEXT'				=> 'Dein Code',
 	'SNIPPET_TITLE'				=> 'Titel',
+	'SNIPPET_CREATION_TIME'		=> 'Snippet erstellt',
+	'SNIPPET_PRUNE_TIME'		=> 'Snippet wird automatisch gelöscht',
 	'SNIPPET_PLAIN'				=> 'zeige einfaches Snippet',
 	'SNIPPET_PRUNABLE'			=> 'Eintrag prunable - automatisch löschbar',
 	'SNIPPET_PRUNABLE_EXPLAIN'	=> 'Wenn diese Option deaktiviert ist, wird der Eintrag nicht in die monatlich automatisch zu löschenden Einträge aufgenommen.',

language/en/pastebin.php

@@ -89,6 +89,8 @@
 	'SNIPPET_MODERATED'			=> 'The entry was sucessfully edited.',
 	'SNIPPET_TEXT'				=> 'Your code',
 	'SNIPPET_TITLE'				=> 'Title',
+	'SNIPPET_CREATION_TIME'		=> 'Entry created on',
+	'SNIPPET_PRUNE_TIME'		=> 'Entry will be automatically deleted',
 	'SNIPPET_PLAIN'				=> 'Show simple entry.',
 	'SNIPPET_PRUNABLE'			=> 'Entry prunable',
 	'SNIPPET_PRUNABLE_EXPLAIN'	=> 'If this option is disabled, the entry will not be entered in the monthly list of prunable entries.',

styles/prosilver/template/pastebin_body.html

@@ -67,7 +67,7 @@ <h3>{L_LATEST_SNIPPETS}</h3>
 	<!-- IF .latest_snippets -->
 	<ul>
 		<!-- BEGIN latest_snippets -->
-			<li><a href="{latest_snippets.URL}" title="{latest_snippets.TITLE}<!-- IF latest_snippets.DESC -->: {latest_snippets.DESC}<!-- ENDIF -->">{latest_snippets.TITLE_SHORT}</a> ({latest_snippets.AUTHOR_FULL})</li>
+			<li><a href="{latest_snippets.URL}" title="{latest_snippets.TITLE}<!-- IF latest_snippets.DESC -->: {latest_snippets.DESC}<!-- ENDIF -->">{latest_snippets.TITLE_SHORT}</a> ({latest_snippets.SNIPPET_TIME}, {latest_snippets.AUTHOR_FULL})</li>
 		<!-- END latest_snippets -->
 	</ul>
 	<!-- ELSE -->

styles/prosilver/template/pastebin_view.html

@@ -4,6 +4,10 @@ <h3>{SNIPPET_TITLE_V}</h3>
 	<dl>
 		<dt><strong>{L_SNIPPET_DESC}:</strong></dt>
 		<dd>{SNIPPET_DESC_V}</dd>
+		<dt><strong>{L_SNIPPET_CREATION_TIME}:</strong></dt>
+		<dd>{SNIPPET_TIME}</dd>
+		<dt><strong>{L_SNIPPET_PRUNE_TIME}:</strong></dt>
+		<dd>{SNIPPET_PRUNE_ON}</dd>
 	</dl>
 	<br />
 	<!-- ENDIF -->