From: Jerome Jutteau Date: Fri, 28 Dec 2012 11:19:30 +0000 (+0100) Subject: Fix previous commit by adding forgotten files X-Git-Tag: 1.0~23 X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/6165f1ef9bf8abf6d07caff88f14a36f368832c6?ds=inline Fix previous commit by adding forgotten files --- diff --git a/file.php b/file.php index 0a6e32c..cc3f163 100644 --- a/file.php +++ b/file.php @@ -37,7 +37,7 @@ if (isset ($_GET['h']) && !empty ($_GET['h'])) header ("HTTP/1.0 404 Not Found"); require (JIRAFEAU_ROOT.'lib/template/header.php'); - echo '

Error 404: Not Found

'; + echo '

' . _('Error 404: Not Found') . '

'; require (JIRAFEAU_ROOT.'lib/template/footer.php'); exit; } @@ -80,8 +80,9 @@ if (isset ($_GET['h']) && !empty ($_GET['h'])) jirafeau_delete ($link_name); require (JIRAFEAU_ROOT.'lib/template/header.php'); echo '

'. - _('The time limit of this file has expired.' . - 'It has been deleted.') . '

'; + _('The time limit of this file has expired.') . ' ' . + _('File has been deleted.') . + '

'; require (JIRAFEAU_ROOT.'lib/template/footer.php'); exit; } @@ -96,9 +97,9 @@ if (isset ($_GET['h']) && !empty ($_GET['h'])) "" method = "post">
- -

Error 403: Forbidden

'; + echo '

' . _('Error 403: Forbidden') . + '

'; require (JIRAFEAU_ROOT.'lib/template/footer.php'); exit; } @@ -139,7 +141,8 @@ if (isset ($_GET['h']) && !empty ($_GET['h'])) header ("HTTP/1.0 404 Not Found"); require (JIRAFEAU_ROOT.'lib/template/header.php'); - echo '

Error 404: Not Found

'; + echo '

' . _('Error 404: Not Found') . + '

'; require (JIRAFEAU_ROOT.'lib/template/footer.php'); exit; } diff --git a/index.php b/index.php index 8a31665..912b1ef 100644 --- a/index.php +++ b/index.php @@ -20,10 +20,10 @@ define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/'); define ('DEBUG', true); -require (JIRAFEAU_ROOT . 'lib/lang.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'); /* check if the destination dirs are writable */ $writable = is_writable (VAR_FILES) && is_writable (VAR_LINKS); @@ -63,13 +63,13 @@ if ($writable && isset ($_POST['jirafeau'])) } if (file_exists (JIRAFEAU_ROOT . 'install.php') - && !file_exists (JIRAFEAU_ROOT.'lib/config.local.php')) + && !file_exists (JIRAFEAU_ROOT . 'lib/config.local.php')) { header('Location: install.php'); exit; } -require (JIRAFEAU_ROOT.'lib/template/header.php'); +require (JIRAFEAU_ROOT . 'lib/template/header.php'); /* Checking for errors. */ if (!is_writable (VAR_FILES)) @@ -108,20 +108,20 @@ if (!has_error () && !empty ($res)) } echo '
'.NL; - echo '

'._('File uploaded! Copy the following URL to get it:'). - '
' . NL; + echo '

' . _('File uploaded! Copy the following URL to get it') . + ':
' . NL; echo ''.$link.'' . NL; if ($time != JIRAFEAU_INFINITY) { - echo '
'._('This file is valid until the following date:') . - '
' . strftime ('%c', $time) . ''; + echo '
' . _('This file is valid until the following date') . + ':
' . strftime ('%c', $time) . ''; } echo '

'; echo '
' . NL; - echo '

' . _('Keep the following URL to delete it:') . '
' . NL; + echo '

' . _('Keep the following URL to delete it at any moment') . ':
' . NL; echo '' . $delete_link . '' . NL; echo '

'; } @@ -140,19 +140,19 @@ if (!has_error () && $writable)