Fix invalid form bug

Author: Mike-on-Tour

controller/main.php

@@ -233,7 +233,7 @@ private function display_pb()
 		switch ($mode)
 		{
 			case 'edit_snippet':
-				if (!check_form_key('phpbbde_pastebin_editform'))
+				if (!check_form_key('pastebinform'))
 				{
 					trigger_error('PASTEBIN_FORM_INVALID');
 				}
@@ -252,7 +252,7 @@ private function display_pb()
 
 					$message = $this->language->lang('PASTEBIN_SNIPPET_MODERATED');
 					$message .= '<br /><br />';
-					$message .= $this->language->lang('PASTEBIN_RETURN_' . ((!$delete) ? 'SNIPPET' : 'PASTEBIN'), '<a href="' . $redirect_url . '">', '</a>');
+					$message .= $this->language->lang('PASTEBIN_RETURN_SNIPPET', '<a href="' . $redirect_url . '">', '</a>');
 
 					meta_refresh(3, $redirect_url);
 					trigger_error($message);
@@ -627,7 +627,6 @@ private function display_pb()
 		$is_recaptcha = strpos($captcha_in_use, 'recaptcha');
 
 		add_form_key('pastebinform');
-		add_form_key('phpbbde_pastebin_editform');
 
 		$this->template->assign_vars(array(
 				'SNIPPET_TITLE'		=> isset($data['snippet_title']) ? $data['snippet_title'] : '',

language/de/permissions_pastebin.php

@@ -42,11 +42,11 @@
 	'ACL_U_PASTEBIN_POST'			=> 'Kann Snippets posten',
 	'ACL_U_PASTEBIN_POST_NOVC'		=> 'Kann Snippets posten ohne visuelle Bestätigung',
 	'ACL_U_PASTEBIN_POST_NOTLIM'	=> 'Kann Snippets dauerhaft in den Pastebin einstellen',
-	'ACL_U_PASTEBIN_EDIT'			=> 'Kann eigene Snippets bearbeiten (Speicherdauer, Syntaxhervorhebung)',
+	'ACL_U_PASTEBIN_EDIT'			=> 'Kann eigene Snippets bearbeiten (Speicherdauer, Syntaxhervorhebung, Quellcode)',
 	'ACL_U_PASTEBIN_DELETE'			=> 'Kann eigene Snippets löschen',
 
 	// Moderator perms,
-	'ACL_M_PASTEBIN_EDIT'			=> 'Kann Snippets editieren (Speicherdauer, Syntaxhervorhebung)',
+	'ACL_M_PASTEBIN_EDIT'			=> 'Kann Snippets editieren (Speicherdauer, Syntaxhervorhebung, Quellcode)',
 	'ACL_M_PASTEBIN_DELETE'			=> 'Kann Snippets löschen',
 	'ACL_M_PASTEBIN_POST_NOTLIM'	=> 'Kann die automatische Löschung von Snippets deaktivieren',
 ));

language/en/permissions_pastebin.php

@@ -42,11 +42,11 @@
 	'ACL_U_PASTEBIN_POST'			=> 'Can post pastebin entries',
 	'ACL_U_PASTEBIN_POST_NOVC'		=> 'Can post pastebin entries without visual confirmation',
 	'ACL_U_PASTEBIN_POST_NOTLIM'	=> 'Can post non-pruned pastebin entries',
-	'ACL_U_PASTEBIN_EDIT'			=> 'Can edit own pastebin entries (Storage duration, Syntax highlighting)',
+	'ACL_U_PASTEBIN_EDIT'			=> 'Can edit own pastebin entries (Storage duration, Syntax highlighting, Source code)',
 	'ACL_U_PASTEBIN_DELETE'			=> 'Can delete own pastebin entries',
 
 	// Moderator perms
-	'ACL_M_PASTEBIN_EDIT'			=> 'Can edit pastebin entries (Storage duration, Syntax highlighting)',
+	'ACL_M_PASTEBIN_EDIT'			=> 'Can edit pastebin entries (Storage duration, Syntax highlighting, Source code)',
 	'ACL_M_PASTEBIN_DELETE'			=> 'Can delete pastebin entries',
 	'ACL_M_PASTEBIN_POST_NOTLIM'	=> 'Can deactivate pruning of selected pastebin entries',
 ));