Merge branch 'forum' into 'master'

Forum

See merge request 076/community/076Server!2

app/Http/Controllers/BoardController.php

@@ -0,0 +1,208 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+class BoardController extends Controller {
+    public function getCategories() { // /api/rpc/board/category/getcategories
+        return DB::table('for_category')
+            ->select('*')
+            ->orderBy('order', 'asc')
+            ->get();
+    }
+
+    public function getCategory($id) { // /api/rpc/board/category/getcategory/id
+        return DB::table('for_category')
+            ->select('*')
+            ->where('id', $id)
+            ->get();
+    }
+
+    public function getCategoryName($id) { // /api/rpc/board/category/getcategoryname/id
+        return DB::table('for_category')
+            ->select('title')
+            ->where('id', $id)
+            ->get();
+    }
+
+    public function getForums() { // /api/rpc/board/forum/getforums
+        return DB::table('for_forums')
+            ->select('*')
+            ->orderBy('order', 'asc')
+            ->get();
+    }
+
+    public function getForum($id) { // /api/rpc/board/forum/getforum/id
+        return DB::table('for_forums')
+            ->select('*')
+            ->where('id', $id)
+            ->orderBy('order', 'asc')
+            ->get();
+    }
+
+    public function getForumName($id) { // /api/rpc/board/forum/getforumname/id
+        return DB::table('for_forums')
+            ->select('cat_id', 'title')
+            ->where('id', $id)
+            ->orderBy('order', 'asc')
+            ->get();
+    }
+
+    public function getForumsInCategory($cat_id) { // /api/rpc/board/forum/getforumsincategory/cat_id
+        return DB::table('for_forums')
+            ->select('*')
+            ->where('cat_id', $cat_id)
+            ->get();
+    }
+
+    public function getTopics($for, $from, $to) { // /api/rpc/board/topic/gettopics/for/from/to
+        return DB::table('for_threads')
+            ->select('*')
+            ->where('for_id', $id)
+            ->offset($from)
+            ->limit($to)
+            ->orderBy('last_date', 'desc')
+            ->get();
+    }
+
+    public function getTopicsUnpinned($for_id, $from, $to) { // /api/rpc/board/topic/gettopicsunpinned/for_id
+        return DB::table('for_threads')
+            ->select('*')
+            ->where('for_id', $for_id)
+            ->where('sticky', 0)
+            ->offset($from)
+            ->limit($to)
+            ->orderBy('last_date', 'desc')
+            ->get();
+    }
+
+    public function getTopicsPinned($for_id) { // /api/rpc/board/topic/gettopicspinned/for_id
+        return DB::table('for_threads')
+            ->select('*')
+            ->where('for_id', $for_id)
+            ->where('sticky', 1)
+            ->orderBy('last_date', 'desc')
+            ->get();
+    }
+
+    public function countUnpinnedTopicsInForum($for_id) { // /api/rpc/board/topic/countunpinnedtopicsinforum/for_id
+        return DB::table('for_threads')
+            ->where('for_id', $for_id)
+            ->where('sticky', 0)
+            ->count();
+    }
+
+    public function getTopic($id, $from, $to) { // /api/rpc/board/topic/gettopic/id/from/to
+        return DB::table('for_threads')
+            ->select('*')
+            ->where('id', $id)
+            ->offset($from)
+            ->limit($to)
+            ->orderBy('last_date', 'desc')
+            ->get();
+    }
+
+    public function getTopicLock($id) { // /api/rpc/board/topic/gettopiclock/id
+        return DB::table('for_threads')
+            ->select('lock')
+            ->where('id', $id)
+            ->get();
+    }
+
+    public function getTopicName($id) { // /api/rpc/board/topic/gettopicname/id
+        return DB::table('for_threads')
+            ->select('for_id', 'title')
+            ->where('id', $id)
+            ->get();
+    }
+
+    public function getPostsInTopic($top_id, $from, $to) { // /api/rpc/board/post/getpostsintopic/top_id/from/to
+        return DB::table('for_posts')
+            ->select('*')
+            ->where('top_id', $top_id)
+            ->offset($from)
+            ->limit($to)
+            ->orderBy('post_date', 'asc')
+            ->get();
+    }
+
+    public function countPostsInTopic($top_id) { // /api/rpc/board/post/countpostsintopic/top_id
+        return DB::table('for_posts')
+            ->where('top_id', $top_id)
+            ->count();
+    }
+
+    public function getPost($id) { // /api/rpc/board/post/getpost/id
+        return DB::table('for_posts')
+            ->select('*')
+            ->where('id', $id)
+            ->get();
+    }
+
+    public function getUserPosts($top_id, $from, $to) { // /api/rpc/board/post/getuserposts/top/from/to
+        return DB::table('for_posts')
+            ->join('for_users', 'for_posts.user_id', '=', 'for_users.id')
+            ->where('for_posts.top_id', $top_id)
+            ->offset($from)
+            ->limit($to)
+            ->orderBy('for_posts.post_date', 'asc')
+            ->get(array(
+                "for_posts.id",
+                "top_id",
+                "user_id",
+                "post_date",
+                "message",
+                "delete",
+                "lastedit",
+                "ipaddress",
+                "delreason",
+                "nolayout",
+                "postcount",
+                "username",
+                "perm_id",
+                "total_posts",
+                "header",
+                "footer",
+                "member_title",
+                "gender",
+                "avatar",
+                "name_colour",
+                "display_name",
+                "country"
+            ));
+    }
+
+    public function getUserPost($id) { // /api/rpc/board/post/getuserpost/id
+        return DB::table('for_posts')
+            ->join('for_users', 'for_posts.user_id', '=', 'for_users.id')
+            ->where('for_posts.id', $id)
+            ->orderBy('for_posts.post_date', 'asc')
+            ->get(array(
+                "for_posts.id",
+                "top_id",
+                "user_id",
+                "post_date",
+                "message",
+                "delete",
+                "lastedit",
+                "ipaddress",
+                "delreason",
+                "nolayout",
+                "postcount",
+                "username",
+                "perm_id",
+                "total_posts",
+                "header",
+                "footer",
+                "member_title",
+                "gender",
+                "avatar",
+                "name_colour",
+                "display_name",
+                "country"
+            ));
+    }
+}

app/Http/Controllers/UserController.php

@@ -48,6 +48,13 @@ class UserController extends Controller {
             ->get();
     }
 
+    public function getPostStyle($id) { // /api/rpc/user/user/getpoststyle/id
+        return DB:: table('for_users')
+            ->select('header', 'footer')
+            ->where('id', $id)
+            ->get();
+    }
+
     public function getGroupColours() { // /api/rpc/user/user/getgroupcolours
         return DB::table('usr_perm_module')
             ->select(

routes/class/board.php

@@ -8,3 +8,30 @@
 | These are the API routes corresponding to board.
 |
 */
+
+// Category
+Route::get('/api/rpc/board/category/getcategories', 'BoardController@getCategories');
+Route::get('/api/rpc/board/category/getcategory/{id}', 'BoardController@getCategory');
+Route::get('/api/rpc/board/category/getcategoryname/{id}', 'BoardController@getCategoryName');
+
+// Forum
+Route::get('/api/rpc/board/forum/getforumsincategory/{cat_id}', 'BoardController@getForumsInCategory');
+Route::get('/api/rpc/board/forum/getforums', 'BoardController@getForums');
+Route::get('/api/rpc/board/forum/getforum/{id}', 'BoardController@getForum');
+Route::get('/api/rpc/board/forum/getforumname/{id}', 'BoardController@getForumName');
+
+// Topic
+Route::get('/api/rpc/board/topic/gettopics/{cat}/{from}/{to}', 'BoardController@getTopics');
+Route::get('/api/rpc/board/topic/gettopicsunpinned/{cat}/{from}/{to}', 'BoardController@getTopicsUnpinned');
+Route::get('/api/rpc/board/topic/gettopicspinned/{cat}', 'BoardController@getTopicsPinned');
+Route::get('/api/rpc/board/topic/countunpinnedtopicsinforum/{for_id}', 'BoardController@countUnpinnedTopicsInForum');
+Route::get('/api/rpc/board/topic/gettopic/{cat}/{from}/{to}', 'BoardController@getTopic');
+Route::get('/api/rpc/board/topic/gettopiclock/{id}', 'BoardController@getTopicLock');
+Route::get('/api/rpc/board/topic/gettopicname/{id}', 'BoardController@getTopicName');
+
+// Post
+Route::get('/api/rpc/board/post/getpostsintopic/{top}/{from}/{to}', 'BoardController@getPostsInTopic');
+Route::get('/api/rpc/board/post/countpostsintopic/{top}', 'BoardController@countPostsInTopic');
+Route::get('/api/rpc/board/post/getpost/{id}', 'BoardController@getPost');
+Route::get('/api/rpc/board/post/getuserposts/{top}/{from}/{to}', 'BoardController@getuserPosts');
+Route::get('/api/rpc/board/post/getuserpost/{id}', 'BoardController@getuserPost');

routes/class/user.php

@@ -24,4 +24,5 @@ Route::get('/api/rpc/user/owner/getfilesofowner/{id}', 'OwnerController@getFiles
 // User
 Route::get('/api/rpc/user/user/getusers', 'UserController@getUsers');
 Route::get('/api/rpc/user/user/getuser/{id}', 'UserController@getUser');
+Route::get('/api/rpc/user/user/getpoststyle/{id}', 'UserController@getPostStyle');
 Route::get('/api/rpc/user/user/getgroupcolours', 'UserController@getGroupColours');

routes/web.php

@@ -16,7 +16,7 @@ header('Access-Control-Allow-Headers: "Origin, X-Requested-With, Content-Type, A
 
 Auth::routes();
 
-// require(__DIR__.'/class/board.php');
+require(__DIR__.'/class/board.php');
 // require(__DIR__.'/class/document.php');
 // require(__DIR__.'/class/image.php');
 // require(__DIR__.'/class/odb.php');