Fixing bug when adding a contact directly in the shared profile

skala
Julio Montoya 14 years ago
parent 0a75e6004c
commit ba520e97f1
  1. 14
      main/inc/ajax/social.ajax.php
  2. 2
      main/inc/lib/message.lib.php
  3. 38
      main/social/profile.php

@ -3,6 +3,7 @@
/**
* Responses to AJAX calls
*/
$language_file = array('messages','userInfo');
require_once '../global.inc.php';
$action = $_GET['a'];
@ -10,8 +11,7 @@ $action = $_GET['a'];
$current_user_id = api_get_user_id();
switch ($action) {
case 'add_friend':
if (api_is_anonymous()){
if (api_is_anonymous()) {
echo '';
break;
}
@ -33,7 +33,6 @@ switch ($action) {
UserManager::relate_users($current_user_id,$my_current_friend,$relation_type);
UserManager::relate_users($my_current_friend,$current_user_id,$relation_type);
SocialManager::invitation_accepted($my_current_friend,$current_user_id);
if (isset($_POST['is_my_friend'])) {
@ -42,14 +41,12 @@ switch ($action) {
Display::display_normal_message(api_xml_http_response_encode(get_lang('AddedContactToList')));
}
}
break;
case 'deny_friend':
if (api_is_anonymous()){
echo '';
break;
}
$my_current_friend = Security::remove_XSS($_POST['friend_id']);
$my_denied_current_friend= Security::remove_XSS($_POST['denied_friend_id']);
$my_delete_friend = Security::remove_XSS($_POST['delete_friend_id']);
@ -67,8 +64,7 @@ switch ($action) {
}
break;
case 'delete_friend':
if (api_is_anonymous()){
if (api_is_anonymous()) {
echo '';
break;
}
@ -91,7 +87,6 @@ switch ($action) {
}*/
break;
case 'show_my_friends':
if (api_is_anonymous()) {
echo '';
break;
@ -153,7 +148,6 @@ switch ($action) {
switch ($action) {
case 'load_course' :
$course_db = $_POST['course_code'];
$course_id = CourseManager::get_course_id_by_database_name($course_db);
if (api_is_user_of_course($course_id, api_get_user_id())) {

@ -1259,7 +1259,9 @@ function inbox_display() {
$table->set_additional_parameters($parameters);
}
$table->set_form_actions(array ('delete' => get_lang('DeleteSelectedMessages')));
$table->display();
}
function get_number_of_messages_mask() {

@ -161,23 +161,24 @@ function hide_display_message () {
}
}
function register_friend(element_input) {
if(confirm("'.get_lang('AddToFriends').'")) {
if(confirm("'.get_lang('AddToFriends').'")) {
name_button=$(element_input).attr("id");
name_div_id="id_"+name_button.substring(13);
user_id=name_div_id.split("_");
user_friend_id=user_id[1];
$.ajax({
$.ajax({
contentType: "application/x-www-form-urlencoded",
beforeSend: function(objeto) {
$("div#dpending_"+user_friend_id).html("<img src=\'../inc/lib/javascript/indicator.gif\' />"); },
$("div#dpending_"+user_friend_id).html("<img src=\'../inc/lib/javascript/indicator.gif\' />");
},
type: "POST",
url: "'.api_get_path(WEB_AJAX_PATH).'social.ajax.php?a=add_friend",
data: "friend_id="+user_friend_id+"&is_my_friend="+"friend",
success: function(datos) {
$("form").submit()
$("#dpending_" + user_friend_id).html(datos);
}
});
}
}
}
</script>';
@ -583,23 +584,28 @@ if ($show_full_profile) {
}
}
echo '<div class="rounded_div" style="width:280px">';
//--Productions
$production_list = UserManager::build_production_list($user_id);
if (!empty($production_list )) {
echo '<div><h3>'.get_lang('MyProductions').'</h3></div>';
echo '<div class="rounded1">';
echo $production_list;
echo '</div>';
$product_content = '';
if (!empty($production_list)) {
$product_content .= '<div><h3>'.get_lang('MyProductions').'</h3></div>';
$product_content .= '<div class="rounded1">';
$product_content .= $production_list;
$product_content .= '</div>';
}
// Images uploaded by course
if (!empty($file_list)) {
echo '<div><h3>'.get_lang('ImagesUploaded').'</h3></div>';
echo '<div class="social-content-information">';
echo $file_list;
echo '</div>';
$product_content .= '<div><h3>'.get_lang('ImagesUploaded').'</h3></div>';
$product_content .= '<div class="social-content-information">';
$product_content .= $file_list;
$product_content .= '</div>';
}
if (!empty($product_content)) {
echo '<div class="rounded_div" style="width:280px">';
echo $product_content;
echo '</div>'; // close rounded
}
echo '</div>'; // close rounded
}

Loading…
Cancel
Save