mmainstreet / jodel-web

php/View.php

Spacing +19 added lines, -19 removed lines

@@ -49,25 +49,25 @@ 
         $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";
                     }
@@ -81,7 +81,7 @@ 
 
 
         ?>
-        <article id ="postId-<?php echo $post['post_id']; ?>" class="jodel" style="background-color: #<?php echo $post['color'];?>;">
+        <article id ="postId-<?php echo $post['post_id']; ?>" class="jodel" style="background-color: #<?php echo $post['color']; ?>;">
             <content>
                 <?php 
                 if(isset($post['image_url']))
@@ -99,24 +99,24 @@ 
                 <?php
                     if($this->isDetailedView)
                     {?>
-                        <a href="index.php?vote=up&getPostDetails=true&postId=<?php echo $post['post_id'];?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']);?>" rel="nofollow">
+                        <a href="index.php?vote=up&getPostDetails=true&postId=<?php echo $post['post_id']; ?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']); ?>" rel="nofollow">
               <?php }
                     else
                     {?>
-                        <a href="index.php?vote=up&postId=<?php echo $post['post_id'];?>" rel="nofollow">
+                        <a href="index.php?vote=up&postId=<?php echo $post['post_id']; ?>" rel="nofollow">
               <?php } ?>
                             <i class="fa fa-angle-up fa-3x"></i>
                         </a>    
                             <br />
-                        <?php echo $post["vote_count"];?><br />
+                        <?php echo $post["vote_count"]; ?><br />
                 <?php
                     if($this->isDetailedView)
                     {?>
-                        <a href="index.php?vote=down&getPostDetails=true&postId=<?php echo $post['post_id'];?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']);?>" rel="nofollow">
+                        <a href="index.php?vote=down&getPostDetails=true&postId=<?php echo $post['post_id']; ?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']); ?>" rel="nofollow">
               <?php }
                     else
                     {?>
-                        <a href="index.php?vote=down&postId=<?php echo $post['post_id'];?>" rel="nofollow">
+                        <a href="index.php?vote=down&postId=<?php echo $post['post_id']; ?>" rel="nofollow">
               <?php } ?>
                             <i class="fa fa-angle-down fa-3x"></i>
                         </a>
@@ -128,14 +128,14 @@ 
                         <span class="time">
                             <span class="tip" data-tooltip="Time">
                                 <i class="fa fa-clock-o"></i>
-                                <?php echo $timediff;?>
-                                <span class="tiptext"><?php echo $d->format('Y-m-d H:i:s');?></span>
+                                <?php echo $timediff; ?>
+                                <span class="tiptext"><?php echo $d->format('Y-m-d H:i:s'); ?></span>
                             </span> 
                         </span>
 						<?php if(!$this->isDetailedView) {?>
                         <span class="comments">
                             <span data-tooltip="Comments">
-                                <a href="<?php echo $this->changePostId($post['post_id'])->toUrl();?>">
+                                <a href="<?php echo $this->changePostId($post['post_id'])->toUrl(); ?>">
                                     <i class="fa fa-commenting-o"></i>
                                     <?php if(array_key_exists("child_count", $post)) {
                                                 echo $post["child_count"];
@@ -147,7 +147,7 @@ 
                         </span>
 						<?php
 						}															  
-						if (isUserAdmin())
+						if(isUserAdmin())
 						{
 						?>
 						<span class="voting">
@@ -177,7 +177,7 @@ 
                                         {
                                             ?>
                                             <span data-tooltip="Author">
-                                                <i class="fa fa-user-o"></i> #<?php echo $post['user_handle'];?> |
+                                                <i class="fa fa-user-o"></i> #<?php echo $post['user_handle']; ?> |
                                             </span>
                                             <?php
                                         }
@@ -187,8 +187,8 @@ 
 
                             <span class="tip" data-tooltip="Distance">
                                 <i class="fa fa-map-marker"></i>
-                                <?php echo $post['distance'];?> km
-                                <span class="tiptext"><?php echo $post['location']['name'];?></span>
+                                <?php echo $post['distance']; ?> km
+                                <span class="tiptext"><?php echo $post['location']['name']; ?></span>
                             </span>
                         </span>
                     
@@ -227,7 +227,7 @@ 
 
 		if($post != '' && array_key_exists('message', $post) && $post['message'] != '' && $this->isDetailedView)
 		{
-			$description = 'On JodelBlue in ' . htmlspecialchars($this->city) .  ' with ' . htmlspecialchars($post['vote_count']) . ' Upvotes: ' . substr(htmlspecialchars($post['message']), 0, 130);
+			$description = 'On JodelBlue in ' . htmlspecialchars($this->city) . ' with ' . htmlspecialchars($post['vote_count']) . ' Upvotes: ' . substr(htmlspecialchars($post['message']), 0, 130);
 		}
 
 		return $description;
@@ -324,7 +324,7 @@ 
         {
             return $data['recent'];
         }
-        else if(array_key_exists('posts', $data)&& array_key_exists(0, $data['posts']))
+        else if(array_key_exists('posts', $data) && array_key_exists(0, $data['posts']))
         {
             return $data['posts'];
         }

index.php

Braces +20 added lines, -5 removed lines

@@ -96,7 +96,9 @@ 
 							} ?>
 					</content>
 					
-					<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails'])) { ?>
+					<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails']))
+{
+?>
 						<p id="loading">
 							Loading…
 						</p>
@@ -104,12 +106,20 @@ 
 				</article>
 			
 				<aside class="topSidebar col-sm-4 sidebar-outer">
-					<div class="fixed<?php if(!$view->isDetailedView) echo(' hide-mobile');?>">
+					<div class="fixed<?php if(!$view->isDetailedView)
+{
+	echo(' hide-mobile');
+}
+?>">
 						<article>
 							<div>
 								<h2>Position / Hashtag</h2>
 								<form action="index.php" method="get">
-									<input type="text" id="city" name="search" placeholder="<?php if(isset($newPositionStatus)) echo $newPositionStatus; ?>" required>
+									<input type="text" id="city" name="search" placeholder="<?php if(isset($newPositionStatus))
+{
+	echo $newPositionStatus;
+}
+?>" required>
 									<label>try: #jhj</label><br>
 									<input type="submit" value="Set Location" /> 
 								</form>
@@ -125,7 +135,9 @@ 
 
 						<article>
 							<div>
-								<?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 htmlspecialchars($_GET['postId']);?>" />
@@ -133,7 +145,10 @@ 
 									<br />
 									<input type="submit" value="SEND" /> 
 								</form>
-									<?php } else { ?>
+									<?php }
+else
+{
+?>
 								<h2>New Jodel</h2>
 								<form enctype="multipart/form-data" method="POST">
 									<textarea id="message" name="message" placeholder="Send a Jodel to all students within 10km" required></textarea>