X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/ef7711fcbea94ca12e41a4897f5cc4ab284b4b11..40b274fbb2209d95cdb84e7b08c40e1c5c4092d0:/index.php diff --git a/index.php b/index.php index 5a2c926..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,8 @@ 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))) { @@ -106,7 +107,7 @@ if (jirafeau_has_upload_password ($cfg)) <div id="upload_finished_download_page"> <p> - <?php echo t('Download page') ?> + <?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> @@ -150,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" @@ -170,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']['none']) { ?> - <option value="none"><?php echo t('None'); ?></option> - <?php } ?> - <?php if ($cfg['availabilities']['year']) { ?> - <option value = "year"><?php echo t('One year');?></option> - <?php } ?> - <?php if ($cfg['availabilities']['month']) { ?> - <option value = "month"><?php echo t('One month');?></option> - <?php } ?> - <?php if ($cfg['availabilities']['week']) { ?> - <option value = "week"><?php echo t('One week'); ?></option> - <?php } ?> - <?php if ($cfg['availabilities']['day']) { ?> - <option value = "day"><?php echo t('One day'); ?></option> - <?php } ?> - <?php if ($cfg['availabilities']['hour']) { ?> - <option value = "hour"><?php echo t('One hour'); ?></option> - <?php } ?> - <?php if ($cfg['availabilities']['minute']) { ?> - <option value = "minute"><?php echo t('One minute'); ?></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> @@ -242,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';