redCOMPONENT-COM / redCORE

extensions/libraries/redcore/api/oauth2/ScopeInterface.php

Indentation +25 added lines, -25 removed lines

@@ -11,30 +11,30 @@
  */
 interface ScopeInterface extends ScopeStorageInterface
 {
-    /**
-     * Check if everything in required scope is contained in available scope.
-     *
-     * @param $required_scope
-     * A space-separated string of scopes.
-     *
-     * @return
-     * TRUE if everything in required scope is contained in available scope,
-     * and FALSE if it isn't.
-     *
-     * @see http://tools.ietf.org/html/rfc6749#section-7
-     *
-     * @ingroup oauth2_section_7
-     */
-    public function checkScope($required_scope, $available_scope);
+	/**
+	 * Check if everything in required scope is contained in available scope.
+	 *
+	 * @param $required_scope
+	 * A space-separated string of scopes.
+	 *
+	 * @return
+	 * TRUE if everything in required scope is contained in available scope,
+	 * and FALSE if it isn't.
+	 *
+	 * @see http://tools.ietf.org/html/rfc6749#section-7
+	 *
+	 * @ingroup oauth2_section_7
+	 */
+	public function checkScope($required_scope, $available_scope);
 
-    /**
-     * Return scope info from request
-     *
-     * @param OAuth2\RequestInterface
-     * Request object to check
-     *
-     * @return
-     * string representation of requested scope
-     */
-    public function getScopeFromRequest(RequestInterface $request);
+	/**
+	 * Return scope info from request
+	 *
+	 * @param OAuth2\RequestInterface
+	 * Request object to check
+	 *
+	 * @return
+	 * string representation of requested scope
+	 */
+	public function getScopeFromRequest(RequestInterface $request);
 }

extensions/libraries/redcore/api/hal/model/item.php

Braces +4 added lines, -8 removed lines

@@ -75,13 +75,11 @@ 
 			if (count($config['primaryFields']) > 1)
 			{
 				$tableKey = $config['primaryFields'];
-			}
-			else
+			} else
 			{
 				$tableKey = $config['primaryFields'][0];
 			}
-		}
-		else
+		} else
 		{
 			$tableKey = 'id';
 		}
@@ -207,8 +205,7 @@ 
 			{
 				$pk[$pkKey] = (!empty($data[$pkKey])) ? $data[$pkKey] : (int) $this->getState($this->getName() . '.' . $pkKey);
 			}
-		}
-		else
+		} else
 		{
 			$pk = (!empty($data[$key])) ? $data[$key] : (int) $this->getState($this->getName() . '.id');
 		}
@@ -270,8 +267,7 @@ 
 
 			// Trigger the after save event.
 			$dispatcher->trigger($this->event_after_save, array($context, $table, $isNew));
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->setError($e->getMessage());
 

extensions/libraries/redcore/api/hal/model/list.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 	protected function getListQuery()
 	{
 		$table = $this->getTableName();
-		$db	= $this->getDbo();
+		$db = $this->getDbo();
 		$query = $db->getQuery(true);
 		$activeFields = array();
 		$hiddenFields = array();

Braces +4 added lines, -8 removed lines

@@ -109,8 +109,7 @@ 
 				if (!empty($field['isHiddenField']) && strtolower($field['isHiddenField']) == 'true')
 				{
 					$hiddenFields[] = $field['name'];
-				}
-				else
+				} else
 				{
 					$activeFields[] = $field['name'];
 					$query->select($db->qn($field['name']));
@@ -138,8 +137,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 		{
 			// If no fields are defined then we select all fields
 			$query->select('*');
@@ -215,13 +213,11 @@ 
 			if (count($config['primaryFields']) > 1)
 			{
 				$tableKey = $config['primaryFields'];
-			}
-			else
+			} else
 			{
 				$tableKey = $config['primaryFields'][0];
 			}
-		}
-		else
+		} else
 		{
 			$tableKey = 'id';
 		}

extensions/libraries/redcore/api/hal/table/table.php

Braces +2 added lines, -4 removed lines

@@ -38,8 +38,7 @@ 
 			$this->_tbl_keys = $key;
 			$this->_tbl_key = $key;
 			$this->_tableKey = $key[key($key)];
-		}
-		else
+		} else
 		{
 			$this->_tbl_key = $key;
 			$this->_tableKey = $key;
@@ -81,8 +80,7 @@ 
 			{
 				// If we want multiple keys, return the raw array.
 				return $this->_tbl_keys;
-			}
-			else
+			} else
 			{
 				// If we want the standard method, just return the first key.
 				return $this->_tbl_keys[0];

extensions/libraries/redcore/api/hal/hal.php

Spacing +2 added lines, -2 removed lines

@@ -648,7 +648,7 @@ 
 			'webservice.documentation',
 			array(
 				'view' => $this,
-				'options' => array (
+				'options' => array(
 					'xml' => $currentConfiguration,
 					'soapEnabled' => RBootstrap::getConfig('enable_soap', 0),
 					'print' => isset($dataGet->print)
@@ -1345,7 +1345,7 @@ 
 		}
 		else
 		{
-			$documentOptions    = array(
+			$documentOptions = array(
 				'absoluteHrefs' => $this->options->get('absoluteHrefs', false),
 				'documentFormat' => $format,
 				'uriParams' => $this->uriParams,

Braces +34 added lines, -68 removed lines

@@ -203,8 +203,7 @@ 
 		if (RBootstrap::getConfig('webservices_authorization_check', 0) == 0)
 		{
 			$this->authorizationCheck = 'oauth2';
-		}
-		elseif (RBootstrap::getConfig('webservices_authorization_check', 0) == 1)
+		} elseif (RBootstrap::getConfig('webservices_authorization_check', 0) == 1)
 		{
 			$this->authorizationCheck = 'joomla';
 		}
@@ -450,8 +449,7 @@ 
 							break;
 					}
 				}
-			}
-			else
+			} else
 			{
 				// If default page needs authorization to access it
 				if (!$this->isAuthorized('', RBootstrap::getConfig('webservices_default_page_authorization', 0)))
@@ -469,8 +467,7 @@ 
 
 			$executionErrors = ob_get_contents();
 			ob_end_clean();
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$executionErrors = ob_get_contents();
 			ob_end_clean();
@@ -809,8 +806,7 @@ 
 		if (method_exists($model, $functionName))
 		{
 			$result = $this->triggerCallFunction($model, $functionName, $args);
-		}
-		else
+		} else
 		{
 			$customError = $this->triggerFunction('createCustomHttpError', 400, $this->apiErrors);
 			$this->setStatusCode(400, $customError);
@@ -840,8 +836,7 @@ 
 			{
 				$customError = $this->triggerFunction('createCustomHttpError', 404, $this->apiErrors);
 				$this->setStatusCode(404, $customError);
-			}
-			else
+			} else
 			{
 				$this->setStatusCode(201);
 			}
@@ -891,20 +886,17 @@ 
 			if (!empty($primaryKeys))
 			{
 				$result = $model->{$functionName}($primaryKeys);
-			}
-			else
+			} else
 			{
 				$result = $model->{$functionName}($args);
 			}
-		}
-		else
+		} else
 		{
 			// Checks if that method exists in model class file and executes it
 			if (method_exists($model, $functionName))
 			{
 				$result = $this->triggerCallFunction($model, $functionName, $args);
-			}
-			else
+			} else
 			{
 				$customError = $this->triggerFunction('createCustomHttpError', 400, $this->apiErrors);
 				$this->setStatusCode(400, $customError);
@@ -972,8 +964,7 @@ 
 		if (method_exists($model, $functionName))
 		{
 			$result = $this->triggerCallFunction($model, $functionName, $args);
-		}
-		else
+		} else
 		{
 			$customError = $this->triggerFunction('createCustomHttpError', 400, $this->apiErrors);
 			$this->setStatusCode(400, $customError);
@@ -1056,8 +1047,7 @@ 
 			if (method_exists($model, $functionName))
 			{
 				$result = $this->triggerCallFunction($model, $functionName, $args);
-			}
-			else
+			} else
 			{
 				$customError = $this->triggerFunction('createCustomHttpError', 400, $this->apiErrors);
 				$this->setStatusCode(400, $customError);
@@ -1112,8 +1102,7 @@ 
 					{
 						unset($item[$key]);
 						continue;
-					}
-					else
+					} else
 					{
 						$item[$this->assignGlobalValueToResource($key)] = $this->assignValueToResource(
 							$this->resources['listItem'][$key], $item
@@ -1164,15 +1153,13 @@ 
 								RApiHalHelper::isAttributeTrue($resource, 'linkTemplated')
 							), $linkSingular = false, $linkPlural
 						);
-					}
-					else
+					} else
 					{
 						$resourceDocument->setDataGrouped(
 							$resource['displayGroup'], $this->assignGlobalValueToResource($resource['displayName']), $this->assignValueToResource($resource, $data)
 						);
 					}
-				}
-				else
+				} else
 				{
 					$resourceDocument->setData($this->assignGlobalValueToResource($resource['displayName']), $this->assignValueToResource($resource, $data));
 				}
@@ -1300,8 +1287,7 @@ 
 				$value = !empty($this->resources['rcwsGlobal'][$key]) ? $this->assignValueToResource($this->resources['rcwsGlobal'][$key], $item) : $value;
 				$this->setData($this->assignGlobalValueToResource($key), $value);
 			}
-		}
-		else
+		} else
 		{
 			// 404 => 'Not found'
 			$customError = $this->triggerFunction('createCustomHttpError', 404, $this->apiErrors);
@@ -1342,8 +1328,7 @@ 
 		{
 			// This is already in HTML format
 			echo $this->documentation;
-		}
-		else
+		} else
 		{
 			$documentOptions    = array(
 				'absoluteHrefs' => $this->options->get('absoluteHrefs', false),
@@ -1405,8 +1390,7 @@ 
 			{
 				$this->data[$k] = $v;
 			}
-		}
-		else
+		} else
 		{
 			$this->data[$key] = $data;
 		}
@@ -1666,16 +1650,14 @@ 
 			{
 				$terminateIfNotAuthorized = false;
 			}
-		}
-		elseif ($this->operation == 'read')
+		} elseif ($this->operation == 'read')
 		{
 			// Disable authorization on operation read level
 			if (isset($allowedOperations->{$this->operation}['authorizationNeeded'])
 				&& strtolower($allowedOperations->{$this->operation}['authorizationNeeded']) == 'false')
 			{
 				$terminateIfNotAuthorized = false;
-			}
-			else
+			} else
 			{
 				$primaryKeys = array();
 				$isReadItem  = $this->apiFillPrimaryKeys($primaryKeys);
@@ -1687,8 +1669,7 @@ 
 					$terminateIfNotAuthorized = false;
 				}
 			}
-		}
-		elseif (isset($allowedOperations->{$this->operation}['authorizationNeeded'])
+		} elseif (isset($allowedOperations->{$this->operation}['authorizationNeeded'])
 			&& strtolower($allowedOperations->{$this->operation}['authorizationNeeded']) == 'false')
 		{
 			$terminateIfNotAuthorized = false;
@@ -1785,12 +1766,10 @@ 
 
 					JFactory::getApplication()->close();
 				}
-			}
-			elseif ($response === false && $terminateIfNotAuthorized)
+			} elseif ($response === false && $terminateIfNotAuthorized)
 			{
 				throw new Exception(JText::_('LIB_REDCORE_API_OAUTH2_SERVER_IS_NOT_ACTIVE'));
-			}
-			else
+			} else
 			{
 				$response = json_decode($response);
 
@@ -2012,8 +1991,7 @@ 
 				{
 					return new $modelClass;
 				}
-			}
-			else
+			} else
 			{
 				$componentName = ucfirst(strtolower(substr($this->optionName, 4)));
 				$prefix        = $componentName . 'Model';
@@ -2060,8 +2038,7 @@ 
 			JTable::addIncludePath($path . '/tables');
 			RForm::addFormPath($path . '/models/forms');
 			RForm::addFieldPath($path . '/models/fields');
-		}
-		else
+		} else
 		{
 			$this->loadExtensionLanguage($optionName);
 			$path = JPATH_SITE . '/components/' . $optionName;
@@ -2177,8 +2154,7 @@ 
 				if ($errors[$i] instanceof Exception)
 				{
 					$app->enqueueMessage($errors[$i]->getMessage(), 'error');
-				}
-				else
+				} else
 				{
 					$app->enqueueMessage($errors[$i], 'error');
 				}
@@ -2230,8 +2206,7 @@ 
 							$format = str_replace('{' . $replacementKey . '}', $this->transformField($transform, $value->{$replacementKey}), $format);
 						}
 					}
-				}
-				elseif (is_array($value))
+				} elseif (is_array($value))
 				{
 					if (isset($value[$replacementKey]))
 					{
@@ -2246,8 +2221,7 @@ 
 							$format = str_replace('{' . $replacementKey . '}', $this->transformField($transform, $value[$replacementKey]), $format);
 						}
 					}
-				}
-				else
+				} else
 				{
 					// We are transforming only value
 					if ($format == '{' . $replacementKey . '}')
@@ -2381,8 +2355,7 @@ 
 		if ($className instanceof RApiHalTransformInterface)
 		{
 			return $directionExternal ? $className::toExternal($definition) : $className::toInternal($definition);
-		}
-		else
+		} else
 		{
 			return $definition;
 		}
@@ -2423,8 +2396,7 @@ 
 			if ($return !== null)
 			{
 				return $return;
-			}
-			else
+			} else
 			{
 				return $result;
 			}
@@ -2434,8 +2406,7 @@ 
 		if (method_exists($apiHelperClass, $functionName))
 		{
 			$result = call_user_func_array(array($apiHelperClass, $functionName), $temp);
-		}
-		else
+		} else
 		{
 			$result = call_user_func_array(array($this, $functionName), $temp);
 		}
@@ -2503,14 +2474,12 @@ 
 				if ($parameter[1] == 'value')
 				{
 					$parameterValue = $parameter[0];
-				}
-				else
+				} else
 				{
 					if (isset($data[$parameter[0]]))
 					{
 						$parameterValue = $this->transformField($parameter[1], $data[$parameter[0]]);
-					}
-					else
+					} else
 					{
 						$parameterValue = null;
 					}
@@ -2518,8 +2487,7 @@ 
 
 				$args[] = $parameterValue;
 			}
-		}
-		else
+		} else
 		{
 			$args[] = $data;
 		}
@@ -2640,8 +2608,7 @@ 
 			}
 
 			$data = $this->triggerFunction('processPostData', $this->options->get('dataGet', array()), $configuration);
-		}
-		else
+		} else
 		{
 			$data = $this->triggerFunction('processPostData', $this->options->get('data', array()), $configuration);
 		}
@@ -2658,8 +2625,7 @@ 
 					if (isset($data[$primaryKey]) && $data[$primaryKey] != '')
 					{
 						$primaryKeys[$primaryKey] = $this->transformField($primaryKeyField['transform'], $data[$primaryKey], false);
-					}
-					else
+					} else
 					{
 						$primaryKeys[$primaryKey] = null;
 					}

extensions/libraries/redcore/api/hal/helper.php

Braces +13 added lines, -26 removed lines

@@ -177,8 +177,7 @@ 
 		if (is_array($command))
 		{
 			$command = $filter->clean(array_pop(array_keys($command)), 'cmd');
-		}
-		else
+		} else
 		{
 			$command = $filter->clean($command, 'cmd');
 		}
@@ -188,8 +187,7 @@ 
 		{
 			// Explode the controller.task command.
 			list ($type, $task) = explode('.', $command);
-		}
-		else
+		} else
 		{
 			$task = $command;
 		}
@@ -216,14 +214,12 @@ 
 			try
 			{
 				self::loadWebservices($client, $webserviceName, $version, $path);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				if ($showNotifications)
 				{
 					JFactory::getApplication()->enqueueMessage($e->getMessage(), 'message');
-				}
-				else
+				} else
 				{
 					throw $e;
 				}
@@ -283,22 +279,19 @@ 
 							$xml->webservicePath                                               = trim($webserviceXmlPath);
 							self::$webservices[$client][(string) $xml->config->name][$version] = $xml;
 						}
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						if ($showNotifications)
 						{
 							JFactory::getApplication()->enqueueMessage($e->getMessage(), 'message');
-						}
-						else
+						} else
 						{
 							throw $e;
 						}
 					}
 				}
 			}
-		}
-		else
+		} else
 		{
 			try
 			{
@@ -311,14 +304,12 @@ 
 					$xml->webservicePath                                               = trim($path);
 					self::$webservices[$client][(string) $xml->config->name][$version] = $xml;
 				}
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				if ($showNotifications)
 				{
 					JFactory::getApplication()->enqueueMessage($e->getMessage(), 'message');
-				}
-				else
+				} else
 				{
 					throw $e;
 				}
@@ -443,8 +434,7 @@ 
 				$client = self::getWebserviceClient($fileContent);
 
 				$file['name'] = $client . '.' . $name . '.' . $version . '.xml';
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				unset($files[$key]);
 				JFactory::getApplication()->enqueueMessage(JText::_('COM_REDCORE_WEBSERVICES_WEBSERVICE_FILE_NOT_VALID'), 'message');
@@ -487,8 +477,7 @@ 
 			}
 
 			$db->transactionCommit();
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$db->transactionRollback();
 
@@ -920,8 +909,7 @@ 
 					'isRequiredField' => 'false',
 					'transform' => 'string'
 				);
-			}
-			else
+			} else
 			{
 				$filterFields[] = 'search';
 			}
@@ -947,8 +935,7 @@ 
 							'isRequiredField' => $required,
 							'transform' => (isset($field['transform'])) ? (string) $field['transform'] : 'string'
 						);
-					}
-					else
+					} else
 					{
 						$filterFields[] = (string) $field["name"];
 					}

extensions/libraries/redcore/api/hal/document/document.php

Braces +3 added lines, -6 removed lines

@@ -100,8 +100,7 @@ 
 		if ($this->documentFormat == 'xml')
 		{
 			$content = $hal->getXML()->asXML();
-		}
-		else
+		} else
 		{
 			$content = (string) $hal;
 		}
@@ -190,8 +189,7 @@ 
 						$arrayLink->setHref($href);
 						$hal->setReplacedLink($arrayLink, $group);
 					}
-				}
-				else
+				} else
 				{
 					$href = $link->getHref();
 					$href = $this->addUriParameters($href, $absoluteHrefs);
@@ -209,8 +207,7 @@ 
 				if (is_object($resources))
 				{
 					$this->relToAbs($resources, $absoluteHrefs);
-				}
-				elseif (is_array($resources))
+				} elseif (is_array($resources))
 				{
 					foreach ($resources as $resource)
 					{

extensions/libraries/redcore/api/hal/document/resource.php

Braces +12 added lines, -24 removed lines

@@ -120,8 +120,7 @@ 
 		if ($singular || (!isset($this->_links[$rel]) && !$plural))
 		{
 			$this->_links[$rel] = $link;
-		}
-		else
+		} else
 		{
 			if (isset($this->_links[$rel]) && !is_array($this->_links[$rel]))
 			{
@@ -169,8 +168,7 @@ 
 		if ($group !== '')
 		{
 			$this->_links[$rel][$group] = $link;
-		}
-		else
+		} else
 		{
 			$this->_links[$rel] = $link;
 		}
@@ -194,8 +192,7 @@ 
 			{
 				$this->_data[$k] = $v;
 			}
-		}
-		else
+		} else
 		{
 			$this->_data[$rel] = $data;
 		}
@@ -219,8 +216,7 @@ 
 		if ($singular || (!isset($this->_data[$rel]) && !$plural))
 		{
 			$this->_data[$rel][$key] = $data;
-		}
-		else
+		} else
 		{
 			if (isset($this->_data[$rel]) && !is_array($this->_data[$rel]))
 			{
@@ -248,8 +244,7 @@ 
 		if ($singular)
 		{
 			$this->_embedded[$rel] = $resource;
-		}
-		else
+		} else
 		{
 			$this->_embedded[$rel][] = $resource;
 		}
@@ -308,8 +303,7 @@ 
 		if ($embedded instanceof self)
 		{
 			$result = $embedded->toArray();
-		}
-		else
+		} else
 		{
 			foreach ($embedded as $embed)
 			{
@@ -337,8 +331,7 @@ 
 		if (!is_array($links))
 		{
 			$result = $links->toArray();
-		}
-		else
+		} else
 		{
 			foreach ($links as $link)
 			{
@@ -404,8 +397,7 @@ 
 				{
 					$this->_addLinks($link);
 				}
-			}
-			else
+			} else
 			{
 				$this->_addLinks($links);
 			}
@@ -434,14 +426,12 @@ 
 			{
 				$rel = is_numeric($rel) ? $_rel : $rel;
 				$this->_getEmbRes($embed)->addAttribute('rel', $rel);
-			}
-			else
+			} else
 			{
 				if (!is_null($embed))
 				{
 					$this->_getEmbedded($embed, $rel);
-				}
-				else
+				} else
 				{
 					$rel = is_numeric($rel) ? $_rel : $rel;
 					$this->xml->addChild('resource')->addAttribute('rel', $rel);
@@ -559,12 +549,10 @@ 
 			if ($name == '_links')
 			{
 				$this->_links = array_merge((array) $this->_links, (array) $value);
-			}
-			elseif ($name == '_embedded')
+			} elseif ($name == '_embedded')
 			{
 				$this->_embedded = array_merge((array) $this->_embedded, (array) $value);
-			}
-			else
+			} else
 			{
 				$this->_data[$name] = $value;
 			}

extensions/libraries/redcore/api/hal/document/link.php

Spacing +8 added lines, -8 removed lines

@@ -93,7 +93,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getRel ()
+	public function getRel()
 	{
 		return $this->_rel;
 	}
@@ -103,7 +103,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getHref ()
+	public function getHref()
 	{
 		return $this->_href;
 	}
@@ -123,7 +123,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getTitle ()
+	public function getTitle()
 	{
 		return $this->_title;
 	}
@@ -133,7 +133,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getHreflang ()
+	public function getHreflang()
 	{
 		return $this->_hreflang;
 	}
@@ -155,7 +155,7 @@ 
 	 *
 	 * @return RApiHalDocumentLink
 	 */
-	public function setRel ($rel)
+	public function setRel($rel)
 	{
 		$this->_rel = $rel;
 
@@ -169,7 +169,7 @@ 
 	 *
 	 * @return RApiHalDocumentLink
 	 */
-	public function setHref ($href)
+	public function setHref($href)
 	{
 		$this->_href = $href;
 
@@ -197,7 +197,7 @@ 
 	 *
 	 * @return RApiHalDocumentLink
 	 */
-	public function setTitle ($title)
+	public function setTitle($title)
 	{
 		$this->_title = $title;
 
@@ -211,7 +211,7 @@ 
 	 *
 	 * @return RApiHalDocumentLink
 	 */
-	public function setHreflang ($hreflang)
+	public function setHreflang($hreflang)
 	{
 		$this->_hreflang = $hreflang;