Empty commit

2025-01-18 20:21:37 +00:00 · 2013-02-07 08:00:47 +00:00 · 2013-02-07 08:00:47 +00:00 · df129a5ba5
commit df129a5ba5
parent b1324098d8
52 changed files with 396 additions and 412 deletions
--- a/classes/class_irc.php
+++ b/classes/class_irc.php
@ -138,22 +138,12 @@ protected function ip_check($IP,$Gline=false,$Channel=BOT_REPORT_CHAN) {
 				$this->send_raw('GLINE *@'.$IP.' 90d :DNSBL Proxy');
 			}
 		}
-		$IPBans = $Cache->get_value('ip_bans');
-		if(!is_array($IPBans)) {
-			$DB->query("SELECT FromIP, ToIP FROM ip_bans");
-			$IPBans = $DB->to_array();
-			$Cache->cache_value('ip_bans', $IPBans, 0);
-		}
-		foreach($IPBans as $IPBan) {
-			list($FromIP, $ToIP) = $IPBan;
-			$Long = ip2long($IP);
-			if($Long >= $FromIP && $Long <= $ToIP) {
+		if(Tools::site_ban_ip($IP)) {
 			$this->send_to($Channel, 'Site IP Ban Detected: '.$IP);
 			if ($Gline) {
 				$this->send_raw('GLINE *@'.$IP.' 90d :IP Ban');
 			}
 		}
-		}
 	}*/

 	protected function listen() {
--- a/classes/class_text.php
+++ b/classes/class_text.php
@ -623,7 +623,7 @@ private function to_html ($Array) {
 					$Str.='<a href="wiki.php?action=article&amp;name='.urlencode($Block['Val']).'">'.$Block['Val'].'</a>';
 					break;
 				case 'tex':
-					$Str.='<img style="vertical-align: middle" src="'.STATIC_SERVER.'blank.gif" onload="if (this.src.substr(this.src.length-9,this.src.length) == \'blank.gif\') { this.src = \'http://chart.apis.google.com/chart?cht=tx&amp;chf=bg,s,FFFFFF00&amp;chl='.urlencode(mb_convert_encoding($Block['Val'],"UTF-8","HTML-ENTITIES")).'&amp;chco=\' + hexify(getComputedStyle(this.parentNode,null).color); }" />';
+					$Str.='<img style="vertical-align: middle" src="'.STATIC_SERVER.'blank.gif" onload="if (this.src.substr(this.src.length-9,this.src.length) == \'blank.gif\') { this.src = \'http://chart.apis.google.com/chart?cht=tx&amp;chf=bg,s,FFFFFF00&amp;chl='.urlencode(mb_convert_encoding($Block['Val'],"UTF-8","HTML-ENTITIES")).'&amp;chco=\' + hexify(getComputedStyle(this.parentNode,null).color); }" alt="TeX" />';
 					break;
 				case 'plain':
 					$Str.=$Block['Val'];
@ -710,11 +710,11 @@ private function to_html ($Array) {
 							$Str.='<blockquote class="hidden spoiler">'.$this->to_html($Block['Val']).'</blockquote>';
 						}
 						else {
-							$Str .= '<strong>Use of the [mature] tag requires a description.</strong> The correct format is as follows: <strong>[mature=description] ...content... [/mature]</strong>, where "description" is a mandatory description of the post. Misleading descriptions will be penalized. For further information on our mature content policies, please refer to this <a href="wiki.php?action=article&id=1063">wiki</a>.';
+							$Str .= '<strong>Use of the [mature] tag requires a description.</strong> The correct format is as follows: <strong>[mature=description] ...content... [/mature]</strong>, where "description" is a mandatory description of the post. Misleading descriptions will be penalized. For further information on our mature content policies, please refer to this <a href="wiki.php?action=article&amp;id=1063">wiki</a>.';
 						}
 					}
 					else {
-						$Str .= '<span class="mature_blocked" style="font-style:italic;"><a href="wiki.php?action=article&id=1063">Mature content </a>has been blocked. You can choose to view mature content by editing your <a href="user.php?action=edit&userid=' . $LoggedUser['ID'] . '">settings</a>.</span>';
+						$Str .= '<span class="mature_blocked" style="font-style:italic;"><a href="wiki.php?action=article&amp;id=1063">Mature content </a>has been blocked. You can choose to view mature content by editing your <a href="user.php?action=edit&amp;userid=' . $LoggedUser['ID'] . '">settings</a>.</span>';
 					}
 					break;
 				case 'img':
--- a/classes/class_text3.php
+++ b/classes/class_text3.php
@ -440,7 +440,7 @@ function to_html($Array) {
 					$Str.='<a href="wiki.php?action=article&amp;name='.urlencode($Block['Val']).'">'.$Block['Val'].'</a>';
 					break;
 				case 'tex':
-					$Str.='<img style="vertical-align: middle" src="'.STATIC_SERVER.'blank.gif" onload="if (this.src.substr(this.src.length-9,this.src.length) == \'blank.gif\') { this.src = \'http://chart.apis.google.com/chart?cht=tx&amp;chf=bg,s,FFFFFF00&amp;chl='.urlencode(mb_convert_encoding($Block['Val'],"UTF-8","HTML-ENTITIES")).'&amp;chco=\' + hexify(getComputedStyle(this.parentNode,null).color); }" />';
+					$Str.='<img style="vertical-align: middle" src="'.STATIC_SERVER.'blank.gif" onload="if (this.src.substr(this.src.length-9,this.src.length) == \'blank.gif\') { this.src = \'http://chart.apis.google.com/chart?cht=tx&amp;chf=bg,s,FFFFFF00&amp;chl='.urlencode(mb_convert_encoding($Block['Val'],"UTF-8","HTML-ENTITIES")).'&amp;chco=\' + hexify(getComputedStyle(this.parentNode,null).color); }" alt="TeX" />';
 					break;
 				case 'plain':
 					$Str.=$Block['Val'];
--- a/sections/requests/new_edit.php
+++ b/sections/requests/new_edit.php
@ -310,7 +310,7 @@
 					</td>
 				</tr>
 				<tr id="logcue_tr" class="hidden">
-					<td class="label">Log / Cue (FLAC only)</td>
+					<td class="label">Log / Cue (CD FLAC only)</td>
 					<td>
 						<input type="checkbox" id="needlog" name="needlog" onchange="ToggleLogScore()" <?=(!empty($NeedLog) ? 'checked="checked" ' : '')?>/><label for="needlog"> Require Log</label>
 						<span id="minlogscore_span" class="hidden">&nbsp;<input type="text" name="minlogscore" id="minlogscore" size="4" value="<?=(!empty($MinLogScore) ? $MinLogScore : '')?>" /> Minimum Log Score</span>
--- a/sections/requests/request.php
+++ b/sections/requests/request.php
@ -325,7 +325,7 @@
 			</tr>
 <?		if(!empty($LogCue)) { ?>
 			<tr>
-				<td class="label">Required FLAC only extra(s)</td>
+				<td class="label">Required CD FLAC only extra(s)</td>
 				<td>
 					<?=$LogCue?>
 				</td>
--- a/sections/requests/takenew_edit.php
+++ b/sections/requests/takenew_edit.php
@ -165,7 +165,7 @@
 		}

 		if (($NeedCue || $NeedLog)) {
-			if (!empty($_POST['all_media']) || $MediaArray[0] != 0) {
+			if (!(empty($_POST['all_media']) && $MediaArray[0] == 0)) {
 				$Err = "Only CD is allowed as media for FLAC Log/Cue Requests.";
 			}
 		}
--- a/sections/rules/chat.php
+++ b/sections/rules/chat.php
@ -72,13 +72,13 @@
 				No language other than English is permitted in the forums. If we can't understand it, we can't moderate it.
 			</li>
 			<li>
-                Be cautious when posting mature content on the forums. All mature imagery must abide by <a href="wiki.php?action=article&id=1063">the rules found here</a>. Gratuitously sexual or violent content which falls outside of the allowable categories will result in a warning or worse.
+				Be cautious when posting mature content on the forums. All mature imagery must abide by <a href="wiki.php?action=article&amp;id=1063">the rules found here</a>. Gratuitously sexual or violent content which falls outside of the allowable categories will result in a warning or worse.
 			</li>
 			<li>
 				Mature content in posts must be properly tagged. The correct format is as follows: <strong>[mature=description] ...content... [/mature]</strong>, where “description” is a mandatory description of the post contents. Misleading or inadequate descriptions will be penalized.
 			</li>
 			<li>
-                Threads created for the exclusive purpose of posting mature imagery will be trashed. Mature content (including graphic album art) should be contextually relevant to the thread and/or forum you’re posting in. Mature content is only allowed in: The Lounge, The Lounge +1, The Library, Music, Power Users, Elite, Torrent Masters, VIPs, Comics, Contests & Designs, The Laboratory. If you are in doubt about a post’s appropriateness, send a <a href="staff.php">Staff PM to the Forum Moderators</a> and wait for a reply before proceeding.
+				Threads created for the exclusive purpose of posting mature imagery will be trashed. Mature content (including graphic album art) should be contextually relevant to the thread and/or forum you’re posting in. Mature content is only allowed in: The Lounge, The Lounge +1, The Library, Music, Power Users, Elite, Torrent Masters, VIPs, Comics, Contests &amp; Designs, The Laboratory. If you are in doubt about a post’s appropriateness, send a <a href="staff.php">Staff PM to the Forum Moderators</a> and wait for a reply before proceeding.
 			</li>
 		</ul>
 	</div>
--- a/sections/staff/functions.php
+++ b/sections/staff/functions.php
@ -17,7 +17,7 @@ function get_fls() {
 			JOIN users_main AS m ON m.ID=i.UserID
 			JOIN permissions AS p ON p.ID=m.PermissionID
 			JOIN users_levels AS l ON l.UserID = i.UserID
-			WHERE l.PermissionID = 41");
+			WHERE l.PermissionID = ".FLS_TEAM);
 		$FLS = $DB->to_array(false, MYSQLI_BOTH, array(3,'Paranoia'));
 		$Cache->cache_value('fls', $FLS, 180);
 	}
--- a/sections/staff/index.php
+++ b/sections/staff/index.php
@ -53,7 +53,7 @@
 	<div class="box pad" style="padding:0px 10px 10px 10px;">
 		<br />
 		<h3>Forum Moderators</h3>
-		<p>Forum Mods are users who have been promoted to help moderate the forums. They can only help with forum oriented questions</p>
+		<p>Forum Moderators are users who have been promoted to help moderate the forums. They can only help with forum-oriented questions.</p>
 		<table class="staff" width="100%">
 			<tr class="colhead">
 				<td style="width:130px;">Username</td>
--- a/sections/tools/managers/bans.php
+++ b/sections/tools/managers/bans.php
@ -4,10 +4,11 @@
 if (isset($_POST['submit'])) {
 	authorize();

+	$IPA = substr($_POST['start'], 0, strcspn($_POST['start'], '.'));
 	if ($_POST['submit'] == 'Delete') { //Delete
 		if(!is_number($_POST['id']) || $_POST['id'] == ''){ error(0); }
 		$DB->query('DELETE FROM ip_bans WHERE ID='.$_POST['id']);
-		$Bans = $Cache->delete_value('ip_bans');
+		$Cache->delete_value('ip_bans_'.$IPA);
 	} else { //Edit & Create, Shared Validation
 		$Val->SetFields('start', '1','regex','You must include the starting IP address.',array('regex'=>'/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i'));
 		$Val->SetFields('end', '1','regex','You must include the ending IP address.',array('regex'=>'/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i'));
@ -28,19 +29,12 @@
 				ToIP='$End',
 				Reason='$Notes'
 				WHERE ID='".$_POST['id']."'");
-			$Bans = $Cache->get_value('ip_bans');
-			$Cache->begin_transaction();
-			$Cache->update_row($_POST['id'], array($_POST['id'], $Start, $End));
-			$Cache->commit_transaction();
 		} else { //Create
 			$DB->query("INSERT INTO ip_bans
 				(FromIP, ToIP, Reason) VALUES
 				('$Start','$End', '$Notes')");
-			$ID = $DB->inserted_id();
-			$Bans = $Cache->get_value('ip_bans');
-			$Bans[$ID] = array($ID, $Start, $End);
-			$Cache->cache_value('ip_bans', $Bans, 0);
 		}
+		$Cache->delete_value('ip_bans_'.$IPA);
 	}
 }

--- a/sections/tools/misc/quick_ban.php
+++ b/sections/tools/misc/quick_ban.php
@ -2,21 +2,20 @@

 if (!check_perms('admin_manage_ipbans')) { error(403); }
 	if (isset($_GET['perform'])) {
+		$IPA = substr($_GET['ip'], 0, strcspn($_GET['ip'], '.'));
 		if ($_GET['perform'] == 'delete') {
-					if(!is_number($_GET['id']) || $_GET['id'] == ''){ error(0); }
-					$DB->query('DELETE FROM ip_bans WHERE ID='.$_GET['id']);
-			$Bans = $Cache->delete_value('ip_bans');
+			if (!is_number($_GET['id']) || $_GET['id'] == '') {
+				error(0);
 			}
-		elseif($_GET['perform'] == 'create') {
+			$DB->query('DELETE FROM ip_bans WHERE ID='.$_GET['id']);
+			$Bans = $Cache->delete_value('ip_bans_'.$IPA);
+		} elseif ($_GET['perform'] == 'create') {
 			$Notes = db_string($_GET['notes']);
 			$IP = Tools::ip_to_unsigned($_GET['ip']); //Sanitized by Validation regex
 			$DB->query("INSERT INTO ip_bans
 				(FromIP, ToIP, Reason) VALUES
 				('$IP','$IP', '$Notes')");
-						$ID = $DB->inserted_id();
-						$Bans = $Cache->get_value('ip_bans');
-						$Bans[$ID] = array($ID, $Start, $End);
-						$Cache->cache_value('ip_bans', $Bans, 0);
+			$Cache->delete_value('ip_bans_'.$IPA);
 		}
 }

--- a/sections/torrents/edit.php
+++ b/sections/torrents/edit.php
@ -1,12 +1,12 @@
 <?
-//*********************************************************************//
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Edit form ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
+//**********************************************************************//
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Edit form ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
 // This page relies on the TORRENT_FORM class. All it does is call		//
 // the necessary functions.												//
-//---------------------------------------------------------------------//
+//----------------------------------------------------------------------//
 // At the bottom, there are grouping functions which are off limits to	//
 // most members.														//
-//*********************************************************************//
+//**********************************************************************//

 require(SERVER_ROOT.'/classes/class_torrent_form.php');

--- a/sections/upload/upload.php
+++ b/sections/upload/upload.php
@ -1,13 +1,13 @@
 <?
-//*********************************************************************//
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Upload form ~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
+//**********************************************************************//
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Upload form ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
 // This page relies on the TORRENT_FORM class. All it does is call		//
 // the necessary functions.												//
-//---------------------------------------------------------------------//
+//----------------------------------------------------------------------//
 // $Properties, $Err and $UploadForm are set in takeupload.php, and		//
 // are only used when the form doesn't validate and this page must be	//
 // called again.														//
-//*********************************************************************//
+//**********************************************************************//

 ini_set('max_file_uploads','100');
 View::show_header('Upload','upload,jquery,valid_tags,musicbrainz,multiformat_uploader');
--- a/sections/user/connchecker.php
+++ b/sections/user/connchecker.php
@ -41,7 +41,7 @@
 	<form class="manage_form" name="connections" action="javascript:check_ip();" method="get">
 		<table class="layout">
 			<tr>
-				<td class="label">IP</td>
+				<td class="label">IP address</td>
 				<td>
 					<input type="text" id="ip" name="ip" value="<?=$_SERVER['REMOTE_ADDR']?>" size="20" />
 				</td>
@ -57,7 +57,7 @@
 	</form>
 	<div id="result" class="box pad"></div>
 </div>
-<script type="text/javascript">
+<script type="text/javascript">//<![CDATA[
 var result = $('#result').raw();

 function check_ip() {
@ -68,5 +68,6 @@ function check_ip() {
 		result.innerHTML = response;
 	});
 }
+//]]>
 </script>
 <? View::show_footer(); ?>
--- a/sections/user/edit.php
+++ b/sections/user/edit.php
@ -291,7 +291,7 @@ function checked($Checked) {
 				</td>
 			</tr>
 		<tr>
-            <td class="label"><strong>Last.fm Username</strong></td>
+			<td class="label"><strong>Last.fm username</strong></td>
 			<td><input type="text" size="50" name="lastfm_username" id="lastfm_username" value="<?=display_str($LastFMUsername)?>" />
 				<p class="min_padding">Your Last.fm username. Will be used to display Last.fm information on your profile which can be seen by other users.</p>
 			</td>
--- a/sections/user/lastfm.php
+++ b/sections/user/lastfm.php
@ -28,5 +28,4 @@
 			</li>
 		</ul>
 	</div>
-
 <? } ?>
--- a/sections/userhistory/ip_history.php
+++ b/sections/userhistory/ip_history.php
@ -31,7 +31,7 @@

 View::show_header("IP history for $Username");
 ?>
-<script type="text/javascript">
+<script type="text/javascript">//<![CDATA[
 function ShowIPs(rowname) {
 	$('tr[name="'+rowname+'"]').toggle();

@ -69,10 +69,11 @@ function UnBan(ip, id, elemID) {
 				document.getElementById(elemID).onclick = function() { Ban(ip, id, elemID); return false;};
 			}
 		}
-		xmlhttp.open("GET","tools.php?action=quick_ban&perform=delete&id="+id,true);
+		xmlhttp.open("GET","tools.php?action=quick_ban&perform=delete&id=" + id + "&ip=" + ip,true);
 		xmlhttp.send();
 }
 */
+//]]>
 </script>
 <?
 list($Page,$Limit) = Format::page_limit(IPS_PER_PAGE);
@ -126,7 +127,7 @@ function UnBan(ip, id, elemID) {
 ?>
 <div class="thin">
 	<div class="header">
-		<h2>IP history for <a href="/user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
+		<h2>IP address history for <a href="/user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
 	</div>
 	<div class="linkbox">
 	<? if($UsersOnly) { ?>