From 856650861f0c454b800fe816ba2592444ef13894 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 22 Apr 2006 16:18:40 +0000
Subject: - removed group settings from roles - added forum icon in front of
 forums in permissions acp - added trace permissions in permission masks
 (thanks naderman for writing the first code and for the idea... :)) - some
 bugfixes - PHP6 fix

git-svn-id: file:///svn/phpbb/trunk@5824 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/functions.php')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 886865f645..1fe1082ea5 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -425,13 +425,15 @@ function tz_select($default = '')
 /**
 * Topic and forum watching common code
 */
-function watch_topic_forum($mode, &$s_watching, &$s_watching_img, $user_id, $match_id, $notify_status = 'unset', $start = 0)
+function watch_topic_forum($mode, &$s_watching, &$s_watching_img, $user_id, $forum_id, $topic_id, $notify_status = 'unset', $start = 0)
 {
 	global $template, $db, $user, $phpEx, $SID, $start, $phpbb_root_path;
 
 	$table_sql = ($mode == 'forum') ? FORUMS_WATCH_TABLE : TOPICS_WATCH_TABLE;
 	$where_sql = ($mode == 'forum') ? 'forum_id' : 'topic_id';
-	$u_url = ($mode == 'forum') ? 'f' : 't';
+	$match_id = ($mode == 'forum') ? $forum_id : $topic_id;
+
+	$u_url = ($mode == 'forum') ? 'f' : 'f=' . $forum_id . '&amp;t';
 
 	// Is user watching this thread?
 	if ($user_id != ANONYMOUS)
@@ -2113,6 +2115,16 @@ function get_backtrace()
 		$output .= '<br />';
 		$output .= '<b>FILE:</b> ' . htmlspecialchars($trace['file']) . '<br />';
 		$output .= '<b>LINE:</b> ' . $trace['line'] . '<br />';
+
+		// Do not display the users password
+		if (strpos($trace['function'], 'login') !== false)
+		{
+			if (isset($args[1]))
+			{
+				$args[1] = "'***'";
+			}
+		}
+
 		$output .= '<b>CALL:</b> ' . htmlspecialchars($trace['class'] . $trace['type'] . $trace['function']) . '(' . ((sizeof($args)) ? implode(', ', $args) : '') . ')<br />';
 	}
 	$output .= '</div>';
-- 
cgit v1.2.1