redCOMPONENT-COM / redCORE

extensions/libraries/redcore/controller/admin.php

Braces +1 added lines, -3 removed lines

@@ -34,9 +34,7 @@
 		{
 		}
 	}
-}
-
-else
+} else
 {
 	/**
 	 * redCORE Controller Admin

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

Braces +9 added lines, -20 removed lines

@@ -97,8 +97,7 @@ 
 		if (!is_array($cid) || count($cid) < 1)
 		{
 			JLog::add(JText::_($this->text_prefix . '_NO_ITEM_SELECTED'), JLog::WARNING, 'jerror');
-		}
-		else
+		} else
 		{
 			// Get the model.
 			$model = $this->getModel();
@@ -111,8 +110,7 @@ 
 			if ($model->delete($cid))
 			{
 				$this->setMessage(JText::plural($this->text_prefix . '_N_ITEMS_DELETED', count($cid)));
-			}
-			else
+			} else
 			{
 				$this->setMessage($model->getError(), 'error');
 			}
@@ -142,8 +140,7 @@ 
 		if (empty($cid))
 		{
 			JLog::add(JText::_($this->text_prefix . '_NO_ITEM_SELECTED'), JLog::WARNING, 'jerror');
-		}
-		else
+		} else
 		{
 			// Get the model.
 			$model = $this->getModel();
@@ -180,13 +177,11 @@ 
 					}
 
 					$this->setMessage(JText::plural($ntext, count($cid)));
-				}
-				else
+				} else
 				{
 					$this->setMessage($model->getError(), 'error');
 				}
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->setMessage(JText::_('JLIB_DATABASE_ERROR_ANCESTOR_NODES_LOWER_STATE'), 'error');
 			}
@@ -224,9 +219,7 @@ 
 			$this->setRedirect($this->getRedirectToListRoute(), $message, 'error');
 
 			return false;
-		}
-
-		else
+		} else
 		{
 			// Reorder succeeded.
 			$message = JText::_('JLIB_APPLICATION_SUCCESS_ITEM_REORDERED');
@@ -271,9 +264,7 @@ 
 			$this->setRedirect($this->getRedirectToListRoute(), $message, 'error');
 
 			return false;
-		}
-
-		else
+		} else
 		{
 			// Reorder succeeded.
 			$this->setMessage(JText::_('JLIB_APPLICATION_SUCCESS_ORDERING_SAVED'));
@@ -301,8 +292,7 @@ 
 			$returnUrl = base64_decode($returnUrl);
 
 			return JRoute::_($returnUrl . $append, false);
-		}
-		else
+		} else
 		{
 			return JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $append, false);
 		}
@@ -331,8 +321,7 @@ 
 			$this->setRedirect($this->getRedirectToListRoute(), $message, 'error');
 
 			return false;
-		}
-		else
+		} else
 		{
 			// Checkin succeeded.
 			$message = JText::plural($this->text_prefix . '_N_ITEMS_CHECKED_IN', count($ids));

extensions/libraries/redcore/controller/form.php

Braces +11 added lines, -23 removed lines

@@ -74,8 +74,7 @@ 
 			if (array_key_exists('name', $config))
 			{
 				$this->name = $config['name'];
-			}
-			else
+			} else
 			{
 				$this->name = $this->getName();
 			}
@@ -85,8 +84,7 @@ 
 		if (array_key_exists('base_path', $config))
 		{
 			$this->basePath = $config['base_path'];
-		}
-		else
+		} else
 		{
 			$this->basePath = JPATH_COMPONENT;
 		}
@@ -95,8 +93,7 @@ 
 		if (array_key_exists('default_task', $config))
 		{
 			$this->registerDefaultTask($config['default_task']);
-		}
-		else
+		} else
 		{
 			$this->registerDefaultTask('display');
 		}
@@ -108,8 +105,7 @@ 
 			{
 				// User-defined prefix
 				$this->model_prefix = $config['model_prefix'];
-			}
-			else
+			} else
 			{
 				$this->model_prefix = ucfirst($this->name) . 'Model';
 			}
@@ -120,8 +116,7 @@ 
 		{
 			// User-defined dirs
 			$this->addModelPath($config['model_path'], $this->model_prefix);
-		}
-		else
+		} else
 		{
 			$this->addModelPath($this->basePath . '/models', $this->model_prefix);
 		}
@@ -131,8 +126,7 @@ 
 		{
 			// User-defined dirs
 			$this->setPath('view', $config['view_path']);
-		}
-		else
+		} else
 		{
 			$this->setPath('view', $this->basePath . '/views');
 		}
@@ -141,8 +135,7 @@ 
 		if (array_key_exists('default_view', $config))
 		{
 			$this->default_view = $config['default_view'];
-		}
-		elseif (empty($this->default_view))
+		} elseif (empty($this->default_view))
 		{
 			$this->default_view = $this->getName();
 		}
@@ -264,9 +257,7 @@ 
 				if ($message instanceof Exception)
 				{
 					$jsonArray[$key] = $message->getMessage();
-				}
-
-				else
+				} else
 				{
 					$jsonArray[$key] = $message;
 				}
@@ -412,8 +403,7 @@ 
 			);
 
 			return false;
-		}
-		else
+		} else
 		{
 			// Check-out succeeded, push the new record id into the session.
 			$this->holdEditId($context, $recordId);
@@ -581,8 +571,7 @@ 
 				if ($errors[$i] instanceof Exception)
 				{
 					$app->enqueueMessage($errors[$i]->getMessage(), 'warning');
-				}
-				else
+				} else
 				{
 					$app->enqueueMessage($errors[$i], 'warning');
 				}
@@ -756,8 +745,7 @@ 
 			$returnUrl = base64_decode($returnUrl);
 
 			return JRoute::_($returnUrl . $append, false);
-		}
-		else
+		} else
 		{
 			return JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $append, false);
 		}

extensions/libraries/redcore/html/rbootstrap.php

Braces +2 added lines, -4 removed lines

@@ -55,8 +55,7 @@ 
 			}
 
 			RHtmlMedia::loadFrameworkJs();
-		}
-		elseif (!$isAdmin && !RBootstrap::$loadFrontendCSS && !version_compare(JVERSION, '3.0', '<'))
+		} elseif (!$isAdmin && !RBootstrap::$loadFrontendCSS && !version_compare(JVERSION, '3.0', '<'))
 		{
 			JHtml::_('bootstrap.framework');
 		}
@@ -346,8 +345,7 @@ 
 		if (RHtmlMedia::getFramework() == 'bootstrap3')
 		{
 			return RLayoutHelper::render('modal.dialog', $layoutData);
-		}
-		else
+		} else
 		{
 			return JLayoutHelper::render('joomla.modal.main', $layoutData);
 		}

extensions/libraries/redcore/html/rgrid.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 	 * @return  string         The Html code
 	 */
 	public static function action($i, $task, $prefix = '', $text = '', $active_title = '', $inactive_title = '',
-		$tip = false, $active_class = '',$inactive_class = '',
+		$tip = false, $active_class = '', $inactive_class = '',
 		$enabled = true, $translate = true, $checkbox = 'cb', $formId = 'adminForm', $buttonClass = ''
 	)
 	{

Braces +5 added lines, -11 removed lines

@@ -125,9 +125,7 @@ 
 			if ($active_class === 'plus')
 			{
 				$buttonClass = 'published';
-			}
-
-			elseif ($active_class === 'minus')
+			} elseif ($active_class === 'minus')
 			{
 				$buttonClass = 'unpublished';
 			}
@@ -141,8 +139,7 @@ 
 			$html[] = '<i class="icon-' . $active_class . '">';
 			$html[] = '</i>';
 			$html[] = '</a>';
-		}
-		else
+		} else
 		{
 			$html[] = '<a class="btn btn-micro disabled jgrid ' . $buttonClass . ' ' . ($tip ? 'hasTooltip' : '') . '" ';
 			$html[] = ' title="' . addslashes(htmlspecialchars($translate ? JText::_($inactive_title) : $inactive_title, ENT_COMPAT, 'UTF-8')) . '">';
@@ -150,8 +147,7 @@ 
 			if ($active_class == "protected")
 			{
 				$html[] = '<i class="icon-lock"></i>';
-			}
-			else
+			} else
 			{
 				$html[] = '<i class="icon-' . $inactive_class . '"></i>';
 			}
@@ -459,8 +455,7 @@ 
 		if ($order != $selected)
 		{
 			$direction = $new_direction;
-		}
-		else
+		} else
 		{
 			$direction = ($direction == 'desc') ? 'asc' : 'desc';
 		}
@@ -509,8 +504,7 @@ 
 		if ($order != $selected)
 		{
 			$direction = $new_direction;
-		}
-		else
+		} else
 		{
 			$direction = ($direction == 'desc') ? 'asc' : 'desc';
 		}

extensions/libraries/redcore/html/raccess.php

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
 					$html[] = '<input type="hidden" name="' . $name . '[]" value="' . $item->id . '" id="' . $eid . '" />';
 					$html[] = '<button type="button" class="btn btn-small btn-danger" onclick="JRemoveUsergroup(\''
 						. $eid . '\', \'' . $item->id . '\')">' . JText::_('JREMOVE') . '</button>';
-				}
-				else
+				} else
 				{
 					$html[] = '<button type="button" class="btn btn-small btn-success" onclick="JAddUsergroup(\''
 						. $eid . '\', \'' . $item->id . '\')">' . JText::_('JADD') . '</button>';

extensions/libraries/redcore/html/html.php

Spacing +1 added lines, -1 removed lines

@@ -344,7 +344,7 @@
 
 				// Try to include files named filename.ext, filename_browser.ext, filename_browser_major.ext, filename_browser_major_minor.ext
 				// where major and minor are the browser version names
-				$potential = array($strip, $strip . '_' . $browser,  $strip . '_' . $browser . '_' . $major,
+				$potential = array($strip, $strip . '_' . $browser, $strip . '_' . $browser . '_' . $major,
 					$strip . '_' . $browser . '_' . $major . '_' . $minor);
 			}
 			else

Braces +22 added lines, -44 removed lines

@@ -324,8 +324,7 @@ 
 		if (strpos($file, 'http') === 0 || strpos($file, '//') === 0)
 		{
 			$includes = array($file);
-		}
-		else
+		} else
 		{
 			// Extract extension and strip the file
 			$strip = JFile::stripExt($file);
@@ -346,8 +345,7 @@ 
 				// where major and minor are the browser version names
 				$potential = array($strip, $strip . '_' . $browser,  $strip . '_' . $browser . '_' . $major,
 					$strip . '_' . $browser . '_' . $major . '_' . $minor);
-			}
-			else
+			} else
 			{
 				$potential = array($strip);
 			}
@@ -373,8 +371,7 @@ 
 						if (strlen($strip) > 4 && preg_match('#\.min$#', $strip))
 						{
 							$files[] = preg_replace('#\.min$#', '.', $strip) . $ext;
-						}
-						else
+						} else
 						{
 							$files[] = $strip . '-uncompressed.' . $ext;
 						}
@@ -397,8 +394,7 @@ 
 							$includes[] = JUri::base(true) . "/templates/$template/$folder/$file" . static::getMd5Version($path);
 
 							break;
-						}
-						else
+						} else
 						{
 							// If the file contains any /: it can be in an media extension subfolder
 							if (strpos($file, '/'))
@@ -462,8 +458,7 @@ 
 
 										break;
 									}
-								}
-								else
+								} else
 								{
 									// Try to deals in the extension media folder
 									$path = JPATH_ROOT . "/media/$extension/$folder/$file";
@@ -529,8 +524,7 @@ 
 						if (strlen($strip) > 4 && preg_match('#\.min$#', $strip))
 						{
 							$files[] = preg_replace('#\.min$#', '.', $strip) . $ext;
-						}
-						else
+						} else
 						{
 							$files[] = $strip . '-uncompressed.' . $ext;
 						}
@@ -645,17 +639,14 @@ 
 			if (count($includes) == 0)
 			{
 				return null;
-			}
-			elseif (count($includes) == 1)
+			} elseif (count($includes) == 1)
 			{
 				return $includes[0];
-			}
-			else
+			} else
 			{
 				return $includes;
 			}
-		}
-		else
+		} else
 			// If inclusion is required
 		{
 			$document = JFactory::getDocument();
@@ -698,17 +689,14 @@ 
 			if (count($includes) == 0)
 			{
 				return null;
-			}
-			elseif (count($includes) == 1)
+			} elseif (count($includes) == 1)
 			{
 				return $includes[0];
-			}
-			else
+			} else
 			{
 				return $includes;
 			}
-		}
-		else
+		} else
 			// If inclusion is required
 		{
 			$document = JFactory::getDocument();
@@ -846,8 +834,7 @@ 
 			if (isset($title['title']))
 			{
 				$title = $title['title'];
-			}
-			else
+			} else
 			{
 				$title = '';
 			}
@@ -862,8 +849,7 @@ 
 		if ($href)
 		{
 			$tip = '<a href="' . $href . '">' . $text . '</a>';
-		}
-		else
+		} else
 		{
 			$tip = $text;
 		}
@@ -878,8 +864,7 @@ 
 				$title = htmlspecialchars($title, ENT_COMPAT, 'UTF-8');
 				$tooltip = $title . '::' . $tooltip;
 			}
-		}
-		else
+		} else
 		{
 			$tooltip = self::tooltipText($title, $tooltip, 0);
 		}
@@ -934,8 +919,7 @@ 
 			elseif ($content != '')
 			{
 				$result = '<strong>' . $title . '</strong><br />' . $content;
-			}
-			else
+			} else
 			{
 				$result = $title;
 			}
@@ -990,8 +974,7 @@ 
 		if (is_file(JPATH_ROOT . '/media/system/js/fields/calendar-locales/' . strtolower($tag) . '.js'))
 		{
 			$localesPath = 'system/fields/calendar-locales/' . strtolower($tag) . '.js';
-		}
-		elseif (is_file(JPATH_ROOT . '/media/system/js/fields/calendar-locales/' . strtolower(substr($tag, 0, -3)) . '.js'))
+		} elseif (is_file(JPATH_ROOT . '/media/system/js/fields/calendar-locales/' . strtolower(substr($tag, 0, -3)) . '.js'))
 		{
 			$localesPath = 'system/fields/calendar-locales/' . strtolower(substr($tag, 0, -3)) . '.js';
 		}
@@ -1025,8 +1008,7 @@ 
 			date_default_timezone_set('UTC');
 			$inputvalue = strftime($format, strtotime($value));
 			date_default_timezone_set($tz);
-		}
-		else
+		} else
 		{
 			$inputvalue = '';
 		}
@@ -1121,25 +1103,21 @@ 
 			if (is_bool($v))
 			{
 				$elements[] = $key . ': ' . ($v ? 'true' : 'false');
-			}
-			elseif (is_numeric($v))
+			} elseif (is_numeric($v))
 			{
 				$elements[] = $key . ': ' . ($v + 0);
-			}
-			elseif (is_string($v))
+			} elseif (is_string($v))
 			{
 				if (strpos($v, '\\') === 0)
 				{
 					// Items such as functions and JSON objects are prefixed with \, strip the prefix and don't encode them
 					$elements[] = $key . ': ' . substr($v, 1);
-				}
-				else
+				} else
 				{
 					// The safest way to insert a string
 					$elements[] = $key . ': ' . json_encode((string) $v);
 				}
-			}
-			else
+			} else
 			{
 				$elements[] = $key . ': ' . json_encode(is_object($v) ? get_object_vars($v) : $v);
 			}

extensions/libraries/redcore/html/rsearchtools.php

Braces +1 added lines, -2 removed lines

@@ -205,8 +205,7 @@
 		if ($order != $selected)
 		{
 			$direction = $new_direction;
-		}
-		else
+		} else
 		{
 			$direction = ($direction == 'desc') ? 'asc' : 'desc';
 		}

extensions/libraries/redcore/html/media.php

Braces +7 added lines, -14 removed lines

@@ -68,22 +68,19 @@ 
 			self::$frameworkOptions = array(
 				'disableMootools' => true,
 			);
-		}
-		elseif ($framework == 'bootstrap2')
+		} elseif ($framework == 'bootstrap2')
 		{
 			self::$frameworkSuffix  = 'bs2';
 			self::$frameworkOptions = array(
 				'disableMootools' => false,
 			);
-		}
-		elseif ($framework == 'foundation5')
+		} elseif ($framework == 'foundation5')
 		{
 			self::$frameworkSuffix  = 'fd5';
 			self::$frameworkOptions = array(
 				'disableMootools' => false,
 			);
-		}
-		else
+		} else
 		{
 			self::$frameworkSuffix  = '';
 			self::$frameworkOptions = array(
@@ -119,12 +116,10 @@ 
 			if (self::getFramework() == 'bootstrap2')
 			{
 				RHelperAsset::load('component.min.css', 'redcore');
-			}
-			elseif (self::getFramework() == 'bootstrap3')
+			} elseif (self::getFramework() == 'bootstrap3')
 			{
 				RHelperAsset::load('component.bs3.min.css', 'redcore');
-			}
-			elseif (self::getFramework() == 'foundation5')
+			} elseif (self::getFramework() == 'foundation5')
 			{
 			}
 		}
@@ -154,12 +149,10 @@ 
 			if (self::getFramework() == 'bootstrap2')
 			{
 				RHelperAsset::load('lib/bootstrap/js/bootstrap.min.js', 'redcore');
-			}
-			elseif (self::getFramework() == 'bootstrap3')
+			} elseif (self::getFramework() == 'bootstrap3')
 			{
 				RHelperAsset::load('lib/bootstrap3/js/bootstrap.min.js', 'redcore');
-			}
-			elseif (self::getFramework() == 'foundation5')
+			} elseif (self::getFramework() == 'foundation5')
 			{
 			}
 		}