Remove _responseTTL from all controllers

carlbennett · carlbennett · commit b70e041e1cdc · 2020-01-01T19:36:06.000Z
diff --git a/src/controllers/Comment/Create.php b/src/controllers/Comment/Create.php
@@ -45,7 +45,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = $code;
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     if (!empty($model->origin) && $code >= 300 && $code <= 399) {
       $model->_responseHeaders['Location'] = $model->origin;
diff --git a/src/controllers/Comment/Delete.php b/src/controllers/Comment/Delete.php
@@ -59,7 +59,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = ($model->acl_allowed ? 200 : 403);
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
   }
diff --git a/src/controllers/Comment/Edit.php b/src/controllers/Comment/Edit.php
@@ -89,7 +89,6 @@ public function &run( Router &$router, View &$view, array &$args ) {
 
     $model->_responseCode = ( $model->acl_allowed ? 200 : 403 );
     $model->_responseHeaders[ 'Content-Type' ] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
   }
diff --git a/src/controllers/Credits.php b/src/controllers/Credits.php
@@ -21,7 +21,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Discord.php b/src/controllers/Discord.php
@@ -26,7 +26,6 @@ public function &run( Router &$router, View &$view, array &$args ) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders[ 'Content-Type' ] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Document/Create.php b/src/controllers/Document/Create.php
@@ -40,7 +40,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = ($model->acl_allowed ? 200 : 403);
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Document/Delete.php b/src/controllers/Document/Delete.php
@@ -54,7 +54,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = ($model->acl_allowed ? 200 : 403);
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Document/Edit.php b/src/controllers/Document/Edit.php
@@ -65,7 +65,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = ($model->acl_allowed ? 200 : 403);
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Document/Index.php b/src/controllers/Document/Index.php
@@ -95,7 +95,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Document/Popular.php b/src/controllers/Document/Popular.php
@@ -18,7 +18,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Document/Search.php b/src/controllers/Document/Search.php
@@ -18,7 +18,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Document/View.php b/src/controllers/Document/View.php
@@ -37,7 +37,6 @@ public function &run(Router &$router, ViewLib &$view, array &$args) {
 
     $model->_responseCode = ($model->document ? 200 : 404);
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Donate.php b/src/controllers/Donate.php
@@ -21,7 +21,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/EventLog/Index.php b/src/controllers/EventLog/Index.php
@@ -85,7 +85,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = ($model->acl_allowed ? 200 : 403);
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/EventLog/View.php b/src/controllers/EventLog/View.php
@@ -51,7 +51,6 @@ public function &run( Router &$router, ViewMVC &$view, array &$args ) {
     );
 
     $model->_responseHeaders['Content-Type'] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Legacy.php b/src/controllers/Legacy.php
@@ -61,7 +61,6 @@ public function &run(Router &$router, View &$view, array &$args) {
     $model->_responseCode = $code;
     $model->_responseHeaders['Content-Type'] = $view->getMimeType();
     $model->_responseHeaders['Location'] = $model->url;
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Legal.php b/src/controllers/Legal.php
@@ -38,7 +38,6 @@ public function &run( Router &$router, View &$view, array &$args ) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders[ 'Content-Type' ] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Maintenance.php b/src/controllers/Maintenance.php
@@ -18,7 +18,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = 503;
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/News.php b/src/controllers/News.php
@@ -46,7 +46,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/News/Create.php b/src/controllers/News/Create.php
@@ -52,7 +52,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = ($model->acl_allowed ? 200 : 403);
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/News/Delete.php b/src/controllers/News/Delete.php
@@ -54,7 +54,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = ($model->acl_allowed ? 200 : 403);
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/News/Edit.php b/src/controllers/News/Edit.php
@@ -79,7 +79,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = ($model->acl_allowed ? 200 : 403);
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/News/View.php b/src/controllers/News/View.php
@@ -34,7 +34,6 @@ public function &run(Router &$router, ViewLib &$view, array &$args) {
 
     $model->_responseCode = ($model->news_post ? 200 : 404);
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Packet/Delete.php b/src/controllers/Packet/Delete.php
@@ -55,7 +55,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = ($model->acl_allowed ? 200 : 403);
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Packet/Edit.php b/src/controllers/Packet/Edit.php
@@ -75,7 +75,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = ($model->acl_allowed ? 200 : 403);
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Packet/Index.php b/src/controllers/Packet/Index.php
@@ -91,7 +91,6 @@ public function &run( Router &$router, View &$view, array &$args ) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Packet/Popular.php b/src/controllers/Packet/Popular.php
@@ -18,7 +18,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Packet/Search.php b/src/controllers/Packet/Search.php
@@ -41,7 +41,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Packet/View.php b/src/controllers/Packet/View.php
@@ -45,7 +45,6 @@ public function &run(Router &$router, ViewLib &$view, array &$args) {
 
     $model->_responseCode = ($model->packet ? 200 : 404);
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/PageNotFound.php b/src/controllers/PageNotFound.php
@@ -17,7 +17,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = 404;
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/RedirectSoft.php b/src/controllers/RedirectSoft.php
@@ -20,7 +20,6 @@ public function &run(Router &$router, View &$view, array &$args) {
     $model->_responseCode                    = 302;
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
     $model->_responseHeaders["Location"]     = $model->location;
-    $model->_responseTTL                     = 0;
 
     return $model;
 
diff --git a/src/controllers/Server/UpdateJob.php b/src/controllers/Server/UpdateJob.php
@@ -85,7 +85,6 @@ public function &run( Router &$router, ViewLib &$view, array &$args ) {
     $view->render( $model );
 
     $model->_responseHeaders[ 'Content-Type' ] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Server/View.php b/src/controllers/Server/View.php
@@ -35,7 +35,6 @@ public function &run( Router &$router, ViewLib &$view, array &$args ) {
 
     $model->_responseCode = ( $model->server ? 200 : 404 );
     $model->_responseHeaders['Content-Type'] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Servers.php b/src/controllers/Servers.php
@@ -22,7 +22,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Status.php b/src/controllers/Status.php
@@ -32,7 +32,6 @@ public function &run( Router &$router, View &$view, array &$args ) {
 
     $model->_responseCode = $code;
     $model->_responseHeaders['Content-Type'] = $view->getMimeType();
-    $model->_responseTTL = 300;
 
     return $model;
 
diff --git a/src/controllers/User/ChangePassword.php b/src/controllers/User/ChangePassword.php
@@ -31,7 +31,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/User/CreatePassword.php b/src/controllers/User/CreatePassword.php
@@ -26,7 +26,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
   }
diff --git a/src/controllers/User/Index.php b/src/controllers/User/Index.php
@@ -88,7 +88,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders['Content-Type'] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/User/Login.php b/src/controllers/User/Login.php
@@ -32,7 +32,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/User/Logout.php b/src/controllers/User/Logout.php
@@ -30,7 +30,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/User/Register.php b/src/controllers/User/Register.php
@@ -51,7 +51,6 @@ public function &run(Router &$router, View &$view, array &$args) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/User/ResetPassword.php b/src/controllers/User/ResetPassword.php
@@ -66,7 +66,6 @@ public function &run( Router &$router, View &$view, array &$args ) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders[ 'Content-Type' ] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/User/Update.php b/src/controllers/User/Update.php
@@ -459,7 +459,6 @@ public function &run(Router &$router, View &$view, array &$args) {
     $view->render($model);
 
     $model->_responseHeaders['Content-Type'] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
   }
diff --git a/src/controllers/User/Verify.php b/src/controllers/User/Verify.php
@@ -65,7 +65,6 @@ public function &run( Router &$router, View &$view, array &$args ) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders[ 'Content-Type' ] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/User/View.php b/src/controllers/User/View.php
@@ -32,7 +32,6 @@ public function &run(Router &$router, ViewLib &$view, array &$args) {
 
     $model->_responseCode = ($model->user ? 200 : 404);
     $model->_responseHeaders["Content-Type"] = $view->getMimeType();
-    $model->_responseTTL = 0;
 
     return $model;
 
diff --git a/src/controllers/Welcome.php b/src/controllers/Welcome.php
@@ -18,7 +18,6 @@ public function &run( Router &$router, View &$view, array &$args ) {
 
     $model->_responseCode = 200;
     $model->_responseHeaders['Content-Type'] = $view->getMimeType();
-    $model->_responseTTL = 300;
 
     return $model;
 

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@ public function &run(Router &$router, View &$view, array &$args) {`
`59`	`59`
`60`	`60`	`$model->_responseCode = ($model->acl_allowed ? 200 : 403);`
`61`	`61`	`$model->_responseHeaders["Content-Type"] = $view->getMimeType();`
`62`		`- $model->_responseTTL = 0;`
`63`	`62`
`64`	`63`	`return $model;`
`65`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ public function &run( Router &$router, View &$view, array &$args ) {`
`89`	`89`
`90`	`90`	`$model->_responseCode = ( $model->acl_allowed ? 200 : 403 );`
`91`	`91`	`$model->_responseHeaders[ 'Content-Type' ] = $view->getMimeType();`
`92`		`- $model->_responseTTL = 0;`
`93`	`92`
`94`	`93`	`return $model;`
`95`	`94`	`}`