Skip to content
This repository
Browse code

Fix a number of alignment issues.

  • Loading branch information...
commit 5182006f2d2a2b26e7f14cf0aa7415f8870bd212 1 parent 6e412a3
elinw authored August 23, 2011
2  libraries/joomla/application/application.php
@@ -1051,7 +1051,7 @@ protected function _createSession($name)
1051 1051
 
1052 1052
 		// Check to see the the session already exists.
1053 1053
 		if (($this->getCfg('session_handler') != 'database' && ($time % 2 || $session->isNew())) ||
1054  
-			($this->getCfg('session_handler') == 'database' && $session->isNew())
  1054
+		    ($this->getCfg('session_handler') == 'database' && $session->isNew())
1055 1055
 		)
1056 1056
 		{
1057 1057
 				$this->checkSession();
2  libraries/joomla/database/table/category.php
@@ -221,7 +221,7 @@ public function store($updateNulls = false)
221 221
 		// Verify that the alias is unique
222 222
 		$table = JTable::getInstance('Category', 'JTable');
223 223
 		if ($table->load(array('alias' => $this->alias, 'parent_id' => $this->parent_id, 'extension' => $this->extension))
224  
-			&& ($table->id != $this->id || $this->id == 0))
  224
+		    && ($table->id != $this->id || $this->id == 0))
225 225
 		{
226 226
 
227 227
 			$this->setError(JText::_('JLIB_DATABASE_ERROR_CATEGORY_UNIQUE_ALIAS'));
2  libraries/joomla/database/table/menu.php
@@ -148,7 +148,7 @@ public function store($updateNulls = false)
148 148
 		// Verify that the alias is unique
149 149
 		$table = JTable::getInstance('Menu', 'JTable');
150 150
 		if ($table->load(array('alias' => $this->alias, 'parent_id' => $this->parent_id, 'client_id' => $this->client_id))
151  
-			&& ($table->id != $this->id || $this->id == 0)
  151
+		    && ($table->id != $this->id || $this->id == 0)
152 152
 		)
153 153
 		{
154 154
 			if ($this->menutype == $table->menutype)
2  libraries/joomla/database/table/user.php
@@ -239,7 +239,7 @@ function check()
239 239
 			$this->_db->setQuery($query);
240 240
 			$xid = intval($this->_db->loadResult());
241 241
 			if ($rootUser == $this->username && (!$xid || $xid && $xid != intval($this->id))
242  
-				|| $xid && $xid == intval($this->id) && $rootUser != $this->username
  242
+			    || $xid && $xid == intval($this->id) && $rootUser != $this->username
243 243
 			)
244 244
 			{
245 245
 				$this->setError(JText::_('JLIB_DATABASE_ERROR_USERNAME_CANNOT_CHANGE'));
2  libraries/joomla/filesystem/folder.php
@@ -577,7 +577,7 @@ protected static function _items($path, $filter, $recurse, $full, $exclude, $exc
577 577
 		while (($file = readdir($handle)) !== false)
578 578
 		{
579 579
 			if ($file != '.' && $file != '..' && !in_array($file, $exclude)
580  
-				&& (empty($excludefilter_string) || !preg_match($excludefilter_string, $file)))
  580
+			    && (empty($excludefilter_string) || !preg_match($excludefilter_string, $file)))
581 581
 			{
582 582
 				// Compute the fullpath
583 583
 				$fullpath = $path . '/' . $file;
2  libraries/joomla/installer/adapters/component.php
@@ -211,7 +211,7 @@ public function install()
211 211
 			// Update tag detected
212 212
 
213 213
 			if ($this->parent->getUpgrade() || ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
214  
-				|| $updateElement)
  214
+			    || $updateElement)
215 215
 			{
216 216
 				return $this->update(); // transfer control to the update function
217 217
 			}
2  libraries/joomla/installer/adapters/language.php
@@ -183,7 +183,7 @@ protected function _install($cname, $basePath, $clientId, &$element)
183 183
 			// Update function available or
184 184
 			// Update tag detected
185 185
 			if ($this->parent->getUpgrade() || ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
186  
-				|| is_a($updateElement, 'JXMLElement'))
  186
+			    || is_a($updateElement, 'JXMLElement'))
187 187
 			{
188 188
 				return $this->update(); // transfer control to the update function
189 189
 			}
2  libraries/joomla/installer/adapters/module.php
@@ -254,7 +254,7 @@ public function install()
254 254
 			// Update function available or
255 255
 			// Update tag detected
256 256
 			if ($this->parent->getUpgrade() || ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
257  
-				|| is_a($updateElement, 'JXMLElement'))
  257
+			    || is_a($updateElement, 'JXMLElement'))
258 258
 			{
259 259
 				// Force this one
260 260
 				$this->parent->setOverwrite(true);
2  libraries/joomla/installer/adapters/plugin.php
@@ -211,7 +211,7 @@ public function install()
211 211
 			// Update function available or
212 212
 			// Update tag detected
213 213
 			if ($this->parent->getUpgrade() || ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
214  
-				|| is_a($updateElement, 'JXMLElement'))
  214
+			    || is_a($updateElement, 'JXMLElement'))
215 215
 			{
216 216
 				// Force this one
217 217
 				$this->parent->setOverwrite(true);
2  libraries/joomla/installer/adapters/template.php
@@ -125,7 +125,7 @@ public function install()
125 125
 			// Update function available or
126 126
 			// Update tag detected
127 127
 			if ($this->parent->getUpgrade() || ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
128  
-				|| is_a($updateElement, 'JXMLElement'))
  128
+			    || is_a($updateElement, 'JXMLElement'))
129 129
 			{
130 130
 				// Force this one
131 131
 				$this->parent->setOverwrite(true);
2  libraries/joomla/mail/mail.php
@@ -369,7 +369,7 @@ public function useSMTP($auth = null, $host = null, $user = null, $pass = null,
369 369
 		}
370 370
 
371 371
 		if (($this->SMTPAuth !== null && $this->Host !== null && $this->Username !== null && $this->Password !== null)
372  
-			|| ($this->SMTPAuth === null && $this->Host !== null))
  372
+		    || ($this->SMTPAuth === null && $this->Host !== null))
373 373
 		{
374 374
 			$this->IsSMTP();
375 375
 
10  libraries/joomla/string/string.php
@@ -812,11 +812,11 @@ public static function valid($str)
812 812
 						 */
813 813
 						// From Unicode 3.1, non-shortest form is illegal
814 814
 						if (((2 == $mBytes) && ($mUcs4 < 0x0080)) || ((3 == $mBytes) && ($mUcs4 < 0x0800)) || ((4 == $mBytes) && ($mUcs4 < 0x10000))
815  
-							|| (4 < $mBytes)
816  
-							// From Unicode 3.2, surrogate characters are illegal
817  
-							|| (($mUcs4 & 0xFFFFF800) == 0xD800)
818  
-							// Codepoints outside the Unicode range are illegal
819  
-							|| ($mUcs4 > 0x10FFFF)
  815
+						    || (4 < $mBytes)
  816
+						    // From Unicode 3.2, surrogate characters are illegal
  817
+						    || (($mUcs4 & 0xFFFFF800) == 0xD800)
  818
+						    // Codepoints outside the Unicode range are illegal
  819
+						    || ($mUcs4 > 0x10FFFF)
820 820
 						)
821 821
 						{
822 822
 							return false;
2  libraries/joomla/updater/adapters/extension.php
@@ -82,7 +82,7 @@ protected function _endElement($parser, $name)
82 82
 				$product = strtolower(JFilterInput::getInstance()->clean($ver->PRODUCT, 'cmd')); // lower case and remove the exclamation mark
83 83
 				// Check that the product matches and that the version matches (optionally a regexp)
84 84
 				if ($product == $this->current_update->targetplatform['NAME']
85  
-					&& preg_match('/' . $this->current_update->targetplatform['VERSION'] . '/', $ver->RELEASE))
  85
+				    && preg_match('/' . $this->current_update->targetplatform['VERSION'] . '/', $ver->RELEASE))
86 86
 				{
87 87
 					// Target platform isn't a valid field in the update table so unset it to prevent J! from trying to store it
88 88
 					unset($this->current_update->targetplatform);
2  libraries/joomla/updater/update.php
@@ -212,7 +212,7 @@ public function _endElement($parser, $name)
212 212
 				$ver = new JVersion;
213 213
 				$product = strtolower(JFilterInput::getInstance()->clean($ver->PRODUCT, 'cmd'));
214 214
 				if ($product == $this->_current_update->targetplatform->name
215  
-					&& preg_match('/' . $this->_current_update->targetplatform->version . '/', $ver->RELEASE))
  215
+				    && preg_match('/' . $this->_current_update->targetplatform->version . '/', $ver->RELEASE))
216 216
 				{
217 217
 					if (isset($this->_latest))
218 218
 					{

0 notes on commit 5182006

Please sign in to comment.
Something went wrong with that request. Please try again.