florinp / phpbb-messenger

event/main_listener.php

Braces +3 added lines, -1 removed lines

@@ -124,7 +124,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,

ext.php

Spacing +12 added lines, -12 removed lines

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

Braces +5 added lines, -1 removed lines

@@ -89,7 +89,11 @@
 	  $objects = scandir($messengerDir);
 	  foreach($objects as $object) {
 		if($object != '.' && $object != '..') {
-		  if (filetype($messengerDir."/".$object) == "dir") rmdir($messengerDir."/".$object); else unlink($messengerDir."/".$object);
+		  if (filetype($messengerDir."/".$object) == "dir") {
+		  	rmdir($messengerDir."/".$object);
+		  } else {
+		  	unlink($messengerDir."/".$object);
+		  }
 		}
 	  }
 	  reset($objects);

libs/emojione.php

Spacing +31 added lines, -31 removed lines

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

Braces +17 added lines, -34 removed lines

@@ -2432,8 +2432,7 @@ 
 	static function shortnameToAsciiCallback($m) {
 		if((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
 			return $m[0];
-		}
-		else {
+		} else {
 			$aflipped = array_flip(self::$ascii_replace);
 
 			$shortname = $m[0];
@@ -2450,8 +2449,7 @@ 
 	static function shortnameToUnicodeCallback($m) {
 		if((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
 			return $m[0];
-		}
-		else {
+		} else {
 			$flipped = array_flip(self::$unicode_replace);
 
 			$shortname = $m[1];
@@ -2468,8 +2466,7 @@ 
 	static function shortnameToImageCallback($m) {
 		if((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
 			return $m[0];
-		}
-		else {
+		} else {
 			$shortname = $m[1];
 
 			if(!isset(self::$shortcode_replace[$shortname])) {
@@ -2480,22 +2477,19 @@ 
 			$unicode = self::$shortcode_replace[$shortname];
 			$filename = strtoupper($unicode);
 
-			if(self::$unicodeAlt) { $alt = self::convert($unicode); }
-			else { $alt = $shortname; }
+			if(self::$unicodeAlt) { $alt = self::convert($unicode); } else { $alt = $shortname; }
 
 			if(self::$imageType == 'png') {
 				if(self::$sprites) {
 					return '<span class="emojione-'.strtoupper($unicode).'" title="'.htmlspecialchars($shortname).'">'.$alt.'</span>';
-				}
-				else {
+				} else {
 					return '<img class="emojione" alt="'.$alt.'" src="'.self::$imagePathPNG.$filename.'.png'.self::$cacheBustParam.'"/>';
 				}
 			}
 
 			if(self::$sprites) {
 				return '<svg class="emojione"><description>'.$alt.'</description><use xlink:href="'.self::$imagePathSVGSprites.'#emoji-'.strtoupper($unicode).'"></use></svg>';
-			}
-			else {
+			} else {
 				return '<object class="emojione" data="'.self::$imagePathSVG.$filename.'.svg'.self::$cacheBustParam.'" type="image/svg+xml" standby="'.$alt.'">'.$alt.'</object>';
 			}
 		}
@@ -2503,8 +2497,7 @@ 
 	static function asciiToUnicodeCallback($m) {
 		if((!is_array($m)) || (!isset($m[3])) || (empty($m[3]))) {
 			return $m[0];
-		}
-		else {
+		} else {
 			$shortname = $m[3];
 			$unicode = self::$ascii_replace[$shortname];
 			return $m[2].self::convert($unicode);
@@ -2513,28 +2506,24 @@ 
 	static function asciiToImageCallback($m) {
 		if((!is_array($m)) || (!isset($m[3])) || (empty($m[3]))) {
 			return $m[0];
-		}
-		else {
+		} else {
 			$shortname = html_entity_decode($m[3]);
 			$unicode = self::$ascii_replace[$shortname];
 
 			// unicode char or shortname for the alt tag? (unicode is better for copying and pasting the resulting text)
-			if(self::$unicodeAlt) { $alt = self::convert($unicode); }
-			else { $alt = htmlspecialchars($shortname); }
+			if(self::$unicodeAlt) { $alt = self::convert($unicode); } else { $alt = htmlspecialchars($shortname); }
 
 			if(self::$imageType == 'png') {
 				if(self::$sprites) {
 					return $m[2].'<span class="emojione-'.strtoupper($unicode).'" title="'.htmlspecialchars($shortname).'">'.$alt.'</span>';
-				}
-				else {
+				} else {
 					return $m[2].'<img class="emojione" alt="'.$alt.'" src="'.self::$imagePathPNG.strtoupper($unicode).'.png'.self::$cacheBustParam.'"/>';
 				}
 			}
 
 			if(self::$sprites) {
 				return $m[2].'<svg class="emojione"><description>'.$alt.'</description><use xlink:href="'.self::$imagePathSVGSprites.'#emoji-'.strtoupper($unicode).'"></use></svg>';
-			}
-			else {
+			} else {
 				return $m[2].'<object class="emojione" data="'.self::$imagePathSVG.strtoupper($unicode).'.svg'.self::$cacheBustParam.'" type="image/svg+xml" standby="'.$alt.'">'.$alt.'</object>';
 			}
 		}
@@ -2542,8 +2531,7 @@ 
 	static function toShortCallback($m) {
 		if((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
 			return $m[0];
-		}
-		else {
+		} else {
 			$unicode = $m[1];
 			if(!isset(self::$unicode_replace[$unicode])) {
 				$unicode = substr($m[1], 0, 4);
@@ -2558,8 +2546,7 @@ 
 	static function unicodeToImageCallback($m) {
 		if((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
 			return $m[0];
-		}
-		else {
+		} else {
 			$unicode = $m[1];
 
 			if(!isset(self::$unicode_replace[$unicode])) {
@@ -2572,22 +2559,19 @@ 
 			$shortname = self::$unicode_replace[$unicode];
 			$filename = strtoupper(self::$shortcode_replace[$shortname]);
 
-			if(self::$unicodeAlt) { $alt = $unicode; }
-			else { $alt = $shortname; }
+			if(self::$unicodeAlt) { $alt = $unicode; } else { $alt = $shortname; }
 
 			if(self::$imageType == 'png') {
 				if(self::$sprites) {
 					return '<span class="emojione-'.strtoupper($unicode).'" title="'.htmlspecialchars($shortname).'">'.$alt.'</span>';
-				}
-				else {
+				} else {
 					return '<img class="emojione" alt="'.$alt.'" src="'.self::$imagePathPNG.$filename.'.png'.self::$cacheBustParam.'"/>';
 				}
 			}
 
 			if(self::$sprites) {
 				return '<svg class="emojione"><description>'.$alt.'</description><use xlink:href="'.self::$imagePathSVGSprites.'#emoji-'.strtoupper($unicode).'"></use></svg>';
-			}
-			else {
+			} else {
 				return '<object class="emojione" data="'.self::$imagePathSVG.$filename.'.svg'.self::$cacheBustParam.'" type="image/svg+xml" standby="'.$alt.'">'.$alt.'</object>';
 			}
 		}
@@ -2600,8 +2584,7 @@ 
 		if(stristr($unicode,'-')) {
 			$pairs = explode('-',$unicode);
 			return '&#x'.implode(';&#x',$pairs).';';
-		}
-		else {
+		} else {
 			return '&#x'.$unicode.';';
 		}
 	}

migrations/m3_ucp_friends_module.php

Spacing +2 added lines, -2 removed lines

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

models/main_model.php

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

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);
 				}

Braces +3 added lines, -6 removed lines

@@ -85,8 +85,7 @@ 
 								{
 								  redirect($redirect_url);
 								}
-							}
-							else
+							} else
 							{
 								$user_id = $request->variable('user_id', array(0));
 								$redirect_url = $request->server('HTTP_REFERER');
@@ -118,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(
@@ -149,8 +147,7 @@ 
 				{
 					redirect($redirect_url);
 				}
-			  }
-			  else
+			  } else
 			  {
 				$request_id = $request->variable('request_id', 0);
 				$redirect_url = $request->server('HTTP_REFERER');