mmainstreet / jodel-web

php/JodelAccount.php

Braces +12 added lines, -7 removed lines

@@ -87,7 +87,7 @@ 
         if($location->getLat() == $lat && $location->getLng() == $lng && $location->getCityName() == $name)
         {
             return TRUE;
-        }  
+        }
         else
         {
             return FALSE;
@@ -100,7 +100,7 @@ 
         if(substr($_GET['city'], 0, 1) === '#')
         {
             return htmlspecialchars($_GET['city']) . " " . $this->location->cityName;
-        }                
+        }
         else
         {
             $url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($_GET['city']) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w';
@@ -262,7 +262,8 @@ 
         if(isset($_POST['color']))
         {
             $color = $_POST['color'];
-            switch ($color) {
+            switch ($color)
+            {
                 case '8ABDB0':
                     $color = '8ABDB0';
                     break;
@@ -355,7 +356,8 @@ 
                                     expiration_date='" . $expiration_date . "'
                                 WHERE device_uid='" . $device_uid . "'");
 
-        if($result === false){
+        if($result === false)
+        {
                 error_log("Adding account failed: (" . $db->errno . ") " . $db->error);
         }   
     }
@@ -435,14 +437,16 @@ 
         $result = $db->query("INSERT INTO votes (device_uid, postId, type)
                         VALUES ('" . $this->deviceUid . "','" . $postId . "','" . $voteType . "')");
         
-        if($result === false){
+        if($result === false)
+        {
                 $error = db_error();
                 echo $error;
                 echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
         }       
     }
 
-    function registerAccount($location) {
+    function registerAccount($location)
+    {
         $accountCreator = new CreateUser();
         $accountCreator->setLocation($location);
         $data = $accountCreator->execute();
@@ -467,7 +471,8 @@ 
                         "','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') ");
 
         $success = TRUE;
-        if($result === false){
+        if($result === false)
+        {
                 $error = db_error();
                 echo $error;
                 echo "Adding account failed: (" . $result->errno . ") " . $result->error;

php/Requests/AbstractRequest.php

Braces +13 added lines, -7 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 abstract class AbstractRequest
-{	
+{
     const CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
     const APIURL = 'https://api.go-tellm.com/api';
     const SECRET = 'LDWWpuUigOnKCbCLpoNMDHCqHCWbLKPzHbnIUKIf';
@@ -20,7 +20,8 @@ 
 		        
 		$this->payLoad = $this->getPayload();
 		$device_uid = '';
-		if(isset($this->payLoad['device_uid'])) {
+		if(isset($this->payLoad['device_uid']))
+		{
 			$device_uid = $this->payLoad['device_uid'];
 		}
 				
@@ -29,7 +30,8 @@ 
         $header = $this->getSignHeaders();
         $url = $this->getFullUrl();
 
-        if ($this->getAccessToken()) {
+        if ($this->getAccessToken())
+        {
             $header['Authorization'] = "Bearer " . $this->getAccessToken();
         }
         //Comment out to debug the Request:
@@ -52,7 +54,8 @@ 
             'proxy' => '186.103.169.165:8080',
         );*/
 
-        switch ($this->getMethod()) {
+        switch ($this->getMethod())
+        {
             case 'POST':
                 $result = Requests::post($url, $header, $this->payLoad);
                 break;
@@ -70,7 +73,8 @@ 
                 $result = Requests::put($url, $header, $this->payLoad);
                 break;
         }
-        switch ($result->status_code) {
+        switch ($result->status_code)
+        {
             case 200:
                 $result = json_decode($result->body, true);
                 break;
@@ -125,10 +129,12 @@ 
      */
     private function getSignHeaders()
     {
-			if($this->getAccessToken() == null) {
+			if($this->getAccessToken() == null)
+			{
 				$payload_accessToken = "";
 			}
-			else {
+			else
+			{
 				$payload_accessToken = $this->getAccessToken();
 			}
 			

php/View.php

Braces +24 added lines, -12 removed lines

@@ -32,7 +32,8 @@ 
 	 * Compute HTML Code
 	 */
  	function jodelToHtml($post)
-    {   //ToDO
+ 	{
+//ToDO
         //Replace # with link
         //preg_replace('~(\#)([^\s!,. /()"\'?]+)~', '<a href="tag/$2">#$2</a>', $text);
 
@@ -88,7 +89,8 @@ 
 
                     echo '<img src="' . $post['image_url'] . '" alt="' . htmlspecialchars(preg_replace($regexRest, '', $post['message'])) . '">';
                 }
-                else {
+                else
+                {
                     echo str_replace('  ', ' &nbsp;', nl2br(htmlspecialchars($post['message'])));
                 }
                 ?>
@@ -96,11 +98,13 @@ 
             <aside>
                 <?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">
               <?php }
-                    else
-                    {?>
+else
+                    {
+?>
                         <a href="index.php?vote=up&postId=<?php echo $post['post_id'];?>" rel="nofollow">
               <?php } ?>
                             <i class="fa fa-angle-up fa-3x"></i>
@@ -109,11 +113,13 @@ 
                         <?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">
               <?php }
-                    else
-                    {?>
+else
+                    {
+?>
                         <a href="index.php?vote=down&postId=<?php echo $post['post_id'];?>" rel="nofollow">
               <?php } ?>
                             <i class="fa fa-angle-down fa-3x"></i>
@@ -131,13 +137,19 @@ 
                             </span> 
                         </td>
                         <td class="comments">
-                            <?php if(!$this->isDetailedView) {?>
+                            <?php if(!$this->isDetailedView)
+{
+?>
                             <span data-tooltip="Comments">
                                 <a href="index.php?getPostDetails=true&view=<?php echo $this->view;?>&postId=<?php echo $post["post_id"];?>">
                                     <i class="fa fa-commenting-o"></i>
-                                    <?php if(array_key_exists("child_count", $post)) {
+                                    <?php if(array_key_exists("child_count", $post))
+{
                                                 echo $post["child_count"];
-                                            } else echo "0";
+                                            }
+                                            else {
+                                            	echo "0";
+                                            }
                                     ?>
                                     </a>
                             </span>
@@ -303,7 +315,7 @@ 
             $data = $accountCreator->execute();
         }
     	if(array_key_exists('recent', $data))
-        {
+    	{
             return $data['recent'];
         }
         else if(array_key_exists('posts', $data))

php/jodel-web.php

Braces +4 added lines, -3 removed lines

@@ -97,7 +97,7 @@ 
 	}
 	
 	if(configPropertyExists($config, 'karmaDeviceUid'))
-    {
+	{
     	$jodelAccountForKarma = new JodelAccount($config['karmaDeviceUid']);
     }
     else
@@ -165,7 +165,8 @@ 
 	
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch ($_GET['view'])
+		{
 			case 'discussed':
 				$view = 'discussed';
 				break;
@@ -212,7 +213,7 @@ 
 	{
 		$jodelAccountForKarma->votePostId($_GET['postId'], $_GET['vote']);
 		if(isset($_GET['getPostDetails']) && isset($_GET['getPostDetails']))
-        {
+		{
             header('Location: index.php?getPostDetails=true&postId=' . htmlspecialchars($_GET['postId_parent']) . '#postId-' . htmlspecialchars($_GET['postId']));
         }
         else

index.php

Braces +25 added lines, -7 removed lines

@@ -20,7 +20,8 @@ 
 
 		$posts[0] = $data;
 
-		if(array_key_exists('children', $data)) {
+		if(array_key_exists('children', $data))
+		{
 			foreach($data['children'] as $key => $child)
 			{
 				
@@ -124,7 +125,11 @@ 
 
 					<div id="location_mobile" class="hidden-sm-up">
 						<form method="get">
-							<input type="text" id="city_mobile" name="search" placeholder="<?php if(isset($newPositionStatus)) echo $newPositionStatus; ?>" required>
+							<input type="text" id="city_mobile" name="search" placeholder="<?php if(isset($newPositionStatus))
+{
+	echo $newPositionStatus;
+}
+?>" required>
 
 							<input type="submit" id="submit_mobile" class="fa" value="&#xf0ac;" />
 						</form>
@@ -146,7 +151,9 @@ 
 							} ?>
 					</content>
 					
-					<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails'])) { ?>
+					<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails']))
+{
+?>
 						<p id="loading">
 							Loading…
 						</p>
@@ -159,7 +166,11 @@ 
 							<div>
 								<h2>Position / Hashtag</h2>
 								<form 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>
@@ -175,7 +186,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']);?>" />
@@ -183,7 +196,10 @@ 
 									<br />
 									<input type="submit" value="SEND" /> 
 								</form>
-									<?php } else { ?>
+									<?php }
+else
+{
+?>
 								<h2>New Jodel</h2>
 								<form method="POST">
 									<textarea id="message" name="message" placeholder="Send a Jodel to all students within 10km" required></textarea> 
@@ -242,7 +258,9 @@ 
 				    $('html,body').animate({scrollTop: aTag.offset().top-90},'slow');
 				}
 
-				<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails'])) { ?>
+				<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails']))
+{
+?>
 
 				
 

template/nav-bottom.php

Braces +15 added lines, -3 removed lines

@@ -2,13 +2,25 @@
 	<div class="col-xs-12">
 		<div class="row">
 			<div class="col-xs-3">
-				<a <?php if($view->view == 'combo')echo 'class="active"';?> href="<?php echo $view->changeView('combo')->toUrl();?>"><i class="fa fa-clock-o fa-3x"></i></a>
+				<a <?php if($view->view == 'combo')
+{
+	echo 'class="active"';
+}
+?> href="<?php echo $view->changeView('combo')->toUrl();?>"><i class="fa fa-clock-o fa-3x"></i></a>
 			</div>
 			<div class="col-xs-3">
-				<a <?php if($view->view == 'discussed') echo 'class="active"';?> href="<?php echo $view->changeView('discussed')->toUrl();?>"><i class="fa fa-commenting-o fa-3x"></i></a>
+				<a <?php if($view->view == 'discussed')
+{
+	echo 'class="active"';
+}
+?> href="<?php echo $view->changeView('discussed')->toUrl();?>"><i class="fa fa-commenting-o fa-3x"></i></a>
 			</div>
 			<div class="col-xs-3">
-				<a <?php if($view->view == 'popular') echo 'class="active"';?> href="<?php echo $view->changeView('popular')->toUrl();?>"><i class="fa fa-angle-up fa-3x"></i></a>
+				<a <?php if($view->view == 'popular')
+{
+	echo 'class="active"';
+}
+?> href="<?php echo $view->changeView('popular')->toUrl();?>"><i class="fa fa-angle-up fa-3x"></i></a>
 			</div>
 			<div class="col-xs-3">
 				<nav>