Skip to content

Commit 65b40cf

Browse files
carlbennettcarlbennett
committed
Move Content-Type from controllers to views
1 parent b70e041 commit 65b40cf

File tree

110 files changed

+517
-831
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+517
-831
lines changed

‎src/controllers/Comment/Create.php

+21-27
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
use \UnexpectedValueException;
1919

2020
class Create extends Controller {
21-
2221
public function &run(Router &$router, View &$view, array &$args) {
23-
2422
$model = new CreateModel();
2523

2624
$model->user = Authentication::$user;
@@ -31,34 +29,31 @@ public function &run(Router &$router, View &$view, array &$args) {
3129

3230
$code = 500;
3331
if (!$model->user) {
34-
$model->response = ["error" => "Unauthorized"];
32+
$model->response = ['error' => 'Unauthorized'];
3533
$code = 403;
36-
} else if ($router->getRequestMethod() !== "POST") {
37-
$router->setResponseHeader("Allow", "POST");
38-
$model->response = ["error" => "Method Not Allowed","allow" => ["POST"]];
34+
} else if ($router->getRequestMethod() !== 'POST') {
35+
$router->setResponseHeader('Allow', 'POST');
36+
$model->response = ['error' => 'Method Not Allowed','allow' => ['POST']];
3937
$code = 405;
4038
} else {
4139
$code = $this->createComment($router, $model);
4240
}
4341

4442
$view->render($model);
45-
4643
$model->_responseCode = $code;
47-
$model->_responseHeaders["Content-Type"] = $view->getMimeType();
4844

4945
if (!empty($model->origin) && $code >= 300 && $code <= 399) {
5046
$model->_responseHeaders['Location'] = $model->origin;
5147
}
5248

5349
return $model;
54-
5550
}
5651

5752
protected function createComment(Router &$router, CreateModel &$model) {
5853
$query = $router->getRequestBodyArray();
59-
$p_id = (isset($query["parent_id" ]) ? $query["parent_id" ] : null);
60-
$p_type = (isset($query["parent_type"]) ? $query["parent_type"] : null);
61-
$content = (isset($query["content" ]) ? $query["content" ] : null);
54+
$p_id = (isset($query['parent_id' ]) ? $query['parent_id' ] : null);
55+
$p_type = (isset($query['parent_type']) ? $query['parent_type'] : null);
56+
$content = (isset($query['content' ]) ? $query['content' ] : null);
6257

6358
if (!$model->acl_allowed) {
6459
$success = false;
@@ -70,37 +65,37 @@ protected function createComment(Router &$router, CreateModel &$model) {
7065
switch ($p_type) {
7166
case CommentLib::PARENT_TYPE_DOCUMENT: {
7267
$log_event_type = EventTypes::COMMENT_CREATED_DOCUMENT;
73-
$origin = "/document/";
68+
$origin = '/document/';
7469
break;
7570
}
7671
case CommentLib::PARENT_TYPE_COMMENT: {
7772
$log_event_type = EventTypes::COMMENT_CREATED_COMMENT;
78-
$origin = "/comment/";
73+
$origin = '/comment/';
7974
break;
8075
}
8176
case CommentLib::PARENT_TYPE_NEWS_POST: {
8277
$log_event_type = EventTypes::COMMENT_CREATED_NEWS;
83-
$origin = "/news/";
78+
$origin = '/news/';
8479
break;
8580
}
8681
case CommentLib::PARENT_TYPE_PACKET: {
8782
$log_event_type = EventTypes::COMMENT_CREATED_PACKET;
88-
$origin = "/packet/";
83+
$origin = '/packet/';
8984
break;
9085
}
9186
case CommentLib::PARENT_TYPE_SERVER: {
9287
$log_event_type = EventTypes::COMMENT_CREATED_SERVER;
93-
$origin = "/server/";
88+
$origin = '/server/';
9489
break;
9590
}
9691
case CommentLib::PARENT_TYPE_USER: {
9792
$log_event_type = EventTypes::COMMENT_CREATED_USER;
98-
$origin = "/user/";
93+
$origin = '/user/';
9994
break;
10095
}
101-
default: throw new UnexpectedValueException("Parent type: " . $p_type);
96+
default: throw new UnexpectedValueException('Parent type: ' . $p_type);
10297
}
103-
$origin = Common::relativeUrlToAbsolute($origin . $p_id . "#comments");
98+
$origin = Common::relativeUrlToAbsolute($origin . $p_id . '#comments');
10499
$model->origin = $origin;
105100

106101
if (empty($content)) {
@@ -114,19 +109,18 @@ protected function createComment(Router &$router, CreateModel &$model) {
114109
}
115110

116111
$model->response = [
117-
"content" => $content,
118-
"error" => ($success ? false : true),
119-
"origin" => $origin,
120-
"parent_id" => $p_id,
121-
"parent_type" => $p_type
112+
'content' => $content,
113+
'error' => ($success ? false : true),
114+
'origin' => $origin,
115+
'parent_id' => $p_id,
116+
'parent_type' => $p_type
122117
];
123118

124119
Logger::logEvent(
125120
$log_event_type, $model->user->getId(),
126-
getenv("REMOTE_ADDR"), json_encode($model->response)
121+
getenv('REMOTE_ADDR'), json_encode($model->response)
127122
);
128123

129124
return 303;
130125
}
131-
132126
}

‎src/controllers/Comment/Delete.php

+14-20
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@
2020
use \UnexpectedValueException;
2121

2222
class Delete extends Controller {
23-
2423
public function &run(Router &$router, View &$view, array &$args) {
25-
2624
$data = $router->getRequestQueryArray();
2725
$model = new CommentDeleteModel();
2826
$model->comment = null;
2927
$model->csrf_id = mt_rand();
3028
$model->csrf_token = CSRF::generate($model->csrf_id);
3129
$model->error = null;
32-
$model->id = (isset($data["id"]) ? $data["id"] : null);
30+
$model->id = (isset($data['id']) ? $data['id'] : null);
3331
$model->parent_id = null;
3432
$model->parent_type = null;
3533
$model->user = Authentication::$user;
@@ -44,42 +42,39 @@ public function &run(Router &$router, View &$view, array &$args) {
4442
));
4543

4644
if ($model->comment === null) {
47-
$model->error = "NOT_FOUND";
45+
$model->error = 'NOT_FOUND';
4846
} else {
4947
$model->content = $model->comment->getContent(true);
5048
$model->parent_type = $model->comment->getParentType();
5149
$model->parent_id = $model->comment->getParentId();
5250

53-
if ($router->getRequestMethod() == "POST") {
51+
if ($router->getRequestMethod() == 'POST') {
5452
$this->tryDelete($router, $model);
5553
}
5654
}
5755

5856
$view->render($model);
59-
6057
$model->_responseCode = ($model->acl_allowed ? 200 : 403);
61-
$model->_responseHeaders["Content-Type"] = $view->getMimeType();
62-
6358
return $model;
6459
}
6560

6661
protected function tryDelete(Router &$router, CommentDeleteModel &$model) {
6762
if (!isset($model->user)) {
68-
$model->error = "NOT_LOGGED_IN";
63+
$model->error = 'NOT_LOGGED_IN';
6964
return;
7065
}
7166
if (!$model->acl_allowed) {
72-
$model->error = "ACL_NOT_SET";
67+
$model->error = 'ACL_NOT_SET';
7368
return;
7469
}
7570

7671
$data = $router->getRequestBodyArray();
77-
$csrf_id = (isset($data["csrf_id" ]) ? $data["csrf_id" ] : null);
78-
$csrf_token = (isset($data["csrf_token"]) ? $data["csrf_token"] : null);
72+
$csrf_id = (isset($data['csrf_id' ]) ? $data['csrf_id' ] : null);
73+
$csrf_token = (isset($data['csrf_token']) ? $data['csrf_token'] : null);
7974
$csrf_valid = CSRF::validate($csrf_id, $csrf_token);
8075

8176
if (!$csrf_valid) {
82-
$model->error = "INVALID_CSRF";
77+
$model->error = 'INVALID_CSRF';
8378
return;
8479
}
8580
CSRF::invalidate($csrf_id);
@@ -125,22 +120,21 @@ protected function tryDelete(Router &$router, CommentDeleteModel &$model) {
125120
}
126121

127122
if (!$success) {
128-
$model->error = "INTERNAL_ERROR";
123+
$model->error = 'INTERNAL_ERROR';
129124
} else {
130125
$model->error = false;
131126
}
132127

133128
Logger::logEvent(
134129
$log_key,
135130
$user_id,
136-
getenv("REMOTE_ADDR"),
131+
getenv('REMOTE_ADDR'),
137132
json_encode([
138-
"error" => $model->error,
139-
"comment_id" => $id,
140-
"parent_type" => $parent_type,
141-
"parent_id" => $parent_id
133+
'error' => $model->error,
134+
'comment_id' => $id,
135+
'parent_type' => $parent_type,
136+
'parent_id' => $parent_id
142137
])
143138
);
144139
}
145-
146140
}

‎src/controllers/Comment/Edit.php

-3
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,7 @@ public function &run( Router &$router, View &$view, array &$args ) {
8686
}
8787

8888
$view->render( $model );
89-
9089
$model->_responseCode = ( $model->acl_allowed ? 200 : 403 );
91-
$model->_responseHeaders[ 'Content-Type' ] = $view->getMimeType();
92-
9390
return $model;
9491
}
9592

‎src/controllers/Credits.php

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,21 @@
44

55
use \BNETDocs\Libraries\Credits as CreditsLib;
66
use \BNETDocs\Models\Credits as CreditsModel;
7+
78
use \CarlBennett\MVC\Libraries\Common;
89
use \CarlBennett\MVC\Libraries\Controller;
910
use \CarlBennett\MVC\Libraries\Router;
1011
use \CarlBennett\MVC\Libraries\View;
1112

1213
class Credits extends Controller {
13-
1414
public function &run(Router &$router, View &$view, array &$args) {
15-
1615
$model = new CreditsModel();
1716

1817
$this->getCredits($model);
1918

2019
$view->render($model);
21-
2220
$model->_responseCode = 200;
23-
$model->_responseHeaders["Content-Type"] = $view->getMimeType();
24-
2521
return $model;
26-
2722
}
2823

2924
protected function getCredits(CreditsModel &$model) {
@@ -38,5 +33,4 @@ protected function getCredits(CreditsModel &$model) {
3833
$model->top_contributors_by_servers
3934
= &$credits->getTopContributorsByServers();
4035
}
41-
4236
}

‎src/controllers/Discord.php

+2-9
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,15 @@
1313
use \DateTimeZone;
1414

1515
class Discord extends Controller {
16-
17-
public function &run( Router &$router, View &$view, array &$args ) {
18-
16+
public function &run(Router &$router, View &$view, array &$args) {
1917
$model = new DiscordModel();
2018

2119
$model->discord_url = 'https://discord.gg/';
2220
$model->discord_url .= Common::$config->discord->invite_code;
2321
$model->discord_server_id = Common::$config->discord->server_id;
2422

25-
$view->render( $model );
26-
23+
$view->render($model);
2724
$model->_responseCode = 200;
28-
$model->_responseHeaders[ 'Content-Type' ] = $view->getMimeType();
29-
3025
return $model;
31-
3226
}
33-
3427
}

‎src/controllers/Document/Create.php

+19-26
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
use \CarlBennett\MVC\Libraries\View;
1818

1919
class Create extends Controller {
20-
2120
public function &run(Router &$router, View &$view, array &$args) {
22-
2321
$model = new DocumentCreateModel();
2422
$model->csrf_id = mt_rand();
2523
$model->csrf_token = CSRF::generate($model->csrf_id, 7200); // 2 hours
@@ -30,53 +28,49 @@ public function &run(Router &$router, View &$view, array &$args) {
3028
User::OPTION_ACL_DOCUMENT_CREATE
3129
));
3230

33-
if ($router->getRequestMethod() == "POST") {
31+
if ($router->getRequestMethod() == 'POST') {
3432
$this->handlePost($router, $model);
35-
} else if ($router->getRequestMethod() == "GET") {
33+
} else if ($router->getRequestMethod() == 'GET') {
3634
$model->markdown = true;
3735
}
3836

3937
$view->render($model);
40-
4138
$model->_responseCode = ($model->acl_allowed ? 200 : 403);
42-
$model->_responseHeaders["Content-Type"] = $view->getMimeType();
43-
4439
return $model;
45-
4640
}
4741

4842
protected function handlePost(Router &$router, DocumentCreateModel &$model) {
4943
if (!$model->acl_allowed) {
50-
$model->error = "ACL_NOT_SET";
44+
$model->error = 'ACL_NOT_SET';
5145
return;
5246
}
5347
if (!isset(Common::$database)) {
5448
Common::$database = DatabaseDriver::getDatabaseObject();
5549
}
5650
$data = $router->getRequestBodyArray();
57-
$csrf_id = (isset($data["csrf_id" ]) ? $data["csrf_id" ] : null);
58-
$csrf_token = (isset($data["csrf_token"]) ? $data["csrf_token"] : null);
51+
$csrf_id = (isset($data['csrf_id' ]) ? $data['csrf_id' ] : null);
52+
$csrf_token = (isset($data['csrf_token']) ? $data['csrf_token'] : null);
5953
$csrf_valid = CSRF::validate($csrf_id, $csrf_token);
60-
$title = (isset($data["title" ]) ? $data["title" ] : null);
61-
$markdown = (isset($data["markdown" ]) ? $data["markdown" ] : null);
62-
$content = (isset($data["content" ]) ? $data["content" ] : null);
63-
$publish = (isset($data["publish" ]) ? $data["publish" ] : null);
64-
$save = (isset($data["save" ]) ? $data["save" ] : null);
54+
$title = (isset($data['title' ]) ? $data['title' ] : null);
55+
$markdown = (isset($data['markdown' ]) ? $data['markdown' ] : null);
56+
$content = (isset($data['content' ]) ? $data['content' ] : null);
57+
$publish = (isset($data['publish' ]) ? $data['publish' ] : null);
58+
$save = (isset($data['save' ]) ? $data['save' ] : null);
6559

6660
$model->title = $title;
6761
$model->markdown = $markdown;
6862
$model->content = $content;
6963

7064
if (!$csrf_valid) {
71-
$model->error = "INVALID_CSRF";
65+
$model->error = 'INVALID_CSRF';
7266
return;
7367
}
7468
CSRF::invalidate($csrf_id);
7569

7670
if (empty($title)) {
77-
$model->error = "EMPTY_TITLE";
71+
$model->error = 'EMPTY_TITLE';
7872
} else if (empty($content)) {
79-
$model->error = "EMPTY_CONTENT";
73+
$model->error = 'EMPTY_CONTENT';
8074
}
8175

8276
$options_bitmask = 0;
@@ -100,22 +94,21 @@ protected function handlePost(Router &$router, DocumentCreateModel &$model) {
10094
}
10195

10296
if (!$success) {
103-
$model->error = "INTERNAL_ERROR";
97+
$model->error = 'INTERNAL_ERROR';
10498
} else {
10599
$model->error = false;
106100
}
107101

108102
Logger::logEvent(
109103
EventTypes::DOCUMENT_CREATED,
110104
$user_id,
111-
getenv("REMOTE_ADDR"),
105+
getenv('REMOTE_ADDR'),
112106
json_encode([
113-
"error" => $model->error,
114-
"options_bitmask" => $options_bitmask,
115-
"title" => $title,
116-
"content" => $content,
107+
'error' => $model->error,
108+
'options_bitmask' => $options_bitmask,
109+
'title' => $title,
110+
'content' => $content,
117111
])
118112
);
119113
}
120-
121114
}

0 commit comments

Comments
 (0)