[BUGFIX] fix error return

[jirafeau.git] / admin.php

diff --git a/admin.php b/admin.php
index cb6058036bee37b11b8ada637b07e71d5fd028f6..a42b20fa3dc68ec435768022a9b00c7dc4825b6b 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -1,7 +1,7 @@
 <?php
 /*
  *  Jirafeau, your web file repository
 <?php
 /*
  *  Jirafeau, your web file repository

- *  Copyright (C) 2015  Jerome Jutteau <j.jutteau@gmail.com>
+ *  Copyright (C) 2015  Jerome Jutteau <jerome@jutteau.fr>

  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as


@@ -16,122 +16,94 @@
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */

+session_start();
+define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');

 
 

-define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
-
-require (JIRAFEAU_ROOT . 'lib/config.original.php');
-require (JIRAFEAU_ROOT . 'lib/settings.php');
-require (JIRAFEAU_ROOT . 'lib/functions.php');
-require (JIRAFEAU_ROOT . 'lib/lang.php');
+require(JIRAFEAU_ROOT . 'lib/settings.php');
+require(JIRAFEAU_ROOT . 'lib/functions.php');
+require(JIRAFEAU_ROOT . 'lib/lang.php');

 
 /* Check if installation is OK. */
 
 /* Check if installation is OK. */

-if (file_exists (JIRAFEAU_ROOT . 'install.php')
-    && !file_exists (JIRAFEAU_ROOT . 'lib/config.local.php'))
-{
+if (file_exists(JIRAFEAU_ROOT . 'install.php')
+    && !file_exists(JIRAFEAU_ROOT . 'lib/config.local.php')) {

     header('Location: install.php');
     exit;
 }
 
 /* If called from CLI, no password or graphical interface */
 if (php_sapi_name() == "cli") {
     header('Location: install.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 <clean_expired|clean_async>.");
-     }
-}
-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');
+    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 <clean_expired|clean_async>.");
+    }
+} 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 '<div class="error"><p>'.
       echo '<div class="error"><p>'.

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

            '</p></div>';
            '</p></div>';

-      require (JIRAFEAU_ROOT.'lib/template/footer.php');
+      require(JIRAFEAU_ROOT.'lib/template/footer.php');

       exit;
   }
 
       exit;
   }
 

-  /* Check session. */
-  session_start();
-

   /* Unlog if asked. */
   /* Unlog if asked. */

-  if (isset ($_POST['action']) && (strcmp ($_POST['action'], 'logout') == 0))
-      $_SESSION['admin_auth'] = false;
-
-  /* Check classic admin password authentification. */
-  if (isset ($_POST['admin_password']) && empty($cfg['admin_http_auth_user']))
-  {
-      if ($cfg['admin_password'] === $_POST['admin_password'] ||
-          $cfg['admin_password'] === hash('sha256', $_POST['admin_password']))
-          $_SESSION['admin_auth'] = true;
-      else
-      {
-          $_SESSION['admin_auth'] = false;
-          require (JIRAFEAU_ROOT . 'lib/template/header.php');
-          echo '<div class="error"><p>'.
-               t('Wrong password.') . '</p></div>';
-          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'); ?>
-      <form action = "<?php echo basename(__FILE__); ?>" method = "post">
-      <fieldset>
-          <table>
-          <tr>
-              <td class = "label"><label for = "enter_password">
-              <?php echo t('Administration password') . ':';?></label>
-              </td>
-              <td class = "field"><input type = "password"
-              name = "admin_password" id = "admin_password"
-              size = "40" />
-              </td>
-          </tr>
-          <tr class = "nav">
-              <td></td>
-              <td class = "nav next">
-              <input type = "submit" name = "key" value =
-              "<?php echo t('Login'); ?>" />
-              </td>
-          </tr>
-          </table>
-      </fieldset>
-      </form>
-      <?php
-      require (JIRAFEAU_ROOT.'lib/template/footer.php');
-      exit;
-  }
-  /* Check authenticated user if HTTP authentification is enable. */
-  elseif ((!isset ($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true)
-          && !empty($cfg['admin_http_auth_user']))
-  {
-      if ($cfg['admin_http_auth_user'] == $_SERVER['PHP_AUTH_USER'])
-          $_SESSION['admin_auth'] = true;
+  if (jirafeau_admin_session_logged() && isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
+      jirafeau_admin_session_end();

   }
 
   }
 

-  /* Be sure that no one can access further without admin_auth. */
-  if (!isset ($_SESSION['admin_auth']) || $_SESSION['admin_auth'] != true)
-  {
-           $_SESSION['admin_auth'] = false;
-          require (JIRAFEAU_ROOT . 'lib/template/header.php');
-          echo '<div class="error"><p>'.
-           t('Sorry, you are not authenticated on admin interface.') .
-           '</p></div>';
-          require (JIRAFEAU_ROOT.'lib/template/footer.php');
+  if (!jirafeau_admin_session_logged()) {
+      /* Test HTTP authentification. */
+      if (!empty($cfg['admin_http_auth_user']) &&
+          $cfg['admin_http_auth_user'] == $_SERVER['PHP_AUTH_USER']) {
+          jirafeau_admin_session_start();
+      }
+      /* Test web password authentification. */
+      else if (!empty($cfg['admin_password']) && isset($_POST['admin_password'])) {
+          if ($cfg['admin_password'] === hash('sha256', $_POST['admin_password'])) {
+              jirafeau_admin_session_start();
+          } else {
+              require(JIRAFEAU_ROOT . 'lib/template/header.php');
+              echo '<div class="error"><p>'. t('BAD_PSW') . '</p></div>';
+              require(JIRAFEAU_ROOT.'lib/template/footer.php');
+              exit;
+          }
+      }
+      /* Admin password prompt form. */
+      else {
+          require(JIRAFEAU_ROOT . 'lib/template/header.php'); ?>
+          <form method="post" class="form login">
+          <fieldset>
+              <table>
+              <tr>
+                  <td class = "label"><label for = "enter_password">
+                  <?php echo t('ADMIN_PSW') . ':'; ?></label>
+                  </td>
+              </tr>
+              <tr>
+                  <td class = "field"><input type = "password"
+                  name = "admin_password" id = "admin_password"
+                  size = "40" />
+                  </td>
+              </tr>
+              <tr class = "nav">
+                  <td class = "nav next">
+                  <input type = "submit" name = "key" value =
+                  "<?php echo t('LOGIN'); ?>" />
+                  </td>
+              </tr>
+              </table>
+          </fieldset>
+          </form>
+          <?php
+          require(JIRAFEAU_ROOT.'lib/template/footer.php');

           exit;
           exit;

+      }

   }
 
   /* Operations may take a long time.
   }
 
   /* Operations may take a long time.


@@ -142,164 +114,177 @@ else
   @error_reporting(0);
 
   /* Show admin interface if not downloading a file. */
   @error_reporting(0);
 
   /* Show admin interface if not downloading a file. */

-  if (!(isset ($_POST['action']) && strcmp ($_POST['action'], 'download') == 0))
-  {
-          require (JIRAFEAU_ROOT . 'lib/template/header.php');
-          ?><h2><?php echo t('Admin interface'); ?></h2><?php
+  if (!(isset($_POST['action']) && strcmp($_POST['action'], 'download') == 0)) {
+      require(JIRAFEAU_ROOT . 'lib/template/header.php'); ?><h2><?php echo t('ADMIN_INTERFACE'); ?></h2><?php

           ?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php
 
           ?><div id = "admin">
           ?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php
 
           ?><div id = "admin">

-          <fieldset><legend><?php echo t('Actions');?></legend>
+          <fieldset><legend><?php echo t('ACTIONS'); ?></legend>

           <table>
           <table>

-          <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+          <form method="post">

           <tr>
               <input type = "hidden" name = "action" value = "clean"/>
           <tr>
               <input type = "hidden" name = "action" value = "clean"/>

+              <?php echo jirafeau_admin_csrf_field() ?>

               <td class = "info">
               <td class = "info">

-                  <?php echo t('Clean expired files'); ?>
+                  <?php echo t('CLEAN_EXPIRED'); ?>

               </td>
               <td></td>
               <td>
               </td>
               <td></td>
               <td>

-                  <input type = "submit" value = "<?php echo t('Clean'); ?>" />
+                  <input type = "submit" value = "<?php echo t('CLEAN'); ?>" />

               </td>
           </tr>
           </form>
               </td>
           </tr>
           </form>

-          <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+          <form method="post">

           <tr>
               <input type = "hidden" name = "action" value = "clean_async"/>
           <tr>
               <input type = "hidden" name = "action" value = "clean_async"/>

+              <?php echo jirafeau_admin_csrf_field() ?>

               <td class = "info">
               <td class = "info">

-                  <?php echo t('Clean old unfinished transfers'); ?>
+                  <?php echo t('CLEAN_INCOMPLETE'); ?>

               </td>
               <td></td>
               <td>
               </td>
               <td></td>
               <td>

-                  <input type = "submit" value = "<?php echo t('Clean'); ?>" />
+                  <input type = "submit" value = "<?php echo t('CLEAN'); ?>" />

               </td>
           </tr>
           </form>
               </td>
           </tr>
           </form>

-          <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+          <form method="post">

           <tr>
               <input type = "hidden" name = "action" value = "list"/>
           <tr>
               <input type = "hidden" name = "action" value = "list"/>

+              <?php echo jirafeau_admin_csrf_field() ?>

               <td class = "info">
               <td class = "info">

-                  <?php echo t('List all files'); ?>
+                  <?php echo t('LS_FILES'); ?>

               </td>
               <td></td>
               <td>
               </td>
               <td></td>
               <td>

-                  <input type = "submit" value = "<?php echo t('List'); ?>" />
+                  <input type = "submit" value = "<?php echo t('LIST'); ?>" />

               </td>
           </tr>
           </form>
               </td>
           </tr>
           </form>

-          <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+          <form method="post">
+              <tr>
+                  <input type = "hidden" name = "action" value = "size"/>
+                  <?php echo jirafeau_admin_csrf_field() ?>
+                  <td class = "info">
+                      <?php echo t('SIZE_DATA'); ?>
+                  </td>
+                  <td></td>
+                  <td>
+                      <input type = "submit" value = "<?php echo t('SIZE'); ?>" />
+                  </td>
+              </tr>
+          </form>
+          <form method="post">

           <tr>
               <input type = "hidden" name = "action" value = "search_by_name"/>
           <tr>
               <input type = "hidden" name = "action" value = "search_by_name"/>

+              <?php echo jirafeau_admin_csrf_field() ?>

               <td class = "info">
               <td class = "info">

-                  <?php echo t('Search files by name'); ?>
+                  <?php echo t('SEARCH_NAME'); ?>

               </td>
               <td>
                   <input type = "text" name = "name" id = "name"/>
               </td>
               <td>
               </td>
               <td>
                   <input type = "text" name = "name" id = "name"/>
               </td>
               <td>

-                  <input type = "submit" value = "<?php echo t('Search'); ?>" />
+                  <input type = "submit" value = "<?php echo t('SEARCH'); ?>" />

               </td>
           </tr>
           </form>
               </td>
           </tr>
           </form>

-          <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+          <form method="post">

           <tr>
               <input type = "hidden" name = "action" value = "search_by_file_hash"/>
           <tr>
               <input type = "hidden" name = "action" value = "search_by_file_hash"/>

+              <?php echo jirafeau_admin_csrf_field() ?>

               <td class = "info">
               <td class = "info">

-                  <?php echo t('Search files by file hash'); ?>
+                  <?php echo t('SEARH_BY_HASH'); ?>

               </td>
               <td>
                   <input type = "text" name = "hash" id = "hash"/>
               </td>
               <td>
               </td>
               <td>
                   <input type = "text" name = "hash" id = "hash"/>
               </td>
               <td>

-                  <input type = "submit" value = "<?php echo t('Search'); ?>" />
+                  <input type = "submit" value = "<?php echo t('SEARCH'); ?>" />

               </td>
           </tr>
           </form>
               </td>
           </tr>
           </form>

-          <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+          <form method="post">

           <tr>
               <input type = "hidden" name = "action" value = "search_link"/>
           <tr>
               <input type = "hidden" name = "action" value = "search_link"/>

+              <?php echo jirafeau_admin_csrf_field() ?>

               <td class = "info">
               <td class = "info">

-                  <?php echo t('Search a specific link'); ?>
+                  <?php echo t('SEARCH_LINK'); ?>

               </td>
               <td>
                   <input type = "text" name = "link" id = "link"/>
               </td>
               <td>
               </td>
               <td>
                   <input type = "text" name = "link" id = "link"/>
               </td>
               <td>

-                  <input type = "submit" value = "<?php echo t('Search'); ?>" />
+                  <input type = "submit" value = "<?php echo t('SEARCH'); ?>" />

               </td>
           </tr>
           </form>
           </table>
               </td>
           </tr>
           </form>
           </table>

-          <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+          <form method="post">

               <input type = "hidden" name = "action" value = "logout" />
               <input type = "hidden" name = "action" value = "logout" />

-              <input type = "submit" value = "<?php echo t('Logout'); ?>" />
+              <?php echo jirafeau_admin_csrf_field() ?>
+              <input type = "submit" value = "<?php echo t('LOGOUT'); ?>" />

           </form>
           </fieldset></div><?php
   }
 
   /* Check for actions */
           </form>
           </fieldset></div><?php
   }
 
   /* Check for actions */

-  if (isset ($_POST['action']))
-  {
-      if (strcmp ($_POST['action'], 'clean') == 0)
-      {
-          $total = jirafeau_admin_clean ();
+  if (isset($_POST['action'])) {
+      if (strcmp($_POST['action'], 'clean') == 0) {
+          $total = jirafeau_admin_clean();

           echo '<div class="message">' . NL;
           echo '<p>';
           echo '<div class="message">' . NL;
           echo '<p>';

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

           echo '</p></div>';
           echo '</p></div>';

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

           echo '<div class="message">' . NL;
           echo '<p>';
           echo '<div class="message">' . NL;
           echo '<p>';

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

           echo '</p></div>';
           echo '</p></div>';

-      }
-      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']);
+      } elseif (strcmp($_POST['action'], 'size') == 0) {
+          $size = jirafeau_dir_size($cfg['var_root']);
+          $human_size = jirafeau_human_size($size);

           echo '<div class="message">' . NL;
           echo '<div class="message">' . NL;

-          echo '<p>' . t('Link deleted') . '</p></div>';
-      }
-      elseif (strcmp ($_POST['action'], 'delete_file') == 0)
-      {
-          $count = jirafeau_delete_file ($_POST['md5']);
+          echo '<p>' . t('SIZE_DATA') . ': ' . $human_size .'</p>';
+          echo '</div>';
+      } 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 '<div class="message">' . NL;
           echo '<div class="message">' . NL;

-          echo '<p>' . t('Deleted links') . ' : ' . $count . '</p></div>';
-      }
-      elseif (strcmp ($_POST['action'], 'download') == 0)
-      {
-          $l = jirafeau_get_link ($_POST['link']);
-          if (!count ($l))
+          echo '<p>' . t('LINK_DELETED') . '</p></div>';
+      } elseif (strcmp($_POST['action'], 'delete_file') == 0) {
+          $count = jirafeau_delete_file($_POST['hash']);
+          echo '<div class="message">' . NL;
+          echo '<p>' . t('DELETED_LINKS') . ' : ' . $count . '</p></div>';
+      } elseif (strcmp($_POST['action'], 'download') == 0) {
+          $l = jirafeau_get_link($_POST['link']);
+          if (!count($l)) {

               return;
               return;

-          $p = s2p ($l['md5']);
-          header ('Content-Length: ' . $l['file_size']);
-          header ('Content-Type: ' . $l['mime_type']);
-          header ('Content-Disposition: attachment; filename="' .
+          }
+          $p = s2p($l['hash']);
+          header('Content-Length: ' . $l['file_size']);
+          header('Content-Type: ' . $l['mime_type']);
+          header('Content-Disposition: attachment; filename="' .

                   $l['file_name'] . '"');
                   $l['file_name'] . '"');

-          if (file_exists(VAR_FILES . $p . $l['md5']))
-              readfile (VAR_FILES . $p . $l['md5']);
+          if (file_exists(VAR_FILES . $p . $l['hash'])) {
+              $r = fopen(VAR_FILES . $p . $l['hash'], 'r');
+              while (!feof($r)) {
+                  print fread($r, 1024);
+                  ob_flush();
+              }
+              fclose($r);
+          }

           exit;
       }
   }
 
           exit;
       }
   }
 

-  require (JIRAFEAU_ROOT.'lib/template/footer.php');
+    require(JIRAFEAU_ROOT.'lib/template/footer.php');

 }
 ?>
 }
 ?>