mmainstreet / jodel-web

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();
 			}
 			

php/Requests/libary/Requests/Proxy/HTTP.php

Braces +3 added lines, -6 removed lines

@@ -57,16 +57,13 @@
 	public function __construct($args = null) {
 		if (is_string($args)) {
 			$this->proxy = $args;
-		}
-		elseif (is_array($args)) {
+		} elseif (is_array($args)) {
 			if (count($args) == 1) {
 				list($this->proxy) = $args;
-			}
-			elseif (count($args) == 3) {
+			} elseif (count($args) == 3) {
 				list($this->proxy, $this->user, $this->pass) = $args;
 				$this->use_authentication = true;
-			}
-			else {
+			} else {
 				throw new Requests_Exception('Invalid number of arguments', 'proxyhttpbadargs');
 			}
 		}

php/Requests/libary/Requests/Transport/cURL.php

Braces +10 added lines, -20 removed lines

@@ -149,8 +149,7 @@ 
 			if ($options['verify'] === false) {
 				curl_setopt($this->handle, CURLOPT_SSL_VERIFYHOST, 0);
 				curl_setopt($this->handle, CURLOPT_SSL_VERIFYPEER, 0);
-			}
-			elseif (is_string($options['verify'])) {
+			} elseif (is_string($options['verify'])) {
 				curl_setopt($this->handle, CURLOPT_CAINFO, $options['verify']);
 			}
 		}
@@ -246,8 +245,7 @@ 
 								);
 					$responses[$key] = $exception;
 					$options['hooks']->dispatch('transport.internal.parse_error', array(&$responses[$key], $requests[$key]));
-				}
-				else {
+				} else {
 					$responses[$key] = $subrequests[$key]->process_response($subrequests[$key]->response_data, $options);
 
 					$options['hooks']->dispatch('transport.internal.parse_response', array(&$responses[$key], $requests[$key]));
@@ -322,8 +320,7 @@ 
 			if ($data_format === 'query') {
 				$url = self::format_get($url, $data);
 				$data = '';
-			}
-			elseif (!is_string($data)) {
+			} elseif (!is_string($data)) {
 				$data = http_build_query($data, null, '&');
 			}
 		}
@@ -361,15 +358,13 @@ 
 
 		if (is_int($timeout) || $this->version < self::CURL_7_16_2) {
 			curl_setopt($this->handle, CURLOPT_TIMEOUT, ceil($timeout));
-		}
-		else {
+		} else {
 			curl_setopt($this->handle, CURLOPT_TIMEOUT_MS, round($timeout * 1000));
 		}
 
 		if (is_int($options['connect_timeout']) || $this->version < self::CURL_7_16_2) {
 			curl_setopt($this->handle, CURLOPT_CONNECTTIMEOUT, ceil($options['connect_timeout']));
-		}
-		else {
+		} else {
 			curl_setopt($this->handle, CURLOPT_CONNECTTIMEOUT_MS, round($options['connect_timeout'] * 1000));
 		}
 		curl_setopt($this->handle, CURLOPT_URL, $url);
@@ -380,8 +375,7 @@ 
 		}
 		if ($options['protocol_version'] === 1.1) {
 			curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
-		}
-		else {
+		} else {
 			curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
 		}
 
@@ -408,8 +402,7 @@ 
 		if ($options['filename'] !== false) {
 			fclose($this->stream_handle);
 			$this->headers = trim($this->headers);
-		}
-		else {
+		} else {
 			$this->headers .= $response;
 		}
 
@@ -479,8 +472,7 @@ 
 
 		if ($this->stream_handle) {
 			fwrite($this->stream_handle, $data);
-		}
-		else {
+		} else {
 			$this->response_data .= $data;
 		}
 
@@ -500,8 +492,7 @@ 
 			$url_parts = parse_url($url);
 			if (empty($url_parts['query'])) {
 				$query = $url_parts['query'] = '';
-			}
-			else {
+			} else {
 				$query = $url_parts['query'];
 			}
 
@@ -510,8 +501,7 @@ 
 
 			if (empty($url_parts['query'])) {
 				$url .= '?' . $query;
-			}
-			else {
+			} else {
 				$url = str_replace($url_parts['query'], $query, $url);
 			}
 		}

php/Requests/libary/Requests/Transport/fsockopen.php

Braces +10 added lines, -20 removed lines

@@ -92,8 +92,7 @@ 
 			if (isset($options['verify'])) {
 				if ($options['verify'] === false) {
 					$context_options['verify_peer'] = false;
-				}
-				elseif (is_string($options['verify'])) {
+				} elseif (is_string($options['verify'])) {
 					$context_options['cafile'] = $options['verify'];
 				}
 			}
@@ -104,8 +103,7 @@ 
 			}
 
 			stream_context_set_option($context, array('ssl' => $context_options));
-		}
-		else {
+		} else {
 			$remote_socket = 'tcp://' . $host;
 		}
 
@@ -142,8 +140,7 @@ 
 		if ($data_format === 'query') {
 			$path = self::format_get($url_parts, $data);
 			$data = '';
-		}
-		else {
+		} else {
 			$path = self::format_get($url_parts, array());
 		}
 
@@ -155,8 +152,7 @@ 
 		if ($options['type'] !== Requests::TRACE) {
 			if (is_array($data)) {
 				$request_body = http_build_query($data, null, '&');
-			}
-			else {
+			} else {
 				$request_body = $data;
 			}
 
@@ -222,8 +218,7 @@ 
 		$timeout_sec = (int) floor($options['timeout']);
 		if ($timeout_sec == $options['timeout']) {
 			$timeout_msec = 0;
-		}
-		else {
+		} else {
 			$timeout_msec = self::SECOND_IN_MICROSECONDS * $options['timeout'] % self::SECOND_IN_MICROSECONDS;
 		}
 		stream_set_timeout($socket, $timeout_sec, $timeout_msec);
@@ -271,8 +266,7 @@ 
 				$size += strlen($block);
 				if ($download) {
 					fwrite($download, $block);
-				}
-				else {
+				} else {
 					$body .= $block;
 				}
 			}
@@ -281,8 +275,7 @@ 
 
 		if ($download) {
 			fclose($download);
-		}
-		else {
+		} else {
 			$this->headers .= "\r\n\r\n" . $body;
 		}
 		fclose($socket);
@@ -307,8 +300,7 @@ 
 				$responses[$id] = $handler->request($request['url'], $request['headers'], $request['data'], $request['options']);
 
 				$request['options']['hooks']->dispatch('transport.internal.parse_response', array(&$responses[$id], $request));
-			}
-			catch (Requests_Exception $e) {
+			} catch (Requests_Exception $e) {
 				$responses[$id] = $e;
 			}
 
@@ -359,12 +351,10 @@ 
 		if (isset($url_parts['path'])) {
 			if (isset($url_parts['query'])) {
 				$get = $url_parts['path'] . '?' . $url_parts['query'];
-			}
-			else {
+			} else {
 				$get = $url_parts['path'];
 			}
-		}
-		else {
+		} else {
 			$get = '/';
 		}
 		return $get;

php/Requests/libary/Requests/Session.php

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/libary/Requests/IPv6.php

Braces +3 added lines, -6 removed lines

@@ -106,8 +106,7 @@ 
 
 		if ($ip_parts[1] !== '') {
 			return implode(':', $ip_parts);
-		}
-		else {
+		} else {
 			return $ip_parts[0];
 		}
 	}
@@ -130,8 +129,7 @@ 
 			$ipv6_part = substr($ip, 0, $pos);
 			$ipv4_part = substr($ip, $pos + 1);
 			return array($ipv6_part, $ipv4_part);
-		}
-		else {
+		} else {
 			return array($ip, '');
 		}
 	}
@@ -182,8 +180,7 @@ 
 				}
 			}
 			return true;
-		}
-		else {
+		} else {
 			return false;
 		}
 	}

php/Requests/libary/Requests/Response.php

Braces +1 added lines, -2 removed lines

@@ -112,8 +112,7 @@
 			if (!$allow_redirects) {
 				throw new Requests_Exception('Redirection not allowed', 'response.no_redirects', $this);
 			}
-		}
-		elseif (!$this->success) {
+		} elseif (!$this->success) {
 			$exception = Requests_Exception_HTTP::get_class($this->status_code);
 			throw new $exception(null, $this);
 		}