X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/d8192d6d361c2d707bac679facce23c7167cb93b..96707e02b8b24054e0827eaf169cc88504a1e78c:/index.php?ds=sidebyside diff --git a/index.php b/index.php old mode 100755 new mode 100644 index 127d9e6..b8feabd --- a/index.php +++ b/index.php @@ -16,57 +16,61 @@ * 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 ($cfg); -if (has_error ()) -{ - show_errors (); - require (JIRAFEAU_ROOT . 'lib/template/footer.php'); +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; +} + +require(JIRAFEAU_ROOT . 'lib/template/header.php'); + +/* Check if user is allowed to upload. */ +if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) { + echo '

' . t('Access denied') . '

'; + require(JIRAFEAU_ROOT.'lib/template/footer.php'); exit; } /* Ask password if upload password is set. */ -if (strlen ($cfg['upload_password']) > 0) -{ +if (jirafeau_has_upload_password($cfg)) { session_start(); /* Unlog if asked. */ - if (isset ($_POST['action']) && (strcmp ($_POST['action'], 'logout') == 0)) - $_SESSION['upload_auth'] = false; + if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { + session_unset(); + } /* Auth. */ - if (isset ($_POST['upload_password'])) - { - if (strcmp ($cfg['upload_password'], $_POST['upload_password']) == 0) + if (isset($_POST['upload_password'])) { + if (jirafeau_challenge_upload_password($cfg, $_POST['upload_password'])) { $_SESSION['upload_auth'] = true; - else - { + $_SESSION['user_upload_password'] = $_POST['upload_password']; + } else { $_SESSION['admin_auth'] = false; echo '

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

'; - require (JIRAFEAU_ROOT.'lib/template/footer.php'); + require(JIRAFEAU_ROOT.'lib/template/footer.php'); exit; } } /* Show auth page. */ - if (!isset ($_SESSION['upload_auth']) || $_SESSION['upload_auth'] != true) - { - ?> + if (!isset($_SESSION['upload_auth']) || $_SESSION['upload_auth'] != true) { + ?>
+ 0)
-

- : -
- -
-

+

+

- : -
- -

- -

- : -

+ +

+

+
+ + +
+

:

+

+
+ + +
+

:

+

+
+ +
+

:

+

+
+ +
+

:

+

+

-

+ +
+
+

+
+
+
- +

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

- +
@@ -142,50 +165,107 @@ if (strlen ($cfg['upload_password']) > 0) + + 0) { + echo '

' . t('File size is limited to'); + echo " " . $cfg['maximal_upload_size'] . " MB

"; + } + ?> +

+ + + + + "/> + } + ?>

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