mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-16 19:44:09 +02:00
Code Issues Releases Wiki Activity

Issue #784 Forum: Thread tracking - enable/disable functioning correctly. Actual notification requires work.

Browse Source
This commit is contained in:
Cameron
2016-01-31 14:39:41 -08:00
parent edf00641d2
commit fadc6eeb44
5 changed files with 114 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
e107_plugins/forum/forum_viewtopic.php
View File

@@ -69,15 +69,25 @@ if(vartrue($_GET['id']) && isset($_GET['dl']))
exit;
}
if(e_AJAX_REQUEST && varset($_POST['action']) == 'quickreply')
if(e_AJAX_REQUEST)
{
$forum->ajaxQuickReply();
}
if(e_AJAX_REQUEST && MODERATOR) // see javascript above.
{
$forum->ajaxModerate();
if(varset($_POST['action']) == 'quickreply')
{
$forum->ajaxQuickReply();
}
if(varset($_POST['action']) == 'track')
{
$forum->ajaxTrack();
}
if(MODERATOR)
{
$forum->ajaxModerate();
}
}
if (isset($_GET['last']))
{
@@ -91,11 +101,15 @@ if(isset($_GET['f']) && $_GET['f'] == 'post')
$thread->init();
/*
if(isset($_POST['track_toggle']))
{
$thread->toggle_track();
exit;
}
}*/
if(!empty($_GET['f']))
{
@@ -251,11 +265,15 @@ $tVars->NEXTPREV .= "<a class='btn btn-default btn-sm btn-small' href='" . $e107
if ($forum->prefs->get('track') && USER)
{
$img = ($thread->threadInfo['track_userid'] ? IMAGE_track : IMAGE_untrack);
/*
$url = $e107->url->create('forum/thread/view', array('id' => $thread->threadId), 'encode=0'); // encoding could break AJAX call
//FIXME
/*$tVars->TRACK .= "
$url = e107::url('forum','index');
$tVars->TRACK .= "
<span id='forum-track-trigger-container'>
<a class='btn btn-default btn-sm btn-small' href='{$url}' id='forum-track-trigger'>{$img}</a>
<a class='btn btn-default btn-sm btn-small e-ajax' data-target='forum-track-trigger' href='{$url}' id='forum-track-trigger'>{$img}</a>
</span>
<script type='text/javascript'>
e107.runOnLoad(function(){
@@ -273,6 +291,9 @@ if ($forum->prefs->get('track') && USER)
</script>
";*/
$tVars->TRACK = "<a id='forum-track-button' href='#' title=\"".LAN_FORUM_3040."\" data-token='".e_TOKEN."' data-forum-insert='forum-track-button' data-forum-post='".$thread->threadInfo['thread_forum_id']."' data-forum-thread='".$thread->threadInfo['thread_id']."' data-forum-action='track' name='track' class='e-tip btn btn-default' >".$img."</a>
";
}
@@ -754,7 +775,7 @@ class e107ForumThread
$this->noInc = false;
}
/*
function toggle_track()
{
@@ -778,6 +799,7 @@ class e107ForumThread
exit();
}
}
*/
/**
* @return bool|null|string|void