Migracia na 6.0

- oprava chyb v log
- welcome.blade url uprava

app/Http/Controllers/Search.php

@@ -10,19 +10,53 @@ use Illuminate\Support\Facades\DB;
 class Search extends Controller
 {
   public function autocomplete(){
-	$term = Request::input('term');
-	$results = array();
-	
-	$queries = DB::table('network')
-		->select('user')->distinct()
-		->where('user', 'LIKE', $term.'%')
-		->get();
-	
-	foreach ($queries as $query)
-	{
-	    $results[] = $query->user ;
-	}
-  return Response::json($results);
-  }
+		$term = Request::input('term');
+		$users = array();
+		$computers = array();
+		$uin = [];
+		$cin = [];
+		$results = [];
+		
+		$queries = DB::table('users')
+			->select('id','name')
+			->get();
+		
+		foreach ($queries as $query)
+		{
+				$users[$query->id] = $query->name;
+				if ($term && strpos($query->name, $term) === 0) {
+					$uin[] = $query->id;
+				}
+		}
 
+		$queries = DB::table('computers')
+			->select('id','computer')
+			->get();
+
+		foreach ($queries as $query)
+		{
+				$computers[$query->id] = $query->computer ;
+				if ($term && strpos(strtolower($query->computer),strtolower($term)) === 0) {
+					$cin[] = $query->id;
+				}
+		}
+	
+		$queries = DB::table('user_ip')
+			->select('computer_id','user_id')->distinct()
+			->whereIn('computer_id',$cin)
+			->orWhereIn('user_id',$uin)
+			->get();
+
+		foreach ($queries as $query) {
+			$results[] = [ 'id' => $query->computer_id, 'computer' => $computers[$query->computer_id], 'user' => $users[$query->user_id]];
+		}
+		return Response::json($results);
+	}
+
+	public function search($var = null)
+	{
+		$ip = Request::input('ip');
+		$user = Request::input('user');
+	}
+	
 }