fix admin searches

diff --git a/lib/functions.php b/lib/functions.php
index 6d7cb342d9780bbf779782e274e57707721e3d5c..97733d598d199f2c04eb10f91543427e59cecc5c 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -446,11 +446,11 @@ jirafeau_admin_list ($name, $file_hash, $link_hash)
 {
     echo '<fieldset><legend>';
     if (!empty ($name))
 {
     echo '<fieldset><legend>';
     if (!empty ($name))

-        echo $name . ' ';
+        echo t('Filename') . ": $name ";

     if (!empty ($file_hash))
     if (!empty ($file_hash))

-        echo $file_hash . ' ';
+        echo t('file') . ": $file_hash ";

     if (!empty ($link_hash))
     if (!empty ($link_hash))

-        echo $link_hash . ' ';
+        echo t('link') . ": $link_hash ";

     if (empty ($name) && empty ($file_hash) && empty ($link_hash))
         echo t('List all files');
     echo '</legend>';
     if (empty ($name) && empty ($file_hash) && empty ($link_hash))
         echo t('List all files');
     echo '</legend>';


@@ -489,11 +489,11 @@ jirafeau_admin_list ($name, $file_hash, $link_hash)
                     continue;
 
                 /* Filter. */
                     continue;
 
                 /* Filter. */

-                if (!empty ($name) && $name != $l['file_name'])
+                if (!empty ($name) && !preg_match ("/$name/i", $l['file_name']))

                     continue;
                 if (!empty ($file_hash) && $file_hash != $l['md5'])
                     continue;
                     continue;
                 if (!empty ($file_hash) && $file_hash != $l['md5'])
                     continue;

-                if (!empty ($link_hash) && $link_hash != $link)
+                if (!empty ($link_hash) && $link_hash != $node)

                     continue;
                 /* Print link informations. */
                 echo '<tr>';
                     continue;
                 /* Print link informations. */
                 echo '<tr>';

diff --git a/lib/lang/fr.php b/lib/lang/fr.php
index d266c1f967e7513e083caf4ddfa5067568e3984e..49ec634e61223188ec984b992598239accf68ecd 100755 (executable)
--- a/lib/lang/fr.php
+++ b/lib/lang/fr.php
@@ -112,6 +112,8 @@ $tr = array (
             'You are now Logout' => 'Vous êtes maintenant déconnecté',
             'Link deleted' => 'Lien supprimé',
             'Filename' => 'Nom',
             'You are now Logout' => 'Vous êtes maintenant déconnecté',
             'Link deleted' => 'Lien supprimé',
             'Filename' => 'Nom',

+            'file' => 'fichier',
+            'link' => 'lien',

             'Type' => 'Type',
             'Size' => 'Taille',
             'Expire' => 'Expiration',
             'Type' => 'Type',
             'Size' => 'Taille',
             'Expire' => 'Expiration',