diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php index fd9baee586..dcfd64eb4f 100755 --- a/main/exercice/exercise.class.php +++ b/main/exercice/exercise.class.php @@ -87,7 +87,7 @@ class Exercise { $TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION,$this->course['db_name']); #$TBL_REPONSES = Database::get_course_table(TABLE_QUIZ_ANSWER); - $sql="SELECT title,description,sound,type,random, random_answers, active, results_disabled, max_attempt,start_time,end_time,feedback_type,expired_time,propagate_neg FROM $TBL_EXERCICES WHERE id='".Database::escape_string($id)."'"; + $sql="SELECT * FROM $TBL_EXERCICES WHERE id='".Database::escape_string($id)."'"; $result=Database::query($sql); // if the exercise has been found @@ -113,8 +113,6 @@ class Exercise { } $this->expired_time = $object->expired_time; //control time - - $sql="SELECT question_id, question_order FROM $TBL_EXERCICE_QUESTION, $TBL_QUESTIONS WHERE question_id=id AND exercice_id='".Database::escape_string($id)."' ORDER BY question_order"; $result=Database::query($sql); @@ -130,7 +128,7 @@ class Exercise { //load questions only for exercises of type 'one question per page' //this is needed only is there is no questions // - // @todo not sure were in the code this is used somebody mess with the exercise + // @todo not sure were in the code this is used somebody mess with the exercise tool global $_configuration, $questionList; if ($this->type == ONE_PER_PAGE && $_configuration['live_exercise_tracking'] && $_SERVER['REQUEST_METHOD'] != 'POST' && defined('QUESTION_LIST_ALREADY_LOGGED')) { //if(empty($_SESSION['questionList'])) @@ -409,8 +407,7 @@ class Exercise { $this->sound=$sound['name']; if (@move_uploaded_file($sound['tmp_name'],$audioPath.'/'.$this->sound)) { - $query="SELECT 1 FROM $TBL_DOCUMENT " - ." WHERE path='".str_replace($documentPath,'',$audioPath).'/'.$this->sound."'"; + $query="SELECT 1 FROM $TBL_DOCUMENT WHERE path='".str_replace($documentPath,'',$audioPath).'/'.$this->sound."'"; $result=Database::query($query); if(!Database::num_rows($result)) { @@ -506,7 +503,7 @@ class Exercise { * @author - Olivier Brouckaert */ function save($type_e='') { - global $_course,$_user; + global $_course; $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST); $TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION); $TBL_QUIZ_QUESTION= Database::get_course_table(TABLE_QUIZ_TEST_QUESTION); @@ -559,7 +556,7 @@ class Exercise { Database::query($sql); // update into the item_property table - api_item_property_update($_course, TOOL_QUIZ, $id,'QuizUpdated',$_user['user_id']); + api_item_property_update($_course, TOOL_QUIZ, $id,'QuizUpdated',api_get_user_id()); if (api_get_setting('search_enabled')=='true') { $this -> search_engine_edit(); @@ -597,7 +594,7 @@ class Exercise { $this->id=Database::insert_id(); // insert into the item_property table - api_item_property_update($_course, TOOL_QUIZ, $this->id,'QuizAdded',$_user['user_id']); + api_item_property_update($_course, TOOL_QUIZ, $this->id,'QuizAdded',api_get_user_id()); if (api_get_setting('search_enabled')=='true' && extension_loaded('xapian')) { $this -> search_engine_save(); } @@ -820,11 +817,11 @@ class Exercise { * @author - Olivier Brouckaert */ function delete() { - global $_course,$_user; + global $_course; $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST); $sql="UPDATE $TBL_EXERCICES SET active='-1' WHERE id='".Database::escape_string($this->id)."'"; Database::query($sql); - api_item_property_update($_course, TOOL_QUIZ, $this->id,'QuizDeleted',$_user['user_id']); + api_item_property_update($_course, TOOL_QUIZ, $this->id,'QuizDeleted',api_get_user_id()); if (api_get_setting('search_enabled')=='true' && extension_loaded('xapian') ) { $this -> search_engine_delete(); @@ -987,10 +984,7 @@ class Exercise { $form -> addElement('text', 'enabletimercontroltotalminutes',get_lang('ExerciseTotalDurationInMinutes'),array('style' => 'width : 35px','id' => 'enabletimercontroltotalminutes')); $form -> addElement('html',''); - //$form -> addElement('text', 'exerciseAttempts', get_lang('ExerciseAttempts').' : ',array('size'=>'2')); - - - + //$form -> addElement('text', 'exerciseAttempts', get_lang('ExerciseAttempts').' : ',array('size'=>'2')); $form -> addElement('html',''); //End advanced setting $form -> addElement('html',''); diff --git a/main/exercice/exercise.lib.php b/main/exercice/exercise.lib.php index bd8ed377b9..d989ec0775 100755 --- a/main/exercice/exercise.lib.php +++ b/main/exercice/exercise.lib.php @@ -6,7 +6,7 @@ * @todo convert this lib into a static class * * shows a question and its answers - * @package dokeos.exercise + * @package chamilo.exercise * @author Olivier Brouckaert * @version $Id: exercise.lib.php 22247 2009-07-20 15:57:25Z ivantcholakov $ */ diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index 17a49583b3..9c9056f6e1 100755 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -241,20 +241,9 @@ class Display { * Can be also only a bool value. TRUE: show all columns, FALSE: show nothing */ - public static function display_sortable_grid($name, $header, $content, $paging_options = array(), $query_vars = null, $form_actions = array(), $vibility_options = true) { - if (!class_exists('SortableTable')) { - require_once 'sortabletable.class.php'; - } - global $origin; - $column = 0; - $default_items_per_page = isset($paging_options['per_page']) ? $paging_options['per_page'] : 20; - $table = new SortableTableFromArray($content, $column, $default_items_per_page, $name); - - if (is_array($query_vars)) { - $table->set_additional_parameters($query_vars); - } - echo $table->display_simple_grid($vibility_options, $paging_options['hide_navigation']); - } + public static function display_sortable_grid($name, $header, $content, $paging_options = array(), $query_vars = null, $form_actions = array(), $vibility_options = true, $sort_data = true) { + echo self::return_sortable_grid($name, $header, $content, $paging_options, $query_vars, $form_actions, $vibility_options, $sort_data); + } /** * Gets a nice grid in html string @@ -829,8 +818,7 @@ class Display { $i = 1; foreach ($header_list as $item) { - $item =self::tag('a', $item, array('href'=>'#'.$id.'-'.$i)); - + $item =self::tag('a', $item, array('href'=>'#'.$id.'-'.$i)); $lis .=self::tag('li', $item, $ul_attributes); $i++; } diff --git a/main/inc/lib/group_portal_manager.lib.php b/main/inc/lib/group_portal_manager.lib.php index 8a25578b00..413625a472 100755 --- a/main/inc/lib/group_portal_manager.lib.php +++ b/main/inc/lib/group_portal_manager.lib.php @@ -899,7 +899,7 @@ class GroupPortalManager $picture = GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],160,GROUP_IMAGE_SIZE_MEDIUM); $big_image = GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],'',GROUP_IMAGE_SIZE_BIG); $tags = GroupPortalManager::get_group_tags($group_id, true); - $members = GroupPortalManager::get_users_by_group($group_id); + $groups_by_user = GroupPortalManager::get_groups_by_user($user_id, 0); //my relation with the group is set here @@ -921,18 +921,18 @@ class GroupPortalManager case GROUP_USER_PERMISSION_READER: // I'm just a reader $relation_group_title = get_lang('IamAReader'); - $links .= '
  • '.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).'
    • '; - $links .= '
  • '. Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace'=>'6')).''.get_lang('MessageList').'
    • '; + //$links .= '
  • '.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).'
    • '; + //$links .= '
  • '. Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace'=>'6')).''.get_lang('MessageList').'
    • '; $links .= '
  • '. Display::return_icon('invitation_friend.png', get_lang('InviteFriends'), array('hspace'=>'6')).''.get_lang('InviteFriends').'
    • '; - $links .= '
  • '. Display::return_icon('member_list.png', get_lang('MemberList'), array('hspace'=>'6')).''.get_lang('MemberList').'
    • '; + //$links .= '
  • '. Display::return_icon('member_list.png', get_lang('MemberList'), array('hspace'=>'6')).''.get_lang('MemberList').'
    • '; $links .= '
  • '. Display::return_icon('group_leave.png', get_lang('LeaveGroup'), array('hspace'=>'6')).'
    • '; break; case GROUP_USER_PERMISSION_ADMIN: $relation_group_title = get_lang('IamAnAdmin'); - $links .= '
  • '.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).'
    • '; - $links .= '
  • '. Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace'=>'6')).''.get_lang('MessageList').'
    • '; + //$links .= '
  • '.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).'
    • '; + //$links .= '
  • '. Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace'=>'6')).''.get_lang('MessageList').'
    • '; $links .= '
  • '. Display::return_icon('group_edit.png', get_lang('EditGroup'), array('hspace'=>'6')).''.get_lang('EditGroup').'
    • '; - $links .= '
  • '. Display::return_icon('member_list.png', get_lang('MemberList'), array('hspace'=>'6')).''.get_lang('MemberList').'
    • '; + //$links .= '
  • '. Display::return_icon('member_list.png', get_lang('MemberList'), array('hspace'=>'6')).''.get_lang('MemberList').'
    • '; //if ($group_info['visibility'] == GROUP_PERMISSION_CLOSED) { $links .= '
  • '. Display::return_icon('waiting_list.png', get_lang('WaitingList'), array('hspace'=>'6')).''.get_lang('WaitingList').'
    • '; //} @@ -946,9 +946,9 @@ class GroupPortalManager break; case GROUP_USER_PERMISSION_MODERATOR: $relation_group_title = get_lang('IamAModerator'); - $links .= '
  • '.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).'
    • '; - $links .= '
  • '. Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace'=>'6')).''.get_lang('MessageList').'
    • '; - $links .= '
  • '. Display::return_icon('member_list.png', get_lang('MemberList'), array('hspace'=>'6')).''.get_lang('MemberList').'
    • '; + //$links .= '
  • '.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).'
    • '; + //$links .= '
  • '. Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace'=>'6')).''.get_lang('MessageList').'
    • '; + //$links .= '
  • '. Display::return_icon('member_list.png', get_lang('MemberList'), array('hspace'=>'6')).''.get_lang('MemberList').'
    • '; if ($group_info['visibility'] == GROUP_PERMISSION_CLOSED) { $links .= '
  • '. Display::return_icon('waiting_list.png', get_lang('WaitingList'), array('hspace'=>'6')).''.get_lang('WaitingList').'
    • '; } @@ -966,43 +966,7 @@ class GroupPortalManager echo ''; } - //Members - if (count($members) > 0) { - echo '
    '; - echo '
    '; - $min_count_members = 4; - $i = 1; - foreach($members as $member) { - if ($i > $min_count_members) break; - // if is a member - if (in_array($member['relation_type'] , array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER,GROUP_USER_PERMISSION_MODERATOR))) { - //add icons - if ($member['relation_type'] == GROUP_USER_PERMISSION_ADMIN) { - $icon= Display::return_icon('social_group_admin.png', get_lang('Admin')); - }elseif ($member['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) { - $icon= Display::return_icon('social_group_moderator.png', get_lang('Moderator')); - } else{ - $icon= ''; - } - $image_path = UserManager::get_user_picture_path_by_id($member['user_id'], 'web', false, true); - $picture = UserManager::get_picture_user($member['user_id'], $image_path['file'], 60, USER_IMAGE_SIZE_MEDIUM); - - echo ''; - $i++; - } - } - if (count($members) > $min_count_members) { - //More link - echo '
    '.get_lang('SeeMore').'
    '; - } - echo '
    '; - echo '
    '; - echo '
    '; - } + /* // my other groups if (count($groups_by_user) > 1) { diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php index ccaf52772d..db25572ee9 100755 --- a/main/inc/lib/message.lib.php +++ b/main/inc/lib/message.lib.php @@ -961,7 +961,7 @@ class MessageManager $html_items.= '  '.Display :: return_icon('edit.gif', get_lang('Edit')).''; } $html_items.= ''; - $html_items.= '
    '.Security::remove_XSS($item['title']).' 
    '; + //$html_items.= '
    '.Security::remove_XSS($item['title']).' 
    '; $image_path = UserManager::get_user_picture_path_by_id($topic['user_sender_id'], 'web', false, true); $image_repository = $image_path['dir']; $existing_image = $image_path['file']; $html_items.= '
    '.$name.' '.$name.' 
    '; diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index 584f4b4ff7..6bf2a8bd7c 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -541,7 +541,7 @@ class SocialManager extends UserManager { $user_id = api_get_user_id(); } - $show_groups = array('groups', 'group_messages', 'messages_list', 'group_add', 'mygroups', 'group_edit', 'member_list', 'invite_friends', 'waiting_list'); + $show_groups = array('groups', 'group_messages', 'messages_list', 'group_add', 'mygroups', 'group_edit', 'member_list', 'invite_friends', 'waiting_list', 'browse_groups'); $show_messages = array('messages', 'messages_inbox', 'messages_outbox', 'messages_compose'); // get count unread message and total invitations @@ -555,6 +555,7 @@ class SocialManager extends UserManager { $total_invitations = (!empty($total_invitations)?' ('.$total_invitations.')':''); // Everybody can create groups + /* if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') { $create_group_item = '
  • '.Display::return_icon('group_add.png',get_lang('CreateASocialGroup'),array('hspace'=>'6','style'=>'float:left')).''.get_lang('CreateASocialGroup').'
    • '; } else { @@ -562,25 +563,19 @@ class SocialManager extends UserManager { if (api_is_allowed_to_edit(null,true)) { $create_group_item = '
  • '.Display::return_icon('group_add.png',get_lang('CreateASocialGroup'),array('hspace'=>'6','style'=>'float:left')).''.get_lang('CreateASocialGroup').'
    • '; } - } + }*/ echo '
    '; if (in_array($show, $show_groups) && !empty($group_id)) { //--- Group image - $group_info = GroupPortalManager::get_group_data($group_id); $big = GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],160,GROUP_IMAGE_SIZE_BIG); $original = GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],'',GROUP_IMAGE_SIZE_ORIGINAL); echo ''; - echo '
    '; - + echo '
    '; + echo '

    '.$group_info['name'].'

    '; + if (count($nosessionUsersList) == 0) { $friends = SocialManager::get_friends(api_get_user_id()); if ($friends == 0) { diff --git a/main/social/group_members.php b/main/social/group_members.php index 998d05739e..a0fc8d111c 100755 --- a/main/social/group_members.php +++ b/main/social/group_members.php @@ -107,6 +107,9 @@ echo '
    '; SocialManager::show_social_menu('member_list',$group_id); echo '
    '; echo '
    '; + + echo '

    '.$group_info['name'].'

    '; + echo '