Fixes file upload and a few small things, too (#21)

* Add new language object and use it in controller

* use service files.factory 

* Add a few more allowed file formats

* Add common checks

* Change get('uploadname') to get('filename') in controller/main.php

* Add snippet time to view template

* Remove duplicate error messages and redudant code

Author: Crizz0

config/services.yml

@@ -25,6 +25,8 @@ services:
             - '@dbal.conn'
             - '@template'
             - '@user'
+            - '@language'
+            - '@files.factory'
             - '@controller.helper'
             - '@captcha.factory'
             - '@phpbbde.pastebin.functions.utility'
@@ -37,10 +39,10 @@ services:
     phpbbde.pastebin.base_listener:
         class: phpbbde\pastebin\event\base_events
         arguments:
-            - '@auth'
             - '@template'
             - '@controller.helper'
             - '@user'
+            - '@language'
             - '%core.root_path%'
             - '%core.php_ext%'
         tags:

controller/main.php

@@ -27,29 +27,55 @@ static public function getSubscribedEvents()
 		);
 	}
 
+	/** @var \phpbb\template\template */
+	protected $template;
+
+	/** @var \phpbb\user */
+	protected $user;
+
+	/* @var \phpbb\language\language */
+	protected $language;
+
+	/** @var \phpbb\controller\helper */
+	protected $helper;
+
+	/** @var string */
+	protected $root_path;
+
+	/** @var string */
+	protected $php_ext;
+
 	/**
 	 * Constructor
 	 *
-	 * @param \phpbb\auth\auth			$auth		Auth object
 	 * @param \phpbb\template\template	$template	Template object
 	 * @param \phpbb\controller\helper	$helper 	Helper
+	 * @param \phpbb\user $user
+	 * @param \phpbb\language\language	$language
 	 * @param string			$phpbb_root_path		phpBB root path (community/)
 	 * @param string			$php_ext				php file extension (php)
 	 * @param string			$root_path				php file extension (...phpbb.de/)
 	 */
-	public function __construct(\phpbb\auth\auth $auth, \phpbb\template\template $template, \phpbb\controller\helper $helper, \phpbb\user $user, $phpbb_root_path, $php_ext)
+	public function __construct(
+		\phpbb\template\template $template,
+		\phpbb\controller\helper $helper,
+		\phpbb\user $user,
+		\phpbb\language\language $language,
+		$root_path,
+		$php_ext
+	)
 	{
-		$this->auth = $auth;
 		$this->template = $template;
-		$this->phpbb_root_path = $phpbb_root_path;
+		$this->root_path = $root_path;
 		$this->helper = $helper;
 		$this->php_ext = $php_ext;
 		$this->user = $user;
+		$this->language = $language;
 	}
 
 	public function page_header_after($event)
 	{
-		$this->user->add_lang_ext('phpbbde/pastebin', 'global');
+		$this->language->add_lang('global', 'phpbbde/pastebin');
 
 		$this->template->assign_vars(array(
 				// Main Menu
@@ -63,7 +89,7 @@ public function viewonline_page($event)
 		{
 			if (strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/pastebin') === 0)
 			{
-				$event['location'] = $this->user->lang('PASTEBIN_VIEWONLINE');
+				$event['location'] = $this->language->lang('PASTEBIN_VIEWONLINE');
 				$event['location_url'] = $this->helper->route('phpbbde_pastebin_main_controller');
 			}
 		}

event/base_events.php

@@ -206,7 +206,7 @@ function submit()
 	function delete()
 	{
 		$sql = 'DELETE FROM ' . $this->pastebin_table . '
-			WHERE snippet_id = ' . $this->data['snippet_id'];
+			WHERE snippet_id = ' . (int) $this->data['snippet_id'];
 		$this->db->sql_query($sql);
 		$this->empty_data();
 	}

functions/pastebin.php

@@ -34,7 +34,9 @@
 	'DOWNLOAD_SNIPPET'			=> 'Eintrag herunterladen',
 	'DOWNLOAD_SNIPPET_EXPLAIN'	=> 'Alternativ kannst du den gesamten Eintrag auch als Datei %sherunterladen%s.',
 
-	'ERR_NO_BODY'				=> 'Du hast kein Code eingefügt oder keine gültige Datei zum Upload ausgewählt.',
+	'DISALLOWED_EXTENSION'	=> 'Die Dateierweiterung %s ist nicht erlaubt',
+
+	'ERR_NO_BODY'				=> 'Du hast keinen Code eingefügt oder keine gültige Datei zum Upload ausgewählt.',
 	'ERR_NO_TITLE'				=> 'Du hast keinen Titel für den Eintrag eingegeben.',
 	'ERR_NO_DESC'				=> 'Du hast keine Beschreibung für den Eintrag eingegeben.',
 
@@ -53,7 +55,6 @@
 	'PASTEBIN_AUTH_NO_POST'		=> 'Du hast keine Berechtigung, einen Eintrag zu erstellen.',
 	'PASTEBIN_CONFIRM'			=> 'Visuelle Bestätigung',
 	'PASTEBIN_CONFIRM_EXPLAIN'	=> 'Gib den Code genau so ein, wie du ihn siehst; Groß- und Kleinschreibung wird nicht unterschieden, Null wird nicht verwendet.',
-	'PASTEBIN_DISALLOWED_EXTENSION'	=> 'Die Dateierweiterung %s ist nicht erlaubt',
 	'PASTEBIN_EMPTY_FILEUPLOAD'	=> 'Die hochgeladene Datei ist leer.',
 	'PASTEBIN_EXPLAIN'			=> 'Im Pastebin kannst du Codeabschnitte oder auch ganze Dateien ablegen, um sie zum Beispiel später in einem Supportthema zu verlinken.',
 	'PASTEBIN_HELLO'			=> 'Hat dich jemand hierher geschickt?',

language/de/pastebin.php

@@ -33,7 +33,9 @@
 	'DOWNLOAD_SNIPPET'			=> 'Download as file',
 	'DOWNLOAD_SNIPPET_EXPLAIN'	=> 'Alternatively, you can %sdownload%s the whole entry as a file.',
 
-	'ERR_NO_BODY'				=> 'You did not enter any code or upload a valid file.',
+	'DISALLOWED_EXTENSION'	=> 'The file extension %s is not allowed.',
+
+	'ERR_NO_BODY'				=> 'You did not enter any code or a valid file for upload.',
 	'ERR_NO_TITLE'				=> 'You did not enter a title for your entry.',
 	'ERR_NO_DESC'				=> 'You did not enter a description for your entry.',
 
@@ -52,11 +54,11 @@
 	'PASTEBIN_AUTH_NO_POST'		=> 'You are not authorized to enter a new entry.',
 	'PASTEBIN_CONFIRM'			=> 'Visual confirmation',
 	'PASTEBIN_CONFIRM_EXPLAIN'	=> 'Enter the code exactly as you see it; capitalization will be ignored, zero is not used.',
-	'PASTEBIN_DISALLOWED_EXTENSION'	=> 'The file extension %s is not allowed.',
 	'PASTEBIN_EMPTY_FILEUPLOAD'	=> 'The uploaded file is empty.',
 	'PASTEBIN_EXPLAIN'			=> 'In the pastebin, you can paste code snippets or whole files, for example to add a link to them to a support topic.',
 	'PASTEBIN_HELLO'			=> 'Did someone direct you here?',
 	'PASTEBIN_HELLO_EXPLAIN'	=> 'If you were directed here, please add the desired file or enter the code into the text area below and send the url to the person who sent you here.',
+	'PASTEBIN_INSTALLED'		=> 'Pastebin was successfully installed.',
 	'PASTEBIN_INVALID_FILENAME'	=> '%s is an invalid filename',
 	'PASTEBIN_NOT_UPLOADED'		=> 'The upload of the file failed.',
 	'PASTEBIN_NO_AUTH'			=> 'Information',
@@ -68,6 +70,7 @@
 	'PASTEBIN_POST'				=> 'New entry',
 	'PASTEBIN_POST_EXPLAIN'		=> 'Please enter a title, choose the language to highlight, and choose the storage duration. Optionally, you can add a description of the entry. Finally, you upload your code as a file <em>or</em> enter it in the text area below.',
 	'PASTEBIN_TOO_MANY'			=> 'You exeeded the maximum number of login trials. Please try again later.',
+	'PASTEBIN_UPDATED'			=> 'Pastebin was successfully updated to the latest version.',
 	'PASTEBIN_UPLOAD'			=> 'Upload file',
 	'PASTEBIN_UPLOAD_EXPLAIN'	=> 'If you selected a file for upload, code entered into the text area below will be ignored!',
 	'PASTEBIN_VIEW'				=> 'View entry - %s',

language/en/pastebin.php

@@ -1,5 +1,5 @@
 	<h3>{SNIPPET_TITLE_V}</h3>
-	<!-- IF SNIPPET_AUTHOR_FULL --><em class="author">{L_POST_BY_AUTHOR} {SNIPPET_AUTHOR_FULL}</em><!-- ENDIF -->
+	<!-- IF SNIPPET_AUTHOR_FULL --><em class="author">{L_POST_BY_AUTHOR} {SNIPPET_AUTHOR_FULL} ({SNIPPET_TIME})</em><!-- ENDIF -->
 	<!-- IF SNIPPET_DESC_V -->
 	<dl>
 		<dt><strong>{L_SNIPPET_DESC}:</strong></dt>

styles/prosilver/template/pastebin_view.html

@@ -20,7 +20,7 @@
 	display: block;
 	padding: 1em ;
 	margin-top: 1em;
-	margin-bottom: 1em;	
+	margin-bottom: 1em;
 }
 
 .pastebin #content {