modularization of functions

[jirafeau_project.git] / index.php

diff --git a/index.php b/index.php
index 39eded554b55cff0b65e5c55e0584e1683e35d2f..fd8586da143790b67efba663db37c34784c29153 100644 (file)
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /*
  *  Jirafeau, your web file repository
  *  Copyright (C) 2013
 /*
  *  Jirafeau, your web file repository
  *  Copyright (C) 2013

- *  Jerome Jutteau <j.jutteau@gmail.com>
+ *  Jerome Jutteau <jerome@jutteau.fr>

  *  Jimmy Beauvois <jimmy.beauvois@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  Jimmy Beauvois <jimmy.beauvois@gmail.com>
  *
  *  This program is free software: you can redistribute it and/or modify


@@ -18,66 +18,74 @@
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */

+session_start();

 define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
 
 require(JIRAFEAU_ROOT . 'lib/settings.php');
 require(JIRAFEAU_ROOT . 'lib/functions.php');
 require(JIRAFEAU_ROOT . 'lib/lang.php');
 
 define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
 
 require(JIRAFEAU_ROOT . 'lib/settings.php');
 require(JIRAFEAU_ROOT . 'lib/functions.php');
 require(JIRAFEAU_ROOT . 'lib/lang.php');
 

+if ($cfg['download_password_requirement'] === "generated"){
+    $download_pass = jirafeau_gen_download_pass($cfg['download_password_gen_len'], $cfg['download_password_gen_chars']);
+}
+

 check_errors($cfg);
 if (has_error()) {
 check_errors($cfg);
 if (has_error()) {

+    require(JIRAFEAU_ROOT . 'lib/template/header.php');

     show_errors();
     require(JIRAFEAU_ROOT . 'lib/template/footer.php');
     exit;
 }
     show_errors();
     require(JIRAFEAU_ROOT . 'lib/template/footer.php');
     exit;
 }

-

 require(JIRAFEAU_ROOT . 'lib/template/header.php');
 
 require(JIRAFEAU_ROOT . 'lib/template/header.php');
 

-/* Check if user is allowed to upload. */
-if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
+// Logout action
+if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
+    jirafeau_session_end();
+}

 
 

-    /* Ask password if upload password is set. */
+/* 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
+elseif (true === jirafeau_challenge_upload_ip_without_password($cfg, get_ip_address($cfg))) {
+    jirafeau_user_session_start();
+    $_SESSION['user_auth_type'] = JIRAFEAU_USER_AUTH_BY_IP_NO_PASSWORD;
+}
+// Third check: Challenge by IP
+elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
+    // Is an upload password required?

     if (jirafeau_has_upload_password($cfg)) {
     if (jirafeau_has_upload_password($cfg)) {

-        session_start();
-
-        /* Unlog if asked. */
-        if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
-            session_unset();
-        }
-
-        /* Auth. */
+        // Challenge by password

         if (isset($_POST['upload_password'])) {
             if (jirafeau_challenge_upload_password($cfg, $_POST['upload_password'])) {
         if (isset($_POST['upload_password'])) {
             if (jirafeau_challenge_upload_password($cfg, $_POST['upload_password'])) {

-                $_SESSION['upload_auth'] = true;
-                $_SESSION['user_upload_password'] = $_POST['upload_password'];
+                jirafeau_user_session_start();
+                $_SESSION['user_auth_type'] = JIRAFEAU_USER_AUTH_BY_PASSWORD;

             } else {
             } else {

-                $_SESSION['admin_auth'] = false;
-                echo '<div class="error"><p>' . t('Wrong password.') . '</p></div>';
-                require(JIRAFEAU_ROOT.'lib/template/footer.php');
-                exit;
+                jirafeau_session_end();
+                jirafeau_fatal_error(t('BAD_PSW'), $cfg);

             }
         }
 
             }
         }
 

-        /* Show auth page. */
-        if (!isset($_SESSION['upload_auth']) || $_SESSION['upload_auth'] != true) {
+        // Show login form if user session is not authorized yet
+        if (!jirafeau_user_session_logged()) {

             ?>
             ?>

-            <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+            <form method="post" class="form login">

             <fieldset>
                 <table>
                 <tr>
                     <td class = "label"><label for = "enter_password">
             <fieldset>
                 <table>
                 <tr>
                     <td class = "label"><label for = "enter_password">

-                    <?php echo t('Upload password') . ':'; ?></label>
+                    <?php echo t('UP_PSW') . ':'; ?></label>

                     </td>
                     </td>

+                </tr><tr>

                     <td class = "field"><input type = "password"
                     name = "upload_password" id = "upload_password"
                     <td class = "field"><input type = "password"
                     name = "upload_password" id = "upload_password"

-                    size = "40" />
+                    size = "40" autocomplete = "current-password" />

                     </td>
                 </tr>
                 <tr class = "nav">
                     </td>
                 </tr>
                 <tr class = "nav">

-                    <td></td>

                     <td class = "nav next">
                     <td class = "nav next">

-                    <input type = "submit" name = "key" value =
-                    "<?php echo t('Login'); ?>" />
+                    <input type = "submit" name = "key" value = "<?php echo t('LOGIN'); ?>" />

                     </td>
                 </tr>
                 </table>
                     </td>
                 </tr>
                 </table>


@@ -88,48 +96,17 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
             exit;
         }
     }
             exit;
         }
     }

+} else {
+    jirafeau_fatal_error(t('ACCESS_KO'), $cfg);

 }
 }

-    
-?>
-<div id="upload_finished">
-    <p><?php echo t('File uploaded !') ?></p>

 
 

-    <div id="upload_finished_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>
-    </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>
-    </div>
-    <?php 
-} ?>
-
-    <div id="upload_direct_download">
-    <p><?php echo t('Direct download link') ?>:</p>
-    <p><a id="direct_link" href=""></a></p>
-    </div>
+?>

 
 

-    <div>
-    <p><?php echo t('Delete link') ?>:</p>
-    <p><a id="delete_link" href=""></a></p>
-    </div>
-
-    <div id="validity">
-    <p><?php echo t('This file is valid until the following date'); ?>:</p>
-    <p id="date"></p>
-    </div>
-</div>
+<?php jirafeau_create_upload_finished_box($cfg['preview']); ?>

 
 <div id="uploading">
     <p>
 
 <div id="uploading">
     <p>

-    <?php echo t('Uploading ...'); ?>
+    <?php echo t('UP'); ?>

     <div id="uploaded_percentage"></div>
     <div id="uploaded_speed"></div>
     <div id="uploaded_time"></div>
     <div id="uploaded_percentage"></div>
     <div id="uploaded_speed"></div>
     <div id="uploaded_time"></div>


@@ -140,121 +117,93 @@ if (!jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
 </div>
 
 <div id="upload">
 </div>
 
 <div id="upload">

-<fieldset>
+<form id="upload-form" onsubmit="
+            event.preventDefault();
+            document.getElementById('upload').style.display = 'none';
+            document.getElementById('uploading').style.display = '';
+            upload (<?php echo jirafeau_get_max_upload_chunk_size_bytes($cfg['max_upload_chunk_size_bytes']); ?>);
+            "><fieldset>

     <legend>
     <legend>

-    <?php echo t('Select a file'); ?>
+    <?php echo t('SEL_FILE'); ?>

     </legend>
     <p>
     </legend>
     <p>

-    <input type="file" id="file_select" size="30"
-    onchange="control_selected_file_size(<?php echo $cfg['maximal_upload_size'] ?>, '<?php echo t('File is too big') . ', ' . t('File size is limited to') . " " . $cfg['maximal_upload_size'] . " MB"; ?>')"/>
+        <input type="file" id="file_select" size="30"
+    onchange="control_selected_file_size(<?php echo $cfg['maximal_upload_size'] ?>, '<?php
+            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.";
+            }
+?>')"/>

     </p>
 
     <div id="options">
         <table id="option_table">
     </p>
 
     <div id="options">
         <table id="option_table">

-        <tr>
-        <td><?php echo t('One time download'); ?>:</td>
-        <td><input type="checkbox" id="one_time_download" /></td>
-        </tr>
-        <tr>
-        <td><label for="input_key"><?php echo t('Password') . ':'; ?></label></td>
-        <td><input type="text" name="key" id="input_key" /></td>
-        </tr>
-        <tr>
-        <td><label for="select_time"><?php echo t('Time limit') . ':'; ?></label></td>
-        <td><select name="time" id="select_time">

         <?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>';
+        if ($cfg['one_time_download']) {
+            echo '<tr><td>' . t('ONE_TIME_DL') . ':</td>';
+            echo '<td><input type="checkbox" id="one_time_download"';
+            
+            if ($cfg['one_time_download_preselected']) {
+                echo ' checked';

             }
             }

+
+            echo ' /></td></tr>';

         }
         }

-        ?>
-        </select></td>
+        if ($cfg['download_password_requirement'] === 'generated'){
+            echo '<input type="hidden" name="key" id="input_key" value="' . $download_pass .'"/>';
+        }else{
+            echo '<tr><td><label for="input_key">' . t('PSW') . ':' . '</label></td>';
+            echo '<td><input type="password" name="key" id="input_key" autocomplete = "new-password"';
+            if ($cfg['download_password_policy'] === 'regex'){
+                echo ' pattern="' . substr($cfg['download_password_policy_regex'], 1, strlen($cfg['download_password_policy_regex']) - 2) . '"'; //remove php delimiters
+            }
+            if ($cfg['download_password_requirement'] === 'required'){
+                echo ' required';
+            }
+            echo '/></td></tr>';
+        }?>
+        <tr>
+        <td><label for="select_time"><?php echo t('TIME_LIM') . ':'; ?></label></td>
+        <td>
+            <?php jirafeau_create_selection_array($cfg); ?> 
+        </td>

         </tr>
 
         <?php
         </tr>
 
         <?php

-        if ($cfg['maximal_upload_size'] > 0) {
-            echo '<p class="config">' . t('File size is limited to');
-            echo " " . $cfg['maximal_upload_size'] . " MB</p>";
-        }
-        ?>
+if ($cfg['maximal_upload_size'] >= 1024) {
+    echo '<p class="config">' . t('FILE_LIM');
+    echo " " . number_format($cfg['maximal_upload_size'] / 1024, 2) . " GB.</p>";
+} elseif ($cfg['maximal_upload_size'] > 0) {
+    echo '<p class="config">' . t('FILE_LIM');
+    echo " " . $cfg['maximal_upload_size'] . " MB.</p>";
+} else {
+    echo '<p class="config"></p>';
+}
+?>

 
 

-               <p id="max_file_size" class="config"></p>
+        <p id="max_file_size" class="config"></p>

     <p>
     <p>

-    <?php
-    if (jirafeau_has_upload_password($cfg) && $_SESSION['upload_auth']) {
-        ?>
-    <input type="hidden" id="upload_password" name="upload_password" value="<?php echo $_SESSION['user_upload_password'] ?>"/>
-    <?php
-
-    } else {
-        ?>
-    <input type="hidden" id="upload_password" name="upload_password" value=""/>
-    <?php
-
-    }
-    ?>
-    <input type="submit" id="send" value="<?php echo t('Send'); ?>"
-    onclick="
-        document.getElementById('upload').style.display = 'none';
-        document.getElementById('uploading').style.display = '';
-        upload ('<?php echo $cfg['web_root']; ?>', <?php echo jirafeau_get_max_upload_size_bytes(); ?>);
-    "/>
+    <input type="submit" id="send" value="<?php echo t('SEND'); ?>"/>

     </p>
         </table>
     </p>
         </table>

-    </div> </fieldset>
+    </div> </fieldset></form>

 
     <?php
 
     <?php

-    if (jirafeau_has_upload_password($cfg)) {
+    if (jirafeau_user_session_logged() && $_SESSION['user_auth_type'] == JIRAFEAU_USER_AUTH_BY_PASSWORD) {

         ?>
         ?>

-    <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+    <form method="post" class="form logout">

         <input type = "hidden" name = "action" value = "logout"/>
         <input type = "hidden" name = "action" value = "logout"/>

-        <input type = "submit" value = "<?php echo t('Logout'); ?>" />
+        <input type = "submit" value = "<?php echo t('LOGOUT'); ?>" />

     </form>
     <?php
     </form>
     <?php

-

     }
     }

-    ?>
+?>

 
 </div>
 
 <script type="text/javascript" lang="Javascript">
 
 </div>
 
 <script type="text/javascript" lang="Javascript">

+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later

     document.getElementById('error_pop').style.display = 'none';
     document.getElementById('uploading').style.display = 'none';
     document.getElementById('upload_finished').style.display = 'none';
     document.getElementById('error_pop').style.display = 'none';
     document.getElementById('uploading').style.display = 'none';
     document.getElementById('upload_finished').style.display = 'none';


@@ -262,7 +211,17 @@ if (!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 = '<?php
     document.getElementById('send').style.display = 'none';
     if (!check_html5_file_api ())
         document.getElementById('max_file_size').innerHTML = '<?php

-             echo t('You browser may not support HTML5 so the maximum file size is ') . jirafeau_get_max_upload_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');
+    addCopyListener('direct_link_button', 'direct_link');
+    addCopyListener('delete_link_button', 'delete_link');
+    addTextCopyListener('password_copy_button', 'output_key');
+// @license-end

 </script>
 <?php require(JIRAFEAU_ROOT . 'lib/template/footer.php'); ?>
 </script>
 <?php require(JIRAFEAU_ROOT . 'lib/template/footer.php'); ?>