X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/6d4142df4e30e1f46cfa5b377bf2db0323e59479..0e38a24b7a276704431ca70c440ff49f4d53d341:/lib/functions.php diff --git a/lib/functions.php b/lib/functions.php index 83fdaf1..47fbc40 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -56,7 +56,7 @@ base_16_to_64 ($num) '1101', # d '1110', # e '1111'); # f - $o = ''; + $o = ''; $b = ''; $i = 0; # Convert long hex string to bin. @@ -114,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) @@ -127,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); @@ -148,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); @@ -284,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. */ @@ -300,7 +300,7 @@ jirafeau_delete_file ($md5) { $count++; jirafeau_delete_link ($node); - } + } } } } @@ -403,7 +403,7 @@ jirafeau_upload ($file, $one_time_download, $key, $time, $ip, $crypt, $link_name $handle = fopen ($link_tmp_name, 'w'); fwrite ($handle, $name . NL. $mime_type . NL. $size . NL. $password . NL. $time . - NL . $md5. NL . ($one_time_download ? 'O' : 'R') . NL . date ('U') . + NL . $md5. NL . ($one_time_download ? 'O' : 'R') . NL . time () . NL . $ip . NL. $delete_link_code . NL . ($crypted ? 'C' : 'O')); fclose ($handle); $md5_link = substr(base_16_to_64 (md5_file ($link_tmp_name)), 0, $link_name_length); @@ -413,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) { @@ -506,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; } @@ -519,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); } @@ -536,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]); @@ -549,7 +549,7 @@ jirafeau_get_link ($hash) $out['ip'] = trim ($c[8]); $out['link_code'] = trim ($c[9]); $out['crypted'] = trim ($c[10]) == 'C'; - + return $out; } @@ -613,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 '' . '
' . + '' . + '' . + '' . + '
' . + '
' . '' . '' . '' . @@ -664,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. */ @@ -710,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. */ @@ -723,7 +730,7 @@ jirafeau_admin_clean_async () if (!count ($a)) continue; /* Delete transferts older than 1 hour. */ - if (date ('U') - $a['last_edited'] > 3600) + if (time () - $a['last_edited'] > 3600) { jirafeau_async_delete (basename ($node)); $count++; @@ -745,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]); @@ -774,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); @@ -810,7 +817,7 @@ jirafeau_async_init ($filename, $type, $one_time, $key, $time, $ip) echo 'Error'; return; } - + /* md5 password or empty */ $password = ''; if (!empty ($key)) @@ -823,7 +830,7 @@ jirafeau_async_init ($filename, $type, $one_time, $key, $time, $ip) str_replace (NL, '', trim ($filename)) . NL . str_replace (NL, '', trim ($type)) . NL . $password . NL . $time . NL . ($one_time ? 'O' : 'R') . NL . $ip . NL . - date ('U') . NL . $code . NL); + time () . NL . $code . NL); fclose ($handle); return $ref . NL . $code ; @@ -842,14 +849,14 @@ 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'; - + $p = s2p ($ref); /* File path. */ @@ -880,14 +887,14 @@ jirafeau_async_push ($ref, $data, $code, $max_file_size) fclose ($r); fclose ($w); unlink ($r_path); - + /* 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 . $a['time'] . NL . $a['onetime'] . NL . $a['ip'] . NL . - date ('U') . NL . $code . NL); + time () . NL . $code . NL); fclose ($handle); return $code; } @@ -908,7 +915,7 @@ 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)) @@ -927,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')) @@ -945,21 +952,21 @@ 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'); fwrite ($handle, $a['file_name'] . NL . $a['mime_type'] . NL . $size . NL . $a['key'] . NL . $a['time'] . NL . $md5 . NL . $a['onetime'] . NL . - date ('U') . 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); $md5_link = substr(base_16_to_64 (md5_file ($link_tmp_name)), 0, $link_name_length); $l = s2p ("$md5_link"); 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); @@ -1121,6 +1128,8 @@ get_ip_list_http_forwarded() 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)); } @@ -1130,7 +1139,10 @@ 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)); } } @@ -1186,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; } @@ -1223,12 +1235,12 @@ jirafeau_alias_create ($alias, $destination, $password, $ip) $p = VAR_ALIAS . s2p ($alias); if (file_exists ($p)) return 'Error'; - + /* Create alias folder. */ @mkdir ($p, 0755, true); if (!file_exists ($p)) return 'Error'; - + /* Generate password. */ $md5_password = md5 ($password); @@ -1238,7 +1250,7 @@ jirafeau_alias_create ($alias, $destination, $password, $ip) fwrite ($handle, $md5_password . NL . $ip . NL . - date ('U') . NL . + time () . NL . $destination . NL); fclose ($handle); @@ -1285,7 +1297,7 @@ jirafeau_alias_update ($alias, $destination, $password, fwrite ($handle, $p . NL . $ip . NL . - date ('U') . NL . + time () . NL . $destination . NL); fclose ($handle); return 'Ok'; @@ -1318,7 +1330,7 @@ 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);