starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-31 10:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove login/register pages, use Login/Register controllers completely

Browse Source
This commit is contained in:
DariusIII
2018-03-29 10:22:36 +02:00
parent 5d61c66997
commit 005cfdaa8d
40 changed files with 177 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Blacklight/http/BasePage.php
+42 -97
View File
@@ -121,17 +121,16 @@ class BasePage
// Buffer settings/DB connection.
$this->settings = new Settings();
$this->pdo = new DB();
$this->smarty = new Smarty();
$this->smarty->setCompileDir(config('ytake-laravel-smarty.compile_path'));
$this->smarty->setConfigDir(array_get(config('ytake-laravel-smarty'), 'config_paths'));
$this->smarty->setCacheDir(config('ytake-laravel-smarty.cache_path'));
app('smarty.view')->setCompileDir(config('ytake-laravel-smarty.compile_path'));
app('smarty.view')->setConfigDir(array_get(config('ytake-laravel-smarty'), 'config_paths'));
app('smarty.view')->setCacheDir(config('ytake-laravel-smarty.cache_path'));
foreach (array_get(config('ytake-laravel-smarty'), 'plugins_paths', []) as $plugins) {
$this->smarty->addPluginsDir($plugins);
app('smarty.view')->addPluginsDir($plugins);
}
$this->smarty->error_reporting = E_ALL & ~E_NOTICE;
app('smarty.view')->error_reporting = E_ALL & ~E_NOTICE;
$this->smarty->assign('serverroot', url('/'));
app('smarty.view')->assign('serverroot', url('/'));
$this->page = request()->input('page') ?? 'content';
@@ -141,17 +140,17 @@ class BasePage
} else {
$this->theme = $this->getSettingValue('site.main.style');
$this->smarty->assign('isadmin', 'false');
$this->smarty->assign('ismod', 'false');
$this->smarty->assign('loggedin', 'false');
app('smarty.view')->assign('isadmin', 'false');
app('smarty.view')->assign('ismod', 'false');
app('smarty.view')->assign('loggedin', 'false');
}
if ($this->theme === 'None') {
$this->theme = Settings::settingValue('site.main.style');
}
$this->smarty->assign('theme', $this->theme);
$this->smarty->assign('site', $this->settings);
$this->smarty->assign('page', $this);
app('smarty.view')->assign('theme', $this->theme);
app('smarty.view')->assign('site', $this->settings);
app('smarty.view')->assign('page', $this);
}
/**
@@ -165,26 +164,6 @@ class BasePage
$this->show503();
}
/**
* Inject content into the html head.
*
* @param $headcontent
*/
public function addToHead($headcontent): void
{
$this->head = $this->head."\n".$headcontent;
}
/**
* Inject js/attributes into the html body tag.
*
* @param $attr
*/
public function addToBody($attr): void
{
$this->body = $this->body.' '.$attr;
}
/**
* @return bool
*/
@@ -277,7 +256,7 @@ class BasePage
public function render()
{
$this->smarty->display($this->page_template);
app('smarty.view')->display($this->page_template);
}
/**
@@ -303,73 +282,39 @@ class BasePage
User::updateSiteAccessed($this->userdata['id']);
}
$this->smarty->assign('userdata', $this->userdata);
$this->smarty->assign('loggedin', 'true');
app('smarty.view')->assign('userdata', $this->userdata);
app('smarty.view')->assign('loggedin', 'true');
if ($this->userdata['nzbvortex_api_key'] !== '' && $this->userdata['nzbvortex_server_url'] !== '') {
$this->smarty->assign('weHasVortex', true);
app('smarty.view')->assign('weHasVortex', true);
} else {
$this->smarty->assign('weHasVortex', false);
app('smarty.view')->assign('weHasVortex', false);
}
$sab = new SABnzbd($this);
$this->smarty->assign('sabintegrated', $sab->integratedBool);
app('smarty.view')->assign('sabintegrated', $sab->integratedBool);
if ($sab->integratedBool !== false && $sab->url !== '' && $sab->apikey !== '') {
$this->smarty->assign('sabapikeytype', $sab->apikeytype);
app('smarty.view')->assign('sabapikeytype', $sab->apikeytype);
}
switch ((int) $this->userdata['user_roles_id']) {
case User::ROLE_ADMIN:
$this->smarty->assign('isadmin', 'true');
app('smarty.view')->assign('isadmin', 'true');
break;
case User::ROLE_MODERATOR:
$this->smarty->assign('ismod', 'true');
app('smarty.view')->assign('ismod', 'true');
}
}
/**
* Allows to fetch a value from the settings table.
*
* This method is deprecated, as the column it uses to select the data is due to be removed
* from the table *soon*.
*
* @param $setting
*
* @return array|bool|mixed|null|string
* @throws \Exception
*/
public function getSetting($setting)
{
if (strpos($setting, '.') === false) {
trigger_error('You should update your template to use the newer method "$page->getSettingValue()"" of fetching values from the "settings" table! This method *will* be removed in a future version.', E_USER_WARNING);
} else {
return $this->getSettingValue($setting);
}
return $this->settings->$setting;
}
/**
* @param $setting
*
* @return null|string
* @throws \Exception
*/
public function getSettingValue($setting): ?string
{
return Settings::settingValue($setting);
}
/**
* Setup user preferences.
*
*
* @throws \Exception
* @throws \SmartyException
*/
public function setUserPrefs()
{
// Tell Smarty which directories to use for templates
$this->smarty->setTemplateDir([
app('smarty.view')->setTemplateDir([
'user' => config('ytake-laravel-smarty.template_path').DIRECTORY_SEPARATOR.$this->theme,
'shared' => config('ytake-laravel-smarty.template_path').'/shared',
'default' => config('ytake-laravel-smarty.template_path').'/Gentele',
@@ -381,16 +326,16 @@ class BasePage
}
$content = new Contents();
$this->smarty->assign('menulist', Menu::getMenu($role, $this->serverurl));
$this->smarty->assign('usefulcontentlist', $content->getForMenuByTypeAndRole(Contents::TYPEUSEFUL, $role));
$this->smarty->assign('articlecontentlist', $content->getForMenuByTypeAndRole(Contents::TYPEARTICLE, $role));
app('smarty.view')->assign('menulist', Menu::getMenu($role, $this->serverurl));
app('smarty.view')->assign('usefulcontentlist', $content->getForMenuByTypeAndRole(Contents::TYPEUSEFUL, $role));
app('smarty.view')->assign('articlecontentlist', $content->getForMenuByTypeAndRole(Contents::TYPEARTICLE, $role));
if ($this->userdata !== null) {
$this->smarty->assign('recentforumpostslist', Forumpost::getPosts(Settings::settingValue('..showrecentforumposts')));
app('smarty.view')->assign('recentforumpostslist', Forumpost::getPosts(Settings::settingValue('..showrecentforumposts')));
}
$this->smarty->assign('main_menu', $this->smarty->fetch('mainmenu.tpl'));
$this->smarty->assign('useful_menu', $this->smarty->fetch('usefullinksmenu.tpl'));
$this->smarty->assign('article_menu', $this->smarty->fetch('articlesmenu.tpl'));
app('smarty.view')->assign('main_menu', app('smarty.view')->fetch('mainmenu.tpl'));
app('smarty.view')->assign('useful_menu', app('smarty.view')->fetch('usefullinksmenu.tpl'));
app('smarty.view')->assign('article_menu', app('smarty.view')->fetch('articlesmenu.tpl'));
if (! empty($this->userdata)) {
$parentcatlist = Category::getForMenu($this->userdata['categoryexclusions'], $this->userdata['rolecategoryexclusions']);
@@ -398,27 +343,27 @@ class BasePage
$parentcatlist = Category::getForMenu();
}
$this->smarty->assign('parentcatlist', $parentcatlist);
$this->smarty->assign('catClass', Category::class);
app('smarty.view')->assign('parentcatlist', $parentcatlist);
app('smarty.view')->assign('catClass', Category::class);
$searchStr = '';
if ($this->page === 'search' && request()->has('id')) {
$searchStr = request()->input('id');
}
$this->smarty->assign('header_menu_search', $searchStr);
app('smarty.view')->assign('header_menu_search', $searchStr);
if (request()->has('t')) {
$this->smarty->assign('header_menu_cat', request()->input('t'));
app('smarty.view')->assign('header_menu_cat', request()->input('t'));
} else {
$this->smarty->assign('header_menu_cat', '');
app('smarty.view')->assign('header_menu_cat', '');
}
$header_menu = $this->smarty->fetch('headermenu.tpl');
$this->smarty->assign('header_menu', $header_menu);
$header_menu = app('smarty.view')->fetch('headermenu.tpl');
app('smarty.view')->assign('header_menu', $header_menu);
}
public function setAdminPrefs()
{
// Tell Smarty which directories to use for templates
$this->smarty->setTemplateDir(
app('smarty.view')->setTemplateDir(
[
'admin' => config('ytake-laravel-smarty.template_path').'/admin',
'shared' => config('ytake-laravel-smarty.template_path').'/shared',
@@ -426,7 +371,7 @@ class BasePage
]
);
$this->smarty->assign('catClass', Category::class);
app('smarty.view')->assign('catClass', Category::class);
}
/**
@@ -434,7 +379,7 @@ class BasePage
*/
public function pagerender(): void
{
$this->smarty->assign('page', $this);
app('smarty.view')->assign('page', $this);
$this->page_template = 'basepage.tpl';
$this->render();
@@ -447,10 +392,10 @@ class BasePage
*/
public function adminrender(): void
{
$this->smarty->assign('page', $this);
app('smarty.view')->assign('page', $this);
$admin_menu = $this->smarty->fetch('adminmenu.tpl');
$this->smarty->assign('admin_menu', $admin_menu);
$admin_menu = app('smarty.view')->fetch('adminmenu.tpl');
app('smarty.view')->assign('admin_menu', $admin_menu);
$this->page_template = 'baseadminpage.tpl';
Changelog
+2
View File
@@ -1,3 +1,5 @@
2018-03-29 DariusIII
* Chg: Remove login/register pages, use Login/Register controllers completely
2018-03-28 DariusIII
* Chg: Update laravel/framework to version 5.6.14
* Chg: Change login/register pages
app/Http/Controllers/Auth/LoginController.php
+26
View File
@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Auth;
use App\Models\Settings;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
@@ -65,10 +66,35 @@ class LoginController extends Controller
return redirect()->intended($this->redirectPath());
}
app('smarty.view')->assign('error', 'These credentials do not match our records.');
return redirect()->back()
->withInput()
->withErrors([
'login' => 'These credentials do not match our records.',
]);
}
/**
* @throws \Exception
*/
public function showLoginForm()
{
$theme = Settings::settingValue('site.main.style');
app('smarty.view')->assign(['error' => '', 'username' => '', 'rememberme' => '']);
$meta_title = 'Login';
$meta_keywords = 'Login';
$meta_description = 'Login';
$content = app('smarty.view')->fetch($theme.'/login.tpl');
app('smarty.view')->assign(
[
'error' => 'These credentials do not match our records.',
'content' => $content,
'meta_title' => $meta_title,
'meta_keywords' => $meta_keywords,
'meta_description' => $meta_description,
]
);
app('smarty.view')->display($theme.'/basepage.tpl');
}
}
app/Http/Controllers/Auth/RegisterController.php
+44 -9
View File
@@ -85,7 +85,7 @@ class RegisterController extends Controller
public function register(Request $request)
{
$userName = $password = $confirmPassword = $email = $inviteCode = $inviteCodeQuery = '';
$error = $userName = $password = $confirmPassword = $email = $inviteCode = $inviteCodeQuery = '';
$showRegister = 1;
if ((int) Settings::settingValue('..registerstatus') === Settings::REGISTER_STATUS_CLOSED) {
@@ -118,41 +118,41 @@ class RegisterController extends Controller
if ((int) Settings::settingValue('..registerstatus') === Settings::REGISTER_STATUS_INVITE) {
if ($inviteCode === '') {
echo 'Sorry, the invite code is old or has been used.';
$error = 'Sorry, the invite code is old or has been used.';
break;
}
$invitedBy = User::checkAndUseInvite($inviteCode);
if ($invitedBy < 0) {
echo 'Sorry, the invite code is old or has been used.';
$error = 'Sorry, the invite code is old or has been used.';
break;
}
}
if (! User::isValidUsername($userName)) {
echo 'Your username must be at least five characters.';
$error = 'Your username must be at least five characters.';
break;
}
if (! User::isValidPassword($password)) {
echo 'Your password must be longer than eight characters, have at least 1 number, at least 1 capital and at least one lowercase letter';
$error = 'Your password must be longer than eight characters, have at least 1 number, at least 1 capital and at least one lowercase letter';
break;
}
if (! User::isValidEmail($email)) {
echo 'Your email is not a valid format.';
$error = 'Your email is not a valid format.';
break;
}
$res = User::getByUsername($userName);
if ($res) {
echo 'Sorry, the username is already taken.';
$error = 'Sorry, the username is already taken.';
break;
}
$res = User::getByEmail($email);
if ($res) {
echo 'Sorry, the email is already in use.';
$error = 'Sorry, the email is already in use.';
break;
}
@@ -181,7 +181,7 @@ class RegisterController extends Controller
// See if it is a valid invite.
$invite = Invitation::getInvite($inviteCode);
if (! $invite) {
echo sprintf('Bad or invite code older than %d days.', Invitation::DEFAULT_INVITE_EXPIRY_DAYS);
$error = sprintf('Bad or invite code older than %d days.', Invitation::DEFAULT_INVITE_EXPIRY_DAYS);
$showRegister = 0;
} else {
$inviteCode = $invite['guid'];
@@ -191,5 +191,40 @@ class RegisterController extends Controller
}
}
}
app('smarty.view')->assign(
[
'username' => Utility::htmlfmt($userName),
'password' => Utility::htmlfmt($password),
'confirmpassword' => Utility::htmlfmt($confirmPassword),
'email' => Utility::htmlfmt($email),
'invitecode' => Utility::htmlfmt($inviteCode),
'invite_code_query' => Utility::htmlfmt($inviteCodeQuery),
'showregister' => $showRegister,
'error' => $error,
]
);
}
/**
* @throws \Exception
*/
public function showRegistrationForm()
{
$theme = Settings::settingValue('site.main.style');
$meta_title = 'Register';
$meta_keywords = 'register,signup,registration';
$meta_description = 'Register';
$content = app('smarty.view')->fetch($theme.'/register.tpl');
app('smarty.view')->assign(
[
'content' => $content,
'meta_title' => $meta_title,
'meta_keywords' => $meta_keywords,
'meta_description' => $meta_description,
]
);
app('smarty.view')->display($theme.'/basepage.tpl');
}
}
app/Providers/AppServiceProvider.php
+2 -1
View File
@@ -13,7 +13,8 @@ class AppServiceProvider extends ServiceProvider
*/
public function boot()
{
//
$smarty = app('smarty.view');
view()->share('smarty', $smarty);
}
/**
public/index.php
-2
View File
@@ -56,7 +56,6 @@ switch ($page->page) {
case 'profileedit':
case 'profile_delete':
case 'queue':
case 'register':
case 'sabqueuedata':
case 'search':
case 'sendtocouch':
@@ -70,7 +69,6 @@ switch ($page->page) {
case 'api':
case 'failed':
case 'getnzb':
case 'login':
case 'rss':
include NN_WWW.'pages/'.$page->page.'.php';
break;
public/pages/login.php
-9
View File
@@ -1,9 +0,0 @@
<?php
$page->smarty->assign(['error' => '', 'username' => '', 'rememberme' => '']);
$page->meta_title = 'Login';
$page->meta_keywords = 'Login';
$page->meta_description = 'Login';
$page->content = $page->smarty->fetch('login.tpl');
$page->pagerender();
public/pages/register.php
-30
View File
@@ -1,30 +0,0 @@
<?php
use Blacklight\utility\Utility;
use Illuminate\Support\Facades\Auth;
if (Auth::check()) {
redirect('/');
}
$error = $userName = $password = $confirmPassword = $email = $inviteCode = $inviteCodeQuery = '';
$showRegister = 1;
$page->smarty->assign(
[
'username' => Utility::htmlfmt($userName),
'password' => Utility::htmlfmt($password),
'confirmpassword' => Utility::htmlfmt($confirmPassword),
'email' => Utility::htmlfmt($email),
'invitecode' => Utility::htmlfmt($inviteCode),
'invite_code_query' => Utility::htmlfmt($inviteCodeQuery),
'showregister' => $showRegister,
'error' => $error,
]
);
$page->meta_title = 'Register';
$page->meta_keywords = 'register,signup,registration';
$page->meta_description = 'Register';
$page->content = $page->smarty->fetch('register.tpl');
$page->pagerender();
resources/views/themes/Charisma/basepage.tpl
+2 -2
View File
@@ -24,7 +24,7 @@
===
-->
<meta charset="utf-8">
<title>{$page->meta_title}{if $page->meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
<title>{$meta_title}{if $meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<meta name="csrf-token" content="{$csrf_token}">
<!-- The styles -->
@@ -146,7 +146,7 @@
<div class="box col-md-12">
<div class="box-content">
<!-- put your content here -->
{$page->content}
{$content}
</div>
</div>
</div>
resources/views/themes/Charisma/contact.tpl
+1 -1
View File
@@ -43,7 +43,7 @@
<label for="comment" class="h6">Message</label>
<textarea rows="7" name="comment" id="comment"
class="form-control form-white"></textarea>
{$page->smarty->fetch('captcha.tpl')}
{NoCaptcha::display()}{NoCaptcha::renderJs()}
<button type="submit" value="submit" class="btn btn-primary m-t-20">Send
message
</button>
resources/views/themes/Charisma/forgottenpassword.tpl
+1 -1
View File
@@ -59,7 +59,7 @@
<br>
<p class="center col-md-5">
<p class="center col-md-5">
{$page->smarty->fetch('captcha.tpl')}
{NoCaptcha::display()}{NoCaptcha::renderJs()}
</p>
<button type="submit" class="btn btn-primary">Request Password Reset</button>
</fieldset>
resources/views/themes/Charisma/login.tpl
+1 -1
View File
@@ -67,7 +67,7 @@
<div class="clearfix"></div>
<p class="center col-md-5">
<p class="center col-md-5">
{$page->smarty->fetch('captcha.tpl')}
{NoCaptcha::display()}{NoCaptcha::renderJs()}
</p>
<button type="submit" class="btn btn-primary">Login</button>
</fieldset>
resources/views/themes/Charisma/profileedit.tpl
+4 -4
View File
@@ -146,7 +146,7 @@
</tr>
<tr>
<td>
{if $page->getSettingValue('site.main.userselstyle') == 1}
{if{{Setting::settingValue('site.main.userselstyle')}} == 1}
{html_options style="color: black;" id="style" name='style' values=$themelist output=$themelist selected=$user.style}
{/if}
</td>
@@ -171,7 +171,7 @@
function.
</div>
<br>
{if $page->getSettingValue('apps.sabnzbplus.integrationtype') != 1}
{if {{Setting::settingValue('apps.sabnzbplus.integrationtype')}} != 1}
<table class="data table table-condensed table-striped table-responsive table-hover">
<tbody>
<tr class="bg-aqua-active">
@@ -190,7 +190,7 @@
</tbody>
</table>
{/if}
{if $user.queuetype == 1 && $page->getSettingValue('apps.sabnzbplus.integrationtype') == 2}
{if $user.queuetype == 1 && {{Setting::settingValue('apps.sabnzbplus.integrationtype')}} == 2}
<table class="data table table-condensed table-striped table-responsive table-hover">
<tbody>
<tr class="bg-aqua-active">
@@ -240,7 +240,7 @@
</tbody>
</table>
{/if}
{if $user.queuetype == 2 && ($page->getSettingValue('apps.sabnzbplus.integrationtype') == 0 || $page->getSettingValue('apps.sabnzbplus.integrationtype') == 2)}
{if $user.queuetype == 2 && ({{Setting::settingValue('apps.sabnzbplus.integrationtype')}} == 0 || {{Setting::settingValue('apps.sabnzbplus.integrationtype')}} == 2)}
<table class="data table table-condensed table-striped table-responsive table-hover">
<tbody>
<tr class="bg-aqua-active">
resources/views/themes/Charisma/register.tpl
+1 -1
View File
@@ -68,7 +68,7 @@
<div class="clearfix"></div>
<p class="center col-md-5">
<p class="center col-md-5">
{$page->smarty->fetch('captcha.tpl')}
{NoCaptcha::display()}{NoCaptcha::renderJs()}
</p>
<button type="submit" class="btn btn-primary">Register</button>
</fieldset>
resources/views/themes/Charisma/viewqueue.tpl
+2 -2
View File
@@ -8,12 +8,12 @@
</div>
</div>
{if $error == ''}
{if $page->getSettingValue('apps.sabnzbplus.integrationtype') > 0 || $user.queuetype == 2}
{if {{Setting::settingValue('apps.sabnzbplus.integrationtype')}} > 0 || $user.queuetype == 2}
<p style="text-align:center;">
The following queue is pulled from
<a href="{$serverURL|escape:"htmlall"}">{$serverURL|escape:"htmlall"}</a>.
<br/>
{if $page->getSettingValue('apps.sabnzbplus.integrationtype') == 2 || $user.queuetype == 2}Edit your queue settings in
{if {{App\Models\Settings::settingValue('apps.sabnzbplus.integrationtype')}} == 2 || $user.queuetype == 2}Edit your queue settings in
<a href="{$smarty.const.WWW_TOP}/profileedit">your profile</a>
.{/if}
</p>
resources/views/themes/Gamma/basepage.tpl
+4 -4
View File
@@ -14,11 +14,11 @@
{/literal}
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=9" />
<meta name="keywords" content="{$page->meta_keywords}{if $page->meta_keywords != "" && $site->metakeywords != ""},{/if}{$site->metakeywords}" />
<meta name="description" content="{$page->meta_description}{if $page->meta_description != "" && $site->metadescription != ""} - {/if}{$site->metadescription}" />
<meta name="keywords" content="{$meta_keywords}{if $meta_keywords != "" && $site->metakeywords != ""},{/if}{$site->metakeywords}" />
<meta name="description" content="{$meta_description}{if $meta_description != "" && $site->metadescription != ""} - {/if}{$site->metadescription}" />
<meta name="robots" content="noindex,nofollow"/>
<meta name="application-name" content="newznab-{$site->version}" />
<title>{$page->meta_title}{if $page->meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
<title>{$meta_title}{if $meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<meta name="csrf-token" content="{$csrf_token}">
@@ -125,7 +125,7 @@
</ul>
</div>
<div class="col-md-10">
{$page->content}
{$content}
</div>
</div>
</div>
resources/views/themes/Gamma/contact.tpl
+1 -1
View File
@@ -35,7 +35,7 @@
<tr>
<td></td>
<td>
{$page->smarty->fetch('captcha.tpl')}
{NoCaptcha::display()}{NoCaptcha::renderJs()}
<input type="submit" value="Submit" />
</td>
</tr>
resources/views/themes/Gamma/forgottenpassword.tpl
+1 -1
View File
@@ -26,7 +26,7 @@ border: 1px solid #e1e1e8;
<input class="input-block-level" autocomplete="off" type="text" id="username prependedInput" value="{$apikey}" name="apikey" placeholder="Apikey" style="margin-bottom:5px;">
<div>
{$page->smarty->fetch('captcha.tpl')}
{NoCaptcha::display()}{NoCaptcha::renderJs()}
</div>
<br>
<button type="submit" class="btn btn-success pull-warning">Request password reset</button>
resources/views/themes/Gamma/login.tpl
+1 -1
View File
@@ -19,7 +19,7 @@
<input id="rememberme" {if $rememberme == 1}checked="checked"{/if} name="rememberme" type="checkbox"/> <span class="help-inline" style="vertical-align:sub;">Remember me </span>
<div class="pull-right"><a href="{$serverroot}forgottenpassword" class="text-center">I forgot my password</a></div>
<div>
{$page->smarty->fetch('captcha.tpl')}
{NoCaptcha::display()}{NoCaptcha::renderJs()}
</div>
<button type="submit" class="btn btn-success pull-right">Login</button>
</table>
resources/views/themes/Gamma/profileedit.tpl
+4 -4
View File
@@ -53,11 +53,11 @@
<fieldset>
<legend>Site Preferences</legend>
{if $page->getSettingValue('site.main.userselstyle') == 1}
{if {{App\Models\Settings::settingValue('site.main.userselstyle')}} == 1}
<div class="control-group">
<label class="control-label">Change site theme</label>
<div class="controls">
{if $page->getSettingValue('site.main.userselstyle') == 1}
{if {{App\Models\Settings::settingValue('site.main.userselstyle')}} == 1}
{html_options id="style" name='style' values=$themelist output=$themelist selected=$user.style}
{/if}
</div>
@@ -113,8 +113,8 @@
</div>
</div>
</fieldset>
{if $page->getSettingValue('apps.sabnzbplus.integrationtype') > 0}
{if $page->getSettingValue('apps.sabnzbplus.integrationtype') != 1}
{if {{App\Models\Settings::settingValue('apps.sabnzbplus.integrationtype')}} > 0}
{if {{App\Models\Settings::settingValue('apps.sabnzbplus.integrationtype')}} != 1}
<legend>Queue type (NZBget / Sabnzbd)</legend>
<div class="control-group">
<label class="control-label">Queue type</label>
resources/views/themes/Gamma/register.tpl
+1 -1
View File
@@ -25,7 +25,7 @@
<input id="invitecode" name="invitecode" type="hidden" value="{$invitecode|escape:html_all}" />
<input class="input-block-level" autocomplete="off" id="confirmpassword" name="confirmpassword" value="{$confirmpassword}" type="password" placeholder="Confim password" style="margin-bottom:5px;"/>
<input class="input-block-level" autocomplete="off" id="email" name="email" value="{$email}" type="text" placeholder="Email" style="margin-bottom:20px;"/>
{$page->smarty->fetch('captcha.tpl')}
{NoCaptcha::display()}{NoCaptcha::renderJs()}
<button type="submit" class="btn btn-success pull-right">Register</button>
</table>
</form>
resources/views/themes/Gamma/viewqueue.tpl
+2 -2
View File
@@ -8,12 +8,12 @@
</div>
</div>
{if $error == ''}
{if $page->getSettingValue('apps.sabnzbplus.integrationtype') > 0 || $user.queuetype == 2}
{if {{App\Models\Settings::settingValue('apps.sabnzbplus.integrationtype')}} > 0 || $user.queuetype == 2}
<p style="text-align:center;">
The following queue is pulled from
<a href="{$serverURL|escape:"htmlall"}">{$serverURL|escape:"htmlall"}</a>.
<br/>
{if $page->getSettingValue('apps.sabnzbplus.integrationtype') == 2 || $user.queuetype == 2}Edit your queue settings in
{if {{App\Models\Settings::settingValue('apps.sabnzbplus.integrationtype')}} == 2 || $user.queuetype == 2}Edit your queue settings in
<a href="{$smarty.const.WWW_TOP}/profileedit">your profile</a>
.{/if}
</p>
resources/views/themes/Gentele/basepage.tpl
+2 -2
View File
@@ -19,7 +19,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="csrf-token" content="{{csrf_token()}}">
<title>{$page->meta_title}{if $page->meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
<title>{$meta_title}{if $meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<!-- Bootstrap core CSS -->
{{Html::style("{$smarty.const.WWW_ASSETS}/bootstrap-3.x/dist/css/bootstrap.min.css")}}
@@ -153,7 +153,7 @@
<div class="clearfix"></div>
<div class="row">
<div class="col-md-12 col-sm-12 col-xs-12">
{$page->content}
{$content}
<div class="clearfix"></div>
</div>
</div>
resources/views/themes/Gentele/contact.tpl
+2 -2
View File
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="UTF-8">
<title>{$page->meta_title}{if $page->meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
<title>{$meta_title}{if $meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
</head>
<body class="skin-blue layout-boxed">
@@ -54,7 +54,7 @@
<label for="comment" class="h6">Message</label>
<textarea rows="7" name="comment" id="comment"
class="form-control form-white"></textarea>
{$page->smarty->fetch('captcha.tpl')}
{NoCaptcha::display()}{NoCaptcha::renderJs()}
<button type="submit" class="btn btn-primary m-t-20">
Send message
</button>
resources/views/themes/Gentele/forgottenpassword.tpl
+1 -1
View File
@@ -33,7 +33,7 @@
</div>
<div class="row">
<div class="col-xs-6">
{$page->smarty->fetch('captcha.tpl')}
{NoCaptcha::display()}{NoCaptcha::renderJs()}
</div><!-- /.col -->
<hr>
<div class="col-xs-12">
resources/views/themes/Gentele/login.tpl
+2 -1
View File
@@ -29,7 +29,8 @@
name="rememberme" type="checkbox"> Remember Me
</label>
<hr>
{$page->smarty->fetch('captcha.tpl')}
{NoCaptcha::display()}
{NoCaptcha::renderJs()}
</div>
</div><!-- /.col -->
<div class="col-xs-4">
resources/views/themes/Gentele/profileedit.tpl
+4 -4
View File
@@ -145,7 +145,7 @@
</tr>
<tr>
<td>
{if $page->getSettingValue('site.main.userselstyle') == 1}
{if {{App\Models\Settings::settingValue('site.main.userselstyle')}} == 1}
{html_options id="style" name='style' values=$themelist output=$themelist selected=$user.style}
{/if}
</td>
@@ -170,7 +170,7 @@
function.
</div>
<br>
{if $page->getSettingValue('apps.sabnzbplus.integrationtype') != 1}
{if {{App\Models\Settings::settingValue('apps.sabnzbplus.integrationtype')}} != 1}
<table class="data table table-striped responsive-utilities jambo-table">
<tbody>
<tr class="bg-aqua-active">
@@ -189,7 +189,7 @@
</tbody>
</table>
{/if}
{if $user.queuetype == 1 && $page->getSettingValue('apps.sabnzbplus.integrationtype') == 2}
{if $user.queuetype == 1 && {{App\Models\Settings::settingValue('apps.sabnzbplus.integrationtype')}} == 2}
<table class="data table table-striped responsive-utilities jambo-table">
<tbody>
<tr class="bg-aqua-active">
@@ -240,7 +240,7 @@
</tbody>
</table>
{/if}
{if $user.queuetype == 2 && ($page->getSettingValue('apps.sabnzbplus.integrationtype') == 0 || $page->getSettingValue('apps.sabnzbplus.integrationtype') == 2)}
{if $user.queuetype == 2 && ({{App\Models\Settings::settingValue('apps.sabnzbplus.integrationtype')}} == 0 || {{App\Models\Settings::settingValue('apps.sabnzbplus.integrationtype')}} == 2)}
<table class="data table table-striped responsive-utilities jambo-table">
<tbody>
<tr class="bg-aqua-active">
resources/views/themes/Gentele/register.tpl
+2 -1
View File
@@ -55,7 +55,8 @@
</div><!-- /.col -->
<hr>
<div style="text-align: center;">
{$page->smarty->fetch('captcha.tpl')}
{NoCaptcha::display()}
{NoCaptcha::renderJs()}
</div>
</div>
<a href="{$serverroot}login" class="text-center">I already have a membership</a>
resources/views/themes/Gentele/terms.tpl
+1 -1
View File
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="UTF-8">
<title>{$page->meta_title}{if $page->meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
<title>{$meta_title}{if $meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
</head>
<body class="skin-blue layout-boxed">
resources/views/themes/Gentele/viewqueue.tpl
+2 -2
View File
@@ -9,12 +9,12 @@
</div>
</div>
{if $error == ''}
{if $page->getSettingValue('apps.sabnzbplus.integrationtype') > 0 || $user.queuetype == 2}
{if {{App\Models\Settings::settingValue('apps.sabnzbplus.integrationtype')}} > 0 || $user.queuetype == 2}
<p style="text-align:center;">
The following queue is pulled from
<a href="{$serverURL|escape:"htmlall"}">{$serverURL|escape:"htmlall"}</a>.
<br/>
{if $page->getSettingValue('apps.sabnzbplus.integrationtype') == 2 || $user.queuetype == 2}Edit your queue settings in
{if {{App\Models\Settings::settingValue('apps.sabnzbplus.integrationtype')}} == 2 || $user.queuetype == 2}Edit your queue settings in
<a href="{$smarty.const.WWW_TOP}/profileedit">your profile</a>
.{/if}
</p>
resources/views/themes/Omicron/basepage.tpl
+2 -2
View File
@@ -13,7 +13,7 @@
</script>
{/literal}
<meta charset="UTF-8">
<title>{$page->meta_title}{if $page->meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
<title>{$meta_title}{if $meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<meta name="csrf-token" content="{$csrf_token}">
<!-- Bootstrap 3.3.6 -->
@@ -242,7 +242,7 @@
<!-- Main content -->
<section class="content">
<!-- Your Page Content Here -->
{$page->content}
{$content}
</section>
<!-- /.content -->
</div>
resources/views/themes/Omicron/contact.tpl
+2 -2
View File
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="UTF-8">
<title>{$page->meta_title}{if $page->meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
<title>{$meta_title}{if $meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
</head>
<body class="skin-blue layout-boxed">
@@ -54,7 +54,7 @@
<label for="comment" class="h6">Message</label>
<textarea rows="7" name="comment" id="comment"
class="form-control form-white"></textarea>
{$page->smarty->fetch('captcha.tpl')}
{NoCaptcha::display()}{NoCaptcha::renderJs()}
<button type="submit" value="submit" class="btn btn-primary m-t-20">
Send
message
resources/views/themes/Omicron/forgottenpassword.tpl
+1 -1
View File
@@ -30,7 +30,7 @@
</div>
<div class="row">
<div class="col-xs-6">
{$page->smarty->fetch('captcha.tpl')}
{NoCaptcha::display()}{NoCaptcha::renderJs()}
</div><!-- /.col -->
<hr>
<div class="col-xs-12">
resources/views/themes/Omicron/login.tpl
+1 -1
View File
@@ -38,7 +38,7 @@
<input id="rememberme" {if isset($rememberme) && $rememberme == 1}checked="checked"{/if} name="rememberme" type="checkbox"> Remember Me
</label>
<hr>
{$page->smarty->fetch('captcha.tpl')}
{NoCaptcha::display()}{NoCaptcha::renderJs()}
</div>
</div><!-- /.col -->
<div class="col-xs-4">
resources/views/themes/Omicron/profileedit.tpl
+4 -4
View File
@@ -146,7 +146,7 @@
</tr>
<tr>
<td>
{if $page->getSettingValue('site.main.userselstyle') == 1}
{if {{App\Models\Settings::settingValue('site.main.userselstyle')}} == 1}
{html_options id="style" name='style' values=$themelist output=$themelist selected=$user.style}
{/if}
</td>
@@ -171,7 +171,7 @@
function.
</div>
<br>
{if $page->getSettingValue('apps.sabnzbplus.integrationtype') != 1}
{if {{App\Models\Settings::settingValue('apps.sabnzbplus.integrationtype')}} != 1}
<table class="data table table-condensed table-striped table-responsive">
<tbody>
<tr class="bg-aqua-active">
@@ -190,7 +190,7 @@
</tbody>
</table>
{/if}
{if $user.queuetype == 1 && $page->getSettingValue('apps.sabnzbplus.integrationtype') == 2}
{if $user.queuetype == 1 && {{App\Models\Settings::settingValue('apps.sabnzbplus.integrationtype')}} == 2}
<table class="data table table-condensed table-striped table-responsive">
<tbody>
<tr class="bg-aqua-active">
@@ -240,7 +240,7 @@
</tbody>
</table>
{/if}
{if $user.queuetype == 2 && ($page->getSettingValue('apps.sabnzbplus.integrationtype') == 0 || $page->getSettingValue('apps.sabnzbplus.integrationtype') == 2)}
{if $user.queuetype == 2 && ({{App\Models\Settings::settingValue('apps.sabnzbplus.integrationtype')}} == 0 || {{App\Models\Settings::settingValue('apps.sabnzbplus.integrationtype')}} == 2)}
<table class="data table table-condensed table-striped table-responsive">
<tbody>
<tr class="bg-aqua-active">
resources/views/themes/Omicron/register.tpl
+2 -2
View File
@@ -11,7 +11,7 @@
{/if}
<head>
<meta charset="UTF-8">
<title>{$page->meta_title}{if $page->meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle} | Registration Page</title>
<title>{$meta_title}{if $meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle} | Registration Page</title>
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
</head>
{if $showregister != "0"}
@@ -55,7 +55,7 @@
</div><!-- /.col -->
<hr>
<div style="text-align: center;">
{$page->smarty->fetch('captcha.tpl')}
{NoCaptcha::display()}{NoCaptcha::renderJs()}
</div>
</div>
<a href="{$serverroot}login" class="text-center">I already have a membership</a>
resources/views/themes/Omicron/terms.tpl
+1 -1
View File
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="UTF-8">
<title>{$page->meta_title}{if $page->meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
<title>{$meta_title}{if $meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
</head>
<body class="skin-blue layout-boxed">
resources/views/themes/Omicron/viewqueue.tpl
+2 -2
View File
@@ -8,12 +8,12 @@
</div>
</div>
{if $error == ''}
{if $page->getSettingValue('apps.sabnzbplus.integrationtype') > 0 || $user.queuetype == 2}
{if {{App\Models\Settings::settingValue('apps.sabnzbplus.integrationtype')}} > 0 || $user.queuetype == 2}
<p style="text-align:center;">
The following queue is pulled from
<a href="{$serverURL|escape:"htmlall"}">{$serverURL|escape:"htmlall"}</a>.
<br/>
{if $page->getSettingValue('apps.sabnzbplus.integrationtype') == 2 || $user.queuetype == 2}Edit your queue settings in
{if {{App\Models\Settings::settingValue('apps.sabnzbplus.integrationtype')}} == 2 || $user.queuetype == 2}Edit your queue settings in
<a href="{$smarty.const.WWW_TOP}/profileedit">your profile</a>
.{/if}
</p>
resources/views/themes/admin/baseadminpage.tpl
+2 -2
View File
@@ -18,7 +18,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{$page->meta_title}{if $page->meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
<title>{$meta_title}{if $meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
<!-- Bootstrap core CSS -->
<link href="{$smarty.const.WWW_ASSETS}/bootstrap-3.x/dist/css/bootstrap.min.css" rel="stylesheet"
@@ -75,7 +75,7 @@
<div class="clearfix"></div>
<div class="row">
<div class="col-md-12 col-sm-12 col-xs-12">
{$page->content}
{$content}
<div class="clearfix"></div>
</div>
</div>
routes/web.php
+2 -8
View File
@@ -27,16 +27,10 @@ Route::post('/', function () {
Auth::routes();
Route::get('/login', function () {
redirect('/login');
})->middleware('guest');
Route::get('/login', 'Auth\LoginController@showLoginForm');
Route::post('/login', 'Auth\LoginController@login');
Route::get('/register', function () {
redirect('/register');
})->middleware('guest');
Route::get('/register', 'Auth\RegisterController@showRegistrationForm');
Route::post('/register', 'Auth\RegisterController@register');
Route::get('/forgottenpassword', function () {