[FEATURE] Install script: Simplify config generation

[jirafeau.git] / f.php

diff --git a/f.php b/f.php
index 75d77d768a5f9fafc98eec91db189067076a8a85..a97718f9387a4ddd11f8d0563ee58ef4a11a57b3 100644 (file)
--- a/f.php
+++ b/f.php
@@ -19,10 +19,9 @@
  */
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 
  */
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 

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

 
 if (!isset ($_GET['h']) || empty ($_GET['h']))
 {
 
 if (!isset ($_GET['h']) || empty ($_GET['h']))
 {


@@ -49,6 +48,13 @@ if (!preg_match ('/[0-9a-zA-Z_-]+$/', $link_name))
 
 $link = jirafeau_get_link ($link_name);
 if (count ($link) == 0)
 
 $link = jirafeau_get_link ($link_name);
 if (count ($link) == 0)

+{
+    /* Try alias. */
+    $alias = jirafeau_get_alias (md5 ($link_name));
+    if (count ($alias) > 0)
+        $link = jirafeau_get_link ($alias["destination"]);
+}
+if (count ($link) == 0)

 {
     require (JIRAFEAU_ROOT.'lib/template/header.php');
     echo '<div class="error"><p>' . t('Sorry, the requested file is not found') .
 {
     require (JIRAFEAU_ROOT.'lib/template/header.php');
     echo '<div class="error"><p>' . t('Sorry, the requested file is not found') .


@@ -173,6 +179,7 @@ if (!empty ($link['key']))
             $password_challenged = true;
        else
         {
             $password_challenged = true;
        else
         {

+            sleep (2);

             require (JIRAFEAU_ROOT.'lib/template/header.php');
             echo '<div class="error"><p>' . t('Access denied') .
             '</p></div>';
             require (JIRAFEAU_ROOT.'lib/template/header.php');
             echo '<div class="error"><p>' . t('Access denied') .
             '</p></div>';