絵文字、セキュリティなど

app/Http/Controllers/BoardController.php

@@ -808,7 +808,7 @@ class BoardController extends Controller {
             ->get($getting);
     }
 
-    public function addTopic(Request $request) { // /api/rpc/board/topic/addtopic
+    public function addTopic(Request $request) { // /api/rpc/board/topic/add
         $check = $this->objAuth->checkLegit($request->username, $request->password);
 
         if ($check == 0) {
@@ -818,6 +818,14 @@ class BoardController extends Controller {
             $valid = $this->objAuth->getPermissions($request->username, $request->password);
 
             if ($valid['for_post'] == 1) {
+              $fpc = $this->getPostCountFreeze($request->for_id);
+
+              if ($fpc === 0) {
+                $next = $this->getNextPostCount($check);
+              }
+              else {
+                $next = 0;
+              }
                 $addTopic = DB::table('for_threads')
                     ->insertGetId([
                         'for_id' => $request->for_id,
@@ -845,11 +853,7 @@ class BoardController extends Controller {
                         'ipaddress' => $request->ipaddress,
                         'delreason' => '',
                         'nolayout' => $request->nolayout,
-                        'postcount' => $request->postcount,
-                        // Deprecated: remove like and read stuff after full release!
-                        'likes' => 0,
-                        'likers' => '',
-                        'read' => ''
+                        'postcount' => $next
                     ]);
 
                 return $addTopic;
@@ -860,7 +864,7 @@ class BoardController extends Controller {
         }
     }
 
-    public function addPost(Request $request) { // /api/rpc/board/post/addpost
+    public function addPost(Request $request) { // /api/rpc/board/post/add
         $check = $this->objAuth->checkLegit($request->username, $request->password);
 
         if ($check == 0) {
@@ -870,6 +874,14 @@ class BoardController extends Controller {
             $valid = $this->objAuth->getPermissions($request->username, $request->password);
 
             if ($valid['for_post'] == 1) {
+              $fpc = $this->getPostCountFreeze($request->for_id);
+
+              if ($fpc === 0) {
+                $next = $this->getNextPostCount($check);
+              }
+              else {
+                $next = 0;
+              }
                 $add = DB::table('for_posts')
                     ->insert([
                         'top_id' => $request->top_id,
@@ -881,11 +893,7 @@ class BoardController extends Controller {
                         'ipaddress' => $request->ipaddress,
                         'delreason' => '',
                         'nolayout' => $request->nolayout,
-                        'postcount' => $request->postcount,
-                        // Deprecated: remove like and read stuff after full release!
-                        'likes' => 0,
-                        'likers' => '',
-                        'read' => ''
+                        'postcount' => $next
                     ]);
 
                 return \Response::json($add);
@@ -896,7 +904,7 @@ class BoardController extends Controller {
         }
     }
 
-    public function editPost(Request $request) { // /api/rpc/board/post/editpost
+    public function editPost(Request $request) { // /api/rpc/board/post/edit
         $check = $this->objAuth->checkLegit($request->username, $request->password);
 
         if ($check == 0) {
@@ -917,7 +925,7 @@ class BoardController extends Controller {
         }
     }
 
-    public function deletePost(Request $request) { // /api/rpc/board/post/deletepost
+    public function deletePost(Request $request) { // /api/rpc/board/post/delete
         $check = $this->objAuth->checkLegit($request->username, $request->password);
 
         if ($check == 0) {
@@ -1261,7 +1269,7 @@ class BoardController extends Controller {
         
     }
 
-    public function undeletePost(Request $request) { // /api/rpc/board/post/undeletepost
+    public function undeletePost(Request $request) { // /api/rpc/board/post/undelete
         $check = $this->objAuth->checkLegit($request->username, $request->password);
 
         if ($check == 0) {
@@ -1657,8 +1665,8 @@ class BoardController extends Controller {
 
         foreach ($get as $g) {
             $res[] = array(
-                'value' => $g->text,
-                'label' => "<img src='".$domain.$kusa.$g->image."' width='20px' height='20px />'"
+                'val' => $g->text,
+                'url' => $domain.$kusa.$g->image
             );
         }
 

routes/class/board.php

@@ -46,7 +46,7 @@ Route::get('/api/rpc/board/topic/getforumidfromtopic/{top_id}', 'BoardController
 Route::get('/api/rpc/board/topic/gettopicname/{id}', 'BoardController@getTopicName');
 
 Route::post('/api/rpc/board/topic/read', 'BoardController@readTopic');
-Route::post('/api/rpc/board/topic/addtopic', 'BoardController@addTopic');
+Route::post('/api/rpc/board/topic/add', 'BoardController@addTopic');
 Route::post('/api/rpc/board/topic/lock', 'BoardController@lockTopic');
 Route::post('/api/rpc/board/topic/unlock', 'BoardController@unlockTopic');
 Route::post('/api/rpc/board/topic/merge', 'BoardController@mergeTopic');
@@ -70,10 +70,10 @@ Route::get('/api/rpc/board/post/gettopicstart/{top_id}', 'BoardController@getTop
 Route::get('/api/rpc/board/post/getlastpost/{top_id}', 'BoardController@getLastPost');
 Route::get('/api/rpc/board/post/getfirstandlastposts/{top_id}', 'BoardController@getFirstAndLastPosts');
 
-Route::post('/api/rpc/board/post/addpost', 'BoardController@addPost');
-Route::post('/api/rpc/board/post/editpost', 'BoardController@editPost');
-Route::post('/api/rpc/board/post/deletepost', 'BoardController@deletePost');
-Route::post('/api/rpc/board/post/undeletepost', 'BoardController@undeletePost');
+Route::post('/api/rpc/board/post/add', 'BoardController@addPost');
+Route::post('/api/rpc/board/post/edit', 'BoardController@editPost');
+Route::post('/api/rpc/board/post/delete', 'BoardController@deletePost');
+Route::post('/api/rpc/board/post/undelete', 'BoardController@undeletePost');
 Route::post('/api/rpc/board/post/split', 'BoardController@splitPost');
 
 // Compiled routes.