Completed
Push — master ( 285880...d65ec1 )
by mains
02:43
created
php/Requests/libary/Requests/Proxy.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,5 +31,5 @@
 block discarded – undo
31 31
 	 * @see Requests_Hooks::register
32 32
 	 * @param Requests_Hooks $hooks Hook system
33 33
 	 */
34
-	public function register(Requests_Hooks &$hooks);
34
+	public function register(Requests_Hooks&$hooks);
35 35
 }
36 36
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,8 @@
 block discarded – undo
20 20
  * @subpackage Proxy
21 21
  * @since 1.6
22 22
  */
23
-interface Requests_Proxy {
23
+interface Requests_Proxy
24
+{
24 25
 	/**
25 26
 	 * Register hooks as needed
26 27
 	 *
Please login to merge, or discard this patch.
php/Location.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-class Location{
3
+class Location {
4 4
 
5 5
     public $cityName;
6 6
 
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
     {
38 38
         $this->lng = $lng;
39 39
     }
40
-    public function toArray(){
40
+    public function toArray() {
41 41
         return array(
42 42
             "city" => $this->getCityName(),
43 43
             "country" => 'DE',
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-class Location{
3
+class Location
4
+{
4 5
 
5 6
     public $cityName;
6 7
 
@@ -37,7 +38,8 @@  discard block
 block discarded – undo
37 38
     {
38 39
         $this->lng = $lng;
39 40
     }
40
-    public function toArray(){
41
+    public function toArray()
42
+    {
41 43
         return array(
42 44
             "city" => $this->getCityName(),
43 45
             "country" => 'DE',
Please login to merge, or discard this patch.
get-posts-ajax.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 
20 20
 function getPosts($lastPostId, $url) {
21 21
 	$db = new DatabaseConnect();
22
-	if ($db->connect_errno) {
22
+	if($db->connect_errno) {
23 23
 		echo 'Sorry, die Verbindung zu unserem superfetten endgeilen 
24 24
 					Server ist hops gegangen. Wegen '. $db -> connect_error;
25 25
 	}
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	
29 29
 	$access_token;
30 30
 	
31
-	if ($result->num_rows > 0) {
31
+	if($result->num_rows > 0) {
32 32
 			// output data of each row
33 33
 			while($row = $result->fetch_assoc()) {
34 34
 					$access_token = $row["access_token"];
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 		?>
77 77
 		<div class="nextPosts">
78 78
 		<?php
79
-		for($i = 0; $i<$loops; $i++) {
79
+		for($i = 0; $i < $loops; $i++) {
80 80
 		
81 81
 			if(isset($posts[$i])) {
82 82
 				$lastPostId = $posts[$i]['post_id'];
@@ -94,24 +94,24 @@  discard block
 block discarded – undo
94 94
 							$timediff_inHours = (string)$timediff->format('%h');
95 95
 							$timediff_inDays = (string)$timediff->format('%d');
96 96
 							$timediff_inMonth = (string)$timediff->format('%m');
97
-							if($timediff_inMonth!=0) {
97
+							if($timediff_inMonth != 0) {
98 98
 									$timediff = $timediff_inMonth . "m";
99 99
 							}
100 100
 							else
101 101
 							{
102
-								if($timediff_inDays!=0)
102
+								if($timediff_inDays != 0)
103 103
 								{
104 104
 									$timediff = $timediff_inDays . "d";
105 105
 								}
106 106
 								else
107 107
 								{
108
-									if($timediff_inHours!=0)
108
+									if($timediff_inHours != 0)
109 109
 									{
110 110
 										$timediff = $timediff_inHours . "h";
111 111
 									}
112 112
 									else
113 113
 									{
114
-										if($timediff_inMinutes!=0)
114
+										if($timediff_inMinutes != 0)
115 115
 										{
116 116
 											$timediff = $timediff_inMinutes . "m";
117 117
 										}
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 							}
125 125
 						?>
126 126
 
127
-				<article class="jodel" style="background-color: #<?php echo $posts[$i]["color"];?>;">
127
+				<article class="jodel" style="background-color: #<?php echo $posts[$i]["color"]; ?>;">
128 128
 					<content>
129 129
 						<?php 
130 130
 						if(isset($posts[$i]["image_url"])) {
@@ -136,12 +136,12 @@  discard block
 block discarded – undo
136 136
 						?>
137 137
 					</content>
138 138
 					<aside>
139
-						<a href="index.php?vote=up&postID=<?php echo $posts[$i]["post_id"];?>">
139
+						<a href="index.php?vote=up&postID=<?php echo $posts[$i]["post_id"]; ?>">
140 140
 							<i class="fa fa-angle-up fa-3x"></i>
141 141
 						</a>	
142 142
 							<br />
143
-						<?php echo $posts[$i]["vote_count"];?><br />
144
-						<a href="index.php?vote=down&postID=<?php echo $posts[$i]["post_id"];?>">
143
+						<?php echo $posts[$i]["vote_count"]; ?><br />
144
+						<a href="index.php?vote=down&postID=<?php echo $posts[$i]["post_id"]; ?>">
145 145
 							<i class="fa fa-angle-down fa-3x"></i>
146 146
 						</a>
147 147
 					</aside>
@@ -152,13 +152,13 @@  discard block
 block discarded – undo
152 152
 								<td class="time">
153 153
 									<span data-tooltip="Time">
154 154
 										<i class="fa fa-clock-o"></i>
155
-										<?php echo $timediff;?>
155
+										<?php echo $timediff; ?>
156 156
 									</span> 
157 157
 								</td>
158 158
 								<td class="comments">
159 159
 									<?php if($showCommentIcon) {?>
160 160
 									<span data-tooltip="Comments">
161
-										<a href="index.php?getPostDetails=true&postID=<?php echo $posts[$i]["post_id"];?>">
161
+										<a href="index.php?getPostDetails=true&postID=<?php echo $posts[$i]["post_id"]; ?>">
162 162
 											<i class="fa fa-commenting-o"></i>
163 163
 											<?php if(array_key_exists("child_count", $posts[$i])) {
164 164
 														echo $posts[$i]["child_count"];
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 								<td class="distance">
172 172
 									<span data-tooltip="Distance">
173 173
 										<i class="fa fa-map-marker"></i>
174
-										<?php echo $posts[$i]["distance"];?> km
174
+										<?php echo $posts[$i]["distance"]; ?> km
175 175
 									</span>
176 176
 								</td>
177 177
 							</tr>
Please login to merge, or discard this patch.
Braces   +29 added lines, -13 removed lines patch added patch discarded remove patch
@@ -17,18 +17,22 @@  discard block
 block discarded – undo
17 17
 require_once 'php/Requests/libary/Requests.php';
18 18
 Requests::register_autoloader();
19 19
 
20
-function getPosts($lastPostId, $url) {
20
+function getPosts($lastPostId, $url)
21
+{
21 22
 	$db = new DatabaseConnect();
22
-	if ($db->connect_errno) {
23
+	if ($db->connect_errno)
24
+	{
23 25
 		echo 'Sorry, die Verbindung zu unserem superfetten endgeilen 
24 26
 					Server ist hops gegangen. Wegen '. $db -> connect_error;
25 27
 	}
26 28
 	
27 29
 	$result = $db->query("SELECT * FROM accounts WHERE id='1'");
28 30
 	
29
-	if ($result->num_rows > 0) {
31
+	if ($result->num_rows > 0)
32
+	{
30 33
 		// output data of each row
31
-		while($row = $result->fetch_assoc()) {
34
+		while($row = $result->fetch_assoc())
35
+		{
32 36
 			$access_token = $row["access_token"];
33 37
 		}
34 38
 	}
@@ -66,7 +70,8 @@  discard block
 block discarded – undo
66 70
 		}
67 71
 	}
68 72
 
69
-	if(isset($_GET['lastPostId'])) {
73
+	if(isset($_GET['lastPostId']))
74
+	{
70 75
 	
71 76
 		$lastPostId = $_GET['lastPostId'];
72 77
 		
@@ -76,9 +81,11 @@  discard block
 block discarded – undo
76 81
 		?>
77 82
 		<div class="nextPosts">
78 83
 		<?php
79
-		for($i = 0; $i<$loops; $i++) {
84
+		for($i = 0; $i<$loops; $i++)
85
+		{
80 86
 		
81
-			if(isset($posts[$i])) {
87
+			if(isset($posts[$i]))
88
+			{
82 89
 				$lastPostId = $posts[$i]['post_id'];
83 90
 
84 91
 				
@@ -94,7 +101,8 @@  discard block
 block discarded – undo
94 101
 							$timediff_inHours = (string)$timediff->format('%h');
95 102
 							$timediff_inDays = (string)$timediff->format('%d');
96 103
 							$timediff_inMonth = (string)$timediff->format('%m');
97
-							if($timediff_inMonth!=0) {
104
+							if($timediff_inMonth!=0)
105
+							{
98 106
 									$timediff = $timediff_inMonth . "m";
99 107
 							}
100 108
 							else
@@ -127,10 +135,12 @@  discard block
 block discarded – undo
127 135
 				<article class="jodel" style="background-color: #<?php echo $posts[$i]["color"];?>;">
128 136
 					<content>
129 137
 						<?php 
130
-						if(isset($posts[$i]["image_url"])) {
138
+						if(isset($posts[$i]["image_url"]))
139
+						{
131 140
 							echo '<img src="' . $posts[$i]["image_url"] . '">';
132 141
 						}
133
-						else {
142
+						else
143
+						{
134 144
 							echo nl2br($posts[$i]["message"]);
135 145
 						}
136 146
 						?>
@@ -156,13 +166,19 @@  discard block
 block discarded – undo
156 166
 									</span> 
157 167
 								</td>
158 168
 								<td class="comments">
159
-									<?php if($showCommentIcon) {?>
169
+									<?php if($showCommentIcon)
170
+{
171
+?>
160 172
 									<span data-tooltip="Comments">
161 173
 										<a href="index.php?getPostDetails=true&postID=<?php echo $posts[$i]["post_id"];?>">
162 174
 											<i class="fa fa-commenting-o"></i>
163
-											<?php if(array_key_exists("child_count", $posts[$i])) {
175
+											<?php if(array_key_exists("child_count", $posts[$i]))
176
+{
164 177
 														echo $posts[$i]["child_count"];
165
-													} else echo "0";
178
+													}
179
+													else {
180
+														echo "0";
181
+													}
166 182
 											?>
167 183
 											</a>
168 184
 									</span>
Please login to merge, or discard this patch.
php/DatabaseConnect.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 
13 13
 }
14 14
 $db = new DatabaseConnect();
15
-if ($db->connect_errno) {
15
+if($db->connect_errno) {
16 16
   echo 'Sorry, die Verbindung zu unserem superfetten endgeilen 
17 17
         Server ist hops gegangen. Wegen '.$db -> connect_error;
18 18
 }
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,8 @@
 block discarded – undo
12 12
 
13 13
 }
14 14
 $db = new DatabaseConnect();
15
-if ($db->connect_errno) {
15
+if ($db->connect_errno)
16
+{
16 17
   echo 'Sorry, die Verbindung zu unserem superfetten endgeilen 
17 18
         Server ist hops gegangen. Wegen '.$db -> connect_error;
18 19
 }
Please login to merge, or discard this patch.
php/Requests/GetKarma.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 
4
-class GetKarma extends AbstractRequest {
4
+class GetKarma extends AbstractRequest
5
+{
5 6
 		
6 7
     function getApiEndPoint()
7 8
     {
Please login to merge, or discard this patch.
php/Requests/SetLocation.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 
4
-class SetLocation extends AbstractRequest {
4
+class SetLocation extends AbstractRequest
5
+{
5 6
 		 /**
6 7
      * @var Location
7 8
      */
Please login to merge, or discard this patch.
php/Requests/CreateUser.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
     {
37 37
         $str = '';
38 38
         $max = mb_strlen($keyspace, '8bit') - 1;
39
-        for ($i = 0; $i < $length; ++$i) {
39
+        for($i = 0; $i < $length; ++$i) {
40 40
             $str .= $keyspace[random_int(0, $max)];
41 41
         }
42 42
         return $str;
Please login to merge, or discard this patch.
Braces   +5 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-class CreateUser extends AbstractRequest {
3
+class CreateUser extends AbstractRequest
4
+{
4 5
     /**
5 6
      * @var Location
6 7
      */
@@ -25,7 +26,7 @@  discard block
 block discarded – undo
25 26
 		return $this->deviceUid;
26 27
 	}
27 28
 	public function setDeviceUid($deviceUid)
28
-    {
29
+	{
29 30
 			$this->deviceUid = $deviceUid;
30 31
 	}
31 32
     public function generateDeviceUid()
@@ -36,7 +37,8 @@  discard block
 block discarded – undo
36 37
     {
37 38
         $str = '';
38 39
         $max = mb_strlen($keyspace, '8bit') - 1;
39
-        for ($i = 0; $i < $length; ++$i) {
40
+        for ($i = 0; $i < $length; ++$i)
41
+        {
40 42
             $str .= $keyspace[random_int(0, $max)];
41 43
         }
42 44
         return $str;
Please login to merge, or discard this patch.
php/Requests/GetPosts.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -7,22 +7,22 @@  discard block
 block discarded – undo
7 7
 
8 8
     public $url;
9 9
         
10
-    function setUrl ($url)
10
+    function setUrl($url)
11 11
     {
12 12
             $this->url = $url;
13 13
     }
14 14
     
15
-    function getUrl ()
15
+    function getUrl()
16 16
     {
17 17
         return $this->url;
18 18
     }
19 19
 		
20
-    function setLastPostId ($lastPostId)
20
+    function setLastPostId($lastPostId)
21 21
     {
22 22
 			$this->lastPostId = $lastPostId;
23 23
 	}
24 24
 	
25
-	function getlastPostId ()
25
+	function getlastPostId()
26 26
 	{
27 27
 		return $this->lastPostId;
28 28
 	}
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
     {
32 32
         $apiEndPoint = $this->getUrl();
33 33
         //echo $GLOBALS['lastPostId'];
34
-        if ($this->getLastPostId() != "") {
34
+        if($this->getLastPostId() != "") {
35 35
 			$apiEndPoint = $this->getUrl() . '/location/?after=' . $this->getLastPostId();
36 36
 		}
37 37
         return $apiEndPoint;
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,8 @@
 block discarded – undo
31 31
     {
32 32
         $apiEndPoint = $this->getUrl();
33 33
         //echo $GLOBALS['lastPostId'];
34
-        if ($this->getLastPostId() != "") {
34
+        if ($this->getLastPostId() != "")
35
+        {
35 36
 			$apiEndPoint = $this->getUrl() . '/location/?after=' . $this->getLastPostId();
36 37
 		}
37 38
         return $apiEndPoint;
Please login to merge, or discard this patch.
php/Requests/Upvote.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 
4
-class Upvote extends AbstractRequest {
4
+class Upvote extends AbstractRequest
5
+{
5 6
 		
6 7
     function getApiEndPoint()
7 8
     {
Please login to merge, or discard this patch.