A bit more consistency formatting

design/views/generic/reply/quickreply.php

@@ -28,7 +28,7 @@
  * Example:
 
     View::parse('generic/reply/quickreply.php', array(
-      'InputTitle' => 'Post comment',
+      'InputTitle' => 'Post Comment',
       'InputName' => 'groupid',
       'InputID' => $GroupID,
       'TextareaCols' => 65,
@@ -50,7 +50,7 @@
     $InputAction = 'reply';
   }
   if (!isset($InputTitle)) {
-    $InputTitle = 'Post comment';
+    $InputTitle = 'Post Comment';
   }
 
   $ReplyText = new TEXTAREA_PREVIEW('body', 'quickpost', '',

sections/forums/newthread.php

@@ -83,11 +83,11 @@ View::show_header('Forums > '.$Forum['Name'].' > New Topic', 'comments,bbc
       <input type="hidden" name="forum" value="<?=$ForumID?>" />
       <table id="newthreadtext" class="layout">
         <tr>
-          <td class="label">Title:</td>
+          <td class="label">Title</td>
           <td><input id="title" class="required" type="text" name="title" style="width: 98%;" /></td>
         </tr>
         <tr>
-          <td class="label">Body:</td>
+          <td class="label">Body</td>
           <td><textarea id="posttext" class="required bbcode_editor" style="width: 98%;" onkeyup="resize('posttext');" name="body" cols="90" rows="8"></textarea></td>
         </tr>
         <tr>
@@ -139,11 +139,11 @@ if (check_perms('forums_polls_create')) {
           </td>
         </tr>
         <tr id="poll_question" class="hidden">
-          <td class="label">Question:</td>
+          <td class="label">Question</td>
           <td><input type="text" name="question" id="pollquestionfield" class="required" style="width: 98%;" /></td>
         </tr>
         <tr id="poll_answers" class="hidden">
-          <td class="label">Answers:</td>
+          <td class="label">Answers</td>
           <td id="answer_block">
             <input type="text" name="answers[]" class="required" style="width: 90%;" />
             <a href="#" onclick="AddAnswerField();return false;" class="brackets">+</a>
@@ -159,7 +159,7 @@ if (check_perms('forums_polls_create')) {
       <div id="buttons" class="center">
         <input type="button" value="Preview" onclick="Newthread_Preview(1);" id="newthreadpreviewbutton" />
         <input type="button" value="Editor" onclick="Newthread_Preview(0);" id="newthreadeditbutton" class="hidden" />
-        <input type="submit" class="submit" id="submit_button" value="Create thread" />
+        <input type="submit" class="submit" id="submit_button" value="Create" />
       </div>
     </form>
   </div>

sections/requests/new_edit.php

@@ -343,9 +343,10 @@ View::show_header(($NewRequest ? 'Create Request' : 'Edit Request'), 'bbcode,req
             <input type="hidden" id="current_downloaded"
               value="<?= $LoggedUser['BytesDownloaded'] ?>" />
             <ul>
-              <!-- <li>Bounty: <span id="bounty_after_tax">90.00 MB</span></li> -->
-              <li>Uploaded: <span id="new_uploaded"><?= Format::get_size($LoggedUser['BytesUploaded']) ?></span></li>
-              <li>Ratio: <span id="new_ratio"><?= Format::get_ratio_html($LoggedUser['BytesUploaded'], $LoggedUser['BytesDownloaded']) ?></span></li>
+              <!-- @todo Return this feature
+              <li><strong>Bounty:</strong> <span id="bounty_after_tax">90.00 MB</span></li> -->
+              <li><strong>Uploaded:</strong> <span id="new_uploaded"><?= Format::get_size($LoggedUser['BytesUploaded']) ?></span></li>
+              <li><strong>Ratio:</strong> <span id="new_ratio"><?= Format::get_ratio_html($LoggedUser['BytesUploaded'], $LoggedUser['BytesDownloaded']) ?></span></li>
             </ul>
           </td>
         </tr>

sections/requests/request.php

@@ -10,14 +10,14 @@ if (empty($_GET['id']) || !is_number($_GET['id'])) {
 
 $RequestID = $_GET['id'];
 
-//First things first, lets get the data for the request.
+// First things first, let's get the data for the request
 
 $Request = Requests::get_request($RequestID);
 if ($Request === false) {
   error(404);
 }
 
-//Convenience variables
+// Convenience variables
 $IsFilled = !empty($Request['TorrentID']);
 $CanVote = !$IsFilled && check_perms('site_vote');
 
@@ -29,7 +29,7 @@ if ($Request['CategoryID'] === '0') {
 
 $Title = empty($Request['Title']) ? (empty($Request['TitleRJ']) ? $Request['TitleJP'] : $Request['TitleRJ']) : $Request['Title'];
 
-//Do we need to get artists?
+// Do we need to get artists?
 $ArtistForm = Requests::get_artists($RequestID);
 $ArtistName = Artists::display_artists($ArtistForm, false, true);
 $ArtistLink = Artists::display_artists($ArtistForm, true, true);
@@ -61,7 +61,7 @@ if (!empty($Request['DLsiteID'])) {
 
 $DisplayLink .= $Extra;
 
-//Votes time
+// Votes time
 $RequestVotes = Requests::get_votes_array($RequestID);
 $VoteCount = count($RequestVotes['Voters']);
 $ProjectCanEdit = (check_perms('project_team') && !$IsFilled && ($Request['CategoryID'] === '0' || ($CategoryName === 'Music' && $Request['Year'] === '0')));
@@ -72,8 +72,8 @@ $CanEdit = ($UserCanEdit || $ProjectCanEdit || check_perms('site_moderate_reques
 list($NumComments, $Page, $Thread, $LastRead) = Comments::load('requests', $RequestID);
 
 View::show_header("View request: $FullName", 'comments,requests,bbcode,subscriptions');
-
 ?>
+
 <div class="thin">
   <div class="header">
     <h2><a href="requests.php">Requests</a> &gt; <?=$CategoryName?> &gt; <?=$DisplayLink?></h2>
@@ -125,7 +125,9 @@ $encoded_artist = urlencode($encoded_artist);
     </div>
 <?
   }
-  $ArtistVariant = "";
+
+  $ArtistVariant = "Author(s)";
+  /*
   switch ($CategoryName) {
     case "Movies":
       $ArtistVariant = "Idols";
@@ -145,13 +147,14 @@ $encoded_artist = urlencode($encoded_artist);
     default:
       $ArtistVariant = "Artists";
   }
+  */
 ?>
     <div class="box box_artists">
-      <div class="head"><strong><?=$ArtistVariant?></strong></div>
+      <div class="head"><strong><?= $ArtistVariant ?></strong></div>
       <ul class="stats nobullet">
 <?    foreach ($ArtistForm as $Artist) { ?>
         <li class="artist">
-          <?=Artists::display_artist($Artist)?>
+          <?= Artists::display_artist($Artist) ?>
         </li>
 <?    } ?>
       </ul>
@@ -163,7 +166,7 @@ $encoded_artist = urlencode($encoded_artist);
       $Split = Tags::get_name_and_class($TagName);
 ?>
         <li>
-          <a class="<?=$Split['class']?>" href="torrents.php?taglist=<?=$TagName?>"><?=display_str($Split['name'])?></a>
+          <a class="<?= $Split['class']?>" href="torrents.php?taglist=<?=$TagName?>"><?=display_str($Split['name']) ?></a>
           <br style="clear: both;" />
         </li>
 <?  } ?>
@@ -185,10 +188,10 @@ $encoded_artist = urlencode($encoded_artist);
 ?>
         <tr>
           <td>
-            <a href="user.php?id=<?=$User['UserID']?>"><?=($Boldify ? '<strong>' : '') . display_str($User['Username']) . ($Boldify ? '</strong>' : '')?></a>
+            <a href="user.php?id=<?= $User['UserID'] ?>"><?= ($Boldify ? '<strong>' : '') . display_str($User['Username']) . ($Boldify ? '</strong>' : '') ?></a>
           </td>
           <td class="number_column">
-            <?=($Boldify ? '<strong>' : '') . Format::get_size($User['Bounty']) . ($Boldify ? "</strong>\n" : "\n")?>
+            <?= ($Boldify ? '<strong>' : '') . Format::get_size($User['Bounty']) . ($Boldify ? "</strong>\n" : "\n") ?>
           </td>
         </tr>
 <?  }
@@ -198,10 +201,10 @@ $encoded_artist = urlencode($encoded_artist);
       if ($User['UserID'] === $LoggedUser['ID']) { ?>
         <tr>
           <td>
-            <a href="user.php?id=<?=$User['UserID']?>"><strong><?=display_str($User['Username'])?></strong></a>
+            <a href="user.php?id=<?= $User['UserID'] ?>"><strong><?= display_str($User['Username']) ?></strong></a>
           </td>
           <td class="number_column">
-            <strong><?=Format::get_size($User['Bounty'])?></strong>
+            <strong><?= Format::get_size($User['Bounty']) ?></strong>
           </td>
         </tr>
 <?      }
@@ -213,31 +216,34 @@ $encoded_artist = urlencode($encoded_artist);
   </div>
   <div class="main_column">
     <div class="box">
-    <div class="head"><strong>Information</strong></div>
+    <div class="head"><strong>Info</strong></div>
     <div class="pad">
     <table class="layout">
       <tr>
         <td class="label">Created</td>
         <td>
-          <?=time_diff($Request['TimeAdded'])?> by <strong><?=Users::format_username($Request['UserID'], false, false, false)?></strong>
+          <?= time_diff($Request['TimeAdded']) ?> by <strong><?= Users::format_username($Request['UserID'], false, false, false) ?></strong>
         </td>
       </tr>
 <?  if ($CategoryName == 'Movies') {
     if (!empty($Request['CatalogueNumber'])) { ?>
       <tr>
         <td class="label">Catalogue number</td>
-        <td><?=$Request['CatalogueNumber']?></td>
+        <td><?= $Request['CatalogueNumber'] ?></td>
       </tr>
 <?
     }
-  } elseif ($CategoryName == 'Games') {
+  }
+  /*
+  elseif ($CategoryName == 'Games') {
     if (!empty($Request['DLSiteID'])) { ?>
       <tr>
         <td class="label">DLSite ID</td>
-        <td><?=$Request['DLSiteID']?></td>
+        <td><?= $Request['DLSiteID'] ?></td>
       </tr>
 <?  }
   }
+  */
 /*
   $Worldcat = '';
   $OCLC = str_replace(' ', '', $Request['OCLC']);
@@ -263,43 +269,45 @@ $encoded_artist = urlencode($encoded_artist);
   if ($Request['GroupID']) {
 ?>
       <tr>
-        <td class="label">Torrent group</td>
-        <td><a href="torrents.php?id=<?=$Request['GroupID']?>">torrents.php?id=<?=$Request['GroupID']?></a></td>
+        <td class="label">Torrent Group</td>
+        <td><a href="torrents.php?id=<?= $Request['GroupID'] ?>">torrents.php?id=<?= $Request['GroupID'] ?></a></td>
       </tr>
 <?  } ?>
       <tr>
         <td class="label">Votes</td>
         <td>
-          <span id="votecount"><?=number_format($VoteCount)?></span>
+          <span id="votecount"><?= number_format($VoteCount) ?></span>
 <?  if ($CanVote) { ?>
           &nbsp;&nbsp;<a href="javascript:Vote(0)" class="brackets"><strong>+</strong></a>
-          <strong>Costs <?=Format::get_size($MinimumVote, 0)?></strong>
+          <strong>Costs <?= Format::get_size($MinimumVote, 0) ?></strong>
 <?  } ?>
         </td>
       </tr>
 <?  if ($Request['LastVote'] > $Request['TimeAdded']) { ?>
       <tr>
-        <td class="label">Last voted</td>
-        <td><?=time_diff($Request['LastVote'])?></td>
+        <td class="label">Last Voted</td>
+        <td><?= time_diff($Request['LastVote']) ?></td>
       </tr>
 <?
   }
   if ($CanVote) {
 ?>
       <tr id="voting">
-        <td class="label tooltip" title="These units are in base 2, not base 10. For example, there are 1,024 MiB in 1 GiB.">Custom vote</td>
+        <td class="label">Custom Vote</td>
         <td>
+          These units are in base 2, not base 10, e.g., there are 1,024 MiB in 1 GiB
           <input type="text" id="amount_box" size="8" onchange="Calculate();" />
           <select id="unit" name="unit" onchange="Calculate();">
             <option value="mb">MiB</option>
             <option value="gb">GiB</option>
           </select>
           <input type="button" value="Preview" onclick="Calculate();" />
-          <strong><?=($RequestTax * 100)?>% of this is deducted as tax by the system.</strong>
+          <strong>The system deducts <?= ($RequestTax * 100) ?>% as tax</strong>
+
         </td>
       </tr>
       <tr>
-        <td class="label">Post vote information</td>
+        <td class="label">New Stats</td>
         <td>
           <form class="add_form" name="request" action="requests.php" method="get" id="request_form">
             <input type="hidden" name="action" value="vote" />
@@ -312,10 +320,13 @@ $encoded_artist = urlencode($encoded_artist);
             <input type="hidden" id="current_downloaded" value="<?=$LoggedUser['BytesDownloaded']?>" />
             <input type="hidden" id="current_rr" value="<?=(float)$LoggedUser['RequiredRatio']?>" />
             <input id="total_bounty" type="hidden" value="<?=$RequestVotes['TotalBounty']?>" />
-            Bounty after tax: <strong><span id="bounty_after_tax">0.00 MiB</span></strong><br />
-            If you add the entered <strong><span id="new_bounty">0.00 MiB</span></strong> of bounty, your new stats will be: <br />
-            Uploaded: <span id="new_uploaded"><?=Format::get_size($LoggedUser['BytesUploaded'])?></span><br />
-            Ratio: <span id="new_ratio"><?=Format::get_ratio_html($LoggedUser['BytesUploaded'],$LoggedUser['BytesDownloaded'])?></span>
+
+            <ul>
+              <!-- @todo Return this feature
+              <li><strong>Bounty:</strong> <span id="bounty_after_tax">0.00 MiB</span></li> -->
+              <li><strong>Uploaded:</strong> <span id="new_uploaded"><?= Format::get_size($LoggedUser['BytesUploaded']) ?></span></li>
+              <li><strong>Ratio:</strong> <span id="new_ratio"><?= Format::get_ratio_html($LoggedUser['BytesUploaded'],$LoggedUser['BytesDownloaded']) ?></span></li>
+  </ul>
             <input type="button" id="button" value="Vote!" disabled="disabled" onclick="Vote();" />
           </form>
         </td>
@@ -341,7 +352,7 @@ $encoded_artist = urlencode($encoded_artist);
       </tr>
 <?  } else { ?>
       <tr>
-        <td class="label" valign="top">Fill request</td>
+        <td class="label" valign="top">Fill Request</td>
         <td>
           <form class="edit_form" name="request" action="" method="post">
             <div class="field_div">
@@ -350,15 +361,16 @@ $encoded_artist = urlencode($encoded_artist);
               <input type="hidden" name="requestid" value="<?=$RequestID?>" />
               <input type="text" size="50" name="link"<?=(!empty($Link) ? " value=\"$Link\"" : '')?> />
               <br />
-              <strong>Should be the permalink (PL) to the torrent (e.g. <?=site_url()?>torrents.php?torrentid=xxxx).</strong>
+              <strong>Should be the permalink (PL) to the torrent, e.g.,
+                <pre><?= site_url() ?>torrents.php?torrentid=xxx</pre></strong>
             </div>
 <?    if (check_perms('site_moderate_requests')) { ?>
             <div class="field_div">
-              For user: <input type="text" size="25" name="user"<?=(!empty($FillerUsername) ? " value=\"$FillerUsername\"" : '')?> />
+            <strong>For User</strong> <input type="text" size="25" name="user"<?= (!empty($FillerUsername) ? " value=\"$FillerUsername\"" : '') ?> />
             </div>
 <?    } ?>
             <div class="submit_div">
-              <input type="submit" value="Fill request" />
+              <input type="submit" value="Fill" />
             </div>
           </form>
         </td>

sections/upload/upload_handle.php

@@ -467,7 +467,6 @@ if (!isset($GroupID) || !$GroupID) {
         (GroupID, UserID, Time, Image)
       VALUES (?, ?, NOW(), ?)", $GroupID, $LoggedUser['ID'], $Screenshot);
         foreach ($Screenshots as $Screenshot) {
-            $DB->db_string($Screenshot); # Maybe unnecessary
             $DB->exec_prepared_query();
         }
     }
@@ -546,7 +545,7 @@ if ($DB->has_results()) {
 // Download doesn't count, upload does
 if (($TotalSize > 53687091200)) { # 50 GiB
   $T['FreeTorrent'] = '2';
-  $T['FreeLeechType'] = '2';
+    $T['FreeLeechType'] = '2';
 }
 
 // Torrent
@@ -770,18 +769,18 @@ if (!empty($ArtistsUnescaped)) {
         $SQL .= " OR Artists = '')) AND (";
     } else {
     */
-        $SQL .= " AND (";
-        if (!empty($GuestArtistNameList)) {
-            $SQL .= "(ExcludeVA = '0' AND (";
-            $SQL .= implode(' OR ', $GuestArtistNameList);
-            $SQL .= ')) OR ';
-        }
-        if (count($ArtistNameList) > 0) {
-            $SQL .= implode(' OR ', $ArtistNameList);
-            $SQL .= " OR ";
-        }
-        $SQL .= "Artists = '') AND (";
-    #}
+    $SQL .= " AND (";
+    if (!empty($GuestArtistNameList)) {
+        $SQL .= "(ExcludeVA = '0' AND (";
+        $SQL .= implode(' OR ', $GuestArtistNameList);
+        $SQL .= ')) OR ';
+    }
+    if (count($ArtistNameList) > 0) {
+        $SQL .= implode(' OR ', $ArtistNameList);
+        $SQL .= " OR ";
+    }
+    $SQL .= "Artists = '') AND (";
+#}
 } else {
     $SQL .= "AND (Artists = '') AND (";
 }