Update Gentele for latest changes in NNTmux

NNTmux · May 31, 2018 · a28dfdd · a28dfdd
1 parent 72be40c
commit a28dfdd
Show file tree

Hide file tree

Showing 32 changed files with 136 additions and 143 deletions.
diff --git a/basepage.tpl b/basepage.tpl
@@ -235,9 +235,8 @@
     });
 </script>
 
-<form id="frm-logout" action="{{route('logout')}}" method="post" style="display: none;">
-	{{csrf_field()}}
-</form>
+{{Form::open(['id' => 'frm-logout', 'route' => 'logout'])}}
+{{Form::close()}}
 
 </body>
 

diff --git a/books.tpl b/books.tpl
@@ -11,7 +11,7 @@
 <div class="well well-sm">
 	{include file='search-filter.tpl'}
 </div>
-<form id="nzb_multi_operations_form" action="get">
+{{Form::open(['id' => 'nzb_multi_operations_form', 'method' => 'get'])}}
 	<div class="row">
 		<div class="col-md-12">
 			<div class="row">
@@ -183,7 +183,7 @@
 							{/foreach}
 							<div class="row">
 								<div class="col-md-8">
-									<form id="nzb_multi_operations_form" action="get">
+									{{Form::open(['id' => 'nzb_multi_operations_form', 'method' => 'get'])}}
 										<div class="nzb_multi_operations">
 											View: <strong>Covers</strong> | <a
 													href="{$smarty.const.WWW_TOP}/browse/Books/{$categorytitle}">List</a><br/>
@@ -228,4 +228,4 @@
 			</div>
 		</div>
 	</div>
-</form>
+{{Form::close()}}
diff --git a/browse.tpl b/browse.tpl
@@ -3,15 +3,15 @@
 		<ol class="breadcrumb">
 			<li><a href="{$smarty.const.WWW_TOP}{$site->home_link}">Home</a></li>
 			/
-			<a href="{$smarty.const.WWW_TOP}/browse/{if ($parentcat == 'music')}Audio{else}{$parentcat}{/if}">{$parentcat}</a>
-			/ {if ($catname != '' && $catname != 'All')} <a
+			<a href="{$smarty.const.WWW_TOP}/{if preg_match('/^alt\.binaries|a\.b|dk\./i', $parentcat)}browse/group?g={else}browse/{/if}{if ($parentcat == 'music')}Audio{else}{$parentcat}{/if}">{$parentcat}</a>
+			/ {if ($catname != '' && $catname != 'all')} <a
 				href="{$smarty.const.WWW_TOP}/browse/{$parentcat}/{$catname}">{$catname}</a>{/if}
 		</ol>
 	</div>
 </div>
 {$site->adbrowse}
 {if $results|@count > 0}
-	<form id="nzb_multi_operations_form" action="get">
+	{{Form::open(['id' => 'nzb_multi_operations_form', 'method' => 'get'])}}
 		<div class="box-body">
 			<div class="row">
 				<div class="col-md-12 col-xs-12">
@@ -240,5 +240,5 @@
 				</div>
 			</div>
 		</div>
-	</form>
+	{{Form::close()}}
 {/if}
diff --git a/browsegroup.tpl b/browsegroup.tpl
@@ -15,6 +15,9 @@
 				<div class="col-lg-12 portlets">
 					<div class="panel panel-default">
 						<div class="panel-body pagination2">
+                            <div class="col-md-4">
+                                {$results->links()}
+                            </div>
 							<table class="data table table-striped responsive-utilities jambo-table Sortable"
 								   style="table-layout: auto;" data-sort-order="desc">
 								<thead>
@@ -37,6 +40,9 @@
 								{/foreach}
 								</tbody>
 							</table>
+                            <div class="col-md-4">
+                                {$results->links()}
+                            </div>
 						</div>
 					</div>
 				</div>

diff --git a/btc_payment.tpl b/btc_payment.tpl
@@ -10,21 +10,20 @@
 	</div>
 	<table class="data table table-condensed responsive-utilities jambo-table">
 		{foreach $donation as $donate}
-			<form method="post" action="btc_payment?action=submit">
-                {{csrf_field()}}
+            {{Form::open(['url' => 'btc_payment?action=submit'])}}
 				<thead>
 				<tr>
 					<th>{$donate->name} ({$donate->donation}$)</th>
 				</tr>
 				</thead>
 				<td>
-					<input type="hidden" name="price" value="{$donate->donation}">
-					<input type="hidden" name="role" value="{$donate->id}">
-					<input type="hidden" name="rolename" value="{$donate->name}">
-					<input type="hidden" name="addyears" value="{$donate->addyears}">
-					<input type="submit" class="btn btn-primary" value="Pay with BTC">
+                    {{Form::hidden('price', {$donate->donation})}}
+                    {{Form::hidden('role', {$donate->id})}}
+                    {{Form::hidden('rolename', {$donate->name})}}
+                    {{Form::hidden('addyears', {$donate->addyears})}}
+                    {{Form::submit('Pay with BTC', ['class' => 'btn btn-primary'])}}
 				</td>
-			</form>
+			{{Form::close()}}
 		{/foreach}
 	</table>
 </div>
diff --git a/cart.tpl b/cart.tpl
@@ -15,7 +15,7 @@
 			feed</a>. Some NZB downloaders can read this feed and automatically start downloading.
 	</div>
 	{if $results|@count > 0}
-		<form id="nzb_multi_operations_form" action="get">
+		{{Form::open(['id' => 'nzb_multi_operations_form', 'method' => 'get'])}}
 			{{csrf_field()}}
 			<div class="nzb_multi_operations">
 				<small>With Selected:</small>
@@ -29,7 +29,7 @@
 						   value="Download"/>
 				</div>
 			</div>
-		</form>
+		{{Form::close()}}
 		<div class="row">
 			<div class="col-lg-12 portlets">
 				<div class="panel panel-default">

diff --git a/console.tpl b/console.tpl
@@ -12,7 +12,7 @@
 <div class="well well-sm">
 	{include file='search-filter.tpl'}
 </div>
-<form id="nzb_multi_operations_form" action="get">
+{{Form::open(['id' => 'nzb_multi_operations_form', 'method' => 'get'])}}
 	<div class="box-body">
 		<div class="row">
 			<div class="col-lg-12 col-sm-12 col-xs-12">
@@ -57,7 +57,7 @@
 			</div>
 		</div>
 	</div>
-</form>
+{{Form::close()}}
 <div class="box-body">
 	<div class="row">
 		<div class="col-lg-12 col-sm-12 col-xs-12">
@@ -197,7 +197,7 @@
 		</div>
 	</div>
 </div>
-<form id="nzb_multi_operations_form" action="get">
+{{Form::open(['id' => 'nzb_multi_operations_form', 'method' => 'get'])}}
 	<div class="box-body">
 		<div class="row">
 			<div class="col-lg-12 col-sm-12 col-xs-12">
@@ -242,4 +242,4 @@
 			</div>
 		</div>
 	</div>
-</form>
+{{Form::close()}}
diff --git a/contact.tpl b/contact.tpl
@@ -37,8 +37,7 @@
 										</div>
 										<div class="row m-b-30">
 											<div class="col-sm-6">
-												<form method="POST" action="{$smarty.const.WWW_TOP}contact-us">
-													{{csrf_field()}}
+												{{Form::open(['url' => 'contact-us'])}}
 													<div class="row">
 														<div class="col-sm-6">
 															<label for="username" class="h6">Name</label>
@@ -60,7 +59,7 @@
 													<button type="submit" class="btn btn-primary m-t-20">
 														Send message
 													</button>
-												</form>
+												{{Form::close()}}
 											</div>
 										</div>
 									</div>

diff --git a/forgottenpassword.tpl b/forgottenpassword.tpl
@@ -19,8 +19,7 @@
 				cannot remember your email, or no longer have access to it, please <a
 						href="{$smarty.const.WWW_TOP}/contact-us">contact
 					us</a>.</p>
-			<form action="forgottenpassword?action=submit" method="post">
-				{{csrf_field()}}
+            {{Form::open(['url' => 'forgottenpassword?action=submit'])}}
 				<div class="form-group has-feedback">
 					<input autocomplete="off" id="email" name="email" value="{$email}" type="email" class="form-control"
 						   placeholder="Email"/>
@@ -43,7 +42,7 @@
 						<button type="submit" class="btn btn-primary btn-block btn-flat">Request Password Reset</button>
 					</div><!-- /.col -->
 				</div>
-			</form>
+			{{Form::close()}}
 			{elseif $sent != ''}
 			<p>
 				A password reset request has been sent to your email.
@@ -55,4 +54,4 @@
 			{/if}
 		</div>
 	</div>
-</div>
+</div>
diff --git a/forum.tpl b/forum.tpl
@@ -90,8 +90,7 @@
 			<h3 id="myLabel">Add New Post</h3>
 		</div>
 		<div class="body">
-			<form id="new-forum-thread" class="form-horizontal" action="" method="post">
-				{{csrf_field()}}
+            {{Form::open(['id' => 'new-forum-thread', 'class' => 'form-horizontal'])}}
 				<div class="control-group">
 					<label class="control-label" for="addSubject">Subject</label>
 					<div class="controls">
@@ -108,7 +107,7 @@
 					<input class="btn btn-warning" value="Cancel"
 						   onclick="if(confirm('Are you SURE you wish to cancel?')) history.back();"/>
 				</div>
-			</form>
+			{{Form::close()}}
 		</div>
 	</div>
 </div>
diff --git a/forumpost.tpl b/forumpost.tpl
@@ -56,7 +56,7 @@
 					<h3 id="myLabel">Reply</h3>
 				</div>
 				<div class="body">
-					<form id="forum-post-reply" class="form-horizontal" action="" method="post">
+                    {{Form::open(['id' => 'forum-post-reply', 'class' => 'form-horizontal'])}}
 						{{csrf_field()}}
 						<div class="control-group">
 							<label class="control-label" for="addMessage">Message</label>
@@ -67,7 +67,7 @@
 							<input class="btn btn-warning" value="Cancel"
 								   onclick="if(confirm('Are you SURE you wish to cancel?')) history.back();"/>
 						</div>
-					</form>
+					{{Form::close()}}
 				</div>
 			{else}
 				<label class="label label-warning" title="Topic Locked">Topic Locked</label>

diff --git a/games.tpl b/games.tpl
@@ -13,7 +13,7 @@
 <div class="well well-sm">
 	{include file='search-filter.tpl'}
 </div>
-<form id="nzb_multi_operations_form" action="get">
+{{Form::open(['id' => 'nzb_multi_operations_form', 'method' => 'get'])}}
 	<div class="box-body">
 		<div class="row">
 			<div class="col-lg-12 col-sm-12 col-xs-12">
@@ -58,7 +58,7 @@
 			</div>
 		</div>
 	</div>
-</form>
+{{Form::close()}}
 
 <div class="box-body">
 	<div class="row">
@@ -214,7 +214,7 @@
 		</div>
 	</div>
 </div>
-<form id="nzb_multi_operations_form" action="get">
+{{Form::open(['id' => 'nzb_multi_operations_form', 'method' => 'get'])}}
 	<div class="box-body">
 		<div class="row">
 			<div class="col-lg-12 col-sm-12 col-xs-12">
@@ -261,4 +261,4 @@
 				</div>
 			</div>
 		</div>
-</form>
+{{Form::close()}}
diff --git a/headermenu.tpl b/headermenu.tpl
@@ -12,7 +12,7 @@
 							<li><a href="{$smarty.const.WWW_TOP}/browse/{$parentcat.title}">TV</a></li>
 							<hr>
 							<li><a href="{$smarty.const.WWW_TOP}/series">TV Series</a></li>
-							<li><a href="{$smarty.const.WWW_TOP}/anime">Anime Series</a></li>
+							<li><a href="{$smarty.const.WWW_TOP}/animelist">Anime Series</a></li>
 							<hr>
 							{foreach $parentcat.subcatlist as $subcat}
 								<li><a href="{$smarty.const.WWW_TOP}/browse/TV/{$subcat.title}">{$subcat.title}</a></li>
@@ -230,8 +230,7 @@
 		{/if}
 		<ul class="nav navbar-left">
 			<li class="">
-				<form class="navbar-form" id="headsearch_form" action="{$smarty.const.WWW_TOP}/search"
-					  method="get">
+                {{Form::open(['id' => 'headsearch_form', 'class' => 'navbar-form', 'url' => 'search', 'method' => 'get'])}}
 					<select class="form-control" id="headcat" name="t">
 						<option class="grouping" value="-1">All</option>
 						{foreach $parentcatlist as $parentcat}
@@ -248,7 +247,7 @@
 						   placeholder="Search" type="text"/>
 					<button id="headsearch_go" type="submit" class="btn btn-success"><i class="fab fa-searchengin"></i>
 					</button>
-				</form>
+				{{Form::close()}}
 			</li>
 		</ul>
 

diff --git a/login.tpl b/login.tpl
@@ -11,8 +11,7 @@
 		</div><!-- /.login-logo -->
 		<div class="login-box-body">
 			<p class="login-box-msg">Please sign in to access the site</p>
-			<form action="login" method="post">
-				{{csrf_field()}}
+			{{Form::open(['url' => 'login'])}}
 				<div class="form-group has-feedback">
 					<input id="username" name="username" type="text" class="form-control"
 						   placeholder="Username or email"/>
@@ -40,7 +39,7 @@
 
 					</div><!-- /.col -->
 				</div>
-			</form>
+			{{Form::close()}}
 
 			<a href="{$smarty.const.WWW_TOP}/forgottenpassword" class="text-center">I forgot my password</a><br>
 			<a href="{$smarty.const.WWW_TOP}/register" class="text-center">Register a new membership</a>

diff --git a/movies.tpl b/movies.tpl
@@ -11,7 +11,7 @@
 <div class="well well-sm">
 	{include file='search-filter.tpl'}
 </div>
-<form id="nzb_multi_operations_form" action="get">
+{{Form::open(['id' => 'nzb_multi_operations_form', 'method' => 'get'])}}
 	<div class="box-body"
 	<div class="row">
 		<div class="col-lg-12 col-sm-12 col-xs-12">
@@ -395,4 +395,4 @@
 			</div>
 		</div>
 	</div>
-</form>
+{{Form::close()}}
diff --git a/music.tpl b/music.tpl
@@ -10,7 +10,7 @@
 <div class="well well-sm">
 	{include file='search-filter.tpl'}
 </div>
-<form id="nzb_multi_operations_form" action="get">
+{{Form::open(['id' => 'nzb_multi_operations_form', 'method' => 'get'])}}
 	<div class="box-body"
 	<div class="row">
 		<div class="col-lg-12 col-sm-12 col-xs-12">
@@ -220,4 +220,4 @@
 			</div>
 		</div>
 	</div>
-</form>
+{{Form::close()}}
diff --git a/mymovies-add.tpl b/mymovies-add.tpl
@@ -3,7 +3,7 @@
 		<h1>Add to category</h1>
 	</div>
 	<h3>{$type|ucwords} {$movie.title|escape:"htmlall"} in</h3>
-	<form class="form-horizontal" id="mymovies" action="{$smarty.const.WWW_TOP}/mymovies/do{$type}" method="post">
+    {{Form::open(['id' => 'mymovies', 'class' => 'form-horizontal', 'url' => "mymovies/do{$type}"])}}
 		<input type="hidden" name="subpage" value="{$imdbid}"/>
 		<div class="control-group">
 			<label class="control-label" for="category">Choose</label>
@@ -18,5 +18,5 @@
 				<input class="btn btn-success" type="submit" name="{$type}" value="{$type|ucwords}"/>
 			</div>
 		</div>
-	</form>
+	{{Form::close()}}
 </div>
diff --git a/myshows-add.tpl b/myshows-add.tpl
@@ -1,10 +1,10 @@
 <div class="row" style="background-color: white">
 	<h4>{$type|ucwords} {$show.title|escape:"htmlall"} in:</h4>
-	<form id="myshows" action="{$smarty.const.WWW_TOP}/myshows/do{$type}" method="post">
-		<input type="hidden" name="subpage" value="{$video}"/>
+	{{Form::open(['id' => 'myshows', 'class' => 'form-horizontal', 'url' => "myshows?action=do{$type}"])}}
+		<input type="hidden" name="id" value="{$video}"/>
 		{if isset($from)}<input type="hidden" name="from" value="{$from}" />{/if}
 		{html_checkboxes name='category' values=$cat_ids output=$cat_names selected=$cat_selected separator='<br />'}
 		<br/>
 		<input class="btn btn-primary" type="submit" name="{$type}" value="{$type|ucwords}"/>
-	</form>
+	{{Form::close()}}
 </div>