mmainstreet / jodel-web

php/Requests/libary/Requests/Proxy.php

Braces +2 added lines, -1 removed lines

@@ -20,7 +20,8 @@
  * @subpackage Proxy
  * @since 1.6
  */
-interface Requests_Proxy {
+interface Requests_Proxy
+{
 	/**
 	 * Register hooks as needed
 	 *

Doc Comments +1 added lines

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

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/libary/Requests/Exception.php

Braces +8 added lines, -4 removed lines

@@ -10,7 +10,8 @@ 
  *
  * @package Requests
  */
-class Requests_Exception extends Exception {
+class Requests_Exception extends Exception
+{
 	/**
 	 * Type of exception
 	 *
@@ -33,7 +34,8 @@ 
 	 * @param mixed $data Associated data
 	 * @param integer $code Exception numerical code, if applicable
 	 */
-	public function __construct($message, $type, $data = null, $code = 0) {
+	public function __construct($message, $type, $data = null, $code = 0)
+	{
 		parent::__construct($message, $code);
 
 		$this->type = $type;
@@ -46,7 +48,8 @@ 
 	 * @codeCoverageIgnore
 	 * @return string
 	 */
-	public function getType() {
+	public function getType()
+	{
 		return $this->type;
 	}
 
@@ -56,7 +59,8 @@ 
 	 * @codeCoverageIgnore
 	 * @return mixed
 	 */
-	public function getData() {
+	public function getData()
+	{
 		return $this->data;
 	}
 }
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 * @param mixed $data Associated data
 	 * @param integer $code Exception numerical code, if applicable
 	 */
-	public function __construct($message, $type, $data = null, $code = 0) {
+	public function __construct($message, $type, $data = NULL, $code = 0) {
 		parent::__construct($message, $code);
 
 		$this->type = $type;

php/Requests/libary/Requests/Auth/Basic.php

Spacing +3 added lines, -3 removed lines

@@ -37,8 +37,8 @@ 
 	 * @param array|null $args Array of user and password. Must have exactly two elements
 	 */
 	public function __construct($args = null) {
-		if (is_array($args)) {
-			if (count($args) !== 2) {
+		if(is_array($args)) {
+			if(count($args) !== 2) {
 				throw new Requests_Exception('Invalid number of arguments', 'authbasicbadargs');
 			}
 
@@ -53,7 +53,7 @@ 
 	 * @see fsockopen_header
 	 * @param Requests_Hooks $hooks Hook system
 	 */
-	public function register(Requests_Hooks &$hooks) {
+	public function register(Requests_Hooks&$hooks) {
 		$hooks->register('curl.before_send', array(&$this, 'curl_before_send'));
 		$hooks->register('fsockopen.after_headers', array(&$this, 'fsockopen_header'));
 	}

Braces +16 added lines, -8 removed lines

@@ -15,7 +15,8 @@ 
  * @package Requests
  * @subpackage Authentication
  */
-class Requests_Auth_Basic implements Requests_Auth {
+class Requests_Auth_Basic implements Requests_Auth
+{
 	/**
 	 * Username
 	 *
@@ -36,9 +37,12 @@ 
 	 * @throws Requests_Exception On incorrect number of arguments (`authbasicbadargs`)
 	 * @param array|null $args Array of user and password. Must have exactly two elements
 	 */
-	public function __construct($args = null) {
-		if (is_array($args)) {
-			if (count($args) !== 2) {
+	public function __construct($args = null)
+	{
+		if (is_array($args))
+		{
+			if (count($args) !== 2)
+			{
 				throw new Requests_Exception('Invalid number of arguments', 'authbasicbadargs');
 			}
 
@@ -53,7 +57,8 @@ 
 	 * @see fsockopen_header
 	 * @param Requests_Hooks $hooks Hook system
 	 */
-	public function register(Requests_Hooks &$hooks) {
+	public function register(Requests_Hooks &$hooks)
+	{
 		$hooks->register('curl.before_send', array(&$this, 'curl_before_send'));
 		$hooks->register('fsockopen.after_headers', array(&$this, 'fsockopen_header'));
 	}
@@ -63,7 +68,8 @@ 
 	 *
 	 * @param resource $handle cURL resource
 	 */
-	public function curl_before_send(&$handle) {
+	public function curl_before_send(&$handle)
+	{
 		curl_setopt($handle, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
 		curl_setopt($handle, CURLOPT_USERPWD, $this->getAuthString());
 	}
@@ -73,7 +79,8 @@ 
 	 *
 	 * @param string $out HTTP header string
 	 */
-	public function fsockopen_header(&$out) {
+	public function fsockopen_header(&$out)
+	{
 		$out .= sprintf("Authorization: Basic %s\r\n", base64_encode($this->getAuthString()));
 	}
 
@@ -82,7 +89,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getAuthString() {
+	public function getAuthString()
+	{
 		return $this->user . ':' . $this->pass;
 	}
 }
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 	 * @throws Requests_Exception On incorrect number of arguments (`authbasicbadargs`)
 	 * @param array|null $args Array of user and password. Must have exactly two elements
 	 */
-	public function __construct($args = null) {
+	public function __construct($args = NULL) {
 		if (is_array($args)) {
 			if (count($args) !== 2) {
 				throw new Requests_Exception('Invalid number of arguments', 'authbasicbadargs');

php/Requests/UpdateLocation.php

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
 
-class UpdateLocation extends AbstractRequest {
+class UpdateLocation extends AbstractRequest
+{
 		 /**
      * @var Location
      */

Indentation +30 added lines, -30 removed lines

@@ -3,37 +3,37 @@
 
 class UpdateLocation extends AbstractRequest {
 		 /**
-     * @var Location
-     */
-    public $location;
-    /**
-     * @return Location
-     */
-    public function getLocation()
-    {
-        return $this->location;
-    }
-    /**
-     * @param Location $location
-     */
-    public function setLocation($location)
-    {
-        $this->location = $location;
-    }
+		  * @var Location
+		  */
+	public $location;
+	/**
+	 * @return Location
+	 */
+	public function getLocation()
+	{
+		return $this->location;
+	}
+	/**
+	 * @param Location $location
+	 */
+	public function setLocation($location)
+	{
+		$this->location = $location;
+	}
 		
-    function getApiEndPoint()
-    {
-        return '/v2/users/location';
-    }
-    function getPayload()
-    {
-        return array(
+	function getApiEndPoint()
+	{
+		return '/v2/users/location';
+	}
+	function getPayload()
+	{
+		return array(
 			'location' => $this->getLocation()->toArray(),
-        );
-    }
-    function getMethod()
-    {
-        return 'PUT';
-    }
+		);
+	}
+	function getMethod()
+	{
+		return 'PUT';
+	}
 }
 

php/Requests/CreateUser.php

Doc Comments +3 added lines

@@ -33,6 +33,9 @@
         return $this->random_str(64, 'abcdef0123456789');
     }
     
+    /**
+     * @param integer $length
+     */
     private function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
     {
         $str = '';

Indentation +46 added lines, -46 removed lines

@@ -1,53 +1,53 @@ 
 <?php
 
 class CreateUser extends AbstractRequest {
-    /**
-     * @var Location
-     */
-    private $location;
-    private $deviceUid;
-    /**
-     * @return Location
-     */
-    private function getLocation()
-    {
-        return $this->location;
-    }
-    /**
-     * @param Location $location
-     */
-    public function setLocation(Location $location)
-    {
-        $this->location = $location;
-    }
-    private function getDeviceUid()
-    {
+	/**
+	 * @var Location
+	 */
+	private $location;
+	private $deviceUid;
+	/**
+	 * @return Location
+	 */
+	private function getLocation()
+	{
+		return $this->location;
+	}
+	/**
+	 * @param Location $location
+	 */
+	public function setLocation(Location $location)
+	{
+		$this->location = $location;
+	}
+	private function getDeviceUid()
+	{
 		return $this->deviceUid;
 	}
 	public function setDeviceUid($deviceUid)
-    {
+	{
 			$this->deviceUid = $deviceUid;
 	}
-    private function generateDeviceUid()
-    {
-        return $this->random_str(64, 'abcdef0123456789');
-    }
+	private function generateDeviceUid()
+	{
+		return $this->random_str(64, 'abcdef0123456789');
+	}
     
-    private function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
-    {
-        $str = '';
-        $max = mb_strlen($keyspace, '8bit') - 1;
-        for ($i = 0; $i < $length; ++$i) {
-            $str .= $keyspace[rand(0, $max)];
-        }
-        return $str;
-    }
-    public function getApiEndPoint()
-    {
-        return '/v2/users';
-    }
-    public function getPayload()
-    {
+	private function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
+	{
+		$str = '';
+		$max = mb_strlen($keyspace, '8bit') - 1;
+		for ($i = 0; $i < $length; ++$i) {
+			$str .= $keyspace[rand(0, $max)];
+		}
+		return $str;
+	}
+	public function getApiEndPoint()
+	{
+		return '/v2/users';
+	}
+	public function getPayload()
+	{
 			if(!isset($this->deviceUid))
 			{
 				$this->setDeviceUid($this->generateDeviceUid());
@@ -58,9 +58,9 @@ 
 					"client_id" => self::CLIENTID,
 					"device_uid" => $this->getDeviceUid(),
 			);
-    }
-    public function getMethod()
-    {
-        return 'POST';
-    }
+	}
+	public function getMethod()
+	{
+		return 'POST';
+	}
 }

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;

Braces +5 added lines, -3 removed lines

@@ -1,6 +1,7 @@ 
 <?php
 
-class CreateUser extends AbstractRequest {
+class CreateUser extends AbstractRequest
+{
     /**
      * @var Location
      */
@@ -25,7 +26,7 @@ 
 		return $this->deviceUid;
 	}
 	public function setDeviceUid($deviceUid)
-    {
+	{
 			$this->deviceUid = $deviceUid;
 	}
     private function generateDeviceUid()
@@ -37,7 +38,8 @@ 
     {
         $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/AccountData.php

Indentation +90 added lines, -90 removed lines

@@ -2,94 +2,94 @@
 
 class AccountData
 {
-    /**
-     * @var string
-     */
-    public $accessToken;
-    /**
-     * @var string
-     */
-    public $expirationDate;
-    /**
-     * @var string
-     */
-    public $refreshToken;
-    /**
-     * @var string
-     */
-    public $distinctId;
-    /**
-     * @var string
-     */
-    public $deviceUid;
-    /**
-     * @return string
-     */
-    public function getAccessToken()
-    {
-        return $this->accessToken;
-    }
-    /**
-     * @param string $accessToken
-     */
-    public function setAccessToken(string $accessToken)
-    {
-        $this->accessToken = $accessToken;
-    }
-    /**
-     * @return string
-     */
-    public function getExpirationDate()
-    {
-        return $this->expirationDate;
-    }
-    /**
-     * @param string $expirationDate
-     */
-    public function setExpirationDate(string $expirationDate)
-    {
-        $this->expirationDate = $expirationDate;
-    }
-    /**
-     * @return string
-     */
-    public function getRefreshToken()
-    {
-        return $this->refreshToken;
-    }
-    /**
-     * @param string $refreshToken
-     */
-    public function setRefreshToken(string $refreshToken)
-    {
-        $this->refreshToken = $refreshToken;
-    }
-    /**
-     * @return string
-     */
-    public function getDistinctId()
-    {
-        return $this->distinctId;
-    }
-    /**
-     * @param string $distinctId
-     */
-    public function setDistinctId(string $distinctId)
-    {
-        $this->distinctId = $distinctId;
-    }
-    /**
-     * @return string
-     */
-    public function getDeviceUid()
-    {
-        return $this->deviceUid;
-    }
-    /**
-     * @param string $deviceUid
-     */
-    public function setDeviceUid(string $deviceUid)
-    {
-        $this->deviceUid = $deviceUid;
-    }
+	/**
+	 * @var string
+	 */
+	public $accessToken;
+	/**
+	 * @var string
+	 */
+	public $expirationDate;
+	/**
+	 * @var string
+	 */
+	public $refreshToken;
+	/**
+	 * @var string
+	 */
+	public $distinctId;
+	/**
+	 * @var string
+	 */
+	public $deviceUid;
+	/**
+	 * @return string
+	 */
+	public function getAccessToken()
+	{
+		return $this->accessToken;
+	}
+	/**
+	 * @param string $accessToken
+	 */
+	public function setAccessToken(string $accessToken)
+	{
+		$this->accessToken = $accessToken;
+	}
+	/**
+	 * @return string
+	 */
+	public function getExpirationDate()
+	{
+		return $this->expirationDate;
+	}
+	/**
+	 * @param string $expirationDate
+	 */
+	public function setExpirationDate(string $expirationDate)
+	{
+		$this->expirationDate = $expirationDate;
+	}
+	/**
+	 * @return string
+	 */
+	public function getRefreshToken()
+	{
+		return $this->refreshToken;
+	}
+	/**
+	 * @param string $refreshToken
+	 */
+	public function setRefreshToken(string $refreshToken)
+	{
+		$this->refreshToken = $refreshToken;
+	}
+	/**
+	 * @return string
+	 */
+	public function getDistinctId()
+	{
+		return $this->distinctId;
+	}
+	/**
+	 * @param string $distinctId
+	 */
+	public function setDistinctId(string $distinctId)
+	{
+		$this->distinctId = $distinctId;
+	}
+	/**
+	 * @return string
+	 */
+	public function getDeviceUid()
+	{
+		return $this->deviceUid;
+	}
+	/**
+	 * @param string $deviceUid
+	 */
+	public function setDeviceUid(string $deviceUid)
+	{
+		$this->deviceUid = $deviceUid;
+	}
 }

php/Requests/SendJodel.php

Indentation +18 added lines, -18 removed lines

@@ -1,26 +1,26 @@
 <?php
 
 class SendJodel extends AbstractRequest {
-    public $location;
-    public $ancestor = "";
-    public $color = "";
+	public $location;
+	public $ancestor = "";
+	public $color = "";
     
-    function getApiEndPoint()
-    {
-        return '/v3/posts/';
-    }
+	function getApiEndPoint()
+	{
+		return '/v3/posts/';
+	}
 
-    function getPayload()
-    {
-        return array(
+	function getPayload()
+	{
+		return array(
 			"ancestor" => $this->ancestor,
 			"color" => $this->color,
-            "location" => $this->location->toArray(),
-            "message" => $_POST['message'],
-        );
-    }
-    function getMethod()
-    {
-        return 'POST';
-    }
+			"location" => $this->location->toArray(),
+			"message" => $_POST['message'],
+		);
+	}
+	function getMethod()
+	{
+		return 'POST';
+	}
 }

Braces +2 added lines, -1 removed lines

@@ -1,6 +1,7 @@
 <?php
 
-class SendJodel extends AbstractRequest {
+class SendJodel extends AbstractRequest
+{
     public $location;
     public $ancestor = "";
     public $color = "";

get-posts-ajax.php

Braces +2 added lines, -1 removed lines

@@ -45,7 +45,8 @@
 
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch ($_GET['view'])
+		{
 			case 'comment':
 				$view = 'comment';
 				break;

Spacing +5 added lines, -5 removed lines

@@ -18,7 +18,7 @@ 
 if(!isset($_COOKIE["JodelDeviceId"]))
 {
 	$deviceUid = createAccount();
-	setcookie("JodelDeviceId", $deviceUid, time()+60*60*24*365*10);
+	setcookie("JodelDeviceId", $deviceUid, time() + 60 * 60 * 24 * 365 * 10);
 	
 }
 else
@@ -37,7 +37,7 @@ 
 
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch($_GET['view']) {
 			case 'comment':
 				$view = 'comment';
 				break;
@@ -56,13 +56,13 @@ 
 		$view = 'time';
 	}
 
-	if($view=='comment')
+	if($view == 'comment')
 	{
 		$url = "/v2/posts/location/discussed/";
 	}
 	else
 	{
-		if($view=='upVote')
+		if($view == 'upVote')
 		{
 			$url = "/v2/posts/location/popular/";
 		}
@@ -82,7 +82,7 @@ 
 		?>
 		<div class="nextPosts">
 		<?php
-		for($i = 0; $i<$loops; $i++)
+		for($i = 0; $i < $loops; $i++)
 		{
 			if(isset($posts[$i]))
 			{

php/Requests/GetPosts.php

Indentation +44 added lines, -44 removed lines

@@ -4,25 +4,25 @@ 
 {
 	public $lastPostId;
 
-    /**
-     * @var Location
-     */
-    public $location;
-    public $url;
+	/**
+	 * @var Location
+	 */
+	public $location;
+	public $url;
 
         
-    function setUrl ($url)
-    {
-            $this->url = $url;
-    }
+	function setUrl ($url)
+	{
+			$this->url = $url;
+	}
     
-    function getUrl ()
-    {
-        return $this->url;
-    }
+	function getUrl ()
+	{
+		return $this->url;
+	}
 		
-    function setLastPostId ($lastPostId)
-    {
+	function setLastPostId ($lastPostId)
+	{
 			$this->lastPostId = $lastPostId;
 	}
 	
@@ -31,38 +31,38 @@ 
 		return $this->lastPostId;
 	}
     
-    function getApiEndPoint()
-    {
-        $apiEndPoint = $this->getUrl();
+	function getApiEndPoint()
+	{
+		$apiEndPoint = $this->getUrl();
 
-        if ($this->getLastPostId() != "") {
+		if ($this->getLastPostId() != "") {
 			$apiEndPoint = $this->getUrl() . '?after=' . $this->getLastPostId();
 		}
-        return $apiEndPoint;
-    }
-    function getPayload()
-    {
-        if($this->version == 'v3')
-        {
-            $this->location = new Location();
-            $this->location->setLat(52.520006);
-            $this->location->setLng(13.404954);
-            $this->location->setCityName('Berlin');
+		return $apiEndPoint;
+	}
+	function getPayload()
+	{
+		if($this->version == 'v3')
+		{
+			$this->location = new Location();
+			$this->location->setLat(52.520006);
+			$this->location->setLng(13.404954);
+			$this->location->setCityName('Berlin');
 
 
-            return array(
-                "location" => $this->location->toArray(),
-                "stickies" => 'false',
-            );
-        }
-        else
-        {
-            return array(
-            );
-        }
-    }
-    function getMethod()
-    {
-        return 'GET';
-    }
+			return array(
+				"location" => $this->location->toArray(),
+				"stickies" => 'false',
+			);
+		}
+		else
+		{
+			return array(
+			);
+		}
+	}
+	function getMethod()
+	{
+		return 'GET';
+	}
 }

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;

Braces +2 added lines, -1 removed lines

@@ -35,7 +35,8 @@
     {
         $apiEndPoint = $this->getUrl();
 
-        if ($this->getLastPostId() != "") {
+        if ($this->getLastPostId() != "")
+        {
 			$apiEndPoint = $this->getUrl() . '?after=' . $this->getLastPostId();
 		}
         return $apiEndPoint;