Mirror/Gazelle
1
0
Fork 0
mirror of https://github.com/WhatCD/Gazelle.git synced 2024-12-13 02:46:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Empty commit

Browse Source
This commit is contained in:
Git 2013-06-28 08:01:04 +00:00
parent defe05e12a
commit 4747554353
16 changed files with 282 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/sphinxql.class.php
View File

@ -64,7 +64,7 @@ public static function init_connection($Server, $Port, $Socket) {
/**
* Connect the Sphinxql object to the Sphinx server
*/
public function connect() {
public function sphconnect() {
if (!$this->Connected) {
global $Debug;
$Debug->set_flag('Connecting to Sphinx server '.$this->Ident);

2
classes/sphinxqlquery.class.php
View File

@ -282,7 +282,7 @@ private function send_query($GetMeta) {
if (!$this->QueryString) {
return false;
}
$this->Sphinxql->connect();
$this->Sphinxql->sphconnect();
$Result = $this->Sphinxql->query($this->QueryString);
if ($Result === false) {
$Errno = $this->Sphinxql->errno;

31
sections/artist/artist.php
View File

@ -707,7 +707,7 @@ function compare($X, $Y) {
echo $TorrentDisplayList;
$Collages = $Cache->get_value('artists_collages_'.$ArtistID);
$Collages = $Cache->get_value("artists_collages_$ArtistID");
if (!is_array($Collages)) {
$DB->query("
SELECT c.Name, c.NumTorrents, c.ID
@ -717,7 +717,7 @@ function compare($X, $Y) {
AND Deleted = '0'
AND CategoryID = '7'");
$Collages = $DB->to_array();
$Cache->cache_value('artists_collages_'.$ArtistID, $Collages, 3600 * 6);
$Cache->cache_value("artists_collages_$ArtistID", $Collages, 3600 * 6);
}
if (count($Collages) > 0) {
if (count($Collages) > MAX_COLLAGES) {
@ -733,7 +733,7 @@ function compare($X, $Y) {
?>
<table class="collage_table" id="collages">
<tr class="colhead">
<td width="85%"><a href="#">&uarr;</a>&nbsp;This artists is in <?=number_format(count($Collages))?> collage<?=((count($Collages) > 1) ? 's' : '')?><?=$SeeAll?></td>
<td width="85%"><a href="#">&uarr;</a>&nbsp;This artist is in <?=number_format(count($Collages))?> collage<?=((count($Collages) > 1) ? 's' : '')?><?=$SeeAll?></td>
<td># artists</td>
</tr>
<? foreach ($Indices as $i) {
@ -785,11 +785,11 @@ function compare($X, $Y) {
if ($CategoryName == 'Music') {
$ArtistForm = Requests::get_artists($RequestID);
$ArtistLink = Artists::display_artists($ArtistForm, true, true);
$FullName = $ArtistLink."<a href=\"requests.php?action=view&amp;id=".$RequestID."\">$Title [$Year]</a>";
$FullName = $ArtistLink."<a href=\"requests.php?action=view&amp;id=$RequestID\">$Title [$Year]</a>";
} elseif ($CategoryName == 'Audiobooks' || $CategoryName == 'Comedy') {
$FullName = "<a href=\"requests.php?action=view&amp;id=".$RequestID."\">$Title [$Year]</a>";
$FullName = "<a href=\"requests.php?action=view&amp;id=$RequestID\">$Title [$Year]</a>";
} else {
$FullName ="<a href=\"requests.php?action=view&amp;id=".$RequestID."\">$Title</a>";
$FullName ="<a href=\"requests.php?action=view&amp;id=$RequestID\">$Title</a>";
}
$Row = ($Row == 'a') ? 'b' : 'a';
@ -797,7 +797,7 @@ function compare($X, $Y) {
$Tags = Requests::get_tags($RequestID);
$ReqTagList = array();
foreach ($Tags as $TagID => $TagName) {
$ReqTagList[] = "<a href=\"requests.php?tags=".$TagName.'">'.display_str($TagName).'</a>';
$ReqTagList[] = "<a href=\"requests.php?tags=$TagName\">".display_str($TagName).'</a>';
}
$ReqTagList = implode(', ', $ReqTagList);
?>
@ -828,7 +828,7 @@ function compare($X, $Y) {
// Similar artist map
if ($NumSimilar > 0) {
if ($SimilarData = $Cache->get_value('similar_positions_'.$ArtistID)) {
if ($SimilarData = $Cache->get_value("similar_positions_$ArtistID")) {
$Similar = new ARTISTS_SIMILAR($ArtistID, $Name);
$Similar->load_data($SimilarData);
if (!(current($Similar->Artists)->NameLength)) {
@ -848,7 +848,7 @@ function compare($X, $Y) {
$SimilarData = $Similar->dump_data();
$Cache->cache_value('similar_positions_'.$ArtistID, $SimilarData, 3600 * 24);
$Cache->cache_value("similar_positions_$ArtistID", $SimilarData, 3600 * 24);
}
?>
<div id="similar_artist_map" class="box">
@ -968,7 +968,7 @@ function require(file, callback) {
//---------- Get some data to start processing
// Cache catalogue from which the page is selected, allows block caches and future ability to specify posts per page
$Catalogue = $Cache->get_value('artist_comments_'.$ArtistID.'_catalogue_'.$CatalogueID);
$Catalogue = $Cache->get_value("artist_comments_{$ArtistID}_catalogue_$CatalogueID");
if ($Catalogue === false) {
$DB->query("
SELECT
@ -985,7 +985,7 @@ function require(file, callback) {
ORDER BY c.ID
LIMIT $CatalogueLimit");
$Catalogue = $DB->to_array(false, MYSQLI_ASSOC);
$Cache->cache_value('artist_comments_'.$ArtistID.'_catalogue_'.$CatalogueID, $Catalogue, 0);
$Cache->cache_value("artist_comments_{$ArtistID}_catalogue_$CatalogueID", $Catalogue, 0);
}
//This is a hybrid to reduce the catalogue down to the page elements: We use the page limit % catalogue
@ -1019,14 +1019,16 @@ function require(file, callback) {
- <a href="#quickpost" onclick="Quote('<?=$PostID?>','<?=$Username?>');" class="brackets">Quote</a>
<? if ($AuthorID == $LoggedUser['ID'] || check_perms('site_moderate_forums')) { ?>
- <a href="#post<?=$PostID?>" onclick="Edit_Form('<?=$PostID?>','<?=$Key?>');" class="brackets">Edit</a>
<? }
<?
}
if (check_perms('site_moderate_forums')) { ?>
- <a href="#post<?=$PostID?>" onclick="Delete('<?=$PostID?>');" class="brackets">Delete</a>
<? } ?>
</div>
<div id="bar<?=$PostID?>" style="float: right;">
<a href="reports.php?action=report&amp;type=artist_comment&amp;id=<?=$PostID?>" class="brackets">Report</a>
<? if (check_perms('users_warn') && $AuthorID != $LoggedUser['ID']) {
<?
if (check_perms('users_warn') && $AuthorID != $LoggedUser['ID']) {
$AuthorInfo = Users::user_info($AuthorID);
if ($LoggedUser['Class'] >= $AuthorInfo['Class']) {
?>
@ -1038,7 +1040,8 @@ function require(file, callback) {
<input type="hidden" name="key" value="<?=$Key?>" />
</form>
- <a href="#" onclick="$('#warn<?=$PostID?>').raw().submit(); return false;" class="brackets">Warn</a>
<? }
<?
}
}
?>
&nbsp;

59
sections/collages/add_artist.php
View File

@ -9,26 +9,40 @@
function add_artist($CollageID, $ArtistID) {
global $Cache, $LoggedUser, $DB;
$DB->query("SELECT MAX(Sort) FROM collages_artists WHERE CollageID='$CollageID'");
$DB->query("
SELECT MAX(Sort)
FROM collages_artists
WHERE CollageID = '$CollageID'");
list($Sort) = $DB->next_record();
$Sort += 10;
$DB->query("SELECT ArtistID FROM collages_artists WHERE CollageID='$CollageID' AND ArtistID='$ArtistID'");
$DB->query("
SELECT ArtistID
FROM collages_artists
WHERE CollageID = '$CollageID'
AND ArtistID = '$ArtistID'");
if ($DB->record_count() == 0) {
$DB->query("INSERT IGNORE INTO collages_artists
$DB->query("
INSERT IGNORE INTO collages_artists
(CollageID, ArtistID, UserID, Sort, AddedOn)
VALUES
('$CollageID', '$ArtistID', '$LoggedUser[ID]', '$Sort', '" . sqltime() . "')");
$DB->query("UPDATE collages SET NumTorrents=NumTorrents+1, Updated = '" . sqltime() . "' WHERE ID='$CollageID'");
$DB->query("
UPDATE collages
SET NumTorrents = NumTorrents + 1, Updated = '" . sqltime() . "'
WHERE ID = '$CollageID'");
$Cache->delete_value('collage_'.$CollageID);
$Cache->delete_value('artists_collages_'.$ArtistID);
$Cache->delete_value('artists_collages_personal_'.$ArtistID);
$Cache->delete_value("collage_$CollageID");
$Cache->delete_value("artists_collages_$ArtistID");
$Cache->delete_value("artists_collages_personal_$ArtistID");
$DB->query("SELECT UserID FROM users_collage_subs WHERE CollageID=$CollageID");
$DB->query("
SELECT UserID
FROM users_collage_subs
WHERE CollageID = $CollageID");
while (list($CacheUserID) = $DB->next_record()) {
$Cache->delete_value('collage_subs_user_new_'.$CacheUserID);
$Cache->delete_value("collage_subs_user_new_$CacheUserID");
}
}
}
@ -37,18 +51,21 @@ function add_artist($CollageID, $ArtistID) {
if (!is_number($CollageID)) {
error(404);
}
$DB->query("SELECT UserID, CategoryID, Locked, NumTorrents, MaxGroups, MaxGroupsPerUser FROM collages WHERE ID='$CollageID'");
$DB->query("
SELECT UserID, CategoryID, Locked, NumTorrents, MaxGroups, MaxGroupsPerUser
FROM collages
WHERE ID = '$CollageID'");
list($UserID, $CategoryID, $Locked, $NumTorrents, $MaxGroups, $MaxGroupsPerUser) = $DB->next_record();
if (!check_perms('site_collages_delete')) {
if ($Locked) {
$Err = "This collage is locked";
$Err = 'This collage is locked';
}
if ($CategoryID == 0 && $UserID != $LoggedUser['ID']) {
$Err = "You cannot edit someone else's personal collage";
$Err = 'You cannot edit someone else\'s personal collage.';
}
if ($MaxGroups > 0 && $NumTorrents >= $MaxGroups) {
$Err = "This collage already holds its maximum allowed number of artists";
$Err = 'This collage already holds its maximum allowed number of artists.';
}
if (isset($Err)) {
@ -57,7 +74,11 @@ function add_artist($CollageID, $ArtistID) {
}
if ($MaxGroupsPerUser > 0) {
$DB->query("SELECT COUNT(*) FROM collages_artists WHERE CollageID='$CollageID' AND UserID='$LoggedUser[ID]'");
$DB->query("
SELECT COUNT(*)
FROM collages_artists
WHERE CollageID = '$CollageID'
AND UserID = '$LoggedUser[ID]'");
list($GroupsForUser) = $DB->next_record();
if (!check_perms('site_collages_delete') && $GroupsForUser >= $MaxGroupsPerUser) {
error(403);
@ -81,7 +102,10 @@ function add_artist($CollageID, $ArtistID) {
error(404);
}
$DB->query("SELECT ArtistID FROM artists_group WHERE ArtistID='$ArtistID'");
$DB->query("
SELECT ArtistID
FROM artists_group
WHERE ArtistID = '$ArtistID'");
list($ArtistID) = $DB->next_record();
if (!$ArtistID) {
error('The artist was not found in the database.');
@ -119,7 +143,10 @@ function add_artist($CollageID, $ArtistID) {
break;
}
$DB->query("SELECT ArtistID FROM artists_group WHERE ArtistID='$ArtistID'");
$DB->query("
SELECT ArtistID
FROM artists_group
WHERE ArtistID = '$ArtistID'");
if (!$DB->record_count()) {
$Err = "One of the entered URLs ($URL) does not correspond to an artist on the site.";
break;

15
sections/collages/add_comment.php
View File

@ -12,23 +12,26 @@
$DB->query("
SELECT
CEIL((
CEIL(
(
SELECT COUNT(ID) + 1
FROM collages_comments
WHERE CollageID='".db_string($CollageID)."')/".TORRENT_COMMENTS_PER_PAGE."
WHERE CollageID = '".db_string($CollageID)."'
) / ".TORRENT_COMMENTS_PER_PAGE."
) AS Pages");
list($Pages) = $DB->next_record();
$DB->query("INSERT INTO collages_comments
$DB->query("
INSERT INTO collages_comments
(CollageID, Body, UserID, Time)
VALUES
('$CollageID', '".db_string($_POST['body'])."', '$LoggedUser[ID]', '".sqltime()."')");
$CatalogueID = floor((TORRENT_COMMENTS_PER_PAGE * $Pages - TORRENT_COMMENTS_PER_PAGE) / THREAD_CATALOGUE);
$Cache->delete_value('collage_'.$CollageID);
$Cache->delete_value('collage_comments_'.$CollageID.'_catalogue_'.$CatalogueID);
$Cache->increment('collage_comments_'.$CollageID);
$Cache->delete_value("collage_$CollageID");
$Cache->delete_value("collage_comments_{$CollageID}_catalogue_$CatalogueID");
$Cache->increment("collage_comments_$CollageID");
header('Location: collages.php?id='.$CollageID);
?>

65
sections/collages/add_torrent.php
View File

@ -8,27 +8,41 @@
function add_torrent($CollageID, $GroupID) {
global $Cache, $LoggedUser, $DB;
$DB->query("SELECT MAX(Sort) FROM collages_torrents WHERE CollageID='$CollageID'");
$DB->query("
SELECT MAX(Sort)
FROM collages_torrents
WHERE CollageID = '$CollageID'");
list($Sort) = $DB->next_record();
$Sort += 10;
$DB->query("SELECT GroupID FROM collages_torrents WHERE CollageID='$CollageID' AND GroupID='$GroupID'");
$DB->query("
SELECT GroupID
FROM collages_torrents
WHERE CollageID = '$CollageID'
AND GroupID = '$GroupID'");
if ($DB->record_count() == 0) {
$DB->query("INSERT IGNORE INTO collages_torrents
$DB->query("
INSERT IGNORE INTO collages_torrents
(CollageID, GroupID, UserID, Sort, AddedOn)
VALUES
('$CollageID', '$GroupID', '$LoggedUser[ID]', '$Sort', '" . sqltime() . "')");
$DB->query("UPDATE collages SET NumTorrents=NumTorrents+1, Updated = '" . sqltime() . "' WHERE ID='$CollageID'");
$DB->query("
UPDATE collages
SET NumTorrents = NumTorrents + 1, Updated = '" . sqltime() . "'
WHERE ID = '$CollageID'");
$Cache->delete_value('collage_'.$CollageID);
$Cache->delete_value('torrents_details_'.$GroupID);
$Cache->delete_value('torrent_collages_'.$GroupID);
$Cache->delete_value('torrent_collages_personal_'.$GroupID);
$Cache->delete_value("collage_$CollageID");
$Cache->delete_value("torrents_details_$GroupID");
$Cache->delete_value("torrent_collages_$GroupID");
$Cache->delete_value("torrent_collages_personal_$GroupID");
$DB->query("SELECT UserID FROM users_collage_subs WHERE CollageID=$CollageID");
$DB->query("
SELECT UserID
FROM users_collage_subs
WHERE CollageID = $CollageID");
while (list($CacheUserID) = $DB->next_record()) {
$Cache->delete_value('collage_subs_user_new_'.$CacheUserID);
$Cache->delete_value("collage_subs_user_new_$CacheUserID");
}
}
}
@ -37,18 +51,21 @@ function add_torrent($CollageID, $GroupID) {
if (!is_number($CollageID)) {
error(404);
}
$DB->query("SELECT UserID, CategoryID, Locked, NumTorrents, MaxGroups, MaxGroupsPerUser FROM collages WHERE ID='$CollageID'");
$DB->query("
SELECT UserID, CategoryID, Locked, NumTorrents, MaxGroups, MaxGroupsPerUser
FROM collages
WHERE ID = '$CollageID'");
list($UserID, $CategoryID, $Locked, $NumTorrents, $MaxGroups, $MaxGroupsPerUser) = $DB->next_record();
if (!check_perms('site_collages_delete')) {
if ($Locked) {
$Err = "This collage is locked";
$Err = 'This collage is locked';
}
if ($CategoryID == 0 && $UserID != $LoggedUser['ID']) {
$Err = "You cannot edit someone else's personal collage";
$Err = 'You cannot edit someone else\'s personal collage.';
}
if ($MaxGroups > 0 && $NumTorrents >= $MaxGroups) {
$Err = "This collage already holds its maximum allowed number of torrents";
$Err = 'This collage already holds its maximum allowed number of torrents.';
}
if (isset($Err)) {
@ -57,7 +74,11 @@ function add_torrent($CollageID, $GroupID) {
}
if ($MaxGroupsPerUser > 0) {
$DB->query("SELECT COUNT(*) FROM collages_torrents WHERE CollageID='$CollageID' AND UserID='$LoggedUser[ID]'");
$DB->query("
SELECT COUNT(*)
FROM collages_torrents
WHERE CollageID = '$CollageID'
AND UserID = '$LoggedUser[ID]'");
list($GroupsForUser) = $DB->next_record();
if (!check_perms('site_collages_delete') && $GroupsForUser >= $MaxGroupsPerUser) {
error(403);
@ -81,7 +102,10 @@ function add_torrent($CollageID, $GroupID) {
error(404);
}
$DB->query("SELECT ID FROM torrents_group WHERE ID='$TorrentID'");
$DB->query("
SELECT ID
FROM torrents_group
WHERE ID = '$TorrentID'");
list($GroupID) = $DB->next_record();
if (!$GroupID) {
error('The torrent was not found in the database.');
@ -115,13 +139,16 @@ function add_torrent($CollageID, $GroupID) {
$GroupIDs[] = $Matches[4];
$GroupID = $Matches[4];
} else {
$Err = "One of the entered URLs ($URL) does not correspond to a torrent on the site.";
$Err = "One of the entered URLs ($URL) does not correspond to a torrent group on the site.";
break;
}
$DB->query("SELECT ID FROM torrents_group WHERE ID='$GroupID'");
$DB->query("
SELECT ID
FROM torrents_group
WHERE ID = '$GroupID'");
if (!$DB->record_count()) {
$Err = "One of the entered URLs ($URL) does not correspond to a torrent on the site.";
$Err = "One of the entered URLs ($URL) does not correspond to a torrent group on the site.";
break;
}
}

19
sections/collages/artist_collage.php
View File

@ -175,9 +175,12 @@
<input type="hidden" name="action" value="add_artist" />
<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
<input type="hidden" name="collageid" value="<?=$CollageID?>" />
<div class="field_div">
<input type="text" size="20" name="url" />
<input type="submit" value="+" />
<br />
</div>
<div class="submit_div">
<input type="submit" value="Add" />
</div>
<span style="font-style: italic;">Enter the URL of an artist on the site.</span>
</form>
</div>
@ -186,9 +189,12 @@
<input type="hidden" name="action" value="add_artist_batch" />
<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
<input type="hidden" name="collageid" value="<?=$CollageID?>" />
<textarea name="urls" rows="5" cols="25" style="white-space: nowrap;"></textarea><br />
<div class="field_div">
<textarea name="urls" rows="5" cols="25" style="white-space: nowrap;"></textarea>
</div>
<div class="submit_div">
<input type="submit" value="Add" />
<br />
</div>
<span style="font-style: italic;">Enter the URLs of artists on the site, one per line.</span>
</form>
</div>
@ -238,10 +244,13 @@
<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
<input type="hidden" name="collageid" value="<?=$CollageID?>" />
<div class="pad">
<div class="field_div">
<textarea name="body" cols="24" rows="5"></textarea>
<br />
</div>
<div class="submit_div">
<input type="submit" id="submit_button" value="Add comment" />
</div>
</div>
</form>
</div>
<?

11
sections/collages/delete.php
View File

@ -5,7 +5,10 @@
error(404);
}
$DB->query("SELECT Name, UserID FROM collages WHERE ID='$CollageID'");
$DB->query("
SELECT Name, UserID
FROM collages
WHERE ID = '$CollageID'");
list($Name, $UserID) = $DB->next_record();
if (!check_perms('site_collages_delete') && $UserID != $LoggedUser['ID']) {
@ -24,9 +27,13 @@
<input type="hidden" name="action" value="take_delete" />
<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
<input type="hidden" name="collageid" value="<?=$CollageID?>" />
<div class="field_div">
<strong>Reason: </strong>
<input type="text" name="reason" size="30" />
<input type="text" name="reason" size="40" />
</div>
<div class="submit_div">
<input value="Delete" type="submit" />
</div>
</form>
</div>
</div>

5
sections/collages/get_post.php
View File

@ -19,7 +19,10 @@
$PostID = $_GET['post'];
// Mainly
$DB->query("SELECT Body FROM collages_comments WHERE ID='$PostID'");
$DB->query("
SELECT Body
FROM collages_comments
WHERE ID = '$PostID'");
list($Body) = $DB->next_record(MYSQLI_NUM);
// This gets sent to the browser, which echoes it wherever

15
sections/collages/manage.php
View File

@ -4,7 +4,10 @@
error(0);
}
$DB->query("SELECT Name, UserID, CategoryID FROM collages WHERE ID='$CollageID'");
$DB->query("
SELECT Name, UserID, CategoryID
FROM collages
WHERE ID = '$CollageID'");
list($Name, $UserID, $CategoryID) = $DB->next_record();
if ($CategoryID == 0 && $UserID != $LoggedUser['ID'] && !check_perms('site_collages_delete')) {
error(403);
@ -32,7 +35,7 @@
$TorrentList = array();
}
View::show_header('Manage collage '.$Name, 'jquery-ui,jquery.tablesorter.min,sort');
View::show_header("Manage collage: $Name", 'jquery-ui,jquery.tablesorter.min,sort');
?>
<div class="thin">
@ -63,10 +66,10 @@
<tr class="colhead">
<th style="width: 7%;">Order</th>
<th style="width: 1%;"><span><abbr title="Current rank">#</abbr></span></th>
<th style="width: 7%;"><span>Cat #</span></th>
<th style="width: 7%;"><span>Cat.&nbsp;#</span></th>
<th style="width: 1%;"><span>Year</span></th>
<th style="width: 15%;"><span>Artist</span></th>
<th><span>Torrent</span></th>
<th><span>Torrent group</span></th>
<th style="width: 1%;"><span>User</span></th>
<th style="width: 1%; text-align: right;" class="nobr"><span><abbr title="Modify an individual row.">Tweak</abbr></span></th>
</tr>
@ -89,13 +92,13 @@
} elseif (count($Artists) > 0) {
$DisplayName .= Artists::display_artists(array('1' => $Artists), true, false);
}
$TorrentLink = '<a href="torrents.php?id='.$GroupID.'" title="View Torrent">'.$GroupName.'</a>';
$TorrentLink = "<a href=\"torrents.php?id=$GroupID\" title=\"View Torrent\">$GroupName</a>";
$GroupYear = $GroupYear > 0 ? $GroupYear : '';
if ($GroupVanityHouse) {
$DisplayName .= ' [<abbr title="This is a Vanity House release">VH</abbr>]';
}
$AltCSS = $Number % 2 === 0 ? 'rowa' : 'rowb';
$AltCSS = ($Number % 2 === 0) ? 'rowa' : 'rowb';
?>
<tr class="drag <?=$AltCSS?>" id="li_<?=$GroupID?>">
<form class="manage_form" name="collage" action="collages.php" method="post">

16
sections/collages/recover.php
View File

@ -7,12 +7,18 @@
authorize();
$CollageID = $_POST['collage_id'];
$DB->query("SELECT Name FROM collages WHERE ID = ".$CollageID);
$DB->query("
SELECT Name
FROM collages
WHERE ID = $CollageID");
if ($DB->record_count() == 0) {
error('Collage is completely deleted');
} else {
$DB->query("UPDATE collages SET Deleted = '0' WHERE ID=$CollageID");
$Cache->delete_value('collage_'.$CollageID);
$DB->query("
UPDATE collages
SET Deleted = '0'
WHERE ID = $CollageID");
$Cache->delete_value("collage_$CollageID");
Misc::write_log("Collage $CollageID was recovered by ".$LoggedUser['Username']);
header("Location: collages.php?id=$CollageID");
}
@ -28,9 +34,13 @@
<form class="undelete_form" name="collage" action="collages.php" method="post">
<input type="hidden" name="action" value="recover" />
<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
<div class="field_div">
<strong>ID: </strong>
<input type="text" name="collage_id" size="8" />
</div>
<div class="submit_div">
<input value="Recover!" type="submit" />
</div>
</form>
</div>
</div>

36
sections/collages/torrent_collage.php
View File

@ -71,7 +71,7 @@
}
}
$DisplayName = $Number.' - ';
$DisplayName = "$Number - ";
if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5])|| !empty($ExtendedArtists[6])) {
unset($ExtendedArtists[2]);
@ -81,7 +81,7 @@
$DisplayName .= Artists::display_artists(array('1' => $GroupArtists));
}
$DisplayName .= '<a href="torrents.php?id='.$GroupID.'" title="View Torrent" dir="ltr">'.$GroupName.'</a>';
$DisplayName .= "<a href=\"torrents.php?id=$GroupID\" title=\"View Torrent\" dir=\"ltr\">$GroupName</a>";
if ($GroupYear > 0) {
$DisplayName = "$DisplayName [$GroupYear]";
}
@ -173,7 +173,7 @@
list($TorrentID, $Torrent) = each($Torrents);
$DisplayName = '<a href="torrents.php?id='.$GroupID.'" title="View Torrent" dir="ltr">'.$GroupName.'</a>';
$DisplayName = "<a href=\"torrents.php?id=$GroupID\" title=\"View Torrent\" dir=\"ltr\">$GroupName</a>";
if ($Torrent['IsSnatched']) {
$DisplayName .= ' ' . Format::torrent_label('Snatched!');
@ -228,7 +228,7 @@
}
$DisplayName .= $GroupName;
if ($GroupYear > 0) {
$DisplayName = $DisplayName. " [$GroupYear]";
$DisplayName = "$DisplayName [$GroupYear]";
}
?>
<li class="image_group_<?=$GroupID?>">
@ -358,7 +358,8 @@
</optgroup>
<? } ?>
<optgroup label="<?=$ZIPGroups[$GroupID]?>">
<? $OpenGroup = true;
<?
$OpenGroup = true;
}
?>
<option id="opt<?=$GroupID.$OptionID?>" value="<?=$GroupID.$OptionID?>"<? if (in_array($GroupID.$OptionID, $ZIPList)) { echo ' disabled="disabled"'; }?>><?=$OptName?></option>
@ -444,16 +445,19 @@
</div>
<? if (check_perms('site_collages_manage') && !$PreventAdditions) { ?>
<div class="box box_addtorrent">
<div class="head"><strong>Add torrent</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="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">
<form class="add_form" name="torrent" action="collages.php" method="post">
<input type="hidden" name="action" value="add_torrent" />
<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
<input type="hidden" name="collageid" value="<?=$CollageID?>" />
<div class="field_div">
<input type="text" size="20" name="url" />
<input type="submit" value="+" />
<br />
<span style="font-style: italic;">Enter the URL of a torrent on the site.</span>
</div>
<div class="submit_div">
<input type="submit" value="Add" />
</div>
<span style="font-style: italic;">Enter the URL of a torrent group on the site.</span>
</form>
</div>
<div class="pad hidden add_torrent_container">
@ -461,10 +465,13 @@
<input type="hidden" name="action" value="add_torrent_batch" />
<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
<input type="hidden" name="collageid" value="<?=$CollageID?>" />
<textarea name="urls" rows="5" cols="25" style="white-space: nowrap;"></textarea><br />
<div class="field_div">
<textarea name="urls" rows="5" cols="25" style="white-space: nowrap;"></textarea>
</div>
<div class="submit_div">
<input type="submit" value="Add" />
<br />
<span style="font-style: italic;">Enter the URLs of torrents on the site, one per line.</span>
</div>
<span style="font-style: italic;">Enter the URLs of torrent groups on the site, one per line.</span>
</form>
</div>
</div>
@ -513,10 +520,13 @@
<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
<input type="hidden" name="collageid" value="<?=$CollageID?>" />
<div class="pad">
<div class="field_div">
<textarea name="body" cols="24" rows="5"></textarea>
<br />
</div>
<div class="submit_div">
<input type="submit" id="submit_button" value="Add comment" />
</div>
</div>
</form>
</div>
<?

10
sections/user/edit.php
View File

@ -152,15 +152,11 @@ function checked($Checked) {
<tr>
<td class="label"><strong>Torrent grouping</strong></td>
<td>
<ul class="options_list nobullet">
<li>
<div class="field_div">
<div class="option_group">
<input type="checkbox" name="disablegrouping" id="disablegrouping"<?Format::selected('DisableGrouping2', 0, 'checked', $SiteOptions);?> />
<label for="disablegrouping">Group torrents by default</label>
</div>
</li>
<li>
<div class="field_div">
<div class="option_group">
<p>By default, torrent groups are:</p>
<ul class="options_list nobullet">
<li>
@ -173,8 +169,6 @@ function checked($Checked) {
</li>
</ul>
</div>
</li>
</ul>
</td>
</tr>
<tr>

6
static/styles/global.css
View File

@ -494,3 +494,9 @@ tr.torrent .bookmark>a:after {
font-size: 85%;
font-weight: normal;
}
.option_group {
margin-bottom: 10px;
}
.option_group:last-child {
margin-bottom: 0px;
}