Empty commit

This commit is contained in:
Git 2012-10-31 08:00:17 +00:00
parent 2380381c26
commit e95360f48f
10 changed files with 32 additions and 24 deletions

View File

@ -40,7 +40,7 @@ class CACHE extends Memcache {
'top10tor_*',
'query_lock_*',
'top10votes_*',
'similar_albums_*',
// 'similar_albums_*',
'users_snatched_*'
);

View File

@ -143,7 +143,7 @@ function foot() {
?>
<tr>
<td colspan="2" style="text-align: center;">
<p>Be sure that your torrent is approved by the <a href="rules.php?p=upload">rules</a>. Not doing this will result in a <strong>warning</strong> or <strong>worse</strong>.</p>
<p>Be sure that your torrent is approved by the <a href="rules.php?p=upload" target="_blank">rules</a>. Not doing this will result in a <strong>warning</strong> or <strong>worse</strong>.</p>
<? if($this->NewTorrent) { ?>
<p>After uploading the torrent, you will have a one hour grace period during which no one other than you can fill requests with this torrent. Make use of this time wisely, and search the requests.</p>
<? } ?>
@ -198,7 +198,7 @@ function music_form($GenreTags) {
<tr id="artist_tr">
<td class="label">Artist(s)</td>
<td id="artistfields">
<p id="vawarning" class="hidden">Please use the multiple artists feature rather than adding 'Various Artists' as an artist, read <a href='wiki.php?action=article&amp;id=369'>this</a> for more information on why.</p>
<p id="vawarning" class="hidden">Please use the multiple artists feature rather than adding 'Various Artists' as an artist, read <a href='wiki.php?action=article&amp;id=369' target='_blank'>this</a> for more information on why.</p>
<? if(!empty($Torrent['Artists'])) {
$FirstArtist = true;
foreach($Torrent['Artists'] as $Importance => $Artists) {
@ -244,7 +244,7 @@ function music_form($GenreTags) {
<td class="label">Album title:</td>
<td>
<input type="text" id="title" name="title" size="60" value="<?=display_str($Torrent['Title']) ?>"<?=$this->Disabled?>/>
<p class="min_padding">Do not include the words remaster, re-issue, MSFL Gold, limited edition, bonus tracks, bonus disc or country specific information in this field. That belongs in the edition information fields below, see <a href="wiki.php?action=article&amp;id=159">this</a> for further information. Also remember to use the correct capitalization for your upload. See the <a href="wiki.php?action=article&amp;id=317">Capitalization Guidelines</a> for more information.
<p class="min_padding">Do not include the words remaster, re-issue, MSFL Gold, limited edition, bonus tracks, bonus disc or country specific information in this field. That belongs in the edition information fields below, see <a href="wiki.php?action=article&amp;id=159" target="_blank">this</a> for further information. Also remember to use the correct capitalization for your upload. See the <a href="wiki.php?action=article&amp;id=317" target="_blank">Capitalization Guidelines</a> for more information.
</td>
</tr>
<tr id="musicbrainz_tr">
@ -314,7 +314,7 @@ function show() {
<td class="label">Catalogue Number (Optional):</td>
<td>
<input type="text" id="catalogue_number" name="catalogue_number" size="40" value="<?=display_str($Torrent['CatalogueNumber']) ?>"<?=$this->Disabled?> />
Please double check the record label and catalogue number when using MusicBrainz. See <a href="wiki.php?action=article&amp;id=688">this guide</a> for more details.
Please double check the record label and catalogue number when using MusicBrainz. See <a href="wiki.php?action=article&amp;id=688" target="_blank">this guide</a> for more details.
</td>
</tr>
<tr id="releasetype_tr">
@ -335,7 +335,7 @@ function show() {
}
?>
</select> Please take the time to fill this out properly (try searching <a href="http://musicbrainz.org/search.html">MusicBrainz</a>).
</select> Please take the time to fill this out properly (try searching <a href="http://musicbrainz.org/search.html" target="_blank">MusicBrainz</a>).
</td>
</tr>
<? } ?>
@ -390,7 +390,7 @@ function show() {
<td class="label">Scene</td>
<td>
<input type="checkbox" id="scene" name="scene" <? if($Torrent['Scene']) { echo "checked='checked' ";}?>/>
Check this only if this is a 'scene release'. If you ripped it yourself, it is <strong>not</strong> a scene release. <br />If you are not sure, <strong>DO NOT</strong> check it; you will be penalized. For information on the scene, visit <a href="http://en.wikipedia.org/wiki/Scene_%28software%29">Wikipedia</a>.
Check this only if this is a 'scene release'. If you ripped it yourself, it is <strong>not</strong> a scene release. <br />If you are not sure, <strong>DO NOT</strong> check it; you will be penalized. For information on the scene, visit <a href="http://en.wikipedia.org/wiki/Scene_%28software%29" target="_blank">Wikipedia</a>.
</td>
</tr>
<tr>
@ -481,7 +481,7 @@ function show() {
Log Files
</td>
<td id="logfields">
Check your log files here before uploading: <a href="logchecker.php">logchecker.php</a><br />
Check your log files here before uploading: <a href="logchecker.php" target="_blank">logchecker.php</a><br />
<input id="file" type="file" name="logfiles[]" size="50" /> [<a href="javascript:;" onclick="AddLogField();">+</a>] [<a href="javascript:;" onclick="RemoveLogField();">-</a>]
</td>
</tr>

View File

@ -406,7 +406,7 @@
if($Show) {
?>
<div class="rippywrap">
<div id="rippywrap" class="rippywrap">
<div id="bubble" style="display: <?=($Says ? 'block' : 'none')?>">
<span class="rbt"></span>
<span id="rippy-says" class="rbm"><?=$Says?></span>
@ -414,6 +414,13 @@
</div>
<div class="rippy" onclick="rippyclick();"></div>
</div>
<script>
//Random rippy image script, moved to here instead of js file because opera sucks
var n = Math.floor((Math.random()*3)+1);
var background = "transparent url('static/rippy/rippy_halloween_" + n + ".png') no-repeat bottom center";
document.getElementById('rippywrap').style.background = background;
</script>
<?
}
}

View File

@ -640,6 +640,7 @@ CREATE TABLE `schedule` (
CREATE TABLE `sphinx_delta` (
`ID` int(10) NOT NULL,
`GroupID` int(11) NOT NULL DEFAULT '0',
`GroupName` varchar(255) DEFAULT NULL,
`ArtistName` varchar(2048) DEFAULT NULL,
`TagList` varchar(728) DEFAULT NULL,
@ -662,12 +663,13 @@ CREATE TABLE `sphinx_delta` (
`Media` varchar(255) DEFAULT NULL,
`Format` varchar(255) DEFAULT NULL,
`Encoding` varchar(255) DEFAULT NULL,
`RemasterYear` int(4) DEFAULT NULL,
`RemasterYear` varchar(50) NOT NULL DEFAULT '',
`RemasterTitle` varchar(512) DEFAULT NULL,
`RemasterRecordLabel` varchar(50) DEFAULT NULL,
`RemasterCatalogueNumber` varchar(50) DEFAULT NULL,
`FileList` mediumtext,
PRIMARY KEY (`ID`)
PRIMARY KEY (`ID`),
KEY `GroupID` (`GroupID`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE `sphinx_hash` (

View File

@ -538,10 +538,8 @@ function header_link($SortKey,$DefaultWay="desc") {
'isFreeleech' => $Data['FreeTorrent'] == '1',
'isNeutralLeech' => $Data['FreeTorrent'] == '2',
'isPersonalFreeleech' => $Data['PersonalFL'],
'canUseToken' => ($LoggedUser['FLTokens'] > 0)
&& $Data['HasFile'] && ($Data['Size'] < 1073741824)
&& !$Data['PersonalFL']
&& empty($Data['FreeTorrent']) && ($LoggedUser['CanLeech'] == '1')
'canUseToken' => Torrents::can_use_token($Data),
'hasSnatched' => $Data['IsSnatched']
);
}
@ -582,10 +580,8 @@ function header_link($SortKey,$DefaultWay="desc") {
'isFreeleech' => $Data['FreeTorrent'] == '1',
'isNeutralLeech' => $Data['FreeTorrent'] == '2',
'isPersonalFreeleech' => $Data['PersonalFL'],
'canUseToken' => ($LoggedUser['FLTokens'] > 0)
&& $Data['HasFile'] && ($Data['Size'] < 1073741824)
&& !$Data['PersonalFL']
&& empty($Data['FreeTorrent']) && ($LoggedUser['CanLeech'] == '1')
'canUseToken' => Torrents::can_use_token($Data),
'hasSnatched' => $Data['IsSnatched']
);
}
}

View File

@ -27,7 +27,7 @@
This has <span id="upvotes" class="favoritecount"><?=$UpVotes?></span> <?=(($UpVotes==1)?'upvote':'upvotes')?> out of <span id="totalvotes" class="favoritecount"><?=$TotalVotes?></span> total<span id="upvoted" <?=($Voted!='Up'?'class="hidden"':'')?>>, including your upvote</span><span id="downvoted" <?=($Voted!='Down'?'class="hidden"':'')?>>, including your downvote</span>.
<br /><br />
<? if (check_perms('site_album_votes')) { ?>
<span <?=($Voted?'class="hidden"':'')?> id="vote_message"><a href="#" onClick="UpVoteGroup(<?=$GroupID?>, '<?=$LoggedUser['AuthKey']?>'); return false;">Upvote</a> - <a href="#" onClick="DownVoteGroup(<?=$GroupID?>, '<?=$LoggedUser['AuthKey']?>'); return false;">Downvote</a></span>
<span <?=($Voted?'class="hidden"':'')?> id="vote_message"><a href="#" class="upvote" onClick="UpVoteGroup(<?=$GroupID?>, '<?=$LoggedUser['AuthKey']?>'); return false;">Upvote</a> - <a href="#" class="downvote" onClick="DownVoteGroup(<?=$GroupID?>, '<?=$LoggedUser['AuthKey']?>'); return false;">Downvote</a></span>
<? } ?>
<span <?=($Voted?'':'class="hidden"')?> id="unvote_message">Changed your mind?<br /><a href="#" onClick="UnvoteGroup(<?=$GroupID?>, '<?=$LoggedUser['AuthKey']?>'); return false;">Clear your vote</a></span>
</div>

View File

@ -3,10 +3,10 @@
include(SERVER_ROOT.'/sections/torrents/ranking_funcs.php');
$Top10 = $Cache->get_value('similar_albums_'.$GroupID);
if ($Top10 === False) {
if ($Top10 === False || isset($Top10[$GroupID])) {
$VotePairs = $Cache->get_value('vote_pairs_'.$GroupID, true);
if ($VotePairs === False) {
if ($VotePairs === False|| isset($VotePairs[$GroupID])) {
$DB->query("SELECT v.GroupID, SUM(IF(v.Type='Up',1,0)) AS Ups, COUNT(1) AS Total
FROM (SELECT UserID FROM users_votes WHERE GroupID = $GroupID AND Type='Up') AS a
JOIN users_votes AS v USING (UserID)
@ -28,7 +28,7 @@
arsort($GroupScores);
$Top10 = array_slice($GroupScores, 0, 10, true);
$Cache->cache_value('similar_albums_'.$GroupID, $Top10, 2*3600);
$Cache->cache_value('similar_albums_'.$GroupID, $Top10, .5*3600);
}
if (count($Top10) > 0) {
?>

View File

@ -194,6 +194,7 @@
$Options['DisablePMAvatars'] = (!empty($_POST['disablepmavatars']) ? 1 : 0);
$Options['NotifyOnQuote'] = (!empty($_POST['notifyquotes']) ? 1 : 0);
$Options['ShowSnatched'] = (!empty($_POST['showsnatched']) ? 1 : 0);
$Options['DisableAutoSave'] = (!empty($_POST['disableautosave']) ? 1 : 0);
if(isset($LoggedUser['DisableFreeTorrentTop10'])) {

View File

@ -13,3 +13,5 @@ function say() {
function rippyclick() {
$('.rippywrap').remove();
}

View File

@ -190,7 +190,7 @@ div#AddArtists a {
z-index: 25;
display: block;
position: fixed;
background: transparent url('../rippy/rippy_bday.png') no-repeat bottom
background: transparent no-repeat bottom
center;
color: black;
text-align: center;