X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/631048856d53591fed1253a61f63ab07c3772443..de715daced3e21c6bb12bb1fc840985380dfc83a:/index.php?ds=inline diff --git a/index.php b/index.php old mode 100755 new mode 100644 index d267140..8cd556d --- a/index.php +++ b/index.php @@ -16,176 +16,275 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ -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'); -require (JIRAFEAU_ROOT . 'lib/template/header.php'); - -check_errors (); -if (has_error ()) -{ - show_errors (); - require (JIRAFEAU_ROOT . 'lib/template/footer.php'); +session_start(); +define('JIRAFEAU_ROOT', dirname(__FILE__) . '/'); + +require(JIRAFEAU_ROOT . 'lib/settings.php'); +require(JIRAFEAU_ROOT . 'lib/functions.php'); +require(JIRAFEAU_ROOT . 'lib/lang.php'); + +check_errors($cfg); +if (has_error()) { + show_errors(); + require(JIRAFEAU_ROOT . 'lib/template/footer.php'); exit; } -/* Ask password if upload password is set. */ -if (strlen ($cfg['upload_password']) > 0) -{ - session_start(); - - /* Unlog if asked. */ - if (isset ($_POST['action']) && (strcmp ($_POST['action'], 'logout') == 0)) - $_SESSION['upload_auth'] = false; - - /* Auth. */ - if (isset ($_POST['upload_password'])) - { - if (strcmp ($cfg['upload_password'], $_POST['upload_password']) == 0) - $_SESSION['upload_auth'] = true; - else - { - $_SESSION['admin_auth'] = false; - echo '

' . t('Wrong password.') . '

'; - require (JIRAFEAU_ROOT.'lib/template/footer.php'); - exit; +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))) { + // Is an upload password required? + if (jirafeau_has_upload_password($cfg)) { + // Logout action + if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { + session_unset(); } - } - /* Show auth page. */ - if (!isset ($_SESSION['upload_auth']) || $_SESSION['upload_auth'] != true) - { - ?> -
-
- - - - - - - - - -
- -
-
-
- + +
+

+ +
+

+ + +

+ + +

+
+ + +

- : -
- -
+ +

+ +

+
+ +

- : -
- + +

+ +

- -

- : -

+
+ +
+

+ +

+ +

+
+ +
+

:

+

+

-

+ +
+
+

+
+
+
- +

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

- +
- + - + - + -

+ + 0) { + echo '

' . t('FILE_LIM'); + echo " " . $cfg['maximal_upload_size'] . " MB

"; + } + ?> + +

+ + + "/> - + + +

::
0) - { - ?> -
+ if (jirafeau_has_upload_password($cfg)) { + ?> + - +
- - +