PHP8 Forum code cleanup

2025-08-23 14:44:29 +02:00 · 2021-01-22 06:31:23 -08:00
parent aafd277331
commit 4a9cf379a6
5 changed files with 266 additions and 466 deletions
--- a/e107_plugins/forum/forum_viewtopic.php
+++ b/e107_plugins/forum/forum_viewtopic.php
@@ -33,8 +33,10 @@ if(!deftrue('BOOTSTRAP'))
 	e107::getLanguage()->bcDefs($bcDefs);
 }

-
-define('NAVIGATION_ACTIVE','forum');
+if(!defined('NAVIGATION_ACTIVE'))
+{
+	define('NAVIGATION_ACTIVE','forum');
+}

 $e107 = e107::getInstance();
 $tp = e107::getParser();
@@ -52,7 +54,7 @@ $highlight_search = isset($_POST['highlight_search']);
 if (!e_QUERY)
 {
 	//No parameters given, redirect to forum home
-	$url = e107::url('forum','index','full');
+	$url = e107::url('forum','index', null, ['mode'=>'full']);
 	e107::getRedirect()->go($url);
 	exit;
 }
@@ -254,220 +256,14 @@ else

 //TODO Clean up this mess!!

-// get info for main thread -------------------------------------------------------------------------------------------------------------------------------------------------------------------
-//---- Moved here to enclose $tVars.....
+
 $sc = e107::getScBatch('view', 'forum');

-//---- $tVars = new e_vars;
-//---- $forum->set_crumb(true, '', $tVars); // Set $BREADCRUMB (and BACKLINK)
+
 $forum->set_crumb(true, '', $thread->threadInfo); // Set $BREADCRUMB (and BACKLINK)
-//$tVars->BREADCRUMB = $crumbs['breadcrumb'];
-//$tVars->BACKLINK = $tVars->BREADCRUMB;
-//$tVars->FORUM_CRUMB = $crumbs['forum_crumb'];
-//---- $tVars->THREADNAME = $tp->toHTML($thread->threadInfo['thread_name'], true, 'no_hook, emotes_off');


-/*----
-	$prev = $forum->threadGetNextPrev('prev', $thread->threadId,$thread->threadInfo['forum_id'], $thread->threadInfo['thread_lastpost']);
-	$next = $forum->threadGetNextPrev('next', $thread->threadId,$thread->threadInfo['forum_id'], $thread->threadInfo['thread_lastpost']);

-	$options = array();
-
-	if($prev !== false)
-	{
-		$options[] = "<a class='btn btn-default btn-sm btn-small' href='" . e107::url('forum','topic', $prev) . "'>&laquo; " . LAN_FORUM_2001 . "</a>";
-	}
-	if($next !== false)
-	{
-		$options[] = "<a class='btn btn-default btn-sm btn-small' href='" .  e107::url('forum','topic', $next) . "'>" . LAN_FORUM_2002 . " &raquo;</a>";
-	}
-
-	$tVars->NEXTPREV = implode(" | ", $options);
----*/
-
-/*
-$tVars->NEXTPREV = "<a class='btn btn-default btn-sm btn-small' href='" . $e107->url->create('forum/thread/prev', array('id' => $thread->threadId)) . "'>&laquo; " . LAN_FORUM_2001 . "</a>";
-$tVars->NEXTPREV .= ' | '; // enabled to make it look better on v1 templates
-$tVars->NEXTPREV .= "<a class='btn btn-default btn-sm btn-small' href='" . $e107->url->create('forum/thread/prev', array('id' => $thread->threadId)) . "'>" . LAN_FORUM_2002 . " &raquo;</a>";
-*/
-
-/*----
-if ($forum->prefs->get('track') && USER)
-{
-	// BC Fix for old template.
-	if(!defined('IMAGE_track'))
-	{
-		define('IMAGE_track', 		'<img src="'.img_path('track.png').'" alt="'.LAN_FORUM_4009.'" title="'.LAN_FORUM_4009.'" class="icon S16 action" />');
-	}
-
-	if(!defined('IMAGE_untrack'))
-	{
-		define('IMAGE_untrack', 	'<img src="'.img_path('untrack.png').'" alt="'.LAN_FORUM_4010.'" title="'.LAN_FORUM_4010.'" class="icon S16 action" />');
-	}
-
-
-	$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
-
-	$url = e107::url('forum','index');
-
-	$tVars->TRACK .= "
-			<span id='forum-track-trigger-container'>
-			<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(){
-				$('forum-track-trigger').observe('click', function(e) {
-					e.stop();
-					new e107Ajax.Updater('forum-track-trigger-container', '{$url}', {
-						method: 'post',
-						parameters: { //send query parameters here
-							'track_toggle': 1
-						},
-						overlayPage: $(document.body)
-					});
-				});
-			}, document, true);
-			</script>
-	";*/
-
-
-/*----
-	$trackDiz = ($forum->prefs->get('trackemail',true)) ? LAN_FORUM_3040 : LAN_FORUM_3041;
-
-	$tVars->TRACK = "<a id='forum-track-button' href='#' title=\"".$trackDiz."\" data-token='".deftrue('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>
-";
-
-}
----*/
-
-/*----
-$modUser = array();
-foreach ( $forum->modArray as $user)
-{
-	$modUser[] = "<a href='".e107::getUrl()->create('user/profile/view', $user)."'>".$user['user_name']."</a>";
-}
-
-$tVars->MODERATORS = LAN_FORUM_2003.": ". implode(', ', $modUser);
-unset($modUser);
----*/
-
-//---- $tVars->THREADSTATUS = (!$thread->threadInfo['thread_active'] ? LAN_FORUM_2004 : '');
-
-/*----
-if ($thread->pages > 1)
-{
-	if(!$thread->page) $thread->page = 1;
-//	$url = rawurlencode(e107::getUrl()->create('forum/thread/view', array('name' => $thread->threadInfo['thread_name'], 'id' => $thread->threadId, 'page' => '[FROM]')));
-
-//	$url = e_REQUEST_SELF."?p=[FROM]"; // SEF URL Friendly.
-	$url = e107::url('forum','topic', $thread->threadInfo)."&amp;p=[FROM]";
-
-	$parms = "total={$thread->pages}&type=page&current={$thread->page}&url=".urlencode($url)."&caption=off&tmpl=default&navcount=4&glyphs=1";
-	
-	//XXX FIXME - pull-down template not practical here. Can we force another?
-
-	$tVars->GOTOPAGES = $tp->parseTemplate("{NEXTPREV={$parms}}");
-/*
-	$parms = ($thread->pages).",1,{$thread->page},url::forum::thread::func=view&id={$thread->threadId}&page=[FROM],off";
-	$tVars->GOTOPAGES = $tp->parseTemplate("{NEXTPREV={$parms}}");
-}
----*/
-
-/*----
-$tVars->BUTTONS = '';
-if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'post') && $thread->threadInfo['thread_active'])
-{
-	// print_a($thread->threadInfo);
-	$url = e107::url('forum','post')."?f=rp&amp;id=".$thread->threadInfo['thread_id']."&amp;post=".$thread->threadId;
-//	$url = $e107->url->create('forum/thread/reply', array('id' => $thread->threadId));
-	$tVars->BUTTONS .= "<a href='" . $url . "'>" . IMAGE_reply . "</a>";
-}
-if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'thread'))
-{
-	$ntUrl = e107::url('forum','post')."?f=nt&amp;id=". $thread->threadInfo['thread_forum_id'];
-//	$ntUrl = $e107->url->create('forum/thread/new', array('id' => $thread->threadInfo['thread_forum_id']));
-	$tVars->BUTTONS .= "<a href='" . $ntUrl . "'>" . IMAGE_newthread . "</a>";
-}
----*/
-/*----
-$tVars->BUTTONSX = forumbuttons($thread);
-
-function forumbuttons($thread)
-{
-	global $forum; 
-
-	
-	if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'post') && $thread->threadInfo['thread_active'])
-	{
-		$url = e107::url('forum','post')."?f=rp&amp;id=".$thread->threadInfo['thread_id']."&amp;post=".$thread->threadId;
-	//	$url = e107::getUrl()->create('forum/thread/reply', array('id' => $thread->threadId));
-		$replyUrl = "<a class='btn btn-primary' href='".$url."'>".LAN_FORUM_2006."</a>";
-	}
-	if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'thread'))
-	{
-		$ntUrl = e107::url('forum','post')."?f=nt&amp;id=". $thread->threadInfo['thread_forum_id'];
-	//	$ntUrl = e107::getUrl()->create('forum/thread/new', array('id' => $thread->threadInfo['thread_forum_id']));
-		$options[] = " <a  href='".$ntUrl."'>".LAN_FORUM_2005."</a>";
-	}	
-	
-//	$options[] = "<a href='" . e107::getUrl()->create('forum/thread/prev', array('id' => $thread->threadId)) . "'>".LAN_FORUM_1017." ".LAN_FORUM_2001."</a>";
-//	$options[] = "<a href='" . e107::getUrl()->create('forum/thread/prev', array('id' => $thread->threadId)) . "'>".LAN_FORUM_1017." ".LAN_FORUM_2002."</a>";
-
-	$prev = $forum->threadGetNextPrev('prev', $thread->threadId,$thread->threadInfo['forum_id'], $thread->threadInfo['thread_lastpost']);
-	$next = $forum->threadGetNextPrev('next', $thread->threadId,$thread->threadInfo['forum_id'], $thread->threadInfo['thread_lastpost']);
-
-	if($prev !== false)
-	{
-		$options[] = "<a href='" . e107::url('forum','topic', $prev) . "'>".LAN_FORUM_1017." ".LAN_FORUM_2001."</a>";
-	}
-	if($next !== false)
-	{
-		$options[] = "<a href='" .  e107::url('forum','topic', $next) . "'>".LAN_FORUM_1017." ".LAN_FORUM_2002."</a>";
-	}
-
-
-	$text = '<div class="btn-group">
-   '.$replyUrl.'
-    <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
-    <span class="caret"></span>
-    </button>
-    <ul class="dropdown-menu pull-right">
-    ';
-	
-	foreach($options as $key => $val)
-	{
-		$text .= '<li>'.$val.'</li>';
-	}
-	
-	$jumpList = $forum->forumGetAllowed();
-	
-	$text .= "<li class='divider'></li>";
-	
-	foreach($jumpList as $key=>$val)
-	{
-		$text .= '<li><a href ="'.e107::url('forum','forum',$val).'">'.LAN_FORUM_1017." ".$val['forum_name'].'</a></li>';
-	}
-	
-	$text .= '
-    </ul>
-    </div>';
-	
-	
-	return $text;
-	
-}
----*/
-
-
-//---- $tVars->POLL = vartrue($pollstr);
-
-//---- $tVars->FORUMJUMP = forumjump();
-
-//---- $tVars->MESSAGE = $thread->message;

 		$sc->setVars($thread->threadInfo);
 		$sc->setScVar('threadInfo', $thread->threadInfo);
@@ -482,12 +278,9 @@ $alt = false;

 $i = $thread->page;

-//---- Moved upwards, to enclose $tVars...
-//---- $sc = e107::getScBatch('view', 'forum');

 	$mes = e107::getMessage();
-//		$sc->setVars($thread->threadInfo);
-//--->$forend = $tp->simpleParse($FORUMEND, $tVars);
+
 $sc->wrapper('forum_viewtopic/end'); 
 $forend = $tp->parseTemplate($FORUMEND, true, $sc);

@@ -560,55 +353,9 @@ foreach ($postList as $c => $postInfo)
 }
 unset($loop_uid);

-/*---->
-if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'post') && $thread->threadInfo['thread_active'])
-{
-	//XXX Show only on the last page??
-	if (!vartrue($forum_quickreply))
-	{
-		$ajaxInsert = ($thread->pages == $thread->page || $thread->pages == 0) ? 1 : 0;
-	//	$ajaxInsert = 1;
-	//	echo "AJAX-INSERT=".$ajaxInsert ."(".$thread->pages." vs ".$thread->page.")";
-		$frm = e107::getForm();
-
-		$urlParms = array('f'=>'rp','id'=>$thread->threadInfo['thread_id'], 'post'=>$thread->threadInfo['thread_id']);
-		$url = e107::url('forum','post', null, array('query'=>$urlParms));; // ."?f=rp&amp;id=".$thread->threadInfo['thread_id']."&amp;post=".$thread->threadInfo['thread_id'];
-
-		$tVars->QUICKREPLY = "
-		<form action='" . $url . "' method='post'>
-		<div class='form-group'>
-			<textarea cols='80' placeholder='".LAN_FORUM_2007."' rows='4' id='forum-quickreply-text' class='tbox input-xxlarge form-control' name='post' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'></textarea>
-		</div>
-		<div class='center text-center form-group'>
-			<input type='submit' data-token='".e_TOKEN."' data-forum-insert='".$ajaxInsert."' data-forum-post='".$thread->threadInfo['thread_forum_id']."' data-forum-thread='".$threadId."' data-forum-action='quickreply' name='reply' value='".LAN_FORUM_2006. "' class='btn btn-success button' />
-			<input type='hidden' name='thread_id' value='".$threadId."' />
-		</div>
-		
-		</form>";
-
-		if(E107_DEBUG_LEVEL > 0)
-		{
-		//	echo "<div class='alert alert-info'>Thread id: ".$threadId."</div>";
-		//	print_a($this);
-		}


-				
-		// Preview should be reserved for the full 'Post reply' page. <input type='submit' name='fpreview' value='" . Preview . "' /> &nbsp;
-	}
-	else
-	{
-		$tVars->QUICKREPLY = $forum_quickreply;
-	}
-}
-<----*/

-/*--->
-	$mes = e107::getMessage();
-		$sc->setVars($thread->threadInfo);
-//--->$forend = $tp->simpleParse($FORUMEND, $tVars);
-$forend = $tp->parseTemplate($FORUMEND, true, $sc);
-<---*/
 $forumstring = $forstr . $forthr . vartrue($forrep) . $forend;

 //If last post came after USERLV and not yet marked as read, mark the thread id as read