|
@@ -102,7 +102,7 @@ function ManageAttachmentSettings($return_config = false)
|
|
// If not set, show a default path for the base directory
|
|
// If not set, show a default path for the base directory
|
|
if (!isset($_GET['save']) && empty($modSettings['basedirectory_for_attachments']))
|
|
if (!isset($_GET['save']) && empty($modSettings['basedirectory_for_attachments']))
|
|
if (is_dir($modSettings['attachmentUploadDir'][1]))
|
|
if (is_dir($modSettings['attachmentUploadDir'][1]))
|
|
- $modSettings['basedirectory_for_attachments'] = $modSettings['attachmentUploadDir'][1];
|
|
|
|
|
|
+ $modSettings['basedirectory_for_attachments'] = $modSettings['attachmentUploadDir'][1];
|
|
else
|
|
else
|
|
$modSettings['basedirectory_for_attachments'] = $context['attachmentUploadDir'];
|
|
$modSettings['basedirectory_for_attachments'] = $context['attachmentUploadDir'];
|
|
|
|
|
|
@@ -244,7 +244,7 @@ function ManageAttachmentSettings($return_config = false)
|
|
));
|
|
));
|
|
|
|
|
|
$_POST['use_subdirectories_for_attachments'] = 1;
|
|
$_POST['use_subdirectories_for_attachments'] = 1;
|
|
- $_POST['attachmentUploadDir'] = serialize($modSettings['attachmentUploadDir']);
|
|
|
|
|
|
+ $_POST['attachmentUploadDir'] = serialize($modSettings['attachmentUploadDir']);
|
|
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -738,7 +738,7 @@ function MaintainFiles()
|
|
if (!empty($modSettings['attachmentDirFileLimit']))
|
|
if (!empty($modSettings['attachmentDirFileLimit']))
|
|
$context['attachment_files'] = comma_format(max($modSettings['attachmentDirFileLimit'] - $current_dir_files, 0), 0);
|
|
$context['attachment_files'] = comma_format(max($modSettings['attachmentDirFileLimit'] - $current_dir_files, 0), 0);
|
|
$context['attachment_current_files'] = comma_format($current_dir_files, 0);
|
|
$context['attachment_current_files'] = comma_format($current_dir_files, 0);
|
|
-
|
|
|
|
|
|
+
|
|
$context['attach_multiple_dirs'] = count($attach_dirs) > 1 ? true : false;
|
|
$context['attach_multiple_dirs'] = count($attach_dirs) > 1 ? true : false;
|
|
$context['attach_dirs'] = $attach_dirs;
|
|
$context['attach_dirs'] = $attach_dirs;
|
|
$context['base_dirs'] = !empty($modSettings['attachment_basedirectories']) ? unserialize($modSettings['attachment_basedirectories']) : array();
|
|
$context['base_dirs'] = !empty($modSettings['attachment_basedirectories']) ? unserialize($modSettings['attachment_basedirectories']) : array();
|
|
@@ -2070,7 +2070,7 @@ function ManageAttachmentPaths()
|
|
if (!is_array($modSettings['last_attachments_directory']))
|
|
if (!is_array($modSettings['last_attachments_directory']))
|
|
$modSettings['last_attachments_directory'] = unserialize($modSettings['last_attachments_directory']);
|
|
$modSettings['last_attachments_directory'] = unserialize($modSettings['last_attachments_directory']);
|
|
$num = substr(strrchr($modSettings['attachmentUploadDir'][$_POST['current_dir']], '_'), 1);
|
|
$num = substr(strrchr($modSettings['attachmentUploadDir'][$_POST['current_dir']], '_'), 1);
|
|
-
|
|
|
|
|
|
+
|
|
if (is_numeric($num))
|
|
if (is_numeric($num))
|
|
{
|
|
{
|
|
// Need to find the base folder.
|
|
// Need to find the base folder.
|
|
@@ -2234,7 +2234,7 @@ function ManageAttachmentPaths()
|
|
if (!empty($_SESSION['errors']['dir']))
|
|
if (!empty($_SESSION['errors']['dir']))
|
|
foreach($_SESSION['errors']['dir'] as $error)
|
|
foreach($_SESSION['errors']['dir'] as $error)
|
|
$errors['dir'][] = $smcFunc['htmlspecialchars']($error, ENT_QUOTES);
|
|
$errors['dir'][] = $smcFunc['htmlspecialchars']($error, ENT_QUOTES);
|
|
-
|
|
|
|
|
|
+
|
|
if (!empty($_SESSION['errors']['base']))
|
|
if (!empty($_SESSION['errors']['base']))
|
|
foreach($_SESSION['errors']['base'] as $error)
|
|
foreach($_SESSION['errors']['base'] as $error)
|
|
$errors['base'][] = $smcFunc['htmlspecialchars']($error, ENT_QUOTES);
|
|
$errors['base'][] = $smcFunc['htmlspecialchars']($error, ENT_QUOTES);
|
|
@@ -2586,9 +2586,9 @@ function attachDirStatus($dir, $expected_files)
|
|
function TransferAttachments()
|
|
function TransferAttachments()
|
|
{
|
|
{
|
|
global $modSettings, $context, $smcFunc, $sourcedir, $txt, $boarddir;
|
|
global $modSettings, $context, $smcFunc, $sourcedir, $txt, $boarddir;
|
|
-
|
|
|
|
|
|
+
|
|
checkSession();
|
|
checkSession();
|
|
-
|
|
|
|
|
|
+
|
|
$modSettings['attachmentUploadDir'] = unserialize($modSettings['attachmentUploadDir']);
|
|
$modSettings['attachmentUploadDir'] = unserialize($modSettings['attachmentUploadDir']);
|
|
if (!empty($modSettings['attachment_basedirectories']))
|
|
if (!empty($modSettings['attachment_basedirectories']))
|
|
$modSettings['attachment_basedirectories'] = unserialize($modSettings['attachment_basedirectories']);
|
|
$modSettings['attachment_basedirectories'] = unserialize($modSettings['attachment_basedirectories']);
|
|
@@ -2606,7 +2606,7 @@ function TransferAttachments()
|
|
$current_progress = 0;
|
|
$current_progress = 0;
|
|
$total_moved = 0;
|
|
$total_moved = 0;
|
|
$total_not_moved = 0;
|
|
$total_not_moved = 0;
|
|
-
|
|
|
|
|
|
+
|
|
if (empty($_POST['from']) || (empty($_POST['auto']) && empty($_POST['to'])))
|
|
if (empty($_POST['from']) || (empty($_POST['auto']) && empty($_POST['to'])))
|
|
$results[] = $txt['attachment_transfer_no_dir'];
|
|
$results[] = $txt['attachment_transfer_no_dir'];
|
|
|
|
|