florinp / phpbb-messenger

controller/friends.php

Spacing +16 added lines, -16 removed lines

@@ -33,7 +33,7 @@ 
 	{
 		$friends = $this->model->getFriends();
 		$i = 0;
-		foreach($friends as $friend)
+		foreach ($friends as $friend)
 		{
 			$i = $i + 1;
 			$user_loader = $this->user_loader->load_users(array(
@@ -57,7 +57,7 @@ 
 	{
 		$requests = $this->model->get_friends_requests();
 		$i = 0;
-		foreach($requests as $request)
+		foreach ($requests as $request)
 		{
 			$i = $i + 1;
 			$user_loader = $this->user_loader->load_users(array(
@@ -80,9 +80,9 @@ 
 
 	public function delete_request($requests_id)
 	{
-		if(is_array($requests_id))
+		if (is_array($requests_id))
 		{
-			foreach($requests_id as $id)
+			foreach ($requests_id as $id)
 			{
 				$this->model->delete_friend_request($id);
 			}
@@ -95,12 +95,12 @@ 
 
 	public function approve_request($requests_id)
 	{
-		if(is_array($requests_id))
+		if (is_array($requests_id))
 		{
-			foreach($requests_id as $id)
+			foreach ($requests_id as $id)
 			{
 				$request_data = $this->model->get_friend_request($id);
-				if($request_data)
+				if ($request_data)
 				{
 					$this->model->add_friend(array(
 						'user_id' => $request_data['user_id'],
@@ -122,26 +122,26 @@ 
 	}
 
 	public function send_request($user_id) {
-		$user_id = ( int ) $user_id;
+		$user_id = (int)$user_id;
 		$sender_id = $this->user->data ['user_id'];
 
-		$insert = array (
+		$insert = array(
 				'user_id' => $user_id,
 				'sender_id' => $sender_id
 		);
 
-		if ($request_id = $this->model->insert_friends_request ( $insert )) {
+		if ($request_id = $this->model->insert_friends_request($insert)) {
 
-			$notification_data = array (
+			$notification_data = array(
 					'request_id' => $request_id,
 					'sender_id' => $sender_id,
 					'sender_username' => $this->user->data ['username'],
 					'user_id' => $user_id
 			);
 
-			$this->notification_manager->add_notifications ( array (
+			$this->notification_manager->add_notifications(array(
 					'florinp.messenger.notification.type.friend_request'
-			), $notification_data );
+			), $notification_data);
 
 			return true;
 		}
@@ -151,9 +151,9 @@ 
 	
 	public function remove_friend($user_id) {
 		
-		if(is_array($user_id))
+		if (is_array($user_id))
 		{
-			foreach($user_id as $id)
+			foreach ($user_id as $id)
 			{
 				$this->model->remove_friend($id);
 			}
@@ -161,7 +161,7 @@ 
 		}
 		else
 		{
-			if($user_id > 1)
+			if ($user_id > 1)
 			{
 				$this->model->remove_friend($user_id);
 				return true;

controller/main.php

Spacing +23 added lines, -23 removed lines

@@ -18,7 +18,7 @@ 
 	protected $notification_manager;
 	protected $emojione;
 
-	public function __construct(\phpbb\config\config $config, \phpbb\controller\helper $helper, \phpbb\template\template $template, \phpbb\request\request $request ,\phpbb\user $user, \florinp\messenger\models\main_model $model, \phpbb\notification\manager $notification_manager, \florinp\messenger\libs\emojione $emojione)
+	public function __construct(\phpbb\config\config $config, \phpbb\controller\helper $helper, \phpbb\template\template $template, \phpbb\request\request $request, \phpbb\user $user, \florinp\messenger\models\main_model $model, \phpbb\notification\manager $notification_manager, \florinp\messenger\libs\emojione $emojione)
 	{
 		$this->config = $config;
 		$this->helper = $helper;
@@ -43,7 +43,7 @@ 
 	{
 		/* AJAX check  */
 		$http_request = $this->request->server('HTTP_X_REQUESTED_WITH');
-		if(empty($http_request) && strtolower($http_request) != 'xmlhttprequest') {
+		if (empty($http_request) && strtolower($http_request) != 'xmlhttprequest') {
 			return new Response("The request is invalid", 500);
 		}
 
@@ -52,7 +52,7 @@ 
 		$sender_id = $this->user->data['user_id'];
 
 
-		if($receiver_id != 0 && trim($text) != '')
+		if ($receiver_id != 0 && trim($text) != '')
 		{
 			$text = htmlspecialchars($text);
 			$text = str_replace(array("\n", "\r"), '', $text);
@@ -64,7 +64,7 @@ 
 				'sentAt' => time()
 			);
 
-			if($id = $this->model->sendMessage($message))
+			if ($id = $this->model->sendMessage($message))
 			{
 				$lastMessage = $this->model->getMessageById($id);
 				$response = array('success' => true, 'message' => $lastMessage);
@@ -82,14 +82,14 @@ 
 	public function getFile($id)
 	{
 			global $phpbb_root_path;
-			$uploadDir = $phpbb_root_path . 'store/messenger/files';
+			$uploadDir = $phpbb_root_path.'store/messenger/files';
 			$id = explode('_', $id)[1];
 			$file = $this->model->getFileById($id);
-			if($file && is_file($uploadDir.'/'.$file['file'])) {
+			if ($file && is_file($uploadDir.'/'.$file['file'])) {
 				header('Content-Type: application/csv');
-				header('Content-Disposition: attachment; filename=' . $file['file']);
+				header('Content-Disposition: attachment; filename='.$file['file']);
 				header('Pragma: no-cache');
-				readfile($uploadDir . '/' . $file['file']);
+				readfile($uploadDir.'/'.$file['file']);
 			} else {
 				return new Response("The request is invalid", 500);
 			}
@@ -102,16 +102,16 @@ 
 		$receiver_id = $this->request->variable('receiver_id', 0);
 		$sender_id = $this->user->data['user_id'];
 
-		$uploadDir = $phpbb_root_path . 'store/messenger/files';
+		$uploadDir = $phpbb_root_path.'store/messenger/files';
 		$file = $this->request->file('file');
-		if($receiver_id != 0 && !empty($file)) {
-			if($file['error'] == 0) {
+		if ($receiver_id != 0 && !empty($file)) {
+			if ($file['error'] == 0) {
 				$extension = pathinfo($file['name'], PATHINFO_EXTENSION);
 				$fileName = $file['name'];
 				$newName = md5(time().''.$fileName).'.'.$extension;
 				$type = $file['type'];
 
-				if(move_uploaded_file($file['tmp_name'], $uploadDir . '/' . $newName)) {
+				if (move_uploaded_file($file['tmp_name'], $uploadDir.'/'.$newName)) {
 					$data = array(
 						'sender_id' => $sender_id,
 						'receiver_id' => $receiver_id,
@@ -119,7 +119,7 @@ 
 						'file' => $newName,
 						'type' => $type
 					);
-					if($id = $this->model->sendFile($data)) {
+					if ($id = $this->model->sendFile($data)) {
 						$lastFile = $this->model->getFileById($id);
 						$response = array('success' => true, 'file' => $lastFile);
 					} else {
@@ -154,13 +154,13 @@ 
 	{
 		/* AJAX check  */
 		$http_request = $this->request->server('HTTP_X_REQUESTED_WITH');
-		if(empty($http_request) && strtolower($http_request) != 'xmlhttprequest') {
+		if (empty($http_request) && strtolower($http_request) != 'xmlhttprequest') {
 			return new Response("The request is invalid", 500);
 		}
 
 		$friend_id = $this->request->variable('friend_id', 0);
 
-		if($friend_id > 0) {
+		if ($friend_id > 0) {
 			$messages = $this->model->getMessages($friend_id);
 			return new JsonResponse($messages, 200);
 		}
@@ -171,12 +171,12 @@ 
 	{
 		/* AJAX check  */
 		$http_request = $this->request->server('HTTP_X_REQUESTED_WITH');
-		if(empty($http_request) && strtolower($http_request) != 'xmlhttprequest') {
+		if (empty($http_request) && strtolower($http_request) != 'xmlhttprequest') {
 			return new Response("The request is invalid", 500);
 		}
 
 		$friend_id = $this->request->variable('friend_id', 0);
-		if($friend_id > 0)
+		if ($friend_id > 0)
 		{
 			$newVal = $this->model->updateMessagesStatus($friend_id);
 			return new JsonResponse(array('success' => true, 'newVal' => $newVal), 200);
@@ -188,12 +188,12 @@ 
 	{
 		/* AJAX check  */
 		$http_request = $this->request->server('HTTP_X_REQUESTED_WITH');
-		if(empty($http_request) && strtolower($http_request) != 'xmlhttprequest') {
+		if (empty($http_request) && strtolower($http_request) != 'xmlhttprequest') {
 			return new Response("The request is invalid", 500);
 		}
 
 		$friend_id = $this->request->variable('friend_id', 0);
-		if($friend_id > 0)
+		if ($friend_id > 0)
 		{
 			$messages = $this->model->getInboxFromId($friend_id);
 			return new JsonResponse(array('success' => true, 'messages' => $messages), 200);
@@ -205,12 +205,12 @@ 
 	{
 		/* AJAX check  */
 		$http_request = $this->request->server('HTTP_X_REQUESTED_WITH');
-		if(empty($http_request) && strtolower($http_request) != 'xmlhttprequest') {
+		if (empty($http_request) && strtolower($http_request) != 'xmlhttprequest') {
 			return new Response("The request is invalid", 500);
 		}
 
 		$friends = $this->model->getFriends();
-		$friends_online = array_filter($friends, function($friend){
+		$friends_online = array_filter($friends, function($friend) {
 			return $friend['user_status'] != 0;
 		});
 
@@ -226,12 +226,12 @@ 
 	{
 		$emoticons = \florinp\messenger\libs\emojione::$ascii_replace;
 		$eicons = array();
-		foreach($emoticons as $code => $value) {
+		foreach ($emoticons as $code => $value) {
 			$eicons[$value] = $code;
 		}
 
 		$response = array();
-		foreach($eicons as $emoticon) {
+		foreach ($eicons as $emoticon) {
 			$item = array();
 			$item['code'] = $emoticon;
 			$item['image'] = $this->emojione->toImage($emoticon);

event/main_listener.php

Spacing +8 added lines, -8 removed lines

@@ -46,21 +46,21 @@ 
 	{
 		$context = new RequestContext();
 		$context->fromRequest($this->symfony_request);
-		$baseUrl = generate_board_url(true) . $context->getBaseUrl();
+		$baseUrl = generate_board_url(true).$context->getBaseUrl();
 		
 		$scriptName = $this->symfony_request->getScriptName();
 		$scriptName = substr($scriptName, -1, 1) == '/' ? '' : utf8_basename($scriptName);
 		
-		if($scriptName != '') {
+		if ($scriptName != '') {
 			$baseUrl = str_replace('/'.$scriptName, '', $baseUrl);
 		}
 		
 		$friends = $this->model->getFriends();
-		$friends_online = array_filter($friends, function($friend){
+		$friends_online = array_filter($friends, function($friend) {
 			return $friend['user_status'] != 0;
 		});
 		$this->template->assign_var('S_COUNT_FRIENDS', count($friends_online));
-		foreach($friends as $friend)
+		foreach ($friends as $friend)
 		{
 			$this->template->assign_block_vars('chat_friends', array(
 				'U_USERID' => $friend['user_id'],
@@ -88,7 +88,7 @@ 
 	public function check_login()
 	{
 		$s_enable_messenger = 0;
-		if(in_array($this->user->data['user_type'], array(USER_NORMAL, USER_FOUNDER)))
+		if (in_array($this->user->data['user_type'], array(USER_NORMAL, USER_FOUNDER)))
 		{
 			$s_enable_messenger = 1;
 		}
@@ -99,12 +99,12 @@ 
 	{
 		$context = new RequestContext();
 		$context->fromRequest($this->symfony_request);
-		$baseUrl = generate_board_url(true) . $context->getBaseUrl();
+		$baseUrl = generate_board_url(true).$context->getBaseUrl();
 		
 		$scriptName = $this->symfony_request->getScriptName();
 		$scriptName = substr($scriptName, -1, 1) == '/' ? '' : utf8_basename($scriptName);
 		
-		if($scriptName != '') {
+		if ($scriptName != '') {
 			$baseUrl = str_replace('/'.$scriptName, '', $baseUrl);
 		}
 		
@@ -124,7 +124,7 @@ 
 			'sender_id' => $user_id
 		));
 		$check_widget = true;
-		if($user_id == $this->user->data['user_id']) $check_widget = false;
+		if ($user_id == $this->user->data['user_id']) $check_widget = false;
 		$this->template->assign_vars(array(
 			'U_USER_ID' => $user_id,
 			'U_CHECK_FRIEND' => $check_friend,

ext.php

Spacing +12 added lines, -12 removed lines

@@ -10,7 +10,7 @@ 
   {
     global $phpbb_root_path;
 
-    switch($old_state)
+    switch ($old_state)
     {
       case '':
         $db = new \florinp\messenger\libs\database();
@@ -34,11 +34,11 @@ 
           );
         ");
 
-        $messengerDir = $phpbb_root_path . 'store/messenger';
-        if(!is_dir($messengerDir)) {
+        $messengerDir = $phpbb_root_path.'store/messenger';
+        if (!is_dir($messengerDir)) {
           mkdir($messengerDir, 0777);
-          $filesDir = $messengerDir . '/files';
-          if(!is_dir($filesDir)) {
+          $filesDir = $messengerDir.'/files';
+          if (!is_dir($filesDir)) {
             mkdir($filesDir, 0777);
           }
         }
@@ -60,7 +60,7 @@ 
 
   public function disable_step($old_state)
   {
-    switch($old_state)
+    switch ($old_state)
     {
       case '':
         $phpbb_notifications = $this->container->get('notification_manager');
@@ -79,16 +79,16 @@ 
   {
     global $phpbb_root_path;
 
-    $database = $phpbb_root_path . 'store/messenger.db';
-    if(is_file($database)) {
+    $database = $phpbb_root_path.'store/messenger.db';
+    if (is_file($database)) {
       unlink($database);
     }
 
-    $messengerDir = $phpbb_root_path . 'store/messenger';
-    if(is_dir($messengerDir)) {
+    $messengerDir = $phpbb_root_path.'store/messenger';
+    if (is_dir($messengerDir)) {
       $objects = scandir($messengerDir);
-      foreach($objects as $object) {
-        if($object != '.' && $object != '..') {
+      foreach ($objects as $object) {
+        if ($object != '.' && $object != '..') {
           if (filetype($messengerDir."/".$object) == "dir") rmdir($messengerDir."/".$object); else unlink($messengerDir."/".$object);
         }
       }

libs/database.php

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
 	{
 		global $phpbb_root_path;
 
-		$database = $phpbb_root_path . 'store/messenger.db';
+		$database = $phpbb_root_path.'store/messenger.db';
 		parent::__construct('sqlite:'.$database);
 		parent::setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 	}
@@ -20,7 +20,7 @@ 
 	public function select($sql, $array = array(), $fetchMode = PDO::FETCH_ASSOC)
 	{
 		$sth = $this->prepare($sql);
-		foreach($array as $key => $value)
+		foreach ($array as $key => $value)
 		{
 			$sth->bindValue("$key", $value);
 		}
@@ -38,7 +38,7 @@ 
 
 		$sth = $this->prepare("INSERT INTO $table (`$fieldNames`) VALUES ($fieldValues)");
 
-		foreach($data as $key => $value)
+		foreach ($data as $key => $value)
 		{
 			$sth->bindValue(":$key", $value);
 		}
@@ -51,7 +51,7 @@ 
 		ksort($data);
 
 		$fieldDetails = NULL;
-		foreach($data as $key=> $value) {
+		foreach ($data as $key=> $value) {
 			$fieldDetails .= "`$key`=:$key,";
 		}
 		$fieldDetails = rtrim($fieldDetails, ',');

libs/emojione.php

Spacing +31 added lines, -31 removed lines

@@ -2401,7 +2401,7 @@ 
     // useful for sending emojis back to mobile devices
     static function shortnameToUnicode($string) {
         $string = preg_replace_callback('/'.self::$ignoredRegexp.'|('.self::$shortcodeRegexp.')/Si', 'static::shortnameToUnicodeCallback', $string);
-        if(self::$ascii) {
+        if (self::$ascii) {
             $string = preg_replace_callback('/'.self::$ignoredRegexp.'|((\\s|^)'.self::$asciiRegexp.'(?=\\s|$|[!,\.]))/S', 'static::asciiToUnicodeCallback', $string);
         }
         return $string;
@@ -2414,7 +2414,7 @@ 
     }
     static function shortnameToImage($string) {
         $string = preg_replace_callback('/'.self::$ignoredRegexp.'|('.self::$shortcodeRegexp.')/Si', 'static::shortnameToImageCallback', $string);
-        if(self::$ascii) {
+        if (self::$ascii) {
             $string = preg_replace_callback('/'.self::$ignoredRegexp.'|((\\s|^)'.self::$asciiRegexp.'(?=\\s|$|[!,\.]))/S', 'static::asciiToImageCallback', $string);
         }
         return $string;
@@ -2430,7 +2430,7 @@ 
     // ######## preg_replace callbacks
     // ##########################################
     static function shortnameToAsciiCallback($m) {
-        if((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
+        if ((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
             return $m[0];
         }
         else {
@@ -2438,7 +2438,7 @@ 
 
             $shortname = $m[0];
 
-            if(!isset(self::$shortcode_replace[$shortname])) {
+            if (!isset(self::$shortcode_replace[$shortname])) {
                 return $m[0];
             }
 
@@ -2448,7 +2448,7 @@ 
         }
     }
     static function shortnameToUnicodeCallback($m) {
-        if((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
+        if ((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
             return $m[0];
         }
         else {
@@ -2456,7 +2456,7 @@ 
 
             $shortname = $m[1];
 
-            if(!isset($flipped[$shortname])) {
+            if (!isset($flipped[$shortname])) {
                 return $m[0];
             }
 
@@ -2466,13 +2466,13 @@ 
         }
     }
     static function shortnameToImageCallback($m) {
-        if((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
+        if ((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
             return $m[0];
         }
         else {
             $shortname = $m[1];
 
-            if(!isset(self::$shortcode_replace[$shortname])) {
+            if (!isset(self::$shortcode_replace[$shortname])) {
                 return $m[0];
             }
 
@@ -2480,11 +2480,11 @@ 
             $unicode = self::$shortcode_replace[$shortname];
             $filename = strtoupper($unicode);
 
-            if(self::$unicodeAlt) { $alt = self::convert($unicode); }
+            if (self::$unicodeAlt) { $alt = self::convert($unicode); }
             else { $alt = $shortname; }
 
-            if(self::$imageType == 'png') {
-                if(self::$sprites) {
+            if (self::$imageType == 'png') {
+                if (self::$sprites) {
                     return '<span class="emojione-'.strtoupper($unicode).'" title="'.htmlspecialchars($shortname).'">'.$alt.'</span>';
                 }
                 else {
@@ -2492,7 +2492,7 @@ 
                 }
             }
 
-            if(self::$sprites) {
+            if (self::$sprites) {
                 return '<svg class="emojione"><description>'.$alt.'</description><use xlink:href="'.self::$imagePathSVGSprites.'#emoji-'.strtoupper($unicode).'"></use></svg>';
             }
             else {
@@ -2501,7 +2501,7 @@ 
         }
     }
     static function asciiToUnicodeCallback($m) {
-        if((!is_array($m)) || (!isset($m[3])) || (empty($m[3]))) {
+        if ((!is_array($m)) || (!isset($m[3])) || (empty($m[3]))) {
             return $m[0];
         }
         else {
@@ -2511,7 +2511,7 @@ 
         }
     }
     static function asciiToImageCallback($m) {
-        if((!is_array($m)) || (!isset($m[3])) || (empty($m[3]))) {
+        if ((!is_array($m)) || (!isset($m[3])) || (empty($m[3]))) {
             return $m[0];
         }
         else {
@@ -2519,11 +2519,11 @@ 
             $unicode = self::$ascii_replace[$shortname];
 
             // unicode char or shortname for the alt tag? (unicode is better for copying and pasting the resulting text)
-            if(self::$unicodeAlt) { $alt = self::convert($unicode); }
+            if (self::$unicodeAlt) { $alt = self::convert($unicode); }
             else { $alt = htmlspecialchars($shortname); }
 
-            if(self::$imageType == 'png') {
-                if(self::$sprites) {
+            if (self::$imageType == 'png') {
+                if (self::$sprites) {
                     return $m[2].'<span class="emojione-'.strtoupper($unicode).'" title="'.htmlspecialchars($shortname).'">'.$alt.'</span>';
                 }
                 else {
@@ -2531,7 +2531,7 @@ 
                 }
             }
 
-            if(self::$sprites) {
+            if (self::$sprites) {
                 return $m[2].'<svg class="emojione"><description>'.$alt.'</description><use xlink:href="'.self::$imagePathSVGSprites.'#emoji-'.strtoupper($unicode).'"></use></svg>';
             }
             else {
@@ -2540,14 +2540,14 @@ 
         }
     }
     static function toShortCallback($m) {
-        if((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
+        if ((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
             return $m[0];
         }
         else {
             $unicode = $m[1];
-            if(!isset(self::$unicode_replace[$unicode])) {
+            if (!isset(self::$unicode_replace[$unicode])) {
                 $unicode = substr($m[1], 0, 4);
-                if(!isset(self::$unicode_replace[$unicode])) {
+                if (!isset(self::$unicode_replace[$unicode])) {
                     return $m[0];
                 }
             }
@@ -2556,15 +2556,15 @@ 
         }
     }
     static function unicodeToImageCallback($m) {
-        if((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
+        if ((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
             return $m[0];
         }
         else {
             $unicode = $m[1];
 
-            if(!isset(self::$unicode_replace[$unicode])) {
+            if (!isset(self::$unicode_replace[$unicode])) {
                 $unicode = substr($m[1], 0, 4);
-                if(!isset(self::$unicode_replace[$unicode])) {
+                if (!isset(self::$unicode_replace[$unicode])) {
                     return $m[0];
                 }
             }
@@ -2572,11 +2572,11 @@ 
             $shortname = self::$unicode_replace[$unicode];
             $filename = strtoupper(self::$shortcode_replace[$shortname]);
 
-            if(self::$unicodeAlt) { $alt = $unicode; }
+            if (self::$unicodeAlt) { $alt = $unicode; }
             else { $alt = $shortname; }
 
-            if(self::$imageType == 'png') {
-                if(self::$sprites) {
+            if (self::$imageType == 'png') {
+                if (self::$sprites) {
                     return '<span class="emojione-'.strtoupper($unicode).'" title="'.htmlspecialchars($shortname).'">'.$alt.'</span>';
                 }
                 else {
@@ -2584,7 +2584,7 @@ 
                 }
             }
 
-            if(self::$sprites) {
+            if (self::$sprites) {
                 return '<svg class="emojione"><description>'.$alt.'</description><use xlink:href="'.self::$imagePathSVGSprites.'#emoji-'.strtoupper($unicode).'"></use></svg>';
             }
             else {
@@ -2597,9 +2597,9 @@ 
     // ######## helper methods
     // ##########################################
     static function convert($unicode) {
-        if(stristr($unicode,'-')) {
-            $pairs = explode('-',$unicode);
-            return '&#x'.implode(';&#x',$pairs).';';
+        if (stristr($unicode, '-')) {
+            $pairs = explode('-', $unicode);
+            return '&#x'.implode(';&#x', $pairs).';';
         }
         else {
             return '&#x'.$unicode.';';

migrations/m1_initial_scheme.php

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
 	{
 		return array(
 			'add_tables' => array(
-				$this->table_prefix . 'messenger_friends_request' => array(
+				$this->table_prefix.'messenger_friends_request' => array(
 					'COLUMNS' => array(
 						'request_id' => array('UINT', null, 'auto_increment', 0),
 						'user_id' => array('UINT', 0),
@@ -19,7 +19,7 @@ 
 					),
 					'PRIMARY_KEY' => 'request_id'
 				),
-				$this->table_prefix . 'messenger_user_friends' => array(
+				$this->table_prefix.'messenger_user_friends' => array(
 					'COLUMNS' => array(
 						'user_id' => array('UINT', 0),
 						'friend_id' => array('UINT', 0)
@@ -33,8 +33,8 @@ 
 	{
 		return array(
 			'drop_tables' => array(
-				$this->table_prefix . 'messenger_friends_request',
-				$this->table_prefix . 'messenger_user_friends'
+				$this->table_prefix.'messenger_friends_request',
+				$this->table_prefix.'messenger_user_friends'
 			)
 		);
 	}

migrations/m3_ucp_friends_module.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
                     array(
                         'module_basename'   => '\florinp\messenger\ucp\ucp_friends_module',
                         'module_class' => 'ucp_friends_module',
-                        'modes' => array('friends','requests'),
+                        'modes' => array('friends', 'requests'),
                     ),
                 )
             ),
@@ -36,7 +36,7 @@ 
                     array(
                         'module_basename'   => '\florinp\messenger\ucp\ucp_friends_module',
                         'module_class' => 'ucp_friends_module',
-                        'modes' => array('friends','requests'),
+                        'modes' => array('friends', 'requests'),
                     )
                 )
             ),

models/friends_model.php

Spacing +36 added lines, -36 removed lines

@@ -29,16 +29,16 @@ 
                    u.user_colour, 
                    s.session_id, 
                    s.session_time
-            FROM ". $this->user_friends_table ."
-            LEFT JOIN ". USERS_TABLE ." AS u ON u.user_id = ". $this->user_friends_table .".friend_id
-            LEFT JOIN ". SESSIONS_TABLE ." AS s ON s.session_user_id = u.user_id
-            WHERE ". $this->user_friends_table .".user_id = ". (int)$this->user->data['user_id'] ."
+            FROM ". $this->user_friends_table."
+            LEFT JOIN ". USERS_TABLE." AS u ON u.user_id = ".$this->user_friends_table.".friend_id
+            LEFT JOIN ". SESSIONS_TABLE." AS s ON s.session_user_id = u.user_id
+            WHERE ". $this->user_friends_table.".user_id = ".(int)$this->user->data['user_id']."
             GROUP BY u.user_id
         ";
 		$result = $this->db->sql_query($sql);
 
 		$friends = array();
-		while($row = $this->db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$friends[] = array(
 				'user_id' => $row['user_id'],
@@ -63,15 +63,15 @@ 
 					`sender_id`,
 					`status`,
 					`time`
-			FROM ". $this->friends_request_table ."
-			WHERE `user_id` = ". (int)$this->user->data['user_id'] ."
+			FROM ". $this->friends_request_table."
+			WHERE `user_id` = ". (int)$this->user->data['user_id']."
                     AND `status` = 0
 			ORDER BY `time` DESC
 		";
 
 		$result = $this->db->sql_query($sql);
 
-		while($row = $this->db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$requests[] = $row;
 		}
@@ -87,8 +87,8 @@ 
 					`sender_id`,
 					`status`,
 					`time`
-			FROM ". $this->friends_request_table ."
-			WHERE `request_id` = ". (int)$id ."
+			FROM ". $this->friends_request_table."
+			WHERE `request_id` = ". (int)$id."
                 AND `status` = 0
 			ORDER BY `time` DESC
 			LIMIT 1
@@ -96,7 +96,7 @@ 
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
 		
-		if($this->approve_friend_request($id))
+		if ($this->approve_friend_request($id))
 		{		
 			return $row;
 		}
@@ -114,8 +114,8 @@ 
 					`sender_id`,
 					`status`,
 					`time`
-			FROM ". $this->friends_request_table ."
-			WHERE `sender_id` = ". (int)$sender_id ."
+			FROM ". $this->friends_request_table."
+			WHERE `sender_id` = ". (int)$sender_id."
                 AND `status` = 0
 			ORDER BY `time` DESC
 			LIMIT 1 
@@ -128,7 +128,7 @@ 
 
 	public function insert_friends_request(array $data) {
 		$sql = "
-      INSERT INTO " . $this->friends_request_table . "
+      INSERT INTO " . $this->friends_request_table."
         (
           `user_id`,
           `sender_id`,
@@ -137,21 +137,21 @@ 
         )
       VALUES
         (
-          " . ( int ) $data ['user_id'] . ",
-          " . ( int ) $data ['sender_id'] . ",
+          " . (int)$data ['user_id'].",
+          " . (int)$data ['sender_id'].",
           0,
-          " . time () . "
+          " . time()."
         )
     ";
-		$this->db->sql_query ( $sql );
+		$this->db->sql_query($sql);
 
-		return $this->db->sql_nextid ();
+		return $this->db->sql_nextid();
 	}
 
 	public function delete_friend_request($request_id)
 	{
 		$sql = "
-			DELETE FROM ". $this->friends_request_table ." WHERE `request_id` = ". (int)$request_id ."
+			DELETE FROM ". $this->friends_request_table." WHERE `request_id` = ".(int)$request_id."
 		";
 
 		return $this->db->sql_query($sql);
@@ -160,7 +160,7 @@ 
 	public function approve_friend_request($request_id)
 	{
 		$sql = "
-			UPDATE ". $this->friends_request_table ." SET `status` = 1 WHERE `request_id` = ". (int)$request_id ."
+			UPDATE ". $this->friends_request_table." SET `status` = 1 WHERE `request_id` = ".(int)$request_id."
 		";
 
 		return $this->db->sql_query($sql);
@@ -170,21 +170,21 @@ 
 	{
 
 		$check_friend = $this->check_friend($data);
-		if($check_friend == false)
+		if ($check_friend == false)
 		{
 			$sql = "
-				INSERT INTO ". $this->user_friends_table ."
+				INSERT INTO ". $this->user_friends_table."
 					(
 						`user_id`,
 						`friend_id`
 					)
 				VALUES
 					(
-						". (int)$data['user_id'] .",
-						". (int)$data['friend_id'] ."
+						". (int)$data['user_id'].",
+						". (int)$data['friend_id']."
 					)
 			";
-			if($this->db->sql_query($sql))
+			if ($this->db->sql_query($sql))
 			{
 				$aux = $data['user_id'];
 				$data['user_id'] = $data['friend_id'];
@@ -208,13 +208,13 @@ 
 	{
 		$sql = "
 			SELECT COUNT(*) AS `count`
-			FROM ". $this->user_friends_table ."
-			WHERE `user_id` = ". (int)$data['user_id'] ."
-			 		AND `friend_id` = ". (int)$data['friend_id'] ."
+			FROM ". $this->user_friends_table."
+			WHERE `user_id` = ". (int)$data['user_id']."
+			 		AND `friend_id` = ". (int)$data['friend_id']."
 		";
 		$this->db->sql_query($sql);
 		$count = $this->db->sql_fetchfield('count');
-		if($count > 0)
+		if ($count > 0)
 		{
 			return true;
 		}
@@ -228,15 +228,15 @@ 
 	{
 		$sql = "
 			SELECT COUNT(*) AS `count`
-			FROM ". $this->friends_request_table ."
-			WHERE `user_id` = ". (int)$data['user_id'] ."
-					AND `sender_id` = ". (int)$data['sender_id'] ."
+			FROM ". $this->friends_request_table."
+			WHERE `user_id` = ". (int)$data['user_id']."
+					AND `sender_id` = ". (int)$data['sender_id']."
 					AND `status` = 0
 			LIMIT 1
 		";
 		$this->db->sql_query($sql);
 		$count = $this->db->sql_fetchfield('count');
-		if($count > 0)
+		if ($count > 0)
 		{
 			return true;
 		}
@@ -248,10 +248,10 @@ 
     
     public function remove_friend($user_id)
     {
-        $sql = "DELETE FROM ". $this->user_friends_table ." WHERE `user_id` = ". (int)$user_id ."";
+        $sql = "DELETE FROM ".$this->user_friends_table." WHERE `user_id` = ".(int)$user_id."";
         $this->db->sql_query($sql);
         
-        $sql = "DELETE FROM ". $this->user_friends_table ." WHERE `friend_id` = ". (int)$user_id ."";
+        $sql = "DELETE FROM ".$this->user_friends_table." WHERE `friend_id` = ".(int)$user_id."";
         $this->db->sql_query($sql);
     }