Merge remote-tracking branch 'origin/master'

[jirafeau.git] / admin.php

diff --git a/admin.php b/admin.php
index 62fd5eee86eacbc8b3c9a7eb9adc30b6a5e00387..d602dcda96f989745df8f3ba820570c73648ca2e 100644 (file)
--- a/admin.php
+++ b/admin.php
@@ -19,7 +19,6 @@
 
 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');
@@ -70,7 +69,8 @@ else
   /* Check classic admin password authentification. */
   if (isset ($_POST['admin_password']) && empty($cfg['admin_http_auth_user']))
   {
-      if ($cfg['admin_password'] === $_POST['admin_password'])
+      if ($cfg['admin_password'] === $_POST['admin_password'] ||
+          $cfg['admin_password'] === hash('sha256', $_POST['admin_password']))
           $_SESSION['admin_auth'] = true;
       else
       {