[FEATURE] add LDAP authentication support for uploaders

[jirafeau_mojo42.git] / admin.php

diff --git a/admin.php b/admin.php
index 7974ce6f5cb145c55e8b3fb3b516564c546be071..68e0f3bbe4a26bb282b82c5c584b0fd998120161 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -55,18 +55,18 @@ if (php_sapi_name() == "cli") {
         exit;
     }
 
-    /* Unlog if asked. */
+    /* Logout if requested. */
     if (jirafeau_admin_session_logged() && isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
-        jirafeau_admin_session_end();
+        jirafeau_session_end();
     }
 
     if (!jirafeau_admin_session_logged()) {
-        /* Test HTTP authentification. */
+        /* Test HTTP authentication. */
         if (!empty($cfg['admin_http_auth_user']) &&
           $cfg['admin_http_auth_user'] == $_SERVER['PHP_AUTH_USER']) {
             jirafeau_admin_session_start();
         }
-        /* Test web password authentification. */
+        /* Test web password authentication. */
         elseif (!empty($cfg['admin_password']) && isset($_POST['admin_password'])) {
             if ($cfg['admin_password'] === hash('sha256', $_POST['admin_password'])) {
                 jirafeau_admin_session_start();
@@ -91,7 +91,7 @@ if (php_sapi_name() == "cli") {
               <tr>
                   <td class = "field"><input type = "password"
                   name = "admin_password" id = "admin_password"
-                  size = "40" />
+                  size = "40" autocomplete = "current-password" />
                   </td>
               </tr>
               <tr class = "nav">
@@ -117,9 +117,9 @@ 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
-          ?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php
+        ?><h2>(version <?php echo JIRAFEAU_VERSION ?>)</h2><?php
 
-          ?><div id = "admin">
+        ?><div id = "admin">
           <fieldset><legend><?php echo t('ACTIONS'); ?></legend>
           <table>
           <form method="post">