kakserpom / phpdaemon

lib/DebugConsole.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 	/**
 	 * Let's check the password
 	 * @param string Password
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	private function checkPassword($pass = '') {
 		if ($pass != $this->pool->config->passphrase->value) {

Braces +1 added lines, -2 removed lines

@@ -140,8 +140,7 @@
 
 			if (in_array($cmd, array('quit', 'exit'))) {
 				$this->disconnect();
-			} 
-			elseif (!$this->auth) {
+			} elseif (!$this->auth) {
 				$this->checkPassword($e[0]);
 			} else {
 				$this->processCommand($cmd, $arg);

lib/DNSClient.php

Doc Comments +5 added lines

@@ -152,6 +152,11 @@
 			}
 		});
 	}
+
+	/**
+	 * @param string $hostname
+	 * @param Closure $cb
+	 */
 	public function get($hostname, $cb, $noncache = false) {
 		if (!$this->preloading->hasCompleted()) {
 			$pool = $this;

Spacing +7 added lines, -7 removed lines

@@ -7,7 +7,7 @@ 
  */
 class DNSClient extends NetworkClient {
 	public static $type = array(
- 		1 => 'A', 2 => 'NS',  3 => 'MD', 4 => 'MF', 5 => 'CNAME',
+ 		1 => 'A', 2 => 'NS', 3 => 'MD', 4 => 'MF', 5 => 'CNAME',
  		6 => 'SOA', 7 => 'MB', 8 => 'MG', 9 => 'MR', 10 => 'RR',
  		11 => 'WKS', 12 => 'PTR', 13 => 'HINFO', 14 => 'MINFO',
  		15 => 'MX', 16 => 'TXT', 17 => 'RP', 18 => 'AFSDB',
@@ -65,7 +65,7 @@ 
 			$this->preloading = new ComplexJob;
 		}
 		$job = $this->preloading;
-		$job->addJob('resolvfile', function ($jobname, $job) use ($pool) {
+		$job->addJob('resolvfile', function($jobname, $job) use ($pool) {
 			FS::readfile($pool->config->resolvfile->value, function($file, $data) use ($pool, $job, $jobname) {
 				if ($file) {
 					preg_match_all('~nameserver ([^\r\n;]+)~', $data, $m);
@@ -77,7 +77,7 @@ 
 				$job->setResult($jobname);
 			});
 		});
-		$job->addJob('hostsfile', function ($jobname, $job) use ($pool) {
+		$job->addJob('hostsfile', function($jobname, $job) use ($pool) {
 			FS::readfile($pool->config->hostsfile->value, function($file, $data) use ($pool, $job, $jobname) {
 				if ($file) {
 					preg_match_all('~^(\S+)\s+([^\r\n]+)\s*~m', $data, $m, PREG_SET_ORDER);
@@ -100,7 +100,7 @@ 
 	public function resolve($hostname, $cb, $noncache = false) {
 		if (!$this->preloading->hasCompleted()) {
 			$pool = $this;
-			$this->preloading->addListener(function ($job) use ($hostname, $cb, $noncache, $pool) {
+			$this->preloading->addListener(function($job) use ($hostname, $cb, $noncache, $pool) {
 				$pool->resolve($hostname, $cb, $noncache);
 			});
 			return;
@@ -123,7 +123,7 @@ 
 			$item->addListener($cb);
 		}
 		$pool = $this;
-		$this->get($hostname, function ($response) use ($cb, $noncache, $hostname, $pool) {
+		$this->get($hostname, function($response) use ($cb, $noncache, $hostname, $pool) {
 			if (!isset($response['A'])) {
 				if ($noncache) {
 					call_user_func($cb, false);
@@ -155,7 +155,7 @@ 
 	public function get($hostname, $cb, $noncache = false) {
 		if (!$this->preloading->hasCompleted()) {
 			$pool = $this;
-			$this->preloading->addListener(function ($job) use ($hostname, $cb, $noncache, $pool) {
+			$this->preloading->addListener(function($job) use ($hostname, $cb, $noncache, $pool) {
 				$pool->get($hostname, $cb, $noncache);
 			});
 			return;
@@ -178,7 +178,7 @@ 
 				call_user_func($cb, false);
 				return;
 			}
-			$q =	Binary::labels($hostname) .  // domain
+			$q = Binary::labels($hostname) . // domain
 					Binary::word($qtypeInt) . 
 					Binary::word($qclassInt);
 			$QD[] = $q;

Braces +2 added lines, -4 removed lines

@@ -294,11 +294,9 @@
 				} else {
 					$record['ip'] = inet_ntop($data);
 				}
-			}
-			elseif ($type === 'NS') {
+			} elseif ($type === 'NS') {
 				$record['ns'] = Binary::parseLabels($data);
-			}
-			elseif ($type === 'CNAME') {
+			} elseif ($type === 'CNAME') {
 				$record['cname'] = Binary::parseLabels($data, $orig);
 			}
 

lib/Encoding.php

Doc Comments +3 added lines

@@ -114,6 +114,9 @@
        "\xc5\xb8"     => "\x9f"

     );

 

+  /**
+   * @param string $text
+   */
   static function toUTF8($text){

   /**

    * Function Encoding::toUTF8

Indentation +181 added lines, -181 removed lines

@@ -5,114 +5,114 @@ 
  * @version  1.1

  * @link     http://www.framework2.com.ar/dzone/forceUTF8-es/

  * @example  http://www.framework2.com.ar/dzone/forceUTF8-es/

-  */

+ */

 

 class Encoding {

     

   protected static $win1252ToUtf8 = array(

-        128 => "\xe2\x82\xac",

+		128 => "\xe2\x82\xac",

 

-        130 => "\xe2\x80\x9a",

-        131 => "\xc6\x92",

-        132 => "\xe2\x80\x9e",

-        133 => "\xe2\x80\xa6",

-        134 => "\xe2\x80\xa0",

-        135 => "\xe2\x80\xa1",

-        136 => "\xcb\x86",

-        137 => "\xe2\x80\xb0",

-        138 => "\xc5\xa0",

-        139 => "\xe2\x80\xb9",

-        140 => "\xc5\x92",

+		130 => "\xe2\x80\x9a",

+		131 => "\xc6\x92",

+		132 => "\xe2\x80\x9e",

+		133 => "\xe2\x80\xa6",

+		134 => "\xe2\x80\xa0",

+		135 => "\xe2\x80\xa1",

+		136 => "\xcb\x86",

+		137 => "\xe2\x80\xb0",

+		138 => "\xc5\xa0",

+		139 => "\xe2\x80\xb9",

+		140 => "\xc5\x92",

 

-        142 => "\xc5\xbd",

+		142 => "\xc5\xbd",

 

 

-        145 => "\xe2\x80\x98",

-        146 => "\xe2\x80\x99",

-        147 => "\xe2\x80\x9c",

-        148 => "\xe2\x80\x9d",

-        149 => "\xe2\x80\xa2",

-        150 => "\xe2\x80\x93",

-        151 => "\xe2\x80\x94",

-        152 => "\xcb\x9c",

-        153 => "\xe2\x84\xa2",

-        154 => "\xc5\xa1",

-        155 => "\xe2\x80\xba",

-        156 => "\xc5\x93",

+		145 => "\xe2\x80\x98",

+		146 => "\xe2\x80\x99",

+		147 => "\xe2\x80\x9c",

+		148 => "\xe2\x80\x9d",

+		149 => "\xe2\x80\xa2",

+		150 => "\xe2\x80\x93",

+		151 => "\xe2\x80\x94",

+		152 => "\xcb\x9c",

+		153 => "\xe2\x84\xa2",

+		154 => "\xc5\xa1",

+		155 => "\xe2\x80\xba",

+		156 => "\xc5\x93",

 

-        158 => "\xc5\xbe",

-        159 => "\xc5\xb8"

+		158 => "\xc5\xbe",

+		159 => "\xc5\xb8"

   );

   

-    protected static $brokenUtf8ToUtf8 = array(

-        "\xc2\x80" => "\xe2\x82\xac",

+	protected static $brokenUtf8ToUtf8 = array(

+		"\xc2\x80" => "\xe2\x82\xac",

         

-        "\xc2\x82" => "\xe2\x80\x9a",

-        "\xc2\x83" => "\xc6\x92",

-        "\xc2\x84" => "\xe2\x80\x9e",

-        "\xc2\x85" => "\xe2\x80\xa6",

-        "\xc2\x86" => "\xe2\x80\xa0",

-        "\xc2\x87" => "\xe2\x80\xa1",

-        "\xc2\x88" => "\xcb\x86",

-        "\xc2\x89" => "\xe2\x80\xb0",

-        "\xc2\x8a" => "\xc5\xa0",

-        "\xc2\x8b" => "\xe2\x80\xb9",

-        "\xc2\x8c" => "\xc5\x92",

+		"\xc2\x82" => "\xe2\x80\x9a",

+		"\xc2\x83" => "\xc6\x92",

+		"\xc2\x84" => "\xe2\x80\x9e",

+		"\xc2\x85" => "\xe2\x80\xa6",

+		"\xc2\x86" => "\xe2\x80\xa0",

+		"\xc2\x87" => "\xe2\x80\xa1",

+		"\xc2\x88" => "\xcb\x86",

+		"\xc2\x89" => "\xe2\x80\xb0",

+		"\xc2\x8a" => "\xc5\xa0",

+		"\xc2\x8b" => "\xe2\x80\xb9",

+		"\xc2\x8c" => "\xc5\x92",

         

-        "\xc2\x8e" => "\xc5\xbd",

+		"\xc2\x8e" => "\xc5\xbd",

         

         

-        "\xc2\x91" => "\xe2\x80\x98",

-        "\xc2\x92" => "\xe2\x80\x99",

-        "\xc2\x93" => "\xe2\x80\x9c",

-        "\xc2\x94" => "\xe2\x80\x9d",

-        "\xc2\x95" => "\xe2\x80\xa2",

-        "\xc2\x96" => "\xe2\x80\x93",

-        "\xc2\x97" => "\xe2\x80\x94",

-        "\xc2\x98" => "\xcb\x9c",

-        "\xc2\x99" => "\xe2\x84\xa2",

-        "\xc2\x9a" => "\xc5\xa1",

-        "\xc2\x9b" => "\xe2\x80\xba",

-        "\xc2\x9c" => "\xc5\x93",

+		"\xc2\x91" => "\xe2\x80\x98",

+		"\xc2\x92" => "\xe2\x80\x99",

+		"\xc2\x93" => "\xe2\x80\x9c",

+		"\xc2\x94" => "\xe2\x80\x9d",

+		"\xc2\x95" => "\xe2\x80\xa2",

+		"\xc2\x96" => "\xe2\x80\x93",

+		"\xc2\x97" => "\xe2\x80\x94",

+		"\xc2\x98" => "\xcb\x9c",

+		"\xc2\x99" => "\xe2\x84\xa2",

+		"\xc2\x9a" => "\xc5\xa1",

+		"\xc2\x9b" => "\xe2\x80\xba",

+		"\xc2\x9c" => "\xc5\x93",

         

-        "\xc2\x9e" => "\xc5\xbe",

-        "\xc2\x9f" => "\xc5\xb8"

+		"\xc2\x9e" => "\xc5\xbe",

+		"\xc2\x9f" => "\xc5\xb8"

   );

     

   protected static $utf8ToWin1252 = array(

-       "\xe2\x82\xac" => "\x80",

+	   "\xe2\x82\xac" => "\x80",

        

-       "\xe2\x80\x9a" => "\x82",

-       "\xc6\x92"     => "\x83",

-       "\xe2\x80\x9e" => "\x84",

-       "\xe2\x80\xa6" => "\x85",

-       "\xe2\x80\xa0" => "\x86",

-       "\xe2\x80\xa1" => "\x87",

-       "\xcb\x86"     => "\x88",

-       "\xe2\x80\xb0" => "\x89",

-       "\xc5\xa0"     => "\x8a",

-       "\xe2\x80\xb9" => "\x8b",

-       "\xc5\x92"     => "\x8c",

+	   "\xe2\x80\x9a" => "\x82",

+	   "\xc6\x92"     => "\x83",

+	   "\xe2\x80\x9e" => "\x84",

+	   "\xe2\x80\xa6" => "\x85",

+	   "\xe2\x80\xa0" => "\x86",

+	   "\xe2\x80\xa1" => "\x87",

+	   "\xcb\x86"     => "\x88",

+	   "\xe2\x80\xb0" => "\x89",

+	   "\xc5\xa0"     => "\x8a",

+	   "\xe2\x80\xb9" => "\x8b",

+	   "\xc5\x92"     => "\x8c",

        

-       "\xc5\xbd"     => "\x8e",

+	   "\xc5\xbd"     => "\x8e",

        

        

-       "\xe2\x80\x98" => "\x91",

-       "\xe2\x80\x99" => "\x92",

-       "\xe2\x80\x9c" => "\x93",

-       "\xe2\x80\x9d" => "\x94",

-       "\xe2\x80\xa2" => "\x95",

-       "\xe2\x80\x93" => "\x96",

-       "\xe2\x80\x94" => "\x97",

-       "\xcb\x9c"     => "\x98",

-       "\xe2\x84\xa2" => "\x99",

-       "\xc5\xa1"     => "\x9a",

-       "\xe2\x80\xba" => "\x9b",

-       "\xc5\x93"     => "\x9c",

+	   "\xe2\x80\x98" => "\x91",

+	   "\xe2\x80\x99" => "\x92",

+	   "\xe2\x80\x9c" => "\x93",

+	   "\xe2\x80\x9d" => "\x94",

+	   "\xe2\x80\xa2" => "\x95",

+	   "\xe2\x80\x93" => "\x96",

+	   "\xe2\x80\x94" => "\x97",

+	   "\xcb\x9c"     => "\x98",

+	   "\xe2\x84\xa2" => "\x99",

+	   "\xc5\xa1"     => "\x9a",

+	   "\xe2\x80\xba" => "\x9b",

+	   "\xc5\x93"     => "\x9c",

        

-       "\xc5\xbe"     => "\x9e",

-       "\xc5\xb8"     => "\x9f"

-    );

+	   "\xc5\xbe"     => "\x9e",

+	   "\xc5\xb8"     => "\x9f"

+	);

 

   static function toUTF8($text){

   /**

@@ -140,123 +140,123 @@ 
    *

    */

 

-    if(is_array($text))

-    {

-      foreach($text as $k => $v)

-      {

-        $text[$k] = self::toUTF8($v);

-      }

-      return $text;

-    } elseif(is_string($text)) {

+	if(is_array($text))

+	{

+	  foreach($text as $k => $v)

+	  {

+		$text[$k] = self::toUTF8($v);

+	  }

+	  return $text;

+	} elseif(is_string($text)) {

     

-      $max = strlen($text);

-      $buf = "";

-      for($i = 0; $i < $max; $i++){

-          $c1 = $text{$i};

-          if($c1>="\xc0"){ //Should be converted to UTF8, if it's not UTF8 already

-            $c2 = $i+1 >= $max? "\x00" : $text{$i+1};

-            $c3 = $i+2 >= $max? "\x00" : $text{$i+2};

-            $c4 = $i+3 >= $max? "\x00" : $text{$i+3};

-              if($c1 >= "\xc0" & $c1 <= "\xdf"){ //looks like 2 bytes UTF8

-                  if($c2 >= "\x80" && $c2 <= "\xbf"){ //yeah, almost sure it's UTF8 already

-                      $buf .= $c1 . $c2;

-                      $i++;

-                  } else { //not valid UTF8.  Convert it.

-                      $cc1 = (chr(ord($c1) / 64) | "\xc0");

-                      $cc2 = ($c1 & "\x3f") | "\x80";

-                      $buf .= $cc1 . $cc2;

-                  }

-              } elseif($c1 >= "\xe0" & $c1 <= "\xef"){ //looks like 3 bytes UTF8

-                  if($c2 >= "\x80" && $c2 <= "\xbf" && $c3 >= "\x80" && $c3 <= "\xbf"){ //yeah, almost sure it's UTF8 already

-                      $buf .= $c1 . $c2 . $c3;

-                      $i = $i + 2;

-                  } else { //not valid UTF8.  Convert it.

-                      $cc1 = (chr(ord($c1) / 64) | "\xc0");

-                      $cc2 = ($c1 & "\x3f") | "\x80";

-                      $buf .= $cc1 . $cc2;

-                  }

-              } elseif($c1 >= "\xf0" & $c1 <= "\xf7"){ //looks like 4 bytes UTF8

-                  if($c2 >= "\x80" && $c2 <= "\xbf" && $c3 >= "\x80" && $c3 <= "\xbf" && $c4 >= "\x80" && $c4 <= "\xbf"){ //yeah, almost sure it's UTF8 already

-                      $buf .= $c1 . $c2 . $c3;

-                      $i = $i + 2;

-                  } else { //not valid UTF8.  Convert it.

-                      $cc1 = (chr(ord($c1) / 64) | "\xc0");

-                      $cc2 = ($c1 & "\x3f") | "\x80";

-                      $buf .= $cc1 . $cc2;

-                  }

-              } else { //doesn't look like UTF8, but should be converted

-                      $cc1 = (chr(ord($c1) / 64) | "\xc0");

-                      $cc2 = (($c1 & "\x3f") | "\x80");

-                      $buf .= $cc1 . $cc2;

-              }

-          } elseif(($c1 & "\xc0") == "\x80"){ // needs conversion

-                if(isset(self::$win1252ToUtf8[ord($c1)])) { //found in Windows-1252 special cases

-                    $buf .= self::$win1252ToUtf8[ord($c1)];

-                } else {

-                  $cc1 = (chr(ord($c1) / 64) | "\xc0");

-                  $cc2 = (($c1 & "\x3f") | "\x80");

-                  $buf .= $cc1 . $cc2;

-                }

-          } else { // it doesn't need convesion

-              $buf .= $c1;

-          }

-      }

-      return $buf;

-    } else {

-      return $text;

-    }

+	  $max = strlen($text);

+	  $buf = "";

+	  for($i = 0; $i < $max; $i++){

+		  $c1 = $text{$i};

+		  if($c1>="\xc0"){ //Should be converted to UTF8, if it's not UTF8 already

+			$c2 = $i+1 >= $max? "\x00" : $text{$i+1};

+			$c3 = $i+2 >= $max? "\x00" : $text{$i+2};

+			$c4 = $i+3 >= $max? "\x00" : $text{$i+3};

+			  if($c1 >= "\xc0" & $c1 <= "\xdf"){ //looks like 2 bytes UTF8

+				  if($c2 >= "\x80" && $c2 <= "\xbf"){ //yeah, almost sure it's UTF8 already

+					  $buf .= $c1 . $c2;

+					  $i++;

+				  } else { //not valid UTF8.  Convert it.

+					  $cc1 = (chr(ord($c1) / 64) | "\xc0");

+					  $cc2 = ($c1 & "\x3f") | "\x80";

+					  $buf .= $cc1 . $cc2;

+				  }

+			  } elseif($c1 >= "\xe0" & $c1 <= "\xef"){ //looks like 3 bytes UTF8

+				  if($c2 >= "\x80" && $c2 <= "\xbf" && $c3 >= "\x80" && $c3 <= "\xbf"){ //yeah, almost sure it's UTF8 already

+					  $buf .= $c1 . $c2 . $c3;

+					  $i = $i + 2;

+				  } else { //not valid UTF8.  Convert it.

+					  $cc1 = (chr(ord($c1) / 64) | "\xc0");

+					  $cc2 = ($c1 & "\x3f") | "\x80";

+					  $buf .= $cc1 . $cc2;

+				  }

+			  } elseif($c1 >= "\xf0" & $c1 <= "\xf7"){ //looks like 4 bytes UTF8

+				  if($c2 >= "\x80" && $c2 <= "\xbf" && $c3 >= "\x80" && $c3 <= "\xbf" && $c4 >= "\x80" && $c4 <= "\xbf"){ //yeah, almost sure it's UTF8 already

+					  $buf .= $c1 . $c2 . $c3;

+					  $i = $i + 2;

+				  } else { //not valid UTF8.  Convert it.

+					  $cc1 = (chr(ord($c1) / 64) | "\xc0");

+					  $cc2 = ($c1 & "\x3f") | "\x80";

+					  $buf .= $cc1 . $cc2;

+				  }

+			  } else { //doesn't look like UTF8, but should be converted

+					  $cc1 = (chr(ord($c1) / 64) | "\xc0");

+					  $cc2 = (($c1 & "\x3f") | "\x80");

+					  $buf .= $cc1 . $cc2;

+			  }

+		  } elseif(($c1 & "\xc0") == "\x80"){ // needs conversion

+				if(isset(self::$win1252ToUtf8[ord($c1)])) { //found in Windows-1252 special cases

+					$buf .= self::$win1252ToUtf8[ord($c1)];

+				} else {

+				  $cc1 = (chr(ord($c1) / 64) | "\xc0");

+				  $cc2 = (($c1 & "\x3f") | "\x80");

+				  $buf .= $cc1 . $cc2;

+				}

+		  } else { // it doesn't need convesion

+			  $buf .= $c1;

+		  }

+	  }

+	  return $buf;

+	} else {

+	  return $text;

+	}

   }

 

   static function toWin1252($text) {

-    if(is_array($text)) {

-      foreach($text as $k => $v) {

-        $text[$k] = self::toWin1252($v);

-      }

-      return $text;

-    } elseif(is_string($text)) {

-      return utf8_decode(str_replace(array_keys(self::$utf8ToWin1252), array_values(self::$utf8ToWin1252), self::toUTF8($text)));

-    } else {

-      return $text;

-    }

+	if(is_array($text)) {

+	  foreach($text as $k => $v) {

+		$text[$k] = self::toWin1252($v);

+	  }

+	  return $text;

+	} elseif(is_string($text)) {

+	  return utf8_decode(str_replace(array_keys(self::$utf8ToWin1252), array_values(self::$utf8ToWin1252), self::toUTF8($text)));

+	} else {

+	  return $text;

+	}

   }

 

   static function toISO8859($text) {

-    return self::toWin1252($text);

+	return self::toWin1252($text);

   }

 

   static function toLatin1($text) {

-    return self::toWin1252($text);

+	return self::toWin1252($text);

   }

 

   static function fixUTF8($text){

-    if(is_array($text)) {

-      foreach($text as $k => $v) {

-        $text[$k] = self::fixUTF8($v);

-      }

-      return $text;

-    }

+	if(is_array($text)) {

+	  foreach($text as $k => $v) {

+		$text[$k] = self::fixUTF8($v);

+	  }

+	  return $text;

+	}

 

-    $last = "";

-    while($last <> $text){

-      $last = $text;

-      $text = self::toUTF8(utf8_decode(str_replace(array_keys(self::$utf8ToWin1252), array_values(self::$utf8ToWin1252), $text)));

-    }

-    $text = self::toUTF8(utf8_decode(str_replace(array_keys(self::$utf8ToWin1252), array_values(self::$utf8ToWin1252), $text)));

-    return $text;

+	$last = "";

+	while($last <> $text){

+	  $last = $text;

+	  $text = self::toUTF8(utf8_decode(str_replace(array_keys(self::$utf8ToWin1252), array_values(self::$utf8ToWin1252), $text)));

+	}

+	$text = self::toUTF8(utf8_decode(str_replace(array_keys(self::$utf8ToWin1252), array_values(self::$utf8ToWin1252), $text)));

+	return $text;

   }

   

   static function UTF8FixWin1252Chars($text){

-    // If you received an UTF-8 string that was converted from Windows-1252 as it was ISO8859-1 

-    // (ignoring Windows-1252 chars from 80 to 9F) use this function to fix it.

-    // See: http://en.wikipedia.org/wiki/Windows-1252

+	// If you received an UTF-8 string that was converted from Windows-1252 as it was ISO8859-1 

+	// (ignoring Windows-1252 chars from 80 to 9F) use this function to fix it.

+	// See: http://en.wikipedia.org/wiki/Windows-1252

     

-    return str_replace(array_keys(self::$brokenUtf8ToUtf8), array_values(self::$brokenUtf8ToUtf8), $text);

+	return str_replace(array_keys(self::$brokenUtf8ToUtf8), array_values(self::$brokenUtf8ToUtf8), $text);

   }

   

   static function removeBOM($str=""){

-    if(substr($str, 0,3) == pack("CCC",0xef,0xbb,0xbf)) {

-      $str=substr($str, 3);

-    }

-    return $str;

+	if(substr($str, 0,3) == pack("CCC",0xef,0xbb,0xbf)) {

+	  $str=substr($str, 3);

+	}

+	return $str;

   }

 }

Spacing +28 added lines, -28 removed lines

@@ -114,7 +114,7 @@ 
        "\xc5\xb8"     => "\x9f"

     );

 

-  static function toUTF8($text){

+  static function toUTF8($text) {

   /**

    * Function Encoding::toUTF8

    *

@@ -140,25 +140,25 @@ 
    *

    */

 

-    if(is_array($text))

+    if (is_array($text))

     {

-      foreach($text as $k => $v)

+      foreach ($text as $k => $v)

       {

         $text[$k] = self::toUTF8($v);

       }

       return $text;

-    } elseif(is_string($text)) {

+    } elseif (is_string($text)) {

     

       $max = strlen($text);

       $buf = "";

-      for($i = 0; $i < $max; $i++){

+      for ($i = 0; $i < $max; $i++) {

           $c1 = $text{$i};

-          if($c1>="\xc0"){ //Should be converted to UTF8, if it's not UTF8 already

-            $c2 = $i+1 >= $max? "\x00" : $text{$i+1};

-            $c3 = $i+2 >= $max? "\x00" : $text{$i+2};

-            $c4 = $i+3 >= $max? "\x00" : $text{$i+3};

-              if($c1 >= "\xc0" & $c1 <= "\xdf"){ //looks like 2 bytes UTF8

-                  if($c2 >= "\x80" && $c2 <= "\xbf"){ //yeah, almost sure it's UTF8 already

+          if ($c1 >= "\xc0") { //Should be converted to UTF8, if it's not UTF8 already

+            $c2 = $i + 1 >= $max ? "\x00" : $text{$i + 1};

+            $c3 = $i + 2 >= $max ? "\x00" : $text{$i + 2};

+            $c4 = $i + 3 >= $max ? "\x00" : $text{$i + 3};

+              if ($c1 >= "\xc0" & $c1 <= "\xdf") { //looks like 2 bytes UTF8

+                  if ($c2 >= "\x80" && $c2 <= "\xbf") { //yeah, almost sure it's UTF8 already

                       $buf .= $c1 . $c2;

                       $i++;

                   } else { //not valid UTF8.  Convert it.

@@ -166,8 +166,8 @@ 
                       $cc2 = ($c1 & "\x3f") | "\x80";

                       $buf .= $cc1 . $cc2;

                   }

-              } elseif($c1 >= "\xe0" & $c1 <= "\xef"){ //looks like 3 bytes UTF8

-                  if($c2 >= "\x80" && $c2 <= "\xbf" && $c3 >= "\x80" && $c3 <= "\xbf"){ //yeah, almost sure it's UTF8 already

+              } elseif ($c1 >= "\xe0" & $c1 <= "\xef") { //looks like 3 bytes UTF8

+                  if ($c2 >= "\x80" && $c2 <= "\xbf" && $c3 >= "\x80" && $c3 <= "\xbf") { //yeah, almost sure it's UTF8 already

                       $buf .= $c1 . $c2 . $c3;

                       $i = $i + 2;

                   } else { //not valid UTF8.  Convert it.

@@ -175,8 +175,8 @@ 
                       $cc2 = ($c1 & "\x3f") | "\x80";

                       $buf .= $cc1 . $cc2;

                   }

-              } elseif($c1 >= "\xf0" & $c1 <= "\xf7"){ //looks like 4 bytes UTF8

-                  if($c2 >= "\x80" && $c2 <= "\xbf" && $c3 >= "\x80" && $c3 <= "\xbf" && $c4 >= "\x80" && $c4 <= "\xbf"){ //yeah, almost sure it's UTF8 already

+              } elseif ($c1 >= "\xf0" & $c1 <= "\xf7") { //looks like 4 bytes UTF8

+                  if ($c2 >= "\x80" && $c2 <= "\xbf" && $c3 >= "\x80" && $c3 <= "\xbf" && $c4 >= "\x80" && $c4 <= "\xbf") { //yeah, almost sure it's UTF8 already

                       $buf .= $c1 . $c2 . $c3;

                       $i = $i + 2;

                   } else { //not valid UTF8.  Convert it.

@@ -189,8 +189,8 @@ 
                       $cc2 = (($c1 & "\x3f") | "\x80");

                       $buf .= $cc1 . $cc2;

               }

-          } elseif(($c1 & "\xc0") == "\x80"){ // needs conversion

-                if(isset(self::$win1252ToUtf8[ord($c1)])) { //found in Windows-1252 special cases

+          } elseif (($c1 & "\xc0") == "\x80") { // needs conversion

+                if (isset(self::$win1252ToUtf8[ord($c1)])) { //found in Windows-1252 special cases

                     $buf .= self::$win1252ToUtf8[ord($c1)];

                 } else {

                   $cc1 = (chr(ord($c1) / 64) | "\xc0");

@@ -208,12 +208,12 @@ 
   }

 

   static function toWin1252($text) {

-    if(is_array($text)) {

-      foreach($text as $k => $v) {

+    if (is_array($text)) {

+      foreach ($text as $k => $v) {

         $text[$k] = self::toWin1252($v);

       }

       return $text;

-    } elseif(is_string($text)) {

+    } elseif (is_string($text)) {

       return utf8_decode(str_replace(array_keys(self::$utf8ToWin1252), array_values(self::$utf8ToWin1252), self::toUTF8($text)));

     } else {

       return $text;

@@ -228,16 +228,16 @@ 
     return self::toWin1252($text);

   }

 

-  static function fixUTF8($text){

-    if(is_array($text)) {

-      foreach($text as $k => $v) {

+  static function fixUTF8($text) {

+    if (is_array($text)) {

+      foreach ($text as $k => $v) {

         $text[$k] = self::fixUTF8($v);

       }

       return $text;

     }

 

     $last = "";

-    while($last <> $text){

+    while ($last <> $text) {

       $last = $text;

       $text = self::toUTF8(utf8_decode(str_replace(array_keys(self::$utf8ToWin1252), array_values(self::$utf8ToWin1252), $text)));

     }

@@ -245,7 +245,7 @@ 
     return $text;

   }

   

-  static function UTF8FixWin1252Chars($text){

+  static function UTF8FixWin1252Chars($text) {

     // If you received an UTF-8 string that was converted from Windows-1252 as it was ISO8859-1 

     // (ignoring Windows-1252 chars from 80 to 9F) use this function to fix it.

     // See: http://en.wikipedia.org/wiki/Windows-1252

@@ -253,9 +253,9 @@ 
     return str_replace(array_keys(self::$brokenUtf8ToUtf8), array_values(self::$brokenUtf8ToUtf8), $text);

   }

   

-  static function removeBOM($str=""){

-    if(substr($str, 0,3) == pack("CCC",0xef,0xbb,0xbf)) {

-      $str=substr($str, 3);

+  static function removeBOM($str = "") {

+    if (substr($str, 0, 3) == pack("CCC", 0xef, 0xbb, 0xbf)) {

+      $str = substr($str, 3);

     }

     return $str;

   }

lib/FastCGIServerConnection.php

Doc Comments +4 added lines, -1 removed lines

@@ -253,7 +253,7 @@ 
 	 * Handles the output from downstream requests.
 	 * @param object Request.
 	 * @param string The output.
-	 * @return void
+	 * @return boolean
 	 */
 	public function requestOut($req, $output) {		
 		$outlen = strlen($output);
@@ -331,6 +331,9 @@ 
 	}
 	/**
 	 * Handles the output from downstream requests.
+	 * @param stdClass $req
+	 * @param integer $appStatus
+	 * @param integer $protoStatus
 	 * @return void
 	 */
 	public function endRequest($req, $appStatus, $protoStatus) {

Spacing +10 added lines, -11 removed lines

@@ -7,8 +7,8 @@ 
  * @author Zorin Vasily <kak.serpom.po.yaitsam@gmail.com>
  */
 class FastCGIServerConnection extends Connection {
-	protected $lowMark  = 8;         // initial value of the minimal amout of bytes in buffer
-	protected $highMark = 0xFFFFFF;  // initial value of the maximum amout of bytes in buffer
+	protected $lowMark  = 8; // initial value of the minimal amout of bytes in buffer
+	protected $highMark = 0xFFFFFF; // initial value of the maximum amout of bytes in buffer
 	public $timeout = 180;
 
 	protected $requests = array();
@@ -117,8 +117,7 @@ 
 				. ' (' . strlen($pad) . ')');
 		
 
-		if ($type == self::FCGI_BEGIN_REQUEST) {
-			++Daemon::$process->reqCounter;
+		if ($type == self::FCGI_BEGIN_REQUEST) {++Daemon::$process->reqCounter;
 			$u = unpack('nrole/Cflags', $this->content);
 
 			$req = new stdClass();
@@ -130,7 +129,7 @@ 
 			$req->attrs->server      = array();
 			$req->attrs->files       = array();
 			$req->attrs->session     = null;
-			$req->attrs->role       = self::$roles[$u['role']];
+			$req->attrs->role = self::$roles[$u['role']];
 			$req->attrs->flags       = $u['flags'];
 			$req->attrs->id          = $this->header['reqid'];
 			$req->attrs->params_done = false;
@@ -264,7 +263,7 @@ 
 		*/ 
 		// string bytes counter 
 		$d = 0; 
-		while($d < $outlen){ 
+		while ($d < $outlen) { 
 		  
 		  $ord_var_c = ord($output{$d}); 
 		  
@@ -277,31 +276,31 @@ 
 			  case (($ord_var_c & 0xE0) == 0xC0): 
 				  // characters U-00000080 - U-000007FF, mask 110XXXXX 
 				  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 
-				  $d+=2; 
+				  $d += 2; 
 				  break; 
 
 			  case (($ord_var_c & 0xF0) == 0xE0): 
 				  // characters U-00000800 - U-0000FFFF, mask 1110XXXX 
 				  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 
-				  $d+=3; 
+				  $d += 3; 
 				  break; 
 
 			  case (($ord_var_c & 0xF8) == 0xF0): 
 				  // characters U-00010000 - U-001FFFFF, mask 11110XXX 
 				  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 
-				  $d+=4; 
+				  $d += 4; 
 				  break; 
 
 			  case (($ord_var_c & 0xFC) == 0xF8): 
 				  // characters U-00200000 - U-03FFFFFF, mask 111110XX 
 				  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 
-				  $d+=5; 
+				  $d += 5; 
 				  break; 
 
 			  case (($ord_var_c & 0xFE) == 0xFC): 
 				  // characters U-04000000 - U-7FFFFFFF, mask 1111110X 
 				  // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 
-				  $d+=6; 
+				  $d += 6; 
 				  break; 
 			  default: 
 				$d++;    

Braces +9 added lines, -13 removed lines

@@ -112,9 +112,11 @@ 
 		$this->state = self::STATE_ROOT;
 
 		
-		if (0) Daemon::log('[DEBUG] FastCGI-record ' . $this->header['ttype'] . '). Request ID: ' . $rid 
+		if (0) {
+			Daemon::log('[DEBUG] FastCGI-record ' . $this->header['ttype'] . '). Request ID: ' . $rid 
 				. '. Content length: ' . $this->header['conlen'] . ' (' . strlen($this->content) . ') Padding length: ' . $this->header['padlen'] 
 				. ' (' . strlen($pad) . ')');
+		}
 		
 
 		if ($type == self::FCGI_BEGIN_REQUEST) {
@@ -142,8 +144,7 @@ 
 			$req->queueId = $rid;
 			$req->conn = $this;
 			$this->requests[$rid] = $req;
-		}
-		elseif (isset($this->requests[$rid])) {
+		} elseif (isset($this->requests[$rid])) {
 			$req = $this->requests[$rid];
 		} else {
 			Daemon::log('Unexpected FastCGI-record #' . $this->header['type'] . ' (' . $this->header['ttype'] . '). Request ID: ' . $rid . '.');
@@ -152,8 +153,7 @@ 
 
 		if ($type === self::FCGI_ABORT_REQUEST) {
 			$req->abort();
-		}
-		elseif ($type === self::FCGI_PARAMS) {
+		} elseif ($type === self::FCGI_PARAMS) {
 			if ($this->content === '') {
 				if (!isset($req->attrs->server['REQUEST_TIME'])) {
 					$req->attrs->server['REQUEST_TIME'] = time();
@@ -213,8 +213,7 @@ 
 					$p += $namelen + $vlen;
 				}
 			}
-		}
-		elseif ($type === self::FCGI_STDIN) {
+		} elseif ($type === self::FCGI_STDIN) {
 			if ($this->content === '') {
 				$req->attrs->stdin_done = true;
 			}
@@ -234,11 +233,9 @@ 
 
 					if ($char == 'G') {
 						$req->attrs->request += $req->attrs->get;
-					}
-					elseif ($char == 'P') {
+					} elseif ($char == 'P') {
 						$req->attrs->request += $req->attrs->post;
-					}
-					elseif ($char == 'C') {
+					} elseif ($char == 'C') {
 						$req->attrs->request += $req->attrs->cookie;
 					}
 				}
@@ -349,8 +346,7 @@ 
 
 		if ($protoStatus === -1) {
 			$this->close();
-		}
-		elseif (!$this->pool->config->keepalive->value) {
+		} elseif (!$this->pool->config->keepalive->value) {
 			$this->finish();
 		}
 	}	

lib/File.php

Doc Comments +9 added lines

@@ -15,6 +15,9 @@ 
 	public $append;
 	public $path;
 
+	/**
+	 * @return string
+	 */
 	public static function convertFlags($mode, $text = false) {
 		$plus = strpos($mode, '+') !== false;
 		$sync = strpos($mode, 's') !== false;
@@ -55,6 +58,9 @@ 
 		eio_ftruncate($this->fd, $offset, $pri, $cb, $this);
 	}
 	
+	/**
+	 * @param Closure $cb
+	 */
 	public function stat($cb, $pri = EIO_PRI_DEFAULT) {
 		if (!$this->fd || $this->fd === -1) {
 			if ($cb) {
@@ -77,6 +83,9 @@ 
 		}
 	}
 
+	/**
+	 * @param Closure $cb
+	 */
 	public function statRefresh($cb, $pri = EIO_PRI_DEFAULT) {
 		if (!$this->fd || $this->fd === -1) {
 			if ($cb) {

Spacing +10 added lines, -10 removed lines

@@ -69,7 +69,7 @@ 
 		if ($this->stat) {
 			call_user_func($cb, $this, $this->stat);
 		} else {
-			eio_fstat($this->fd, $pri, function ($file, $stat) use ($cb) {
+			eio_fstat($this->fd, $pri, function($file, $stat) use ($cb) {
 				$stat = FS::statPrepare($stat);
 				$file->stat = $stat;
 				call_user_func($cb, $file, $stat);
@@ -88,7 +88,7 @@ 
 			call_user_func($cb, $this, FS::statPrepare(fstat($this->fd)));
 			return;
 		}
-		eio_fstat($this->fd, $pri, function ($file, $stat) use ($cb) {
+		eio_fstat($this->fd, $pri, function($file, $stat) use ($cb) {
 			$stat = FS::statPrepare($stat);
 			$file->stat = $stat;
 			call_user_func($cb, $file, $stat);
@@ -111,7 +111,7 @@ 
 		if ($this->statvfs) {
 			call_user_func($cb, $this, $this->statvfs);
 		} else {
-			eio_fstatvfs($this->fd, $pri, function ($file, $stat) use ($cb) {
+			eio_fstatvfs($this->fd, $pri, function($file, $stat) use ($cb) {
 				$file->statvfs = $stat;
 				call_user_func($cb, $file, $stat);
 			}, $this);		
@@ -229,7 +229,7 @@ 
 			$length,
 			$offset !== null ? $offset : $this->offset,
 			$pri,
-			$cb ? $cb: $this->onRead,
+			$cb ? $cb : $this->onRead,
 			$this
 		);
 		return true;
@@ -250,7 +250,7 @@ 
 		}
 		static $chunkSize = 1024;
 		$ret = true;
-		$handler = function ($file, $sent) use (&$ret, $outfd, $cb, &$handler, &$offset, &$length, $pri, $chunkSize) {
+		$handler = function($file, $sent) use (&$ret, $outfd, $cb, &$handler, &$offset, &$length, $pri, $chunkSize) {
 			if (!$ret) {
 				call_user_func($cb, $file, false);
 				return;
@@ -274,7 +274,7 @@ 
 			$handler($this, -1);
 			return;
 		}
-		$this->statRefresh(function ($file, $stat) use ($handler, &$length) {
+		$this->statRefresh(function($file, $stat) use ($handler, &$length) {
 			$length = $stat['size'];
 			$handler($file, -1);
 		}, $pri);
@@ -312,7 +312,7 @@ 
 			}
 			return false;
 		}
-		$this->statRefresh(function ($file, $stat) use ($cb, $pri) {
+		$this->statRefresh(function($file, $stat) use ($cb, $pri) {
 			if (!$stat) {
 				if ($cb) {
 					call_user_func($cb, $file, false);
@@ -322,7 +322,7 @@ 
 			$offset = 0;
 			$buf = '';
 			$size = $stat['size'];
-			$handler = function ($file, $data) use ($cb, &$handler, $size, &$offset, $pri, &$buf) {
+			$handler = function($file, $data) use ($cb, &$handler, $size, &$offset, $pri, &$buf) {
 				$buf .= $data;
 				$offset += strlen($data);
 				$len = min($file->chunkSize, $size - $offset);
@@ -345,14 +345,14 @@ 
 			}
 			return false;
 		}
-		$this->statRefresh(function ($file, $stat) use ($cb, $chunkcb, $pri) {
+		$this->statRefresh(function($file, $stat) use ($cb, $chunkcb, $pri) {
 			if (!$stat) {
 				call_user_func($cb, $file, false);
 				return;
 			}
 			$offset = 0;
 			$size = $stat['size'];
-			$handler = function ($file, $data) use ($cb, $chunkcb, &$handler, $size, &$offset, $pri) {
+			$handler = function($file, $data) use ($cb, $chunkcb, &$handler, $size, &$offset, $pri) {
 				call_user_func($chunkcb, $file, $data);
 				$offset += strlen($data);
 				$len = min($file->chunkSize, $size - $offset);

lib/FS.php

Doc Comments +18 added lines

@@ -86,6 +86,10 @@ 
 		return $stat;
 		
 	}
+
+	/**
+	 * @param Closure $cb
+	 */
 	public static function stat($path, $cb, $pri = EIO_PRI_DEFAULT) {
 		if (!self::$supported) {
 			call_user_func($cb, $path, FS::statPrepare(@stat($path)));
@@ -182,6 +186,10 @@ 
 		return eio_mkdir($path, $mode, $pri, $cb, $path);
 	}
 	
+	/**
+	 * @param string $path
+	 * @param Closure $cb
+	 */
 	public static function readdir($path, $cb = null, $flags,  $pri = EIO_PRI_DEFAULT) {
 		if (!FS::$supported) {
 			$r = glob($path);
@@ -233,6 +241,9 @@ 
 		return eio_chown($path, $uid, $gid, $pri, $cb, $path);
 	}
 	
+	/**
+	 * @param Closure $cb
+	 */
 	public static function readfile($path, $cb, $pri = EIO_PRI_DEFAULT) {
 		if (!FS::$supported) {
 			call_user_func($cb, $path, file_get_contents($path));
@@ -247,6 +258,9 @@ 
 		}, null, $pri);
 	}
 	
+	/**
+	 * @param Closure $chunkcb
+	 */
 	public static function readfileChunked($path, $cb, $chunkcb, $pri = EIO_PRI_DEFAULT) {
 		if (!FS::$supported) {
 			call_user_func($chunkcb, $path, $r = readfile($path));
@@ -266,6 +280,10 @@ 
 		return tempnam($dir, $prefix);
 	}
 	
+	/**
+	 * @param string $flags
+	 * @param Closure $cb
+	 */
 	public static function open($path, $flags, $cb, $mode = null, $pri = EIO_PRI_DEFAULT) {
 		if (self::$supported) {
 			$fdCacheKey = $path . "\x00" . $flags;

Indentation +3 added lines, -3 removed lines

@@ -39,8 +39,8 @@ 
 		self::$fd = eio_get_event_stream();
 		self::$ev = new Event(Daemon::$process->eventBase, self::$fd, Event::READ | Event::PERSIST, function ($fd, $events, $arg) {
 			while (eio_nreqs()) {
-	        	eio_poll();
-		    }
+				eio_poll();
+			}
 		});
 		self::$ev->add();
 	}
@@ -50,7 +50,7 @@ 
 			return;
 		}
 		while (eio_nreqs()) {
-		    eio_poll();
+			eio_poll();
 		}
 	}
 	

Spacing +10 added lines, -10 removed lines

@@ -24,7 +24,7 @@ 
 	public static $fdCache;
 	public static $fdCacheSize = 128;
 	public static function init() {
-		if (!self::$supported =	Daemon::loadModuleIfAbsent('eio')) {
+		if (!self::$supported = Daemon::loadModuleIfAbsent('eio')) {
 			Daemon::log('FS: missing pecl-eio, Filesystem I/O performance compromised. Consider installing pecl-eio.');
 			return;
 		}
@@ -37,7 +37,7 @@ 
 		}
 		self::updateConfig();
 		self::$fd = eio_get_event_stream();
-		self::$ev = new Event(Daemon::$process->eventBase, self::$fd, Event::READ | Event::PERSIST, function ($fd, $events, $arg) {
+		self::$ev = new Event(Daemon::$process->eventBase, self::$fd, Event::READ | Event::PERSIST, function($fd, $events, $arg) {
 			while (eio_nreqs()) {
 	        	eio_poll();
 		    }
@@ -91,7 +91,7 @@ 
 			call_user_func($cb, $path, FS::statPrepare(@stat($path)));
 			return;
 		}
-		return eio_stat($path, $pri, function($path, $stat) use ($cb) {call_user_func($cb, $path, FS::statPrepare($stat));}, $path);
+		return eio_stat($path, $pri, function($path, $stat) use ($cb) {call_user_func($cb, $path, FS::statPrepare($stat)); }, $path);
 	}
 	
 	public static function unlink($path, $cb = null, $pri = EIO_PRI_DEFAULT) {
@@ -118,7 +118,7 @@ 
 			call_user_func($cb, $path, FS::statPrepare(lstat($path)));
 			return;
 		}
-		return eio_lstat($path, $pri, function($path, $stat) use ($cb) {call_user_func($cb, $path, FS::statPrepare($stat));}, $path);
+		return eio_lstat($path, $pri, function($path, $stat) use ($cb) {call_user_func($cb, $path, FS::statPrepare($stat)); }, $path);
 	}
 	
 	public static function realpath($path, $cb, $pri = EIO_PRI_DEFAULT) {
@@ -182,7 +182,7 @@ 
 		return eio_mkdir($path, $mode, $pri, $cb, $path);
 	}
 	
-	public static function readdir($path, $cb = null, $flags,  $pri = EIO_PRI_DEFAULT) {
+	public static function readdir($path, $cb = null, $flags, $pri = EIO_PRI_DEFAULT) {
 		if (!FS::$supported) {
 			$r = glob($path);
 			if ($cb) {
@@ -211,7 +211,7 @@ 
 			call_user_func($cb, $path, false);
 			return;
 		}
-		FS::open($path, 'r', function ($file) use ($cb, $path, $pri, $outfd, $offset, $length) {
+		FS::open($path, 'r', function($file) use ($cb, $path, $pri, $outfd, $offset, $length) {
 			if (!$file) {
 				call_user_func($cb, $path, false);
 				return;
@@ -238,7 +238,7 @@ 
 			call_user_func($cb, $path, file_get_contents($path));
 			return;
 		}
-		FS::open($path, 'r', function ($file) use ($cb, $pri, $path) {
+		FS::open($path, 'r', function($file) use ($cb, $pri, $path) {
 			if (!$file) {
 				call_user_func($cb, $path, false);
 				return;
@@ -253,7 +253,7 @@ 
 			call_user_func($cb, $r !== false);
 			return;
 		}
-		FS::open($path, 'r', function ($file) use ($cb, $chunkcb, $pri) {
+		FS::open($path, 'r', function($file) use ($cb, $chunkcb, $pri) {
 			if (!$file) {
 				call_user_func($cb, $file->path, false);
 				return;
@@ -283,8 +283,8 @@ 
 				$item = FS::$fdCache->put($fdCacheKey, null);
 				$item->addListener($cb);
 			}
-			return eio_open($path, $flags , $mode,
-			  $pri, function ($arg, $fd) use ($cb, $path, $flags, $fdCacheKey, $noncache) {
+			return eio_open($path, $flags, $mode,
+			  $pri, function($arg, $fd) use ($cb, $path, $flags, $fdCacheKey, $noncache) {
 			  	
 				if (!$fd) {
 					if ($noncache) {

lib/GameMonitor.php

Doc Comments +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 	 * Creates Request.
 	 * @param object Request.
 	 * @param object Upstream application instance.
-	 * @return object Request.
+	 * @return GameMonitorHTTPRequest Request.
 	 */
 	public function beginRequest($req, $upstream) {
 		return new GameMonitorHTTPRequest($this, $upstream, $req);

Spacing +12 added lines, -12 removed lines

@@ -63,10 +63,10 @@ 
 			$set['players'] = $job->results['players'];
 			$set['latency'] = $job->results['latency'];
 			$set['atime'] = time();
-			if (0) Daemon::log('Updated server ('.round(memory_get_usage(true)/1024/1024, 5).'): '.$server['address']. ' latency = '.round($set['latency'] * 1000, 2).' ==== '
+			if (0) Daemon::log('Updated server (' . round(memory_get_usage(true) / 1024 / 1024, 5) . '): ' . $server['address'] . ' latency = ' . round($set['latency'] * 1000, 2) . ' ==== '
 				 . (isset($server['atime']) ?
 				  round($set['atime'] - $server['atime']) . ' secs. from last update.'
-				  : ' =---= '.json_encode($server))
+				  : ' =---= ' . json_encode($server))
 			);
 			try {
 				$app->servers->upsert(array('_id' => $server['_id']), array('$set' => $set));
@@ -78,12 +78,12 @@ 
 		$app->jobMap[$server['address']] = $job;
 		//Daemon::log('Added job for '.$server['address']);
 
-		$job('info', function ($jobname, $job) use ($app, $server) {
-			$app->client->requestInfo($server['address'], function ($conn, $result) use ($app, $server, $jobname, $job) {
+		$job('info', function($jobname, $job) use ($app, $server) {
+			$app->client->requestInfo($server['address'], function($conn, $result) use ($app, $server, $jobname, $job) {
 
-				$job('players', function ($jobname, $job) use ($app, $server, $conn) {
+				$job('players', function($jobname, $job) use ($app, $server, $conn) {
 					
-					$conn->requestPlayers(function ($conn, $result) use ($app,$jobname, $job) {
+					$conn->requestPlayers(function($conn, $result) use ($app, $jobname, $job) {
 
 						$job->setResult($jobname, $result);
 						$conn->finish();
@@ -96,9 +96,9 @@ 
 			});
 		});
 
-		$job('latency', function ($jobname, $job) use ($app, $server) {
+		$job('latency', function($jobname, $job) use ($app, $server) {
 							
-			$app->client->ping($server['address'], function ($conn, $result) use ($app, $jobname, $job) {
+			$app->client->ping($server['address'], function($conn, $result) use ($app, $jobname, $job) {
 	
 				$job->setResult($jobname, $result);
 
@@ -116,7 +116,7 @@ 
 		gc_collect_cycles();
 		$app = $this;
 		$amount = 1000 - sizeof($this->jobMap);
-		Daemon::log('amount: '.$amount);
+		Daemon::log('amount: ' . $amount);
 		if ($amount <= 0) {
 			return;
 		}
@@ -138,7 +138,7 @@ 
 
 			)),
 			//'fields' => '_id,atime,address',
-			'limit' => - max($amount, 100),
+			'limit' => -max($amount, 100),
 			'sort' => array('atime' => 1),
 		));
 	}
@@ -149,7 +149,7 @@ 
 	 */
 	public function onReady() {
 		if ($this->isEnabled()) {
-			$this->updateTimer = setTimeout(function ($timer) {
+			$this->updateTimer = setTimeout(function($timer) {
 				$this->updateAllServers();
 				$timer->timeout(2e6);
 			}, 1);
@@ -196,7 +196,7 @@ 
 				
 		$job('getServers', function($name, $job) use ($req) { // registering job named 'pingjob'
 		
-			$req->appInstance->servers->find(function ($cursor) use ($name, $job) {
+			$req->appInstance->servers->find(function($cursor) use ($name, $job) {
 				$job->setResult($name, $cursor->items);
 			});
 		});

Braces +3 added lines, -1 removed lines

@@ -63,11 +63,13 @@
 			$set['players'] = $job->results['players'];
 			$set['latency'] = $job->results['latency'];
 			$set['atime'] = time();
-			if (0) Daemon::log('Updated server ('.round(memory_get_usage(true)/1024/1024, 5).'): '.$server['address']. ' latency = '.round($set['latency'] * 1000, 2).' ==== '
+			if (0) {
+				Daemon::log('Updated server ('.round(memory_get_usage(true)/1024/1024, 5).'): '.$server['address']. ' latency = '.round($set['latency'] * 1000, 2).' ==== '
 				 . (isset($server['atime']) ?
 				  round($set['atime'] - $server['atime']) . ' secs. from last update.'
 				  : ' =---= '.json_encode($server))
 			);
+			}
 			try {
 				$app->servers->upsert(array('_id' => $server['_id']), array('$set' => $set));
 			} catch (MongoException $e) {

lib/HTTPRequest.php

Doc Comments +12 added lines, -3 removed lines

@@ -105,6 +105,9 @@ 
 		$this->parseParams();
 	}
 	
+	/**
+	 * @param Closure $cb
+	 */
 	public function sendfile($path, $cb, $pri = EIO_PRI_DEFAULT) {
 		$req = $this;
 		if ($req->state === self::STATE_FINISHED) {
@@ -122,6 +125,10 @@ 
 		}
 		$first = true;
 		FS::readfileChunked($path, $cb,
+
+			/**
+			 * @param Closure $chunk
+			 */
 			function($file, $chunk) use ($req, &$first) { // readed chunk
 				if ($first) {
 					try {
@@ -137,7 +144,7 @@ 
 	/**
 	 * Called by call() to check if ready
 	 * @todo protected?
-	 * @return void
+	 * @return boolean
 	 */
 	public function checkIfReady() {
 		if (
@@ -484,7 +491,7 @@ 
 	 * Send HTTP-status
 	 * @throws RequestHeadersAlreadySent
 	 * @param int Code
-	 * @return void
+	 * @return boolean
 	 */
 	public function status($code = 200) {
 		if (!isset(self::$codes[$code])) {
@@ -522,6 +529,7 @@ 
 	 * @param string. Optional. Path. Default is empty string.
 	 * @param boolean. Optional. Secure. Default is false.
 	 * @param boolean. Optional. HTTPOnly. Default is false.
+	 * @param string $name
 	 * @return void
 	 * @throws RequestHeadersAlreadySent
 	 */
@@ -607,6 +615,7 @@ 
 
 	/**
 	 * @todo description missing
+	 * @param string $value
 	 */
 	public function parseSize($value) {
 		$l = strtolower(substr($value, -1));
@@ -873,7 +882,7 @@ 
 
 	/**
 	 * Read request body from the file given in REQUEST_BODY_FILE parameter.
-	 * @return void
+	 * @return false|null
 	 */
 	public function readBodyFile() {
 		if (!isset($this->attrs->server['REQUEST_BODY_FILE'])) {

Spacing +13 added lines, -13 removed lines

@@ -13,7 +13,7 @@ 
 	 * Status codes
 	 * @var array
 	 */
-	private static $codes = array (
+	private static $codes = array(
 		100 => 'Continue',
 		101 => 'Switching Protocols',
 		200 => 'OK',
@@ -242,7 +242,7 @@ 
 					$URLprefix = $this->attrs->server['REQUEST_PREPARED_UPLOADS_URL_PREFIX'];
 					$l = strlen($URLprefix);
 					foreach (array('PHP_SELF', 'REQUEST_URI', 'SCRIPT_NAME', 'DOCUMENT_URI') as $k) {
-						if (!isset($this->attrs->server[$k])) {continue;}
+						if (!isset($this->attrs->server[$k])) {continue; }
 						if (strncmp($this->attrs->server[$k], $URLprefix, $l) === 0) {
 							$this->attrs->server[$k] = substr($this->attrs->server[$k], $l - 1);
 						}
@@ -272,7 +272,7 @@ 
 					if ($this->oldFashionUploadFP) {
 						$file['fp'] = fopen($file['tmp_name'], 'c+');
 					} else {
-						FS::open($file['tmp_name'], 'c+', function ($fp) use (&$file) {
+						FS::open($file['tmp_name'], 'c+', function($fp) use (&$file) {
 							if (!$fp) {
 								return;
 							}
@@ -529,8 +529,8 @@ 
 		$this->header(
 			'Set-Cookie: ' . $name . '=' . rawurlencode($value)
 			. (empty($domain) ? '' : '; Domain=' . $domain)
-			. (empty($maxage) ? '' : '; Max-Age='.$maxage)
-			. (empty($path) ? '' : '; Path='.$path)
+			. (empty($maxage) ? '' : '; Max-Age=' . $maxage)
+			. (empty($path) ? '' : '; Path=' . $path)
 			. (!$secure ? '' : '; Secure')
 			. (!$HTTPOnly ? '' : '; HttpOnly'), false);
 	}
@@ -570,17 +570,17 @@ 
 			if (!isset($ctype['charset'])) {
 				$ctype['charset'] = $this->upstream->pool->config->defaultcharset->value;
 
-				$s = $e[0].': ';
+				$s = $e[0] . ': ';
 				$i = 0;
 				foreach ($ctype as $k => $v) {
-					$s .= ($i > 0 ? '; ' : '') . $k.  ($v !== '' ? '=' . $v : '');
+					$s .= ($i > 0 ? '; ' : '') . $k . ($v !== '' ? '=' . $v : '');
 					++$i;
 				}
 			}
 		}
 
 		if ($k === 'SET_COOKIE') {
-			$k .= '_'.++$this->cookieNum;
+			$k .= '_' . ++$this->cookieNum;
 		}
 		elseif (
 			!$replace
@@ -703,7 +703,7 @@ 
 									if (FS::$supported) {
 										$this->upstream->lockRead();
 									}
-									FS::open($this->attrs->files[$name]['tmp_name'], 'c+', function ($fp) use ($req, $name) {
+									FS::open($this->attrs->files[$name]['tmp_name'], 'c+', function($fp) use ($req, $name) {
 										if (!$fp) {
 											$req->attrs->files[$name]['error'] = UPLOAD_ERR_CANT_WRITE;
 										}
@@ -864,7 +864,7 @@ 
 	 * @param string The destination of the moved file.
 	 * @return boolean Success.
 	 */
-	public function moveUploadedFile($filename,$dest) {
+	public function moveUploadedFile($filename, $dest) {
 		if (!$this->isUploadedFile($filename)) {
 			return false;
 		}
@@ -880,7 +880,7 @@ 
 			return false;
 		}
 		FS::readfileChunked($this->attrs->server['REQUEST_BODY_FILE'],
-			function ($file, $success) {
+			function($file, $success) {
 				$this->attrs->stdin_done = true;
 				if ($this->sleepTime === 0) {
 					$this->wakeup();
@@ -902,7 +902,7 @@ 
 	public static function parse_str($s, &$var, $header = false) {
 		static $cb;
 		if ($cb === NULL) {
-			$cb = function ($m) {
+			$cb = function($m) {
 				return urlencode(html_entity_decode('&#' . hexdec($m[1]) . ';', ENT_NOQUOTES, 'utf-8'));
 			};
 		}
@@ -910,7 +910,7 @@ 
 			$s = strtr($s, HTTPRequest::$hvaltr);
 		}
 		if (
-			(stripos($s,'%u') !== false)
+			(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', $cb, $s);

Braces +5 added lines, -10 removed lines

@@ -581,8 +581,7 @@ 
 
 		if ($k === 'SET_COOKIE') {
 			$k .= '_'.++$this->cookieNum;
-		}
-		elseif (
+		} elseif (
 			!$replace
 			&& isset($this->headers[$k])
 		) {
@@ -593,8 +592,7 @@ 
 
 		if ($k === 'CONTENT_LENGTH') {
 			$this->contentLength = (int) $e[1];
-		}
-		elseif ($k === 'LOCATION') {
+		} elseif ($k === 'LOCATION') {
 			$this->status(301);
 		}
 
@@ -719,8 +717,7 @@ 
 						} else {
 							$this->attrs->post[$this->mpartcondisp['name']] = '';
 						}
-					}
-					elseif (
+					} elseif (
 						($e[0] == 'CONTENT_TYPE')
 						&& isset($e[1])
 					) {
@@ -758,8 +755,7 @@ 
 					&& isset($this->mpartcondisp['name'])
 				) {
 					$this->attrs->post[$this->mpartcondisp['name']] .= $chunk;
-				}
-				elseif (
+				} elseif (
 					($this->mpartstate === self::MPSTATE_UPLOAD)
 					&& isset($this->mpartcondisp['filename'])
 				) {
@@ -799,8 +795,7 @@ 
 						&& isset($this->mpartcondisp['name'])
 					) {
 						$this->attrs->post[$this->mpartcondisp['name']] .= $chunk;
-					}
-					elseif (
+					} elseif (
 						($this->mpartstate === self::MPSTATE_UPLOAD)
 						&& isset($this->mpartcondisp['filename'])
 					) {

lib/HTTPServerConnection.php

Doc Comments +4 added lines, -1 removed lines

@@ -228,7 +228,10 @@
 
 	/**
 	 * Handles the output from downstream requests.
-	 * @return boolean Succcess.
+	 * @param stdClass $req
+	 * @param integer $appStatus
+	 * @param integer $protoStatus
+	 * @return boolean|null Succcess.
 	 */
 	public function endRequest($req, $appStatus, $protoStatus) {
 		if ($protoStatus === -1) {

Spacing +5 added lines, -5 removed lines

@@ -8,8 +8,8 @@ 
  */
 
 class HTTPServerConnection extends Connection {
-	protected $initialLowMark  = 1;         // initial value of the minimal amout of bytes in buffer
-	protected $initialHighMark = 0xFFFFFF;  // initial value of the maximum amout of bytes in buffer
+	protected $initialLowMark  = 1; // initial value of the minimal amout of bytes in buffer
+	protected $initialHighMark = 0xFFFFFF; // initial value of the maximum amout of bytes in buffer
 	public $timeout = 45;
 
 	public $req;
@@ -79,7 +79,7 @@ 
 		} else {
 			if (!$this->req) {
 				if ($buf !== '') {
-					Daemon::log('Unexpected input (HTTP request): '.Debug::dump($buf));
+					Daemon::log('Unexpected input (HTTP request): ' . Debug::dump($buf));
 				}
 				return;
 			}
@@ -157,11 +157,11 @@ 
 				if ($req instanceof stdClass) {
 					$this->endRequest($req, 0, 0);
 				} else {
-					if ($this->pool->config->sendfile->value && (!$this->pool->config->sendfileonlybycommand->value	|| isset($req->attrs->server['USE_SENDFILE'])) 
+					if ($this->pool->config->sendfile->value && (!$this->pool->config->sendfileonlybycommand->value || isset($req->attrs->server['USE_SENDFILE'])) 
 						&& !isset($req->attrs->server['DONT_USE_SENDFILE'])
 					) {
 						$fn = FS::tempnam($this->pool->config->sendfiledir->value, $this->pool->config->sendfileprefix->value);
-						FS::open($fn, 'wb', function ($file) use ($req) {
+						FS::open($fn, 'wb', function($file) use ($req) {
 							$req->sendfp = $file;
 						});
 						$req->header('X-Sendfile: ' . $fn);

Braces +5 added lines, -10 removed lines

@@ -116,12 +116,10 @@ 
 					if (isset($e[1])) {
 						$currentHeader = 'HTTP_' . strtoupper(strtr($e[0], HTTPRequest::$htr));
 						$req->attrs->server[$currentHeader] = $e[1];
-					}
-					elseif ($e[0][0] === "\t" || $e[0][0] === "\x20")
+					} elseif ($e[0][0] === "\t" || $e[0][0] === "\x20")
 					{ // multiline header continued
 						$req->attrs->server[$currentHeader] .= $e[0];
-					}
-					else
+					} else
 					{ // whatever client speaks is not HTTP anymore
 						$this->finish();
 						return;
@@ -168,8 +166,7 @@ 
 					}
 					$this->state = self::STATE_CONTENT;
 				}
-			}
-			else {
+			} else {
 				$this->bufHead = $buf;
 				goto start;
 			}
@@ -197,11 +194,9 @@ 
 					$char = $this->pool->variablesOrder[$i];
 					if ($char == 'G') {
 						$req->attrs->request += $req->attrs->get;
-					}
-					elseif ($char == 'P') {
+					} elseif ($char == 'P') {
 						$req->attrs->request += $req->attrs->post;
-					}
-					elseif ($char == 'C') {
+					} elseif ($char == 'C') {
 						$req->attrs->request += $req->attrs->cookie;
 					}
 				}