Various torrent form fixes

Disables autofill on request format, adds Censored option to Other
category, etc

classes/torrent_form.class.php

@@ -61,7 +61,7 @@ class TORRENT_FORM {
 		$this->ArchivesManga = $ArchivesManga;
 
 		if ($this->Torrent && $this->Torrent['GroupID']) {
-			$this->Disabled = ' disabled="disabled"';
+			$this->Disabled = ' readonly="readonly"';
 			$this->DisabledFlag = true;
 		}
 	}
@@ -103,7 +103,7 @@ class TORRENT_FORM {
 			if ($this->Torrent && $this->Torrent['GroupID']) {
 ?>
 			<input type="hidden" name="groupid" value="<?=display_str($this->Torrent['GroupID'])?>" />
-			<input type="hidden" name="type" value="<?=array_search($this->UploadForm, $this->Categories)?>" />
+			<input type="hidden" name="type" value="<?=display_str($this->Torrent['CategoryID'])?>" />
 <?
 			}
 			if ($this->Torrent && $this->Torrent['RequestID']) {
@@ -123,7 +123,7 @@ class TORRENT_FORM {
 			<tr>
 				<td class="label">Type:</td>
 				<td>
-					<select id="categories" name="type" onchange="Categories()"<?=$this->Disabled?>>
+					<select id="categories" name="type" onchange="Categories()"<?=($this->DisabledFlag) ? ' disabled="disabled"' : ''?>>
 <?
 			foreach (Misc::display_array($this->Categories) as $Index => $Cat) {
 				echo "\t\t\t\t\t\t<option value=\"$Index\"";
@@ -203,8 +203,10 @@ class TORRENT_FORM {
 			<tr id="javdb_tr">
 				<td class="label tooltip" title='Enter a JAV catalogue number, e.g., "CND-060"'>Catalogue Number:</td>
 				<td>
-					<input type="text" id="catalogue" name="catalogue" size="10" value="<?=display_str($Torrent['CatalogueNumber']) ?>"/>
-					 <input type="button" onclick="JavAutofill()" value="Autofill" <?=$this->Disabled?>></input>
+					<input type="text" id="catalogue" name="catalogue" size="10" value="<?=display_str($Torrent['CatalogueNumber']) ?>" <?=$this->Disabled?>/>
+<? if (!$this->DisabledFlag) { ?>
+					<input type="button" onclick="JavAutofill()" value="Autofill"></input>
+<? } ?>
 				</td>
 			</tr>
 			<tr id="title_tr">
@@ -403,7 +405,7 @@ class TORRENT_FORM {
 		G::$Cache->cache_value('genre_tags', $GenreTags, 3600*6);
 	}
 ?>
-					<select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;">
+					<select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;" <?=($this->DisabledFlag) ? ' disabled="disabled"' : ''?>>
 						<option>---</option>
 <? foreach (Misc::display_array($GenreTags) as $Genre) { ?>
 						<option value="<?=$Genre?>"><?=$Genre?></option>
@@ -459,8 +461,10 @@ class TORRENT_FORM {
 			<tr id="anidb_tr">
 				<td class="label">AniDB Autofill (optional):</td>
 				<td>
-					<input type="text" id="anidb" size="10" />
-					<input type="button" onclick="AnidbAutofill()" value="Autofill" <?=$this->Disabled?>/>
+					<input type="text" id="anidb" size="10" <?=$this->Disabled?>/>
+<? if (!$this->DisabledFlag) { ?>
+					<input type="button" onclick="AnidbAutofill()" value="Autofill"/>
+<? } ?>
 				</td>
 			</tr>
 			<tr id="title_tr">
@@ -655,7 +659,7 @@ class TORRENT_FORM {
 		G::$Cache->cache_value('genre_tags', $GenreTags, 3600*6);
 	}
 ?>
-					<select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;">
+					<select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;" <?=($this->DisabledFlag) ? ' disabled="disabled"' : ''?>>
 						<option>---</option>
 <? foreach (Misc::display_array($GenreTags) as $Genre) { ?>
 						<option value="<?=$Genre?>"><?=$Genre?></option>
@@ -707,7 +711,9 @@ class TORRENT_FORM {
 				<td class="label">nhentai URL (optional):</td>
         <td>
           <input type="text" id="catalogue" size="50" <?=$this->Disabled?> />
-					<input type="button" onclick="DoujAutofill()" value="Autofill" <?=$this->Disabled?>/>
+<? if (!$this->DisabledFlag) { ?>
+					<input type="button" onclick="DoujAutofill()" value="Autofill"/>
+<? } ?>
         </td>
 			</tr>
 			<tr id="title_tr">
@@ -832,7 +838,7 @@ class TORRENT_FORM {
 		G::$Cache->cache_value('genre_tags', $GenreTags, 3600*6);
 	}
 ?>
-					<select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;">
+					<select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;" <?=($this->DisabledFlag) ? ' disabled="disabled"' : ''?>>
 						<option>---</option>
 <? foreach (Misc::display_array($GenreTags) as $Genre) { ?>
 						<option value="<?=$Genre?>"><?=$Genre?></option>
@@ -888,6 +894,12 @@ class TORRENT_FORM {
 				<td><input type="text" id="title_jp" name="title_jp" size="60" value="<?=display_str($Torrent['TitleJP'])?>" <?=$this->Disabled?>/></td>
 			</tr>
 <? } ?>
+			<tr>
+				<td class="label">Censored?:</td>
+				<td>
+					<input type="checkbox" name="censored" value="1" <?=(($Torrent['Censored'] ?? 1) ? 'checked ' : '')?>/>
+				</td>
+			</tr>
 			<tr>
 				<td class="label tooltip" title="Comma seperated list of tags">Tags:</td>
 				<td>
@@ -903,7 +915,7 @@ class TORRENT_FORM {
 		G::$Cache->cache_value('genre_tags', $GenreTags, 3600*6);
 	}
 ?>
-					<select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;">
+					<select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;" <?=($this->DisabledFlag) ? ' disabled="disabled"' : ''?>>
 						<option>---</option>
 <? foreach (Misc::display_array($GenreTags) as $Genre) { ?>
 						<option value="<?=$Genre?>"><?=$Genre?></option>
@@ -1081,7 +1093,7 @@ new TEXTAREA_PREVIEW('album_desc', 'album_desc', display_str($Torrent['GroupDesc
 		G::$Cache->cache_value('genre_tags', $GenreTags, 3600*6);
 	}
 ?>
-					<select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;">
+					<select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;" <?=($this->DisabledFlag) ? ' disabled="disabled"' : ''?>>
 						<option>---</option>
 <? foreach (Misc::display_array($GenreTags) as $Genre) { ?>
 						<option value="<?=$Genre?>"><?=$Genre?></option>

sections/requests/new_edit.php

@@ -16,6 +16,7 @@ if (!$NewRequest) {
 	}
 }
 
+$Disabled = "";
 
 if ($NewRequest && ($LoggedUser['BytesUploaded'] < 250 * 1024 * 1024 || !check_perms('site_submit_requests'))) {
 	error('You do not have enough uploaded to make a request.');
@@ -89,6 +90,8 @@ if ($NewRequest && !empty($_GET['artistid']) && is_number($_GET['artistid'])) {
 		WHERE tg.ID = ".$_GET['groupid']);
 	if (list($Title, $TitleJP, $Year, $Studio, $Series, $CatalogueNumber, $DLsiteID, $Image, $Tags, $CategoryID) = $DB->next_record()) {
 		$GroupID = trim($_REQUEST['groupid']);
+		$CategoryName = $Categories[$CategoryID - 1];
+		$Disabled = 'readonly="readonly"';
 	}
 }
 
@@ -119,7 +122,12 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'reques
 						Type
 					</td>
 					<td>
+<? if (!empty($Disabled)) { ?>
+						<input type="hidden" name="type" value="<?=$CategoryName?>" />
+						<select id="categories" name="type" onchange="Categories();" disabled="disabled">
+<? } else { ?>
 						<select id="categories" name="type" onchange="Categories();">
+<? } ?>
 <?		foreach (Misc::display_array($Categories) as $Cat) { ?>
 							<option value="<?=$Cat?>"<?=(!empty($CategoryName) && ($CategoryName === $Cat) ? ' selected="selected"' : '')?>><?=$Cat?></option>
 <?		} ?>
@@ -129,8 +137,10 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'reques
 				<tr id="cataloguenumber_tr">
 					<td class="label">Catalogue Number</td>
 					<td>
-						<input type="text" id="catalogue" name="cataloguenumber" size="15" value="<?=(isset($CatalogueNumber)?$CatalogueNumber:'') ?>" />
+						<input type="text" id="catalogue" name="cataloguenumber" size="15" value="<?=(isset($CatalogueNumber)?$CatalogueNumber:'') ?>" <?=$Disabled?>/>
+<? if (empty($Disabled)) { ?>
 						( <input type="button" onclick="JavAutofill()" value="Autofill" style="font-size:0.8em;"></input> )
+<? } ?>
 					</td>
 				</tr>
 				<tr id="artist_tr">
@@ -142,14 +152,16 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'reques
 			$First = true;
 			foreach ($ArtistForm as $Artist) {
 ?>
-						<input type="text" id="artist_0" name="artists[]"<? Users::has_autocomplete_enabled('other'); ?> size="45" value="<?=display_str($Artist['name']) ?>" />
-						<? if ($First) { ?><a href="#" onclick="AddArtistField(); return false;" class="brackets">+</a> <a href="#" onclick="RemoveArtistField(); return false;" class="brackets">&minus;</a><? } $First = false; ?>
+						<input type="text" id="artist_0" name="artists[]"<? Users::has_autocomplete_enabled('other'); ?> size="45" value="<?=display_str($Artist['name']) ?>" <?=$Disabled?>/>
+						<? if (empty($Disabled)) { if ($First) { ?><a href="#" onclick="AddArtistField(); return false;" class="brackets">+</a> <a href="#" onclick="RemoveArtistField(); return false;" class="brackets">&minus;</a><? } $First = false; } ?>
 						<br />
 <?
 			}
 		} else {
-?>						<input type="text" id="artist_0" name="artists[]"<? Users::has_autocomplete_enabled('other'); ?> size="45" onblur="CheckVA();" />
+?>						<input type="text" id="artist_0" name="artists[]"<? Users::has_autocomplete_enabled('other'); ?> size="45" onblur="CheckVA();" <?=$Disabled?>/>
+<? if (empty($Disabled)) { ?>
 						<a href="#" onclick="AddArtistField(); return false;" class="brackets">+</a> <a href="#" onclick="RemoveArtistField(); return false;" class="brackets">&minus;</a>
+<? } ?>
 <?
 		}
 ?>
@@ -158,19 +170,19 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'reques
 				<tr>
 					<td class="label">Title</td>
 					<td>
-						<input type="text" id="title" name="title" size="45" value="<?=(!empty($Title) ? $Title : '')?>" />
+						<input type="text" id="title" name="title" size="45" value="<?=(!empty($Title) ? $Title : '')?>" <?=$Disabled?>/>
 					</td>
 				</tr>
 				<tr>
 					<td class="label">Japanese Title</td>
 					<td>
-						<input type="text" id="title_jp" name="title_jp" size="45" value="<?=isset($TitleJP)?$TitleJP:''?>" />
+						<input type="text" id="title_jp" name="title_jp" size="45" value="<?=isset($TitleJP)?$TitleJP:''?>" <?=$Disabled?>/>
 					</td>
 				</tr>
 				<tr id="dlsiteid_tr">
 					<td class="label">DLSite ID</td>
 					<td>
-						<input type="text" id="dlsiteid" name="dlsiteid" size="15" value="<?=isset($DLsiteID)?$DLsiteID:''?>" />
+						<input type="text" id="dlsiteid" name="dlsiteid" size="15" value="<?=isset($DLsiteID)?$DLsiteID:''?>" <?=$Disabled?>/>
 					</td>
 				</tr>
 <?	} ?>
@@ -178,7 +190,7 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'reques
 				<tr id="image_tr">
 					<td class="label">Image</td>
 					<td>
-						<input type="text" id="image" name="image" size="45" value="<?=(!empty($Image) ? $Image : '')?>" />
+						<input type="text" id="image" name="image" size="45" value="<?=(!empty($Image) ? $Image : '')?>" <?=$Disabled?>/>
 					</td>
 				</tr>
 <?	} ?>
@@ -196,14 +208,19 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'reques
 		$GenreTags = $DB->collect('Name');
 		$Cache->cache_value('genre_tags', $GenreTags, 3600 * 6);
 	}
+
+	if (!empty($Disabled)) {
 ?>
-						<select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;">
+						<select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;" disabled="disabled">
+<? } else { ?>
+						<select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;" >
+<? } ?>
 							<option>---</option>
 <?	foreach (Misc::display_array($GenreTags) as $Genre) { ?>
 							<option value="<?=$Genre?>"><?=$Genre?></option>
 <?	} ?>
 						</select>
-						<input type="text" id="tags" name="tags" size="45" value="<?=(!empty($Tags) ? display_str($Tags) : '')?>"<? Users::has_autocomplete_enabled('other'); ?> />
+						<input type="text" id="tags" name="tags" size="45" value="<?=(!empty($Tags) ? display_str($Tags) : '')?>"<? Users::has_autocomplete_enabled('other'); ?> <?=$Disabled?>/>
 						<br />
 						Tags should be comma-separated, and you should use a period (".") to separate words inside a tag&#8202;&mdash;&#8202;e.g. "<strong class="important_text_alt">big.breasts</strong>".
 						<br /><br />
@@ -222,7 +239,7 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'reques
 				<tr>
 					<td class="label">Torrent group</td>
 					<td>
-						<?=site_url()?>torrents.php?id=<input type="text" name="groupid" value="<?=isset($GroupID)?$GroupID:''?>" size="15" /><br />
+						<?=site_url()?>torrents.php?id=<input type="text" name="groupid" value="<?=isset($GroupID)?$GroupID:''?>" size="15"/><br />
 						If this request matches a torrent group <span style="font-weight: bold;">already existing</span> on the site, please indicate that here.
 					</td>
 				</tr>

sections/schedule/index.php

@@ -10,7 +10,7 @@ $ScheduleDebug = false;
 
 $PCount = chop(shell_exec("/usr/bin/pgrep -cf schedule.php"));
 if ($PCount > 3) {  // 3 because the cron job starts two processes and pgrep finds itself
-	die("schedule.php is already running. Exiting ($PCount)\n");
+  die("schedule.php is already running. Exiting ($PCount)\n");
 }
 
 $AS = check_perms('admin_schedule');
@@ -28,18 +28,18 @@ function run_all_in($Dir) {
 }
 
 if ((!isset($_REQUEST['key']) || $_REQUEST['key'] != SCHEDULE_KEY) && !$AS) {
-	error(403);
+  error(403);
 }
 
 if ($AS) {
-	authorize();
-	View::show_header();
-	echo '<div class="box">';
+  authorize();
+  View::show_header();
+  echo '<div class="box">';
 }
 
 $DB->query("
-	SELECT NextHour, NextDay, NextBiWeekly
-	FROM schedule");
+  SELECT NextHour, NextDay, NextBiWeekly
+  FROM schedule");
 list($Hour, $Day, $BiWeek) = $DB->next_record();
 
 $NextHour = date('H', time(date('H') + 1, 0, 0, date('m'), date('d'), date('Y')));
@@ -47,8 +47,8 @@ $NextDay = date('d', time(0, 0, 0, date('m'), date('d') + 1, date('Y')));
 $NextBiWeek = (date('d') < 22 && date('d') >= 8) ? 22 : 8;
 
 $DB->query("
-	UPDATE schedule
-	SET NextHour = $NextHour, NextDay = $NextDay, NextBiWeekly = $NextBiWeek");
+  UPDATE schedule
+  SET NextHour = $NextHour, NextDay = $NextDay, NextBiWeekly = $NextBiWeek");
 
 $sqltime = sqltime();
 
@@ -63,13 +63,13 @@ if (!(isset($_GET['notevery']) && $_GET['notevery'])) {
 //-------------- Run every hour ------------------------------------------//
 if ($Hour != $NextHour || (isset($_GET['runhour']) && $_GET['runhour'])) {
   run_all_in('hourly');
-	echo "Ran hourly functions".($AS?'<br>':"\n");
+  echo "Ran hourly functions".($AS?'<br>':"\n");
 }
 
 //-------------- Run every day -------------------------------------------//
 if ($Day != $NextDay || (isset($_GET['runday']) && $_GET['runday'])) {
   run_all_in('daily');
-	echo "Ran daily functions".($AS?'<br>':"\n");
+  echo "Ran daily functions".($AS?'<br>':"\n");
 }
 
 //-------------- Run every week -------------------------------------------//
@@ -81,24 +81,24 @@ if (($Day != $NextDay && date('w') == 0) || (isset($_GET['runweek']) && $_GET['r
 //--------------- Run twice per month -------------------------------------//
 if ($BiWeek != $NextBiWeek || (isset($_GET['runbiweek']) && $_GET['runbiweek'])) {
   run_all_in('biweekly');
-	echo "Ran bi-weekly functions".($AS?'<br>':"\n");
+  echo "Ran bi-weekly functions".($AS?'<br>':"\n");
 }
 
 //---------------- Run every month -----------------------------------------//
 if (($BiWeek != $NextBiWeek && $BiWeek == 8) || (isset($_GET['runmonth']) && $_GET['runmonth'])) {
   run_all_in('monthly');
-	echo "Ran monthly functions".($AS?'<br>':"\n");
+  echo "Ran monthly functions".($AS?'<br>':"\n");
 }
 
 //---------------- Run on request ------------------------------------------//
 if (isset($_GET['runmanual']) && $_GET['runmanual']) {
   run_all_in('manually');
-	echo "Ran manual functions".($AS?'<br>':"\n");
+  echo "Ran manual functions".($AS?'<br>':"\n");
 }
 
 if ($AS) {
-	echo '</div>';
-	View::show_footer();
+  echo '</div>';
+  View::show_footer();
 } else {
   echo "-------------------------\n\n";
 }