Prechádzať zdrojové kódy

A few bug fixes. Undefined index error

Kays48 12 rokov pred
rodič
commit
5245d7ef8c

+ 3 - 3
Sources/Attachments.php

@@ -535,8 +535,8 @@ function attachmentChecks($attachID)
 		$context['dir_files']++;
 
 		// Are we about to run out of room? Let's notify the admin then.
-		if (empty($modSettings['attachment_full_notified']) && empty($modSettings['attachmentDirSizeLimit']) && $modSettings['attachmentDirSizeLimit'] > 4000 && $context['dir_size'] > ($modSettings['attachmentDirSizeLimit'] - 2000) * 1024
-			|| (empty($modSettings['attachmentDirFileLimit']) && $modSettings['attachmentDirFileLimit'] * .95 < $context['dir_files'] && $modSettings['attachmentDirFileLimit'] > 500))
+		if (empty($modSettings['attachment_full_notified']) && !empty($modSettings['attachmentDirSizeLimit']) && $modSettings['attachmentDirSizeLimit'] > 4000 && $context['dir_size'] > ($modSettings['attachmentDirSizeLimit'] - 2000) * 1024
+			|| (!empty($modSettings['attachmentDirFileLimit']) && $modSettings['attachmentDirFileLimit'] * .95 < $context['dir_files'] && $modSettings['attachmentDirFileLimit'] > 500))
 		{
 			require_once($sourcedir . '/Subs-Admin.php');
 			emailAdmins('admin_attachments_full');
@@ -545,7 +545,7 @@ function attachmentChecks($attachID)
 
 		// // No room left.... What to do now???
 		if (!empty($modSettings['attachmentDirFileLimit']) && $context['dir_files'] + 2 > $modSettings['attachmentDirFileLimit']
-			|| (!empty($modSettings['attachmentDirFileLimit']) && $context['dir_size'] > $modSettings['attachmentDirSizeLimit'] * 1024))
+			|| (!empty($modSettings['attachmentDirSizeLimit']) && $context['dir_size'] > $modSettings['attachmentDirSizeLimit'] * 1024))
 		{
 			if (!empty($modSettings['automanage_attachments']) && $modSettings['automanage_attachments'] == 1)
 			{

+ 1 - 0
other/install_2-1_mysql.sql

@@ -1657,6 +1657,7 @@ VALUES ('smfVersion', '{$smf_version}'),
 	('attachmentPostLimit', '192'),
 	('attachmentNumPerPostLimit', '4'),
 	('attachmentDirSizeLimit', '10240'),
+	('attachmentDirFileLimit', '1000'),
 	('attachmentUploadDir', '{$boarddir}/attachments'),
 	('attachmentExtensions', 'doc,gif,jpg,mpg,pdf,png,txt,zip'),
 	('attachmentCheckExtensions', '0'),

+ 1 - 0
other/install_2-1_postgresql.sql

@@ -2146,6 +2146,7 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentSizeLimit'
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentPostLimit', '192');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentNumPerPostLimit', '4');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentDirSizeLimit', '10240');
+INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentDirFileLimit', '1000');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentUploadDir', '{$boarddir}/attachments');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentExtensions', 'doc,gif,jpg,mpg,pdf,png,txt,zip');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentCheckExtensions', '0');

+ 1 - 0
other/install_2-1_sqlite.sql

@@ -1799,6 +1799,7 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentSizeLimit'
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentPostLimit', '192');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentNumPerPostLimit', '4');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentDirSizeLimit', '10240');
+INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentDirFileLimit', '1000');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentUploadDir', '{$boarddir}/attachments');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentExtensions', 'doc,gif,jpg,mpg,pdf,png,txt,zip');
 INSERT INTO {$db_prefix}settings (variable, value) VALUES ('attachmentCheckExtensions', '0');