florinp / phpbb-messenger

event/main_listener.php

Indentation +140 added lines, -140 removed lines

@@ -14,144 +14,144 @@
 class main_listener implements EventSubscriberInterface
 {
 
-    static public function getSubscribedEvents()
-    {
-        return array(
-            'core.user_setup' => 'load_language_on_setup',
-            'core.page_footer' => 'friends_list',
-            'core.page_header' => 'check_login',
-            'core.memberlist_view_profile' => 'check_friends'
-        );
-    }
-
-
-    /* @var \phpbb\template\template */
-    protected $template;
-
-    /**
-     * @var main_model
-     */
-    protected $model;
-
-    /**
-     * @var friends_model
-     */
-    protected $friends_model;
-
-    /**
-     * @var user
-     */
-    protected $user;
-
-    /**
-     * @var symfony_request
-     */
-    protected $symfony_request;
-
-    public function __construct(
-        template $template,
-        main_model $model,
-        friends_model $friends_model,
-        user $user,
-        symfony_request $symfony_request
-    )
-    {
-        $this->template = $template;
-        $this->model = $model;
-        $this->friends_model = $friends_model;
-        $this->user = $user;
-        $this->symfony_request = $symfony_request;
-    }
-
-    public function friends_list()
-    {
-        $context = new RequestContext();
-        $context->fromRequest($this->symfony_request);
-        $baseUrl = generate_board_url(true) . $context->getBaseUrl();
-
-        $scriptName = $this->symfony_request->getScriptName();
-        $scriptName = substr($scriptName, -1, 1) == '/' ? '' : utf8_basename($scriptName);
-
-        if ($scriptName != '') {
-            $baseUrl = str_replace('/' . $scriptName, '', $baseUrl);
-        }
-
-        $friends = $this->model->getFriends();
-        $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) {
-            $this->template->assign_block_vars('chat_friends', array(
-                'U_USERID' => $friend['user_id'],
-                'U_USERNAME' => $friend['username'],
-                'U_USERCOLOR' => $friend['user_colour'],
-                'U_STATUS' => $friend['user_status'],
-                'U_USERINBOX' => $friend['inbox'],
-            ));
-        }
-        $this->template->assign_vars(array(
-            'BASE_URL' => $baseUrl
-        ));
-    }
-
-    public function load_language_on_setup($event)
-    {
-        $lang_set_ext = $event['lang_set_ext'];
-        $lang_set_ext[] = array(
-            'ext_name' => 'florinp/messenger',
-            'lang_set' => 'common',
-        );
-        $event['lang_set_ext'] = $lang_set_ext;
-    }
-
-    public function check_login()
-    {
-        $s_enable_messenger = 0;
-        if (in_array($this->user->data['user_type'], array(USER_NORMAL, USER_FOUNDER))) {
-            $s_enable_messenger = 1;
-        }
-        $this->template->assign_var('S_ENABLE_MESSENGER', $s_enable_messenger);
-    }
-
-    public function check_friends($event)
-    {
-        $context = new RequestContext();
-        $context->fromRequest($this->symfony_request);
-        $baseUrl = generate_board_url(true) . $context->getBaseUrl();
-
-        $scriptName = $this->symfony_request->getScriptName();
-        $scriptName = substr($scriptName, -1, 1) == '/' ? '' : utf8_basename($scriptName);
-
-        if ($scriptName != '') {
-            $baseUrl = str_replace('/' . $scriptName, '', $baseUrl);
-        }
-
-        $user_id = $event['member']['user_id'];
-        $sender_id = $this->user->data['user_id'];
-        $request = $this->friends_model->get_request_by_sender_id($sender_id);
-        $check_friend = $this->friends_model->check_friend(array(
-            'user_id' => $this->user->data['user_id'],
-            'friend_id' => $user_id,
-        ));
-        $check_request = $this->friends_model->check_request(array(
-            'user_id' => $user_id,
-            'sender_id' => $this->user->data['user_id']
-        ));
-        $check_request_confirm = $this->friends_model->check_request(array(
-            'user_id' => $this->user->data['user_id'],
-            'sender_id' => $user_id
-        ));
-        $check_widget = true;
-        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,
-            'U_CHECK_REQUEST' => $check_request,
-            'U_CHECK_REQUEST_CONFIRM' => $check_request_confirm,
-            'U_CHECK_WIDGET' => $check_widget,
-            'U_REQUEST_ID' => $request['request_id'],
-            'BASE_URL' => $baseUrl
-        ));
-    }
+	static public function getSubscribedEvents()
+	{
+		return array(
+			'core.user_setup' => 'load_language_on_setup',
+			'core.page_footer' => 'friends_list',
+			'core.page_header' => 'check_login',
+			'core.memberlist_view_profile' => 'check_friends'
+		);
+	}
+
+
+	/* @var \phpbb\template\template */
+	protected $template;
+
+	/**
+	 * @var main_model
+	 */
+	protected $model;
+
+	/**
+	 * @var friends_model
+	 */
+	protected $friends_model;
+
+	/**
+	 * @var user
+	 */
+	protected $user;
+
+	/**
+	 * @var symfony_request
+	 */
+	protected $symfony_request;
+
+	public function __construct(
+		template $template,
+		main_model $model,
+		friends_model $friends_model,
+		user $user,
+		symfony_request $symfony_request
+	)
+	{
+		$this->template = $template;
+		$this->model = $model;
+		$this->friends_model = $friends_model;
+		$this->user = $user;
+		$this->symfony_request = $symfony_request;
+	}
+
+	public function friends_list()
+	{
+		$context = new RequestContext();
+		$context->fromRequest($this->symfony_request);
+		$baseUrl = generate_board_url(true) . $context->getBaseUrl();
+
+		$scriptName = $this->symfony_request->getScriptName();
+		$scriptName = substr($scriptName, -1, 1) == '/' ? '' : utf8_basename($scriptName);
+
+		if ($scriptName != '') {
+			$baseUrl = str_replace('/' . $scriptName, '', $baseUrl);
+		}
+
+		$friends = $this->model->getFriends();
+		$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) {
+			$this->template->assign_block_vars('chat_friends', array(
+				'U_USERID' => $friend['user_id'],
+				'U_USERNAME' => $friend['username'],
+				'U_USERCOLOR' => $friend['user_colour'],
+				'U_STATUS' => $friend['user_status'],
+				'U_USERINBOX' => $friend['inbox'],
+			));
+		}
+		$this->template->assign_vars(array(
+			'BASE_URL' => $baseUrl
+		));
+	}
+
+	public function load_language_on_setup($event)
+	{
+		$lang_set_ext = $event['lang_set_ext'];
+		$lang_set_ext[] = array(
+			'ext_name' => 'florinp/messenger',
+			'lang_set' => 'common',
+		);
+		$event['lang_set_ext'] = $lang_set_ext;
+	}
+
+	public function check_login()
+	{
+		$s_enable_messenger = 0;
+		if (in_array($this->user->data['user_type'], array(USER_NORMAL, USER_FOUNDER))) {
+			$s_enable_messenger = 1;
+		}
+		$this->template->assign_var('S_ENABLE_MESSENGER', $s_enable_messenger);
+	}
+
+	public function check_friends($event)
+	{
+		$context = new RequestContext();
+		$context->fromRequest($this->symfony_request);
+		$baseUrl = generate_board_url(true) . $context->getBaseUrl();
+
+		$scriptName = $this->symfony_request->getScriptName();
+		$scriptName = substr($scriptName, -1, 1) == '/' ? '' : utf8_basename($scriptName);
+
+		if ($scriptName != '') {
+			$baseUrl = str_replace('/' . $scriptName, '', $baseUrl);
+		}
+
+		$user_id = $event['member']['user_id'];
+		$sender_id = $this->user->data['user_id'];
+		$request = $this->friends_model->get_request_by_sender_id($sender_id);
+		$check_friend = $this->friends_model->check_friend(array(
+			'user_id' => $this->user->data['user_id'],
+			'friend_id' => $user_id,
+		));
+		$check_request = $this->friends_model->check_request(array(
+			'user_id' => $user_id,
+			'sender_id' => $this->user->data['user_id']
+		));
+		$check_request_confirm = $this->friends_model->check_request(array(
+			'user_id' => $this->user->data['user_id'],
+			'sender_id' => $user_id
+		));
+		$check_widget = true;
+		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,
+			'U_CHECK_REQUEST' => $check_request,
+			'U_CHECK_REQUEST_CONFIRM' => $check_request_confirm,
+			'U_CHECK_WIDGET' => $check_widget,
+			'U_REQUEST_ID' => $request['request_id'],
+			'BASE_URL' => $baseUrl
+		));
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -67,17 +67,17 @@ 
     {
         $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 != '') {
-            $baseUrl = str_replace('/' . $scriptName, '', $baseUrl);
+            $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));
@@ -118,13 +118,13 @@ 
     {
         $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 != '') {
-            $baseUrl = str_replace('/' . $scriptName, '', $baseUrl);
+            $baseUrl = str_replace('/'.$scriptName, '', $baseUrl);
         }
 
         $user_id = $event['member']['user_id'];

Braces +3 added lines, -1 removed lines

@@ -143,7 +143,9 @@
             '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,

models/main_model.php

Indentation +166 added lines, -166 removed lines

@@ -12,35 +12,35 @@ 
 class main_model
 {
 
-    /**
-     * @var config
-     */
-    protected $config;
-
-    /**
-     * @var driver_interface
-     */
-    protected $phpbb_db;
-
-    /**
-     * @var user
-     */
-    protected $user;
-
-    /**
-     * @var database
-     */
-    protected $db;
-
-    /**
-     * @var string
-     */
-    protected $friends_request_table;
-
-    /**
-     * @var string
-     */
-    protected $user_friends_table;
+	/**
+	 * @var config
+	 */
+	protected $config;
+
+	/**
+	 * @var driver_interface
+	 */
+	protected $phpbb_db;
+
+	/**
+	 * @var user
+	 */
+	protected $user;
+
+	/**
+	 * @var database
+	 */
+	protected $db;
+
+	/**
+	 * @var string
+	 */
+	protected $friends_request_table;
+
+	/**
+	 * @var string
+	 */
+	protected $user_friends_table;
 
 	/**
 	 * @var user_loader
@@ -48,32 +48,32 @@ 
 	protected $user_loader;
 
 
-    public function __construct(
-        config $config,
-        driver_interface $phpbb_db,
-        user $user,
+	public function __construct(
+		config $config,
+		driver_interface $phpbb_db,
+		user $user,
 		user_loader $user_loader,
-        database $db,
-        $friends_request_table,
-        $user_friends_table
-    )
-    {
-        $this->config = $config;
-        $this->phpbb_db = $phpbb_db;
-        $this->user = $user;
-        $this->db = $db;
-        $this->friends_request_table = $friends_request_table;
-        $this->user_friends_table = $user_friends_table;
+		database $db,
+		$friends_request_table,
+		$user_friends_table
+	)
+	{
+		$this->config = $config;
+		$this->phpbb_db = $phpbb_db;
+		$this->user = $user;
+		$this->db = $db;
+		$this->friends_request_table = $friends_request_table;
+		$this->user_friends_table = $user_friends_table;
 		$this->user_loader = $user_loader;
-    }
-
-    /**
-     * get all friends
-     * @return array the list of friends
-     */
-    public function getFriends()
-    {
-        $sql = "
+	}
+
+	/**
+	 * get all friends
+	 * @return array the list of friends
+	 */
+	public function getFriends()
+	{
+		$sql = "
             SELECT u.user_id,
                    u.username,
                    u.username_clean,
@@ -87,32 +87,32 @@ 
             WHERE " . $this->user_friends_table.".user_id = ".(int)$this->user->data['user_id']."
             GROUP BY u.user_id
         ";
-        $result = $this->phpbb_db->sql_query($sql);
-
-        $friends = array();
-        while ($row = $this->phpbb_db->sql_fetchrow($result)) {
-            $friends[] = array(
-                'user_id' => $row['user_id'],
-                'username' => $row['username_clean'],
-                'user_colour' => $row['user_colour'],
-                'user_status' => ($row['session_time'] >= (time() - ($this->config['load_online_time'] * 60))) ? 1 : 0,
+		$result = $this->phpbb_db->sql_query($sql);
+
+		$friends = array();
+		while ($row = $this->phpbb_db->sql_fetchrow($result)) {
+			$friends[] = array(
+				'user_id' => $row['user_id'],
+				'username' => $row['username_clean'],
+				'user_colour' => $row['user_colour'],
+				'user_status' => ($row['session_time'] >= (time() - ($this->config['load_online_time'] * 60))) ? 1 : 0,
 				'user_avatar' => $this->user_loader->get_avatar($row['user_id'], true, true),
-                'inbox' => $this->getInboxFromId($row['user_id'])
-            );
-        }
-        $this->phpbb_db->sql_freeresult();
-
-        return $friends;
-    }
-
-    /**
-     * checks if a user is friend with other user and vice-versa
-     * @param int $friend_id
-     * @return bool
-     */
-    public function checkFriend($friend_id)
-    {
-        $sql = "
+				'inbox' => $this->getInboxFromId($row['user_id'])
+			);
+		}
+		$this->phpbb_db->sql_freeresult();
+
+		return $friends;
+	}
+
+	/**
+	 * checks if a user is friend with other user and vice-versa
+	 * @param int $friend_id
+	 * @return bool
+	 */
+	public function checkFriend($friend_id)
+	{
+		$sql = "
 			SELECT COUNT(zebra_id) as friend_count
 			FROM " . ZEBRA_TABLE."
 			WHERE user_id = " . (int)$friend_id."
@@ -211,48 +211,48 @@ 
 			LIMIT 1
 		";
 
-        $message = $this->db->select($sql, array(
-            ':id' => $id
-        ));
+		$message = $this->db->select($sql, array(
+			':id' => $id
+		));
 		$message = $message[0];
 		$message = $this->parseMessage($message, $message['type']);
 
-        return $message;
-    }
-
-    /**
-     * Returns a file by id
-     * @param $id File id
-     * @return mixed
-     */
-    public function getFileById($id)
-    {
-        $sql = "
+		return $message;
+	}
+
+	/**
+	 * Returns a file by id
+	 * @param $id File id
+	 * @return mixed
+	 */
+	public function getFileById($id)
+	{
+		$sql = "
 			SELECT *
 			FROM `files`
 			WHERE `id` = :id
 			LIMIT 1
 		";
-        $file = $this->db->select($sql, array(
-            ':id' => $id
-        ));
+		$file = $this->db->select($sql, array(
+			':id' => $id
+		));
 		$file = $file[0];
 		$file = $this->parseFile($file, $file['type']);
 
-        return $file;
-    }
+		return $file;
+	}
 
-    /**
-     * Get all message from an user
-     * @param int $friend_id
-     * @return array
-     */
-    public function getMessages($friend_id)
-    {
+	/**
+	 * Get all message from an user
+	 * @param int $friend_id
+	 * @return array
+	 */
+	public function getMessages($friend_id)
+	{
 		$this->user_loader->load_users([$this->user->data['user_id'], $friend_id]);
 
-        // get the sent messages
-        $sql = "SELECT *
+		// get the sent messages
+		$sql = "SELECT *
 				FROM `messages`
 				WHERE `sender_id` = :sender_id
 					AND `receiver_id` = :receiver_id
@@ -265,58 +265,58 @@ 
 			ORDER BY `sentAt` ASC
 		";
 
-        $sentMessages = $this->db->select($sql, array(
-            ':sender_id' => $this->user->data['user_id'],
-            ':receiver_id' => $friend_id
-        ));
-        $getInbox = $this->db->select($sql, array(
-            ':sender_id' => $friend_id,
-            ':receiver_id' => $this->user->data['user_id']
-        ));
-
-        $sentFiles = $this->db->select($sqlFiles, array(
-            ':sender_id' => $this->user->data['user_id'],
-            ':receiver_id' => $friend_id
-        ));
-        $getFiles = $this->db->select($sqlFiles, array(
-            ':sender_id' => $friend_id,
-            ':receiver_id' => $this->user->data['user_id']
-        ));
-
-        $sent = array();
-        foreach ($sentMessages as $msg) {
-            $item = $this->parseMessage($msg, 'sent');
-            $sent[] = $item;
-        }
-        $inbox = array();
-        foreach ($getInbox as $msg) {
-            $item = $this->parseMessage($msg, 'inbox');
-            $inbox[] = $item;
-        }
-
-        foreach ($sentFiles as $file) {
-            $item = $this->parseFile($file, 'sent');
-            $sent[] = $item;
-        }
-
-        foreach ($getFiles as $file) {
-            $item = $this->parseFile($file, 'inbox');
-            $inbox[] = $item;
-        }
-
-        $unsorted_messages = array_merge($sent, $inbox);
-
-        uasort($unsorted_messages, function ($a, $b) {
-            return ($a['sentAt'] > $b['sentAt']) ? -1 : 1;
-        });
-
-        $sorted_messages = array();
-        foreach ($unsorted_messages as $msg) {
-            $sorted_messages[] = $msg;
-        }
-
-        return $sorted_messages;
-    }
+		$sentMessages = $this->db->select($sql, array(
+			':sender_id' => $this->user->data['user_id'],
+			':receiver_id' => $friend_id
+		));
+		$getInbox = $this->db->select($sql, array(
+			':sender_id' => $friend_id,
+			':receiver_id' => $this->user->data['user_id']
+		));
+
+		$sentFiles = $this->db->select($sqlFiles, array(
+			':sender_id' => $this->user->data['user_id'],
+			':receiver_id' => $friend_id
+		));
+		$getFiles = $this->db->select($sqlFiles, array(
+			':sender_id' => $friend_id,
+			':receiver_id' => $this->user->data['user_id']
+		));
+
+		$sent = array();
+		foreach ($sentMessages as $msg) {
+			$item = $this->parseMessage($msg, 'sent');
+			$sent[] = $item;
+		}
+		$inbox = array();
+		foreach ($getInbox as $msg) {
+			$item = $this->parseMessage($msg, 'inbox');
+			$inbox[] = $item;
+		}
+
+		foreach ($sentFiles as $file) {
+			$item = $this->parseFile($file, 'sent');
+			$sent[] = $item;
+		}
+
+		foreach ($getFiles as $file) {
+			$item = $this->parseFile($file, 'inbox');
+			$inbox[] = $item;
+		}
+
+		$unsorted_messages = array_merge($sent, $inbox);
+
+		uasort($unsorted_messages, function ($a, $b) {
+			return ($a['sentAt'] > $b['sentAt']) ? -1 : 1;
+		});
+
+		$sorted_messages = array();
+		foreach ($unsorted_messages as $msg) {
+			$sorted_messages[] = $msg;
+		}
+
+		return $sorted_messages;
+	}
 
 	/**
 	 * Parse message to specific array
@@ -359,15 +359,15 @@ 
 		return $item;
 	}
 
-    /**
-     * Change messages status to read
-     * @param $friend_id
-     * @return int
-     */
-    public function updateMessagesStatus($friend_id)
-    {
+	/**
+	 * Change messages status to read
+	 * @param $friend_id
+	 * @return int
+	 */
+	public function updateMessagesStatus($friend_id)
+	{
 
-        $sql = "
+		$sql = "
 			UPDATE `messages`
 			SET `newMsg` = 0
 			WHERE `newMsg` = 1

Spacing +2 added lines, -2 removed lines

@@ -306,7 +306,7 @@ 
 
         $unsorted_messages = array_merge($sent, $inbox);
 
-        uasort($unsorted_messages, function ($a, $b) {
+        uasort($unsorted_messages, function($a, $b) {
             return ($a['sentAt'] > $b['sentAt']) ? -1 : 1;
         });
 
@@ -346,7 +346,7 @@ 
 	 */
 	protected function parseFile($file, $type) {
 		$item = array();
-		$item['id'] = 'f_' . $file['id'];
+		$item['id'] = 'f_'.$file['id'];
 		$item['sender_id'] = $file['sender_id'];
 		$item['sender_avatar'] = $this->user_loader->get_avatar($file['sender_id'], true, true);
 		$item['receiver_id'] = $file['receiver_id'];