Empty commit

classes/image_tools.class.php

@@ -137,7 +137,7 @@ private static function clean_imgur_url($Url) {
 				$Path = substr($Path, 0, -1);
 			}
 		}
-	   return $Base . '/' . $Path . '.' . $Extension;
+		return "$Base/$Path.$Extension";
 	}
 
 	/**

gazelle.sql

@@ -154,6 +154,13 @@ CREATE TABLE `bookmarks_torrents` (
   KEY `GroupID` (`GroupID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
+CREATE TABLE `changelog` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `time` datetime DEFAULT NULL,
+  `message` text COLLATE utf8_swedish_ci,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_swedish_ci;
+
 CREATE TABLE `collages` (
   `ID` int(10) NOT NULL AUTO_INCREMENT,
   `Name` varchar(100) CHARACTER SET utf8 COLLATE utf8_swedish_ci NOT NULL DEFAULT '',

sections/ajax/inbox/inbox.php

@@ -35,7 +35,8 @@
 		um.Username,
 		ui.Donor,
 		ui.Warned,
-		um.Enabled,";
+		um.Enabled,
+		ui.Avatar,";
 $sql .= ($Section == 'sentbox')? ' cu.SentDate ' : ' cu.ReceivedDate ';
 $sql .= "AS Date
 	FROM pm_conversations AS c
@@ -81,7 +82,7 @@
 $Pages = Format::get_pages($Page, $NumResults, MESSAGES_PER_PAGE, 9);
 
 $JsonMessages = array();
-while (list($ConvID, $Subject, $Unread, $Sticky, $ForwardedID, $ForwardedName, $SenderID, $Username, $Donor, $Warned, $Enabled, $Date) = $DB->next_record()) {
+while (list($ConvID, $Subject, $Unread, $Sticky, $ForwardedID, $ForwardedName, $SenderID, $Username, $Donor, $Warned, $Enabled, $Avatar, $Date) = $DB->next_record()) {
 	$JsonMessage = array(
 		'convId' => (int) $ConvID,
 		'subject' => $Subject,
@@ -91,6 +92,7 @@
 		'forwardedName' => $ForwardedName,
 		'senderId' => (int) $SenderID,
 		'username' => $Username,
+		'avatar' => $Avatar,
 		'donor' => $Donor == 1,
 		'warned' => $Warned == 1,
 		'enabled' => ($Enabled == 2 ? false : true),

sections/ajax/inbox/viewconv.php

@@ -55,9 +55,12 @@
 	$PMUserID = (int)$PMUserID;
 	$Users[$PMUserID]['UserStr'] = Users::format_username($PMUserID, true, true, true, true);
 	$Users[$PMUserID]['Username'] = $Username;
+	$UserInfo = Users::user_info($PMUserID);
+	$Users[$PMUserID]['Avatar'] = $UserInfo['Avatar'];
 }
 $Users[0]['UserStr'] = 'System'; // in case it's a message from the system
 $Users[0]['Username'] = 'System';
+$Users[0]['Avatar'] = '';
 
 
 
@@ -86,6 +89,7 @@
 		'senderId' => (int) $SenderID,
 		'senderName' => $Users[(int)$SenderID]['Username'],
 		'sentDate' => $SentDate,
+		'avatar' => $Users[(int)$SenderID]['Avatar'],
 		'bbBody' => $Body,
 		'body' => $Text->full_format($Body)
 	);

sections/artist/artist.php

@@ -510,7 +510,7 @@ function compare($X, $Y) {
 <?	} ?>
 			<a href="artist.php?action=history&amp;artistid=<?=$ArtistID?>" class="brackets">View history</a>
 			<a href="artist.php?id=<?=$ArtistID?>#info" class="brackets">Info</a>
-<?	if (defined(LASTFM_API_KEY)) { ?>
+<?	if (defined('LASTFM_API_KEY')) { ?>
 			<a href="artist.php?id=<?=$ArtistID?>#concerts" class="brackets">Concerts</a>
 <?	} ?>
 			<a href="artist.php?id=<?=$ArtistID?>#artistcomments" class="brackets">Comments</a>
@@ -933,7 +933,7 @@ function require(file, callback) {
 			</div>
 			<div id="body" class="body"><?=$Text->full_format($Body)?></div>
 		</div>
-<?	if (defined(LASTFM_API_KEY)) {
+<?	if (defined('LASTFM_API_KEY')) {
 		include(SERVER_ROOT.'/sections/artist/concerts.php');
 	} ?>
 <?php

sections/rules/ratio.php

@@ -15,7 +15,7 @@
 			<li>To maintain <strong>leeching privileges</strong>, your ratio must remain above a minimum value. This minimum value is your <strong>required ratio</strong>.</li>
 			<li>If your ratio falls below your required ratio, you will be given two weeks to raise your ratio back above your required ratio. During this period, you are on <strong>ratio watch</strong>.
 			</li>
-			<li>If you fail to raise your ratio above your required required ratio in the allotted time, your leeching privileges will be revoked. You will be unable to download more data. Your account will remain enabled.
+			<li>If you fail to raise your ratio above your required ratio in the allotted time, your leeching privileges will be revoked. You will be unable to download more data. Your account will remain enabled.
 			</li>
 		</ul>
 		<br />

static/functions/musicbrainz.js

@@ -120,7 +120,7 @@ function showReleaseGroups(xml) {
 		var $score = $(this).attr("ext:score");
 		var $releaseId = $(this).attr("id");
 		var $result = $artist + " - " + $title + " [Type: " + $type + ", Score: " + $score + "]"
-		$("<a href='#null'>" + $result + "<p />").attr("id", $releaseId).appendTo("#results1");
+		$('<a href="#null">' + $result + "<p />").attr("id", $releaseId).appendTo("#results1");
 	});
 }