X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/71e621e81a096fce132f70ee3918279cc71dd23f..48f14e7b05a452683cf059b767ea6b071a300edd:/index.php
diff --git a/index.php b/index.php
index 7c24e3b..ec7aac4 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,51 +35,47 @@ if (has_error()) {
require(JIRAFEAU_ROOT . 'lib/template/header.php');
/* Check if user is allowed to upload. */
-if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg)) ||
- count($cfg['upload_ip']) == 0) {
-
- /* Ask password if upload password is set. */
+// 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)) {
- session_start();
-
- /* Unlog if asked. */
+ // Logout action
if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
session_unset();
}
- /* Auth. */
+ // Challenge by password
+ // â¦save successful logins in session
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;
+ jirafeau_fatal_error(t('BAD_PSW'), $cfg);
}
}
- /* Show auth page. */
- if (!isset($_SESSION['upload_auth']) || $_SESSION['upload_auth'] != true) {
+ // Show login form if user session is not authorized yet
+ if (true === empty($_SESSION['upload_auth'])) {
?>
-