diff options
| -rwxr-xr-x | static/classes/Response.class.php | 28 | ||||
| -rw-r--r-- | static/classes/UploadedFile.class.php | 3 | ||||
| -rw-r--r-- | static/upload.php | 20 |
3 files changed, 25 insertions, 26 deletions
diff --git a/static/classes/Response.class.php b/static/classes/Response.class.php index 02e42eb..fac7db5 100755 --- a/static/classes/Response.class.php +++ b/static/classes/Response.class.php @@ -68,16 +68,16 @@ class Response switch ($this->type) { case 'csv': - $response = $this->csv_error($desc); + $response = $this->csvError($desc); break; case 'html': - $response = $this->html_error($code, $desc); + $response = $this->htmlError($code, $desc); break; case 'json': - $response = $this->json_error($code, $desc); + $response = $this->jsonError($code, $desc); break; case 'text': - $response = $this->text_error($code, $desc); + $response = $this->textError($code, $desc); break; } @@ -97,16 +97,16 @@ class Response switch ($this->type) { case 'csv': - $response = $this->csv_success($files); + $response = $this->csvSuccess($files); break; case 'html': - $response = $this->html_success($files); + $response = $this->htmlSuccess($files); break; case 'json': - $response = $this->json_success($files); + $response = $this->jsonSuccess($files); break; case 'text': - $response = $this->text_success($files); + $response = $this->textSuccess($files); break; } @@ -121,7 +121,7 @@ class Response * @param int $description Descriptive error message. * @return string Error message in CSV format. */ - private static function csv_error($description) + private static function csvError($description) { return '"error"'."\r\n"."\"$description\""."\r\n"; } @@ -133,7 +133,7 @@ class Response * @param mixed[] $files * @return string Success message in CSV format. */ - private static function csv_success($files) + private static function csvSuccess($files) { $result = '"name","url","hash","size"'."\r\n"; foreach ($files as $file) { @@ -154,7 +154,7 @@ class Response * @param int $description Descriptive error message. * @return string Error message in HTML format. */ - private static function html_error($code, $description) + private static function htmlError($code, $description) { return '<p>ERROR: ('.$code.') '.$description.'</p>'; } @@ -166,7 +166,7 @@ class Response * @param mixed[] $files * @return string Success message in HTML format. */ - private static function html_success($files) + private static function htmlSuccess($files) { $result = ''; @@ -185,7 +185,7 @@ class Response * @param int $description Descriptive error message. * @return string Error message in pretty-printed JSON format. */ - private static function json_error($code, $description) + private static function jsonError($code, $description) { return json_encode(array( 'success' => false, @@ -201,7 +201,7 @@ class Response * @param mixed[] $files * @return string Success message in pretty-printed JSON format. */ - private static function json_success($files) + private static function jsonSuccess($files) { return json_encode(array( 'success' => true, diff --git a/static/classes/UploadedFile.class.php b/static/classes/UploadedFile.class.php index c55a22d..03b7429 100644 --- a/static/classes/UploadedFile.class.php +++ b/static/classes/UploadedFile.class.php @@ -20,10 +20,9 @@ class UploadedFile /** * Generates the SHA-1 or returns the cached SHA-1 hash for the file. * - * @deprecated 2.1.0 To be replaced with SHA-256 hashing. * @return string|false $sha1 */ - public function get_sha1() + public function getSha1() { if (!$this->sha1) { $this->sha1 = sha1_file($this->tempfile); diff --git a/static/upload.php b/static/upload.php index f6fe155..2889da6 100644 --- a/static/upload.php +++ b/static/upload.php @@ -25,7 +25,7 @@ require_once 'includes/database.inc.php'; * * @return string */ -function generate_name($file) +function generateName($file) { global $db; global $doubledots; @@ -79,7 +79,7 @@ function generate_name($file) * * @return array */ -function upload_file($file) +function uploadFile($file) { global $db; @@ -93,13 +93,13 @@ function upload_file($file) // and data. PHP deletes the temporary file just uploaded automatically. $q = $db->prepare('SELECT filename, COUNT(*) AS count FROM files WHERE hash = (:hash) '. 'AND size = (:size)'); - $q->bindValue(':hash', $file->get_sha1(), PDO::PARAM_STR); + $q->bindValue(':hash', $file->getSha1(), PDO::PARAM_STR); $q->bindValue(':size', $file->size, PDO::PARAM_INT); $q->execute(); $result = $q->fetch(); if ($result['count'] > 0) { return array( - 'hash' => $file->get_sha1(), + 'hash' => $file->getSha1(), 'name' => $file->name, 'url' => POMF_URL.$result['filename'], 'size' => $file->size, @@ -107,7 +107,7 @@ function upload_file($file) } // Generate a name for the file - $newname = generate_name($file); + $newname = generateName($file); // Store the file's full file path in memory $uploadDir = POMF_FILES_ROOT; @@ -133,7 +133,7 @@ function upload_file($file) ':exp, :del)'); // Common parameters binding - $q->bindValue(':hash', $file->get_sha1(), PDO::PARAM_STR); + $q->bindValue(':hash', $file->getSha1(), PDO::PARAM_STR); $q->bindValue(':orig', strip_tags($file->name), PDO::PARAM_STR); $q->bindValue(':name', $newname, PDO::PARAM_STR); $q->bindValue(':size', $file->size, PDO::PARAM_INT); @@ -143,7 +143,7 @@ function upload_file($file) $q->execute(); return array( - 'hash' => $file->get_sha1(), + 'hash' => $file->getSha1(), 'name' => $file->name, 'url' => POMF_URL.$newname, 'size' => $file->size, @@ -157,7 +157,7 @@ function upload_file($file) * * @return array */ -function diverse_array($files) +function diverseArray($files) { $result = array(); @@ -180,7 +180,7 @@ function diverse_array($files) function refiles($files) { $result = array(); - $files = diverse_array($files); + $files = diverseArray($files); foreach ($files as $file) { $f = new UploadedFile(); @@ -206,7 +206,7 @@ if (isset($_FILES['files'])) { try { foreach ($uploads as $upload) { - $res[] = upload_file($upload); + $res[] = uploadFile($upload); } $response->send($res); } catch (Exception $e) { |