|
@@ -214,7 +214,7 @@ function ManageAttachmentSettings($return_config = false)
|
|
|
|
|
|
if (!empty($_POST['use_subdirectories_for_attachments']))
|
|
if (!empty($_POST['use_subdirectories_for_attachments']))
|
|
{
|
|
{
|
|
- if(isset($_POST['use_subdirectories_for_attachments']) && empty($_POST['basedirectory_for_attachments']))
|
|
|
|
|
|
+ if (isset($_POST['use_subdirectories_for_attachments']) && empty($_POST['basedirectory_for_attachments']))
|
|
$_POST['basedirectory_for_attachments'] = (!empty($modSettings['basedirectory_for_attachments']) ? ($modSettings['basedirectory_for_attachments']) : $boarddir);
|
|
$_POST['basedirectory_for_attachments'] = (!empty($modSettings['basedirectory_for_attachments']) ? ($modSettings['basedirectory_for_attachments']) : $boarddir);
|
|
|
|
|
|
if (!empty($_POST['use_subdirectories_for_attachments']) && !empty($modSettings['attachment_basedirectories']))
|
|
if (!empty($_POST['use_subdirectories_for_attachments']) && !empty($modSettings['attachment_basedirectories']))
|
|
@@ -2077,7 +2077,7 @@ function ManageAttachmentPaths()
|
|
$bid = -1;
|
|
$bid = -1;
|
|
$use_subdirectories_for_attachments = 0;
|
|
$use_subdirectories_for_attachments = 0;
|
|
if (!empty($modSettings['attachment_basedirectories']))
|
|
if (!empty($modSettings['attachment_basedirectories']))
|
|
- foreach($modSettings['attachment_basedirectories'] as $bid => $base)
|
|
|
|
|
|
+ foreach ($modSettings['attachment_basedirectories'] as $bid => $base)
|
|
if (strpos($modSettings['attachmentUploadDir'][$_POST['current_dir']], $base . DIRECTORY_SEPARATOR) !==false)
|
|
if (strpos($modSettings['attachmentUploadDir'][$_POST['current_dir']], $base . DIRECTORY_SEPARATOR) !==false)
|
|
{
|
|
{
|
|
$use_subdirectories_for_attachments = 1;
|
|
$use_subdirectories_for_attachments = 1;
|
|
@@ -2158,7 +2158,7 @@ function ManageAttachmentPaths()
|
|
|
|
|
|
If (isset($_POST['base_dir']))
|
|
If (isset($_POST['base_dir']))
|
|
{
|
|
{
|
|
- foreach($_POST['base_dir'] as $id => $dir)
|
|
|
|
|
|
+ foreach ($_POST['base_dir'] as $id => $dir)
|
|
{
|
|
{
|
|
if (!empty($dir) && $dir != $modSettings['attachmentUploadDir'][$id])
|
|
if (!empty($dir) && $dir != $modSettings['attachmentUploadDir'][$id])
|
|
{
|
|
{
|
|
@@ -2232,11 +2232,11 @@ function ManageAttachmentPaths()
|
|
{
|
|
{
|
|
$errors = array();
|
|
$errors = array();
|
|
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);
|
|
}
|
|
}
|
|
unset($_SESSION['errors']);
|
|
unset($_SESSION['errors']);
|