From 7d5c9719c29770cbb56d8d9be9baa5b30435ec6d Mon Sep 17 00:00:00 2001 From: Rouji Date: Sun, 29 Aug 2021 22:53:31 +0200 Subject: [PATCH] clean up strings use string interpolation where it makes sense use '' for non-interpolated ones use print instead of printf where it makes sense --- index.php | 95 +++++++++++++++++++++++++++---------------------------- 1 file changed, 47 insertions(+), 48 deletions(-) diff --git a/index.php b/index.php index 89fd7df..c5c8fc3 100755 --- a/index.php +++ b/index.php @@ -8,14 +8,14 @@ class CONFIG const UPLOAD_TIMEOUT=5*60; //max. time an upload can take before it times out const ID_LENGTH=3; //length of the random file ID - const STORE_PATH="files/"; //directory to store uploaded files in + const STORE_PATH='files/'; //directory to store uploaded files in const LOG_PATH=null; //path to log uploads + resulting links to - const DOWNLOAD_PATH="%s"; //the path part of the download url. %s = placeholder for filename + const DOWNLOAD_PATH='%s'; //the path part of the download url. %s = placeholder for filename const MAX_EXT_LEN=7; //max. length for file extensions const EXTERNAL_HOOK=null; const AUTO_FILE_EXT=false; - const ADMIN_EMAIL="admin@example.com"; //address for inquiries + const ADMIN_EMAIL='admin@example.com'; //address for inquiries public static function SITE_URL() { @@ -53,14 +53,13 @@ function check_config() { $ini_val = intval(ini_get($ini_name)); if ($ini_val < $var_val) - printf("
Warning: php.ini: %s (%s) set lower than %s (%s)\n
", - $ini_name, $ini_val, $var_name, $var_val); + print("
Warning: php.ini: $ini_name ($ini_val) set lower than $var_name ($var_val)\n
"); }; - $warn_config_value('upload_max_filesize', "MAX_FILESIZE", CONFIG::MAX_FILESIZE); - $warn_config_value('post_max_size', "MAX_FILESIZE", CONFIG::MAX_FILESIZE); - $warn_config_value('max_input_time', "UPLOAD_TIMEOUT", CONFIG::UPLOAD_TIMEOUT); - $warn_config_value('max_execution_time', "UPLOAD_TIMEOUT", CONFIG::UPLOAD_TIMEOUT); + $warn_config_value('upload_max_filesize', 'MAX_FILESIZE', CONFIG::MAX_FILESIZE); + $warn_config_value('post_max_size', 'MAX_FILESIZE', CONFIG::MAX_FILESIZE); + $warn_config_value('max_input_time', 'UPLOAD_TIMEOUT', CONFIG::UPLOAD_TIMEOUT); + $warn_config_value('max_execution_time', 'UPLOAD_TIMEOUT', CONFIG::UPLOAD_TIMEOUT); } //extract extension from a path (does not include the dot) @@ -81,21 +80,21 @@ function ext_by_finfo($path) $finfo = finfo_open(FILEINFO_EXTENSION); $finfo_ext = finfo_file($finfo, $path); finfo_close($finfo); - if ($finfo_ext != "???") + if ($finfo_ext != '???') { - return explode("/", $finfo_ext, 2)[0]; + return explode('/', $finfo_ext, 2)[0]; } else { $finfo = finfo_open(); $finfo_info = finfo_file($finfo, $path); finfo_close($finfo); - if (strstr($finfo_info, "text") !== false) + if (strstr($finfo_info, 'text') !== false) { - return "txt"; + return 'txt'; } } - return ""; + return ''; } // store an uploaded file, given its name and temporary path (e.g. values straight out of $_FILES) @@ -116,14 +115,14 @@ function store_file($name, $tmpfile, $formatted = false) $size = filesize($tmpfile); if ($size > CONFIG::MAX_FILESIZE * 1024 * 1024) { - header("HTTP/1.0 413 Payload Too Large"); - printf("Error 413: Max File Size (%d MiB) Exceeded\n", CONFIG::MAX_FILESIZE); + header('HTTP/1.0 413 Payload Too Large'); + print("Error 413: Max File Size ({CONFIG::MAX_FILESIZE} MiB) Exceeded\n"); return; } if ($size == 0) { - header("HTTP/1.0 400 Bad Request"); - print("Error 400: Uploaded file is empty\n"); + header('HTTP/1.0 400 Bad Request'); + print('Error 400: Uploaded file is empty\n'); return; } @@ -151,22 +150,22 @@ function store_file($name, $tmpfile, $formatted = false) if (!$res) { //TODO: proper error handling? - header("HTTP/1.0 520 Unknown Error"); + header('HTTP/1.0 520 Unknown Error'); return; } if (CONFIG::EXTERNAL_HOOK !== null) { - putenv("REMOTE_ADDR=".$_SERVER['REMOTE_ADDR']); - putenv("ORIGINAL_NAME=".$name); - putenv("STORED_FILE=".$target_file); + putenv('REMOTE_ADDR='.$_SERVER['REMOTE_ADDR']); + putenv('ORIGINAL_NAME='.$name); + putenv('STORED_FILE='.$target_file); $ret = -1; $out = exec(CONFIG::EXTERNAL_HOOK, $_ = null, $ret); if ($out !== false && $ret !== 0) { unlink($target_file); - header("HTTP/1.0 400 Bad Request"); - print("Error: ".$out."\n"); + header('HTTP/1.0 400 Bad Request'); + print("Error: $out\n"); return; } } @@ -176,11 +175,11 @@ function store_file($name, $tmpfile, $formatted = false) if ($formatted) { - printf('
Access your file here: %s
', $url, $url); + print("
Access your file here: $url
"); } else { - printf($url."\n"); + print("$url\n"); } // log uploader's IP, original filename, etc. @@ -188,13 +187,13 @@ function store_file($name, $tmpfile, $formatted = false) { file_put_contents( CONFIG::LOG_PATH, - implode("\t", array( + implode('\t', array( date('c'), $_SERVER['REMOTE_ADDR'], filesize($tmpfile), escapeshellarg($name), $basename - )) . "\n", + )) . '\n', FILE_APPEND ); } @@ -237,20 +236,20 @@ function purge_files() { unlink($file); - printf("deleted \"%s\", %d MiB, %d days old\n", $file, $file_size, $file_age); + print("deleted $file, $file_size MiB, $file_age days old\n"); $num_del += 1; $total_size += $file_size; } } - printf("Deleted %d files totalling %d MiB\n", $num_del, $total_size); + print("Deleted $num_del files totalling $total_size MiB\n"); } // send a ShareX custom uploader config as .json function send_sharex_config() { - $name = $_SERVER["SERVER_NAME"]; + $name = $_SERVER['SERVER_NAME']; $site_url = CONFIG::SITE_URL(); - $filename = $name.".sxcu"; + $filename = $name.'.sxcu'; $content = <<