diff --git a/classes/class_users.php b/classes/class_users.php index b2e303f2..579bdee4 100644 --- a/classes/class_users.php +++ b/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') ? '' : ''; $Str .= ($IsEnabled && $UserInfo['Enabled'] == 2) ? '' : ''; diff --git a/gazelle.sql b/gazelle.sql index 7ea8fd15..15a10bc3 100644 --- a/gazelle.sql +++ b/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, diff --git a/sections/ajax/send_recommendation.php b/sections/ajax/send_recommendation.php index 101e0598..5c3d8aad 100644 --- a/sections/ajax/send_recommendation.php +++ b/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 - FROM friends AS f - JOIN users_enable_recommendations AS r - ON r.ID = f.FriendID AND r.Enable = 1 - LEFT JOIN users_main AS u - ON u.ID = f.FriendID - WHERE f.UserID = '$LoggedUser[ID]' AND f.FriendID = '$FriendID'"); + f.FriendID, u.Username + FROM friends AS f + RIGHT JOIN users_enable_recommendations AS r + ON r.ID = f.FriendID AND r.Enable = 1 + RIGHT JOIN users_main AS u + ON u.ID = f.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(); diff --git a/sections/artist/artist.php b/sections/artist/artist.php index f2951438..6010ae27 100644 --- a/sections/artist/artist.php +++ b/sections/artist/artist.php @@ -510,7 +510,8 @@ function compare($X, $Y){ } ?> - Recommend + if (check_perms('site_edit_wiki')) { ?> @@ -534,7 +535,7 @@ function compare($X, $Y){ } ?> - Misc::display_recommend($ArtistID, "artist"); ?> + /* Misc::display_recommend($ArtistID, "artist"); */ ?>
- Misc::display_recommend($CollageID, "collage"); ?> + /* Misc::display_recommend($CollageID, "collage"); */ ?> - Misc::display_recommend($GroupID, "torrent"); ?> + /* Misc::display_recommend($GroupID, "torrent"); */ ?>