Merge remote-tracking branch 'origin/master'

[jirafeau_project.git] / f.php

diff --git a/f.php b/f.php
index 75d77d768a5f9fafc98eec91db189067076a8a85..e3f4420bb65a43331952da057e403911d6394115 100644 (file)
--- a/f.php
+++ b/f.php
@@ -49,9 +49,16 @@ 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');
 {
     require (JIRAFEAU_ROOT.'lib/template/header.php');

-    echo '<div class="error"><p>' . t('Sorry, the requested file is not found') .
+    echo '<div class="error"><p>' . t('Sorry, the requested file is not found....' . $link_name) .

     '</p></div>';
     require (JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
     '</p></div>';
     require (JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;