From: Pierre-Alain Bandinelli Date: Sun, 15 May 2016 15:08:27 +0000 (+0200) Subject: Adding the possibility to call admin.php from CLI to automatize cleanoing of old... X-Git-Tag: 1.2.0~32^2~3 X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/94819539182ec00e4a35ecc95a5d9ca886d903cf Adding the possibility to call admin.php from CLI to automatize cleanoing of old files / async files --- diff --git a/README.md b/README.md index 006fdfd..d57c767 100644 --- a/README.md +++ b/README.md @@ -208,14 +208,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 +237,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'); +} ?>