X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/05833d4c3163695568bebb2b905eb9f180107e15..03240df47e1ebcfd0619e9ab845e680a2be59447:/index.php?ds=sidebyside diff --git a/index.php b/index.php index e06086f..6d1dc10 100644 --- a/index.php +++ b/index.php @@ -16,120 +16,120 @@ * 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; } -/* Ask password if upload password is set. */ -if (jirafeau_has_upload_password ($cfg)) -{ - session_start(); - - /* Unlog if asked. */ - if (isset ($_POST['action']) && (strcmp ($_POST['action'], 'logout') == 0)) - session_unset (); - - /* Auth. */ - if (isset ($_POST['upload_password'])) - { - if (jirafeau_challenge_upload_password ($cfg, $_POST['upload_password'])) - { - $_SESSION['upload_auth'] = true; - $_SESSION['user_upload_password'] = $_POST['upload_password']; +require(JIRAFEAU_ROOT . 'lib/template/header.php'); + +/* Check if user is allowed to upload. */ +if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) { + + /* Ask password if upload password is set. */ + if (jirafeau_has_upload_password($cfg)) { + session_start(); + + /* Unlog if asked. */ + if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { + session_unset(); } - else - { - $_SESSION['admin_auth'] = false; - echo '

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

'; - require (JIRAFEAU_ROOT.'lib/template/footer.php'); - exit; + + /* Auth. */ + if (isset($_POST['upload_password'])) { + if (jirafeau_challenge_upload_password($cfg, $_POST['upload_password'])) { + $_SESSION['upload_auth'] = true; + $_SESSION['user_upload_password'] = $_POST['upload_password']; + } else { + $_SESSION['admin_auth'] = false; + echo '

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

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

-
- +

+ + +

-
- +

:

-
- +

:

-
+

:

-
- -

- : -

-

+
+ +
+

:

+

+

- +

@@ -142,11 +142,11 @@ if (jirafeau_has_upload_password ($cfg))
- +

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

@@ -162,79 +162,99 @@ if (jirafeau_has_upload_password ($cfg)) 0) - { - echo '

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

"; + if ($cfg['maximal_upload_size'] > 0) { + echo '

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

"; } ?>

+ if (jirafeau_has_upload_password($cfg) && $_SESSION['upload_auth']) { + ?> + + } else { + ?>

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