X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/d98c495abf51c2581b2d8b1edfc09004f5defcde..40b274fbb2209d95cdb84e7b08c40e1c5c4092d0:/lib/functions.php diff --git a/lib/functions.php b/lib/functions.php index c0e0c72..5c0c45f 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -3,6 +3,7 @@ * Jirafeau, your web file repository * Copyright (C) 2008 Julien "axolotl" BERNARD * Copyright (C) 2015 Jerome Jutteau + * Copyright (C) 2015 Nicola Spanti (RyDroid) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -15,12 +16,12 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ /** * Transform a string in a path by seperating each letters by a '/'. - * @return path finishing with a '/' + * @return path finishing with a '/' */ function s2p ($s) @@ -39,23 +40,23 @@ function base_16_to_64 ($num) { $m = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_'; - $hex2bin = array ('0000', # 0 - '0001', # 1 - '0010', # 2 - '0011', # 3 - '0100', # 4 - '0101', # 5 - '0110', # 6 - '0111', # 7 - '1000', # 8 - '1001', # 9 - '1010', # a - '1011', # b - '1100', # c - '1101', # d - '1110', # e - '1111'); # f - $o = ''; + $hex2bin = array ('0000', # 0 + '0001', # 1 + '0010', # 2 + '0011', # 3 + '0100', # 4 + '0101', # 5 + '0110', # 6 + '0111', # 7 + '1000', # 8 + '1001', # 9 + '1010', # a + '1011', # b + '1100', # c + '1101', # d + '1110', # e + '1111'); # f + $o = ''; $b = ''; $i = 0; # Convert long hex string to bin. @@ -90,11 +91,11 @@ jirafeau_gen_random ($l) return $code; } -function is_ssl() { +function +is_ssl() { if ( isset($_SERVER['HTTPS']) ) { - if ( 'on' == strtolower($_SERVER['HTTPS']) ) - return true; - if ( '1' == $_SERVER['HTTPS'] ) + if ( 'on' == strtolower($_SERVER['HTTPS']) || + '1' == $_SERVER['HTTPS'] ) return true; } elseif ( isset($_SERVER['SERVER_PORT']) && ( '443' == $_SERVER['SERVER_PORT'] ) ) { return true; @@ -113,7 +114,7 @@ jirafeau_human_size ($octets) $p = min (floor (($o ? log ($o) : 0) / log (1024)), count ($u) - 1); $o /= pow (1024, $p); return round ($o, 1) . $u[$p]; -} +} function jirafeau_clean_rm_link ($link) @@ -126,7 +127,7 @@ jirafeau_clean_rm_link ($link) while (file_exists ($parse) && ($scan = scandir ($parse)) && count ($scan) == 2 // '.' and '..' folders => empty. - && basename ($parse) != basename (VAR_LINKS)) + && basename ($parse) != basename (VAR_LINKS)) { rmdir ($parse); $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1); @@ -147,7 +148,7 @@ jirafeau_clean_rm_file ($md5) while (file_exists ($parse) && ($scan = scandir ($parse)) && count ($scan) == 2 // '.' and '..' folders => empty. - && basename ($parse) != basename (VAR_FILES)) + && basename ($parse) != basename (VAR_FILES)) { rmdir ($parse); $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1); @@ -159,7 +160,8 @@ jirafeau_clean_rm_file ($md5) * @param $value the value from php.ini * @returns an integer for this value */ -function jirafeau_ini_to_bytes ($value) +function +jirafeau_ini_to_bytes ($value) { $modifier = substr ($value, -1); $bytes = substr ($value, 0, -1); @@ -175,8 +177,6 @@ function jirafeau_ini_to_bytes ($value) $bytes *= 1024; case 'K': $bytes *= 1024; - default: - break; } return $bytes; } @@ -217,23 +217,16 @@ jirafeau_upload_errstr ($code) case UPLOAD_ERR_INI_SIZE: case UPLOAD_ERR_FORM_SIZE: return t('Your file exceeds the maximum authorized file size. '); - break; case UPLOAD_ERR_PARTIAL: case UPLOAD_ERR_NO_FILE: return - t - ('Your file was not uploaded correctly. You may succeed in retrying. '); - break; + t('Your file was not uploaded correctly. You may succeed in retrying. '); case UPLOAD_ERR_NO_TMP_DIR: case UPLOAD_ERR_CANT_WRITE: case UPLOAD_ERR_EXTENSION: return t('Internal error. You may not succeed in retrying. '); - break; - - default: - break; } return t('Unknown error. '); } @@ -291,7 +284,7 @@ jirafeau_delete_file ($md5) if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 || preg_match ('/\.tmp/i', "$node")) continue; - + if (is_dir ($d . $node)) { /* Push new found directory. */ @@ -307,7 +300,7 @@ jirafeau_delete_file ($md5) { $count++; jirafeau_delete_link ($node); - } + } } } } @@ -420,7 +413,7 @@ jirafeau_upload ($file, $one_time_download, $key, $time, $ip, $crypt, $link_name { if (file_exists ($link_tmp_name)) unlink ($link_tmp_name); - + $counter--; if ($counter >= 1) { @@ -432,17 +425,17 @@ jirafeau_upload ($file, $one_time_download, $key, $time, $ip, $crypt, $link_name { jirafeau_clean_rm_file ($md5_link); } - return (array( + return array( 'error' => array ('has_error' => true, 'why' => t('Internal error during file creation. ')), 'link' =>'', - 'delete_link' => '')); + 'delete_link' => ''); } - return (array ('error' => $noerr, + return array ( 'error' => $noerr, 'link' => $md5_link, 'delete_link' => $delete_link_code, - 'crypt_key' => $crypt_key)); + 'crypt_key' => $crypt_key); } /** @@ -513,7 +506,7 @@ function check_errors ($cfg) if (file_exists (JIRAFEAU_ROOT . 'install.php') && !($cfg['installation_done'] === true)) { - header('Location: install.php'); + header('Location: install.php'); exit; } @@ -526,7 +519,7 @@ function check_errors ($cfg) if (!is_writable (VAR_LINKS)) add_error (t('The link directory is not writable!'), VAR_LINKS); - + if (!is_writable (VAR_ASYNC)) add_error (t('The async directory is not writable!'), VAR_ASYNC); } @@ -543,7 +536,7 @@ jirafeau_get_link ($hash) if (!file_exists ($link)) return $out; - + $c = file ($link); $out['file_name'] = trim ($c[0]); $out['mime_type'] = trim ($c[1]); @@ -555,11 +548,8 @@ jirafeau_get_link ($hash) $out['upload_date'] = trim ($c[7]); $out['ip'] = trim ($c[8]); $out['link_code'] = trim ($c[9]); - if (trim ($c[10]) == 'C') - $out['crypted'] = true; - else - $out['crypted'] = false; - + $out['crypted'] = trim ($c[10]) == 'C'; + return $out; } @@ -623,21 +613,28 @@ jirafeau_admin_list ($name, $file_hash, $link_hash) /* Print link informations. */ echo ''; echo '' . - '
' . - '' . - '' . - '' . - '
'; + '' . htmlspecialchars($l['file_name']) . ''; echo ''; echo '' . $l['mime_type'] . ''; echo '' . jirafeau_human_size ($l['file_size']) . ''; echo '' . ($l['time'] == -1 ? '' : strftime ('%c', $l['time'])) . ''; - echo '' . $l['onetime'] . ''; + echo ''; + if ($l['onetime'] == 'O') + echo 'Y'; + else + echo 'N'; + echo ''; echo '' . strftime ('%c', $l['upload_date']) . ''; echo '' . $l['ip'] . ''; echo '' . '
' . + '' . + '' . + '' . + '
' . + '
' . '' . '' . '' . @@ -674,7 +671,7 @@ jirafeau_admin_clean () if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 || preg_match ('/\.tmp/i', "$node")) continue; - + if (is_dir ($d . $node)) { /* Push new found directory. */ @@ -720,7 +717,7 @@ jirafeau_admin_clean_async () if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 || preg_match ('/\.tmp/i', "$node")) continue; - + if (is_dir ($d . $node)) { /* Push new found directory. */ @@ -755,7 +752,7 @@ jirafeau_get_async_ref ($ref) if (!file_exists ($refinfos)) return $out; - + $c = file ($refinfos); $out['file_name'] = trim ($c[0]); $out['mime_type'] = trim ($c[1]); @@ -784,7 +781,7 @@ jirafeau_async_delete ($ref) while (file_exists ($parse) && ($scan = scandir ($parse)) && count ($scan) == 2 // '.' and '..' folders => empty. - && basename ($parse) != basename (VAR_ASYNC)) + && basename ($parse) != basename (VAR_ASYNC)) { rmdir ($parse); $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1); @@ -798,7 +795,7 @@ jirafeau_async_delete ($ref) * @param $key eventual password (or blank) * @param $time time limit * @param $ip ip address of the client - * @return a string containing a temporary reference followed by a code or the string "Error" + * @return a string containing a temporary reference followed by a code or the string 'Error' */ function jirafeau_async_init ($filename, $type, $one_time, $key, $time, $ip) @@ -817,10 +814,10 @@ jirafeau_async_init ($filename, $type, $one_time, $key, $time, $ip) @mkdir ($p, 0755, true); if (!file_exists ($p)) { - echo "Error"; + echo 'Error'; return; } - + /* md5 password or empty */ $password = ''; if (!empty ($key)) @@ -845,21 +842,21 @@ jirafeau_async_init ($filename, $type, $one_time, $key, $time, $ip) * @param $file piece of data * @param $code client code for this operation * @param $max_file_size maximum allowed file size - * @return a string containing a next code to use or the string "Error" + * @return a string containing a next code to use or the string "Error" */ function jirafeau_async_push ($ref, $data, $code, $max_file_size) { /* Get async infos. */ $a = jirafeau_get_async_ref ($ref); - + /* Check some errors. */ if (count ($a) == 0 || $a['next_code'] != "$code" || empty ($data['tmp_name']) || !is_uploaded_file ($data['tmp_name'])) - return "Error"; - + return 'Error'; + $p = s2p ($ref); /* File path. */ @@ -871,7 +868,7 @@ jirafeau_async_push ($ref, $data, $code, $max_file_size) filesize ($r_path) + filesize ($w_path) > $max_file_size * 1024 * 1024) { jirafeau_async_delete ($ref); - return "Error"; + return 'Error'; } /* Concatenate data. */ @@ -884,13 +881,13 @@ jirafeau_async_push ($ref, $data, $code, $max_file_size) fclose ($r); fclose ($w); jirafeau_async_delete ($ref); - return "Error"; + return 'Error'; } } fclose ($r); fclose ($w); unlink ($r_path); - + /* Update async file. */ $code = jirafeau_gen_random (4); $handle = fopen (VAR_ASYNC . $p . $ref, 'w'); @@ -908,7 +905,7 @@ jirafeau_async_push ($ref, $data, $code, $max_file_size) * @param $code client code for this operation * @param $crypt boolean asking to crypt or not * @param $link_name_length link name length - * @return a string containing the download reference followed by a delete code or the string "Error" + * @return a string containing the download reference followed by a delete code or the string 'Error' */ function jirafeau_async_end ($ref, $code, $crypt, $link_name_length) @@ -918,11 +915,11 @@ jirafeau_async_end ($ref, $code, $crypt, $link_name_length) if (count ($a) == 0 || $a['next_code'] != "$code") return "Error"; - + /* Generate link infos. */ $p = VAR_ASYNC . s2p ($ref) . $ref . "_data"; if (!file_exists($p)) - return "Error"; + return 'Error'; $crypted = false; $crypt_key = ''; @@ -937,13 +934,13 @@ jirafeau_async_end ($ref, $code, $crypt, $link_name_length) $size = filesize($p); $np = s2p ($md5); $delete_link_code = jirafeau_gen_random (5); - - /* File already exist ? */ + + /* File already exist ? */ if (!file_exists (VAR_FILES . $np)) @mkdir (VAR_FILES . $np, 0755, true); if (!file_exists (VAR_FILES . $np . $md5)) rename ($p, VAR_FILES . $np . $md5); - + /* Increment or create count file. */ $counter = 0; if (file_exists (VAR_FILES . $np . $md5 . '_count')) @@ -955,7 +952,7 @@ jirafeau_async_end ($ref, $code, $crypt, $link_name_length) $handle = fopen (VAR_FILES . $np . $md5. '_count', 'w'); fwrite ($handle, $counter); fclose ($handle); - + /* Create link. */ $link_tmp_name = VAR_LINKS . $md5 . rand (0, 10000) . '.tmp'; $handle = fopen ($link_tmp_name, 'w'); @@ -969,7 +966,7 @@ jirafeau_async_end ($ref, $code, $crypt, $link_name_length) if (!@mkdir (VAR_LINKS . $l, 0755, true) || !rename ($link_tmp_name, VAR_LINKS . $l . $md5_link)) echo "Error"; - + /* Clean async upload. */ jirafeau_async_delete ($ref); return $md5_link . NL . $delete_link_code . NL . urlencode($crypt_key); @@ -1034,7 +1031,7 @@ function jirafeau_decrypt_file ($fp_src, $fp_dst, $k) { $fs = filesize ($fp_src); - if ($fs === false || $fs == 0 || !(extension_loaded('mcrypt') == true)) + if ($fs === false || $fs == 0 || extension_loaded('mcrypt') == false) return false; /* Init module */ @@ -1064,7 +1061,8 @@ jirafeau_decrypt_file ($fp_src, $fp_dst, $k) * Check if Jirafeau is password protected for visitors. * @return true if Jirafeau is password protected, false otherwise. */ -function jirafeau_has_upload_password ($cfg) +function +jirafeau_has_upload_password ($cfg) { return count ($cfg['upload_password']) > 0; } @@ -1074,7 +1072,8 @@ function jirafeau_has_upload_password ($cfg) * @param $password password to be challenged * @return true if password is valid, false otherwise. */ -function jirafeau_challenge_upload_password ($cfg, $password) +function +jirafeau_challenge_upload_password ($cfg, $password) { if (!jirafeau_has_upload_password($cfg)) return false; @@ -1089,7 +1088,8 @@ function jirafeau_challenge_upload_password ($cfg, $password) * @param $ip IP to be challenged * @return true if IP is authorized, false otherwise. */ -function jirafeau_challenge_upload_ip ($cfg, $ip) +function +jirafeau_challenge_upload_ip ($cfg, $ip) { if (count ($cfg['upload_ip']) == 0) return true; @@ -1109,25 +1109,27 @@ function jirafeau_challenge_upload_ip ($cfg, $ip) } /** Tell if we have some HTTP headers generated by a proxy */ -function has_http_forwarded() +function +has_http_forwarded() { - if (!empty ($_SERVER['HTTP_X_FORWARDED_FOR'])) - return true; - if (!empty ($_SERVER['http_X_forwarded_for'])) - return true; - return false; + return + !empty ($_SERVER['HTTP_X_FORWARDED_FOR']) || + !empty ($_SERVER['http_X_forwarded_for']); } /** * Generate IP list from HTTP headers generated by a proxy * @return array of IP strings */ -function get_ip_list_http_forwarded() +function +get_ip_list_http_forwarded() { $ip_list = array(); if (!empty ($_SERVER['HTTP_X_FORWARDED_FOR'])) { $l = explode (',', $_SERVER['HTTP_X_FORWARDED_FOR']); + if ($l === FALSE) + return array(); foreach ($l as $ip) array_push ($ip_list, preg_replace ('/\s+/', '', $ip)); } @@ -1137,7 +1139,10 @@ function get_ip_list_http_forwarded() foreach ($l as $ip) { // Separate IP from port - $ip = explode (':', $ip)[0]; + $ipa = explode (':', $ip); + if ($ipa === FALSE) + continue; + $ip = $ipa[0]; array_push ($ip_list, preg_replace ('/\s+/', '', $ip)); } } @@ -1149,7 +1154,9 @@ function get_ip_list_http_forwarded() * or from HTTP_X_FORWARDED_FOR if behind a proxy * @returns the client ip address */ -function get_ip_address($cfg) { +function +get_ip_address($cfg) +{ $remote = $_SERVER['REMOTE_ADDR']; if (count ($cfg['proxy_ip']) == 0 || !has_http_forwarded ()) return $remote; @@ -1191,13 +1198,13 @@ jirafeau_get_alias ($hash) if (!file_exists ($link)) return $out; - + $c = file ($link); $out['md5_password'] = trim ($c[0]); $out['ip'] = trim ($c[1]); $out['update_date'] = trim ($c[2]); $out['destination'] = trim ($c[3], NL); - + return $out; } @@ -1208,31 +1215,32 @@ jirafeau_get_alias ($hash) * @param $ip client's IP * @return a string containing the edit code of the alias or the string "Error" */ -function jirafeau_alias_create ($alias, $destination, $password, $ip) +function +jirafeau_alias_create ($alias, $destination, $password, $ip) { /* Check that alias and password are long enough. */ if (strlen ($alias) < 8 || strlen ($alias) > 32 || strlen ($password) < 8 || strlen ($password) > 32) - return "Error"; + return 'Error'; /* Check that destination exists. */ $l = jirafeau_get_link ($destination); if (!count ($l)) - return "Error"; + return 'Error'; /* Check that alias does not already exists. */ $alias = md5 ($alias); $p = VAR_ALIAS . s2p ($alias); if (file_exists ($p)) - return "Error"; - + return 'Error'; + /* Create alias folder. */ @mkdir ($p, 0755, true); if (!file_exists ($p)) - return "Error"; - + return 'Error'; + /* Generate password. */ $md5_password = md5 ($password); @@ -1246,7 +1254,7 @@ function jirafeau_alias_create ($alias, $destination, $password, $ip) $destination . NL); fclose ($handle); - return "Ok"; + return 'Ok'; } /** Update an alias. @@ -1257,30 +1265,31 @@ function jirafeau_alias_create ($alias, $destination, $password, $ip) * @param $ip client's IP * @return "Ok" or "Error" string */ -function jirafeau_alias_update ($alias, $destination, $password, - $new_password, $ip) +function +jirafeau_alias_update ($alias, $destination, $password, + $new_password, $ip) { $alias = md5 ($alias); /* Check that alias exits. */ $a = jirafeau_get_alias ($alias); if (!count ($a)) - return "Error"; + return 'Error'; /* Check that destination exists. */ $l = jirafeau_get_link ($a["destination"]); if (!count ($l)) - return "Error"; + return 'Error'; /* Check password. */ if ($a["md5_password"] != md5 ($password)) - return "Error"; + return 'Error'; - $p = $a["md5_password"]; + $p = $a['md5_password']; if (strlen ($new_password) >= 8 && strlen ($new_password) <= 32) $p = md5 ($new_password); else if (strlen ($new_password) > 0) - return "Error"; + return 'Error'; /* Rewrite informations. */ $p = VAR_ALIAS . s2p ($alias) . $alias; @@ -1291,25 +1300,27 @@ function jirafeau_alias_update ($alias, $destination, $password, date ('U') . NL . $destination . NL); fclose ($handle); - return "Ok"; + return 'Ok'; } /** Get an alias. * @param $alias alias to get * @return alias destination or "Error" string */ -function jirafeau_alias_get ($alias) +function +jirafeau_alias_get ($alias) { $alias = md5 ($alias); /* Check that alias exits. */ $a = jirafeau_get_alias ($alias); if (!count ($a)) - return "Error"; + return 'Error'; - return $a["destination"]; + return $a['destination']; } -function jirafeau_clean_rm_alias ($alias) +function +jirafeau_clean_rm_alias ($alias) { $p = s2p ("$alias"); if (file_exists (VAR_ALIAS . $p . $alias)) @@ -1319,7 +1330,7 @@ function jirafeau_clean_rm_alias ($alias) while (file_exists ($parse) && ($scan = scandir ($parse)) && count ($scan) == 2 // '.' and '..' folders => empty. - && basename ($parse) != basename (VAR_ALIAS)) + && basename ($parse) != basename (VAR_ALIAS)) { rmdir ($parse); $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1); @@ -1331,7 +1342,8 @@ function jirafeau_clean_rm_alias ($alias) * @param $password password to protect alias * @return "Ok" or "Error" string */ -function jirafeau_alias_delete ($alias, $password) +function +jirafeau_alias_delete ($alias, $password) { $alias = md5 ($alias); /* Check that alias exits. */ @@ -1341,9 +1353,9 @@ function jirafeau_alias_delete ($alias, $password) /* Check password. */ if ($a["md5_password"] != md5 ($password)) - return "Error"; + return 'Error'; jirafeau_clean_rm_alias ($alias); - return "Ok"; + return 'Ok'; }