url param access

Author: lnt

Diff for: app/handler/Index.php

@@ -8,12 +8,11 @@
 
 class Index extends AbstractHandler {
 
-	public function invokeHandler($viewModel,$header) {
+	public function invokeHandler($viewModel,$header,$f) {
 		$header->import('bootstrap');
 		$header->import('utils');
 		$header->import('product_login');
 
-
 		if (isset($_REQUEST['uname'])) {
 			$username = $_POST['uname'];
 			$password = $_POST['pass'];
@@ -40,9 +39,6 @@ public function invokeHandler($viewModel,$header) {
 			$viewModel->assign("option_selected", "NE");
 			return "home/home";
 		} else {
-			
-			
-			
 			return "sample/login";
 		}
 	}

Diff for: lib/rudra/rudrax.php

@@ -5,12 +5,44 @@ public static function get($section,$prop=NULL){
 		return $GLOBALS['CONFIG'][$section];
 	}
 }
+class HttpRequest {
+	private static $request;
+	private $map = array();
+	public function get($key){
+		if(isset($this->map[$key])){
+			return $this->map[$key];
+		} else if(isset($_REQUEST[$key])){
+			return $_REQUEST[$key];
+		} else {
+			return NULL;
+		}
+	}
+	public function set($key,$value){
+		$this->map[$key] = $value;
+		return $this;
+	}
+	public function getAllParams(){
+		return $this->map;
+	}
+	public function loadParams($params){
+		$this->map = array_merge($this->map,$params);
+		return $this;
+	}
+	public static function getInstance(){
+		if(!isset(self::$request)){
+			self::$request = new HttpRequest();
+		}
+		return self::$request;
+	}
+}
+
+
 class RudraX {
 	public static $REQUEST_MAPPED = FALSE;
 	public static function setProjectConfiguration($file){
 		ob_start ();
 		session_start ();
-		$GLOBALS ['CONFIG'] = parse_ini_file ($file, true );
+		$GLOBALS ['CONFIG'] = parse_ini_file ($file, TRUE );
 		set_include_path ($GLOBALS['CONFIG']['WORK_DIR']);
 		define("BASE_PATH", dirname(__FILE__) );
 		define("LOG_PATH", $GLOBALS ['CONFIG']['LOG_PATH']);
@@ -23,12 +55,12 @@ public static function setProjectConfiguration($file){
 		define ( 'DEBUG_ENABLED', $GLOBALS ['CONFIG']['DEBUG_ENABLED'] );
 		define ( 'MODEL_PATH', $GLOBALS ['CONFIG']['MODEL_PATH'] );
 		define ( 'CONTROLLER_PATH', $GLOBALS ['CONFIG']['CONTROLLER_PATH'] );
-		define('Q',(isset($_REQUEST['q']) ? $_REQUEST['q'] : null));
-		
+		define('Q',(isset($_REQUEST['q']) ? $_REQUEST['q'] : NULL));
+
 		define ( 'CONTEXT_PATH', (
-			(Q==null) ? strstr($_SERVER['REQUEST_URI'],"?".$_SERVER['QUERY_STRING'],true) : strstr($_SERVER['REQUEST_URI'],Q,true)
+		(Q==NULL) ? strstr($_SERVER['REQUEST_URI'],"?".$_SERVER['QUERY_STRING'],TRUE) : strstr($_SERVER['REQUEST_URI'],Q,true)
 		));
-		Console::set(true);
+		Console::set(TRUE);
 	}
 	public static function includeTemplates(){
 		self::includeUser();
@@ -61,10 +93,16 @@ public static function getDB($configname){
 	}
 	public static function getArgsArray($reflectionMethod,$argArray){
 		$arr = array();
+		$request =  HttpRequest::getInstance();
 		foreach($reflectionMethod->getParameters() as $key => $val){
-			$arr[$val->getName()] = isset($argArray[$val->getName()]) ?
-			$argArray[$val->getName()] : (isset($_REQUEST[$val->getName()])
-					? $_REQUEST[$val->getName()] : ($val->isDefaultValueAvailable()  ? $val->getDefaultValue() : NULL));
+			$arr[$val->getName()] = isset($argArray[$val->getName()])
+			? $argArray[$val->getName()]
+			:(($request->get($val->getName()))
+					? $request->get($val->getName())
+					:($val->isDefaultValueAvailable()
+							? $val->getDefaultValue() : NULL
+					)
+			);
 		}
 		return $arr;
 	}
@@ -106,10 +144,13 @@ public static function mapRequest ($mapping,$callback){
 		preg_match("/".$mapper."/",str_replace( array("/"),
 		array("#"),Q),$varmap);
 
+		$request =  HttpRequest::getInstance()->loadParams($varmap);
+		$argArray = self::getArgsArray(new ReflectionFunction($callback),$varmap);
+		$request->loadParams($argArray);
+
 		if(count($varmap)>0){
 			self::$REQUEST_MAPPED = TRUE;
-			return call_user_func_array($callback,
-					self::getArgsArray(new ReflectionFunction($callback),$varmap));
+			return call_user_func_array($callback, $argArray);
 		}
 	}
 
@@ -119,4 +160,5 @@ public static function getDB($configname){
 		return RudraX::getDB($configname);
 	}
 }
+
 ?>

Diff for: web/index.php

@@ -16,21 +16,22 @@
 RudraX::invokePage(function($q){
 
 	RudraX::mapRequest("page/{p}",function($q,$f,$d,$p="index"){
-		echo $p;
+		//echo $p;
 		global $controller;
 		$controller = new PageController();
 		$controller->invoke($p);
 	});
 
 	RudraX::mapRequest("user/{u}/d/{d}/{f}",function($q,$u,$f,$d,$t="index"){
-		echo "user/{u}/d/{d}/{f}==>u=".$u;
-		//global $controller;
-		//$controller = new PageController();
-		//$controller->invoke($t);
+		//echo "user/{u}/d/{d}/{f}==>u=".$u;
+		//echo "<br/>f=".$f;
+		global $controller;
+		$controller = new PageController();
+		$controller->invoke($t);
 	});
 
 	RudraX::mapRequest("user/{u}/",function($q,$u,$f,$d,$t="index"){
-		echo "user/{u}/==>u=".$u;
+		//echo "user/{u}/==>u=".$u;
 		//global $controller;
 		//$controller = new PageController();
 		//$controller->invoke($u);