Merge pull request #1171 from simonharrer/master

Several small refactorings.
joomla · Apr 26, 2012 · 7f7d459 · 7f7d459
2 parents 8bee952 + 1aaa4fc
commit 7f7d459
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 19 deletions.
diff --git a/libraries/joomla/client/ldap.php b/libraries/joomla/client/ldap.php
@@ -628,6 +628,7 @@ public static function generatePassword($password, $type = 'md5')
 		{
 			case 'sha':
 				$userpassword = '{SHA}' . base64_encode(pack('H*', sha1($password)));
+				break;
 			case 'md5':
 			default:
 				$userpassword = '{MD5}' . base64_encode(pack('H*', md5($password)));

diff --git a/libraries/joomla/database/driver/oracle.php b/libraries/joomla/database/driver/oracle.php
@@ -255,7 +255,6 @@ public function getTableKeys($table)
 	{
 		$this->connect();
 
-		$keys = array();
 		$query = $this->getQuery(true);
 
 		$fieldCasing = $this->getOption(PDO::ATTR_CASE);

diff --git a/libraries/joomla/form/fields/password.php b/libraries/joomla/form/fields/password.php
@@ -48,9 +48,6 @@ protected function getInput()
 		$meter		= ((string) $this->element['strengthmeter'] == 'true');
 		$threshold	= $this->element['threshold'] ? (int) $this->element['threshold'] : 66;
 
-		// Initialize JavaScript field attributes.
-		$onchange = $this->element['onchange'] ? ' onchange="' . (string) $this->element['onchange'] . '"' : '';
-
 		$script = '';
 		if ($meter)
 		{
@@ -65,9 +62,6 @@ protected function getInput()
 			);</script>';
 		}
 
-		// Initialize JavaScript field attributes.
-		$onchange	= $this->element['onchange'] ? ' onchange="' . (string) $this->element['onchange'] . '"' : '';
-
 		return '<input type="password" name="' . $this->name . '" id="' . $this->id . '"' .
 			' value="' . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '"' .
 			$auto . $class . $readonly . $disabled . $size . $maxLength . '/>' . $script;

diff --git a/libraries/joomla/form/form.php b/libraries/joomla/form/form.php
@@ -308,7 +308,7 @@ public function getFieldAttribute($name, $attribute, $default = null, $group = n
 		// Make sure there is a valid JForm XML document.
 		if (!($this->xml instanceof SimpleXMLElement))
 		{
-			throw new UnexpectedValueException(sprint('%s::getFieldAttribute `xml` is not an instance of SimpleXMLElement', get_class($this)));
+			throw new UnexpectedValueException(sprintf('%s::getFieldAttribute `xml` is not an instance of SimpleXMLElement', get_class($this)));
 		}
 
 		// Find the form field element from the definition.
@@ -791,7 +791,7 @@ public function removeField($name, $group = null)
 		// Make sure there is a valid JForm XML document.
 		if (!($this->xml instanceof SimpleXMLElement))
 		{
-			throw new UnexpectedValueException(sprint('%s::getFieldAttribute `xml` is not an instance of SimpleXMLElement', get_class($this)));
+			throw new UnexpectedValueException(sprintf('%s::getFieldAttribute `xml` is not an instance of SimpleXMLElement', get_class($this)));
 		}
 
 		// Find the form field element from the definition.
@@ -822,7 +822,7 @@ public function removeGroup($group)
 		// Make sure there is a valid JForm XML document.
 		if (!($this->xml instanceof SimpleXMLElement))
 		{
-			throw new UnexpectedValueException(sprint('%s::getFieldAttribute `xml` is not an instance of SimpleXMLElement', get_class($this)));
+			throw new UnexpectedValueException(sprintf('%s::getFieldAttribute `xml` is not an instance of SimpleXMLElement', get_class($this)));
 		}
 
 		// Get the fields elements for a given group.
@@ -878,7 +878,7 @@ public function setField(SimpleXMLElement $element, $group = null, $replace = tr
 		// Make sure there is a valid JForm XML document.
 		if (!($this->xml instanceof SimpleXMLElement))
 		{
-			throw new UnexpectedValueException(sprint('%s::getFieldAttribute `xml` is not an instance of SimpleXMLElement', get_class($this)));
+			throw new UnexpectedValueException(sprintf('%s::getFieldAttribute `xml` is not an instance of SimpleXMLElement', get_class($this)));
 		}
 
 		// Find the form field element from the definition.
@@ -940,7 +940,7 @@ public function setFieldAttribute($name, $attribute, $value, $group = null)
 		// Make sure there is a valid JForm XML document.
 		if (!($this->xml instanceof SimpleXMLElement))
 		{
-			throw new UnexpectedValueException(sprint('%s::getFieldAttribute `xml` is not an instance of SimpleXMLElement', get_class($this)));
+			throw new UnexpectedValueException(sprintf('%s::getFieldAttribute `xml` is not an instance of SimpleXMLElement', get_class($this)));
 		}
 
 		// Find the form field element from the definition.
@@ -982,7 +982,7 @@ public function setFields(&$elements, $group = null, $replace = true)
 		// Make sure there is a valid JForm XML document.
 		if (!($this->xml instanceof SimpleXMLElement))
 		{
-			throw new UnexpectedValueException(sprint('%s::getFieldAttribute `xml` is not an instance of SimpleXMLElement', get_class($this)));
+			throw new UnexpectedValueException(sprintf('%s::getFieldAttribute `xml` is not an instance of SimpleXMLElement', get_class($this)));
 		}
 
 		// Make sure the elements to set are valid.

diff --git a/libraries/joomla/form/helper.php b/libraries/joomla/form/helper.php
@@ -105,15 +105,15 @@ protected static function loadType($entity, $type, $new = true)
 
 		// Initialize variables.
 		$key = md5($type);
-		$class = '';
 
 		// Return an entity object if it already exists and we don't need a new one.
 		if (isset($types[$key]) && $new === false)
 		{
 			return $types[$key];
 		}
 
-		if (($class = self::loadClass($entity, $type)) !== false)
+		$class = self::loadClass($entity, $type);
+		if ($class !== false)
 		{
 			// Instantiate a new type object.
 			$types[$key] = new $class;

diff --git a/libraries/joomla/html/html/rules.php b/libraries/joomla/html/html/rules.php
@@ -66,9 +66,9 @@ public static function assetFormWidget($actions, $assetId = null, $parent = null
 		{
 			$html[] = '			<tr class="row' . ($i % 2) . '">';
 			$html[] = '				<td class="col1">' . $group->text . '</td>';
-			foreach ($actions as $i => $action)
+			foreach ($actions as $j => $action)
 			{
-				$html[] = '				<td class="col' . ($i + 2) . '">'
+				$html[] = '				<td class="col' . ($j + 2) . '">'
 					. ($assetId ? ($inherited->allow($action->name, $group->identities) ? $images['allow'] : $images['deny'])
 					: ($inheriting->allow($action->name, $group->identities) ? $images['allow'] : $images['deny'])) . '</td>';
 			}

diff --git a/libraries/joomla/table/table.php b/libraries/joomla/table/table.php
@@ -1008,8 +1008,6 @@ public function reorder($where = '')
 		if (!property_exists($this, 'ordering'))
 		{
 			throw new UnexpectedValueException(sprintf('%s does not support ordering.', get_class($this)));
-			$this->setError($e);
-			return false;
 		}
 
 		// Initialise variables.