Merge branch 'HEAD' of ssh://git@git.raylu.net/pathery

1 files changed, 4 insertions, 3 deletions

diff --git a/pages/cp.php b/pages/cp.php
index d5fff2b..0f355f4 100644
--- a/pages/cp.php
+++ b/pages/cp.php
@@ -32,6 +32,7 @@ if (!$accepted) {
 

 include('./includes/maps.php');

 include_once('./includes/sqlEmbedded.php');

+include_once('./includes/chats.php');

 

 function validatename($name) {

 	if (strlen($name) < 1) return "Name to short";

@@ -68,7 +69,6 @@ function setOptedOutOfEmails($userID, $setting) {
 if (isset($_POST['updateSettings']) AND $_POST['updateSettings'] == 'true') {

 	$userID = $_SESSION['userID'];

 	if (isset($_POST['displayName'])) {

-		

 		//$inputname = stripSlashes($_POST['displayName']);

 		$inputname = $_POST['displayName'];

 		//Validate before replacements. To perevent < becoming &gt; (longer)

@@ -76,9 +76,9 @@ if (isset($_POST['updateSettings']) AND $_POST['updateSettings'] == 'true') {
 		

 		//$inputname = htmlentities($inputname);

 		$inputname = htmlspecialchars($inputname, ENT_COMPAT | ENT_HTML5);

-		$inputname = chatFilter($inputname);

+		$inputname = filterStringForBadLanguage($inputname);

 		$inputname = str_replace("  ", "&nbsp;&nbsp;", $inputname);

-

+		

 		if ($nameError === true) {

 			$inputname = sql_clean($inputname);

 			$sql = "UPDATE `users`

@@ -86,6 +86,7 @@ if (isset($_POST['updateSettings']) AND $_POST['updateSettings'] == 'true') {
 			WHERE `ID` = '$userID'

 			";

 			mysql_query($sql);

+

 			$_SESSION['displayName'] = $inputname;

 			$r .= "<br />Name change success!";

 		} else {