diff --git a/www/pages/movies.php b/www/pages/movies.php index c2a9589fa..ebf50e520 100644 --- a/www/pages/movies.php +++ b/www/pages/movies.php @@ -8,7 +8,7 @@ if (!$page->users->isLoggedIn()) $moviecats = $cat->getChildren(Category::CAT_PARENT_MOVIE); -$mtmp = array(); +$mtmp = []; foreach($moviecats as $mcat) { $mtmp[$mcat['id']] = $mcat; } @@ -23,7 +23,7 @@ $cpurl = $user['cp_url']; $page->smarty->assign('cpapi', $cpapi); $page->smarty->assign('cpurl', $cpurl); -$catarray = array(); +$catarray = []; if ($category != -1) $catarray[] = $category; $page->smarty->assign('catlist', $mtmp); @@ -35,7 +35,7 @@ $offset = (isset($_REQUEST["offset"]) && ctype_digit($_REQUEST['offset'])) ? $_R $ordering = $movie->getMovieOrdering(); $orderby = isset($_REQUEST["ob"]) && in_array($_REQUEST['ob'], $ordering) ? $_REQUEST["ob"] : ''; -$results = $movies = array(); +$results = $movies = []; $results = $movie->getMovieRange($catarray, $offset, ITEMS_PER_COVER_PAGE, $orderby, -1, $page->userdata["categoryexclusions"]); foreach($results as $result) { $result['genre'] = $movie->makeFieldLinks($result, 'genre'); diff --git a/www/templates/charisma/views/frontend/browse.tpl b/www/templates/charisma/views/frontend/browse.tpl index cfe83e773..cbeea1d66 100644 --- a/www/templates/charisma/views/frontend/browse.tpl +++ b/www/templates/charisma/views/frontend/browse.tpl @@ -74,7 +74,7 @@
- diff --git a/www/templates/charisma/views/frontend/browsegroup.tpl b/www/templates/charisma/views/frontend/browsegroup.tpl index 0dd535037..8c448569d 100644 --- a/www/templates/charisma/views/frontend/browsegroup.tpl +++ b/www/templates/charisma/views/frontend/browsegroup.tpl @@ -17,7 +17,7 @@
-
diff --git a/www/templates/charisma/views/frontend/cart.tpl b/www/templates/charisma/views/frontend/cart.tpl index eb8a13864..ab35a445d 100644 --- a/www/templates/charisma/views/frontend/cart.tpl +++ b/www/templates/charisma/views/frontend/cart.tpl @@ -35,7 +35,7 @@
-
+
diff --git a/www/templates/charisma/views/frontend/mymovielist.tpl b/www/templates/charisma/views/frontend/mymovielist.tpl index f7220bed7..4c32dc414 100644 --- a/www/templates/charisma/views/frontend/mymovielist.tpl +++ b/www/templates/charisma/views/frontend/mymovielist.tpl @@ -1,5 +1,5 @@ {if $data|@count > 0} -
+
@@ -12,7 +12,7 @@
{$result['title']|escape:
diff --git a/www/templates/charisma/views/frontend/mymoviesedit.tpl b/www/templates/charisma/views/frontend/mymoviesedit.tpl index dbb315a83..8a7190934 100644 --- a/www/templates/charisma/views/frontend/mymoviesedit.tpl +++ b/www/templates/charisma/views/frontend/mymoviesedit.tpl @@ -22,7 +22,7 @@

{if $movies|@count > 0} -
Name
+
diff --git a/www/templates/charisma/views/frontend/myshows.tpl b/www/templates/charisma/views/frontend/myshows.tpl index f45bea930..ffb7cc2ee 100644 --- a/www/templates/charisma/views/frontend/myshows.tpl +++ b/www/templates/charisma/views/frontend/myshows.tpl @@ -10,7 +10,6 @@ -
View all series @@ -20,53 +19,54 @@ href="{$smarty.const.WWW_TOP}/rss?t=-3&dl=1&i={$userdata.id}&r={$userdata.rsstoken}">RSS Feed for My Shows
-
-
+
{if $shows|@count > 0} -
-
-
-
-
- - - - - - +
+
+
+
+
+
NameCategoryAddedOptions
+ + + + + + - {foreach from=$shows item=show} - - - - - - - {/foreach} + {foreach from=$shows item=show} + + + + + + + {/foreach} -
NameCategoryAddedOptions
- {$show.releasetitle|escape:"htmlall"|wordwrap:75:"\n":true} - - {if $show.categoryNames != ''}{$show.categoryNames|escape:"htmlall"}{else}All{/if} - {$show.createddate|date_format} -
- Edit - Remove -
-
+ {$show.releasetitle|escape:"htmlall"|wordwrap:75:"\n":true} + + {if $show.categoryNames != ''}{$show.categoryNames|escape:"htmlall"}{else}All{/if} + {$show.createddate|date_format} +
+ Edit + Remove +
+
- - {else} -
- Sorry! No shows bookmarked yet! + +
- {/if} - \ No newline at end of file +{else} +
+ Sorry! No shows bookmarked yet! +
+{/if} diff --git a/www/templates/charisma/views/frontend/prehash.tpl b/www/templates/charisma/views/frontend/prehash.tpl index d37ee16f8..859e020e5 100644 --- a/www/templates/charisma/views/frontend/prehash.tpl +++ b/www/templates/charisma/views/frontend/prehash.tpl @@ -9,285 +9,338 @@ value="{$lastSearch|escape:'html'}"> {$pager} - - - - - - - - - - - - - {foreach from=$results item=result} - - - - - - + + + + + + {/foreach} +
DateTitleCategorySourceReqidSizeFiles
- {$result.predate|date_format:"%Y-%m-%d %H:%M:%S"} - - {if isset($result.guid)} - - 1}NUKED: {$result.nukereason|escape:"htmlall"}{else}{$result.title|escape:"htmlall"}{/if}">{$result.title|escape:"htmlall"} - - {else} - 1}NUKED: {$result.nukereason|escape:"htmlall"}{else}{$result.title|escape:"htmlall"}{/if}">{$result.title|escape:"htmlall"} - {/if} - - {* Console *} - {* Xbox 360 *} - {if {$result.category} == 'XBOX360'} - Console - Xbox - 360 - {* Movies *} - {elseif in_array({$result.category}, array('Movies'))} - Movies - {* SD *} - {elseif in_array({$result.category}, array('movies-sd', 'Movies: STD', 'XVid'))} - Movies - SD - {* HD *} - {elseif in_array({$result.category}, array('Movies: HD', 'X264'))} - Movies - HD - {* BluRay *} - {elseif in_array({$result.category}, array('BLURAY'))} - Movies - BluRay - {* DVD *} - {elseif in_array({$result.category}, array('DVDR', 'Movies: DVD'))} - DVD - {* Audio *} - {elseif in_array({$result.category}, array('music-audio'))} - Audio - {* MP3 *} - {elseif in_array({$result.category}, array('MP3', 'Music: MP3'))} - MP3 - {* Video *} - {elseif in_array({$result.category}, array('MVid', 'Music: MVid'))} - Music - Videos - {* Audiobook *} - {elseif in_array({$result.category}, array('audiobook', 'Audiobook'))} - Audiobook - {* Lossless *} - {elseif in_array({$result.category}, array('FLAC', 'Music: FLAC'))} - Lossless - Music - {* PC *} - {* 0day *} - {elseif in_array({$result.category}, array('0DAY', 'APPS', 'Apps: PC', 'Apps: Linux', 'DOX'))} - PC - 0DAY - {* Mac *} - {elseif in_array({$result.category}, array('Apps: MAC', 'Games: MAC'))} - PC - Mac - {* Phone-Other *} - {elseif in_array({$result.category}, array('Apps: Phone', 'PDA'))} - Phone - Other - {* Games *} - {elseif in_array({$result.category}, array('GAMES', 'Games: PC', 'Games: Other'))} - PC - Games - {* TV *} - {elseif in_array({$result.category}, array('TV'))} - TV - {* SD *} - {elseif in_array({$result.category}, array('TV-DVDRIP', 'tv-sd', 'TV: STD', 'TV-XVid'))} - SDTV - {* HD *} - {elseif in_array({$result.category}, array('tv-hd', 'TV: HD', 'TV-x264', 'TV-X264'))} - HDTV - {* XXX *} - {elseif in_array({$result.category}, array('XXX'))} - XXX - {* DVD *} - {elseif in_array({$result.category}, array('XXX: DVD'))} - XXX - DVD - {* XviD *} - {elseif in_array({$result.category}, array('XXX: SD-CLIPS', 'XXX: MOVIES-SD'))} - XXX - SD - {* x264 *} - {elseif in_array({$result.category}, array('XXX: HD-CLIPS', 'XXX: MOVIES-HD'))} - XXX - HD - {* Other *} - {elseif in_array({$result.category}, array('xxx-videos'))} - XXX - Other - {* Imageset *} - {elseif in_array({$result.category}, array('XXX-IMGSET'))} - XXX - Imagesets - {* Books *} - {elseif in_array({$result.category}, array('EBOOK'))} - Ebooks - {* Other *} - {elseif in_array({$result.category}, array('Other: E-Books'))} - Ebooks - Other - {elseif in_array({$result.category}, array('', 'PRE'))} - N/A - {else} - {$result.category} - {/if} - - {if {$result.source} == abgx} - - abgx.net - - {elseif in_array({$result.source}, array('abErotica', 'abMooVee', 'abTeeVee', 'abForeign'))} - - {$result.source} - - {elseif $result.source|strpos:'#a.b.' !== false} - - {$result.source} - - {elseif {$result.source} == omgwtfnzbs} - - omgwtfnzbs - - {elseif {$result.source} == orlydb} - - ORLYDB - - {elseif {$result.source} == predbme} - - PreDB - - {elseif {$result.source} == prelist} - - Prelist - - {elseif {$result.source} == "#Pre@zenet"} - - Zenet IRC - - {elseif {$result.source} == "#pre@corrupt"} - - Corrupt-Net - - {elseif {$result.source} == srrdb} - - srrDB - - {elseif {$result.source} == "#scnzb"} - - srrDB - - {elseif {$result.source} == "#tvnzb"} - - srrDB - - {elseif {$result.source} == "usenet-crawler"} - - Usenet-Crawler - - {elseif {$result.source} == womble} - - Womble - - {elseif {$result.source} == zenet} - - ZEnet - - {else} - {$result.source} - {/if} - - {if is_numeric({$result.requestid}) && {$result.requestid} != 0} - +
+
+
+
+
+
+
+ + + + + + + + + + + + + {foreach from=$results item=result} + + + + + + - - - - - - {/foreach} -
Date Title Category Source Reqid Size Files
+ {$result.predate|date_format:"%Y-%m-%d %H:%M:%S"} + + {if isset($result.guid)} + + 1}NUKED: {$result.nukereason|escape:"htmlall"}{else}{$result.title|escape:"htmlall"}{/if}">{$result.title|escape:"htmlall"} + + {else} + 1}NUKED: {$result.nukereason|escape:"htmlall"}{else}{$result.title|escape:"htmlall"}{/if}">{$result.title|escape:"htmlall"} + {/if} + + {* Console *} + {* Xbox 360 *} + {if {$result.category} == 'XBOX360'} + Console + Xbox + 360 + {* Movies *} + {elseif in_array({$result.category}, array('Movies'))} + Movies + {* SD *} + {elseif in_array({$result.category}, array('movies-sd', 'Movies: STD', 'XVid'))} + Movies + SD + {* HD *} + {elseif in_array({$result.category}, array('Movies: HD', 'X264'))} + Movies + HD + {* BluRay *} + {elseif in_array({$result.category}, array('BLURAY'))} + Movies + BluRay + {* DVD *} + {elseif in_array({$result.category}, array('DVDR', 'Movies: DVD'))} + DVD + {* Audio *} + {elseif in_array({$result.category}, array('music-audio'))} + Audio + {* MP3 *} + {elseif in_array({$result.category}, array('MP3', 'Music: MP3'))} + MP3 + {* Video *} + {elseif in_array({$result.category}, array('MVid', 'Music: MVid'))} + Music + Videos + {* Audiobook *} + {elseif in_array({$result.category}, array('audiobook', 'Audiobook'))} + Audiobook + {* Lossless *} + {elseif in_array({$result.category}, array('FLAC', 'Music: FLAC'))} + Lossless + Music + {* PC *} + {* 0day *} + {elseif in_array({$result.category}, array('0DAY', 'APPS', 'Apps: PC', 'Apps: Linux', 'DOX'))} + PC + 0DAY + {* Mac *} + {elseif in_array({$result.category}, array('Apps: MAC', 'Games: MAC'))} + PC + Mac + {* Phone-Other *} + {elseif in_array({$result.category}, array('Apps: Phone', 'PDA'))} + Phone + Other + {* Games *} + {elseif in_array({$result.category}, array('GAMES', 'Games: PC', 'Games: Other'))} + PC + Games + {* TV *} + {elseif in_array({$result.category}, array('TV'))} + TV + {* SD *} + {elseif in_array({$result.category}, array('TV-DVDRIP', 'tv-sd', 'TV: STD', 'TV-XVid'))} + SDTV + {* HD *} + {elseif in_array({$result.category}, array('tv-hd', 'TV: HD', 'TV-x264', 'TV-X264'))} + HDTV + {* XXX *} + {elseif in_array({$result.category}, array('XXX'))} + XXX + {* DVD *} + {elseif in_array({$result.category}, array('XXX: DVD'))} + XXX + DVD + {* XviD *} + {elseif in_array({$result.category}, array('XXX: SD-CLIPS', 'XXX: MOVIES-SD'))} + XXX + SD + {* x264 *} + {elseif in_array({$result.category}, array('XXX: HD-CLIPS', 'XXX: MOVIES-HD'))} + XXX + HD + {* Other *} + {elseif in_array({$result.category}, array('xxx-videos'))} + XXX + Other + {* Imageset *} + {elseif in_array({$result.category}, array('XXX-IMGSET'))} + XXX + Imagesets + {* Books *} + {elseif in_array({$result.category}, array('EBOOK'))} + Ebooks + {* Other *} + {elseif in_array({$result.category}, array('Other: E-Books'))} + Ebooks + Other + {elseif in_array({$result.category}, array('', 'PRE'))} + N/A + {else} + {$result.category} + {/if} + + {if {$result.source} == abgx} + + abgx.net + + {elseif in_array({$result.source}, array('abErotica', 'abMooVee', 'abTeeVee', 'abForeign'))} + + {$result.source} + + {elseif $result.source|strpos:'#a.b.' !== false} + + {$result.source} + + {elseif {$result.source} == omgwtfnzbs} + + omgwtfnzbs + + {elseif {$result.source} == orlydb} + + ORLYDB + + {elseif {$result.source} == predbme} + + PreDB + + {elseif {$result.source} == prelist} + + Prelist + + {elseif {$result.source} == "#Pre@zenet"} + + Zenet IRC + + {elseif {$result.source} == "#pre@corrupt"} + + Corrupt-Net + + {elseif {$result.source} == srrdb} + + srrDB + + {elseif {$result.source} == "#scnzb"} + + srrDB + + {elseif {$result.source} == "#tvnzb"} + + srrDB + + {elseif {$result.source} == "usenet-crawler"} + + Usenet-Crawler + + {elseif {$result.source} == womble} + + Womble + + {elseif {$result.source} == zenet} + + ZEnet + + {else} + {$result.source} + {/if} + + {if is_numeric({$result.requestid}) && {$result.requestid} != 0} + - {$result.requestid} - - {else} - N/A - {/if} - - {if not in_array({$result.size}, array('NULL', '', '0MB'))} - {if strpos($result.size, 'MB') != false && {$result.size|regex_replace:"/(\.\d|,|MB)+/":''|count_characters} > 3} - {math equation=($result.size|regex_replace:'/(\.\d|,|MB)+/':'' / 1024)|round}GB - {else} - {$result.size|regex_replace:"/(\.\d|,)+/":''} - {/if} - {else} - N/A - {/if} - - {if isset($result.files)} - {$result.files} - {else} - N/A - {/if} - - - -   - - - - -   - -
- + > + {$result.requestid} + + {else} + N/A + {/if} +
+ {if not in_array({$result.size}, array('NULL', '', '0MB'))} + {if strpos($result.size, 'MB') != false && {$result.size|regex_replace:"/(\.\d|,|MB)+/":''|count_characters} > 3} + {math equation=($result.size|regex_replace:'/(\.\d|,|MB)+/':'' / 1024)|round}GB + {else} + {$result.size|regex_replace:"/(\.\d|,)+/":''} + {/if} + {else} + N/A + {/if} + + {if isset($result.files)} + {$result.files} + {else} + N/A + {/if} + + + +   + + + + +   + +
+ + + + + + + + +
+
{$pager} - \ No newline at end of file +
\ No newline at end of file diff --git a/www/templates/charisma/views/frontend/profile.tpl b/www/templates/charisma/views/frontend/profile.tpl index d003970d6..9419e5574 100644 --- a/www/templates/charisma/views/frontend/profile.tpl +++ b/www/templates/charisma/views/frontend/profile.tpl @@ -27,7 +27,7 @@ - +
General @@ -67,7 +67,7 @@
- +
API & diff --git a/www/templates/charisma/views/frontend/profileedit.tpl b/www/templates/charisma/views/frontend/profileedit.tpl index 29e9d9bf5..68d8f4c8c 100644 --- a/www/templates/charisma/views/frontend/profileedit.tpl +++ b/www/templates/charisma/views/frontend/profileedit.tpl @@ -19,7 +19,7 @@
{$error}
{/if}
- +
@@ -70,7 +70,7 @@
- +
Excluded @@ -84,7 +84,7 @@
- +
UI @@ -156,7 +156,7 @@ function.
{if $page->settings->getSetting('sabintegrationtype') != 1} - +
Queue @@ -175,7 +175,7 @@
{/if} {if $user.queuetype == 1 && $page->settings->getSetting('sabintegrationtype') == 2} - +
SABnzbd @@ -234,7 +234,7 @@
{/if} {if $user.queuetype == 2 && ($page->settings->getSetting('sabintegrationtype') == 0 || $page->settings->getSetting('sabintegrationtype') == 2)} - +
NZBget @@ -269,7 +269,7 @@
{/if} - +
NZB @@ -300,9 +300,34 @@
- - - + + + + + + + + + + + + +
Couchpotato +
API / URL +
+ + / + +
+
{if $page->settings->getSetting('userselstyle') == 1} {html_options id="style" name='style' values=$themelist output=$themelist selected=$user.style} {/if} diff --git a/www/templates/charisma/views/frontend/search.tpl b/www/templates/charisma/views/frontend/search.tpl index 1c3d0ce82..9ff59c6cb 100644 --- a/www/templates/charisma/views/frontend/search.tpl +++ b/www/templates/charisma/views/frontend/search.tpl @@ -24,20 +24,20 @@
-
-
-
- -
-
- - - -
+ +
+
+
- -
+
+ + + +
+
+ +
@@ -168,60 +168,60 @@ {$pager}
- +
name
- Sort Descending + Sort Descending - Sort Ascending + Sort Ascending 		category
- Sort Descending + Sort Descending - Sort Ascending + Sort Ascending 		posted
- Sort Descending + Sort Descending - Sort Ascending + Sort Ascending 		size
- Sort Descending + Sort Descending - Sort Ascending + Sort Ascending 		files
- Sort Descending + Sort Descending - Sort Ascending + Sort Ascending 		stats
- Sort Descending + Sort Descending - Sort Ascending + Sort Ascending 		@@ -251,11 +251,11 @@
{release_flag($result.searchname, browse)} {if $result.passwordstatus == 1} - RAR/ZIP Possibly Passworded. + RAR/ZIP Possibly Passworded. {elseif $result.passwordstatus == 2} - RAR/ZIP Possibly Damaged. + RAR/ZIP Possibly Damaged. {elseif $result.passwordstatus == 10} - RAR/ZIP is Passworded. + RAR/ZIP is Passworded. {/if} {if $result.videostatus > 0} {$result.totalpart} {if $result.rarinnerfilecount > 0}
- {$result.guid} + {$result.guid}
{/if} diff --git a/www/templates/charisma/views/frontend/upcoming.tpl b/www/templates/charisma/views/frontend/upcoming.tpl index ff427d3b1..01434b90c 100644 --- a/www/templates/charisma/views/frontend/upcoming.tpl +++ b/www/templates/charisma/views/frontend/upcoming.tpl @@ -23,7 +23,7 @@ {$site->adbrowse} {if isset($data) && $data|@count > 0} - +
{foreach $data as $result}
@@ -65,7 +65,7 @@
{/if} - {if isset ($ourmovies) && $ourmovies[$result->alternate_ids->imdb] != ""} + {if isset($ourmovies) && $ourmovies[$result->alternate_ids->imdb] != ""} Download {else} diff --git a/www/templates/charisma/views/frontend/viewanime.tpl b/www/templates/charisma/views/frontend/viewanime.tpl index 722191ecb..5922a1e0b 100644 --- a/www/templates/charisma/views/frontend/viewanime.tpl +++ b/www/templates/charisma/views/frontend/viewanime.tpl @@ -90,7 +90,7 @@
- {foreach $animeEpisodeTitles as $animeEpno => $animeEpisodeTitle} @@ -147,19 +147,19 @@ {if isset($sabintegrated)} Send to my Sabnzbd + src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/sabup.png"> {/if} {if $weHasVortex} Send to my NZBVortex + src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/vortex/bigsmile.png"> {/if} {if isset($nzbgetintegrated)}Send to NZBget + src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/nzbgetup.png"> {/if} {if isset($isadmin)}
@@ -175,8 +175,4 @@ {/foreach} {/foreach}
- -
-
- - \ No newline at end of file + \ No newline at end of file diff --git a/www/templates/charisma/views/frontend/viewanimelist.tpl b/www/templates/charisma/views/frontend/viewanimelist.tpl index f538363b1..1b87ddffb 100644 --- a/www/templates/charisma/views/frontend/viewanimelist.tpl +++ b/www/templates/charisma/views/frontend/viewanimelist.tpl @@ -23,7 +23,7 @@ {$site->adbrowse} {if $animelist|@count > 0} - +
{foreach $animelist as $aletter => $anime}
diff --git a/www/templates/charisma/views/frontend/viewfilelist.tpl b/www/templates/charisma/views/frontend/viewfilelist.tpl index 71a90de36..3474af3c9 100644 --- a/www/templates/charisma/views/frontend/viewfilelist.tpl +++ b/www/templates/charisma/views/frontend/viewfilelist.tpl @@ -4,7 +4,7 @@ {$rel.searchname|escape:'htmlall'} - +
@@ -19,7 +19,7 @@ - {assign var="icon" value='templates/charisma/images/fileicons/'|cat:$file.ext|cat:".png"} + {assign var="icon" value='templates/omicron/images/fileicons/'|cat:$file.ext|cat:".png"} {if $file.ext == "" || !is_file("$icon")} {assign var="icon" value='file'} {else} @@ -33,7 +33,7 @@ {/if} + src="{$smarty.const.WWW_TOP}/templates/omicron/images/fileicons/{$icon}.png"/> diff --git a/www/templates/charisma/views/frontend/viewmoviefull.tpl b/www/templates/charisma/views/frontend/viewmoviefull.tpl index 0fe31a88e..35fd55d6d 100644 --- a/www/templates/charisma/views/frontend/viewmoviefull.tpl +++ b/www/templates/charisma/views/frontend/viewmoviefull.tpl @@ -11,216 +11,235 @@ {if $results|@count > 0} - {foreach from=$results item=result} -
- {if $result.cover == 1} - {$result.title|escape: - {else} - {$result.title|escape: - {/if} - {$result.title|escape:"htmlall"} ({$result.year})View on IMDB -

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

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

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

- {/if} -
- {if $result.plot != ''} -
Plot
-
{$result.plot|escape:"htmlall"}
+
+ {foreach from=$results item=result} +
+ {if $result.cover == 1} + {$result.title|escape: + {else} + {$result.title|escape: {/if} - {if $result.rating != ''} -
Rating
-
{$result.rating} - /10 {if $result.ratingcount != ''}({$result.ratingcount|number_format} votes)
{/if} + {$result.title|escape:"htmlall"} ({$result.year})View on IMDB +

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

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

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

{/if} - {if $result.director != ''} -
Director
-
{$result.director|replace:"|":", "}
- {/if} - {if $result.actors != ''} -
Actors
-
{$result.actors|replace:"|":", "}
- {/if} -
-
- -
-
- {if $section != ''}View: - Covers - | - List -
- {/if} - With Selected: -
- - - {if isset($sabintegrated)} - +
+ {if $result.plot != ''} +
Plot
+
{$result.plot|escape:"htmlall"}
{/if} -
- - {if isset($isadmin)} -
- Admin: -
- - -
-
- {/if} + {if $result.rating != ''} +
Rating
+
{$result.rating} + /10 {if $result.ratingcount != ''}({$result.ratingcount|number_format} votes)
{/if} + {/if} + {if $result.director != ''} +
Director
+
{$result.director|replace:"|":", "}
+ {/if} + {if $result.actors != ''} +
Actors
+
{$result.actors|replace:"|":", "}
+ {/if} +
-
-
-
-
-
-
#{$smarty.foreach.iteration.index+1} {$file.title|escape:'htmlall'}{$file.ext} {if $completion < 100}{$completion} %{else}{$completion}%{/if} {if $file.size < 100000}{$file.size|fsize_format:"KB"}{else}{$file.size|fsize_format:"MB"}{/if}
- - + +
+
+ {if $section != ''}View: + Covers + | + List +
+ {/if} + With Selected: +
+ + + {if isset($sabintegrated)} + + {/if} +
-
+ {if isset($isadmin)} +
+ Admin: +
+ + +
+
+ {/if} + + +
+
+
+
+
- - - Name
- - - - - - -
+ + - + - + - - - + - {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="mcat" value=","|explode:$result.grp_release_categoryid} - {assign var="mcatname" value=","|explode:$result.grp_release_categoryName} - {foreach from=$msplits item=m} - - - + + + + {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="mcat" value=","|explode:$result.grp_release_categoryid} + {assign var="mcatname" value=","|explode:$result.grp_release_categoryName} + {foreach from=$msplits item=m} + + + - - - - - - {/foreach} + {if $mnfo[$m@index] > 0}NFO + {/if} + {if $mpass[$m@index] == 2} + + {elseif $mpass[$m@index] == 1} + + {/if} + + + + + + + {/foreach} -
+ + + Category
- - - - - - - 		Name
+ + + + + + + 		Posted
- - - - - - - 		Category
+ + + + + + + 		Size
- - - - - - - 		Action
Posted
+ + + + + + +
- {$mname[$m@index]|escape:"htmlall"|replace:".":" "} -
+ 		Size
+ + + + + + + 		Action
+ {$mname[$m@index]|escape:"htmlall"|replace:".":" "} +
{$mgrabs[$m@index]} grab{if $mgrabs[$m@index] != 1}s{/if} - {if $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]|fsize_format:"MB"} - - - {if isset($sabintegrated)}{/if} -
{$mcatname[$m@index]} + {$mpostdate[$m@index]|timeago}{$msize[$m@index]|fsize_format:"MB"} + + + {if isset($sabintegrated)}{/if} +
-
- {$pager} - {if $results|@count > 10} -
-
- {if $section != ''}View: - Covers - | - List -
- {/if} - With Selected: -
- - - {if isset($sabintegrated)} - - {/if} -
+
+
- {if isset($isadmin)} -
- Admin: -
- - -
-
- {/if} - - - - - {/if} - {/foreach} - -{/if} - - - - - - \ No newline at end of file + {if $results|@count > 10} +
+
+
+ {if isset($section) && $section != ''}View: + Covers + | + List +
+ {/if} + With Selected: +
+ + + {if isset($sabintegrated)} + + {/if} + {if isset($nzbgetintegrated)} + + {/if} + {if isset($isadmin)} + + + {/if} +
+
+
+
+ {$pager} +
+
+ {/if} + + + + {/foreach} + +{/if} \ No newline at end of file diff --git a/www/templates/charisma/views/frontend/viewnzb.tpl b/www/templates/charisma/views/frontend/viewnzb.tpl index a0e2ac3e2..055f1c2c5 100644 --- a/www/templates/charisma/views/frontend/viewnzb.tpl +++ b/www/templates/charisma/views/frontend/viewnzb.tpl @@ -238,7 +238,7 @@
- +
{if $movie && $release.rageid < 0} @@ -572,7 +572,7 @@
{if $comments|@count > 0} -
+
@@ -625,7 +625,8 @@ {/if} {if $reVideo.releaseid|@count > 0 || $reAudio|@count > 0}
-
User Comment
+
@@ -670,7 +671,8 @@ - + {/if} {if $reVideo.videoaspect != ""} @@ -779,7 +781,6 @@ -
Property
Width x Height{$reVideo.videowidth}x{$reVideo.videoheight}{$reVideo.videowidth} + x{$reVideo.videoheight}
+
diff --git a/www/templates/charisma/views/frontend/viewseries.tpl b/www/templates/charisma/views/frontend/viewseries.tpl index 4fcccd2d1..4953c1499 100644 --- a/www/templates/charisma/views/frontend/viewseries.tpl +++ b/www/templates/charisma/views/frontend/viewseries.tpl @@ -50,200 +50,210 @@

-
-
- {if $rage|@count == 1 && $isadmin} - Update - From Tv Rage - {/if} - View - in Tv Rage +
+ {if $rage|@count == 1 && $isadmin} RSS - for TV Show -
-
+ href="{$smarty.const.WWW_TOP}/admin/rage-edit.php?id={$r.id}&action=update&from={$smarty.server.REQUEST_URI|escape:"url"}">Update + From Tv Rage + {/if} + View + in Tv Rage + RSS + for TV Show +
- +
-
-
- With Selected: -
- - - {if isset($sabintegrated)} - - {/if} -
+
+
+ With Selected: +
+ + + {if isset($sabintegrated)} + + {/if} +
- {if isset($isadmin)} -
- Admin: -
- - -
-
- {/if} -
-
- My Shows : -
- {if $myshows.id != ''} - Edit - Remove - {else} - Add - {/if} -
-
-
- -
- - - -
-
-
-
-
-
    - {foreach $seasons as $seasonnum => $season name="seas"} -
  • {$seasonnum}
    • - {/foreach} -
- -
- {foreach $seasons as $seasonnum => $season name=tv} -
-
Date Directory
- - - - - - - - - - - - {foreach $season as $episodes} - {foreach $episodes as $result} - - {if $result@total>1 && $result@index == 0} - - {else if $result@total == 1} - - {/if} - - - - - - - - - {/foreach} - {/foreach} -
EpNameCategoryPostedSizeAction
-

{$episodes@key}

{$episodes@key}

 - {$result.searchname|escape:"htmlall"|replace:".":" "} - -
- {if $result.nfoid > 0} - NFO{/if} - {if $result.haspreview == 1 && $userdata.canpreview == 1} - Preview{/if} - {$result.grabs} - Grab{if $result.grabs != 1}s{/if} - {if $result.tvairdate != ""} - Aired {if $result.tvairdate|strtotime > $smarty.now}in future{else}{$result.tvairdate|daysago}{/if}{/if} - {if $result.reid > 0}Media{/if} -
- 		- {$result.category_name} - {$result.postdate|timeago} - {$result.size|fsize_format:"MB"} - - - - - {if isset($sabintegrated)} - - Send to my Sabnzbd - - {/if} - {if $weHasVortex} - - Send to my NZBVortex - - {/if} - {if isset($nzbgetintegrated)}Send to NZBget - {/if} - {if isset($isadmin)} -
- Edit - Delete - {/if} -
+ {if isset($isadmin)} +
+ Admin: +
+ +
- {/foreach} +
+ {/if} + +
+ My Shows : +
+ {if $myshows.id != ''} + Edit + Remove + {else} + Add + {/if}
- -{/if} - - - - \ No newline at end of file + + +
+ + + +
+
+
+
+
+
    + {foreach $seasons as $seasonnum => $season name="seas"} +
  • {$seasonnum}
    • + {/foreach} +
+ +
+ {foreach $seasons as $seasonnum => $season name=tv} +
+ + + + + + + + + + + + + {foreach $season as $episodes} + {foreach $episodes as $result} + + {if $result@total>1 && $result@index == 0} + + {else if $result@total == 1} + + {/if} + + + + + + + + + {/foreach} + {/foreach} +
EpNameCategoryPostedSizeAction
+

{$episodes@key}

{$episodes@key}

 + {$result.searchname|escape:"htmlall"|replace:".":" "} + +
+ {if $result.nfoid > 0} + NFO + {/if} + {if $result.haspreview == 1 && $userdata.canpreview == 1} + Preview{/if} + {$result.grabs} + Grab{if $result.grabs != 1}s{/if} + {if $result.tvairdate != ""} + Aired {if $result.tvairdate|strtotime > $smarty.now}in future{else}{$result.tvairdate|daysago}{/if}{/if} + {if $result.reid > 0}Media{/if} +
+ 		+ {$result.category_name} + {$result.postdate|timeago} + {$result.size|fsize_format:"MB"} + + + + + {if isset($sabintegrated)} + + Send to my Sabnzbd + + {/if} + {if $weHasVortex} + + Send to my NZBVortex + + {/if} + {if isset($nzbgetintegrated)}Send to NZBget + {/if} + {if isset($isadmin)} +
+ Edit + Delete + {/if} +
+
+ {/foreach} +
+
+ +{/if} \ No newline at end of file diff --git a/www/templates/charisma/views/frontend/viewserieslist.tpl b/www/templates/charisma/views/frontend/viewserieslist.tpl index fba0734df..33021b136 100644 --- a/www/templates/charisma/views/frontend/viewserieslist.tpl +++ b/www/templates/charisma/views/frontend/viewserieslist.tpl @@ -25,7 +25,7 @@ {if $serieslist|@count > 0} - +
{foreach $serieslist as $sletter => $series}
diff --git a/www/templates/omicron/views/frontend/browse.tpl b/www/templates/omicron/views/frontend/browse.tpl index cfe83e773..cbeea1d66 100644 --- a/www/templates/omicron/views/frontend/browse.tpl +++ b/www/templates/omicron/views/frontend/browse.tpl @@ -74,7 +74,7 @@
- diff --git a/www/templates/omicron/views/frontend/browsegroup.tpl b/www/templates/omicron/views/frontend/browsegroup.tpl index 0dd535037..8c448569d 100644 --- a/www/templates/omicron/views/frontend/browsegroup.tpl +++ b/www/templates/omicron/views/frontend/browsegroup.tpl @@ -17,7 +17,7 @@
-
diff --git a/www/templates/omicron/views/frontend/cart.tpl b/www/templates/omicron/views/frontend/cart.tpl index eb8a13864..ab35a445d 100644 --- a/www/templates/omicron/views/frontend/cart.tpl +++ b/www/templates/omicron/views/frontend/cart.tpl @@ -35,7 +35,7 @@
-
+
diff --git a/www/templates/omicron/views/frontend/mymovielist.tpl b/www/templates/omicron/views/frontend/mymovielist.tpl index 22bfde06e..4c32dc414 100644 --- a/www/templates/omicron/views/frontend/mymovielist.tpl +++ b/www/templates/omicron/views/frontend/mymovielist.tpl @@ -1,5 +1,5 @@ {if $data|@count > 0} -
+
diff --git a/www/templates/omicron/views/frontend/mymoviesedit.tpl b/www/templates/omicron/views/frontend/mymoviesedit.tpl index dbb315a83..8a7190934 100644 --- a/www/templates/omicron/views/frontend/mymoviesedit.tpl +++ b/www/templates/omicron/views/frontend/mymoviesedit.tpl @@ -22,7 +22,7 @@

{if $movies|@count > 0} -
Name
+
diff --git a/www/templates/omicron/views/frontend/myshows.tpl b/www/templates/omicron/views/frontend/myshows.tpl index f45bea930..ffb7cc2ee 100644 --- a/www/templates/omicron/views/frontend/myshows.tpl +++ b/www/templates/omicron/views/frontend/myshows.tpl @@ -10,7 +10,6 @@ -
View all series @@ -20,53 +19,54 @@ href="{$smarty.const.WWW_TOP}/rss?t=-3&dl=1&i={$userdata.id}&r={$userdata.rsstoken}">RSS Feed for My Shows
-
-
+
{if $shows|@count > 0} -
-
-
-
-
- - - - - - +
+
+
+
+
+
NameCategoryAddedOptions
+ + + + + + - {foreach from=$shows item=show} - - - - - - - {/foreach} + {foreach from=$shows item=show} + + + + + + + {/foreach} -
NameCategoryAddedOptions
- {$show.releasetitle|escape:"htmlall"|wordwrap:75:"\n":true} - - {if $show.categoryNames != ''}{$show.categoryNames|escape:"htmlall"}{else}All{/if} - {$show.createddate|date_format} -
- Edit - Remove -
-
+ {$show.releasetitle|escape:"htmlall"|wordwrap:75:"\n":true} + + {if $show.categoryNames != ''}{$show.categoryNames|escape:"htmlall"}{else}All{/if} + {$show.createddate|date_format} +
+ Edit + Remove +
+
- - {else} -
- Sorry! No shows bookmarked yet! +
+
- {/if}
- \ No newline at end of file +{else} +
+ Sorry! No shows bookmarked yet! +
+{/if} diff --git a/www/templates/omicron/views/frontend/prehash.tpl b/www/templates/omicron/views/frontend/prehash.tpl index e4b01b86a..859e020e5 100644 --- a/www/templates/omicron/views/frontend/prehash.tpl +++ b/www/templates/omicron/views/frontend/prehash.tpl @@ -9,285 +9,338 @@ value="{$lastSearch|escape:'html'}"> {$pager} - - - - - - - - - - - - - {foreach from=$results item=result} - - - - - - + + + + + + {/foreach} +
DateTitleCategorySourceReqidSizeFiles
- {$result.predate|date_format:"%Y-%m-%d %H:%M:%S"} - - {if isset($result.guid)} - - 1}NUKED: {$result.nukereason|escape:"htmlall"}{else}{$result.title|escape:"htmlall"}{/if}">{$result.title|escape:"htmlall"} - - {else} - 1}NUKED: {$result.nukereason|escape:"htmlall"}{else}{$result.title|escape:"htmlall"}{/if}">{$result.title|escape:"htmlall"} - {/if} - - {* Console *} - {* Xbox 360 *} - {if {$result.category} == 'XBOX360'} - Console - Xbox - 360 - {* Movies *} - {elseif in_array({$result.category}, array('Movies'))} - Movies - {* SD *} - {elseif in_array({$result.category}, array('movies-sd', 'Movies: STD', 'XVid'))} - Movies - SD - {* HD *} - {elseif in_array({$result.category}, array('Movies: HD', 'X264'))} - Movies - HD - {* BluRay *} - {elseif in_array({$result.category}, array('BLURAY'))} - Movies - BluRay - {* DVD *} - {elseif in_array({$result.category}, array('DVDR', 'Movies: DVD'))} - DVD - {* Audio *} - {elseif in_array({$result.category}, array('music-audio'))} - Audio - {* MP3 *} - {elseif in_array({$result.category}, array('MP3', 'Music: MP3'))} - MP3 - {* Video *} - {elseif in_array({$result.category}, array('MVid', 'Music: MVid'))} - Music - Videos - {* Audiobook *} - {elseif in_array({$result.category}, array('audiobook', 'Audiobook'))} - Audiobook - {* Lossless *} - {elseif in_array({$result.category}, array('FLAC', 'Music: FLAC'))} - Lossless - Music - {* PC *} - {* 0day *} - {elseif in_array({$result.category}, array('0DAY', 'APPS', 'Apps: PC', 'Apps: Linux', 'DOX'))} - PC - 0DAY - {* Mac *} - {elseif in_array({$result.category}, array('Apps: MAC', 'Games: MAC'))} - PC - Mac - {* Phone-Other *} - {elseif in_array({$result.category}, array('Apps: Phone', 'PDA'))} - Phone - Other - {* Games *} - {elseif in_array({$result.category}, array('GAMES', 'Games: PC', 'Games: Other'))} - PC - Games - {* TV *} - {elseif in_array({$result.category}, array('TV'))} - TV - {* SD *} - {elseif in_array({$result.category}, array('TV-DVDRIP', 'tv-sd', 'TV: STD', 'TV-XVid'))} - SDTV - {* HD *} - {elseif in_array({$result.category}, array('tv-hd', 'TV: HD', 'TV-x264', 'TV-X264'))} - HDTV - {* XXX *} - {elseif in_array({$result.category}, array('XXX'))} - XXX - {* DVD *} - {elseif in_array({$result.category}, array('XXX: DVD'))} - XXX - DVD - {* XviD *} - {elseif in_array({$result.category}, array('XXX: SD-CLIPS', 'XXX: MOVIES-SD'))} - XXX - SD - {* x264 *} - {elseif in_array({$result.category}, array('XXX: HD-CLIPS', 'XXX: MOVIES-HD'))} - XXX - HD - {* Other *} - {elseif in_array({$result.category}, array('xxx-videos'))} - XXX - Other - {* Imageset *} - {elseif in_array({$result.category}, array('XXX-IMGSET'))} - XXX - Imagesets - {* Books *} - {elseif in_array({$result.category}, array('EBOOK'))} - Ebooks - {* Other *} - {elseif in_array({$result.category}, array('Other: E-Books'))} - Ebooks - Other - {elseif in_array({$result.category}, array('', 'PRE'))} - N/A - {else} - {$result.category} - {/if} - - {if {$result.source} == abgx} - - abgx.net - - {elseif in_array({$result.source}, array('abErotica', 'abMooVee', 'abTeeVee', 'abForeign'))} - - {$result.source} - - {elseif $result.source|strpos:'#a.b.' !== false} - - {$result.source} - - {elseif {$result.source} == omgwtfnzbs} - - omgwtfnzbs - - {elseif {$result.source} == orlydb} - - ORLYDB - - {elseif {$result.source} == predbme} - - PreDB - - {elseif {$result.source} == prelist} - - Prelist - - {elseif {$result.source} == "#Pre@zenet"} - - Zenet IRC - - {elseif {$result.source} == "#pre@corrupt"} - - Corrupt-Net - - {elseif {$result.source} == srrdb} - - srrDB - - {elseif {$result.source} == "#scnzb"} - - srrDB - - {elseif {$result.source} == "#tvnzb"} - - srrDB - - {elseif {$result.source} == "usenet-crawler"} - - Usenet-Crawler - - {elseif {$result.source} == womble} - - Womble - - {elseif {$result.source} == zenet} - - ZEnet - - {else} - {$result.source} - {/if} - - {if is_numeric({$result.requestid}) && {$result.requestid} != 0} - +
+
+
+
+
+
+
+ + + + + + + + + + + + + {foreach from=$results item=result} + + + + + + - - - - - - {/foreach} -
Date Title Category Source Reqid Size Files
+ {$result.predate|date_format:"%Y-%m-%d %H:%M:%S"} + + {if isset($result.guid)} + + 1}NUKED: {$result.nukereason|escape:"htmlall"}{else}{$result.title|escape:"htmlall"}{/if}">{$result.title|escape:"htmlall"} + + {else} + 1}NUKED: {$result.nukereason|escape:"htmlall"}{else}{$result.title|escape:"htmlall"}{/if}">{$result.title|escape:"htmlall"} + {/if} + + {* Console *} + {* Xbox 360 *} + {if {$result.category} == 'XBOX360'} + Console + Xbox + 360 + {* Movies *} + {elseif in_array({$result.category}, array('Movies'))} + Movies + {* SD *} + {elseif in_array({$result.category}, array('movies-sd', 'Movies: STD', 'XVid'))} + Movies + SD + {* HD *} + {elseif in_array({$result.category}, array('Movies: HD', 'X264'))} + Movies + HD + {* BluRay *} + {elseif in_array({$result.category}, array('BLURAY'))} + Movies + BluRay + {* DVD *} + {elseif in_array({$result.category}, array('DVDR', 'Movies: DVD'))} + DVD + {* Audio *} + {elseif in_array({$result.category}, array('music-audio'))} + Audio + {* MP3 *} + {elseif in_array({$result.category}, array('MP3', 'Music: MP3'))} + MP3 + {* Video *} + {elseif in_array({$result.category}, array('MVid', 'Music: MVid'))} + Music + Videos + {* Audiobook *} + {elseif in_array({$result.category}, array('audiobook', 'Audiobook'))} + Audiobook + {* Lossless *} + {elseif in_array({$result.category}, array('FLAC', 'Music: FLAC'))} + Lossless + Music + {* PC *} + {* 0day *} + {elseif in_array({$result.category}, array('0DAY', 'APPS', 'Apps: PC', 'Apps: Linux', 'DOX'))} + PC + 0DAY + {* Mac *} + {elseif in_array({$result.category}, array('Apps: MAC', 'Games: MAC'))} + PC + Mac + {* Phone-Other *} + {elseif in_array({$result.category}, array('Apps: Phone', 'PDA'))} + Phone + Other + {* Games *} + {elseif in_array({$result.category}, array('GAMES', 'Games: PC', 'Games: Other'))} + PC + Games + {* TV *} + {elseif in_array({$result.category}, array('TV'))} + TV + {* SD *} + {elseif in_array({$result.category}, array('TV-DVDRIP', 'tv-sd', 'TV: STD', 'TV-XVid'))} + SDTV + {* HD *} + {elseif in_array({$result.category}, array('tv-hd', 'TV: HD', 'TV-x264', 'TV-X264'))} + HDTV + {* XXX *} + {elseif in_array({$result.category}, array('XXX'))} + XXX + {* DVD *} + {elseif in_array({$result.category}, array('XXX: DVD'))} + XXX + DVD + {* XviD *} + {elseif in_array({$result.category}, array('XXX: SD-CLIPS', 'XXX: MOVIES-SD'))} + XXX + SD + {* x264 *} + {elseif in_array({$result.category}, array('XXX: HD-CLIPS', 'XXX: MOVIES-HD'))} + XXX + HD + {* Other *} + {elseif in_array({$result.category}, array('xxx-videos'))} + XXX + Other + {* Imageset *} + {elseif in_array({$result.category}, array('XXX-IMGSET'))} + XXX + Imagesets + {* Books *} + {elseif in_array({$result.category}, array('EBOOK'))} + Ebooks + {* Other *} + {elseif in_array({$result.category}, array('Other: E-Books'))} + Ebooks + Other + {elseif in_array({$result.category}, array('', 'PRE'))} + N/A + {else} + {$result.category} + {/if} + + {if {$result.source} == abgx} + + abgx.net + + {elseif in_array({$result.source}, array('abErotica', 'abMooVee', 'abTeeVee', 'abForeign'))} + + {$result.source} + + {elseif $result.source|strpos:'#a.b.' !== false} + + {$result.source} + + {elseif {$result.source} == omgwtfnzbs} + + omgwtfnzbs + + {elseif {$result.source} == orlydb} + + ORLYDB + + {elseif {$result.source} == predbme} + + PreDB + + {elseif {$result.source} == prelist} + + Prelist + + {elseif {$result.source} == "#Pre@zenet"} + + Zenet IRC + + {elseif {$result.source} == "#pre@corrupt"} + + Corrupt-Net + + {elseif {$result.source} == srrdb} + + srrDB + + {elseif {$result.source} == "#scnzb"} + + srrDB + + {elseif {$result.source} == "#tvnzb"} + + srrDB + + {elseif {$result.source} == "usenet-crawler"} + + Usenet-Crawler + + {elseif {$result.source} == womble} + + Womble + + {elseif {$result.source} == zenet} + + ZEnet + + {else} + {$result.source} + {/if} + + {if is_numeric({$result.requestid}) && {$result.requestid} != 0} + - {$result.requestid} - - {else} - N/A - {/if} - - {if not in_array({$result.size}, array('NULL', '', '0MB'))} - {if strpos($result.size, 'MB') != false && {$result.size|regex_replace:"/(\.\d|,|MB)+/":''|count_characters} > 3} - {math equation=($result.size|regex_replace:'/(\.\d|,|MB)+/':'' / 1024)|round}GB - {else} - {$result.size|regex_replace:"/(\.\d|,)+/":''} - {/if} - {else} - N/A - {/if} - - {if isset($result.files)} - {$result.files} - {else} - N/A - {/if} - - - -   - - - - -   - -
- + > + {$result.requestid} + + {else} + N/A + {/if} +
+ {if not in_array({$result.size}, array('NULL', '', '0MB'))} + {if strpos($result.size, 'MB') != false && {$result.size|regex_replace:"/(\.\d|,|MB)+/":''|count_characters} > 3} + {math equation=($result.size|regex_replace:'/(\.\d|,|MB)+/':'' / 1024)|round}GB + {else} + {$result.size|regex_replace:"/(\.\d|,)+/":''} + {/if} + {else} + N/A + {/if} + + {if isset($result.files)} + {$result.files} + {else} + N/A + {/if} + + + +   + + + + +   + +
+ + + + + + + + +
+
{$pager} - \ No newline at end of file +
\ No newline at end of file diff --git a/www/templates/omicron/views/frontend/profile.tpl b/www/templates/omicron/views/frontend/profile.tpl index d003970d6..9419e5574 100644 --- a/www/templates/omicron/views/frontend/profile.tpl +++ b/www/templates/omicron/views/frontend/profile.tpl @@ -27,7 +27,7 @@
- +
General @@ -67,7 +67,7 @@
- +
API & diff --git a/www/templates/omicron/views/frontend/profileedit.tpl b/www/templates/omicron/views/frontend/profileedit.tpl index f229e58be..68d8f4c8c 100644 --- a/www/templates/omicron/views/frontend/profileedit.tpl +++ b/www/templates/omicron/views/frontend/profileedit.tpl @@ -31,7 +31,7 @@
- +
@@ -70,7 +70,7 @@
- +
Excluded @@ -84,7 +84,7 @@
- +
UI @@ -156,7 +156,7 @@ function.
{if $page->settings->getSetting('sabintegrationtype') != 1} - +
Queue @@ -175,7 +175,7 @@
{/if} {if $user.queuetype == 1 && $page->settings->getSetting('sabintegrationtype') == 2} - +
SABnzbd @@ -234,7 +234,7 @@
{/if} {if $user.queuetype == 2 && ($page->settings->getSetting('sabintegrationtype') == 0 || $page->settings->getSetting('sabintegrationtype') == 2)} - +
NZBget @@ -269,7 +269,7 @@
{/if} - +
NZB @@ -300,7 +300,7 @@
- +
Couchpotato diff --git a/www/templates/omicron/views/frontend/search.tpl b/www/templates/omicron/views/frontend/search.tpl index 4b3300071..9ff59c6cb 100644 --- a/www/templates/omicron/views/frontend/search.tpl +++ b/www/templates/omicron/views/frontend/search.tpl @@ -168,7 +168,7 @@ {$pager} - +
diff --git a/www/templates/omicron/views/frontend/upcoming.tpl b/www/templates/omicron/views/frontend/upcoming.tpl index be6e0137b..01434b90c 100644 --- a/www/templates/omicron/views/frontend/upcoming.tpl +++ b/www/templates/omicron/views/frontend/upcoming.tpl @@ -23,7 +23,7 @@ {$site->adbrowse} {if isset($data) && $data|@count > 0} - +
{foreach $data as $result}
diff --git a/www/templates/omicron/views/frontend/viewanime.tpl b/www/templates/omicron/views/frontend/viewanime.tpl index a7d47a088..5922a1e0b 100644 --- a/www/templates/omicron/views/frontend/viewanime.tpl +++ b/www/templates/omicron/views/frontend/viewanime.tpl @@ -90,7 +90,7 @@
- {foreach $animeEpisodeTitles as $animeEpno => $animeEpisodeTitle} @@ -175,8 +175,4 @@ {/foreach} {/foreach}
- -
-
- - \ No newline at end of file + \ No newline at end of file diff --git a/www/templates/omicron/views/frontend/viewanimelist.tpl b/www/templates/omicron/views/frontend/viewanimelist.tpl index f538363b1..1b87ddffb 100644 --- a/www/templates/omicron/views/frontend/viewanimelist.tpl +++ b/www/templates/omicron/views/frontend/viewanimelist.tpl @@ -23,7 +23,7 @@ {$site->adbrowse} {if $animelist|@count > 0} - +
{foreach $animelist as $aletter => $anime}
diff --git a/www/templates/omicron/views/frontend/viewfilelist.tpl b/www/templates/omicron/views/frontend/viewfilelist.tpl index e6322227d..3474af3c9 100644 --- a/www/templates/omicron/views/frontend/viewfilelist.tpl +++ b/www/templates/omicron/views/frontend/viewfilelist.tpl @@ -4,7 +4,7 @@ {$rel.searchname|escape:'htmlall'} - +
diff --git a/www/templates/omicron/views/frontend/viewmoviefull.tpl b/www/templates/omicron/views/frontend/viewmoviefull.tpl index a8ddd05b8..35fd55d6d 100644 --- a/www/templates/omicron/views/frontend/viewmoviefull.tpl +++ b/www/templates/omicron/views/frontend/viewmoviefull.tpl @@ -11,216 +11,235 @@ {if $results|@count > 0} - {foreach from=$results item=result} -
- {if $result.cover == 1} - {$result.title|escape: - {else} - {$result.title|escape: - {/if} - {$result.title|escape:"htmlall"} ({$result.year})View on IMDB -

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

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

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

- {/if} -
- {if $result.plot != ''} -
Plot
-
{$result.plot|escape:"htmlall"}
+
+ {foreach from=$results item=result} +
+ {if $result.cover == 1} + {$result.title|escape: + {else} + {$result.title|escape: {/if} - {if $result.rating != ''} -
Rating
-
{$result.rating} - /10 {if $result.ratingcount != ''}({$result.ratingcount|number_format} votes)
{/if} + {$result.title|escape:"htmlall"} ({$result.year})View on IMDB +

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

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

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

{/if} - {if $result.director != ''} -
Director
-
{$result.director|replace:"|":", "}
- {/if} - {if $result.actors != ''} -
Actors
-
{$result.actors|replace:"|":", "}
- {/if} -
-
- -
-
- {if $section != ''}View: - Covers - | - List -
- {/if} - With Selected: -
- - - {if isset($sabintegrated)} - +
+ {if $result.plot != ''} +
Plot
+
{$result.plot|escape:"htmlall"}
{/if} -
- - {if isset($isadmin)} -
- Admin: -
- - -
-
- {/if} + {if $result.rating != ''} +
Rating
+
{$result.rating} + /10 {if $result.ratingcount != ''}({$result.ratingcount|number_format} votes)
{/if} + {/if} + {if $result.director != ''} +
Director
+
{$result.director|replace:"|":", "}
+ {/if} + {if $result.actors != ''} +
Actors
+
{$result.actors|replace:"|":", "}
+ {/if} +
-
-
-
-
-
-
#
- - + +
+
+ {if $section != ''}View: + Covers + | + List +
+ {/if} + With Selected: +
+ + + {if isset($sabintegrated)} + + {/if} +
-
+ {if isset($isadmin)} +
+ Admin: +
+ + +
+
+ {/if} + + +
+
+
+
+
- - - Name
- - - - - - -
+ + - + - + - - - + - {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="mcat" value=","|explode:$result.grp_release_categoryid} - {assign var="mcatname" value=","|explode:$result.grp_release_categoryName} - {foreach from=$msplits item=m} - - - + + + + {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="mcat" value=","|explode:$result.grp_release_categoryid} + {assign var="mcatname" value=","|explode:$result.grp_release_categoryName} + {foreach from=$msplits item=m} + + + - - - - - - {/foreach} + {if $mnfo[$m@index] > 0}NFO + {/if} + {if $mpass[$m@index] == 2} + + {elseif $mpass[$m@index] == 1} + + {/if} + + + + + + + {/foreach} -
+ + + Category
- - - - - - - 		Name
+ + + + + + + 		Posted
- - - - - - - 		Category
+ + + + + + + 		Size
- - - - - - - 		Action
Posted
+ + + + + + +
- {$mname[$m@index]|escape:"htmlall"|replace:".":" "} -
+ 		Size
+ + + + + + + 		Action
+ {$mname[$m@index]|escape:"htmlall"|replace:".":" "} +
{$mgrabs[$m@index]} grab{if $mgrabs[$m@index] != 1}s{/if} - {if $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]|fsize_format:"MB"} - - - {if isset($sabintegrated)}{/if} -
{$mcatname[$m@index]} + {$mpostdate[$m@index]|timeago}{$msize[$m@index]|fsize_format:"MB"} + + + {if isset($sabintegrated)}{/if} +
-
- {$pager} - {if $results|@count > 10} -
-
- {if $section != ''}View: - Covers - | - List -
- {/if} - With Selected: -
- - - {if isset($sabintegrated)} - - {/if} -
+
+
- {if isset($isadmin)} -
- Admin: -
- - -
-
- {/if} - - - - - {/if} - {/foreach} - -{/if} - - - - - - \ No newline at end of file + {if $results|@count > 10} +
+
+
+ {if isset($section) && $section != ''}View: + Covers + | + List +
+ {/if} + With Selected: +
+ + + {if isset($sabintegrated)} + + {/if} + {if isset($nzbgetintegrated)} + + {/if} + {if isset($isadmin)} + + + {/if} +
+
+
+
+ {$pager} +
+
+ {/if} + + + + {/foreach} + +{/if} \ No newline at end of file diff --git a/www/templates/omicron/views/frontend/viewnzb.tpl b/www/templates/omicron/views/frontend/viewnzb.tpl index c95a74238..055f1c2c5 100644 --- a/www/templates/omicron/views/frontend/viewnzb.tpl +++ b/www/templates/omicron/views/frontend/viewnzb.tpl @@ -238,7 +238,7 @@
- +
{if $movie && $release.rageid < 0} @@ -572,7 +572,7 @@
{if $comments|@count > 0} -
+
@@ -626,7 +626,7 @@ {if $reVideo.releaseid|@count > 0 || $reAudio|@count > 0}
User Comment
+ class="data table table-condensed table-striped table-responsive table-hover"> diff --git a/www/templates/omicron/views/frontend/viewprelist.tpl b/www/templates/omicron/views/frontend/viewprelist.tpl index 5a8d1b0fd..6dc7b8611 100644 --- a/www/templates/omicron/views/frontend/viewprelist.tpl +++ b/www/templates/omicron/views/frontend/viewprelist.tpl @@ -16,7 +16,7 @@ {$pager} -
Property
+
diff --git a/www/templates/omicron/views/frontend/viewseries.tpl b/www/templates/omicron/views/frontend/viewseries.tpl index 0c3ff9869..4953c1499 100644 --- a/www/templates/omicron/views/frontend/viewseries.tpl +++ b/www/templates/omicron/views/frontend/viewseries.tpl @@ -135,7 +135,7 @@ {foreach $seasons as $seasonnum => $season name=tv}
-
Date Directory
diff --git a/www/templates/omicron/views/frontend/viewserieslist.tpl b/www/templates/omicron/views/frontend/viewserieslist.tpl index fba0734df..33021b136 100644 --- a/www/templates/omicron/views/frontend/viewserieslist.tpl +++ b/www/templates/omicron/views/frontend/viewserieslist.tpl @@ -25,7 +25,7 @@ {if $serieslist|@count > 0} -
+
{foreach $serieslist as $sletter => $series}