florinp / phpbb-messenger

migrations/m3_ucp_friends_module.php

Spacing +2 added lines, -2 removed lines

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

notification/type/friend_request.php

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_module.php

Spacing +15 added lines, -15 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);
 					}
@@ -71,17 +71,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);
 								}
@@ -106,15 +106,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);
@@ -138,14 +138,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);
 				}

libs/database.php

Spacing +3 added lines, -3 removed lines

@@ -12,8 +12,8 @@ 
     {
         global $phpbb_root_path;
 
-        $database = $phpbb_root_path . 'store/messenger.db';
-        parent::__construct('sqlite:' . $database);
+        $database = $phpbb_root_path.'store/messenger.db';
+        parent::__construct('sqlite:'.$database);
         parent::setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
     }
 
@@ -41,7 +41,7 @@ 
         //ksort($data);
 
         $fieldNames = implode('`, `', array_keys($data));
-        $fieldValues = ':' . implode(', :', array_keys($data));
+        $fieldValues = ':'.implode(', :', array_keys($data));
 
         $sth = $this->prepare("INSERT INTO $table (`$fieldNames`) VALUES ($fieldValues)");
 

libs/upload.php

Spacing +8 added lines, -8 removed lines

@@ -147,10 +147,10 @@ 
      */
     public function __construct($phpbb_root_path)
     {
-            $phpbb_root_path = $phpbb_root_path . 'store/messenger/files';
+            $phpbb_root_path = $phpbb_root_path.'store/messenger/files';
         // set & create destination path
         if (!$this->set_destination($phpbb_root_path)) {
-            throw new Exception('Upload: Can\'t create destination. ' . $this->root . $this->destination);
+            throw new Exception('Upload: Can\'t create destination. '.$this->root.$this->destination);
         }
 
         //create finfo object
@@ -244,8 +244,8 @@ 
         $this->file['filename'] = $this->filename;
 
         //set full path
-        $this->file['full_path'] = $this->root . $this->destination . $this->filename;
-        $this->file['path'] = $this->destination . $this->filename;
+        $this->file['full_path'] = $this->root.$this->destination.$this->filename;
+        $this->file['path'] = $this->destination.$this->filename;
 
         $status = move_uploaded_file($this->tmp_name, $this->file['full_path']);
 
@@ -476,7 +476,7 @@ 
      */
     protected function set_destination($destination)
     {
-        $this->destination = $destination . DIRECTORY_SEPARATOR;
+        $this->destination = $destination.DIRECTORY_SEPARATOR;
         return $this->destination_exist() ? TRUE : $this->create_destination();
     }
 
@@ -487,7 +487,7 @@ 
      */
     protected function destination_exist()
     {
-        return is_writable($this->root . $this->destination);
+        return is_writable($this->root.$this->destination);
     }
 
     /**
@@ -497,7 +497,7 @@ 
      */
     protected function create_destination()
     {
-        return mkdir($this->root . $this->destination, $this->default_permissions, true);
+        return mkdir($this->root.$this->destination, $this->default_permissions, true);
     }
 
     /**
@@ -507,7 +507,7 @@ 
      */
     protected function create_new_filename()
     {
-        $filename = sha1(mt_rand(1, 9999) . $this->destination . uniqid()) . time() . '.' . $this->extension;
+        $filename = sha1(mt_rand(1, 9999).$this->destination.uniqid()).time().'.'.$this->extension;
         $this->set_filename($filename);
     }
 

libs/download.php

Spacing +6 added lines, -6 removed lines

@@ -33,7 +33,7 @@ 
      * @param string $phpbb_root_path phpBB root path
      */
     public function __construct($phpbb_root_path) {
-        $this->directory = $phpbb_root_path . 'store/messenger/files';
+        $this->directory = $phpbb_root_path.'store/messenger/files';
     }
 
 
@@ -43,10 +43,10 @@ 
      * @throws InvalidArgumentException when the file not exist or is not readable
      */
     public function setFile($filename) {
-        $file_full_path = $this->directory . '/'. $filename;
-        if(!is_file($file_full_path)) {
+        $file_full_path = $this->directory.'/'.$filename;
+        if (!is_file($file_full_path)) {
             throw new InvalidArgumentException("File does not exist");
-        } else if(!is_readable($file_full_path)) {
+        } else if (!is_readable($file_full_path)) {
             throw new InvalidArgumentException("File to download is not readable.");
         }
         $this->filename = $filename;
@@ -80,7 +80,7 @@ 
      * @param bool|true $forceDownload
      */
     public function sendDownload($forceDownload = true) {
-        if(headers_sent()) {
+        if (headers_sent()) {
             throw new \RuntimeException("Cannot send file to the browser, since the headers were already sent");
         }
         $mimeType = $this->getMimeType();
@@ -95,7 +95,7 @@ 
         header("Cache-Control: private", false);
         header("Content-Type: application/octet-stream");
 
-        if($forceDownload) {
+        if ($forceDownload) {
             header("Content-Disposition: attachment; filename=\"{$this->filename}\";");
         } else {
             header("Content-Disposition: filename=\"{$this->filename}\";");

controller/main.php

Spacing +1 added lines, -1 removed lines

@@ -219,7 +219,7 @@
         }
 
         $friends = $this->model->getFriends();
-        $friends_online = array_filter($friends, function ($friend) {
+        $friends_online = array_filter($friends, function($friend) {
             return $friend['user_status'] != 0;
         });
 

ext.php

Spacing +13 added lines, -13 removed lines

@@ -33,10 +33,10 @@ 
           );
         ");
 
-                $messengerDir = $phpbb_root_path . 'store/messenger';
+                $messengerDir = $phpbb_root_path.'store/messenger';
                 if (!is_dir($messengerDir)) {
                     mkdir($messengerDir, 0777);
-                    $filesDir = $messengerDir . '/files';
+                    $filesDir = $messengerDir.'/files';
                     if (!is_dir($filesDir)) {
                         mkdir($filesDir, 0777);
                     }
@@ -77,24 +77,24 @@ 
     {
         global $phpbb_root_path;
 
-        $database = $phpbb_root_path . 'store/messenger.db';
+        $database = $phpbb_root_path.'store/messenger.db';
         if (is_file($database)) {
             unlink($database);
         }
 
-        $messengerDir = $phpbb_root_path . 'store/messenger';
+        $messengerDir = $phpbb_root_path.'store/messenger';
         if (is_dir($messengerDir)) {
             $objects = scandir($messengerDir);
             foreach ($objects as $object) {
                 if ($object != '.' && $object != '..') {
-                    if (filetype($messengerDir . "/" . $object) == "dir") {
-                        $dir = $messengerDir . "/" . $object;
+                    if (filetype($messengerDir."/".$object) == "dir") {
+                        $dir = $messengerDir."/".$object;
                         $subObjects = scandir($dir);
-                        if(count($subObjects) > 0) {
-                            foreach($subObjects as $subObject) {
-                                if($subObject != '.' && $subObject != '..') {
-                                    if(filetype($dir . '/' . $subObject) != 'dir') {
-                                        unlink($dir . '/' . $subObject);
+                        if (count($subObjects) > 0) {
+                            foreach ($subObjects as $subObject) {
+                                if ($subObject != '.' && $subObject != '..') {
+                                    if (filetype($dir.'/'.$subObject) != 'dir') {
+                                        unlink($dir.'/'.$subObject);
                                     }
                                 } else {
                                     continue;
@@ -102,9 +102,9 @@ 
                             }
 
                         }
-                        rmdir($messengerDir . "/" . $object);
+                        rmdir($messengerDir."/".$object);
                     } else {
-                        unlink($messengerDir . "/" . $object);
+                        unlink($messengerDir."/".$object);
                     }
                 }
             }

event/main_listener.php

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'];