Hotfix for Layout 2 regarding display of sfw variable and other minor improvements and or changes

app/Http/Controllers/CategoryController.php

@@ -74,9 +74,14 @@ class CategoryController extends Controller
             return redirect()->back()->with('error', 'Category is empty.');
         }
 
+        $sfw = $video->tags->contains(function($key, $tag) {
+            return $tag->normalized === 'sfw';
+        });
+
         return view('video', [
             'video' => $video,
-            'related' => $category,
+	    'related' => $category,
+	    'sfw' => $sfw,
             'banner' => Banner::getRandom($video->isSfw())]);
     }
 

app/Http/Controllers/UserController.php

@@ -9,6 +9,8 @@ use Illuminate\Http\Request;
 use Carbon\Carbon;
 use App\Models\ModeratorLog;
 use App\Models\Banner;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Validator;
 
 use Symfony\Component\HttpFoundation\Response;
 use Toddish\Verify\Helpers\Verify;
@@ -131,8 +133,8 @@ class UserController extends Controller
         $validator = \Validator::make($request->all(), [
             'username' => 'required|unique:users|min:3|max:25|alpha_num',
             'email' => 'required|email|unique:users|confirmed',
-            'password' => 'required|min:6|confirmed',
+            'password' => 'required|min:6|confirmed'
-            'g-recaptcha-response' => 'required|recaptcha'
+            //'g-recaptcha-response' => 'required|recaptcha'
         ]);
 
         if($validator->fails()) {
@@ -140,7 +142,7 @@ class UserController extends Controller
                 ->withInput($request->except(['password', 'password_confirmation']));
         }
 
-        //$activation_token = str_random(8) . md5($request->get('email')) . str_random(10);
+        $activation_token = str_random(8) . md5($request->get('email')) . str_random(10);
 
         $user = new User();
         $user->username = $request->get('username');
@@ -148,7 +150,7 @@ class UserController extends Controller
         $user->password = $request->get('password');
         $user->activation_token = $activation_token;
         $user->disabled = 0;
-        $user->verified = 1;
+        $user->verified = 0;
         $user->categories = [];
         if($user->save()) {
             $data = [
@@ -162,7 +164,7 @@ class UserController extends Controller
                 $message->to($user->email, $user->username)->subject('Welcome to w0bm. Activate your account');
             });
 
-            return redirect('/')->with('info', 'Congratulations! You can now login!');
+            return redirect('/login')->with('info', 'Congratulations! Your Account was successful created, please verify your email');
         } else {
             return redirect()->back()->with('error', 'Account could not be created')->withInput($request->except(['password', 'password_confirmation']));
         }
@@ -413,5 +415,4 @@ class UserController extends Controller
         //return Response::create("success mothafukka, you can now go back and fap your dick", 200);
         return redirect()->back()->with('success', 'Jesus Scriptus is with you' );
     }
-
 }

app/Http/routes.php

@@ -58,6 +58,8 @@ Route::group(['prefix' => 'api'], function() {
         });
 
 
+
+
 	Route::get('latest', function(\Illuminate\Http\Request $req) {
             if ($req->has('filtered') && $req->get('filtered')) {
                 return \App\Models\Video::filtered()->orderBy('id', 'DESC')->first();
@@ -81,9 +83,14 @@ Route::group(['prefix' => 'api'], function() {
     });
 
     Route::post('upload', 'VideoController@store');
+
 });
 
+
+
 Route::group(["middleware" => "theme"], function() {
+	Route::get('uim', 'uimgController@index');
+	Route::post('uim/add', 'UserController@speichern');
 	Route::post('report/{id}', 'ReportController@report')->middleware('auth');  // added by klee
 	Route::get('messages', 'MessageController@page')->middleware('auth');
 	Route::get('user/{username}', 'UserController@show')->middleware('auth');
@@ -96,7 +103,7 @@ Route::group(["middleware" => "theme"], function() {
 	Route::get('logout', 'UserController@logout');
 	Route::post('login', 'UserController@login');
 	Route::get('register', 'UserController@create');
-	Route::post('register', 'UserController@store');
+	//Route::post('register', 'UserController@store');
 	Route::get('activate/{token}', 'UserController@activate');
 	Route::get('index', 'VideoController@index')->middleware('auth');
 	Route::get('main', 'VideoController@main')->middleware('auth');
@@ -107,6 +114,7 @@ Route::group(["middleware" => "theme"], function() {
 	Route::get('about', function() { return view('about'); })->middleware('auth');
 	Route::get('irc', function() { return view('irc'); });
 	Route::get('rules', function() { return view('rules'); })->middleware('auth');
+	Route::get('todo', function() { return view('todo'); })->middleware('auth');
 	Route::get('contact', function() { return view('contact'); });
 	Route::get('terms', function() { return view('tos'); })->middleware('auth');
 	Route::get('privacy', function() { return view('privacy'); })->middleware('auth');
@@ -119,8 +127,9 @@ Route::group(["middleware" => "theme"], function() {
 		'latest_video' => \App\Models\Video::getLastId(),
 		'newest_user' => \App\Models\User::orderBy('id', 'DESC')->first()->username,
 		'dirsize' => shell_exec("(du -sh " . public_path() . "/b | cut -f1)")
-	    ]);
+	]);
 	})->middleware('auth');
+
 	Route::get('/latest', function () {
 	    Session::reflash();
 

config/mail.php

@@ -54,7 +54,7 @@ return [
     |
     */
 
-    'from' => ['address' => 'info@w0bm.com', 'name' => 'w0bm.com Staff'],
+    'from' => ['address' => 'otter@w0bm.com', 'name' => 'w0bm.com Staff'],
 
     /*
     |--------------------------------------------------------------------------

config/recaptcha.php

@@ -62,4 +62,4 @@ return array(
     */    
     'version'       => 2,
 
-);
+);

public/css/w0bmcustom.css

@@ -3794,4 +3794,25 @@ button#layout4:before {
     display: grid;
     grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));
     grid-gap: 1em;
-}
+}
+
+.commbordersoos {
+    border: 1px solid black;
+    background: #1313137a;
+    margin-left: 5px;
+    margin-right: 5px;
+    margin-bottom: 5px;
+}
+
+#parent {
+    background: #1a1a1b;
+    border-radius: 0;
+    padding: 5px;
+    cursor: pointer;
+    margin-left: 5px;
+    margin-right: 5px;
+    padding-right: 50px;
+    border-left: 1px solid black;
+    border-bottom: 1px solid black;
+    border-right: 1px solid black;
+}

resources/views/layout1/apply.blade.php

@@ -1,9 +1,61 @@
 @extends('layout')
 @section('content')
-
+@include('partials.flash')
-<div class="centershock" style="text-align: center;">
+    <div class="page-header">
-<p class="forbidden">999999 - closed l0l</p>
+	<h5>Register your w0bm.com Account</h5>
-<iframe width="560" height="315" src="https://www.youtube.com/embed/unRldLdllZ8" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+<p style="color:red;">Note: We do not reset passwords, make sure to write down your password on paper, otherwise you need create a new account or start to circlejerk in the IRC!</p>
-</div>
+    </div>
+    <div class="register">
+        <form class="form-horizontal" method="post" action="{{action('UserController@store')}}">
+            {!! csrf_field() !!}
+            <div class="form-group">
+                <div class="">
+                    {!! Form::text('username', null, ['class' => 'form-control', 'placeholder' => 'Username']) !!}
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="">
+                    {!! Form::email('email', null, ['class' => 'form-control', 'placeholder' => 'Email']) !!}
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="">
+                    {!! Form::email('email_confirmation', null, ['class' => 'form-control', 'placeholder' => 'Email Confirmation']) !!}
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="">
+                    {!! Form::password('password', ['class' => 'form-control', 'placeholder' => 'Password']) !!}
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="">
+                    {!! Form::password('password_confirmation', ['class' => 'form-control', 'placeholder' => 'Password Confirmation']) !!}
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="">
+                </div>
+	    </div>
+	    <div class="form-group terms">
+		<div style="text-align: center;">
+		<p><input type="checkbox" checked required name="terms"> I am at least 18 years or older and I have read and understand the <a href="/rules">Rules</a></p>
+		</div>
+		<div class="">
+                    <button type="submit" class="btn btn-primary">Register</button>
+                </div>
+            </div>
+        </form>
+    </div>
+<!--    <div class="form-group" style="
+		text-align: center;
+		background: rgba(0, 0, 0, 0.75);
+		margin-left: 5px;
+                margin-right: 5px;
+    				  ">
+	<p>By clicking on "Register" you accept our <a href="/rules">Rules</a></p>
+	<p>Note: we do NOT reset passwords for now, make sure to save your password correctly</p>
+    </div>
+-->    
 @endsection
 

resources/views/layout1/deleted.blade.php

@@ -4,4 +4,5 @@
 <img src="/images/404-video.png">
 <p>Possible reasons: Your video was shit, broke a rule or the ID you tried to watch does not even exist (yet)</p>
 <p>Go <a href="/">back</a> to the normal rotation</p>
+
 @endsection

resources/views/layout1/layout.blade.php

@@ -12,7 +12,7 @@
     <meta property="og:site_name" content="w0bm.com" />
     <meta property="og:title" content="@if(isset($video)){{$video->videotitle}}@endif">
     @if(auth()->check())<meta property="og:description" content="Tags:@if(isset($video)) {{ $video->getTagListAttribute() }} @endif">@endif
-    <meta property="og:image" content="@if(isset($video))/thumbs/{{str_replace(".webm","",$video->file)}}.gif"@endif/>
+    <meta property="og:image" content="@if(isset($video))/thumbs/beta/{{str_replace(".webm","",$video->file)}}.png"@endif/>
     @if(auth()->check())<meta property="og:video" content="@if(isset($video))/b/{{ $video->file }} @endif">@endif
     <meta property="og:url" content="@if(isset($video))/{{ $video->id }}@endif">
     <meta property="og:video:type" content="video/webm">
@@ -82,11 +82,6 @@ clipboard.on('error', function(e) {
     console.error('Trigger:', e.trigger);
 });
 </script>
-@if(env('SENTRY_PUBLIC'))
-<script>
-    Raven.config('{{ env("SENTRY_PUBLIC") }}').install()
-</script>
-@endif
 <script src="/js/w0bmscript.js?v={{ filemtime("js/w0bmscript.js") }}"></script>
 @if(isset($video))
 @else

resources/views/layout1/login.blade.php

@@ -1,5 +1,6 @@
 @extends('layout')
 @section('content')
+@include('partials.flash')
     <div class="page-header">
         <h5>Spurleys Super Dooper Login Screen</h5>
         <p>Log into your w0bm.com Account</p>
@@ -7,7 +8,6 @@
 <div hiden class="nodisplay">
   
 <div class="wrap-collabsible">
-  @include('partials.flash')
   <input id="collapsible" class="toggle" type="checkbox">
   <label for="collapsible" class="lbl-toggle">Login</label>
   <div class="collapsible-content">

resources/views/layout1/main.blade.php

@@ -1,6 +1,9 @@
 @extends('profilelayout')
 @section('content')
     <div class="page-header">
+    	    <div class="page">
+        {!! $videos->render() !!}
+    </div>
         <form method="get">
 	<button type="submit" class="suchbutton"><i style="color:white;" class="fa fa-search"></i></button>
             {!! Form::text('q', isset($q) ? $q : null, ['class' => 'suchleiste', 'placeholder' => 'Search w0bm.com']) !!}
@@ -25,8 +28,4 @@
 			</div>
         @endforeach
     </div>
-
-    <div class="page">
-        {!! $videos->render() !!}
-    </div>
 @endsection