mmainstreet / jodel-web

index.php

Spacing +40 added lines, -40 removed lines

@@ -17,7 +17,7 @@ 
 	if ($result->num_rows > 0)
 	{
 		// output data of each row
-		while($row = $result->fetch_assoc())
+		while ($row = $result->fetch_assoc())
 		{
 			$accessToken = $row["access_token"];
 		}
@@ -31,11 +31,11 @@ 
 	//createAccount();
 	
 	//Set Location
-	if(isset($_GET['city'])) {
+	if (isset($_GET['city'])) {
 		
 		$url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . $_GET['city'] . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w';
 		$result = Requests::post($url);
-		if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS')
+		if (json_decode($result->body, true)['status'] == 'ZERO_RESULTS')
 		{
 			$newPostionStatus = "0 results";
 		}
@@ -53,11 +53,11 @@ 
 	}
 	
 	//Vote
-	if(isset($_GET['vote']) && isset($_GET['postID'])) {
-		if($_GET['vote'] == "up") {
+	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);
@@ -69,9 +69,9 @@ 
 	
 	
 	//SendJodel
-	if(isset($_POST['message'])) {
+	if (isset($_POST['message'])) {
 		$ancestor;
-		if(isset($_POST['ancestor']))
+		if (isset($_POST['ancestor']))
 		{
 			$ancestor = $_POST['ancestor'];
 		}
@@ -113,7 +113,7 @@ 
 			<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>
@@ -128,14 +128,14 @@ 
 							$posts;
 
 							//Get Post Details
-							if(isset($_GET['postID']) && isset($_GET['getPostDetails'])) {
+							if (isset($_GET['postID']) && isset($_GET['getPostDetails'])) {
 								//Header Nav in Comment View
 								?>
-								<a id="comment-back" href="index.php#postId-<?php echo $_GET['postID'];?>">
+								<a id="comment-back" href="index.php#postId-<?php echo $_GET['postID']; ?>">
 									<i class="fa fa-angle-left fa-3x"></i>
 								</a>
 
-								<a id="comment-refresh" href="index.php?getPostDetails=<?php echo $_GET['getPostDetails'];?>&postID=<?php echo $_GET['postID'];?>">
+								<a id="comment-refresh" href="index.php?getPostDetails=<?php echo $_GET['getPostDetails']; ?>&postID=<?php echo $_GET['postID']; ?>">
 									<i class="fa fa-refresh fa-2x"></i>
 								</a>
 								<?php
@@ -146,8 +146,8 @@ 
 								$data = $accountCreator->execute();
 								
 								$posts[0] = $data;
-								if(isset($data['children'])) {
-									foreach($data['children'] as $child) {
+								if (isset($data['children'])) {
+									foreach ($data['children'] as $child) {
 										array_push($posts, $child);
 									}
 									$loops = $data['child_count'] + 1;
@@ -157,14 +157,14 @@ 
 							}
 							//Get Posts
 							else {
-								if(isset($_GET['commentView']))
+								if (isset($_GET['commentView']))
 								{
 									$commentView = true;
 									$url = "/v2/posts/location/discussed/";
 								}
 								else
 								{
-									if(isset($_GET['upVoteView']))
+									if (isset($_GET['upVoteView']))
 									{
 										$upVoteView = true;
 										$url = "/v2/posts/location/popular/";
@@ -182,9 +182,9 @@ 
 							}
 							
 
-							for($i = 0; $i<$loops; $i++) {
+							for ($i = 0; $i < $loops; $i++) {
 							
-							if(isset($posts[$i])) {
+							if (isset($posts[$i])) {
 							$lastPostId = $posts[$i]['post_id'];
 
 							
@@ -200,24 +200,24 @@ 
 							$timediff_inHours = (string)$timediff->format('%h');
 							$timediff_inDays = (string)$timediff->format('%d');
 							$timediff_inMonth = (string)$timediff->format('%m');
-							if($timediff_inMonth!=0) {
+							if ($timediff_inMonth != 0) {
 									$timediff = $timediff_inMonth . "m";
 							}
 							else
 							{
-								if($timediff_inDays!=0)
+								if ($timediff_inDays != 0)
 								{
 									$timediff = $timediff_inDays . "d";
 								}
 								else
 								{
-									if($timediff_inHours!=0)
+									if ($timediff_inHours != 0)
 									{
 										$timediff = $timediff_inHours . "h";
 									}
 									else
 									{
-										if($timediff_inMinutes!=0)
+										if ($timediff_inMinutes != 0)
 										{
 											$timediff = $timediff_inMinutes . "m";
 										}
@@ -230,10 +230,10 @@ 
 							}
 						?>
 						
-						<article id ="postId-<?php echo $posts[$i]["post_id"]; ?>" class="jodel" style="background-color: #<?php echo $posts[$i]["color"];?>;">
+						<article id ="postId-<?php echo $posts[$i]["post_id"]; ?>" class="jodel" style="background-color: #<?php echo $posts[$i]["color"]; ?>;">
 							<content>
 								<?php 
-								if(isset($posts[$i]["image_url"])) {
+								if (isset($posts[$i]["image_url"])) {
 									echo '<img src="' . $posts[$i]["image_url"] . '">';
 								}
 								else {
@@ -242,12 +242,12 @@ 
 								?>
 							</content>
 							<aside>
-								<a href="index.php?vote=up&postID=<?php echo $posts[$i]["post_id"];?>">
+								<a href="index.php?vote=up&postID=<?php echo $posts[$i]["post_id"]; ?>">
 									<i class="fa fa-angle-up fa-3x"></i>
 								</a>	
 									<br />
-								<?php echo $posts[$i]["vote_count"];?><br />
-								<a href="index.php?vote=down&postID=<?php echo $posts[$i]["post_id"];?>">
+								<?php echo $posts[$i]["vote_count"]; ?><br />
+								<a href="index.php?vote=down&postID=<?php echo $posts[$i]["post_id"]; ?>">
 									<i class="fa fa-angle-down fa-3x"></i>
 								</a>
 							</aside>
@@ -258,15 +258,15 @@ 
 										<td class="time">
 											<span data-tooltip="Time">
 												<i class="fa fa-clock-o"></i>
-												<?php echo $timediff;?>
+												<?php echo $timediff; ?>
 											</span> 
 										</td>
 										<td class="comments">
-											<?php if($showCommentIcon) {?>
+											<?php if ($showCommentIcon) {?>
 											<span data-tooltip="Comments">
-												<a href="index.php?getPostDetails=true&postID=<?php echo $posts[$i]["post_id"];?>">
+												<a href="index.php?getPostDetails=true&postID=<?php echo $posts[$i]["post_id"]; ?>">
 													<i class="fa fa-commenting-o"></i>
-													<?php if(array_key_exists("child_count", $posts[$i])) {
+													<?php if (array_key_exists("child_count", $posts[$i])) {
 																echo $posts[$i]["child_count"];
 															} else echo "0";
 													?>
@@ -277,7 +277,7 @@ 
 										<td class="distance">
 											<span data-tooltip="Distance">
 												<i class="fa fa-map-marker"></i>
-												<?php echo $posts[$i]["distance"];?> km
+												<?php echo $posts[$i]["distance"]; ?> km
 											</span>
 										</td>
 									</tr>
@@ -292,15 +292,15 @@ 
 					</content>
 							
 				</article>
-				<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) { ?>
+				<?php if (!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) { ?>
 				<p id="loading">
 					<img src="images/loading.gif" alt="Loading…" />
 				</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 +308,7 @@ 
 				<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>
@@ -321,10 +321,10 @@ 
 				</article>
 
 				<article>
-					<?php if(isset($_GET['postID']) && isset($_GET['getPostDetails'])) { ?>
+					<?php if (isset($_GET['postID']) && isset($_GET['getPostDetails'])) { ?>
 					<h2>Comment on Jodel</h2>
 					<form method="POST">				
-							<input type="hidden" name="ancestor" value="<?php echo $_GET['postID'];?>" />
+							<input type="hidden" name="ancestor" value="<?php echo $_GET['postID']; ?>" />
 							<textarea id="message" name="message" placeholder="Send a comment on a Jodel to all students within 10km" required></textarea> 
 						<br />
 						<input type="submit" value="SEND" /> 
@@ -358,7 +358,7 @@ 
 			    $(this).addClass('selected');
 			});
 
-			<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) { ?>
+			<?php if (!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) { ?>
 			$(document).ready(function() {
 				var win = $(window);
 				var lastPostId = "<?php echo $lastPostId; ?>";

get-posts-ajax.php

Spacing +20 added lines, -20 removed lines

@@ -30,7 +30,7 @@ 
 	
 	if ($result->num_rows > 0) {
 			// output data of each row
-			while($row = $result->fetch_assoc()) {
+			while ($row = $result->fetch_assoc()) {
 					$access_token = $row["access_token"];
 			}
 	} else {
@@ -47,14 +47,14 @@ 
 }
 	$posts;
 
-	if(isset($_GET['commentView']))
+	if (isset($_GET['commentView']))
 	{
 		$commentView = true;
 		$url = "/posts/location/discussed/";
 	}
 	else
 	{
-		if(isset($_GET['upVoteView']))
+		if (isset($_GET['upVoteView']))
 		{
 			$upVoteView = true;
 			$url = "/posts/location/popular/";
@@ -66,7 +66,7 @@ 
 		}
 	}
 
-	if(isset($_GET['lastPostId'])) {
+	if (isset($_GET['lastPostId'])) {
 	
 		$lastPostId = $_GET['lastPostId'];
 		
@@ -76,9 +76,9 @@ 
 		?>
 		<div class="nextPosts">
 		<?php
-		for($i = 0; $i<$loops; $i++) {
+		for ($i = 0; $i < $loops; $i++) {
 		
-			if(isset($posts[$i])) {
+			if (isset($posts[$i])) {
 				$lastPostId = $posts[$i]['post_id'];
 
 				
@@ -94,24 +94,24 @@ 
 							$timediff_inHours = (string)$timediff->format('%h');
 							$timediff_inDays = (string)$timediff->format('%d');
 							$timediff_inMonth = (string)$timediff->format('%m');
-							if($timediff_inMonth!=0) {
+							if ($timediff_inMonth != 0) {
 									$timediff = $timediff_inMonth . "m";
 							}
 							else
 							{
-								if($timediff_inDays!=0)
+								if ($timediff_inDays != 0)
 								{
 									$timediff = $timediff_inDays . "d";
 								}
 								else
 								{
-									if($timediff_inHours!=0)
+									if ($timediff_inHours != 0)
 									{
 										$timediff = $timediff_inHours . "h";
 									}
 									else
 									{
-										if($timediff_inMinutes!=0)
+										if ($timediff_inMinutes != 0)
 										{
 											$timediff = $timediff_inMinutes . "m";
 										}
@@ -124,10 +124,10 @@ 
 							}
 						?>
 
-				<article class="jodel" style="background-color: #<?php echo $posts[$i]["color"];?>;">
+				<article class="jodel" style="background-color: #<?php echo $posts[$i]["color"]; ?>;">
 					<content>
 						<?php 
-						if(isset($posts[$i]["image_url"])) {
+						if (isset($posts[$i]["image_url"])) {
 							echo '<img src="' . $posts[$i]["image_url"] . '">';
 						}
 						else {
@@ -136,12 +136,12 @@ 
 						?>
 					</content>
 					<aside>
-						<a href="index.php?vote=up&postID=<?php echo $posts[$i]["post_id"];?>">
+						<a href="index.php?vote=up&postID=<?php echo $posts[$i]["post_id"]; ?>">
 							<i class="fa fa-angle-up fa-3x"></i>
 						</a>	
 							<br />
-						<?php echo $posts[$i]["vote_count"];?><br />
-						<a href="index.php?vote=down&postID=<?php echo $posts[$i]["post_id"];?>">
+						<?php echo $posts[$i]["vote_count"]; ?><br />
+						<a href="index.php?vote=down&postID=<?php echo $posts[$i]["post_id"]; ?>">
 							<i class="fa fa-angle-down fa-3x"></i>
 						</a>
 					</aside>
@@ -152,15 +152,15 @@ 
 								<td class="time">
 									<span data-tooltip="Time">
 										<i class="fa fa-clock-o"></i>
-										<?php echo $timediff;?>
+										<?php echo $timediff; ?>
 									</span> 
 								</td>
 								<td class="comments">
-									<?php if($showCommentIcon) {?>
+									<?php if ($showCommentIcon) {?>
 									<span data-tooltip="Comments">
-										<a href="index.php?getPostDetails=true&postID=<?php echo $posts[$i]["post_id"];?>">
+										<a href="index.php?getPostDetails=true&postID=<?php echo $posts[$i]["post_id"]; ?>">
 											<i class="fa fa-commenting-o"></i>
-											<?php if(array_key_exists("child_count", $posts[$i])) {
+											<?php if (array_key_exists("child_count", $posts[$i])) {
 														echo $posts[$i]["child_count"];
 													} else echo "0";
 											?>
@@ -171,7 +171,7 @@ 
 								<td class="distance">
 									<span data-tooltip="Distance">
 										<i class="fa fa-map-marker"></i>
-										<?php echo $posts[$i]["distance"];?> km
+										<?php echo $posts[$i]["distance"]; ?> km
 									</span>
 								</td>
 							</tr>

php/DatabaseConnect.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 			 `X-Api-Version` varchar(10) NOT NULL default '0.2',
 			 PRIMARY KEY  (`id`)
 			 ) DEFAULT CHARSET=utf8";
-  if(!$db->query($query))
+  if (!$db->query($query))
   {
     throw new Exception($db->error($mysqli));
   }

php/Requests/CreateUser.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
     }
     function getPayload()
     {
-			if(!isset($this->deviceUid))
+			if (!isset($this->deviceUid))
 			{
 				$this->setDeviceUid($this->generateDeviceUid());
 			}

php/Requests/GetPosts.php

Spacing +4 added lines, -4 removed lines

@@ -7,22 +7,22 @@
 
     public $url;
         
-    function setUrl ($url)
+    function setUrl($url)
     {
             $this->url = $url;
     }
     
-    function getUrl ()
+    function getUrl()
     {
         return $this->url;
     }
 		
-    function setLastPostId ($lastPostId)
+    function setLastPostId($lastPostId)
     {
 			$this->lastPostId = $lastPostId;
 	}
 	
-	function getlastPostId ()
+	function getlastPostId()
 	{
 		return $this->lastPostId;
 	}

php/Requests/AbstractRequest.php

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
 		        
 		$this->payLoad = $this->getPayload();
 		$device_uid = "";
-		if(isset($this->payLoad["device_uid"])) {
+		if (isset($this->payLoad["device_uid"])) {
 			$device_uid = $this->payLoad["device_uid"];
 		}
 				
@@ -67,10 +67,10 @@ 
                 throw  new \Exception('Signing failed!');
                 break;
             default:
-                throw  new \Exception('Unknown Error: '.$result->status_code);
+                throw  new \Exception('Unknown Error: ' . $result->status_code);
         }
 
-        if($device_uid != "")
+        if ($device_uid != "")
         {
 			$result[0] = $result;
 			$result[1] = $device_uid;
@@ -90,7 +90,7 @@ 
     public function getSignHeaders()
     {
 			$payload_accessToken;
-			if($this->getAccessToken() == null) {
+			if ($this->getAccessToken() == null) {
 				$payload_accessToken = "";
 			}
 			else {

php/Requests/libary/Requests/Cookie/Jar.php

Spacing +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
 	 *
 	 * @var Requests_Response $response
 	 */
-	public function before_redirect_check(Requests_Response &$return) {
+	public function before_redirect_check(Requests_Response&$return) {
 		$url = $return->url;
 		if (!$url instanceof Requests_IRI) {
 			$url = new Requests_IRI($url);

php/Requests/libary/Requests/Auth.php

Spacing +1 added lines, -1 removed lines

@@ -29,5 +29,5 @@
 	 * @see Requests_Hooks::register
 	 * @param Requests_Hooks $hooks Hook system
 	 */
-	public function register(Requests_Hooks &$hooks);
+	public function register(Requests_Hooks&$hooks);
 }
\ No newline at end of file

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

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
 	 * @see fsockopen_header
 	 * @param Requests_Hooks $hooks Hook system
 	 */
-	public function register(Requests_Hooks &$hooks) {
+	public function register(Requests_Hooks&$hooks) {
 		$hooks->register('curl.before_send', array(&$this, 'curl_before_send'));
 
 		$hooks->register('fsockopen.remote_socket', array(&$this, 'fsockopen_remote_socket'));