Empty commit

This commit is contained in:
Git 2011-11-12 08:00:15 +00:00
parent 7d61173d76
commit d52648548e
6 changed files with 62 additions and 18 deletions

View File

@ -519,7 +519,10 @@ function to_html($Array) {
if(!$this->valid_url($Block['Val'], '\.(jpe?g|gif|png|bmp|tiff)')) {
$Str.='[img]'.$Block['Val'].'[/img]';
} else {
if(check_perms('site_proxy_images')) {
$LocalURL = $this->local_url($Block['Val']);
if($LocalURL) {
$Str.='<img class="scale_image" onclick="lightbox.init(this,500);" alt="'.$Block['Val'].'" src="'.$LocalURL.'" />';
} elseif(check_perms('site_proxy_images')) {
$Str.='<img class="scale_image" onclick="lightbox.init(this,500);" alt="'.$Block['Val'].'" src="http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?i='.urlencode($Block['Val']).'" />';
} else {
$Str.='<img class="scale_image" onclick="lightbox.init(this,500);" alt="'.$Block['Val'].'" src="'.$Block['Val'].'" />';

View File

@ -591,7 +591,7 @@ function get_cc($IP) {
function display_ip($IP) {
$Line = display_str($IP).' ('.get_cc($IP).') ';
$Line .= '[<a href="user.php?action=search&amp;ip_history=on&amp;ip='.display_str($IP).'&matchtype=strict" title="Search">S</a>]';
$Line .= '[<a href="user.php?action=search&amp;ip_history=on&amp;ip='.display_str($IP).'&amp;matchtype=strict" title="Search">S</a>]';
return $Line;
}
@ -2104,9 +2104,10 @@ function freeleech_groups($GroupIDs, $FreeNeutral = 1, $FreeLeechType = 0) {
}
$DB->query("SELECT ID from torrents WHERE GroupID IN (".implode(", ", $GroupIDs).")");
$TorrentIDs = $DB->collect('ID');
freeleech_torrents($TorrentIDs, $FreeNeutral, $FreeLeechType);
if($DB->record_count()) {
$TorrentIDs = $DB->collect('ID');
freeleech_torrents($TorrentIDs, $FreeNeutral, $FreeLeechType);
}
}

View File

@ -48,11 +48,11 @@
$DB->query("UPDATE artists_alias SET Redirect='$TargetAliasID' WHERE AliasID='$OldAliasID'");
$DB->query("UPDATE artists_group SET Name='".db_string($NewName)."' WHERE ArtistID='$ArtistID'");
$DB->query("SELECT GroupID FROM torrents_artists WHERE AliasID='$OldAliasID'");
$Groups = $DB->collect('GroupID');
$DB->query("UPDATE IGNORE torrents_artists SET AliasID='$TargetAliasID' WHERE AliasID='$OldAliasID'");
$DB->query("DELETE FROM torrents_artists WHERE AliasID='$OldAliasID'");
if(!empty($Groups)) {
foreach($Groups as $GroupID) {
$Cache->delete_value('groups_artists_'.$GroupID); // Delete group artist cache
@ -60,6 +60,16 @@
}
}
$DB->query("SELECT RequestID FROM requests_artists WHERE AliasID='$OldAliasID'");
$Requests = $DB->collect('RequestID');
$DB->query("UPDATE IGNORE requests_artists SET AliasID='$TargetAliasID' WHERE AliasID='$OldAliasID'");
$DB->query("DELETE FROM requests_artists WHERE AliasID='$OldAliasID'");
if(!empty($Requests)) {
foreach($Requests as $RequestID) {
$Cache->delete_value('request_artists_'.$RequestID); // Delete group artist cache
update_sphinx_requests($RequestID);
}
}
$TargetArtistID = $ArtistID;
} else { // Merge stuff
@ -74,31 +84,49 @@
$DB->query("SELECT GroupID FROM torrents_artists WHERE AliasID='$OldAliasID'");
$Groups = $DB->collect('GroupID');
$DB->query("UPDATE IGNORE torrents_artists SET AliasID='$TargetAliasID',ArtistID='$TargetArtistID' WHERE AliasID='$OldAliasID'");
$DB->query("DELETE FROM torrents_artists WHERE AliasID='$OldAliasID'");
if(!empty($Groups)) {
foreach($Groups as $GroupID) {
$Cache->delete_value('groups_artists_'.$GroupID);
update_hash($GroupID);
}
}
$DB->query("SELECT RequestID FROM requests_artists WHERE AliasID='$OldAliasID'");
$Requests = $DB->collect('RequestID');
$DB->query("UPDATE IGNORE requests_artists SET AliasID='$TargetAliasID',ArtistID='$TargetArtistID' WHERE AliasID='$OldAliasID'");
$DB->query("DELETE FROM requests_artists WHERE AliasID='$OldAliasID'");
if(!empty($Requests)) {
foreach($Requests as $RequestID) {
$Cache->delete_value('request_artists_'.$RequestID);
update_sphinx_requests($RequestID);
}
}
if($ArtistID != $TargetArtistID) {
$DB->query("SELECT GroupID FROM torrents_artists WHERE ArtistID='$ArtistID'");
$Groups = $DB->collect('GroupID');
$DB->query("UPDATE IGNORE torrents_artists SET ArtistID='$TargetArtistID' WHERE ArtistID='$ArtistID'");
$DB->query("DELETE FROM torrents_artists WHERE ArtistID='$ArtistID'");
if(!empty($Groups)) {
foreach($Groups as $GroupID) {
$Cache->delete_value('groups_artists_'.$GroupID);
update_hash($GroupID);
}
}
}
$DB->query("SELECT RequestID FROM requests_artists WHERE ArtistID='$ArtistID'");
$Requests = $DB->collect('RequestID');
$DB->query("UPDATE IGNORE requests_artists SET ArtistID='$TargetArtistID' WHERE ArtistID='$ArtistID'");
$DB->query("DELETE FROM requests_artists WHERE ArtistID='$ArtistID'");
if(!empty($Requests)) {
foreach($Requests as $RequestID) {
$Cache->delete_value('request_artists_'.$RequestID);
update_sphinx_requests($RequestID);
}
}
}
}
$Cache->delete_value('artist_'.$ArtistID);
@ -111,6 +139,8 @@
$Cache->delete_value('artist_'.$ArtistID);
$Cache->delete_value('artist_'.$TargetArtistID);
$Cache->delete_value('artists_requests_'.$TargetArtistID);
$Cache->delete_value('artists_requests_'.$ArtistID);
header('Location: artist.php?id='.$TargetArtistID);

View File

@ -66,6 +66,14 @@
update_sphinx_requests($RequestID);
if(!empty($ArtistForm)) {
foreach($ArtistForm as $ArtistType) {
foreach($ArtistType as $Artist) {
$Cache->delete_value('artist_'.$Artist['id']);
$Cache->delete_value('artists_requests_'.$Artist['id']);
}
}
}
header('Location: requests.php?action=view&id='.$RequestID);

View File

@ -187,7 +187,7 @@ function check_paranoia_here($Setting) {
<? }
if (check_perms('users_mod')) {
?>
[<a href="userhistory.php?action=token_history&userid=<?=$UserID?>">FL Tokens</a>]
[<a href="userhistory.php?action=token_history&amp;userid=<?=$UserID?>">FL Tokens</a>]
<? } ?>
</div>
@ -222,7 +222,7 @@ function check_paranoia_here($Setting) {
<li>Required ratio: <?=number_format((double)$RequiredRatio, 2)?></li>
<? } ?>
<? if ($OwnProfile || check_paranoia_here(false)) { //if ($OwnProfile || check_perms('users_mod')) { ?>
<li><a href="userhistory.php?action=token_history&userid=<?=$UserID?>">Tokens</a>: <?=number_format($FLTokens)?></li>
<li><a href="userhistory.php?action=token_history&amp;userid=<?=$UserID?>">Tokens</a>: <?=number_format($FLTokens)?></li>
<? } ?>
</ul>
</div>
@ -389,7 +389,7 @@ function check_paranoia_here($Setting) {
if (check_perms('users_view_keys',$Class) || $OwnProfile) {
?>
<li>Passkey: <?=display_str($torrent_pass)?>
<li>Passkey: <?=display_str($torrent_pass)?></li>
<? }
if (check_perms('users_view_invites')) {
if (!$InviterID) {
@ -615,7 +615,7 @@ function check_paranoia_here($Setting) {
<table class="recent" cellpadding="0" cellspacing="0" border="0">
<tr class="colhead">
<td colspan="5">Recent Snatches</td>
<tr>
</tr>
<tr>
<?
foreach($RecentSnatches as $RS) { ?>
@ -655,6 +655,7 @@ function check_paranoia_here($Setting) {
<table class="recent" cellpadding="0" cellspacing="0" border="0">
<tr class="colhead">
<td colspan="5">Recent Uploads</td>
</tr>
<tr>
<? foreach($RecentUploads as $RU) { ?>
<td>
@ -690,6 +691,7 @@ function check_paranoia_here($Setting) {
<a href="#" onclick="$('#collage<?=$CollageID?>').toggle(); this.innerHTML=(this.innerHTML=='(Hide)'?'(Show)':'(Hide)'); return false;"><?=$FirstCol?'(Hide)':'(Show)'?></a>
</span>
</td>
</tr>
<tr id="collage<?=$CollageID?>" <?=$FirstCol?'':'class="hidden"'?>>
<? foreach($Collage as $C) {
$Group = get_groups(array($C['GroupID']));

View File

@ -625,12 +625,12 @@ table.staff td.nobr:last-child {
background: url('icons/ebooks.png');
}
#recommended .head {
body#index #recommended .head {
margin-bottom: -11px !important;
border-bottom-color: #aeaeae !important;
}
#recommended #vanityhouse {
body#index #recommended #vanityhouse {
margin-top: 21px;
}