Fixes #1220 XSS vulnerability with CKEditor field is addressed

modules/Users/actions/Save.php

@@ -78,8 +78,9 @@ class Users_Save_Action extends Vtiger_Save_Action {
 			}
             if($fieldName == 'signature' && $fieldValue !== null){
                 $fieldValue = $request->getRaw($fieldName);
-                $processedContent = preg_replace('#<script(.*?)>(.*?)</script>#is', '', $fieldValue);
-                $fieldValue = to_html(purifyHtmlEventAttributes($processedContent,TRUE));
+                $purifiedContent = vtlib_purify(decode_html($fieldValue));
+                // Purify malicious html event attributes
+                $fieldValue = purifyHtmlEventAttributes(decode_html($purifiedContent),true);
 			}
 
 			if($fieldValue !== null) {

modules/Vtiger/actions/Save.php

@@ -162,8 +162,9 @@ class Vtiger_Save_Action extends Vtiger_Action_Controller {
 			}
             if($fieldName == 'notecontent' && $fieldValue !== null){
                 $fieldValue = $request->getRaw($fieldName);
-                $processedContent = preg_replace('#<script(.*?)>(.*?)</script>#is', '', $fieldValue);
-                $fieldValue = to_html(purifyHtmlEventAttributes($processedContent,TRUE));
+                $purifiedContent = vtlib_purify(decode_html($fieldValue));
+                // Purify malicious html event attributes
+                $fieldValue = purifyHtmlEventAttributes(decode_html($purifiedContent),true);
 			}
 			if($fieldValue !== null) {
 				if(!is_array($fieldValue) && $fieldDataType != 'currency') {