mmainstreet / jodel-web

php/Requests/libary/Requests.php

Spacing +89 added lines, -89 removed lines

@@ -137,12 +137,12 @@ 
 	 */
 	public static function autoloader($class) {
 		// Check that the class starts with "Requests"
-		if (strpos($class, 'Requests') !== 0) {
+		if(strpos($class, 'Requests') !== 0) {
 			return;
 		}
 
 		$file = str_replace('_', '/', $class);
-		if (file_exists(dirname(__FILE__) . '/' . $file . '.php')) {
+		if(file_exists(dirname(__FILE__) . '/' . $file . '.php')) {
 			require_once(dirname(__FILE__) . '/' . $file . '.php');
 		}
 	}
@@ -162,7 +162,7 @@ 
 	 * @param string $transport Transport class to add, must support the Requests_Transport interface
 	 */
 	public static function add_transport($transport) {
-		if (empty(self::$transports)) {
+		if(empty(self::$transports)) {
 			self::$transports = array(
 				'Requests_Transport_cURL',
 				'Requests_Transport_fsockopen',
@@ -186,12 +186,12 @@ 
 		$cap_string = serialize($capabilities);
 
 		// Don't search for a transport if it's already been done for these $capabilities
-		if (isset(self::$transport[$cap_string]) && self::$transport[$cap_string] !== null) {
+		if(isset(self::$transport[$cap_string]) && self::$transport[$cap_string] !== null) {
 			return new self::$transport[$cap_string]();
 		}
 		// @codeCoverageIgnoreEnd
 
-		if (empty(self::$transports)) {
+		if(empty(self::$transports)) {
 			self::$transports = array(
 				'Requests_Transport_cURL',
 				'Requests_Transport_fsockopen',
@@ -199,18 +199,18 @@ 
 		}
 
 		// Find us a working transport
-		foreach (self::$transports as $class) {
-			if (!class_exists($class)) {
+		foreach(self::$transports as $class) {
+			if(!class_exists($class)) {
 				continue;
 			}
 
 			$result = call_user_func(array($class, 'test'), $capabilities);
-			if ($result) {
+			if($result) {
 				self::$transport[$cap_string] = $class;
 				break;
 			}
 		}
-		if (self::$transport[$cap_string] === null) {
+		if(self::$transport[$cap_string] === null) {
 			throw new Requests_Exception('No working transports found', 'notransport', self::$transports);
 		}
 
@@ -355,7 +355,7 @@ 
 	 * @return Requests_Response
 	 */
 	public static function request($url, $headers = array(), $data = array(), $type = self::GET, $options = array()) {
-		if (empty($options['type'])) {
+		if(empty($options['type'])) {
 			$options['type'] = $type;
 		}
 		$options = array_merge(self::get_default_options(), $options);
@@ -364,10 +364,10 @@ 
 
 		$options['hooks']->dispatch('requests.before_request', array(&$url, &$headers, &$data, &$type, &$options));
 
-		if (!empty($options['transport'])) {
+		if(!empty($options['transport'])) {
 			$transport = $options['transport'];
 
-			if (is_string($options['transport'])) {
+			if(is_string($options['transport'])) {
 				$transport = new $transport();
 			}
 		}
@@ -427,29 +427,29 @@ 
 	public static function request_multiple($requests, $options = array()) {
 		$options = array_merge(self::get_default_options(true), $options);
 
-		if (!empty($options['hooks'])) {
+		if(!empty($options['hooks'])) {
 			$options['hooks']->register('transport.internal.parse_response', array('Requests', 'parse_multiple'));
-			if (!empty($options['complete'])) {
+			if(!empty($options['complete'])) {
 				$options['hooks']->register('multiple.request.complete', $options['complete']);
 			}
 		}
 
-		foreach ($requests as $id => &$request) {
-			if (!isset($request['headers'])) {
+		foreach($requests as $id => &$request) {
+			if(!isset($request['headers'])) {
 				$request['headers'] = array();
 			}
-			if (!isset($request['data'])) {
+			if(!isset($request['data'])) {
 				$request['data'] = array();
 			}
-			if (!isset($request['type'])) {
+			if(!isset($request['type'])) {
 				$request['type'] = self::GET;
 			}
-			if (!isset($request['options'])) {
+			if(!isset($request['options'])) {
 				$request['options'] = $options;
 				$request['options']['type'] = $request['type'];
 			}
 			else {
-				if (empty($request['options']['type'])) {
+				if(empty($request['options']['type'])) {
 					$request['options']['type'] = $request['type'];
 				}
 				$request['options'] = array_merge($options, $request['options']);
@@ -458,19 +458,19 @@ 
 			self::set_defaults($request['url'], $request['headers'], $request['data'], $request['type'], $request['options']);
 
 			// Ensure we only hook in once
-			if ($request['options']['hooks'] !== $options['hooks']) {
+			if($request['options']['hooks'] !== $options['hooks']) {
 				$request['options']['hooks']->register('transport.internal.parse_response', array('Requests', 'parse_multiple'));
-				if (!empty($request['options']['complete'])) {
+				if(!empty($request['options']['complete'])) {
 					$request['options']['hooks']->register('multiple.request.complete', $request['options']['complete']);
 				}
 			}
 		}
 		unset($request);
 
-		if (!empty($options['transport'])) {
+		if(!empty($options['transport'])) {
 			$transport = $options['transport'];
 
-			if (is_string($options['transport'])) {
+			if(is_string($options['transport'])) {
 				$transport = new $transport();
 			}
 		}
@@ -479,10 +479,10 @@ 
 		}
 		$responses = $transport->request_multiple($requests, $options);
 
-		foreach ($responses as $id => &$response) {
+		foreach($responses as $id => &$response) {
 			// If our hook got messed with somehow, ensure we end up with the
 			// correct response
-			if (is_string($response)) {
+			if(is_string($response)) {
 				$request = $requests[$id];
 				self::parse_multiple($response, $request);
 				$request['options']['hooks']->dispatch('multiple.request.complete', array(&$response, $id));
@@ -521,7 +521,7 @@ 
 			'verify' => Requests::get_certificate_path(),
 			'verifyname' => true,
 		);
-		if ($multirequest !== false) {
+		if($multirequest !== false) {
 			$defaults['complete'] = null;
 		}
 		return $defaults;
@@ -533,7 +533,7 @@ 
 	 * @return string Default certificate path.
 	 */
 	public static function get_certificate_path() {
-		if ( ! empty( Requests::$certificate_path ) ) {
+		if(!empty(Requests::$certificate_path)) {
 			return Requests::$certificate_path;
 		}
 
@@ -545,7 +545,7 @@ 
 	 *
 	 * @param string $path Certificate path, pointing to a PEM file.
 	 */
-	public static function set_certificate_path( $path ) {
+	public static function set_certificate_path($path) {
 		Requests::$certificate_path = $path;
 	}
 
@@ -560,39 +560,39 @@ 
 	 * @return array $options
 	 */
 	protected static function set_defaults(&$url, &$headers, &$data, &$type, &$options) {
-		if (!preg_match('/^http(s)?:\/\//i', $url, $matches)) {
+		if(!preg_match('/^http(s)?:\/\//i', $url, $matches)) {
 			throw new Requests_Exception('Only HTTP(S) requests are handled.', 'nonhttp', $url);
 		}
 
-		if (empty($options['hooks'])) {
+		if(empty($options['hooks'])) {
 			$options['hooks'] = new Requests_Hooks();
 		}
 
-		if (is_array($options['auth'])) {
+		if(is_array($options['auth'])) {
 			$options['auth'] = new Requests_Auth_Basic($options['auth']);
 		}
-		if ($options['auth'] !== false) {
+		if($options['auth'] !== false) {
 			$options['auth']->register($options['hooks']);
 		}
 
-		if (is_string($options['proxy']) || is_array($options['proxy'])) {
+		if(is_string($options['proxy']) || is_array($options['proxy'])) {
 			$options['proxy'] = new Requests_Proxy_HTTP($options['proxy']);
 		}
-		if ($options['proxy'] !== false) {
+		if($options['proxy'] !== false) {
 			$options['proxy']->register($options['hooks']);
 		}
 
-		if (is_array($options['cookies'])) {
+		if(is_array($options['cookies'])) {
 			$options['cookies'] = new Requests_Cookie_Jar($options['cookies']);
 		}
-		elseif (empty($options['cookies'])) {
+		elseif(empty($options['cookies'])) {
 			$options['cookies'] = new Requests_Cookie_Jar();
 		}
-		if ($options['cookies'] !== false) {
+		if($options['cookies'] !== false) {
 			$options['cookies']->register($options['hooks']);
 		}
 
-		if ($options['idn'] !== false) {
+		if($options['idn'] !== false) {
 			$iri = new Requests_IRI($url);
 			$iri->host = Requests_IDNAEncoder::encode($iri->ihost);
 			$url = $iri->uri;
@@ -601,8 +601,8 @@ 
 		// Massage the type to ensure we support it.
 		$type = strtoupper($type);
 
-		if (!isset($options['data_format'])) {
-			if (in_array($type, array(self::HEAD, self::GET, self::DELETE))) {
+		if(!isset($options['data_format'])) {
+			if(in_array($type, array(self::HEAD, self::GET, self::DELETE))) {
 				$options['data_format'] = 'query';
 			}
 			else {
@@ -627,15 +627,15 @@ 
 	 */
 	protected static function parse_response($headers, $url, $req_headers, $req_data, $options) {
 		$return = new Requests_Response();
-		if (!$options['blocking']) {
+		if(!$options['blocking']) {
 			return $return;
 		}
 
 		$return->raw = $headers;
 		$return->url = $url;
 
-		if (!$options['filename']) {
-			if (($pos = strpos($headers, "\r\n\r\n")) === false) {
+		if(!$options['filename']) {
+			if(($pos = strpos($headers, "\r\n\r\n")) === false) {
 				// Crap!
 				throw new Requests_Exception('Missing header/body separator', 'requests.no_crlf_separator');
 			}
@@ -652,44 +652,44 @@ 
 		$headers = preg_replace('/\n[ \t]/', ' ', $headers);
 		$headers = explode("\n", $headers);
 		preg_match('#^HTTP/(1\.\d)[ \t]+(\d+)#i', array_shift($headers), $matches);
-		if (empty($matches)) {
+		if(empty($matches)) {
 			throw new Requests_Exception('Response could not be parsed', 'noversion', $headers);
 		}
-		$return->protocol_version = (float) $matches[1];
-		$return->status_code = (int) $matches[2];
-		if ($return->status_code >= 200 && $return->status_code < 300) {
+		$return->protocol_version = (float)$matches[1];
+		$return->status_code = (int)$matches[2];
+		if($return->status_code >= 200 && $return->status_code < 300) {
 			$return->success = true;
 		}
 
-		foreach ($headers as $header) {
+		foreach($headers as $header) {
 			list($key, $value) = explode(':', $header, 2);
 			$value = trim($value);
 			preg_replace('#(\s+)#i', ' ', $value);
 			$return->headers[$key] = $value;
 		}
-		if (isset($return->headers['transfer-encoding'])) {
+		if(isset($return->headers['transfer-encoding'])) {
 			$return->body = self::decode_chunked($return->body);
 			unset($return->headers['transfer-encoding']);
 		}
-		if (isset($return->headers['content-encoding'])) {
+		if(isset($return->headers['content-encoding'])) {
 			$return->body = self::decompress($return->body);
 		}
 
 		//fsockopen and cURL compatibility
-		if (isset($return->headers['connection'])) {
+		if(isset($return->headers['connection'])) {
 			unset($return->headers['connection']);
 		}
 
 		$options['hooks']->dispatch('requests.before_redirect_check', array(&$return, $req_headers, $req_data, $options));
 
-		if ($return->is_redirect() && $options['follow_redirects'] === true) {
-			if (isset($return->headers['location']) && $options['redirected'] < $options['redirects']) {
-				if ($return->status_code === 303) {
+		if($return->is_redirect() && $options['follow_redirects'] === true) {
+			if(isset($return->headers['location']) && $options['redirected'] < $options['redirects']) {
+				if($return->status_code === 303) {
 					$options['type'] = self::GET;
 				}
 				$options['redirected']++;
 				$location = $return->headers['location'];
-				if (strpos($location, 'http://') !== 0 && strpos($location, 'https://') !== 0) {
+				if(strpos($location, 'http://') !== 0 && strpos($location, 'https://') !== 0) {
 					// relative redirect, for compatibility make it absolute
 					$location = Requests_IRI::absolutize($url, $location);
 					$location = $location->uri;
@@ -707,7 +707,7 @@ 
 				$redirected->history[] = $return;
 				return $redirected;
 			}
-			elseif ($options['redirected'] >= $options['redirects']) {
+			elseif($options['redirected'] >= $options['redirects']) {
 				throw new Requests_Exception('Too many redirects', 'toomanyredirects', $return);
 			}
 		}
@@ -736,7 +736,7 @@ 
 			$options = $request['options'];
 			$response = self::parse_response($response, $url, $headers, $data, $options);
 		}
-		catch (Requests_Exception $e) {
+		catch(Requests_Exception $e) {
 			$response = $e;
 		}
 	}
@@ -749,7 +749,7 @@ 
 	 * @return string Decoded body
 	 */
 	protected static function decode_chunked($data) {
-		if (!preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', trim($data))) {
+		if(!preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', trim($data))) {
 			return $data;
 		}
 
@@ -758,15 +758,15 @@ 
 		$decoded = '';
 		$encoded = $data;
 
-		while (true) {
-			$is_chunked = (bool) preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', $encoded, $matches);
-			if (!$is_chunked) {
+		while(true) {
+			$is_chunked = (bool)preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', $encoded, $matches);
+			if(!$is_chunked) {
 				// Looks like it's not chunked after all
 				return $data;
 			}
 
 			$length = hexdec(trim($matches[1]));
-			if ($length === 0) {
+			if($length === 0) {
 				// Ignore trailer headers
 				return $decoded;
 			}
@@ -775,7 +775,7 @@ 
 			$decoded .= substr($encoded, $chunk_length, $length);
 			$encoded = substr($encoded, $chunk_length + $length + 2);
 
-			if (trim($encoded) === '0' || empty($encoded)) {
+			if(trim($encoded) === '0' || empty($encoded)) {
 				return $decoded;
 			}
 		}
@@ -793,7 +793,7 @@ 
 	 */
 	public static function flatten($array) {
 		$return = array();
-		foreach ($array as $key => $value) {
+		foreach($array as $key => $value) {
 			$return[] = sprintf('%s: %s', $key, $value);
 		}
 		return $return;
@@ -821,21 +821,21 @@ 
 	 * @return string Decompressed string
 	 */
 	public static function decompress($data) {
-		if (substr($data, 0, 2) !== "\x1f\x8b" && substr($data, 0, 2) !== "\x78\x9c") {
+		if(substr($data, 0, 2) !== "\x1f\x8b" && substr($data, 0, 2) !== "\x78\x9c") {
 			// Not actually compressed. Probably cURL ruining this for us.
 			return $data;
 		}
 
-		if (function_exists('gzdecode') && ($decoded = @gzdecode($data)) !== false) {
+		if(function_exists('gzdecode') && ($decoded = @gzdecode($data)) !== false) {
 			return $decoded;
 		}
-		elseif (function_exists('gzinflate') && ($decoded = @gzinflate($data)) !== false) {
+		elseif(function_exists('gzinflate') && ($decoded = @gzinflate($data)) !== false) {
 			return $decoded;
 		}
-		elseif (($decoded = self::compatible_gzinflate($data)) !== false) {
+		elseif(($decoded = self::compatible_gzinflate($data)) !== false) {
 			return $decoded;
 		}
-		elseif (function_exists('gzuncompress') && ($decoded = @gzuncompress($data)) !== false) {
+		elseif(function_exists('gzuncompress') && ($decoded = @gzuncompress($data)) !== false) {
 			return $decoded;
 		}
 
@@ -865,26 +865,26 @@ 
 	public static function compatible_gzinflate($gzData) {
 		// Compressed data might contain a full zlib header, if so strip it for
 		// gzinflate()
-		if (substr($gzData, 0, 3) == "\x1f\x8b\x08") {
+		if(substr($gzData, 0, 3) == "\x1f\x8b\x08") {
 			$i = 10;
 			$flg = ord(substr($gzData, 3, 1));
-			if ($flg > 0) {
-				if ($flg & 4) {
+			if($flg > 0) {
+				if($flg&4) {
 					list($xlen) = unpack('v', substr($gzData, $i, 2));
 					$i = $i + 2 + $xlen;
 				}
-				if ($flg & 8) {
+				if($flg&8) {
 					$i = strpos($gzData, "\0", $i) + 1;
 				}
-				if ($flg & 16) {
+				if($flg&16) {
 					$i = strpos($gzData, "\0", $i) + 1;
 				}
-				if ($flg & 2) {
+				if($flg&2) {
 					$i = $i + 2;
 				}
 			}
 			$decompressed = self::compatible_gzinflate(substr($gzData, $i));
-			if (false !== $decompressed) {
+			if(false !== $decompressed) {
 				return $decompressed;
 			}
 		}
@@ -905,17 +905,17 @@ 
 		// First 2 bytes should be divisible by 0x1F
 		list(, $first_two_bytes) = unpack('n', $gzData);
 
-		if (0x08 == $first_nibble && 0 == ($first_two_bytes % 0x1F)) {
+		if(0x08 == $first_nibble && 0 == ($first_two_bytes % 0x1F)) {
 			$huffman_encoded = true;
 		}
 
-		if ($huffman_encoded) {
-			if (false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
+		if($huffman_encoded) {
+			if(false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
 				return $decompressed;
 			}
 		}
 
-		if ("\x50\x4b\x03\x04" == substr($gzData, 0, 4)) {
+		if("\x50\x4b\x03\x04" == substr($gzData, 0, 4)) {
 			// ZIP file format header
 			// Offset 6: 2 bytes, General-purpose field
 			// Offset 26: 2 bytes, filename length
@@ -927,9 +927,9 @@ 
 			// If the file has been compressed on the fly, 0x08 bit is set of
 			// the general purpose field. We can use this to differentiate
 			// between a compressed document, and a ZIP file
-			$zip_compressed_on_the_fly = (0x08 == (0x08 & $general_purpose_flag));
+			$zip_compressed_on_the_fly = (0x08 == (0x08&$general_purpose_flag));
 
-			if (!$zip_compressed_on_the_fly) {
+			if(!$zip_compressed_on_the_fly) {
 				// Don't attempt to decode a compressed zip file
 				return $gzData;
 			}
@@ -937,20 +937,20 @@ 
 			// Determine the first byte of data, based on the above ZIP header
 			// offsets:
 			$first_file_start = array_sum(unpack('v2', substr($gzData, 26, 4)));
-			if (false !== ($decompressed = @gzinflate(substr($gzData, 30 + $first_file_start)))) {
+			if(false !== ($decompressed = @gzinflate(substr($gzData, 30 + $first_file_start)))) {
 				return $decompressed;
 			}
 			return false;
 		}
 
 		// Finally fall back to straight gzinflate
-		if (false !== ($decompressed = @gzinflate($gzData))) {
+		if(false !== ($decompressed = @gzinflate($gzData))) {
 			return $decompressed;
 		}
 
 		// Fallback for all above failing, not expected, but included for
 		// debugging and preventing regressions and to track stats
-		if (false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
+		if(false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
 			return $decompressed;
 		}
 
@@ -959,7 +959,7 @@ 
 
 	public static function match_domain($host, $reference) {
 		// Check for a direct match
-		if ($host === $reference) {
+		if($host === $reference) {
 			return true;
 		}
 
@@ -967,10 +967,10 @@ 
 		// Also validates that the host has 3 parts or more, as per Firefox's
 		// ruleset.
 		$parts = explode('.', $host);
-		if (ip2long($host) === false && count($parts) >= 3) {
+		if(ip2long($host) === false && count($parts) >= 3) {
 			$parts[0] = '*';
 			$wildcard = implode('.', $parts);
-			if ($wildcard === $reference) {
+			if($wildcard === $reference) {
 				return true;
 			}
 		}

php/Requests/libary/Requests/Proxy.php

Spacing +1 added lines, -1 removed lines

@@ -29,5 +29,5 @@
 	 * @see Requests_Hooks::register
 	 * @param Requests_Hooks $hooks Hook system
 	 */
-	public function register(Requests_Hooks &$hooks);
+	public function register(Requests_Hooks&$hooks);
 }
\ No newline at end of file

php/Requests/CreateUser.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
     {
         $str = '';
         $max = mb_strlen($keyspace, '8bit') - 1;
-        for ($i = 0; $i < $length; ++$i) {
+        for($i = 0; $i < $length; ++$i) {
             $str .= $keyspace[rand(0, $max)];
         }
         return $str;

php/Requests/GetPosts.php

Spacing +5 added lines, -5 removed lines

@@ -11,22 +11,22 @@ 
     public $url;
 
         
-    function setUrl ($url)
+    function setUrl($url)
     {
             $this->url = $url;
     }
     
-    function getUrl ()
+    function getUrl()
     {
         return $this->url;
     }
 		
-    function setLastPostId ($lastPostId)
+    function setLastPostId($lastPostId)
     {
 			$this->lastPostId = $lastPostId;
 	}
 	
-	function getlastPostId ()
+	function getlastPostId()
 	{
 		return $this->lastPostId;
 	}
@@ -35,7 +35,7 @@ 
     {
         $apiEndPoint = $this->getUrl();
 
-        if ($this->getLastPostId() != "") {
+        if($this->getLastPostId() != "") {
 			$apiEndPoint = $this->getUrl() . '?after=' . $this->getLastPostId();
 		}
         return $apiEndPoint;

about-us.php

Spacing +2 added lines, -2 removed lines

@@ -47,6 +47,6 @@
 			</content>
 		</article>
 	</div>
-	<?php include 'templates/nav-bottom.php';?>
+	<?php include 'templates/nav-bottom.php'; ?>
 </div>
-<?php include 'templates/footer.php';?>
\ No newline at end of file
+<?php include 'templates/footer.php'; ?>
\ No newline at end of file

error-pages/404.php

Spacing +1 added lines, -1 removed lines

@@ -66,4 +66,4 @@
 		</article>
 	</div>
 </div>
-<?php include(realpath(__DIR__ . '/..') . '/templates/footer.php');?>
\ No newline at end of file
+<?php include(realpath(__DIR__ . '/..') . '/templates/footer.php'); ?>
\ No newline at end of file

error-pages/410.php

Spacing +1 added lines, -1 removed lines

@@ -66,4 +66,4 @@
 		</article>
 	</div>
 </div>
-<?php include(realpath(__DIR__ . '/..') . '/templates/footer.php');?>
\ No newline at end of file
+<?php include(realpath(__DIR__ . '/..') . '/templates/footer.php'); ?>
\ No newline at end of file

templates/nav-bottom.php

Spacing +4 added lines, -4 removed lines

@@ -1,16 +1,16 @@
 <div id="sortJodelBy" class="row">
 	<div class="col-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>
+		<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>
 	</div>
 	<div class="col-3">
-		<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>
+		<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>
 	</div>
 	<div class="col-3">
-		<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>
+		<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>
 	</div>
 	<div class="col-3">
 		<nav>
-			<a href="<?php echo $baseUrl;?>about-us.php">about</a>
+			<a href="<?php echo $baseUrl; ?>about-us.php">about</a>
 		</nav>
 	</div>
 </div>

php/JodelAccount.php

Spacing +14 added lines, -14 removed lines

@@ -35,7 +35,7 @@ 
         {
             $this->refreshToken();
         }
-        $this->accessToken  = $this->getAccessToken();
+        $this->accessToken = $this->getAccessToken();
 
        /* if($this->isAccountVerified() != 1)
         {
@@ -106,11 +106,11 @@ 
         }
 
         $db = new DatabaseConnect();
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
+        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
         
         $location = new Location();
         
-        if ($result->num_rows > 0)
+        if($result->num_rows > 0)
         {
             // output data of each row
             while($row = $result->fetch_assoc())
@@ -182,7 +182,7 @@ 
                     }
                     else
                     {
-                        user_log('User with JodelDeviceId:' . $this->deviceUid .  ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
+                        user_log('User with JodelDeviceId:' . $this->deviceUid . ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
                     }
                 }
 
@@ -194,11 +194,11 @@ 
     function getLocation()
     {
         $db = new DatabaseConnect();
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
+        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
         
         $location = new Location();
         
-        if ($result->num_rows > 0)
+        if($result->num_rows > 0)
         {
             // output data of each row
             while($row = $result->fetch_assoc())
@@ -321,7 +321,7 @@ 
         if(isset($_POST['color']))
         {
             $color = $_POST['color'];
-            switch ($color) {
+            switch($color) {
                 case '8ABDB0':
                     $color = '8ABDB0';
                     break;
@@ -389,7 +389,7 @@ 
         $db = new DatabaseConnect();  
         $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
 
-        if ($result->num_rows > 0)
+        if($result->num_rows > 0)
         {
             // output data of each row
             while($row = $result->fetch_assoc())
@@ -428,7 +428,7 @@ 
                                     expiration_date='" . $expiration_date . "'
                                 WHERE device_uid='" . $device_uid . "'");
 
-        if($result === false){
+        if($result === false) {
                 error_log("Adding account failed: (" . $db->errno . ") " . $db->error);
         }   
     }
@@ -438,11 +438,11 @@ 
     function getAccessToken()
     {
         $db = new DatabaseConnect();
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
+        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
         
         $accessToken;
         
-        if ($result->num_rows > 0)
+        if($result->num_rows > 0)
         {
             // output data of each row
             while($row = $result->fetch_assoc())
@@ -508,7 +508,7 @@ 
         $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;
@@ -536,11 +536,11 @@ 
         $result = $db->query("INSERT INTO accounts (access_token, refresh_token, token_type,
                         expires_in, expiration_date, distinct_id, device_uid, name, lat, lng)
                         VALUES ('" . $access_token . "','" . $refresh_token . "','" . $token_type .
-                        "','" .  $expires_in . "','" . $expiration_date . "','" . $distinct_id .
+                        "','" . $expires_in . "','" . $expiration_date . "','" . $distinct_id .
                         "','" . $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;