return 42;
}
- $code="";
+ $code = '';
for ($i = 0; $i < $l; $i++) {
$code .= dechex(rand(0, 15));
}
if ($length <= 0) {
return false;
}
- $pass="";
+ $pass = '';
for ($i = 0; $i < $length; $i++) {
$pass .= $allowed_chars[rand(0, strlen($allowed_chars) - 1)];
}
// Convert UTC timestamp to a datetime field
function jirafeau_get_datetimefield($timestamp)
{
- $ts = date_create("@" . $timestamp);
+ $ts = date_create('@' . $timestamp);
$content = '<span class="datetime" data-datetime="' . date_format($ts, 'Y-m-d H:i') . '">'
. date_format($ts, 'Y-m-d H:i') . ' (GMT)</span>';
-
+
return $content;
}
function jirafeau_md5_outside($file_path)
{
$out = false;
- $handle = fopen($file_path, "r");
+ $handle = fopen($file_path, 'r');
if ($handle === false) {
return false;
}
}
/**
- *
- * @param bool $crypt_module_enabled
- * @param string $file_path
+ *
+ * @param bool $crypt_module_enabled
+ * @param string $file_path
* @return array [bool, string]
*/
-function jirafeau_handle_add_file_encryption($crypt_module_enabled, $file_path) {
+function jirafeau_handle_add_file_encryption($crypt_module_enabled, $file_path)
+{
/* Crypt file if option is enabled. */
$crypted = false;
$crypt_key = '';
$crypt_key = '';
list($crypted, $crypt_key) = jirafeau_handle_add_file_encryption($crypt, $file['tmp_name']);
-
/* file information */
$hash = jirafeau_hash_file($file_hash_method, $file['tmp_name']);
$name = str_replace(NL, '', trim($file['name']));
$p = s2p("$hash");
if (file_exists(VAR_FILES . $p . $hash)) {
$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 . $hash))
- $move_operation($file['tmp_name'], VAR_FILES . $p . $hash))
- {
-
+ } elseif (
+ (file_exists(VAR_FILES . $p) || @mkdir(VAR_FILES . $p, 0755, true)) &&
+ $move_operation($file['tmp_name'], VAR_FILES . $p . $hash)) {
$rc = true;
}
if (!$rc) {
'error' =>
array('has_error' => true,
'why' => t('INTERNAL_ERROR_DEL')),
- 'link' =>'',
+ 'link' => '',
'delete_link' => ''));
}
'error' =>
array('has_error' => true,
'why' => t('Internal error during file creation. ')),
- 'link' =>'',
+ 'link' => '',
'delete_link' => '');
}
return array( 'error' => $noerr,
'crypt_key' => $crypt_key);
}
-
-function jirafeau_admin_list_table ($name, $file_hash, $link_hash, $visitor_function = null) {
+function jirafeau_admin_list_table($name, $file_hash, $link_hash, $visitor_function = null)
+{
echo '<fieldset><legend>';
if (!empty($name)) {
echo t('FILENAME') . ": " . jirafeau_escape($name);
echo '</table></fieldset>';
}
-
-
-
-
/**
* Tells if a mime-type is viewable in a browser
* @param $mime the mime type
if (!empty($mime)) {
$viewable = array('image', 'video', 'audio');
$decomposed = explode('/', $mime);
- if (in_array($decomposed[0], $viewable) && strpos($mime, 'image/svg+xml') === false) {
+ if (in_array($decomposed[0], $viewable) && stripos($mime, 'image/svg+xml') === false) {
return true;
}
$viewable = array('text/plain');
}
/**
- * List files ii folder in admin interface.
+ * List files in admin interface.
*/
function jirafeau_admin_list($name, $file_hash, $link_hash)
{
- $function = function($name, $file_hash, $link_hash) {
- /* Get all links files. */
+ $function = function ($name, $file_hash, $link_hash) {
+ /* Get all links files. */
$stack = array(VAR_LINKS);
while (($d = array_shift($stack)) && $d != null) {
$dir = scandir($d);
}
/* Print link information. */
echo '<tr>';
- echo '<td>' .
- '<strong><a id="upload_link" href="f.php?h='. jirafeau_escape($node) .'" title="' .
- t('DL_PAGE') . '">' . jirafeau_escape($l['file_name']) . '</a></strong><br/>';
+ echo '<td><strong>';
+
+ if (!$l['crypted'] && !$l['crypted_legacy']) {
+ echo'<a href="f.php?h='. jirafeau_escape($node) .'" title="' .
+ t('DL_PAGE') . '">' . jirafeau_escape($l['file_name']) . '</a>';
+ } else {
+ echo jirafeau_escape($l['file_name']);
+ }
+
+ echo '</strong><br/>';
+
echo t('TYPE') . ': ' . jirafeau_escape($l['mime_type']) . '<br/>';
echo t('SIZE') . ': ' . jirafeau_human_size($l['file_size']) . '<br>';
echo t('EXPIRE') . ': ' . ($l['time'] == -1 ? '∞' : jirafeau_get_datetimefield($l['time'])) . '<br/>';
- echo t('ONETIME') . ': ' . ($l['onetime'] == 'O' ? 'Yes' : 'No') . '<br/>';
+ echo t('ONETIME') . ': ' . ($l['onetime'] == 'O' ? t('YES') : t('NO')) . '<br/>';
+ echo t('ENCRYPTED') . ': ' . (($l['crypted'] || $l['crypted_legacy']) ? t('YES') : t('NO')) . '<br/>';
echo t('UPLOAD_DATE') . ': ' . jirafeau_get_datetimefield($l['upload_date']) . '<br/>';
if (strlen($l['ip']) > 0) {
echo t('ORIGIN') . ': ' . $l['ip'] . '<br/>';
}
echo '</td><td>';
+
+ if (!$l['crypted'] && !$l['crypted_legacy']) {
+ echo '<form method="post">' .
+ '<input type = "hidden" name = "action" value = "download"/>' .
+ '<input type = "hidden" name = "link" value = "' . $node . '"/>' .
+ jirafeau_admin_csrf_field() .
+ '<input type = "submit" value = "' . t('DL') . '" />' .
+ '</form>';
+ }
+
echo '<form method="post">' .
- '<input type = "hidden" name = "action" value = "download"/>' .
- '<input type = "hidden" name = "link" value = "' . $node . '"/>' .
- jirafeau_admin_csrf_field() .
- '<input type = "submit" value = "' . t('DL') . '" />' .
- '</form>' .
- '<form method="post">' .
'<input type = "hidden" name = "action" value = "delete_link"/>' .
'<input type = "hidden" name = "link" value = "' . $node . '"/>' .
jirafeau_admin_csrf_field() .
}
}
}
- };
- jirafeau_admin_list_table($name, $file_hash, $link_hash, $function);
+ };
+
+ jirafeau_admin_list_table($name, $file_hash, $link_hash, $function);
}
/**
return "Error: referenced file does not exist";
}
+ /* Store filesize before encrypting the file */
+ /* Otherwise we would send the size of the encrypted file and the data of the unencrypted file */
+ /* This would break some browsers */
+ $size = filesize($p);
+
$crypted = false;
$crypt_key = '';
if ($crypt == true && extension_loaded('sodium') == true) {
}
$hash = jirafeau_hash_file($file_hash_method, $p);
- $size = filesize($p);
$np = s2p($hash);
$delete_link_code = jirafeau_gen_random(5);
for ($i = SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES; $i < $fs; $i += JIRAFEAU_SODIUM_CHUNKSIZE + SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES) {
$to_dec = fread($r, JIRAFEAU_SODIUM_CHUNKSIZE + SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES);
[$dec, $crypt_tag] = sodium_crypto_secretstream_xchacha20poly1305_pull($crypt_state, $to_dec);
-
+
if (fwrite($w, $dec) === false) {
return false;
}
$filename = VAR_LINKS . s2p("$hash") . $hash . '_download';
if (!file_exists($filename)) {
- return array('count'=>0);
+ return array('count' => 0);
}
$c = file($filename);
fclose($handle);
}
-function jirafeau_create_upload_finished_box($preview = true) {
+function jirafeau_create_upload_finished_box($preview = true)
+{
?>
<div id="upload_finished">
</p>
</div>
- <?php if ($preview == true) {
- ?>
+ <?php
+ if ($preview == true) { ?>
<div id="upload_finished_preview">
<p>
<a id="preview_link" href=""><?php echo t('VIEW_LINK') ?></a>
</p>
</div>
<?php
-} ?>
+ }
+ ?>
<div id="upload_direct_download">
<p>
<p id="date"></p>
</div>
</div>
-<?php
+<?php
}
-function jirafeau_get_expiration_time_options() {
- return
- array(
+function jirafeau_get_expiration_time_options()
+{
+ return array(
array(
- 'value' => 'minute',
- 'label' => '1_MIN'
+ 'value' => 'minute',
+ 'label' => '1_MIN'
),
array(
- 'value' => 'hour',
- 'label' => '1_H'
+ 'value' => 'hour',
+ 'label' => '1_H'
),
array(
- 'value' => 'day',
- 'label' => '1_D'
+ 'value' => 'day',
+ 'label' => '1_D'
),
array(
- 'value' => 'week',
- 'label' => '1_W'
+ 'value' => 'week',
+ 'label' => '1_W'
),
array(
'value' => 'fortnight',
'label' => '2_W'
),
array(
- 'value' => 'month',
- 'label' => '1_M'
+ 'value' => 'month',
+ 'label' => '1_M'
),
array(
- 'value' => 'quarter',
- 'label' => '1_Q'
+ 'value' => 'quarter',
+ 'label' => '1_Q'
),
array(
- 'value' => 'year',
- 'label' => '1_Y'
+ 'value' => 'year',
+ 'label' => '1_Y'
),
array(
- 'value' => 'none',
- 'label' => 'NONE'
+ 'value' => 'none',
+ 'label' => 'NONE'
)
- );
+ );
}
+/**
+ *
+ * creates the time selection field
+ * @param mixed $cfg
+ * @return void
+ */
+function jirafeau_create_selection_array($cfg)
+{
+ echo '<select name="time" id="select_time">';
+ $expirationTimeOptions = jirafeau_get_expiration_time_options();
- /**
- *
- * creates the time selection field
- * @param mixed $cfg
- * @return void
- */
- function jirafeau_create_selection_array($cfg) {
- echo
- '<select name="time" id="select_time">';
-
-
- $expirationTimeOptions = jirafeau_get_expiration_time_options();
-
- foreach ($expirationTimeOptions as $expirationTimeOption) {
- $selected = ($expirationTimeOption['value'] === $cfg['availability_default'])? 'selected="selected"' : '';
- if (true === $cfg['availabilities'][$expirationTimeOption['value']]) {
- echo '<option value="' . $expirationTimeOption['value'] . '" ' .
- $selected . '>' . t($expirationTimeOption['label']) . '</option>';
- }
+ foreach ($expirationTimeOptions as $expirationTimeOption) {
+ $selected = ($expirationTimeOption['value'] === $cfg['availability_default']) ? 'selected="selected"' : '';
+ if (true === $cfg['availabilities'][$expirationTimeOption['value']]) {
+ echo '<option value="' . $expirationTimeOption['value'] . '" ' .
+ $selected . '>' . t($expirationTimeOption['label']) . '</option>';
}
- echo '</select>';
- }
+ }
+
+ echo '</select>';
+}
- function jirafeau_datestr_to_int ($time_str) {
+function jirafeau_datestr_to_int($time_str)
+{
$time = time();
switch ($time_str) {
case 'minute':
case 'year':
$time += JIRAFEAU_YEAR;
break;
- default:
+ default:
$time = JIRAFEAU_INFINITY;
break;
}
/**
- * links or copy a local file
+ * links or copy a local file
* TODO: boolean in config for linking
- * @param string $filepath
- * @param $one_time_download is the file a one time download ?
+ * @param string $filepath
+ * @param $one_time_download is the file a one time download?
* @param $key if not empty, protect the file with this key
* @param $time the time of validity of the file
* @param $ip uploader's ip
* 'link' => the link name of the uploaded file
* 'delete_link' => the link code to delete file
*/
-function jirafeau_copy_local_file($local_file_path, $one_time_download, $key, $time, $ip, $crypt, $link_name_length, $file_hash_method) {
-
+function jirafeau_copy_local_file($local_file_path, $one_time_download, $key, $time, $ip, $crypt, $link_name_length, $file_hash_method)
+{
if (!file_exists($local_file_path)) {
return (array(
'error' =>
array('has_error' => true,
'why' => t('INTERNAL_ERROR_FILE_NOT_EXIST')),
- 'link' =>'',
+ 'link' => '',
'delete_link' => ''));
}
- if(
+ if (
// sanity check if file can be opened
- $file = fopen($local_file_path, "r")
- )
- {
+ $file = fopen($local_file_path, 'r')
+ ) {
// close file pointer - it's not needed here
fclose($file);
$time_in_int = jirafeau_datestr_to_int($time);
$file_hash_method,
false
);
- }
- else {
+ } else {
return (array(
'error' =>
array('has_error' => true,
'why' => t('INTERNAL_ERROR_FP_OPEN_LOCAL')),
- 'link' =>'',
+ 'link' => '',
'delete_link' => ''));
}
-
}
-function jirafeau_create_file_array($file_path) {
- return
- [
- 'type' => mime_content_type($file_path),
- 'tmp_name' => $file_path,
- 'name' => basename($file_path),
- 'size' => filesize($file_path),
+function jirafeau_create_file_array($file_path)
+{
+ return [
+ 'type' => mime_content_type($file_path),
+ 'tmp_name' => $file_path,
+ 'name' => basename($file_path),
+ 'size' => filesize($file_path),
];
}
git.p6c8.net / jirafeau_project.git / blobdiff