[svn r21549] logic changes - improvements in message tool - (partial FS#3909)

skala
Isaac Flores 16 years ago
parent 58a144ad69
commit ef710e0ee5
  1. 3
      main/social/select_options.php
  2. 4
      whoisonline.php

@ -13,8 +13,7 @@ if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_messa
$sql = 'SELECT u.user_id as id,concat(u.firstname," ",u.lastname," ","( ",u.email," )") as name
FROM '.$tbl_my_user_friend.' uf ' .
'INNER JOIN '.$tbl_my_user.' AS u ON uf.friend_user_id = u.user_id ' .
'WHERE relation_type<>6 AND friend_user_id<>'.(int)$user_id.' AND uf.user_id<>'.(int)$user_id.
' AND concat(u.firstName,u.lastName) like CONCAT("%","'.$search.'","%") ';
'WHERE relation_type<>6 AND friend_user_id<>'.(int)$user_id.' AND concat(u.firstName,u.lastName) like CONCAT("%","'.$search.'","%") ';
} elseif (api_get_setting('allow_social_tool')=='false' && api_get_setting('allow_message_tool')=='true') {
$valid=api_get_setting('time_limit_whosonline');
$sql='SELECT DISTINCT u.user_id as id,concat(u.firstname," ",u.lastname," ","( ",u.email," )") as name

@ -1,4 +1,4 @@
<?php // $Id: whoisonline.php 21119 2009-05-30 22:58:11Z iflorespaz $
<?php // $Id: whoisonline.php 21549 2009-06-21 14:02:37Z iflorespaz $
/*
==============================================================================
Dokeos - elearning and course management software
@ -181,7 +181,7 @@ function display_user_list($user_list, $_plugins)
}
$user_anonymous=api_get_anonymous_id();
if (api_get_setting('allow_social_tool')=='true' && api_get_user_id()<>$user_anonymous && api_get_user_id()<>0) {
$table_header[] = array(get_lang('Friends'),false,'width="150"');
$table_header[] = array(get_lang('Friends'),false,'width="200"');
}
/*this feature is deprecated
if ( api_get_setting('allow_message_tool')=='true' && isset($_SESSION['_user'])) {

Loading…
Cancel
Save