Empty commit

classes/class_torrent.php

@@ -256,18 +256,21 @@ function file_list() {
 			$FileList[]= array($this->Val['info']->Val['length'], $this->Val['info']->Val['name']);
 		} else { // Multiple file mode
 			$FileNames = array();
+			$FileSizes = array();
 			$TotalSize = 0;
 			$Files = $this->Val['info']->Val['files']->Val;
 			foreach($Files as $File) {
-				$TotalSize+=$File->Val['length'];
+				$TotalSize += $File->Val['length'];
 				$FileSize = $File->Val['length'];
 				
 				$FileName = ltrim(implode('/',$File->Val['path']->Val), '/');
-				
+				$FileSizes[] = $FileSize;
-				$FileList[] = array($FileSize, $FileName);
 				$FileNames[] = $FileName;
 			}
-			array_multisort($FileNames, $FileList);
+			natcasesort($FileNames);
+			foreach($FileNames as $Index => $FileName) {
+				$FileList[] = array($FileSizes[$Index], $FileName);
+			}
 		}
 		return array($TotalSize, $FileList);
 	}

classes/class_torrent_32bit.php

@@ -77,11 +77,15 @@ class BENCODE {
 	var $Pos = 1; // Pointer that indicates our position in the string
 	var $Str = ''; // Torrent string
 	
-	function BENCODE($Val){
+	function __construct($Val, $IsParsed = false){
-		$this->Str = $Val;
+		if(!$IsParsed) {
-		$this->dec();
+			$this->Str = $Val;
+			$this->dec();
+		} else {
+			$this->Val = $Val;
+		}
 	}
-	
+
 	// Decode an element based on the type
 	function decode($Type, $Key){
 		if(ctype_digit($Type)) { // Element is a string
@@ -248,16 +252,21 @@ function file_list() {
 			$TotalSize = substr($this->Val['info']->Val['length'],7);
 			$FileList[]= array($TotalSize, $this->Val['info']->Val['name']);
 		} else { // Multiple file mode
+			$FileNames = array();
+			$FileSizes = array();
 			$TotalSize = 0;
 			$Files = $this->Val['info']->Val['files']->Val;
 			foreach($Files as $File) {
-				$TotalSize+=substr($File->Val['length'], 7);
+				$FileSize = substr($File->Val['length'], 7);
-				$FileSize = substr($File->Val['length'],7);
+				$TotalSize += $FileSize;
-				
-				$FileName = implode('/',$File->Val['path']->Val);
-				
-				$FileList[]=array($FileSize, $FileName);
 				
+				$FileName = ltrim(implode('/',$File->Val['path']->Val), '/');
+				$FileSizes[] = $FileSize;
+				$FileNames[] = $FileName;
+			}
+			natcasesort($FileNames);
+			foreach($FileNames as $Index => $FileName) {
+				$FileList[] = array($FileSizes[$Index], $FileName);
 			}
 		}
 		return array($TotalSize, $FileList);

sections/forums/index.php

@@ -74,7 +74,10 @@
 			break;
 		case 'add_poll_option':
 			require(SERVER_ROOT.'/sections/forums/add_poll_option.php');
-			break;
+            break;
+        case 'warn':
+            require(SERVER_ROOT.'/sections/forums/warn.php');
+            break;
 		case 'take_warn':
             require(SERVER_ROOT.'/sections/forums/take_warn.php');
             break;

sections/forums/take_warn.php

@@ -11,6 +11,12 @@
 $UserID = (int)$_POST['userid'];
 $Key = (int)$_POST['key'];
 $SQLTime = sqltime();
+
+$UserInfo = user_info($UserID);
+if($UserInfo['Class'] > $LoggedUser['Class']) {
+    error(403);
+}
+
 $URL = "https://".SSL_SITE_URL."/forums.php?action=viewthread&postid=$PostID#post$PostID";
 if ($Length != 'verbal') {
     $Time = ((int)$Length) * (7 * 24 * 60 * 60);

sections/forums/thread.php

@@ -412,9 +412,15 @@
                 if(check_perms('users_warn') && $AuthorID != $LoggedUser['ID']) { 
                     $AuthorInfo = user_info($AuthorID);
                     if($LoggedUser['Class'] >= $AuthorInfo['Class']) { ?>
-                    - <a href="forums.php?action=warn&postid=<?=$PostID?>&userid=<?=$AuthorID?>&key=<?=$Key?>">[Warn]</a>
+                        <form action="" style="display: none;" name="warn<?=$PostID?>" method="post">
-<?                  }
+                        <input type="hidden" name="action" value="warn" />
-                }
+                        <input type="hidden" name="postid" value="<?=$PostID?>" />
+                        <input type="hidden" name="userid" value="<?=$AuthorID?>" />
+                        <input type="hidden" name="key" value="<?=$Key?>" />
+                        </form>
+                        - <a href="#" onclick="document.warn<?=$PostID?>.submit(); return false;">[Warn]</a>
+<?                  } ?>
+<?  }
 ?>
                 &nbsp;
 				<a href="#">&uarr;</a>

sections/forums/warn.php

@@ -1,9 +1,9 @@
 <?php
 if (!check_perms('users_warn')) { error(404);}
-isset_request($_GET, array('postid', 'userid', 'key'));
+isset_request($_POST, array('postid', 'userid', 'key'));
-$PostID = (int) $_GET['postid'];
+$PostID = (int) $_POST['postid'];
-$UserID = (int)$_GET['userid'];
+$UserID = (int)$_POST['userid'];
-$Key = (int)$_GET['key'];
+$Key = (int)$_POST['key'];
 $UserInfo = user_info($UserID);
 $DB -> query("SELECT
     p.Body, t.ForumID

sections/reportsv2/array.php

@@ -235,7 +235,8 @@
 				'reason' => '-1',
 				'title' => 'Bonus Tracks Only',
 				'report_messages' => array(
-					'If possible, please provide a link to Amazon.com or another source showing the proper track listing.'
+					'If possible, please provide a link to Amazon.com or another source showing the proper track listing.',
+					'Per <a href="rules.php?p=upload#r2.4.5">rule 2.4.5</a>, exclusive WEB-sourced bonus tracks are allowed to be uploaded separately.'
 				),
 				'report_fields' => array(
 					'track' => '0',

sections/stats/torrents.php

@@ -60,11 +60,11 @@
 
 <div class="box pad center">
 	<h1>Uploads by month</h1>
-	<img src="http://chart.apis.google.com/chart?cht=lc&chs=880x160&chco=000D99,99000D,00990D&chg=0,-1,1,1&chxt=y,x&chxs=0,h&chxl=1:|<?=implode('|',$Labels)?>&chxr=0,0,<?=$Max?>&chd=t:<?=implode(',',$InFlow)?>|<?=implode(',',$OutFlow)?>|<?=implode(',',$NetFlow)?>&chls=2,4,0&chdl=Uploads|Deletions|Remaining&amp;chf=bg,s,FFFFFF00" />
+	<img src="http://chart.apis.google.com/chart?cht=lc&chs=880x160&chco=000D99,99000D,00990D&chg=0,-1,1,1&chxt=y,x&chxs=0,h&chxl=1:|<?=implode('|',$Labels)?>&chxr=0,0,<?=$Max?>&chd=t:<?=implode(',',$InFlow)?>|<?=implode(',',$OutFlow)?>|<?=implode(',',$NetFlow)?>&chls=2,4,0&chdl=Uploads|Deletions|Remaining&amp;chf=bg,s,FFFFFF00" alt="User Flow Chart" />
 </div>
 <div class="box pad center">
 	<h1>Torrents by category</h1>
-	<img src="<?=$Categories?>" />
+	<img src="<?=$Categories?>" alt="" />
 </div>
 <?
 show_footer();

sections/stats/users.php

@@ -127,36 +127,36 @@
 ?>
 <h3>User Flow</h3>
 <div class="box pad center">
-	<img src="http://chart.apis.google.com/chart?cht=lc&chs=880x160&chco=000D99,99000D&chg=0,-1,1,1&chxt=y,x&chxs=0,h&chxl=1:|<?=implode('|',$Labels)?>&chxr=0,0,<?=$Max?>&chd=t:<?=implode(',',$InFlow)?>|<?=implode(',',$OutFlow)?>&chls=2,4,0&chdl=New+Registrations|Disabled+Users&amp;chf=bg,s,FFFFFF00" />
+	<img src="http://chart.apis.google.com/chart?cht=lc&chs=880x160&chco=000D99,99000D&chg=0,-1,1,1&chxt=y,x&chxs=0,h&chxl=1:|<?=implode('|',$Labels)?>&chxr=0,0,<?=$Max?>&chd=t:<?=implode(',',$InFlow)?>|<?=implode(',',$OutFlow)?>&chls=2,4,0&chdl=New+Registrations|Disabled+Users&amp;chf=bg,s,FFFFFF00" alt="User Flow Chart" />
 </div>
 <br />
 <h3>User Classes</h3>
 <div class="box pad center">
-	<img src="<?=$ClassDistribution?>" />
+	<img src="<?=$ClassDistribution?>" alt="User Class Distribution" />
 </div>
 <br />
 <h3>User Platforms</h3>
 <div class="box pad center">
-	<img src="<?=$PlatformDistribution?>" />
+	<img src="<?=$PlatformDistribution?>" alt="User Platform Distribution" />
 </div>
 <br />
 <h3>User Browsers</h3>
 <div class="box pad center">
-	<img src="<?=$BrowserDistribution?>" />
+	<img src="<?=$BrowserDistribution?>" alt="User Browsers Market Share" />
 </div>
 <br />
 <h3>Geographical Distribution Map</h3>
 <div class="box center">
-	<img src="http://chart.apis.google.com/chart?cht=map:fixed=-55,-180,73,180&chs=440x220&chd=t:<?=implode(',',$Rank)?>&chco=FFFFFF,EDEDED,1F0066&chld=<?=implode('|',$Countries)?>&chf=bg,s,CCD6FF" />
+	<img src="http://chart.apis.google.com/chart?cht=map:fixed=-55,-180,73,180&chs=440x220&chd=t:<?=implode(',',$Rank)?>&chco=FFFFFF,EDEDED,1F0066&chld=<?=implode('|',$Countries)?>&chf=bg,s,CCD6FF" alt="Geographical Distribution Map - Worldwide" />
-	<img src="http://chart.apis.google.com/chart?cht=map:fixed=37,-26,65,67&chs=440x220&chs=440x220&chd=t:<?=implode(',',$Rank)?>&chco=FFFFFF,EDEDED,1F0066&chld=<?=implode('|',$Countries)?>&chf=bg,s,CCD6FF" />
+	<img src="http://chart.apis.google.com/chart?cht=map:fixed=37,-26,65,67&chs=440x220&chs=440x220&chd=t:<?=implode(',',$Rank)?>&chco=FFFFFF,EDEDED,1F0066&chld=<?=implode('|',$Countries)?>&chf=bg,s,CCD6FF" alt="Geographical Distribution Map - Europe" />
 	<br />
-	<img src="http://chart.apis.google.com/chart?cht=map:fixed=-46,-132,24,21.5&chs=440x220&chd=t:<?=implode(',',$Rank)?>&chco=FFFFFF,EDEDED,1F0066&chld=<?=implode('|',$Countries)?>&chf=bg,s,CCD6FF" />
+	<img src="http://chart.apis.google.com/chart?cht=map:fixed=-46,-132,24,21.5&chs=440x220&chd=t:<?=implode(',',$Rank)?>&chco=FFFFFF,EDEDED,1F0066&chld=<?=implode('|',$Countries)?>&chf=bg,s,CCD6FF" alt="Geographical Distribution Map - South America" />
-	<img src="http://chart.apis.google.com/chart?cht=map:fixed=-11,22,50,160&chs=440x220&chd=t:<?=implode(',',$Rank)?>&chco=FFFFFF,EDEDED,1F0066&chld=<?=implode('|',$Countries)?>&chf=bg,s,CCD6FF" />
+	<img src="http://chart.apis.google.com/chart?cht=map:fixed=-11,22,50,160&chs=440x220&chd=t:<?=implode(',',$Rank)?>&chco=FFFFFF,EDEDED,1F0066&chld=<?=implode('|',$Countries)?>&chf=bg,s,CCD6FF" alt="Geographical Distribution Map - Asia" />
 	<br />
-	<img src="http://chart.apis.google.com/chart?cht=map:fixed=-36,-57,37,100&chs=440x220&chd=t:<?=implode(',',$Rank)?>&chco=FFFFFF,EDEDED,1F0066&chld=<?=implode('|',$Countries)?>&chf=bg,s,CCD6FF" />
+	<img src="http://chart.apis.google.com/chart?cht=map:fixed=-36,-57,37,100&chs=440x220&chd=t:<?=implode(',',$Rank)?>&chco=FFFFFF,EDEDED,1F0066&chld=<?=implode('|',$Countries)?>&chf=bg,s,CCD6FF" alt="Geographical Distribution Map - Africa" />
-	<img src="http://chart.apis.google.com/chart?cht=map:fixed=14.8,15,45,86&chs=440x220&chd=t:<?=implode(',',$Rank)?>&chco=FFFFFF,EDEDED,1F0066&chld=<?=implode('|',$Countries)?>&chf=bg,s,CCD6FF" />
+	<img src="http://chart.apis.google.com/chart?cht=map:fixed=14.8,15,45,86&chs=440x220&chd=t:<?=implode(',',$Rank)?>&chco=FFFFFF,EDEDED,1F0066&chld=<?=implode('|',$Countries)?>&chf=bg,s,CCD6FF" alt="Geographical Distribution Map - Middle East" />
 	<br />
-	<img src="http://chart.apis.google.com/chart?chxt=y,x&chg=0,-1,1,1&chxs=0,h&cht=bvs&chco=76A4FB&chs=880x300&chd=t:<?=implode(',',array_slice($CountryUsers,0,31))?>&chxl=1:|<?=implode('|',array_slice($Countries,0,31))?>|0:|<?=implode('|',$LogIncrements)?>&amp;chf=bg,s,FFFFFF00" />
+	<img src="http://chart.apis.google.com/chart?chxt=y,x&chg=0,-1,1,1&chxs=0,h&cht=bvs&chco=76A4FB&chs=880x300&chd=t:<?=implode(',',array_slice($CountryUsers,0,31))?>&chxl=1:|<?=implode('|',array_slice($Countries,0,31))?>|0:|<?=implode('|',$LogIncrements)?>&amp;chf=bg,s,FFFFFF00" alt="Number of users by country" />
 </div>
 <?
 show_footer();

sections/torrents/details.php

@@ -805,7 +805,15 @@ function filelist($Str) {
                     <? if(check_perms('users_warn') && $AuthorID != $LoggedUser['ID']) { 
                         $AuthorInfo = user_info($AuthorID);
                         if($LoggedUser['Class'] >= $AuthorInfo['Class']) { ?>
-                        - <a href="torrents.php?action=warn&groupid=<?=$GroupID?>&postid=<?=$PostID?>&userid=<?=$AuthorID?>&key=<?=$Key?>">[Warn]</a>
+                        <form action="" style="display: none;" name="warn<?=$PostID?>" method="post">
+                        <input type="hidden" name="action" value="warn" />
+                        <input type="hidden" name="groupid" value="<?=$GroupID?>" />
+                        <input type="hidden" name="postid" value="<?=$PostID?>" />
+                        <input type="hidden" name="userid" value="<?=$AuthorID?>" />
+                        <input type="hidden" name="key" value="<?=$Key?>" />
+                        </form>
+                        - <a href="#" onclick="document.warn<?=$PostID?>.submit(); return false;">[Warn]</a>
+
                     <? }
                 } ?>
 				- <a href="#quickpost" onclick="Quote('<?=$PostID?>','<?=$Username?>');">[Quote]</a>

sections/torrents/take_warn.php

@@ -12,6 +12,10 @@
 $UserID = (int)$_POST['userid'];
 $Key = (int)$_POST['key'];
 $SQLTime = sqltime();
+$UserInfo = user_info($UserID);
+if($UserInfo['Class'] > $LoggedUser['Class']) {
+    error(403);
+}
 $URL = "https://". SSL_SITE_URL."/torrents.php?id=$GroupID&postid=$PostID#post$PostID";
 if ($Length != 'verbal') {
     $Time = ((int)$Length) * (7 * 24 * 60 * 60);

sections/torrents/warn.php

@@ -1,11 +1,11 @@
 <?php
 if (!check_perms('users_warn')) { error(404);}
-isset_request($_GET, array('groupid', 'postid', 'userid', 'key'));
+isset_request($_POST, array('groupid', 'postid', 'userid', 'key'));
 
-$GroupID = (int) $_GET['groupid'];
+$GroupID = (int) $_POST['groupid'];
-$PostID = (int) $_GET['postid'];
+$PostID = (int) $_POST['postid'];
-$UserID = (int) $_GET['userid'];
+$UserID = (int) $_POST['userid'];
-$Key = (int) $_GET['key'];
+$Key = (int) $_POST['key'];
 $UserInfo = user_info($UserID);
 $DB -> query("SELECT
     tc.Body,