[svn r18878] logic changes - allow view shared profile - (partial FS#3751)

skala
Isaac Flores 16 years ago
parent 6d756a1de6
commit 917876aa46
  1. 18
      main/messages/send_message_to_userfriend.inc.php
  2. 8
      main/social/data_personal.inc.php
  3. 2
      main/social/group_contact.inc.php
  4. 108
      main/social/profile.php
  5. 4
      whoisonline.php

@ -49,7 +49,13 @@ if (api_get_setting('allow_message_tool')!='true'){
<td><div class="message-top-title">
<table width="600" border="0" height="20">
<td width="450"><?php echo get_lang('SocialNetwork');?></td>
<?php
if (!isset($_REQUEST['view'])) {
?>
<td width="150"><a href="javascript:void(0)" onclick="change_panel('3','<?php echo $userfriend_id; ?>')" ><?php echo Display::return_icon('folder_up.gif',get_lang('MoreOptions')).'&nbsp;&nbsp;'.get_lang('MoreOptions')?></a></td>
<?php
}
?>
</table>
</div></td>
</tr>
@ -66,9 +72,21 @@ if (api_get_setting('allow_message_tool')!='true'){
<div class="message-conten-body-right">
<div id="id_content_panel_init"><!--init content changed -->
<dl>
<?php
if (!isset($_REQUEST['view'])) {
?>
<dd><a href="javascript:void(0)" onclick="change_panel('2','<?php echo $userfriend_id; ?>')"><?php echo get_lang('SocialAddToContact')?></a></dd>
<?php
}
?>
<dd><a href="javascript:void(0)" onclick="change_panel('1','<?php echo $userfriend_id; ?>')"><?php echo get_lang('SocialSendMessage');?></a></dd>
<?php
if (!isset($_REQUEST['view'])) {
?>
<dd><a href="main/social/index.php#remote-tab-5"><?php echo get_lang('SocialSeeContacts'); ?></a></dd>
<?php
}
?>
</dl>
</div><!-- end content changed-->

@ -82,10 +82,10 @@ if (isset($_POST['load_ajax'])) {
} else {
// normal behavior
echo '<div id="actions">';
echo '<a href="../auth/profile.php?show=1"">'.Display::return_icon('edit.gif').'&nbsp;'.mb_convert_encoding(get_lang('EditInformation'),'UTF-8',$charset).'</a>';
echo '</div">';
echo '<div id="actions" class="actions">';
echo '<a href="../auth/profile.php?show=1"">'.Display::return_icon('edit.gif').'&nbsp;'.mb_convert_encoding(get_lang('EditInformation'),'UTF-8',$charset).'</a>&nbsp;&nbsp;';
echo '<a href="../social/profile.php">'.Display::return_icon('edit.gif').'&nbsp;'.mb_convert_encoding(get_lang('ViewSharedProfile'),'UTF-8',$charset).'</a>';
echo '</div>';
echo '<div id="profile_container" style="width:500px;">';
echo '<div id="picture" style="width:200px;float:right;position:relative;">';
echo '<img src='.$img_array['dir'].$img_array['file'].' />';

@ -62,7 +62,7 @@ if (count($list_path_friends)!=0) {
if ($list_friends_file[$j]<>"") {
$user_info=api_get_user_info($list_friends_id[$j]);
$name_user=$user_info['firstName'].' '.$user_info['lastName'];
$friend_html.='&nbsp;<div class="image-social-content" id=div_'.$list_friends_id[$j].' style="float:left" ><a href="javascript:void(0)" onclick=load_thick("'.$list_friends_dir[$j].$list_friends_file[$j].'","'.urlencode($name_user).'") title="" class="thickbox"><img src="'.$list_friends_dir[$j].$list_friends_file[$j].'" width="90" height="110" style="margin-left:3px ;margin-rigth:3px;margin-top:10px;margin-bottom:3px;" id="imgfriend_'.$list_friends_id[$j].'" title="'.$name_user.'" /></a></div>&nbsp;';
$friend_html.='&nbsp;<div class="image-social-content" id=div_'.$list_friends_id[$j].' style="float:left" ><a href="javascript:void(0)" onclick=load_thick("'.$list_friends_dir[$j].'big_'.$list_friends_file[$j].'","'.urlencode($name_user).'") title="" class="thickbox"><img src="'.$list_friends_dir[$j].$list_friends_file[$j].'" width="90" height="110" style="margin-left:3px ;margin-rigth:3px;margin-top:10px;margin-bottom:3px;" id="imgfriend_'.$list_friends_id[$j].'" title="'.$name_user.'" /></a></div>&nbsp;';
}
$j++;
}

@ -29,6 +29,7 @@
$language_file = array('registration','messages','userInfo','admin');
$cidReset = true;
require '../inc/global.inc.php';
require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');
require_once (api_get_path(LIBRARY_PATH).'social.lib.php');
@ -40,7 +41,6 @@ define(SOCIALGOODFRIEND,4);
define(SOCIALENEMY,5);
define(SOCIALDELETED,6);
*/
$user_id = api_get_user_id();
$show_full_profile = true;
@ -86,7 +86,8 @@ api_block_anonymous_users();
$htmlHeadXtra[] = '<script src="../inc/lib/javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
$htmlHeadXtra[] = '<script src="../inc/lib/javascript/jquery.corners.min.js" type="text/javascript" language="javascript"></script>'; //jQuery corner
$htmlHeadXtra[] = '<script type="text/javascript" src="../inc/lib/javascript/thickbox.js"></script>';
$htmlHeadXtra[] = '<link rel="stylesheet" href="../inc/lib/javascript/thickbox.css" type="text/css" media="projection, screen">';
$htmlHeadXtra[] = '
<script type="text/javascript">
function toogle_function (element_html, course_code){
@ -120,9 +121,93 @@ function toogle_function (element_html, course_code){
});
}
</script>';
$htmlHeadXtra[] = '<script type="text/javascript">
$(document).ready(function (){
$("input#id_btn_send_invitation").bind("click", function(){
if (confirm("'.get_lang('SendMessageInvitation').'")) {
$("#form_register_friend").submit();
}
});
});
function change_panel (mypanel_id,myuser_id) {
$.ajax({
contentType: "application/x-www-form-urlencoded",
beforeSend: function(objeto) {
$("#id_content_panel").html("'.get_lang('Loading').'"); },
type: "POST",
url: "../messages/send_message.php",
data: "panel_id="+mypanel_id+"&user_id="+myuser_id,
success: function(datos) {
$("div#id_content_panel_init").html(datos);
$("div#display_response_id").html("");
}
});
}
function action_database_panel(option_id,myuser_id) {
if (option_id==5) {
my_txt_subject=$("#txt_subject_id").val();
} else {
my_txt_subject="clear";
}
my_txt_content=$("#txt_area_invite").val();
if (my_txt_content.length==0 || my_txt_subject.length==0) {
$("#display_response_id").html("&nbsp;&nbsp;&nbsp;'.get_lang('MessageInformationBySendMessage').'");
setTimeout("message_information_display()",3000);
return false;
}
$.ajax({
contentType: "application/x-www-form-urlencoded",
beforeSend: function(objeto) {
$("#display_response_id").html("'.get_lang('Loading').'"); },
type: "POST",
url: "../messages/send_message.php",
data: "panel_id="+option_id+"&user_id="+myuser_id+"&txt_subject="+my_txt_subject+"&txt_content="+my_txt_content,
success: function(datos) {
$("#display_response_id").html(datos);
}
});
}
function display_hide () {
setTimeout("hide_display_message()",3000);
}
function message_information_display() {
$("#display_response_id").html("");
}
function hide_display_message () {
$("div#display_response_id").html("");
try {
$("#txt_subject_id").val("");
$("#txt_area_invite").val("");
}catch(e) {
$("#txt_area_invite").val("");
}
}
</script>';
$interbreadcrumb[]= array ('url' => '#','name' => get_lang('ModifyProfile') );
$interbreadcrumb[]= array (
'url' => '../social/index.php?#remote-tab-1',
'name' => get_lang('ViewSharedProfile')
);
if (isset($_GET['u'])) {
$info_user=api_get_user_info(api_get_user_id());
$interbreadcrumb[]= array (
'url' => '../social/profile.php'.$param_user,
'name' => $info_user['firstName'].' '.$info_user['lastName']
);
}
if (isset($_GET['u'])) {
$info_user=api_get_user_info(Security::remove_XSS($_GET['u']));
$param_user='?u='.Security::remove_XSS($_GET['u']);
}else {
$info_user=api_get_user_info(api_get_user_id());
$param_user='';
}
$interbreadcrumb[]= array ('url' => '#','name' => get_lang('Profile') );
$interbreadcrumb[]= array (
'url' => '../social/profile.php'.$param_user,
'name' => $info_user['firstName'].' '.$info_user['lastName']
);
$_SESSION['social_user_id'] = $user_id;
function get_logged_user_course_html($my_course, $count) {
@ -456,23 +541,20 @@ echo '<div id="social-profile-container">';
if (api_get_user_id() == $user_id) {
// if i'm me
echo Display::return_icon('email.gif');
echo '&nbsp;&nbsp;<a href="../auth/profile.php?show=1">'.get_lang('MyInbox').'</a><br />';
echo '&nbsp;&nbsp;<a href="../social/index.php#remote-tab-2">'.get_lang('MyInbox').'</a><br />';
echo Display::return_icon('edit.gif');
echo '&nbsp;&nbsp;<a href="../auth/profile.php?show=1">'.get_lang('EditInformation').'</a>';
} else {
echo Display::return_icon('message_new.png');
echo '&nbsp;&nbsp;<a href="#">'.get_lang('SendMessage').'</a>';
echo '&nbsp;&nbsp;<a href="../messages/send_message_to_userfriend.inc.php?height=365&width=610&user_friend='.$user_id.'&view=profile" class="thickbox" title="'.get_lang('SendMessage').'">'.Display::return_icon('message_new.png').'&nbsp;&nbsp;'.get_lang('SendMessage').'</a><br />';
//echo '&nbsp;&nbsp;<a href="#">'.get_lang('SendMessage').'</a>';
}
echo '<br /><br />';
// Send message or Add to friend links
if (!$show_full_profile) {
echo Display::return_icon('message_new.png');
echo '&nbsp;&nbsp;<a href="#">';
echo get_lang('AddToFriends');
echo '</a>';
}
/*if (!$show_full_profile) {
echo '&nbsp;&nbsp;<a href="../messages/send_message_to_userfriend.inc.php?height=365&width=610&user_friend='.$user_id.'&view=profile" class="thickbox" title="'.get_lang('SendMessage').'">'.Display::return_icon('message_new.png').'&nbsp;&nbsp;'.get_lang('SendMessage').'</a><br />';
}*/
if ($show_full_profile) {
//-- Extra Data

@ -1,4 +1,4 @@
<?php // $Id: whoisonline.php 18867 2009-03-09 14:59:20Z iflorespaz $
<?php // $Id: whoisonline.php 18878 2009-03-09 16:58:15Z iflorespaz $
/*
==============================================================================
Dokeos - elearning and course management software
@ -166,7 +166,7 @@ function display_user_list($user_list, $_plugins)
if ($user_info['user_id'] != api_get_user_id()) {
$user_relation=UserFriend::get_relation_between_contacts(api_get_user_id(),$user_info['user_id']);
if ($user_relation==0 || $user_relation==6) {
$table_row[] = '<a href="main/messages/send_message_to_userfriend.inc.php?height=365&width=610&user_friend='.$user_info['user_id'].'" class="thickbox" title="Add users"><img src="main/img/addd.gif"></a>';
$table_row[] = '<a href="main/messages/send_message_to_userfriend.inc.php?height=365&width=610&user_friend='.$user_info['user_id'].'" class="thickbox" title="'.get_lang('AddUsers').'"><img src="main/img/addd.gif"></a>';
} else {
$table_row[] = '<img src="main/img/add_na.gif">';
}

Loading…
Cancel
Save