mmainstreet / jodel-web

php/CustomError.php

Braces +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	public $varsToDump;
 
 	function __construct($msg = 'not Set', $varsToDump = 'not Set', $view = 'not Set', $actions = 'not Set', $accountId = 'not Set', $isVerified = 'not Set', $isTokenFresh = 'not Set', $page = 'not Set', $referrer = 'not Set')
-    {
+	{
         $this->view = $view;
         $this->actions = $actions;
         $this->accountId = $accountId;

templates/footer.php

Braces +9 added lines, -3 removed lines

@@ -61,7 +61,9 @@ 
 			{
 				window.history.back();
 			}
-		<?php if(isset($includeEmojiAndAjax)){ ?>
+		<?php if(isset($includeEmojiAndAjax))
+{
+?>
 
 			function vote(postId, vote, obj)
 			{
@@ -91,7 +93,9 @@ 
 
 			$(document).ready(function()
 			{
-				<?php if(isset($errorMsg)) { ?>
+				<?php if(isset($errorMsg))
+{
+?>
 				//Error Msg
 				if('<?php echo $errorMsg;?>' != '')
 				{
@@ -155,7 +159,9 @@ 
 					return {"lastPostId":lastPostId, "old_lastPostId":old_lastPostId};
 				}
 
-				<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails'])) { ?>
+				<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails']))
+{
+?>
 
 				if(window.location.hash)
 				{

php/jodel-web.php

Braces +4 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
 function isUserVoter()
 {
 	if(isset($_COOKIE['JodelVoterPassword']))
-	{	
+	{
 		$db = new DatabaseConnect();
 		$result = $db->query("SELECT id FROM users WHERE user_token = '" . $_COOKIE['JodelVoterPassword'] . "'");
 		if($result->num_rows == 0)
@@ -147,7 +147,7 @@ 
 	}
 	
 	if(configPropertyExists($config, 'karmaDeviceUid'))
-    {
+	{
     	$jodelAccountForKarma = new JodelAccount($config['karmaDeviceUid']);
     }
     else
@@ -220,7 +220,8 @@ 
 	
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch ($_GET['view'])
+		{
 			case 'discussed':
 				$view = 'discussed';
 				break;

php/DatabaseConnect.php

Braces +4 added lines, -1 removed lines

@@ -13,9 +13,12 @@
 }
 $db = new DatabaseConnect();
 
-if($db->connect_errno == 1203)  // 1203 == ER_TOO_MANY_USER_CONNECTIONS (mysqld_error.h)
+if($db->connect_errno == 1203)
+{
+	// 1203 == ER_TOO_MANY_USER_CONNECTIONS (mysqld_error.h)
 {
 	error_log('ER_TOO_MANY_USER_CONNECTIONS');
+}
 	sleep(1);
 	header('location: '.$_SERVER['PHP_SELF']);
 }

admin.php

Braces +12 added lines, -4 removed lines

@@ -62,7 +62,8 @@ 
                     	. "','" . $db->escape_string($_POST['device_uid'])
                     	. "','" . $db->escape_string($_POST['rights']) . "')");
     
-    if($result === false){
+    if($result === false)
+    {
             $error = db_error();
             error_log($error);
             error_log("Adding Voter failed: (" . $result->errno . ") " . $result->error);
@@ -165,7 +166,9 @@ 
 			<div class="row">
 				<article class="topContent col-12 col-sm-12">
 					<content id="posts" class="adminpanel">
-						<?php if($userIsAdmin) { ?>
+						<?php if($userIsAdmin)
+{
+?>
 							<div class="row">
 								<div class="col-md-12">
 									<h2>Account management</h2>
@@ -213,7 +216,8 @@ 
 						<?php
 						}
 
-						if($userIsVoter) {
+						if($userIsVoter)
+						{
 						?>
 							<div class="row">								
 								<div class="col-12 col-sm-12">
@@ -239,7 +243,11 @@ 
 										</div>
 										<div class="form-group">
 											<label for="postIdDelay">Post Id</label>
-											<input placeholder="postId" class="form-control" id="postIdDelay" value="<?php if(isset($_GET['postId'])) echo $_GET['postId'];?>" type="text" name="postId">
+											<input placeholder="postId" class="form-control" id="postIdDelay" value="<?php if(isset($_GET['postId']))
+{
+	echo $_GET['postId'];
+}
+?>" type="text" name="postId">
 										</div>
 										<div class="row">
 											<div class="col-6 col-xs-6"><button type="button" name="vote" value="up" class="half" onclick="voteWithAjax('up');">Upvote</button></div>

php/JodelAccount.php

Braces +12 added lines, -7 removed lines

@@ -132,7 +132,7 @@ 
         if($location->getCityName() == $city)
         {
             return TRUE;
-        }  
+        }
         else
         {
             return FALSE;
@@ -145,7 +145,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=' . $this->getGeocodingToken();
@@ -333,7 +333,8 @@ 
         if(isset($_POST['color']))
         {
             $color = $_POST['color'];
-            switch ($color) {
+            switch ($color)
+            {
                 case '8ABDB0':
                     $color = '8ABDB0';
                     break;
@@ -446,7 +447,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);
         }   
     }
@@ -526,14 +528,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();
@@ -558,7 +562,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/View.php

Braces +13 added lines, -6 removed lines

@@ -48,7 +48,8 @@ 
 	 * Compute HTML Code
 	 */
  	function jodelToHtml($post)
-    {   //ToDO
+ 	{
+//ToDO
         //Replace # with link
         //preg_replace('~(\#)([^\s!,. /()"\'?]+)~', '<a href="tag/$2">#$2</a>', $text);
 
@@ -104,7 +105,8 @@ 
 
                     echo '<img src="' . $post['image_url'] . '" alt="' . htmlspecialchars(preg_replace($regexRest, '', $post['message'])) . '">';
                 }
-                else {
+                else
+                {
                     echo str_replace('  ', ' &nbsp;', nl2br(htmlspecialchars($post['message'])));
                 }
                 ?>
@@ -130,15 +132,20 @@ 
                                 <span class="tiptext"><?php echo $d->format('Y-m-d H:i:s');?></span>
                             </span> 
                         </span>
-						<?php if(!$this->isDetailedView) {?>
+						<?php if(!$this->isDetailedView)
+{
+?>
                         <span class="comments">
                             <span data-tooltip="Comments">
                                 <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"];
-                                    } else echo "0";
+                                    }
+                                    else {
+                                    	echo "0";
+                                    }
                                     ?>
                                 </a>
                             </span>
@@ -313,7 +320,7 @@ 
             $data = $accountCreator->execute();
         }
     	if(is_array($data) && array_key_exists('recent', $data) && array_key_exists(0, $data['recent']))
-        {
+    	{
             return $data['recent'];
         }
         else if(is_array($data) && array_key_exists('posts', $data)&& array_key_exists(0, $data['posts']))

index.php

Braces +21 added lines, -6 removed lines

@@ -97,7 +97,9 @@ 
 							} ?>
 					</content>
 					
-					<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails'])) { ?>
+					<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails']))
+{
+?>
 						<p id="loading">
 							Loading…
 						</p>
@@ -105,12 +107,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>
@@ -127,7 +137,7 @@ 
 						<article>
 							<div>
 								<?php if(!$jodelAccountForView->isAccountVerified())
-								{
+{
 								?>
 								<h2>New Jodel</h2>
 								
@@ -137,7 +147,9 @@ 
 								}
 								else
 								{
-									if(isset($_GET['postId']) && isset($_GET['getPostDetails'])) { ?>
+									if(isset($_GET['postId']) && isset($_GET['getPostDetails']))
+									{
+?>
 									<h2>Comment on Jodel</h2>
 									<form enctype="multipart/form-data" method="POST">				
 											<input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postId']);?>" />
@@ -146,7 +158,10 @@ 
 											<input name="image" type="file" />
 										<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> 

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';
 
@@ -21,7 +21,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'];
 		}
 				
@@ -30,7 +31,8 @@ 
         $header = $this->getSignHeaders();
         $url = $this->getFullUrl();
 
-        if ($this->getAccessToken()) {
+        if ($this->getAccessToken())
+        {
             $header['Authorization'] = "Bearer " . $this->getAccessToken();
         }
         //Comment out to debug the Request:
@@ -53,7 +55,8 @@ 
             'proxy' => '186.103.169.165:8080',
         );*/
 
-        switch ($this->getMethod()) {
+        switch ($this->getMethod())
+        {
             case 'POST':
                 $result = Requests::post($url, $header, $this->payLoad);
                 break;
@@ -74,7 +77,8 @@ 
 
         http_response_code($result->status_code);
 
-        switch ($result->status_code) {
+        switch ($result->status_code)
+        {
             case 200:
                 $result = json_decode($result->body, true);
                 break;
@@ -174,10 +178,12 @@ 
      */
     private function getSignHeaders()
     {
-			if($this->getAccessToken() == null) {
+			if($this->getAccessToken() == null)
+			{
 				$payload_accessToken = "";
 			}
-			else {
+			else
+			{
 				$payload_accessToken = $this->getAccessToken();
 			}