mmainstreet / jodel-web

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/jodel-web.php

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
 	$expiration_date;
 	$deviceUid;
 	
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 			// output data of each row
 			while($row = $result->fetch_assoc()) {
@@ -43,7 +43,7 @@ 
 
 	if($expiration_date <= time()) {
 		$accountCreator = new CreateUser();
-		$accountCreator->setAccessToken($access_token);//$accountData->getAccessToken());
+		$accountCreator->setAccessToken($access_token); //$accountData->getAccessToken());
 		$accountCreator->setDeviceUid($deviceUid);
 		$accountCreator->setLocation($location);
 		$data = $accountCreator->execute();
@@ -63,7 +63,7 @@ 
 								WHERE device_uid='" . $device_uid . "'");
 
 		$success = TRUE;
-		if($result === false){
+		if($result === false) {
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 				$success = FALSE;
 		}	
@@ -102,11 +102,11 @@ 
 	$result = $db->query("INSERT INTO accounts (access_token, refresh_token, token_type,
 					expires_in, expiration_date, distinct_id, device_uid)
 					VALUES ('" . $access_token . "','" . $refresh_token . "','" . $token_type .
-					"','" .  $expires_in . "','" . $expiration_date . "','" . $distinct_id .
+					"','" . $expires_in . "','" . $expiration_date . "','" . $distinct_id .
 					"','" . $device_uid . "') ");
 
 	$success = TRUE;
-	if($result === false){
+	if($result === false) {
 			$error = db_error();
 			echo $error;
 			echo "Adding account failed: (" . $result->errno . ") " . $result->error;

Braces +15 added lines, -8 removed lines

@@ -18,7 +18,8 @@ 
 
 $lastPostId = "";
 
-function isTokenFresh(Location $location) {
+function isTokenFresh(Location $location)
+{
 	$db = new DatabaseConnect();  
 	$result = $db->query("SELECT * FROM accounts WHERE id='1'");
 	
@@ -29,7 +30,8 @@ 
 	if ($result->num_rows > 0)
 	{
 			// output data of each row
-			while($row = $result->fetch_assoc()) {
+			while($row = $result->fetch_assoc())
+			{
 					//$access_token = $row["access_token"];
 					$expiration_date = $row["expiration_date"];
 					$deviceUid = $row["device_uid"];
@@ -41,7 +43,8 @@ 
 			echo "0 results";
 	}
 
-	if($expiration_date <= time()) {
+	if($expiration_date <= time())
+	{
 		$accountCreator = new CreateUser();
 		$accountCreator->setAccessToken($access_token);//$accountData->getAccessToken());
 		$accountCreator->setDeviceUid($deviceUid);
@@ -63,7 +66,8 @@ 
 								WHERE device_uid='" . $device_uid . "'");
 
 		$success = TRUE;
-		if($result === false){
+		if($result === false)
+		{
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 				$success = FALSE;
 		}	
@@ -85,7 +89,8 @@ 
 	return $data["karma"];
 }
 
-function registerAccount(Location $location) {
+function registerAccount(Location $location)
+{
 	$accountCreator = new CreateUser();
 	$accountCreator->setLocation($location);
 	$data = $accountCreator->execute();
@@ -106,7 +111,8 @@ 
 					"','" . $device_uid . "') ");
 
 	$success = TRUE;
-	if($result === false){
+	if($result === false)
+	{
 			$error = db_error();
 			echo $error;
 			echo "Adding account failed: (" . $result->errno . ") " . $result->error;
@@ -117,7 +123,7 @@ 
 }
 
 function getPosts($lastPostId, $accessToken, $url)
-{	
+{
 	$accountCreator = new GetPosts();
 	$accountCreator->setLastPostId($lastPostId);
 	$accountCreator->setAccessToken($accessToken);
@@ -127,7 +133,8 @@ 
 	return $data;
 }
 
-function createAccount() {
+function createAccount()
+{
 	$location = new Location();
 	$location->setLat(50.690399);
 	$location->setLng(10.918175);

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

@@ -63,7 +63,7 @@ 
 								WHERE device_uid='" . $device_uid . "'");
 
 		$success = TRUE;
-		if($result === false){
+		if($result === FALSE){
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 				$success = FALSE;
 		}	
@@ -106,7 +106,7 @@ 
 					"','" . $device_uid . "') ");
 
 	$success = TRUE;
-	if($result === false){
+	if($result === FALSE){
 			$error = db_error();
 			echo $error;
 			echo "Adding account failed: (" . $result->errno . ") " . $result->error;

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;
+	}
 }