X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/29fffe4a12cc764c9087796ecded32a6e5814a65..6d6c111b80ad13201b7acd7c2f5b8fd6d160e11b:/lib/functions.php?ds=inline diff --git a/lib/functions.php b/lib/functions.php index ae3516a..6e5c886 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -28,7 +28,7 @@ function s2p($s) $block_size = 8; $p = ''; for ($i = 0; $i < strlen($s); $i++) { - $p .= $s{$i}; + $p .= $s[$i]; if (($i + 1) % $block_size == 0) { $p .= '/'; } @@ -68,16 +68,16 @@ function base_16_to_64($num) # Convert long hex string to bin. $size = strlen($num); for ($i = 0; $i < $size; $i++) { - $b .= $hex2bin{hexdec($num{$i})}; + $b .= $hex2bin[hexdec($num[$i])]; } # Convert long bin to base 64. $size *= 4; for ($i = $size - 6; $i >= 0; $i -= 6) { - $o = $m{bindec(substr($b, $i, 6))} . $o; + $o = $m[bindec(substr($b, $i, 6))] . $o; } # Some few bits remaining ? if ($i < 0 && $i > -6) { - $o = $m{bindec(substr($b, 0, $i + 6))} . $o; + $o = $m[bindec(substr($b, 0, $i + 6))] . $o; } return $o; } @@ -192,12 +192,16 @@ function jirafeau_ini_to_bytes($value) switch (strtoupper($modifier)) { case 'P': $bytes *= 1024; + // no break case 'T': $bytes *= 1024; + // no break case 'G': $bytes *= 1024; + // no break case 'M': $bytes *= 1024; + // no break case 'K': $bytes *= 1024; } @@ -210,8 +214,10 @@ function jirafeau_ini_to_bytes($value) */ function jirafeau_get_max_upload_size_bytes() { - return min(jirafeau_ini_to_bytes(ini_get('post_max_size')), - jirafeau_ini_to_bytes(ini_get('upload_max_filesize'))); + return min( + jirafeau_ini_to_bytes(ini_get('post_max_size')), + jirafeau_ini_to_bytes(ini_get('upload_max_filesize')) + ); } /** @@ -459,10 +465,12 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l /* create link file */ $link_tmp_name = VAR_LINKS . $hash . rand(0, 10000) . '.tmp'; $handle = fopen($link_tmp_name, 'w'); - fwrite($handle, - $name . NL. $mime_type . NL. $size . NL. $password . NL. $time . + fwrite( + $handle, + $name . NL. $mime_type . NL. $size . NL. $password . NL. $time . NL . $hash. NL . ($one_time_download ? 'O' : 'R') . NL . time() . - NL . $ip . NL. $delete_link_code . NL . ($crypted ? 'C' : 'O')); + NL . $ip . NL. $delete_link_code . NL . ($crypted ? 'C' : 'O') + ); fclose($handle); $hash_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length); $l = s2p("$hash_link"); @@ -501,10 +509,15 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l function jirafeau_is_viewable($mime) { if (!empty($mime)) { - /* Actually, verify if mime-type is an image or a text. */ - $viewable = array('image', 'text', 'video', 'audio'); + $viewable = array('image', 'video', 'audio'); $decomposed = explode('/', $mime); - return in_array($decomposed[0], $viewable); + if (in_array($decomposed[0], $viewable) && strpos($mime, 'image/svg+xml') === false) { + return true; + } + $viewable = array('text/plain'); + if (in_array($mime, $viewable)) { + return true; + } } return false; } @@ -672,7 +685,9 @@ function jirafeau_admin_list($name, $file_hash, $link_hash) echo t('EXPIRE') . ': ' . ($l['time'] == -1 ? '∞' : jirafeau_get_datetimefield($l['time'])) . '
'; echo t('ONETIME') . ': ' . ($l['onetime'] == 'O' ? 'Yes' : 'No') . '
'; echo t('UPLOAD_DATE') . ': ' . jirafeau_get_datetimefield($l['upload_date']) . '
'; - echo t('ORIGIN') . ': ' . $l['ip'] . '
'; + if (strlen($l['ip']) > 0) { + echo t('ORIGIN') . ': ' . $l['ip'] . '
'; + } echo ''; echo '
' . '' . @@ -778,6 +793,104 @@ function jirafeau_admin_clean_async() } return $count; } + +/** + * Better strval function for debug purposes + */ +function jirafeau_strval($value) +{ + if (gettype($value) == "boolean") { + return $value ? 'true' : 'false'; + } + return strval($value); +} + +/** + * Show file/folder permissions + */ +function jirafeau_fileperms($path) +{ + $out = substr(sprintf("%o", @fileperms($path)), -4) . ", "; + $out .= "read " . (is_readable($path) ? "OK" : "KO") . ", "; + $out .= "write " . (is_writable($path) ? "OK" : "KO"); + return $out; +} + +/** + * Show some useful informations for bug reporting. + */ +function jirafeau_admin_bug_report($cfg) +{ + $out = "
" . t('REPORTING_AN_ISSUE') . ""; + $out .= "If you have a problem related to Jirafeau, please open an issue, explain your problem in english and copy-paste the following content:

"; + + $out .= "# Jirafeau
"; + $out .= "- version: " . JIRAFEAU_VERSION . "
"; + $jirafeau_options = [ + 'debug', + 'file_hash', + 'litespeed_workaround', + 'store_uploader_ip', + 'installation_done', + 'enable_crypt', + 'preview', + 'maximal_upload_size', + 'store_uploader_ip' + ]; + foreach ($jirafeau_options as &$o) { + $v = $cfg[$o]; + $out .= "- $o: " . jirafeau_strval($v) . " (" . gettype($v) . ")
"; + } + $out .= "
"; + + $out .= "# PHP options
"; + $out .= "- php version: " . phpversion() . "
"; + $out .= "- mcrypt version: " . phpversion('mcrypt') . "
"; + $php_options = [ + 'post_max_size', + 'upload_max_filesize', + 'safe_mode', + 'max_execution_time', + 'max_input_time' + ]; + foreach ($php_options as &$o) { + $v = ini_get($o); + $out .= "- $o: " . jirafeau_strval($v) . " (" . gettype($v). ")
"; + } + $out .= "- can set_time_limit: " . (set_time_limit(0) ? "yes" : "no") . "
"; + $out .= "
"; + + $out .= "# File permissions
"; + $out .= "- 'var' folder permissions: " . jirafeau_fileperms($cfg['var_root']) . "
"; + $out .= "- 'file' folder permissions: " . jirafeau_fileperms(VAR_FILES) . "
"; + $out .= "- 'links' folder permissions: " . jirafeau_fileperms(VAR_LINKS) . "
"; + $out .= "- 'async' folder permissions: " . jirafeau_fileperms(VAR_ASYNC) . "
"; + $out .= "
"; + + $out .= "# Server details
"; + $out .= "- server software: " . $_SERVER["SERVER_SOFTWARE"] . "
"; + $out .= "
"; + + $out .= "# OS details
"; + $out .= "- OS: " . php_uname() . "
"; + $out .= "
"; + + $out .= "# Browser details
"; + $out .= ""; + $out .= "
"; + + $out .= "# Memory
"; + $out .= "- memory_get_peak_usage: " . jirafeau_human_size(memory_get_peak_usage()) . "
"; + + $out .= "
"; + return $out; +} + /** * Read async transfert informations * @return array containing informations. @@ -866,11 +979,13 @@ function jirafeau_async_init($filename, $type, $one_time, $key, $time, $ip) /* Store informations. */ $p .= $ref; $handle = fopen($p, 'w'); - fwrite($handle, - str_replace(NL, '', trim($filename)) . NL . + fwrite( + $handle, + str_replace(NL, '', trim($filename)) . NL . str_replace(NL, '', trim($type)) . NL . $password . NL . $time . NL . ($one_time ? 'O' : 'R') . NL . $ip . NL . - time() . NL . $code . NL); + time() . NL . $code . NL + ); fclose($handle); return $ref . NL . $code ; @@ -928,10 +1043,12 @@ function jirafeau_async_push($ref, $data, $code, $max_file_size) /* Update async file. */ $code = jirafeau_gen_random(4); $handle = fopen(VAR_ASYNC . $p . $ref, 'w'); - fwrite($handle, - $a['file_name'] . NL. $a['mime_type'] . NL. $a['key'] . NL . + fwrite( + $handle, + $a['file_name'] . NL. $a['mime_type'] . NL. $a['key'] . NL . $a['time'] . NL . $a['onetime'] . NL . $a['ip'] . NL . - time() . NL . $code . NL); + time() . NL . $code . NL + ); fclose($handle); return $code; } @@ -995,10 +1112,12 @@ function jirafeau_async_end($ref, $code, $crypt, $link_name_length, $file_hash_m /* Create link. */ $link_tmp_name = VAR_LINKS . $hash . rand(0, 10000) . '.tmp'; $handle = fopen($link_tmp_name, 'w'); - fwrite($handle, - $a['file_name'] . NL . $a['mime_type'] . NL . $size . NL . + fwrite( + $handle, + $a['file_name'] . NL . $a['mime_type'] . NL . $size . NL . $a['key'] . NL . $a['time'] . NL . $hash . NL . $a['onetime'] . NL . - time() . NL . $a['ip'] . NL . $delete_link_code . NL . ($crypted ? 'C' : 'O')); + time() . NL . $a['ip'] . NL . $delete_link_code . NL . ($crypted ? 'C' : 'O') + ); fclose($handle); $hash_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length); $l = s2p("$hash_link"); @@ -1152,7 +1271,8 @@ function jirafeau_challenge_ip($allowedIpList, $challengedIp) * Check if Jirafeau has a restriction on the IP address for uploading. * @return true if uploading is IP restricted, false otherwise. */ -function jirafeau_upload_has_ip_restriction($cfg) { +function jirafeau_upload_has_ip_restriction($cfg) +{ return count($cfg['upload_ip']) > 0; } @@ -1190,7 +1310,7 @@ function jirafeau_challenge_upload_ip_without_password($cfg, $challengedIp) * @param $password password to be challenged * @return true if access is valid, false otherwise. */ -function jirafeau_challenge_upload ($cfg, $ip, $password) +function jirafeau_challenge_upload($cfg, $ip, $password) { return jirafeau_challenge_upload_ip_without_password($cfg, $ip) || (!jirafeau_has_upload_password($cfg) && !jirafeau_upload_has_ip_restriction($cfg)) || @@ -1344,3 +1464,75 @@ function jirafeau_dir_size($dir) } return $size; } + +function jirafeau_export_cfg($cfg) +{ + $content = ' true, + 'why' => $mkdir_str1 . '
' . + $path . '
' . $solution_str . + '
' . $mkdir_str2); + } + + foreach (array('files', 'links', 'async') as $subdir) { + $subpath = $path.$subdir; + + if (!jirafeau_mkdir($subpath) || !jirafeau_is_writable($subpath)) { + return array('has_error' => true, + 'why' => $mkdir_str1 . '
' . + $subpath . '
' . $solution_str . + '
' . $mkdir_str2); + } + } + + return array('has_error' => false, 'why' => ''); +} + +function jirafeau_add_ending_slash($path) +{ + return $path . ((substr($path, -1) == '/') ? '' : '/'); +} + +function jirafeau_default_web_root() +{ + return $_SERVER['HTTP_HOST'] . str_replace(basename(__FILE__), '', $_SERVER['REQUEST_URI']); +}