' . t('Password protection') . @@ -135,7 +132,7 @@ if (!empty($link['key'])) { '' . '' . '' . - t('By using our services, you accept our'). ' ' . t('Terms of Service') . '.' . + t('By using our services, you accept our'). ' ' . t('Terms of Service') . '.' . ''; if ($link['onetime'] == 'O') { @@ -144,7 +141,7 @@ if (!empty($link['key'])) { ''; } ?>'; ?> + ''; ?> ' . htmlspecialchars($link['file_name']) . '' . '' . ''; if ($link['onetime'] == 'O') { @@ -199,7 +193,7 @@ if (!$password_challenged && !$do_download && !$do_preview) { } ?>

' . t('You are about to download') . ' "' . htmlspecialchars($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' . '

' . - t('By using our services, you accept our'). ' ' . t('Terms of Service') . '.' . + t('By using our services, you accept our'). ' ' . t('Terms of Service') . '.' . '

- +

@@ -236,7 +232,7 @@ else { onclick=" document.getElementById('upload').style.display = 'none'; document.getElementById('uploading').style.display = ''; - upload ('', ); + upload (); "/>

diff --git a/install.php b/install.php index b400988..df6c599 100644 --- a/install.php +++ b/install.php @@ -335,7 +335,7 @@ case 4: jirafeau_export_cfg($cfg); echo '

' . t('Jirafeau is now fully operational') . ':' . - '
' . + '
' . $cfg['web_root'].'

'; } break; diff --git a/lib/functions.js.php b/lib/functions.js.php index 7ac8c76..542000b 100644 --- a/lib/functions.js.php +++ b/lib/functions.js.php @@ -113,7 +113,7 @@ function convertAllDatetimeFields() { } } -function show_link (url, reference, delete_code, crypt_key, date) +function show_link (reference, delete_code, crypt_key, date) { // Upload finished document.getElementById('uploading').style.display = 'none'; @@ -122,23 +122,20 @@ function show_link (url, reference, delete_code, crypt_key, date) document.title = 'Jirafeau - 100%'; // Download page - var download_link = url + 'f.php?h=' + reference; - var download_link_href = url + 'f.php?h=' + reference; + var download_link_href = 'f.php?h=' + reference; if (crypt_key.length > 0) { - download_link += '&k=' + crypt_key; download_link_href += '&k=' + crypt_key; } if (!!document.getElementById('upload_finished_download_page')) { - document.getElementById('upload_link').innerHTML = download_link; document.getElementById('upload_link').href = download_link_href; } // Email link var filename = document.getElementById('file_select').files[0].name; var b = encodeURIComponent("Download file \"" + filename + "\":") + "%0D"; - b += encodeURIComponent(download_link_href) + "%0D"; + b += encodeURIComponent("" + download_link_href) + "%0D"; if (false == isEmpty(date)) { b += "%0D" + encodeURIComponent("This file will be available until " + date.format('YYYY-MM-DD hh:mm (GMT O)')) + "%0D"; @@ -146,9 +143,7 @@ function show_link (url, reference, delete_code, crypt_key, date) } // Delete link - var delete_link = url + 'f.php?h=' + reference + '&d=' + delete_code; - var delete_link_href = url + 'f.php?h=' + reference + '&d=' + delete_code; - document.getElementById('delete_link').innerHTML = delete_link; + var delete_link_href = 'f.php?h=' + reference + '&d=' + delete_code; document.getElementById('delete_link').href = delete_link_href; // Validity date @@ -168,11 +163,9 @@ function show_link (url, reference, delete_code, crypt_key, date) if (!!document.getElementById('preview_link')) { document.getElementById('upload_finished_preview').style.display = 'none'; - var preview_link = url + 'f.php?h=' + reference + '&p=1'; - var preview_link_href = url + 'f.php?h=' + reference + '&p=1'; + var preview_link_href = 'f.php?h=' + reference + '&p=1'; if (crypt_key.length > 0) { - preview_link += '&k=' + crypt_key; preview_link_href += '&k=' + crypt_key; } @@ -183,24 +176,19 @@ function show_link (url, reference, delete_code, crypt_key, date) type.indexOf("text") > -1 || type.indexOf("video") > -1) { - document.getElementById('preview_link').innerHTML = preview_link; document.getElementById('preview_link').href = preview_link_href; document.getElementById('upload_finished_preview').style.display = ''; } } // Direct download link - var direct_download_link = url + 'f.php?h=' + reference + '&d=1'; - var direct_download_link_href = url + 'f.php?h=' + reference + '&d=1'; + var direct_download_link_href = 'f.php?h=' + reference + '&d=1'; if (crypt_key.length > 0) { - direct_download_link += '&k=' + crypt_key; direct_download_link_href += '&k=' + crypt_key; } - document.getElementById('direct_link').innerHTML = direct_download_link; document.getElementById('direct_link').href = direct_download_link_href; - // Hide preview and direct download link if password is set if (document.getElementById('input_key').value.length > 0) { @@ -330,7 +318,7 @@ function add_time_string_to_date(d, time) return false; } -function classic_upload (url, file, time, password, one_time, upload_password) +function classic_upload (file, time, password, one_time, upload_password) { // Delay time estimation init as we can't have file size upload_time_estimation_init(0); @@ -366,10 +354,10 @@ function classic_upload (url, file, time, password, one_time, upload_password) expiryDate = localDatetime; } - show_link (url, res[0], res[1], res[2], expiryDate); + show_link (res[0], res[1], res[2], expiryDate); } } - req.open ("POST", url + 'script.php' , true); + req.open ("POST", 'script.php' , true); var form = new FormData(); form.append ("file", file); @@ -391,17 +379,15 @@ function check_html5_file_api () } var async_global_transfered = 0; -var async_global_url = ''; var async_global_file; var async_global_ref = ''; var async_global_max_size = 0; var async_global_time; var async_global_transfering = 0; -function async_upload_start (url, max_size, file, time, password, one_time, upload_password) +function async_upload_start (max_size, file, time, password, one_time, upload_password) { async_global_transfered = 0; - async_global_url = url; async_global_file = file; async_global_max_size = max_size; async_global_time = time; @@ -427,7 +413,7 @@ function async_upload_start (url, max_size, file, time, password, one_time, uplo async_upload_push (code); } } - req.open ("POST", async_global_url + 'script.php?init_async' , true); + req.open ("POST", 'script.php?init_async' , true); var form = new FormData(); form.append ("filename", async_global_file.name); @@ -498,7 +484,7 @@ function async_upload_push (code) async_upload_push (code); } } - req.open ("POST", async_global_url + 'script.php?push_async' , true); + req.open ("POST", 'script.php?push_async' , true); var chunk_size = parseInt (async_global_max_size * 0.50); var start = async_global_transfered; @@ -545,10 +531,10 @@ function async_upload_end (code) expiryDate = localDatetime; } - show_link (async_global_url, res[0], res[1], res[2], expiryDate); + show_link (res[0], res[1], res[2], expiryDate); } } - req.open ("POST", async_global_url + 'script.php?end_async' , true); + req.open ("POST", 'script.php?end_async' , true); var form = new FormData(); form.append ("ref", async_global_ref); @@ -556,12 +542,12 @@ function async_upload_end (code) req.send (form); } -function upload (url, max_size) +function upload (max_size) { if (check_html5_file_api () && document.getElementById('file_select').files[0].size >= max_size) { - async_upload_start (url, + async_upload_start ( max_size, document.getElementById('file_select').files[0], document.getElementById('select_time').value, @@ -572,7 +558,7 @@ function upload (url, max_size) } else { - classic_upload (url, + classic_upload ( document.getElementById('file_select').files[0], document.getElementById('select_time').value, document.getElementById('input_key').value, diff --git a/lib/functions.php b/lib/functions.php index 7d15e1b..0bb51db 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -609,7 +609,7 @@ function jirafeau_admin_list($name, $file_hash, $link_hash) /* Print link informations. */ echo ''; echo '' . - '' . htmlspecialchars($l['file_name']) . ''; echo ''; echo '' . $l['mime_type'] . ''; diff --git a/lib/template/footer.php b/lib/template/footer.php index f33373f..054f97f 100644 --- a/lib/template/footer.php +++ b/lib/template/footer.php @@ -11,7 +11,7 @@ | '; - echo '' . t('Terms of Service') . ''; + echo '' . t('Terms of Service') . ''; } ?>

diff --git a/lib/template/header.php b/lib/template/header.php index f03b2ba..fa7fb8f 100644 --- a/lib/template/header.php +++ b/lib/template/header.php @@ -7,14 +7,14 @@ header('x-ua-compatible: ie=edge'); <?php echo (true === empty($cfg['title']))? t('Jirafeau, your web file repository') : $cfg['title']; ?> - - + + - +

- +

diff --git a/script.php b/script.php index f00b1df..ffd2c0e 100644 --- a/script.php +++ b/script.php @@ -50,7 +50,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count($_GET) == 0) {

Scripting interface

This interface permits to script your uploads and downloads.

See source code of this interface to get available calls :)

You may download a preconfigured Bash Script to easily send to and get files from the API via command line.

Date: Sun, 9 Jul 2017 16:48:32 +0200 Subject: [PATCH 12/16] [FEATURE] Add a copy button next to links closes #129 Signed-off-by: Jerome Jutteau --- index.php | 25 ++++++++++++++++++++----- lib/functions.js.php | 22 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/index.php b/index.php index cd0eed8..11205a4 100644 --- a/index.php +++ b/index.php @@ -98,25 +98,35 @@ else {

- - + + +

+ + +

@@ -262,5 +272,10 @@ else { document.getElementById('max_file_size').innerHTML = ''; + + addCopyListener('upload_link_button', 'upload_link'); + addCopyListener('preview_link_button', 'preview_link'); + addCopyListener('direct_link_button', 'direct_link'); + addCopyListener('delete_link_button', 'delete_link'); diff --git a/lib/functions.js.php b/lib/functions.js.php index 542000b..6ee335d 100644 --- a/lib/functions.js.php +++ b/lib/functions.js.php @@ -710,3 +710,25 @@ document.addEventListener('DOMContentLoaded', function(event) { // Search for all datetime fields and convert the time to local timezone convertAllDatetimeFields(); }); + +// Add copy event listeners +function copyLinkToClipboard(link_id) { + var focus = document.activeElement; + var e = document.getElementById(link_id); + + var tmp = document.createElement("textarea"); + document.body.appendChild(tmp); + tmp.textContent = e.href; + tmp.focus(); + tmp.setSelectionRange(0, tmp.value.length); + document.execCommand("copy"); + document.body.removeChild(tmp); + + focus.focus(); +} + +function addCopyListener(button_id, link_id) { + document.getElementById(button_id) + .addEventListener("click", function() { + copyLinkToClipboard(link_id);}); +} -- 2.34.1 From 91800659866146b2d5406bd209022191fa4c8da6 Mon Sep 17 00:00:00 2001 From: Jerome Jutteau Date: Mon, 4 Sep 2017 08:56:13 +0200 Subject: [PATCH 13/16] [TASK] Remove dev.sh script file Not usefull anymore as there is now a docker directory with better configuration. Signed-off-by: Jerome Jutteau --- dev.sh | 5 ----- 1 file changed, 5 deletions(-) delete mode 100755 dev.sh diff --git a/dev.sh b/dev.sh deleted file mode 100755 index d749cf7..0000000 --- a/dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -jroot=$(cd "$(dirname $0)" && pwd) -docker -h &> /dev/null || (echo "You need docker installed" && exit 1) -docker pull tutum/apache-php -docker run -v $jroot:/app -t -i --rm -p 8080:80 tutum/apache-php -- 2.34.1 From d76baeb068461f6f27c40a2fed1eae56586f08a7 Mon Sep 17 00:00:00 2001 From: Jerome Jutteau Date: Mon, 4 Sep 2017 21:31:42 +0200 Subject: [PATCH 14/16] [FEATURE] Add docker image support closes #114 Signed-off-by: Jerome Jutteau --- Dockerfile | 25 +++++++++++++++++++++++++ README.md | 4 ++++ docker/README.md | 38 ++++++++++++++++++++++++++++++++++++++ docker/lighttpd.conf | 34 ++++++++++++++++++++++++++++++++++ docker/php.ini | 2 ++ 5 files changed, 103 insertions(+) create mode 100644 Dockerfile create mode 100644 docker/README.md create mode 100644 docker/lighttpd.conf create mode 100644 docker/php.ini diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..a950963 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,25 @@ +FROM php:7.1.1-fpm-alpine +MAINTAINER "JÃ©rÃ´me Jutteau " + +RUN apk update && \ + apk add lighttpd git && \ + ln -snf /usr/share/zoneinfo/Etc/UTC /etc/localtime && \ + echo "UTC" > /etc/timezone && \ + mkdir -p /usr/local/etc/php / && \ + mkdir /www + +WORKDIR /www + +COPY docker/php.ini /usr/local/etc/php/php.ini +COPY docker/lighttpd.conf /etc/lighttpd/lighttpd.conf +COPY *.php LICENSE.txt ./ +COPY lib lib +COPY media media + +RUN chown -R www-data. . && \ + chmod o=,ug=rwX -R . && \ + apk del git && \ + rm -rf /var/cache/apk/* + +CMD php-fpm -D && lighttpd -D -f /etc/lighttpd/lighttpd.conf +EXPOSE 80 diff --git a/README.md b/README.md index d9ac583..c62e252 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,10 @@ Jirafeau project won't evolve to a file manager and will focus to keep a very fe ## Installation +This shows how to install Jirafeau by your own, it's quite simple but you can +also use a [docker image](https://hub.docker.com/r/mojo42/jirafeau/) or build +it yourself. Check [docker folder](docker/README.md) for more informations. + System requirements: - PHP >= 5.6 - Optional, but recommended: Git >= 2.7 diff --git a/docker/README.md b/docker/README.md new file mode 100644 index 0000000..5dc4c2c --- /dev/null +++ b/docker/README.md @@ -0,0 +1,38 @@ +# Jirafeau in Docker + +Jirafeau is a small PHP application so running it inside a docker is pretty straightforward. + +## Get Jirafeau's docker image + +### Pull docker image from Docker Hub + +`docker pull mojo42/jirafeau` + +### Build your own docker image + +``` +git clone https://gitlab.com/mojo42/Jirafeau.git +cd Jirafeau +docker build -t mojo42/jirafeau:latest . +``` + +## Run Jirafeau image + +Once you have your Jirafeau's image, you can run a quick & dirty Jirafeau using: +``` +docker run -d -p 8000:80 mojo42/jirafeau +``` +and then connect on [locahost:8000](http://localhost:8000) and proceed to installation. + +An other way to run Jirafeau (in a more controlled way) is to mount your Jirafeau's reprository in /www folder so your data are outside the container. This way, you will be able to easily make backups, upgrade Jirafeau, change configuration and develop Jirafeau. +``` +docker run -d -p 8000:80 -v$(pwd):/www mojo42/jirafeau +``` + +There are also other ways to manage your container (like docker's volumes) but this is out of the scope of this documentation. + +## Few notes + +- SSL is currently not enabled in docker's image for the moment +- `var-...` folder where lives all uploaded data is protected from direct access +- Image has been made using [Alpine Linux](https://alpinelinux.org/) with [lighttpd](https://www.lighttpd.net/) which makes the container very light and start very quickly diff --git a/docker/lighttpd.conf b/docker/lighttpd.conf new file mode 100644 index 0000000..0e4bb5d --- /dev/null +++ b/docker/lighttpd.conf @@ -0,0 +1,34 @@ +var.basedir = "/www" +var.logdir = "/var/log/lighttpd" +var.statedir = "/var/lib/lighttpd" + +server.modules = ( + "mod_access", + "mod_usertrack", + "mod_expire", + "mod_accesslog" +) + +include "mime-types.conf" +include "mod_fastcgi_fpm.conf" + +server.username = "lighttpd" +server.groupname = "lighttpd" + +server.pid-file = "/run/lighttpd.pid" +server.errorlog = var.logdir + "/error.log" +server.indexfiles = ("index.php", "index.html", "index.htm") +server.follow-symlink = "enable" +server.document-root = var.basedir + +dir-listing.show-header = "disable" +dir-listing.hide-header-file = "enable" +dir-listing.activate = "disable" + +static-file.exclude-extensions = (".php") + +accesslog.filename = var.logdir + "/access.log" +url.access-deny = ("~", ".inc") +$HTTP["url"] =~ "^/var-*" { + url.access-deny = ("") +} diff --git a/docker/php.ini b/docker/php.ini new file mode 100644 index 0000000..f4f5ac2 --- /dev/null +++ b/docker/php.ini @@ -0,0 +1,2 @@ +date.timezone = UTC +display_errors = stderr -- 2.34.1 From 379a0267c27b3731c60b7221f8f533aaf418fcae Mon Sep 17 00:00:00 2001 From: Jerome Jutteau Date: Tue, 5 Sep 2017 00:24:08 +0200 Subject: [PATCH 15/16] [TASK] Remove Alias support Some time ago, this was a weird idea. It's useless to keep this, it's just dead garbage code. Signed-off-by: Jerome Jutteau --- f.php | 7 -- install.php | 2 +- lib/functions.php | 179 ---------------------------------------------- lib/settings.php | 1 - script.php | 66 ----------------- 5 files changed, 1 insertion(+), 254 deletions(-) diff --git a/f.php b/f.php index 79f437e..bcf0848 100644 --- a/f.php +++ b/f.php @@ -45,13 +45,6 @@ if (!preg_match('/[0-9a-zA-Z_-]+$/', $link_name)) { } $link = jirafeau_get_link($link_name); -if (count($link) == 0) { - /* Try alias. */ - $alias = jirafeau_get_alias(md5($link_name)); - if (count($alias) > 0) { - $link = jirafeau_get_link($alias["destination"]); - } -} if (count($link) == 0) { require(JIRAFEAU_ROOT.'lib/template/header.php'); echo '

' . t('Sorry, the requested file is not found') . diff --git a/install.php b/install.php index df6c599..8c0f686 100644 --- a/install.php +++ b/install.php @@ -83,7 +83,7 @@ function jirafeau_check_var_dir($path) '
' . $mkdir_str2); } - foreach (array('files', 'links', 'async', 'alias') as $subdir) { + foreach (array('files', 'links', 'async') as $subdir) { $subpath = $path.$subdir; if (!jirafeau_mkdir($subpath) || !jirafeau_is_writable($subpath)) { diff --git a/lib/functions.php b/lib/functions.php index 0bb51db..e4bfbb5 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -1214,185 +1214,6 @@ function hex_to_base64($hex) return base64_encode($b); } -/** - * Read alias informations - * @return array containing informations. - */ -function jirafeau_get_alias($hash) -{ - $out = array(); - $link = VAR_ALIAS . s2p("$hash") . $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; -} - -/** Create an alias to a jirafeau's link. - * @param $alias alias name - * @param $destination reference of the destination - * @param $password password to protect alias - * @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) -{ - /* Check that alias and password are long enough. */ - 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)) { - return 'Error'; - } - - /* Check that alias does not already exists. */ - $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)) { - return 'Error'; - } - - /* Generate password. */ - $md5_password = md5($password); - - /* Store informations. */ - $p .= $alias; - $handle = fopen($p, 'w'); - fwrite($handle, - $md5_password . NL . - $ip . NL . - time() . NL . - $destination . NL); - fclose($handle); - - return 'Ok'; -} - -/** Update an alias. - * @param $alias alias to update - * @param $destination reference of the new destination - * @param $password password to protect alias - * @param $new_password optional new password to protect alias - * @param $ip client's IP - * @return "Ok" or "Error" string - */ -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'; - } - - /* Check that destination exists. */ - $l = jirafeau_get_link($a["destination"]); - if (!count($l)) { - return 'Error'; - } - - /* Check 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); - } elseif (strlen($new_password) > 0) { - return 'Error'; - } - - /* Rewrite informations. */ - $p = VAR_ALIAS . s2p($alias) . $alias; - $handle = fopen($p, 'w'); - fwrite($handle, - $p . NL . - $ip . NL . - time() . NL . - $destination . NL); - fclose($handle); - return 'Ok'; -} - -/** Get an alias. - * @param $alias alias to get - * @return alias destination or "Error" string - */ -function jirafeau_alias_get($alias) -{ - $alias = md5($alias); - /* Check that alias exits. */ - $a = jirafeau_get_alias($alias); - if (!count($a)) { - return 'Error'; - } - - return $a['destination']; -} - -function jirafeau_clean_rm_alias($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); - } -} - -/** Delete an alias. - * @param $alias alias to delete - * @param $password password to protect alias - * @return "Ok" or "Error" string - */ -function jirafeau_alias_delete($alias, $password) -{ - $alias = md5($alias); - /* Check that alias exits. */ - $a = jirafeau_get_alias($alias); - if (!count($a)) { - return "Error"; - } - - /* Check password. */ - if ($a["md5_password"] != md5($password)) { - return 'Error'; - } - - jirafeau_clean_rm_alias($alias); - return 'Ok'; -} - /** * Replace markers in templates. * diff --git a/lib/settings.php b/lib/settings.php index 3f7094c..1109d9a 100644 --- a/lib/settings.php +++ b/lib/settings.php @@ -39,7 +39,6 @@ define('JIRAFEAU_VERSION', '3.2.1'); define('VAR_FILES', $cfg['var_root'] . 'files/'); define('VAR_LINKS', $cfg['var_root'] . 'links/'); define('VAR_ASYNC', $cfg['var_root'] . 'async/'); -define('VAR_ALIAS', $cfg['var_root'] . 'alias/'); // helping variable to build absolute link to // root of the domain without handling the URL scheme diff --git a/script.php b/script.php index ffd2c0e..50726f2 100644 --- a/script.php +++ b/script.php @@ -363,72 +363,6 @@ fi exit; } } -/* Create alias. */ -elseif (isset($_GET['alias_create'])) { - if (isset($_POST['upload_password'])){ - if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) { - echo 'Error 14: Invalid password'; - exit; - } - } else { - if (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), null)) { - echo 'Error 13: No password nor allowed IP'; - exit; - } - } - - if (!isset($_POST['alias']) || - !isset($_POST['destination']) || - !isset($_POST['password'])) { - echo 'Error 15'; - exit; - } - - echo jirafeau_alias_create($_POST['alias'], - $_POST['destination'], - $_POST['password'], - $ip); -} -/* Get alias. */ -elseif (isset($_GET['alias_get'])) { - if (!isset($_POST['alias'])) { - echo 'Error 16'; - exit; - } - - echo jirafeau_alias_get($_POST['alias']); -} -/* Update alias. */ -elseif (isset($_GET['alias_update'])) { - if (!isset($_POST['alias']) || - !isset($_POST['destination']) || - !isset($_POST['password'])) { - echo 'Error 17'; - exit; - } - - $new_password = ''; - if (isset($_POST['new_password'])) { - $new_password = $_POST['new_password']; - } - - echo jirafeau_alias_update($_POST['alias'], - $_POST['destination'], - $_POST['password'], - $new_password, - get_ip_address($cfg)); -} -/* Delete alias. */ -elseif (isset($_GET['alias_delete'])) { - if (!isset($_POST['alias']) || - !isset($_POST['password'])) { - echo 'Error 18'; - exit; - } - - echo jirafeau_alias_delete($_POST['alias'], - $_POST['password']); -} /* Initialize an asynchronous upload. */ elseif (isset($_GET['init_async'])) { if (isset($_POST['upload_password'])){ -- 2.34.1 From 5efae52e3028850bd88ed03945f5d912420a36d3 Mon Sep 17 00:00:00 2001 From: Jerome Jutteau Date: Tue, 5 Sep 2017 00:02:51 +0200 Subject: [PATCH 16/16] [BUGFIX] Delete links using POST closes #136 Signed-off-by: Jerome Jutteau --- f.php | 28 +++++++++++++++++++++++++--- lib/locales/template.json | 3 +++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/f.php b/f.php index bcf0848..4289eae 100644 --- a/f.php +++ b/f.php @@ -84,10 +84,32 @@ if (!file_exists(VAR_FILES . $p . $link['md5'])) { } if (!empty($delete_code) && $delete_code == $link['link_code']) { - jirafeau_delete_link($link_name); require(JIRAFEAU_ROOT.'lib/template/header.php'); - echo '

'.t('File has been deleted.'). - '

'; + if (isset($_POST['do_delete'])) { + jirafeau_delete_link($link_name); + echo '

'.t('File has been deleted.'). + '

'; + } else { ?> +

+ + +

+ + + + + +

+ +

+ ' . t('Terms of Service') . '.' ?> +

+ + document.getElementById('submit_delete').submit ();"/> +