X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/364d1c4437c45eda91dd0b8c5e92a098578f8b39..75f4119aba4c074acc8f83b82eb3be94ace4aeca:/index.php?ds=sidebyside

diff --git a/index.php b/index.php
index 4802e33..2002ad7 100644
--- a/index.php
+++ b/index.php
@@ -16,15 +16,13 @@
  *  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__) . '/');
 
-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,8 +32,10 @@ if (has_error ())
     exit;
 }
 
+require (JIRAFEAU_ROOT . 'lib/template/header.php');
+
 /* Check if user is allowed to upload. */
-if (!jirafeau_challenge_upload_ip ($cfg, $_SERVER['REMOTE_ADDR']))
+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');
@@ -106,7 +106,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 +150,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 +170,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 +264,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';