Started work on SiteDetails and Setup

app/Http/Middleware/Reseller.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Support\Facades\Auth;
-use Closure;
-
-class Reseller
-{
-	public function handle($request, Closure $next)
-	{
-		if (! in_array(Auth::user()->role(),['Wholesaler','Reseller']))
-		{
-			abort(303,'Not Reseller');
-
-		} else
-			return $next($request);
-	}
-}

app/Http/Middleware/Role.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Support\Facades\Auth;
+use Closure;
+
+class Role
+{
+	public function handle($request, Closure $next, $role)
+	{
+		if ($role AND ! Auth::user())
+			return abort(303,'Not Authenticated');
+
+		switch ($role) {
+			case 'wholesaler':
+				if (Auth::user()->role() == $role)
+					return $next($request);
+
+				break;
+
+			case 'reseller':
+				if (in_array(Auth::user()->role(),['wholesaler','reseller']))
+					return $next($request);
+
+				break;
+		}
+
+		abort(404,'User doesnt have role?');
+	}
+}

app/Http/Middleware/SetSite.php

@@ -29,11 +29,9 @@ class SetSite
 		// @todo Figure out how to know if this is an API call - and deny it if it's not in the database.
 		$so = new Site;
 
-		if (Schema::hasTable('site'))
+		if ($so->getTable() AND Schema::hasTable($so->getTable()))
 		{
 			$so = Site::where('url',$request->root())
-				->orwhere('devurl',$request->root())
-				// @todo With an API call, we would use ->firstorfail();
 				->first();
 		}