From 9e8a8513b20cfd770429e35135516c6399444930 Mon Sep 17 00:00:00 2001 From: WubTheCaptain Date: Tue, 15 Sep 2015 17:36:21 +0000 Subject: Indent and format project to PSR-2 style PSR-2 [1] is a highly regarded style guide in the PHP community according to Stack Overflow [2]. The indentation was out of place in the source code. I've seen a combination of 1 space tabs, 3 space tabs, 4 space tabs and 5 space tabs. Some closing braces on the same line and a lot of the code (especially moe code) had reached the point of losing readability. Converted with php-cs-fixer and some hand adjustment. [1]: http://www.php-fig.org/psr/psr-2/ [2]: https://stackoverflow.com/questions/3638083/list-of-highly-regarded -php-style-guides --- static/classes/Response.class.php | 204 ++++++++++++++++--------------- static/classes/UploadException.class.php | 92 +++++++------- static/classes/UploadedFile.class.php | 44 +++---- 3 files changed, 176 insertions(+), 164 deletions(-) (limited to 'static/classes') diff --git a/static/classes/Response.class.php b/static/classes/Response.class.php index 41f946c..25121ce 100755 --- a/static/classes/Response.class.php +++ b/static/classes/Response.class.php @@ -1,98 +1,106 @@ -type = $response_type; - break; - default: - header('Content-Type: application/json; charset=UTF-8'); - $this->type = 'json'; - break; - } - } - - public function error ($code, $desc) { - $response = null; - - switch ($this->type) { - case 'csv': - $response = $this->csv_error($desc); - break; - case 'gyazo': - $response = $this->gyazo_error($code, $desc); - break; - default: - $response = $this->json_error($code, $desc); - break; - } - - http_response_code($code); - echo $response; - } - - public function send ($files) { - $response = null; - - switch ($this->type) { - case 'csv': - $response = $this->csv_success($files); - break; - case 'gyazo': - $response = $this->gyazo_success($files); - break; - default: - $response = $this->json_success($files); - break; - } - - http_response_code(200); - echo $response; - } - - private static function csv_error ($description) { - return "error\n" . $description . "\n"; - } - - private static function csv_success ($files) { - $result = "name,url,hash,size\n"; - foreach ($files as $file) { - $result .= $file['name'] . "," . - $file['url'] . "," . - $file['hash'] . "," . - $file['size'] . "\n"; - } - - return $result; - } - - private static function gyazo_error ($code, $description) { - return "ERROR: (" . $code . ") " . $description; - } - - private static function gyazo_success ($files) { - return POMF_URL . $files[0]['url']; - } - - private static function json_error ($code, $description) { - return json_encode(array( - 'success' => false, - 'errorcode' => $code, - 'description' => $description - )); - } - - private static function json_success ($files) { - return json_encode(array( - 'success' => true, - 'files' => $files - )); - } -} - -?> \ No newline at end of file +type = $response_type; + break; + default: + header('Content-Type: application/json; charset=UTF-8'); + $this->type = 'json'; + break; + } + } + + public function error($code, $desc) + { + $response = null; + + switch ($this->type) { + case 'csv': + $response = $this->csv_error($desc); + break; + case 'gyazo': + $response = $this->gyazo_error($code, $desc); + break; + default: + $response = $this->json_error($code, $desc); + break; + } + + http_response_code($code); + echo $response; + } + + public function send($files) + { + $response = null; + + switch ($this->type) { + case 'csv': + $response = $this->csv_success($files); + break; + case 'gyazo': + $response = $this->gyazo_success($files); + break; + default: + $response = $this->json_success($files); + break; + } + + http_response_code(200); + echo $response; + } + + private static function csv_error($description) + { + return "error\n".$description."\n"; + } + + private static function csv_success($files) + { + $result = "name,url,hash,size\n"; + foreach ($files as $file) { + $result .= $file['name'].','. + $file['url'].','. + $file['hash'].','. + $file['size']."\n"; + } + + return $result; + } + + private static function gyazo_error($code, $description) + { + return 'ERROR: ('.$code.') '.$description; + } + + private static function gyazo_success($files) + { + return POMF_URL.$files[0]['url']; + } + + private static function json_error($code, $description) + { + return json_encode(array( + 'success' => false, + 'errorcode' => $code, + 'description' => $description, + )); + } + + private static function json_success($files) + { + return json_encode(array( + 'success' => true, + 'files' => $files, + )); + } +} diff --git a/static/classes/UploadException.class.php b/static/classes/UploadException.class.php index b1b4839..66be853 100755 --- a/static/classes/UploadException.class.php +++ b/static/classes/UploadException.class.php @@ -1,45 +1,47 @@ -codeToMessage($code); - parent::__construct($message, 500); - } - - private function codeToMessage($code) { - switch ($code) { - case UPLOAD_ERR_INI_SIZE: - $message = "The uploaded file exceeds the upload_max_filesize directive in php.ini"; - break; - case UPLOAD_ERR_FORM_SIZE: - $message = "The uploaded file exceeds the MAX_FILE_SIZE directive that was " . - "specified in the HTML form"; - break; - case UPLOAD_ERR_PARTIAL: - $message = "The uploaded file was only partially uploaded"; - break; - case UPLOAD_ERR_NO_FILE: - $message = "No file was uploaded"; - break; - case UPLOAD_ERR_NO_TMP_DIR: - $message = "Missing a temporary folder"; - break; - case UPLOAD_ERR_CANT_WRITE: - $message = "Failed to write file to disk"; - break; - case UPLOAD_ERR_EXTENSION: - $message = "File upload stopped by extension"; - break; - - default: - $message = "Unknown upload error"; - break; - } - return $message; - } -} - -?> \ No newline at end of file +codeToMessage($code); + parent::__construct($message, 500); + } + + private function codeToMessage($code) + { + switch ($code) { + case UPLOAD_ERR_INI_SIZE: + $message = 'The uploaded file exceeds the upload_max_filesize directive in php.ini'; + break; + case UPLOAD_ERR_FORM_SIZE: + $message = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was '. + 'specified in the HTML form'; + break; + case UPLOAD_ERR_PARTIAL: + $message = 'The uploaded file was only partially uploaded'; + break; + case UPLOAD_ERR_NO_FILE: + $message = 'No file was uploaded'; + break; + case UPLOAD_ERR_NO_TMP_DIR: + $message = 'Missing a temporary folder'; + break; + case UPLOAD_ERR_CANT_WRITE: + $message = 'Failed to write file to disk'; + break; + case UPLOAD_ERR_EXTENSION: + $message = 'File upload stopped by extension'; + break; + + default: + $message = 'Unknown upload error'; + break; + } + + return $message; + } +} diff --git a/static/classes/UploadedFile.class.php b/static/classes/UploadedFile.class.php index 1cf8914..5e8ae1c 100644 --- a/static/classes/UploadedFile.class.php +++ b/static/classes/UploadedFile.class.php @@ -1,27 +1,29 @@ sha1) - $this->sha1 = sha1_file($this->tempfile); + /** + * Generates the SHA1 or returns the cached SHA1 hash for the file. + * + * @return string + */ + public function get_sha1() + { + if (!$this->sha1) { + $this->sha1 = sha1_file($this->tempfile); + } - return $this->sha1; - } + return $this->sha1; + } } -?> -- cgit v1.2.3