Skip to content
Permalink
Browse files

merge framework ?NRE?

  • Loading branch information
coderkun committed May 28, 2016
2 parents 16e5957 + 7b44e19 commit 8353cfc7d9595b01c15747d030d5e96693481630
Showing with 19 additions and 8 deletions.
  1. +2 −0 .htaccess
  2. +3 −3 core/Agent.inc
  3. +1 −1 core/ClassLoader.inc
  4. +4 −4 requests/WebRequest.inc
  5. +9 −0 www/.htaccess
@@ -4,6 +4,8 @@ ErrorDocument 403 /www/error403.html
ErrorDocument 404 /www/error404.html
ErrorDocument 500 /www/error500.html

AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css application/javascript text/javascript



<IfModule mod_authz_core.c>
@@ -107,7 +107,7 @@
* @throws \nre\exceptions\ControllerNotFoundException
* @param string $agentName Name of the Agent to instantiate
* @param Request $request Current request
* @param Response $respone Current respone
* @param Response $response Current respone
* @param Logger $log Log-system
*/
public static function factory($agentName, Request $request, Response $response, Logger $log=null)
@@ -165,7 +165,7 @@
* @throws \nre\exceptions\ControllerNotValidException
* @throws \nre\exceptions\ControllerNotFoundException
* @param Request $request Current request
* @param Response $respone Current response
* @param Response $response Current response
* @param Logger $log Log-system
*/
protected function __construct(Request $request, Response $response, Logger $log=null)
@@ -502,7 +502,7 @@
*
* @param array $subAgent Original (Sub-) Agent
* @param Request $request Current request
* @param Excepiton $exception Occurred exception
* @param Exception $exception Occurred exception
* @return array InlineError-SubAgent
*/
private function errorInline($subAgent, $request, $exception)
@@ -27,7 +27,7 @@
* Load a class.
*
* @throws \nre\exceptions\ClassNotFoundException
* @param string $className Name of the class to load
* @param string $fullClassName Name of the class to load
*/
public static function load($fullClassName)
{
@@ -275,21 +275,21 @@
*/
private function detectRequest()
{
// URL ermitteln
// Get URL
$url = isset($_GET) && array_key_exists('url', $_GET) ? $_GET['url'] : '';
$url = trim($url, '/');
// Routes anwenden
// Apply routes
$url = $this->applyRoutes($url, $this->routes);
// URL splitten
// Split URL
$params = explode('/', $url);
if(empty($params[0])) {
$params = array();
}
// Parameter speichern
// Save parameters
$this->params = $params;
}
@@ -1,3 +1,12 @@
<IfModule mod_expires.c>
AddType text/javascript .js

ExpiresActive on
ExpiresByType image/png "access plus 1 week"
ExpiresByType image/jpeg "access plus 1 week"
ExpiresByType text/javascript "access plus 1 week"
</IfModule>

<IfModule mod_rewrite.c>
RewriteEngine On

0 comments on commit 8353cfc

Please sign in to comment.
You can’t perform that action at this time.