More query chaining + PHPCS

Author: C-Lodder

mod_shoutbox/helper.php

@@ -205,11 +205,12 @@ public function getShouts($offset, $number, $message)
 	private function getShoutData($offset, $number)
 	{
 		$db = JFactory::getDbo();
-		$query = $db->getQuery(true);
-		$query->select('*')
-			->from($db->qn('#__shoutbox'))
-			->order($db->qn('id') . ' DESC')
-			->setLimit($number, $offset);
+
+		$query = $db->getQuery(true)
+		->select('*')
+		->from($db->qn('#__shoutbox'))
+		->order($db->qn('id') . ' DESC')
+		->setLimit($number, $offset);
 
 		$db->setQuery($query);
 
@@ -244,10 +245,11 @@ private function getShoutData($offset, $number)
 	public function getAShout($id)
 	{
 		$db = JFactory::getDbo();
-		$query = $db->getQuery(true);
-		$query->select('*')
-			->from($db->qn('#__shoutbox'))
-			->where($db->qn('id') . ' = ' . (int)$id);
+
+		$query = $db->getQuery(true)
+		->select('*')
+		->from($db->qn('#__shoutbox'))
+		->where($db->qn('id') . ' = ' . (int)$id);
 
 		$db->setQuery($query);
 
@@ -298,9 +300,9 @@ public function countShouts()
 	{
 		$db = JFactory::getDbo();
 
-		$query = $db->getQuery(true);
-		$query->select('COUNT(id)')
-			->from($db->qn('#__shoutbox'));
+		$query = $db->getQuery(true)
+		->select('COUNT(id)')
+		->from($db->qn('#__shoutbox'));
 
 		$db->setQuery($query);
 
@@ -687,7 +689,6 @@ public function addShout($type, $id, $name, $message, $ip)
 		if ($type == 'insert')
 		{
 			// Insert a new shout into the database
-			$query = $db->getQuery(true);
 			$columns = array('name', 'when', 'ip', 'msg', 'user_id');
 
 			$values = array(
@@ -698,12 +699,12 @@ public function addShout($type, $id, $name, $message, $ip)
 				$db->q(JFactory::getUser()->id)
 			);
 
-			$query->insert($db->qn('#__shoutbox'))
-				  ->columns($db->qn($columns))
-				  ->values(implode(',', $values));
+			$query = $db->getQuery(true)
+			->insert($db->qn('#__shoutbox'))
+			->columns($db->qn($columns))
+			->values(implode(',', $values));
 
 			$db->setQuery($query);
-
 			$db->execute();
 
 			return $db->insertid();
@@ -736,13 +737,12 @@ public function addShout($type, $id, $name, $message, $ip)
 	public function deletepost($id)
 	{
 		$db	= JFactory::getDbo();
-		$query = $db->getQuery(true);
-		$query->delete()
-			  ->from($db->qn('#__shoutbox'))
-			  ->where($db->qn('id') . ' = ' . (int) $id);
+		$query = $db->getQuery(true)
+		->delete()
+		->from($db->qn('#__shoutbox'))
+		->where($db->qn('id') . ' = ' . (int) $id);
 
 		$db->setQuery($query);
-
 		$db->execute();
 	}
 
@@ -767,11 +767,11 @@ public function deleteall($delete, $dir = 'DESC')
 		}
 
 		$db = JFactory::getDbo();
-		$query = $db->getQuery(true);
-		$query->select('*')
-			  ->from($db->qn('#__shoutbox'))
-			  ->order($db->qn('id') . ' ' . $dir)
-			  ->setLimit($delete);
+		$query = $db->getQuery(true)
+		->select('*')
+		->from($db->qn('#__shoutbox'))
+		->order($db->qn('id') . ' ' . $dir)
+		->setLimit($delete);
 
 		$db->setQuery($query);
 
@@ -1270,12 +1270,10 @@ public function getAvatar($type, $id)
 		{
 			// Use a database query as the CB framework is horrible
 			$db = JFactory::getDbo();
-
-			$query = $db->getQuery(true);
-
-			$query->select($db->qn('avatar'))
-				->from($db->qn('#__comprofiler'))
-				->where($db->qn('user_id') . ' = ' . $db->q($user->id));
+			$query = $db->getQuery(true)
+			->select($db->qn('avatar'))
+			->from($db->qn('#__comprofiler'))
+			->where($db->qn('user_id') . ' = ' . $db->q($user->id));
 
 			$db->setQuery($query);
 
@@ -1397,10 +1395,11 @@ public static function checkTimestampAjax()
 	private function getTimestampData($id)
 	{
 		$db = JFactory::getDbo();
-		$query = $db->getQuery(true);
-		$query->select('*')
-			->from($db->qn('#__shoutbox'))
-			->where($db->qn('id') . ' = ' . (int) $id);
+
+		$query = $db->getQuery(true)
+		->select('*')
+		->from($db->qn('#__shoutbox'))
+		->where($db->qn('id') . ' = ' . (int) $id);
 
 		$db->setQuery($query);