redCOMPONENT-COM / redCORE

extensions/libraries/redcore/table/table.php

Braces +7 added lines, -15 removed lines

@@ -685,8 +685,7 @@ 
 		if (!property_exists($this, 'checked_out') || !property_exists($this, 'checked_out_time'))
 		{
 			$checkin = false;
-		}
-		else
+		} else
 		{
 			$query->where('(checked_out = 0 OR checked_out IS NULL OR checked_out = ' . (int) $userId . ')');
 			$checkin = true;
@@ -698,8 +697,7 @@ 
 		try
 		{
 			$db->execute();
-		}
-		catch (RuntimeException $e)
+		} catch (RuntimeException $e)
 		{
 			JError::raiseWarning(500, $e->getMessage());
 			JLog::add(JText::sprintf('REDCORE_ERROR_QUERY', $db->dump()), JLog::ERROR, $this->_logPrefix . 'Queries');
@@ -755,8 +753,7 @@ 
 				{
 					$pk[$key] = $this->$key;
 				}
-			}
-			elseif (is_array($pk))
+			} elseif (is_array($pk))
 			{
 				$pk = array();
 
@@ -803,8 +800,7 @@ 
 			{
 				$query->where($this->_db->quoteName($k) . ' = ' . $this->_db->quote($pk[$k]));
 			}
-		}
-		else
+		} else
 		{
 			$query->where($this->_db->quoteName($this->_tbl_key) . ' IN (' . $pk . ')');
 		}
@@ -872,9 +868,7 @@ 
 		elseif ($client === 0)
 		{
 			JTable::addIncludePath(JPATH_SITE . '/components/' . $option . '/tables');
-		}
-
-		else
+		} else
 		{
 			throw new InvalidArgumentException(
 				sprintf('Cannot instanciate the table %s in component %s. Invalid client %s.', $name, $option, $client)
@@ -1003,8 +997,7 @@ 
 			if ($user->id)
 			{
 				$tableInstance->{$tableFieldCreatedBy} = $user->id;
-			}
-			else
+			} else
 			{
 				$tableInstance->{$tableFieldCreatedBy} = null;
 			}
@@ -1027,8 +1020,7 @@ 
 			if ($user->id)
 			{
 				$tableInstance->{$tableFieldModifiedBy} = $user->id;
-			}
-			else
+			} else
 			{
 				$tableInstance->{$tableFieldModifiedBy} = null;
 			}

extensions/libraries/redcore/inflector/inflector.php

Braces +3 added lines, -6 removed lines

@@ -287,14 +287,12 @@ 
 				if ($reset)
 				{
 					self::${$type}[$rule] = $pattern;
-				}
-				else
+				} else
 				{
 					if ($rule === 'uninflected')
 					{
 						self::${$type}[$rule] = array_merge($pattern, self::${$type}[$rule]);
-					}
-					else
+					} else
 					{
 						self::${$type}[$rule] = $pattern + self::${$type}[$rule];
 					}
@@ -310,8 +308,7 @@ 
 				if ($type === 'plural')
 				{
 					self::$cache['pluralize'] = self::$cache['tableize'] = array();
-				}
-				elseif ($type === 'singular')
+				} elseif ($type === 'singular')
 				{
 					self::$cache['singularize'] = array();
 				}

extensions/libraries/redcore/component/helper.php

Spacing +1 added lines, -1 removed lines

@@ -173,7 +173,7 @@
 		if (!empty($mySqlRequired))
 		{
 			$db = JFactory::getDbo();
-			$dbVersion  = $db->getVersion();
+			$dbVersion = $db->getVersion();
 
 			if (!in_array($db->name, array('mysql', 'mysqli')))
 			{

Braces +2 added lines, -4 removed lines

@@ -79,8 +79,7 @@ 
 						{
 							self::$redcoreExtensions[] = 'com_' . strstr($folderFile, '.xml', true);
 						}
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						JFactory::getApplication()->enqueueMessage($e->getMessage() . ': ' . $folder . '/' . $folderFile, 'error');
 					}
@@ -178,8 +177,7 @@ 
 			if (!in_array($db->name, array('mysql', 'mysqli')))
 			{
 				$status = false;
-			}
-			else
+			} else
 			{
 				$status = version_compare($mySqlRequired, $dbVersion, '<=');
 			}

extensions/libraries/redcore/bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -154,7 +154,7 @@
 			// For Joomla! 2.5 compatibility we add some core functions
 			if (version_compare(JVERSION, '3.0', '<'))
 			{
-				RLoader::registerPrefix('J',  JPATH_LIBRARIES . '/redcore/joomla', false, true);
+				RLoader::registerPrefix('J', JPATH_LIBRARIES . '/redcore/joomla', false, true);
 			}
 
 			// Make available the fields

Braces +1 added lines, -2 removed lines

@@ -192,8 +192,7 @@
 
 				// Reset plugin translations params if needed
 				RTranslationHelper::resetPluginTranslation();
-			}
-			else
+			} else
 			{
 				// We still need to set translate property to avoid notices as we check it from other functions
 				$db = JFactory::getDbo();

extensions/libraries/redcore/modal/modal.php

Braces +2 added lines, -4 removed lines

@@ -90,12 +90,10 @@
 		if (is_array($params))
 		{
 			$this->params = new JRegistry($params);
-		}
-		elseif ($params instanceof JRegistry)
+		} elseif ($params instanceof JRegistry)
 		{
 			$this->params = $params;
-		}
-		else
+		} else
 		{
 			$this->params = new JRegistry;
 		}

extensions/libraries/redcore/filesystem/file.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 		}
 
 		JPluginHelper::importPlugin('content');
-		$dispatcher	= RFactory::getDispatcher();
+		$dispatcher = RFactory::getDispatcher();
 
 		foreach ($files as &$file)
 		{

Braces +7 added lines, -14 removed lines

@@ -46,8 +46,7 @@ 
 			{
 				$fileExtension = self::getExt($file['name']);
 				$file['destinationFileName'] = self::getUniqueName($file['name']) . '.' . $fileExtension;
-			}
-			else
+			} else
 			{
 				$file['destinationFileName'] = self::makeSafe($file['name']);
 			}
@@ -86,8 +85,7 @@ 
 				$app->enqueueMessage(JText::_('LIB_REDCORE_ERROR_UNABLE_TO_UPLOAD_FILE'), 'error');
 
 				return false;
-			}
-			else
+			} else
 			{
 				// Trigger the onContentAfterSave event.
 				$dispatcher->trigger('onContentAfterSave', array('com_redcore.file', &$objectFile, true));
@@ -118,8 +116,7 @@ 
 		if (version_compare(JVERSION, '3.0', 'ge'))
 		{
 			$serverKey = JFactory::getConfig()->get('secret', '');
-		}
-		else
+		} else
 		{
 			$serverKey = JFactory::getConfig()->getValue('secret', '');
 		}
@@ -129,12 +126,10 @@ 
 		if (function_exists('sha256'))
 		{
 			$mangledName = sha256($sig);
-		}
-		elseif (function_exists('sha1'))
+		} elseif (function_exists('sha1'))
 		{
 			$mangledName = sha1($sig);
-		}
-		else
+		} else
 		{
 			$mangledName = md5($sig);
 		}
@@ -238,13 +233,11 @@ 
 			$type  = finfo_file($finfo, $file['tmp_name']);
 
 			finfo_close($finfo);
-		}
-		elseif (function_exists('mime_content_type'))
+		} elseif (function_exists('mime_content_type'))
 		{
 			// We have mime magic.
 			$type = mime_content_type($file['tmp_name']);
-		}
-		else
+		} else
 		{
 			$type = $file['type'];
 		}

extensions/libraries/redcore/form/base.php

Braces +3 added lines, -6 removed lines

@@ -60,8 +60,7 @@ 
 				{
 					throw new RuntimeException('RForm::getInstance could not load form');
 				}
-			}
-			else
+			} else
 			{
 				if ($forms[$name]->loadFile($data, $replace, $xpath) == false)
 				{
@@ -118,8 +117,7 @@ 
 			if ($group)
 			{
 				$value = $input->get($group . '.' . $name);
-			}
-			else
+			} else
 			{
 				$value = $input->get($name);
 			}
@@ -133,8 +131,7 @@ 
 				if ($group)
 				{
 					$this->errors[$group . '.' . $name] = $valid;
-				}
-				else
+				} else
 				{
 					$this->errors[$name] = $valid;
 				}

extensions/libraries/redcore/form/fields/rrules.php

Braces +9 added lines, -18 removed lines

@@ -71,8 +71,7 @@ 
 				->where($db->quoteName('name') . ' = ' . $db->quote($component));
 			$db->setQuery($query);
 			$assetId = (int) $db->loadResult();
-		}
-		else
+		} else
 		{
 			// Find the asset id of the content.
 			// Note that for global configuration, com_config injects asset_id = 1 into the form.
@@ -214,44 +213,37 @@ 
 						if ($inheritedRule === null)
 						{
 							$html[] = '<span class="label label-important label-danger">' . JText::_('JLIB_RULES_NOT_ALLOWED') . '</span>';
-						}
-						elseif ($inheritedRule === true)
+						} elseif ($inheritedRule === true)
 						{
 							$html[] = '<span class="label label-success">' . JText::_('JLIB_RULES_ALLOWED') . '</span>';
-						}
-						elseif ($inheritedRule === false)
+						} elseif ($inheritedRule === false)
 						{
 							if ($assetRule === false)
 							{
 								$html[] = '<span class="label label-important label-danger">' . JText::_('JLIB_RULES_NOT_ALLOWED') . '</span>';
-							}
-							else
+							} else
 							{
 								$html[] = '<span class="label label-default"><i class="icon-lock icon-white"></i> ' . JText::_('JLIB_RULES_NOT_ALLOWED_LOCKED')
 									. '</span>';
 							}
 						}
-					}
-					elseif (!empty($component))
+					} elseif (!empty($component))
 					{
 						$html[] = '<span class="label label-success"><i class="icon-lock icon-white"></i> ' . JText::_('JLIB_RULES_ALLOWED_ADMIN')
 							. '</span>';
-					}
-					else
+					} else
 					{
 						// Special handling for  groups that have global admin because they can't  be denied.
 						// The admin rights can be changed.
 						if ($action->name === 'core.admin')
 						{
 							$html[] = '<span class="label label-success">' . JText::_('JLIB_RULES_ALLOWED') . '</span>';
-						}
-						elseif ($inheritedRule === false)
+						} elseif ($inheritedRule === false)
 						{
 							// Other actions cannot be changed.
 							$html[] = '<span class="label label-important label-danger"><i class="icon-lock icon-white"></i> '
 								. JText::_('JLIB_RULES_NOT_ALLOWED_ADMIN_CONFLICT') . '</span>';
-						}
-						else
+						} else
 						{
 							$html[] = '<span class="label label-success"><i class="icon-lock icon-white"></i> ' . JText::_('JLIB_RULES_ALLOWED_ADMIN')
 								. '</span>';
@@ -275,8 +267,7 @@ 
 		if ($section == 'component' || $section == null)
 		{
 			$html[] = JText::_('JLIB_RULES_SETTING_NOTES');
-		}
-		else
+		} else
 		{
 			$html[] = JText::_('JLIB_RULES_SETTING_NOTES_ITEM');
 		}

extensions/libraries/redcore/form/fields/ruser.php

Braces +1 added lines, -2 removed lines

@@ -111,8 +111,7 @@
 		if ($this->value)
 		{
 			$table->load($this->value);
-		}
-		else
+		} else
 		{
 			$table->username = JText::_('JLIB_FORM_SELECT_USER');
 		}