Mirror/Gazelle
1
0
Fork 0
mirror of https://github.com/WhatCD/Gazelle.git synced 2025-01-18 12:11:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Empty commit

Browse Source
This commit is contained in:
Git 2013-11-10 08:00:49 +00:00
parent 59efede6a0
commit dcd7d38564
27 changed files with 595 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/donationsview.class.php
View File

@ -106,7 +106,7 @@ public static function render_profile_rewards($EnabledRewards, $ProfileRewards)
<span style="float: left;"><?=!empty($ProfileRewards['ProfileInfoTitle' . $i]) ? display_str($ProfileRewards['ProfileInfoTitle' . $i]) : "Extra Profile " . ($i + 1)?></span>
<span style="float: right;"><a href="#" onclick="$('#profilediv_<?=$i?>').gtoggle(); this.innerHTML = (this.innerHTML == 'Hide' ? 'Show' : 'Hide'); return false;" class="brackets">Hide</a></span>
</div>
<div class="pad" id="profilediv_<?=$i?>">
<div class="pad profileinfo" id="profilediv_<?=$i?>">
<? echo $Text->full_format($ProfileRewards['ProfileInfo' . $i]); ?>
</div>
</div>

4
classes/text.class.php
View File

@ -775,9 +775,9 @@ private function to_html ($Array) {
} else {
$LocalURL = $this->local_url($Block['Val']);
if ($LocalURL) {
$Str .= '<img class="scale_image" onclick="lightbox.init(this,500);" alt="'.$Block['Val'].'" src="'.$LocalURL.'" />';
$Str .= '<img class="scale_image" onclick="lightbox.init(this, $(this).width());" alt="'.$Block['Val'].'" src="'.$LocalURL.'" />';
} else {
$Str .= '<img class="scale_image" onclick="lightbox.init(this,500);" alt="'.$Block['Val'].'" src="'.ImageTools::process($Block['Val']).'" />';
$Str .= '<img class="scale_image" onclick="lightbox.init(this, $(this).width());" alt="'.$Block['Val'].'" src="'.ImageTools::process($Block['Val']).'" />';
}
}
break;

10
classes/util.php
View File

@ -166,8 +166,17 @@ function check_perms($PermissionName, $MinClass = 0) {
/**
* Print JSON status result with an optional message and die.
* DO NOT USE THIS FUNCTION!
*/
function json_die($Status, $Message) {
json_print($Status, $Message);
die();
}
/**
* Print JSON status result with an optional message.
*/
function json_print($Status, $Message) {
if ($Status == 'success' && $Message) {
print json_encode(array('status' => $Status, 'response' => $Message));
} elseif ($Message) {
@ -175,7 +184,6 @@ function json_die($Status, $Message) {
} else {
print json_encode(array('status' => $Status));
}
die();
}
/**

4
docs/CHANGES.txt
View File

@ -1,5 +1,9 @@
CHANGE LOG
2013-11-09 by mcnellis
Set image max-width explicitly for each stylesheet.
Also added new classes for news_post, blog_post, wiki_article, torrent_comments, request_comments, artist information, and more
2013-11-08 by alderaan
Revised some of the Golden Rules for clarity

62
sections/ajax/collage.php
View File

@ -1,21 +1,15 @@
<?
define('ARTIST_COLLAGE', 'Artists');
include(SERVER_ROOT.'/classes/text.class.php'); // Text formatting class
$Text = new TEXT;
if (empty($_GET['id'])) {
if (empty($_GET['id']) || !is_number($_GET['id'])) {
json_die("failure", "bad parameters");
}
$CollageID = $_GET['id'];
if ($CollageID && !is_number($CollageID)) {
json_die("failure");
}
$Text = new TEXT;
$CacheKey = "collage_$CollageID";
$Data = $Cache->get_value($CacheKey);
if ($Data) {
list($K, list($Name, $Description,, $Subscribers, $CommentList, $Deleted, $CollageCategoryID, $CreatorID, $Locked, $MaxGroups, $MaxGroupsPerUser, $Updated)) = each($Data);
$CollageData = $Cache->get_value($CacheKey);
if ($CollageData) {
list($Name, $Description, $CommentList, $Deleted, $CollageCategoryID, $CreatorID, $Locked, $MaxGroups, $MaxGroupsPerUser, $Updated, $Subscribers) = $CollageData;
} else {
$DB->query("
SELECT
@ -27,32 +21,24 @@
Locked,
MaxGroups,
MaxGroupsPerUser,
Updated,
Subscribers
FROM collages
WHERE ID = '$CollageID'");
if (!$DB->has_results()) {
json_die("failure");
}
list($Name, $Description, $CreatorID, $Deleted, $CollageCategoryID, $Locked, $MaxGroups, $MaxGroupsPerUser, $Subscribers) = $DB->next_record();
list($Name, $Description, $CreatorID, $Deleted, $CollageCategoryID, $Locked, $MaxGroups, $MaxGroupsPerUser, $Updated, $Subscribers) = $DB->next_record(MYSQLI_NUM);
$CommentList = null;
$SetCache = true;
}
// Populate data that wasn't included in the cache
if (is_null($TorrentGroups) || is_number($TorrentGroups)) {
$DB->query("
SELECT GroupID
FROM collages_torrents
WHERE CollageID = $CollageID");
$TorrentGroups = $DB->collect('GroupID');
}
if (is_null($Subscribers)) {
$DB->query("
SELECT Subscribers
FROM collages
WHERE ID = $CollageID");
list($Subscribers) = $DB->next_record();
}
// TODO: Cache this
$DB->query("
SELECT GroupID
FROM collages_torrents
WHERE CollageID = $CollageID");
$TorrentGroups = $DB->collect('GroupID');
$JSON = array(
'id' => (int)$CollageID,
@ -165,6 +151,20 @@
$JSON['artists'] = $Artists;
}
$Cache->cache_value($CacheKey, array(array($Name, $Description, null, $Subscribers, $CommentList, $Deleted, $CollageCategoryID, $CreatorID, $Locked, $MaxGroups, $MaxGroupsPerUser)), 3600);
if (isset($SetCache)) {
$CollageData = array(
$Name,
$Description,
$CommentList,
(bool)$Deleted,
(int)$CollageCategoryID,
(int)$CreatorID,
(bool)$Locked,
(int)$MaxGroups,
(int)$MaxGroupsPerUser,
$Updated,
(int)$Subscribers);
$Cache->cache_value($CacheKey, $CollageData, 3600);
}
json_die("success", $JSON);
json_print("success", $JSON);

23
sections/artist/artist.php
View File

@ -876,13 +876,13 @@ function compare($X, $Y) {
$Similar->write_artists();
?>
</div>
<div id="flip_view_2" style="display: none; width: <?=WIDTH?>px; height: <?=HEIGHT?>px;">
<canvas width="<?=WIDTH?>px" height="<?=(HEIGHT - 20)?>px" id="similarArtistsCanvas"></canvas>
<div id="artistTags" style="display: none;">
<ul><li></li></ul>
<div id="flip_view_2" style="display: none; width: <?=WIDTH?>px; height: <?=HEIGHT?>px;">
<canvas width="<?=WIDTH?>px" height="<?=(HEIGHT - 20)?>px" id="similarArtistsCanvas"></canvas>
<div id="artistTags" style="display: none;">
<ul><li></li></ul>
</div>
<strong style="margin-left: 10px;"><a id="currentArtist" href="#null">Loading...</a></strong>
</div>
<strong style="margin-left: 10px;"><a id="currentArtist" href="#null">Loading...</a></strong>
</div>
</div>
<script type="text/javascript">//<![CDATA[
@ -937,7 +937,7 @@ function require(file, callback) {
</script>
<? } // if $NumSimilar > 0 ?>
<div class="box">
<div id="artist_information" class="box">
<div id="info" class="head">
<a href="#">&uarr;</a>&nbsp;
<strong>Artist Information</strong>
@ -956,10 +956,10 @@ function require(file, callback) {
$Pages = Format::get_pages($Page, $NumComments, TORRENT_COMMENTS_PER_PAGE, 9, '#comments');
?>
<div id="artistcomments" class="linkbox">
<a name="comments"></a>
<?=$Pages?>
</div>
<div id="artistcomments">
<div class="linkbox"><a name="comments"></a>
<?=($Pages)?>
</div>
<?
//---------- Begin printing
@ -977,6 +977,7 @@ function require(file, callback) {
'SubscribeBox' => true
));
?>
</div>
</div>
</div>
<?

2
sections/blog/index.php
View File

@ -173,7 +173,7 @@
foreach ($Blog as $BlogItem) {
list($BlogID, $Author, $Title, $Body, $BlogTime, $ThreadID) = $BlogItem;
?>
<div id="blog<?=$BlogID?>" class="box">
<div id="blog<?=$BlogID?>" class="box blog_post">
<div class="head">
<strong><?=$Title?></strong> - posted <?=time_diff($BlogTime);?> by <?=$Author?>
<? if (check_perms('admin_manage_blog')) { ?>

56
sections/collages/artist_collage.php
View File

@ -1,15 +1,14 @@
<?
// TODO: Cache this
$DB->query("
SELECT
ca.ArtistID,
ag.Name,
aw.Image,
um.ID AS UserID,
um.Username
ca.UserID
FROM collages_artists AS ca
JOIN artists_group AS ag ON ag.ArtistID=ca.ArtistID
LEFT JOIN wiki_artists AS aw ON aw.RevisionID = ag.RevisionID
LEFT JOIN users_main AS um ON um.ID=ca.UserID
WHERE ca.CollageID='$CollageID'
ORDER BY ca.Sort");
@ -18,45 +17,40 @@
// Loop through the result set, building up $Collage and $TorrentTable
// Then we print them.
$Collage = array();
$TorrentTable = '';
$ArtistTable = '';
$NumArtists = 0;
$NumArtistsByUser = 0;
$Users = array();
$NumGroups = count($Artists);
$NumGroupsByUser = 0;
$UserAdditions = array();
foreach ($Artists as $Artist) {
$UserID = $Artist['UserID'];
$Username = $Artist['Username'];
$NumArtists++;
if ($UserID == $LoggedUser['ID']) {
$NumArtistsByUser++;
$NumGroupsByUser++;
}
if ($Username) {
if (!isset($Users[$UserID])) {
$Users[$UserID] = array('name' => $Username, 'count' => 1);
} else {
$Users[$UserID]['count']++;
}
if (!isset($UserAdditions[$UserID])) {
$UserAdditions[$UserID] = 0;
}
$UserAdditions[$UserID]++;
ob_start();
?>
?>
<tr>
<td><a href="artist.php?id=<?=$Artist['ArtistID']?>"><?=$Artist['Name']?></a></td>
</tr>
<?
$ArtistTable.= ob_get_clean();
$ArtistTable .= ob_get_clean();
ob_start();
?>
<li class="image_group_<?=$Artist['ArtistID']?>">
<a href="artist.php?id=<?=$Artist['ArtistID']?>">
<? if ($Artist['Image']) { ?>
<? if ($Artist['Image']) { ?>
<img class="tooltip" src="<?=ImageTools::process($Artist['Image'], true)?>" alt="<?=$Artist['Name']?>" title="<?=$Artist['Name']?>" width="118" />
<? } else { ?>
<? } else { ?>
<span style="width: 107px; padding: 5px;"><?=$Artist['Name']?></span>
<? } ?>
<? } ?>
</a>
</li>
<?
@ -79,7 +73,6 @@
}
}
for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) {
$Groups = array_slice($Collage, $i * $CollageCovers, $CollageCovers);
$CollagePage = '';
@ -109,15 +102,11 @@
<? } else { ?>
<span class="brackets">Locked</span>
<? }
if (Bookmarks::has_bookmarked('collage', $CollageID)) {
?>
if (Bookmarks::has_bookmarked('collage', $CollageID)) { ?>
<a href="#" id="bookmarklink_collage_<?=$CollageID?>" class="brackets" onclick="Unbookmark('collage', <?=$CollageID?>, 'Bookmark'); return false;">Remove bookmark</a>
<? } else { ?>
<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> -->
<?
if (check_perms('site_collages_manage') && !$Locked) { ?>
<a href="collages.php?action=manage_artists&amp;collageid=<?=$CollageID?>" class="brackets">Manage artists</a>
<? } ?>
@ -127,7 +116,6 @@
<? } ?>
</div>
</div>
<? /* Misc::display_recommend($CollageID, "collage"); */ ?>
<div class="sidebar">
<div class="box box_category">
<div class="head"><strong>Category</strong></div>
@ -140,9 +128,9 @@
<div class="box box_info box_statistics_collage_torrents">
<div class="head"><strong>Statistics</strong></div>
<ul class="stats nobullet">
<li>Artists: <?=number_format($NumArtists)?></li>
<li>Artists: <?=number_format($NumGroups)?></li>
<li>Subscribers: <?=number_format((int)$Subscribers)?></li>
<li>Built by <?=number_format(count($Users))?> user<?=(count($Users) > 1 ? 's' : '')?></li>
<li>Built by <?=number_format(count($UserAdditions))?> user<?=(count($UserAdditions) > 1 ? 's' : '')?></li>
<li>Last updated: <?=time_diff($Updated)?></li>
</ul>
</div>
@ -151,22 +139,22 @@
<div class="pad">
<ol style="padding-left: 5px;">
<?
uasort($Users, 'compare');
arsort($UserAdditions);
$i = 0;
foreach ($Users as $ID => $User) {
foreach ($UserAdditions as $UserID => $Additions) {
$i++;
if ($i > 5) {
break;
}
?>
<li><?=Users::format_username($ID, false, false, false)?> (<?=number_format($User['count'])?>)</li>
<li><?=Users::format_username($UserID, false, false, false)?> (<?=number_format($Additions)?>)</li>
<?
}
?>
</ol>
</div>
</div>
<? if (check_perms('site_collages_manage') && !$PreventAdditions) { ?>
<? if (check_perms('site_collages_manage') && !isset($PreventAdditions)) { ?>
<div class="box box_addartist">
<div class="head"><strong>Add Artists</strong><span class="float_right"><a href="#" onclick="$('.add_artist_container').toggle_class('hidden'); this.innerHTML = (this.innerHTML == 'Batch add' ? 'Individual add' : 'Batch add'); return false;" class="brackets">Batch add</a></span></div>
<div class="pad add_artist_container">

67
sections/collages/collage.php
View File

@ -1,28 +1,17 @@
<?php
<?
ini_set('max_execution_time', 600);
//~~~~~~~~~~~ Main collage page ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
function compare($X, $Y) {
return($Y['count'] - $X['count']);
}
include(SERVER_ROOT.'/classes/text.class.php'); // Text formatting class
$Text = new TEXT;
$UserVotes = Votes::get_user_votes($LoggedUser['ID']);
$CollageID = $_GET['id'];
if (!is_number($CollageID)) {
if (empty($_GET['id']) || !is_number($_GET['id'])) {
error(0);
}
$CollageID = $_GET['id'];
$Text = new TEXT;
$CacheKey = "collage_$CollageID";
$Data = $Cache->get_value($CacheKey);
if ($Data) {
list($K, list($Name, $Description, $NumGroups, , $CommentList, $Deleted, $CollageCategoryID, $CreatorID, $Locked, $MaxGroups, $MaxGroupsPerUser, $Updated, $Subscribers)) = each($Data);
$CollageData = $Cache->get_value("collage_$CollageID");
if ($CollageData) {
list($Name, $Description, $CommentList, $Deleted, $CollageCategoryID, $CreatorID, $Locked, $MaxGroups, $MaxGroupsPerUser, $Updated, $Subscribers) = $CollageData;
} else {
$DB->query("
SELECT
@ -39,11 +28,12 @@ function compare($X, $Y) {
FROM collages
WHERE ID = '$CollageID'");
if ($DB->has_results()) {
list($Name, $Description, $CreatorID, $Deleted, $CollageCategoryID, $Locked, $MaxGroups, $MaxGroupsPerUser, $Updated, $Subscribers) = $DB->next_record();
$NumGroups = null;
list($Name, $Description, $CreatorID, $Deleted, $CollageCategoryID, $Locked, $MaxGroups, $MaxGroupsPerUser, $Updated, $Subscribers) = $DB->next_record(MYSQLI_NUM);
$CommentList = null;
} else {
$Deleted = '1';
}
$SetCache = true;
}
if ($Deleted === '1') {
@ -51,13 +41,7 @@ function compare($X, $Y) {
die();
}
if ($CollageCategoryID === '0' && !check_perms('site_collages_delete')) {
if (!check_perms('site_collages_personal') || $CreatorID !== $LoggedUser['ID']) {
$PreventAdditions = true;
}
}
//Handle subscriptions
// Handle subscriptions
if (($CollageSubscriptions = $Cache->get_value('collage_subs_user_'.$LoggedUser['ID'])) === false) {
$DB->query("
SELECT CollageID
@ -67,30 +51,25 @@ function compare($X, $Y) {
$Cache->cache_value('collage_subs_user_'.$LoggedUser['ID'], $CollageSubscriptions, 0);
}
if (empty($CollageSubscriptions)) {
$CollageSubscriptions = array();
}
if (in_array($CollageID, $CollageSubscriptions)) {
if (!empty($CollageSubscriptions) && in_array($CollageID, $CollageSubscriptions)) {
$DB->query("
UPDATE users_collage_subs
SET LastVisit = NOW()
WHERE UserID = ".$LoggedUser['ID']."
AND CollageID = $CollageID");
$Cache->delete_value('collage_subs_user_new_'.$LoggedUser['ID']);
}
$DB->query("
UPDATE users_collage_subs
SET LastVisit = NOW()
WHERE UserID = ".$LoggedUser['ID']."
AND CollageID = $CollageID");
if ((int)$CollageCategoryID === array_search(ARTIST_COLLAGE, $CollageCats)) {
if ($CollageCategoryID == array_search(ARTIST_COLLAGE, $CollageCats)) {
include(SERVER_ROOT.'/sections/collages/artist_collage.php');
} else {
include(SERVER_ROOT.'/sections/collages/torrent_collage.php');
}
$Cache->cache_value($CacheKey, array(array(
if (isset($SetCache)) {
$CollageData = array(
$Name,
$Description,
(int)$NumGroups,
null,
$CommentList,
(bool)$Deleted,
(int)$CollageCategoryID,
@ -98,5 +77,7 @@ function compare($X, $Y) {
(bool)$Locked,
(int)$MaxGroups,
(int)$MaxGroupsPerUser,
(int)$Subscribers
)), 3600);
$Updated,
(int)$Subscribers);
$Cache->cache_value("collage_$CollageID", $CollageData, 3600);
}

71
sections/collages/torrent_collage.php
View File

@ -1,47 +1,46 @@
<?
function compare($X, $Y) {
return($Y['count'] - $X['count']);
}
// Build the data for the collage and the torrent list
// TODO: Cache this
$DB->query("
SELECT
ct.GroupID,
tg.WikiImage,
tg.CategoryID,
um.ID,
um.Username
ct.UserID
FROM collages_torrents AS ct
JOIN torrents_group AS tg ON tg.ID = ct.GroupID
LEFT JOIN users_main AS um ON um.ID = ct.UserID
WHERE ct.CollageID = '$CollageID'
ORDER BY ct.Sort");
$GroupIDs = $DB->collect('GroupID');
$CollageDataList = $DB->to_array('GroupID', MYSQLI_ASSOC);
$Contributors = $DB->to_pair('GroupID', 'UserID', false);
if (count($GroupIDs) > 0) {
$TorrentList = Torrents::get_groups($GroupIDs);
$UserVotes = Votes::get_user_votes($LoggedUser['ID']);
} else {
$TorrentList = array();
}
// Loop through the result set, building up $Collage and $TorrentTable
// Then we print them.
$Collage = array();
$TorrentTable = '';
$NumGroups = 0;
$NumGroups = count($TorrentList);
$NumGroupsByUser = 0;
$TopArtists = array();
$Users = array();
$UserAdditions = array();
$Number = 0;
foreach ($TorrentList as $GroupID => $Group) {
extract(Torrents::array_group($Group));
list( , , , $UserID, $Username) = array_values($CollageDataList[$GroupID]);
$UserID = $Contributors[$GroupID];
$TorrentTags = new Tags($TagList);
// Handle stats and stuff
$Number++;
$NumGroups++;
if ($UserID == $LoggedUser['ID']) {
$NumGroupsByUser++;
}
@ -62,13 +61,10 @@
}
}
if ($Username) {
if (!isset($Users[$UserID])) {
$Users[$UserID] = array('name' => $Username, 'count' => 1);
} else {
$Users[$UserID]['count']++;
}
if (!isset($UserAdditions[$UserID])) {
$UserAdditions[$UserID] = 0;
}
$UserAdditions[$UserID]++;
$DisplayName = "$Number - ";
@ -88,12 +84,13 @@
$DisplayName .= ' [<abbr class="tooltip" title="This is a Vanity House release">VH</abbr>]';
}
$SnatchedGroupClass = ($GroupFlags['IsSnatched'] ? ' snatched_group' : '');
$UserVote = isset($UserVotes[$GroupID]) ? $UserVotes[$GroupID]['Type'] : '';
// Start an output buffer, so we can store this output in $TorrentTable
ob_start();
if (count($Torrents) > 1 || $GroupCategoryID == 1) {
// Grouped torrents
$ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] == 1);
// Grouped torrents
$ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] == 1);
?>
<tr class="group discog<?=$SnatchedGroupClass?>" id="group_<?=$GroupID?>">
<td class="center">
@ -106,14 +103,14 @@
</td>
<td colspan="5">
<strong><?=$DisplayName?></strong>
<? // PHP start tag is indented for proper formatting of generated HTML
if (Bookmarks::has_bookmarked('torrent', $GroupID)) {
echo "<a style = \"float: right;\" href=\"#\" id=\"bookmarklink_torrent_$GroupID\" class=\"remove_bookmark brackets\" onclick=\"Unbookmark('torrent', $GroupID, 'Bookmark'); return false;\">Remove bookmark</a>";
} else {
echo "<a style = \"float: right;\" href=\"#\" id=\"bookmarklink_torrent_$GroupID\" class=\"add_bookmark brackets\" onclick=\"Bookmark('torrent', $GroupID, 'Remove bookmark'); return false;\">Bookmark</a>";
}
echo "\n";
echo Votes::vote_link($GroupID, $UserVotes[$GroupID]['Type']); ?>
<? if (Bookmarks::has_bookmarked('torrent', $GroupID)) { ?>
<a style="float: right;" href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="remove_bookmark brackets" onclick="Unbookmark('torrent', <?=$GroupID?>, 'Bookmark'); return false;">Remove bookmark</a>
<? } else { ?>
<a style="float: right;" href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="add_bookmark brackets" onclick="Bookmark('torrent', <?=$GroupID?>, 'Remove bookmark'); return false;">Bookmark</a>
<?
}
Votes::vote_link($GroupID, $UserVote);
?>
<div class="tags"><?=$TorrentTags->format()?></div>
</td>
</tr>
@ -206,7 +203,7 @@
| <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" class="tooltip" title="Report">RP</a>
</span>
<strong><?=$DisplayName?></strong>
<? Votes::vote_link($GroupID, $UserVotes[$GroupID]['Type']); ?>
<? Votes::vote_link($GroupID, $UserVote); ?>
<div class="tags"><?=$TorrentTags->format()?></div>
</td>
<td class="number_column nobr"><?=Format::get_size($Torrent['Size'])?></td>
@ -250,6 +247,12 @@
$Collage[] = ob_get_clean();
}
if ($CollageCategoryID === '0' && !check_perms('site_collages_delete')) {
if (!check_perms('site_collages_personal') || $CreatorID !== $LoggedUser['ID']) {
$PreventAdditions = true;
}
}
if (!check_perms('site_collages_delete') && ($Locked || ($MaxGroups > 0 && $NumGroups >= $MaxGroups) || ($MaxGroupsPerUser > 0 && $NumGroupsByUser >= $MaxGroupsPerUser))) {
$PreventAdditions = true;
}
@ -391,7 +394,7 @@
<li>Artists: <?=number_format(count($TopArtists))?></li>
<? } ?>
<li>Subscribers: <?=number_format((int)$Subscribers)?></li>
<li>Built by <?=number_format(count($Users))?> user<?=(count($Users) > 1 ? 's' : '')?></li>
<li>Built by <?=number_format(count($UserAdditions))?> user<?=(count($UserAdditions) > 1 ? 's' : '')?></li>
<li>Last updated: <?=time_diff($Updated)?></li>
</ul>
</div>
@ -432,22 +435,22 @@
<div class="pad">
<ol style="padding-left: 5px;">
<?
uasort($Users, 'compare');
arsort($UserAdditions);
$i = 0;
foreach ($Users as $ID => $User) {
foreach ($UserAdditions as $UserID => $Additions) {
$i++;
if ($i > 5) {
break;
}
?>
<li><?=Users::format_username($ID, false, false, false)?> (<?=number_format($User['count'])?>)</li>
<li><?=Users::format_username($UserID, false, false, false)?> (<?=number_format($Additions)?>)</li>
<?
}
?>
</ol>
</div>
</div>
<? if (check_perms('site_collages_manage') && !$PreventAdditions) { ?>
<? if (check_perms('site_collages_manage') && !isset($PreventAdditions)) { ?>
<div class="box box_addtorrent">
<div class="head"><strong>Add torrent group</strong><span class="float_right"><a href="#" onclick="$('.add_torrent_container').toggle_class('hidden'); this.innerHTML = (this.innerHTML == 'Batch add' ? 'Individual add' : 'Batch add'); return false;" class="brackets">Batch add</a></span></div>
<div class="pad add_torrent_container">

2
sections/index/private.php
View File

@ -469,7 +469,7 @@
continue;
}
?>
<div id="news<?=$NewsID?>" class="box">
<div id="news<?=$NewsID?>" class="box news_post">
<div class="head">
<strong><?=$Text->full_format($Title)?></strong> <?=time_diff($NewsTime);?>
<? if (check_perms('admin_manage_news')) { ?>

2
sections/requests/request.php
View File

@ -445,6 +445,7 @@
<?
list($NumComments, $Page, $Thread, $LastRead) = Comments::load('requests', $RequestID);
?>
<div id="request_comments">
<div class="linkbox">
<a name="comments"></a>
<?
@ -470,6 +471,7 @@
'SubscribeBox' => true
));
?>
</div>
</div>
</div>
<? View::show_footer(); ?>

2
sections/staffblog/index.php
View File

@ -136,7 +136,7 @@
list($BlogID, $Author, $Title, $Body, $BlogTime) = $BlogItem;
$BlogTime = strtotime($BlogTime);
?>
<div id="blog<?=$BlogID?>" class="box box2">
<div id="blog<?=$BlogID?>" class="box box2 blog_post">
<div class="head">
<strong><?=$Title?></strong> - posted <?=time_diff($BlogTime);?> by <?=$Author?>
<? if (check_perms('admin_manage_blog')) { ?>

2
sections/staffpm/viewconv.php
View File

@ -147,7 +147,7 @@
// Reply box and buttons
?>
<h3>Reply</h3>
<div class="box pad">
<div class="box pad" id="reply_box">
<div id="buttons" class="center">
<form class="manage_form" name="staff_messages" action="staffpm.php" method="post" id="messageform">
<input type="hidden" name="action" value="takepost" />

2
sections/tools/managers/news.php
View File

@ -73,7 +73,7 @@
ORDER BY n.Time DESC');// LIMIT 20
while (list($NewsID, $Title, $Body, $NewsTime) = $DB->next_record()) {
?>
<div class="box vertical_space">
<div class="box vertical_space news_post">
<div class="head">
<strong><?=display_str($Title) ?></strong> - posted <?=time_diff($NewsTime) ?>
- <a href="tools.php?action=editnews&amp;id=<?=$NewsID?>" class="brackets">Edit</a>

4
sections/torrents/details.php
View File

@ -900,7 +900,7 @@ function filelist($Str) {
// Matched Votes
include(SERVER_ROOT.'/sections/torrents/voter_picks.php');
?>
<div class="box">
<div class="box torrent_description">
<div class="head"><a href="#">&uarr;</a>&nbsp;<strong><?=(!empty($ReleaseType) ? $ReleaseTypes[$ReleaseType].' info' : 'Info' )?></strong></div>
<div class="body"><? if ($WikiBody != '') { echo $WikiBody; } else { echo 'There is no information on this torrent.'; } ?></div>
</div>
@ -910,6 +910,7 @@ function filelist($Str) {
list($NumComments, $Page, $Thread, $LastRead) = Comments::load('torrents', $GroupID);
$Pages = Format::get_pages($Page, $NumComments, TORRENT_COMMENTS_PER_PAGE, 9, '#comments');
?>
<div id="torrent_comments">
<div class="linkbox"><a name="comments"></a>
<?=$Pages?>
</div>
@ -929,6 +930,7 @@ function filelist($Str) {
'SubscribeBox' => true
));
?>
</div>
</div>
</div>
<? View::show_footer(); ?>

2
sections/user/user.php
View File

@ -579,7 +579,7 @@ function check_paranoia_here($Setting) {
<?=!empty($InfoTitle) ? $InfoTitle : 'Profile';?>
<span style="float: right;"><a href="#" onclick="$('#profilediv').gtoggle(); this.innerHTML = (this.innerHTML == 'Hide' ? 'Show' : 'Hide'); return false;" class="brackets">Hide</a></span>&nbsp;
</div>
<div class="pad" id="profilediv">
<div class="pad profileinfo" id="profilediv">
<?
if (!$Info) {
?>

2
sections/wiki/article.php
View File

@ -132,7 +132,7 @@
<? } ?>
</div>
<div class="main_column">
<div class="box">
<div class="box wiki_article">
<div class="pad"><?=$TextBody?></div>
</div>
</div>

15
static/functions/collage.js
View File

@ -48,6 +48,21 @@ var collageShow = {
$(ul).add_class('collage_images');
ul.id = 'collage_page' + this.pg;
$(ul).html(data);
if ($.fn.tooltipster) {
$('.tooltip_interactive', ul).tooltipster({
interactive: true,
interactiveTolerance: 500,
delay: tooltip_delay,
updateAnimation: false,
maxWidth: 400
});
} else {
$('.tooltip_interactive', ul).each(function() {
if ($(this).data('title-plain')) {
$(this).attr('title', $(this).data('title-plain')).removeData('title-plain');
}
});
}
this.wrap.appendChild(ul);
return ul;
},

63
static/styles/dark_ambient/style.css
View File

@ -2060,3 +2060,66 @@ TODO: Make these rules apply globally and add exceptions where needed
#reports .pad {
padding: 10px !important;
}
.forum_post td img {
max-width: 685px;
}
#collage #reply_box img,
#forums #reply_box img {
max-width: 685px;
}
#request_comments #reply_box img,
#torrent_comments #reply_box img {
max-width: 403px;
}
#artistcomments #reply_box img {
max-width: 446px;
}
#torrent_comments img,
#request_comments img {
max-width: 425px;
}
#artistcomments img {
max-width: 468px;
}
#artist_information img,
.box_request_desc img,
.news_post img,
.torrent_description img,
.wiki_article img {
max-width: 619px;
}
.torrentdetails img {
max-width: 590px;
}
.blog_post img,
#wiki .create_form img,
#wiki .edit_form img {
max-width: 900px;
}
#inbox .body img,
#inbox #preview img,
#staffpm #reply_box img {
max-width: 450px;
}
#userform img {
max-width: 512px;
}
.profileinfo img {
max-width: 618px;
}
#reportsv2 .manage_form img {
max-width: 602px;
}

80
static/styles/global.css
View File

@ -183,18 +183,6 @@ div#AddArtists a {
width: 95%
}
.scale_image {
max-width: 500px;
}
#torrents .scale_image {
max-width: 400px;
}
.sidebar .scale_image {
max-width: 100%;
}
.rippywrap {
z-index: 25;
display: block;
@ -644,3 +632,71 @@ tr.torrent .bookmark>a:after {
text-align: right;
width: auto;
}
.scale_image {
max-width: 500px;
}
.sidebar img {
max-width: 220px;
}
.forum_post td img {
max-width: 675px;
}
#collage #reply_box img,
#forums #reply_box img {
max-width: 650px;
}
#artistcomments #reply_box img,
#request_comments #reply_box img,
#torrent_comments #reply_box img {
max-width: 400px;
}
#artistcomments img,
#request_comments img,
#torrent_comments img {
max-width: 417px;
}
.blog_post img {
max-width: 825px;
}
#artist_information img,
.box_request_desc img,
.news_post img,
.torrent_description img,
.wiki_article img {
max-width: 570px;
}
.torrentdetails img {
max-width: 540px;
}
#inbox #preview img,
#staffpm #reply_box img,
#wiki .create_form img,
#wiki .edit_form img {
max-width: 805px;
}
#inbox .body img {
max-width: 830px;
}
#userform img {
max-width: 490px;
}
.profileinfo img {
max-width: 565px;
}
#reportsv2 .manage_form img {
max-width: 616px;
}

64
static/styles/minimal/style.css
View File

@ -580,3 +580,67 @@ tr.torrent .bookmark > a:after { content: ""; }
.permission_container:first-child {
margin-left: 0;
}
.sidebar img {
max-width: 230px;
}
.forum_post td img {
max-width: 785px;
}
#collage #reply_box img,
#forums #reply_box img {
max-width: 769px;
}
#artistcomments #reply_box img,
#request_comments #reply_box img,
#torrent_comments #reply_box img {
max-width: 507px;
}
#artistcomments img {
max-width: 527px;
}
#request_comments img,
#torrent_comments img {
max-width: 499px;
}
#artist_information img,
.box_request_desc img,
.news_post img,
.torrent_description img,
.wiki_article img {
max-width: 680px;
}
.torrentdetails img {
max-width: 640px;
}
.blog_post img,
#inbox .body img,
#inbox #preview img,
#wiki .create_form img,
#wiki .edit_form img {
max-width: 960px;
}
#staffpm #reply_box img {
max-width: 940px;
}
#userform img {
max-width: 508px;
}
.profileinfo img {
max-width: 680px;
}
#reportsv2 .manage_form img {
max-width: 625px;
}

56
static/styles/minimal/style2.css
View File

@ -505,3 +505,59 @@ h3{margin:10px 0}
.edit_changelog textarea {
width: 600px;
}
#collage #reply_box img,
#forums #reply_box img {
max-width: 769px;
}
#artistcomments #reply_box img,
#request_comments #reply_box img,
#torrent_comments #reply_box img {
max-width: 507px;
}
#artistcomments img {
max-width: 527px;
}
#request_comments img,
#torrent_comments img {
max-width: 499px;
}
#artist_information img,
.box_request_desc img,
.news_post img,
.torrent_description img,
.wiki_article img {
max-width: 680px;
}
.torrentdetails img {
max-width: 640px;
}
.blog_post img,
#inbox .body img,
#inbox #preview img,
#wiki .create_form img,
#wiki .edit_form img {
max-width: 960px;
}
#staffpm #reply_box img {
max-width: 940px;
}
#userform img {
max-width: 508px;
}
.profileinfo img {
max-width: 680px;
}
#reportsv2 .manage_form img {
max-width: 625px;
}

55
static/styles/mono/style.css
View File

@ -1377,6 +1377,61 @@ table[width="100%"].user_options {
max-width: 100%;
}
.forum_post td img {
max-width: 785px;
}
#collage #reply_box img,
#forums #reply_box img {
max-width: 787px;
}
#artistcomments #reply_box img,
#request_comments #reply_box img,
#torrent_comments #reply_box img {
max-width: 520px;
}
#artistcomments img,
#torrent_comments img {
max-width: 527px;
}
#request_comments img {
max-width: 539px;
}
#artist_information img,
.box_request_desc img,
.profileinfo img,
.news_post img,
.torrent_description img,
.torrentdetails img,
.wiki_article img {
max-width: 675px;
}
.blog_post img,
#inbox .body img,
#inbox #preview img,
#wiki .create_form img,
#wiki .edit_form img {
max-width: 939px;
}
#staff .preview_wrap img,
#staffpm #reply_box img {
max-width: 938px;
}
#userform img {
max-width: 438px;
}
#reportsv2 .manage_form img {
max-width: 646px;
}
/*
Consistent .box and .pad
TODO: Make these rules apply globally and add exceptions where needed

13
static/styles/postmod/style.css
View File

@ -1112,3 +1112,16 @@ div[class~=tooltipster-content] > a {
div.sidebar #event_div {
margin-left: -50px;
}
.sidebar img {
max-width: 225px;
}
.news_post img,
.wiki_article img {
max-width: 565px;
}
#reportsv2 .manage_form img {
max-width: 622px;
}

64
static/styles/proton/style.css
View File

@ -676,6 +676,8 @@ table {
#inbox #preview {
padding: 20px;
background: transparent url('images/convo.png') 50% 0px no-repeat;
margin-left: 180px;
width: 471px;
}
#inbox table:not(.message_table) td {
@ -1640,10 +1642,6 @@ ul.collage_images {
min-width: 60px;
}
#requests .scale_image {
max-width: 440px;
}
#quickreplybuttons {
margin-top: 5px;
}
@ -2084,3 +2082,61 @@ TODO: Make these rules apply globally and add exceptions where needed
#reports .pad {
padding: 10px !important;
}
.sidebar img {
max-width: 230px;
}
.forum_post td img {
max-width: 690px;
}
#collage #reply_box img,
#forums #reply_box img {
max-width: 680px;
}
#artistcomments img,
#request_comments img,
#torrent_comments img {
max-width: 440px;
}
.blog_post img {
max-width: 885px;
}
#artist_information img,
.box_request_desc img,
.news_post img,
.torrent_description img,
.wiki_article img {
max-width: 625px;
}
.torrentdetails img {
max-width: 590px;
}
#wiki .create_form img,
#wiki .edit_form img {
max-width: 908px;
}
#userform img {
max-width: 510px;
}
.profileinfo img {
max-width: 620px;
}
#inbox #preview img,
#inbox .body img,
#staffpm #reply_box img {
max-width: 450px;
}
#reportsv2 .manage_form img {
max-width: 600px;
}

49
static/styles/white.cd/style.css
View File

@ -482,14 +482,14 @@ table .time {
table tr td.edition_info {
background: #f5f5f5;
}
#artist #content .linkbox:first-of-type {
#artist .header .linkbox:first-of-type {
text-align: right;
position: absolute;
top: 0;
right: 0;
width: 300px;
}
#artist #content .linkbox:first-of-type a {
#artist .header .linkbox:first-of-type a {
margin-right: 5px;
}
.r00,.r01,.r02,.r03,.r04,.r05 {
@ -831,3 +831,48 @@ div[class~=tooltipster-base] {
.two_columns:last-of-type {
padding-left: 7px;
}
.forum_post td img,
#collage #reply_box img,
#forums #reply_box img {
max-width: 740px;
}
#artistcomments img,
#request_comments img,
#torrent_comments img,
#artistcomments #reply_box img,
#request_comments #reply_box img,
#torrent_comments #reply_box img {
max-width: 445px;
}
#artist_information img,
.box_request_desc img,
.profileinfo img,
.news_post img,
.torrent_description img,
.wiki_article img {
max-width: 650px;
}
.torrentdetails img {
max-width: 590px;
}
.blog_post img,
#inbox .body img,
#inbox #preview img,
#staffpm #reply_box img,
#wiki .create_form img,
#wiki .edit_form img {
max-width: 950px;
}
#userform img {
max-width: 515px;
}
#reportsv2 .manage_form img {
max-width: 532px;
}