Empty commit

This commit is contained in:
Git 2013-02-26 08:00:42 +00:00
parent a17170b8c9
commit 87d6f98db3
9 changed files with 22 additions and 15 deletions

View File

@ -128,7 +128,9 @@ public static function sorted() {
*/
public function format($Link = 'torrents.php?taglist=') {
foreach ($this->Tags as $Tag) {
$this->TagLink[] = '<a href="' . $Link . $Tag . '">' . $Tag . '</a>';
if (empty($this->TagLink[$Tag])) {
$this->TagLink[$Tag] = '<a href="' . $Link . $Tag . '">' . $Tag . '</a>';
}
}
return implode(', ', $this->TagLink);
}
@ -138,8 +140,12 @@ public function format($Link = 'torrents.php?taglist=') {
* @param int $Max Max number of items to get
*/
public static function format_top($Max = 5, $Link = 'torrents.php?taglist=') {
if (empty(self::$All)) { ?>
<li>No torrent tags</li>
<? return;
}
foreach (array_slice(self::sorted(), 0, $Max) as $TagName => $Total) { ?>
<li><a href="<?=$Link . display_str($TagName)?>"><?=display_str($TagName)?></a> (<?=$Total?>)</li>
<li><a href="<?=$Link . display_str($TagName)?>"><?=display_str($TagName)?></a> (<?=$Total?>)</li>
<? }
}
}

View File

@ -621,7 +621,7 @@ function compare($X, $Y){
<div class="head"><strong>Tags</strong></div>
<ul class="stats nobullet">
<?
$TorrentTags->format_top(50);
Tags::format_top(50);
?>
</ul>
</div>
@ -752,11 +752,16 @@ function compare($X, $Y){
$Row = ($Row == 'a') ? 'b' : 'a';
$Tags = get_request_tags($RequestID);
$ReqTagList = array();
foreach($Tags as $TagID => $TagName) {
$ReqTagList[] = "<a href='requests.php?tags=".$TagName."'>".display_str($TagName)."</a>";
}
$ReqTagList = implode(', ', $ReqTagList);
?>
<tr class="row<?=$Row?>">
<td>
<?=$FullName?>
<div class="tags"><?=$TorrentTags->format('requests.php?tags=')?></div>
<div class="tags"><?=$ReqTagList?></div>
</td>
<td>
<span id="vote_count_<?=$RequestID?>"><?=$Votes?></span>

View File

@ -450,7 +450,7 @@ function display_name($ReleaseType) {
<div class="head"><strong>Tags</strong></div>
<ul class="stats nobullet">
<?
$TorrentTags->format_top(50);
Tags::format_top(50);
?>
</ul>
</div>

View File

@ -173,7 +173,7 @@
} else {
$ArtistNames = '';
}
$TorrentTags = new Tags($GroupInfo['TagList']);
foreach ($Editions as $RemIdent => $Edition) {
if (!$Edition['FlacID'] || count($Edition['Formats']) == 3) {
continue;
@ -205,7 +205,6 @@
if (!empty($Edition['RemasterYear'])) {
$ExtraInfo .= ' - ';
}
$TorrentTags = new Tags($GroupInfo['TagList']);
$ExtraInfo .= implode(' / ', $EditionInfo);
?>
<tr class="torrent torrent_row<?=$Edition['IsSnatched'] ? ' snatched_torrent' : ''?>">

View File

@ -128,6 +128,7 @@
} else {
$ArtistNames = '';
}
$TorrentTags = new Tags($GroupInfo['TagList']);
foreach ($Editions as $RemIdent => $Edition) {
if (!$Edition['FlacID'] //no FLAC in this group
|| !empty($Edition['Formats']) && $_GET['type'] == 3 //at least one transcode present when we only wanted groups containing no transcodes at all (type 3)
@ -166,7 +167,6 @@
if (!empty($Edition['RemasterYear'])) {
$ExtraInfo .= ' - ';
}
$TorrentTags = new Tags($GroupInfo['TagList']);
$ExtraInfo .= implode(' / ', $EditionInfo);
?>
<tr<?=$Edition['IsSnatched'] ? ' class="snatched_torrent"' : ''?>>

View File

@ -152,7 +152,7 @@
} else {
$ArtistNames = '';
}
$TorrentTags = new Tags($TagList);
foreach ($Editions as $RemIdent => $Edition) {
if (!$Edition['FlacID'] || count($Edition['Formats']) == 3) {
continue;
@ -184,7 +184,6 @@
if (!empty($Edition['RemasterYear'])) {
$ExtraInfo .= ' - ';
}
$TorrentTags = new Tags($TagList);
$ExtraInfo .= implode(' / ', $EditionInfo);
?>
<tr class="torrent torrent_row<?=$Edition['IsSnatched'] ? ' snatched_torrent' : ''?>">

View File

@ -299,7 +299,7 @@ function compare($X, $Y){
<div class="head"><strong>Top tags</strong></div>
<div class="pad">
<ol style="padding-left:5px;">
<? $TorrentTags->format_top(5) ?>
<? Tags::format_top(5) ?>
</ol>
</div>
</div>

View File

@ -466,9 +466,7 @@ function compare($X, $Y){
<div class="pad">
<ol style="padding-left:5px;">
<?
if (isset($TorrentTags)) {
$TorrentTags->format_top(5, 'collages.php?action=search&amp;tags=');
}
Tags::format_top(5, 'collages.php?action=search&amp;tags=');
?>
</ol>
</div>

View File

@ -16,7 +16,7 @@
// File list and size
list($ExtraTotalSize, $ExtraFileList) = $ExtraTor->file_list();
$ExtraDirName = isset($ExtraTor->Val['info']->Val['files']) ? Format::make_utf8($ExtraTor->get_name()) : "";
$ExtraDirName = isset($ExtraTor->Dec['info']['files']) ? Format::make_utf8($ExtraTor->get_name()) : "";
$ExtraTmpFileList = array();
foreach ($ExtraFileList as $ExtraFile) {