mmainstreet / jodel-web

php/Requests/CreateUser.php

Doc Comments +4 added lines

@@ -32,6 +32,10 @@
     {
         return $this->random_str(64, 'abcdef0123456789');
     }
+
+    /**
+     * @param integer $length
+     */
     function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
     {
         $str = '';

php/Requests/libary/Requests.php

Doc Comments +3 added lines

@@ -226,6 +226,7 @@ 
 	 */
 	/**
 	 * Send a GET request
+	 * @param string $url
 	 */
 	public static function get($url, $headers = array(), $options = array()) {
 		return self::request($url, $headers, null, self::GET, $options);
@@ -263,12 +264,14 @@ 
 	 */
 	/**
 	 * Send a POST request
+	 * @param string $url
 	 */
 	public static function post($url, $headers = array(), $data = array(), $options = array()) {
 		return self::request($url, $headers, $data, self::POST, $options);
 	}
 	/**
 	 * Send a PUT request
+	 * @param string $url
 	 */
 	public static function put($url, $headers = array(), $data = array(), $options = array()) {
 		return self::request($url, $headers, $data, self::PUT, $options);

Braces +11 added lines, -22 removed lines

@@ -370,8 +370,7 @@ 
 			if (is_string($options['transport'])) {
 				$transport = new $transport();
 			}
-		}
-		else {
+		} else {
 			$need_ssl = (0 === stripos($url, 'https://'));
 			$capabilities = array('ssl' => $need_ssl);
 			$transport = self::get_transport($capabilities);
@@ -447,8 +446,7 @@ 
 			if (!isset($request['options'])) {
 				$request['options'] = $options;
 				$request['options']['type'] = $request['type'];
-			}
-			else {
+			} else {
 				if (empty($request['options']['type'])) {
 					$request['options']['type'] = $request['type'];
 				}
@@ -473,8 +471,7 @@ 
 			if (is_string($options['transport'])) {
 				$transport = new $transport();
 			}
-		}
-		else {
+		} else {
 			$transport = self::get_transport();
 		}
 		$responses = $transport->request_multiple($requests, $options);
@@ -584,8 +581,7 @@ 
 
 		if (is_array($options['cookies'])) {
 			$options['cookies'] = new Requests_Cookie_Jar($options['cookies']);
-		}
-		elseif (empty($options['cookies'])) {
+		} elseif (empty($options['cookies'])) {
 			$options['cookies'] = new Requests_Cookie_Jar();
 		}
 		if ($options['cookies'] !== false) {
@@ -604,8 +600,7 @@ 
 		if (!isset($options['data_format'])) {
 			if (in_array($type, array(self::HEAD, self::GET, self::DELETE))) {
 				$options['data_format'] = 'query';
-			}
-			else {
+			} else {
 				$options['data_format'] = 'body';
 			}
 		}
@@ -642,8 +637,7 @@ 
 
 			$headers = substr($return->raw, 0, $pos);
 			$return->body = substr($return->raw, $pos + strlen("\n\r\n\r"));
-		}
-		else {
+		} else {
 			$return->body = '';
 		}
 		// Pretend CRLF = LF for compatibility (RFC 2616, section 19.3)
@@ -706,8 +700,7 @@ 
 				$redirected = self::request($location, $req_headers, $req_data, $options['type'], $options);
 				$redirected->history[] = $return;
 				return $redirected;
-			}
-			elseif ($options['redirected'] >= $options['redirects']) {
+			} elseif ($options['redirected'] >= $options['redirects']) {
 				throw new Requests_Exception('Too many redirects', 'toomanyredirects', $return);
 			}
 		}
@@ -735,8 +728,7 @@ 
 			$data = $request['data'];
 			$options = $request['options'];
 			$response = self::parse_response($response, $url, $headers, $data, $options);
-		}
-		catch (Requests_Exception $e) {
+		} catch (Requests_Exception $e) {
 			$response = $e;
 		}
 	}
@@ -828,14 +820,11 @@ 
 
 		if (function_exists('gzdecode') && ($decoded = @gzdecode($data)) !== false) {
 			return $decoded;
-		}
-		elseif (function_exists('gzinflate') && ($decoded = @gzinflate($data)) !== false) {
+		} elseif (function_exists('gzinflate') && ($decoded = @gzinflate($data)) !== false) {
 			return $decoded;
-		}
-		elseif (($decoded = self::compatible_gzinflate($data)) !== false) {
+		} elseif (($decoded = self::compatible_gzinflate($data)) !== false) {
 			return $decoded;
-		}
-		elseif (function_exists('gzuncompress') && ($decoded = @gzuncompress($data)) !== false) {
+		} elseif (function_exists('gzuncompress') && ($decoded = @gzuncompress($data)) !== false) {
 			return $decoded;
 		}
 

php/Requests/libary/Requests/IDNAEncoder.php

Doc Comments +1 added lines, -1 removed lines

@@ -357,7 +357,7 @@
 	 * @param int $delta
 	 * @param int $numpoints
 	 * @param bool $firsttime
-	 * @return int New bias
+	 * @return double New bias
 	 */
 	protected static function adapt($delta, $numpoints, $firsttime) {
 #	function adapt(delta,numpoints,firsttime):

Braces +2 added lines, -4 removed lines

@@ -291,11 +291,9 @@
 #								tmax if k >= bias + tmax, or k - bias otherwise
 						if ($k <= ($bias + self::BOOTSTRAP_TMIN)) {
 							$t = self::BOOTSTRAP_TMIN;
-						}
-						elseif ($k >= ($bias + self::BOOTSTRAP_TMAX)) {
+						} elseif ($k >= ($bias + self::BOOTSTRAP_TMAX)) {
 							$t = self::BOOTSTRAP_TMAX;
-						}
-						else {
+						} else {
 							$t = $k - $bias;
 						}
 #						if q < t then break

php/Requests/libary/Requests/IRI.php

Doc Comments +2 added lines, -1 removed lines

@@ -249,7 +249,7 @@ 
 	 *
 	 * Returns false if $base is not absolute, otherwise an IRI.
 	 *
-	 * @param IRI|string $base (Absolute) Base IRI
+	 * @param string $base (Absolute) Base IRI
 	 * @param IRI|string $relative Relative IRI
 	 * @return IRI|false
 	 */
@@ -984,6 +984,7 @@ 
 	 * Convert an IRI to a URI (or parts thereof)
 	 *
 	 * @param string|bool IRI to convert (or false from {@see get_iri})
+	 * @param false|string $string
 	 * @return string|false URI if IRI is valid, false otherwise.
 	 */
 	protected function to_uri($string) {

Braces +30 added lines, -60 removed lines

@@ -155,8 +155,7 @@ 
 	public function __set($name, $value) {
 		if (method_exists($this, 'set_' . $name)) {
 			call_user_func(array($this, 'set_' . $name), $value);
-		}
-		elseif (
+		} elseif (
 			   $name === 'iauthority'
 			|| $name === 'iuserinfo'
 			|| $name === 'ihost'
@@ -187,8 +186,7 @@ 
 		) {
 			$method = 'get_' . $name;
 			$return = $this->$method();
-		}
-		elseif (array_key_exists($name, $props)) {
+		} elseif (array_key_exists($name, $props)) {
 			$return = $this->$name;
 		}
 		// host -> ihost
@@ -200,16 +198,14 @@ 
 		elseif (($prop = substr($name, 1)) && array_key_exists($prop, $props)) {
 			$name = $prop;
 			$return = $this->$prop;
-		}
-		else {
+		} else {
 			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
 			$return = null;
 		}
 
 		if ($return === null && isset($this->normalization[$this->scheme][$name])) {
 			return $this->normalization[$this->scheme][$name];
-		}
-		else {
+		} else {
 			return $return;
 		}
 	}
@@ -259,8 +255,7 @@ 
 		}
 		if (!$relative->is_valid()) {
 			return false;
-		}
-		elseif ($relative->scheme !== null) {
+		} elseif ($relative->scheme !== null) {
 			return clone $relative;
 		}
 
@@ -275,8 +270,7 @@ 
 			if ($relative->iuserinfo !== null || $relative->ihost !== null || $relative->port !== null) {
 				$target = clone $relative;
 				$target->scheme = $base->scheme;
-			}
-			else {
+			} else {
 				$target = new Requests_IRI;
 				$target->scheme = $base->scheme;
 				$target->iuserinfo = $base->iuserinfo;
@@ -285,32 +279,26 @@ 
 				if ($relative->ipath !== '') {
 					if ($relative->ipath[0] === '/') {
 						$target->ipath = $relative->ipath;
-					}
-					elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '') {
+					} elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '') {
 						$target->ipath = '/' . $relative->ipath;
-					}
-					elseif (($last_segment = strrpos($base->ipath, '/')) !== false) {
+					} elseif (($last_segment = strrpos($base->ipath, '/')) !== false) {
 						$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
-					}
-					else {
+					} else {
 						$target->ipath = $relative->ipath;
 					}
 					$target->ipath = $target->remove_dot_segments($target->ipath);
 					$target->iquery = $relative->iquery;
-				}
-				else {
+				} else {
 					$target->ipath = $base->ipath;
 					if ($relative->iquery !== null) {
 						$target->iquery = $relative->iquery;
-					}
-					elseif ($base->iquery !== null) {
+					} elseif ($base->iquery !== null) {
 						$target->iquery = $base->iquery;
 					}
 				}
 				$target->ifragment = $relative->ifragment;
 			}
-		}
-		else {
+		} else {
 			$target = clone $base;
 			$target->ifragment = null;
 		}
@@ -362,8 +350,7 @@ 
 			// then remove that prefix from the input buffer; otherwise,
 			if (strpos($input, '../') === 0) {
 				$input = substr($input, 3);
-			}
-			elseif (strpos($input, './') === 0) {
+			} elseif (strpos($input, './') === 0) {
 				$input = substr($input, 2);
 			}
 			// B: if the input buffer begins with a prefix of "/./" or "/.",
@@ -371,8 +358,7 @@ 
 			// with "/" in the input buffer; otherwise,
 			elseif (strpos($input, '/./') === 0) {
 				$input = substr($input, 2);
-			}
-			elseif ($input === '/.') {
+			} elseif ($input === '/.') {
 				$input = '/';
 			}
 			// C: if the input buffer begins with a prefix of "/../" or "/..",
@@ -382,8 +368,7 @@ 
 			elseif (strpos($input, '/../') === 0) {
 				$input = substr($input, 3);
 				$output = substr_replace($output, '', strrpos($output, '/'));
-			}
-			elseif ($input === '/..') {
+			} elseif ($input === '/..') {
 				$input = '/';
 				$output = substr_replace($output, '', strrpos($output, '/'));
 			}
@@ -399,8 +384,7 @@ 
 			elseif (($pos = strpos($input, '/', 1)) !== false) {
 				$output .= substr($input, 0, $pos);
 				$input = substr_replace($input, '', 0, $pos);
-			}
-			else {
+			} else {
 				$output .= $input;
 				$input = '';
 			}
@@ -482,8 +466,7 @@ 
 							break;
 						}
 					}
-				}
-				else {
+				} else {
 					$position = $strlen - 1;
 					$valid = false;
 				}
@@ -634,8 +617,7 @@ 
 					for ($j = $start; $j <= $i; $j++) {
 						$string .= '%' . strtoupper($bytes[$j]);
 					}
-				}
-				else {
+				} else {
 					for ($j = $start; $j <= $i; $j++) {
 						$string .= chr(hexdec($bytes[$j]));
 					}
@@ -760,12 +742,10 @@ 
 	protected function set_scheme($scheme) {
 		if ($scheme === null) {
 			$this->scheme = null;
-		}
-		elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme)) {
+		} elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme)) {
 			$this->scheme = null;
 			return false;
-		}
-		else {
+		} else {
 			$this->scheme = strtolower($scheme);
 		}
 		return true;
@@ -803,8 +783,7 @@ 
 		if (($iuserinfo_end = strrpos($remaining, '@')) !== false) {
 			$iuserinfo = substr($remaining, 0, $iuserinfo_end);
 			$remaining = substr($remaining, $iuserinfo_end + 1);
-		}
-		else {
+		} else {
 			$iuserinfo = null;
 		}
 		if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false) {
@@ -813,8 +792,7 @@ 
 				$port = null;
 			}
 			$remaining = substr($remaining, 0, $port_start);
-		}
-		else {
+		} else {
 			$port = null;
 		}
 
@@ -839,8 +817,7 @@ 
 	protected function set_userinfo($iuserinfo) {
 		if ($iuserinfo === null) {
 			$this->iuserinfo = null;
-		}
-		else {
+		} else {
 			$this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');
 			$this->scheme_normalization();
 		}
@@ -863,13 +840,11 @@ 
 		if (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']') {
 			if (Requests_IPv6::check_ipv6(substr($ihost, 1, -1))) {
 				$this->ihost = '[' . Requests_IPv6::compress(substr($ihost, 1, -1)) . ']';
-			}
-			else {
+			} else {
 				$this->ihost = null;
 				return false;
 			}
-		}
-		else {
+		} else {
 			$ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;=');
 
 			// Lowercase, but ignore pct-encoded sections (as they should
@@ -880,8 +855,7 @@ 
 			while (($position += strcspn($ihost, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ%', $position)) < $strlen) {
 				if ($ihost[$position] === '%') {
 					$position += 3;
-				}
-				else {
+				} else {
 					$ihost[$position] = strtolower($ihost[$position]);
 					$position++;
 				}
@@ -934,8 +908,7 @@ 
 
 		if (isset($cache[$ipath])) {
 			$this->ipath = $cache[$ipath][(int) ($this->scheme !== null)];
-		}
-		else {
+		} else {
 			$valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
 			$removed = $this->remove_dot_segments($valid);
 
@@ -955,8 +928,7 @@ 
 	protected function set_query($iquery) {
 		if ($iquery === null) {
 			$this->iquery = null;
-		}
-		else {
+		} else {
 			$this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true);
 			$this->scheme_normalization();
 		}
@@ -972,8 +944,7 @@ 
 	protected function set_fragment($ifragment) {
 		if ($ifragment === null) {
 			$this->ifragment = null;
-		}
-		else {
+		} else {
 			$this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?');
 			$this->scheme_normalization();
 		}
@@ -1076,8 +1047,7 @@ 
 		$iauthority = $this->get_iauthority();
 		if (is_string($iauthority)) {
 			return $this->to_uri($iauthority);
-		}
-		else {
+		} else {
 			return $iauthority;
 		}
 	}

php/Requests/libary/Requests/Session.php

Doc Comments +1 added lines, -1 removed lines

@@ -232,7 +232,7 @@
 	 *
 	 * @param array $request Request data (same form as {@see request_multiple})
 	 * @param boolean $merge_options Should we merge options as well?
-	 * @return array Request data
+	 * @return string Request data
 	 */
 	protected function merge_request($request, $merge_options = true) {
 		if ($this->url !== null) {

Braces +1 added lines, -2 removed lines

@@ -249,8 +249,7 @@
 			if (is_array($this->data)) {
 				$request['data'] = $this->data;
 			}
-		}
-		elseif (is_array($request['data']) && is_array($this->data)) {
+		} elseif (is_array($request['data']) && is_array($this->data)) {
 			$request['data'] = array_merge($this->data, $request['data']);
 		}
 

php/Requests/SendJodel.php

Doc Comments -1 removed lines

@@ -29,7 +29,6 @@
         return $this->ancestor;
     }
     /**
-     * @param Location $location
      */
     public function setAncestor($ancestor)
     {

index.php

Braces +37 added lines, -27 removed lines

@@ -21,8 +21,7 @@ 
 		{
 			$accessToken = $row["access_token"];
 		}
-	}
-	else
+	} else
 	{
 		echo "Error: 0 results";
 	}
@@ -38,8 +37,7 @@ 
 		if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS')
 		{
 			$newPostionStatus = "0 results";
-		}
-		else
+		} else
 		{
 			$location = new Location();
 			$location->setLat(json_decode($result->body, true)['results']['0']['geometry']['location']['lat']);
@@ -56,8 +54,7 @@ 
 	if(isset($_GET['vote']) && isset($_GET['postID'])) {
 		if($_GET['vote'] == "up") {
 			$accountCreator = new Upvote();
-		}
-		else if($_GET['vote'] == "down") {
+		} else if($_GET['vote'] == "down") {
 			$accountCreator = new Downvote();
 		}
 		$accountCreator->setAccessToken($accessToken);
@@ -113,7 +110,10 @@ 
 			<a href="index.php">
 				<h1>
 					Jodel WebClient
-					<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) echo '<i class="fa fa-refresh fa-1x"></i>';?>
+					<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) {
+	echo '<i class="fa fa-refresh fa-1x"></i>';
+}
+?>
 				</h1>					
 			</a>
 			<div class="clear"></div>
@@ -151,8 +151,9 @@ 
 										array_push($posts, $child);
 									}
 									$loops = $data['child_count'] + 1;
+								} else {
+									$loops = 1;
 								}
-								else $loops = 1;
 								$showCommentIcon = FALSE;
 							}
 							//Get Posts
@@ -161,15 +162,13 @@ 
 								{
 									$commentView = true;
 									$url = "/v2/posts/location/discussed/";
-								}
-								else
+								} else
 								{
 									if(isset($_GET['upVoteView']))
 									{
 										$upVoteView = true;
 										$url = "/v2/posts/location/popular/";
-									}
-									else
+									} else
 									{
 										$timeView = true;
 										$url = "/v2/posts";
@@ -202,26 +201,22 @@ 
 							$timediff_inMonth = (string)$timediff->format('%m');
 							if($timediff_inMonth!=0) {
 									$timediff = $timediff_inMonth . "m";
-							}
-							else
+							} else
 							{
 								if($timediff_inDays!=0)
 								{
 									$timediff = $timediff_inDays . "d";
-								}
-								else
+								} else
 								{
 									if($timediff_inHours!=0)
 									{
 										$timediff = $timediff_inHours . "h";
-									}
-									else
+									} else
 									{
 										if($timediff_inMinutes!=0)
 										{
 											$timediff = $timediff_inMinutes . "m";
-										}
-										else
+										} else
 										{
 											$timediff = $timediff_inSeconds . "s";
 										}
@@ -235,8 +230,7 @@ 
 								<?php 
 								if(isset($posts[$i]["image_url"])) {
 									echo '<img src="' . $posts[$i]["image_url"] . '">';
-								}
-								else {
+								} else {
 									echo nl2br($posts[$i]["message"]);
 								}
 								?>
@@ -268,7 +262,9 @@ 
 													<i class="fa fa-commenting-o"></i>
 													<?php if(array_key_exists("child_count", $posts[$i])) {
 																echo $posts[$i]["child_count"];
-															} else echo "0";
+															} else {
+																echo "0";
+															}
 													?>
 													</a>
 											</span>
@@ -298,9 +294,18 @@ 
 				</p>
 				<?php } ?>
 				<nav id="sortJodelBy">
-					<a href="index.php" <?php if(isset($timeView)) echo 'class="active"';?>><i class="fa fa-clock-o fa-3x"></i></a>
-					<a href="index.php?commentView=true" <?php if(isset($commentView)) echo 'class="active"';?>><i class="fa fa-commenting-o fa-3x"></i></a>
-					<a href="index.php?upVoteView=true" <?php if(isset($upVoteView)) echo 'class="active"';?>><i class="fa fa-angle-up fa-3x"></i></a>
+					<a href="index.php" <?php if(isset($timeView)) {
+	echo 'class="active"';
+}
+?>><i class="fa fa-clock-o fa-3x"></i></a>
+					<a href="index.php?commentView=true" <?php if(isset($commentView)) {
+	echo 'class="active"';
+}
+?>><i class="fa fa-commenting-o fa-3x"></i></a>
+					<a href="index.php?upVoteView=true" <?php if(isset($upVoteView)) {
+	echo 'class="active"';
+}
+?>><i class="fa fa-angle-up fa-3x"></i></a>
 				</nav>
 			</div>
 			
@@ -308,7 +313,12 @@ 
 				<article>
 					<h3>Position</h3>
 					<form method="get">
-						<input type="text" id="city" name="city" placeholder="<?php if(isset($newPositionStatus)) echo $newPositionStatus; else echo $posts[0]["location"]["name"]; ?>" required>
+						<input type="text" id="city" name="city" placeholder="<?php if(isset($newPositionStatus)) {
+	echo $newPositionStatus;
+} else {
+	echo $posts[0]["location"]["name"];
+}
+?>" required>
 
 						<input type="submit" value="Set Location" /> 
 					</form>

get-posts-ajax.php

Braces +10 added lines, -15 removed lines

@@ -51,15 +51,13 @@ 
 	{
 		$commentView = true;
 		$url = "/posts/location/discussed/";
-	}
-	else
+	} else
 	{
 		if(isset($_GET['upVoteView']))
 		{
 			$upVoteView = true;
 			$url = "/posts/location/popular/";
-		}
-		else
+		} else
 		{
 			$timeView = true;
 			$url = "/v2/posts";
@@ -96,26 +94,22 @@ 
 							$timediff_inMonth = (string)$timediff->format('%m');
 							if($timediff_inMonth!=0) {
 									$timediff = $timediff_inMonth . "m";
-							}
-							else
+							} else
 							{
 								if($timediff_inDays!=0)
 								{
 									$timediff = $timediff_inDays . "d";
-								}
-								else
+								} else
 								{
 									if($timediff_inHours!=0)
 									{
 										$timediff = $timediff_inHours . "h";
-									}
-									else
+									} else
 									{
 										if($timediff_inMinutes!=0)
 										{
 											$timediff = $timediff_inMinutes . "m";
-										}
-										else
+										} else
 										{
 											$timediff = $timediff_inSeconds . "s";
 										}
@@ -129,8 +123,7 @@ 
 						<?php 
 						if(isset($posts[$i]["image_url"])) {
 							echo '<img src="' . $posts[$i]["image_url"] . '">';
-						}
-						else {
+						} else {
 							echo nl2br($posts[$i]["message"]);
 						}
 						?>
@@ -162,7 +155,9 @@ 
 											<i class="fa fa-commenting-o"></i>
 											<?php if(array_key_exists("child_count", $posts[$i])) {
 														echo $posts[$i]["child_count"];
-													} else echo "0";
+													} else {
+														echo "0";
+													}
 											?>
 											</a>
 									</span>

php/Requests/AbstractRequest.php

Braces +1 added lines, -2 removed lines

@@ -92,8 +92,7 @@
 			$payload_accessToken;
 			if($this->getAccessToken() == null) {
 				$payload_accessToken = "";
-			}
-			else {
+			} else {
 				$payload_accessToken = $this->getAccessToken();
 			}