From 23684501b2d83c9e4958b1e0a0a35b53cfae563a Mon Sep 17 00:00:00 2001
From: Git <git@what.cd>
Date: Sun, 30 Dec 2012 08:00:23 +0000
Subject: [PATCH] Empty commit

---
 sections/rules/ratio.php                |  2 +-
 sections/schedule/index.php             |  2 +-
 sections/tools/managers/forum_alter.php |  7 ++++---
 sections/tools/managers/forum_list.php  | 13 +++++++++++--
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/sections/rules/ratio.php b/sections/rules/ratio.php
index 51ddcd66..3fd54c81 100644
--- a/sections/rules/ratio.php
+++ b/sections/rules/ratio.php
@@ -155,7 +155,7 @@
             </li>
             <li>In this example, Rippy has snatched 90 torrents, and is currently seeding 45 torrents.</li>
             <li>To calculate Rippy&#39;s actual required ratio, we take his maximum required ratio (0% seeded), which is 0.30, and multiply it by [1 - seeding/snatched] (which is 0.50). Written out:
-                0.05 * [1 - (45/90)] = 0.15.
+                0.3 * [1 - (45/90)] = 0.15.
             </li>
             <li>The resulting required ratio is 0.15, which falls between the maximum required ratio of 0.30 and the minimum required ratio of 0.05 for his amount downloaded bracket.</li>
             <li>If Rippy&#39;s on-site required ratio was listed as a value greater than the calculated value, this would be because he hadn&#39;t seeded those 45 torrents for a 72 hour period in the
diff --git a/sections/schedule/index.php b/sections/schedule/index.php
index 24dfe2ba..0bc7bf2e 100644
--- a/sections/schedule/index.php
+++ b/sections/schedule/index.php
@@ -619,7 +619,7 @@ function next_hour() {
 				FROM forums_topics AS t
 				JOIN forums AS f ON t.ForumID = f.ID
 				WHERE t.IsLocked='0' AND t.IsSticky='0'
-				  AND t.LastPostTime<'".time_minus(3600*24*28)."'
+				  AND DATEDIFF(CURDATE(),DATE(t.LastPostTime))/7>f.AutoLockWeeks
 				  AND f.AutoLock = '1'");
 	$IDs = $DB->collect('ID');
 	
diff --git a/sections/tools/managers/forum_alter.php b/sections/tools/managers/forum_alter.php
index c5bcfdd4..ff0716fc 100644
--- a/sections/tools/managers/forum_alter.php
+++ b/sections/tools/managers/forum_alter.php
@@ -42,12 +42,13 @@
 			MinClassRead='$P[minclassread]',
 			MinClassWrite='$P[minclasswrite]',
 			MinClassCreate='$P[minclasscreate]',
-			AutoLock='$P[autolock]'
+			AutoLock='$P[autolock]',
+			AutoLockWeeks='$P[autolockweeks]'
 			WHERE ID='$P[id]'");
 	} else { //Create
 		$DB->query("INSERT INTO forums
-			(Sort, CategoryID, Name, Description, MinClassRead, MinClassWrite, MinClassCreate, AutoLock) VALUES
-			('$P[sort]', '$P[categoryid]', '$P[name]','$P[description]','$P[minclassread]','$P[minclasswrite]','$P[minclasscreate]','$P[autolock]')");
+			(Sort, CategoryID, Name, Description, MinClassRead, MinClassWrite, MinClassCreate, AutoLock, AutoLockWeeks) VALUES
+			('$P[sort]', '$P[categoryid]', '$P[name]','$P[description]','$P[minclassread]','$P[minclasswrite]','$P[minclasscreate]','$P[autolock]','$P[autolockweeks]')");
 	}
 }
 
diff --git a/sections/tools/managers/forum_list.php b/sections/tools/managers/forum_list.php
index 2a26b667..0190abf8 100644
--- a/sections/tools/managers/forum_list.php
+++ b/sections/tools/managers/forum_list.php
@@ -44,11 +44,13 @@ function class_list($Selected=0){
 	MinClassRead,
 	MinClassWrite,
 	MinClassCreate,
-	AutoLock
+	AutoLock,
+	AutoLockWeeks
 	FROM forums
 	ORDER BY CategoryID, Sort ASC');
 ?>
 <div class="header">
+	<script type="text/javacript">document.getElementByID('content').style.overflow='visible';</script>
 	<h2>Forum control panel</h2>
 </div>
 <table width="100%">
@@ -61,11 +63,12 @@ function class_list($Selected=0){
 		<td>Min class write</td>
 		<td>Min class create</td>
 		<td>Autolock</td>
+		<td>Autolock weeks</td>
 		<td>Submit</td>
 	</tr>
 <?
 $Row = 'b';
-while(list($ID, $CategoryID, $Sort, $Name, $Description, $MinClassRead, $MinClassWrite, $MinClassCreate, $AutoLock) = $DB->next_record()){
+while(list($ID, $CategoryID, $Sort, $Name, $Description, $MinClassRead, $MinClassWrite, $MinClassCreate, $AutoLock, $AutoLockWeeks) = $DB->next_record()){
 	$Row = ($Row === 'a' ? 'b' : 'a');
 ?>
 	<tr class="row<?=$Row?>">
@@ -109,6 +112,9 @@ function class_list($Selected=0){
 			<td>
 				<input type="checkbox" name="autolock" <?=($AutoLock == '1')?'checked ':''?>/>
 			</td>
+			<td>
+				<input type="text" name="autolockweeks" value="<?=$AutoLockWeeks?>" />
+			</td>
 			<td>
 				<input type="submit" name="submit" value="Edit" />
 				<input type="submit" name="submit" value="Delete" />
@@ -161,6 +167,9 @@ function class_list($Selected=0){
 			<td>
 				<input type="checkbox" name="autolock" checked />
 			</td>
+			<td>
+				<input type="text" name="autolockweeks" value="4" />
+			</td>
 			<td>
 				<input type="submit" value="Create" />
 			</td>