Home Explore Help
Sign In
KarmaSolutions
/
KarmaFW
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

dev 2020-11

Max F 5 years ago
parent
a09bfd9920
commit
b034fe6a09
6 changed files with 14 additions and 14 deletions
Split View Show Diff Stats
  1. 1 1
      src/App/Middlewares/AuthBasic.php
  2. 2 2
      src/App/Middlewares/ErrorHandler.php
  3. 3 3
      src/App/Middlewares/UrlRouter.php
  4. 1 1
      src/Kernel.php
  5. 2 2
      src/Routing/Controllers/WebAppController.php
  6. 5 5
      src/Routing/Router.php

+ 1 - 1
src/App/Middlewares/AuthBasic.php
View File 

@@ -38,7 +38,7 @@ class AuthBasic
 
         } else {
 
             $response->addHeader('WWW-Authenticate', 'Basic realm="My Realm"');
 
             $body = "Accès interdit";
 
-            return $response->setHtml($body, 401);
 
+            return $response->html($body, 401);
 
         }
 
     
     }

+ 2 - 2
src/App/Middlewares/ErrorHandler.php
View File 

@@ -51,7 +51,7 @@ class ErrorHandler
 
             /*
 
             if ($error_code == 404) {
 
                 // case moved to UrlRouter
 
-                $response->setStatus(404)->setHtml($error_message);
 
+                $response->setStatus(404)->html($error_message);
 
             }
 
             */
 
 
@@ -75,7 +75,7 @@ class ErrorHandler
 
                 $response_content = '<title>' . $title . '</title><h1>' . $title . '</h1><p>' . $message . '</p>';
 
             }
 
 
-            $response->setHtml($response_content, $http_code);
 
+            $response->html($response_content, $http_code);
 
         }
 
 
         return $response;

+ 3 - 3
src/App/Middlewares/UrlRouter.php
View File 

@@ -68,7 +68,7 @@ class UrlRouter
 
 
 	        // CODE 200
 
 			if ($error_code === 200) {
 
-				return $response->setHtml($error_message, $error_code);
 
+				return $response->html($error_message, $error_code);
 
 			}
 
 
 
@@ -86,7 +86,7 @@ class UrlRouter
 
 				if (empty($error_message)) {
 
 					$error_message = '<title>Not Found</title><h1>Not Found</h1><p>Page not Found</p>';
 
 				}
 
-				return $response->setHtml($error_message, $error_code);
 
+				return $response->html($error_message, $error_code);
 
 			}
 
 
 
@@ -113,7 +113,7 @@ class UrlRouter
 
 
 
 			// else => error 500
 
-			$response->setHtml($response_content, 500);
 
+			$response->html($response_content, 500);
 
 		}
 
 
 		return $response;

+ 1 - 1
src/Kernel.php
View File 

@@ -170,7 +170,7 @@ class Kernel
 
             }
 
 
             //throw $e;
 
-            $response->setHtml($content, 500);
 
+            $response->html($content, 500);
 
 		}
 
 
 		return $response;

+ 2 - 2
src/Routing/Controllers/WebAppController.php
View File 

@@ -97,7 +97,7 @@ class WebAppController extends AppController
 
 			}
 
 
 			//$template->display($error_template);
 
-			return $this->response->setHtml( $template->fetch($error_template) , $http_status);
 
+			return $this->response->html( $template->fetch($error_template) , $http_status);
 
 
 		} else {
 
 			//header("HTTP/1.0 " . $http_status . " " . $meta_title);
 
@@ -121,7 +121,7 @@ class WebAppController extends AppController
 
 
 			//echo $output_html;
 
 
-			return $this->response->setHtml($output_html, $http_status);
 
+			return $this->response->html($output_html, $http_status);
 
 		}
 
 
 	}

+ 5 - 5
src/Routing/Router.php
View File 

@@ -282,7 +282,7 @@ class Router
 
 						return $response;
 
 					}
 
 
-					return $response->setHtml('<h1>Page not Found</h1><p>Warning: route found but no callback defined</p>', 404);
 
+					return $response->html('<h1>Page not Found</h1><p>Warning: route found but no callback defined</p>', 404);
 
 
 				} else if (is_callable($callback)) {
 
 					// OK !
 
@@ -309,7 +309,7 @@ class Router
 
 						continue;
 
 					}
 
 
-					return $response->setHtml('<h1>Page not Found</h1><p>Warning: route callback is not callable</p>', 404);
 
+					return $response->html('<h1>Page not Found</h1><p>Warning: route callback is not callable</p>', 404);
 
 				}
 
 
 			}
 
@@ -318,7 +318,7 @@ class Router
 
 
 		// no matching route
 
 		//return false;
 
-		return $response->setHtml('<h1>Page not Found</h1><p>Warning: no matching route</p>', 404);
 
+		return $response->html('<h1>Page not Found</h1><p>Warning: no matching route</p>', 404);
 
 	}
 
 
 
@@ -391,11 +391,11 @@ class Router
 
 			$response = $route_response;
 
 
 		} else if ($route_response) {
 
-			return $response->setHtml('<html><body><h1>Server Error</h1><p>Error: $response is not a Response</p></body></html>', 404);
 
+			return $response->html('<html><body><h1>Server Error</h1><p>Error: $response is not a Response</p></body></html>', 404);
 
 
 		} else {
 
 			if (! $response->getContentLength()) {
 
-				//return $response->setHtml('<html><body><h1>Server Error</h1><p>Error: $response is empty</p></body></html>', 404);
 
+				//return $response->html('<html><body><h1>Server Error</h1><p>Error: $response is empty</p></body></html>', 404);
 
 			}
 
 		}