diff --git a/Blacklight/Books.php b/Blacklight/Books.php
index 517062944..fd16208b6 100755
--- a/Blacklight/Books.php
+++ b/Blacklight/Books.php
@@ -16,6 +16,7 @@ use ApaiIO\Request\GuzzleRequest;
use Illuminate\Support\Facades\Cache;
use ApaiIO\Configuration\GenericConfiguration;
use ApaiIO\ResponseTransformer\XmlToSimpleXmlObject;
+use Illuminate\Support\Facades\DB as DBFacade;
class Books
{
@@ -141,68 +142,95 @@ class Books
/**
* @param $page
* @param $cat
- * @param $orderBy
- * @param array $excludedCats
+ * @param $start
+ * @param $num
+ * @param $orderby
+ * @param array $excludedcats
*
- * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator|mixed
+ * @return array
* @throws \Exception
*/
- public function getBookRange($page, $cat, $orderBy = '', array $excludedCats = [])
+ public function getBookRange($page, $cat, $start, $num, $orderby, array $excludedcats = []): array
{
- $order = $this->getBookOrder($orderBy);
-
- $sql = Release::query()
- ->where('r.nzbstatus', '=', 1)
- ->where('b.title', '<>', '')
- ->where('b.cover', '=', 1);
- Releases::showPasswords($sql, true);
- if (\count($excludedCats) > 0) {
- $sql->whereNotIn('r.categories_id', $excludedCats);
- }
-
+ $browseby = $this->getBrowseBy();
+ $catsrch = '';
if (\count($cat) > 0 && $cat[0] !== -1) {
- Category::getCategorySearch($cat, $sql, true);
+ $catsrch = Category::getCategorySearch($cat);
}
- $sql->select(
- [
- 'b.*',
- 'r.bookinfo_id',
- 'g.name as group_name',
- 'rn.releases_id as nfoid',
- \Illuminate\Support\Facades\DB::raw("GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_id"),
- \Illuminate\Support\Facades\DB::raw("GROUP_CONCAT(r.rarinnerfilecount ORDER BY r.postdate DESC SEPARATOR ',') as grp_rarinnerfilecount"),
- \Illuminate\Support\Facades\DB::raw("GROUP_CONCAT(r.haspreview ORDER BY r.postdate DESC SEPARATOR ',') as grp_haspreview"),
- \Illuminate\Support\Facades\DB::raw("GROUP_CONCAT(r.passwordstatus ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_password"),
- \Illuminate\Support\Facades\DB::raw("GROUP_CONCAT(r.guid ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_guid"),
- \Illuminate\Support\Facades\DB::raw("GROUP_CONCAT(rn.releases_id ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_nfoid"),
- \Illuminate\Support\Facades\DB::raw("GROUP_CONCAT(g.name ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_grpname"),
- \Illuminate\Support\Facades\DB::raw("GROUP_CONCAT(r.searchname ORDER BY r.postdate DESC SEPARATOR '#') as grp_release_name"),
- \Illuminate\Support\Facades\DB::raw("GROUP_CONCAT(r.postdate ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_postdate"),
- \Illuminate\Support\Facades\DB::raw("GROUP_CONCAT(r.size ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_size"),
- \Illuminate\Support\Facades\DB::raw("GROUP_CONCAT(r.totalpart ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_totalparts"),
- \Illuminate\Support\Facades\DB::raw("GROUP_CONCAT(r.comments ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_comments"),
- \Illuminate\Support\Facades\DB::raw("GROUP_CONCAT(r.grabs ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_grabs"),
- \Illuminate\Support\Facades\DB::raw("GROUP_CONCAT(df.failed ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_failed"),
- ]
- )
- ->from('releases as r')
- ->leftJoin('groups as g', 'g.id', '=', 'r.groups_id')
- ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'r.id')
- ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'r.id')
- ->join('bookinfo as b', 'b.id', '=', 'r.bookinfo_id')
- ->groupBy('b.id')
- ->orderBy($order[0], $order[1]);
-
- $return = Cache::get(md5($page.implode('.', $cat).implode('.', $order).implode('.', $excludedCats)));
+ $exccatlist = '';
+ if (\count($excludedcats) > 0) {
+ $exccatlist = ' AND r.categories_id NOT IN ('.implode(',', $excludedcats).')';
+ }
+ $order = $this->getBookOrder($orderby);
+ $booksql = sprintf(
+ "
+ SELECT SQL_CALC_FOUND_ROWS boo.id,
+ GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id
+ FROM bookinfo boo
+ LEFT JOIN releases r ON boo.id = r.bookinfo_id
+ WHERE r.nzbstatus = 1
+ AND boo.cover = 1
+ AND boo.title != ''
+ AND r.passwordstatus %s
+ %s %s %s
+ GROUP BY boo.id
+ ORDER BY %s %s %s",
+ Releases::showPasswords(),
+ $browseby,
+ $catsrch,
+ $exccatlist,
+ $order[0],
+ $order[1],
+ ($start === false ? '' : ' LIMIT '.$num.' OFFSET '.$start)
+ );
+ $expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_medium'));
+ $bookscache = Cache::get(md5($booksql.$page));
+ if ($bookscache !== null) {
+ $books = $bookscache;
+ } else {
+ $books = $this->pdo->queryCalc($booksql);
+ Cache::put(md5($booksql.$page), $books, $expiresAt);
+ }
+ $bookIDs = $releaseIDs = false;
+ if (\is_array($books['result'])) {
+ foreach ($books['result'] as $book => $id) {
+ $bookIDs[] = $id['id'];
+ $releaseIDs[] = $id['grp_release_id'];
+ }
+ }
+ $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, rn.releases_id, g.name AS group_name, df.failed AS failed,
+ boo.*,
+ r.bookinfo_id,
+ g.name AS group_name,
+ rn.releases_id AS nfoid
+ FROM releases r
+ LEFT OUTER JOIN groups g ON g.id = r.groups_id
+ LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id
+ LEFT OUTER JOIN dnzb_failures df ON df.release_id = r.id
+ INNER JOIN bookinfo boo ON boo.id = r.bookinfo_id
+ WHERE boo.id IN (%s)
+ AND r.id IN (%s)
+ %s
+ GROUP BY boo.id
+ ORDER BY %s %s',
+ (\is_array($bookIDs) ? implode(',', $bookIDs) : -1),
+ (\is_array($releaseIDs) ? implode(',', $releaseIDs) : -1),
+ $catsrch,
+ $order[0],
+ $order[1]
+ );
+ $return = Cache::get(md5($sql));
if ($return !== null) {
return $return;
}
-
- $return = $sql->paginate(config('nntmux.items_per_cover_page'));
-
- $expiresAt = Carbon::now()->addMinutes(config('nntmux.cache_expiry_long'));
- Cache::put(md5($page.implode('.', $cat).implode('.', $order).implode('.', $excludedCats)), $return, $expiresAt);
-
+ $return = DBFacade::select($sql);
+ if (! empty($return)) {
+ $return['_totalcount'] = $books['total'] ?? 0;
+ }
+ Cache::put(md5($sql.$page), $return, $expiresAt);
return $return;
}
diff --git a/Blacklight/Console.php b/Blacklight/Console.php
index 211fbbcb6..32e6f455f 100755
--- a/Blacklight/Console.php
+++ b/Blacklight/Console.php
@@ -79,6 +79,11 @@ class Console
*/
public $failCache;
+ /**
+ * @var \Blacklight\db\DB
+ */
+ protected $pdo;
+
/**
* @param array $options Class instances / Echo to cli.
* @throws \Exception
@@ -91,6 +96,7 @@ class Console
];
$options += $defaults;
+ $this->pdo = ($options['Settings'] instanceof \Blacklight\db\DB ? $options['Settings'] : new \Blacklight\db\DB());
$this->echooutput = ($options['Echo'] && config('nntmux.echocli'));
$this->pubkey = Settings::settingValue('APIs..amazonpubkey');
@@ -142,69 +148,99 @@ class Console
/**
* @param $page
* @param $cat
+ * @param $start
+ * @param $num
+ * @param $orderBy
* @param array $excludedcats
*
- * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator|mixed
+ * @return array
* @throws \Exception
*/
- public function getConsoleRange($page, $cat, array $excludedcats = [])
+ public function getConsoleRange($page, $cat, $start, $num, $orderBy, array $excludedcats = []): array
{
- $sql = Release::query()
- ->where('r.nzbstatus', '=', 1)
- ->where('con.title', '<>', '')
- ->where('con.cover', '=', 1)
- ->select(
- [
- 'con.*',
- 'r.consoleinfo_id',
- 'g.name as group_name',
- 'gn.title as genre',
- 'rn.releases_id as nfoid',
- DB::raw("GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_id"),
- DB::raw("GROUP_CONCAT(r.rarinnerfilecount ORDER BY r.postdate DESC SEPARATOR ',') as grp_rarinnerfilecount"),
- DB::raw("GROUP_CONCAT(r.haspreview ORDER BY r.postdate DESC SEPARATOR ',') as grp_haspreview"),
- DB::raw("GROUP_CONCAT(r.passwordstatus ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_password"),
- DB::raw("GROUP_CONCAT(r.guid ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_guid"),
- DB::raw("GROUP_CONCAT(rn.releases_id ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_nfoid"),
- DB::raw("GROUP_CONCAT(g.name ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_grpname"),
- DB::raw("GROUP_CONCAT(r.searchname ORDER BY r.postdate DESC SEPARATOR '#') as grp_release_name"),
- DB::raw("GROUP_CONCAT(r.postdate ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_postdate"),
- DB::raw("GROUP_CONCAT(r.size ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_size"),
- DB::raw("GROUP_CONCAT(r.totalpart ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_totalparts"),
- DB::raw("GROUP_CONCAT(r.comments ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_comments"),
- DB::raw("GROUP_CONCAT(r.grabs ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_grabs"),
- DB::raw("GROUP_CONCAT(df.failed ORDER BY r.postdate DESC SEPARATOR ',') as grp_release_failed"),
-
- ]
- )
- ->from('releases as r')
- ->leftJoin('groups as g', 'g.id', '=', 'r.groups_id')
- ->leftJoin('release_nfos as rn', 'rn.releases_id', '=', 'r.id')
- ->leftJoin('dnzb_failures as df', 'df.release_id', '=', 'r.id')
- ->join('consoleinfo as con', 'con.id', '=', 'r.consoleinfo_id')
- ->join('genres as gn', 'con.genres_id', '=', 'gn.id');
- Releases::showPasswords($sql, true);
+ $browseBy = $this->getBrowseBy();
+ $catsrch = '';
+ if (\count($cat) > 0 && (int) $cat[0] !== -1) {
+ $catsrch = Category::getCategorySearch($cat);
+ }
+ $exccatlist = '';
if (\count($excludedcats) > 0) {
- $sql->whereNotIn('r.categories_id', $excludedcats);
+ $exccatlist = ' AND r.categories_id NOT IN ('.implode(',', $excludedcats).')';
}
-
- if (\count($cat) > 0 && $cat[0] !== -1) {
- Category::getCategorySearch($cat, $sql, true);
+ $order = $this->getConsoleOrder($orderBy);
+ $calcSql = sprintf(
+ "
+ SELECT SQL_CALC_FOUND_ROWS
+ con.id,
+ GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id
+ FROM consoleinfo con
+ LEFT JOIN releases r ON con.id = r.consoleinfo_id
+ WHERE r.nzbstatus = 1
+ AND con.title != ''
+ AND con.cover = 1
+ AND r.passwordstatus %s
+ %s %s %s
+ GROUP BY con.id
+ ORDER BY %s %s %s",
+ Releases::showPasswords(),
+ $browseBy,
+ $catsrch,
+ $exccatlist,
+ $order[0],
+ $order[1],
+ ($start === false ? '' : ' LIMIT '.$num.' OFFSET '.$start)
+ );
+ $cached = Cache::get(md5($calcSql.$page));
+ if ($cached !== null) {
+ $consoles = $cached;
+ } else {
+ $consoles = $this->pdo->queryCalc($calcSql);
+ $expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_medium'));
+ Cache::put(md5($calcSql.$page), $consoles, $expiresAt);
}
-
- $sql->groupBy('con.id')
- ->orderBy('r.postdate', 'desc');
-
- $return = Cache::get(md5($page.implode('.', $cat).implode('.', $excludedcats)));
+ $consoleIDs = $releaseIDs = false;
+ if (\is_array($consoles['result'])) {
+ foreach ($consoles['result'] as $console => $id) {
+ $consoleIDs[] = $id['id'];
+ $releaseIDs[] = $id['grp_release_id'];
+ }
+ }
+ $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, rn.releases_id, g.name AS group_name, df.failed AS failed,
+ con.*,
+ r.consoleinfo_id,
+ g.name AS group_name,
+ genres.title AS genre,
+ rn.releases_id AS nfoid
+ FROM releases r
+ LEFT OUTER JOIN groups g ON g.id = r.groups_id
+ LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id
+ LEFT OUTER JOIN dnzb_failures df ON df.release_id = r.id
+ INNER JOIN consoleinfo con ON con.id = r.consoleinfo_id
+ INNER JOIN genres ON con.genres_id = genres.id
+ WHERE con.id IN (%s)
+ AND r.id IN (%s)
+ %s
+ GROUP BY con.id
+ ORDER BY %s %s',
+ (\is_array($consoleIDs) ? implode(',', $consoleIDs) : -1),
+ (\is_array($releaseIDs) ? implode(',', $releaseIDs) : -1),
+ $catsrch,
+ $order[0],
+ $order[1]
+ );
+ $return = Cache::get(md5($sql.$page));
if ($return !== null) {
return $return;
}
-
- $return = $sql->paginate(config('nntmux.items_per_cover_page'));
-
- $expiresAt = Carbon::now()->addMinutes(config('nntmux.cache_expiry_long'));
- Cache::put(md5($page.implode('.', $cat).implode('.', $excludedcats)), $return, $expiresAt);
-
+ $return = DB::select($sql);
+ if (! empty($return)) {
+ $return['_totalcount'] = $consoles['total'] ?? 0;
+ }
+ $expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_long'));
+ Cache::put(md5($sql.$page), $return, $expiresAt);
return $return;
}
@@ -265,19 +301,18 @@ class Console
}
/**
- * @param $query
- *
- * @return \Illuminate\Database\Query\Builder
- */
- public function getBrowseBy($query)
+ * @return string
+ */
+ public function getBrowseBy(): string
{
+ $browseBy = ' ';
foreach ($this->getBrowseByOptions() as $bbk => $bbv) {
- if (request()->has($bbk) && request()->input($bbk) !== null) {
- $bbs = stripslashes(request()->input($bbk));
-
- return $query->where('con.'.$bbv, 'like', '%'.$bbs.'%');
+ if (isset($_REQUEST[$bbk]) && ! empty($_REQUEST[$bbk])) {
+ $bbs = stripslashes($_REQUEST[$bbk]);
+ $browseBy .= 'AND con.'.$bbv.' '.$this->pdo->likeString($bbs);
}
}
+ return $browseBy;
}
/**
diff --git a/Changelog b/Changelog
index aca3f8e65..09b9072e2 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
2018-05-11 DariusIII
+ * Fix: Fix Books and Console pages
* Fix: Use raw queries to speed up browse pages
* Chg: Replace '!=' with proper '<>' operator
2018-05-10 DariusIII
diff --git a/app/Http/Controllers/BooksController.php b/app/Http/Controllers/BooksController.php
index c0261f143..7a3aa14a4 100644
--- a/app/Http/Controllers/BooksController.php
+++ b/app/Http/Controllers/BooksController.php
@@ -5,12 +5,15 @@ namespace App\Http\Controllers;
use Blacklight\Books;
use App\Models\Category;
use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
class BooksController extends BasePageController
{
/**
* @param \Illuminate\Http\Request $request
*
+ * @param string $id
+ *
* @throws \Exception
*/
public function index(Request $request, $id = '')
@@ -49,15 +52,16 @@ class BooksController extends BasePageController
$books = [];
$page = $request->has('page') ? $request->input('page') : 1;
- $results = $book->getBookRange($page, $catarray, $orderby, $this->userdata['categoryexclusions']);
-
+ $offset = ($page - 1) * config('nntmux.items_per_cover_page');
+ $rslt = $book->getBookRange($page, $catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, $this->userdata['categoryexclusions']);
+ $results = new LengthAwarePaginator($rslt, $rslt['_totalcount'], config('nntmux.items_per_cover_page'), $page, ['path' => $request->url()]);
$maxwords = 50;
foreach ($results as $result) {
- if (! empty($result['overview'])) {
- $words = explode(' ', $result['overview']);
+ if (! empty($result->overview)) {
+ $words = explode(' ', $result->overview);
if (\count($words) > $maxwords) {
$newwords = \array_slice($words, 0, $maxwords);
- $result['overview'] = implode(' ', $newwords).'...';
+ $result->overview = implode(' ', $newwords).'...';
}
}
$books[] = $result;
diff --git a/app/Http/Controllers/ConsoleController.php b/app/Http/Controllers/ConsoleController.php
index 8705aca05..eaa9fcf4f 100644
--- a/app/Http/Controllers/ConsoleController.php
+++ b/app/Http/Controllers/ConsoleController.php
@@ -6,6 +6,7 @@ use Blacklight\Genres;
use Blacklight\Console;
use App\Models\Category;
use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
class ConsoleController extends BasePageController
{
@@ -46,18 +47,22 @@ class ConsoleController extends BasePageController
$this->smarty->assign('category', $category);
$this->smarty->assign('categorytitle', $id);
+ $ordering = $console->getConsoleOrdering();
+ $orderby = $request->has('ob') && \in_array($request->input('ob'), $ordering, false) ? $request->input('ob') : '';
$page = $request->has('page') ? $request->input('page') : 1;
+ $offset = ($page - 1) * config('nntmux.items_per_cover_page');
$consoles = [];
- $results = $console->getConsoleRange($page, $catarray, $this->userdata['categoryexclusions']);
+ $rslt = $console->getConsoleRange($page, $catarray, $offset, config('nntmux.items_per_cover_page'), $orderby, $this->userdata['categoryexclusions']);
+ $results = new LengthAwarePaginator($rslt, $rslt['_totalcount'], config('nntmux.items_per_cover_page'), $page, ['path' => $request->url()]);
$maxwords = 50;
foreach ($results as $result) {
- if (! empty($result['review'])) {
- $words = explode(' ', $result['review']);
+ if (! empty($result->review)) {
+ $words = explode(' ', $result->review);
if (\count($words) > $maxwords) {
$newwords = \array_slice($words, 0, $maxwords);
- $result['review'] = implode(' ', $newwords).'...';
+ $result->review = implode(' ', $newwords).'...';
}
}
$consoles[] = $result;
diff --git a/resources/views/themes/Charisma/books.tpl b/resources/views/themes/Charisma/books.tpl
index ebfd8c33c..2f48f7701 100755
--- a/resources/views/themes/Charisma/books.tpl
+++ b/resources/views/themes/Charisma/books.tpl
@@ -57,97 +57,97 @@
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$result->author|escape:"htmlall"}
+ - {$result->title|escape:"htmlall"}
- |
+ |
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
- {if isset($result.review) && $result.review != ""}{$result.review|escape:"htmlall"|nl2br|magicurl|truncate:350}{if $result.review|strlen > 350}
+ {if isset($result->review) && $result->review != ""}{$result->review|escape:"htmlall"|nl2br|magicurl|truncate:350}{if $result->review|strlen > 350}
more...
- {$result.review|escape:"htmlall"|nl2br|magicurl}{else}{/if}
+ {$result->review|escape:"htmlall"|nl2br|magicurl}{else}{/if}
{/if}
- {if isset($result.publisher) && $result.publisher != ""}
+ {if isset($result->publisher) && $result->publisher != ""}
Publisher:
- {$result.publisher|escape:"htmlall"}
+ {$result->publisher|escape:"htmlall"}
{/if}
- {if isset($result.publishdate) && $result.publishdate != ""}
+ {if isset($result->publishdate) && $result->publishdate != ""}
Published:
- {$result.publishdate|date_format}
+ {$result->publishdate|date_format}
{/if}
- {if isset($result.pages) && $result.pages != ""}
+ {if isset($result->pages) && $result->pages != ""}
Pages:
- {$result.pages}
+ {$result->pages}
{/if}
- {if isset($result.isbn) && $result.isbn != ""}
+ {if isset($result->isbn) && $result->isbn != ""}
ISBN:
- {$result.isbn}
+ {$result->isbn}
{/if}
{$result.grp_release_grabs}
- Grab{if $result.grp_release_grabs != 1}s{/if}
+ class="badge">{$result->grabs}
+ Grab{if $result->grabs != 1}s{/if}
{$result.grp_release_comments}
- Comment{if $result.grp_release_comments != 1}s{/if}
+ class="badge">{$result->comments}
+ Comment{if $result->comments != 1}s{/if}
{if isset($sabintegrated) && $sabintegrated !=""}
diff --git a/resources/views/themes/Charisma/console.tpl b/resources/views/themes/Charisma/console.tpl
index de1faa58e..d7d419bc5 100755
--- a/resources/views/themes/Charisma/console.tpl
+++ b/resources/views/themes/Charisma/console.tpl
@@ -69,107 +69,107 @@
{$result.title|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$result->title|escape:"htmlall"}
- |
+ |
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
{if isset($isadmin)}
Edit{/if}
- {if isset($result.genre) && $result.genre != ""}
+ {if isset($result->genre) && $result->genre != ""}
Genre:
- {$result.genre}
+ {$result->genre}
{/if}
- {if isset($result.esrb) && $result.esrb != ""}
+ {if isset($result->esrb) && $result->esrb != ""}
Rating:
- {$result.esrb}
+ {$result->esrb}
{/if}
- {if isset($result.publisger) && $result.publisher != ""}
+ {if isset($result->publisger) && $result->publisher != ""}
Publisher:
- {$result.publisher}
+ {$result->publisher}
{/if}
- {if isset($result.releasedate) && $result.releasedate != ""}
+ {if isset($result->releasedate) && $result->releasedate != ""}
Released:
- {$result.releasedate|date_format}
+ {$result->releasedate|date_format}
{/if}
- {if isset($result.review) && $result.review != ""}
+ {if isset($result->review) && $result->review != ""}
Review:
- {$result.review|escape:'htmlall'}
+ {$result->review|escape:'htmlall'}
{/if}
{$result.grp_release_grabs}
- Grab{if $result.grp_release_grabs != 1}s{/if}
+ class="badge">{$result->grabs}
+ Grab{if $result->grabs != 1}s{/if}
{$result.grp_release_comments}
- Comment{if $result.grp_release_comments != 1}s{/if}
+ class="badge">{$result->comments}
+ Comment{if $result->comments != 1}s{/if}
{if isset($sabintegrated) && $sabintegrated !=""}
diff --git a/resources/views/themes/Charisma/games.tpl b/resources/views/themes/Charisma/games.tpl
index 3744e61aa..7873dd226 100755
--- a/resources/views/themes/Charisma/games.tpl
+++ b/resources/views/themes/Charisma/games.tpl
@@ -70,126 +70,126 @@
{$result.title|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$result->title|escape:"htmlall"}
- |
+ |
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
{if isset($isadmin)}
Edit{/if}
- {if isset($result.genre) && $result.genre != ""}
+ {if isset($result->genre) && $result->genre != ""}
Genre:
- {$result.genre}
+ {$result->genre}
{/if}
- {if isset($result.esrb) && $result.esrb != ""}
+ {if isset($result->esrb) && $result->esrb != ""}
Rating:
- {$result.esrb}
+ {$result->esrb}
{/if}
- {if isset($result.publisher) && $result.publisher != ""}
+ {if isset($result->publisher) && $result->publisher != ""}
Publisher:
- {$result.publisher}
+ {$result->publisher}
{/if}
- {if isset($result.releasedate) && $result.releasedate != ""}
+ {if isset($result->releasedate) && $result->releasedate != ""}
Released:
- {$result.releasedate|date_format}
+ {$result->releasedate|date_format}
{/if}
- {if isset($result.review) && $result.review != ""}
+ {if isset($result->review) && $result->review != ""}
Review:
- {$result.review|stripslashes|escape:'htmlall'}
+ {$result->review|stripslashes|escape:'htmlall'}
{/if}
|
diff --git a/resources/views/themes/Charisma/movies.tpl b/resources/views/themes/Charisma/movies.tpl
index f25b27f19..51ca72e00 100755
--- a/resources/views/themes/Charisma/movies.tpl
+++ b/resources/views/themes/Charisma/movies.tpl
@@ -54,8 +54,8 @@
{foreach $resultsadd as $result}
- {if isset($result.category_name)}
- {assign var="catnamesplit" value=">"|explode:$result.category_name}
+ {if isset($result->category_name)}
+ {assign var="catnamesplit" value=">"|explode:$result->category_name}
{/if}
{if $result@iteration is odd by 1}
@@ -66,87 +66,87 @@
{$result.title|escape:"htmlall"}
- {if $result.genre != ''}
+ href="{$smarty.const.WWW_TOP}/movies/?imdb={$result->imdbid}">{$result->title|escape:"htmlall"}
+ {if $result->genre != ''}
Genre:
- {$result.genre}, {/if}
- {if $result.plot != ''}{$result.plot} {/if}
- {if $result.director != ''}Director: {$result.director} {/if}
+ {$result->genre}, {/if}
+ {if $result->plot != ''}{$result->plot} {/if}
+ {if $result->director != ''}Director: {$result->director} {/if}
- {if $result.actors != ''}
+ {if $result->actors != ''}
Starring:
- {$result.actors} {/if}
-
+ {$result->actors} {/if}
+
{if isset($catsplit[0])} {$catsplit[0]}{/if}
{if isset($catsplit[1])} {$catsplit[1]}{/if}
- {$result.year}
- {if $result.rating != ''}{$result.rating}/10{/if}
- {if $result.rtrating != ''}RottenTomatoes Score {$result.rtrating}{/if}
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->year}
+ {if $result->rating != ''}{$result->rating}/10{/if}
+ {if $result->rtrating != ''}RottenTomatoes Score {$result->rtrating}{/if}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
{$mname[$m@index]|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$mname[$m@index]|escape:"htmlall"}
{$result.grp_release_grabs}
- Grab{if $result.grp_release_grabs != 1}s{/if}
+ class="badge"> {$result->grabs}
+ Grab{if $result->grabs != 1}s{/if}
{$result.grp_release_comments}
- Comment{if $result.grp_release_comments != 1}s{/if}
+ class="badge"> {$result->comments}
+ Comment{if $result->comments != 1}s{/if}
{if isset($sabintegrated) && $sabintegrated !=""}
@@ -154,20 +154,20 @@
{/if}
{if !empty($cpurl) && !empty($cpapi)}
{/if}
- {if !empty($result.grp_release_failed)}
+ {if !empty($result->failed)}
- {$result.grp_release_grabs}
- Grab{if {$result.grp_release_grabs} != 1}s{/if} / {$result.grp_release_failed}
- Failed Download{if {$result.grp_release_failed} > 1}s{/if}
+ {$result->grabs}
+ Grab{if {$result->grabs} != 1}s{/if} / {$result->failed}
+ Failed Download{if {$result->failed} > 1}s{/if}
{/if}
@@ -184,87 +184,87 @@
{$result.title|escape:"htmlall"}
- {if $result.genre != ''}
+ href="{$smarty.const.WWW_TOP}/movies/?imdb={$result->imdbid}">{$result->title|escape:"htmlall"}
+ {if $result->genre != ''}
Genre:
- {$result.genre}, {/if}
- {if $result.plot != ''}{$result.plot} {/if}
- {if $result.director != ''}Director: {$result.director} {/if}
+ {$result->genre}, {/if}
+ {if $result->plot != ''}{$result->plot} {/if}
+ {if $result->director != ''}Director: {$result->director} {/if}
- {if $result.actors != ''}
+ {if $result->actors != ''}
Starring:
- {$result.actors} {/if}
-
+ {$result->actors} {/if}
+
{if isset($catsplit[0])} {$catsplit[0]}{/if}
{if isset($catsplit[1])} {$catsplit[1]}{/if}
- {$result.year}
- {if $result.rating != ''}{$result.rating}/10{/if}
- {if $result.rtrating != ''}RottenTomatoes Score {$result.rtrating}{/if}
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->year}
+ {if $result->rating != ''}{$result->rating}/10{/if}
+ {if $result->rtrating != ''}RottenTomatoes Score {$result->rtrating}{/if}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
{$mname[$m@index]|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$mname[$m@index]|escape:"htmlall"}
{$result.grp_release_grabs}
- Grab{if $result.grp_release_grabs != 1}s{/if}
+ class="badge"> {$result->grabs}
+ Grab{if $result->grabs != 1}s{/if}
{$result.grp_release_comments}
- Comment{if $result.grp_release_comments != 1}s{/if}
+ class="badge"> {$result->comments}
+ Comment{if $result->comments != 1}s{/if}
{if isset($sabintegrated) && $sabintegrated !=""}
@@ -272,20 +272,20 @@
{/if}
{if !empty($cpurl) && !empty($cpapi)}
{/if}
- {if !empty($result.grp_release_failed)}
+ {if !empty($result->failed)}
- {$result.grp_release_grabs}
- Grab{if {$result.grp_release_grabs} != 1}s{/if} / {$result.grp_release_failed}
- Failed Download{if {$result.grp_release_failed} > 1}s{/if}
+ {$result->grabs}
+ Grab{if {$result->grabs} != 1}s{/if} / {$result->failed}
+ Failed Download{if {$result->failed} > 1}s{/if}
{/if}
diff --git a/resources/views/themes/Charisma/music.tpl b/resources/views/themes/Charisma/music.tpl
index 64f79141b..9f97b1149 100755
--- a/resources/views/themes/Charisma/music.tpl
+++ b/resources/views/themes/Charisma/music.tpl
@@ -56,94 +56,94 @@
- |
+ |
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
{if isset($isadmin)}
Edit{/if}
- {if $result.genre != ""}
+ {if $result->genre != ""}
Genre:
- {$result.genre|escape:"htmlall"}
+ {$result->genre|escape:"htmlall"}
{/if}
- {if $result.publisher != ""}
+ {if $result->publisher != ""}
Publisher:
- {$result.publisher|escape:"htmlall"}
+ {$result->publisher|escape:"htmlall"}
{/if}
- {if $result.releasedate != ""}
+ {if $result->releasedate != ""}
Released:
- {$result.releasedate|date_format}
+ {$result->releasedate|date_format}
{/if}
{$result.grp_release_grabs}
- Grab{if $result.grp_release_grabs != 1}s{/if}
+ class="badge">{$result->grabs}
+ Grab{if $result->grabs != 1}s{/if}
{$result.grp_release_comments}
- Comment{if $result.grp_release_comments != 1}s{/if}
+ class="badge">{$result->comments}
+ Comment{if $result->comments != 1}s{/if}
{if isset($sabintegrated) && $sabintegrated !=""}
diff --git a/resources/views/themes/Charisma/xxx.tpl b/resources/views/themes/Charisma/xxx.tpl
index 6ea733902..2192b834e 100755
--- a/resources/views/themes/Charisma/xxx.tpl
+++ b/resources/views/themes/Charisma/xxx.tpl
@@ -53,8 +53,8 @@
{foreach $resultsadd as $result}
- {if isset($result.category_name)}
- {assign var="catnamesplit" value=">"|explode:$result.category_name}
+ {if isset($result->category_name)}
+ {assign var="catnamesplit" value=">"|explode:$result->category_name}
{/if}
{if $result@iteration is odd by 1}
@@ -65,119 +65,119 @@
- ![]() {if !empty($result.grp_release_failed)}
+ alt="{$result->title|escape:"htmlall"}"/>{if !empty($result->failed)}
{/if}
- {if $result.classused == "ade"}
+ {if $result->classused == "ade"}

{/if}
- {if $result.classused == "adm"}
+ {if $result->classused == "adm"}

{/if}
- {if $result.classused == "aebn"}
+ {if $result->classused == "aebn"}

{/if}
- {if $result.classused == "hotm"}
+ {if $result->classused == "hotm"}

{/if}
- {if $result.classused == "pop"}
+ {if $result->classused == "pop"}

{/if}
{if $mnfo[$m@index] > 0} NFO{/if}
Group
- {if !empty($result.grp_release_failed)}
+ href="{$smarty.const.WWW_TOP}/browse/group?g={$result->group_name}"
+ title="Browse releases in {$result->group_name|replace:"alt.binaries":"a.b"}">Group
+ {if !empty($result->failed)}
- {$result.grp_release_grabs}
- Grab{if {$result.grp_release_grabs} != 1}s{/if} / {$result.grp_release_failed}
- Failed Download{if {$result.grp_release_failed} > 1}s{/if}
+ {$result->grabs}
+ Grab{if {$result->grabs} != 1}s{/if} / {$result->failed}
+ Failed Download{if {$result->failed} > 1}s{/if}
{/if}
{$result.title|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/xxx/?id={$result->id}">{$result->title|escape:"htmlall"}
- {if $result.genre != ''}{$result.genre}, {/if}
-
+ {if $result->genre != ''}{$result->genre}, {/if}
+
{if isset($catsplit[0])} {$catsplit[0]}{/if}
{if isset($catsplit[1])} {$catsplit[1]}{/if}
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
{$mname[$m@index]|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$mname[$m@index]|escape:"htmlall"}
{$result.grp_release_grabs}
- Grab{if $result.grp_release_grabs != 1}s{/if}
+ class="badge"> {$result->grabs}
+ Grab{if $result->grabs != 1}s{/if}
{$result.grp_release_comments}
- Comment{if $result.grp_release_comments != 1}s{/if}
+ class="badge"> {$result->comments}
+ Comment{if $result->comments != 1}s{/if}
{if isset($sabintegrated) && $sabintegrated !=""}
@@ -198,119 +198,119 @@
- ![]() {if !empty($result.grp_release_failed)}
+ alt="{$result->title|escape:"htmlall"}"/>{if !empty($result->failed)}
{/if}
- {if $result.classused == "ade"}
+ {if $result->classused == "ade"}

{/if}
- {if $result.classused == "adm"}
+ {if $result->classused == "adm"}

{/if}
- {if $result.classused == "aebn"}
+ {if $result->classused == "aebn"}

{/if}
- {if $result.classused == "hotm"}
+ {if $result->classused == "hotm"}

{/if}
- {if $result.classused == "pop"}
+ {if $result->classused == "pop"}

{/if}
{if $mnfo[$m@index] > 0} NFO{/if}
Group
- {if !empty($result.grp_release_failed)}
+ href="{$smarty.const.WWW_TOP}/browse/group?g={$result->group_name}"
+ title="Browse releases in {$result->group_name|replace:"alt.binaries":"a.b"}">Group
+ {if !empty($result->failed)}
- {$result.grp_release_grabs}
- Grab{if {$result.grp_release_grabs} != 1}s{/if} / {$result.grp_release_failed}
- Failed Download{if {$result.grp_release_failed} > 1}s{/if}
+ {$result->grabs}
+ Grab{if {$result->grabs} != 1}s{/if} / {$result->failed}
+ Failed Download{if {$result->failed} > 1}s{/if}
{/if}
{$result.title|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/xxx/?id={$result->id}">{$result->title|escape:"htmlall"}
- {if $result.genre != ''}{$result.genre}, {/if}
-
+ {if $result->genre != ''}{$result->genre}, {/if}
+
{if isset($catsplit[0])} {$catsplit[0]}{/if}
{if isset($catsplit[1])} {$catsplit[1]}{/if}
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
{$mname[$m@index]|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$mname[$m@index]|escape:"htmlall"}
{$result.grp_release_grabs}
- Grab{if $result.grp_release_grabs != 1}s{/if}
+ class="badge"> {$result->grabs}
+ Grab{if $result->grabs != 1}s{/if}
{$result.grp_release_comments}
- Comment{if $result.grp_release_comments != 1}s{/if}
+ class="badge"> {$result->comments}
+ Comment{if $result->comments != 1}s{/if}
{if isset($sabintegrated) && $sabintegrated !=""}
diff --git a/resources/views/themes/Gentele/books.tpl b/resources/views/themes/Gentele/books.tpl
index 8f3259b4b..3c5fb1a04 100755
--- a/resources/views/themes/Gentele/books.tpl
+++ b/resources/views/themes/Gentele/books.tpl
@@ -64,112 +64,112 @@
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$result->author|escape:"htmlall"}
+ - {$result->title|escape:"htmlall"}
- |
+ |
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
- {if isset($result.review) && $result.review != ""}{$result.review|escape:"htmlall"|nl2br|magicurl|truncate:350}{if $result.review|strlen > 350}
+ {if isset($result->review) && $result->review != ""}{$result->review|escape:"htmlall"|nl2br|magicurl|truncate:350}{if $result->review|strlen > 350}
more...
- {$result.review|escape:"htmlall"|nl2br|magicurl}{else}{/if}
+ {$result->review|escape:"htmlall"|nl2br|magicurl}{else}{/if}
{/if}
- {if isset($result.publisher) && $result.publisher != ""}
+ {if isset($result->publisher) && $result->publisher != ""}
Publisher:
- {$result.publisher|escape:"htmlall"}
+ {$result->publisher|escape:"htmlall"}
{/if}
- {if isset($result.publishdate) && $result.publishdate != ""}
+ {if isset($result->publishdate) && $result->publishdate != ""}
Published:
- {$result.publishdate|date_format}
+ {$result->publishdate|date_format}
{/if}
- {if isset($result.pages) && $result.pages != ""}
+ {if isset($result->pages) && $result->pages != ""}
Pages:
- {$result.pages}
+ {$result->pages}
{/if}
- {if isset($result.isbn) && $result.isbn != ""}
+ {if isset($result->isbn) && $result->isbn != ""}
ISBN:
- {$result.isbn}
+ {$result->isbn}
{/if}
|
diff --git a/resources/views/themes/Gentele/console.tpl b/resources/views/themes/Gentele/console.tpl
index 676fd0dfd..895a601df 100755
--- a/resources/views/themes/Gentele/console.tpl
+++ b/resources/views/themes/Gentele/console.tpl
@@ -69,107 +69,107 @@
{$result.title|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$result->title|escape:"htmlall"}
- |
+ |
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
{if isset($isadmin)}
Edit{/if}
- {if isset($result.genre) && $result.genre != ""}
+ {if isset($result->genre) && $result->genre != ""}
Genre:
- {$result.genre}
+ {$result->genre}
{/if}
- {if isset($result.esrb) && $result.esrb != ""}
+ {if isset($result->esrb) && $result->esrb != ""}
Rating:
- {$result.esrb}
+ {$result->esrb}
{/if}
- {if isset($result.publisger) && $result.publisher != ""}
+ {if isset($result->publisger) && $result->publisher != ""}
Publisher:
- {$result.publisher}
+ {$result->publisher}
{/if}
- {if isset($result.releasedate) && $result.releasedate != ""}
+ {if isset($result->releasedate) && $result->releasedate != ""}
Released:
- {$result.releasedate|date_format}
+ {$result->releasedate|date_format}
{/if}
- {if isset($result.review) && $result.review != ""}
+ {if isset($result->review) && $result->review != ""}
Review:
- {$result.review|escape:'htmlall'}
+ {$result->review|escape:'htmlall'}
{/if}
{$result.grp_release_grabs}
- Grab{if $result.grp_release_grabs != 1}s{/if}
+ class="badge">{$result->grabs}
+ Grab{if $result->grabs != 1}s{/if}
{$result.grp_release_comments}
- Comment{if $result.grp_release_comments != 1}s{/if}
+ class="badge">{$result->comments}
+ Comment{if $result->comments != 1}s{/if}
{if isset($sabintegrated) && $sabintegrated !=""}
diff --git a/resources/views/themes/Gentele/games.tpl b/resources/views/themes/Gentele/games.tpl
index 0263002ce..93edd81fa 100755
--- a/resources/views/themes/Gentele/games.tpl
+++ b/resources/views/themes/Gentele/games.tpl
@@ -71,126 +71,126 @@
{$result.title|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$result->title|escape:"htmlall"}
- |
+ |
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
{if isset($isadmin)}
Edit{/if}
- {if isset($result.genre) && $result.genre != ""}
+ {if isset($result->genre) && $result->genre != ""}
Genre:
- {$result.genre}
+ {$result->genre}
{/if}
- {if isset($result.esrb) && $result.esrb != ""}
+ {if isset($result->esrb) && $result->esrb != ""}
Rating:
- {$result.esrb}
+ {$result->esrb}
{/if}
- {if isset($result.publisher) && $result.publisher != ""}
+ {if isset($result->publisher) && $result->publisher != ""}
Publisher:
- {$result.publisher}
+ {$result->publisher}
{/if}
- {if isset($result.releasedate) && $result.releasedate != ""}
+ {if isset($result->releasedate) && $result->releasedate != ""}
Released:
- {$result.releasedate|date_format}
+ {$result->releasedate|date_format}
{/if}
- {if isset($result.review) && $result.review != ""}
+ {if isset($result->review) && $result->review != ""}
Review:
- {$result.review|stripslashes|escape:'htmlall'}
+ {$result->review|stripslashes|escape:'htmlall'}
{/if}
|
diff --git a/resources/views/themes/Gentele/movies.tpl b/resources/views/themes/Gentele/movies.tpl
index f76b68bee..290e90679 100755
--- a/resources/views/themes/Gentele/movies.tpl
+++ b/resources/views/themes/Gentele/movies.tpl
@@ -59,8 +59,8 @@
{foreach $resultsadd as $result}
- {if isset($result.category_name)}
- {assign var="catnamesplit" value=">"|explode:$result.category_name}
+ {if isset($result->category_name)}
+ {assign var="catnamesplit" value=">"|explode:$result->category_name}
{/if}
{if $result@iteration is odd by 1}
@@ -71,91 +71,91 @@
{$result.title|escape:"htmlall"}
- {if $result.genre != ''}
+ href="{$smarty.const.WWW_TOP}/movies/?imdb={$result->imdbid}">{$result->title|escape:"htmlall"}
+ {if $result->genre != ''}
Genre:
- {$result.genre}, {/if}
- {if $result.plot != ''}{$result.plot} {/if}
- {if $result.director != ''}Director: {$result.director} {/if}
+ {$result->genre}, {/if}
+ {if $result->plot != ''}{$result->plot} {/if}
+ {if $result->director != ''}Director: {$result->director} {/if}
- {if $result.actors != ''}
+ {if $result->actors != ''}
Starring:
- {$result.actors} {/if}
+ {$result->actors} {/if}
- |
+ |
{if isset($catsplit[0])} {$catsplit[0]}{/if}
{if isset($catsplit[1])} {$catsplit[1]}{/if}
- {$result.year}
- {if $result.rating != ''}{$result.rating}/10{/if}
- {if $result.rtrating != ''}RottenTomatoes Score {$result.rtrating}{/if}
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->year}
+ {if $result->rating != ''}{$result->rating}/10{/if}
+ {if $result->rtrating != ''}RottenTomatoes Score {$result->rtrating}{/if}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
{$result.grp_release_name|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$result->name|escape:"htmlall"}
|
@@ -199,91 +199,91 @@
{$result.title|escape:"htmlall"}
- {if $result.genre != ''}
+ href="{$smarty.const.WWW_TOP}/movies/?imdb={$result->imdbid}">{$result->title|escape:"htmlall"}
+ {if $result->genre != ''}
Genre:
- {$result.genre}, {/if}
- {if $result.plot != ''}{$result.plot} {/if}
- {if $result.director != ''}Director: {$result.director} {/if}
+ {$result->genre}, {/if}
+ {if $result->plot != ''}{$result->plot} {/if}
+ {if $result->director != ''}Director: {$result->director} {/if}
- {if $result.actors != ''}
+ {if $result->actors != ''}
Starring:
- {$result.actors} {/if}
+ {$result->actors} {/if}
- |
+ |
{if isset($catsplit[0])} {$catsplit[0]}{/if}
{if isset($catsplit[1])} {$catsplit[1]}{/if}
- {$result.year}
- {if $result.rating != ''}{$result.rating}/10{/if}
- {if $result.rtrating != ''}RottenTomatoes Score {$result.rtrating}{/if}
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->year}
+ {if $result->rating != ''}{$result->rating}/10{/if}
+ {if $result->rtrating != ''}RottenTomatoes Score {$result->rtrating}{/if}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
{$result.grp_release_name|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$result->name|escape:"htmlall"}
|
diff --git a/resources/views/themes/Gentele/music.tpl b/resources/views/themes/Gentele/music.tpl
index cc38b23ff..36f530516 100755
--- a/resources/views/themes/Gentele/music.tpl
+++ b/resources/views/themes/Gentele/music.tpl
@@ -62,108 +62,108 @@
- |
+ |
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
{if isset($isadmin)}
Edit{/if}
- {if $result.genre != ""}
+ {if $result->genre != ""}
Genre:
- {$result.genre|escape:"htmlall"}
+ {$result->genre|escape:"htmlall"}
{/if}
- {if $result.publisher != ""}
+ {if $result->publisher != ""}
Publisher:
- {$result.publisher|escape:"htmlall"}
+ {$result->publisher|escape:"htmlall"}
{/if}
- {if $result.releasedate != ""}
+ {if $result->releasedate != ""}
Released:
- {$result.releasedate|date_format}
+ {$result->releasedate|date_format}
{/if}
|
diff --git a/resources/views/themes/Gentele/xxx.tpl b/resources/views/themes/Gentele/xxx.tpl
index 2a02500f0..0b944014f 100755
--- a/resources/views/themes/Gentele/xxx.tpl
+++ b/resources/views/themes/Gentele/xxx.tpl
@@ -59,8 +59,8 @@
{foreach $resultsadd as $result}
- {if isset($result.category_name)}
- {assign var="catnamesplit" value=">"|explode:$result.category_name}
+ {if isset($result->category_name)}
+ {assign var="catnamesplit" value=">"|explode:$result->category_name}
{/if}
{if $result@iteration is odd by 1}
@@ -71,140 +71,140 @@
- ![]() {if !empty($result.grp_release_failed)}
+ alt="{$result->title|escape:"htmlall"}"/>{if !empty($result->failed)}
{/if}
- {if $result.classused == "ade"}
+ {if $result->classused == "ade"}

{/if}
- {if $result.classused == "adm"}
+ {if $result->classused == "adm"}

{/if}
- {if $result.classused == "aebn"}
+ {if $result->classused == "aebn"}

{/if}
- {if $result.classused == "hotm"}
+ {if $result->classused == "hotm"}

{/if}
- {if $result.classused == "pop"}
+ {if $result->classused == "pop"}

{/if}
- {if $result.grp_release_nfoid > 0} nfoid > 0}NFO{/if}
Group
- {if !empty($result.grp_release_failed)}
+ href="{$smarty.const.WWW_TOP}/browse/group?g={$result->group_name}"
+ title="Browse releases in {$result->group_name|replace:"alt.binaries":"a.b"}">Group
+ {if !empty($result->failed)}
- {$result.grp_release_grabs}
- Grab{if {$result.grp_release_grabs} != 1}s{/if} / {$result.grp_release_failed}
- Failed Download{if {$result.grp_release_failed} > 1}s{/if}
+ {$result->grabs}
+ Grab{if {$result->grabs} != 1}s{/if} / {$result->failed}
+ Failed Download{if {$result->failed} > 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.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
- {if $result.genre != ''}Genre: {$result.genre}, {/if}
+ {if $result->genre != ''}Genre: {$result->genre}, {/if}
- {if $result.plot != ''}Plot: {$result.plot}, {/if}
+ {if $result->plot != ''}Plot: {$result->plot}, {/if}
- {if $result.actors != ''}Cast: {$result.actors}, {/if}
+ {if $result->actors != ''}Cast: {$result->actors}, {/if}
{$result.grp_release_name|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$result->name|escape:"htmlall"}
|
@@ -223,139 +223,139 @@
- ![]() {if !empty($result.grp_release_failed)}
+ alt="{$result->title|escape:"htmlall"}"/>{if !empty($result->failed)}
{/if}
- {if $result.classused == "ade"}
+ {if $result->classused == "ade"}

{/if}
- {if $result.classused == "adm"}
+ {if $result->classused == "adm"}

{/if}
- {if $result.classused == "aebn"}
+ {if $result->classused == "aebn"}

{/if}
- {if $result.classused == "hotm"}
+ {if $result->classused == "hotm"}

{/if}
- {if $result.classused == "pop"}
+ {if $result->classused == "pop"}

{/if}
- {if $result.grp_release_nfoid > 0} nfoid > 0}NFO{/if}
Group
- {if !empty($result.grp_release_failed)}
+ href="{$smarty.const.WWW_TOP}/browse/group?g={$result->group_name}"
+ title="Browse releases in {$result->group_name|replace:"alt.binaries":"a.b"}">Group
+ {if !empty($result->failed)}
- {$result.grp_release_grabs}
- Grab{if {$result.grp_release_grabs} != 1}s{/if} / {$result.grp_release_failed}
- Failed Download{if {$result.grp_release_failed} > 1}s{/if}
+ {$result->grabs}
+ Grab{if {$result->grabs} != 1}s{/if} / {$result->failed}
+ Failed Download{if {$result->failed} > 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.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
- {if $result.genre != ''}Genre: {$result.genre}, {/if}
+ {if $result->genre != ''}Genre: {$result->genre}, {/if}
- {if $result.plot != ''}Plot: {$result.plot}, {/if}
+ {if $result->plot != ''}Plot: {$result->plot}, {/if}
- {if $result.actors != ''}Cast: {$result.actors}, {/if}
+ {if $result->actors != ''}Cast: {$result->actors}, {/if}
{$result.grp_release_name|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$result->name|escape:"htmlall"}
|
diff --git a/resources/views/themes/Omicron/books.tpl b/resources/views/themes/Omicron/books.tpl
index 41c6b5b8f..860b91445 100755
--- a/resources/views/themes/Omicron/books.tpl
+++ b/resources/views/themes/Omicron/books.tpl
@@ -57,109 +57,109 @@
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$result->author|escape:"htmlall"}
+ - {$result->title|escape:"htmlall"}
- |
+ |
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
- {if isset($result.review) && $result.review != ""}{$result.review|escape:"htmlall"|nl2br|magicurl|truncate:350}{if $result.review|strlen > 350}
+ {if isset($result->review) && $result->review != ""}{$result->review|escape:"htmlall"|nl2br|magicurl|truncate:350}{if $result->review|strlen > 350}
more...
- {$result.review|escape:"htmlall"|nl2br|magicurl}{else}{/if}
+ {$result->review|escape:"htmlall"|nl2br|magicurl}{else}{/if}
{/if}
- {if isset($result.publisher) && $result.publisher != ""}
+ {if isset($result->publisher) && $result->publisher != ""}
Publisher:
- {$result.publisher|escape:"htmlall"}
+ {$result->publisher|escape:"htmlall"}
{/if}
- {if isset($result.publishdate) && $result.publishdate != ""}
+ {if isset($result->publishdate) && $result->publishdate != ""}
Published:
- {$result.publishdate|date_format}
+ {$result->publishdate|date_format}
{/if}
- {if isset($result.pages) && $result.pages != ""}
+ {if isset($result->pages) && $result->pages != ""}
Pages:
- {$result.pages}
+ {$result->pages}
{/if}
- {if isset($result.isbn) && $result.isbn != ""}
+ {if isset($result->isbn) && $result->isbn != ""}
ISBN:
- {$result.isbn}
+ {$result->isbn}
{/if}
|
diff --git a/resources/views/themes/Omicron/console.tpl b/resources/views/themes/Omicron/console.tpl
index de1faa58e..d7d419bc5 100755
--- a/resources/views/themes/Omicron/console.tpl
+++ b/resources/views/themes/Omicron/console.tpl
@@ -69,107 +69,107 @@
{$result.title|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$result->title|escape:"htmlall"}
- |
+ |
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
{if isset($isadmin)}
Edit{/if}
- {if isset($result.genre) && $result.genre != ""}
+ {if isset($result->genre) && $result->genre != ""}
Genre:
- {$result.genre}
+ {$result->genre}
{/if}
- {if isset($result.esrb) && $result.esrb != ""}
+ {if isset($result->esrb) && $result->esrb != ""}
Rating:
- {$result.esrb}
+ {$result->esrb}
{/if}
- {if isset($result.publisger) && $result.publisher != ""}
+ {if isset($result->publisger) && $result->publisher != ""}
Publisher:
- {$result.publisher}
+ {$result->publisher}
{/if}
- {if isset($result.releasedate) && $result.releasedate != ""}
+ {if isset($result->releasedate) && $result->releasedate != ""}
Released:
- {$result.releasedate|date_format}
+ {$result->releasedate|date_format}
{/if}
- {if isset($result.review) && $result.review != ""}
+ {if isset($result->review) && $result->review != ""}
Review:
- {$result.review|escape:'htmlall'}
+ {$result->review|escape:'htmlall'}
{/if}
{$result.grp_release_grabs}
- Grab{if $result.grp_release_grabs != 1}s{/if}
+ class="badge">{$result->grabs}
+ Grab{if $result->grabs != 1}s{/if}
{$result.grp_release_comments}
- Comment{if $result.grp_release_comments != 1}s{/if}
+ class="badge">{$result->comments}
+ Comment{if $result->comments != 1}s{/if}
{if isset($sabintegrated) && $sabintegrated !=""}
diff --git a/resources/views/themes/Omicron/games.tpl b/resources/views/themes/Omicron/games.tpl
index aea12610e..5f23ef257 100755
--- a/resources/views/themes/Omicron/games.tpl
+++ b/resources/views/themes/Omicron/games.tpl
@@ -71,126 +71,126 @@
{$result.title|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$result->title|escape:"htmlall"}
- |
+ |
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
{if isset($isadmin)}
Edit{/if}
- {if isset($result.genre) && $result.genre != ""}
+ {if isset($result->genre) && $result->genre != ""}
Genre:
- {$result.genre}
+ {$result->genre}
{/if}
- {if isset($result.esrb) && $result.esrb != ""}
+ {if isset($result->esrb) && $result->esrb != ""}
Rating:
- {$result.esrb}
+ {$result->esrb}
{/if}
- {if isset($result.publisher) && $result.publisher != ""}
+ {if isset($result->publisher) && $result->publisher != ""}
Publisher:
- {$result.publisher}
+ {$result->publisher}
{/if}
- {if isset($result.releasedate) && $result.releasedate != ""}
+ {if isset($result->releasedate) && $result->releasedate != ""}
Released:
- {$result.releasedate|date_format}
+ {$result->releasedate|date_format}
{/if}
- {if isset($result.review) && $result.review != ""}
+ {if isset($result->review) && $result->review != ""}
Review:
- {$result.review|stripslashes|escape:'htmlall'}
+ {$result->review|stripslashes|escape:'htmlall'}
{/if}
|
diff --git a/resources/views/themes/Omicron/movies.tpl b/resources/views/themes/Omicron/movies.tpl
index f45035bfc..66ba1eb08 100755
--- a/resources/views/themes/Omicron/movies.tpl
+++ b/resources/views/themes/Omicron/movies.tpl
@@ -59,8 +59,8 @@
{foreach $resultsadd as $result}
- {if isset($result.category_name)}
- {assign var="catnamesplit" value=">"|explode:$result.category_name}
+ {if isset($result->category_name)}
+ {assign var="catnamesplit" value=">"|explode:$result->category_name}
{/if}
{if $result@iteration is odd by 1}
@@ -71,91 +71,91 @@
{$result.title|escape:"htmlall"}
- {if $result.genre != ''}
+ href="{$smarty.const.WWW_TOP}/movies/?imdb={$result->imdbid}">{$result->title|escape:"htmlall"}
+ {if $result->genre != ''}
Genre:
- {$result.genre}, {/if}
- {if $result.plot != ''}{$result.plot} {/if}
- {if $result.director != ''}Director: {$result.director} {/if}
+ {$result->genre}, {/if}
+ {if $result->plot != ''}{$result->plot} {/if}
+ {if $result->director != ''}Director: {$result->director} {/if}
- {if $result.actors != ''}
+ {if $result->actors != ''}
Starring:
- {$result.actors} {/if}
+ {$result->actors} {/if}
- |
+ |
{if isset($catsplit[0])} {$catsplit[0]}{/if}
{if isset($catsplit[1])} {$catsplit[1]}{/if}
- {$result.year}
- {if $result.rating != ''}{$result.rating}/10{/if}
- {if $result.rtrating != ''}RottenTomatoes Score {$result.rtrating}{/if}
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->year}
+ {if $result->rating != ''}{$result->rating}/10{/if}
+ {if $result->rtrating != ''}RottenTomatoes Score {$result->rtrating}{/if}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
{$mname[$m@index]|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$mname[$m@index]|escape:"htmlall"}
|
@@ -199,91 +199,91 @@
{$result.title|escape:"htmlall"}
- {if $result.genre != ''}
+ href="{$smarty.const.WWW_TOP}/movies/?imdb={$result->imdbid}">{$result->title|escape:"htmlall"}
+ {if $result->genre != ''}
Genre:
- {$result.genre}, {/if}
- {if $result.plot != ''}{$result.plot} {/if}
- {if $result.director != ''}Director: {$result.director} {/if}
+ {$result->genre}, {/if}
+ {if $result->plot != ''}{$result->plot} {/if}
+ {if $result->director != ''}Director: {$result->director} {/if}
- {if $result.actors != ''}
+ {if $result->actors != ''}
Starring:
- {$result.actors} {/if}
+ {$result->actors} {/if}
- |
+ |
{if isset($catsplit[0])} {$catsplit[0]}{/if}
{if isset($catsplit[1])} {$catsplit[1]}{/if}
- {$result.year}
- {if $result.rating != ''}{$result.rating}/10{/if}
- {if $result.rtrating != ''}RottenTomatoes Score {$result.rtrating}{/if}
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->year}
+ {if $result->rating != ''}{$result->rating}/10{/if}
+ {if $result->rtrating != ''}RottenTomatoes Score {$result->rtrating}{/if}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
{$mname[$m@index]|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$mname[$m@index]|escape:"htmlall"}
|
diff --git a/resources/views/themes/Omicron/music.tpl b/resources/views/themes/Omicron/music.tpl
index 7042155bf..b1e7178b0 100755
--- a/resources/views/themes/Omicron/music.tpl
+++ b/resources/views/themes/Omicron/music.tpl
@@ -56,106 +56,106 @@
- |
+ |
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
{if isset($isadmin)}
Edit{/if}
- {if $result.genre != ""}
+ {if $result->genre != ""}
Genre:
- {$result.genre|escape:"htmlall"}
+ {$result->genre|escape:"htmlall"}
{/if}
- {if $result.publisher != ""}
+ {if $result->publisher != ""}
Publisher:
- {$result.publisher|escape:"htmlall"}
+ {$result->publisher|escape:"htmlall"}
{/if}
- {if $result.releasedate != ""}
+ {if $result->releasedate != ""}
Released:
- {$result.releasedate|date_format}
+ {$result->releasedate|date_format}
{/if}
|
diff --git a/resources/views/themes/Omicron/xxx.tpl b/resources/views/themes/Omicron/xxx.tpl
index 54bc6acc7..29e6d3b53 100755
--- a/resources/views/themes/Omicron/xxx.tpl
+++ b/resources/views/themes/Omicron/xxx.tpl
@@ -53,8 +53,8 @@
{foreach $resultsadd as $result}
- {if isset($result.category_name)}
- {assign var="catnamesplit" value=">"|explode:$result.category_name}
+ {if isset($result->category_name)}
+ {assign var="catnamesplit" value=">"|explode:$result->category_name}
{/if}
{if $result@iteration is odd by 1}
@@ -65,131 +65,131 @@
- ![]() {if !empty($result.grp_release_failed)}
+ alt="{$result->title|escape:"htmlall"}"/>{if !empty($result->failed)}
{/if}
- {if $result.classused == "ade"}
+ {if $result->classused == "ade"}

{/if}
- {if $result.classused == "adm"}
+ {if $result->classused == "adm"}

{/if}
- {if $result.classused == "aebn"}
+ {if $result->classused == "aebn"}

{/if}
- {if $result.classused == "hotm"}
+ {if $result->classused == "hotm"}

{/if}
- {if $result.classused == "pop"}
+ {if $result->classused == "pop"}

{/if}
{if $mnfo[$m@index] > 0} NFO{/if}
Group
- {if !empty($result.grp_release_failed)}
+ href="{$smarty.const.WWW_TOP}/browse/group?g={$result->group_name}"
+ title="Browse releases in {$result->group_name|replace:"alt.binaries":"a.b"}">Group
+ {if !empty($result->failed)}
- {$result.grp_release_grabs}
- Grab{if {$result.grp_release_grabs} != 1}s{/if} / {$result.grp_release_failed}
- Failed Download{if {$result.grp_release_failed} > 1}s{/if}
+ {$result->grabs}
+ Grab{if {$result->grabs} != 1}s{/if} / {$result->failed}
+ Failed Download{if {$result->failed} > 1}s{/if}
{/if}
{$result.title|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/xxx/?id={$result->id}">{$result->title|escape:"htmlall"}
- {if $result.genre != ''}{$result.genre}, {/if}
-
+ {if $result->genre != ''}{$result->genre}, {/if}
+
{if isset($catsplit[0])} {$catsplit[0]}{/if}
{if isset($catsplit[1])} {$catsplit[1]}{/if}
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
{$mname[$m@index]|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$mname[$m@index]|escape:"htmlall"}
@@ -206,131 +206,131 @@
- ![]() {if !empty($result.grp_release_failed)}
+ alt="{$result->title|escape:"htmlall"}"/>{if !empty($result->failed)}
{/if}
- {if $result.classused == "ade"}
+ {if $result->classused == "ade"}

{/if}
- {if $result.classused == "adm"}
+ {if $result->classused == "adm"}

{/if}
- {if $result.classused == "aebn"}
+ {if $result->classused == "aebn"}

{/if}
- {if $result.classused == "hotm"}
+ {if $result->classused == "hotm"}

{/if}
- {if $result.classused == "pop"}
+ {if $result->classused == "pop"}

{/if}
{if $mnfo[$m@index] > 0} NFO{/if}
Group
- {if !empty($result.grp_release_failed)}
+ href="{$smarty.const.WWW_TOP}/browse/group?g={$result->group_name}"
+ title="Browse releases in {$result->group_name|replace:"alt.binaries":"a.b"}">Group
+ {if !empty($result->failed)}
- {$result.grp_release_grabs}
- Grab{if {$result.grp_release_grabs} != 1}s{/if} / {$result.grp_release_failed}
- Failed Download{if {$result.grp_release_failed} > 1}s{/if}
+ {$result->grabs}
+ Grab{if {$result->grabs} != 1}s{/if} / {$result->failed}
+ Failed Download{if {$result->failed} > 1}s{/if}
{/if}
{$result.title|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/xxx/?id={$result->id}">{$result->title|escape:"htmlall"}
- {if $result.genre != ''}{$result.genre}, {/if}
-
+ {if $result->genre != ''}{$result->genre}, {/if}
+
{if isset($catsplit[0])} {$catsplit[0]}{/if}
{if isset($catsplit[1])} {$catsplit[1]}{/if}
- {$result.grp_release_size|fsize_format:"MB"}
- Posted {$result.grp_release_postdate|timeago}
+ {$result->size|fsize_format:"MB"}
+ Posted {$result->postdate|timeago}
ago
{$mname[$m@index]|escape:"htmlall"}
+ href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$mname[$m@index]|escape:"htmlall"}
| | | | |