From d838a825c8c51700bfef4a69ee064326262bab9e Mon Sep 17 00:00:00 2001
From: Achim Ennenbach <achim@simsync.de>
Date: Mon, 6 Aug 2018 21:50:25 +0200
Subject: [PATCH] fixes #3059 updated lans (removed html) Renamed lan vars
 Cleanup code in e_notify.php Fixed wrong event name in forum_class.php

---
 e107_plugins/forum/e_notify.php               | 250 +++++++-----------
 e107_plugins/forum/forum_class.php            |   2 +-
 .../languages/English/English_notify.php      |  16 +-
 3 files changed, 98 insertions(+), 170 deletions(-)

diff --git a/e107_plugins/forum/e_notify.php b/e107_plugins/forum/e_notify.php
index 5c8562db3..d183345bf 100644
--- a/e107_plugins/forum/e_notify.php
+++ b/e107_plugins/forum/e_notify.php
@@ -10,8 +10,6 @@
  *
 */
 
-// TODO - create notify messages + LAN
-
 if (!defined('e107_INIT')) { exit; }
 
 e107::lan('forum','notify',true); 
@@ -93,53 +91,62 @@ class forum_notify extends notify
 
 		return $config;
 	}
+
+
+	private function getData($type, $id)
+	{
+		if (intval($id) < 1) return false;
+		$qry = '';
+		switch($type)
+		{
+			case 'post':
+				$qry = 'SELECT f.forum_name, f.forum_sef, t.thread_id, t.thread_name, p.post_entry 
+						FROM `#forum_post` AS p
+						LEFT JOIN `#forum_thread` AS t ON (t.thread_id = p.post_thread)
+						LEFT JOIN `#forum` AS f ON (f.forum_id = t.thread_forum_id) 
+						WHERE p.post_id = ' . intval($id);
+				break;
+
+			case 'thread':
+				$qry = 'SELECT f.forum_name, f.forum_sef, t.thread_id, t.thread_name
+						FROM `#forum_thread` AS t
+						LEFT JOIN `#forum` AS f ON (f.forum_id = t.thread_forum_id) 
+						WHERE t.thread_id = ' . intval($id);
+				break;
+
+			default:
+				return false;
+		}
+
+		$sql = e107::getDb();
+		if($sql->gen($qry))
+		{
+			return $sql->fetch();
+		}
+		return false;
+
+	}
 	
 	//function forum_nt($data) 
 	function user_forum_topic_created($data) 
 	{
-		/*
-			[u] = username / realname?
-			[f] = forumname
-			[f2] = forumname 2
-			[s] = subject
-			[m] = message
-			[d] = deleted by
-			[p] = post id
-		*/
-
 		if (isset($data['id']) && isset($data['data']))
 		{
 			$message = 'Notify test: New thread created';
 		}
 		else
 		{
-			if(!isset($data['post_id']) || intval($data['post_id']) < 1)
-			{
-				return false;
-			}
-
 			$sef = $data['thread_sef'];
 
-			$sql = e107::getDb();
-			if($sql->gen('SELECT f.forum_name, f.forum_sef, t.thread_id, t.thread_name, p.post_entry 
-				FROM `#forum_post` AS p
-				LEFT JOIN `#forum_thread` AS t ON (t.thread_id = p.post_thread)
-				LEFT JOIN `#forum` AS f ON (f.forum_id = t.thread_forum_id) 
-				WHERE p.post_id = ' . intval($data['post_id'])))
-			{
-				$data = $sql->fetch();
-			}
-			else
-			{
-				return false;
-			}
+			$data = $this->getData('post', vartrue($data['post_id'], 0));
+			if ($data === false) return false;
 
 			$url = e107::url('forum', 'topic', array('thread_id' => $data['thread_id'], 'thread_sef' => $sef, 'forum_sef' => $data['forum_sef']), array('mode' => 'full'));
-			$message = e107::getParser()->lanVars(LAN_FORUM_NT_NEWTOPIC_MSG, array(
-				'u' => USERNAME,
-				'f' => $data['forum_name'],
-				's' => sprintf('<a href="%s">%s</a>', $url, $data['thread_name']),
-				'm' => e107::getParser()->toHTML($data['post_entry'], true, 'BODY')
+			$message = e107::getParser()->lanVars(nl2br(LAN_FORUM_NT_NEWTOPIC_MSG), array(
+				'user' => USERNAME,
+				'forum' => $data['forum_name'],
+				'thread' => sprintf('<a href="%s">%s</a>', $url, $data['thread_name']),
+				'post' => e107::getParser()->toHTML($data['post_entry'], true, 'BODY')
 			));
 		}
 		$this->send('user_forum_topic_created', LAN_PLUGIN_FORUM_NAME, $message);
@@ -155,34 +162,17 @@ class forum_notify extends notify
 		}
 		else
 		{
-			if(!isset($data['post_id']) || intval($data['post_id']) < 1)
-			{
-				return false;
-			}
-
 			$sef = $data['thread_sef'];
 
-			$sql = e107::getDb();
-			if($sql->gen('SELECT f.forum_name, f.forum_sef, t.thread_id, t.thread_name, p.post_entry 
-				FROM `#forum_post` AS p
-				LEFT JOIN `#forum_thread` AS t ON (t.thread_id = p.post_thread)
-				LEFT JOIN `#forum` AS f ON (f.forum_id = t.thread_forum_id) 
-				WHERE p.post_id = ' . intval($data['post_id'])))
-			{
-				$data = $sql->fetch();
-			}
-			else
-			{
-				return false;
-			}
-
+			$data = $this->getData('post', vartrue($data['post_id'], 0));
+			if ($data === false) return false;
 
 			$url = e107::url('forum', 'topic', array('thread_id' => $data['thread_id'], 'thread_sef' => $sef, 'forum_sef' => $data['forum_sef']), array('mode' => 'full'));
-			$message = e107::getParser()->lanVars(LAN_FORUM_NT_NEWTOPIC_PROB_MSG, array(
-				'u' => USERNAME,
-				'f' => $data['forum_name'],
-				's' => sprintf('<a href="%s">%s</a>', $url, $data['thread_name']),
-				'm' => e107::getParser()->toHTML($data['post_entry'], true, 'BODY')
+			$message = e107::getParser()->lanVars(nl2br(LAN_FORUM_NT_NEWTOPIC_PROB_MSG), array(
+				'user' => USERNAME,
+				'forum' => $data['forum_name'],
+				'thread' => sprintf('<a href="%s">%s</a>', $url, $data['thread_name']),
+				'post' => e107::getParser()->toHTML($data['post_entry'], true, 'BODY')
 			));
 		}
 
@@ -198,17 +188,17 @@ class forum_notify extends notify
 		}
 		else
 		{
-			if(!isset($data['old']) || !isset($data['new']))
+			if(!isset($data['old_thread']) || !isset($data['new_thread']))
 			{
 				return false;
 			}
 
-			$url = e107::url('forum', 'forum', array('forum_sef' => $data['new']['forum_sef'], 'forum_id' => $data['new']['forum_id']), array('mode' => 'full'));
-			$message = e107::getParser()->lanVars(LAN_FORUM_NT_TOPIC_MOVED_MSG, array(
-				'u' => USERNAME,
-				'f' => $data['old']['forum_name'],
-				'f2' => sprintf('<a href="%s">%s</a>', $url, $data['new']['forum_name']),
-				's' => $data['thread_name']
+			$url = e107::url('forum', 'forum', array('forum_sef' => $data['new_thread']['forum_sef'], 'forum_id' => $data['new_thread']['forum_id']), array('mode' => 'full'));
+			$message = e107::getParser()->lanVars(nl2br(LAN_FORUM_NT_TOPIC_MOVED_MSG), array(
+				'user' => USERNAME,
+				'forum' => $data['old_thread']['forum_name'],
+				'forum2' => sprintf('<a href="%s">%s</a>', $url, $data['new_thread']['forum_name']),
+				'thread' => $data['new_thread']['thread_name']
 			));
 		}
 
@@ -231,10 +221,10 @@ class forum_notify extends notify
 			}
 
 			$url = e107::url('forum', 'forum', array('forum_id' => $data['forum_id'], 'forum_sef' => $data['forum_sef']), array('mode' => 'full'));
-			$message = e107::getParser()->lanVars(LAN_FORUM_NT_TOPIC_DELETED_MSG, array(
-				'd' => USERNAME,
-				'f' => sprintf('<a href="%s">%s</a>', $url, $data['forum_name']),
-				's' => $data['thread_name']
+			$message = e107::getParser()->lanVars(nl2br(LAN_FORUM_NT_TOPIC_DELETED_MSG), array(
+				'user' => USERNAME,
+				'forum' => sprintf('<a href="%s">%s</a>', $url, $data['forum_name']),
+				'thread' => $data['thread_name']
 			));
 		}
 
@@ -250,32 +240,17 @@ class forum_notify extends notify
 		}
 		else
 		{
-			if(!isset($data['thread_id']) || intval($data['thread_id']) < 1)
-			{
-				return false;
-			}
-
-			$sql = e107::getDb();
-			if($sql->gen('SELECT f.forum_name, f.forum_sef, t.thread_id, t.thread_name
-				FROM `#forum_thread` AS t
-				LEFT JOIN `#forum` AS f ON (f.forum_id = t.thread_forum_id) 
-				WHERE t.thread_id = ' . intval($data['thread_id'])))
-			{
-				$data = $sql->fetch();
-			}
-			else
-			{
-				return false;
-			}
+			$data = $this->getData('thread', vartrue($data['thread_id'],0));
+			if ($data === false) return false;
 
 			$sef = eHelper::title2sef($data['thread_name'],'dashl');
 
 			$url = e107::url('forum', 'topic', array('thread_id' => $data['thread_id'], 'thread_sef' => $sef, 'forum_sef' => $data['forum_sef']), array('mode' => 'full'));
-			$message = e107::getParser()->lanVars(LAN_FORUM_NT_TOPIC_UPDATED_MSG, array(
-				'u' => USERNAME,
-				'f' => $data['forum_name'],
-				's' => sprintf('<a href="%s">%s</a>', $url, $data['thread_name']),
-				'm' => e107::getParser()->toHTML($data['post_entry'], true, 'BODY')
+			$message = e107::getParser()->lanVars(nl2br(LAN_FORUM_NT_TOPIC_UPDATED_MSG), array(
+				'user' => USERNAME,
+				'forum' => $data['forum_name'],
+				'thread' => sprintf('<a href="%s">%s</a>', $url, $data['thread_name']),
+				'post' => e107::getParser()->toHTML($data['post_entry'], true, 'BODY')
 			));
 		}
 		$this->send('user_forum_topic_updated', LAN_FORUM_NT_12, $message);
@@ -305,32 +280,16 @@ class forum_notify extends notify
 		}
 		else
 		{
-			if(!isset($data['post_id']) || intval($data['post_id']) < 1)
-			{
-				return false;
-			}
-
-			$sql = e107::getDb();
-			if($sql->gen('SELECT f.forum_name, f.forum_sef, t.thread_id, t.thread_name, p.post_entry 
-				FROM `#forum_post` AS p
-				LEFT JOIN `#forum_thread` AS t ON (t.thread_id = p.post_thread)
-				LEFT JOIN `#forum` AS f ON (f.forum_id = t.thread_forum_id) 
-				WHERE p.post_id = ' . intval($data['post_id'])))
-			{
-				$data = $sql->fetch();
-			}
-			else
-			{
-				return false;
-			}
+			$data = $this->getData('post', vartrue($data['post_id'], 0));
+			if ($data === false) return false;
 
 			$sef = eHelper::title2sef($data['thread_name'],'dashl');
 			$url = e107::url('forum', 'topic', array('thread_id' => $data['thread_id'], 'thread_sef' => $sef, 'forum_sef' => $data['forum_sef']), array('mode' => 'full'));
-			$message = e107::getParser()->lanVars(LAN_FORUM_NT_POST_CREATED_MSG, array(
-				'u' => USERNAME,
-				'f' => $data['forum_name'],
-				's' => sprintf('<a href="%s">%s</a>', $url, $data['thread_name']),
-				'm' => e107::getParser()->toHTML($data['post_entry'], true, 'BODY')
+			$message = e107::getParser()->lanVars(nl2br(LAN_FORUM_NT_POST_CREATED_MSG), array(
+				'user' => USERNAME,
+				'forum' => $data['forum_name'],
+				'thread' => sprintf('<a href="%s">%s</a>', $url, $data['thread_name']),
+				'post' => e107::getParser()->toHTML($data['post_entry'], true, 'BODY')
 			));
 		}
 		$this->send('user_forum_post_created', LAN_FORUM_NT_14, $message);
@@ -345,32 +304,16 @@ class forum_notify extends notify
 		}
 		else
 		{
-			if(!isset($data['post_id']) || intval($data['post_id']) < 1)
-			{
-				return false;
-			}
-
-			$sql = e107::getDb();
-			if($sql->gen('SELECT f.forum_name, f.forum_sef, t.thread_id, t.thread_name, p.post_entry 
-				FROM `#forum_post` AS p
-				LEFT JOIN `#forum_thread` AS t ON (t.thread_id = p.post_thread)
-				LEFT JOIN `#forum` AS f ON (f.forum_id = t.thread_forum_id) 
-				WHERE p.post_id = ' . intval($data['post_id'])))
-			{
-				$data = $sql->fetch();
-			}
-			else
-			{
-				return false;
-			}
+			$data = $this->getData('post', vartrue($data['post_id'], 0));
+			if ($data === false) return false;
 
 			$sef = eHelper::title2sef($data['thread_name'],'dashl');
 			$url = e107::url('forum', 'topic', array('thread_id' => $data['thread_id'], 'thread_sef' => $sef, 'forum_sef' => $data['forum_sef']), array('mode' => 'full'));
-			$message = e107::getParser()->lanVars(LAN_FORUM_NT_POST_UPDATED_MSG, array(
-				'u' => USERNAME,
-				'f' => $data['forum_name'],
-				's' => sprintf('<a href="%s">%s</a>', $url, $data['thread_name']),
-				'm' => e107::getParser()->toHTML($data['post_entry'], true, 'BODY')
+			$message = e107::getParser()->lanVars(nl2br(LAN_FORUM_NT_POST_UPDATED_MSG), array(
+				'user' => USERNAME,
+				'forum' => $data['forum_name'],
+				'thread' => sprintf('<a href="%s">%s</a>', $url, $data['thread_name']),
+				'post' => e107::getParser()->toHTML($data['post_entry'], true, 'BODY')
 			));
 		}
 		$this->send('user_forum_post_updated', LAN_FORUM_NT_15, $message);
@@ -386,35 +329,20 @@ class forum_notify extends notify
 		}
 		else
 		{
-			if(isset($data['post_id']) && intval($data['post_id']) < 1)
-			{
-				return false;
-			}
-
 			$entry = e107::getParser()->toHTML($data['post_entry'], true, 'BODY');
 			$postid = $data['post_id'];
 
-			$sql = e107::getDb();
-			if($sql->gen('SELECT f.forum_name, f.forum_sef, t.thread_id, t.thread_name 
-				FROM `#forum_thread` AS t
-				LEFT JOIN `#forum` AS f ON (f.forum_id = t.thread_forum_id) 
-				WHERE t.thread_id = ' . intval($data['post_thread'])))
-			{
-				$data = $sql->fetch();
-			}
-			else
-			{
-				return false;
-			}
+			$data = $this->getData('thread', vartrue($data['post_thread'], 0));
+			if ($data === false) return false;
 
 			$sef = eHelper::title2sef($data['thread_name'],'dashl');
 			$url = e107::url('forum', 'topic', array('thread_id' => $data['thread_id'], 'thread_sef' => $sef, 'forum_sef' => $data['forum_sef']), array('mode' => 'full'));
-			$message = e107::getParser()->lanVars(LAN_FORUM_NT_POST_DELETED_MSG, array(
-				'd' => USERNAME,
-				'f' => $data['forum_name'],
-				's' => sprintf('<a href="%s">%s</a>', $url, $data['thread_name']),
-				'p' => $postid,
-				'm' => $entry
+			$message = e107::getParser()->lanVars(nl2br(LAN_FORUM_NT_POST_DELETED_MSG), array(
+				'user' => USERNAME,
+				'forum' => $data['forum_name'],
+				'thread' => sprintf('<a href="%s">%s</a>', $url, $data['thread_name']),
+				'postid' => $postid,
+				'post' => $entry
 			));
 		}
 		$this->send('user_forum_post_deleted', LAN_FORUM_NT_10, $message);
diff --git a/e107_plugins/forum/forum_class.php b/e107_plugins/forum/forum_class.php
index 1b488d2c4..9e881c9b1 100644
--- a/e107_plugins/forum/forum_class.php
+++ b/e107_plugins/forum/forum_class.php
@@ -930,7 +930,7 @@ class e107forum
 		$this->forumUpdateLastpost('forum', $oldForumId, false);
 		$this->forumUpdateLastpost('forum', $newForumId, false);
 
-		e107::getEvent()->trigger('user_forum_thread_moved', array(
+		e107::getEvent()->trigger('user_forum_topic_moved', array(
 			'old_thread' => $threadInfo,
 			'new_thread' => $this->threadGet($threadId)
 			));
diff --git a/e107_plugins/forum/languages/English/English_notify.php b/e107_plugins/forum/languages/English/English_notify.php
index c7e36c96c..c4d65f1b8 100644
--- a/e107_plugins/forum/languages/English/English_notify.php
+++ b/e107_plugins/forum/languages/English/English_notify.php
@@ -24,12 +24,12 @@ define("LAN_FORUM_NT_POST_DELETED", "Post deleted");
 define("LAN_FORUM_NT_POST_REPORTED", "Post reported");
 
 
-define("LAN_FORUM_NT_NEWTOPIC_MSG", "New thread in forum [f] created by: [u]<br/>Subject: [s]<br/><br/>Message:<br/>[m]<br/><br/>");
-define("LAN_FORUM_NT_NEWTOPIC_PROB_MSG", "New thread in forum [f] created by new user: [u]<br/>Subject: [s]<br/><br/>Message:<br/>[m]<br/><br/>");
-define("LAN_FORUM_NT_TOPIC_UPDATED_MSG", "Thread [s] (Forum name: [f]) has been updated by: [u]<br/><br/>");
-define("LAN_FORUM_NT_TOPIC_DELETED_MSG", "Thread [s] in forum [f] deleted by: [d]<br/><br/>");
-define("LAN_FORUM_NT_TOPIC_MOVED_MSG", "Thread [s] has been moved from [f] to forum [f2] by: [u]<br/><br/>");
+define("LAN_FORUM_NT_NEWTOPIC_MSG", "New thread in forum [forum] created by: [user]\nSubject: [thread]\n\nMessage:\n[post]");
+define("LAN_FORUM_NT_NEWTOPIC_PROB_MSG", "New thread in forum [forum] created by new user: [user]\nSubject: [thread]\n\nMessage:\n[post]");
+define("LAN_FORUM_NT_TOPIC_UPDATED_MSG", "Thread [thread] (Forum name: [forum]) has been updated by: [user]");
+define("LAN_FORUM_NT_TOPIC_DELETED_MSG", "Thread [thread] in forum [forum] deleted by: [user]");
+define("LAN_FORUM_NT_TOPIC_MOVED_MSG", "Thread [thread] has been moved from [forum] to forum [forum2] by: [user]");
 
-define("LAN_FORUM_NT_POST_CREATED_MSG", "New message in thread [s] (Forum name: [f]) created by: [u]<br/>Message:<br/>[m]<br/><br/>");
-define("LAN_FORUM_NT_POST_UPDATED_MSG", "Message in thread [s] (Forum name: [f]) updated by: [u]<br/>Message:<br/>[m]<br/><br/>");
-define("LAN_FORUM_NT_POST_DELETED_MSG", "Message #[p] of thread [s] in forum [f] deleted by: [d]<br/><br/>Message:<br/>[m]<br/><br/>");
+define("LAN_FORUM_NT_POST_CREATED_MSG", "New message in thread [thread] (Forum name: [forum]) created by: [user]\nMessage:\n[post]");
+define("LAN_FORUM_NT_POST_UPDATED_MSG", "Message in thread [thread] (Forum name: [forum]) updated by: [user]\nMessage:\n[post]");
+define("LAN_FORUM_NT_POST_DELETED_MSG", "Message #[postid] of thread [thread] in forum [forum] deleted by: [user]\n\nMessage:\n[post]");