fix error on link encrypted parameters

[jirafeau.git] / index.php

diff --git a/index.php b/index.php
old mode 100755 (executable)
new mode 100644 (file)
index d3c0df7..127d9e6
--- a/index.php
+++ b/index.php
@@ -1,7 +1,9 @@
 <?php
 /*
  *  Jirafeau, your web file repository
 <?php
 /*
  *  Jirafeau, your web file repository

- *  Copyright (C) 2012  Jerome Jutteau <j.jutteau@gmail.com>
+ *  Copyright (C) 2013
+ *  Jerome Jutteau <j.jutteau@gmail.com>
+ *  Jimmy Beauvois <jimmy.beauvois@gmail.com>

  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as


@@ -18,19 +20,75 @@
  */
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 
  */
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 

-require (JIRAFEAU_ROOT . 'lib/config.php');
+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');
 
 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 ();
+check_errors ($cfg);

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

+
+/* Ask password if upload password is set. */
+if (strlen ($cfg['upload_password']) > 0)
+{
+    session_start();
+
+    /* Unlog if asked. */
+    if (isset ($_POST['action']) && (strcmp ($_POST['action'], 'logout') == 0))
+        $_SESSION['upload_auth'] = false;
+
+    /* Auth. */
+    if (isset ($_POST['upload_password']))
+    {
+        if (strcmp ($cfg['upload_password'], $_POST['upload_password']) == 0)
+            $_SESSION['upload_auth'] = true;
+        else
+        {
+            $_SESSION['admin_auth'] = false;
+            echo '<div class="error"><p>' . t('Wrong password.') . '</p></div>';
+            require (JIRAFEAU_ROOT.'lib/template/footer.php');
+            exit;
+        }
+    }
+
+    /* Show auth page. */
+    if (!isset ($_SESSION['upload_auth']) || $_SESSION['upload_auth'] != true)
+    {
+       ?>
+        <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+        <fieldset>
+            <table>
+            <tr>
+                <td class = "label"><label for = "enter_password">
+                <?php echo t('Upload password') . ':';?></label>
+                </td>
+                <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'); ?>" />
+                </td>
+            </tr>
+            </table>
+        </fieldset>
+        </form>
+        <?php
+        require (JIRAFEAU_ROOT.'lib/template/footer.php');
+        exit;
+    }
+}
+

 ?>
 <div id="upload_finished">
     <p>
 ?>
 <div id="upload_finished">
     <p>


@@ -59,8 +117,9 @@ if (has_error ())
 </div>
 
 <div id="upload">
 </div>
 
 <div id="upload">

+<fieldset>

     <legend>
     <legend>

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

     </legend>
     <p>
     <input type="file" id="file_select" size="30"
     </legend>
     <p>
     <input type="file" id="file_select" size="30"


@@ -69,15 +128,7 @@ if (has_error ())
         document.getElementById('send').style.display = '';
     "/>
     </p>
         document.getElementById('send').style.display = '';
     "/>
     </p>

-    <p id="max_file_size" class="config"></p>
-    <p>
-    <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 (); ?>);
-    "/>
-    </p>
+    

     <div id="options">
         <table id="option_table">
         <tr>
     <div id="options">
         <table id="option_table">
         <tr>


@@ -99,9 +150,34 @@ if (has_error ())
         <option value = "month"><?php echo t('One month');?></option>
         </select></td>
         </tr>
         <option value = "month"><?php echo t('One month');?></option>
         </select></td>
         </tr>

+               <p id="max_file_size" class="config"></p>
+    <p>
+
+    <input type="hidden" id="upload_password" name="upload_password" value="<?php echo $cfg['upload_password']?>"/>
+    <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 (); ?>);
+    "/>
+    </p>

         </table>
         </table>

-    </div> 
+    </div> </fieldset>
+
+    <?php
+    if (strlen ($cfg['upload_password']) > 0)
+    {
+    ?>
+    <form action = "<?php echo basename(__FILE__); ?>" method = "post">
+        <input type = "hidden" name = "action" value = "logout"/>
+        <input type = "submit" value = "<?php echo t('Logout'); ?>" />
+    </form>
+    <?php
+    }
+    ?>
+

 </div>
 </div>

+

 <script lang="Javascript">
     document.getElementById('uploading').style.display = 'none';
     document.getElementById('upload_finished').style.display = 'none';
 <script lang="Javascript">
     document.getElementById('uploading').style.display = 'none';
     document.getElementById('upload_finished').style.display = 'none';