[svn r18445] logic changes - allow send messages to users online - (partial FS#3560)

main/messages/inbox.php

@@ -89,7 +89,7 @@ if ($request===false) {
 } else {
 	$link_ref="../messages/new_message.php?rs=1";
 }
-api_display_tool_title('');
+api_display_tool_title(get_lang('Inbox'));
 
 $table_message = Database::get_main_table(TABLE_MESSAGE);
 

main/social/index.php

@@ -1,6 +1,5 @@
 <?php
-$language_file = array('registration','messages','userInfo');//$cidReset = true;
-
+$language_file = array('registration','messages','userInfo','admin');
 require '../inc/global.inc.php';
 require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
 $this_section = SECTION_MYPROFILE;
@@ -255,18 +254,18 @@ Display :: display_header('');
 ?>
 <div id="container-9">
     <ul>
-        <li><a href="data_personal.inc.php"><span><?php echo get_lang('PersonalData') ?></span></a></li>
+        <li><a href="data_personal.inc.php"><span><?php echo get_lang('PersonalData'); ?></span></a></li>
         <?php 
        	if (api_get_setting('allow_message_tool')=='true') { 
        	?>        
-        <li><a href="../messages/inbox.php"><span><?php echo get_lang('Inbox') ?></span></a></li>
-        <li><a href="../messages/outbox.php"><span><?php echo get_lang('Outbox') ?></span></a></li>
+        <li><a href="../messages/inbox.php"><span><?php echo get_lang('Inbox'); ?></span></a></li>
+        <li><a href="../messages/outbox.php"><span><?php echo get_lang('Outbox'); ?></span></a></li>
         <?php }
   	 	if (api_get_setting('allow_social_tool')=='true') {      
         ?>
-        <li><a href="select_friend_response.php"><span><?php echo get_lang('Invites') ?></span></a></li>
-        <li><a href="contacts.inc.php"><span><?php echo get_lang('Contacts') ?></span></a></li>
-        <li><a href="group_contact.inc.php"><span><?php echo get_lang('ContactsGroups') ?></span></a></li>
+        <li><a href="select_friend_response.php"><span><?php echo get_lang('Invites'); ?></span></a></li>
+        <li><a href="contacts.inc.php"><span><?php echo get_lang('Contacts'); ?></span></a></li>
+        <li><a href="group_contact.inc.php"><span><?php echo get_lang('ContactsGroups'); ?></span></a></li>
         <?php
   	 	}
         ?>    

main/social/select_options.php

@@ -10,7 +10,7 @@ $html_form='<select id="id_search_name" name="id_search_name" size="8"" class="m
 $sql='SELECT DISTINCT u.user_id as id,concat(u.firstname," ",u.lastname," ","( ",u.email," )") as name
 FROM '.$tbl_my_user.' u INNER JOIN '.$track_online_table.' t ON u.user_id=t.login_user_id';
 if (api_get_setting('allow_social_tool')=='true') {
-	$sql.=' INNER JOIN '.$tbl_my_user_friend.' uf ON uf.friend_user_id=u.user_id ';
+	//$sql.=' INNER JOIN '.$tbl_my_user_friend.' uf ON uf.friend_user_id=u.user_id ';
 }  
 $res=api_sql_query($sql,__FILE__,__LINE__);
 while ($row=Database::fetch_array($res,'ASSOC')) {