* moved more templates to Twig

* now you can replace template in your main template, example is templates/kathrine/templates/success.html * removed output_errors, replace with template * some grammar fixes * moved some forum code to Twig templates * added movies link to tibiacom template
2025-10-14 09:44:55 +02:00 · 2017-08-31 17:01:17 +02:00
parent 7620ec896b
commit 37502c5562
26 changed files with 631 additions and 365 deletions
--- a/system/pages/forum.php
+++ b/system/pages/forum.php
@@ -28,6 +28,7 @@ $sections = array();
 foreach(getForumSections() as $section)
 {
 	$sections[$section['id']] = array(
+		'id' => $section['id'],
 		'name' => $section['name'],
 		'description' => $section['description'],
 		'closed' => $section['closed'] == '1'
@@ -130,22 +131,33 @@ if(!$logged)
 $number_of_rows = 0;
 if(empty($action))
 {
-	echo '<b>Boards</b>';
-	echo '<table width="100%"><tr bgcolor="'.$config['vdarkborder'].'"><td><font color="white" size="1"><b>Board</b></font></td><td><font color="white" size="1"><b>Posts</b></font></td><td><font color="white" size="1"><b>Threads</b></font></td><td align="center"><font color="white" size="1"><b>Last Post</b></font></td></tr>';
 	$info = $db->query("SELECT `section`, COUNT(`id`) AS 'threads', SUM(`replies`) AS 'replies' FROM `" . TABLE_PREFIX . "forum` WHERE `first_post` = `id` GROUP BY `section`")->fetchAll();
+	
+	$boards = array();
 	foreach($info as $data)
 		$counters[$data['section']] = array('threads' => $data['threads'], 'posts' => $data['replies'] + $data['threads']);
 	foreach($sections as $id => $section)
 	{
 		$last_post = $db->query("SELECT `players`.`name`, `" . TABLE_PREFIX . "forum`.`post_date` FROM `players`, `" . TABLE_PREFIX . "forum` WHERE `" . TABLE_PREFIX . "forum`.`section` = ".(int) $id." AND `players`.`id` = `" . TABLE_PREFIX . "forum`.`author_guid` ORDER BY `post_date` DESC LIMIT 1")->fetch();
-		echo '<tr bgcolor="'.getStyle(++$number_of_rows).'"><td><a href="' . getForumBoardLink($id) . '">'.$section['name'].'</a><br /><small>'.$section['description'].'</small></td><td>'.(int) (isset($counters[$id]['posts']) ? $counters[$id]['posts'] : 0).'</td><td>'.(int) (isset($counters[$id]['threads']) ? $counters[$id]['threads'] : 0).'</td><td>';
-		if(isset($last_post['name']))
-			echo date('d.m.y H:i:s', $last_post['post_date']).'<br />by ' . getPlayerLink($last_post['name']);
-		else
-			echo 'No posts';
-		echo '</td></tr>';
+		$boards[] = array(
+			'link' => getForumBoardLink($id),
+			'name' => $section['name'],
+			'description' => $section['description'],
+			'posts' => isset($counters[$id]['posts']) ? $counters[$id]['posts'] : 0,
+			'threads' => isset($counters[$id]['threads']) ? $counters[$id]['threads'] : 0,
+			'last_post' => array(
+				'name' => isset($last_post['name']) ? $last_post['name'] : null,
+				'date' => isset($last_post['post_date']) ? $last_post['post_date'] : null,
+				'player_link' => isset($last_post['name']) ? getPlayerLink($last_post['name']) : null,
+			)
+		);
 	}
-	echo '</table>';
+	
+	echo $twig->render('forum.boards.html', array(
+		'boards' => $boards,
+		'config' => $config
+	));
+	
 	return;
 }

@@ -166,7 +178,7 @@ if($action == 'show_board')
 	if(!$sections[$section_id]['closed'] || Forum::isModerator())
 	{
 		echo '<br /><br />
-		<a href="?subtopic=forum&action=new_topic&section_id='.$section_id.'"><img src="images/forum/topic.gif" border="0" /></a>';
+		<a href="?subtopic=forum&action=new_thread&section_id='.$section_id.'"><img src="images/forum/topic.gif" border="0" /></a>';
 	}

 	echo '<br /><br />Page: '.$links_to_pages.'<br />';
@@ -175,7 +187,7 @@ if($action == 'show_board')
 	{
 		echo '<table width="100%"><tr bgcolor="'.$config['vdarkborder'].'" align="center"><td><font color="white" size="1"><b>Thread</b></font></td><td><font color="white" size="1"><b>Thread Starter</b></font></td><td><font color="white" size="1"><b>Replies</b></font></td><td><font color="white" size="1"><b>Views</b></font></td><td><font color="white" size="1"><b>Last Post</b></font></td></tr>';
 		
-		$player = $ots->createObject('Player');
+		$player = new OTS_Player();
 		foreach($last_threads as $thread)
 		{
 			echo '<tr bgcolor="' . getStyle($number_of_rows++) . '"><td>';
@@ -209,7 +221,7 @@ if($action == 'show_board')
 		}
 		echo '</table>';
 		if(!$sections[$section_id]['closed'] || Forum::isModerator())
-			echo '<br /><a href="?subtopic=forum&action=new_topic&section_id='.$section_id.'"><img src="images/forum/topic.gif" border="0" /></a>';
+			echo '<br /><a href="?subtopic=forum&action=new_thread&section_id='.$section_id.'"><img src="images/forum/topic.gif" border="0" /></a>';
 	}
 	else
 		echo '<h3>No threads in this board.</h3>';
@@ -318,7 +330,7 @@ if($action == 'remove_post')
 			}
 		}
 		else
-			echo 'Post with ID '.$id.' does not exist.';
+			echo 'Post with ID ' . $id . ' does not exist.';
 	}
 	else
 		echo 'You are not logged in or you are not moderator.';
@@ -392,7 +404,7 @@ if($action == 'new_post')
 			if(!$saved)
 			{
 				if(!empty($errors))
-					output_errors($errors);
+					echo $twig->render('error_box.html', array('errors' => $errors));

 				echo '<form action="?" method="POST">
 					<input type="hidden" name="action" value="new_post" />
@@ -508,7 +520,7 @@ if($action == 'edit_post')
 				if(!$saved)
 				{
 					if(!empty($errors))
-						output_errors($errors);
+						echo $twig->render('error_box.html', array('errors' => $errors));

 					echo '<br /><form action="?" method="POST"><input type="hidden" name="action" value="edit_post" /><input type="hidden" name="id" value="'.$post_id.'" /><input type="hidden" name="subtopic" value="forum" /><input type="hidden" name="save" value="save" /><table width="100%"><tr bgcolor="'.$config['vdarkborder'].'"><td colspan="2"><font color="white"><b>Edit Post</b></font></td></tr><tr bgcolor="'.$config['darkborder'].'"><td width="180"><b>Character:</b></td><td><select name="char_id"><option value="0">(Choose character)</option>';
 					foreach($players_from_account as $player)
@@ -536,98 +548,93 @@ if($action == 'edit_post')
 		echo '<br />Your account is banned, deleted or you don\'t have any player with level '.$config['forum_level_required'].' on your account. You can\'t post.';
 }

-if($action == 'new_topic')
+if($action == 'new_thread')
 {
 	if(Forum::canPost($account_logged))
 	{
-		$players_from_account = $db->query("SELECT `players`.`name`, `players`.`id` FROM `players` WHERE `players`.`account_id` = ".(int) $account_logged->getId())->fetchAll();
-		$section_id = (int) $_REQUEST['section_id'];
-		echo '<a href="' . getPageLink('forum') . '">Boards</a> >> <a href="' . getForumBoardLink($section_id) . '">'.$sections[$section_id]['name'].'</a> >> <b>Post new thread</b><br />';
-		if(isset($sections[$section_id]['name']))
-		{
-			if($sections[$section_id]['closed'] && !Forum::isModerator())
-				$errors[] = 'You cannot create topic on this board.';
-
-			$quote = (int) (isset($_REQUEST['quote']) ? $_REQUEST['quote'] : 0);
-			$text = isset($_REQUEST['text']) ? stripslashes(trim($_REQUEST['text'])) : '';
-			$char_id = (int) (isset($_REQUEST['char_id']) ? $_REQUEST['char_id'] : 0);
-			$post_topic = isset($_REQUEST['topic']) ? stripslashes(trim($_REQUEST['topic'])) : '';
-			$smile = (int) (isset($_REQUEST['smile']) ? $_REQUEST['smile'] : 0);
-			$saved = false;
-			if(isset($_REQUEST['save']))
-			{
-				$lenght = 0;
-				for($i = 0; $i < strlen($post_topic); $i++)
-				{
-					if(ord($post_topic[$i]) >= 33 && ord($post_topic[$i]) <= 126)
-						$lenght++;
-				}
-				if($lenght < 1 || strlen($post_topic) > 60)
-					$errors[] = 'Too short or too long topic (short: '.$lenght.' long: '.strlen($post_topic).' letters). Minimum 1 letter, maximum 60 letters.';
-				$lenght = 0;
-				for($i = 0; $i < strlen($text); $i++)
-				{
-					if(ord($text[$i]) >= 33 && ord($text[$i]) <= 126)
-						$lenght++;
-				}
-				if($lenght < 1 || strlen($text) > 15000)
-					$errors[] = 'Too short or too long post (short: '.$lenght.' long: '.strlen($text).' letters). Minimum 1 letter, maximum 15000 letters.';
-				if($char_id == 0)
-					$errors[] = 'Please select a character.';
-				$player_on_account = false;
-				if(count($errors) == 0)
-				{
-					foreach($players_from_account as $player)
-						if($char_id == $player['id'])
-							$player_on_account = true;
-					if(!$player_on_account)
-						$errors[] = 'Player with selected ID '.$char_id.' doesn\'t exist or isn\'t on your account';
-				}
-				if(count($errors) == 0)
-				{
-					$last_post = 0;
-					$query = $db->query('SELECT post_date FROM ' . TABLE_PREFIX . 'forum ORDER BY post_date DESC LIMIT 1');
-					if($query->rowCount() > 0)
-					{
-						$query = $query->fetch();
-						$last_post = $query['post_date'];
+		$players_from_account = $db->query('SELECT `players`.`name`, `players`.`id` FROM `players` WHERE `players`.`account_id` = '.(int) $account_logged->getId())->fetchAll();
+		$section_id = isset($_REQUEST['section_id']) ? $_REQUEST['section_id'] : null;
+		if($section_id !== null) {
+			echo '<a href="' . getPageLink('forum') . '">Boards</a> >> <a href="' . getForumBoardLink($section_id) . '">' . $sections[$section_id]['name'] . '</a> >> <b>Post new thread</b><br />';
+			if (isset($sections[$section_id]['name'])) {
+				if ($sections[$section_id]['closed'] && !Forum::isModerator())
+					$errors[] = 'You cannot create topic on this board.';
+				
+				$quote = (int)(isset($_REQUEST['quote']) ? $_REQUEST['quote'] : 0);
+				$text = isset($_REQUEST['text']) ? stripslashes($_REQUEST['text']) : '';
+				$char_id = (int)(isset($_REQUEST['char_id']) ? $_REQUEST['char_id'] : 0);
+				$post_topic = isset($_REQUEST['topic']) ? stripslashes($_REQUEST['topic']) : '';
+				$smile = (int)(isset($_REQUEST['smile']) ? $_REQUEST['smile'] : 0);
+				$saved = false;
+				if (isset($_REQUEST['save'])) {
+					$errors = array();
+					
+					$lenght = 0;
+					for ($i = 0; $i < strlen($post_topic); $i++) {
+						if (ord($post_topic[$i]) >= 33 && ord($post_topic[$i]) <= 126)
+							$lenght++;
+					}
+					if ($lenght < 1 || strlen($post_topic) > 60)
+						$errors[] = 'Too short or too long topic (short: ' . $lenght . ' long: ' . strlen($post_topic) . ' letters). Minimum 1 letter, maximum 60 letters.';
+					$lenght = 0;
+					for ($i = 0; $i < strlen($text); $i++) {
+						if (ord($text[$i]) >= 33 && ord($text[$i]) <= 126)
+							$lenght++;
+					}
+					if ($lenght < 1 || strlen($text) > 15000)
+						$errors[] = 'Too short or too long post (short: ' . $lenght . ' long: ' . strlen($text) . ' letters). Minimum 1 letter, maximum 15000 letters.';
+					
+					if ($char_id == 0)
+						$errors[] = 'Please select a character.';
+					$player_on_account = false;
+					
+					if (count($errors) == 0) {
+						foreach ($players_from_account as $player)
+							if ($char_id == $player['id'])
+								$player_on_account = true;
+						if (!$player_on_account)
+							$errors[] = 'Player with selected ID ' . $char_id . ' doesn\'t exist or isn\'t on your account';
+					}
+					
+					if (count($errors) == 0) {
+						$last_post = 0;
+						$query = $db->query('SELECT `post_date` FROM `' . TABLE_PREFIX . 'forum` ORDER BY `post_date` DESC LIMIT 1');
+						if ($query->rowCount() > 0) {
+							$query = $query->fetch();
+							$last_post = $query['post_date'];
+						}
+						if ($last_post + $config['forum_post_interval'] - time() > 0 && !Forum::isModerator())
+							$errors[] = 'You can post one time per ' . $config['forum_post_interval'] . ' seconds. Next post after ' . ($last_post + $config['forum_post_interval'] - time()) . ' second(s).';
+					}
+					if (count($errors) == 0) {
+						$saved = true;
+						$db->query("INSERT INTO `" . TABLE_PREFIX . "forum` (`first_post` ,`last_post` ,`section` ,`replies` ,`views` ,`author_aid` ,`author_guid` ,`post_text` ,`post_topic` ,`post_smile` ,`post_date` ,`last_edit_aid` ,`edit_date`, `post_ip`) VALUES ('0', '" . time() . "', '" . (int)$section_id . "', '0', '0', '" . $account_logged->getId() . "', '" . (int)$char_id . "', " . $db->quote($text) . ", " . $db->quote($post_topic) . ", '" . (int)$smile . "', '" . time() . "', '0', '0', '" . $_SERVER['REMOTE_ADDR'] . "')");
+						$thread_id = $db->lastInsertId();
+						$db->query("UPDATE `" . TABLE_PREFIX . "forum` SET `first_post`=" . (int)$thread_id . " WHERE `id` = " . (int)$thread_id);
+						header('Location: ' . getForumThreadLink($thread_id));
+						echo '<br />Thank you for posting.<br /><a href="' . getForumThreadLink($thread_id) . '">GO BACK TO LAST THREAD</a>';
 					}
-					if($last_post+$config['forum_post_interval']-time() > 0 && !Forum::isModerator())
-						$errors[] = 'You can post one time per '.$config['forum_post_interval'].' seconds. Next post after '.($last_post+$config['forum_post_interval']-time()).' second(s).';
 				}
-				if(count($errors) == 0)
-				{
-					$saved = true;
-					$db->query("INSERT INTO `" . TABLE_PREFIX . "forum` (`id` ,`first_post` ,`last_post` ,`section` ,`replies` ,`views` ,`author_aid` ,`author_guid` ,`post_text` ,`post_topic` ,`post_smile` ,`post_date` ,`last_edit_aid` ,`edit_date`, `post_ip`) VALUES ('null', '0', '".time()."', '".(int) $section_id."', '0', '0', '".$account_logged->getId()."', '".(int) $char_id."', ".$db->quote($text).", ".$db->quote($post_topic).", '".(int) $smile."', '".time()."', '0', '0', '".$_SERVER['REMOTE_ADDR']."')");
-					$thread_id = $db->lastInsertId();
-					$db->query("UPDATE `" . TABLE_PREFIX . "forum` SET `first_post`=".(int) $thread_id." WHERE `id` = ".(int) $thread_id);
-					header('Location: ' . getForumThreadLink($thread_id));
-					echo '<br />Thank you for posting.<br /><a href="' . getForumThreadLink($thread_id) . '">GO BACK TO LAST THREAD</a>';
+				if (!$saved) {
+					if (!empty($errors))
+						echo $twig->render('error_box.html', array('errors' => $errors));
+					
+					echo $twig->render('forum.new_thread.html', array(
+						'section_id' => $section_id,
+						'config' => $config,
+						'players' => $players_from_account,
+						'post_player_id' => $char_id,
+						'post_thread' => $post_topic,
+						'text' => $text,
+						'smiles_enabled' => $smile > 0
+					));
 				}
 			}
-			if(!$saved)
-			{
-				if(!empty($errors))
-					output_errors($errors);
-
-				echo '<form action="?" method="POST"><input type="hidden" name="action" value="new_topic" /><input type="hidden" name="section_id" value="'.$section_id.'" /><input type="hidden" name="subtopic" value="forum" /><input type="hidden" name="save" value="save" /><table width="100%"><tr bgcolor="'.$config['vdarkborder'].'"><td colspan="2"><font color="white"><b>Post New Reply</b></font></td></tr><tr bgcolor="'.$config['darkborder'].'"><td width="180"><b>Character:</b></td><td><select name="char_id"><option value="0">(Choose character)</option>';
-				foreach($players_from_account as $player)
-				{
-					echo '<option value="'.$player['id'].'"';
-					if($player['id'] == $char_id)
-						echo ' selected="selected"';
-					echo '>'.$player['name'].'</option>';
-				}
-				echo '</select></td></tr><tr bgcolor="'.$config['lightborder'].'"><td><b>Topic:</b></td><td><input type="text" name="topic" value="'.htmlspecialchars($post_topic).'" size="40" maxlength="60" /> (Optional)</td></tr>
-				<tr bgcolor="'.$config['darkborder'].'"><td valign="top"><b>Message:</b><font size="1"><br />You can use:<br />[player]Nick[/player]<br />[url]http://address.com/[/url]<br />[img]http://images.com/images3.gif[/img]<br />[code]Code[/code]<br />[b]<b>Text</b>[/b]<br />[i]<i>Text</i>[/i]<br />[u]<u>Text</u>[/u]<br />and smileys:<br />;) , :) , :D , :( , :rolleyes:<br />:cool: , :eek: , :o , :p</font></td><td><textarea rows="10" cols="60" name="text">'.htmlspecialchars($text).'</textarea><br />(Max. 15,000 letters)</td></tr>
-				<tr bgcolor="'.$config['lightborder'].'"><td valign="top">Options:</td><td><label><input type="checkbox" name="smile" value="1"';
-				if($smile == 1)
-					echo ' checked="checked"';
-				echo '/>Disable Smileys in This Post </label></td></tr></table><center><input type="submit" value="Post Thread" /></center></form>';
-			}
+			else
+				echo 'Board with ID ' . $board_id . ' doesn\'t exist.';
 		}
 		else
-			echo 'Board with ID '.$board_id.' doesn\'t exist.';
+			echo 'Please enter section_id.';
 	}
 	else
 		echo 'Your account is banned, deleted or you don\'t have any player with level '.$config['forum_level_required'].' on your account. You can\'t post.';
@@ -645,6 +652,17 @@ if($action == 'move_thread')
 		{
 			if($post['id'] == $post['first_post'])
 			{
+				echo $twig->render('forum.move_thread.html', array(
+					'thread' => $post['post_topic'],
+					'author' => $name[0],
+					'board' => $sections[$post['section']]['name'],
+					'post_id' => $post['id'],
+					'sections' => $sections,
+					'section_link' => getForumBoardLink($post['section']),
+					'config' => $config
+				));
+				
+				/*
 				echo '<br/><table bgcolor='.$config['vdarkborder'].' border=0 cellpadding=2 cellspacing=0 width=100%>
 				<tr bgcolor='.$config['vdarkborder'].'><td class=white colspan=5><B>Move thread to another board</B></td></tr>
 				<tr><td><table border=0 cellpadding=3 cellspacing=1 width=100%>
@@ -656,11 +674,11 @@ if($action == 'move_thread')
 				<strong>THREAD:</strong> '.$post['post_topic'].'
 				<br/><strong>AUTHOR:</strong> '.$name[0].'
 				<br/><strong>BOARD:</strong> '.$sections[$post['section']]['name'].'<br/>
-				<br/><strong>Select the new board:&nbsp;</strong><SELECT NAME=sektion>';
+				<br/><strong>Select the new board:&nbsp;</strong><SELECT NAME=section>';
 				foreach($sections as $id => $section) { echo '<OPTION value="'.$id.'">'.$section['name'].'</OPTION>'; } echo '</SELECT>
 				<INPUT TYPE="submit" VALUE="Move Thread"></FORM>
 				<form action="' . getForumBoardLink($post['section']) . '" method="POST">
-				<input type="submit" value="Cancel"></form></td></tr></table></td></tr></table>';
+				<input type="submit" value="Cancel"></form></td></tr></table></td></tr></table>';*/
 			}
 		}
 		else
@@ -675,7 +693,7 @@ if($action == 'moved_thread')
 	if(Forum::isModerator())
 	{
 		$id = (int) $_REQUEST['id'];
-		$board = (int) $_REQUEST['sektion'];
+		$board = (int) $_REQUEST['section'];
 		$post = $db->query("SELECT `id`, `first_post`, `section` FROM `" . TABLE_PREFIX . "forum` WHERE `id` = ".$id." LIMIT 1")->fetch();
 		if($post['id'] == $id)
 		{
@@ -687,7 +705,7 @@ if($action == 'moved_thread')
 			}
 		}
 		else
-			echo 'Post with ID '.$id.' does not exist.';
+			echo 'Post with ID ' . $id . ' does not exist.';
 	}
 	else
 		echo 'You are not logged in or you are not moderator.';
@@ -707,10 +725,8 @@ class Forum

 		return
 			$db->query(
-				'SELECT ' . $db->fieldName('id') .
-				' FROM ' . $db->tableName('players') .
-				' WHERE ' . $db->fieldName('account_id') . ' = ' . $db->quote($account->getId()) .
-				' AND ' . $db->fieldName('level') . ' >= ' . $db->quote($config['forum_level_required']) .
+				'SELECT `id` FROM `players` WHERE `account_id` = ' . $db->quote($account->getId()) .
+				' AND `level` >= ' . $db->quote($config['forum_level_required']) .
 				' LIMIT 1')->rowCount() > 0;
 	}