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

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

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.';';
 		}
 	}

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)

ucp/ucp_friends_module.php

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