From 3fef0a5870b1f444e501f48ef3fdc40c4d55bbac Mon Sep 17 00:00:00 2001
From: Git <git@what.cd>
Date: Thu, 3 May 2012 08:00:25 +0000
Subject: [PATCH] Empty commit

---
 classes/class_irc.php                  |  2 +-
 sections/forums/newthread.php          |  5 +-
 sections/staffpm/ajax_get_response.php | 72 +++++++++++++-------------
 sections/user/index.php                |  2 +-
 sections/user/user.php                 |  2 +-
 5 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/classes/class_irc.php b/classes/class_irc.php
index 119306ac..c8cdb7cf 100644
--- a/classes/class_irc.php
+++ b/classes/class_irc.php
@@ -33,7 +33,7 @@ public function __construct() {
 
 	public function connect() {
 		//Open a socket to the IRC server
-		$this->Socket = fsockopen('ssl://'.BOT_SERVER, BOT_PORT_SSL);
+		$this->Socket = fsockopen('tls://'.BOT_SERVER, BOT_PORT_SSL);
 		stream_set_blocking($this->Socket, 0);
 
 		//create a socket to listen on
diff --git a/sections/forums/newthread.php b/sections/forums/newthread.php
index aee5bb7d..bded690c 100644
--- a/sections/forums/newthread.php
+++ b/sections/forums/newthread.php
@@ -91,7 +91,10 @@
 						<label for="subscribebox">Subscribe to topic</label>
 					</td>
 				</tr>
-<? if (check_perms('forums_polls_create')) { ?>
+<? 
+
+if (check_perms('forums_polls_create')) { 
+?>
 				<script type="text/javascript">
 				var AnswerCount = 1;
 
diff --git a/sections/staffpm/ajax_get_response.php b/sections/staffpm/ajax_get_response.php
index ffdef5c7..b1562d7e 100644
--- a/sections/staffpm/ajax_get_response.php
+++ b/sections/staffpm/ajax_get_response.php
@@ -1,36 +1,36 @@
-<?
-enforce_login();
-
-// Get user level
-$DB->query("
-	SELECT
-		i.SupportFor,
-		p.DisplayStaff
-	FROM users_info as i
-	JOIN users_main as m ON m.ID = i.UserID
-	JOIN permissions as p ON p.ID = m.PermissionID
-	WHERE i.UserID = ".$LoggedUser['ID']
-);
-list($SupportFor, $DisplayStaff) = $DB->next_record();
-
-if (!($SupportFor != '' || $DisplayStaff == '1')) {
-	// Logged in user is not FLS or Staff
-	error(403);
-}
-
-if ($ID = (int)$_GET['id']) {
-	$DB->query("SELECT Message FROM staff_pm_responses WHERE ID=$ID");
-	list($Message) = $DB->next_record();
-	if ($_GET['plain'] == 1) {
-		echo $Message;
-	} else {
-		include(SERVER_ROOT.'/classes/class_text.php'); // Text formatting class
-		$Text = new TEXT;
-		echo $Text->full_format($Message);
-	}
-	
-} else {
-	// No id
-	echo '-1';
-}
-?>
+<?
+enforce_login();
+
+// Get user level
+$DB->query("
+	SELECT
+		i.SupportFor,
+		p.DisplayStaff
+	FROM users_info as i
+	JOIN users_main as m ON m.ID = i.UserID
+	JOIN permissions as p ON p.ID = m.PermissionID
+	WHERE i.UserID = ".$LoggedUser['ID']
+);
+list($SupportFor, $DisplayStaff) = $DB->next_record();
+
+if (!$IsFLS) {
+	// Logged in user is not FLS or Staff
+	error(403);
+}
+
+if ($ID = (int)$_GET['id']) {
+	$DB->query("SELECT Message FROM staff_pm_responses WHERE ID=$ID");
+	list($Message) = $DB->next_record();
+	if ($_GET['plain'] == 1) {
+		echo $Message;
+	} else {
+		include(SERVER_ROOT.'/classes/class_text.php'); // Text formatting class
+		$Text = new TEXT;
+		echo $Text->full_format($Message);
+	}
+	
+} else {
+	// No id
+	echo '-1';
+}
+?>
diff --git a/sections/user/index.php b/sections/user/index.php
index b074417c..6a02c10b 100644
--- a/sections/user/index.php
+++ b/sections/user/index.php
@@ -74,7 +74,7 @@
 		include('takemoderate.php');
 		break;
 	case 'clearcache':
-		if (!check_perms('admin_clear_cache') || !check_perms('users_mod')) {
+		if (!check_perms('admin_clear_cache') || !check_perms('users_override_paranoia')) {
 			error(403);
 		}
 		$UserID = $_REQUEST['id'];
diff --git a/sections/user/user.php b/sections/user/user.php
index 006396e6..0f88639e 100644
--- a/sections/user/user.php
+++ b/sections/user/user.php
@@ -190,7 +190,7 @@ function check_paranoia_here($Setting) {
 ?>
 		[<a href="userhistory.php?action=token_history&amp;userid=<?=$UserID?>">FL Tokens</a>]
 <? } 
-if (check_perms('admin_clear_cache') && check_perms('users_mod')) {
+if (check_perms('admin_clear_cache') && check_perms('users_override_paranoia')) {
 ?>
 		[<a href="user.php?action=clearcache&amp;id=<?=$UserID?>">Clear Cache</a>]
 <? } ?>