chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[svn r22569] logic changes-improvements in social tool - (partial FS#4447)

Browse Source
skala
Isaac Flores 16 years ago
parent ca5fbb5622
commit 9fcf30dba8
4 changed files with 41 additions and 21 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 38
      main/forum/forumfunction.inc.php
  2. 5
      main/inc/lib/blog.lib.php
  3. 11
      main/inc/lib/course.lib.php
  4. 8
      main/social/data_personal.inc.php

38
main/forum/forumfunction.inc.php
Unescape View File

@ -3898,23 +3898,28 @@ function get_thread_user_post($course_db, $thread_id, $user_id )
$j=0;
$forums = get_forums();
krsort($forums);
$forum_results = '';
$forum_results = '';
foreach($forums as $forum) {
if ($j<=4) {
$threads = get_threads($forum['forum_id']);
$threads = get_threads($forum['forum_id']);
if (is_array($threads)) {
/*echo Display::return_icon('forum.gif');
echo $forum['forum_title'];*/
$my_course_db=explode('_',$course_db);
$my_course_code=$my_course_db[1];
//$my_course_db=explode('_',$course_db);
//$my_course_code=$my_course_db[1];
$my_course_code=CourseManager::get_course_id_by_database_name($course_db);
$i=0;
$hand_forums = '';
$post_counter = 0;
foreach($threads as $thread) {
if ($i<=4) {
$post_list = get_thread_user_post_limit($course_db, $thread['thread_id'], $user_id, 1);
$post_counter = count($post_list);
if (is_array($post_list) && count($post_list)>0) {
$hand_forums.= '<div id="social-thread">';
$hand_forums.= Display::return_icon('forumthread.gif');
$hand_forums.= $thread['thread_title'].' ';
@ -3930,17 +3935,18 @@ function get_thread_user_post($course_db, $thread_id, $user_id )
$hand_forums.= '</div>';
}
$i++;
}
if ($post_counter > 0 ) {
$forum_results .='<div id="social-forum">';
$forum_results .='<div class="clear"></div><br />';
$forum_results .='<div class="actions" style="margin-left:5px;margin-right:5px;">'.Display::return_icon('forum.gif').'&nbsp;&nbsp;&nbsp;&nbsp;'.$forum['forum_title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../forum/viewforum.php?cidReq='.$my_course_code.'&gidReq=&forum='.$forum['forum_id'].' " >'.get_lang('SeeForum').'</a></div></div>';
$forum_results .='<br / >';
$forum_results .=$hand_forums;
$forum_results .='</div>';
}
}
} $j++;
if ($post_counter > 0 ) {
$forum_results .='<div id="social-forum">';
$forum_results .='<div class="clear"></div><br />';
$forum_results .='<div class="actions" style="margin-left:5px;margin-right:5px;">'.Display::return_icon('forum.gif').'&nbsp;&nbsp;&nbsp;&nbsp;'.$forum['forum_title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../forum/viewforum.php?cidReq='.$my_course_code.'&gidReq=&forum='.$forum['forum_id'].' " >'.get_lang('SeeForum').'</a></div></div>';
$forum_results .='<br / >';
$forum_results .=$hand_forums;
$forum_results .='</div>';
}
}
} $j++;
}
}
return $forum_results;
}
@ -3957,7 +3963,7 @@ function get_thread_user_post_limit($course_db, $thread_id, $user_id, $limit=10)
AND posts.poster_id='".Database::escape_string($user_id)."'
ORDER BY posts.post_id DESC LIMIT $limit ";
$result=api_sql_query($sql, __FILE__, __LINE__);
while ($row=Database::fetch_array($result)) {
$row['status'] = '1';
$post_list[]=$row;

5
main/inc/lib/blog.lib.php
Unescape View File

@ -3026,11 +3026,12 @@ function get_blog_post_from_user($course_db_name, $user_id) {
ORDER BY post.date_creation DESC ";
$result = api_sql_query($sql, __FILE__, __LINE__);
$return_data = '';
$my_course_info=explode('_',$course_db_name);
//$my_course_info=explode('_',$course_db_name);
$my_course_id=CourseManager::get_course_id_by_database_name($course_db_name);
if (Database::num_rows($result)!=0) {
while ($row=Database::fetch_array($result)) {
$return_data.= '<div class="clear"></div><br />';
$return_data.= '<div class="actions" style="margin-left:5px;margin-right:5px;">'.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.$my_course_info[1].' " >'.get_lang('SeeBlog').'</a></div></div>';
$return_data.= '<div class="actions" style="margin-left:5px;margin-right:5px;"><img src="../img/blog.gif" />'.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.$my_course_id.' " >'.get_lang('SeeBlog').'</a></div></div>';
$return_data.= '<br / >';
//$return_data.= '<strong>'.$row['title'].'</strong>'; echo '<br>';
$return_data.= $row['full_text'];

11
main/inc/lib/course.lib.php
Unescape View File

@ -2129,5 +2129,16 @@ class CourseManager {
} else {
return false; //field not found
}
}
/**
* Get the course id of an course by the database name
* @param string The database name
* @return string The course id
*/
public static function get_course_id_by_database_name ($db_name) {
$t_course = Database::get_main_table(TABLE_MAIN_COURSE);
$sql='SELECT code FROM '.$t_course.' WHERE db_name="'.Database::escape_string($db_name).'"';
$rs=Database::query($sql,__FILE__,__LINE__);
return Database::result($rs,0,'code');
}
} //end class CourseManager

8
main/social/data_personal.inc.php
Unescape View File

@ -5,6 +5,7 @@ $language_file = array('registration','messages','userInfo','admin','forum','blo
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'social.lib.php';
require_once api_get_path(LIBRARY_PATH).'course.lib.php';
// @todo here we must show the user information as read only
//User picture size is calculated from SYSTEM path
@ -21,8 +22,8 @@ if (isset($_POST['load_ajax'])) {
$course_db = $_POST['course_code'];
// @todo goto the course link
//echo '<a href="'.api_get_path(WEB_COURSE_PATH).$course_directory.'/?id_session='.$my_course['id_session'].'">'.get_lang('GotoCourse').'</a>';
$my_course_info_db=explode('_',$course_db);
$course_id=$my_course_info_db[1];
$course_id=CourseManager::get_course_id_by_database_name($course_db);
if (api_is_user_of_course($course_id,api_get_user_id())) {
$table_forums = Database :: get_course_table(TABLE_FORUM,$course_db);
@ -31,7 +32,8 @@ if (isset($_POST['load_ajax'])) {
$table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY,$course_db);
$table_users = Database :: get_main_table(TABLE_MAIN_USER);
//------Forum messages
//------Forum messages
$forum_result = get_all_post_from_user($user_id, $course_db);
$all_result_data = 0;
if ($forum_result !='') {

Write Preview
Loading…
Cancel
Save