florinp / phpbb-messenger

models/main_model.php

Indentation +6 added lines, -6 removed lines

@@ -10,9 +10,9 @@ 
 	protected $phpbb_db;
 	protected $user;
 	protected $db;
-    protected $friends_request_table;
+	protected $friends_request_table;
 	protected $user_friends_table;
-    protected $emojione;
+	protected $emojione;
 
 	public function __construct(\phpbb\config\config $config, \phpbb\controller\helper $helper, \phpbb\db\driver\driver_interface $phpbb_db, \phpbb\user $user, \florinp\messenger\libs\database $db, \florinp\messenger\libs\emojione $emojione, $friends_request_table, $user_friends_table)
 	{
@@ -21,9 +21,9 @@ 
 		$this->phpbb_db = $phpbb_db;
 		$this->user = $user;
 		$this->db = $db;
-        $this->emojione = $emojione;
-        $this->friends_request_table = $friends_request_table;
-        $this->user_friends_table = $user_friends_table;
+		$this->emojione = $emojione;
+		$this->friends_request_table = $friends_request_table;
+		$this->user_friends_table = $user_friends_table;
 	}
 
 	/**
@@ -55,7 +55,7 @@ 
 				'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_status' => ($row['session_time'] >= (time() - ($this->config['load_online_time'] * 60))) ? 1 : 0,
 				'inbox' => $this->getInboxFromId($row['user_id'])
 			);
 		}

Spacing +16 added lines, -16 removed lines

@@ -40,16 +40,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->phpbb_db->sql_query($sql);
 
 		$friends = array();
-		while($row = $this->phpbb_db->sql_fetchrow($result))
+		while ($row = $this->phpbb_db->sql_fetchrow($result))
 		{
 			$friends[] = array(
 				'user_id' => $row['user_id'],
@@ -71,9 +71,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
 		";
@@ -81,7 +81,7 @@ 
 		$friend_count = (int)$this->phpbb_db->sql_fetchfield('friend_count');
 		$this->phpbb_db->sql_freeresult($result);
 
-		if($friend_count > 0) {
+		if ($friend_count > 0) {
 			return true;
 		} else {
 			return false;
@@ -114,7 +114,7 @@ 
 			'sentAt' => time()
 		);
 
-		if($this->db->insert('messages', $insert))
+		if ($this->db->insert('messages', $insert))
 			return $this->db->lastInsertId();
 		else
 			return false;
@@ -131,7 +131,7 @@ 
 			'sentAt' => time()
 		);
 
-		if($this->db->insert('files', $insert))
+		if ($this->db->insert('files', $insert))
 			return $this->db->lastInsertId();
 		else
 			return false;
@@ -201,7 +201,7 @@ 
 		));
 
 		$sent = array();
-		foreach($sentMessages as $msg)
+		foreach ($sentMessages as $msg)
 		{
 			$item = array();
 			$item['id'] = $msg['id'];
@@ -214,7 +214,7 @@ 
 			$sent[] = $item;
 		}
 		$inbox = array();
-		foreach($getInbox as $msg)
+		foreach ($getInbox as $msg)
 		{
 			$item = array();
 			$item['id'] = $msg['id'];
@@ -227,7 +227,7 @@ 
 			$inbox[] = $item;
 		}
 
-		foreach($sentFiles as $file) {
+		foreach ($sentFiles as $file) {
 			$item = array();
 			$item['id'] = 'f_'.$file['id'];
 			$item['sender_id'] = $file['sender_id'];
@@ -240,7 +240,7 @@ 
 			$sent[] = $item;
 		}
 
-		foreach($getFiles as $file) {
+		foreach ($getFiles as $file) {
 			$item = array();
 			$item['id'] = 'f_'.$file['id'];
 			$item['sender_id'] = $file['sender_id'];
@@ -260,7 +260,7 @@ 
 		});
 
 		$sorted_messages = array();
-		foreach($unsorted_messages as $msg)
+		foreach ($unsorted_messages as $msg)
 		{
 			$sorted_messages[] = $msg;
 		}

Braces +10 added lines, -8 removed lines

@@ -114,10 +114,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;
+		}
 	}
 
 	public function sendFile($data)
@@ -131,10 +132,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;
+		}
 	}
 
 	public function getMessageById($id)

notification/type/friend_request.php

Indentation +35 added lines, -35 removed lines

@@ -7,99 +7,99 @@
 
   public function get_type()
   {
-    return 'florinp.messenger.notification.type.friend_request';
+	return 'florinp.messenger.notification.type.friend_request';
   }
 
   public function __construct(\phpbb\user_loader $user_loader, \phpbb\db\driver\driver_interface $db, \phpbb\cache\driver\driver_interface $cache, \phpbb\user $user, \phpbb\auth\auth $auth, \phpbb\config\config $config, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
   {
-    $this->user_loader = $user_loader;
-    $this->db = $db;
-    $this->cache = $cache;
-    $this->user = $user;
-    $this->auth = $auth;
-    $this->config = $config;
-    $this->phpbb_root_path = $phpbb_root_path;
-    $this->php_ext = $php_ext;
-    $this->notification_types_table = $notification_types_table;
-    $this->notifications_table = $notifications_table;
-    $this->user_notifications_table = $user_notifications_table;
+	$this->user_loader = $user_loader;
+	$this->db = $db;
+	$this->cache = $cache;
+	$this->user = $user;
+	$this->auth = $auth;
+	$this->config = $config;
+	$this->phpbb_root_path = $phpbb_root_path;
+	$this->php_ext = $php_ext;
+	$this->notification_types_table = $notification_types_table;
+	$this->notifications_table = $notifications_table;
+	$this->user_notifications_table = $user_notifications_table;
   }
 
   public static $notification_option = array(
-    'group'   => 'NOTIFICATION_GROUP_MISCELLANEOUS',
+	'group'   => 'NOTIFICATION_GROUP_MISCELLANEOUS',
   );
 
   public function is_available()
   {
-    return true;
+	return true;
   }
 
   public static function get_item_id($data)
   {
-    return (int)$data['request_id'];
+	return (int)$data['request_id'];
   }
 
   public static function get_item_parent_id($data)
   {
-    return 0;
+	return 0;
   }
 
   public function users_to_query()
   {
-    return array();
+	return array();
   }
 
   public function find_users_for_notification($data, $options = array())
   {
-    $options = array_merge(array(
-       'ignore_users'      => array(),
-    ), $options);
+	$options = array_merge(array(
+	   'ignore_users'      => array(),
+	), $options);
 
-    $users = array($data['user_id']);
+	$users = array($data['user_id']);
 
-    return $this->check_user_notification_options($users, $options);
+	return $this->check_user_notification_options($users, $options);
   }
 
   public function get_title()
   {
-    $user_id = $this->user_loader->load_user_by_username($this->get_data('sender_username'));
-    return $this->user->lang('FRIEND_REQUEST_FROM') .$this->user_loader->get_username($user_id, 'no_profile');
+	$user_id = $this->user_loader->load_user_by_username($this->get_data('sender_username'));
+	return $this->user->lang('FRIEND_REQUEST_FROM') .$this->user_loader->get_username($user_id, 'no_profile');
   }
 
   public function get_url()
   {
-    return append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, "i=-florinp-messenger-ucp-ucp_friends_module&mode=requests");
+	return append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, "i=-florinp-messenger-ucp-ucp_friends_module&mode=requests");
   }
 
   public function get_avatar()
   {
-    $user_id = $this->user_loader->load_user_by_username($this->get_data('sender_username'));
-    return $this->user_loader->get_avatar($user_id);
+	$user_id = $this->user_loader->load_user_by_username($this->get_data('sender_username'));
+	return $this->user_loader->get_avatar($user_id);
   }
 
   public function get_redirect_url()
   {
-    return $this->get_url();
+	return $this->get_url();
   }
 
   public function get_email_template()
   {
-    return false;
+	return false;
   }
 
   public function get_email_template_variables()
   {
-    return array();
+	return array();
   }
 
   public function create_insert_array($data, $pre_create_data = array())
   {
-    $this->set_data('request_id', $data['request_id']);
-    $this->set_data('sender_id', $data['sender_id']);
-    $this->set_data('sender_username', $data['sender_username']);
-    $this->set_data('user_id', $data['user_id']);
+	$this->set_data('request_id', $data['request_id']);
+	$this->set_data('sender_id', $data['sender_id']);
+	$this->set_data('sender_username', $data['sender_username']);
+	$this->set_data('user_id', $data['user_id']);
 
-    return parent::create_insert_array($data, $pre_create_data);
+	return parent::create_insert_array($data, $pre_create_data);
   }
 
 

Spacing +2 added lines, -2 removed lines

@@ -63,12 +63,12 @@
   public function get_title()
   {
     $user_id = $this->user_loader->load_user_by_username($this->get_data('sender_username'));
-    return $this->user->lang('FRIEND_REQUEST_FROM') .$this->user_loader->get_username($user_id, 'no_profile');
+    return $this->user->lang('FRIEND_REQUEST_FROM').$this->user_loader->get_username($user_id, 'no_profile');
   }
 
   public function get_url()
   {
-    return append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, "i=-florinp-messenger-ucp-ucp_friends_module&mode=requests");
+    return append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, "i=-florinp-messenger-ucp-ucp_friends_module&mode=requests");
   }
 
   public function get_avatar()

ucp/ucp_friends_info.php

Indentation +14 added lines, -14 removed lines

@@ -7,20 +7,20 @@
 
   function module()
   {
-    return array(
-      'filename' => '\florinp\messenger\ucp\ucp_friends_module',
-      'title' => 'CHAT_BOX',
-      'modes' => array(
-        'friends' => array(
-          'title' => 'FRIENDS_LIST',
-          'auth' => 'ext_florinp/messenger && acl_u_access_messenger'
-        ),
-        'requests' => array(
-          'title' => 'FRIENDS_REQUESTS',
-          'auth' => 'ext_florinp/messenger && acl_u_access_messenger',
-        ),
-      )
-    );
+	return array(
+	  'filename' => '\florinp\messenger\ucp\ucp_friends_module',
+	  'title' => 'CHAT_BOX',
+	  'modes' => array(
+		'friends' => array(
+		  'title' => 'FRIENDS_LIST',
+		  'auth' => 'ext_florinp/messenger && acl_u_access_messenger'
+		),
+		'requests' => array(
+		  'title' => 'FRIENDS_REQUESTS',
+		  'auth' => 'ext_florinp/messenger && acl_u_access_messenger',
+		),
+	  )
+	);
   }
 
 }

ucp/ucp_friends_module.php

Indentation +104 added lines, -104 removed lines

@@ -10,16 +10,16 @@ 
   public function main($id, $mode)
   {
 
-    global $phpbb_container, $request, $user;
+	global $phpbb_container, $request, $user;
 
-    $friends_controller = $phpbb_container->get('florinp.messenger.friends.controller');
-    $friends_controller->set_page_url($this->u_action);
+	$friends_controller = $phpbb_container->get('florinp.messenger.friends.controller');
+	$friends_controller->set_page_url($this->u_action);
 
-    $this->tpl_name = 'friends';
+	$this->tpl_name = 'friends';
 
-    switch($mode)
-    {
-      case 'friends':
+	switch($mode)
+	{
+	  case 'friends':
 		
 		$action = $request->variable('action', '');
 		switch($action)
@@ -72,105 +72,105 @@ 
 				}
 			}
 		  break;
-            default:
-                if($request->is_set_post('action'))
-                {
-                    $action = $request->variable('action', '');
-                    switch($action) 
-                    {
-                        case 'remove':
-                            if(confirm_box(true))
-                            {
-                                $user_id = $request->variable('user_id', array(0));
-                                $redirect_url = $request->variable('redirect_url', '');
-                                if($friends_controller->remove_friend($user_id))
-                                {
-                                  redirect($redirect_url);
-                                }
-                            }
-                            else
-                            {
-                                $user_id = $request->variable('user_id', array(0));
-                                $redirect_url = $request->server('HTTP_REFERER');
-                                confirm_box(false, $user->lang('CONFIRM_REMOVE_FRIEND'), build_hidden_fields(array(
-                                  'user_id' => $user_id,
-                                  'redirect_url' => $redirect_url,
-                                )));
-                            }
-                        break;
-                    }
-                }
-                $friends_controller->friends_list();
-                $this->tpl_name = 'friends';
-            break;
+			default:
+				if($request->is_set_post('action'))
+				{
+					$action = $request->variable('action', '');
+					switch($action) 
+					{
+						case 'remove':
+							if(confirm_box(true))
+							{
+								$user_id = $request->variable('user_id', array(0));
+								$redirect_url = $request->variable('redirect_url', '');
+								if($friends_controller->remove_friend($user_id))
+								{
+								  redirect($redirect_url);
+								}
+							}
+							else
+							{
+								$user_id = $request->variable('user_id', array(0));
+								$redirect_url = $request->server('HTTP_REFERER');
+								confirm_box(false, $user->lang('CONFIRM_REMOVE_FRIEND'), build_hidden_fields(array(
+								  'user_id' => $user_id,
+								  'redirect_url' => $redirect_url,
+								)));
+							}
+						break;
+					}
+				}
+				$friends_controller->friends_list();
+				$this->tpl_name = 'friends';
+			break;
+		}
+	  break;
+
+	  case 'requests':
+
+		if($request->is_set_post('action'))
+		{
+		  $action = $request->variable('action', '');
+
+		  switch($action)
+		  {
+			case 'delete':
+
+			  if(confirm_box(true))
+			  {
+				$requests_id = $request->variable('requests_id', array(0));
+				$friends_controller->delete_request($requests_id);
+			  }
+			  else
+			  {
+				$requests_id = $request->variable('requests_id', array(0));
+				confirm_box(false, $user->lang('CONFIRM_REMOVE_REQUESTS'), build_hidden_fields(array(
+				  'requests_id' => $requests_id,
+				  'action' => $action,
+				  'mode' => $mode
+				)));
+			  }
+
+			break;
+			case 'approve':
+			  $requests_id = $request->variable('requests_id', array(0));
+			  $friends_controller->approve_request($requests_id);
+			break;
+		  }
 		}
-      break;
-
-      case 'requests':
-
-        if($request->is_set_post('action'))
-        {
-          $action = $request->variable('action', '');
-
-          switch($action)
-          {
-            case 'delete':
-
-              if(confirm_box(true))
-              {
-                $requests_id = $request->variable('requests_id', array(0));
-                $friends_controller->delete_request($requests_id);
-              }
-              else
-              {
-                $requests_id = $request->variable('requests_id', array(0));
-                confirm_box(false, $user->lang('CONFIRM_REMOVE_REQUESTS'), build_hidden_fields(array(
-                  'requests_id' => $requests_id,
-                  'action' => $action,
-                  'mode' => $mode
-                )));
-              }
-
-            break;
-            case 'approve':
-              $requests_id = $request->variable('requests_id', array(0));
-              $friends_controller->approve_request($requests_id);
-            break;
-          }
-        }
         
-        $action = $request->variable('action', '');
-        switch($action)
-        {
-            case 'cancel_request':
-                if(confirm_box(true))
-              {
-                $request_id = $request->variable('request_id', 0);
-                $redirect_url = $request->variable('redirect_url', '');
-                if($friends_controller->delete_request($request_id))
-                {
-                    redirect($redirect_url);
-                }
-              }
-              else
-              {
-                $request_id = $request->variable('request_id', 0);
-                $redirect_url = $request->server('HTTP_REFERER');
-                confirm_box(false, $user->lang('CONFIRM_REMOVE_REQUESTS'), build_hidden_fields(array(
-                  'request_id' => $request_id,
-                  'action' => $action,
-                  'mode' => $mode,
-                  'redirect_url' => $redirect_url,
-                )));
-              }
-            break;
-        }
-
-    		$friends_controller->requests();
-    		$this->tpl_name = 'ucp_friends_requests';
-    	break;
-
-    }
+		$action = $request->variable('action', '');
+		switch($action)
+		{
+			case 'cancel_request':
+				if(confirm_box(true))
+			  {
+				$request_id = $request->variable('request_id', 0);
+				$redirect_url = $request->variable('redirect_url', '');
+				if($friends_controller->delete_request($request_id))
+				{
+					redirect($redirect_url);
+				}
+			  }
+			  else
+			  {
+				$request_id = $request->variable('request_id', 0);
+				$redirect_url = $request->server('HTTP_REFERER');
+				confirm_box(false, $user->lang('CONFIRM_REMOVE_REQUESTS'), build_hidden_fields(array(
+				  'request_id' => $request_id,
+				  'action' => $action,
+				  'mode' => $mode,
+				  'redirect_url' => $redirect_url,
+				)));
+			  }
+			break;
+		}
+
+			$friends_controller->requests();
+			$this->tpl_name = 'ucp_friends_requests';
+		break;
+
+	}
 
   }
 

Spacing +18 added lines, -18 removed lines

@@ -17,22 +17,22 @@ 
 
     $this->tpl_name = 'friends';
 
-    switch($mode)
+    switch ($mode)
     {
       case 'friends':
 		
 		$action = $request->variable('action', '');
-		switch($action)
+		switch ($action)
 		{
 			case 'add_friend':
 				$user_id = $request->variable('user_id', 0);
-				if($user_id > 0)
+				if ($user_id > 0)
 				{
-				  if(confirm_box(true))
+				  if (confirm_box(true))
 				  {
 					$user_id = $request->variable('user_id', 0);
 					$redirect_url = $request->variable('redirect_url', '');
-					if($friends_controller->send_request($user_id))
+					if ($friends_controller->send_request($user_id))
 					{
 					  redirect($redirect_url);
 					}
@@ -50,13 +50,13 @@ 
 			  break;
 		  case 'remove_friend':
 			$user_id = $request->variable('user_id', 0);
-			if($user_id > 0)
+			if ($user_id > 0)
 			{
-				if(confirm_box(true))
+				if (confirm_box(true))
 				{
 					$user_id = $request->variable('user_id', 0);
 					$redirect_url = $request->variable('redirect_url', '');
-					if($friends_controller->remove_friend($user_id))
+					if ($friends_controller->remove_friend($user_id))
 					{
 					  redirect($redirect_url);
 					}
@@ -73,17 +73,17 @@ 
 			}
 		  break;
             default:
-                if($request->is_set_post('action'))
+                if ($request->is_set_post('action'))
                 {
                     $action = $request->variable('action', '');
-                    switch($action) 
+                    switch ($action) 
                     {
                         case 'remove':
-                            if(confirm_box(true))
+                            if (confirm_box(true))
                             {
                                 $user_id = $request->variable('user_id', array(0));
                                 $redirect_url = $request->variable('redirect_url', '');
-                                if($friends_controller->remove_friend($user_id))
+                                if ($friends_controller->remove_friend($user_id))
                                 {
                                   redirect($redirect_url);
                                 }
@@ -108,15 +108,15 @@ 
 
       case 'requests':
 
-        if($request->is_set_post('action'))
+        if ($request->is_set_post('action'))
         {
           $action = $request->variable('action', '');
 
-          switch($action)
+          switch ($action)
           {
             case 'delete':
 
-              if(confirm_box(true))
+              if (confirm_box(true))
               {
                 $requests_id = $request->variable('requests_id', array(0));
                 $friends_controller->delete_request($requests_id);
@@ -140,14 +140,14 @@ 
         }
         
         $action = $request->variable('action', '');
-        switch($action)
+        switch ($action)
         {
             case 'cancel_request':
-                if(confirm_box(true))
+                if (confirm_box(true))
               {
                 $request_id = $request->variable('request_id', 0);
                 $redirect_url = $request->variable('redirect_url', '');
-                if($friends_controller->delete_request($request_id))
+                if ($friends_controller->delete_request($request_id))
                 {
                     redirect($redirect_url);
                 }

Braces +5 added lines, -10 removed lines

@@ -36,8 +36,7 @@ 
 					{
 					  redirect($redirect_url);
 					}
-				  }
-				  else
+				  } else
 				  {
 					$user_id = $request->variable('user_id', 0);
 					$redirect_url = $request->server('HTTP_REFERER');
@@ -60,8 +59,7 @@ 
 					{
 					  redirect($redirect_url);
 					}
-				}
-				else
+				} else
 				{
 					$user_id = $request->variable('user_id', 0);
 					$redirect_url = $request->server('HTTP_REFERER');
@@ -87,8 +85,7 @@ 
                                 {
                                   redirect($redirect_url);
                                 }
-                            }
-                            else
+                            } else
                             {
                                 $user_id = $request->variable('user_id', array(0));
                                 $redirect_url = $request->server('HTTP_REFERER');
@@ -120,8 +117,7 @@ 
               {
                 $requests_id = $request->variable('requests_id', array(0));
                 $friends_controller->delete_request($requests_id);
-              }
-              else
+              } else
               {
                 $requests_id = $request->variable('requests_id', array(0));
                 confirm_box(false, $user->lang('CONFIRM_REMOVE_REQUESTS'), build_hidden_fields(array(
@@ -151,8 +147,7 @@ 
                 {
                     redirect($redirect_url);
                 }
-              }
-              else
+              } else
               {
                 $request_id = $request->variable('request_id', 0);
                 $redirect_url = $request->server('HTTP_REFERER');