X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/7496abe3c13d938d2da0e8c8a248bc704e9886da..7d1d6fe244514c94f44ce436c4ddbf3e94635b9e:/index.php?ds=sidebyside diff --git a/index.php b/index.php index d03ee81..c9f6cab 100644 --- a/index.php +++ b/index.php @@ -35,8 +35,11 @@ if (has_error()) { require(JIRAFEAU_ROOT . 'lib/template/header.php'); /* Check if user is allowed to upload. */ -// First check: Challenge by IP -if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) { +// First check: Challenge by IP NO PASSWORD +if (true === jirafeau_challenge_upload_ip($cfg['upload_ip_nopassword'], get_ip_address($cfg))) { +} +// Second check: Challenge by IP +elseif (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) { // Is an upload password required? if (jirafeau_has_upload_password($cfg)) { // Logout action @@ -101,7 +104,7 @@ else { <a id="upload_link_email" href=""><img id="upload_image_email"/></a> </p><p> <code id=upload_link_text></code> - <button id="upload_link_button">â</button> + <button id="upload_link_button">â</button> </p> </div> @@ -112,7 +115,7 @@ else { <a id="preview_link" href=""><?php echo t('VIEW_LINK') ?></a> </p><p> <code id=preview_link_text></code> - <button id="preview_link_button">â</button> + <button id="preview_link_button">â</button> </p> </div> <?php @@ -123,7 +126,7 @@ else { <a id="direct_link" href=""><?php echo t('DIRECT_DL') ?></a> </p><p> <code id=direct_link_text></code> - <button id="direct_link_button">â</button> + <button id="direct_link_button">â</button> </p> </div> @@ -132,7 +135,7 @@ else { <a id="delete_link" href=""><?php echo t('DELETE_LINK') ?></a> </p><p> <code id=delete_link_text></code> - <button id="delete_link_button">â</button> + <button id="delete_link_button">â</button> </p> </div> @@ -172,7 +175,7 @@ else { </tr> <tr> <td><label for="input_key"><?php echo t('PSW') . ':'; ?></label></td> - <td><input type="text" name="key" id="input_key" /></td> + <td><input type="password" name="key" id="input_key" /></td> </tr> <tr> <td><label for="select_time"><?php echo t('TIME_LIM') . ':'; ?></label></td> @@ -256,7 +259,8 @@ else { </div> </fieldset> <?php - if (jirafeau_has_upload_password($cfg)) { + if (jirafeau_has_upload_password($cfg) + && false === jirafeau_challenge_upload_ip($cfg['upload_ip_nopassword'], get_ip_address($cfg))) { ?> <form method="post" class="form logout"> <input type = "hidden" name = "action" value = "logout"/>