Merge branch '3.2.x'

Author: Crizz0

composer.json

@@ -3,8 +3,8 @@
 	"type": "phpbb-extension",
 	"description": "Provides a pastebin including syntax highlighting",
 	"homepage": "https://www.phpbb.de/community/",
-	"version": "2.0.6",
-	"time": "2020-10-04",
+	"version": "2.0.7",
+	"time": "2023-10-03",
 	"license": "GPL-2.0-only",
 	"authors": [
 		{
@@ -21,7 +21,7 @@
 		}
 	],
 	"require": {
-		"php": ">=5.4.7, <=7.4",
+		"php": ">=7.2, <=8.2",
 		"easybook/geshi": ">=1.0.8.4"
 	},
 	"require-dev": {

composer.lock

@@ -156,7 +156,7 @@ private function display_pb()
 		$snippet_id		= $this->request->variable('s', 0);
 		$submit			= $this->request->is_set_post('submit');
 
-		if (in_array($mode, array('view', 'download', 'moderate')))
+		if (in_array($mode, array('view', 'download', 'moderate', 'edit_snippet')))
 		{
 			// for all of these we have to check if the entry exists
 
@@ -232,6 +232,34 @@ private function display_pb()
 		// Now let's decide what to do
 		switch ($mode)
 		{
+			case 'edit_snippet':
+				if (!check_form_key('pastebinform'))
+				{
+					trigger_error('PASTEBIN_FORM_INVALID');
+				}
+				else
+				{
+					$data = [
+						'snippet_id'	=> $snippet_id,
+						'snippet_text'	=> $this->request->raw_variable('edit_snippet', ''),
+					];
+
+					$snippet->load_from_array($data);
+					$snippet->submit();
+
+					$redirect_append = array("mode"=>"view","s"=>$snippet_id);
+					$redirect_url = $this->helper->route('phpbbde_pastebin_main_controller', $redirect_append);
+
+					$message = $this->language->lang('PASTEBIN_SNIPPET_MODERATED');
+					$message .= '<br /><br />';
+					$message .= $this->language->lang('PASTEBIN_RETURN_SNIPPET', '<a href="' . $redirect_url . '">', '</a>');
+
+					meta_refresh(3, $redirect_url);
+					trigger_error($message);
+				}
+
+        break;
+
 			case 'post':
 				// process submitted data from the posting form
 				if (!$this->auth->acl_get('u_pastebin_post'))
@@ -247,7 +275,7 @@ private function display_pb()
 				$data = array(
 						'snippet_title'		=> str_replace("\n", '', $this->request->variable('snippet_title', '', true)),
 						'snippet_desc'		=> str_replace("\n", '', $this->request->variable('snippet_desc', '', true)),
-						'snippet_text'		=> $this->request->variable('snippet_text', '', true),
+						'snippet_text'		=> $this->request->raw_variable('snippet_text', ''),
 						'snippet_prunable'	=> 1,
 						'snippet_highlight'	=> $this->request->variable('snippet_highlight', ''),
 						'snippet_prune_on'	=> max(1, min(6, $this->request->variable('pruning_months', 0))),
@@ -392,7 +420,7 @@ private function display_pb()
 						$highlight = 'php';
 					}
 
-					$code = htmlspecialchars_decode($snippet_text);
+					$code = $snippet_text;
 
 					$geshi = new \GeSHi($code, $highlight, $this->util->geshi_dir);
 					$geshi->set_header_type(GESHI_HEADER_NONE);
@@ -442,9 +470,9 @@ private function display_pb()
 					}
 
 					// Thanks download.php
-					$snippet_text = htmlspecialchars_decode(utf8_decode($data['snippet_text']));
+					$snippet_text = $data['snippet_text'];
 
-					$filename = htmlspecialchars_decode($data['snippet_title']) . '.' . $this->pastebin->file_ext();
+					$filename = $data['snippet_title'] . '.' . $this->pastebin->file_ext();
 
 					$user_agent = $this->request->server('HTTP_USER_AGENT', '');
 					if (strpos($user_agent, 'MSIE') !== false || strpos($user_agent, 'Safari') !== false || strpos($user_agent, 'Konqueror') !== false)

composer.phar

@@ -41,7 +41,7 @@ public function run()
 	{
 		$now = time();
 		$sql = 'DELETE FROM ' . $this->pastebin_table . '
-			WHERE snippet_prunable = 1 and snippet_prune_on < ' . $now;
+			WHERE snippet_prunable = 1 and snippet_prune_on < ' . (int) $now;
 		$this->db->sql_query($sql);
 		$this->config->set('phpbbde_pastebin_prune_last_run', $now, true);
 	}

controller/main.php

@@ -19,7 +19,7 @@
  */
 class acp_events implements EventSubscriberInterface
 {
-	static public function getSubscribedEvents()
+	public static function getSubscribedEvents()
 	{
 		return array(
 			'core.permissions'			=> 'add_permissions',