Fixed little mistake in installation

[jirafeau_mojo42.git] / index.php

diff --git a/index.php b/index.php
index 41a0d5f6c0a4885455b348411c48f9f5071b1538..ae25e7b6c4cef2a42c912a79c9cca17b9558a79b 100644 (file)
--- a/index.php
+++ b/index.php
@@ -18,11 +18,18 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
  *  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');
 
 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 */
 $writable = is_writable (VAR_FILES) && is_writable (VAR_LINKS);
 
 /* check if the destination dirs are writable */
 $writable = is_writable (VAR_FILES) && is_writable (VAR_LINKS);


@@ -30,7 +37,6 @@ $writable = is_writable (VAR_FILES) && is_writable (VAR_LINKS);
 $res = array ();
 if ($writable && isset ($_POST['jirafeau']))
 {
 $res = array ();
 if ($writable && isset ($_POST['jirafeau']))
 {

-

     $key = $_POST['key'];
 
     $time = time ();
     $key = $_POST['key'];
 
     $time = time ();


@@ -58,28 +64,28 @@ if ($writable && isset ($_POST['jirafeau']))
 
     $res =
         jirafeau_upload ($_FILES['file'], isset ($_POST['one_time_download']),
 
     $res =
         jirafeau_upload ($_FILES['file'], isset ($_POST['one_time_download']),

-                         $key, $time, $cfg, $_SERVER['REMOTE_ADDR']);
+                         $key, $time, $_SERVER['REMOTE_ADDR']);

 }
 
 }
 

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

 
 /* Checking for errors. */
 if (!is_writable (VAR_FILES))
 
 /* Checking for errors. */
 if (!is_writable (VAR_FILES))

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

 
 if (!is_writable (VAR_LINKS))
 
 if (!is_writable (VAR_LINKS))

-    add_error (_('The link directory is not 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. */
 if (file_exists (JIRAFEAU_ROOT . 'install.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 ' .
+    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'])
                  '"install.php" before continuing.'));
 
 if (!has_error () && !empty ($res))
 {
     if ($res['error']['has_error'])

-        add_error (_('An error occurred.'), $res['error']['why']);
+        add_error (t('An error occurred.'), $res['error']['why']);

     else
     {
         $link = $cfg['web_root'];
     else
     {
         $link = $cfg['web_root'];


@@ -100,20 +106,20 @@ if (!has_error () && !empty ($res))
         }
 
         echo '<div class="message">'.NL;
         }
 
         echo '<div class="message">'.NL;

-        echo '<p>'._('File uploaded! Copy the following URL to get it:').
-            '<br />' . 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 '<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 '<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></div>';
 
         echo '<div class="message">' . NL;

-        echo '<p>' . _('Keep the following URL to delete it:') . '<br />' . 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 '<a href="' . $delete_link . '">' . $delete_link . '</a>' . NL;
         echo '</p></div>';
     }


@@ -129,30 +135,33 @@ if (!has_error () && $writable)
         <?php echo $cfg['web_root']; ?>" method =
         "post"> <div><input type = "hidden" name = "jirafeau" value = "
         <?php echo JIRAFEAU_VERSION; ?>" /></div> <fieldset>
         <?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><?php echo t('Upload a file');

     ?></legend> <p><input type = "file" name = "file" size =
         "30" /></p> <p class =
     ?></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 =
+        "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').disabled='true';
+    "/>
+    </p><hr /><div id = "moreoptions"> <p><label><input type =

         "checkbox" name =
         "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>
+        "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"
         <p><label for = "select_time"

-       ><?php echo _('Time limit:');
+       ><?php echo t('Time limit') . ':';

     ?></label>
         <select name = "time" id = "select_time">
     ?></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 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
 }
     ?></option>
         </select> </p> </div> </fieldset> </form> </div> <?php
 }