florinp / phpbb-messenger

models/friends_model.php

Indentation +15 added lines, -15 removed lines

@@ -19,7 +19,7 @@ 
 		$this->user_friends_table = $user_friends_table;
 	}
 
-    public function getFriends()
+	public function getFriends()
 	{
 		$sql = "
             SELECT u.user_id, 
@@ -44,7 +44,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,
 			);
 		}
 		$this->db->sql_freeresult();
@@ -106,9 +106,9 @@ 
 		}
 	}
     
-    public function get_request_by_sender_id($sender_id)
-    {
-        $sql = "
+	public function get_request_by_sender_id($sender_id)
+	{
+		$sql = "
             SELECT `request_id`,
 					`user_id`,
 					`sender_id`,
@@ -120,11 +120,11 @@ 
 			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;
-    }
+	}
 
 	public function insert_friends_request(array $data) {
 		$sql = "
@@ -246,13 +246,13 @@ 
 		}
 	}
     
-    public function remove_friend($user_id)
-    {
-        $sql = "DELETE FROM ". $this->user_friends_table ." WHERE `user_id` = ". (int)$user_id ."";
-        $this->db->sql_query($sql);
+	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);
-    }
+		$sql = "DELETE FROM ". $this->user_friends_table ." WHERE `friend_id` = ". (int)$user_id ."";
+		$this->db->sql_query($sql);
+	}
 
 }

Spacing +36 added lines, -36 removed lines

@@ -29,16 +29,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->db->sql_query($sql);
 
 		$friends = array();
-		while($row = $this->db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$friends[] = array(
 				'user_id' => $row['user_id'],
@@ -63,15 +63,15 @@ 
 					`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
 		";
 
 		$result = $this->db->sql_query($sql);
 
-		while($row = $this->db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$requests[] = $row;
 		}
@@ -87,8 +87,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
@@ -96,7 +96,7 @@ 
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
 		
-		if($this->approve_friend_request($id))
+		if ($this->approve_friend_request($id))
 		{		
 			return $row;
 		}
@@ -114,8 +114,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 
@@ -128,7 +128,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`,
@@ -137,21 +137,21 @@ 
         )
       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 );
+		$this->db->sql_query($sql);
 
-		return $this->db->sql_nextid ();
+		return $this->db->sql_nextid();
 	}
 
 	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);
@@ -160,7 +160,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);
@@ -170,21 +170,21 @@ 
 	{
 
 		$check_friend = $this->check_friend($data);
-		if($check_friend == false)
+		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))
+			if ($this->db->sql_query($sql))
 			{
 				$aux = $data['user_id'];
 				$data['user_id'] = $data['friend_id'];
@@ -208,13 +208,13 @@ 
 	{
 		$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');
-		if($count > 0)
+		if ($count > 0)
 		{
 			return true;
 		}
@@ -228,15 +228,15 @@ 
 	{
 		$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
 		";
 		$this->db->sql_query($sql);
 		$count = $this->db->sql_fetchfield('count');
-		if($count > 0)
+		if ($count > 0)
 		{
 			return true;
 		}
@@ -248,10 +248,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);
     }
 

Braces +5 added lines, -10 removed lines

@@ -99,8 +99,7 @@ 
 		if($this->approve_friend_request($id))
 		{		
 			return $row;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -191,13 +190,11 @@ 
 				$data['friend_id'] = $aux;
 
 				self::add_friend($data);
-			}
-			else
+			} else
 			{
 				return false;
 			}
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -217,8 +214,7 @@ 
 		if($count > 0)
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -239,8 +235,7 @@ 
 		if($count > 0)
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}

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,

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

libs/upload.php

Doc Comments +2 added lines, -2 removed lines

@@ -365,7 +365,7 @@ 
     /**
      * Set allowed mime types
      *
-     * @param array $mimes
+     * @param string[] $mimes
      */
     public function set_allowed_mime_types($mimes)
     {
@@ -515,7 +515,7 @@ 
      * Convert bytes to mb.
      *
      * @param int $bytes
-     * @return int
+     * @return double
      */
     protected function bytes_to_mb($bytes)
     {

Indentation +508 added lines, -508 removed lines

@@ -13,514 +13,514 @@
 class upload
 {
 
-    /**
-     * Default directory persmissions (destination dir)
-     */
-    protected $default_permissions = 750;
-
-
-    /**
-     * File post array
-     *
-     * @var array
-     */
-    protected $files_post = array();
-
-
-    /**
-     * Destination directory
-     *
-     * @var string
-     */
-    protected $destination;
-
-
-    /**
-     * Fileinfo
-     *
-     * @var object
-     */
-    protected $finfo;
-
-
-    /**
-     * Data about file
-     *
-     * @var array
-     */
-    public $file = array();
-
-
-    /**
-     * Max. file size
-     *
-     * @var int
-     */
-    protected $max_file_size;
-
-
-    /**
-     * Allowed mime types
-     *
-     * @var array
-     */
-    protected $mimes = array();
-
-
-    /**
-     * External callback object
-     *
-     * @var obejct
-     */
-    protected $external_callback_object;
-
-
-    /**
-     * External callback methods
-     *
-     * @var array
-     */
-    protected $external_callback_methods = array();
-
-
-    /**
-     * Temp path
-     *
-     * @var string
-     */
-    protected $tmp_name;
-
-
-    /**
-     * Validation errors
-     *
-     * @var array
-     */
-    protected $validation_errors = array();
-
-
-    /**
-     * Filename (new)
-     *
-     * @var string
-     */
-    protected $filename;
-
-    /**
-     * File extension
-     * @var string
-     */
-    protected $extension;
-
-    /**
-     * Internal callbacks (filesize check, mime, etc)
-     *
-     * @var array
-     */
-    private $callbacks = array();
-
-    /**
-     * Root dir
-     *
-     * @var string
-     */
-    protected $root;
-
-    /**
-     * Return upload object
-     *
-     * $destination = 'path/to/your/file/destination/folder';
-     *
-     * @param string $phpbb_root_path
-     * @return Upload
-     */
-    public static function factory($phpbb_root_path)
-    {
-        return new Upload($phpbb_root_path);
-    }
-
-    /**
-     *  Define ROOT constant and set & create destination path
-     *
-     * @param string $phpbb_root_path
-     * @throws Exception
-     */
-    public function __construct($phpbb_root_path)
-    {
-            $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);
-        }
-
-        //create finfo object
-        $this->finfo = new finfo();
-    }
-
-    /**
-     * Set target filename
-     *
-     * @param string $filename
-     */
-    public function set_filename($filename)
-    {
-        $this->filename = $filename;
-    }
-
-    /**
-     * Check & Save file
-     *
-     * Return data about current upload
-     *
-     * @return array
-     */
-    public function upload($filename = '')
-    {
-        if ($this->check()) {
-            $this->save();
-        }
-        // return state data
-        return $this->get_state();
-    }
-
-
-    /**
-     * Save file on server
-     *
-     * Return state data
-     *
-     * @return array
-     */
-    public function save()
-    {
-        $this->save_file();
-        return $this->get_state();
-    }
-
-
-    /**
-     * Validate file (execute callbacks)
-     *
-     * Returns TRUE if validation successful
-     *
-     * @return bool
-     */
-    public function check()
-    {
-        //execute callbacks (check filesize, mime, also external callbacks
-        $this->validate();
-
-        //add error messages
-        $this->file['errors'] = $this->get_errors();
-
-        //change file validation status
-        $this->file['status'] = empty($this->validation_errors);
-
-        return $this->file['status'];
-    }
-
-    /**
-     * Get current state data
-     *
-     * @return array
-     */
-    public function get_state()
-    {
-        return $this->file;
-    }
-
-
-    /**
-     * Save file on server
-     */
-    protected function save_file()
-    {
-        //create & set new filename
-        if (empty($this->filename)) {
-            $this->create_new_filename();
-        }
-
-        //set filename
-        $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;
-
-        $status = move_uploaded_file($this->tmp_name, $this->file['full_path']);
-
-        //checks whether upload successful
-        if (!$status) {
-            throw new Exception('Upload: Can\'t upload file.');
-        }
-
-        //done
-        $this->file['status'] = true;
-    }
-
-    /**
-     * Set data about file
-     */
-    protected function set_file_data()
-    {
-        $file_size = $this->get_file_size();
-
-        $this->file = array(
-            'status' => false,
-            'destination' => $this->destination,
-            'size_in_bytes' => $file_size,
-            'size_in_mb' => $this->bytes_to_mb($file_size),
-            'mime' => $this->get_file_mime(),
-            'original_filename' => $this->file_post['name'],
-            'tmp_name' => $this->file_post['tmp_name'],
-            'post_data' => $this->file_post,
-        );
-    }
-
-    /**
-     * Set validation error
-     *
-     * @param string $message
-     */
-    public function set_error($message)
-    {
-        $this->validation_errors[] = $message;
-    }
-
-    /**
-     * Return validation errors
-     *
-     * @return array
-     */
-    public function get_errors()
-    {
-        return $this->validation_errors;
-    }
-
-    /**
-     * Set external callback methods
-     *
-     * @param object $instance_of_callback_object
-     * @param array $callback_methods
-     * @throws Exception
-     */
-    public function callbacks($instance_of_callback_object, $callback_methods)
-    {
-        if (empty($instance_of_callback_object)) {
-            throw new Exception('Upload: $instance_of_callback_object can\'t be empty.');
-        }
-
-        if (!is_array($callback_methods)) {
-            throw new Exception('Upload: $callback_methods data type need to be array.');
-        }
-
-        $this->external_callback_object = $instance_of_callback_object;
-        $this->external_callback_methods = $callback_methods;
-    }
-
-    /**
-     * Execute callbacks
-     */
-    protected function validate()
-    {
-        //get curent errors
-        $errors = $this->get_errors();
-
-        if (empty($errors)) {
-            //set data about current file
-            $this->set_file_data();
-
-            //execute internal callbacks
-            $this->execute_callbacks($this->callbacks, $this);
-
-            //execute external callbacks
-            $this->execute_callbacks($this->external_callback_methods, $this->external_callback_object);
-        }
-    }
-
-    /**
-     * Execute callbacks
-     */
-    protected function execute_callbacks($callbacks, $object)
-    {
-        foreach ($callbacks as $method) {
-            $object->$method($this);
-        }
-    }
-
-    /**
-     * File mime type validation callback
-     *
-     * @param mixed $object
-     */
-    protected function check_mime_type($object)
-    {
-        if (!empty($object->mimes)) {
-            if (!in_array($object->file['mime'], $object->mimes)) {
-                $object->set_error('Mime type not allowed.');
-            }
-        }
-    }
-
-    /**
-     * Set allowed mime types
-     *
-     * @param array $mimes
-     */
-    public function set_allowed_mime_types($mimes)
-    {
-        $this->mimes = $mimes;
-        //if mime types is set -> set callback
-        $this->callbacks[] = 'check_mime_type';
-    }
-
-    /**
-     * File size validation callback
-     *
-     * @param object $object
-     */
-    protected function check_file_size($object)
-    {
-        if (!empty($object->max_file_size)) {
-            $file_size_in_mb = $this->bytes_to_mb($object->file['size_in_bytes']);
-            if ($object->max_file_size <= $file_size_in_mb) {
-                $object->set_error('File is too big.');
-            }
-        }
-    }
-
-    /**
-     * Set max. file size
-     *
-     * @param int $size
-     */
-    public function set_max_file_size($size)
-    {
-        $this->max_file_size = $size;
-        //if max file size is set -> set callback
-        $this->callbacks[] = 'check_file_size';
-    }
-
-    /**
-     * Set File array to object
-     *
-     * @param array $file
-     */
-    public function file($file)
-    {
-        $this->set_file_array($file);
-    }
-
-    /**
-     * Set file array
-     *
-     * @param array $file
-     */
-    protected function set_file_array($file)
-    {
-        //checks whether file array is valid
-        if (!$this->check_file_array($file)) {
-            //file not selected or some bigger problems (broken files array)
-            $this->set_error('Please select file.');
-        }
-
-        //set file data
-        $this->file_post = $file;
-
-        //set tmp path
-        $this->tmp_name = $file['tmp_name'];
-
-        // set file extension
-        $this->extension = pathinfo($file['name'], PATHINFO_EXTENSION);
-    }
-
-    /**
-     * Checks whether Files post array is valid
-     *
-     * @return bool
-     */
-    protected function check_file_array($file)
-    {
-        return isset($file['error'])
-        && !empty($file['name'])
-        && !empty($file['type'])
-        && !empty($file['tmp_name'])
-        && !empty($file['size']);
-    }
-
-    /**
-     * Get file mime type
-     *
-     * @return string
-     */
-    protected function get_file_mime()
-    {
-        return $this->finfo->file($this->tmp_name, FILEINFO_MIME_TYPE);
-    }
-
-    /**
-     * Get file size
-     *
-     * @return int
-     */
-    protected function get_file_size()
-    {
-        return filesize($this->tmp_name);
-    }
-
-    /**
-     * Set destination path (return TRUE on success)
-     *
-     * @param string $destination
-     * @return bool
-     */
-    protected function set_destination($destination)
-    {
-        $this->destination = $destination . DIRECTORY_SEPARATOR;
-        return $this->destination_exist() ? TRUE : $this->create_destination();
-    }
-
-    /**
-     * Checks whether destination folder exists
-     *
-     * @return bool
-     */
-    protected function destination_exist()
-    {
-        return is_writable($this->root . $this->destination);
-    }
-
-    /**
-     * Create path to destination
-     *
-     * @return bool
-     */
-    protected function create_destination()
-    {
-        return mkdir($this->root . $this->destination, $this->default_permissions, true);
-    }
-
-    /**
-     * Set unique filename
-     *
-     * @return string
-     */
-    protected function create_new_filename()
-    {
-        $filename = sha1(mt_rand(1, 9999) . $this->destination . uniqid()) . time() . '.' . $this->extension;
-        $this->set_filename($filename);
-    }
-
-    /**
-     * Convert bytes to mb.
-     *
-     * @param int $bytes
-     * @return int
-     */
-    protected function bytes_to_mb($bytes)
-    {
-        return round(($bytes / 1048576), 2);
-    }
+	/**
+	 * Default directory persmissions (destination dir)
+	 */
+	protected $default_permissions = 750;
+
+
+	/**
+	 * File post array
+	 *
+	 * @var array
+	 */
+	protected $files_post = array();
+
+
+	/**
+	 * Destination directory
+	 *
+	 * @var string
+	 */
+	protected $destination;
+
+
+	/**
+	 * Fileinfo
+	 *
+	 * @var object
+	 */
+	protected $finfo;
+
+
+	/**
+	 * Data about file
+	 *
+	 * @var array
+	 */
+	public $file = array();
+
+
+	/**
+	 * Max. file size
+	 *
+	 * @var int
+	 */
+	protected $max_file_size;
+
+
+	/**
+	 * Allowed mime types
+	 *
+	 * @var array
+	 */
+	protected $mimes = array();
+
+
+	/**
+	 * External callback object
+	 *
+	 * @var obejct
+	 */
+	protected $external_callback_object;
+
+
+	/**
+	 * External callback methods
+	 *
+	 * @var array
+	 */
+	protected $external_callback_methods = array();
+
+
+	/**
+	 * Temp path
+	 *
+	 * @var string
+	 */
+	protected $tmp_name;
+
+
+	/**
+	 * Validation errors
+	 *
+	 * @var array
+	 */
+	protected $validation_errors = array();
+
+
+	/**
+	 * Filename (new)
+	 *
+	 * @var string
+	 */
+	protected $filename;
+
+	/**
+	 * File extension
+	 * @var string
+	 */
+	protected $extension;
+
+	/**
+	 * Internal callbacks (filesize check, mime, etc)
+	 *
+	 * @var array
+	 */
+	private $callbacks = array();
+
+	/**
+	 * Root dir
+	 *
+	 * @var string
+	 */
+	protected $root;
+
+	/**
+	 * Return upload object
+	 *
+	 * $destination = 'path/to/your/file/destination/folder';
+	 *
+	 * @param string $phpbb_root_path
+	 * @return Upload
+	 */
+	public static function factory($phpbb_root_path)
+	{
+		return new Upload($phpbb_root_path);
+	}
+
+	/**
+	 *  Define ROOT constant and set & create destination path
+	 *
+	 * @param string $phpbb_root_path
+	 * @throws Exception
+	 */
+	public function __construct($phpbb_root_path)
+	{
+			$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);
+		}
+
+		//create finfo object
+		$this->finfo = new finfo();
+	}
+
+	/**
+	 * Set target filename
+	 *
+	 * @param string $filename
+	 */
+	public function set_filename($filename)
+	{
+		$this->filename = $filename;
+	}
+
+	/**
+	 * Check & Save file
+	 *
+	 * Return data about current upload
+	 *
+	 * @return array
+	 */
+	public function upload($filename = '')
+	{
+		if ($this->check()) {
+			$this->save();
+		}
+		// return state data
+		return $this->get_state();
+	}
+
+
+	/**
+	 * Save file on server
+	 *
+	 * Return state data
+	 *
+	 * @return array
+	 */
+	public function save()
+	{
+		$this->save_file();
+		return $this->get_state();
+	}
+
+
+	/**
+	 * Validate file (execute callbacks)
+	 *
+	 * Returns TRUE if validation successful
+	 *
+	 * @return bool
+	 */
+	public function check()
+	{
+		//execute callbacks (check filesize, mime, also external callbacks
+		$this->validate();
+
+		//add error messages
+		$this->file['errors'] = $this->get_errors();
+
+		//change file validation status
+		$this->file['status'] = empty($this->validation_errors);
+
+		return $this->file['status'];
+	}
+
+	/**
+	 * Get current state data
+	 *
+	 * @return array
+	 */
+	public function get_state()
+	{
+		return $this->file;
+	}
+
+
+	/**
+	 * Save file on server
+	 */
+	protected function save_file()
+	{
+		//create & set new filename
+		if (empty($this->filename)) {
+			$this->create_new_filename();
+		}
+
+		//set filename
+		$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;
+
+		$status = move_uploaded_file($this->tmp_name, $this->file['full_path']);
+
+		//checks whether upload successful
+		if (!$status) {
+			throw new Exception('Upload: Can\'t upload file.');
+		}
+
+		//done
+		$this->file['status'] = true;
+	}
+
+	/**
+	 * Set data about file
+	 */
+	protected function set_file_data()
+	{
+		$file_size = $this->get_file_size();
+
+		$this->file = array(
+			'status' => false,
+			'destination' => $this->destination,
+			'size_in_bytes' => $file_size,
+			'size_in_mb' => $this->bytes_to_mb($file_size),
+			'mime' => $this->get_file_mime(),
+			'original_filename' => $this->file_post['name'],
+			'tmp_name' => $this->file_post['tmp_name'],
+			'post_data' => $this->file_post,
+		);
+	}
+
+	/**
+	 * Set validation error
+	 *
+	 * @param string $message
+	 */
+	public function set_error($message)
+	{
+		$this->validation_errors[] = $message;
+	}
+
+	/**
+	 * Return validation errors
+	 *
+	 * @return array
+	 */
+	public function get_errors()
+	{
+		return $this->validation_errors;
+	}
+
+	/**
+	 * Set external callback methods
+	 *
+	 * @param object $instance_of_callback_object
+	 * @param array $callback_methods
+	 * @throws Exception
+	 */
+	public function callbacks($instance_of_callback_object, $callback_methods)
+	{
+		if (empty($instance_of_callback_object)) {
+			throw new Exception('Upload: $instance_of_callback_object can\'t be empty.');
+		}
+
+		if (!is_array($callback_methods)) {
+			throw new Exception('Upload: $callback_methods data type need to be array.');
+		}
+
+		$this->external_callback_object = $instance_of_callback_object;
+		$this->external_callback_methods = $callback_methods;
+	}
+
+	/**
+	 * Execute callbacks
+	 */
+	protected function validate()
+	{
+		//get curent errors
+		$errors = $this->get_errors();
+
+		if (empty($errors)) {
+			//set data about current file
+			$this->set_file_data();
+
+			//execute internal callbacks
+			$this->execute_callbacks($this->callbacks, $this);
+
+			//execute external callbacks
+			$this->execute_callbacks($this->external_callback_methods, $this->external_callback_object);
+		}
+	}
+
+	/**
+	 * Execute callbacks
+	 */
+	protected function execute_callbacks($callbacks, $object)
+	{
+		foreach ($callbacks as $method) {
+			$object->$method($this);
+		}
+	}
+
+	/**
+	 * File mime type validation callback
+	 *
+	 * @param mixed $object
+	 */
+	protected function check_mime_type($object)
+	{
+		if (!empty($object->mimes)) {
+			if (!in_array($object->file['mime'], $object->mimes)) {
+				$object->set_error('Mime type not allowed.');
+			}
+		}
+	}
+
+	/**
+	 * Set allowed mime types
+	 *
+	 * @param array $mimes
+	 */
+	public function set_allowed_mime_types($mimes)
+	{
+		$this->mimes = $mimes;
+		//if mime types is set -> set callback
+		$this->callbacks[] = 'check_mime_type';
+	}
+
+	/**
+	 * File size validation callback
+	 *
+	 * @param object $object
+	 */
+	protected function check_file_size($object)
+	{
+		if (!empty($object->max_file_size)) {
+			$file_size_in_mb = $this->bytes_to_mb($object->file['size_in_bytes']);
+			if ($object->max_file_size <= $file_size_in_mb) {
+				$object->set_error('File is too big.');
+			}
+		}
+	}
+
+	/**
+	 * Set max. file size
+	 *
+	 * @param int $size
+	 */
+	public function set_max_file_size($size)
+	{
+		$this->max_file_size = $size;
+		//if max file size is set -> set callback
+		$this->callbacks[] = 'check_file_size';
+	}
+
+	/**
+	 * Set File array to object
+	 *
+	 * @param array $file
+	 */
+	public function file($file)
+	{
+		$this->set_file_array($file);
+	}
+
+	/**
+	 * Set file array
+	 *
+	 * @param array $file
+	 */
+	protected function set_file_array($file)
+	{
+		//checks whether file array is valid
+		if (!$this->check_file_array($file)) {
+			//file not selected or some bigger problems (broken files array)
+			$this->set_error('Please select file.');
+		}
+
+		//set file data
+		$this->file_post = $file;
+
+		//set tmp path
+		$this->tmp_name = $file['tmp_name'];
+
+		// set file extension
+		$this->extension = pathinfo($file['name'], PATHINFO_EXTENSION);
+	}
+
+	/**
+	 * Checks whether Files post array is valid
+	 *
+	 * @return bool
+	 */
+	protected function check_file_array($file)
+	{
+		return isset($file['error'])
+		&& !empty($file['name'])
+		&& !empty($file['type'])
+		&& !empty($file['tmp_name'])
+		&& !empty($file['size']);
+	}
+
+	/**
+	 * Get file mime type
+	 *
+	 * @return string
+	 */
+	protected function get_file_mime()
+	{
+		return $this->finfo->file($this->tmp_name, FILEINFO_MIME_TYPE);
+	}
+
+	/**
+	 * Get file size
+	 *
+	 * @return int
+	 */
+	protected function get_file_size()
+	{
+		return filesize($this->tmp_name);
+	}
+
+	/**
+	 * Set destination path (return TRUE on success)
+	 *
+	 * @param string $destination
+	 * @return bool
+	 */
+	protected function set_destination($destination)
+	{
+		$this->destination = $destination . DIRECTORY_SEPARATOR;
+		return $this->destination_exist() ? TRUE : $this->create_destination();
+	}
+
+	/**
+	 * Checks whether destination folder exists
+	 *
+	 * @return bool
+	 */
+	protected function destination_exist()
+	{
+		return is_writable($this->root . $this->destination);
+	}
+
+	/**
+	 * Create path to destination
+	 *
+	 * @return bool
+	 */
+	protected function create_destination()
+	{
+		return mkdir($this->root . $this->destination, $this->default_permissions, true);
+	}
+
+	/**
+	 * Set unique filename
+	 *
+	 * @return string
+	 */
+	protected function create_new_filename()
+	{
+		$filename = sha1(mt_rand(1, 9999) . $this->destination . uniqid()) . time() . '.' . $this->extension;
+		$this->set_filename($filename);
+	}
+
+	/**
+	 * Convert bytes to mb.
+	 *
+	 * @param int $bytes
+	 * @return int
+	 */
+	protected function bytes_to_mb($bytes)
+	{
+		return round(($bytes / 1048576), 2);
+	}
 
 
 } // end of Upload
\ No newline at end of file

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/database.php

Indentation +94 added lines, -94 removed lines

@@ -6,98 +6,98 @@
 
 class database extends \PDO
 {
-    protected $extension_manager;
-
-    public function __construct()
-    {
-        global $phpbb_root_path;
-
-        $database = $phpbb_root_path . 'store/messenger.db';
-        parent::__construct('sqlite:' . $database);
-        parent::setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-    }
-
-    /**
-     * @param string $sql
-     * @return array
-     */
-    public function select($sql, $array = array(), $fetchMode = PDO::FETCH_ASSOC)
-    {
-        $sth = $this->prepare($sql);
-        foreach ($array as $key => $value) {
-            $sth->bindValue("$key", $value);
-        }
-
-        $sth->execute();
-        return $sth->fetchAll($fetchMode);
-    }
-
-    /**
-     * @param string $table
-     * @return bool
-     */
-    public function insert($table, $data)
-    {
-        //ksort($data);
-
-        $fieldNames = implode('`, `', array_keys($data));
-        $fieldValues = ':' . implode(', :', array_keys($data));
-
-        $sth = $this->prepare("INSERT INTO $table (`$fieldNames`) VALUES ($fieldValues)");
-
-        foreach ($data as $key => $value) {
-            $sth->bindValue(":$key", $value);
-        }
-
-        return $sth->execute();
-    }
-
-    /**
-     * @param string $table
-     * @param array $data
-     * @param string $where
-     * @return bool
-     */
-    public function update($table, $data, $where)
-    {
-        ksort($data);
-
-        $fieldDetails = NULL;
-        foreach ($data as $key => $value) {
-            $fieldDetails .= "`$key`=:$key,";
-        }
-        $fieldDetails = rtrim($fieldDetails, ',');
-
-        $sth = $this->prepare("UPDATE $table SET $fieldDetails WHERE $where");
-
-        foreach ($data as $key => $value) {
-            $sth->bindValue(":$key", $value);
-        }
-
-        return $sth->execute();
-    }
-
-    /**
-     * @param string $table
-     * @param string $where
-     * @param int $limit
-     * @return int
-     */
-    public function delete($table, $where, $limit = 1)
-    {
-        return $this->exec("DELETE FROM $table WHERE $where LIMIT $limit");
-    }
-
-    protected function find($path, $prefix, $suffix)
-    {
-        $finder = $this->extension_manager->get_finder();
-
-        return $finder
-            ->set_extensions(array('phpbb/messenger'))
-            ->prefix($prefix)
-            ->suffix($suffix)
-            ->core_path("$path/")
-            ->extension_directory("/$path")
-            ->find();
-    }
+	protected $extension_manager;
+
+	public function __construct()
+	{
+		global $phpbb_root_path;
+
+		$database = $phpbb_root_path . 'store/messenger.db';
+		parent::__construct('sqlite:' . $database);
+		parent::setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+	}
+
+	/**
+	 * @param string $sql
+	 * @return array
+	 */
+	public function select($sql, $array = array(), $fetchMode = PDO::FETCH_ASSOC)
+	{
+		$sth = $this->prepare($sql);
+		foreach ($array as $key => $value) {
+			$sth->bindValue("$key", $value);
+		}
+
+		$sth->execute();
+		return $sth->fetchAll($fetchMode);
+	}
+
+	/**
+	 * @param string $table
+	 * @return bool
+	 */
+	public function insert($table, $data)
+	{
+		//ksort($data);
+
+		$fieldNames = implode('`, `', array_keys($data));
+		$fieldValues = ':' . implode(', :', array_keys($data));
+
+		$sth = $this->prepare("INSERT INTO $table (`$fieldNames`) VALUES ($fieldValues)");
+
+		foreach ($data as $key => $value) {
+			$sth->bindValue(":$key", $value);
+		}
+
+		return $sth->execute();
+	}
+
+	/**
+	 * @param string $table
+	 * @param array $data
+	 * @param string $where
+	 * @return bool
+	 */
+	public function update($table, $data, $where)
+	{
+		ksort($data);
+
+		$fieldDetails = NULL;
+		foreach ($data as $key => $value) {
+			$fieldDetails .= "`$key`=:$key,";
+		}
+		$fieldDetails = rtrim($fieldDetails, ',');
+
+		$sth = $this->prepare("UPDATE $table SET $fieldDetails WHERE $where");
+
+		foreach ($data as $key => $value) {
+			$sth->bindValue(":$key", $value);
+		}
+
+		return $sth->execute();
+	}
+
+	/**
+	 * @param string $table
+	 * @param string $where
+	 * @param int $limit
+	 * @return int
+	 */
+	public function delete($table, $where, $limit = 1)
+	{
+		return $this->exec("DELETE FROM $table WHERE $where LIMIT $limit");
+	}
+
+	protected function find($path, $prefix, $suffix)
+	{
+		$finder = $this->extension_manager->get_finder();
+
+		return $finder
+			->set_extensions(array('phpbb/messenger'))
+			->prefix($prefix)
+			->suffix($suffix)
+			->core_path("$path/")
+			->extension_directory("/$path")
+			->find();
+	}
 }

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