[BUGFIX] Fix mime_type escaping

[jirafeau_project.git] / lib / functions.php

diff --git a/lib/functions.php b/lib/functions.php
index e4bfbb56219f573d383f52a4b7b7a1e64a093ba8..3a50eac828cc42fa58cb46e6c53d910371dbd3eb 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -374,7 +374,7 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l
         return (array(
                  'error' =>
                    array('has_error' => true,
         return (array(
                  'error' =>
                    array('has_error' => true,

-                          'why' => t('Internal error during file creation.')),
+                          'why' => t('INTERNAL_ERROR_DEL')),

                  'link' =>'',
                  'delete_link' => ''));
     }
                  'link' =>'',
                  'delete_link' => ''));
     }


@@ -513,7 +513,7 @@ function check_errors($cfg)
     }
 
     if (!is_writable(VAR_ASYNC)) {
     }
 
     if (!is_writable(VAR_ASYNC)) {

-        add_error(t('The async directory is not writable!'), VAR_ASYNC);
+        add_error(t('ASYNC_DIR_W'), VAR_ASYNC);

     }
 }
 
     }
 }
 


@@ -553,28 +553,28 @@ function jirafeau_admin_list($name, $file_hash, $link_hash)
 {
     echo '<fieldset><legend>';
     if (!empty($name)) {
 {
     echo '<fieldset><legend>';
     if (!empty($name)) {

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

     }
     if (!empty($file_hash)) {
     }
     if (!empty($file_hash)) {

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

     }
     if (!empty($link_hash)) {
     }
     if (!empty($link_hash)) {

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

     }
     if (empty($name) && empty($file_hash) && empty($link_hash)) {
     }
     if (empty($name) && empty($file_hash) && empty($link_hash)) {

-        echo t('List all files');
+        echo t('LS_FILES');

     }
     echo '</legend>';
     echo '<table>';
     echo '<tr>';
     }
     echo '</legend>';
     echo '<table>';
     echo '<tr>';

-    echo '<td>' . t('Filename') . '</td>';
-    echo '<td>' . t('Type') . '</td>';
-    echo '<td>' . t('Size') . '</td>';
-    echo '<td>' . t('Expire') . '</td>';
-    echo '<td>' . t('Onetime') . '</td>';
-    echo '<td>' . t('Upload date') . '</td>';
-    echo '<td>' . t('Origin') . '</td>';
-    echo '<td>' . t('Action') . '</td>';
+    echo '<td>' . t('FILENAME') . '</td>';
+    echo '<td>' . t('TYPE') . '</td>';
+    echo '<td>' . t('SIZE') . '</td>';
+    echo '<td>' . t('EXPIRE') . '</td>';
+    echo '<td>' . t('ONETIME') . '</td>';
+    echo '<td>' . t('UPLOAD_DATE') . '</td>';
+    echo '<td>' . t('ORIGIN') . '</td>';
+    echo '<td>' . t('ACTION') . '</td>';

     echo '</tr>';
 
     /* Get all links files. */
     echo '</tr>';
 
     /* Get all links files. */


@@ -597,7 +597,7 @@ function jirafeau_admin_list($name, $file_hash, $link_hash)
                 }
 
                 /* Filter. */
                 }
 
                 /* Filter. */

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

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


@@ -609,10 +609,10 @@ function jirafeau_admin_list($name, $file_hash, $link_hash)
                 /* Print link informations. */
                 echo '<tr>';
                 echo '<td>' .
                 /* Print link informations. */
                 echo '<tr>';
                 echo '<td>' .

-                '<strong><a id="upload_link" href="f.php?h='. htmlspecialchars($node) .'" title="' .
-                    t('Download page') . '">' . htmlspecialchars($l['file_name']) . '</a></strong>';
+                '<strong><a id="upload_link" href="f.php?h='. jirafeau_escape($node) .'" title="' .
+                    t('DL_PAGE') . '">' . jirafeau_escape($l['file_name']) . '</a></strong>';

                 echo '</td>';
                 echo '</td>';

-                echo '<td>' . $l['mime_type'] . '</td>';
+                echo '<td>' . jirafeau_escape($l['mime_type']) . '</td>';

                 echo '<td>' . jirafeau_human_size($l['file_size']) . '</td>';
                 echo '<td>' . ($l['time'] == -1 ? '∞' : jirafeau_get_datetimefield($l['time'])) . '</td>';
                 echo '<td>';
                 echo '<td>' . jirafeau_human_size($l['file_size']) . '</td>';
                 echo '<td>' . ($l['time'] == -1 ? '∞' : jirafeau_get_datetimefield($l['time'])) . '</td>';
                 echo '<td>';


@@ -628,17 +628,17 @@ function jirafeau_admin_list($name, $file_hash, $link_hash)
                 '<form method="post">' .
                 '<input type = "hidden" name = "action" value = "download"/>' .
                 '<input type = "hidden" name = "link" value = "' . $node . '"/>' .
                 '<form method="post">' .
                 '<input type = "hidden" name = "action" value = "download"/>' .
                 '<input type = "hidden" name = "link" value = "' . $node . '"/>' .

-                '<input type = "submit" value = "' . t('Download') . '" />' .
+                '<input type = "submit" value = "' . t('DL') . '" />' .

                 '</form>' .
                 '<form method="post">' .
                 '<input type = "hidden" name = "action" value = "delete_link"/>' .
                 '<input type = "hidden" name = "link" value = "' . $node . '"/>' .
                 '</form>' .
                 '<form method="post">' .
                 '<input type = "hidden" name = "action" value = "delete_link"/>' .
                 '<input type = "hidden" name = "link" value = "' . $node . '"/>' .

-                '<input type = "submit" value = "' . t('Del link') . '" />' .
+                '<input type = "submit" value = "' . t('DEL_LINK') . '" />' .

                 '</form>' .
                 '<form method="post">' .
                 '<input type = "hidden" name = "action" value = "delete_file"/>' .
                 '<input type = "hidden" name = "md5" value = "' . $l['md5'] . '"/>' .
                 '</form>' .
                 '<form method="post">' .
                 '<input type = "hidden" name = "action" value = "delete_file"/>' .
                 '<input type = "hidden" name = "md5" value = "' . $l['md5'] . '"/>' .

-                '<input type = "submit" value = "' . t('Del file and links') . '" />' .
+                '<input type = "submit" value = "' . t('DEL_FILE_LINKS') . '" />' .

                 '</form>' .
                 '</td>';
                 echo '</tr>';
                 '</form>' .
                 '</td>';
                 echo '</tr>';


@@ -1243,3 +1243,8 @@ function jirafeau_replace_markers($content, $htmllinebreaks = false)
 
     return $content;
 }
 
     return $content;
 }

+
+function jirafeau_escape($string)
+{
+    return htmlspecialchars($string, ENT_QUOTES);
+}