From: Jérôme Date: Wed, 18 May 2016 12:09:14 +0000 (+0000) Subject: Merge branch 'master' into 'master' X-Git-Tag: 1.2.0~32 X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/2cd580e147f550e4bbc99e89a20f40359c6b5940?hp=dd3bb52ddcfed99d4c8e6e3736ae58e1c6ed4ece Merge branch 'master' into 'master' Adding the possibility to call admin.php from CLI to automatize (e.g. in cron) the cleaning of old/expired files and unfinished tranfers Hello, I think this feature might be of interest for other administrators of Jirafeau. I have not found any way in the app to do it so I developed this small patch. What do you think? Best Pierre-Alain See merge request !15 --- diff --git a/README.md b/README.md index 006fdfd..a41a4ea 100644 --- a/README.md +++ b/README.md @@ -91,13 +91,13 @@ In a next step, encryption will be made by the client (in javascript), see issue ### Can I add a new language in Jirafeau? -Of-course ! Translations are easy to make and no technical knowledge is required. +Of course ! Translations are easy to make and no technical knowledge is required. Simply go to [Jirafeau's Weblate](https://hosted.weblate.org/projects/jirafeau/master/). If you want to add a new language in the list, feel free to contact us or leave a comment in ticket #9. -We would like to thanks to anonymous contributors on weblate. :) +We would like to thank all anonymous contributors on weblate. :) ### How do I upgrade my Jirafeau? @@ -121,11 +121,22 @@ There are two ways to limit upload access (but not download): Check documentation of ```upload_password``` and ```upload_ip``` parameters in [lib/config.original.php](https://gitlab.com/mojo42/Jirafeau/blob/master/lib/config.original.php). +### How can I automatize the cleaning of old (expired) files? + +You can call the admin.php script from the command line (CLI) with the ```clean_expired``` or ```clean_async``` commands: ```sudo -u www-data php admin.php clean_expired```. + +Then the command can be placed in a cron file to automatize the process. For example: +``` +# m h dom mon dow user command +12 3 * * * www-data php /path/to/jirafeau/admin.php clean_expired +16 3 * * * www-data php /path/to/jirafeau/admin.php clean_async +``` + ### I have some troubles with IE If you have some strange behavior with IE, you may configure [compatibility mode](http://feedback.dominknow.com/knowledgebase/articles/159097-internet-explorer-ie8-ie9-ie10-and-ie11-compat). -Anyway I would recommand you to use another web browser. :) +Anyway I would recommend you to use another web browser. :) ### I found a bug, what should I do? @@ -157,6 +168,10 @@ Simply go to ```/script.php``` with your web browser. Be sure your PHP installation is not using safe mode, it may cause timeouts. +### How can I monitor the use of my Jirafeau instance? + +You may use Munin and simple scripts to collect the number of files in the Jirafeau instance as well as the disk space occupied by all the files. You can consult this [web page](https://blog.bandinelli.net/index.php?post/2016/05/15/Scripts-Munin-pour-Jirafeau). + ### Why forking? The original project seems not to be continued anymore and I prefer to add more features and increase security from a stable version. @@ -175,13 +190,13 @@ Just edit ```tos.php``` and configure ```$org``` and ```$contact``` variables. ### What about this file deduplication thing? -Jirafeau use a very simple file level deduplication for storage optimization. +Jirafeau uses a very simple file level deduplication for storage optimization. This mean that if some people upload several times the same file, this will only store one time the file and increment a counter. -If someone use his delete link or an admin cleans expired links, this will decrement the counter corresponding to the file. +If someone use his/her delete link or an admin cleans expired links, this will decrement the counter corresponding to the file. -If the counter falls to zero, the file is destroyed. +When the counter falls to zero, the file is destroyed. ### What is the difference between "delete link" and "delete file and links" in admin interface? @@ -198,7 +213,7 @@ Feel free to create an issue if you found a bug. ## Version 1.0 -The very first version of Jirafeau after the fork of Jiraph. +The very first version of Jirafeau after the fork of Jyraphe. - Security fix - Keep uploader's ip @@ -208,14 +223,14 @@ The very first version of Jirafeau after the fork of Jiraph. - Add an admin interface - New Design - Add term of use -- New path system to manage large number of files +- New path system to manage large number of files - New option to show a page at download time - Add option to activate or not preview mode ## Version 1.1 - New skins -- Add optional server side encryption +- Add optional server side encryption - Unlimited file size upload using HTML5 file API - Show speed and estimated time during upload - A lot of fixes @@ -237,4 +252,3 @@ The very first version of Jirafeau after the fork of Jiraph. 5. Follow installation wizard, it should propose you the same data folder 6. Add a rewrite rule in your web server configuration to rename file.php to f.php to make old url work again 7. Go in you lib/config.local.php and lib/config.original.php to check new options and eventually change skin to 'courgette' - diff --git a/admin.php b/admin.php index a0ae04b..62fd5ee 100644 --- a/admin.php +++ b/admin.php @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ - + define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/'); require (JIRAFEAU_ROOT . 'lib/config.original.php'); @@ -28,260 +28,277 @@ require (JIRAFEAU_ROOT . 'lib/lang.php'); if (file_exists (JIRAFEAU_ROOT . 'install.php') && !file_exists (JIRAFEAU_ROOT . 'lib/config.local.php')) { - header('Location: install.php'); + header('Location: install.php'); exit; } -/* Disable admin interface if we have a empty admin password. */ -if (empty($cfg['admin_password']) && empty($cfg['admin_http_auth_user'])) -{ - require (JIRAFEAU_ROOT . 'lib/template/header.php'); - echo '

'. - t('Sorry, the admin interface is not enabled.') . - '

'; - require (JIRAFEAU_ROOT.'lib/template/footer.php'); - exit; +/* If called from CLI, no password or graphical interface */ +if (php_sapi_name() == "cli") { + if ((count($argv)>1) && $argv[1]=="clean_expired") { + $total = jirafeau_admin_clean (); + echo "$total expired files deleted."; + } + elseif ((count($argv)>1) && $argv[1]=="clean_async") { + $total = jirafeau_admin_clean_async (); + echo "$total old unfinished transfers deleted."; + } + else + { + die("No command found. Should be admin.php ."); + } } +else +{ + /* Disable admin interface if we have a empty admin password. */ + if (empty($cfg['admin_password']) && empty($cfg['admin_http_auth_user'])) + { + require (JIRAFEAU_ROOT . 'lib/template/header.php'); + echo '

'. + t('Sorry, the admin interface is not enabled.') . + '

'; + require (JIRAFEAU_ROOT.'lib/template/footer.php'); + exit; + } -/* Check session. */ -session_start(); - -/* Unlog if asked. */ -if (isset ($_POST['action']) && (strcmp ($_POST['action'], 'logout') == 0)) - $_SESSION['admin_auth'] = false; + /* Check session. */ + session_start(); -/* Check classic admin password authentification. */ -if (isset ($_POST['admin_password']) && empty($cfg['admin_http_auth_user'])) -{ - if ($cfg['admin_password'] === $_POST['admin_password']) - $_SESSION['admin_auth'] = true; - else - { - $_SESSION['admin_auth'] = false; - require (JIRAFEAU_ROOT . 'lib/template/header.php'); - echo '

'. - t('Wrong password.') . '

'; - require (JIRAFEAU_ROOT.'lib/template/footer.php'); - exit; - } -} -/* Ask for classic admin password authentification. */ -elseif ((!isset ($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true) - && empty($cfg['admin_http_auth_user'])) -{ - require (JIRAFEAU_ROOT . 'lib/template/header.php'); ?> -
-
- - - - - - - - - -
- -
- " /> -
-
-
-

'. - t('Sorry, you are not authenticated on admin interface.') . - '

'; - require (JIRAFEAU_ROOT.'lib/template/footer.php'); - exit; -} + /* Check classic admin password authentification. */ + if (isset ($_POST['admin_password']) && empty($cfg['admin_http_auth_user'])) + { + if ($cfg['admin_password'] === $_POST['admin_password']) + $_SESSION['admin_auth'] = true; + else + { + $_SESSION['admin_auth'] = false; + require (JIRAFEAU_ROOT . 'lib/template/header.php'); + echo '

'. + t('Wrong password.') . '

'; + require (JIRAFEAU_ROOT.'lib/template/footer.php'); + exit; + } + } + /* Ask for classic admin password authentification. */ + elseif ((!isset ($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true) + && empty($cfg['admin_http_auth_user'])) + { + require (JIRAFEAU_ROOT . 'lib/template/header.php'); ?> +
+
+ + + + + + + + + +
+ +
+ " /> +
+
+
+

'. + t('Sorry, you are not authenticated on admin interface.') . + '

'; + require (JIRAFEAU_ROOT.'lib/template/footer.php'); + exit; + } -/* Show admin interface if not downloading a file. */ -if (!(isset ($_POST['action']) && strcmp ($_POST['action'], 'download') == 0)) -{ - require (JIRAFEAU_ROOT . 'lib/template/header.php'); - ?>

(version )

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - -
- - - - - -
- - - - - -
- - - - - -
-
- - -
-

(version )

' . NL; - echo '

'; - echo t('Number of cleaned files') . ' : ' . $total; - echo '

'; - } - elseif (strcmp ($_POST['action'], 'clean_async') == 0) - { - $total = jirafeau_admin_clean_async (); - echo '
' . NL; - echo '

'; - echo t('Number of cleaned files') . ' : ' . $total; - echo '

'; - } - elseif (strcmp ($_POST['action'], 'list') == 0) - { - jirafeau_admin_list ("", "", ""); - } - elseif (strcmp ($_POST['action'], 'search_by_name') == 0) - { - jirafeau_admin_list ($_POST['name'], "", ""); - } - elseif (strcmp ($_POST['action'], 'search_by_file_hash') == 0) - { - jirafeau_admin_list ("", $_POST['hash'], ""); - } - elseif (strcmp ($_POST['action'], 'search_link') == 0) - { - jirafeau_admin_list ("", "", $_POST['link']); - } - elseif (strcmp ($_POST['action'], 'delete_link') == 0) - { - jirafeau_delete_link ($_POST['link']); - echo '
' . NL; - echo '

' . t('Link deleted') . '

'; - } - elseif (strcmp ($_POST['action'], 'delete_file') == 0) - { - $count = jirafeau_delete_file ($_POST['md5']); - echo '
' . NL; - echo '

' . t('Deleted links') . ' : ' . $count . '

'; - } - elseif (strcmp ($_POST['action'], 'download') == 0) - { - $l = jirafeau_get_link ($_POST['link']); - if (!count ($l)) - return; - $p = s2p ($l['md5']); - header ('Content-Length: ' . $l['file_size']); - header ('Content-Type: ' . $l['mime_type']); - header ('Content-Disposition: attachment; filename="' . - $l['file_name'] . '"'); - if (file_exists(VAR_FILES . $p . $l['md5'])) - readfile (VAR_FILES . $p . $l['md5']); - exit; - } -} + ?>
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + + + +
+ + + + + +
+ + + + + +
+
+ + +
+
' . NL; + echo '

'; + echo t('Number of cleaned files') . ' : ' . $total; + echo '

'; + } + elseif (strcmp ($_POST['action'], 'clean_async') == 0) + { + $total = jirafeau_admin_clean_async (); + echo '
' . NL; + echo '

'; + echo t('Number of cleaned files') . ' : ' . $total; + echo '

'; + } + elseif (strcmp ($_POST['action'], 'list') == 0) + { + jirafeau_admin_list ("", "", ""); + } + elseif (strcmp ($_POST['action'], 'search_by_name') == 0) + { + jirafeau_admin_list ($_POST['name'], "", ""); + } + elseif (strcmp ($_POST['action'], 'search_by_file_hash') == 0) + { + jirafeau_admin_list ("", $_POST['hash'], ""); + } + elseif (strcmp ($_POST['action'], 'search_link') == 0) + { + jirafeau_admin_list ("", "", $_POST['link']); + } + elseif (strcmp ($_POST['action'], 'delete_link') == 0) + { + jirafeau_delete_link ($_POST['link']); + echo '
' . NL; + echo '

' . t('Link deleted') . '

'; + } + elseif (strcmp ($_POST['action'], 'delete_file') == 0) + { + $count = jirafeau_delete_file ($_POST['md5']); + echo '
' . NL; + echo '

' . t('Deleted links') . ' : ' . $count . '

'; + } + elseif (strcmp ($_POST['action'], 'download') == 0) + { + $l = jirafeau_get_link ($_POST['link']); + if (!count ($l)) + return; + $p = s2p ($l['md5']); + header ('Content-Length: ' . $l['file_size']); + header ('Content-Type: ' . $l['mime_type']); + header ('Content-Disposition: attachment; filename="' . + $l['file_name'] . '"'); + if (file_exists(VAR_FILES . $p . $l['md5'])) + readfile (VAR_FILES . $p . $l['md5']); + exit; + } + } + require (JIRAFEAU_ROOT.'lib/template/footer.php'); +} ?>