X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/bfbbf72959faa385b97d250484be1d25e4fd22aa..6d2f72029699314db90926f57861154ae76d3852:/index.php?ds=sidebyside diff --git a/index.php b/index.php index f7aeb04..f60c37d 100644 --- a/index.php +++ b/index.php @@ -40,13 +40,60 @@ if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) { } /* Check if user is allowed to upload. */ -// First check: Is user already logged -if (jirafeau_user_session_logged()) {} -// Second check: Challenge by IP NO PASSWORD +// check if user already logged +if (jirafeau_user_session_logged()) { +} +// check of ldap authentication +elseif (jirafeau_has_ldap_auth($cfg)) { + if (isset($_POST['ldap_user']) and isset($_POST['ldap_password'])) { + $result = jirafeau_challenge_ldap_auth($cfg, $_POST['ldap_user'], $_POST['ldap_password']); + if (true === $result) { + jirafeau_user_session_start(); + } else { + jirafeau_session_end(); + jirafeau_non_fatal_error(t('BAD_PSW')); + } + } + // Show login form if user session is not authorized yet + if (!jirafeau_user_session_logged()) { + ?> +
+
+ + + + + + + + + + + + +
+
+ +
+
+ +
+
+
+ + ?>

@@ -118,7 +165,7 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {

+ } ?>

@@ -164,22 +211,22 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {

0) { - echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB."; - } - ?>')"/> + if ($cfg['maximal_upload_size'] >= 1024) { + echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . number_format($cfg['maximal_upload_size']/1024, 2) . " GB."; + } elseif ($cfg['maximal_upload_size'] > 0) { + echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB."; + } +?>')"/>

'; - echo ''; - } - ?> + if ($cfg['one_time_download']) { + echo ''; + echo ''; + } +?> @@ -188,66 +235,66 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) { = 1024) { - echo '

' . t('FILE_LIM'); - echo " " . number_format($cfg['maximal_upload_size'] / 1024, 2) . " GB.

"; - } elseif ($cfg['maximal_upload_size'] > 0) { - echo '

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

"; - } else { - echo '

'; - } - ?> +if ($cfg['maximal_upload_size'] >= 1024) { + echo '

' . t('FILE_LIM'); + echo " " . number_format($cfg['maximal_upload_size'] / 1024, 2) . " GB.

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

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

"; +} else { + echo '

'; +} +?>

@@ -263,14 +310,14 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) { + ?>
+?> @@ -283,11 +330,11 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) { document.getElementById('send').style.display = 'none'; if (!check_html5_file_api ()) document.getElementById('max_file_size').innerHTML = ' 0) { - echo t('NO_BROWSER_SUPPORT') . $max_size; - } - ?>'; + $max_size = jirafeau_get_max_upload_size(); +if ($max_size > 0) { + echo t('NO_BROWSER_SUPPORT') . $max_size; +} +?>'; addCopyListener('upload_link_button', 'upload_link'); addCopyListener('preview_link_button', 'preview_link');

' . t('ONE_TIME_DL') . ':
' . t('ONE_TIME_DL') . ':