starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-09-02 03:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix nocaptcha display on login, contact, forgottenpassword and register pages

Browse Source
This commit is contained in:
DariusIII
2018-05-04 13:29:03 +02:00
parent faae421972
commit 8ba86e184a
18 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ContactUsController.php
+6 -8
View File
@@ -17,13 +17,12 @@ class ContactUsController extends BasePageController
*/
public function contact(Request $request)
{
$this->setPrefs();
$this->validate($request, [
'useremail' => 'required',
'username' => 'required',
]);
if (env('NOCAPTCHA_ENABLED') === true) {
if (env('NOCAPTCHA_ENABLED') === true && (!empty(env('NOCAPTCHA_SECRET')) && ! empty(env('NOCAPTCHA_SITEKEY')))) {
$this->validate($request, [
'g-recaptcha-response' => 'required|captcha',
]);
@@ -47,7 +46,7 @@ class ContactUsController extends BasePageController
}
$msg = "<h2 style='text-align:center;'>Thank you for getting in touch with ".Settings::settingValue('site.main.title').'.</h2>';
}
$this->smarty->assign('msg', $msg);
app('smarty.view')->assign('msg', $msg);
return redirect('contact-us');
}
@@ -57,24 +56,23 @@ class ContactUsController extends BasePageController
*/
public function showContactForm()
{
$this->setPrefs();
$theme = Settings::settingValue('site.main.style');
$title = 'Contact '.Settings::settingValue('site.main.title');
$meta_title = 'Contact '.Settings::settingValue('site.main.title');
$meta_keywords = 'contact us,contact,get in touch,email';
$meta_description = 'Contact us at '.Settings::settingValue('site.main.title').' and submit your feedback';
$content = $this->smarty->fetch('contact.tpl');
$content = app('smarty.view')->fetch($theme.'/contact.tpl');
$this->smarty->assign(
app('smarty.view')->assign(
[
'title' => $title,
'content' => $content,
'meta_title' => $meta_title,
'meta_keywords' => $meta_keywords,
'meta_description' => $meta_description,
'nocaptcha' => env('NOCAPTCHA_ENABLED'),
]
);
$this->pagerender();
app('smarty.view')->display($theme.'/basepage.tpl');
}
}