@@ -28,11 +28,11 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | // COURSES WITH CATEGORIES |
| 30 | 30 | if (!empty($user_course_categories)) { |
| 31 | - foreach ($user_course_categories as $row) { |
|
| 32 | - echo Display::page_subheader($row['title']); |
|
| 33 | - echo '<a name="category'.$row['id'].'"></a>'; |
|
| 31 | + foreach ($user_course_categories as $row) { |
|
| 32 | + echo Display::page_subheader($row['title']); |
|
| 33 | + echo '<a name="category'.$row['id'].'"></a>'; |
|
| 34 | 34 | |
| 35 | - if (isset($_GET['categoryid']) && $_GET['categoryid'] == $row['id']) { ?> |
|
| 35 | + if (isset($_GET['categoryid']) && $_GET['categoryid'] == $row['id']) { ?> |
|
| 36 | 36 | <!-- We display the edit form for the category --> |
| 37 | 37 | |
| 38 | 38 | <form name="edit_course_category" method="post" action="courses.php?action=<?php echo $action; ?>"> |
@@ -243,15 +243,15 @@ discard block |
||
| 243 | 243 | </a> |
| 244 | 244 | <?php } else { |
| 245 | 245 | echo Display::display_icon('up_na.png', get_lang('Up'),'',22); |
| 246 | - } |
|
| 246 | + } |
|
| 247 | 247 | |
| 248 | - if ($key < $number_of_courses - 1) { ?> |
|
| 248 | + if ($key < $number_of_courses - 1) { ?> |
|
| 249 | 249 | <a href="courses.php?action=<?php echo $action; ?>&move=down&course=<?php echo $course['code']; ?>&category=<?php echo $course['user_course_cat']; ?>&sec_token=<?php echo $stok; ?>"> |
| 250 | 250 | <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?> |
| 251 | 251 | </a> |
| 252 | 252 | <?php } else { |
| 253 | 253 | echo Display::display_icon('down_na.png', get_lang('Down'),'',22); |
| 254 | - }?> |
|
| 254 | + }?> |
|
| 255 | 255 | </div> |
| 256 | 256 | <div style="float:left; margin-right:10px;"> |
| 257 | 257 | <!-- cancel subscrioption--> |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | </div> |
| 270 | 270 | <?php } |
| 271 | 271 | } |
| 272 | - ?> |
|
| 272 | + ?> |
|
| 273 | 273 | </td> |
| 274 | 274 | </tr> |
| 275 | 275 | <?php |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * This script displays an area where teachers can edit the group properties and member list. |
| 6 | - * |
|
| 6 | + * |
|
| 7 | 7 | * @author various contributors |
| 8 | 8 | * @author Roan Embrechts (VUB), partial code cleanup, initial virtual course support |
| 9 | 9 | * @package chamilo.group |
@@ -161,9 +161,9 @@ |
||
| 161 | 161 | // possible : number_groups_left > 0 and is group member |
| 162 | 162 | $possible_users = array(); |
| 163 | 163 | foreach ($complete_user_list as $index => $user) { |
| 164 | - if ($user['number_groups_left'] > 0 || in_array($user['user_id'], $selected_users)) { |
|
| 164 | + if ($user['number_groups_left'] > 0 || in_array($user['user_id'], $selected_users)) { |
|
| 165 | 165 | $possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; |
| 166 | - } |
|
| 166 | + } |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | $group_members_element = $form->addElement('advmultiselect', 'group_members', get_lang('GroupMembers'), $possible_users, 'style="width: 280px;"'); |
@@ -89,7 +89,7 @@ |
||
| 89 | 89 | 'error' |
| 90 | 90 | ) |
| 91 | 91 | ); |
| 92 | - exit; |
|
| 92 | + exit; |
|
| 93 | 93 | } else { |
| 94 | 94 | /* DOWNLOAD THE FILE */ |
| 95 | 95 | // the user is allowed to download the file |
@@ -83,11 +83,11 @@ |
||
| 83 | 83 | if (strstr($_POST['action'], 'move_')) { |
| 84 | 84 | // check move_received_n or move_sent_n command |
| 85 | 85 | if (strstr($_POST['action'], 'received')) { |
| 86 | - $part = 'received'; |
|
| 87 | - $to_cat_id = str_replace('move_received_', '', $_POST['action']); |
|
| 86 | + $part = 'received'; |
|
| 87 | + $to_cat_id = str_replace('move_received_', '', $_POST['action']); |
|
| 88 | 88 | } else { |
| 89 | - $part = 'sent'; |
|
| 90 | - $to_cat_id = str_replace('move_sent_', '', $_POST['action']); |
|
| 89 | + $part = 'sent'; |
|
| 90 | + $to_cat_id = str_replace('move_sent_', '', $_POST['action']); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | foreach ($checked_file_ids as $value) { |
@@ -8,9 +8,9 @@ discard block |
||
| 8 | 8 | die(); |
| 9 | 9 | require '../../inc/global.inc.php'; |
| 10 | 10 | if (empty($_GET['doc'])) { |
| 11 | - echo "To add a document name to search, add ?doc=abc to the URL\n"; |
|
| 11 | + echo "To add a document name to search, add ?doc=abc to the URL\n"; |
|
| 12 | 12 | } else { |
| 13 | - echo "Received param ".$_GET['doc']."<br />\n"; |
|
| 13 | + echo "Received param ".$_GET['doc']."<br />\n"; |
|
| 14 | 14 | } |
| 15 | 15 | $allowed_mime_types = DocumentManager::file_get_mime_type(true); |
| 16 | 16 | $allowed_extensions = array( |
@@ -40,30 +40,30 @@ discard block |
||
| 40 | 40 | $specific_fields = get_specific_field_list(); |
| 41 | 41 | $specific_fields_values = array(); |
| 42 | 42 | foreach ($specific_fields as $sf) { |
| 43 | - $specific_fields_values[$sf['code']] = ''; |
|
| 43 | + $specific_fields_values[$sf['code']] = ''; |
|
| 44 | 44 | } |
| 45 | 45 | $td = Database::get_course_table(TABLE_DOCUMENT); |
| 46 | 46 | |
| 47 | 47 | foreach ($courses_list as $course) { |
| 48 | - $course_dir = $course['directory'].'/document'; |
|
| 49 | - $title = Database::escape_string($_GET['doc']); |
|
| 50 | - $sql = "SELECT id, path, session_id FROM $td WHERE c_id = ".$course['id']." AND path LIKE '%$title%' or title LIKE '%$title%'"; |
|
| 51 | - $res = Database::query($sql); |
|
| 52 | - if (Database::num_rows($res)>0) { |
|
| 48 | + $course_dir = $course['directory'].'/document'; |
|
| 49 | + $title = Database::escape_string($_GET['doc']); |
|
| 50 | + $sql = "SELECT id, path, session_id FROM $td WHERE c_id = ".$course['id']." AND path LIKE '%$title%' or title LIKE '%$title%'"; |
|
| 51 | + $res = Database::query($sql); |
|
| 52 | + if (Database::num_rows($res)>0) { |
|
| 53 | 53 | while ($row = Database::fetch_array($res)) { |
| 54 | - $doc_path = api_get_path(SYS_COURSE_PATH).$course_dir.$row['path']; |
|
| 55 | - $extensions = preg_split("/[\/\\.]/", $doc_path); |
|
| 56 | - $doc_ext = strtolower($extensions[count($extensions) - 1]); |
|
| 57 | - if (in_array($doc_ext, $allowed_extensions) && !is_dir($doc_path)) { |
|
| 54 | + $doc_path = api_get_path(SYS_COURSE_PATH).$course_dir.$row['path']; |
|
| 55 | + $extensions = preg_split("/[\/\\.]/", $doc_path); |
|
| 56 | + $doc_ext = strtolower($extensions[count($extensions) - 1]); |
|
| 57 | + if (in_array($doc_ext, $allowed_extensions) && !is_dir($doc_path)) { |
|
| 58 | 58 | $doc_mime = mime_content_type($doc_path); |
| 59 | 59 | echo "Indexing doc ".$row['id']." (".$row['path'].") in course ".$course['code']."\n"; |
| 60 | 60 | $residx = DocumentManager::index_document($row['id'], $course['code'], $row['session_id'], $course['course_language'], $specific_fields_values); |
| 61 | 61 | if ($residx) { |
| 62 | - echo "Success\n"; |
|
| 62 | + echo "Success\n"; |
|
| 63 | 63 | } else { |
| 64 | - echo "Failure\n"; |
|
| 64 | + echo "Failure\n"; |
|
| 65 | 65 | } |
| 66 | - } |
|
| 66 | + } |
|
| 67 | + } |
|
| 67 | 68 | } |
| 68 | - } |
|
| 69 | 69 | } |
@@ -14,23 +14,23 @@ discard block |
||
| 14 | 14 | $views = array('blocks', 'list'); |
| 15 | 15 | |
| 16 | 16 | if(isset($_GET['view']) && in_array($_GET['view'], $views)){ |
| 17 | - $dashboard_view = $_GET['view']; |
|
| 17 | + $dashboard_view = $_GET['view']; |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | $link_blocks_view = $link_list_view = null; |
| 21 | 21 | |
| 22 | 22 | if (isset($dashboard_view) && $dashboard_view == 'list') { |
| 23 | - $link_blocks_view = '<a href="'.api_get_self().'?view=blocks">'. |
|
| 24 | - Display::return_icon('blocks.png',get_lang('DashboardBlocks'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 23 | + $link_blocks_view = '<a href="'.api_get_self().'?view=blocks">'. |
|
| 24 | + Display::return_icon('blocks.png',get_lang('DashboardBlocks'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 25 | 25 | } else { |
| 26 | - $link_list_view = '<a href="'.api_get_self().'?view=list">'. |
|
| 27 | - Display::return_icon('edit.png',get_lang('EditBlocks'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 26 | + $link_list_view = '<a href="'.api_get_self().'?view=list">'. |
|
| 27 | + Display::return_icon('edit.png',get_lang('EditBlocks'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | $configuration_link = null; |
| 31 | 31 | if (api_is_platform_admin()) { |
| 32 | - $configuration_link = '<a href="'.api_get_path(WEB_CODE_PATH).'admin/settings.php?category=Plugins">' |
|
| 33 | - .Display::return_icon('settings.png',get_lang('ConfigureDashboardPlugin'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 32 | + $configuration_link = '<a href="'.api_get_path(WEB_CODE_PATH).'admin/settings.php?category=Plugins">' |
|
| 33 | + .Display::return_icon('settings.png',get_lang('ConfigureDashboardPlugin'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | echo '<div class="actions">'; |
@@ -87,10 +87,10 @@ discard block |
||
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | } else { |
| 90 | - // block dashboard list |
|
| 91 | - if (isset($success)) { |
|
| 92 | - Display::display_confirmation_message(get_lang('BlocksHaveBeenUpdatedSuccessfully')); |
|
| 93 | - } |
|
| 94 | - $user_id = api_get_user_id(); |
|
| 95 | - DashboardManager::display_user_dashboard_list($user_id); |
|
| 90 | + // block dashboard list |
|
| 91 | + if (isset($success)) { |
|
| 92 | + Display::display_confirmation_message(get_lang('BlocksHaveBeenUpdatedSuccessfully')); |
|
| 93 | + } |
|
| 94 | + $user_id = api_get_user_id(); |
|
| 95 | + DashboardManager::display_user_dashboard_list($user_id); |
|
| 96 | 96 | } |
@@ -33,18 +33,18 @@ |
||
| 33 | 33 | $doc_url = str_replace('/..', '', $doc_url); //echo $doc_url; |
| 34 | 34 | |
| 35 | 35 | if (! isset($_course)) { |
| 36 | - api_not_allowed(true); |
|
| 36 | + api_not_allowed(true); |
|
| 37 | 37 | } |
| 38 | 38 | $full_file_name = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/upload/blog/'.$doc_url; |
| 39 | 39 | |
| 40 | 40 | //if the rewrite rule asks for a directory, we redirect to the course view |
| 41 | 41 | if (is_dir($full_file_name)) { |
| 42 | - //remove last slash if present |
|
| 43 | - while ($doc_url{$dul = strlen($doc_url)-1}=='/') $doc_url = substr($doc_url,0,$dul); |
|
| 44 | - //create the path |
|
| 45 | - $document_explorer = api_get_path(WEB_COURSE_PATH).api_get_course_path(); // home course path |
|
| 46 | - //redirect |
|
| 47 | - header('Location: '.$document_explorer); |
|
| 42 | + //remove last slash if present |
|
| 43 | + while ($doc_url{$dul = strlen($doc_url)-1}=='/') $doc_url = substr($doc_url,0,$dul); |
|
| 44 | + //create the path |
|
| 45 | + $document_explorer = api_get_path(WEB_COURSE_PATH).api_get_course_path(); // home course path |
|
| 46 | + //redirect |
|
| 47 | + header('Location: '.$document_explorer); |
|
| 48 | 48 | exit; |
| 49 | 49 | } |
| 50 | 50 | |
@@ -162,17 +162,17 @@ |
||
| 162 | 162 | |
| 163 | 163 | if ($form->validate()) { |
| 164 | 164 | $officialCode = $form->getSubmitValue('filter'); |
| 165 | - if ($officialCode == 'all') { |
|
| 165 | + if ($officialCode == 'all') { |
|
| 166 | 166 | $certificate_list = GradebookUtils::get_list_users_certificates($cat_id); |
| 167 | 167 | } else { |
| 168 | - $userList = UserManager::getUsersByOfficialCode($officialCode); |
|
| 169 | - if (!empty($userList)) { |
|
| 170 | - $certificate_list = GradebookUtils::get_list_users_certificates( |
|
| 171 | - $cat_id, |
|
| 172 | - $userList |
|
| 173 | - ); |
|
| 174 | - } |
|
| 175 | - } |
|
| 168 | + $userList = UserManager::getUsersByOfficialCode($officialCode); |
|
| 169 | + if (!empty($userList)) { |
|
| 170 | + $certificate_list = GradebookUtils::get_list_users_certificates( |
|
| 171 | + $cat_id, |
|
| 172 | + $userList |
|
| 173 | + ); |
|
| 174 | + } |
|
| 175 | + } |
|
| 176 | 176 | } else { |
| 177 | 177 | $certificate_list = GradebookUtils::get_list_users_certificates($cat_id); |
| 178 | 178 | } |