Home Explore Help
Register Sign In
Omnimaga
/
SMF2.1
mirror of [email protected]:Omnimaga/SMF2.1.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

! For some reason, some of the fixes that were in 2.0.5 weren't pushed to 2.1 as well. Better to be safe than sorry.

Signed-off-by: Peter Spicer <[email protected]>
Peter Spicer 10 years ago
parent
04537b5264
commit
a422db7098
3 changed files with 8 additions and 5 deletions
Split View Show Diff Stats
  1. 4 4
      Sources/ManageLanguages.php
  2. 1 1
      Sources/ManageNews.php
  3. 3 0
      Sources/PersonalMessage.php

+ 4 - 4
Sources/ManageLanguages.php
View File 

@@ -1011,10 +1011,10 @@ function ModifyLanguage()
 
 		$current_data = implode('', file($settings['default_theme_dir'] . '/languages/index.' . $context['lang_id'] . '.php'));
 
 		// These are the replacements. old => new
 
 		$replace_array = array(
 
-			'~\$txt\[\'lang_character_set\'\]\s=\s(\'|")[^\r\n]+~' => '$txt[\'lang_character_set\'] = \'' . addslashes($_POST['character_set']) . '\';',
 
-			'~\$txt\[\'lang_locale\'\]\s=\s(\'|")[^\r\n]+~' => '$txt[\'lang_locale\'] = \'' . addslashes($_POST['locale']) . '\';',
 
-			'~\$txt\[\'lang_dictionary\'\]\s=\s(\'|")[^\r\n]+~' => '$txt[\'lang_dictionary\'] = \'' . addslashes($_POST['dictionary']) . '\';',
 
-			'~\$txt\[\'lang_spelling\'\]\s=\s(\'|")[^\r\n]+~' => '$txt[\'lang_spelling\'] = \'' . addslashes($_POST['spelling']) . '\';',
 
+			'~\$txt\[\'lang_character_set\'\]\s=\s(\'|")[^\r\n]+~' => '$txt[\'lang_character_set\'] = \'' . preg_replace('~[^\w-]~i', '', $_POST['character_set']) . '\';',
 
+			'~\$txt\[\'lang_locale\'\]\s=\s(\'|")[^\r\n]+~' => '$txt[\'lang_locale\'] = \'' . preg_replace('~[^\w-]~i', '', $_POST['locale']) . '\';',
 
+			'~\$txt\[\'lang_dictionary\'\]\s=\s(\'|")[^\r\n]+~' => '$txt[\'lang_dictionary\'] = \'' . preg_replace('~[^\w-]~i', '', $_POST['dictionary']) . '\';',
 
+			'~\$txt\[\'lang_spelling\'\]\s=\s(\'|")[^\r\n]+~' => '$txt[\'lang_spelling\'] = \'' . preg_replace('~[^\w-]~i', '', $_POST['spelling']) . '\';',
 
 			'~\$txt\[\'lang_rtl\'\]\s=\s[A-Za-z0-9]+;~' => '$txt[\'lang_rtl\'] = ' . (!empty($_POST['rtl']) ? 'true' : 'false') . ';',
 
 		);
 
 		$current_data = preg_replace(array_keys($replace_array), array_values($replace_array), $current_data);

+ 1 - 1
Sources/ManageNews.php
View File 

@@ -775,7 +775,7 @@ function SendMailing($clean_only = false)
 
 		foreach ($addressed as $curmem)
 
 		{
 
 			$curmem = trim($curmem);
 
-			if ($curmem != '')
 
+			if ($curmem != '' && preg_match('~^[0-9A-Za-z=_\'+\-/\.]*@[\w\-]+(\.[\w\-]+)*(\.[\w]{2,6})$~', $curmem) !== 0)
 
 				$context['recipients']['emails'][$curmem] = $curmem;
 
 		}
 
 	}

+ 3 - 0
Sources/PersonalMessage.php
View File 

@@ -205,7 +205,10 @@ function MessageMain()
 
 	);
 
 
 	if (!isset($_REQUEST['sa']) || !isset($subActions[$_REQUEST['sa']]))
 
+	{
 
+		$_REQUEST['sa'] = '';
 
 		MessageFolder();
 
+	}
 
 	else
 
 	{
 
 		if (!isset($_REQUEST['xml']))