[BUGFIX] run session_start before outputing any html

[jirafeau.git] / index.php

diff --git a/index.php b/index.php
index cd0eed839d6ba22cdc2650bfba447f299db7a79e..eec0fa37b005ce3b415f8f7909a537c2edf3d29c 100644 (file)
--- a/index.php
+++ b/index.php
@@ -18,6 +18,7 @@
  *  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');
@@ -38,8 +39,6 @@ require(JIRAFEAU_ROOT . 'lib/template/header.php');
 if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg))) {
     // Is an upload password required?
     if (jirafeau_has_upload_password($cfg)) {
-        session_start();
-
         // Logout action
         if (isset($_POST['action']) && (strcmp($_POST['action'], 'logout') == 0)) {
             session_unset();
@@ -67,13 +66,13 @@ if (true === jirafeau_challenge_upload_ip($cfg['upload_ip'], get_ip_address($cfg
                     <td class = "label"><label for = "enter_password">
                     <?php echo t('Upload password') . ':'; ?></label>
                     </td>
+                </tr><tr>
                     <td class = "field"><input type = "password"
                     name = "upload_password" id = "upload_password"
                     size = "40" />
                     </td>
                 </tr>
                 <tr class = "nav">
-                    <td></td>
                     <td class = "nav next">
                     <input type = "submit" name = "key" value =
                     "<?php echo t('Login'); ?>" />
@@ -98,25 +97,35 @@ else {
 
     <div id="upload_finished_download_page">
     <p>
-          <a id="upload_link" href=""><?php echo t('Download page') ?></a>
-          <a id="upload_link_email" href=""><img id="upload_image_email"/></a>
+        <a id="upload_link" href=""><?php echo t('Download page') ?></a>
+        <a id="upload_link_email" href=""><img id="upload_image_email"/></a>
+        <button id="upload_link_button">✂</button>
     </p>
     </div>
 
     <?php if ($cfg['preview'] == true) {
     ?>
     <div id="upload_finished_preview">
-    <p><a id="preview_link" href=""><?php echo t('View link') ?></a></p>
+    <p>
+        <a id="preview_link" href=""><?php echo t('View link') ?></a>
+        <button id="preview_link_button">✂</button>
+    </p>
     </div>
     <?php
 } ?>
 
     <div id="upload_direct_download">
-    <p><a id="direct_link" href=""><?php echo t('Direct download link') ?></a></p>
+    <p>
+        <a id="direct_link" href=""><?php echo t('Direct download link') ?></a>
+        <button id="direct_link_button">✂</button>
+    </p>
     </div>
 
     <div id="upload_delete">
-    <p><a id="delete_link" href=""><?php echo t('Delete link') ?></a></p>
+    <p>
+        <a id="delete_link" href=""><?php echo t('Delete link') ?></a>
+        <button id="delete_link_button">✂</button>
+    </p>
     </div>
 
     <div id="upload_validity">
@@ -262,5 +271,10 @@ else {
         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();
              ?>';
+
+    addCopyListener('upload_link_button', 'upload_link');
+    addCopyListener('preview_link_button', 'preview_link');
+    addCopyListener('direct_link_button', 'direct_link');
+    addCopyListener('delete_link_button', 'delete_link');
 </script>
 <?php require(JIRAFEAU_ROOT . 'lib/template/footer.php'); ?>