X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/60530d95ccf26f833db80b08c2a0a456f69e3aad..d8529b7477be1783bf47d5ec9c1bfe98b0bf4f07:/index.php
diff --git a/index.php b/index.php
index 0fa2ca1..832749b 100644
--- a/index.php
+++ b/index.php
@@ -18,126 +18,139 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
+session_start();
+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');
+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');
+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;
+// First check: Challenge by IP NO PASSWORD
+if (true === jirafeau_challenge_upload_ip_without_password($cfg, get_ip_address($cfg))) {
+ $_SESSION['upload_auth'] = true;
+ $_POST['upload_password'] = '';
+ $_SESSION['user_upload_password'] = $_POST['upload_password'];
}
+// Second check: Challenge by IP
+elseif (true === jirafeau_challenge_upload_ip($cfg, 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();
+ }
-/* 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'];
+ // 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;
+ jirafeau_fatal_error(t('BAD_PSW'), $cfg);
+ }
}
- else
- {
- $_SESSION['admin_auth'] = false;
- echo '
' . t('Wrong password.') . '
';
- require (JIRAFEAU_ROOT.'lib/template/footer.php');
+
+ // Show login form if user session is not authorized yet
+ if (true === empty($_SESSION['upload_auth'])) {
+ ?>
+
+
-
-
-
+
-
-
+
+
+
+
+
-
-
+
-
:
-
+
+
+
+
+
+
-
+
-
:
-
+
+
+
+
+
+
-
-
:
-
+
+
+
+
+
+
+
-
-
:
+
+
:
-
+
@@ -150,99 +163,132 @@ if (jirafeau_has_upload_password ($cfg))