diff --git a/Blacklight/XXX.php b/Blacklight/XXX.php index b139c5dbe..d8dff8bbe 100755 --- a/Blacklight/XXX.php +++ b/Blacklight/XXX.php @@ -174,8 +174,21 @@ class XXX $sql = sprintf( " SELECT - r.id, r.rarinnerfilecount, r.grabs, r.comments, r.totalpart, r.size, r.postdate, r.searchname, r.haspreview, r.passwordstatus, r.guid, df.failed AS failed, - CONCAT(cp.title, ' > ', c.title) AS catname, + GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id, + GROUP_CONCAT(r.rarinnerfilecount ORDER BY r.postdate DESC SEPARATOR ',') AS grp_rarinnerfilecount, + GROUP_CONCAT(r.haspreview ORDER BY r.postdate DESC SEPARATOR ',') AS grp_haspreview, + GROUP_CONCAT(r.passwordstatus ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_password, + GROUP_CONCAT(r.guid ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_guid, + GROUP_CONCAT(rn.releases_id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_nfoid, + GROUP_CONCAT(g.name ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grpname, + GROUP_CONCAT(r.searchname ORDER BY r.postdate DESC SEPARATOR '#') AS grp_release_name, + GROUP_CONCAT(r.postdate ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_postdate, + GROUP_CONCAT(r.size ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_size, + GROUP_CONCAT(r.totalpart ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_totalparts, + GROUP_CONCAT(r.comments ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_comments, + GROUP_CONCAT(r.grabs ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grabs, + GROUP_CONCAT(df.failed ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_failed, + GROUP_CONCAT(cp.title, ' > ', c.title ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_catname, xxx.*, UNCOMPRESS(xxx.plot) AS plot, g.name AS group_name, rn.releases_id AS nfoid diff --git a/Changelog b/Changelog index 8a3f4d9a4..39bbfb405 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-05-17 DariusIII + * Fix: Fix XXX and Full XXX movie view * Fix: Revert to old output code with addition of exit; to prevent overwriting of sent headers * Chg: Use laravel Response class to return xml in Capabilities class output function 2018-05-16 DariusIII diff --git a/app/Http/Controllers/AdultController.php b/app/Http/Controllers/AdultController.php index fe5e2e59e..0dbd8ffd1 100644 --- a/app/Http/Controllers/AdultController.php +++ b/app/Http/Controllers/AdultController.php @@ -53,13 +53,14 @@ class AdultController extends BasePageController $results = $this->paginate($rslt ?? [], $rslt['_totalcount'] ?? 0, config('nntmux.items_per_cover_page'), $page, $request->url(), $request->query()); foreach ($results as $result) { if (! empty($result->id)) { - $result->genre = makeFieldLinks((array) $result, 'genre', 'movies'); - $result->actors = makeFieldLinks((array) $result, 'actors', 'movies'); - $result->director = makeFieldLinks((array) $result, 'director', 'movies'); + $result->genre = makeFieldLinks((array) $result, 'genre', 'xxx'); + $result->actors = makeFieldLinks((array) $result, 'actors', 'xxx'); + $result->director = makeFieldLinks((array) $result, 'director', 'xxx'); $movies[] = $result; } } + $title = ($request->has('title') && ! empty($request->input('title'))) ? stripslashes($request->input('title')) : ''; $this->smarty->assign('title', stripslashes($title)); diff --git a/resources/views/themes/Charisma/books.tpl b/resources/views/themes/Charisma/books.tpl index 9a6d83f8f..96c097f07 100755 --- a/resources/views/themes/Charisma/books.tpl +++ b/resources/views/themes/Charisma/books.tpl @@ -98,7 +98,7 @@ value="{$result->guid}" id="chksingle"/> - {$result->size|fsize_format:"MB"} + {$result->size|filesize} Posted {$result->postdate|timeago} ago
diff --git a/resources/views/themes/Charisma/browse.tpl b/resources/views/themes/Charisma/browse.tpl index b93622a24..a76d89a02 100755 --- a/resources/views/themes/Charisma/browse.tpl +++ b/resources/views/themes/Charisma/browse.tpl @@ -136,7 +136,7 @@ {$result->category_name} {$result->postdate|timeago} - {$result->size|fsize_format:"MB"} + {$result->size|filesize} - {$result->size|fsize_format:"MB"} + {$result->size|filesize} Posted {$result->postdate|timeago} ago {if isset($isadmin)} diff --git a/resources/views/themes/Charisma/games.tpl b/resources/views/themes/Charisma/games.tpl index a92d23ef4..c3971fae5 100755 --- a/resources/views/themes/Charisma/games.tpl +++ b/resources/views/themes/Charisma/games.tpl @@ -123,7 +123,7 @@ value="{$result->guid}" id="chksingle"/> - {$result->size|fsize_format:"MB"} + {$result->size|filesize} Posted {$result->postdate|timeago} ago {if isset($isadmin)} - {$result->size|fsize_format:"MB"} + {$result->size|filesize} Posted {$result->postdate|timeago} ago {if isset($isadmin)}postdate|timeago} - {$result->size|fsize_format:"MB"} + {$result->size|filesize} {if $result->completion > 0}
{if $result->completion < 100} diff --git a/resources/views/themes/Charisma/viewanime.tpl b/resources/views/themes/Charisma/viewanime.tpl index e3059af1b..b426b401d 100755 --- a/resources/views/themes/Charisma/viewanime.tpl +++ b/resources/views/themes/Charisma/viewanime.tpl @@ -137,7 +137,7 @@ {$result.category_name} {$result.postdate|timeago} - {$result.size|fsize_format:"MB"} + {$result.size|filesize} {if $completion < 100}{$completion} %{else}{$completion}%{/if} - {if $file.size < 100000}{$file.size|fsize_format:"KB"}{else}{$file.size|fsize_format:"MB"}{/if} + {$file.size|filesize} {/foreach} diff --git a/resources/views/themes/Charisma/viewnzb.tpl b/resources/views/themes/Charisma/viewnzb.tpl index eb838f666..b979dec90 100755 --- a/resources/views/themes/Charisma/viewnzb.tpl +++ b/resources/views/themes/Charisma/viewnzb.tpl @@ -493,7 +493,7 @@ Size / Completion - {$release.size|fsize_format:"MB"}{if $release.completion > 0} ({if $release.completion < 100} + {$release.size|filesize}{if $release.completion > 0} ({if $release.completion < 100} {$release.completion} %{else}{$release.completion}%{/if}){/if} @@ -546,7 +546,7 @@ Passworded {/if} - {$rf.size|fsize_format:"MB"} + {$rf.size|filesize} {$rf.created_at|date_format}
{/foreach} diff --git a/resources/views/themes/Charisma/viewseries.tpl b/resources/views/themes/Charisma/viewseries.tpl index ae3a9e12f..558364e19 100755 --- a/resources/views/themes/Charisma/viewseries.tpl +++ b/resources/views/themes/Charisma/viewseries.tpl @@ -201,7 +201,7 @@ {$result.postdate|timeago} - {$result.size|fsize_format:"MB"} + {$result.size|filesize} {$result.grp_release_postdate|timeago} - {$result.grp_release_size|fsize_format:"MB"} + {$result.grp_release_size|filesize}
-
{$result->title|escape:"htmlall"} + href="{$smarty.const.WWW_TOP}/XXX?id={$result->id}">{$result->title|escape:"htmlall"}
{if $result->genre != ''}{$result->genre}, {/if}
@@ -151,7 +151,7 @@ {if isset($catsplit[0])} {$catsplit[0]}{/if} {if isset($catsplit[1])} {$catsplit[1]}{/if} - {$result->size|fsize_format:"MB"} + {$result->size|filesize} Posted {$result->postdate|timeago} ago


@@ -199,7 +199,7 @@
-
{$result->title|escape:"htmlall"} + href="{$smarty.const.WWW_TOP}/XXX?id={$result->id}">{$result->title|escape:"htmlall"}
{if $result->genre != ''}{$result->genre}, {/if}
@@ -284,7 +284,7 @@ {if isset($catsplit[0])} {$catsplit[0]}{/if} {if isset($catsplit[1])} {$catsplit[1]}{/if} - {$result->size|fsize_format:"MB"} + {$result->size|filesize} Posted {$result->postdate|timeago} ago


diff --git a/resources/views/themes/Gentele/books.tpl b/resources/views/themes/Gentele/books.tpl index 58880ac5c..4c77acb1a 100755 --- a/resources/views/themes/Gentele/books.tpl +++ b/resources/views/themes/Gentele/books.tpl @@ -105,7 +105,7 @@ value="{$result->guid}" id="chksingle"/> - {$result->size|fsize_format:"MB"} + {$result->size|filesize} Posted {$result->postdate|timeago} ago
diff --git a/resources/views/themes/Gentele/browse.tpl b/resources/views/themes/Gentele/browse.tpl index 024a137e6..93c626d3f 100755 --- a/resources/views/themes/Gentele/browse.tpl +++ b/resources/views/themes/Gentele/browse.tpl @@ -149,7 +149,7 @@ {$result->category_name} {$result->postdate|timeago} - {$result->size|fsize_format:"MB"} + {$result->size|filesize} - {$result->size|fsize_format:"MB"} + {$result->size|filesize} Posted {$result->postdate|timeago} ago {if isset($isadmin)} diff --git a/resources/views/themes/Gentele/games.tpl b/resources/views/themes/Gentele/games.tpl index 4828847c8..4fa1169b7 100755 --- a/resources/views/themes/Gentele/games.tpl +++ b/resources/views/themes/Gentele/games.tpl @@ -126,7 +126,7 @@ value="{$result->guid}" id="chksingle"/> - {$result->size|fsize_format:"MB"} + {$result->size|filesize} Posted {$result->postdate|timeago} ago {if isset($isadmin)} - {$result->size|fsize_format:"MB"} + {$result->size|filesize} Posted {$result->postdate|timeago} ago {if isset($isadmin)}postdate|timeago} - {$result->size|fsize_format:"MB"} + {$result->size|filesize} {if $result->completion > 0}
{if $result->completion < 100} diff --git a/resources/views/themes/Gentele/viewanime.tpl b/resources/views/themes/Gentele/viewanime.tpl index e3059af1b..b426b401d 100755 --- a/resources/views/themes/Gentele/viewanime.tpl +++ b/resources/views/themes/Gentele/viewanime.tpl @@ -137,7 +137,7 @@ {$result.category_name} {$result.postdate|timeago} - {$result.size|fsize_format:"MB"} + {$result.size|filesize} {if $completion < 100}{$completion} %{else}{$completion}%{/if} - {if $file.size < 100000}{$file.size|fsize_format:"KB"}{else}{$file.size|fsize_format:"MB"}{/if} + {$file.size|filesize} {/foreach} diff --git a/resources/views/themes/Gentele/viewnzb.tpl b/resources/views/themes/Gentele/viewnzb.tpl index 325f900b4..a1bbcb947 100755 --- a/resources/views/themes/Gentele/viewnzb.tpl +++ b/resources/views/themes/Gentele/viewnzb.tpl @@ -492,7 +492,7 @@ Size / Completion - {$release.size|fsize_format:"MB"}{if $release.completion > 0} ({if $release.completion < 100} + {$release.size|filesize}{if $release.completion > 0} ({if $release.completion < 100} {$release.completion} %{else}{$release.completion}%{/if}){/if} @@ -545,7 +545,7 @@ Passworded {/if} - {$rf.size|fsize_format:"MB"} + {$rf.size|filesize} {$rf.created_at|date_format}
{/foreach} diff --git a/resources/views/themes/Gentele/viewseries.tpl b/resources/views/themes/Gentele/viewseries.tpl index 211304854..4c3a0a69b 100755 --- a/resources/views/themes/Gentele/viewseries.tpl +++ b/resources/views/themes/Gentele/viewseries.tpl @@ -210,7 +210,7 @@ {$result.postdate|timeago} - {$result.size|fsize_format:"MB"} + {$result.size|filesize} {if $results|@count > 0}
- {foreach $results as $result} + {foreach $resultsadd as $result}
- {if $result.cover == 1} + {if $result->cover == 1} {$result.title|escape: + alt="{$result->title|escape:"htmlall"} Logo" + src="{$smarty.const.WWW_TOP}/covers/xxx/{$result->id}-cover.jpg"/> {else} {$result.title|escape: {/if} - {$result.title|escape:"htmlall"} -

{if $result.genre != ''}{$result.genre|replace:"|":" / "}{/if}

- {if $result.tagline != ''} -

"{$result.tagline|escape:"htmlall"}"

+ {$result->title|escape:"htmlall"} +

{if $result->genre != ''}{$result->genre|replace:"|":" / "}{/if}

+ {if $result->tagline != ''} +

"{$result->tagline|escape:"htmlall"}"

{/if}
- {if isset($result.plot) && $result.plot != ''} + {if isset($result->plot) && $result->plot != ''}
Plot
-
{$result.plot|escape:"htmlall"}
+
{$result->plot|escape:"htmlall"}
{/if} - {if isset($result.rating) && $result.rating != ''} + {if isset($result->rating) && $result->rating != ''}
Rating
-
{$result.rating} - /10 {if isset($result.ratingcount) && $result.ratingcount != ''}({$result.ratingcount|number_format} votes)
{/if} +
{$result->rating} + /10 {if isset($result->ratingcount) && $result->ratingcount != ''}({$result->ratingcount|number_format} votes)
{/if} {/if} - {if isset($result.director) && $result.director != ''} + {if isset($result->director) && $result->director != ''}
Director
-
{$result.director|replace:"|":", "}
+
{$result->director|replace:"|":", "}
{/if} - {if isset($result.actors) && $result.actors != ''} + {if isset($result->actors) && $result->actors != ''}
Actors
-
{$result.actors|replace:"|":", "}
+
{$result->actors|replace:"|":", "}
{/if}
@@ -100,68 +100,80 @@ Size Action - - - - {$result.grp_release_name|escape:"htmlall"|replace:".":" "} -
- {$result.grp_release_grabs} - grab{if $result.grp_release_grabs != 1}s{/if} - {if isset($result.grp_release_nfoid) && $result.grp_release_nfoid > 0} - NFO - {/if} - {if $result.grp_release_password == 2} - - {elseif $result.grp_release_password == 1} - - {/if} - - {$result.grp_release_catname} - - {$result.grp_release_postdate|timeago} - {$result.grp_release_size|fsize_format:"MB"} - - - - - {if isset($sabintegrated) && $sabintegrated !=""} - - - - - {/if} - {if $weHasVortex} - - {/if} - - + {assign var="msplits" value=","|explode:$result->grp_release_id} + {assign var="mguid" value=","|explode:$result->grp_release_guid} + {assign var="mnfo" value=","|explode:$result->grp_release_nfoid} + {assign var="mgrp" value=","|explode:$result->grp_release_grpname} + {assign var="mname" value="#"|explode:$result->grp_release_name} + {assign var="mpostdate" value=","|explode:$result->grp_release_postdate} + {assign var="msize" value=","|explode:$result->grp_release_size} + {assign var="mtotalparts" value=","|explode:$result->grp_release_totalparts} + {assign var="mcomments" value=","|explode:$result->grp_release_comments} + {assign var="mgrabs" value=","|explode:$result->grp_release_grabs} + {assign var="mpass" value=","|explode:$result->grp_release_password} + {assign var="minnerfiles" value=","|explode:$result->grp_rarinnerfilecount} + {assign var="mhaspreview" value=","|explode:$result->grp_haspreview} + {assign var="mcatname" value=","|explode:$result->grp_release_catname} + {foreach $msplits as $m} + + + + {$mname[$m@index]|escape:"htmlall"|replace:".":" "} +
+ {$mgrabs[$m@index]} + grab{if $mgrabs[$m@index] != 1}s{/if} + {if isset($mnfo[$m@index]) && $mnfo[$m@index] > 0}NFO + {/if} + {if $mpass[$m@index] == 2} + + {elseif $mpass[$m@index] == 1} + + {/if} + + {$mcatname[$m@index]} + + {$mpostdate[$m@index]|timeago} + {$msize[$m@index]|filesize} + + + + + {if isset($sabintegrated) && $sabintegrated !=""} + + + + + {/if} + {if $weHasVortex} + + {/if} + + + {/foreach}
{if $results|@count > 10} @@ -205,11 +217,9 @@
- {if count($results) > 0} -
- {$results->links()} -
- {/if} +
+ {$results->links()} +
{/if}
@@ -217,4 +227,4 @@ {/foreach}
-{/if} +{/if} \ No newline at end of file diff --git a/resources/views/themes/Gentele/xxx.tpl b/resources/views/themes/Gentele/xxx.tpl index be25fe82a..9679568a9 100755 --- a/resources/views/themes/Gentele/xxx.tpl +++ b/resources/views/themes/Gentele/xxx.tpl @@ -72,94 +72,110 @@
- grp_release_id} + {assign var="mguid" value=","|explode:$result->grp_release_guid} + {assign var="mnfo" value=","|explode:$result->grp_release_nfoid} + {assign var="mgrp" value=","|explode:$result->grp_release_grpname} + {assign var="mname" value="#"|explode:$result->grp_release_name} + {assign var="mpostdate" value=","|explode:$result->grp_release_postdate} + {assign var="msize" value=","|explode:$result->grp_release_size} + {assign var="mtotalparts" value=","|explode:$result->grp_release_totalparts} + {assign var="mcomments" value=","|explode:$result->grp_release_comments} + {assign var="mgrabs" value=","|explode:$result->grp_release_grabs} + {assign var="mfailed" value=","|explode:$result->grp_release_failed} + {assign var="mpass" value=","|explode:$result->grp_release_password} + {assign var="minnerfiles" value=","|explode:$result->grp_rarinnerfilecount} + {assign var="mhaspreview" value=","|explode:$result->grp_haspreview} + {foreach $msplits as $m} + {if $m@first} + {$result->title|escape:{if !empty($result->failed)} + alt="{$result->title|escape:"htmlall"}"/>{if !empty($mfailed[$m@index])} {/if} {if $result->classused == "ade"} - + {/if} {if $result->classused == "adm"} - + {/if} {if $result->classused == "aebn"} - + {/if} {if $result->classused == "hotm"} - + {/if} {if $result->classused == "pop"} - + {/if} - {if $result->nfoid > 0}NFO{/if} + {if $mnfo[$m@index] > 0}NFO{/if} Group - {if !empty($result->failed)} - - {$result->grabs} - Grab{if {$result->grabs} != 1}s{/if} / {$result->failed} - Failed Download{if {$result->failed} > 1}s{/if} + href="{$smarty.const.WWW_TOP}/browse?g={$result->grp_release_grpname}" + title="Browse releases in {$result->grp_release_grpname|replace:"alt.binaries":"a.b"}">Group + {if !empty($mfailed[$m@index])} + + {$mgrabs[$m@index]} + Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} + Failed Download{if {$mfailed[$m@index]} > 1}s{/if} {/if}
{$result->title|escape:"htmlall"} + href="{$smarty.const.WWW_TOP}/XXX?id={$result->id}">{$result->title|escape:"htmlall"} -
+ {if isset($catsplit[0])} {$catsplit[0]}{/if} {if isset($catsplit[1])} {$catsplit[1]}{/if} - {$result->size|fsize_format:"MB"} - Posted {$result->postdate|timeago} + {$msize[$m@index]|fsize_format:"MB"} + Posted {$mpostdate[$m@index]|timeago} ago
{if $result->genre != ''}Genre: {$result->genre}, {/if}
@@ -169,48 +185,48 @@
{if $result->actors != ''}Cast: {$result->actors}, {/if}

{$result->searchname|escape:"htmlall"} + href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}">{$mname[$m@index]|escape:"htmlall"}
{$result->grabs} - Grab{if $result->grabs != 1}s{/if} + class="badge"> {$mgrabs[$m@index]} + Grab{if $mgrabs[$m@index] != 1}s{/if} {$result->comments} - Comment{if $result->comments != 1}s{/if} + class="badge"> {$mcomments[$m@index]} + Comment{if $mcomments[$m@index] != 1}s{/if} {if isset($sabintegrated) && $sabintegrated !=""} {/if} - {if !empty($result->failed)} + {if !empty($mfailed[$m@index])} - {$result->grabs} - Grab{if {$result->grabs} != 1}s{/if} - / {$result->failed} - Failed Download{if {$result->failed} > 1}s{/if} + {$mgrabs[$m@index]} + Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} + Failed Download{if {$mfailed[$m@index]} > 1}s{/if} {/if}
+ {/if} + {/foreach}
@@ -224,93 +240,109 @@
- grp_release_id} + {assign var="mguid" value=","|explode:$result->grp_release_guid} + {assign var="mnfo" value=","|explode:$result->grp_release_nfoid} + {assign var="mgrp" value=","|explode:$result->grp_release_grpname} + {assign var="mname" value="#"|explode:$result->grp_release_name} + {assign var="mpostdate" value=","|explode:$result->grp_release_postdate} + {assign var="msize" value=","|explode:$result->grp_release_size} + {assign var="mtotalparts" value=","|explode:$result->grp_release_totalparts} + {assign var="mcomments" value=","|explode:$result->grp_release_comments} + {assign var="mgrabs" value=","|explode:$result->grp_release_grabs} + {assign var="mfailed" value=","|explode:$result->grp_release_failed} + {assign var="mpass" value=","|explode:$result->grp_release_password} + {assign var="minnerfiles" value=","|explode:$result->grp_rarinnerfilecount} + {assign var="mhaspreview" value=","|explode:$result->grp_haspreview} + {foreach $msplits as $loop=>$m name="loop"} + {if $smarty.foreach.loop.first} + {$result->title|escape:{if !empty($result->failed)} + alt="{$result->title|escape:"htmlall"}"/>{if !empty($mfailed[$m@index])} {/if} {if $result->classused == "ade"} - + {/if} {if $result->classused == "adm"} - + {/if} {if $result->classused == "aebn"} - + {/if} {if $result->classused == "hotm"} - + {/if} {if $result->classused == "pop"} - + {/if} - {if $result->nfoid > 0}NFO{/if} + {if $mnfo[$m@index] > 0}NFO{/if} Group - {if !empty($result->failed)} - - {$result->grabs} - Grab{if {$result->grabs} != 1}s{/if} / {$result->failed} - Failed Download{if {$result->failed} > 1}s{/if} + href="{$smarty.const.WWW_TOP}/browse?g={$result->grp_release_grpname}" + title="Browse releases in {$result->grp_release_grpname|replace:"alt.binaries":"a.b"}">Group + {if !empty($mfailed[$m@index])} + + {$mgrabs[$m@index]} + Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} + Failed Download{if {$mfailed[$m@index]} > 1}s{/if} {/if}
{$result->title|escape:"htmlall"} + href="{$smarty.const.WWW_TOP}/XXX?id={$result->id}">{$result->title|escape:"htmlall"} -
+ {if isset($catsplit[0])} {$catsplit[0]}{/if} {if isset($catsplit[1])} {$catsplit[1]}{/if} - {$result->size|fsize_format:"MB"} - Posted {$result->postdate|timeago} + {$msize[$m@index]|fsize_format:"MB"} + Posted {$mpostdate[$m@index]|timeago} ago
{if $result->genre != ''}Genre: {$result->genre}, {/if}
@@ -320,48 +352,48 @@
{if $result->actors != ''}Cast: {$result->actors}, {/if}

{$result->searchname|escape:"htmlall"} + href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}">{$mname[$m@index]|escape:"htmlall"}
{$result->grabs} - Grab{if $result->grabs != 1}s{/if} + class="badge"> {$mgrabs[$m@index]} + Grab{if $mgrabs[$m@index] != 1}s{/if} {$result->comments} - Comment{if $result->comments != 1}s{/if} + class="badge"> {$mcomments[$m@index]} + Comment{if $mcomments[$m@index] != 1}s{/if} {if isset($sabintegrated) && $sabintegrated !=""} {/if} - {if !empty($result->failed)} + {if !empty($mfailed[$m@index])} - {$result->grabs} - Grab{if {$result->grabs} != 1}s{/if} - / {$result->failed} - Failed Download{if {$result->failed} > 1}s{/if} + {$mgrabs[$m@index]} + Grab{if {$mgrabs[$m@index]} != 1}s{/if} / {$mfailed[$m@index]} + Failed Download{if {$mfailed[$m@index]} > 1}s{/if} {/if}
+ {/if} + {/foreach}
diff --git a/resources/views/themes/Omicron/books.tpl b/resources/views/themes/Omicron/books.tpl index bfa8ac423..6dcb8c29f 100755 --- a/resources/views/themes/Omicron/books.tpl +++ b/resources/views/themes/Omicron/books.tpl @@ -98,7 +98,7 @@ value="{$result->guid}" id="chksingle"/> - {$result->size|fsize_format:"MB"} + {$result->size|filesize} Posted {$result->postdate|timeago} ago
diff --git a/resources/views/themes/Omicron/browse.tpl b/resources/views/themes/Omicron/browse.tpl index 5577fc890..6d125a38b 100755 --- a/resources/views/themes/Omicron/browse.tpl +++ b/resources/views/themes/Omicron/browse.tpl @@ -136,7 +136,7 @@ {$result->category_name} {$result->postdate|timeago} - {$result->size|fsize_format:"MB"} + {$result->size|filesize} - {$result->size|fsize_format:"MB"} + {$result->size|filesize} Posted {$result->postdate|timeago} ago {if isset($isadmin)} diff --git a/resources/views/themes/Omicron/games.tpl b/resources/views/themes/Omicron/games.tpl index ba47d36fd..07080b753 100755 --- a/resources/views/themes/Omicron/games.tpl +++ b/resources/views/themes/Omicron/games.tpl @@ -124,7 +124,7 @@ value="{$result->guid}" id="chksingle"/> - {$result->size|fsize_format:"MB"} + {$result->size|filesize} Posted {$result->postdate|timeago} ago {if isset($isadmin)} - {$result->size|fsize_format:"MB"} + {$result->size|filesize} Posted {$result->postdate|timeago} ago {if isset($isadmin)}postdate|timeago} - {$result->size|fsize_format:"MB"} + {$result->size|filesize} {if $result->completion > 0}
{if $result->completion < 100} diff --git a/resources/views/themes/Omicron/viewanime.tpl b/resources/views/themes/Omicron/viewanime.tpl index e3059af1b..b426b401d 100755 --- a/resources/views/themes/Omicron/viewanime.tpl +++ b/resources/views/themes/Omicron/viewanime.tpl @@ -137,7 +137,7 @@ {$result.category_name} {$result.postdate|timeago} - {$result.size|fsize_format:"MB"} + {$result.size|filesize} {if $completion < 100}{$completion} %{else}{$completion}%{/if} - {if $file.size < 100000}{$file.size|fsize_format:"KB"}{else}{$file.size|fsize_format:"MB"}{/if} + {$file.size|filesize} {/foreach} diff --git a/resources/views/themes/Omicron/viewnzb.tpl b/resources/views/themes/Omicron/viewnzb.tpl index 575160b1a..09f87c446 100755 --- a/resources/views/themes/Omicron/viewnzb.tpl +++ b/resources/views/themes/Omicron/viewnzb.tpl @@ -493,7 +493,7 @@ Size / Completion - {$release.size|fsize_format:"MB"}{if $release.completion > 0} ({if $release.completion < 100} + {$release.size|filesize}{if $release.completion > 0} ({if $release.completion < 100} {$release.completion} %{else}{$release.completion}%{/if}){/if} @@ -546,7 +546,7 @@ Passworded {/if} - {$rf.size|fsize_format:"MB"} + {$rf.size|filesize} {$rf.created_at|date_format}
{/foreach} diff --git a/resources/views/themes/Omicron/viewseries.tpl b/resources/views/themes/Omicron/viewseries.tpl index ca5db9276..ee2b39ff8 100755 --- a/resources/views/themes/Omicron/viewseries.tpl +++ b/resources/views/themes/Omicron/viewseries.tpl @@ -201,7 +201,7 @@ {$result.postdate|timeago} - {$result.size|fsize_format:"MB"} + {$result.size|filesize} {$result.grp_release_postdate|timeago} - {$result.grp_release_size|fsize_format:"MB"} + {$result.grp_release_size|filesize}
-
{$result->title|escape:"htmlall"} + href="{$smarty.const.WWW_TOP}/XXX?id={$result->id}">{$result->title|escape:"htmlall"}
{if $result->genre != ''}{$result->genre}, {/if}
@@ -151,7 +151,7 @@ {if isset($catsplit[0])} {$catsplit[0]}{/if} {if isset($catsplit[1])} {$catsplit[1]}{/if} - {$result->size|fsize_format:"MB"} + {$result->size|filesize} Posted {$result->postdate|timeago} ago


@@ -207,7 +207,7 @@
-
{$result->title|escape:"htmlall"} + href="{$smarty.const.WWW_TOP}/XXX?id={$result->id}">{$result->title|escape:"htmlall"}
{if $result->genre != ''}{$result->genre}, {/if}
@@ -292,7 +292,7 @@ {if isset($catsplit[0])} {$catsplit[0]}{/if} {if isset($catsplit[1])} {$catsplit[1]}{/if} - {$result->size|fsize_format:"MB"} + {$result->size|filesize} Posted {$result->postdate|timeago} ago


diff --git a/resources/views/themes/admin/category-list.tpl b/resources/views/themes/admin/category-list.tpl index 06d2f9618..d1eaf658a 100644 --- a/resources/views/themes/admin/category-list.tpl +++ b/resources/views/themes/admin/category-list.tpl @@ -31,10 +31,10 @@ {/if} - {if $category.minsizetoformrelease != 0 }{$category.minsizetoformrelease|fsize_format:"MB"}{/if} + {if $category.minsizetoformrelease != 0 }{$category.minsizetoformrelease|filesize}{/if} - {if $category.maxsizetoformrelease != 0 }{$category.maxsizetoformrelease|fsize_format:"MB"}{/if} + {if $category.maxsizetoformrelease != 0 }{$category.maxsizetoformrelease|filesize}{/if} {if $category.status == "1"}Yes{else}No{/if} {if $category.disablepreview == "1"}Yes{else}No{/if} diff --git a/resources/views/themes/admin/failrel-list.tpl b/resources/views/themes/admin/failrel-list.tpl index 76fcd279d..a1e2a846c 100644 --- a/resources/views/themes/admin/failrel-list.tpl +++ b/resources/views/themes/admin/failrel-list.tpl @@ -22,7 +22,7 @@ href="{$smarty.const.WWW_TOP}/admin/release-edit?id={$release.guid}">{$release.searchname|escape:"htmlall"|wordwrap:75:"\n":true} {$release.category_name} - {$release.size|fsize_format:"MB"} + {$release.size|filesize} {$release.totalpart} {$release.postdate|date_format} {$release.adddate|date_format} diff --git a/resources/views/themes/admin/group-list.tpl b/resources/views/themes/admin/group-list.tpl index 643e6b6cc..cd07e2127 100644 --- a/resources/views/themes/admin/group-list.tpl +++ b/resources/views/themes/admin/group-list.tpl @@ -65,7 +65,7 @@ class="backfill_deactive">Activate{/if} {$group.num_releases} {if $group.minfilestoformrelease==""}n/a{else}{$group.minfilestoformrelease}{/if} - {if $group.minsizetoformrelease==""}n/a{else}{$group.minsizetoformrelease|fsize_format:"MB"}{/if} + {if $group.minsizetoformrelease==""}n/a{else}{$group.minsizetoformrelease|filesize}{/if} {$group.backfill_target} Reset diff --git a/resources/views/themes/admin/release-list.tpl b/resources/views/themes/admin/release-list.tpl index 49dd01a40..6877e0783 100644 --- a/resources/views/themes/admin/release-list.tpl +++ b/resources/views/themes/admin/release-list.tpl @@ -22,7 +22,7 @@ href="{$smarty.const.WWW_TOP}/admin/release-edit?id={$release.guid}">{$release.searchname|escape:"htmlall"|wordwrap:75:"\n":true} {$release.category_name} - {$release.size|fsize_format:"MB"} + {$release.size|filesize} {$release.totalpart} {$release.postdate|date_format} {$release.adddate|date_format} diff --git a/resources/views/themes/admin/site-debug.tpl b/resources/views/themes/admin/site-debug.tpl index 250cb0a2c..72f7e3133 100644 --- a/resources/views/themes/admin/site-debug.tpl +++ b/resources/views/themes/admin/site-debug.tpl @@ -11,10 +11,10 @@ {$site|print_r} {foreach from=$mysql item=data} - {$data.name} Index Size ({$data.indexsize|fsize_format:"MB"}) Data Size ({$data.datasize|fsize_format:"MB"}) + {$data.name} Index Size ({$data.indexsize|filesize}) Data Size ({$data.datasize|filesize}) {/foreach} - Totalsize ({$mysqltotalsize|fsize_format:"MB"}) + Totalsize ({$mysqltotalsize|filesize})