From ef6bf0a7d412c7a33c7ec54f017392c25ae4cd92 Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Thu, 17 May 2018 23:30:48 +0200
Subject: [PATCH] Partialy fix series view

---
 Changelog                                     |  1 +
 app/Http/Controllers/SeriesController.php     | 13 +++--
 .../views/themes/Charisma/viewseries.tpl      | 52 +++++++++---------
 resources/views/themes/Gentele/viewseries.tpl | 54 +++++++++----------
 resources/views/themes/Omicron/viewseries.tpl |  6 +--
 5 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/Changelog b/Changelog
index 2875c5e66..e6649d4e7 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2018-05-17 DariusIII
+	* Fix: Partialy fix series view
 	* Chg: Update laravel/tinker to version 1.0.7
 	* Fix: Fix XXX_WEBDL category check
 	* Fix: Fix adding releases to download basket
diff --git a/app/Http/Controllers/SeriesController.php b/app/Http/Controllers/SeriesController.php
index fead46d3f..1d416e5d2 100644
--- a/app/Http/Controllers/SeriesController.php
+++ b/app/Http/Controllers/SeriesController.php
@@ -6,7 +6,6 @@ use App\Models\Video;
 use Blacklight\Releases;
 use App\Models\UserSerie;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 
 class SeriesController extends BasePageController
 {
@@ -46,13 +45,13 @@ class SeriesController extends BasePageController
             } elseif (! $rel) {
                 $this->smarty->assign('nodata', 'No releases for this series.');
             } else {
-                $myshows = UserSerie::getShow(Auth::id(), $show['id']);
-
-                $sorted = array_sort(array_sort($rel)['data']);
+                $myshows = UserSerie::getShow($this->userdata->id, $show['id']);
 
                 $series = [];
-                foreach ($sorted as $r) {
-                    $series[$r['series']][$r['episode']][] = $r;
+                foreach ($rel as $r) {
+                    if (! empty($r->id)) {
+                        $series[$r->series][$r->episode][] = $r;
+                    }
                 }
 
                 $this->smarty->assign('seasons', $series);
@@ -107,7 +106,7 @@ class SeriesController extends BasePageController
                 $letter = '';
             }
 
-            $masterserieslist = Video::getSeriesList(Auth::id(), $letter, $showname);
+            $masterserieslist = Video::getSeriesList($this->userdata->id, $letter, $showname);
 
             $title = 'Series List';
             $meta_title = 'View Series List';
diff --git a/resources/views/themes/Charisma/viewseries.tpl b/resources/views/themes/Charisma/viewseries.tpl
index 558364e19..b5eed2ef5 100755
--- a/resources/views/themes/Charisma/viewseries.tpl
+++ b/resources/views/themes/Charisma/viewseries.tpl
@@ -123,16 +123,16 @@
 					<div class="panel-body pagination2">
 						<div class="tabbable">
 							<ul class="nav nav-tabs">
-								{foreach $seasons as $seasonnum => $season name = "seas"}
-									<li {if $smarty.foreach.seas.first}class="active"{/if}><a
+								{foreach $seasons as $seasonnum => $season}
+									<li {if $season@first}class="active"{/if}><a
 												title="View Season {$seasonnum}" href="#{$seasonnum}"
 												data-toggle="tab">{$seasonnum}</a></li>
 								{/foreach}
 							</ul>
 							<div class="tab-content">
-								{foreach $seasons as $seasonnum => $season name = "tv"}
+								{foreach $seasons as $seasonnum => $season}
 									{if empty($seasonnum)}{$seasonnum = 'Packs'}{/if}
-									<div class="tab-pane{if $smarty.foreach.tv.first} active{/if} fade in"
+									<div class="tab-pane{if $season@first} active{/if} fade in"
 										 id="{$seasonnum}">
 										<table class="tb_{$seasonnum} data table table-condensed table-bordered table-responsive table-hover"
 											   id="browsetable">
@@ -155,7 +155,7 @@
 											{foreach $season as $episodes}
 												{foreach $episodes as $result}
 													<tr class="{cycle values=",alt"}"
-														id="guid{$result.guid}">
+														id="guid{$result->guid}">
 														{if $result@total>1 && $result@index == 0}
 															<td rowspan="{$result@total}" width="30">
 																<h4>{$episodes@key}</h4></td>
@@ -164,48 +164,48 @@
 														{/if}
 														<td>
 															<a title="View details"
-															   href="{$smarty.const.WWW_TOP}/details/{$result.guid}">{$result.searchname|escape:"htmlall"|replace:".":" "}</a>
+															   href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$result->searchname|escape:"htmlall"|replace:".":" "}</a>
 
 															<div>
-																{if $result.nfoid > 0}<span
+																{if $result->nfoid > 0}<span
 																		class="label label-default">
-																	<a href="{$smarty.const.WWW_TOP}/nfo/{$result.guid}"
+																	<a href="{$smarty.const.WWW_TOP}/nfo/{$result->guid}"
 																	   class="text-muted">NFO</a>
 																	</span>{/if}
-																{if $result.image == 1 && $userdata.canpreview == 1}
+																{if $result->image == 1 && $userdata.canpreview == 1}
 																<a
-																		href="{$smarty.const.WWW_TOP}/covers/preview/{$result.guid}_thumb.jpg"
-																		name="name{$result.guid}"
+																		href="{$smarty.const.WWW_TOP}/covers/preview/{$result->guid}_thumb.jpg"
+																		name="name{$result->guid}"
 																		title="View Screenshot"
 																		class="modal_prev label label-default"
 																		rel="preview">Preview</a>{/if}
-																<span class="label label-default">{$result.grabs}
-																	Grab{if $result.grabs != 1}s{/if}</span>
-																{if $result.firstaired != ""}<span
+																<span class="label label-default">{$result->grabs}
+																	Grab{if $result->grabs != 1}s{/if}</span>
+																{if $result->firstaired != ""}<span
 																	class="label label-success"
-																	title="{$result.title} Aired on {$result.firstaired|date_format}">
-																	Aired {if $result.firstaired|strtotime > $smarty.now}in future{else}{$result.firstaired|daysago}{/if}</span>{/if}
-																{if $result.reid > 0}<span
+																	title="{$result->title} Aired on {$result->firstaired|date_format}">
+																	Aired {if $result->firstaired|strtotime > $smarty.now}in future{else}{$result->firstaired|daysago}{/if}</span>{/if}
+																{if $result->reid > 0}<span
 																	class="mediainfo label label-default"
-																	title="{$result.guid}">Media</span>{/if}
+																	title="{$result->guid}">Media</span>{/if}
 															</div>
 														</td>
 														<td class="check" width="10"><input
-																	id="chk{$result.guid|substr:0:7}"
+																	id="chk{$result->guid|substr:0:7}"
 																	type="checkbox"
 																	class="square" name="{$seasonnum}"
-																	value="{$result.guid}"/></td>
+																	value="{$result->guid}"/></td>
 														<td>
-															<span class="label label-default">{$result.category_name}</span>
+															<span class="label label-default">{$result->category_name}</span>
 														</td>
 														<td width="40"
-															title="{$result.postdate}">{$result.postdate|timeago}</td>
+															title="{$result->postdate}">{$result->postdate|timeago}</td>
 														<td>
-															{$result.size|filesize}
+															{$result->size|filesize}
 														</td>
 														<td class="icons" style='width:100px;'>
 															<a title="Download Nzb"
-															   href="{$smarty.const.WWW_TOP}/getnzb?id={$result.guid}"><i
+															   href="{$smarty.const.WWW_TOP}/getnzb?id={$result->guid}"><i
 																		class="zmdi zmdi-cloud-download text-muted"></i></a>
 															<a class="zmdi zmdi-shopping-basket icon_cart text-muted"
 															   href="#"
@@ -220,10 +220,10 @@
 															{if isset($isadmin)}
 																<br/>
 																<a class="label label-warning"
-																   href="{$smarty.const.WWW_TOP}/admin/release-edit?id={$result.id}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}"
+																   href="{$smarty.const.WWW_TOP}/admin/release-edit?id={$result->id}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}"
 																   title="Edit Release">Edit</a>
 																<a class="label label-danger"
-																   href="{$smarty.const.WWW_TOP}/admin/release-delete/{$result.id}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}"
+																   href="{$smarty.const.WWW_TOP}/admin/release-delete/{$result->id}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}"
 																   title="Delete Release">Delete</a>
 															{/if}
 														</td>
diff --git a/resources/views/themes/Gentele/viewseries.tpl b/resources/views/themes/Gentele/viewseries.tpl
index 4c3a0a69b..15af46f3f 100755
--- a/resources/views/themes/Gentele/viewseries.tpl
+++ b/resources/views/themes/Gentele/viewseries.tpl
@@ -136,16 +136,16 @@
 						<div class="panel-body pagination2">
 							<div class="tabbable">
 								<ul class="nav nav-tabs">
-									{foreach $seasons as $seasonnum => $season name = "seas"}
-										<li {if $smarty.foreach.seas.first}class="active"{/if}><a
+									{foreach $seasons as $seasonnum => $season}
+										<li {if $season@first}class="active"{/if}><a
 													title="View Season {$seasonnum}" href="#{$seasonnum}"
 													data-toggle="tab">{$seasonnum}</a></li>
 									{/foreach}
 								</ul>
 								<div class="tab-content">
-									{foreach $seasons as $seasonnum => $season name = "tv"}
+									{foreach $seasons as $seasonnum => $season}
 										{if empty($seasonnum)}{$seasonnum = 'Packs'}{/if}
-										<div class="tab-pane{if $smarty.foreach.tv.first} active{/if} fade in"
+										<div class="tab-pane{if $season@first} active{/if} fade in"
 											 id="{$seasonnum}">
 											<table class="tb_{$seasonnum} data table table-striped responsive-utilities jambo-table"
 												   id="browsetable">
@@ -164,7 +164,7 @@
 												{foreach $season as $episodes}
 													{foreach $episodes as $result}
 														<tr class="{cycle values=",alt"}"
-															id="guid{$result.guid}">
+															id="guid{$result->guid}">
 															{if $result@total>1 && $result@index == 0}
 																<td rowspan="{$result@total}" width="30">
 																	<h4>{$episodes@key}</h4></td>
@@ -173,66 +173,66 @@
 															{/if}
 															<td>
 																<a title="View details"
-																   href="{$smarty.const.WWW_TOP}/details/{$result.guid}">{$result.searchname|escape:"htmlall"|replace:".":" "}</a>
+																   href="{$smarty.const.WWW_TOP}/details/{$result->guid}">{$result->searchname|escape:"htmlall"|replace:".":" "}</a>
 
 																<div>
-																	{if $result.nfoid > 0}<span>
-																		<a href="{$smarty.const.WWW_TOP}/nfo/{$result.guid}"
+																	{if $result->nfoid > 0}<span>
+																		<a href="{$smarty.const.WWW_TOP}/nfo/{$result->guid}"
 																		   class="modal_nfo label label-primary text-muted">NFO</a>
 																		</span>{/if}
-																	{if $result.image == 1 && $userdata.canpreview == 1}
+																	{if $result->image == 1 && $userdata.canpreview == 1}
 																	<a
-																			href="{$smarty.const.WWW_TOP}/covers/preview/{$result.guid}_thumb.jpg"
-																			name="name{$result.guid}"
+																			href="{$smarty.const.WWW_TOP}/covers/preview/{$result->guid}_thumb.jpg"
+																			name="name{$result->guid}"
 																			data-fancybox
 																			title="View Screenshot"
 																			class="label label-primary"
 																			rel="preview">Preview</a>{/if}
-																	<span class="label label-primary">{$result.grabs}
-																		Grab{if $result.grabs != 1}s{/if}</span>
-																	{if $result.firstaired != ""}<span
+																	<span class="label label-primary">{$result->grabs}
+																		Grab{if $result->grabs != 1}s{/if}</span>
+																	{if $result->firstaired != ""}<span
 																		class="label label-success"
-																		title="{$result.title} Aired on {$result.firstaired|date_format}">
-																		Aired {if $result.firstaired|strtotime > $smarty.now}in future{else}{$result.firstaired|daysago}{/if}</span>{/if}
-																	{if $result.reid > 0}<span
+																		title="{$result->title} Aired on {$result->firstaired|date_format}">
+																		Aired {if $result->firstaired|strtotime > $smarty.now}in future{else}{$result->firstaired|daysago}{/if}</span>{/if}
+																	{if $result->reid > 0}<span
 																		class="mediainfo label label-primary"
-																		title="{$result.guid}">Media</span>{/if}
+																		title="{$result->guid}">Media</span>{/if}
 																</div>
 															</td>
 															<td width="10"><input
-																		id="guid{$result.guid}"
+																		id="guid{$result->guid}"
 																		type="checkbox"
 																		class="flat" name="table_data{$seasonnum}"
-																		value="{$result.guid}"/></td>
+																		value="{$result->guid}"/></td>
 															<td>
-																<span class="label label-primary">{$result.category_name}</span>
+																<span class="label label-primary">{$result->category_name}</span>
 															</td>
 															<td width="40"
-																title="{$result.postdate}">{$result.postdate|timeago}</td>
+																title="{$result->postdate}">{$result->postdate|timeago}</td>
 															<td>
-																{$result.size|filesize}
+																{$result->size|filesize}
 															</td>
 															<td>
-																<a href="{$smarty.const.WWW_TOP}/getnzb?id={$result.guid}"
+																<a href="{$smarty.const.WWW_TOP}/getnzb?id={$result->guid}"
 																   class="icon_nzb text-muted"><i
 																			class="fa fa-cloud-download text-muted"
 																			data-toggle="tooltip" data-placement="top"
 																			title
 																			data-original-title="Download NZB"></i></a>
-																<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments"><i
+																<a href="{$smarty.const.WWW_TOP}/details/{$result->guid}/#comments"><i
 																			class="fa fa-comments-o text-muted"
 																			data-toggle="tooltip" data-placement="top"
 																			title
 																			data-original-title="Comments"></i></a>
 																<a href="#"><i
-																			id="guid{$result.guid}"
+																			id="guid{$result->guid}"
 																			class="icon_cart text-muted fa fa-shopping-basket"
 																			data-toggle="tooltip"
 																			data-placement="top" title
 																			data-original-title="Send to my download basket"></i></a>
 																{if isset($sabintegrated) && $sabintegrated !=""}
 																	<a href="#">
-																		<i id="guid{$result.guid}"
+																		<i id="guid{$result->guid}"
 																		   class="icon_sab text-muted fa fa-share"
 																		   data-toggle="tooltip"
 																		   data-placement="top" title
diff --git a/resources/views/themes/Omicron/viewseries.tpl b/resources/views/themes/Omicron/viewseries.tpl
index ee2b39ff8..2fe4b5625 100755
--- a/resources/views/themes/Omicron/viewseries.tpl
+++ b/resources/views/themes/Omicron/viewseries.tpl
@@ -123,8 +123,8 @@
 					<div class="panel-body pagination2">
 						<div class="tabbable">
 							<ul class="nav nav-tabs">
-								{foreach $seasons as $seasonnum => $season name = "seas"}
-									<li {if $smarty.foreach.seas.first}class="active"{/if}><a
+								{foreach $seasons as $seasonnum => $season}
+									<li {if $season@first}class="active"{/if}><a
 												title="View Season {$seasonnum}" href="#{$seasonnum}"
 												data-toggle="tab">{$seasonnum}</a></li>
 								{/foreach}
@@ -132,7 +132,7 @@
 							<div class="tab-content">
 								{foreach $seasons as $seasonnum => $season name = "tv"}
 									{if empty($seasonnum)}{$seasonnum = 'Packs'}{/if}
-									<div class="tab-pane{if $smarty.foreach.tv.first} active{/if} fade in"
+									<div class="tab-pane{if $season@first} active{/if} fade in"
 										 id="{$seasonnum}">
 										<table class="tb_{$seasonnum} data table table-condensed table-bordered table-responsive table-hover"
 											   id="browsetable">