X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/8d6002fa6a6c13228b00ed54b07359aa83b90da3..1a7180447d14c6666e9aeac68ba8ab12374cb2a5:/admin.php?ds=sidebyside

diff --git a/admin.php b/admin.php
index bee8e1f..6560f10 100644
--- a/admin.php
+++ b/admin.php
@@ -46,79 +46,66 @@ if (php_sapi_name() == "cli") {
   if (empty($cfg['admin_password']) && empty($cfg['admin_http_auth_user'])) {
       require(JIRAFEAU_ROOT . 'lib/template/header.php');
       echo '<div class="error"><p>'.
-           t('Sorry, the admin interface is not enabled.') .
+           t('NO_ADMIN') .
            '</p></div>';
       require(JIRAFEAU_ROOT.'lib/template/footer.php');
       exit;
   }
 
   /* Unlog if asked. */
-  if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
-      $_SESSION['admin_auth'] = false;
+  if (jirafeau_admin_session_logged() && isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
+      jirafeau_admin_session_end();
   }
 
-  /* 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>';
+  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'] === $_POST['admin_password'] ||
+              $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;
       }
   }
-  /* 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 method="post" class="form login">
-      <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;
-      }
-  }
-
-  /* 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');
-      exit;
-  }
 
   /* Operations may take a long time.
    * Be sure PHP's safe mode is off.
@@ -129,97 +116,103 @@ if (php_sapi_name() == "cli") {
 
   /* 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
+      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">
-          <fieldset><legend><?php echo t('Actions'); ?></legend>
+          <fieldset><legend><?php echo t('ACTIONS'); ?></legend>
           <table>
           <form method="post">
           <tr>
               <input type = "hidden" name = "action" value = "clean"/>
+              <?php echo jirafeau_admin_csrf_field() ?>
               <td class = "info">
-                  <?php echo t('Clean expired files'); ?>
+                  <?php echo t('CLEAN_EXPIRED'); ?>
               </td>
               <td></td>
               <td>
-                  <input type = "submit" value = "<?php echo t('Clean'); ?>" />
+                  <input type = "submit" value = "<?php echo t('CLEAN'); ?>" />
               </td>
           </tr>
           </form>
           <form method="post">
           <tr>
               <input type = "hidden" name = "action" value = "clean_async"/>
+              <?php echo jirafeau_admin_csrf_field() ?>
               <td class = "info">
-                  <?php echo t('Clean old unfinished transfers'); ?>
+                  <?php echo t('CLEAN_INCOMPLETE'); ?>
               </td>
               <td></td>
               <td>
-                  <input type = "submit" value = "<?php echo t('Clean'); ?>" />
+                  <input type = "submit" value = "<?php echo t('CLEAN'); ?>" />
               </td>
           </tr>
           </form>
           <form method="post">
           <tr>
               <input type = "hidden" name = "action" value = "list"/>
+              <?php echo jirafeau_admin_csrf_field() ?>
               <td class = "info">
-                  <?php echo t('List all files'); ?>
+                  <?php echo t('LS_FILES'); ?>
               </td>
               <td></td>
               <td>
-                  <input type = "submit" value = "<?php echo t('List'); ?>" />
+                  <input type = "submit" value = "<?php echo t('LIST'); ?>" />
               </td>
           </tr>
           </form>
           <form method="post">
           <tr>
               <input type = "hidden" name = "action" value = "search_by_name"/>
+              <?php echo jirafeau_admin_csrf_field() ?>
               <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>
-                  <input type = "submit" value = "<?php echo t('Search'); ?>" />
+                  <input type = "submit" value = "<?php echo t('SEARCH'); ?>" />
               </td>
           </tr>
           </form>
           <form method="post">
           <tr>
               <input type = "hidden" name = "action" value = "search_by_file_hash"/>
+              <?php echo jirafeau_admin_csrf_field() ?>
               <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>
-                  <input type = "submit" value = "<?php echo t('Search'); ?>" />
+                  <input type = "submit" value = "<?php echo t('SEARCH'); ?>" />
               </td>
           </tr>
           </form>
           <form method="post">
           <tr>
               <input type = "hidden" name = "action" value = "search_link"/>
+              <?php echo jirafeau_admin_csrf_field() ?>
               <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>
-                  <input type = "submit" value = "<?php echo t('Search'); ?>" />
+                  <input type = "submit" value = "<?php echo t('SEARCH'); ?>" />
               </td>
           </tr>
           </form>
           </table>
           <form method="post">
               <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 */
@@ -228,13 +221,13 @@ if (php_sapi_name() == "cli") {
           $total = jirafeau_admin_clean();
           echo '<div class="message">' . NL;
           echo '<p>';
-          echo t('Number of cleaned files') . ' : ' . $total;
+          echo t('CLEANED_FILES_CNT') . ' : ' . $total;
           echo '</p></div>';
       } elseif (strcmp($_POST['action'], 'clean_async') == 0) {
           $total = jirafeau_admin_clean_async();
           echo '<div class="message">' . NL;
           echo '<p>';
-          echo t('Number of cleaned files') . ' : ' . $total;
+          echo t('CLEANED_FILES_CNT') . ' : ' . $total;
           echo '</p></div>';
       } elseif (strcmp($_POST['action'], 'list') == 0) {
           jirafeau_admin_list("", "", "");
@@ -247,11 +240,11 @@ if (php_sapi_name() == "cli") {
       } elseif (strcmp($_POST['action'], 'delete_link') == 0) {
           jirafeau_delete_link($_POST['link']);
           echo '<div class="message">' . NL;
-          echo '<p>' . t('Link deleted') . '</p></div>';
+          echo '<p>' . t('LINK_DELETED') . '</p></div>';
       } elseif (strcmp($_POST['action'], 'delete_file') == 0) {
           $count = jirafeau_delete_file($_POST['md5']);
           echo '<div class="message">' . NL;
-          echo '<p>' . t('Deleted links') . ' : ' . $count . '</p></div>';
+          echo '<p>' . t('DELETED_LINKS') . ' : ' . $count . '</p></div>';
       } elseif (strcmp($_POST['action'], 'download') == 0) {
           $l = jirafeau_get_link($_POST['link']);
           if (!count($l)) {