diff --git a/main/group/group.php b/main/group/group.php index 0e29d4b54f..130abae7d4 100644 --- a/main/group/group.php +++ b/main/group/group.php @@ -41,7 +41,7 @@ INIT SECTION ============================================================================== */ -// name of the language file that needs to be included +// name of the language file that needs to be included $language_file = "group"; include ('../inc/global.inc.php'); $this_section=SECTION_COURSES; @@ -53,9 +53,9 @@ $nameTools = get_lang("GroupManagement"); Libraries ----------------------------------------------------------- */ -include_once (api_get_path(LIBRARY_PATH).'course.lib.php'); +include_once (api_get_path(LIBRARY_PATH).'course.lib.php'); include_once (api_get_path(LIBRARY_PATH).'groupmanager.lib.php'); -include_once (api_get_path(LIBRARY_PATH).'events.lib.inc.php'); +include_once (api_get_path(LIBRARY_PATH).'events.lib.inc.php'); //Create default category if it doesn't exist when group categories aren't allowed if( api_get_setting('allow_group_categories') == 'false') @@ -185,18 +185,18 @@ if (api_is_allowed_to_edit()) } } // Show admin-panel - echo ' '.get_lang("NewGroupCreate").' '; + echo ''.Display::return_icon('group_add_big.gif').' '.get_lang("NewGroupCreate").' '; if (get_setting('allow_group_categories') == 'true') { echo ''.get_lang("AddCategory").' '; } else { - echo ' '.get_lang('PropModify').' '; + echo ''.Display::return_icon('edit_group.gif').' '.get_lang('PropModify').' '; } if( Database::count_rows(Database::get_course_table(TABLE_GROUP)) > 0) { - echo ' '.get_lang('GroupOverview').' '; + echo ''.Display::return_icon('group_view.gif').' '.get_lang('GroupOverview').' '; } } $group_cats = GroupManager :: get_categories(); diff --git a/main/group/group_space.php b/main/group/group_space.php index e6e3df497a..3dddc2e165 100644 --- a/main/group/group_space.php +++ b/main/group/group_space.php @@ -1,42 +1,42 @@ '.stripslashes($current_group['description']).''; +if (!empty($current_group['description'])) +{ + echo '
'.stripslashes($current_group['description']).'
'; +} /* * Group Tools */ -// If the user is subscribed to the group or the user is a tutor of the group then +// If the user is subscribed to the group or the user is a tutor of the group then if (api_is_allowed_to_edit() OR GroupManager :: is_user_in_group($_SESSION['_uid'], $current_group['id'])) { $tools = ''; // Edited by Patrick Cool, 12 feb 2004: hide the forum link if there is no forum for this group (deleted through forum_admin.php) if (!is_null($current_group['forum_id']) && $current_group['forum_state'] != TOOL_NOT_AVAILABLE) { - $tools .= " ".get_lang("Forums").""; + $tools .= "".Display::return_icon('forum.gif')." ".get_lang("Forums").""; } if( $current_group['doc_state'] != TOOL_NOT_AVAILABLE ) { // link to the documents area of this group - $tools .= "
 ".get_lang("GroupDocument")."
"; + $tools .= "
".Display::return_icon('folder_document.gif')." ".get_lang("GroupDocument")."
"; } if ( $current_group['calendar_state'] != TOOL_NOT_AVAILABLE) { //link to a group-specific part of agenda - $tools .= "
 ".get_lang("GroupCalendar")."
"; + $tools .= "
".Display::return_icon('agenda.gif')." ".get_lang("GroupCalendar")."
"; } if ( $current_group['work_state'] != TOOL_NOT_AVAILABLE) { //link to the works area of this group - $tools .= "
 ".get_lang("GroupWork")."
"; + $tools .= "
".Display::return_icon('works.gif')." ".get_lang("GroupWork")."
"; } if ( $current_group['announcements_state'] != TOOL_NOT_AVAILABLE) { //link to a group-specific part of announcements - $tools .= "
 ".get_lang("GroupAnnouncements")."
"; + $tools .= "
".Display::return_icon('valves.gif')." ".get_lang("GroupAnnouncements")."
"; } - echo ''.get_lang("Tools").':
'.$tools.'
'; + echo ''.get_lang("Tools").':'; + if (!empty($tools)) + { + echo '
'.$tools.'
'; + } } else @@ -184,29 +191,33 @@ else $tools = ''; if ($current_group['forum_state'] == TOOL_PUBLIC && !is_null($current_group['forum_id'])) { - $tools .= " ".get_lang("Forums")."
"; + $tools .= "".Display::return_icon('forum.gif')." ".get_lang("Forums")."
"; } if( $current_group['doc_state'] == TOOL_PUBLIC ) { // link to the documents area of this group - $tools .= " ".get_lang("GroupDocument")."
"; + $tools .= "".Display::return_icon('folder_document.gif')." ".get_lang("GroupDocument")."
"; } - if ( $current_group['calendar_state'] == TOOL_PUBLIC ) + if ( $current_group['calendar_state'] == TOOL_PUBLIC ) { //link to a group-specific part of agenda - $tools .= " ".get_lang("GroupCalendar")."
"; + $tools .= "".Display::return_icon('agenda.gif')." ".get_lang("GroupCalendar")."
"; } - if ( $current_group['work_state'] == TOOL_PUBLIC ) + if ( $current_group['work_state'] == TOOL_PUBLIC ) { //link to the works area of this group - $tools .= " ".get_lang("GroupWork")."
"; + $tools .= "".Display::return_icon('works.gif')." ".get_lang("GroupWork")."
"; } if ( $current_group['announcements_state'] == TOOL_PUBLIC) { //link to a group-specific part of announcements - $tools .= " ".get_lang("GroupAnnouncements")."
"; + $tools .= "".Display::return_icon('valves.gif')." ".get_lang("GroupAnnouncements")."
"; + } + echo ''.get_lang("Tools").':'; + if (!empty($tools)) + { + echo '
'.$tools.'
'; } - echo ''.get_lang("GroupTools").':
'.$tools.'
'; } /* @@ -224,7 +235,11 @@ else $tutor_info .= "
 ".$tutor['firstname']." ".$tutor['lastname']."
"; } } -echo ''.get_lang("GroupTutors").':
'.$tutor_info.'
'; +echo ''.get_lang("GroupTutors").':'; +if (!empty($tutor_info)) +{ + echo '
'.$tutor_info.'
'; +} @@ -246,9 +261,9 @@ else } echo ''.get_lang("GroupMembers").':
'.$member_info.'
'; /* -============================================================================== - FOOTER -============================================================================== +============================================================================== + FOOTER +============================================================================== */ if ($origin != 'learnpath') { diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php index b6e76e678e..082e288fb9 100644 --- a/main/inc/lib/main_api.lib.php +++ b/main/inc/lib/main_api.lib.php @@ -1144,6 +1144,7 @@ function api_display_tool_view_option() else { $sourceurl = $_SERVER['REQUEST_URI']; + $sourceurl = str_replace('&', '&', $sourceurl); } if ($isStudentView == "true" and $_SESSION["studentview"]) { @@ -1735,22 +1736,22 @@ function api_parse_tex($textext) */ function api_time_to_hms($seconds) { - + //How many hours ? $hours = floor($seconds / 3600); //How many minutes ? - $min = floor(($seconds - ($hours * 3600)) / 60); + $min = floor(($seconds - ($hours * 3600)) / 60); //How many seconds $sec = floor($seconds - ($hours * 3600) - ($min * 60)); - + if ($sec < 10) $sec = "0".$sec; - + if ($min < 10) $min = "0".$min; - + return $hours.":".$min.":".$sec; } diff --git a/main/user/user.php b/main/user/user.php index 3544ac002b..2df093ef9c 100644 --- a/main/user/user.php +++ b/main/user/user.php @@ -311,10 +311,10 @@ Display::display_introduction_section(TOOL_USER, $is_allowed); if( api_is_allowed_to_edit()) { echo "
"; - echo ' '.get_lang('ExportAsCSV').' | '; - echo " ".get_lang("SubscribeUserToCourse")." | "; - echo " ".get_lang("SubscribeUserToCourseAsTeacher")." | "; - echo " ".get_lang("GroupUserManagement").""; + echo ''.Display::return_icon('excel.gif', get_lang('ExportAsCSV')).' '.get_lang('ExportAsCSV').' | '; + echo ''.Display::return_icon('add_user_big.gif',get_lang("SubscribeUserToCourse")).' '.get_lang("SubscribeUserToCourse").' | '; + echo "".Display::return_icon('add_user_big.gif', get_lang("SubscribeUserToCourseAsTeacher"))." ".get_lang("SubscribeUserToCourseAsTeacher")." | "; + echo "".Display::return_icon('edit_group.gif', get_lang("GroupUserManagement"))." ".get_lang("GroupUserManagement").""; if(api_get_setting('use_session_mode')=='false') { echo ' | '.get_lang('Classes').''; @@ -356,7 +356,7 @@ function get_number_of_users() $sql = "SELECT COUNT(u.user_id) AS number_of_users FROM $user_table u,$course_user_table cu WHERE u.user_id = cu.user_id and course_code='".$_SESSION['_course']['id']."'"; } else{ - + if(!empty($_SESSION['id_session'])){ $session_course_user_table = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); $sql = "SELECT COUNT(DISTINCT id_user) AS number_of_users @@ -379,14 +379,14 @@ function get_number_of_users() } function search_keyword($firstname,$lastname,$username,$official_code,$keyword){ - + if(strripos($firstname,$keyword)!==false || strripos($lastname,$keyword)!==false || strripos($username,$keyword)!==false || strripos($official_code,$keyword)!==false){ return true; } else{ return false; } - + } function sort_users($a,$b){ @@ -404,20 +404,20 @@ function sort_users($a,$b){ function get_user_data($from, $number_of_items, $column, $direction) { $a_users=array(); - + if(!empty($_SESSION["id_session"])){ $a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true, $_SESSION['id_session']); } else{ $a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true); } - + foreach($a_course_users as $user_id=>$o_course_user){ - + if( (isset ($_GET['keyword']) && search_keyword($o_course_user['firstname'],$o_course_user['lastname'],$o_course_user['username'],$o_course_user['official_code'],$_GET['keyword'])) || !isset($_GET['keyword']) || empty($_GET['keyword'])){ - + $groups_name=GroupManager :: get_user_group_name($user_id); - + if(api_is_allowed_to_edit()){ $temp=array(); $temp[] = $user_id; @@ -426,7 +426,7 @@ function get_user_data($from, $number_of_items, $column, $direction) $temp[] = $o_course_user['lastname']; $temp[] = $o_course_user['role']; $temp[] = implode(', ',$groups_name); //Group - + if(isset($o_course_user['tutor_id']) && $o_course_user['tutor_id']==1) $temp[] = get_lang('Tutor'); else @@ -435,7 +435,7 @@ function get_user_data($from, $number_of_items, $column, $direction) $temp[] = get_lang('CourseManager'); else $temp[] = '-'; - + $temp[] = $user_id; } else{ @@ -450,7 +450,7 @@ function get_user_data($from, $number_of_items, $column, $direction) $a_users[$user_id] = $temp; } } - usort($a_users, 'sort_users'); + usort($a_users, 'sort_users'); return $a_users; } @@ -471,7 +471,7 @@ function modify_filter($user_id) if($is_allowed_to_track) { - $result .= ''.get_lang('Tracking').' '; + $result .= ''.get_lang('Tracking').' '; } if(api_is_allowed_to_edit()) diff --git a/main/user/userInfo.php b/main/user/userInfo.php index 74f644c664..5db0f04d46 100644 --- a/main/user/userInfo.php +++ b/main/user/userInfo.php @@ -43,7 +43,7 @@ */ $editMainUserInfo = $_REQUEST['editMainUserInfo']; $uInfo = intval($_REQUEST['uInfo']); -// name of the language file that needs to be included +// name of the language file that needs to be included $language_file = array ('registration', 'userInfo'); include ("../inc/global.inc.php"); @@ -217,7 +217,7 @@ if ($allowedToEditContent) */ // Back button for each display mode (Top) -echo "
".get_lang('BackUser')."
\n"; +echo "
".get_lang('BackUser')."
\n"; if ($displayMode == "viewDefEdit") { /*>>>>>>>>>>>> CATEGORIES DEFINITIONS : EDIT <<<<<<<<<<<<*/ @@ -265,12 +265,16 @@ elseif ($displayMode == "viewDefList") // displays commands - echo "", "\"".get_lang('Remove')."\"", "", "", "\"".get_lang('Edit')."\"", "", "", "\"".get_lang('MoveUp')."\"", "", "", "\"".get_lang('MoveDown')."\"", "\n"; + echo "", "\"".get_lang('Remove')."\"", "", "", "\"".get_lang('Edit')."\"", "", "", "\"".get_lang('MoveUp')."\"", "", "", "\"".get_lang('MoveDown')."\"", "\n"; } // end for each } // end if ($catList) - echo "
\n", "
", "", "
\n", "
\n"; + echo "
\n", + "
", + "", + "
\n", + "
\n"; } elseif ($displayMode == "viewContentEdit") { @@ -300,7 +304,7 @@ elseif ($displayMode == "viewContentEdit") } elseif ($displayMode == "viewMainInfoEdit") { - + /*>>>>>>>>>>>> CATEGORIES MAIN INFO : EDIT <<<<<<<<<<<<*/ $mainUserInfo = get_main_user_info($userIdViewed, $courseCode); @@ -318,14 +322,26 @@ elseif ($displayMode == "viewMainInfoEdit") } else { - echo ""; + Display::display_icon('unknown.jpg', get_lang('Unknown')); } - echo "
\n", "\n", "", "\n", "\n", "\n", "\n", "\n", "\n", "", "\n", "", ""; + echo "\n", + "\n", + "
", get_lang('Name'), "", get_lang('Role'), "", get_lang('Tutor'), "", get_lang('CourseManager'), "
", htmlize($mainUserInfo['firstName']), " ", htmlize($mainUserInfo['lastName']), "
", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "", + "\n", + "", + ""; if (!($is_courseAdmin && $_user['user_id'] == $userIdViewed)) { - echo "\n"; + echo "\n"; } else { @@ -333,7 +349,7 @@ elseif ($displayMode == "viewMainInfoEdit") } - echo "\n", "", "
", get_lang('Name'), "", get_lang('Role'), "", get_lang('Tutor'), "", get_lang('CourseManager'), "
", htmlize($mainUserInfo['firstName']), " ", htmlize($mainUserInfo['lastName']), "
", "
\n"; + echo "\n", "", "", "\n"; echo "

".Display :: encrypted_mailto_link($mainUserInfo['email'], $mainUserInfo['email'])."

"; @@ -363,11 +379,11 @@ elseif ($displayMode == "viewContentList") // default display } else { - echo ""; + Display::display_icon('unknown.jpg', get_lang('Unknown')); } if($is_allowedToTrack) { - echo get_lang('Tracking'); + echo get_lang('Tracking'); } //DISPLAY TABLE HEADING @@ -411,14 +427,14 @@ elseif ($displayMode == "viewContentList") // default display { echo "", "", - "\"\"", + "\"\"", "", ""; } if ($is_allowedToTrack) { echo "", - "", + "", "\"".get_lang('Tracking')."", "", ""; @@ -427,8 +443,6 @@ elseif ($displayMode == "viewContentList") // default display ""; //"

",$mainUserInfo['email'],"", echo "

". Display::encrypted_mailto_link($mainUserInfo['email'],$mainUserInfo['email']). "

"; - - echo "

\n"; } if (get_setting('allow_user_headings') == 'true' && $allowedToEditDef) // only course administrators see this line @@ -436,7 +450,7 @@ elseif ($displayMode == "viewContentList") // default display echo "

", "
", get_lang('CourseAdministratorOnly')," : ", - "", + "", "
", "
", "
\n"; @@ -481,7 +495,7 @@ elseif ($displayMode == "viewContentList") // default display } // Back button for each display mode (bottom) -echo "\n"; +echo "\n"; /* ============================================================================== FOOTER