mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

Moved links from LANs to e_notify.

Browse Source 
Added toHTML() to parse the post messages.
This commit is contained in:
Achim Ennenbach
2018-08-04 20:04:51 +02:00
parent 480ccc20bc
commit 259b2321c4
2 changed files with 35 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
e107_plugins/forum/e_notify.php
View File

@@ -100,7 +100,7 @@ class forum_notify extends notify
/* /*
[u] = username / realname? [u] = username / realname?
[f] = forumname [f] = forumname
[l] = link / url [f2] = forumname 2
[s] = subject [s] = subject
[m] = message [m] = message
[d] = deleted by [d] = deleted by
@@ -134,13 +134,12 @@ class forum_notify extends notify
return 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( $message = e107::getParser()->lanVars(LAN_FORUM_NT_NEWTOPIC_MSG, array(
'u' => USERNAME, 'u' => USERNAME,
'f' => $data['forum_name'], 'f' => $data['forum_name'],
's' => $data['thread_name'], 's' => sprintf('<a href="%s">%s</a>', $url, $data['thread_name']),
'm' => $data['post_entry'], 'm' => e107::getParser()->toHTML($data['post_entry'], true, 'BODY')
'l' => e107::url('forum', 'topic', array('thread_id' => $data['thread_id'], 'thread_sef' => $sef, 'forum_sef' => $data['forum_sef']), array('mode' => 'full'))
)); ));
} }
$this->send('user_forum_topic_created', LAN_PLUGIN_FORUM_NAME, $message); $this->send('user_forum_topic_created', LAN_PLUGIN_FORUM_NAME, $message);
@@ -178,12 +177,12 @@ class forum_notify extends notify
} }
$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( $message = e107::getParser()->lanVars(LAN_FORUM_NT_NEWTOPIC_PROB_MSG, array(
'u' => USERNAME, 'u' => USERNAME,
'f' => $data['forum_name'], 'f' => $data['forum_name'],
's' => $data['thread_name'], 's' => sprintf('<a href="%s">%s</a>', $url, $data['thread_name']),
'm' => $data['post_entry'], 'm' => e107::getParser()->toHTML($data['post_entry'], true, 'BODY')
'l' => e107::url('forum', 'topic', array('thread_id' => $data['thread_id'], 'thread_sef' => $sef, 'forum_sef' => $data['forum_sef']), array('mode' => 'full'))
)); ));
} }
@@ -204,13 +203,12 @@ class forum_notify extends notify
return false; 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( $message = e107::getParser()->lanVars(LAN_FORUM_NT_TOPIC_MOVED_MSG, array(
'u' => USERNAME, 'u' => USERNAME,
'f' => $data['old']['forum_id'], 'f' => $data['old']['forum_name'],
'f1' => $data['new']['forum_id'], 'f2' => sprintf('<a href="%s">%s</a>', $url, $data['new']['forum_name']),
's' => $data['thread_name'], 's' => $data['thread_name']
'l' => e107::url('forum', 'forum', array('forum_sef' => $data['new']['forum_sef'], 'forum_id' => $data['new']['forum_id']), array('mode' => 'full'))
)); ));
} }
@@ -232,11 +230,11 @@ class forum_notify extends notify
return false; return false;
} }
$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( $message = e107::getParser()->lanVars(LAN_FORUM_NT_TOPIC_DELETED_MSG, array(
'd' => USERNAME, 'd' => USERNAME,
'f' => $data['forum_name'], 'f' => sprintf('<a href="%s">%s</a>', $url, $data['forum_name']),
's' => $data['thread_name'], 's' => $data['thread_name']
'l' => e107::url('forum', 'forum', array('forum_id' => $data['forum_id'], 'forum_sef' => $data['forum_sef']), array('mode' => 'full'))
)); ));
} }
@@ -272,12 +270,12 @@ class forum_notify extends notify
$sef = eHelper::title2sef($data['thread_name'],'dashl'); $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( $message = e107::getParser()->lanVars(LAN_FORUM_NT_TOPIC_UPDATED_MSG, array(
'u' => USERNAME, 'u' => USERNAME,
'f' => $data['forum_name'], 'f' => $data['forum_name'],
's' => $data['thread_name'], 's' => sprintf('<a href="%s">%s</a>', $url, $data['thread_name']),
'm' => $data['post_entry'], 'm' => e107::getParser()->toHTML($data['post_entry'], true, 'BODY')
'l' => e107::url('forum', 'topic', array('thread_id' => $data['thread_id'], 'thread_sef' => $sef, 'forum_sef' => $data['forum_sef']), array('mode' => 'full'))
)); ));
} }
$this->send('user_forum_topic_updated', LAN_FORUM_NT_12, $message); $this->send('user_forum_topic_updated', LAN_FORUM_NT_12, $message);
@@ -327,13 +325,12 @@ class forum_notify extends notify
} }
$sef = eHelper::title2sef($data['thread_name'],'dashl'); $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( $message = e107::getParser()->lanVars(LAN_FORUM_NT_POST_CREATED_MSG, array(
'u' => USERNAME, 'u' => USERNAME,
'f' => $data['forum_name'], 'f' => $data['forum_name'],
's' => $data['thread_name'], 's' => sprintf('<a href="%s">%s</a>', $url, $data['thread_name']),
'm' => $data['post_entry'], 'm' => e107::getParser()->toHTML($data['post_entry'], true, 'BODY')
'l' => e107::url('forum', 'topic', array('thread_id' => $data['thread_id'], 'thread_sef' => $sef, 'forum_sef' => $data['forum_sef']), array('mode' => 'full'))
)); ));
} }
$this->send('user_forum_post_created', LAN_FORUM_NT_14, $message); $this->send('user_forum_post_created', LAN_FORUM_NT_14, $message);
@@ -368,13 +365,12 @@ class forum_notify extends notify
} }
$sef = eHelper::title2sef($data['thread_name'],'dashl'); $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( $message = e107::getParser()->lanVars(LAN_FORUM_NT_POST_UPDATED_MSG, array(
'u' => USERNAME, 'u' => USERNAME,
'f' => $data['forum_name'], 'f' => $data['forum_name'],
's' => $data['thread_name'], 's' => sprintf('<a href="%s">%s</a>', $url, $data['thread_name']),
'm' => $data['post_entry'], 'm' => e107::getParser()->toHTML($data['post_entry'], true, 'BODY')
'l' => e107::url('forum', 'topic', array('thread_id' => $data['thread_id'], 'thread_sef' => $sef, 'forum_sef' => $data['forum_sef']), array('mode' => 'full'))
)); ));
} }
$this->send('user_forum_post_updated', LAN_FORUM_NT_15, $message); $this->send('user_forum_post_updated', LAN_FORUM_NT_15, $message);
@@ -395,7 +391,7 @@ class forum_notify extends notify
return false; return false;
} }
$entry = $data['post_entry']; $entry = e107::getParser()->toHTML($data['post_entry'], true, 'BODY');
$postid = $data['post_id']; $postid = $data['post_id'];
$sql = e107::getDb(); $sql = e107::getDb();
@@ -412,14 +408,13 @@ class forum_notify extends notify
} }
$sef = eHelper::title2sef($data['thread_name'],'dashl'); $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( $message = e107::getParser()->lanVars(LAN_FORUM_NT_POST_DELETED_MSG, array(
'd' => USERNAME, 'd' => USERNAME,
'f' => $data['forum_name'], 'f' => $data['forum_name'],
's' => $data['thread_name'], 's' => sprintf('<a href="%s">%s</a>', $url, $data['thread_name']),
'p' => $postid, 'p' => $postid,
'm' => $entry, 'm' => $entry
'l' => e107::url('forum', 'topic', array('thread_id' => $data['thread_id'], 'thread_sef' => $sef, 'forum_sef' => $data['forum_sef']), array('mode' => 'full'))
)); ));
} }
$this->send('user_forum_post_deleted', LAN_FORUM_NT_10, $message); $this->send('user_forum_post_deleted', LAN_FORUM_NT_10, $message);

16
e107_plugins/forum/languages/English/English_notify.php
View File

@@ -24,12 +24,12 @@ define("LAN_FORUM_NT_POST_DELETED", "Post deleted");
define("LAN_FORUM_NT_POST_REPORTED", "Post reported"); define("LAN_FORUM_NT_POST_REPORTED", "Post reported");
define("LAN_FORUM_NT_NEWTOPIC_MSG", "New thread in forum [f] created by: [u]<br/>Subject: <a href=\"[l]\">[s]</a><br/><br/>Message:<br/>[m]<br/><br/>"); 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: <a href=\"[l]\">[s]</a><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 <a href=\"[l]\">[s]</a> (Forum name: [f]) has been updated by: [u]<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 <a href=\"[l]\">[f]</a> deleted by: [d]<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 <a href=\"[l]\">[f2]</a> by: [u]<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_POST_CREATED_MSG", "New message in thread <a href=\"[l]\">[s]</a> (Forum name: [f]) created by: [u]<br/>Message:<br/>[m]<br/><br/>"); 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 <a href=\"[l]\">[s]</a> (Forum name: [f]) updated 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 <a href=\"[l]\">[s]</a> in forum [f] deleted by: [d]<br/><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/>");