瀏覽代碼

Fixing double string conversion when sending messages see #3827

Julio Montoya 13 年之前
父節點
當前提交
37e4e65b5d
共有 3 個文件被更改,包括 23 次插入27 次删除
  1. 11 13
      main/messages/inbox.php
  2. 7 9
      main/messages/new_message.php
  3. 5 5
      main/social/group_invitation.php

+ 11 - 13
main/messages/inbox.php

@@ -43,8 +43,8 @@ function hide_icon_edit(element_html)  {
 /*
 		MAIN CODE
 */
-$nameTools = get_lang('Messages');
-$request=api_is_xml_http_request();
+$nameTools 	= get_lang('Messages');
+$request 	= api_is_xml_http_request();
 if (isset($_GET['form_reply']) || isset($_GET['form_delete'])) {
 	$info_reply=array();
 	$info_delete=array();
@@ -58,17 +58,15 @@ if (isset($_GET['form_reply']) || isset($_GET['form_delete'])) {
 	
 	if ( isset($_GET['form_delete']) ) {
 		//allow to delete messages
-		$info_delete=explode(',',$_GET['form_delete']);
-		$count_delete=(count($info_delete)-1);
+		$info_delete  = explode(',',$_GET['form_delete']);
+		$count_delete = (count($info_delete)-1);
 	}
 	
-	if ( isset($button_sent) ) {
-		$title     = api_convert_encoding(urldecode($info_reply[0]),'UTF-8',$charset);
-		$content   = api_convert_encoding(str_replace("\\","",urldecode($info_reply[1])),'UTF-8',$charset);
-		$title     = Security::remove_XSS($title);
-		$content   = Security::remove_XSS($content,COURSEMANAGERLOWSECURITY);
-
-		$user_reply= $info_reply[2];
+	if (isset($button_sent)) {		
+		$title     = urldecode($info_reply[0]);
+		$content   = str_replace("\\","",urldecode($info_reply[1]));		
+				
+		$user_reply = $info_reply[2];
 		$user_email_base=str_replace(')','(',$info_reply[5]);
 		$user_email_prepare=explode('(',$user_email_base);
 		if (count($user_email_prepare)==1) {
@@ -76,12 +74,12 @@ if (isset($_GET['form_reply']) || isset($_GET['form_delete'])) {
 		} elseif (count($user_email_prepare)==3) {
 			$user_email=trim($user_email_prepare[1]);
 		}
-		$user_id_by_email=MessageManager::get_user_id_by_email($user_email);
+		$user_id_by_email = MessageManager::get_user_id_by_email($user_email);
 
 		if ($info_reply[6]=='save_form') {
 			$user_id_by_email=$info_reply[2];
 		}
-		if ( isset($user_reply) && !is_null($user_id_by_email) && strlen($info_reply[0]) >0) {
+		if (isset($user_reply) && !is_null($user_id_by_email) && strlen($info_reply[0]) >0) {
 			MessageManager::send_message($user_id_by_email, $title, $content);
 			MessageManager::display_success_message($user_id_by_email);
 			inbox_display();

+ 7 - 9
main/messages/new_message.php

@@ -247,15 +247,13 @@ function manage_form ($default, $select_from_user_list = null) {
 
 	if ($form->validate()) {
 		$check = Security::check_token('post');		
-		if ($check) {
-			$values 		= $default;
-			$user_list		= $values['users'];
+		if ($check) {			
+			$user_list		= $default['users'];
 			$file_comments	= $_POST['legend'];
-			$title 			= $values['title'];
-			$content 		= $values['content'];
-			$group_id		= $values['group_id'];
-			$parent_id 		= $values['parent_id'];
-	
+			$title 			= $default['title'];			
+			$content 		= $default['content'];
+			$group_id		= $default['group_id'];
+			$parent_id 		= $default['parent_id'];	
 			if (is_array($user_list) && count($user_list)> 0) {                
 				//all is well, send the message                 
 				foreach ($user_list as $user) {
@@ -270,7 +268,7 @@ function manage_form ($default, $select_from_user_list = null) {
 				}       
 			} else {
 				Display::display_error_message('ErrorSendingMessage');
-			}
+			}			
 		}
 		Security::clear_token();
 	} else {

+ 5 - 5
main/social/group_invitation.php

@@ -217,11 +217,11 @@ if($_POST['form_sent']) {
 	}
 	if ($form_sent == 1) {
 		//invite this users
-		$result = GroupPortalManager::add_users_to_groups($user_list, array($group_id), GROUP_USER_PERMISSION_PENDING_INVITATION);
-		$title = get_lang('YouAreInvitedToGroup').' '.$group_info['name'];
-		$content = get_lang('YouAreInvitedToGroupContent').' '.$group_info['name'].' <br />';
-		$content .= get_lang('ToSubscribeClickInTheLinkBelow').' <br />';
-		$content .= '<a href="'.api_get_path(WEB_CODE_PATH).'social/invitations.php?accept='.$group_id.'">'.get_lang('Subscribe').'</a>';
+		$result 	= GroupPortalManager::add_users_to_groups($user_list, array($group_id), GROUP_USER_PERMISSION_PENDING_INVITATION);
+		$title 		= get_lang('YouAreInvitedToGroup').' '.$group_info['name'];
+		$content  	= get_lang('YouAreInvitedToGroupContent').' '.$group_info['name'].' <br />';
+		$content   .= get_lang('ToSubscribeClickInTheLinkBelow').' <br />';
+		$content   .= '<a href="'.api_get_path(WEB_CODE_PATH).'social/invitations.php?accept='.$group_id.'">'.get_lang('Subscribe').'</a>';
 
 		if (is_array($user_list) && count($user_list) > 0) {
 			//send invitation message