Completed
Push — master ( eeab4c...fe15ce )
by mains
02:52
created
index.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 								<?php if(isset($_GET['postId']) && isset($_GET['getPostDetails'])) { ?>
111 111
 								<h2>Comment on Jodel</h2>
112 112
 								<form method="POST">				
113
-										<input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postId']);?>" />
113
+										<input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postId']); ?>" />
114 114
 										<textarea id="message" name="message" placeholder="Send a comment on a Jodel to all students within 10km" required></textarea> 
115 115
 									<br />
116 116
 									<input type="submit" value="SEND" /> 
@@ -143,6 +143,6 @@  discard block
 block discarded – undo
143 143
 					</div>
144 144
 				</aside>
145 145
 			</div>
146
-			<?php include 'templates/nav-bottom.php';?>
146
+			<?php include 'templates/nav-bottom.php'; ?>
147 147
 		</div>
148
-		<?php include 'templates/footer.php';?>
149 148
\ No newline at end of file
149
+		<?php include 'templates/footer.php'; ?>
150 150
\ No newline at end of file
Please login to merge, or discard this patch.
error-pages/410.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -66,4 +66,4 @@
 block discarded – undo
66 66
 				</article>
67 67
 			</div>
68 68
 		</div>
69
-		<?php include '../templates/footer.php';?>
70 69
\ No newline at end of file
70
+		<?php include '../templates/footer.php'; ?>
71 71
\ No newline at end of file
Please login to merge, or discard this patch.
templates/nav-bottom.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <div id="sortJodelBy" class="row">
2 2
 	<div class="col-3">
3
-		<a <?php if($view->view == 'combo')echo 'class="active"';?> href="<?php echo $view->changeView('combo')->back()->toUrl();?>"><i class="fa fa-clock-o fa-3x"></i></a>
3
+		<a <?php if($view->view == 'combo')echo 'class="active"'; ?> href="<?php echo $view->changeView('combo')->back()->toUrl(); ?>"><i class="fa fa-clock-o fa-3x"></i></a>
4 4
 	</div>
5 5
 	<div class="col-3">
6
-		<a <?php if($view->view == 'discussed') echo 'class="active"';?> href="<?php echo $view->changeView('discussed')->back()->toUrl();?>"><i class="fa fa-commenting-o fa-3x"></i></a>
6
+		<a <?php if($view->view == 'discussed') echo 'class="active"'; ?> href="<?php echo $view->changeView('discussed')->back()->toUrl(); ?>"><i class="fa fa-commenting-o fa-3x"></i></a>
7 7
 	</div>
8 8
 	<div class="col-3">
9
-		<a <?php if($view->view == 'popular') echo 'class="active"';?> href="<?php echo $view->changeView('popular')->back()->toUrl();?>"><i class="fa fa-angle-up fa-3x"></i></a>
9
+		<a <?php if($view->view == 'popular') echo 'class="active"'; ?> href="<?php echo $view->changeView('popular')->back()->toUrl(); ?>"><i class="fa fa-angle-up fa-3x"></i></a>
10 10
 	</div>
11 11
 	<div class="col-3">
12 12
 		<nav>
13
-			<a href="<?php echo $baseUrl;?>about-us.php">about us</a>
13
+			<a href="<?php echo $baseUrl; ?>about-us.php">about us</a>
14 14
 		</nav>
15 15
 	</div>
16 16
 </div>
17 17
\ No newline at end of file
Please login to merge, or discard this patch.
templates/footer.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
 			  crossorigin="anonymous"></script>
6 6
 	    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
7 7
 	    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
8
-	    	<script src="<?php echo $baseUrl;?>js/jQueryEmoji.js"></script>
8
+	    	<script src="<?php echo $baseUrl; ?>js/jQueryEmoji.js"></script>
9 9
 
10 10
 		<script>
11 11
 			//BackButton
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 							if(!$("article[id='"+ hash +"']").length)
50 50
 							{
51 51
 								$.ajax({
52
-									url: '<?php echo $baseUrl;?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view + '&hashtag=' + encodeURI(hashtag),
52
+									url: '<?php echo $baseUrl; ?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view + '&hashtag=' + encodeURI(hashtag),
53 53
 									dataType: 'html',
54 54
 									async: false,
55 55
 									success: function(html) {
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 						$('#loading').show();
93 93
 
94 94
 						$.ajax({
95
-							url: '<?php echo $baseUrl;?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view + '&hashtag=' + encodeURI(hashtag),
95
+							url: '<?php echo $baseUrl; ?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view + '&hashtag=' + encodeURI(hashtag),
96 96
 							dataType: 'html',
97 97
 							async: false,
98 98
 							success: function(html) {
Please login to merge, or discard this patch.
templates/header.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -1,52 +1,52 @@
 block discarded – undo
1 1
 <!DOCTYPE html>
2 2
 <html lang="en">
3 3
 	<head>
4
-		<title><?php echo $title;?></title>
4
+		<title><?php echo $title; ?></title>
5 5
 		
6 6
 		<meta charset="utf-8">
7 7
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
8 8
 		<meta http-equiv="x-ua-compatible" content="ie=edge">
9 9
 		
10
-		<meta name="description" content="<?php echo $description;?>">
10
+		<meta name="description" content="<?php echo $description; ?>">
11 11
 		<meta name="keywords" content="jodelblue, jodel, blue, webclient, web, client, web-app, browser, app">
12 12
 		
13 13
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
14
-		<link rel="stylesheet" href="<?php echo $baseUrl;?>css/font-awesome.min.css">
15
-		<link rel="stylesheet" href="<?php echo $baseUrl;?>style.css" type="text/css">
14
+		<link rel="stylesheet" href="<?php echo $baseUrl; ?>css/font-awesome.min.css">
15
+		<link rel="stylesheet" href="<?php echo $baseUrl; ?>style.css" type="text/css">
16 16
 		
17
-		<link rel="shortcut icon" type="image/x-icon" href="<?php echo $baseUrl;?>img/favicon/favicon.ico">
18
-		<link rel="icon" type="image/x-icon" href="<?php echo $baseUrl;?>img/favicon/favicon.ico">
19
-		<link rel="icon" type="image/gif" href="<?php echo $baseUrl;?>img/favicon/favicon.gif">
20
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon.png">
21
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon.png">
22
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-57x57.png" sizes="57x57">
23
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-60x60.png" sizes="60x60">
24
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-72x72.png" sizes="72x72">
25
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-76x76.png" sizes="76x76">
26
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-114x114.png" sizes="114x114">
27
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-120x120.png" sizes="120x120">
28
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-128x128.png" sizes="128x128">
29
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-144x144.png" sizes="144x144">
30
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-152x152.png" sizes="152x152">
31
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-180x180.png" sizes="180x180">
32
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-precomposed.png">
33
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-16x16.png" sizes="16x16">
34
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-32x32.png" sizes="32x32">
35
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-96x96.png" sizes="96x96">
36
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-160x160.png" sizes="160x160">
37
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-192x192.png" sizes="192x192">
38
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-196x196.png" sizes="196x196">
39
-		<meta name="msapplication-TileImage" content="<?php echo $baseUrl;?>img/favicon/win8-tile-144x144.png"> 
17
+		<link rel="shortcut icon" type="image/x-icon" href="<?php echo $baseUrl; ?>img/favicon/favicon.ico">
18
+		<link rel="icon" type="image/x-icon" href="<?php echo $baseUrl; ?>img/favicon/favicon.ico">
19
+		<link rel="icon" type="image/gif" href="<?php echo $baseUrl; ?>img/favicon/favicon.gif">
20
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon.png">
21
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon.png">
22
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-57x57.png" sizes="57x57">
23
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-60x60.png" sizes="60x60">
24
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-72x72.png" sizes="72x72">
25
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-76x76.png" sizes="76x76">
26
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-114x114.png" sizes="114x114">
27
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-120x120.png" sizes="120x120">
28
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-128x128.png" sizes="128x128">
29
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-144x144.png" sizes="144x144">
30
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-152x152.png" sizes="152x152">
31
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-180x180.png" sizes="180x180">
32
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-precomposed.png">
33
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-16x16.png" sizes="16x16">
34
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-32x32.png" sizes="32x32">
35
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-96x96.png" sizes="96x96">
36
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-160x160.png" sizes="160x160">
37
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-192x192.png" sizes="192x192">
38
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-196x196.png" sizes="196x196">
39
+		<meta name="msapplication-TileImage" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-144x144.png"> 
40 40
 		<meta name="msapplication-TileColor" content="#5682a3"> 
41 41
 		<meta name="msapplication-navbutton-color" content="#5682a3"> 
42 42
 		<meta name="application-name" content="JodelBlue"/> 
43 43
 		<meta name="msapplication-tooltip" content="JodelBlue"/> 
44 44
 		<meta name="apple-mobile-web-app-title" content="JodelBlue"/> 
45
-		<meta name="msapplication-square70x70logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-70x70.png"> 
46
-		<meta name="msapplication-square144x144logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-144x144.png"> 
47
-		<meta name="msapplication-square150x150logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-150x150.png"> 
48
-		<meta name="msapplication-wide310x150logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-310x150.png"> 
49
-		<meta name="msapplication-square310x310logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-310x310.png"> 
45
+		<meta name="msapplication-square70x70logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-70x70.png"> 
46
+		<meta name="msapplication-square144x144logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-144x144.png"> 
47
+		<meta name="msapplication-square150x150logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-150x150.png"> 
48
+		<meta name="msapplication-wide310x150logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-310x150.png"> 
49
+		<meta name="msapplication-square310x310logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-310x310.png"> 
50 50
 	</head>
51 51
 
52 52
 	<body>
Please login to merge, or discard this patch.
php/View.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -49,25 +49,25 @@  discard block
 block discarded – undo
49 49
         $timediff_inDays = (string)$timediff->format('%d');
50 50
         $timediff_inMonth = (string)$timediff->format('%m');
51 51
 
52
-        if($timediff_inMonth!=0)
52
+        if($timediff_inMonth != 0)
53 53
         {
54 54
                 $timediff = $timediff_inMonth . "m";
55 55
         }
56 56
         else
57 57
         {
58
-            if($timediff_inDays!=0)
58
+            if($timediff_inDays != 0)
59 59
             {
60 60
                 $timediff = $timediff_inDays . "d";
61 61
             }
62 62
             else
63 63
             {
64
-                if($timediff_inHours!=0)
64
+                if($timediff_inHours != 0)
65 65
                 {
66 66
                     $timediff = $timediff_inHours . "h";
67 67
                 }
68 68
                 else
69 69
                 {
70
-                    if($timediff_inMinutes!=0)
70
+                    if($timediff_inMinutes != 0)
71 71
                     {
72 72
                         $timediff = $timediff_inMinutes . "m";
73 73
                     }
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
 
83 83
         ?>
84
-        <article id ="postId-<?php echo $post['post_id']; ?>" class="jodel" style="background-color: #<?php echo $post['color'];?>;">
84
+        <article id ="postId-<?php echo $post['post_id']; ?>" class="jodel" style="background-color: #<?php echo $post['color']; ?>;">
85 85
             <content>
86 86
                 <?php 
87 87
                 if(isset($post['image_url']))
@@ -99,24 +99,24 @@  discard block
 block discarded – undo
99 99
                 <?php
100 100
                     if($this->isDetailedView)
101 101
                     {?>
102
-                        <a href="index.php?vote=up&getPostDetails=true&postId=<?php echo $post['post_id'];?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']);?>" rel="nofollow">
102
+                        <a href="index.php?vote=up&getPostDetails=true&postId=<?php echo $post['post_id']; ?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']); ?>" rel="nofollow">
103 103
               <?php }
104 104
                     else
105 105
                     {?>
106
-                        <a href="index.php?vote=up&postId=<?php echo $post['post_id'];?>" rel="nofollow">
106
+                        <a href="index.php?vote=up&postId=<?php echo $post['post_id']; ?>" rel="nofollow">
107 107
               <?php } ?>
108 108
                             <i class="fa fa-angle-up fa-3x"></i>
109 109
                         </a>    
110 110
                             <br />
111
-                        <?php echo $post["vote_count"];?><br />
111
+                        <?php echo $post["vote_count"]; ?><br />
112 112
                 <?php
113 113
                     if($this->isDetailedView)
114 114
                     {?>
115
-                        <a href="index.php?vote=down&getPostDetails=true&postId=<?php echo $post['post_id'];?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']);?>" rel="nofollow">
115
+                        <a href="index.php?vote=down&getPostDetails=true&postId=<?php echo $post['post_id']; ?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']); ?>" rel="nofollow">
116 116
               <?php }
117 117
                     else
118 118
                     {?>
119
-                        <a href="index.php?vote=down&postId=<?php echo $post['post_id'];?>" rel="nofollow">
119
+                        <a href="index.php?vote=down&postId=<?php echo $post['post_id']; ?>" rel="nofollow">
120 120
               <?php } ?>
121 121
                             <i class="fa fa-angle-down fa-3x"></i>
122 122
                         </a>
@@ -128,14 +128,14 @@  discard block
 block discarded – undo
128 128
                         <td class="time">
129 129
                             <span class="tip" data-tooltip="Time">
130 130
                                 <i class="fa fa-clock-o"></i>
131
-                                <?php echo $timediff;?>
132
-                                <span class="tiptext"><?php echo $d->format('Y-m-d H:i:s');?></span>
131
+                                <?php echo $timediff; ?>
132
+                                <span class="tiptext"><?php echo $d->format('Y-m-d H:i:s'); ?></span>
133 133
                             </span> 
134 134
                         </td>
135 135
                         <td class="comments">
136 136
                             <?php if(!$this->isDetailedView) {?>
137 137
                             <span data-tooltip="Comments">
138
-                                <a href="<?php echo $this->changePostId($post['post_id'])->toUrl();?>">
138
+                                <a href="<?php echo $this->changePostId($post['post_id'])->toUrl(); ?>">
139 139
                                     <i class="fa fa-commenting-o"></i>
140 140
                                     <?php if(array_key_exists("child_count", $post)) {
141 141
                                                 echo $post["child_count"];
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
                                         {
165 165
                                             ?>
166 166
                                             <span data-tooltip="Author">
167
-                                                <i class="fa fa-user-o"></i> #<?php echo $post["user_handle"];?> |
167
+                                                <i class="fa fa-user-o"></i> #<?php echo $post["user_handle"]; ?> |
168 168
                                             </span>
169 169
                                             <?php
170 170
                                         }
@@ -174,8 +174,8 @@  discard block
 block discarded – undo
174 174
 
175 175
                             <span class="tip" data-tooltip="Distance">
176 176
                                 <i class="fa fa-map-marker"></i>
177
-                                <?php echo $post['distance'];?> km
178
-                                <span class="tiptext"><?php echo $post['location']['name'];?></span>
177
+                                <?php echo $post['distance']; ?> km
178
+                                <span class="tiptext"><?php echo $post['location']['name']; ?></span>
179 179
                             </span>
180 180
                         </td>
181 181
                     </tr>
Please login to merge, or discard this patch.
about-us.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -47,6 +47,6 @@
 block discarded – undo
47 47
 			</content>
48 48
 		</article>
49 49
 	</div>
50
-	<?php include 'templates/nav-bottom.php';?>
50
+	<?php include 'templates/nav-bottom.php'; ?>
51 51
 </div>
52
-<?php include 'templatess/footer.php';?>
53 52
\ No newline at end of file
53
+<?php include 'templatess/footer.php'; ?>
54 54
\ No newline at end of file
Please login to merge, or discard this patch.