Empty commit

classes/class_users.php

@@ -452,7 +452,7 @@ public static function format_username($UserID, $Badges = false, $IsWarned = tru
 
         $Str .= ($IsWarned && $UserInfo['Warned'] != '0000-00-00 00:00:00') ? '<a href="wiki.php?action=article&amp;id=218"'
 					. '><img src="'.STATIC_SERVER.'common/symbols/warned.png" alt="Warned" title="Warned'
-					. ($LoggedUser['ID'] === $UserID ? ' - Expires ' . date('Y-m-d h:i', strtotime($UserInfo['Warned'])) : '')
+					. ($LoggedUser['ID'] === $UserID ? ' - Expires ' . date('Y-m-d H:i', strtotime($UserInfo['Warned'])) : '')
 					. '" /></a>' : '';
 		$Str .= ($IsEnabled && $UserInfo['Enabled'] == 2) ? '<a href="rules.php"><img src="'.STATIC_SERVER.'common/symbols/disabled.png" alt="Banned" title="Be good, and you won\'t end up like this user" /></a>' : '';
 

gazelle.sql

@@ -1542,6 +1542,17 @@ CREATE TABLE `users_warnings_forums` (
   PRIMARY KEY (`UserID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+CREATE TABLE `watchlist_hits` (
+  `ID` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `UserID` int(10) unsigned NOT NULL,
+  `WatcherID` int(10) unsigned NOT NULL,
+  `Date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `Triggered` varchar(50) COLLATE utf8_swedish_ci NOT NULL,
+  `Item` varchar(100) COLLATE utf8_swedish_ci NOT NULL,
+  `Checked` tinyint(1) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_swedish_ci;
+
 CREATE TABLE `wiki_aliases` (
   `Alias` varchar(50) NOT NULL,
   `UserID` int(10) NOT NULL,

sections/ajax/send_recommendation.php

@@ -10,13 +10,13 @@
 }
 // Make sure the recipient is on your friends list and not some random dude.
 $DB->query("SELECT
-		f.FriendID, u.Username
+    f.FriendID, u.Username
-		FROM friends AS f
+    FROM friends AS f
-		JOIN users_enable_recommendations AS r
+    RIGHT JOIN users_enable_recommendations AS r
-		ON r.ID = f.FriendID AND r.Enable = 1
+    ON r.ID = f.FriendID AND r.Enable = 1
-		LEFT JOIN users_main AS u
+    RIGHT JOIN users_main AS u
-		ON u.ID = f.FriendID
+    ON u.ID = f.FriendID
-		WHERE f.UserID = '$LoggedUser[ID]' AND f.FriendID = '$FriendID'");
+    WHERE f.UserID = '$LoggedUser[ID]' AND f.FriendID = '$FriendID'");
 
 if($DB->record_count() == 0) {
 	echo json_encode(array("status" => "error", "response" => "Not on friend list."));
@@ -50,7 +50,7 @@
     $Body = $Body . "\n\n". $Note;
 }
 
-Misc::send_pm($FriendID, $LoggedUser['ID'], $Subject, $Body);
+Misc::send_pm($FriendID, $LoggedUser['ID'], db_string($Subject), db_string($Body));
 echo json_encode(array("status" => "success", "response" => "Sent!"));
 die();
 

sections/artist/artist.php

@@ -510,7 +510,8 @@ function compare($X, $Y){
 <?
 }
 ?>
-    <a href="#" id="recommend" class="brackets">Recommend</a>
+<!--     <a href="#" id="recommend" class="brackets">Recommend</a>
+ -->
 <?
 if (check_perms('site_edit_wiki')) {
 ?>
@@ -534,7 +535,7 @@ function compare($X, $Y){
 <? } ?>
 		</div>
     </div>
-<? Misc::display_recommend($ArtistID, "artist"); ?>
+<? /* Misc::display_recommend($ArtistID, "artist"); */ ?>
     <div class="sidebar">
 <? if($Image) { ?>
 		<div class="box box_image">

sections/collages/collage.php

@@ -371,7 +371,8 @@ function compare($X, $Y){
 			<a href="#" id="bookmarklink_collage_<?=$CollageID?>" class="brackets" onclick="Bookmark('collage', <?=$CollageID?>,'Remove bookmark');return false;">Bookmark</a>
 <?	}
 ?>
-<a href="#" id="recommend" class="brackets">Recommend</a>
+<!-- <a href="#" id="recommend" class="brackets">Recommend</a>
+ -->
 <?
 if (check_perms('site_collages_manage') && !$Locked) { ?>
 			<a href="collages.php?action=manage&amp;collageid=<?=$CollageID?>" class="brackets">Manage torrents</a>
@@ -382,7 +383,7 @@ function compare($X, $Y){
 <? } ?>
 		</div>
     </div>
-<? Misc::display_recommend($CollageID, "collage"); ?>
+<? /* Misc::display_recommend($CollageID, "collage"); */ ?>
     <div class="sidebar">
 		<div class="box box_category">
 			<div class="head"><strong>Category</strong></div>

sections/torrents/details.php

@@ -100,7 +100,7 @@ function compare($X, $Y){
 			<a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="add_bookmark brackets" title="Add bookmark" onclick="Bookmark('torrent',<?=$GroupID?>,'Unbookmark');return false;">Bookmark</a>
 <?	}
 ?>
-<a href="#" id="recommend" class="brackets">Recommend</a>
+<!-- <a href="#" id="recommend" class="brackets">Recommend</a> -->
 <?
 	if($Categories[$GroupCategoryID-1] == 'Music') { ?>
 			<a href="upload.php?groupid=<?=$GroupID?>" class="brackets">Add format</a>
@@ -111,7 +111,7 @@ function compare($X, $Y){
 			<a href="torrents.php?action=grouplog&amp;groupid=<?=$GroupID?>" class="brackets">View log</a>
 		</div>
 	</div>
-<? Misc::display_recommend($GroupID, "torrent"); ?>
+<? /* Misc::display_recommend($GroupID, "torrent"); */ ?>
 	<div class="sidebar">
 		<div class="box box_image box_image_albumart box_albumart"><!-- .box_albumart deprecated -->
 			<div class="head"><strong>Cover</strong></div>

sections/user/user.php

@@ -241,7 +241,7 @@ function check_paranoia_here($Setting) {
 				<li<?= $Override===2 ? ' class="paranoia_override"' : ''?>><a href="userhistory.php?action=token_history&amp;userid=<?=$UserID?>">Tokens</a>: <?=number_format($FLTokens)?></li>
 <? }
 	if (($OwnProfile || check_perms('users_mod')) && $Warned!='0000-00-00 00:00:00') { ?>
-				<li<?= $Override===2 ? ' class="paranoia_override"' : ''?>>Warning expires: <?= date('Y-m-d h:i', strtotime($Warned)) ?></li>
+				<li<?= $Override===2 ? ' class="paranoia_override"' : ''?>>Warning expires: <?= date('Y-m-d H:i', strtotime($Warned)) ?></li>
 <? } ?>
 			</ul>
 		</div>