florinp / phpbb-messenger

libs/download.php

Indentation +104 added lines, -104 removed lines

@@ -5,109 +5,109 @@
 use InvalidArgumentException;
 class download {
 
-    /**
-     * File directory
-     * @var string
-     */
-    protected $directory;
-
-    /**
-     * File name
-     * @var string
-     */
-    protected $filename;
-
-    /**
-     * File pointer
-     * @var resource
-     */
-    protected $file;
-
-    /**
-     * File full path
-     * @var string
-     */
-    protected $full_path;
-
-    /**
-     * @param string $phpbb_root_path phpBB root path
-     */
-    public function __construct($phpbb_root_path) {
-        $this->directory = $phpbb_root_path . 'store/messenger/files';
-    }
-
-
-    /**
-     * Set the filename
-     * @param string $filename File name
-     * @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)) {
-            throw new InvalidArgumentException("File does not exist");
-        } else if(!is_readable($file_full_path)) {
-            throw new InvalidArgumentException("File to download is not readable.");
-        }
-        $this->filename = $filename;
-        $this->file = fopen($file_full_path, 'rb');
-        $this->full_path = $file_full_path;
-    }
-
-    /**
-     * Get file mime type
-     * @return string
-     */
-    private function getMimeType() {
-        $fileExtension = pathinfo($this->filename, PATHINFO_EXTENSION);
-        $mimeTypeHelper = Mimetypes::getInstance();
-        $mimeType = $mimeTypeHelper->fromExtension($fileExtension);
-
-        return !is_null($mimeType) ? $mimeType : 'application/force-download';
-    }
-
-    /**
-     * Get file size
-     * @return int
-     */
-    private function getFileSize() {
-        $stat = fstat($this->file);
-        return $stat['size'];
-    }
-
-    /**
-     * Sends the download to browser
-     * @param bool|true $forceDownload
-     */
-    public function sendDownload($forceDownload = true) {
-        if(headers_sent()) {
-            throw new \RuntimeException("Cannot send file to the browser, since the headers were already sent");
-        }
-        $mimeType = $this->getMimeType();
-        $fileSize = $this->getFileSize();
-
-        ini_set('display_errors', 1);
-        error_reporting(E_ALL);
-
-        header("Pragma: public");
-        header("Expires: 0");
-        header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-        header("Cache-Control: private", false);
-        header("Content-Type: application/octet-stream");
-
-        if($forceDownload) {
-            header("Content-Disposition: attachment; filename=\"{$this->filename}\";");
-        } else {
-            header("Content-Disposition: filename=\"{$this->filename}\";");
-        }
-
-        header("Content-Transfer-Encoding: binary");
-        header("Content-Length: {$fileSize}");
-
-        @ob_clean();
-
-        rewind($this->file);
-        fpassthru($this->file);
-    }
+	/**
+	 * File directory
+	 * @var string
+	 */
+	protected $directory;
+
+	/**
+	 * File name
+	 * @var string
+	 */
+	protected $filename;
+
+	/**
+	 * File pointer
+	 * @var resource
+	 */
+	protected $file;
+
+	/**
+	 * File full path
+	 * @var string
+	 */
+	protected $full_path;
+
+	/**
+	 * @param string $phpbb_root_path phpBB root path
+	 */
+	public function __construct($phpbb_root_path) {
+		$this->directory = $phpbb_root_path . 'store/messenger/files';
+	}
+
+
+	/**
+	 * Set the filename
+	 * @param string $filename File name
+	 * @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)) {
+			throw new InvalidArgumentException("File does not exist");
+		} else if(!is_readable($file_full_path)) {
+			throw new InvalidArgumentException("File to download is not readable.");
+		}
+		$this->filename = $filename;
+		$this->file = fopen($file_full_path, 'rb');
+		$this->full_path = $file_full_path;
+	}
+
+	/**
+	 * Get file mime type
+	 * @return string
+	 */
+	private function getMimeType() {
+		$fileExtension = pathinfo($this->filename, PATHINFO_EXTENSION);
+		$mimeTypeHelper = Mimetypes::getInstance();
+		$mimeType = $mimeTypeHelper->fromExtension($fileExtension);
+
+		return !is_null($mimeType) ? $mimeType : 'application/force-download';
+	}
+
+	/**
+	 * Get file size
+	 * @return int
+	 */
+	private function getFileSize() {
+		$stat = fstat($this->file);
+		return $stat['size'];
+	}
+
+	/**
+	 * Sends the download to browser
+	 * @param bool|true $forceDownload
+	 */
+	public function sendDownload($forceDownload = true) {
+		if(headers_sent()) {
+			throw new \RuntimeException("Cannot send file to the browser, since the headers were already sent");
+		}
+		$mimeType = $this->getMimeType();
+		$fileSize = $this->getFileSize();
+
+		ini_set('display_errors', 1);
+		error_reporting(E_ALL);
+
+		header("Pragma: public");
+		header("Expires: 0");
+		header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+		header("Cache-Control: private", false);
+		header("Content-Type: application/octet-stream");
+
+		if($forceDownload) {
+			header("Content-Disposition: attachment; filename=\"{$this->filename}\";");
+		} else {
+			header("Content-Disposition: filename=\"{$this->filename}\";");
+		}
+
+		header("Content-Transfer-Encoding: binary");
+		header("Content-Length: {$fileSize}");
+
+		@ob_clean();
+
+		rewind($this->file);
+		fpassthru($this->file);
+	}
 
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

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

controller/main.php

Spacing +1 added lines, -1 removed lines

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

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace florinp\messenger\controller;
 
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 class main

Indentation +199 added lines, -199 removed lines

@@ -8,204 +8,204 @@
 class main
 {
 
-    protected $user;
-    protected $model;
-    protected $request;
-    protected $notification_manager;
-    protected $emojione;
-    protected $upload;
-    protected $download;
-
-    public function __construct(
-        \phpbb\request\request $request,
-        \phpbb\user $user,
-        \florinp\messenger\models\main_model $model,
-        \phpbb\notification\manager $notification_manager,
-        \florinp\messenger\libs\emojione $emojione,
-        \florinp\messenger\libs\upload $upload,
-        \florinp\messenger\libs\download $download
-    )
-    {
-        $this->request = $request;
-        $this->user = $user;
-        $this->model = $model;
-        $this->notification_manager = $notification_manager;
-        $this->emojione = $emojione;
-        $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()
-    {
-        $emoticons = \florinp\messenger\libs\emojione::$ascii_replace;
-        $eicons = array();
-        foreach ($emoticons as $code => $value) {
-            $eicons[$value] = $code;
-        }
-
-        $response = array();
-        foreach ($eicons as $emoticon) {
-            $item = array();
-            $item['code'] = $emoticon;
-            $item['image'] = $this->emojione->toImage($emoticon);
-
-            $response[] = $item;
-        }
-
-        return new JsonResponse($response, 200);
-    }
+	protected $user;
+	protected $model;
+	protected $request;
+	protected $notification_manager;
+	protected $emojione;
+	protected $upload;
+	protected $download;
+
+	public function __construct(
+		\phpbb\request\request $request,
+		\phpbb\user $user,
+		\florinp\messenger\models\main_model $model,
+		\phpbb\notification\manager $notification_manager,
+		\florinp\messenger\libs\emojione $emojione,
+		\florinp\messenger\libs\upload $upload,
+		\florinp\messenger\libs\download $download
+	)
+	{
+		$this->request = $request;
+		$this->user = $user;
+		$this->model = $model;
+		$this->notification_manager = $notification_manager;
+		$this->emojione = $emojione;
+		$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()
+	{
+		$emoticons = \florinp\messenger\libs\emojione::$ascii_replace;
+		$eicons = array();
+		foreach ($emoticons as $code => $value) {
+			$eicons[$value] = $code;
+		}
+
+		$response = array();
+		foreach ($eicons as $emoticon) {
+			$item = array();
+			$item['code'] = $emoticon;
+			$item['image'] = $this->emojione->toImage($emoticon);
+
+			$response[] = $item;
+		}
+
+		return new JsonResponse($response, 200);
+	}
 
 }

ext.php

Indentation +90 added lines, -90 removed lines

@@ -6,14 +6,14 @@ 
 class ext extends \phpbb\extension\base
 {
 
-    public function enable_step($old_state)
-    {
-        global $phpbb_root_path;
-
-        switch ($old_state) {
-            case '':
-                $db = new \florinp\messenger\libs\database();
-                $db->exec("
+	public function enable_step($old_state)
+	{
+		global $phpbb_root_path;
+
+		switch ($old_state) {
+			case '':
+				$db = new \florinp\messenger\libs\database();
+				$db->exec("
           CREATE TABLE IF NOT EXISTS messages (
             `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
             `sender_id` INTEGER NOT NULL,
@@ -33,87 +33,87 @@ 
           );
         ");
 
-                $messengerDir = $phpbb_root_path . 'store/messenger';
-                if (!is_dir($messengerDir)) {
-                    mkdir($messengerDir, 0777);
-                    $filesDir = $messengerDir . '/files';
-                    if (!is_dir($filesDir)) {
-                        mkdir($filesDir, 0777);
-                    }
-                }
-                return 'notifications';
-                break;
-
-            case 'notifications':
-                $phpbb_notifications = $this->container->get('notification_manager');
-                $phpbb_notifications->enable_notifications('florinp.messenger.notification.type.friend_request');
-                return 'step2';
-                break;
-
-            default:
-                return parent::enable_step($old_state);
-                break;
-        }
-
-    }
-
-    public function disable_step($old_state)
-    {
-        switch ($old_state) {
-            case '':
-                $phpbb_notifications = $this->container->get('notification_manager');
-                $phpbb_notifications->disable_notifications('florinp.messenger.notification.type.friend_request');
-                return 'notifications';
-                break;
-
-            default:
-
-                return parent::disable_step($old_state);
-                break;
-        }
-    }
-
-    public function purge_step($old_state)
-    {
-        global $phpbb_root_path;
-
-        $database = $phpbb_root_path . 'store/messenger.db';
-        if (is_file($database)) {
-            unlink($database);
-        }
-
-        $messengerDir = $phpbb_root_path . 'store/messenger';
-        if (is_dir($messengerDir)) {
-            $objects = scandir($messengerDir);
-            foreach ($objects as $object) {
-                if ($object != '.' && $object != '..') {
-                    if (filetype($messengerDir . "/" . $object) == "dir") {
-                        $dir = $messengerDir . "/" . $object;
-                        $subObjects = scandir($dir);
-                        if(count($subObjects) > 0) {
-                            foreach($subObjects as $subObject) {
-                                if($subObject != '.' && $subObject != '..') {
-                                    if(filetype($dir . '/' . $subObject) != 'dir') {
-                                        unlink($dir . '/' . $subObject);
-                                    }
-                                } else {
-                                    continue;
-                                }
-                            }
-
-                        }
-                        rmdir($messengerDir . "/" . $object);
-                    } else {
-                        unlink($messengerDir . "/" . $object);
-                    }
-                }
-            }
-            reset($objects);
-            rmdir($messengerDir);
-        }
-
-        return parent::purge_step($old_state);
-
-    }
+				$messengerDir = $phpbb_root_path . 'store/messenger';
+				if (!is_dir($messengerDir)) {
+					mkdir($messengerDir, 0777);
+					$filesDir = $messengerDir . '/files';
+					if (!is_dir($filesDir)) {
+						mkdir($filesDir, 0777);
+					}
+				}
+				return 'notifications';
+				break;
+
+			case 'notifications':
+				$phpbb_notifications = $this->container->get('notification_manager');
+				$phpbb_notifications->enable_notifications('florinp.messenger.notification.type.friend_request');
+				return 'step2';
+				break;
+
+			default:
+				return parent::enable_step($old_state);
+				break;
+		}
+
+	}
+
+	public function disable_step($old_state)
+	{
+		switch ($old_state) {
+			case '':
+				$phpbb_notifications = $this->container->get('notification_manager');
+				$phpbb_notifications->disable_notifications('florinp.messenger.notification.type.friend_request');
+				return 'notifications';
+				break;
+
+			default:
+
+				return parent::disable_step($old_state);
+				break;
+		}
+	}
+
+	public function purge_step($old_state)
+	{
+		global $phpbb_root_path;
+
+		$database = $phpbb_root_path . 'store/messenger.db';
+		if (is_file($database)) {
+			unlink($database);
+		}
+
+		$messengerDir = $phpbb_root_path . 'store/messenger';
+		if (is_dir($messengerDir)) {
+			$objects = scandir($messengerDir);
+			foreach ($objects as $object) {
+				if ($object != '.' && $object != '..') {
+					if (filetype($messengerDir . "/" . $object) == "dir") {
+						$dir = $messengerDir . "/" . $object;
+						$subObjects = scandir($dir);
+						if(count($subObjects) > 0) {
+							foreach($subObjects as $subObject) {
+								if($subObject != '.' && $subObject != '..') {
+									if(filetype($dir . '/' . $subObject) != 'dir') {
+										unlink($dir . '/' . $subObject);
+									}
+								} else {
+									continue;
+								}
+							}
+
+						}
+						rmdir($messengerDir . "/" . $object);
+					} else {
+						unlink($messengerDir . "/" . $object);
+					}
+				}
+			}
+			reset($objects);
+			rmdir($messengerDir);
+		}
+
+		return parent::purge_step($old_state);
+
+	}
 
 }

Spacing +13 added lines, -13 removed lines

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

tests/controller/main_test.php

Indentation +104 added lines, -104 removed lines

@@ -6,108 +6,108 @@
 
 class main_test extends \phpbb_test_case {
 
-    /**
-     * @var \florinp\messenger\controller\main
-     */
-    protected $controller;
-
-    public function setUp() {
-        parent::setUp();
-        /**
-         * @var \phpbb\user $user Mock the user class
-         */
-        $user = $this->getMock('\phpbb\user', array(), array('\phpbb\datetime'));
-
-        /**
-         * @var \phpbb\request\request $request
-         */
-        $request = $this->getMockBuilder('\phpbb\request\request')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /**
-         * @var \florinp\messenger\models\main_model $model
-         */
-        $model = $this->getMockBuilder('\florinp\messenger\models\main_model')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /**
-         * @var \phpbb\notification\manager $notification_manager
-         */
-        $notification_manager = $this->getMockBuilder('\phpbb\notification\manager')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /**
-         * @var \florinp\messenger\libs\emojione $emojione
-         */
-        $emojione = $this->getMockBuilder('\florinp\messenger\libs\emojione')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /**
-         * @var \florinp\messenger\libs\upload $upload
-         */
-        $upload = $this->getMockBuilder('\florinp\messenger\libs\upload')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /**
-         * @var \florinp\messenger\libs\download $download
-         */
-        $download = $this->getMockBuilder('\florinp\messenger\libs\download')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->controller = new \florinp\messenger\controller\main(
-            $request,
-            $user,
-            $model,
-            $notification_manager,
-            $emojione,
-            $upload,
-            $download
-        );
-    }
-
-    public function tearDown() {
-        $this->controller = null;
-        parent::tearDown();
-    }
-
-    public function publish_data() {
-        return array(
-            array(200, json_encode(array()))
-        );
-    }
-
-    /**
-     * @dataProvider publish_data
-     */
-    public function test_publish($status_code, $page_content) {
-        $response = $this->controller->publish();
-        $this->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
-        $this->assertEquals($status_code, $response->getStatusCode());
-        $this->assertEquals($page_content, $response->getContent());
-    }
-
-    public function load_data() {
-        return array(
-            array(200, json_encode(array(
-                'success' => false,
-                'error' => 'The request is invalid'
-            )))
-        );
-    }
-
-    /**
-     * @dataProvider load_data
-     */
-    public function test_load($status_code, $page_content) {
-        $response = $this->controller->load();
-        $this->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
-        $this->assertEquals($status_code, $response->getStatusCode());
-        $this->assertEquals($page_content, $response->getContent());
-    }
+	/**
+	 * @var \florinp\messenger\controller\main
+	 */
+	protected $controller;
+
+	public function setUp() {
+		parent::setUp();
+		/**
+		 * @var \phpbb\user $user Mock the user class
+		 */
+		$user = $this->getMock('\phpbb\user', array(), array('\phpbb\datetime'));
+
+		/**
+		 * @var \phpbb\request\request $request
+		 */
+		$request = $this->getMockBuilder('\phpbb\request\request')
+			->disableOriginalConstructor()
+			->getMock();
+
+		/**
+		 * @var \florinp\messenger\models\main_model $model
+		 */
+		$model = $this->getMockBuilder('\florinp\messenger\models\main_model')
+			->disableOriginalConstructor()
+			->getMock();
+
+		/**
+		 * @var \phpbb\notification\manager $notification_manager
+		 */
+		$notification_manager = $this->getMockBuilder('\phpbb\notification\manager')
+			->disableOriginalConstructor()
+			->getMock();
+
+		/**
+		 * @var \florinp\messenger\libs\emojione $emojione
+		 */
+		$emojione = $this->getMockBuilder('\florinp\messenger\libs\emojione')
+			->disableOriginalConstructor()
+			->getMock();
+
+		/**
+		 * @var \florinp\messenger\libs\upload $upload
+		 */
+		$upload = $this->getMockBuilder('\florinp\messenger\libs\upload')
+			->disableOriginalConstructor()
+			->getMock();
+
+		/**
+		 * @var \florinp\messenger\libs\download $download
+		 */
+		$download = $this->getMockBuilder('\florinp\messenger\libs\download')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->controller = new \florinp\messenger\controller\main(
+			$request,
+			$user,
+			$model,
+			$notification_manager,
+			$emojione,
+			$upload,
+			$download
+		);
+	}
+
+	public function tearDown() {
+		$this->controller = null;
+		parent::tearDown();
+	}
+
+	public function publish_data() {
+		return array(
+			array(200, json_encode(array()))
+		);
+	}
+
+	/**
+	 * @dataProvider publish_data
+	 */
+	public function test_publish($status_code, $page_content) {
+		$response = $this->controller->publish();
+		$this->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
+		$this->assertEquals($status_code, $response->getStatusCode());
+		$this->assertEquals($page_content, $response->getContent());
+	}
+
+	public function load_data() {
+		return array(
+			array(200, json_encode(array(
+				'success' => false,
+				'error' => 'The request is invalid'
+			)))
+		);
+	}
+
+	/**
+	 * @dataProvider load_data
+	 */
+	public function test_load($status_code, $page_content) {
+		$response = $this->controller->load();
+		$this->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
+		$this->assertEquals($status_code, $response->getStatusCode());
+		$this->assertEquals($page_content, $response->getContent());
+	}
 }
\ No newline at end of file