florinp / phpbb-messenger

tests/controller/main_test.php

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 
 namespace florinp\messenger\tests\controller;
 
-use Symfony\Component\HttpFoundation\JsonResponse;
-
 class main_test extends \phpbb_test_case {
 
     /**

Indentation +110 added lines, -110 removed lines

@@ -6,114 +6,114 @@
 
 class main_test extends \phpbb_test_case {
 
-    /**
-     * @var \florinp\messenger\controller\main
-     */
-    protected $controller;
-
-    public function setUp() {
-        parent::setUp();
-        /**
-         * @var \phpbb\user $user Mock the user class
-         */
-        $user = $this->getMock('\phpbb\user', array(), array('\phpbb\datetime'));
-
-        /**
-         * @var \phpbb\request\request $request
-         */
-        $request = $this->getMockBuilder('\phpbb\request\request')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /**
-         * @var \florinp\messenger\models\main_model $model
-         */
-        $model = $this->getMockBuilder('\florinp\messenger\models\main_model')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /**
-         * @var \phpbb\notification\manager $notification_manager
-         */
-        $notification_manager = $this->getMockBuilder('\phpbb\notification\manager')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /**
-         * @var \florinp\messenger\libs\emojione $emojione
-         */
-        $emojione = $this->getMockBuilder('\florinp\messenger\libs\emojione')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /**
-         * @var \florinp\messenger\libs\upload $upload
-         */
-        $upload = $this->getMockBuilder('\florinp\messenger\libs\upload')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /**
-         * @var \florinp\messenger\libs\download $download
-         */
-        $download = $this->getMockBuilder('\florinp\messenger\libs\download')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->controller = new \florinp\messenger\controller\main(
-            $request,
-            $user,
-            $model,
-            $notification_manager,
-            $emojione,
-            $upload,
-            $download
-        );
-    }
-
-    public function tearDown() {
-        $this->controller = null;
-        parent::tearDown();
-    }
-
-    public function publish_data() {
-        return array(
-            array(200, json_encode(array()))
-        );
-    }
-    /**
-     * @dataProvider publish_data
-     */
-    public function test_publish($status_code, $page_content) {
-        $response = $this->controller->publish();
-        $this->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
-        $this->assertEquals($status_code, $response->getStatusCode());
-        $this->assertEquals($page_content, $response->getContent());
-    }
-
-
-    public function load_data() {
-        return array(
-            array(200, json_encode(array(
-                'success' => false,
-                'error' => 'The request is invalid'
-            )))
-        );
-    }
-    /**
-     * @dataProvider load_data
-     */
-    public function test_load($status_code, $page_content) {
-        $response = $this->controller->load();
-        $this->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
-        $this->assertEquals($status_code, $response->getStatusCode());
-        $this->assertEquals($page_content, $response->getContent());
-    }
-
-
-    public function updateMessages_data() {
-        return array(
-            array(200, json_encode(array('success' => false)))
-        );
-    }
+	/**
+	 * @var \florinp\messenger\controller\main
+	 */
+	protected $controller;
+
+	public function setUp() {
+		parent::setUp();
+		/**
+		 * @var \phpbb\user $user Mock the user class
+		 */
+		$user = $this->getMock('\phpbb\user', array(), array('\phpbb\datetime'));
+
+		/**
+		 * @var \phpbb\request\request $request
+		 */
+		$request = $this->getMockBuilder('\phpbb\request\request')
+			->disableOriginalConstructor()
+			->getMock();
+
+		/**
+		 * @var \florinp\messenger\models\main_model $model
+		 */
+		$model = $this->getMockBuilder('\florinp\messenger\models\main_model')
+			->disableOriginalConstructor()
+			->getMock();
+
+		/**
+		 * @var \phpbb\notification\manager $notification_manager
+		 */
+		$notification_manager = $this->getMockBuilder('\phpbb\notification\manager')
+			->disableOriginalConstructor()
+			->getMock();
+
+		/**
+		 * @var \florinp\messenger\libs\emojione $emojione
+		 */
+		$emojione = $this->getMockBuilder('\florinp\messenger\libs\emojione')
+			->disableOriginalConstructor()
+			->getMock();
+
+		/**
+		 * @var \florinp\messenger\libs\upload $upload
+		 */
+		$upload = $this->getMockBuilder('\florinp\messenger\libs\upload')
+			->disableOriginalConstructor()
+			->getMock();
+
+		/**
+		 * @var \florinp\messenger\libs\download $download
+		 */
+		$download = $this->getMockBuilder('\florinp\messenger\libs\download')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->controller = new \florinp\messenger\controller\main(
+			$request,
+			$user,
+			$model,
+			$notification_manager,
+			$emojione,
+			$upload,
+			$download
+		);
+	}
+
+	public function tearDown() {
+		$this->controller = null;
+		parent::tearDown();
+	}
+
+	public function publish_data() {
+		return array(
+			array(200, json_encode(array()))
+		);
+	}
+	/**
+	 * @dataProvider publish_data
+	 */
+	public function test_publish($status_code, $page_content) {
+		$response = $this->controller->publish();
+		$this->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
+		$this->assertEquals($status_code, $response->getStatusCode());
+		$this->assertEquals($page_content, $response->getContent());
+	}
+
+
+	public function load_data() {
+		return array(
+			array(200, json_encode(array(
+				'success' => false,
+				'error' => 'The request is invalid'
+			)))
+		);
+	}
+	/**
+	 * @dataProvider load_data
+	 */
+	public function test_load($status_code, $page_content) {
+		$response = $this->controller->load();
+		$this->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
+		$this->assertEquals($status_code, $response->getStatusCode());
+		$this->assertEquals($page_content, $response->getContent());
+	}
+
+
+	public function updateMessages_data() {
+		return array(
+			array(200, json_encode(array('success' => false)))
+		);
+	}
 }
\ No newline at end of file

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,

controller/friends.php

Indentation +156 added lines, -156 removed lines

@@ -12,160 +12,160 @@
 class friends
 {
 
-    protected $template;
-    protected $user;
-    protected $user_loader;
-    protected $model;
-    protected $request;
-    protected $notification_manager;
-    protected $u_action;
-
-    public function __construct(
-        template $template,
-        request $request,
-        user $user,
-        user_loader $user_loader,
-        friends_model $model,
-        manager $notification_manager
-    )
-    {
-        $this->template = $template;
-        $this->request = $request;
-        $this->user = $user;
-        $this->user_loader = $user_loader;
-        $this->model = $model;
-        $this->notification_manager = $notification_manager;
-    }
-
-    public function friends_list()
-    {
-        $friends = $this->model->getFriends();
-        $i = 0;
-        foreach ($friends as $friend) {
-            $i = $i + 1;
-            $this->user_loader->load_users(array(
-                $friend['user_id']
-            ));
-            $this->template->assign_block_vars('friends', array(
-                'user_id' => $friend['user_id'],
-                'username' => $this->user_loader->get_username($friend['user_id'], 'full'),
-                'user_colour' => $friend['user_colour'],
-                'user_status' => ($friend['user_status'] == 1) ? 'online' : 'offline',
-                'row_count' => $i
-            ));
-        }
-
-        $this->template->assign_vars(array(
-            'U_ACTION' => $this->u_action,
-        ));
-    }
-
-    public function requests()
-    {
-        $requests = $this->model->get_friends_requests();
-        $i = 0;
-        foreach ($requests as $request) {
-            $i = $i + 1;
-            $this->user_loader->load_users(array(
-                $request['user_id'],
-                $request['sender_id']
-            ));
-            $this->template->assign_block_vars('requests', array(
-                'request_id' => $request['request_id'],
-                'sender_username' => $this->user_loader->get_username($request['sender_id'], 'full'),
-                'status' => ($request['status'] == 1) ? ($this->user->lang['APPROVED']) : ($this->user->lang['WAITING_FOR_APPROVAL']),
-                'time' => date('d M Y H:i:s', $request['time']),
-                'row_count' => $i
-            ));
-        }
-
-        $this->template->assign_vars(array(
-            'U_ACTION' => $this->u_action,
-        ));
-    }
-
-    public function delete_request($requests_id)
-    {
-        if (is_array($requests_id)) {
-            foreach ($requests_id as $id) {
-                $this->model->delete_friend_request($id);
-            }
-        } else {
-            $this->model->delete_friend_request($requests_id);
-        }
-    }
-
-    public function approve_request($requests_id)
-    {
-        if (is_array($requests_id)) {
-            foreach ($requests_id as $id) {
-                $request_data = $this->model->get_friend_request($id);
-                if ($request_data) {
-                    $this->model->add_friend(array(
-                        'user_id' => $request_data['user_id'],
-                        'friend_id' => $request_data['sender_id']
-                    ));
-                }
-
-            }
-        } else {
-            $this->model->approve_friend_request($requests_id);
-            $request_data = $this->model->get_friend_request($requests_id);
-            $this->model->add_friend(array(
-                'user_id' => $request_data['user_id'],
-                'friend_id' => $request_data['sender_id']
-            ));
-        }
-    }
-
-    public function send_request($user_id)
-    {
-        $user_id = (int)$user_id;
-        $sender_id = $this->user->data['user_id'];
-
-        $insert = array(
-            'user_id' => $user_id,
-            'sender_id' => $sender_id
-        );
-
-        if ($request_id = $this->model->insert_friends_request($insert)) {
-
-            $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(
-                'florinp.messenger.notification.type.friend_request'
-            ), $notification_data);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    public function remove_friend($user_id)
-    {
-
-        if (is_array($user_id)) {
-            foreach ($user_id as $id) {
-                $this->model->remove_friend($id);
-            }
-            return true;
-        } else {
-            if ($user_id > 1) {
-                $this->model->remove_friend($user_id);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public function set_page_url($u_action)
-    {
-        $this->u_action = $u_action;
-    }
+	protected $template;
+	protected $user;
+	protected $user_loader;
+	protected $model;
+	protected $request;
+	protected $notification_manager;
+	protected $u_action;
+
+	public function __construct(
+		template $template,
+		request $request,
+		user $user,
+		user_loader $user_loader,
+		friends_model $model,
+		manager $notification_manager
+	)
+	{
+		$this->template = $template;
+		$this->request = $request;
+		$this->user = $user;
+		$this->user_loader = $user_loader;
+		$this->model = $model;
+		$this->notification_manager = $notification_manager;
+	}
+
+	public function friends_list()
+	{
+		$friends = $this->model->getFriends();
+		$i = 0;
+		foreach ($friends as $friend) {
+			$i = $i + 1;
+			$this->user_loader->load_users(array(
+				$friend['user_id']
+			));
+			$this->template->assign_block_vars('friends', array(
+				'user_id' => $friend['user_id'],
+				'username' => $this->user_loader->get_username($friend['user_id'], 'full'),
+				'user_colour' => $friend['user_colour'],
+				'user_status' => ($friend['user_status'] == 1) ? 'online' : 'offline',
+				'row_count' => $i
+			));
+		}
+
+		$this->template->assign_vars(array(
+			'U_ACTION' => $this->u_action,
+		));
+	}
+
+	public function requests()
+	{
+		$requests = $this->model->get_friends_requests();
+		$i = 0;
+		foreach ($requests as $request) {
+			$i = $i + 1;
+			$this->user_loader->load_users(array(
+				$request['user_id'],
+				$request['sender_id']
+			));
+			$this->template->assign_block_vars('requests', array(
+				'request_id' => $request['request_id'],
+				'sender_username' => $this->user_loader->get_username($request['sender_id'], 'full'),
+				'status' => ($request['status'] == 1) ? ($this->user->lang['APPROVED']) : ($this->user->lang['WAITING_FOR_APPROVAL']),
+				'time' => date('d M Y H:i:s', $request['time']),
+				'row_count' => $i
+			));
+		}
+
+		$this->template->assign_vars(array(
+			'U_ACTION' => $this->u_action,
+		));
+	}
+
+	public function delete_request($requests_id)
+	{
+		if (is_array($requests_id)) {
+			foreach ($requests_id as $id) {
+				$this->model->delete_friend_request($id);
+			}
+		} else {
+			$this->model->delete_friend_request($requests_id);
+		}
+	}
+
+	public function approve_request($requests_id)
+	{
+		if (is_array($requests_id)) {
+			foreach ($requests_id as $id) {
+				$request_data = $this->model->get_friend_request($id);
+				if ($request_data) {
+					$this->model->add_friend(array(
+						'user_id' => $request_data['user_id'],
+						'friend_id' => $request_data['sender_id']
+					));
+				}
+
+			}
+		} else {
+			$this->model->approve_friend_request($requests_id);
+			$request_data = $this->model->get_friend_request($requests_id);
+			$this->model->add_friend(array(
+				'user_id' => $request_data['user_id'],
+				'friend_id' => $request_data['sender_id']
+			));
+		}
+	}
+
+	public function send_request($user_id)
+	{
+		$user_id = (int)$user_id;
+		$sender_id = $this->user->data['user_id'];
+
+		$insert = array(
+			'user_id' => $user_id,
+			'sender_id' => $sender_id
+		);
+
+		if ($request_id = $this->model->insert_friends_request($insert)) {
+
+			$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(
+				'florinp.messenger.notification.type.friend_request'
+			), $notification_data);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	public function remove_friend($user_id)
+	{
+
+		if (is_array($user_id)) {
+			foreach ($user_id as $id) {
+				$this->model->remove_friend($id);
+			}
+			return true;
+		} else {
+			if ($user_id > 1) {
+				$this->model->remove_friend($user_id);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public function set_page_url($u_action)
+	{
+		$this->u_action = $u_action;
+	}
 }

controller/main.php

Indentation +182 added lines, -182 removed lines

@@ -15,187 +15,187 @@
 class main
 {
 
-    protected $user;
-    protected $model;
-    protected $request;
-    protected $notification_manager;
-    protected $upload;
-    protected $download;
-
-    public function __construct(
-        request $request,
-        user $user,
-        main_model $model,
-        manager $notification_manager,
-        upload $upload,
-        download $download
-    )
-    {
-        $this->request = $request;
-        $this->user = $user;
-        $this->model = $model;
-        $this->notification_manager = $notification_manager;
-        $this->upload = $upload;
-        $this->download = $download;
-    }
-
-    public function handle()
-    {
-    }
-
-    public function index()
-    {
-
-    }
-
-    public function publish()
-    {
-        $text = $this->request->variable('text', '', true);
-        $receiver_id = $this->request->variable('receiver_id', 0);
-        $sender_id = $this->user->data['user_id'];
-
-        $response = array();
-        if ($receiver_id != 0 && trim($text) != '') {
-            $text = htmlspecialchars($text);
-            $text = str_replace(array("\n", "\r"), '', $text);
-
-            $message = array(
-                'sender_id' => $sender_id,
-                'receiver_id' => $receiver_id,
-                'text' => $text,
-                'sentAt' => time()
-            );
-
-            if ($id = $this->model->sendMessage($message)) {
-                $lastMessage = $this->model->getMessageById($id);
-                $response = array('success' => true, 'message' => $lastMessage);
-            } else {
-                $response = array(
-                    'succes' => false,
-                    'error' => 'An error has been ocurred!'
-                );
-            }
-        }
-
-        return new JsonResponse($response, 200);
-    }
-
-    public function getFile($id)
-    {
-        $id = explode('_', $id)[1];
-        $file = $this->model->getFileById($id);
-        $this->download->setFile($file['file']);
-        $this->download->sendDownload();
-    }
-
-    public function sendFile()
-    {
-        $receiver_id = $this->request->variable('receiver_id', 0);
-        $sender_id = $this->user->data['user_id'];
-
-        $response = array();
-        $file = $this->request->file('file');
-        if ($receiver_id != 0 && !empty($file)) {
-            if ($file['error'] == 0) {
-                $this->upload->file($file);
-                $this->upload->set_allowed_mime_types(array(
-                    'image/gif',
-                    'image/jpeg',
-                    'image/png',
-                    'application/pdf',
-                    'application/x-rar-compressed',
-                    'application/zip',
-                    'application/x-7z-compressed',
-                    'text/plain'
-                ));
-                $results = $this->upload->upload();
-                if (isset($results['errors']) && count($results['errors'])) {
-                    $response = array(
-                        'success' => false,
-                        'errors' => $results['errors']
-                    );
-                } else {
-                    $data = array(
-                        'sender_id' => $sender_id,
-                        'receiver_id' => $receiver_id,
-                        'fileName' => $results['original_filename'],
-                        'file' => $results['filename'],
-                        'type' => $results['mime'],
-                    );
-                    if ($id = $this->model->sendFile($data)) {
-                        $lastFile = $this->model->getFileById($id);
-                        $response = array(
-                            'success' => true,
-                            'file' => $lastFile
-                        );
-                    } else {
-                        $response = array(
-                            'succes' => false,
-                            'error' => 'An error has been ocurred!'
-                        );
-                    }
-                }
-            } else {
-                $response = array(
-                    'succes' => false,
-                    'error' => $file['error']
-                );
-            }
-        }
-
-        return new JsonResponse($response, 200);
-    }
-
-    public function load()
-    {
-        $friend_id = $this->request->variable('friend_id', 0);
-
-        if ($friend_id > 0) {
-            $messages = $this->model->getMessages($friend_id);
-            return new JsonResponse($messages, 200);
-        }
-        return new JsonResponse(array('success' => false, 'error' => 'The request is invalid'), 200);
-    }
-
-    public function updateMessages()
-    {
-        $friend_id = $this->request->variable('friend_id', 0);
-        if ($friend_id > 0) {
-            $newVal = $this->model->updateMessagesStatus($friend_id);
-            return new JsonResponse(array('success' => true, 'newVal' => $newVal), 200);
-        }
-        return new JsonResponse(array('success' => false), 200);
-    }
-
-    public function checkForNewMessages()
-    {
-        $friend_id = $this->request->variable('friend_id', 0);
-        if ($friend_id > 0) {
-            $messages = $this->model->getInboxFromId($friend_id);
-            return new JsonResponse(array('success' => true, 'messages' => $messages), 200);
-        }
-        return new JsonResponse(array('success' => false), 200);
-    }
-
-    public function getFriends()
-    {
-        $friends = $this->model->getFriends();
-        $friends_online = array_filter($friends, function ($friend) {
-            return $friend['user_status'] != 0;
-        });
-
-        $response = array(
-            'friends_online' => count($friends_online),
-            'friends_list' => $friends
-        );
-
-        return new JsonResponse($response, 200);
-    }
-
-    public function getEmoticons()
-    {
-        $response = array();
-        return new JsonResponse($response, 200);
-    }
+	protected $user;
+	protected $model;
+	protected $request;
+	protected $notification_manager;
+	protected $upload;
+	protected $download;
+
+	public function __construct(
+		request $request,
+		user $user,
+		main_model $model,
+		manager $notification_manager,
+		upload $upload,
+		download $download
+	)
+	{
+		$this->request = $request;
+		$this->user = $user;
+		$this->model = $model;
+		$this->notification_manager = $notification_manager;
+		$this->upload = $upload;
+		$this->download = $download;
+	}
+
+	public function handle()
+	{
+	}
+
+	public function index()
+	{
+
+	}
+
+	public function publish()
+	{
+		$text = $this->request->variable('text', '', true);
+		$receiver_id = $this->request->variable('receiver_id', 0);
+		$sender_id = $this->user->data['user_id'];
+
+		$response = array();
+		if ($receiver_id != 0 && trim($text) != '') {
+			$text = htmlspecialchars($text);
+			$text = str_replace(array("\n", "\r"), '', $text);
+
+			$message = array(
+				'sender_id' => $sender_id,
+				'receiver_id' => $receiver_id,
+				'text' => $text,
+				'sentAt' => time()
+			);
+
+			if ($id = $this->model->sendMessage($message)) {
+				$lastMessage = $this->model->getMessageById($id);
+				$response = array('success' => true, 'message' => $lastMessage);
+			} else {
+				$response = array(
+					'succes' => false,
+					'error' => 'An error has been ocurred!'
+				);
+			}
+		}
+
+		return new JsonResponse($response, 200);
+	}
+
+	public function getFile($id)
+	{
+		$id = explode('_', $id)[1];
+		$file = $this->model->getFileById($id);
+		$this->download->setFile($file['file']);
+		$this->download->sendDownload();
+	}
+
+	public function sendFile()
+	{
+		$receiver_id = $this->request->variable('receiver_id', 0);
+		$sender_id = $this->user->data['user_id'];
+
+		$response = array();
+		$file = $this->request->file('file');
+		if ($receiver_id != 0 && !empty($file)) {
+			if ($file['error'] == 0) {
+				$this->upload->file($file);
+				$this->upload->set_allowed_mime_types(array(
+					'image/gif',
+					'image/jpeg',
+					'image/png',
+					'application/pdf',
+					'application/x-rar-compressed',
+					'application/zip',
+					'application/x-7z-compressed',
+					'text/plain'
+				));
+				$results = $this->upload->upload();
+				if (isset($results['errors']) && count($results['errors'])) {
+					$response = array(
+						'success' => false,
+						'errors' => $results['errors']
+					);
+				} else {
+					$data = array(
+						'sender_id' => $sender_id,
+						'receiver_id' => $receiver_id,
+						'fileName' => $results['original_filename'],
+						'file' => $results['filename'],
+						'type' => $results['mime'],
+					);
+					if ($id = $this->model->sendFile($data)) {
+						$lastFile = $this->model->getFileById($id);
+						$response = array(
+							'success' => true,
+							'file' => $lastFile
+						);
+					} else {
+						$response = array(
+							'succes' => false,
+							'error' => 'An error has been ocurred!'
+						);
+					}
+				}
+			} else {
+				$response = array(
+					'succes' => false,
+					'error' => $file['error']
+				);
+			}
+		}
+
+		return new JsonResponse($response, 200);
+	}
+
+	public function load()
+	{
+		$friend_id = $this->request->variable('friend_id', 0);
+
+		if ($friend_id > 0) {
+			$messages = $this->model->getMessages($friend_id);
+			return new JsonResponse($messages, 200);
+		}
+		return new JsonResponse(array('success' => false, 'error' => 'The request is invalid'), 200);
+	}
+
+	public function updateMessages()
+	{
+		$friend_id = $this->request->variable('friend_id', 0);
+		if ($friend_id > 0) {
+			$newVal = $this->model->updateMessagesStatus($friend_id);
+			return new JsonResponse(array('success' => true, 'newVal' => $newVal), 200);
+		}
+		return new JsonResponse(array('success' => false), 200);
+	}
+
+	public function checkForNewMessages()
+	{
+		$friend_id = $this->request->variable('friend_id', 0);
+		if ($friend_id > 0) {
+			$messages = $this->model->getInboxFromId($friend_id);
+			return new JsonResponse(array('success' => true, 'messages' => $messages), 200);
+		}
+		return new JsonResponse(array('success' => false), 200);
+	}
+
+	public function getFriends()
+	{
+		$friends = $this->model->getFriends();
+		$friends_online = array_filter($friends, function ($friend) {
+			return $friend['user_status'] != 0;
+		});
+
+		$response = array(
+			'friends_online' => count($friends_online),
+			'friends_list' => $friends
+		);
+
+		return new JsonResponse($response, 200);
+	}
+
+	public function getEmoticons()
+	{
+		$response = array();
+		return new JsonResponse($response, 200);
+	}
 
 }

models/main_model.php

Indentation +288 added lines, -288 removed lines

@@ -11,61 +11,61 @@ 
 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;
-
-
-    public function __construct(
-        config $config,
-        driver_interface $phpbb_db,
-        user $user,
-        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;
-    }
-
-    /**
-     * get all friends
-     * @return array the list of friends
-     */
-    public function getFriends()
-    {
-        $sql = "
+	/**
+	 * @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;
+
+
+	public function __construct(
+		config $config,
+		driver_interface $phpbb_db,
+		user $user,
+		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;
+	}
+
+	/**
+	 * get all friends
+	 * @return array the list of friends
+	 */
+	public function getFriends()
+	{
+		$sql = "
             SELECT u.user_id,
                    u.username,
                    u.username_clean,
@@ -79,31 +79,31 @@ 
             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,
-                '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 = "
+		$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,
+				'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 . "
@@ -111,233 +111,233 @@ 
 				AND friend = 1
 				AND foe = 0
 		";
-        $result = $this->phpbb_db->sql_query($sql);
-        $friend_count = (int)$this->phpbb_db->sql_fetchfield('friend_count');
-        $this->phpbb_db->sql_freeresult($result);
-
-        if ($friend_count > 0) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Get number of unread messages from an user
-     * @param $friend_id
-     * @return int
-     */
-    public function getInboxFromId($friend_id)
-    {
-        $sql = "SELECT *
+		$result = $this->phpbb_db->sql_query($sql);
+		$friend_count = (int)$this->phpbb_db->sql_fetchfield('friend_count');
+		$this->phpbb_db->sql_freeresult($result);
+
+		if ($friend_count > 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Get number of unread messages from an user
+	 * @param $friend_id
+	 * @return int
+	 */
+	public function getInboxFromId($friend_id)
+	{
+		$sql = "SELECT *
 				FROM `messages`
 				WHERE `sender_id` = :sender_id
 					AND `receiver_id` = :receiver_id
 					AND `newMsg` = 1
 		";
-        $results = $this->db->select($sql, array(
-            ':sender_id' => (int)$friend_id,
-            ':receiver_id' => (int)$this->user->data['user_id']
-        ));
-
-        return count($results);
-    }
-
-    /**
-     * Insert a message in database
-     * @param array $data Message data
-     * @return bool|string
-     */
-    public function sendMessage($data)
-    {
-        $insert = array(
-            'sender_id' => $data['sender_id'],
-            'receiver_id' => $data['receiver_id'],
-            'text' => $data['text'],
-            'newMsg' => 1,
-            'sentAt' => time()
-        );
-
-        if ($this->db->insert('messages', $insert))
-            return $this->db->lastInsertId();
-        else
-            return false;
-    }
-
-    /**
-     * Insert a file in database
-     * @param $data File data
-     * @return bool|string
-     */
-    public function sendFile($data)
-    {
-        $insert = array(
-            'sender_id' => $data['sender_id'],
-            'receiver_id' => $data['receiver_id'],
-            'fileName' => $data['fileName'],
-            'file' => $data['file'],
-            'type' => $data['type'],
-            'sentAt' => time()
-        );
-
-        if ($this->db->insert('files', $insert))
-            return $this->db->lastInsertId();
-        else
-            return false;
-    }
-
-    /**
-     * Returns a message by a id
-     * @param $id Message id
-     * @return mixed
-     */
-    public function getMessageById($id)
-    {
-        $sql = "
+		$results = $this->db->select($sql, array(
+			':sender_id' => (int)$friend_id,
+			':receiver_id' => (int)$this->user->data['user_id']
+		));
+
+		return count($results);
+	}
+
+	/**
+	 * Insert a message in database
+	 * @param array $data Message data
+	 * @return bool|string
+	 */
+	public function sendMessage($data)
+	{
+		$insert = array(
+			'sender_id' => $data['sender_id'],
+			'receiver_id' => $data['receiver_id'],
+			'text' => $data['text'],
+			'newMsg' => 1,
+			'sentAt' => time()
+		);
+
+		if ($this->db->insert('messages', $insert))
+			return $this->db->lastInsertId();
+		else
+			return false;
+	}
+
+	/**
+	 * Insert a file in database
+	 * @param $data File data
+	 * @return bool|string
+	 */
+	public function sendFile($data)
+	{
+		$insert = array(
+			'sender_id' => $data['sender_id'],
+			'receiver_id' => $data['receiver_id'],
+			'fileName' => $data['fileName'],
+			'file' => $data['file'],
+			'type' => $data['type'],
+			'sentAt' => time()
+		);
+
+		if ($this->db->insert('files', $insert))
+			return $this->db->lastInsertId();
+		else
+			return false;
+	}
+
+	/**
+	 * Returns a message by a id
+	 * @param $id Message id
+	 * @return mixed
+	 */
+	public function getMessageById($id)
+	{
+		$sql = "
 			SELECT *
 			FROM `messages`
 			WHERE `id` = :id
 			LIMIT 1
 		";
-        $message = $this->db->select($sql, array(
-            ':id' => $id
-        ));
-
-        return $message[0];
-    }
-
-    /**
-     * Returns a file by id
-     * @param $id File id
-     * @return mixed
-     */
-    public function getFileById($id)
-    {
-        $sql = "
+		$message = $this->db->select($sql, array(
+			':id' => $id
+		));
+
+		return $message[0];
+	}
+
+	/**
+	 * 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
-        ));
-
-        return $file[0];
-    }
-
-    /**
-     * Get all message from an user
-     * @param int $friend_id
-     * @return array
-     */
-    public function getMessages($friend_id)
-    {
-        // get the sent messages
-        $sql = "SELECT *
+		$file = $this->db->select($sql, array(
+			':id' => $id
+		));
+
+		return $file[0];
+	}
+
+	/**
+	 * Get all message from an user
+	 * @param int $friend_id
+	 * @return array
+	 */
+	public function getMessages($friend_id)
+	{
+		// get the sent messages
+		$sql = "SELECT *
 				FROM `messages`
 				WHERE `sender_id` = :sender_id
 					AND `receiver_id` = :receiver_id
 				ORDER BY `sentAt` ASC
 		";
-        $sqlFiles = "SELECT *
+		$sqlFiles = "SELECT *
 			FROM `files`
 			WHERE `sender_id` = :sender_id
 				AND `receiver_id` = :receiver_id
 			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 = array();
-            $item['id'] = $msg['id'];
-            $item['sender_id'] = $msg['sender_id'];
-            $item['receiver_id'] = $msg['receiver_id'];
-            $item['text'] = $msg['text'];
-            $item['sentAt'] = $msg['sentAt'];
-            $item['type'] = 'sent';
-
-            $sent[] = $item;
-        }
-        $inbox = array();
-        foreach ($getInbox as $msg) {
-            $item = array();
-            $item['id'] = $msg['id'];
-            $item['sender_id'] = $msg['sender_id'];
-            $item['receiver_id'] = $msg['receiver_id'];
-            $item['text'] = $msg['text'];
-            $item['sentAt'] = $msg['sentAt'];
-            $item['type'] = 'inbox';
-
-            $inbox[] = $item;
-        }
-
-        foreach ($sentFiles as $file) {
-            $item = array();
-            $item['id'] = 'f_' . $file['id'];
-            $item['sender_id'] = $file['sender_id'];
-            $item['receiver_id'] = $file['receiver_id'];
-            $item['fileName'] = $file['fileName'];
-            $item['file'] = $file['file'];
-            $item['sentAt'] = $file['sentAt'];
-            $item['type'] = 'sent';
-
-            $sent[] = $item;
-        }
-
-        foreach ($getFiles as $file) {
-            $item = array();
-            $item['id'] = 'f_' . $file['id'];
-            $item['sender_id'] = $file['sender_id'];
-            $item['receiver_id'] = $file['receiver_id'];
-            $item['fileName'] = $file['fileName'];
-            $item['file'] = $file['file'];
-            $item['sentAt'] = $file['sentAt'];
-            $item['type'] = '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;
-    }
-
-    /**
-     * Change messages status to read
-     * @param $friend_id
-     * @return int
-     */
-    public function updateMessagesStatus($friend_id)
-    {
-
-        $sql = "
+		$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 = array();
+			$item['id'] = $msg['id'];
+			$item['sender_id'] = $msg['sender_id'];
+			$item['receiver_id'] = $msg['receiver_id'];
+			$item['text'] = $msg['text'];
+			$item['sentAt'] = $msg['sentAt'];
+			$item['type'] = 'sent';
+
+			$sent[] = $item;
+		}
+		$inbox = array();
+		foreach ($getInbox as $msg) {
+			$item = array();
+			$item['id'] = $msg['id'];
+			$item['sender_id'] = $msg['sender_id'];
+			$item['receiver_id'] = $msg['receiver_id'];
+			$item['text'] = $msg['text'];
+			$item['sentAt'] = $msg['sentAt'];
+			$item['type'] = 'inbox';
+
+			$inbox[] = $item;
+		}
+
+		foreach ($sentFiles as $file) {
+			$item = array();
+			$item['id'] = 'f_' . $file['id'];
+			$item['sender_id'] = $file['sender_id'];
+			$item['receiver_id'] = $file['receiver_id'];
+			$item['fileName'] = $file['fileName'];
+			$item['file'] = $file['file'];
+			$item['sentAt'] = $file['sentAt'];
+			$item['type'] = 'sent';
+
+			$sent[] = $item;
+		}
+
+		foreach ($getFiles as $file) {
+			$item = array();
+			$item['id'] = 'f_' . $file['id'];
+			$item['sender_id'] = $file['sender_id'];
+			$item['receiver_id'] = $file['receiver_id'];
+			$item['fileName'] = $file['fileName'];
+			$item['file'] = $file['file'];
+			$item['sentAt'] = $file['sentAt'];
+			$item['type'] = '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;
+	}
+
+	/**
+	 * Change messages status to read
+	 * @param $friend_id
+	 * @return int
+	 */
+	public function updateMessagesStatus($friend_id)
+	{
+
+		$sql = "
 			UPDATE `messages`
 			SET `newMsg` = 0
 			WHERE `newMsg` = 1
@@ -345,12 +345,12 @@ 
 				AND `receiver_id` = :receiver_id
 		";
 
-        $sth = $this->db->prepare($sql);
-        $sth->bindValue(':sender_id', $friend_id);
-        $sth->bindValue(':receiver_id', $this->user->data['user_id']);
-        $sth->execute();
+		$sth = $this->db->prepare($sql);
+		$sth->bindValue(':sender_id', $friend_id);
+		$sth->bindValue(':receiver_id', $this->user->data['user_id']);
+		$sth->execute();
 
-        return $this->getInboxFromId($friend_id);
-    }
+		return $this->getInboxFromId($friend_id);
+	}
 
 }

Spacing +10 added lines, -10 removed lines

@@ -73,10 +73,10 @@ 
                    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->phpbb_db->sql_query($sql);
@@ -105,9 +105,9 @@ 
     {
         $sql = "
 			SELECT COUNT(zebra_id) as friend_count
-			FROM " . ZEBRA_TABLE . "
-			WHERE user_id = " . (int)$friend_id . "
-				AND zebra_id = " . (int)$this->user->data['user_id'] . "
+			FROM " . ZEBRA_TABLE."
+			WHERE user_id = " . (int)$friend_id."
+				AND zebra_id = " . (int)$this->user->data['user_id']."
 				AND friend = 1
 				AND foe = 0
 		";
@@ -291,7 +291,7 @@ 
 
         foreach ($sentFiles as $file) {
             $item = array();
-            $item['id'] = 'f_' . $file['id'];
+            $item['id'] = 'f_'.$file['id'];
             $item['sender_id'] = $file['sender_id'];
             $item['receiver_id'] = $file['receiver_id'];
             $item['fileName'] = $file['fileName'];
@@ -304,7 +304,7 @@ 
 
         foreach ($getFiles as $file) {
             $item = array();
-            $item['id'] = 'f_' . $file['id'];
+            $item['id'] = 'f_'.$file['id'];
             $item['sender_id'] = $file['sender_id'];
             $item['receiver_id'] = $file['receiver_id'];
             $item['fileName'] = $file['fileName'];
@@ -317,7 +317,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;
         });
 

Braces +10 added lines, -8 removed lines

@@ -158,10 +158,11 @@ 
             'sentAt' => time()
         );
 
-        if ($this->db->insert('messages', $insert))
-            return $this->db->lastInsertId();
-        else
-            return false;
+        if ($this->db->insert('messages', $insert)) {
+                    return $this->db->lastInsertId();
+        } else {
+                    return false;
+        }
     }
 
     /**
@@ -180,10 +181,11 @@ 
             'sentAt' => time()
         );
 
-        if ($this->db->insert('files', $insert))
-            return $this->db->lastInsertId();
-        else
-            return false;
+        if ($this->db->insert('files', $insert)) {
+                    return $this->db->lastInsertId();
+        } else {
+                    return false;
+        }
     }
 
     /**

models/friends_model.php

Indentation +135 added lines, -135 removed lines

@@ -8,30 +8,30 @@ 
 
 class friends_model
 {
-    protected $config;
-    protected $db;
-    protected $user;
-    protected $friends_request_table;
-    protected $user_friends_table;
-
-    public function __construct(
-        config $config,
-        driver_interface $db,
-        user $user,
-        $friends_request_table,
-        $user_friends_table
-    )
-    {
-        $this->config = $config;
-        $this->db = $db;
-        $this->user = $user;
-        $this->friends_request_table = $friends_request_table;
-        $this->user_friends_table = $user_friends_table;
-    }
-
-    public function getFriends()
-    {
-        $sql = "
+	protected $config;
+	protected $db;
+	protected $user;
+	protected $friends_request_table;
+	protected $user_friends_table;
+
+	public function __construct(
+		config $config,
+		driver_interface $db,
+		user $user,
+		$friends_request_table,
+		$user_friends_table
+	)
+	{
+		$this->config = $config;
+		$this->db = $db;
+		$this->user = $user;
+		$this->friends_request_table = $friends_request_table;
+		$this->user_friends_table = $user_friends_table;
+	}
+
+	public function getFriends()
+	{
+		$sql = "
             SELECT u.user_id, 
                    u.username, 
                    u.username_clean, 
@@ -45,28 +45,28 @@ 
             WHERE " . $this->user_friends_table . ".user_id = " . (int)$this->user->data['user_id'] . "
             GROUP BY u.user_id
         ";
-        $result = $this->db->sql_query($sql);
+		$result = $this->db->sql_query($sql);
 
-        $friends = array();
-        while ($row = $this->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,
-            );
-        }
-        $this->db->sql_freeresult();
+		$friends = array();
+		while ($row = $this->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,
+			);
+		}
+		$this->db->sql_freeresult();
 
-        return $friends;
-    }
+		return $friends;
+	}
 
-    public function get_friends_requests()
-    {
+	public function get_friends_requests()
+	{
 
-        $requests = array();
+		$requests = array();
 
-        $sql = "
+		$sql = "
 			SELECT `request_id`,
 					`user_id`,
 					`sender_id`,
@@ -78,18 +78,18 @@ 
 			ORDER BY `time` DESC
 		";
 
-        $result = $this->db->sql_query($sql);
+		$result = $this->db->sql_query($sql);
 
-        while ($row = $this->db->sql_fetchrow($result)) {
-            $requests[] = $row;
-        }
+		while ($row = $this->db->sql_fetchrow($result)) {
+			$requests[] = $row;
+		}
 
-        return $requests;
-    }
+		return $requests;
+	}
 
-    public function get_friend_request($id)
-    {
-        $sql = "
+	public function get_friend_request($id)
+	{
+		$sql = "
 			SELECT `request_id`,
 					`user_id`,
 					`sender_id`,
@@ -101,19 +101,19 @@ 
 			ORDER BY `time` DESC
 			LIMIT 1
 		";
-        $result = $this->db->sql_query($sql);
-        $row = $this->db->sql_fetchrow($result);
-
-        if ($this->approve_friend_request($id)) {
-            return $row;
-        } else {
-            return false;
-        }
-    }
-
-    public function get_request_by_sender_id($sender_id)
-    {
-        $sql = "
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+
+		if ($this->approve_friend_request($id)) {
+			return $row;
+		} else {
+			return false;
+		}
+	}
+
+	public function get_request_by_sender_id($sender_id)
+	{
+		$sql = "
             SELECT `request_id`,
 					`user_id`,
 					`sender_id`,
@@ -125,15 +125,15 @@ 
 			ORDER BY `time` DESC
 			LIMIT 1 
         ";
-        $result = $this->db->sql_query($sql);
-        $row = $this->db->sql_fetchrow($result);
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
 
-        return $row;
-    }
+		return $row;
+	}
 
-    public function insert_friends_request(array $data)
-    {
-        $sql = "
+	public function insert_friends_request(array $data)
+	{
+		$sql = "
       INSERT INTO " . $this->friends_request_table . "
         (
           `user_id`,
@@ -149,35 +149,35 @@ 
           " . 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 = "
+	public function delete_friend_request($request_id)
+	{
+		$sql = "
 			DELETE FROM " . $this->friends_request_table . " WHERE `request_id` = " . (int)$request_id . "
 		";
 
-        return $this->db->sql_query($sql);
-    }
+		return $this->db->sql_query($sql);
+	}
 
-    public function approve_friend_request($request_id)
-    {
-        $sql = "
+	public function approve_friend_request($request_id)
+	{
+		$sql = "
 			UPDATE " . $this->friends_request_table . " SET `status` = 1 WHERE `request_id` = " . (int)$request_id . "
 		";
 
-        return $this->db->sql_query($sql);
-    }
+		return $this->db->sql_query($sql);
+	}
 
-    public function add_friend($data)
-    {
+	public function add_friend($data)
+	{
 
-        $check_friend = $this->check_friend($data);
-        if ($check_friend == false) {
-            $sql = "
+		$check_friend = $this->check_friend($data);
+		if ($check_friend == false) {
+			$sql = "
 				INSERT INTO " . $this->user_friends_table . "
 					(
 						`user_id`,
@@ -189,41 +189,41 @@ 
 						" . (int)$data['friend_id'] . "
 					)
 			";
-            if ($this->db->sql_query($sql)) {
-                $aux = $data['user_id'];
-                $data['user_id'] = $data['friend_id'];
-                $data['friend_id'] = $aux;
-
-                self::add_friend($data);
-            } else {
-                return false;
-            }
-        } else {
-            return false;
-        }
-
-    }
-
-    public function check_friend($data)
-    {
-        $sql = "
+			if ($this->db->sql_query($sql)) {
+				$aux = $data['user_id'];
+				$data['user_id'] = $data['friend_id'];
+				$data['friend_id'] = $aux;
+
+				self::add_friend($data);
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
+
+	}
+
+	public function check_friend($data)
+	{
+		$sql = "
 			SELECT COUNT(*) AS `count`
 			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) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public function check_request($data)
-    {
-        $sql = "
+		$this->db->sql_query($sql);
+		$count = $this->db->sql_fetchfield('count');
+		if ($count > 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	public function check_request($data)
+	{
+		$sql = "
 			SELECT COUNT(*) AS `count`
 			FROM " . $this->friends_request_table . "
 			WHERE `user_id` = " . (int)$data['user_id'] . "
@@ -231,22 +231,22 @@ 
 					AND `status` = 0
 			LIMIT 1
 		";
-        $this->db->sql_query($sql);
-        $count = $this->db->sql_fetchfield('count');
-        if ($count > 0) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public function remove_friend($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 . "";
-        $this->db->sql_query($sql);
-    }
+		$this->db->sql_query($sql);
+		$count = $this->db->sql_fetchfield('count');
+		if ($count > 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	public function remove_friend($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 . "";
+		$this->db->sql_query($sql);
+	}
 
 }

Spacing +27 added lines, -27 removed lines

@@ -39,10 +39,10 @@ 
                    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);
@@ -72,8 +72,8 @@ 
 					`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
 		";
@@ -95,8 +95,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
@@ -119,8 +119,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 
@@ -134,7 +134,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`,
@@ -143,10 +143,10 @@ 
         )
       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);
@@ -157,7 +157,7 @@ 
     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);
@@ -166,7 +166,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);
@@ -178,15 +178,15 @@ 
         $check_friend = $this->check_friend($data);
         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)) {
@@ -208,9 +208,9 @@ 
     {
         $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');
@@ -225,9 +225,9 @@ 
     {
         $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
 		";
@@ -242,10 +242,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);
     }