X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/0f8fa96f56dde46864336cd4864e158b55248f58..cd09b476cbbfa8f90f0f86e67da5414d21c8ad10:/lib/functions.php diff --git a/lib/functions.php b/lib/functions.php index 83fdaf1..bac444b 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -23,12 +23,12 @@ * Transform a string in a path by seperating each letters by a '/'. * @return path finishing with a '/' */ -function -s2p ($s) +function s2p($s) { $p = ''; - for ($i = 0; $i < strlen ($s); $i++) + for ($i = 0; $i < strlen($s); $i++) { $p .= $s{$i} . '/'; + } return $p; } @@ -36,11 +36,10 @@ s2p ($s) * Convert base 16 to base 64 * @returns A string based on 64 characters (0-9, a-z, A-Z, "-" and "_") */ -function -base_16_to_64 ($num) +function base_16_to_64($num) { $m = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_'; - $hex2bin = array ('0000', # 0 + $hex2bin = array('0000', # 0 '0001', # 1 '0010', # 2 '0011', # 3 @@ -56,20 +55,23 @@ base_16_to_64 ($num) '1101', # d '1110', # e '1111'); # f - $o = ''; + $o = ''; $b = ''; $i = 0; # Convert long hex string to bin. - $size = strlen ($num); - for ($i = 0; $i < $size; $i++) - $b .= $hex2bin{hexdec ($num{$i})}; + $size = strlen($num); + for ($i = 0; $i < $size; $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; + for ($i = $size - 6; $i >= 0; $i -= 6) { + $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; + if ($i < 0 && $i > -6) { + $o = $m{bindec(substr($b, 0, $i + 6))} . $o; + } return $o; } @@ -78,80 +80,81 @@ base_16_to_64 ($num) * @param $l code length * @return random code. */ -function -jirafeau_gen_random ($l) +function jirafeau_gen_random($l) { - if ($l <= 0) + if ($l <= 0) { return 42; + } $code=""; - for ($i = 0; $i < $l; $i++) - $code .= dechex (rand (0, 15)); + for ($i = 0; $i < $l; $i++) { + $code .= dechex(rand(0, 15)); + } return $code; } -function -is_ssl() { - if ( isset($_SERVER['HTTPS']) ) { - if ( 'on' == strtolower($_SERVER['HTTPS']) || - '1' == $_SERVER['HTTPS'] ) +function is_ssl() +{ + if (isset($_SERVER['HTTPS'])) { + if ('on' == strtolower($_SERVER['HTTPS']) || + '1' == $_SERVER['HTTPS']) { return true; - } elseif ( isset($_SERVER['SERVER_PORT']) && ( '443' == $_SERVER['SERVER_PORT'] ) ) { + } + } elseif (isset($_SERVER['SERVER_PORT']) && ('443' == $_SERVER['SERVER_PORT'])) { return true; } elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) { - if ($_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') + if ($_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') { return true; + } } return false; } -function -jirafeau_human_size ($octets) +function jirafeau_human_size($octets) { - $u = array ('B', 'KB', 'MB', 'GB', 'TB'); - $o = max ($octets, 0); - $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) + $u = array('B', 'KB', 'MB', 'GB', 'TB'); + $o = max($octets, 0); + $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) { - $p = s2p ("$link"); - if (file_exists (VAR_LINKS . $p . $link)) - unlink (VAR_LINKS . $p . $link); + $p = s2p("$link"); + if (file_exists(VAR_LINKS . $p . $link)) { + unlink(VAR_LINKS . $p . $link); + } $parse = VAR_LINKS . $p; $scan = array(); - while (file_exists ($parse) - && ($scan = scandir ($parse)) - && count ($scan) == 2 // '.' and '..' folders => empty. - && basename ($parse) != basename (VAR_LINKS)) - { - rmdir ($parse); - $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1); + while (file_exists($parse) + && ($scan = scandir($parse)) + && count($scan) == 2 // '.' and '..' folders => empty. + && basename($parse) != basename(VAR_LINKS)) { + rmdir($parse); + $parse = substr($parse, 0, strlen($parse) - strlen(basename($parse)) - 1); } } -function -jirafeau_clean_rm_file ($md5) +function jirafeau_clean_rm_file($md5) { - $p = s2p ("$md5"); + $p = s2p("$md5"); $f = VAR_FILES . $p . $md5; - if (file_exists ($f) && is_file ($f)) - unlink ($f); - if (file_exists ($f . '_count') && is_file ($f . '_count')) - unlink ($f . '_count'); + if (file_exists($f) && is_file($f)) { + unlink($f); + } + if (file_exists($f . '_count') && is_file($f . '_count')) { + unlink($f . '_count'); + } $parse = VAR_FILES . $p; $scan = array(); - while (file_exists ($parse) - && ($scan = scandir ($parse)) - && count ($scan) == 2 // '.' and '..' folders => empty. - && basename ($parse) != basename (VAR_FILES)) - { - rmdir ($parse); - $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1); + while (file_exists($parse) + && ($scan = scandir($parse)) + && count($scan) == 2 // '.' and '..' folders => empty. + && basename($parse) != basename(VAR_FILES)) { + rmdir($parse); + $parse = substr($parse, 0, strlen($parse) - strlen(basename($parse)) - 1); } } @@ -160,13 +163,11 @@ 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); - switch (strtoupper ($modifier)) - { + $modifier = substr($value, -1); + $bytes = substr($value, 0, -1); + switch (strtoupper($modifier)) { case 'P': $bytes *= 1024; case 'T': @@ -185,23 +186,21 @@ jirafeau_ini_to_bytes ($value) * gets the maximum upload size according to php.ini * @returns the maximum upload size in bytes */ -function -jirafeau_get_max_upload_size_bytes () +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'))); } /** * gets the maximum upload size according to php.ini * @returns the maximum upload size string */ -function -jirafeau_get_max_upload_size () +function jirafeau_get_max_upload_size() { return jirafeau_human_size( - min (jirafeau_ini_to_bytes (ini_get ('post_max_size')), - jirafeau_ini_to_bytes (ini_get ('upload_max_filesize')))); + min(jirafeau_ini_to_bytes(ini_get('post_max_size')), + jirafeau_ini_to_bytes(ini_get('upload_max_filesize')))); } /** @@ -209,11 +208,9 @@ jirafeau_get_max_upload_size () * @param $code the error code * @returns a string explaining the error */ -function -jirafeau_upload_errstr ($code) +function jirafeau_upload_errstr($code) { - switch ($code) - { + switch ($code) { case UPLOAD_ERR_INI_SIZE: case UPLOAD_ERR_FORM_SIZE: return t('Your file exceeds the maximum authorized file size. '); @@ -235,76 +232,70 @@ jirafeau_upload_errstr ($code) * @param $link the link's name (hash) */ -function -jirafeau_delete_link ($link) +function jirafeau_delete_link($link) { - $l = jirafeau_get_link ($link); - if (!count ($l)) + $l = jirafeau_get_link($link); + if (!count($l)) { return; + } - jirafeau_clean_rm_link ($link); + jirafeau_clean_rm_link($link); $md5 = $l['md5']; - $p = s2p ("$md5"); + $p = s2p("$md5"); $counter = 1; - if (file_exists (VAR_FILES . $p . $md5. '_count')) - { - $content = file (VAR_FILES . $p . $md5. '_count'); - $counter = trim ($content[0]); + if (file_exists(VAR_FILES . $p . $md5. '_count')) { + $content = file(VAR_FILES . $p . $md5. '_count'); + $counter = trim($content[0]); } $counter--; - if ($counter >= 1) - { - $handle = fopen (VAR_FILES . $p . $md5. '_count', 'w'); - fwrite ($handle, $counter); - fclose ($handle); + if ($counter >= 1) { + $handle = fopen(VAR_FILES . $p . $md5. '_count', 'w'); + fwrite($handle, $counter); + fclose($handle); } - if ($counter == 0) - jirafeau_clean_rm_file ($md5); + if ($counter == 0) { + jirafeau_clean_rm_file($md5); + } } /** * Delete a file and it's links. */ -function -jirafeau_delete_file ($md5) +function jirafeau_delete_file($md5) { $count = 0; /* Get all links files. */ - $stack = array (VAR_LINKS); - while (($d = array_shift ($stack)) && $d != NULL) - { - $dir = scandir ($d); + $stack = array(VAR_LINKS); + while (($d = array_shift($stack)) && $d != null) { + $dir = scandir($d); - foreach ($dir as $node) - { - if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 || - preg_match ('/\.tmp/i', "$node")) + foreach ($dir as $node) { + if (strcmp($node, '.') == 0 || strcmp($node, '..') == 0 || + preg_match('/\.tmp/i', "$node")) { continue; - - if (is_dir ($d . $node)) - { + } + + if (is_dir($d . $node)) { /* Push new found directory. */ $stack[] = $d . $node . '/'; - } - elseif (is_file ($d . $node)) - { + } elseif (is_file($d . $node)) { /* Read link informations. */ - $l = jirafeau_get_link (basename ($node)); - if (!count ($l)) + $l = jirafeau_get_link(basename($node)); + if (!count($l)) { continue; - if ($l['md5'] == $md5) - { + } + if ($l['md5'] == $md5) { $count++; - jirafeau_delete_link ($node); - } + jirafeau_delete_link($node); + } } } } - jirafeau_clean_rm_file ($md5); + jirafeau_clean_rm_file($md5); return $count; } @@ -322,57 +313,52 @@ jirafeau_delete_file ($md5) * 'link' => the link name of the uploaded file * 'delete_link' => the link code to delete file */ -function -jirafeau_upload ($file, $one_time_download, $key, $time, $ip, $crypt, $link_name_length) +function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $link_name_length) { - if (empty ($file['tmp_name']) || !is_uploaded_file ($file['tmp_name'])) - { + if (empty($file['tmp_name']) || !is_uploaded_file($file['tmp_name'])) { return (array( 'error' => - array ('has_error' => true, - 'why' => jirafeau_upload_errstr ($file['error'])), + array('has_error' => true, + 'why' => jirafeau_upload_errstr($file['error'])), 'link' => '', 'delete_link' => '')); } /* array representing no error */ - $noerr = array ('has_error' => false, 'why' => ''); + $noerr = array('has_error' => false, 'why' => ''); /* Crypt file if option is enabled. */ $crypted = false; $crypt_key = ''; - if ($crypt == true && !(extension_loaded('mcrypt') == true)) - error_log ("PHP extension mcrypt not loaded, won't encrypt in Jirafeau"); - if ($crypt == true && extension_loaded('mcrypt') == true) - { - $crypt_key = jirafeau_encrypt_file ($file['tmp_name'], $file['tmp_name']); - if (strlen($crypt_key) > 0) + if ($crypt == true && !(extension_loaded('mcrypt') == true)) { + error_log("PHP extension mcrypt not loaded, won't encrypt in Jirafeau"); + } + if ($crypt == true && extension_loaded('mcrypt') == true) { + $crypt_key = jirafeau_encrypt_file($file['tmp_name'], $file['tmp_name']); + if (strlen($crypt_key) > 0) { $crypted = true; + } } /* file informations */ - $md5 = md5_file ($file['tmp_name']); - $name = str_replace (NL, '', trim ($file['name'])); + $md5 = md5_file($file['tmp_name']); + $name = str_replace(NL, '', trim($file['name'])); $mime_type = $file['type']; $size = $file['size']; /* does file already exist ? */ $rc = false; - $p = s2p ("$md5"); - if (file_exists (VAR_FILES . $p . $md5)) - { - $rc = unlink ($file['tmp_name']); - } - elseif ((file_exists (VAR_FILES . $p) || @mkdir (VAR_FILES . $p, 0755, true)) - && move_uploaded_file ($file['tmp_name'], VAR_FILES . $p . $md5)) - { + $p = s2p("$md5"); + if (file_exists(VAR_FILES . $p . $md5)) { + $rc = unlink($file['tmp_name']); + } elseif ((file_exists(VAR_FILES . $p) || @mkdir(VAR_FILES . $p, 0755, true)) + && move_uploaded_file($file['tmp_name'], VAR_FILES . $p . $md5)) { $rc = true; } - if (!$rc) - { + if (!$rc) { return (array( 'error' => - array ('has_error' => true, + array('has_error' => true, 'why' => t('Internal error during file creation.')), 'link' =>'', 'delete_link' => '')); @@ -380,59 +366,56 @@ jirafeau_upload ($file, $one_time_download, $key, $time, $ip, $crypt, $link_name /* Increment or create count file. */ $counter = 0; - if (file_exists (VAR_FILES . $p . $md5 . '_count')) - { - $content = file (VAR_FILES . $p . $md5. '_count'); - $counter = trim ($content[0]); + if (file_exists(VAR_FILES . $p . $md5 . '_count')) { + $content = file(VAR_FILES . $p . $md5. '_count'); + $counter = trim($content[0]); } $counter++; - $handle = fopen (VAR_FILES . $p . $md5. '_count', 'w'); - fwrite ($handle, $counter); - fclose ($handle); + $handle = fopen(VAR_FILES . $p . $md5. '_count', 'w'); + fwrite($handle, $counter); + fclose($handle); /* Create delete code. */ - $delete_link_code = jirafeau_gen_random (5); + $delete_link_code = jirafeau_gen_random(5); /* md5 password or empty. */ $password = ''; - if (!empty ($key)) - $password = md5 ($key); + if (!empty($key)) { + $password = md5($key); + } /* create link file */ - $link_tmp_name = VAR_LINKS . $md5 . rand (0, 10000) . '.tmp'; - $handle = fopen ($link_tmp_name, 'w'); - fwrite ($handle, + $link_tmp_name = VAR_LINKS . $md5 . rand(0, 10000) . '.tmp'; + $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); - $l = s2p ("$md5_link"); - if (!@mkdir (VAR_LINKS . $l, 0755, true) || - !rename ($link_tmp_name, VAR_LINKS . $l . $md5_link)) - { - if (file_exists ($link_tmp_name)) - unlink ($link_tmp_name); - - $counter--; - if ($counter >= 1) - { - $handle = fopen (VAR_FILES . $p . $md5. '_count', 'w'); - fwrite ($handle, $counter); - fclose ($handle); + 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)) { + if (file_exists($link_tmp_name)) { + unlink($link_tmp_name); } - else - { - jirafeau_clean_rm_file ($md5_link); + + $counter--; + if ($counter >= 1) { + $handle = fopen(VAR_FILES . $p . $md5. '_count', 'w'); + fwrite($handle, $counter); + fclose($handle); + } else { + jirafeau_clean_rm_file($md5_link); } return array( 'error' => - array ('has_error' => true, + array('has_error' => true, 'why' => t('Internal error during file creation. ')), 'link' =>'', 'delete_link' => ''); } - return array ( 'error' => $noerr, + return array( 'error' => $noerr, 'link' => $md5_link, 'delete_link' => $delete_link_code, 'crypt_key' => $crypt_key); @@ -443,30 +426,27 @@ jirafeau_upload ($file, $one_time_download, $key, $time, $ip, $crypt, $link_name * @param $mime the mime type * @returns a boolean telling if a mime type is viewable */ -function -jirafeau_is_viewable ($mime) +function jirafeau_is_viewable($mime) { - if (!empty ($mime)) - { + if (!empty($mime)) { /* Actually, verify if mime-type is an image or a text. */ - $viewable = array ('image', 'text', 'video', 'audio'); - $decomposed = explode ('/', $mime); - return in_array ($decomposed[0], $viewable); + $viewable = array('image', 'text', 'video', 'audio'); + $decomposed = explode('/', $mime); + return in_array($decomposed[0], $viewable); } return false; } // Error handling functions. //! Global array that contains all registered errors. -$error_list = array (); +$error_list = array(); /** * Adds an error to the list of errors. * @param $title the error's title * @param $description is a human-friendly description of the problem. */ -function -add_error ($title, $description) +function add_error($title, $description) { global $error_list; $error_list[] = '

' . $title. '
' . $description. '

'; @@ -476,98 +456,99 @@ add_error ($title, $description) * Informs whether any error has been registered yet. * @return true if there are errors. */ -function -has_error () +function has_error() { global $error_list; - return !empty ($error_list); + return !empty($error_list); } /** * Displays all the errors. */ -function -show_errors () +function show_errors() { - if (has_error ()) - { + if (has_error()) { global $error_list; echo '
'; - foreach ($error_list as $error) - { + foreach ($error_list as $error) { echo $error; } echo '
'; } } -function check_errors ($cfg) +function check_errors($cfg) { - if (file_exists (JIRAFEAU_ROOT . 'install.php') - && !($cfg['installation_done'] === true)) - { - header('Location: install.php'); + if (file_exists(JIRAFEAU_ROOT . 'install.php') + && !($cfg['installation_done'] === true)) { + header('Location: install.php'); exit; } /* check if the destination dirs are writable */ - $writable = is_writable (VAR_FILES) && is_writable (VAR_LINKS); + $writable = is_writable(VAR_FILES) && is_writable(VAR_LINKS); /* Checking for errors. */ - if (!is_writable (VAR_FILES)) - add_error (t('The file directory is not writable!'), VAR_FILES); + if (!is_writable(VAR_FILES)) { + add_error(t('The file directory is not writable!'), VAR_FILES); + } - 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); + 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); + } } /** * Read link informations * @return array containing informations. */ -function -jirafeau_get_link ($hash) +function jirafeau_get_link($hash) { - $out = array (); - $link = VAR_LINKS . s2p ("$hash") . $hash; + $out = array(); + $link = VAR_LINKS . s2p("$hash") . $hash; - if (!file_exists ($link)) + if (!file_exists($link)) { return $out; - - $c = file ($link); - $out['file_name'] = trim ($c[0]); - $out['mime_type'] = trim ($c[1]); - $out['file_size'] = trim ($c[2]); - $out['key'] = trim ($c[3], NL); - $out['time'] = trim ($c[4]); - $out['md5'] = trim ($c[5]); - $out['onetime'] = trim ($c[6]); - $out['upload_date'] = trim ($c[7]); - $out['ip'] = trim ($c[8]); - $out['link_code'] = trim ($c[9]); - $out['crypted'] = trim ($c[10]) == 'C'; - + } + + $c = file($link); + $out['file_name'] = trim($c[0]); + $out['mime_type'] = trim($c[1]); + $out['file_size'] = trim($c[2]); + $out['key'] = trim($c[3], NL); + $out['time'] = trim($c[4]); + $out['md5'] = trim($c[5]); + $out['onetime'] = trim($c[6]); + $out['upload_date'] = trim($c[7]); + $out['ip'] = trim($c[8]); + $out['link_code'] = trim($c[9]); + $out['crypted'] = trim($c[10]) == 'C'; + return $out; } /** * List files in admin interface. */ -function -jirafeau_admin_list ($name, $file_hash, $link_hash) +function jirafeau_admin_list($name, $file_hash, $link_hash) { echo '
'; - if (!empty ($name)) + if (!empty($name)) { echo t('Filename') . ": $name "; - if (!empty ($file_hash)) + } + if (!empty($file_hash)) { echo t('file') . ": $file_hash "; - if (!empty ($link_hash)) + } + if (!empty($link_hash)) { echo t('link') . ": $link_hash "; - if (empty ($name) && empty ($file_hash) && empty ($link_hash)) + } + if (empty($name) && empty($file_hash) && empty($link_hash)) { echo t('List all files'); + } echo ''; echo ''; echo ''; @@ -582,57 +563,65 @@ jirafeau_admin_list ($name, $file_hash, $link_hash) echo ''; /* Get all links files. */ - $stack = array (VAR_LINKS); - while (($d = array_shift ($stack)) && $d != NULL) - { - $dir = scandir ($d); - foreach ($dir as $node) - { - if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 || - preg_match ('/\.tmp/i', "$node")) + $stack = array(VAR_LINKS); + while (($d = array_shift($stack)) && $d != null) { + $dir = scandir($d); + foreach ($dir as $node) { + if (strcmp($node, '.') == 0 || strcmp($node, '..') == 0 || + preg_match('/\.tmp/i', "$node")) { continue; - if (is_dir ($d . $node)) - { + } + if (is_dir($d . $node)) { /* Push new found directory. */ $stack[] = $d . $node . '/'; - } - elseif (is_file ($d . $node)) - { + } elseif (is_file($d . $node)) { /* Read link informations. */ - $l = jirafeau_get_link ($node); - if (!count ($l)) + $l = jirafeau_get_link($node); + if (!count($l)) { continue; + } /* Filter. */ - if (!empty ($name) && !preg_match ("/$name/i", htmlspecialchars($l['file_name']))) + if (!empty($name) && !preg_match("/$name/i", htmlspecialchars($l['file_name']))) { continue; - if (!empty ($file_hash) && $file_hash != $l['md5']) + } + if (!empty($file_hash) && $file_hash != $l['md5']) { continue; - if (!empty ($link_hash) && $link_hash != $node) + } + if (!empty($link_hash) && $link_hash != $node) { continue; + } /* Print link informations. */ echo ''; echo ''; echo ''; - echo ''; - echo ''; + echo ''; - echo ''; - echo ''; + echo ''; + echo ''; echo ''; echo '
' . - '
' . - '' . - '' . - '' . - '
'; + '' . htmlspecialchars($l['file_name']) . ''; echo '		' . $l['mime_type'] . '' . jirafeau_human_size ($l['file_size']) . '' . ($l['time'] == -1 ? '' : strftime ('%c', $l['time'])) . + echo '' . jirafeau_human_size($l['file_size']) . '' . ($l['time'] == -1 ? '' : strftime('%c', $l['time'])) . '' . $l['onetime'] . '' . strftime ('%c', $l['upload_date']) . ''; + if ($l['onetime'] == 'O') { + echo 'Y'; + } else { + echo 'N'; + } + echo '' . strftime('%c', $l['upload_date']) . '' . $l['ip'] . '' . - '
' . + '' . + '' . + '' . + '' . + '
' . + '
' . '' . '' . '' . '
' . - '
' . + '' . '' . '' . '' . @@ -649,39 +638,34 @@ jirafeau_admin_list ($name, $file_hash, $link_hash) * Clean expired files. * @return number of cleaned files. */ -function -jirafeau_admin_clean () +function jirafeau_admin_clean() { $count = 0; /* Get all links files. */ - $stack = array (VAR_LINKS); - while (($d = array_shift ($stack)) && $d != NULL) - { - $dir = scandir ($d); + $stack = array(VAR_LINKS); + while (($d = array_shift($stack)) && $d != null) { + $dir = scandir($d); - foreach ($dir as $node) - { - if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 || - preg_match ('/\.tmp/i', "$node")) + foreach ($dir as $node) { + if (strcmp($node, '.') == 0 || strcmp($node, '..') == 0 || + preg_match('/\.tmp/i', "$node")) { continue; - - if (is_dir ($d . $node)) - { + } + + if (is_dir($d . $node)) { /* Push new found directory. */ $stack[] = $d . $node . '/'; - } - elseif (is_file ($d . $node)) - { + } elseif (is_file($d . $node)) { /* Read link informations. */ - $l = jirafeau_get_link (basename ($node)); - if (!count ($l)) + $l = jirafeau_get_link(basename($node)); + if (!count($l)) { continue; - $p = s2p ($l['md5']); - if ($l['time'] > 0 && $l['time'] < time () || // expired - !file_exists (VAR_FILES . $p . $l['md5']) || // invalid - !file_exists (VAR_FILES . $p . $l['md5'] . '_count')) // invalid - { - jirafeau_delete_link ($node); + } + $p = s2p($l['md5']); + if ($l['time'] > 0 && $l['time'] < time() || // expired + !file_exists(VAR_FILES . $p . $l['md5']) || // invalid + !file_exists(VAR_FILES . $p . $l['md5'] . '_count')) { // invalid + jirafeau_delete_link($node); $count++; } } @@ -695,37 +679,32 @@ jirafeau_admin_clean () * Clean old async transferts. * @return number of cleaned files. */ -function -jirafeau_admin_clean_async () +function jirafeau_admin_clean_async() { $count = 0; /* Get all links files. */ - $stack = array (VAR_ASYNC); - while (($d = array_shift ($stack)) && $d != NULL) - { - $dir = scandir ($d); + $stack = array(VAR_ASYNC); + while (($d = array_shift($stack)) && $d != null) { + $dir = scandir($d); - foreach ($dir as $node) - { - if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 || - preg_match ('/\.tmp/i', "$node")) + foreach ($dir as $node) { + if (strcmp($node, '.') == 0 || strcmp($node, '..') == 0 || + preg_match('/\.tmp/i', "$node")) { continue; - - if (is_dir ($d . $node)) - { + } + + if (is_dir($d . $node)) { /* Push new found directory. */ $stack[] = $d . $node . '/'; - } - elseif (is_file ($d . $node)) - { + } elseif (is_file($d . $node)) { /* Read async informations. */ - $a = jirafeau_get_async_ref (basename ($node)); - if (!count ($a)) + $a = jirafeau_get_async_ref(basename($node)); + if (!count($a)) { continue; + } /* Delete transferts older than 1 hour. */ - if (date ('U') - $a['last_edited'] > 3600) - { - jirafeau_async_delete (basename ($node)); + if (time() - $a['last_edited'] > 3600) { + jirafeau_async_delete(basename($node)); $count++; } } @@ -737,47 +716,47 @@ jirafeau_admin_clean_async () * Read async transfert informations * @return array containing informations. */ -function -jirafeau_get_async_ref ($ref) +function jirafeau_get_async_ref($ref) { - $out = array (); - $refinfos = VAR_ASYNC . s2p ("$ref") . "$ref"; + $out = array(); + $refinfos = VAR_ASYNC . s2p("$ref") . "$ref"; - if (!file_exists ($refinfos)) + if (!file_exists($refinfos)) { return $out; - - $c = file ($refinfos); - $out['file_name'] = trim ($c[0]); - $out['mime_type'] = trim ($c[1]); - $out['key'] = trim ($c[2], NL); - $out['time'] = trim ($c[3]); - $out['onetime'] = trim ($c[4]); - $out['ip'] = trim ($c[5]); - $out['last_edited'] = trim ($c[6]); - $out['next_code'] = trim ($c[7]); + } + + $c = file($refinfos); + $out['file_name'] = trim($c[0]); + $out['mime_type'] = trim($c[1]); + $out['key'] = trim($c[2], NL); + $out['time'] = trim($c[3]); + $out['onetime'] = trim($c[4]); + $out['ip'] = trim($c[5]); + $out['last_edited'] = trim($c[6]); + $out['next_code'] = trim($c[7]); return $out; } /** * Delete async transfert informations */ -function -jirafeau_async_delete ($ref) +function jirafeau_async_delete($ref) { - $p = s2p ("$ref"); - if (file_exists (VAR_ASYNC . $p . $ref)) - unlink (VAR_ASYNC . $p . $ref); - if (file_exists (VAR_ASYNC . $p . $ref . '_data')) - unlink (VAR_ASYNC . $p . $ref . '_data'); + $p = s2p("$ref"); + if (file_exists(VAR_ASYNC . $p . $ref)) { + unlink(VAR_ASYNC . $p . $ref); + } + if (file_exists(VAR_ASYNC . $p . $ref . '_data')) { + unlink(VAR_ASYNC . $p . $ref . '_data'); + } $parse = VAR_ASYNC . $p; $scan = array(); - while (file_exists ($parse) - && ($scan = scandir ($parse)) - && count ($scan) == 2 // '.' and '..' folders => empty. - && basename ($parse) != basename (VAR_ASYNC)) - { - rmdir ($parse); - $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1); + while (file_exists($parse) + && ($scan = scandir($parse)) + && count($scan) == 2 // '.' and '..' folders => empty. + && basename($parse) != basename(VAR_ASYNC)) { + rmdir($parse); + $parse = substr($parse, 0, strlen($parse) - strlen(basename($parse)) - 1); } } @@ -790,41 +769,39 @@ jirafeau_async_delete ($ref) * @param $ip ip address of the client * @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) +function jirafeau_async_init($filename, $type, $one_time, $key, $time, $ip) { $res = 'Error'; /* Create temporary folder. */ $ref; $p; - $code = jirafeau_gen_random (4); - do - { - $ref = jirafeau_gen_random (32); - $p = VAR_ASYNC . s2p ($ref); - } while (file_exists ($p)); - @mkdir ($p, 0755, true); - if (!file_exists ($p)) - { + $code = jirafeau_gen_random(4); + do { + $ref = jirafeau_gen_random(32); + $p = VAR_ASYNC . s2p($ref); + } while (file_exists($p)); + @mkdir($p, 0755, true); + if (!file_exists($p)) { echo 'Error'; return; } - + /* md5 password or empty */ $password = ''; - if (!empty ($key)) - $password = md5 ($key); + if (!empty($key)) { + $password = md5($key); + } /* Store informations. */ $p .= $ref; - $handle = fopen ($p, 'w'); - fwrite ($handle, - str_replace (NL, '', trim ($filename)) . NL . - str_replace (NL, '', trim ($type)) . NL . $password . NL . + $handle = fopen($p, 'w'); + 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 . - date ('U') . NL . $code . NL); - fclose ($handle); + time() . NL . $code . NL); + fclose($handle); return $ref . NL . $code ; } @@ -837,20 +814,20 @@ jirafeau_async_init ($filename, $type, $one_time, $key, $time, $ip) * @param $max_file_size maximum allowed file size * @return a string containing a next code to use or the string "Error" */ -function -jirafeau_async_push ($ref, $data, $code, $max_file_size) +function jirafeau_async_push($ref, $data, $code, $max_file_size) { /* Get async infos. */ - $a = jirafeau_get_async_ref ($ref); - + $a = jirafeau_get_async_ref($ref); + /* Check some errors. */ - if (count ($a) == 0 + if (count($a) == 0 || $a['next_code'] != "$code" - || empty ($data['tmp_name']) - || !is_uploaded_file ($data['tmp_name'])) + || empty($data['tmp_name']) + || !is_uploaded_file($data['tmp_name'])) { return 'Error'; - - $p = s2p ($ref); + } + + $p = s2p($ref); /* File path. */ $r_path = $data['tmp_name']; @@ -858,37 +835,34 @@ jirafeau_async_push ($ref, $data, $code, $max_file_size) /* Check that file size is not above upload limit. */ if ($max_file_size > 0 && - filesize ($r_path) + filesize ($w_path) > $max_file_size * 1024 * 1024) - { - jirafeau_async_delete ($ref); + filesize($r_path) + filesize($w_path) > $max_file_size * 1024 * 1024) { + jirafeau_async_delete($ref); return 'Error'; } /* Concatenate data. */ - $r = fopen ($r_path, 'r'); - $w = fopen ($w_path, 'a'); - while (!feof ($r)) - { - if (fwrite ($w, fread ($r, 1024)) === false) - { - fclose ($r); - fclose ($w); - jirafeau_async_delete ($ref); + $r = fopen($r_path, 'r'); + $w = fopen($w_path, 'a'); + while (!feof($r)) { + if (fwrite($w, fread($r, 1024)) === false) { + fclose($r); + fclose($w); + jirafeau_async_delete($ref); return 'Error'; } } - fclose ($r); - fclose ($w); - unlink ($r_path); - + fclose($r); + fclose($w); + unlink($r_path); + /* Update async file. */ - $code = jirafeau_gen_random (4); - $handle = fopen (VAR_ASYNC . $p . $ref, 'w'); - fwrite ($handle, + $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); - fclose ($handle); + time() . NL . $code . NL); + fclose($handle); return $code; } @@ -900,77 +874,80 @@ jirafeau_async_push ($ref, $data, $code, $max_file_size) * @param $link_name_length link name length * @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) +function jirafeau_async_end($ref, $code, $crypt, $link_name_length) { /* Get async infos. */ - $a = jirafeau_get_async_ref ($ref); - if (count ($a) == 0 - || $a['next_code'] != "$code") + $a = jirafeau_get_async_ref($ref); + if (count($a) == 0 + || $a['next_code'] != "$code") { return "Error"; - + } + /* Generate link infos. */ - $p = VAR_ASYNC . s2p ($ref) . $ref . "_data"; - if (!file_exists($p)) + $p = VAR_ASYNC . s2p($ref) . $ref . "_data"; + if (!file_exists($p)) { return 'Error'; + } $crypted = false; $crypt_key = ''; - if ($crypt == true && extension_loaded('mcrypt') == true) - { - $crypt_key = jirafeau_encrypt_file ($p, $p); - if (strlen($crypt_key) > 0) + if ($crypt == true && extension_loaded('mcrypt') == true) { + $crypt_key = jirafeau_encrypt_file($p, $p); + if (strlen($crypt_key) > 0) { $crypted = true; + } } - $md5 = md5_file ($p); + $md5 = md5_file($p); $size = filesize($p); - $np = s2p ($md5); - $delete_link_code = jirafeau_gen_random (5); - - /* 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); - + $np = s2p($md5); + $delete_link_code = jirafeau_gen_random(5); + + /* 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')) - { - $content = file (VAR_FILES . $np . $md5. '_count'); - $counter = trim ($content[0]); + if (file_exists(VAR_FILES . $np . $md5 . '_count')) { + $content = file(VAR_FILES . $np . $md5. '_count'); + $counter = trim($content[0]); } $counter++; - $handle = fopen (VAR_FILES . $np . $md5. '_count', 'w'); - fwrite ($handle, $counter); - fclose ($handle); - + $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, + $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')); - 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)) + 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); + jirafeau_async_delete($ref); return $md5_link . NL . $delete_link_code . NL . urlencode($crypt_key); } -function -jirafeau_crypt_create_iv($base, $size) +function jirafeau_crypt_create_iv($base, $size) { $iv = ''; - while (strlen ($iv) < $size) + while (strlen($iv) < $size) { $iv = $iv . $base; + } $iv = substr($iv, 0, $size); return $iv; } @@ -981,32 +958,32 @@ jirafeau_crypt_create_iv($base, $size) * @param $fp_dst file path to the file to write crypted file (could be the same). * @return decrypt key composed of the key and the iv separated by a point ('.') */ -function -jirafeau_encrypt_file ($fp_src, $fp_dst) +function jirafeau_encrypt_file($fp_src, $fp_dst) { - $fs = filesize ($fp_src); - if ($fs === false || $fs == 0 || !(extension_loaded('mcrypt') == true)) + $fs = filesize($fp_src); + if ($fs === false || $fs == 0 || !(extension_loaded('mcrypt') == true)) { return ''; + } /* Prepare module. */ $m = mcrypt_module_open('rijndael-256', '', 'ofb', ''); /* Generate key. */ - $crypt_key = jirafeau_gen_random (10); + $crypt_key = jirafeau_gen_random(10); $md5_key = md5($crypt_key); - $iv = jirafeau_crypt_create_iv ($md5_key, mcrypt_enc_get_iv_size($m)); + $iv = jirafeau_crypt_create_iv($md5_key, mcrypt_enc_get_iv_size($m)); /* Init module. */ mcrypt_generic_init($m, $md5_key, $iv); /* Crypt file. */ - $r = fopen ($fp_src, 'r'); - $w = fopen ($fp_dst, 'c'); - while (!feof ($r)) - { - $enc = mcrypt_generic($m, fread ($r, 1024)); - if (fwrite ($w, $enc) === false) + $r = fopen($fp_src, 'r'); + $w = fopen($fp_dst, 'c'); + while (!feof($r)) { + $enc = mcrypt_generic($m, fread($r, 1024)); + if (fwrite($w, $enc) === false) { return ''; + } } - fclose ($r); - fclose ($w); + fclose($r); + fclose($w); /* Cleanup. */ mcrypt_generic_deinit($m); mcrypt_module_close($m); @@ -1020,30 +997,30 @@ jirafeau_encrypt_file ($fp_src, $fp_dst) * @param $k string composed of the key and the iv separated by a point ('.') * @return key used to decrypt. a string of length 0 is returned if failed. */ -function -jirafeau_decrypt_file ($fp_src, $fp_dst, $k) +function jirafeau_decrypt_file($fp_src, $fp_dst, $k) { - $fs = filesize ($fp_src); - if ($fs === false || $fs == 0 || extension_loaded('mcrypt') == false) + $fs = filesize($fp_src); + if ($fs === false || $fs == 0 || extension_loaded('mcrypt') == false) { return false; + } /* Init module */ $m = mcrypt_module_open('rijndael-256', '', 'ofb', ''); /* Extract key and iv. */ $crypt_key = $k; $md5_key = md5($crypt_key); - $iv = jirafeau_crypt_create_iv ($md5_key, mcrypt_enc_get_iv_size($m)); + $iv = jirafeau_crypt_create_iv($md5_key, mcrypt_enc_get_iv_size($m)); /* Decrypt file. */ - $r = fopen ($fp_src, 'r'); - $w = fopen ($fp_dst, 'c'); - while (!feof ($r)) - { - $dec = mdecrypt_generic($m, fread ($r, 1024)); - if (fwrite ($w, $dec) === false) + $r = fopen($fp_src, 'r'); + $w = fopen($fp_dst, 'c'); + while (!feof($r)) { + $dec = mdecrypt_generic($m, fread($r, 1024)); + if (fwrite($w, $dec) === false) { return false; + } } - fclose ($r); - fclose ($w); + fclose($r); + fclose($w); /* Cleanup. */ mcrypt_generic_deinit($m); mcrypt_module_close($m); @@ -1054,10 +1031,9 @@ 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; + return count($cfg['upload_password']) > 0; } /** @@ -1065,14 +1041,16 @@ 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)) + if (!jirafeau_has_upload_password($cfg)) { return false; - forEach ($cfg['upload_password'] as $p) - if ($password == $p) + } + foreach ($cfg['upload_password'] as $p) { + if ($password == $p) { return true; + } + } return false; } @@ -1081,57 +1059,99 @@ 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) + if (count($cfg['upload_ip']) == 0) { return true; - forEach ($cfg['upload_ip'] as $i) - { - if ($i == $ip) + } + foreach ($cfg['upload_ip'] as $i) { + if ($i == $ip) { + return true; + } + // CIDR test for IPv4 only. + if (strpos($i, '/') !== false) { + list($subnet, $mask) = explode('/', $i); + if ((ip2long($ip) & ~((1 << (32 - $mask)) - 1)) == ip2long($subnet)) { + return true; + } + } + } + return false; +} + +/** + * Test if visitor's IP is authorized or password is supplied and authorized + * @param $ip IP to be challenged + * @param $password password to be challenged + * @return true if access is valid, false otherwise. + */ +function jirafeau_challenge_upload ($cfg, $ip, $password) +{ + // Allow if no ip restrictaion and no password restriction + if ((count ($cfg['upload_ip']) == 0) and (count ($cfg['upload_password']) == 0)) { + return true; + } + + // Allow if ip is in array + foreach ($cfg['upload_ip'] as $i) { + if ($i == $ip) { return true; + } // CIDR test for IPv4 only. if (strpos ($i, '/') !== false) { list ($subnet, $mask) = explode('/', $i); - if ((ip2long ($ip) & ~((1 << (32 - $mask)) - 1) ) == ip2long ($subnet)) + if ((ip2long ($ip) & ~((1 << (32 - $mask)) - 1) ) == ip2long ($subnet)) { return true; + } + } + } + if (!jirafeau_has_upload_password($cfg)) { + return false; + } + + foreach ($cfg['upload_password'] as $p) { + if ($password == $p) { + return true; } } return false; } /** Tell if we have some HTTP headers generated by a proxy */ -function -has_http_forwarded() +function has_http_forwarded() { return - !empty ($_SERVER['HTTP_X_FORWARDED_FOR']) || - !empty ($_SERVER['http_X_forwarded_for']); + !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']); - foreach ($l as $ip) - array_push ($ip_list, preg_replace ('/\s+/', '', $ip)); - } - if (!empty ($_SERVER['http_X_forwarded_for'])) - { - $l = explode (',', $_SERVER['http_X_forwarded_for']); - foreach ($l as $ip) - { + 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)); + } + } + if (!empty($_SERVER['http_X_forwarded_for'])) { + $l = explode(',', $_SERVER['http_X_forwarded_for']); + foreach ($l as $ip) { // Separate IP from port - $ip = explode (':', $ip)[0]; - array_push ($ip_list, preg_replace ('/\s+/', '', $ip)); + $ipa = explode(':', $ip); + if ($ipa === false) { + continue; + } + $ip = $ipa[0]; + array_push($ip_list, preg_replace('/\s+/', '', $ip)); } } return $ip_list; @@ -1142,23 +1162,24 @@ 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 ()) + if (count($cfg['proxy_ip']) == 0 || !has_http_forwarded()) { return $remote; + } - $ip_list = get_ip_list_http_forwarded (); - if (count ($ip_list) == 0) + $ip_list = get_ip_list_http_forwarded(); + if (count($ip_list) == 0) { return $remote; + } - foreach ($cfg['proxy_ip'] as $proxy_ip) - { - if ($remote != $proxy_ip) + foreach ($cfg['proxy_ip'] as $proxy_ip) { + if ($remote != $proxy_ip) { continue; + } // Take the last IP (the one which has been set by the defined proxy). - return end ($ip_list); + return end($ip_list); } return $remote; } @@ -1169,30 +1190,31 @@ get_ip_address($cfg) function hex_to_base64($hex) { $b = ''; - foreach (str_split ($hex, 2) as $pair) - $b .= chr (hexdec ($pair)); - return base64_encode ($b); + foreach (str_split($hex, 2) as $pair) { + $b .= chr(hexdec($pair)); + } + return base64_encode($b); } /** * Read alias informations * @return array containing informations. */ -function -jirafeau_get_alias ($hash) +function jirafeau_get_alias($hash) { - $out = array (); - $link = VAR_ALIAS . s2p ("$hash") . $hash; + $out = array(); + $link = VAR_ALIAS . s2p("$hash") . $hash; - if (!file_exists ($link)) + 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); - + } + + $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; } @@ -1203,44 +1225,47 @@ 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) + if (strlen($alias) < 8 || + strlen($alias) > 32 || + strlen($password) < 8 || + strlen($password) > 32) { return 'Error'; + } /* Check that destination exists. */ - $l = jirafeau_get_link ($destination); - if (!count ($l)) + $l = jirafeau_get_link($destination); + if (!count($l)) { return 'Error'; + } /* Check that alias does not already exists. */ - $alias = md5 ($alias); - $p = VAR_ALIAS . s2p ($alias); - if (file_exists ($p)) + $alias = md5($alias); + $p = VAR_ALIAS . s2p($alias); + if (file_exists($p)) { return 'Error'; - + } + /* Create alias folder. */ - @mkdir ($p, 0755, true); - if (!file_exists ($p)) + @mkdir($p, 0755, true); + if (!file_exists($p)) { return 'Error'; - + } + /* Generate password. */ - $md5_password = md5 ($password); + $md5_password = md5($password); /* Store informations. */ $p .= $alias; - $handle = fopen ($p, 'w'); - fwrite ($handle, + $handle = fopen($p, 'w'); + fwrite($handle, $md5_password . NL . $ip . NL . - date ('U') . NL . + time() . NL . $destination . NL); - fclose ($handle); + fclose($handle); return 'Ok'; } @@ -1253,41 +1278,44 @@ jirafeau_alias_create ($alias, $destination, $password, $ip) * @param $ip client's IP * @return "Ok" or "Error" string */ -function -jirafeau_alias_update ($alias, $destination, $password, +function jirafeau_alias_update($alias, $destination, $password, $new_password, $ip) { - $alias = md5 ($alias); + $alias = md5($alias); /* Check that alias exits. */ - $a = jirafeau_get_alias ($alias); - if (!count ($a)) + $a = jirafeau_get_alias($alias); + if (!count($a)) { return 'Error'; + } /* Check that destination exists. */ - $l = jirafeau_get_link ($a["destination"]); - if (!count ($l)) + $l = jirafeau_get_link($a["destination"]); + if (!count($l)) { return 'Error'; + } /* Check password. */ - if ($a["md5_password"] != md5 ($password)) + if ($a["md5_password"] != md5($password)) { return 'Error'; + } $p = $a['md5_password']; - if (strlen ($new_password) >= 8 && - strlen ($new_password) <= 32) - $p = md5 ($new_password); - else if (strlen ($new_password) > 0) + if (strlen($new_password) >= 8 && + strlen($new_password) <= 32) { + $p = md5($new_password); + } elseif (strlen($new_password) > 0) { return 'Error'; + } /* Rewrite informations. */ - $p = VAR_ALIAS . s2p ($alias) . $alias; - $handle = fopen ($p, 'w'); - fwrite ($handle, + $p = VAR_ALIAS . s2p($alias) . $alias; + $handle = fopen($p, 'w'); + fwrite($handle, $p . NL . $ip . NL . - date ('U') . NL . + time() . NL . $destination . NL); - fclose ($handle); + fclose($handle); return 'Ok'; } @@ -1295,33 +1323,32 @@ jirafeau_alias_update ($alias, $destination, $password, * @param $alias alias to get * @return alias destination or "Error" string */ -function -jirafeau_alias_get ($alias) +function jirafeau_alias_get($alias) { - $alias = md5 ($alias); + $alias = md5($alias); /* Check that alias exits. */ - $a = jirafeau_get_alias ($alias); - if (!count ($a)) + $a = jirafeau_get_alias($alias); + if (!count($a)) { return 'Error'; + } 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)) - unlink (VAR_ALIAS . $p . $alias); + $p = s2p("$alias"); + if (file_exists(VAR_ALIAS . $p . $alias)) { + unlink(VAR_ALIAS . $p . $alias); + } $parse = VAR_ALIAS . $p; $scan = array(); - while (file_exists ($parse) - && ($scan = scandir ($parse)) - && count ($scan) == 2 // '.' and '..' folders => empty. - && basename ($parse) != basename (VAR_ALIAS)) - { - rmdir ($parse); - $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1); + while (file_exists($parse) + && ($scan = scandir($parse)) + && count($scan) == 2 // '.' and '..' folders => empty. + && basename($parse) != basename(VAR_ALIAS)) { + rmdir($parse); + $parse = substr($parse, 0, strlen($parse) - strlen(basename($parse)) - 1); } } @@ -1330,20 +1357,50 @@ 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); + $alias = md5($alias); /* Check that alias exits. */ - $a = jirafeau_get_alias ($alias); - if (!count ($a)) + $a = jirafeau_get_alias($alias); + if (!count($a)) { return "Error"; + } /* Check password. */ - if ($a["md5_password"] != md5 ($password)) + if ($a["md5_password"] != md5($password)) { return 'Error'; + } - jirafeau_clean_rm_alias ($alias); + jirafeau_clean_rm_alias($alias); return 'Ok'; } +/** + * Replace markers in templates. + * + * Available markers have the scheme "###MARKERNAME###". + * + * @param $content string Template text with markers + * @param $htmllinebreaks boolean Convert linebreaks to BR-Tags + * @return Template with replaced markers + */ +function jirafeau_replace_markers($content, $htmllinebreaks = false) +{ + $patterns = array( + '/###ORGANISATION###/', + '/###CONTACTPERSON###/', + '/###WEBROOT###/' + ); + $replacements = array( + $GLOBALS['cfg']['organisation'], + $GLOBALS['cfg']['contactperson'], + $GLOBALS['cfg']['web_root'] + ); + $content = preg_replace($patterns, $replacements, $content); + + if (true === $htmllinebreaks) { + $content = nl2br($content); + } + + return $content; +}