Merge branch 'master' of git.076.ne.jp:076/community/076Server into markread

app/Http/Controllers/BoardController.php

@@ -178,6 +178,121 @@ class BoardController extends Controller {
             ->get();
     }
 
+    public function getBookmarks(Request $request) { // /api/rpc/board/forum/getbookmarks
+        $check = $this->objAuth->checkLegit($request->username, $request->password);
+
+        if ($check == 0) {
+            return '';
+        }
+        else {
+            $valid = $this->objAuth->getPermissions($request->username, $request->password);
+
+            if ($valid['for_canview'] == 1) {
+                $for = DB::table('for_bookmarks')
+                    ->join('for_forums', 'for_forums.id', 'for_bookmarks.for_id')
+                    ->join('for_category', 'for_forums.cat_id', 'for_category.id')
+                    ->where('for_bookmarks.user_id', $check)
+                    ->get(array(
+                        'for_forums.id as fid',
+                        'for_forums.title as ftitle',
+                        'for_category.title as fctitle'
+                    ));
+
+                $top = DB::table('for_bookmarks')
+                    ->join('for_threads', 'for_threads.id', 'for_bookmarks.top_id')
+                    ->where('for_bookmarks.user_id', $check)
+                    ->get(array(
+                        'for_threads.id as tid',
+                        'for_threads.title as ttitle'
+                    ));
+
+                $forS = array();
+
+                foreach($for as $f) {
+                    $forS[] = array(
+                        'id' => $f->fid,
+                        'type' => 'forum',
+                        'title' => $f->fctitle.'/'.$f->ftitle
+                    );
+                }
+
+                foreach($top as $t) {
+                    $forS[] = array(
+                        'id' => $t->tid,
+                        'type' => 'topic',
+                        'title' => $t->ttitle
+                    );
+                }
+
+                return $forS;
+            }
+            else {
+                return 'Permission denied!';
+            }
+        }
+    }
+
+    public function addBookmark(Request $request) { // /api/rpc/board/forum/addbookmark
+        $check = $this->objAuth->checkLegit($request->username, $request->password);
+
+        if ($check == 0) {
+            return '';
+        }
+        else {
+            $valid = $this->objAuth->getPermissions($request->username, $request->password);
+
+            if ($valid['for_editown'] == 1) {
+                DB::table('for_bookmarks')
+                    ->insert([
+                        'user_id' => $check,
+                        'for_id' => $request->for_id,
+                        'top_id' => $request->top_id
+                    ]);
+
+                return 'Success!';
+            }
+            else {
+                return 'Permission denied!';
+            }
+        }
+    }
+
+    public function delBookmark(Request $request) { // /api/rpc/board/forum/delbookmark
+        $check = $this->objAuth->checkLegit($request->username, $request->password);
+
+        if ($check == 0) {
+            return '';
+        }
+        else {
+            $valid = $this->objAuth->getPermissions($request->username, $request->password);
+
+            if ($valid['for_editown'] == 1) {
+                if (isset($request->for_id)) {
+                    DB::table('for_bookmarks')
+                        ->where('user_id', $check)
+                        ->where('for_id', $request->for_id)
+                        ->delete();
+
+                    return 'Success!';
+                }
+                else if (isset($request->top_id)) {
+                    $res = DB::table('for_bookmarks')
+                        ->where('user_id', $check)
+                        ->where('top_id', $request->top_id)
+                        ->delete();
+
+                    return 'Success!';
+                }
+                else {
+                    return 'Cannot do that.';
+                }
+            }
+            else {
+                return 'Permission denied!';
+            }
+        }
+    }
+
     public function addForum(Request $request) { // /api/rpc/board/forum/add
         $check = $this->objAuth->checkLegit($request->username, $request->password);
 

routes/class/board.php

@@ -14,7 +14,6 @@ Route::get('/api/rpc/board/category/getcategories', 'BoardController@getCategori
 Route::get('/api/rpc/board/category/getcategory/{id}', 'BoardController@getCategory');
 Route::get('/api/rpc/board/category/getcategoryname/{id}', 'BoardController@getCategoryName');
 
-Route::post('/api/rpc/board/category/getreadcategories', 'BoardController@getReadCategories');
 Route::post('/api/rpc/board/category/add', 'BoardController@addCategory');
 Route::post('/api/rpc/board/category/edit', 'BoardController@editCategory');
 Route::post('/api/rpc/board/category/delete', 'BoardController@deleteCategory');
@@ -26,13 +25,13 @@ Route::get('/api/rpc/board/forum/getforum/{id}', 'BoardController@getForum');
 Route::get('/api/rpc/board/forum/getforumname/{id}', 'BoardController@getForumName');
 Route::get('/api/rpc/board/forum/getpostcountfreeze/{id}', 'BoardController@getPostCountFreeze');
 Route::get('/api/rpc/board/forum/getreadonly/{id}', 'BoardController@getReadOnly');
+Route::get('/api/rpc/board/forum/getbookmarks', 'BoardController@getBookmarks');
 
-Route::post('/api/rpc/board/forum/getreadforums', 'BoardController@getReadForums');
-Route::post('/api/rpc/board/topic/markforumread/{id}', 'BoardController@markForumRead');
 Route::post('/api/rpc/board/forum/add', 'BoardController@addForum');
 Route::post('/api/rpc/board/forum/edit', 'BoardController@editForum');
 Route::post('/api/rpc/board/forum/delete', 'BoardController@deleteForum');
-Route::post('/api/rpc/board/forum/bookmark', 'BoardController@bookmarkForum');
+Route::post('/api/rpc/board/forum/addbookmark', 'BoardController@addBookmark');
+Route::post('/api/rpc/board/forum/delbookmark', 'BoardController@delBookmark');
 
 // Topic
 Route::get('/api/rpc/board/topic/gettopics/{for}/{from}/{to}', 'BoardController@getTopics');
@@ -46,8 +45,6 @@ Route::get('/api/rpc/board/topic/gettopiclock/{id}', 'BoardController@getTopicLo
 Route::get('/api/rpc/board/topic/getforumidfromtopic/{top_id}', 'BoardController@getForumIdFromTopic');
 Route::get('/api/rpc/board/topic/gettopicname/{id}', 'BoardController@getTopicName');
 
-Route::post('/api/rpc/board/topic/getreadtopics', 'BoardController@getReadTopics');
-Route::post('/api/rpc/board/topic/marktopicread/{id}', 'BoardController@markTopicRead');
 Route::post('/api/rpc/board/topic/addtopic', 'BoardController@addTopic');
 Route::post('/api/rpc/board/topic/lock', 'BoardController@lockTopic');
 Route::post('/api/rpc/board/topic/unlock', 'BoardController@unlockTopic');