Completed
Pull Request — master (#28)
by
unknown
02:57
created
php/Requests/GetCaptcha.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -1,18 +1,18 @@
 block discarded – undo
1 1
 <?php
2 2
 class GetCaptcha extends AbstractRequest
3 3
 {		
4
-    function getApiEndPoint()
5
-    {
6
-        return '/v3/user/verification/imageCaptcha/';
7
-    }
8
-    function getPayload()
9
-    {
10
-        return array(
11
-        );
12
-    }
13
-    function getMethod()
14
-    {
15
-        return 'GET';
16
-    }
4
+	function getApiEndPoint()
5
+	{
6
+		return '/v3/user/verification/imageCaptcha/';
7
+	}
8
+	function getPayload()
9
+	{
10
+		return array(
11
+		);
12
+	}
13
+	function getMethod()
14
+	{
15
+		return 'GET';
16
+	}
17 17
 }
18 18
 
Please login to merge, or discard this patch.
php/Jodel.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 
3 3
 class Jodel
4 4
 {
5
-    public $jodel;
5
+	public $jodel;
6 6
 
7 7
    
8 8
 }
9 9
\ No newline at end of file
Please login to merge, or discard this patch.
php/Requests/GetPostDetails.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -3,18 +3,18 @@
 block discarded – undo
3 3
 
4 4
 class GetPostDetails extends AbstractRequest {
5 5
 		
6
-    function getApiEndPoint()
7
-    {
8
-        return '/v2/posts/' . $_GET['postId'];
9
-    }
10
-    function getPayload()
11
-    {
12
-        return array(
13
-        );
14
-    }
15
-    function getMethod()
16
-    {
17
-        return 'GET';
18
-    }
6
+	function getApiEndPoint()
7
+	{
8
+		return '/v2/posts/' . $_GET['postId'];
9
+	}
10
+	function getPayload()
11
+	{
12
+		return array(
13
+		);
14
+	}
15
+	function getMethod()
16
+	{
17
+		return 'GET';
18
+	}
19 19
 }
20 20
 
Please login to merge, or discard this patch.
php/Requests/GetChannel.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -2,41 +2,41 @@
 block discarded – undo
2 2
 
3 3
 class GetChannel extends AbstractRequest
4 4
 {
5
-    /**
6
-     * @var Location
7
-     */
8
-    public $location;
9
-    public $channel;
10
-    public $hasPayload = FALSE;
11
-    public $lastPostId = '';
12
-    public $view = 'combo';
5
+	/**
6
+	 * @var Location
7
+	 */
8
+	public $location;
9
+	public $channel;
10
+	public $hasPayload = FALSE;
11
+	public $lastPostId = '';
12
+	public $view = 'combo';
13 13
 		
14
-    function getApiEndPoint()
15
-    {
16
-        if($this->lastPostId == '')
17
-        {
18
-            $apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel;
19
-        }
20
-        else
21
-        {
22
-            if($this->view == 'combo')
23
-            {
24
-                $apiEndPoint = '/v3/posts/hashtag?hashtag=' . $this->channel . '&after=' . $this->lastPostId;
25
-            }
26
-            else
27
-            {
28
-                $apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel . '&after=' . $this->lastPostId;
29
-            }
30
-        }
31
-        return $apiEndPoint;
32
-    }
33
-    function getPayload()
34
-    {
35
-        return array(
36
-        );
37
-    }
38
-    function getMethod()
39
-    {
40
-        return 'GET';
41
-    }
14
+	function getApiEndPoint()
15
+	{
16
+		if($this->lastPostId == '')
17
+		{
18
+			$apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel;
19
+		}
20
+		else
21
+		{
22
+			if($this->view == 'combo')
23
+			{
24
+				$apiEndPoint = '/v3/posts/hashtag?hashtag=' . $this->channel . '&after=' . $this->lastPostId;
25
+			}
26
+			else
27
+			{
28
+				$apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel . '&after=' . $this->lastPostId;
29
+			}
30
+		}
31
+		return $apiEndPoint;
32
+	}
33
+	function getPayload()
34
+	{
35
+		return array(
36
+		);
37
+	}
38
+	function getMethod()
39
+	{
40
+		return 'GET';
41
+	}
42 42
 }
Please login to merge, or discard this patch.
templates/footer.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -129,7 +129,7 @@
 block discarded – undo
129 129
 		<?php  
130 130
 			if(is_file(realpath(__DIR__ . '/..') . '/piwik-script.html'))
131 131
 			{
132
-			    include(realpath(__DIR__ . '/..') . '/piwik-script.html');
132
+				include(realpath(__DIR__ . '/..') . '/piwik-script.html');
133 133
 			}
134 134
 		?>
135 135
 
Please login to merge, or discard this patch.
php/CustomError.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -13,17 +13,17 @@
 block discarded – undo
13 13
 	public $varsToDump;
14 14
 
15 15
 	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')
16
-    {
17
-        $this->view = $view;
18
-        $this->actions = $actions;
19
-        $this->accountId = $accountId;
20
-        $this->isVerified = $isVerified;
21
-        $this->isTokenFresh = $isTokenFresh;
22
-        $this->page = $page;
23
-        $this->referrer = $referrer;
24
-        $this->msg = $msg;
25
-        $this->varsToDump = $varsToDump;
26
-    }
16
+	{
17
+		$this->view = $view;
18
+		$this->actions = $actions;
19
+		$this->accountId = $accountId;
20
+		$this->isVerified = $isVerified;
21
+		$this->isTokenFresh = $isTokenFresh;
22
+		$this->page = $page;
23
+		$this->referrer = $referrer;
24
+		$this->msg = $msg;
25
+		$this->varsToDump = $varsToDump;
26
+	}
27 27
 
28 28
 	function writeErrorToLog()
29 29
 	{
Please login to merge, or discard this patch.
php/Requests/SendJodel.php 1 patch
Indentation   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -1,41 +1,41 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 class SendJodel extends AbstractRequest {
4
-    public $location;
5
-    public $ancestor = "";
6
-    public $color = "";
7
-    public $image = '';
4
+	public $location;
5
+	public $ancestor = "";
6
+	public $color = "";
7
+	public $image = '';
8 8
     
9
-    function getApiEndPoint()
10
-    {
11
-        return '/v3/posts/';
12
-    }
9
+	function getApiEndPoint()
10
+	{
11
+		return '/v3/posts/';
12
+	}
13 13
 
14
-    function getPayload()
15
-    {
16
-        if($this->image != '')
17
-        {
18
-            return array(
19
-            "ancestor" => $this->ancestor,
20
-            "color" => $this->color,
21
-            "location" => $this->location->toArray(),
22
-            "message" => $_POST['message'],
23
-            'image' => base64_encode($this->image),
24
-            );
25
-        }
26
-        else
27
-        {
28
-            return array(
29
-            "ancestor" => $this->ancestor,
30
-            "color" => $this->color,
31
-            "location" => $this->location->toArray(),
32
-            "message" => $_POST['message'],
33
-            );
34
-        }
14
+	function getPayload()
15
+	{
16
+		if($this->image != '')
17
+		{
18
+			return array(
19
+			"ancestor" => $this->ancestor,
20
+			"color" => $this->color,
21
+			"location" => $this->location->toArray(),
22
+			"message" => $_POST['message'],
23
+			'image' => base64_encode($this->image),
24
+			);
25
+		}
26
+		else
27
+		{
28
+			return array(
29
+			"ancestor" => $this->ancestor,
30
+			"color" => $this->color,
31
+			"location" => $this->location->toArray(),
32
+			"message" => $_POST['message'],
33
+			);
34
+		}
35 35
 
36
-    }
37
-    function getMethod()
38
-    {
39
-        return 'POST';
40
-    }
36
+	}
37
+	function getMethod()
38
+	{
39
+		return 'POST';
40
+	}
41 41
 }
Please login to merge, or discard this patch.
admin.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -44,17 +44,17 @@
 block discarded – undo
44 44
 {
45 45
 	//insert voter into db
46 46
 	$db = new DatabaseConnect();
47
-    $result = $db->query("INSERT INTO users (user_token, remaining_votes, device_uid, rights)
47
+	$result = $db->query("INSERT INTO users (user_token, remaining_votes, device_uid, rights)
48 48
                     VALUES ('" 	. $db->escape_string($_POST['user_token'])
49
-                    	. "','" . $db->escape_string($_POST['remaining_votes'])
50
-                    	. "','" . $db->escape_string($_POST['device_uid'])
51
-                    	. "','" . $db->escape_string($_POST['rights']) . "')");
49
+						. "','" . $db->escape_string($_POST['remaining_votes'])
50
+						. "','" . $db->escape_string($_POST['device_uid'])
51
+						. "','" . $db->escape_string($_POST['rights']) . "')");
52 52
     
53
-    if($result === false){
54
-            $error = db_error();
55
-            error_log($error);
56
-            error_log("Adding Voter failed: (" . $result->errno . ") " . $result->error);
57
-    } 
53
+	if($result === false){
54
+			$error = db_error();
55
+			error_log($error);
56
+			error_log("Adding Voter failed: (" . $result->errno . ") " . $result->error);
57
+	} 
58 58
 }
59 59
 
60 60
 //Vote
Please login to merge, or discard this patch.
vote-ajax.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -6,8 +6,8 @@  discard block
 block discarded – undo
6 6
 {
7 7
 	header('Content-Type: application/json');
8 8
 	$voteResult = $jodelAccountForKarma->votePostId($_GET['postId'], $_GET['vote']);
9
-    echo json_encode($voteResult);
10
-    die();
9
+	echo json_encode($voteResult);
10
+	die();
11 11
 }
12 12
 
13 13
 if(isset($_GET['solution']) && isset($_POST['deviceUid']))
@@ -92,10 +92,10 @@  discard block
 block discarded – undo
92 92
 	                                WHERE user_token='" . $_COOKIE['JodelVoterPassword'] . "'");
93 93
 						if($result === false)
94 94
 						{
95
-	               			error_log("Update remaining votes failed: (" . $db->errno . ") " . $db->error);
96
-	               		}
97
-               			$db->close();
98
-               		}
95
+				   			error_log("Update remaining votes failed: (" . $db->errno . ") " . $db->error);
96
+				   		}
97
+			   			$db->close();
98
+			   		}
99 99
 					$jodelAccount->votePostId($_POST['postId'], $_POST['vote']);
100 100
 					//Feedback
101 101
 				}
Please login to merge, or discard this patch.