Escaped HTML special characters in username

delta · Mar 11, 2019 · ce4c462 · ce4c462
1 parent f11639e
commit ce4c462
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cms/profile.lib.php b/cms/profile.lib.php
@@ -74,8 +74,8 @@ function profile($userId, $forEditRegistrant = false) {
 		return '';
 	}
 	$profileRow = mysqli_fetch_row($profileResult);
-	$newUserName = $userName = $profileRow[0];
-	$newUserFullname = $userFullname = $profileRow[1];
+	$newUserName = $userName = htmlspecialchars_decode($profileRow[0]);
+	$newUserFullname = $userFullname = htmlspecialchars_decode($profileRow[1]);
 	$userPassword = $profileRow[2];
 
 	require_once("$sourceFolder/$moduleFolder/form/registrationformsubmit.php");
@@ -93,12 +93,12 @@ function profile($userId, $forEditRegistrant = false) {
 			$updates = array();
 
 			if (isset($_POST['user_name']) && $_POST['user_name'] != '' && $_POST['user_name'] != $userName) {
-				$newUserName = escape($_POST['user_name']);
+				$newUserName = htmlspecialchars(escape($_POST['user_name']));
 				$updates[] = "`user_name` = '".$newUserName."'";
 			}
 			if (isset($_POST['user_fullname']) && $_POST['user_fullname'] != '' && $_POST['user_fullname'] != $userFullname) {
-				$newUserFullname = escape($_POST['user_fullname']);
-				$updates[] = "`user_fullname` = '".$newUserFullname."'";
+				$newUserFullname = htmlspecialchars(escape($_POST['user_fullname']));
+				$updates[] = "`user_fullname` = '".htmlspecialchars($newUserFullname)."'";
 			}
 			$errors = true;
 			if (!$forEditRegistrant && $_POST['user_newpassword'] != '') {

diff --git a/cms/registration.lib.php b/cms/registration.lib.php
@@ -50,7 +50,7 @@ function getRegistrationForm() {
 	if(isset($_POST['user_name']))
 		$name_val = htmlspecialchars(escape($_POST['user_name']));
 	if(isset($_POST['user_email']))
-		$fullname_val = escape($_POST['user_fullname']);
+		$fullname_val = htmlspecialchars(escape($_POST['user_fullname']));
 	$reg_str =<<<REG
 <script language="javascript">
 			function checkPassword(inputhandler2) {