X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/b402561271f0de4f4c12fc8f8c7d51d12e0a3e5c..96f7e6adb9a69aa1d39a17d7332b2dcc625bd543:/index.php diff --git a/index.php b/index.php index 09b37e4..c9f6cab 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,13 @@ 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($cfg['upload_ip_nopassword'], get_ip_address($cfg))) { +} +// Second check: Challenge by IP +elseif (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], 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,30 +55,30 @@ 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); } } // Show login form if user session is not authorized yet if (true === empty($_SESSION['upload_auth'])) { ?> -
+
+ -
+
@@ -89,49 +91,63 @@ if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg } } else { - jirafeau_fatal_error(t('Access denied'), $cfg); + jirafeau_fatal_error(t('ACCESS_KO'), $cfg); } ?>
-

+

- - + + +

+ +

-

-

:

-

+

+ +

+ + +

-

:

-

+

+ +

+ + +

-
-

:

-

+
+

+ +

+ + +

-
-

:

+
+

:

- +

@@ -144,59 +160,59 @@ else {
- +

')"/> + onchange="control_selected_file_size(, '')"/>

- + - - + + - +
::

- + - +