Fixes #53

mrakodol · Feb 23, 2015 · 738d080 · 738d080
1 parent 88f03b1
commit 738d080
Showing 1 changed file with 42 additions and 28 deletions.
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -1,4 +1,6 @@
-<?php namespace App\Http\Controllers;
+<?php
+
+namespace App\Http\Controllers;
 
 use App\User;
 use App\News;
@@ -7,55 +9,67 @@
 use App\PhotoAlbum;
 use Illuminate\Support\Facades\DB;
 
-class HomeController extends BaseController {
+class HomeController extends BaseController
+{
 
     /**
      * News \Model
+     * 
      * @var Post
      */
     protected $news;
 
     /**
      * User \Model
+     * 
      * @var User
      */
     protected $user;
 
     /**
      * Inject the models.
-     * @param \Post $post
-     * @param \User $user
+     * 
+     * @param \Post $post            
+     * @param \User $user            
      */
     public function __construct(News $news, User $user)
     {
         parent::__construct();
-
+        
         $this->news = $news;
         $this->user = $user;
     }
 
     public function index()
-	{
-	    $tbpfx = DB::getTablePrefix();
-
-        $news = $this->news->orderBy('position', 'DESC')->orderBy('created_at', 'DESC')->limit(4)->get();
-        $sliders = Photo::join('photo_album', 'photo_album.id','=','photo.photo_album_id')
-                        ->where('photo.slider',1)
-                        ->orderBy('photo.position', 'DESC')
-                        ->orderBy('photo.created_at', 'DESC')
-                        ->select('photo.filename','photo.name','photo.description','photo_album.folderid')->get();
-
-        $photoalbums = PhotoAlbum::select(array('photo_album.id', 'photo_album.name', 'photo_album.description',
-                'photo_album.folderid',
-                DB::raw('(select ${tbpfx}filename from photo WHERE album_cover=1 and ${tbpfx}photo.photo_album_id=${tbpfx}photo_album.id) AS album_image'),
-                DB::raw('(select ${tbpfx}filename from photo WHERE ${tbpfx}photo.photo_album_id=${tbpfx}photo_album.id ORDER BY position ASC, id ASC LIMIT 1) AS album_image_first')))->limit(8)->get();
-
-        $videoalbums = VideoAlbum::select(array('video_album.id', 'video_album.name', 'video_album.description',
-                'video_album.folderid',
-                DB::raw('(select ${tbpfx}youtube from video as v WHERE album_cover=1 and v.video_album_id=${tbpfx}video_album.id) AS album_image'),
-                DB::raw('(select ${tbpfx}youtube from video WHERE ${tbpfx}video.video_album_id=${tbpfx}video_album.id ORDER BY position ASC, id ASC LIMIT 1) AS album_image_first')))->limit(8)->get();
-
-        return view('site.home.index',compact('news','sliders','videoalbums','photoalbums'));
-	}
-
+    {
+        $news = $this->news->orderBy('position', 'DESC')
+            ->orderBy('created_at', 'DESC')
+            ->limit(4)
+            ->get();
+        $sliders = Photo::join('photo_album', 'photo_album.id', '=', 'photo.photo_album_id')->where('photo.slider', 1)
+            ->orderBy('photo.position', 'DESC')
+            ->orderBy('photo.created_at', 'DESC')
+            ->select('photo.filename', 'photo.name', 'photo.description', 'photo_album.folderid')
+            ->get();
+
+        $photoalbums = PhotoAlbum::select(array(
+            'photo_album.id',
+            'photo_album.name',
+            'photo_album.description',
+            'photo_album.folderid',
+            DB::raw('(select filename from photo WHERE album_cover=1 and photo.photo_album_id=photo_album.id) AS album_image'),
+            DB::raw('(select filename from photo WHERE photo.photo_album_id=photo_album.id ORDER BY position ASC, id ASC LIMIT 1) AS album_image_first')
+        ))->limit(8)->get();
+
+        $videoalbums = VideoAlbum::select(array(
+            'video_album.id',
+            'video_album.name',
+            'video_album.description',
+            'video_album.folderid',
+            DB::raw('(select youtube from video as v WHERE album_cover=1 and v.video_album_id=video_album.id) AS album_image'),
+            DB::raw('(select youtube from video WHERE video.video_album_id=video_album.id ORDER BY position ASC, id ASC LIMIT 1) AS album_image_first')
+        ))->limit(8)->get();
+
+        return view('site.home.index', compact('news', 'sliders', 'videoalbums', 'photoalbums'));
+    }
 }