Permalink
Browse files

Fix a number of alignment issues.

  • Loading branch information...
1 parent 6e412a3 commit 5182006f2d2a2b26e7f14cf0aa7415f8870bd212 @elinw elinw committed Aug 23, 2011
@@ -1051,7 +1051,7 @@ protected function _createSession($name)
// Check to see the the session already exists.
if (($this->getCfg('session_handler') != 'database' && ($time % 2 || $session->isNew())) ||
- ($this->getCfg('session_handler') == 'database' && $session->isNew())
+ ($this->getCfg('session_handler') == 'database' && $session->isNew())
)
{
$this->checkSession();
@@ -221,7 +221,7 @@ public function store($updateNulls = false)
// Verify that the alias is unique
$table = JTable::getInstance('Category', 'JTable');
if ($table->load(array('alias' => $this->alias, 'parent_id' => $this->parent_id, 'extension' => $this->extension))
- && ($table->id != $this->id || $this->id == 0))
+ && ($table->id != $this->id || $this->id == 0))
{
$this->setError(JText::_('JLIB_DATABASE_ERROR_CATEGORY_UNIQUE_ALIAS'));
@@ -148,7 +148,7 @@ public function store($updateNulls = false)
// Verify that the alias is unique
$table = JTable::getInstance('Menu', 'JTable');
if ($table->load(array('alias' => $this->alias, 'parent_id' => $this->parent_id, 'client_id' => $this->client_id))
- && ($table->id != $this->id || $this->id == 0)
+ && ($table->id != $this->id || $this->id == 0)
)
{
if ($this->menutype == $table->menutype)
@@ -239,7 +239,7 @@ function check()
$this->_db->setQuery($query);
$xid = intval($this->_db->loadResult());
if ($rootUser == $this->username && (!$xid || $xid && $xid != intval($this->id))
- || $xid && $xid == intval($this->id) && $rootUser != $this->username
+ || $xid && $xid == intval($this->id) && $rootUser != $this->username
)
{
$this->setError(JText::_('JLIB_DATABASE_ERROR_USERNAME_CANNOT_CHANGE'));
@@ -577,7 +577,7 @@ protected static function _items($path, $filter, $recurse, $full, $exclude, $exc
while (($file = readdir($handle)) !== false)
{
if ($file != '.' && $file != '..' && !in_array($file, $exclude)
- && (empty($excludefilter_string) || !preg_match($excludefilter_string, $file)))
+ && (empty($excludefilter_string) || !preg_match($excludefilter_string, $file)))
{
// Compute the fullpath
$fullpath = $path . '/' . $file;
@@ -211,7 +211,7 @@ public function install()
// Update tag detected
if ($this->parent->getUpgrade() || ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
- || $updateElement)
+ || $updateElement)
{
return $this->update(); // transfer control to the update function
}
@@ -183,7 +183,7 @@ protected function _install($cname, $basePath, $clientId, &$element)
// Update function available or
// Update tag detected
if ($this->parent->getUpgrade() || ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
- || is_a($updateElement, 'JXMLElement'))
+ || is_a($updateElement, 'JXMLElement'))
{
return $this->update(); // transfer control to the update function
}
@@ -254,7 +254,7 @@ public function install()
// Update function available or
// Update tag detected
if ($this->parent->getUpgrade() || ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
- || is_a($updateElement, 'JXMLElement'))
+ || is_a($updateElement, 'JXMLElement'))
{
// Force this one
$this->parent->setOverwrite(true);
@@ -211,7 +211,7 @@ public function install()
// Update function available or
// Update tag detected
if ($this->parent->getUpgrade() || ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
- || is_a($updateElement, 'JXMLElement'))
+ || is_a($updateElement, 'JXMLElement'))
{
// Force this one
$this->parent->setOverwrite(true);
@@ -125,7 +125,7 @@ public function install()
// Update function available or
// Update tag detected
if ($this->parent->getUpgrade() || ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
- || is_a($updateElement, 'JXMLElement'))
+ || is_a($updateElement, 'JXMLElement'))
{
// Force this one
$this->parent->setOverwrite(true);
@@ -369,7 +369,7 @@ public function useSMTP($auth = null, $host = null, $user = null, $pass = null,
}
if (($this->SMTPAuth !== null && $this->Host !== null && $this->Username !== null && $this->Password !== null)
- || ($this->SMTPAuth === null && $this->Host !== null))
+ || ($this->SMTPAuth === null && $this->Host !== null))
{
$this->IsSMTP();
@@ -812,11 +812,11 @@ public static function valid($str)
*/
// From Unicode 3.1, non-shortest form is illegal
if (((2 == $mBytes) && ($mUcs4 < 0x0080)) || ((3 == $mBytes) && ($mUcs4 < 0x0800)) || ((4 == $mBytes) && ($mUcs4 < 0x10000))
- || (4 < $mBytes)
- // From Unicode 3.2, surrogate characters are illegal
- || (($mUcs4 & 0xFFFFF800) == 0xD800)
- // Codepoints outside the Unicode range are illegal
- || ($mUcs4 > 0x10FFFF)
+ || (4 < $mBytes)
+ // From Unicode 3.2, surrogate characters are illegal
+ || (($mUcs4 & 0xFFFFF800) == 0xD800)
+ // Codepoints outside the Unicode range are illegal
+ || ($mUcs4 > 0x10FFFF)
)
{
return false;
@@ -82,7 +82,7 @@ protected function _endElement($parser, $name)
$product = strtolower(JFilterInput::getInstance()->clean($ver->PRODUCT, 'cmd')); // lower case and remove the exclamation mark
// Check that the product matches and that the version matches (optionally a regexp)
if ($product == $this->current_update->targetplatform['NAME']
- && preg_match('/' . $this->current_update->targetplatform['VERSION'] . '/', $ver->RELEASE))
+ && preg_match('/' . $this->current_update->targetplatform['VERSION'] . '/', $ver->RELEASE))
{
// Target platform isn't a valid field in the update table so unset it to prevent J! from trying to store it
unset($this->current_update->targetplatform);
@@ -212,7 +212,7 @@ public function _endElement($parser, $name)
$ver = new JVersion;
$product = strtolower(JFilterInput::getInstance()->clean($ver->PRODUCT, 'cmd'));
if ($product == $this->_current_update->targetplatform->name
- && preg_match('/' . $this->_current_update->targetplatform->version . '/', $ver->RELEASE))
+ && preg_match('/' . $this->_current_update->targetplatform->version . '/', $ver->RELEASE))
{
if (isset($this->_latest))
{

0 comments on commit 5182006

Please sign in to comment.