X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/c5571d92378b2dc0529d05b8f6ad3349b2d128cc..1bcb50020a8fe38adce4c89f366060598eda65b8:/index.php diff --git a/index.php b/index.php index 36ef29e..4371e9e 100644 --- a/index.php +++ b/index.php @@ -16,7 +16,7 @@ * 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 <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/'); @@ -24,7 +24,6 @@ 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 ()) @@ -34,6 +33,16 @@ if (has_error ()) 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 '<div class="error"><p>' . t('Access denied') . '</p></div>'; + require (JIRAFEAU_ROOT.'lib/template/footer.php'); + exit; +} + /* Ask password if upload password is set. */ if (jirafeau_has_upload_password ($cfg)) { @@ -95,49 +104,44 @@ if (jirafeau_has_upload_password ($cfg)) ?> <div id="upload_finished"> <p><?php echo t('File uploaded !') ?></p> - <br /> - <?php if ($cfg['download_page'] == true) { ?> <div id="upload_finished_download_page"> - <?php echo t('Download page') ?> + <p> + <?php echo t('Download page') ?> + <a id="upload_link_email" href=""><img id="upload_image_email"/></a> + </p> <p><a id="upload_link" href=""></a></p> - <br /> - </div> - <?php } ?> - - <div id="upload_password_page"> - <p><?php echo t('Download page') ?>:</p> - <p><a id="password_link" href=""></a></p> - <br /> </div> <?php if ($cfg['preview'] == true) { ?> <div id="upload_finished_preview"> <p><?php echo t('View link') ?>:</p> <p><a id="preview_link" href=""></a></p> - <br /> </div> <?php } ?> <div id="upload_direct_download"> <p><?php echo t('Direct download link') ?>:</p> <p><a id="direct_link" href=""></a></p> - <br /> </div> + <div> <p><?php echo t('Delete link') ?>:</p> <p><a id="delete_link" href=""></a></p> - <br /> - - <p id="validity"> - <?php echo t('This file is valid until the following date'); ?>: - <br /><strong><div id="date"></div></strong> - </p> + </div> + + <div id="validity"> + <p><?php echo t('This file is valid until the following date'); ?>:</p> + <p id="date"></p> + </div> </div> <div id="uploading"> <p> - <?php echo t ('Uploading ...'); ?><div id="uploaded_percentage"></div> + <?php echo t ('Uploading ...'); ?> + <div id="uploaded_percentage"></div> + <div id="uploaded_speed"></div> + <div id="uploaded_time"></div> </p> </div> @@ -147,7 +151,7 @@ if (jirafeau_has_upload_password ($cfg)) <div id="upload"> <fieldset> <legend> - <?php echo t('Select a file'); ?> + <?php echo t('Select a file'); ?> </legend> <p> <input type="file" id="file_select" size="30" @@ -167,27 +171,49 @@ if (jirafeau_has_upload_password ($cfg)) <tr> <td><label for="select_time"><?php echo t('Time limit') . ':'; ?></label></td> <td><select name="time" id="select_time"> - <?php if ($cfg['availabilities']['minute']) { ?> - <option value = "minute"><?php echo t('One minute'); ?></option> - <?php } ?> - <?php if ($cfg['availabilities']['hour']) { ?> - <option value = "hour"><?php echo t('One hour'); ?></option> - <?php } ?> - <?php if ($cfg['availabilities']['day']) { ?> - <option value = "day"><?php echo t('One day'); ?></option> - <?php } ?> - <?php if ($cfg['availabilities']['week']) { ?> - <option value = "week"><?php echo t('One week'); ?></option> - <?php } ?> - <?php if ($cfg['availabilities']['month']) { ?> - <option value = "month"><?php echo t('One month');?></option> - <?php } ?> - <?php if ($cfg['availabilities']['year']) { ?> - <option value = "year"><?php echo t('One year');?></option> - <?php } ?> - <?php if ($cfg['availabilities']['none']) { ?> - <option value="none"><?php echo t('None'); ?></option> - <?php } ?> + <?php + $expirationTimeOptions = array( + array( + 'value' => 'minute', + 'label' => 'One minute' + ), + array( + 'value' => 'hour', + 'label' => 'One hour' + ), + array( + 'value' => 'day', + 'label' => 'One day' + ), + array( + 'value' => 'week', + 'label' => 'One week' + ), + array( + 'value' => 'month', + 'label' => 'One month' + ), + array( + 'value' => 'quarter', + 'label' => 'One quarter' + ), + array( + 'value' => 'year', + 'label' => 'One year' + ), + array( + 'value' => 'none', + 'label' => 'None' + ) + ); + foreach ($expirationTimeOptions as $expirationTimeOption) { + $selected = ($expirationTimeOption['value'] === $cfg['availability_default'])? 'selected="selected"' : ''; + if(true === $cfg['availabilities'][$expirationTimeOption['value']]) { + echo '<option value="' . $expirationTimeOption['value'] . '" ' . + $selected . '>' . t($expirationTimeOption['label']) . '</option>'; + } + } + ?> </select></td> </tr> @@ -239,7 +265,7 @@ if (jirafeau_has_upload_password ($cfg)) </div> -<script lang="Javascript"> +<script type="text/javascript" lang="Javascript"> document.getElementById('error_pop').style.display = 'none'; document.getElementById('uploading').style.display = 'none'; document.getElementById('upload_finished').style.display = 'none';