Merge branch 'master' into 'master'

[jirafeau_project.git] / index.php

diff --git a/index.php b/index.php
index eb8d577fc67074278c2c17e44b12fd8b5911f961..f9eded53cfba6f6b95b154e72fa253145a04f438 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,8 +1,9 @@
 <?php
 /*
  *  Jirafeau, your web file repository
 <?php
 /*
  *  Jirafeau, your web file repository

- *  Copyright (C) 2008  Julien "axolotl" BERNARD <axolotl@magieeternelle.org>
- *  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


@@ -15,147 +16,242 @@
  *  GNU Affero General Public License for more details.
  *
  *  You should have received a copy of the GNU Affero General Public License
  *  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__) . '/');
  */
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');

-define ('DEBUG', true);

 
 

-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/settings.php');
 require (JIRAFEAU_ROOT . 'lib/functions.php');

+require (JIRAFEAU_ROOT . 'lib/lang.php');

 
 

-/* check if the destination dirs are writable */
-$writable = is_writable (VAR_FILES) && is_writable (VAR_LINKS);
+check_errors ($cfg);
+if (has_error ())
+{
+    show_errors ();
+    require (JIRAFEAU_ROOT . 'lib/template/footer.php');
+    exit;
+}
+
+require (JIRAFEAU_ROOT . 'lib/template/header.php');

 
 

-$res = array ();
-if ($writable && isset ($_POST['jirafeau']))
+/* Check if user is allowed to upload. */
+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');
+    exit;
+}
+
+/* Ask password if upload password is set. */
+if (jirafeau_has_upload_password ($cfg))
+{
+    session_start();

 
 

-    $key = $_POST['key'];
+    /* Unlog if asked. */
+    if (isset ($_POST['action']) && (strcmp ($_POST['action'], 'logout') == 0))
+        session_unset ();

 
 

-    $time = time ();
-    switch ($_POST['time'])
+    /* Auth. */
+    if (isset ($_POST['upload_password']))

     {
     {

-    case 'minute':
-        $time += JIRAFEAU_MINUTE;
-        break;
-    case 'hour':
-        $time += JIRAFEAU_HOUR;
-        break;
-    case 'day':
-        $time += JIRAFEAU_DAY;
-        break;
-    case 'week':
-        $time += JIRAFEAU_WEEK;
-        break;
-    case 'month':
-        $time += JIRAFEAU_MONTH;
-        break;
-    default:
-        $time = JIRAFEAU_INFINITY;
-        break;
+        if (jirafeau_challenge_upload_password ($cfg, $_POST['upload_password']))
+        {
+            $_SESSION['upload_auth'] = true;
+            $_SESSION['user_upload_password'] = $_POST['upload_password'];
+        }
+        else
+        {
+            $_SESSION['admin_auth'] = false;
+            echo '<div class="error"><p>' . t('Wrong password.') . '</p></div>';
+            require (JIRAFEAU_ROOT.'lib/template/footer.php');
+            exit;
+        }

     }
 
     }
 

-    $res =
-        jirafeau_upload ($_FILES['file'], isset ($_POST['one_time_download']),
-                         $key, $time, $cfg, $_SERVER['REMOTE_ADDR']);
+    /* 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;
+    }

 }
 
 }
 

-require (JIRAFEAU_ROOT.'lib/template/header.php');
+?>
+<div id="upload_finished">
+    <p><?php echo t('File uploaded !') ?></p>

 
 

-/* Checking for errors. */
-if (!is_writable (VAR_FILES))
-    add_error (_('The file directory is not writable!'), VAR_FILES);
+    <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>

 
 

-if (!is_writable (VAR_LINKS))
-    add_error (_('The link directory is not writable!'), VAR_LINKS);
+    <?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 } ?>

 
 

-/* Check if the install.php script is still in the directory. */
-if (file_exists (JIRAFEAU_ROOT . 'install.php'))
-    add_error (_('Installer script still present'),
-               _('Please make sure to delete the installer script ' .
-                 '"install.php" before continuing.'));
+    <div id="upload_direct_download">
+    <p><?php echo t('Direct download link') ?>:</p>
+    <p><a id="direct_link" href=""></a></p>
+    </div>

 
 

-if (!has_error () && !empty ($res))
-{
-    if ($res['error']['has_error'])
-        add_error (_('An error occurred.'), $res['error']['why']);
-    else
-    {
-        $link = $cfg['web_root'];
-        $delete_link = $cfg['web_root'];
+    <div>
+    <p><?php echo t('Delete link') ?>:</p>
+    <p><a id="delete_link" href=""></a></p>
+    </div>

 
 

-        if ($cfg['rewrite'])
-        {
-            $link .= 'file-'.$res['link'];
-            $delete_link .=
-                'file-'.$res['link'].'-delete-'.$res['delete_link'];
-        }
-        else
-        {
-            /* h because 'h' looks like a jirafeau ;) */
-            $link .= 'file.php?h='.$res['link'];
-            $delete_link .=
-                'file.php?h='.$res['link'].'&amp;d='.$res['delete_link'];
-        }
+    <div id="validity">
+    <p><?php echo t('This file is valid until the following date'); ?>:</p>
+    <p id="date"></p>
+    </div>
+</div>
+
+<div id="uploading">
+    <p>
+    <?php echo t ('Uploading ...'); ?>
+    <div id="uploaded_percentage"></div>
+    <div id="uploaded_speed"></div>
+    <div id="uploaded_time"></div>
+    </p>
+</div>

 
 

-        echo '<div class="message">'.NL;
-        echo '<p>'._('File uploaded! Copy the following URL to get it:').
-            '<br />' . NL;
-        echo '<a href="'.$link.'">'.$link.'</a>' . NL;
+<div id="error_pop" class="error">
+</div>

 
 

-        if ($time != JIRAFEAU_INFINITY)
+<div id="upload">
+<fieldset>
+    <legend>
+    <?php echo t('Select a file'); ?> 
+    </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"; ?>')"/>
+    </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 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 } ?>
+        </select></td>
+        </tr>
+
+        <?php
+        if ($cfg['maximal_upload_size'] > 0)

         {
         {

-            echo '<br />'._('This file is valid until the following date:') .
-                '<br /><strong>' . strftime ('%c', $time) . '</strong>';
+        echo '<p class="config">' . t ('File size is limited to');
+        echo " " . $cfg['maximal_upload_size'] . " MB</p>";

         }
         }

+        ?>

 
 

-        echo '</p></div>';
-
-        echo '<div class="message">' . NL;
-        echo '<p>' . _('Keep the following URL to delete it:') . '<br />' . NL;
-        echo '<a href="' . $delete_link . '">' . $delete_link . '</a>' . NL;
-        echo '</p></div>';
+               <p id="max_file_size" class="config"></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 (); ?>);
+    "/>
+    </p>
+        </table>
+    </div> </fieldset>

 
 

-if (has_error ())
-    show_errors ();
+    <?php
+    if (jirafeau_has_upload_password ($cfg))
+    {
+    ?>
+    <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
+    }
+    ?>

 
 

-if (!has_error () && $writable)
-{
-    ?><div id = "upload">
-        <form enctype = "multipart/form-data" action = "
-        <?php echo $cfg['web_root']; ?>" method =
-        "post"> <div><input type = "hidden" name = "jirafeau" value = "
-        <?php echo JIRAFEAU_VERSION; ?>" /></div> <fieldset>
-        <legend><?php echo _('Upload a file');
-    ?></legend> <p><input type = "file" name = "file" size =
-        "30" /></p> <p class =
-        "config"><?php printf (_('Maximum file size: %dMB'),
-                                  jirafeau_get_max_upload_size () / (1024 *
-                                                                     1024));
-    ?></p> <p><input type = "submit" value =
-        "<?php echo _('Send'); ?>" /></p>
-        <hr /><div id = "moreoptions"> <p><label><input type =
-        "checkbox" name =
-        "one_time_download" /><?php echo _('One time download');
-    ?></label></p> <p><label for = "input_key"
-       ><?php echo _('Password:');
-    ?></label> <input type = "text" name = "key" id = "input_key" /></p>
-        <p><label for = "select_time"
-       ><?php echo _('Time limit:');
-    ?></label>
-        <select name = "time" id = "select_time">
-        <option value = "none"><?php echo _('None');
-    ?></option> <option value = "minute"><?php echo _('One minute');
-    ?></option> <option value = "hour"><?php echo _('One hour');
-    ?></option> <option value = "day"><?php echo _('One day');
-    ?></option> <option value = "week"><?php echo _('One week');
-    ?></option> <option value = "month"><?php echo _('One month');
-    ?></option>
-        </select> </p> </div> </fieldset> </form> </div> <?php
-}
+</div>

 
 

-require (JIRAFEAU_ROOT.'lib/template/footer.php');
-?>
+<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';
+    document.getElementById('options').style.display = 'none';
+    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 ();
+             ?>';
+</script>
+<?php require (JIRAFEAU_ROOT . 'lib/template/footer.php'); ?>