Home Explore Help
Register Sign In
Omnimaga
/
bugs
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

submodule, better error handling, router and response class enhancements

Nathaniel van Diepen 9 years ago
parent
06d2232b2c
commit
f2d1b1909e
10 changed files with 62 additions and 27 deletions
Unified View Show Diff Stats
  1. 3 0
      .gitmodules
  2. 19 22
      index.php
  3. 1 0
      js/juju
  4. 3 0
      js/user.js
  5. 1 1
      lib/response.class.php
  6. 6 0
      lib/router.class.php
  7. 6 2
      lib/user.class.php
  8. 2 2
      paths/user.php
  9. 15 0
      templates/error.php
  10. 6 0
      templates/user.php

+ 3 - 0
.gitmodules
View File 

@@ -0,0 +1,3 @@
 
+[submodule "js/juju"]
 
+	path = js/juju
 
+	url = https://github.com/Eeems/juju.git

+ 19 - 22
index.php
View File 

@@ -2,35 +2,32 @@
 
 	error_reporting(E_ALL);
 
 	error_reporting(E_ALL);
 
 	ini_set('display_errors', 'Off');
 
 	ini_set('display_errors', 'Off');
 
 	set_error_handler(function($errno, $errstr, $errfile, $errline){
 
 	set_error_handler(function($errno, $errstr, $errfile, $errline){
 
-		header('Content-Type: application/json');
 
-		die(
 
-			json_encode(
 
-				array(
 
-					'number'=> $errno,
 
-					'msg'=> $errstr,
 
-					'file'=> $errfile,
 
-					'line'=> $errline,
 
+		Router::write(
 
+			Bugs::template('error')
 
+				->run(new Arguments(array(
 
+					'error'=> array(
 
+						'type'=> $errno,
 
+						'message'=> $errstr,
 
+						'file'=> $errfile,
 
+						'line'=> $errline
 
+					),
 
 					'backtrace'=> debug_backtrace(),
 
 					'backtrace'=> debug_backtrace(),
 
 					'included'=> get_included_files()
 
 					'included'=> get_included_files()
 
-				)
 
-			)
 
+				)))
 
 		);
 
 		);
 
+		die();
 
 	},E_ALL);
 
 	},E_ALL);
 
 	register_shutdown_function(function(){
 
 	register_shutdown_function(function(){
 
 		$error = error_get_last();
 
 		$error = error_get_last();
 
-		if ($error['type'] == 1) {
 
-			header('Content-Type: application/json');
 
-			die(
 
-				json_encode(
 
-					array(
 
-						'number'=> $error['type'],
 
-						'msg'=> $error['message'],
 
-						'file'=> $error['file'],
 
-						'line'=> $error['line'],
 
-						'backtrace'=> array(),
 
+		if(!is_null($error) && $error['type'] == 1){
 
+			Router::clear();
 
+			Router::write(
 
+				Bugs::template('error')
 
+					->run(new Arguments(array(
 
+						'error'=> $error,
 
+						'backtrace'=> debug_backtrace(),
 
 						'included'=> get_included_files()
 
 						'included'=> get_included_files()
 
-					)
 
-				)
 
+					)))
 
 			);
 
 			);
 
 		} 
 		} 
 	});
 
 	});

+ 1 - 0
js/juju 

@@ -0,0 +1 @@
 
+Subproject commit 51685e6c9f4c2429e6567bf2aab6df1dc8f6ef69

+ 3 - 0
js/user.js
View File 

@@ -0,0 +1,3 @@
 
+(function(){
 
+	
+});

+ 1 - 1
lib/response.class.php
View File 

@@ -16,7 +16,7 @@
 
 			if($this->open){
 
 			if($this->open){
 
 				$this->body = '';
 
 				$this->body = '';
 
 			}
 
 			}
 
-			return this;
 
+			return $this;
 
 		}
 
 		}
 
 		public function write($chunk){
 
 		public function write($chunk){
 
 			if($this->open){
 
 			if($this->open){

+ 6 - 0
lib/router.class.php
View File 

@@ -80,6 +80,12 @@
 
 				}
 
 				}
 
 			}
 
 			}
 
 		}
 
 		}
 
+		public static function write($chunk){
 
+			if(!isset(static::$responses[0])){
 
+				array_push($responses,new Response($_SERVER['REQUEST_URI']));
 
+			}
 
+			static::$responses[0]->write($chunk);
 
+		}
 
 	}
 
 	}
 
 	register_shutdown_function(function(){
 
 	register_shutdown_function(function(){
 
 		Router::shutdown();
 
 		Router::shutdown();

+ 6 - 2
lib/user.class.php
View File 

@@ -17,8 +17,12 @@
 
 				FROM users
 
 				FROM users
 
 				WHERE id = ?;
 
 				WHERE id = ?;
 
 			",'i',$this->id)->assoc_result;
 
 			",'i',$this->id)->assoc_result;
 
-			foreach($cache as $key => $value){
 
-				$this->cache[$key] = $value;
 
+			if($cache){
 
+				foreach($cache as $key => $value){
 
+					$this->cache[$key] = $value;
 
+				}
 
+			}else{
 
+				trigger_error("User with id {$id} does not exist");
 
 			}
 
 			}
 
 		}
 
 		}
 
 		public function jsonSerialize(){
 
 		public function jsonSerialize(){

+ 2 - 2
paths/user.php
View File 

@@ -1,14 +1,14 @@
 
 <?php
 
 <?php
 
 	Bugs::actions(
 
 	Bugs::actions(
 
-		'test'
 
+		'view_profile'
 
 	);
 
 	);
 
 	Router::paths(array(
 
 	Router::paths(array(
 
 		'/~{user}'=>function($res,$args){
 
 		'/~{user}'=>function($res,$args){
 
-			Bugs::activity('test','test');
 
 			$res->write(
 
 			$res->write(
 
 				Bugs::template('user')
 
 				Bugs::template('user')
 
 					->run(Bugs::user($args->user))
 
 					->run(Bugs::user($args->user))
 
 			);
 
 			);
 
+			Bugs::activity('view_profile',$args->user);
 
 		},
 
 		},
 
 		'/user/{user}'=>function($res,$args){
 
 		'/user/{user}'=>function($res,$args){
 
 			$res->header(
 
 			$res->header(

+ 15 - 0
templates/error.php
View File 

@@ -0,0 +1,15 @@
 
+<?php
 
+	global $context;
 
+?>
 
+<!doctype html>
 
+	<head>
 
+		<meta charset="utf8"/>
 
+		<title>Error</title>
 
+	</head>
 
+	<body>
 
+		<h2>
 
+			<?=$context->error['message']?>
 
+		</h2>
 
+		<pre><?=print_r($context->backtrace,true)?></pre>
 
+	</body>
 
+</html>

+ 6 - 0
templates/user.php
View File 

@@ -6,6 +6,12 @@
 
 	<head>
 
 	<head>
 
 		<meta charset="utf8"/>
 
 		<meta charset="utf8"/>
 
 		<title>User - <?=$context->name;?></title>
 
 		<title>User - <?=$context->name;?></title>
 
+		<script src="js/juju/core.js"></script>
 
+		<script src="js/juju/page.js"></script>
 
+		<script src="js/juju/dom.js"></script>
 
+		<script src="js/juju/keyboard.js"></script>
 
+		<script src="js/juju/mouse.js"></script>
 
+		<script src="js/user.js"></script>
 
 	</head>
 
 	</head>
 
 	<body>
 
 	<body>
 
 		<form>
 
 		<form>