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,

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

controller/main.php

Indentation +182 added lines, -182 removed lines

@@ -15,187 +15,187 @@
 class main
 {
 
-    protected $user;
-    protected $model;
-    protected $request;
-    protected $notification_manager;
-    protected $upload;
-    protected $download;
-
-    public function __construct(
-        request $request,
-        user $user,
-        main_model $model,
-        manager $notification_manager,
-        upload $upload,
-        download $download
-    )
-    {
-        $this->request = $request;
-        $this->user = $user;
-        $this->model = $model;
-        $this->notification_manager = $notification_manager;
-        $this->upload = $upload;
-        $this->download = $download;
-    }
-
-    public function handle()
-    {
-    }
-
-    public function index()
-    {
-
-    }
-
-    public function publish()
-    {
-        $text = $this->request->variable('text', '', true);
-        $receiver_id = $this->request->variable('receiver_id', 0);
-        $sender_id = $this->user->data['user_id'];
-
-        $response = array();
-        if ($receiver_id != 0 && trim($text) != '') {
-            $text = htmlspecialchars($text);
-            $text = str_replace(array("\n", "\r"), '', $text);
-
-            $message = array(
-                'sender_id' => $sender_id,
-                'receiver_id' => $receiver_id,
-                'text' => $text,
-                'sentAt' => time()
-            );
-
-            if ($id = $this->model->sendMessage($message)) {
-                $lastMessage = $this->model->getMessageById($id);
-                $response = array('success' => true, 'message' => $lastMessage);
-            } else {
-                $response = array(
-                    'succes' => false,
-                    'error' => 'An error has been ocurred!'
-                );
-            }
-        }
-
-        return new JsonResponse($response, 200);
-    }
-
-    public function getFile($id)
-    {
-        $id = explode('_', $id)[1];
-        $file = $this->model->getFileById($id);
-        $this->download->setFile($file['file']);
-        $this->download->sendDownload();
-    }
-
-    public function sendFile()
-    {
-        $receiver_id = $this->request->variable('receiver_id', 0);
-        $sender_id = $this->user->data['user_id'];
-
-        $response = array();
-        $file = $this->request->file('file');
-        if ($receiver_id != 0 && !empty($file)) {
-            if ($file['error'] == 0) {
-                $this->upload->file($file);
-                $this->upload->set_allowed_mime_types(array(
-                    'image/gif',
-                    'image/jpeg',
-                    'image/png',
-                    'application/pdf',
-                    'application/x-rar-compressed',
-                    'application/zip',
-                    'application/x-7z-compressed',
-                    'text/plain'
-                ));
-                $results = $this->upload->upload();
-                if (isset($results['errors']) && count($results['errors'])) {
-                    $response = array(
-                        'success' => false,
-                        'errors' => $results['errors']
-                    );
-                } else {
-                    $data = array(
-                        'sender_id' => $sender_id,
-                        'receiver_id' => $receiver_id,
-                        'fileName' => $results['original_filename'],
-                        'file' => $results['filename'],
-                        'type' => $results['mime'],
-                    );
-                    if ($id = $this->model->sendFile($data)) {
-                        $lastFile = $this->model->getFileById($id);
-                        $response = array(
-                            'success' => true,
-                            'file' => $lastFile
-                        );
-                    } else {
-                        $response = array(
-                            'succes' => false,
-                            'error' => 'An error has been ocurred!'
-                        );
-                    }
-                }
-            } else {
-                $response = array(
-                    'succes' => false,
-                    'error' => $file['error']
-                );
-            }
-        }
-
-        return new JsonResponse($response, 200);
-    }
-
-    public function load()
-    {
-        $friend_id = $this->request->variable('friend_id', 0);
-
-        if ($friend_id > 0) {
-            $messages = $this->model->getMessages($friend_id);
-            return new JsonResponse($messages, 200);
-        }
-        return new JsonResponse(array('success' => false, 'error' => 'The request is invalid'), 200);
-    }
-
-    public function updateMessages()
-    {
-        $friend_id = $this->request->variable('friend_id', 0);
-        if ($friend_id > 0) {
-            $newVal = $this->model->updateMessagesStatus($friend_id);
-            return new JsonResponse(array('success' => true, 'newVal' => $newVal), 200);
-        }
-        return new JsonResponse(array('success' => false), 200);
-    }
-
-    public function checkForNewMessages()
-    {
-        $friend_id = $this->request->variable('friend_id', 0);
-        if ($friend_id > 0) {
-            $messages = $this->model->getInboxFromId($friend_id);
-            return new JsonResponse(array('success' => true, 'messages' => $messages), 200);
-        }
-        return new JsonResponse(array('success' => false), 200);
-    }
-
-    public function getFriends()
-    {
-        $friends = $this->model->getFriends();
-        $friends_online = array_filter($friends, function($friend) {
-            return $friend['user_status'] != 0;
-        });
-
-        $response = array(
-            'friends_online' => count($friends_online),
-            'friends_list' => $friends
-        );
-
-        return new JsonResponse($response, 200);
-    }
-
-    public function getEmoticons()
-    {
-        $response = array();
-        return new JsonResponse($response, 200);
-    }
+	protected $user;
+	protected $model;
+	protected $request;
+	protected $notification_manager;
+	protected $upload;
+	protected $download;
+
+	public function __construct(
+		request $request,
+		user $user,
+		main_model $model,
+		manager $notification_manager,
+		upload $upload,
+		download $download
+	)
+	{
+		$this->request = $request;
+		$this->user = $user;
+		$this->model = $model;
+		$this->notification_manager = $notification_manager;
+		$this->upload = $upload;
+		$this->download = $download;
+	}
+
+	public function handle()
+	{
+	}
+
+	public function index()
+	{
+
+	}
+
+	public function publish()
+	{
+		$text = $this->request->variable('text', '', true);
+		$receiver_id = $this->request->variable('receiver_id', 0);
+		$sender_id = $this->user->data['user_id'];
+
+		$response = array();
+		if ($receiver_id != 0 && trim($text) != '') {
+			$text = htmlspecialchars($text);
+			$text = str_replace(array("\n", "\r"), '', $text);
+
+			$message = array(
+				'sender_id' => $sender_id,
+				'receiver_id' => $receiver_id,
+				'text' => $text,
+				'sentAt' => time()
+			);
+
+			if ($id = $this->model->sendMessage($message)) {
+				$lastMessage = $this->model->getMessageById($id);
+				$response = array('success' => true, 'message' => $lastMessage);
+			} else {
+				$response = array(
+					'succes' => false,
+					'error' => 'An error has been ocurred!'
+				);
+			}
+		}
+
+		return new JsonResponse($response, 200);
+	}
+
+	public function getFile($id)
+	{
+		$id = explode('_', $id)[1];
+		$file = $this->model->getFileById($id);
+		$this->download->setFile($file['file']);
+		$this->download->sendDownload();
+	}
+
+	public function sendFile()
+	{
+		$receiver_id = $this->request->variable('receiver_id', 0);
+		$sender_id = $this->user->data['user_id'];
+
+		$response = array();
+		$file = $this->request->file('file');
+		if ($receiver_id != 0 && !empty($file)) {
+			if ($file['error'] == 0) {
+				$this->upload->file($file);
+				$this->upload->set_allowed_mime_types(array(
+					'image/gif',
+					'image/jpeg',
+					'image/png',
+					'application/pdf',
+					'application/x-rar-compressed',
+					'application/zip',
+					'application/x-7z-compressed',
+					'text/plain'
+				));
+				$results = $this->upload->upload();
+				if (isset($results['errors']) && count($results['errors'])) {
+					$response = array(
+						'success' => false,
+						'errors' => $results['errors']
+					);
+				} else {
+					$data = array(
+						'sender_id' => $sender_id,
+						'receiver_id' => $receiver_id,
+						'fileName' => $results['original_filename'],
+						'file' => $results['filename'],
+						'type' => $results['mime'],
+					);
+					if ($id = $this->model->sendFile($data)) {
+						$lastFile = $this->model->getFileById($id);
+						$response = array(
+							'success' => true,
+							'file' => $lastFile
+						);
+					} else {
+						$response = array(
+							'succes' => false,
+							'error' => 'An error has been ocurred!'
+						);
+					}
+				}
+			} else {
+				$response = array(
+					'succes' => false,
+					'error' => $file['error']
+				);
+			}
+		}
+
+		return new JsonResponse($response, 200);
+	}
+
+	public function load()
+	{
+		$friend_id = $this->request->variable('friend_id', 0);
+
+		if ($friend_id > 0) {
+			$messages = $this->model->getMessages($friend_id);
+			return new JsonResponse($messages, 200);
+		}
+		return new JsonResponse(array('success' => false, 'error' => 'The request is invalid'), 200);
+	}
+
+	public function updateMessages()
+	{
+		$friend_id = $this->request->variable('friend_id', 0);
+		if ($friend_id > 0) {
+			$newVal = $this->model->updateMessagesStatus($friend_id);
+			return new JsonResponse(array('success' => true, 'newVal' => $newVal), 200);
+		}
+		return new JsonResponse(array('success' => false), 200);
+	}
+
+	public function checkForNewMessages()
+	{
+		$friend_id = $this->request->variable('friend_id', 0);
+		if ($friend_id > 0) {
+			$messages = $this->model->getInboxFromId($friend_id);
+			return new JsonResponse(array('success' => true, 'messages' => $messages), 200);
+		}
+		return new JsonResponse(array('success' => false), 200);
+	}
+
+	public function getFriends()
+	{
+		$friends = $this->model->getFriends();
+		$friends_online = array_filter($friends, function($friend) {
+			return $friend['user_status'] != 0;
+		});
+
+		$response = array(
+			'friends_online' => count($friends_online),
+			'friends_list' => $friends
+		);
+
+		return new JsonResponse($response, 200);
+	}
+
+	public function getEmoticons()
+	{
+		$response = array();
+		return new JsonResponse($response, 200);
+	}
 
 }

libs/upload.php

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 string[] $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 double
-     */
-    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 string[] $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 double
+	 */
+	protected function bytes_to_mb($bytes)
+	{
+		return round(($bytes / 1048576), 2);
+	}
 
 
 } // end of Upload
\ No newline at end of file

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/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}\";");