X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/fd3aaad433fe7e041f85752a727bb14b8865dc31..ecfc8a70b8f33915e53ef2fc9ab14e77daa96e72:/index.php
diff --git a/index.php b/index.php
index 9a7b9ec..832749b 100644
--- a/index.php
+++ b/index.php
@@ -18,6 +18,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
+session_start();
define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
require(JIRAFEAU_ROOT . 'lib/settings.php');
@@ -34,12 +35,16 @@ if (has_error()) {
require(JIRAFEAU_ROOT . 'lib/template/header.php');
/* Check if user is allowed to upload. */
-// First check: Challenge by IP
-if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) {
+// First check: Challenge by IP NO PASSWORD
+if (true === jirafeau_challenge_upload_ip_without_password($cfg, get_ip_address($cfg))) {
+ $_SESSION['upload_auth'] = true;
+ $_POST['upload_password'] = '';
+ $_SESSION['user_upload_password'] = $_POST['upload_password'];
+}
+// Second check: Challenge by IP
+elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
// Is an upload password required?
if (jirafeau_has_upload_password($cfg)) {
- session_start();
-
// Logout action
if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
session_unset();
@@ -53,7 +58,7 @@ if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg
$_SESSION['user_upload_password'] = $_POST['upload_password'];
} else {
$_SESSION['admin_auth'] = false;
- jirafeau_fatal_error(t('Wrong password.'), $cfg);
+ jirafeau_fatal_error(t('BAD_PSW'), $cfg);
}
}
@@ -65,18 +70,18 @@ if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg