X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/75c98902b1f1be9a4cd1429886c3089c568e532b..7578ca7e1deb95bef18bb64c3b49d83d78fc3891:/lib/functions.php?ds=inline
diff --git a/lib/functions.php b/lib/functions.php
index 0bb51db..cf6b913 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -204,7 +204,7 @@ function jirafeau_ini_to_bytes($value)
function jirafeau_get_max_upload_size_bytes()
{
return min(jirafeau_ini_to_bytes(ini_get('post_max_size')),
- jirafeau_ini_to_bytes(ini_get('upload_max_filesize')));
+ jirafeau_ini_to_bytes(ini_get('upload_max_filesize')));
}
/**
@@ -213,9 +213,7 @@ function jirafeau_get_max_upload_size_bytes()
*/
function jirafeau_get_max_upload_size()
{
- return jirafeau_human_size(
- min(jirafeau_ini_to_bytes(ini_get('post_max_size')),
- jirafeau_ini_to_bytes(ini_get('upload_max_filesize'))));
+ return jirafeau_human_size(jirafeau_get_max_upload_size_bytes());
}
/**
@@ -374,7 +372,7 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l
return (array(
'error' =>
array('has_error' => true,
- 'why' => t('Internal error during file creation.')),
+ 'why' => t('INTERNAL_ERROR_DEL')),
'link' =>'',
'delete_link' => ''));
}
@@ -500,20 +498,17 @@ function check_errors($cfg)
exit;
}
- /* check if the destination dirs are writable */
- $writable = is_writable(VAR_FILES) && is_writable(VAR_LINKS);
-
/* Checking for errors. */
if (!is_writable(VAR_FILES)) {
- add_error(t('The file directory is not writable!'), VAR_FILES);
+ add_error(t('FILE_DIR_W'), VAR_FILES);
}
if (!is_writable(VAR_LINKS)) {
- add_error(t('The link directory is not writable!'), VAR_LINKS);
+ add_error(t('LINK_DIR_W'), VAR_LINKS);
}
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 +548,28 @@ function jirafeau_admin_list($name, $file_hash, $link_hash)
{
echo '