Forgeted install.php ... shame ... ;)

[jirafeau_mojo42.git] / index.php

diff --git a/index.php b/index.php
index 9028143eda45e259001dd7e963e313e3be1cb24e..2b6e889a98bf91f867b3919f2754922a0ba64bc9 100644 (file)
--- a/index.php
+++ b/index.php
@@ -17,124 +17,155 @@
  *  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/>.
  */
  *  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/>.
  */

-
-define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
-define('DEBUG', true);
-
-require(JIRAFEAU_ROOT . 'lib/config.php');
-require(JIRAFEAU_ROOT . 'lib/settings.php');
-require(JIRAFEAU_ROOT . 'lib/functions.php');
+define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
+
+require (JIRAFEAU_ROOT . 'lib/config.php');
+require (JIRAFEAU_ROOT . 'lib/settings.php');
+require (JIRAFEAU_ROOT . 'lib/functions.php');
+require (JIRAFEAU_ROOT . 'lib/lang.php');
+
+if (file_exists (JIRAFEAU_ROOT . 'install.php')
+    && !file_exists (JIRAFEAU_ROOT . 'lib/config.local.php'))
+{
+    header('Location: install.php'); 
+    exit;
+}

 
 /* check if the destination dirs are writable */
 
 /* check if the destination dirs are writable */

-$writable = is_writable(VAR_FILES) && is_writable(VAR_LINKS);
-
-$res = array();
-if($writable && isset($_POST['jirafeau'])) {
-
-  $key = $_POST['key'];
-
-  $time = time();
-  switch($_POST['time']) {
-  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;
-  }
-
-  $res = jirafeau_upload($_FILES['file'], isset($_POST['one_time_download']), $key, $time, $cfg, $_SERVER['REMOTE_ADDR']);
+$writable = is_writable (VAR_FILES) && is_writable (VAR_LINKS);
+
+$res = array ();
+if ($writable && isset ($_POST['jirafeau']))
+{
+    $key = $_POST['key'];
+
+    $time = time ();
+    switch ($_POST['time'])
+    {
+    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;
+    }
+
+    $res =
+        jirafeau_upload ($_FILES['file'], isset ($_POST['one_time_download']),
+                         $key, $time, $_SERVER['REMOTE_ADDR']);

 }
 
 }
 

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

 
 /* Checking for errors. */
 
 /* Checking for errors. */

-if(!is_writable(VAR_FILES)) {
-  add_error (_('The file directory is not writable!'), VAR_FILES);
-}
+if (!is_writable (VAR_FILES))
+    add_error (t('The file directory is not writable!'), VAR_FILES);

 
 

-if(!is_writable(VAR_LINKS)) {
-  add_error (_('The link directory is not writable!'), VAR_LINKS);
-}
+if (!is_writable (VAR_LINKS))
+    add_error (t('The link directory is not writable!'), VAR_LINKS);

 
 /* Check if the install.php script is still in the directory. */
 
 /* 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.'));
-}
-
-if(!has_error() && !empty($res)) {
-  if($res['error']['has_error']) {
-      add_error (_('An error occurred.'), $res['error']['why']);
-  } else {
-    $link = $cfg['web_root'];
-    if($cfg['rewrite']) {
-      $link .= 'file-' . $res['link'];
-    } else {
-      $link .= 'file.php?h=' . $res['link']; // h because 'h' looks like a jirafeau ;)
+if (file_exists (JIRAFEAU_ROOT . 'install.php'))
+    add_error (t('Installer script still present'),
+               t('Please make sure to delete the installer script ' .
+                 '"install.php" before continuing.'));
+
+if (!has_error () && !empty ($res))
+{
+    if ($res['error']['has_error'])
+        add_error (t('An error occurred.'), $res['error']['why']);
+    else
+    {
+        $link = $cfg['web_root'];
+        $delete_link = $cfg['web_root'];
+
+        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'];
+        }
+
+        echo '<div class="message">'.NL;
+        echo '<p>' . t('File uploaded! Copy the following URL to get it') .
+            ':<br />' . NL;
+        echo '<a href="'.$link.'">'.$link.'</a>' . NL;
+
+        if ($time != JIRAFEAU_INFINITY)
+        {
+            echo '<br />' . t('This file is valid until the following date') .
+                ':<br /><strong>' . strftime ('%c', $time) . '</strong>';
+        }
+
+        echo '</p></div>';
+
+        echo '<div class="message">' . NL;
+        echo '<p>' . t('Keep the following URL to delete it at any moment') . ':<br />' . NL;
+        echo '<a href="' . $delete_link . '">' . $delete_link . '</a>' . NL;
+        echo '</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;
-
-    if($time != JIRAFEAU_INFINITY) {
-      echo '<br />' . _('This file is valid until the following date:') . '<br /><strong>' . strftime('%c' ,$time) . '</strong>';
-    }
-
-    echo '</p></div>';
-  }

 }
 
 }
 

-if(has_error ()) {
+if (has_error ())

     show_errors ();
     show_errors ();

-}

 
 

-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 in the binary chaos'); ?>" /></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 _('File key:'); ?></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
+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 t('Upload a file');
+    ?></legend> <p><input type = "file" name = "file" size =
+        "30" /></p> <p class =
+        "config"><?php printf ('%s: %s', t('Maximum file size'),
+                               jirafeau_get_max_upload_size ());
+    ?></p><p>
+    <input type = "submit" id='send' value ="<?php echo t('Send'); ?>"
+    onclick="
+        document.getElementById('send').value='<?php echo t ('Uploading ...'); ?>';
+        document.getElementById('send').submit ();
+        document.getElementById('send').disabled='true';
+    "/>
+    </p><hr /><div id = "moreoptions"> <p><label><input type =
+        "checkbox" name =
+        "one_time_download" /><?php echo t('One time download');
+    ?></label></p><br/><p><label for = "input_key"
+       ><?php echo t('Password') . ':';
+    ?></label><input type = "text" name = "key" id = "input_key" /></p>
+        <p><label for = "select_time"
+       ><?php echo t('Time limit') . ':';
+    ?></label>
+        <select name = "time" id = "select_time">
+        <option value = "none"><?php echo t('None');
+    ?></option> <option value = "minute"><?php echo t('One minute');
+    ?></option> <option value = "hour"><?php echo t('One hour');
+    ?></option> <option value = "day"><?php echo t('One day');
+    ?></option> <option value = "week"><?php echo t('One week');
+    ?></option> <option value = "month"><?php echo t('One month');
+    ?></option>
+        </select> </p> </div> </fieldset> </form> </div> <?php

 }
 
 }
 

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

 ?>
 ?>