@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | if ($image_resizing == 'noresizing' || $image_resizing == '') { |
78 | 78 | echo ' checked'; |
79 | 79 | } |
80 | - ?>> |
|
80 | + ?>> |
|
81 | 81 | </label> |
82 | 82 | <?php echo '<b>'. get_lang('NoResizing') . '</b>, ' . get_lang('NoResizingComment') ;?> |
83 | 83 | </div> |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | if ($image_resizing == 'resizing_auto' || $image_resizing == '') { |
88 | 88 | echo ' checked'; |
89 | 89 | } |
90 | - ?>> |
|
90 | + ?>> |
|
91 | 91 | </label> |
92 | 92 | <?php echo '<b>'. get_lang('ResizingAuto') . '</b>, ' . get_lang('ResizingAutoComment');?> |
93 | 93 | </div> |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $width = $_SESSION['image_resizing_width']; |
100 | 100 | $height = $_SESSION['image_resizing_height']; |
101 | 101 | } |
102 | - ?>> |
|
102 | + ?>> |
|
103 | 103 | </label> |
104 | 104 | <?php echo '<b>'. get_lang('Resizing') . '</b>, ' . get_lang('ResizingComment'); ?> |
105 | 105 | </div> |
@@ -107,13 +107,13 @@ discard block |
||
107 | 107 | <label class="col-sm-1 control-label"><?php echo get_lang('Width'); ?></label> |
108 | 108 | <div class="col-sm-3"> |
109 | 109 | <input class="form-control" name="width" type="text" id="width" <?php |
110 | - if ($image_resizing == 'resizing') { |
|
111 | - echo ' value="'.$width.'"'; |
|
112 | - echo ' class="enabled_input"'; |
|
110 | + if ($image_resizing == 'resizing') { |
|
111 | + echo ' value="'.$width.'"'; |
|
112 | + echo ' class="enabled_input"'; |
|
113 | 113 | } else { |
114 | 114 | echo ' class="disabled_input"'; |
115 | 115 | } |
116 | - ?> > |
|
116 | + ?> > |
|
117 | 117 | </div> |
118 | 118 | <div class="col-sm-8"></div> |
119 | 119 | </div> |
@@ -121,13 +121,13 @@ discard block |
||
121 | 121 | <label class="col-sm-1 control-label"><?php echo get_lang('Height'); ?></label> |
122 | 122 | <div class="col-sm-3"> |
123 | 123 | <input class="form-control" name="height" type="text" id="height" <?php |
124 | - if ($image_resizing == 'resizing') { |
|
125 | - echo ' value="'.$height.'"'; |
|
126 | - echo ' class="enabled_input"'; |
|
127 | - } else { |
|
124 | + if ($image_resizing == 'resizing') { |
|
125 | + echo ' value="'.$height.'"'; |
|
126 | + echo ' class="enabled_input"'; |
|
127 | + } else { |
|
128 | 128 | echo ' class="disabled_input"'; |
129 | 129 | } |
130 | - ?> > |
|
130 | + ?> > |
|
131 | 131 | </div> |
132 | 132 | <div class="col-sm-8"></div> |
133 | 133 | </div> |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | // bypass the $nametools thing and use <b></b> tags in the $interbreadcrump array |
40 | 40 | $url = 'slideshowoptions.php?curdirpath='.$pathurl; |
41 | 41 | $originaltoolname = '<b>'.get_lang('SlideshowOptions').'</b>'; |
42 | -$interbreadcrumb[] = array('url' => $url, 'name' => $originaltoolname ); |
|
42 | +$interbreadcrumb[] = array('url' => $url, 'name' => $originaltoolname); |
|
43 | 43 | |
44 | 44 | Display::display_header($originalToolName, 'Doc'); |
45 | 45 | $image_resizing = isset($_SESSION['image_resizing']) ? $_SESSION['image_resizing'] : null; |
@@ -63,8 +63,8 @@ discard block |
||
63 | 63 | </script> |
64 | 64 | |
65 | 65 | <?php |
66 | -$actions = '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
67 | -$actions .= '<a href="slideshow.php?curdirpath='.$pathurl.'">'.Display::return_icon('slideshow.png',get_lang('BackTo').' '.get_lang('SlideShow'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
66 | +$actions = '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
67 | +$actions .= '<a href="slideshow.php?curdirpath='.$pathurl.'">'.Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('SlideShow'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
68 | 68 | Display::toolbarAction('toolbar-slideshow', $content) |
69 | 69 | ?> |
70 | 70 | <div class="panel panel-default"> |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | } |
80 | 80 | ?>> |
81 | 81 | </label> |
82 | - <?php echo '<b>'. get_lang('NoResizing') . '</b>, ' . get_lang('NoResizingComment') ;?> |
|
82 | + <?php echo '<b>'.get_lang('NoResizing').'</b>, '.get_lang('NoResizingComment'); ?> |
|
83 | 83 | </div> |
84 | 84 | <div class="radio"> |
85 | 85 | <label> |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | } |
90 | 90 | ?>> |
91 | 91 | </label> |
92 | - <?php echo '<b>'. get_lang('ResizingAuto') . '</b>, ' . get_lang('ResizingAutoComment');?> |
|
92 | + <?php echo '<b>'.get_lang('ResizingAuto').'</b>, '.get_lang('ResizingAutoComment'); ?> |
|
93 | 93 | </div> |
94 | 94 | <div class="radio"> |
95 | 95 | <label> |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | } |
102 | 102 | ?>> |
103 | 103 | </label> |
104 | - <?php echo '<b>'. get_lang('Resizing') . '</b>, ' . get_lang('ResizingComment'); ?> |
|
104 | + <?php echo '<b>'.get_lang('Resizing').'</b>, '.get_lang('ResizingComment'); ?> |
|
105 | 105 | </div> |
106 | 106 | <div class="form-group"> |
107 | 107 | <label class="col-sm-1 control-label"><?php echo get_lang('Width'); ?></label> |
@@ -24,12 +24,12 @@ |
||
24 | 24 | unset($_SESSION['temp_realpath_image']); |
25 | 25 | |
26 | 26 | if (!isset($_SESSION['exit_pixlr'])){ |
27 | - $location=api_get_path(WEB_CODE_PATH).'document/document.php'; |
|
28 | - echo '<script>window.parent.location.href="'.$location.'"</script>'; |
|
29 | - api_not_allowed(true); |
|
27 | + $location=api_get_path(WEB_CODE_PATH).'document/document.php'; |
|
28 | + echo '<script>window.parent.location.href="'.$location.'"</script>'; |
|
29 | + api_not_allowed(true); |
|
30 | 30 | } else { |
31 | - echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>'; |
|
32 | - $location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']); |
|
33 | - echo '<script>window.parent.location.href="'.$location.'"</script>'; |
|
34 | - unset($_SESSION['exit_pixlr']); |
|
31 | + echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>'; |
|
32 | + $location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']); |
|
33 | + echo '<script>window.parent.location.href="'.$location.'"</script>'; |
|
34 | + unset($_SESSION['exit_pixlr']); |
|
35 | 35 | } |
@@ -23,13 +23,13 @@ |
||
23 | 23 | unset($_SESSION['whereami']); |
24 | 24 | unset($_SESSION['temp_realpath_image']); |
25 | 25 | |
26 | -if (!isset($_SESSION['exit_pixlr'])){ |
|
27 | - $location=api_get_path(WEB_CODE_PATH).'document/document.php'; |
|
26 | +if (!isset($_SESSION['exit_pixlr'])) { |
|
27 | + $location = api_get_path(WEB_CODE_PATH).'document/document.php'; |
|
28 | 28 | echo '<script>window.parent.location.href="'.$location.'"</script>'; |
29 | 29 | api_not_allowed(true); |
30 | 30 | } else { |
31 | 31 | echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>'; |
32 | - $location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']); |
|
32 | + $location = api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']); |
|
33 | 33 | echo '<script>window.parent.location.href="'.$location.'"</script>'; |
34 | 34 | unset($_SESSION['exit_pixlr']); |
35 | 35 | } |
@@ -15,8 +15,6 @@ discard block |
||
15 | 15 | This file has two large sections. |
16 | 16 | 1. code that belongs in document.php, but to avoid clutter I put the code here |
17 | 17 | 2. the function resize_image that handles the image resizing |
18 | - |
|
19 | - |
|
20 | 18 | * @author Patrick Cool |
21 | 19 | * @package chamilo.document |
22 | 20 | * @todo convert comments to be understandable to phpDocumentor |
@@ -34,16 +32,16 @@ discard block |
||
34 | 32 | * view is also possible when you choose not to resize the source images |
35 | 33 | */ |
36 | 34 | function resize_image($image, $target_width, $target_height, $slideshow = 0) { |
37 | - // Modifications by Ivan Tcholakov, 04-MAY-2009. |
|
38 | - $result = array(); |
|
39 | - if ( (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing']== 'resizing') or $slideshow == 1) { |
|
40 | - $new_sizes = api_resize_image($image, $target_width, $target_height); |
|
41 | - $result[] = $new_sizes['height']; |
|
42 | - $result[] = $new_sizes['width']; |
|
43 | - } else { |
|
35 | + // Modifications by Ivan Tcholakov, 04-MAY-2009. |
|
36 | + $result = array(); |
|
37 | + if ( (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing']== 'resizing') or $slideshow == 1) { |
|
38 | + $new_sizes = api_resize_image($image, $target_width, $target_height); |
|
39 | + $result[] = $new_sizes['height']; |
|
40 | + $result[] = $new_sizes['width']; |
|
41 | + } else { |
|
44 | 42 | $size = api_getimagesize($image); |
45 | - $result[] = $size['height']; |
|
46 | - $result[] = $size['width']; |
|
47 | - } |
|
48 | - return $result; |
|
43 | + $result[] = $size['height']; |
|
44 | + $result[] = $size['width']; |
|
45 | + } |
|
46 | + return $result; |
|
49 | 47 | } |
@@ -36,7 +36,7 @@ |
||
36 | 36 | function resize_image($image, $target_width, $target_height, $slideshow = 0) { |
37 | 37 | // Modifications by Ivan Tcholakov, 04-MAY-2009. |
38 | 38 | $result = array(); |
39 | - if ( (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing']== 'resizing') or $slideshow == 1) { |
|
39 | + if ((isset($_SESSION['image_resizing']) && $_SESSION['image_resizing'] == 'resizing') or $slideshow == 1) { |
|
40 | 40 | $new_sizes = api_resize_image($image, $target_width, $target_height); |
41 | 41 | $result[] = $new_sizes['height']; |
42 | 42 | $result[] = $new_sizes['width']; |
@@ -32,11 +32,11 @@ discard block |
||
32 | 32 | $session = array(); |
33 | 33 | $user_name = $user_info['complete_name']; |
34 | 34 | |
35 | -$course_list = SessionManager::get_course_list_by_session_id ($session_id); |
|
35 | +$course_list = SessionManager::get_course_list_by_session_id($session_id); |
|
36 | 36 | $session_list = SessionManager::get_session_by_course($course_id); |
37 | 37 | $total_quota_bytes = DocumentManager::get_course_quota(); |
38 | -$quota_bytes = DocumentManager::documents_total_space($course_id, 0 , 0); |
|
39 | -$quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100; |
|
38 | +$quota_bytes = DocumentManager::documents_total_space($course_id, 0, 0); |
|
39 | +$quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100; |
|
40 | 40 | |
41 | 41 | $session[] = array(get_lang('Course').' ('.format_file_size($quota_bytes).')', $quota_percentage); |
42 | 42 | |
@@ -46,11 +46,11 @@ discard block |
||
46 | 46 | foreach ($session_list as $session_data) { |
47 | 47 | $quota_percentage = 0; |
48 | 48 | $quota_bytes = intval(DocumentManager::documents_total_space($course_id, null, $session_data['id'])); |
49 | - if (!empty($quota_bytes)) { |
|
50 | - $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100; |
|
49 | + if (!empty($quota_bytes)) { |
|
50 | + $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100; |
|
51 | 51 | } |
52 | 52 | if ($session_id == $session_data['id']) { |
53 | - $session_data['name'] = $session_data['name'] . ' * '; |
|
53 | + $session_data['name'] = $session_data['name'].' * '; |
|
54 | 54 | } |
55 | 55 | $used_quota_bytes += $quota_bytes; |
56 | 56 | $session[] = array( |
@@ -66,11 +66,11 @@ discard block |
||
66 | 66 | $quota_percentage = 0; |
67 | 67 | $my_group_id = $group_data['id']; |
68 | 68 | $quota_bytes = intval(DocumentManager::documents_total_space($course_id, $my_group_id, 0)); |
69 | - if (!empty($quota_bytes)) { |
|
70 | - $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100; |
|
69 | + if (!empty($quota_bytes)) { |
|
70 | + $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100; |
|
71 | 71 | } |
72 | 72 | if ($group_id == $my_group_id) { |
73 | - $group_data['name'] = $group_data['name'] . ' * '; |
|
73 | + $group_data['name'] = $group_data['name'].' * '; |
|
74 | 74 | } |
75 | 75 | $used_quota_bytes += $quota_bytes; |
76 | 76 | $session[] = array(addslashes(get_lang('Group').': '.$group_data['name']).' ('.format_file_size($quota_bytes).')', $quota_percentage); |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | } |
86 | 86 | } |
87 | 87 | if ($quota_bytes != 0) { |
88 | - $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100; |
|
88 | + $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100; |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | $session[] = array(addslashes(get_lang('Teacher').': '.$user_name).' ('.format_file_size($quota_bytes).')', $quota_percentage); |
@@ -98,15 +98,15 @@ discard block |
||
98 | 98 | $total_quota_bytes += DocumentManager::get_course_quota($course_data['id']); |
99 | 99 | } |
100 | 100 | if ($quota_bytes != 0) { |
101 | - $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100; |
|
101 | + $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100; |
|
102 | 102 | } |
103 | 103 | } |
104 | - $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'),$user_name)), $quota_percentage); |
|
104 | + $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'), $user_name)), $quota_percentage); |
|
105 | 105 | |
106 | 106 | } |
107 | 107 | } |
108 | 108 | |
109 | -$quota_percentage = round(($total_quota_bytes - $used_quota_bytes)/$total_quota_bytes, 2)*100; |
|
109 | +$quota_percentage = round(($total_quota_bytes - $used_quota_bytes) / $total_quota_bytes, 2) * 100; |
|
110 | 110 | $session[] = array(addslashes(get_lang('ShowCourseQuotaUse')).' ('.format_file_size($total_quota_bytes - $used_quota_bytes).') ', $quota_percentage); |
111 | 111 | $quota_data = json_encode($session); |
112 | 112 |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | } |
86 | 86 | } |
87 | 87 | if ($quota_bytes != 0) { |
88 | - $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100; |
|
88 | + $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100; |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | $session[] = array(addslashes(get_lang('Teacher').': '.$user_name).' ('.format_file_size($quota_bytes).')', $quota_percentage); |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | } |
104 | 104 | $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'),$user_name)), $quota_percentage); |
105 | 105 | |
106 | - } |
|
106 | + } |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | $quota_percentage = round(($total_quota_bytes - $used_quota_bytes)/$total_quota_bytes, 2)*100; |
@@ -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 |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | <div id="actions" class="actions"> |
19 | 19 | <?php if ($action != 'createcoursecategory') { ?> |
20 | 20 | <a href="<?php echo api_get_self(); ?>?action=createcoursecategory"> |
21 | - <?php echo Display::return_icon('new_folder.png', get_lang('CreateCourseCategory'),'','32'); ?></a> |
|
21 | + <?php echo Display::return_icon('new_folder.png', get_lang('CreateCourseCategory'), '', '32'); ?></a> |
|
22 | 22 | <?php } ?> |
23 | 23 | </div> |
24 | 24 | |
@@ -50,26 +50,26 @@ discard block |
||
50 | 50 | $max_category_key = count($user_course_categories); |
51 | 51 | if ($action != 'unsubscribe') { ?> |
52 | 52 | <a href="courses.php?action=sortmycourses&categoryid=<?php echo $row['id']; ?>&sec_token=<?php echo $stok; ?>#category<?php echo $row['id']; ?>"> |
53 | - <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?> |
|
53 | + <?php echo Display::display_icon('edit.png', get_lang('Edit'), '', 22); ?> |
|
54 | 54 | </a> |
55 | 55 | |
56 | 56 | <?php if ($row['id'] != $user_course_categories[0]['id']) { ?> |
57 | 57 | <a href="courses.php?action=<?php echo $action ?>&move=up&category=<?php echo $row['id']; ?>&sec_token=<?php echo $stok; ?>"> |
58 | - <?php echo Display::return_icon('up.png', get_lang('Up'),'',22); ?> |
|
58 | + <?php echo Display::return_icon('up.png', get_lang('Up'), '', 22); ?> |
|
59 | 59 | </a> |
60 | 60 | <?php } else { ?> |
61 | - <?php echo Display::return_icon('up_na.png', get_lang('Up'),'',22); ?> |
|
61 | + <?php echo Display::return_icon('up_na.png', get_lang('Up'), '', 22); ?> |
|
62 | 62 | <?php } ?> |
63 | 63 | |
64 | 64 | <?php if ($row['id'] != $user_course_categories[$max_category_key - 1]['id']) { ?> |
65 | 65 | <a href="courses.php?action=<?php echo $action; ?>&move=down&category=<?php echo $row['id']; ?>&sec_token=<?php echo $stok; ?>"> |
66 | - <?php echo Display::return_icon('down.png', get_lang('Down'),'',22); ?> |
|
66 | + <?php echo Display::return_icon('down.png', get_lang('Down'), '', 22); ?> |
|
67 | 67 | </a> |
68 | 68 | <?php } else { ?> |
69 | - <?php echo Display::return_icon('down_na.png', get_lang('Down'),'',22); ?> |
|
69 | + <?php echo Display::return_icon('down_na.png', get_lang('Down'), '', 22); ?> |
|
70 | 70 | <?php } ?> |
71 | 71 | <a href="courses.php?action=deletecoursecategory&id=<?php echo $row['id']; ?>&sec_token=<?php echo $stok; ?>"> |
72 | - <?php echo Display::display_icon('delete.png', get_lang('Delete'), array('onclick' => "javascript: if (!confirm('".addslashes(api_htmlentities(get_lang("CourseCategoryAbout2bedeleted"), ENT_QUOTES, api_get_system_encoding()))."')) return false;"),22) ?> |
|
72 | + <?php echo Display::display_icon('delete.png', get_lang('Delete'), array('onclick' => "javascript: if (!confirm('".addslashes(api_htmlentities(get_lang("CourseCategoryAbout2bedeleted"), ENT_QUOTES, api_get_system_encoding()))."')) return false;"), 22) ?> |
|
73 | 73 | </a> |
74 | 74 | <?php } |
75 | 75 | echo '<br /><br />'; |
@@ -123,35 +123,35 @@ discard block |
||
123 | 123 | <div style="float:left;width:110px;"> |
124 | 124 | <?php |
125 | 125 | if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') { |
126 | - $icon_title = get_lang('CourseDetails') . ' - ' . $course['title']; |
|
126 | + $icon_title = get_lang('CourseDetails').' - '.$course['title']; |
|
127 | 127 | ?> |
128 | 128 | <a href="<?php echo api_get_path(WEB_CODE_PATH); ?>inc/ajax/course_home.ajax.php?a=show_course_information&code=<?php echo $course['code'] ?>" data-title="<?php echo $icon_title ?>" title="<?php echo $icon_title ?>" class="ajax"> |
129 | - <?php echo Display::return_icon('info.png', $icon_title,'','22') ?> |
|
129 | + <?php echo Display::return_icon('info.png', $icon_title, '', '22') ?> |
|
130 | 130 | <?php } ?> |
131 | 131 | </a> |
132 | 132 | |
133 | 133 | <?php if (isset($_GET['edit']) && $course['code'] == $_GET['edit']) { ?> |
134 | - <?php echo Display::display_icon('edit_na.png', get_lang('Edit'),'',22); ?> |
|
134 | + <?php echo Display::display_icon('edit_na.png', get_lang('Edit'), '', 22); ?> |
|
135 | 135 | <?php } else { ?> |
136 | 136 | <a href="courses.php?action=<?php echo $action; ?>&edit=<?php echo $course['code']; ?>&sec_token=<?php echo $stok; ?>"> |
137 | - <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?> |
|
137 | + <?php echo Display::display_icon('edit.png', get_lang('Edit'), '', 22); ?> |
|
138 | 138 | </a> |
139 | 139 | <?php } ?> |
140 | 140 | |
141 | 141 | <?php if ($key > 0) { ?> |
142 | 142 | <a href="courses.php?action=<?php echo $action; ?>&move=up&course=<?php echo $course['code']; ?>&category=<?php echo $course['user_course_cat']; ?>&sec_token=<?php echo $stok; ?>"> |
143 | - <?php echo Display::display_icon('up.png', get_lang('Up'),'',22); ?> |
|
143 | + <?php echo Display::display_icon('up.png', get_lang('Up'), '', 22); ?> |
|
144 | 144 | </a> |
145 | 145 | <?php } else { ?> |
146 | - <?php echo Display::display_icon('up_na.png', get_lang('Up'),'',22); ?> |
|
146 | + <?php echo Display::display_icon('up_na.png', get_lang('Up'), '', 22); ?> |
|
147 | 147 | <?php } ?> |
148 | 148 | |
149 | 149 | <?php if ($key < $number_of_courses - 1) { ?> |
150 | 150 | <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; ?>"> |
151 | - <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?> |
|
151 | + <?php echo Display::display_icon('down.png', get_lang('Down'), '', 22); ?> |
|
152 | 152 | </a> |
153 | 153 | <?php } else { ?> |
154 | - <?php echo Display::display_icon('down_na.png', get_lang('Down'),'',22); ?> |
|
154 | + <?php echo Display::display_icon('down_na.png', get_lang('Down'), '', 22); ?> |
|
155 | 155 | <?php } ?> |
156 | 156 | |
157 | 157 | </div> |
@@ -219,36 +219,36 @@ discard block |
||
219 | 219 | <div style="float:left; width:110px"> |
220 | 220 | <?php |
221 | 221 | if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') { |
222 | - $icon_title = get_lang('CourseDetails') . ' - ' . $course['title']; |
|
222 | + $icon_title = get_lang('CourseDetails').' - '.$course['title']; |
|
223 | 223 | ?> |
224 | 224 | <a href="<?php echo api_get_path(WEB_CODE_PATH); ?>inc/ajax/course_home.ajax.php?a=show_course_information&code=<?php echo $course['code'] ?>" data-title="<?php echo $icon_title ?>" title="<?php echo $icon_title ?>" class="ajax"> |
225 | - <?php echo Display::return_icon('info.png', $icon_title, '','22'); ?> |
|
225 | + <?php echo Display::return_icon('info.png', $icon_title, '', '22'); ?> |
|
226 | 226 | </a> |
227 | 227 | <?php } ?> |
228 | 228 | |
229 | 229 | <?php if (isset($_GET['edit']) && $course['code'] == $_GET['edit']) { ?> |
230 | - <?php echo Display::display_icon('edit_na.png', get_lang('Edit'),'',22); ?> |
|
230 | + <?php echo Display::display_icon('edit_na.png', get_lang('Edit'), '', 22); ?> |
|
231 | 231 | <?php } else { ?> |
232 | 232 | <a href="courses.php?action=<?php echo $action; ?>&edit=<?php echo $course['code']; ?>&sec_token=<?php echo $stok; ?>"> |
233 | - <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?> |
|
233 | + <?php echo Display::display_icon('edit.png', get_lang('Edit'), '', 22); ?> |
|
234 | 234 | </a> |
235 | 235 | <?php } ?> |
236 | 236 | |
237 | 237 | <!-- up /down icons--> |
238 | 238 | <?php if ($key > 0) { ?> |
239 | 239 | <a href="courses.php?action=<?php echo $action; ?>&move=up&course=<?php echo $course['code']; ?>&category=<?php echo $course['user_course_cat']; ?>&sec_token=<?php echo $stok; ?>"> |
240 | - <?php echo Display::display_icon('up.png', get_lang('Up'),'',22) ?> |
|
240 | + <?php echo Display::display_icon('up.png', get_lang('Up'), '', 22) ?> |
|
241 | 241 | </a> |
242 | 242 | <?php } else { |
243 | - echo Display::display_icon('up_na.png', get_lang('Up'),'',22); |
|
243 | + echo Display::display_icon('up_na.png', get_lang('Up'), '', 22); |
|
244 | 244 | } |
245 | 245 | |
246 | 246 | if ($key < $number_of_courses - 1) { ?> |
247 | 247 | <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; ?>"> |
248 | - <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?> |
|
248 | + <?php echo Display::display_icon('down.png', get_lang('Down'), '', 22); ?> |
|
249 | 249 | </a> |
250 | 250 | <?php } else { |
251 | - echo Display::display_icon('down_na.png', get_lang('Down'),'',22); |
|
251 | + echo Display::display_icon('down_na.png', get_lang('Down'), '', 22); |
|
252 | 252 | }?> |
253 | 253 | </div> |
254 | 254 | <div style="float:left; margin-right:10px;"> |
@@ -16,7 +16,7 @@ |
||
16 | 16 | <!-- Actions: The menu with the different options in cathe course management --> |
17 | 17 | <div id="actions" class="actions"> |
18 | 18 | <a href="<?php echo api_get_self() ?>?action=sortmycourses"> |
19 | - <?php echo Display::return_icon('back.png', get_lang('Back'),'','32'); ?> |
|
19 | + <?php echo Display::return_icon('back.png', get_lang('Back'), '', '32'); ?> |
|
20 | 20 | </a> |
21 | 21 | </div> |
22 | 22 |
@@ -26,14 +26,14 @@ |
||
26 | 26 | * Redirect to the correct script to handle this type of upload |
27 | 27 | */ |
28 | 28 | switch ($_SESSION['my_tool']) { |
29 | - case TOOL_LEARNPATH: |
|
30 | - require 'upload.scorm.php'; |
|
31 | - break; |
|
32 | - //the following cases need to be distinguished later on |
|
33 | - case TOOL_DROPBOX: |
|
34 | - case TOOL_STUDENTPUBLICATION: |
|
35 | - case TOOL_DOCUMENT: |
|
36 | - default: |
|
37 | - require 'upload.document.php'; |
|
38 | - break; |
|
29 | + case TOOL_LEARNPATH: |
|
30 | + require 'upload.scorm.php'; |
|
31 | + break; |
|
32 | + //the following cases need to be distinguished later on |
|
33 | + case TOOL_DROPBOX: |
|
34 | + case TOOL_STUDENTPUBLICATION: |
|
35 | + case TOOL_DOCUMENT: |
|
36 | + default: |
|
37 | + require 'upload.document.php'; |
|
38 | + break; |
|
39 | 39 | } |
@@ -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 |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | |
13 | 13 | require_once '../inc/global.inc.php'; |
14 | 14 | $this_section = SECTION_COURSES; |
15 | -$current_course_tool = TOOL_GROUP; |
|
15 | +$current_course_tool = TOOL_GROUP; |
|
16 | 16 | |
17 | 17 | // Notice for unauthorized people. |
18 | 18 | api_protect_course_script(true); |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | $form->addGroup( |
82 | 82 | $group, |
83 | 83 | '', |
84 | - Display::return_icon('user.png', get_lang('GroupSelfRegistration')) . '<span>' . get_lang('GroupSelfRegistration') . '</span>', |
|
84 | + Display::return_icon('user.png', get_lang('GroupSelfRegistration')).'<span>'.get_lang('GroupSelfRegistration').'</span>', |
|
85 | 85 | null, |
86 | 86 | false |
87 | 87 | ); |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | $form->addGroup( |
96 | 96 | $group, |
97 | 97 | '', |
98 | - Display::return_icon('folder.png', get_lang('GroupDocument')) . '<span>' . get_lang('GroupDocument') . '</span>', |
|
98 | + Display::return_icon('folder.png', get_lang('GroupDocument')).'<span>'.get_lang('GroupDocument').'</span>', |
|
99 | 99 | null, |
100 | 100 | false |
101 | 101 | ); |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | $form->addGroup( |
110 | 110 | $group, |
111 | 111 | '', |
112 | - Display::return_icon('works.png', get_lang('GroupWork')) . '<span>' . get_lang('GroupWork') . '</span>', |
|
112 | + Display::return_icon('works.png', get_lang('GroupWork')).'<span>'.get_lang('GroupWork').'</span>', |
|
113 | 113 | null, |
114 | 114 | false |
115 | 115 | ); |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | $form->addGroup( |
124 | 124 | $group, |
125 | 125 | '', |
126 | - Display::return_icon('agenda.png', get_lang('GroupCalendar')) . '<span>' . get_lang('GroupCalendar') . '</span>', |
|
126 | + Display::return_icon('agenda.png', get_lang('GroupCalendar')).'<span>'.get_lang('GroupCalendar').'</span>', |
|
127 | 127 | null, |
128 | 128 | false |
129 | 129 | ); |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | $form->addGroup( |
141 | 141 | $group, |
142 | 142 | '', |
143 | - Display::return_icon('announce.png', get_lang('GroupAnnouncements')) . '<span>' . get_lang('GroupAnnouncements') . '</span>', |
|
143 | + Display::return_icon('announce.png', get_lang('GroupAnnouncements')).'<span>'.get_lang('GroupAnnouncements').'</span>', |
|
144 | 144 | null, |
145 | 145 | false |
146 | 146 | ); |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | $form->addGroup( |
155 | 155 | $group, |
156 | 156 | '', |
157 | - Display::return_icon('forum.png', get_lang('GroupForum')) . '<span>' . get_lang('GroupForum') . '</span>', |
|
157 | + Display::return_icon('forum.png', get_lang('GroupForum')).'<span>'.get_lang('GroupForum').'</span>', |
|
158 | 158 | null, |
159 | 159 | false |
160 | 160 | ); |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | $form->addGroup( |
182 | 182 | $group, |
183 | 183 | '', |
184 | - Display::return_icon('chat.png', get_lang('Chat')) . '<span>' . get_lang('Chat') . '</span>', |
|
184 | + Display::return_icon('chat.png', get_lang('Chat')).'<span>'.get_lang('Chat').'</span>', |
|
185 | 185 | null, |
186 | 186 | false |
187 | 187 | ); |
@@ -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;"'); |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | |
14 | 14 | require_once '../inc/global.inc.php'; |
15 | 15 | $this_section = SECTION_COURSES; |
16 | -$current_course_tool = TOOL_GROUP; |
|
16 | +$current_course_tool = TOOL_GROUP; |
|
17 | 17 | |
18 | 18 | // Notice for unauthorized people. |
19 | 19 | api_protect_course_script(true); |
@@ -22,8 +22,8 @@ discard block |
||
22 | 22 | $current_group = GroupManager :: get_group_properties($group_id); |
23 | 23 | |
24 | 24 | $nameTools = get_lang('EditGroup'); |
25 | -$interbreadcrumb[] = array ('url' => 'group.php?'.api_get_cidreq(), 'name' => get_lang('Groups')); |
|
26 | -$interbreadcrumb[] = array ('url' => 'group_space.php?'.api_get_cidreq(), 'name' => $current_group['name']); |
|
25 | +$interbreadcrumb[] = array('url' => 'group.php?'.api_get_cidreq(), 'name' => get_lang('Groups')); |
|
26 | +$interbreadcrumb[] = array('url' => 'group_space.php?'.api_get_cidreq(), 'name' => $current_group['name']); |
|
27 | 27 | |
28 | 28 | $is_group_member = GroupManager :: is_tutor_of_group(api_get_user_id(), $current_group['iid']); |
29 | 29 | |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | $form->addText('name', get_lang('GroupName')); |
131 | 131 | |
132 | 132 | // Description |
133 | -$form->addElement('textarea', 'description', get_lang('Description'), array ('rows' => 6)); |
|
133 | +$form->addElement('textarea', 'description', get_lang('Description'), array('rows' => 6)); |
|
134 | 134 | |
135 | 135 | $complete_user_list = GroupManager :: fill_groups_list($current_group['iid']); |
136 | 136 | usort($complete_user_list, 'sort_users'); |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | // Group members |
160 | 160 | $group_member_list = GroupManager::get_subscribed_users($current_group['iid']); |
161 | 161 | |
162 | -$selected_users = array (); |
|
162 | +$selected_users = array(); |
|
163 | 163 | foreach ($group_member_list as $index => $user) { |
164 | 164 | $selected_users[] = $user['user_id']; |
165 | 165 | } |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | $form->addGroup( |
206 | 206 | $group, |
207 | 207 | '', |
208 | - Display::return_icon('user.png', get_lang('GroupSelfRegistration')) . ' ' . get_lang('GroupSelfRegistration'), |
|
208 | + Display::return_icon('user.png', get_lang('GroupSelfRegistration')).' '.get_lang('GroupSelfRegistration'), |
|
209 | 209 | null, |
210 | 210 | false |
211 | 211 | ); |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | $form->addGroup( |
232 | 232 | $group, |
233 | 233 | '', |
234 | - Display::return_icon('work.png', get_lang('GroupWork')) . ' ' . get_lang('GroupWork'), |
|
234 | + Display::return_icon('work.png', get_lang('GroupWork')).' '.get_lang('GroupWork'), |
|
235 | 235 | null, |
236 | 236 | false |
237 | 237 | ); |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | $form->addGroup( |
245 | 245 | $group, |
246 | 246 | '', |
247 | - Display::return_icon('agenda.png', get_lang('GroupCalendar')) . ' ' . get_lang('GroupCalendar'), |
|
247 | + Display::return_icon('agenda.png', get_lang('GroupCalendar')).' '.get_lang('GroupCalendar'), |
|
248 | 248 | null, |
249 | 249 | false |
250 | 250 | ); |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | $form->addGroup( |
258 | 258 | $group, |
259 | 259 | '', |
260 | - Display::return_icon('announce.png', get_lang('GroupAnnouncements')) . ' ' . get_lang('GroupAnnouncements'), |
|
260 | + Display::return_icon('announce.png', get_lang('GroupAnnouncements')).' '.get_lang('GroupAnnouncements'), |
|
261 | 261 | null, |
262 | 262 | false |
263 | 263 | ); |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | $form->addGroup( |
271 | 271 | $group, |
272 | 272 | '', |
273 | - Display::return_icon('forum.png', get_lang('GroupForum')) . ' ' . get_lang('GroupForum'), |
|
273 | + Display::return_icon('forum.png', get_lang('GroupForum')).' '.get_lang('GroupForum'), |
|
274 | 274 | null, |
275 | 275 | false |
276 | 276 | ); |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | $form->addGroup( |
285 | 285 | $group, |
286 | 286 | '', |
287 | - Display::return_icon('wiki.png', get_lang('GroupWiki')) . ' ' . get_lang('GroupWiki'), |
|
287 | + Display::return_icon('wiki.png', get_lang('GroupWiki')).' '.get_lang('GroupWiki'), |
|
288 | 288 | null, |
289 | 289 | false |
290 | 290 | ); |