Completed
Push — master ( 3c1d8c...9ca507 )
by mains
02:58
created
php/jodel-web.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -278,6 +278,9 @@
 block discarded – undo
278 278
 	return $data["karma"];
279 279
 }
280 280
 
281
+/**
282
+ * @param string $postId
283
+ */
281 284
 function deviceUidHasVotedThisPostId($deviceUid, $postId)
282 285
 {
283 286
 	$db = new DatabaseConnect();
Please login to merge, or discard this patch.
Braces   +50 added lines, -25 removed lines patch added patch discarded remove patch
@@ -43,7 +43,8 @@  discard block
 block discarded – undo
43 43
 	if ($result->num_rows > 0)
44 44
 	{
45 45
 			// output data of each row
46
-			while($row = $result->fetch_assoc()) {
46
+			while($row = $result->fetch_assoc())
47
+			{
47 48
 					//$access_token = $row["access_token"];
48 49
 					$expiration_date = $row["expiration_date"];
49 50
 					$deviceUid = $row["device_uid"];
@@ -55,7 +56,8 @@  discard block
 block discarded – undo
55 56
 			echo '0 results';
56 57
 	}
57 58
 
58
-	if($expiration_date <= time()) {
59
+	if($expiration_date <= time())
60
+	{
59 61
 		$accountCreator = new CreateUser();
60 62
 		$accountCreator->setAccessToken($access_token);//$accountData->getAccessToken());
61 63
 		$accountCreator->setDeviceUid($deviceUid);
@@ -72,7 +74,8 @@  discard block
 block discarded – undo
72 74
 									expiration_date='" . $expiration_date . "'
73 75
 								WHERE device_uid='" . $device_uid . "'");
74 76
 
75
-		if($result === false){
77
+		if($result === false)
78
+		{
76 79
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
77 80
 		}	
78 81
 	}
@@ -88,7 +91,8 @@  discard block
 block discarded – undo
88 91
 	if ($result->num_rows > 0)
89 92
 	{
90 93
 			// output data of each row
91
-			while($row = $result->fetch_assoc()) {
94
+			while($row = $result->fetch_assoc())
95
+			{
92 96
 					//$access_token = $row["access_token"];
93 97
 					$expiration_date = $row["expiration_date"];
94 98
 					$deviceUid = $row["device_uid"];
@@ -100,7 +104,8 @@  discard block
 block discarded – undo
100 104
 			echo '0 results';
101 105
 	}
102 106
 
103
-	if($expiration_date <= time()) {
107
+	if($expiration_date <= time())
108
+	{
104 109
 		$accountCreator = new CreateUser();
105 110
 		$accountCreator->setAccessToken($access_token);//$accountData->getAccessToken());
106 111
 		$accountCreator->setDeviceUid($deviceUid);
@@ -117,7 +122,8 @@  discard block
 block discarded – undo
117 122
 									expiration_date='" . $expiration_date . "'
118 123
 								WHERE device_uid='" . $device_uid . "'");
119 124
 
120
-		if($result === false){
125
+		if($result === false)
126
+		{
121 127
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
122 128
 		}	
123 129
 	}
@@ -135,7 +141,8 @@  discard block
 block discarded – undo
135 141
 	if ($result->num_rows > 0)
136 142
 	{
137 143
 			// output data of each row
138
-			while($row = $result->fetch_assoc()) {
144
+			while($row = $result->fetch_assoc())
145
+			{
139 146
 					//$access_token = $row["access_token"];
140 147
 					$expiration_date = $row["expiration_date"];
141 148
 					$deviceUid = $row["device_uid"];
@@ -147,7 +154,8 @@  discard block
 block discarded – undo
147 154
 			echo '0 results';
148 155
 	}
149 156
 
150
-	if($expiration_date <= time()) {
157
+	if($expiration_date <= time())
158
+	{
151 159
 		$accountCreator = new CreateUser();
152 160
 		$accountCreator->setAccessToken($access_token);
153 161
 		$accountCreator->setDeviceUid($deviceUid);
@@ -164,7 +172,8 @@  discard block
 block discarded – undo
164 172
 									expiration_date='" . $expiration_date . "'
165 173
 								WHERE device_uid='" . $device_uid . "'");
166 174
 
167
-		if($result === false){
175
+		if($result === false)
176
+		{
168 177
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
169 178
 		}	
170 179
 	}
@@ -320,14 +329,16 @@  discard block
 block discarded – undo
320 329
 	$result = $db->query("INSERT INTO votes (device_uid, postId, type)
321 330
 					VALUES ('" . $device_uid . "','" . $postId . "','" . $voteType . "')");
322 331
 	
323
-	if($result === false){
332
+	if($result === false)
333
+	{
324 334
 			$error = db_error();
325 335
 			echo $error;
326 336
 			echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
327 337
 	}		
328 338
 }
329 339
 
330
-function registerAccount(Location $location) {
340
+function registerAccount(Location $location)
341
+{
331 342
 	$accountCreator = new CreateUser();
332 343
 	$accountCreator->setLocation($location);
333 344
 	$data = $accountCreator->execute();
@@ -352,7 +363,8 @@  discard block
 block discarded – undo
352 363
 					"','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') ");
353 364
 
354 365
 	$success = TRUE;
355
-	if($result === false){
366
+	if($result === false)
367
+	{
356 368
 			$error = db_error();
357 369
 			echo $error;
358 370
 			echo "Adding account failed: (" . $result->errno . ") " . $result->error;
@@ -363,7 +375,7 @@  discard block
 block discarded – undo
363 375
 }
364 376
 
365 377
 function getPosts($lastPostId, $accessToken, $url, $version = 'v2')
366
-{	
378
+{
367 379
 	$accountCreator = new GetPosts();
368 380
 	$accountCreator->setLastPostId($lastPostId);
369 381
 	$accountCreator->setAccessToken($accessToken);
@@ -452,7 +464,8 @@  discard block
 block discarded – undo
452 464
 }
453 465
 
454 466
 function jodelToHtml($post, $view = 'time', $isDetailedView = FALSE)
455
-{	//ToDO
467
+{
468
+//ToDO
456 469
 	//Replace # with link
457 470
 	//preg_replace('~(\#)([^\s!,. /()"\'?]+)~', '<a href="tag/$2">#$2</a>', $text);
458 471
 
@@ -502,10 +515,12 @@  discard block
 block discarded – undo
502 515
 	<article id ="postId-<?php echo $post["post_id"]; ?>" class="jodel" style="background-color: #<?php echo $post["color"];?>;">
503 516
 		<content>
504 517
 			<?php 
505
-			if(isset($post["image_url"])) {
518
+			if(isset($post["image_url"]))
519
+			{
506 520
 				echo '<img src="' . $post["image_url"] . '" alt="' . htmlspecialchars($post["message"]) . '">';
507 521
 			}
508
-			else {
522
+			else
523
+			{
509 524
 				echo str_replace('  ', ' &nbsp;', nl2br(htmlspecialchars($post["message"])));
510 525
 			}
511 526
 			?>
@@ -513,11 +528,13 @@  discard block
 block discarded – undo
513 528
 		<aside>
514 529
 			<?php
515 530
 				if($isDetailedView)
516
-				{?>
531
+				{
532
+?>
517 533
 					<a href="index.php?vote=up&getPostDetails=true&postID=<?php echo $post['post_id'];?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']);?>" rel="nofollow">
518 534
 		  <?php }
519
-				else
520
-				{?>
535
+else
536
+				{
537
+?>
521 538
 					<a href="index.php?vote=up&postID=<?php echo $post['post_id'];?>" rel="nofollow">
522 539
 		  <?php } ?>
523 540
 						<i class="fa fa-angle-up fa-3x"></i>
@@ -526,11 +543,13 @@  discard block
 block discarded – undo
526 543
 					<?php echo $post["vote_count"];?><br />
527 544
 			<?php
528 545
 				if($isDetailedView)
529
-				{?>
546
+				{
547
+?>
530 548
 					<a href="index.php?vote=down&getPostDetails=true&postID=<?php echo $post['post_id'];?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']);?>" rel="nofollow">
531 549
 		  <?php }
532
-				else
533
-				{?>
550
+else
551
+				{
552
+?>
534 553
 					<a href="index.php?vote=down&postID=<?php echo $post['post_id'];?>" rel="nofollow">
535 554
 		  <?php } ?>
536 555
 						<i class="fa fa-angle-down fa-3x"></i>
@@ -548,13 +567,19 @@  discard block
 block discarded – undo
548 567
 						</span> 
549 568
 					</td>
550 569
 					<td class="comments">
551
-						<?php if(!$isDetailedView) {?>
570
+						<?php if(!$isDetailedView)
571
+{
572
+?>
552 573
 						<span data-tooltip="Comments">
553 574
 							<a href="index.php?getPostDetails=true&view=<?php echo $view;?>&postID=<?php echo $post["post_id"];?>">
554 575
 								<i class="fa fa-commenting-o"></i>
555
-								<?php if(array_key_exists("child_count", $post)) {
576
+								<?php if(array_key_exists("child_count", $post))
577
+{
556 578
 											echo $post["child_count"];
557
-										} else echo "0";
579
+										}
580
+										else {
581
+											echo "0";
582
+										}
558 583
 								?>
559 584
 								</a>
560 585
 						</span>
Please login to merge, or discard this patch.