Removed HTTPRequest->parse_str_callback(). HTTPRequest::parse_str is …

…static method.
kakserpom · Dec 2, 2010 · 1809a9c · 1809a9c
1 parent a517e44
commit 1809a9c
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 24 deletions.
diff --git a/app-examples/Example.php b/app-examples/Example.php
@@ -63,10 +63,7 @@ class ExampleRequest extends HTTPRequest {
 	public function run() {
 		$stime = microtime(TRUE);
 		$this->header('Content-Type: text/html; charset=utf-8');
-
-		var_dump(is_uploaded_file(
-			$_FILES['myfile']['tmp_name']
-		));
+
 		$this->registerShutdownFunction(function() {
 ?></html><?php
 		});

diff --git a/bin/php-chroot b/bin/php-chroot
diff --git a/bin/phpdaemon b/bin/phpdaemon
diff --git a/conf/conf.d/example.conf b/conf/conf.d/example.conf
@@ -1,4 +1,4 @@
-# Example of included file
-
-
-
+# Example of included file
+
+
+
diff --git a/doc/gendoc b/doc/gendoc
diff --git a/lib/Daemon_Config.class.php b/lib/Daemon_Config.class.php
@@ -19,7 +19,7 @@ class Daemon_Config implements ArrayAccess {
 	public $pidfile        = '/var/run/phpd.pid';
 	public $defaultpidfile = '/var/run/phpd.pid';
 	public $configfile     = '/etc/phpd/phpd.conf;./conf/phpd.conf';
-	public $path           = './conf/appResolver.php';
+	public $path           = './conf/AppResolver.php';
 	public $appfilepath    = '{app-*,applications}/%s.php';
 	public $autoload   	 	= NULL;
 

diff --git a/lib/HTTPRequest.class.php b/lib/HTTPRequest.class.php
@@ -134,7 +134,7 @@ public function parseParams() {
 		}
 
 		if (isset($this->attrs->server['QUERY_STRING'])) {
-			$this->parse_str($this->attrs->server['QUERY_STRING'], $this->attrs->get);
+			HTTPRequest::parse_str($this->attrs->server['QUERY_STRING'], $this->attrs->get);
 		}
 
 		if (
@@ -153,7 +153,7 @@ public function parseParams() {
 		}
 
 		if (isset($this->attrs->server['HTTP_COOKIE'])) {
-			$this->parse_str(strtr($this->attrs->server['HTTP_COOKIE'], HTTPRequest::$hvaltr), $this->attrs->cookie);
+			HTTPRequest::parse_str(strtr($this->attrs->server['HTTP_COOKIE'], HTTPRequest::$hvaltr), $this->attrs->cookie);
 		}
 
 		if (isset($this->attrs->server['HTTP_AUTHORIZATION'])) {
@@ -185,7 +185,7 @@ public function postPrepare() {
 			&& ($this->attrs->server['REQUEST_METHOD'] == 'POST')
 		) {
 			if ($this->boundary === false) {
-				$this->parse_str($this->attrs->stdinbuf, $this->attrs->post);
+				HTTPRequest::parse_str($this->attrs->stdinbuf, $this->attrs->post);
 			}
 
 			if (
@@ -738,27 +738,23 @@ public function readBodyFile() {
 	 * @param array Reference to the resulting array.
 	 * @return void
 	 */
-	public function parse_str($s, &$array) {
+	public static function parse_str($s, &$array) {
+		static $cb;
+		if ($cb === NULL) {
+			$cb = function ($m) {
+				return urlencode(html_entity_decode('&#' . hexdec($m[1]) . ';', ENT_NOQUOTES, 'utf-8'));
+			};
+		}
 		if (
 			(stripos($s,'%u') !== false) 
 			&& preg_match('~(%u[a-f\d]{4}|%[c-f][a-f\d](?!%[89a-f][a-f\d]))~is', $s, $m)
 		) {
-			$s = preg_replace_callback('~%(u[a-f\d]{4}|[a-f\d]{2})~i', array($this, 'parse_str_callback'), $s);
+			$s = preg_replace_callback('~%(u[a-f\d]{4}|[a-f\d]{2})~i', $cb, $s);
 		}
 
 		parse_str($s, $array);
 	}
 
-	/**
-	 * Called in preg_replace_callback in parse_str
-	 * @todo private?
-	 * @param array Match
-	 * @return string Replacement.
-	 */
-	public function parse_str_callback($m) {
-		return urlencode(html_entity_decode('&#' . hexdec($m[1]) . ';', ENT_NOQUOTES, 'utf-8'));
-	}
-
 	/**
 	 * @todo description missing
 	 * @todo protected?