redCOMPONENT-COM / redCORE

extensions/libraries/redcore/webservices/base.php

Braces +9 added lines, -18 removed lines

@@ -96,15 +96,13 @@ 
 				{
 					$recreate = true;
 				}
-			}
-			elseif (isset($this->token['expireTimeFormatted']))
+			} elseif (isset($this->token['expireTimeFormatted']))
 			{
 				if ($this->token['expireTimeFormatted'] <= date('Y-m-d H:i:s'))
 				{
 					$recreate = true;
 				}
-			}
-			elseif (isset($this->token['expires']))
+			} elseif (isset($this->token['expires']))
 			{
 				if ($this->token['expires'] <= date('Y-m-d H:i:s'))
 				{
@@ -204,8 +202,7 @@ 
 				if (strpos($url, '?'))
 				{
 					$url .= '&';
-				}
-				else
+				} else
 				{
 					$url .= '?1=1';
 				}
@@ -231,8 +228,7 @@ 
 			if ($response->headers['Content-Type'] == 'application/json')
 			{
 				$token = array_merge(json_decode($response->body, true), array('created' => time()));
-			}
-			else
+			} else
 			{
 				parse_str($response->body, $token);
 				$token = array_merge($token, array('created' => time()));
@@ -241,8 +237,7 @@ 
 			$this->setToken($token);
 
 			return $this->token;
-		}
-		else
+		} else
 		{
 			throw new Exception('Error code ' . $response->code . ' received refreshing token: ' . $response->body . '.');
 		}
@@ -277,8 +272,7 @@ 
 			if ($response->headers['Content-Type'] == 'application/json')
 			{
 				$token = array_merge(json_decode($response->body, true), array('created' => time()));
-			}
-			else
+			} else
 			{
 				parse_str($response->body, $token);
 				$token = array_merge($token, array('created' => time()));
@@ -287,8 +281,7 @@ 
 			$this->setToken($token);
 
 			return $this->token;
-		}
-		else
+		} else
 		{
 			throw new Exception('Error code ' . $response->code . ' received refreshing token: ' . $response->body . '.');
 		}
@@ -320,12 +313,10 @@ 
 		if (!$token || !array_key_exists('access_token', $token))
 		{
 			return false;
-		}
-		elseif (array_key_exists('expires_in', $token) && $token['created'] + $token['expires_in'] < time() + 20)
+		} elseif (array_key_exists('expires_in', $token) && $token['created'] + $token['expires_in'] < time() + 20)
 		{
 			return false;
-		}
-		else
+		} else
 		{
 			return true;
 		}

extensions/libraries/redcore/webservices/webservice.php

Braces +3 added lines, -6 removed lines

@@ -44,14 +44,12 @@ 
 				if ($this->getOption('authmethod', 'bearer') == 'bearer')
 				{
 					$headers['Authorization'] = 'Bearer ' . $token['access_token'];
-				}
-				elseif ($this->getOption('authmethod', 'bearer') == 'get')
+				} elseif ($this->getOption('authmethod', 'bearer') == 'get')
 				{
 					if (strpos($url, '?'))
 					{
 						$url .= '&';
-					}
-					else
+					} else
 					{
 						$url .= '?';
 					}
@@ -59,8 +57,7 @@ 
 					$url .= $this->getOption('tokenparam', 'access_token') . '=' . $token['access_token'];
 				}
 			}
-		}
-		elseif ($this->getOption('authorizationtype', 'token') == 'basic')
+		} elseif ($this->getOption('authorizationtype', 'token') == 'basic')
 		{
 			$basic = $this->getOption('authorization.basic');
 

extensions/libraries/redcore/webservices/soap.php

Braces +1 added lines, -2 removed lines

@@ -57,8 +57,7 @@
 
 			$response = $client->{$method}($data);
 			$this->outputSoapMessages($client);
-		}
-		catch (SoapFault $ex)
+		} catch (SoapFault $ex)
 		{
 			$this->outputSoapMessages($client);
 			throw $ex;

extensions/libraries/redcore/model/admin.php

Braces +1 added lines, -3 removed lines

@@ -90,9 +90,7 @@
 		{
 			self::addIncludePath(JPATH_SITE . '/components/' . $option . '/models', $prefix);
 			JTable::addIncludePath(JPATH_SITE . '/components/' . $option . '/tables');
-		}
-
-		else
+		} else
 		{
 			throw new InvalidArgumentException(
 				sprintf('Cannot instantiate the model %s. Invalid client %s.', $name, $client)

extensions/libraries/redcore/model/model.php

Braces +1 added lines, -3 removed lines

@@ -98,9 +98,7 @@
 		{
 			self::addIncludePath(JPATH_SITE . '/components/' . $option . '/models', $prefix);
 			JTable::addIncludePath(JPATH_SITE . '/components/' . $option . '/tables');
-		}
-
-		else
+		} else
 		{
 			throw new InvalidArgumentException(
 				sprintf('Cannot instanciate the model %s in component %s. Invalid client %s.', $name, $option, $client)

extensions/libraries/redcore/model/table.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	{
 		if (empty($config['filter_fields']))
 		{
-			$config['filter_fields']  = array_merge(
+			$config['filter_fields'] = array_merge(
 				array_keys($this->getOrderableColumns()),
 				array_values($this->getOrderableColumns())
 			);

Braces +2 added lines, -6 removed lines

@@ -64,14 +64,10 @@
 		if (isset($filterFields['name']))
 		{
 			parent::populateState($filterFields['name'], 'DESC');
-		}
-
-		elseif (isset($filterFields['title']))
+		} elseif (isset($filterFields['title']))
 		{
 			parent::populateState($filterFields['title'], 'DESC');
-		}
-
-		else
+		} else
 		{
 			parent::populateState();
 		}

extensions/libraries/redcore/model/list.php

Braces +6 added lines, -12 removed lines

@@ -304,8 +304,7 @@ 
 								if (in_array(strtoupper($fullDirection), array('ASC', 'DESC', '')))
 								{
 									$this->setState('list.direction', $fullDirection);
-								}
-								else
+								} else
 								{
 									$this->setState('list.direction', $direction);
 
@@ -321,16 +320,14 @@ 
 								if (in_array($fullOrdering, $this->filter_fields))
 								{
 									$this->setState('list.ordering', $fullOrdering);
-								}
-								else
+								} else
 								{
 									$this->setState('list.ordering', $ordering);
 
 									// Fallback to the default value
 									$value = $ordering . ' ' . $direction;
 								}
-							}
-							else
+							} else
 							{
 								$this->setState('list.ordering', $ordering);
 								$this->setState('list.direction', $direction);
@@ -379,8 +376,7 @@ 
 					$this->setState('list.' . $name, $value);
 				}
 			}
-		}
-		else
+		} else
 		// Keep B/C for components previous to jform forms for filters
 		{
 			// Pre-fill the limits
@@ -471,8 +467,7 @@ 
 			{
 				// Get the data for the form.
 				$data = $this->loadFormData();
-			}
-			else
+			} else
 			{
 				$data = array();
 			}
@@ -486,8 +481,7 @@ 
 
 			// Load the data into the form after the plugins have operated.
 			$form->bind($data);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->setError($e->getMessage());
 

extensions/libraries/redcore/model/admin/base.php

Braces +3 added lines, -7 removed lines

@@ -182,8 +182,7 @@ 
 			{
 				// Get the data for the form.
 				$data = $this->loadFormData();
-			}
-			else
+			} else
 			{
 				$data = array();
 			}
@@ -194,8 +193,7 @@ 
 
 			// Load the data into the form after the plugins have operated.
 			$form->bind($data);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->setError($e->getMessage());
 
@@ -247,9 +245,7 @@ 
 				{
 					// Store the field error in session.
 					$session->set($this->context . '.error.' . $key, $message->getMessage());
-				}
-
-				else
+				} else
 				{
 					// Store the field error in session.
 					$session->set($this->context . '.error.' . $key, $message);

extensions/libraries/redcore/view/base.php

Braces +1 added lines, -2 removed lines

@@ -177,8 +177,7 @@
 			ob_end_clean();
 
 			return $this->_output;
-		}
-		else
+		} else
 		{
 			throw new Exception(JText::sprintf('JLIB_APPLICATION_ERROR_LAYOUTFILE_NOT_FOUND', $file), 500);
 		}