kakserpom / phpdaemon

lib/XMPPClient.php

Braces +6 added lines, -2 removed lines

@@ -263,10 +263,14 @@
 	 * @param string $to
 	 */
 	public function presence($status = null, $show = 'available', $to = null, $type='available', $priority = 0 ) {
-		if($type == 'available') $type = '';
+		if($type == 'available') {
+			$type = '';
+		}
 		$to	 = htmlspecialchars($to);
 		$status = htmlspecialchars($status);
-		if($show == 'unavailable') $type = 'unavailable';
+		if($show == 'unavailable') {
+			$type = 'unavailable';
+		}
 		
 		$out = "<presence";
 		$out .= ' from="'.$this->fulljid.'"';

lib/Daemon_Config.php

Braces +4 added lines, -8 removed lines

@@ -83,14 +83,11 @@ 
 		foreach ($this as $name => $value) {
 			if (in_array($name, $sizes)) {
 				$entry = new Daemon_ConfigEntrySize;
-			}
-			elseif (in_array($name, $times)) {
+			} elseif (in_array($name, $times)) {
 				$entry = new Daemon_ConfigEntryTime;
-			}
-			elseif (in_array($name, $numbers)) {
+			} elseif (in_array($name, $numbers)) {
 				$entry = new Daemon_ConfigEntryNumber;
-			} 
-			elseif ($name === 'configfile') {
+			} elseif ($name === 'configfile') {
 				$entry = new Daemon_ConfigEntryConfigFile;
 			} else {
 				$entry = new Daemon_ConfigEntry;
@@ -184,8 +181,7 @@ 
 				Daemon::$config->{$k}->setHumanValue($v);
 				Daemon::$config->{$k}->source = 'cmdline';
 				
-			}
-			else {
+			} else {
 				Daemon::log('Unrecognized parameter \'' . $k . '\'');
 				$error = TRUE;
 			}

lib/Daemon_ConfigEntryTime.php

Braces +3 added lines, -6 removed lines

@@ -35,14 +35,11 @@
 
 			if ($l === 's') {
 				$time += $n;
-			}
-			elseif ($l === 'm') {
+			} elseif ($l === 'm') {
 				$time += $n * 60;
-			}
-			elseif ($l === 'h') {
+			} elseif ($l === 'h') {
 				$time += $n * 60 * 60;
-			}
-			elseif ($l === 'd') {
+			} elseif ($l === 'd') {
 				$time += $n * 60 * 60 * 24;
 			}
 		}, $value);

lib/WebSocketProtocolV13.php

Braces +3 added lines, -6 removed lines

@@ -107,14 +107,12 @@ 
         if ($dataLength <= 125)
         {
             $packet .= chr($dataLength + $isMaskedInt);
-        }
-        elseif ($dataLength <= 65535)
+        } elseif ($dataLength <= 65535)
         {
             $packet .=	chr(126 + $isMaskedInt) . // 126 + 128
             			chr($dataLength >> 8) .
             			chr($dataLength & 0xFF);
-        }
-        else {
+        } else {
             $packet .=	chr(127 + $isMaskedInt) . // 127 + 128
              			chr($dataLength >> 56) .
            				chr($dataLength >> 48) .
@@ -218,8 +216,7 @@ 
 				}
 				$dataLength = $this->bytes2int(binarySubstr($this->connection->buf, $p, 2), false);
 				$p += 2;
-			}
-			elseif ($dataLength === 0x7f) { // 4 bytes-length
+			} elseif ($dataLength === 0x7f) { // 4 bytes-length
 				if ($buflen < $p + 4) {
 					return; // not enough data yet
 				}

lib/PostgreSQLClient.php

Braces +18 added lines, -36 removed lines

@@ -83,8 +83,7 @@ 
 	public function onConnected($cb) {
 		if ($this->state == self::STATE_AUTH_ERROR) {
 			call_user_func($cb, $this, false);
-		}
-		elseif ($this->state === self::STATE_AUTH_OK) {
+		} elseif ($this->state === self::STATE_AUTH_OK) {
 			call_user_func($cb, $this, true);
 		} else {
 			if (!$this->onConnected) {
@@ -376,38 +375,32 @@ 
 				Daemon::log(__CLASS__ . ': Unsupported authentication method: KerberosV5.');
 				$this->state = self::STATE_AUTH_ERROR; // Auth. error
 				$this->finish(); // Unsupported,  finish
-			}
-			elseif ($authType === 3) {
+			} elseif ($authType === 3) {
 				// Cleartext
 				$this->sendPacket('p', $this->password); // Password Message
 				$this->state = self::STATE_AUTH_PACKET_SENT;
-			}
-			elseif ($authType === 4) {
+			} elseif ($authType === 4) {
 				// Crypt
 				$salt = binarySubstr($packet, 4, 2);
 				$this->sendPacket('p', crypt($this->password, $salt)); // Password Message
 				$this->state = self::STATE_AUTH_PACKET_SENT;
-			}
-			elseif ($authType === 5) {
+			} elseif ($authType === 5) {
 				// MD5
 				$salt = binarySubstr($packet, 4, 4);
 				$this->sendPacket('p', 'md5' . md5(md5($this->password . $this->user) . $salt)); // Password Message
 				$this->state = self::STATE_AUTH_PACKET_SENT;
-			}
-			elseif ($authType === 6) {
+			} elseif ($authType === 6) {
 				// SCM
 				Daemon::log(__CLASS__ . ': Unsupported authentication method: SCM.');
 				$this->state = self::STATE_AUTH_ERROR; // Auth. error
 				$this->finish(); // Unsupported,  finish
-			}
-			elseif ($authType == 9) {
+			} elseif ($authType == 9) {
 				// GSS
 				Daemon::log(__CLASS__.': Unsupported authentication method: GSS.');
 				$this->state = self::STATE_AUTH_ERROR; // Auth. error
 				$this->finish(); // Unsupported,  finish
 			}
-		}
-		elseif ($type === 'T') {
+		} elseif ($type === 'T') {
 			// Row Description
 			list(, $numfields) = unpack('n', binarySubstr($packet, 0, 2));
 			$p = 2;
@@ -419,8 +412,7 @@ 
 				$field['name'] = $name;
 				$this->resultFields[] = $field;
 			}
-		}
-		elseif ($type === 'D') {
+		} elseif ($type === 'D') {
 			// Data Row
 			list(, $numfields) = unpack('n', binarySubstr($packet, 0, 2));
 			$p = 2;
@@ -446,8 +438,7 @@ 
 			}
 	
 			$this->resultRows[] = $row;
-		}
-		elseif (
+		} elseif (
 			$type === 'G'
 			|| $type === 'H'
 		) {
@@ -456,8 +447,7 @@ 
 			if ($this->pool->config->protologging->value) {
 				Daemon::log(__CLASS__ . ': Caught CopyInResponse');
 			}
-		}
-		elseif ($type === 'C') {
+		} elseif ($type === 'C') {
 			// Close command
 			$type = binarySubstr($packet, 0, 1);
 	
@@ -473,8 +463,7 @@ 
 				if ($tag[0] === 'INSERT') {
 					$this->insertId = $tag[1];
 					$this->insertNum = $tag[2];
-				}
-				elseif (
+				} elseif (
 					($tag[0] === 'DELETE') 
 					|| ($tag[0] === 'UPDATE') 
 					|| ($tag[0] === 'MOVE') 
@@ -486,12 +475,10 @@ 
 			}
 	
 			$this->onResultDone();
-		}
-		elseif ($type === 'n') {
+		} elseif ($type === 'n') {
 			// No Data
 			$this->onResultDone();
-		}
-		elseif ($type === 'E') {
+		} elseif ($type === 'E') {
 			// Error Response
 			$code = ord($packet);
 			$message = '';
@@ -522,20 +509,17 @@ 
 			if ($this->pool->config->protologging->value) {
 				Daemon::log(__CLASS__ . ': Error response caught (0x' . dechex($code) . '): ' . $message);
 			}
-		}
-		elseif ($type === 'I') {
+		} elseif ($type === 'I') {
 			// Empty Query Response
 			$this->errno = -1;
 			$this->errmsg = 'Query was empty';
 			$this->onError();
-		}
-		elseif ($type === 'S') {
+		} elseif ($type === 'S') {
 			// Portal Suspended
 			if ($this->pool->config->protologging->value) {
 				Daemon::log(__CLASS__ . ': Caught PortalSuspended');
 			}
-		}
-		elseif ($type === 'S') {
+		} elseif ($type === 'S') {
 			// Parameter Status
 			$u = $this->decodeNULstrings($packet, 2);
 	
@@ -546,8 +530,7 @@ 
 					Daemon::log(__CLASS__ . ': Parameter ' . $u[0] . ' = \'' . $this->parameters[$u[0]] . '\'');
 				}
 			}
-		}
-		elseif ($type === 'K') {
+		} elseif ($type === 'K') {
 			// Backend Key Data
 			list(, $this->backendKey) = unpack('N', $packet);
 			$this->backendKey = isset($u[1])?$u[1]:NULL;
@@ -555,8 +538,7 @@ 
 			if ($this->pool->config->protologging->value) {
 				Daemon::log(__CLASS__ . ': BackendKey is ' . $this->backendKey);
 			}
-		}
-		elseif ($type === 'Z') {
+		} elseif ($type === 'Z') {
 			// Ready For Query
 			$this->status = $packet;
 		

lib/IdentServer.php

Braces +1 added lines, -2 removed lines

@@ -33,8 +33,7 @@
 		if ($method === 'registerPair') {
 			list ($local, $foreign, $user) = $args;
 			$this->pairs[$local . ':' .$foreign] = $user;
-		}
-		elseif ($method === 'unregisterPair') {
+		} elseif ($method === 'unregisterPair') {
 			list ($local, $foreign) = $args;
 			unset($this->pairs[$local . ':' .$foreign]);
 		}

lib/XMLStream.php

Braces +6 added lines, -2 removed lines

@@ -50,7 +50,9 @@ 
 			$this->current_ns[$this->xml_depth] = $attr['XMLNS'];
 		} else {
 			$this->current_ns[$this->xml_depth] = $this->current_ns[$this->xml_depth - 1];
-			if(!$this->current_ns[$this->xml_depth]) $this->current_ns[$this->xml_depth] = $this->default_ns;
+			if(!$this->current_ns[$this->xml_depth]) {
+				$this->current_ns[$this->xml_depth] = $this->default_ns;
+			}
 		}
 		$ns = $this->current_ns[$this->xml_depth];
 		foreach($attr as $key => $value) {
@@ -318,7 +320,9 @@ 
 	 */
 	public function hasSub($name, $ns = null) {
 		foreach($this->subs as $sub) {
-			if(($name == "*" or $sub->name == $name) and ($ns == null or $sub->ns == $ns)) return true;
+			if(($name == "*" or $sub->name == $name) and ($ns == null or $sub->ns == $ns)) {
+				return true;
+			}
 		}
 		return false;
 	}

lib/WebSocketProtocolV0.php

Braces +3 added lines, -6 removed lines

@@ -91,8 +91,7 @@ 
 
 			if ($c === "\x20") {
 				++$spaces;
-			}
-			elseif (ctype_digit($c)) {
+			} elseif (ctype_digit($c)) {
 				$digits .= $c;
 			}
 		}
@@ -169,8 +168,7 @@ 
 				$decodedData = binarySubstr($this->connection->buf, 2, $len) ;
 				$this->connection->buf = binarySubstr($this->connection->buf, 2 + $len) ;
 				$this->connection->onFrame($decodedData, 'BINARY');
-			}
-			else {
+			} else {
 				if (($p = strpos($this->connection->buf, "\xFF")) !== FALSE) {
 					if ($this->connection->pool->maxAllowedPacket <= $p - 1) {
 						// Too big packet
@@ -181,8 +179,7 @@ 
 					$decodedData = binarySubstr($this->connection->buf, 1, $p - 1) ;
 					$this->connection->buf = binarySubstr($this->connection->buf, $p + 1) ;
 					$this->connection->onFrame($decodedData, 'STRING');
-				}
-				else {
+				} else {
 					if ($this->connection->pool->maxAllowedPacket <= $buflen - 1) {
 						// Too big packet
 						$this->connection->finish() ;

lib/Daemon_ConfigParser.php

Braces +16 added lines, -32 removed lines

@@ -64,8 +64,7 @@ 
 					if ($c === $q) {
 						++$cfg->p;
 						break;
-					}
-					elseif ($c === '\\') {
+					} elseif ($c === '\\') {
 						if ($cfg->getNextChar() === $q) {
 							$str .= $q;
 							++$cfg->p;
@@ -84,19 +83,16 @@ 
 				return $str;
 			},
 			self::T_ALL => function($cfg, $c) {
-				if (ctype_space($c)) { }
-				elseif ($c === '#') {
+				if (ctype_space($c)) { } elseif ($c === '#') {
 					$cfg->state[] = array(Daemon_ConfigParser::T_COMMENT);
-				}
-				elseif ($c === '}') {
+				} elseif ($c === '}') {
 					if (sizeof($cfg->state) > 1) {
 						$cfg->purgeScope($cfg->getCurrentScope());
 						array_pop($cfg->state);
 					} else {
 						$cfg->raiseError('Unexpected \'}\'');
 					}
-				}
-				elseif (ctype_alnum($c)) {
+				} elseif (ctype_alnum($c)) {
 					$elements = array('');
 					$elTypes = array(NULL);
 					$i = 0;
@@ -115,8 +111,7 @@ 
 								++$i;
 								$elTypes[$i] = NULL;
 							}
-						}
-						elseif (
+						} elseif (
 							($c === '"') 
 							|| ($c === '\'')
 						) {
@@ -131,18 +126,15 @@ 
 								$elements[$i] = $string;
 								$elTypes[$i] = Daemon_ConfigParser::T_STRING;
 							}
-						}
-						elseif ($c === '}') {
+						} elseif ($c === '}') {
 							$cfg->raiseError('Unexpected \'}\' instead of \';\' or \'{\'');
-						}
-						elseif ($c === ';') {
+						} elseif ($c === ';') {
 							if ($newLineDetected) {
 								$this->raiseError('Unexpected new-line instead of \';\'', 'notice', $newLineDetected[0], $newLineDetected[1]);
 							}
 							$tokenType = Daemon_ConfigParser::T_VAR;
 							break;
-						}
-						elseif ($c === '{') {
+						} elseif ($c === '{') {
 							$tokenType = Daemon_ConfigParser::T_BLOCK;
 							break;
 						} else {
@@ -163,19 +155,16 @@ 
 						if (Daemon_ConfigParser::T_CVALUE === $v) {
 							if (ctype_digit($elements[$k])) {
 								$elements[$k] = (int) $elements[$k];
-							}
-							elseif (is_numeric($elements[$k])) {
+							} elseif (is_numeric($elements[$k])) {
 								$elements[$k] = (float) $elements[$k];
 							} else {
 								$l = strtolower($elements[$k]);
 
 								if (($l === 'true') || ($l === 'on')) {
 									$elements[$k] = true;
-								}
-								elseif (($l === 'false') || ($l === 'off')) {
+								} elseif (($l === 'false') || ($l === 'off')) {
 									$elements[$k] = false;
-								}
-								elseif ($l === 'null') {
+								} elseif ($l === 'null') {
 									$elements[$k] = null;
 								}
 							}
@@ -183,8 +172,7 @@ 
 					}
 					if ($tokenType === 0) {
 						$cfg->raiseError('Expected \';\' or \'{\''); 
-					}
-					elseif ($tokenType === Daemon_ConfigParser::T_VAR) {
+					} elseif ($tokenType === Daemon_ConfigParser::T_VAR) {
 						$name = str_replace('-', '', strtolower($elements[0]));
 						$scope = $cfg->getCurrentScope();
 						
@@ -232,11 +220,9 @@ 
 								}
 								$scope->{$name}->setValue($elements[1]);
 								$scope->{$name}->setValueType($elTypes[1]);
-							}
-							else {$cfg->raiseError('Unrecognized parameter \''.$name.'\'');}
+							} else {$cfg->raiseError('Unrecognized parameter \''.$name.'\'');}
 						}
-					}
-					elseif ($tokenType === Daemon_ConfigParser::T_BLOCK) {
+					} elseif ($tokenType === Daemon_ConfigParser::T_BLOCK) {
 						$scope = $cfg->getCurrentScope();
 						$sectionName = implode('-', $elements);
 						$sectionName = strtr($sectionName, '-. ', ':::');
@@ -277,14 +263,12 @@ 
 							unset($scope->{$name});
 						}
 					}
-			}
-			elseif ($obj instanceof Daemon_ConfigSection) {
+			} elseif ($obj instanceof Daemon_ConfigSection) {
 				
 				if ($obj->source === 'config' && ($obj->revision < $cfg->revision))	{
 					if (sizeof($obj) === 0) {
 						unset($scope->{$name});
-					}
-					elseif (isset($obj->enable)) {
+					} elseif (isset($obj->enable)) {
 						$obj->enable->setValue(FALSE);
 					}
 				}