diff --git a/main/img/shared_profile.png b/main/img/shared_profile.png new file mode 100644 index 0000000000..9e2fd57f29 Binary files /dev/null and b/main/img/shared_profile.png differ diff --git a/main/messages/inbox.php b/main/messages/inbox.php index b3907838e1..067c875cf7 100755 --- a/main/messages/inbox.php +++ b/main/messages/inbox.php @@ -105,6 +105,10 @@ if (isset($_GET['form_reply']) || isset($_GET['form_delete'])) { $user_email=trim($user_email_prepare[1]); } $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) { MessageManager::send_message($user_id_by_email, $title, $content); MessageManager::display_success_message($user_id_by_email); @@ -151,7 +155,7 @@ if ($request===false) { $link_ref="../messages/new_message.php?rs=1"; } $table_message = Database::get_main_table(TABLE_MESSAGE); -echo '
  '; +echo '
'; api_display_tool_title(mb_convert_encoding(get_lang('Inbox'),'UTF-8',$charset)); echo '
'; echo ''.Display::return_icon('message_new.png',get_lang('ComposeMessage')).get_lang('ComposeMessage').''; diff --git a/main/messages/new_message.php b/main/messages/new_message.php index 6d095c29ee..a8fc10d2d2 100755 --- a/main/messages/new_message.php +++ b/main/messages/new_message.php @@ -1,4 +1,4 @@ -'; -$nameTools = get_lang('ComposeMessage'); + +$nameTools=($request===true) ? mb_convert_encoding(get_lang('ComposeMessage'),'UTF-8',$charset) : get_lang('ComposeMessage'); $fck_attribute['Height'] = "150"; $fck_attribute['Width'] = "95%"; $fck_attribute['ToolbarSet'] = "Profil"; @@ -168,7 +170,8 @@ function manage_form ($default, $select_from_user_list = null) { $form->add_textfield('title', mb_convert_encoding(get_lang('Title'),'UTF-8',$charset)); $form->add_html_editor('content', '',false,false); if (isset($_GET['re_id'])) { - $form->addElement('hidden','re_id',$_GET['re_id']); + $form->addElement('hidden','re_id',Security::remove_XSS($_GET['re_id'])); + $form->addElement('hidden','save_form','save_form'); } $form->addElement('submit', 'compose', get_lang('Send')); $form->setDefaults($default); @@ -210,11 +213,10 @@ if (isset($_GET['rs'])) { 'url' => '#', 'name' => get_lang('ComposeMessage') ); -$request=api_is_xml_http_request(); + if ($request===false) { Display::display_header(''); } - api_display_tool_title($nameTools); echo '
'; echo ''.Display::return_icon('folder_up.gif',get_lang('BackToInbox')).get_lang('BackToInbox').''; diff --git a/main/messages/outbox.php b/main/messages/outbox.php index d72aaafa5c..19e90e80fd 100755 --- a/main/messages/outbox.php +++ b/main/messages/outbox.php @@ -112,7 +112,7 @@ if( trim($info_delete_outbox[0])=='delete' ) { } /**************************************************************/ $table_message = Database::get_main_table(TABLE_MESSAGE); -echo '
  '; +echo '
'; api_display_tool_title(mb_convert_encoding(get_lang('Outbox'),'UTF-8',$charset)); echo '
'; $language_variable=($request===true) ? mb_convert_encoding(get_lang('MessageOutboxComment'),'UTF-8',$charset) : get_lang('MessageOutboxComment'); diff --git a/main/social/contacts.inc.php b/main/social/contacts.inc.php index 86bed88876..ac30f188ac 100755 --- a/main/social/contacts.inc.php +++ b/main/social/contacts.inc.php @@ -10,6 +10,9 @@ require_once '../inc/lib/social.lib.php'; $this_section = SECTION_MYPROFILE; $_SESSION['this_section']=$this_section; //$list_path_friends=array(); +$request=api_is_xml_http_request(); +$language_variable=($request===true) ? mb_convert_encoding(get_lang('Contacts'),'UTF-8',$charset) : get_lang('Contacts'); +api_display_tool_title($language_variable); ?>
diff --git a/main/social/data_personal.inc.php b/main/social/data_personal.inc.php index e5a5bba8cf..fc8fe1206c 100755 --- a/main/social/data_personal.inc.php +++ b/main/social/data_personal.inc.php @@ -21,7 +21,7 @@ ============================================================================== */ -$language_file = array('registration','messages','userInfo','admin'); +$language_file = array('registration','messages','userInfo','admin','forum','blog'); require_once ('../inc/global.inc.php'); require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php'); @@ -30,6 +30,7 @@ require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php'); $user_info= UserManager::get_user_info_by_id(api_get_user_id()); $img_array= UserManager::get_user_picture_path_by_id(api_get_user_id(),'web',true,true); + if (isset($_POST['load_ajax'])) { require_once (api_get_path(LIBRARY_PATH).'blog.lib.php'); require_once (api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php'); @@ -106,10 +107,14 @@ if (isset($_POST['load_ajax'])) { } } else { // normal behavior +$request=api_is_xml_http_request(); +$language_variable=($request===true) ? mb_convert_encoding(get_lang('PersonalData'),'UTF-8',$charset) : get_lang('PersonalData'); +api_display_tool_title($language_variable); + echo ''; echo '
'; diff --git a/main/social/group_contact.inc.php b/main/social/group_contact.inc.php index 91b2180343..e500e3e3bf 100755 --- a/main/social/group_contact.inc.php +++ b/main/social/group_contact.inc.php @@ -11,6 +11,9 @@ $this_section = SECTION_MYPROFILE; $_SESSION['this_section']=$this_section; $list_path_friends=array(); $list_groups=array(); +$request=api_is_xml_http_request(); +$language_variable=($request===true) ? mb_convert_encoding(get_lang('ContactsGroups'),'UTF-8',$charset) : get_lang('ContactsGroups'); +api_display_tool_title($language_variable); ?>
diff --git a/main/social/index.php b/main/social/index.php index 8666b0a913..5917f8ff81 100755 --- a/main/social/index.php +++ b/main/social/index.php @@ -449,6 +449,7 @@ if (isset($_GET['sendform'])) { $form_reply[]=$_POST['re_id']; $form_reply[]=urlencode($_POST['compose']); $form_reply[]=urlencode($_POST['id_text_name']); + $form_reply[]=urlencode($_POST['save_form']); $form_info=implode(',',$form_reply); $form_send_data_message='?form_reply='.$form_info; } elseif (isset($_GET['inbox'])) { @@ -473,18 +474,18 @@ $form_url_send=isset($form_send_data_message) ? $form_send_data_message :'';
    -
    • +
    • -
    • -
    • +
    • +
    • -
    • -
    • -
    • +
    • +
    • +
    • diff --git a/main/social/profile.php b/main/social/profile.php index 116197ba5f..41aaa56599 100644 --- a/main/social/profile.php +++ b/main/social/profile.php @@ -9,7 +9,7 @@ /** * Init */ -$language_file = array('registration','messages','userInfo','admin'); +$language_file = array('registration','messages','userInfo','admin','forum','blog'); $cidReset = true; require '../inc/global.inc.php'; require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php'); diff --git a/main/social/select_friend_response.php b/main/social/select_friend_response.php index 38bd72cd69..fa3be022f8 100755 --- a/main/social/select_friend_response.php +++ b/main/social/select_friend_response.php @@ -8,10 +8,11 @@ $this_section = SECTION_MYPROFILE; $_SESSION['this_section']=$this_section; api_block_anonymous_users(); $request=api_is_xml_http_request(); +$language_variable=($request===true) ? mb_convert_encoding(get_lang('SocialInvitesComment'),'UTF-8',$charset) : get_lang('SocialInvitesComment'); +api_display_tool_title($language_variable); ?>