@@ -13,15 +13,15 @@ discard block |
||
13 | 13 | api_not_allowed(true); |
14 | 14 | } |
15 | 15 | |
16 | -$this_section = SECTION_COURSES; |
|
17 | -$current_course_tool = TOOL_BLOGS; |
|
16 | +$this_section = SECTION_COURSES; |
|
17 | +$current_course_tool = TOOL_BLOGS; |
|
18 | 18 | |
19 | 19 | /* ACCESS RIGHTS */ |
20 | 20 | // notice for unauthorized people. |
21 | 21 | api_protect_course_script(true); |
22 | 22 | |
23 | 23 | $lib_path = api_get_path(LIBRARY_PATH); |
24 | -$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT); |
|
24 | +$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT); |
|
25 | 25 | |
26 | 26 | $nameTools = get_lang('Blogs'); |
27 | 27 | $DaysShort = api_get_week_days_short(); |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | $safe_comment_title, |
136 | 136 | $safe_comment_text, |
137 | 137 | $blog_id, |
138 | - (int)$_GET['post_id'], |
|
138 | + (int) $_GET['post_id'], |
|
139 | 139 | $_POST['comment_parent_id'], |
140 | 140 | $_POST['task_id'] |
141 | 141 | ); |
@@ -147,29 +147,29 @@ discard block |
||
147 | 147 | if (!empty($_POST['register'])) { |
148 | 148 | if (is_array($_POST['user'])) { |
149 | 149 | foreach ($_POST['user'] as $index => $user_id) { |
150 | - Blog :: set_user_subscribed((int)$_GET['blog_id'], $user_id); |
|
150 | + Blog :: set_user_subscribed((int) $_GET['blog_id'], $user_id); |
|
151 | 151 | } |
152 | 152 | } |
153 | 153 | } |
154 | 154 | if (!empty($_POST['unregister'])) { |
155 | 155 | if (is_array($_POST['user'])) { |
156 | 156 | foreach ($_POST['user'] as $index => $user_id) { |
157 | - Blog :: set_user_unsubscribed((int)$_GET['blog_id'], $user_id); |
|
157 | + Blog :: set_user_unsubscribed((int) $_GET['blog_id'], $user_id); |
|
158 | 158 | } |
159 | 159 | } |
160 | 160 | } |
161 | 161 | if (!empty($_GET['register'])) { |
162 | - Blog :: set_user_subscribed((int)$_GET['blog_id'], (int)$_GET['user_id']); |
|
162 | + Blog :: set_user_subscribed((int) $_GET['blog_id'], (int) $_GET['user_id']); |
|
163 | 163 | $return_message = array('type' => 'confirmation', 'message' => get_lang('UserRegistered')); |
164 | 164 | $flag = 1; |
165 | 165 | } |
166 | 166 | if (!empty($_GET['unregister'])) { |
167 | - Blog :: set_user_unsubscribed((int)$_GET['blog_id'], (int)$_GET['user_id']); |
|
167 | + Blog :: set_user_unsubscribed((int) $_GET['blog_id'], (int) $_GET['user_id']); |
|
168 | 168 | } |
169 | 169 | |
170 | 170 | if (isset($_GET['action']) && $_GET['action'] == 'manage_tasks') { |
171 | 171 | if (isset($_GET['do']) && $_GET['do'] == 'delete') { |
172 | - Blog :: delete_task($blog_id, (int)$_GET['task_id']); |
|
172 | + Blog :: delete_task($blog_id, (int) $_GET['task_id']); |
|
173 | 173 | $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskDeleted')); |
174 | 174 | } |
175 | 175 | |
@@ -182,9 +182,9 @@ discard block |
||
182 | 182 | if (isset($_GET['action']) && $_GET['action'] == 'view_post') { |
183 | 183 | $task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0; |
184 | 184 | |
185 | - if (isset($_GET['do']) && $_GET['do'] == 'delete_comment') { |
|
185 | + if (isset($_GET['do']) && $_GET['do'] == 'delete_comment') { |
|
186 | 186 | if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) { |
187 | - Blog :: delete_comment($blog_id, (int)$_GET['post_id'],(int)$_GET['comment_id']); |
|
187 | + Blog :: delete_comment($blog_id, (int) $_GET['post_id'], (int) $_GET['comment_id']); |
|
188 | 188 | $return_message = array('type' => 'confirmation', 'message' => get_lang('CommentDeleted')); |
189 | 189 | } else { |
190 | 190 | $error = true; |
@@ -192,9 +192,9 @@ discard block |
||
192 | 192 | } |
193 | 193 | } |
194 | 194 | |
195 | - if (isset($_GET['do']) && $_GET['do'] == 'delete_article') { |
|
195 | + if (isset($_GET['do']) && $_GET['do'] == 'delete_article') { |
|
196 | 196 | if (api_is_allowed('BLOG_'.$blog_id, 'article_delete', $task_id)) { |
197 | - Blog :: delete_post($blog_id, (int)$_GET['article_id']); |
|
197 | + Blog :: delete_post($blog_id, (int) $_GET['article_id']); |
|
198 | 198 | $action = ''; // Article is gone, go to blog home |
199 | 199 | $return_message = array('type' => 'confirmation', 'message' => get_lang('BlogDeleted')); |
200 | 200 | } else { |
@@ -205,13 +205,13 @@ discard block |
||
205 | 205 | if (isset($_GET['do']) && $_GET['do'] == 'rate') { |
206 | 206 | if (isset($_GET['type']) && $_GET['type'] == 'post') { |
207 | 207 | if (api_is_allowed('BLOG_'.$blog_id, 'article_rate')) { |
208 | - Blog :: add_rating('post', $blog_id, (int)$_GET['post_id'], (int)$_GET['rating']); |
|
208 | + Blog :: add_rating('post', $blog_id, (int) $_GET['post_id'], (int) $_GET['rating']); |
|
209 | 209 | $return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded')); |
210 | 210 | } |
211 | 211 | } |
212 | 212 | if (isset($_GET['type']) && $_GET['type'] == 'comment') { |
213 | 213 | if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_add')) { |
214 | - Blog :: add_rating('comment', $blog_id, (int)$_GET['comment_id'], (int)$_GET['rating']); |
|
214 | + Blog :: add_rating('comment', $blog_id, (int) $_GET['comment_id'], (int) $_GET['rating']); |
|
215 | 215 | $return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded')); |
216 | 216 | } |
217 | 217 | } |
@@ -290,16 +290,16 @@ discard block |
||
290 | 290 | echo '<div class=actions>'; |
291 | 291 | ?> |
292 | 292 | <a href="<?php echo api_get_self(); ?>?blog_id=<?php echo $blog_id ?>&<?php echo api_get_cidreq(); ?>" title="<?php echo get_lang('Home') ?>"> |
293 | - <?php echo Display::return_icon('blog.png', get_lang('Home'),'',ICON_SIZE_MEDIUM); ?></a> |
|
294 | - <?php if(api_is_allowed('BLOG_'.$blog_id, 'article_add')) { ?> |
|
293 | + <?php echo Display::return_icon('blog.png', get_lang('Home'), '', ICON_SIZE_MEDIUM); ?></a> |
|
294 | + <?php if (api_is_allowed('BLOG_'.$blog_id, 'article_add')) { ?> |
|
295 | 295 | <a href="<?php echo api_get_self(); ?>?action=new_post&blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('NewPost') ?>"> |
296 | - <?php echo Display::return_icon('new_article.png', get_lang('NewPost'),'',ICON_SIZE_MEDIUM); ?></a><?php } ?> |
|
297 | - <?php if(api_is_allowed('BLOG_'.$blog_id, 'task_management')) { ?> |
|
296 | + <?php echo Display::return_icon('new_article.png', get_lang('NewPost'), '', ICON_SIZE_MEDIUM); ?></a><?php } ?> |
|
297 | + <?php if (api_is_allowed('BLOG_'.$blog_id, 'task_management')) { ?> |
|
298 | 298 | <a href="<?php echo api_get_self(); ?>?action=manage_tasks&blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('ManageTasks') ?>"> |
299 | - <?php echo Display::return_icon('blog_tasks.png', get_lang('TaskManager'),'',ICON_SIZE_MEDIUM); ?></a><?php } ?> |
|
300 | - <?php if(api_is_allowed('BLOG_'.$blog_id, 'member_management')) { ?> |
|
299 | + <?php echo Display::return_icon('blog_tasks.png', get_lang('TaskManager'), '', ICON_SIZE_MEDIUM); ?></a><?php } ?> |
|
300 | + <?php if (api_is_allowed('BLOG_'.$blog_id, 'member_management')) { ?> |
|
301 | 301 | <a href="<?php echo api_get_self(); ?>?action=manage_members&blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('ManageMembers') ?>"> |
302 | - <?php echo Display::return_icon('blog_admin_users.png', get_lang('MemberManager'),'',ICON_SIZE_MEDIUM); ?></a><?php } ?> |
|
302 | + <?php echo Display::return_icon('blog_admin_users.png', get_lang('MemberManager'), '', ICON_SIZE_MEDIUM); ?></a><?php } ?> |
|
303 | 303 | <?php |
304 | 304 | echo '</div>'; |
305 | 305 | |
@@ -317,8 +317,8 @@ discard block |
||
317 | 317 | <div class="panel-heading"><?php echo get_lang('Calendar') ?></div> |
318 | 318 | <div class="panel-body"> |
319 | 319 | <?php |
320 | - $month = isset($_GET['month']) ? (int)$_GET['month'] : (int) date('m'); |
|
321 | - $year = isset($_GET['year']) ? (int)$_GET['year'] : date('Y'); |
|
320 | + $month = isset($_GET['month']) ? (int) $_GET['month'] : (int) date('m'); |
|
321 | + $year = isset($_GET['year']) ? (int) $_GET['year'] : date('Y'); |
|
322 | 322 | Blog::display_minimonthcalendar($month, $year, $blog_id); |
323 | 323 | ?> |
324 | 324 | </div> |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | $course_id = api_get_course_int_id(); |
364 | 364 | |
365 | 365 | if (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) { |
366 | - $task_id = (int)$_GET['task_id']; |
|
366 | + $task_id = (int) $_GET['task_id']; |
|
367 | 367 | } else { |
368 | 368 | $task_id = 0; |
369 | 369 | $tbl_blogs_tasks_rel_user = Database :: get_course_table(TABLE_BLOGS_TASKS_REL_USER); |
@@ -379,9 +379,10 @@ discard block |
||
379 | 379 | $result = Database::query($sql); |
380 | 380 | $row = Database::fetch_array($result); |
381 | 381 | |
382 | - if ($row['number'] == 1) |
|
383 | - $user_task = true; |
|
384 | -} |
|
382 | + if ($row['number'] == 1) { |
|
383 | + $user_task = true; |
|
384 | + } |
|
385 | + } |
|
385 | 386 | |
386 | 387 | switch ($action) { |
387 | 388 | case 'new_post': |
@@ -468,16 +469,17 @@ discard block |
||
468 | 469 | echo '<br /><br />'; |
469 | 470 | Blog :: display_assigned_task_list($blog_id); |
470 | 471 | echo '<br /><br />'; |
472 | + } else { |
|
473 | + api_not_allowed(); |
|
471 | 474 | } |
472 | - else |
|
473 | - api_not_allowed(); |
|
474 | 475 | |
475 | 476 | break; |
476 | 477 | case 'execute_task' : |
477 | - if (isset ($_GET['post_id'])) |
|
478 | - Blog :: display_post($blog_id, intval($_GET['post_id'])); |
|
479 | - else |
|
480 | - Blog :: display_select_task_post($blog_id, intval($_GET['task_id'])); |
|
478 | + if (isset ($_GET['post_id'])) { |
|
479 | + Blog :: display_post($blog_id, intval($_GET['post_id'])); |
|
480 | + } else { |
|
481 | + Blog :: display_select_task_post($blog_id, intval($_GET['task_id'])); |
|
482 | + } |
|
481 | 483 | |
482 | 484 | break; |
483 | 485 | case 'view_search_result' : |
@@ -41,181 +41,181 @@ discard block |
||
41 | 41 | $safe_task_description = isset($_POST['task_description']) ? Security::remove_XSS($_POST['task_description']) : null; |
42 | 42 | |
43 | 43 | if (!empty($_POST['new_post_submit'])) { |
44 | - Blog:: create_post( |
|
45 | - $_POST['title'], |
|
46 | - $_POST['full_text'], |
|
47 | - $_POST['post_file_comment'], |
|
48 | - $blog_id |
|
49 | - ); |
|
50 | - $return_message = array('type' => 'confirmation', 'message' => get_lang('BlogAdded')); |
|
44 | + Blog:: create_post( |
|
45 | + $_POST['title'], |
|
46 | + $_POST['full_text'], |
|
47 | + $_POST['post_file_comment'], |
|
48 | + $blog_id |
|
49 | + ); |
|
50 | + $return_message = array('type' => 'confirmation', 'message' => get_lang('BlogAdded')); |
|
51 | 51 | } |
52 | 52 | if (!empty($_POST['edit_post_submit'])) { |
53 | - Blog:: edit_post( |
|
54 | - $_POST['post_id'], |
|
55 | - $_POST['title'], |
|
56 | - $_POST['full_text'], |
|
57 | - $blog_id |
|
58 | - ); |
|
59 | - $return_message = array('type' => 'confirmation', 'message' => get_lang('BlogEdited')); |
|
53 | + Blog:: edit_post( |
|
54 | + $_POST['post_id'], |
|
55 | + $_POST['title'], |
|
56 | + $_POST['full_text'], |
|
57 | + $blog_id |
|
58 | + ); |
|
59 | + $return_message = array('type' => 'confirmation', 'message' => get_lang('BlogEdited')); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | if (!empty($_POST['new_comment_submit'])) { |
63 | - Blog:: create_comment( |
|
64 | - $_POST['title'], |
|
65 | - $_POST['comment'], |
|
66 | - $_POST['post_file_comment'], |
|
67 | - $blog_id, |
|
68 | - $_GET['post_id'], |
|
69 | - $_POST['comment_parent_id'] |
|
70 | - ); |
|
71 | - $return_message = array('type' => 'confirmation', 'message' => get_lang('CommentAdded')); |
|
63 | + Blog:: create_comment( |
|
64 | + $_POST['title'], |
|
65 | + $_POST['comment'], |
|
66 | + $_POST['post_file_comment'], |
|
67 | + $blog_id, |
|
68 | + $_GET['post_id'], |
|
69 | + $_POST['comment_parent_id'] |
|
70 | + ); |
|
71 | + $return_message = array('type' => 'confirmation', 'message' => get_lang('CommentAdded')); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | if (!empty($_POST['new_task_submit'])) { |
75 | 75 | |
76 | - Blog:: create_task( |
|
77 | - $blog_id, |
|
78 | - $safe_task_name, |
|
79 | - $safe_task_description, |
|
80 | - (isset($_POST['chkArticleDelete']) ? $_POST['chkArticleDelete'] : null), |
|
81 | - (isset($_POST['chkArticleEdit']) ? $_POST['chkArticleEdit'] : null), |
|
82 | - (isset($_POST['chkCommentsDelete']) ? $_POST['chkCommentsDelete'] : null), |
|
83 | - (isset($_POST['task_color']) ? $_POST['task_color'] : null) |
|
84 | - ); |
|
85 | - $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskCreated')); |
|
76 | + Blog:: create_task( |
|
77 | + $blog_id, |
|
78 | + $safe_task_name, |
|
79 | + $safe_task_description, |
|
80 | + (isset($_POST['chkArticleDelete']) ? $_POST['chkArticleDelete'] : null), |
|
81 | + (isset($_POST['chkArticleEdit']) ? $_POST['chkArticleEdit'] : null), |
|
82 | + (isset($_POST['chkCommentsDelete']) ? $_POST['chkCommentsDelete'] : null), |
|
83 | + (isset($_POST['task_color']) ? $_POST['task_color'] : null) |
|
84 | + ); |
|
85 | + $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskCreated')); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | if (isset($_POST['edit_task_submit'])) { |
89 | - Blog:: edit_task( |
|
90 | - $_POST['blog_id'], |
|
91 | - $_POST['task_id'], |
|
92 | - $safe_task_name, |
|
93 | - $safe_task_description, |
|
94 | - $_POST['chkArticleDelete'], |
|
95 | - $_POST['chkArticleEdit'], |
|
96 | - $_POST['chkCommentsDelete'], |
|
97 | - $_POST['task_color'] |
|
98 | - ); |
|
99 | - $return_message = array( |
|
100 | - 'type' => 'confirmation', |
|
101 | - 'message' => get_lang('TaskEdited') |
|
102 | - ); |
|
89 | + Blog:: edit_task( |
|
90 | + $_POST['blog_id'], |
|
91 | + $_POST['task_id'], |
|
92 | + $safe_task_name, |
|
93 | + $safe_task_description, |
|
94 | + $_POST['chkArticleDelete'], |
|
95 | + $_POST['chkArticleEdit'], |
|
96 | + $_POST['chkCommentsDelete'], |
|
97 | + $_POST['task_color'] |
|
98 | + ); |
|
99 | + $return_message = array( |
|
100 | + 'type' => 'confirmation', |
|
101 | + 'message' => get_lang('TaskEdited') |
|
102 | + ); |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | if (!empty($_POST['assign_task_submit'])) { |
106 | - Blog:: assign_task( |
|
107 | - $blog_id, |
|
108 | - $_POST['task_user_id'], |
|
109 | - $_POST['task_task_id'], |
|
110 | - $_POST['task_day'] |
|
111 | - ); |
|
112 | - $return_message = array( |
|
113 | - 'type' => 'confirmation', |
|
114 | - 'message' => get_lang('TaskAssigned') |
|
115 | - ); |
|
106 | + Blog:: assign_task( |
|
107 | + $blog_id, |
|
108 | + $_POST['task_user_id'], |
|
109 | + $_POST['task_task_id'], |
|
110 | + $_POST['task_day'] |
|
111 | + ); |
|
112 | + $return_message = array( |
|
113 | + 'type' => 'confirmation', |
|
114 | + 'message' => get_lang('TaskAssigned') |
|
115 | + ); |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | if (isset($_POST['assign_task_edit_submit'])) { |
119 | - Blog:: edit_assigned_task( |
|
120 | - $blog_id, |
|
121 | - $_POST['task_user_id'], |
|
122 | - $_POST['task_task_id'], |
|
123 | - $_POST['task_day'], |
|
124 | - $_POST['old_user_id'], |
|
125 | - $_POST['old_task_id'], |
|
126 | - $_POST['old_target_date'] |
|
127 | - ); |
|
128 | - $return_message = array( |
|
129 | - 'type' => 'confirmation', |
|
130 | - 'message' => get_lang('AssignedTaskEdited') |
|
131 | - ); |
|
119 | + Blog:: edit_assigned_task( |
|
120 | + $blog_id, |
|
121 | + $_POST['task_user_id'], |
|
122 | + $_POST['task_task_id'], |
|
123 | + $_POST['task_day'], |
|
124 | + $_POST['old_user_id'], |
|
125 | + $_POST['old_task_id'], |
|
126 | + $_POST['old_target_date'] |
|
127 | + ); |
|
128 | + $return_message = array( |
|
129 | + 'type' => 'confirmation', |
|
130 | + 'message' => get_lang('AssignedTaskEdited') |
|
131 | + ); |
|
132 | 132 | } |
133 | 133 | if (!empty($_POST['new_task_execution_submit'])) { |
134 | - Blog:: create_comment( |
|
135 | - $safe_comment_title, |
|
136 | - $safe_comment_text, |
|
137 | - $blog_id, |
|
138 | - (int)$_GET['post_id'], |
|
139 | - $_POST['comment_parent_id'], |
|
140 | - $_POST['task_id'] |
|
141 | - ); |
|
142 | - $return_message = array( |
|
143 | - 'type' => 'confirmation', |
|
144 | - 'message' => get_lang('CommentCreated') |
|
145 | - ); |
|
134 | + Blog:: create_comment( |
|
135 | + $safe_comment_title, |
|
136 | + $safe_comment_text, |
|
137 | + $blog_id, |
|
138 | + (int)$_GET['post_id'], |
|
139 | + $_POST['comment_parent_id'], |
|
140 | + $_POST['task_id'] |
|
141 | + ); |
|
142 | + $return_message = array( |
|
143 | + 'type' => 'confirmation', |
|
144 | + 'message' => get_lang('CommentCreated') |
|
145 | + ); |
|
146 | 146 | } |
147 | 147 | if (!empty($_POST['register'])) { |
148 | - if (is_array($_POST['user'])) { |
|
149 | - foreach ($_POST['user'] as $index => $user_id) { |
|
150 | - Blog :: set_user_subscribed((int)$_GET['blog_id'], $user_id); |
|
151 | - } |
|
152 | - } |
|
148 | + if (is_array($_POST['user'])) { |
|
149 | + foreach ($_POST['user'] as $index => $user_id) { |
|
150 | + Blog :: set_user_subscribed((int)$_GET['blog_id'], $user_id); |
|
151 | + } |
|
152 | + } |
|
153 | 153 | } |
154 | 154 | if (!empty($_POST['unregister'])) { |
155 | - if (is_array($_POST['user'])) { |
|
156 | - foreach ($_POST['user'] as $index => $user_id) { |
|
157 | - Blog :: set_user_unsubscribed((int)$_GET['blog_id'], $user_id); |
|
158 | - } |
|
159 | - } |
|
155 | + if (is_array($_POST['user'])) { |
|
156 | + foreach ($_POST['user'] as $index => $user_id) { |
|
157 | + Blog :: set_user_unsubscribed((int)$_GET['blog_id'], $user_id); |
|
158 | + } |
|
159 | + } |
|
160 | 160 | } |
161 | 161 | if (!empty($_GET['register'])) { |
162 | - Blog :: set_user_subscribed((int)$_GET['blog_id'], (int)$_GET['user_id']); |
|
163 | - $return_message = array('type' => 'confirmation', 'message' => get_lang('UserRegistered')); |
|
164 | - $flag = 1; |
|
162 | + Blog :: set_user_subscribed((int)$_GET['blog_id'], (int)$_GET['user_id']); |
|
163 | + $return_message = array('type' => 'confirmation', 'message' => get_lang('UserRegistered')); |
|
164 | + $flag = 1; |
|
165 | 165 | } |
166 | 166 | if (!empty($_GET['unregister'])) { |
167 | - Blog :: set_user_unsubscribed((int)$_GET['blog_id'], (int)$_GET['user_id']); |
|
167 | + Blog :: set_user_unsubscribed((int)$_GET['blog_id'], (int)$_GET['user_id']); |
|
168 | 168 | } |
169 | 169 | |
170 | 170 | if (isset($_GET['action']) && $_GET['action'] == 'manage_tasks') { |
171 | - if (isset($_GET['do']) && $_GET['do'] == 'delete') { |
|
172 | - Blog :: delete_task($blog_id, (int)$_GET['task_id']); |
|
173 | - $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskDeleted')); |
|
174 | - } |
|
175 | - |
|
176 | - if (isset($_GET['do']) && $_GET['do'] == 'delete_assignment') { |
|
177 | - Blog :: delete_assigned_task($blog_id, intval($_GET['task_id']), intval($_GET['user_id'])); |
|
178 | - $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskAssignmentDeleted')); |
|
179 | - } |
|
171 | + if (isset($_GET['do']) && $_GET['do'] == 'delete') { |
|
172 | + Blog :: delete_task($blog_id, (int)$_GET['task_id']); |
|
173 | + $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskDeleted')); |
|
174 | + } |
|
175 | + |
|
176 | + if (isset($_GET['do']) && $_GET['do'] == 'delete_assignment') { |
|
177 | + Blog :: delete_assigned_task($blog_id, intval($_GET['task_id']), intval($_GET['user_id'])); |
|
178 | + $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskAssignmentDeleted')); |
|
179 | + } |
|
180 | 180 | } |
181 | 181 | |
182 | 182 | if (isset($_GET['action']) && $_GET['action'] == 'view_post') { |
183 | - $task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0; |
|
184 | - |
|
185 | - if (isset($_GET['do']) && $_GET['do'] == 'delete_comment') { |
|
186 | - if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) { |
|
187 | - Blog :: delete_comment($blog_id, (int)$_GET['post_id'],(int)$_GET['comment_id']); |
|
188 | - $return_message = array('type' => 'confirmation', 'message' => get_lang('CommentDeleted')); |
|
189 | - } else { |
|
190 | - $error = true; |
|
191 | - $message = get_lang('ActionNotAllowed'); |
|
192 | - } |
|
193 | - } |
|
194 | - |
|
195 | - if (isset($_GET['do']) && $_GET['do'] == 'delete_article') { |
|
196 | - if (api_is_allowed('BLOG_'.$blog_id, 'article_delete', $task_id)) { |
|
197 | - Blog :: delete_post($blog_id, (int)$_GET['article_id']); |
|
198 | - $action = ''; // Article is gone, go to blog home |
|
199 | - $return_message = array('type' => 'confirmation', 'message' => get_lang('BlogDeleted')); |
|
200 | - } else { |
|
201 | - $error = true; |
|
202 | - $message = get_lang('ActionNotAllowed'); |
|
203 | - } |
|
204 | - } |
|
205 | - if (isset($_GET['do']) && $_GET['do'] == 'rate') { |
|
206 | - if (isset($_GET['type']) && $_GET['type'] == 'post') { |
|
207 | - if (api_is_allowed('BLOG_'.$blog_id, 'article_rate')) { |
|
208 | - Blog :: add_rating('post', $blog_id, (int)$_GET['post_id'], (int)$_GET['rating']); |
|
209 | - $return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded')); |
|
210 | - } |
|
211 | - } |
|
212 | - if (isset($_GET['type']) && $_GET['type'] == 'comment') { |
|
213 | - if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_add')) { |
|
214 | - Blog :: add_rating('comment', $blog_id, (int)$_GET['comment_id'], (int)$_GET['rating']); |
|
215 | - $return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded')); |
|
216 | - } |
|
217 | - } |
|
218 | - } |
|
183 | + $task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0; |
|
184 | + |
|
185 | + if (isset($_GET['do']) && $_GET['do'] == 'delete_comment') { |
|
186 | + if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) { |
|
187 | + Blog :: delete_comment($blog_id, (int)$_GET['post_id'],(int)$_GET['comment_id']); |
|
188 | + $return_message = array('type' => 'confirmation', 'message' => get_lang('CommentDeleted')); |
|
189 | + } else { |
|
190 | + $error = true; |
|
191 | + $message = get_lang('ActionNotAllowed'); |
|
192 | + } |
|
193 | + } |
|
194 | + |
|
195 | + if (isset($_GET['do']) && $_GET['do'] == 'delete_article') { |
|
196 | + if (api_is_allowed('BLOG_'.$blog_id, 'article_delete', $task_id)) { |
|
197 | + Blog :: delete_post($blog_id, (int)$_GET['article_id']); |
|
198 | + $action = ''; // Article is gone, go to blog home |
|
199 | + $return_message = array('type' => 'confirmation', 'message' => get_lang('BlogDeleted')); |
|
200 | + } else { |
|
201 | + $error = true; |
|
202 | + $message = get_lang('ActionNotAllowed'); |
|
203 | + } |
|
204 | + } |
|
205 | + if (isset($_GET['do']) && $_GET['do'] == 'rate') { |
|
206 | + if (isset($_GET['type']) && $_GET['type'] == 'post') { |
|
207 | + if (api_is_allowed('BLOG_'.$blog_id, 'article_rate')) { |
|
208 | + Blog :: add_rating('post', $blog_id, (int)$_GET['post_id'], (int)$_GET['rating']); |
|
209 | + $return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded')); |
|
210 | + } |
|
211 | + } |
|
212 | + if (isset($_GET['type']) && $_GET['type'] == 'comment') { |
|
213 | + if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_add')) { |
|
214 | + Blog :: add_rating('comment', $blog_id, (int)$_GET['comment_id'], (int)$_GET['rating']); |
|
215 | + $return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded')); |
|
216 | + } |
|
217 | + } |
|
218 | + } |
|
219 | 219 | } |
220 | 220 | /* |
221 | 221 | DISPLAY |
@@ -223,67 +223,67 @@ discard block |
||
223 | 223 | |
224 | 224 | // Set breadcrumb |
225 | 225 | switch ($action) { |
226 | - case 'new_post' : |
|
227 | - $nameTools = get_lang('NewPost'); |
|
226 | + case 'new_post' : |
|
227 | + $nameTools = get_lang('NewPost'); |
|
228 | 228 | $interbreadcrumb[] = array( |
229 | 229 | 'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(), |
230 | 230 | "name" => Blog:: get_blog_title($blog_id), |
231 | 231 | ); |
232 | - Display :: display_header($nameTools, 'Blogs'); |
|
233 | - break; |
|
234 | - case 'manage_tasks' : |
|
235 | - $nameTools = get_lang('TaskManager'); |
|
232 | + Display :: display_header($nameTools, 'Blogs'); |
|
233 | + break; |
|
234 | + case 'manage_tasks' : |
|
235 | + $nameTools = get_lang('TaskManager'); |
|
236 | 236 | $interbreadcrumb[] = array( |
237 | 237 | 'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(), |
238 | 238 | "name" => Blog:: get_blog_title($blog_id), |
239 | 239 | ); |
240 | - Display :: display_header($nameTools, 'Blogs'); |
|
241 | - break; |
|
242 | - case 'manage_members' : |
|
243 | - $nameTools = get_lang('MemberManager'); |
|
240 | + Display :: display_header($nameTools, 'Blogs'); |
|
241 | + break; |
|
242 | + case 'manage_members' : |
|
243 | + $nameTools = get_lang('MemberManager'); |
|
244 | 244 | $interbreadcrumb[] = array( |
245 | 245 | 'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(), |
246 | 246 | "name" => Blog:: get_blog_title($blog_id), |
247 | 247 | ); |
248 | - Display :: display_header($nameTools, 'Blogs'); |
|
249 | - break; |
|
250 | - case 'manage_rights' : |
|
251 | - $nameTools = get_lang('RightsManager'); |
|
248 | + Display :: display_header($nameTools, 'Blogs'); |
|
249 | + break; |
|
250 | + case 'manage_rights' : |
|
251 | + $nameTools = get_lang('RightsManager'); |
|
252 | 252 | $interbreadcrumb[] = array( |
253 | 253 | 'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(), |
254 | 254 | 'name' => Blog:: get_blog_title($blog_id), |
255 | 255 | ); |
256 | - Display :: display_header($nameTools, 'Blogs'); |
|
257 | - break; |
|
258 | - case 'view_search_result' : |
|
259 | - $nameTools = get_lang('SearchResults'); |
|
256 | + Display :: display_header($nameTools, 'Blogs'); |
|
257 | + break; |
|
258 | + case 'view_search_result' : |
|
259 | + $nameTools = get_lang('SearchResults'); |
|
260 | 260 | $interbreadcrumb[] = array( |
261 | 261 | 'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(), |
262 | 262 | 'name' => Blog:: get_blog_title($blog_id), |
263 | 263 | ); |
264 | - Display :: display_header($nameTools, 'Blogs'); |
|
265 | - break; |
|
266 | - case 'execute_task' : |
|
267 | - $nameTools = get_lang('ExecuteThisTask'); |
|
264 | + Display :: display_header($nameTools, 'Blogs'); |
|
265 | + break; |
|
266 | + case 'execute_task' : |
|
267 | + $nameTools = get_lang('ExecuteThisTask'); |
|
268 | 268 | $interbreadcrumb[] = array( |
269 | 269 | 'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(), |
270 | 270 | 'name' => Blog:: get_blog_title($blog_id), |
271 | 271 | ); |
272 | - Display :: display_header($nameTools, 'Blogs'); |
|
273 | - break; |
|
274 | - default : |
|
275 | - $nameTools = Blog :: get_blog_title($blog_id); |
|
276 | - Display :: display_header($nameTools, 'Blogs'); |
|
272 | + Display :: display_header($nameTools, 'Blogs'); |
|
273 | + break; |
|
274 | + default : |
|
275 | + $nameTools = Blog :: get_blog_title($blog_id); |
|
276 | + Display :: display_header($nameTools, 'Blogs'); |
|
277 | 277 | } |
278 | 278 | |
279 | 279 | // feedback messages |
280 | 280 | if (!empty($return_message)) { |
281 | - if ($return_message['type'] == 'confirmation') { |
|
282 | - Display::display_confirmation_message($return_message['message']); |
|
283 | - } |
|
284 | - if ($return_message['type'] == 'error') { |
|
285 | - Display::display_error_message($return_message['message']); |
|
286 | - } |
|
281 | + if ($return_message['type'] == 'confirmation') { |
|
282 | + Display::display_confirmation_message($return_message['message']); |
|
283 | + } |
|
284 | + if ($return_message['type'] == 'error') { |
|
285 | + Display::display_error_message($return_message['message']); |
|
286 | + } |
|
287 | 287 | } |
288 | 288 | |
289 | 289 | // actions |
@@ -350,12 +350,12 @@ discard block |
||
350 | 350 | <?php |
351 | 351 | |
352 | 352 | if (isset($error)) { |
353 | - Display :: display_error_message($message); |
|
353 | + Display :: display_error_message($message); |
|
354 | 354 | } |
355 | 355 | |
356 | 356 | if (isset($flag) && $flag == '1') { |
357 | - $action = "manage_tasks"; |
|
358 | - Blog :: display_assign_task_form($blog_id); |
|
357 | + $action = "manage_tasks"; |
|
358 | + Blog :: display_assign_task_form($blog_id); |
|
359 | 359 | } |
360 | 360 | |
361 | 361 | $user_task = false; |
@@ -363,12 +363,12 @@ discard block |
||
363 | 363 | $course_id = api_get_course_int_id(); |
364 | 364 | |
365 | 365 | if (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) { |
366 | - $task_id = (int)$_GET['task_id']; |
|
366 | + $task_id = (int)$_GET['task_id']; |
|
367 | 367 | } else { |
368 | - $task_id = 0; |
|
369 | - $tbl_blogs_tasks_rel_user = Database :: get_course_table(TABLE_BLOGS_TASKS_REL_USER); |
|
368 | + $task_id = 0; |
|
369 | + $tbl_blogs_tasks_rel_user = Database :: get_course_table(TABLE_BLOGS_TASKS_REL_USER); |
|
370 | 370 | |
371 | - $sql = "SELECT COUNT(*) as number |
|
371 | + $sql = "SELECT COUNT(*) as number |
|
372 | 372 | FROM ".$tbl_blogs_tasks_rel_user." |
373 | 373 | WHERE |
374 | 374 | c_id = $course_id AND |
@@ -376,120 +376,120 @@ discard block |
||
376 | 376 | user_id = ".api_get_user_id()." AND |
377 | 377 | task_id = ".$task_id; |
378 | 378 | |
379 | - $result = Database::query($sql); |
|
380 | - $row = Database::fetch_array($result); |
|
379 | + $result = Database::query($sql); |
|
380 | + $row = Database::fetch_array($result); |
|
381 | 381 | |
382 | - if ($row['number'] == 1) |
|
383 | - $user_task = true; |
|
382 | + if ($row['number'] == 1) |
|
383 | + $user_task = true; |
|
384 | 384 | } |
385 | 385 | |
386 | 386 | switch ($action) { |
387 | - case 'new_post': |
|
388 | - if (api_is_allowed('BLOG_'.$blog_id, 'article_add', $user_task ? $task_id : 0)) { |
|
389 | - // we show the form if |
|
390 | - // 1. no post data |
|
391 | - // 2. there is post data and the required field is empty |
|
392 | - if (!$_POST OR (!empty($_POST) AND empty($_POST['title']))) { |
|
393 | - // if there is post data there is certainly an error in the form |
|
394 | - if ($_POST) { |
|
395 | - Display::display_error_message(get_lang('FormHasErrorsPleaseComplete')); |
|
396 | - } |
|
397 | - Blog :: display_form_new_post($blog_id); |
|
398 | - } else { |
|
399 | - if (isset($_GET['filter']) && !empty($_GET['filter'])) { |
|
400 | - Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter'])); |
|
401 | - } else { |
|
402 | - Blog :: display_blog_posts($blog_id); |
|
403 | - } |
|
404 | - } |
|
405 | - } else { |
|
406 | - api_not_allowed(); |
|
407 | - } |
|
408 | - break; |
|
409 | - case 'view_post' : |
|
410 | - Blog :: display_post($blog_id, intval($_GET['post_id'])); |
|
411 | - break; |
|
412 | - case 'edit_post' : |
|
413 | - $task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0; |
|
414 | - |
|
415 | - if (api_is_allowed('BLOG_'.$blog_id, 'article_edit', $task_id)) { |
|
416 | - // we show the form if |
|
417 | - // 1. no post data |
|
418 | - // 2. there is post data and the required field is empty |
|
419 | - if (!$_POST OR (!empty($_POST) AND empty($_POST['post_title']))) { |
|
420 | - // if there is post data there is certainly an error in the form |
|
421 | - if ($_POST) { |
|
422 | - Display::display_error_message(get_lang('FormHasErrorsPleaseComplete')); |
|
423 | - } |
|
387 | + case 'new_post': |
|
388 | + if (api_is_allowed('BLOG_'.$blog_id, 'article_add', $user_task ? $task_id : 0)) { |
|
389 | + // we show the form if |
|
390 | + // 1. no post data |
|
391 | + // 2. there is post data and the required field is empty |
|
392 | + if (!$_POST OR (!empty($_POST) AND empty($_POST['title']))) { |
|
393 | + // if there is post data there is certainly an error in the form |
|
394 | + if ($_POST) { |
|
395 | + Display::display_error_message(get_lang('FormHasErrorsPleaseComplete')); |
|
396 | + } |
|
397 | + Blog :: display_form_new_post($blog_id); |
|
398 | + } else { |
|
399 | + if (isset($_GET['filter']) && !empty($_GET['filter'])) { |
|
400 | + Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter'])); |
|
401 | + } else { |
|
402 | + Blog :: display_blog_posts($blog_id); |
|
403 | + } |
|
404 | + } |
|
405 | + } else { |
|
406 | + api_not_allowed(); |
|
407 | + } |
|
408 | + break; |
|
409 | + case 'view_post' : |
|
410 | + Blog :: display_post($blog_id, intval($_GET['post_id'])); |
|
411 | + break; |
|
412 | + case 'edit_post' : |
|
413 | + $task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0; |
|
414 | + |
|
415 | + if (api_is_allowed('BLOG_'.$blog_id, 'article_edit', $task_id)) { |
|
416 | + // we show the form if |
|
417 | + // 1. no post data |
|
418 | + // 2. there is post data and the required field is empty |
|
419 | + if (!$_POST OR (!empty($_POST) AND empty($_POST['post_title']))) { |
|
420 | + // if there is post data there is certainly an error in the form |
|
421 | + if ($_POST) { |
|
422 | + Display::display_error_message(get_lang('FormHasErrorsPleaseComplete')); |
|
423 | + } |
|
424 | 424 | Blog :: display_form_edit_post($blog_id, intval($_GET['post_id'])); |
425 | - } else { |
|
426 | - if (isset ($_GET['filter']) && !empty ($_GET['filter'])) { |
|
427 | - Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter'])); |
|
428 | - } else { |
|
429 | - Blog :: display_blog_posts($blog_id); |
|
430 | - } |
|
431 | - } |
|
432 | - } else { |
|
433 | - api_not_allowed(); |
|
434 | - } |
|
435 | - |
|
436 | - break; |
|
437 | - case 'manage_members' : |
|
438 | - if (api_is_allowed('BLOG_'.$blog_id, 'member_management')) { |
|
439 | - Blog :: display_form_user_subscribe($blog_id); |
|
440 | - echo '<br /><br />'; |
|
441 | - Blog :: display_form_user_unsubscribe($blog_id); |
|
442 | - } else { |
|
443 | - api_not_allowed(); |
|
425 | + } else { |
|
426 | + if (isset ($_GET['filter']) && !empty ($_GET['filter'])) { |
|
427 | + Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter'])); |
|
428 | + } else { |
|
429 | + Blog :: display_blog_posts($blog_id); |
|
430 | + } |
|
431 | + } |
|
432 | + } else { |
|
433 | + api_not_allowed(); |
|
434 | + } |
|
435 | + |
|
436 | + break; |
|
437 | + case 'manage_members' : |
|
438 | + if (api_is_allowed('BLOG_'.$blog_id, 'member_management')) { |
|
439 | + Blog :: display_form_user_subscribe($blog_id); |
|
440 | + echo '<br /><br />'; |
|
441 | + Blog :: display_form_user_unsubscribe($blog_id); |
|
442 | + } else { |
|
443 | + api_not_allowed(); |
|
444 | 444 | } |
445 | 445 | |
446 | - break; |
|
447 | - case 'manage_rights' : |
|
448 | - Blog :: display_form_user_rights($blog_id); |
|
449 | - break; |
|
450 | - case 'manage_tasks' : |
|
451 | - if (api_is_allowed('BLOG_'.$blog_id, 'task_management')) { |
|
452 | - if (isset($_GET['do']) && $_GET['do'] == 'add') { |
|
453 | - Blog:: display_new_task_form($blog_id); |
|
454 | - } |
|
455 | - if (isset($_GET['do']) && $_GET['do'] == 'assign') { |
|
456 | - Blog:: display_assign_task_form($blog_id); |
|
457 | - } |
|
458 | - if (isset($_GET['do']) && $_GET['do'] == 'edit') { |
|
459 | - Blog:: display_edit_task_form( |
|
460 | - $blog_id, |
|
461 | - intval($_GET['task_id']) |
|
462 | - ); |
|
463 | - } |
|
464 | - if (isset($_GET['do']) && $_GET['do'] == 'edit_assignment') { |
|
465 | - Blog :: display_edit_assigned_task_form($blog_id, intval($_GET['task_id']), intval($_GET['user_id'])); |
|
466 | - } |
|
467 | - Blog :: display_task_list($blog_id); |
|
468 | - echo '<br /><br />'; |
|
469 | - Blog :: display_assigned_task_list($blog_id); |
|
470 | - echo '<br /><br />'; |
|
471 | - } |
|
472 | - else |
|
473 | - api_not_allowed(); |
|
474 | - |
|
475 | - break; |
|
476 | - case 'execute_task' : |
|
477 | - if (isset ($_GET['post_id'])) |
|
478 | - Blog :: display_post($blog_id, intval($_GET['post_id'])); |
|
479 | - else |
|
480 | - Blog :: display_select_task_post($blog_id, intval($_GET['task_id'])); |
|
481 | - |
|
482 | - break; |
|
483 | - case 'view_search_result' : |
|
484 | - Blog :: display_search_results($blog_id, Database::escape_string($_GET['q'])); |
|
485 | - break; |
|
486 | - case '' : |
|
487 | - default : |
|
488 | - if (isset ($_GET['filter']) && !empty ($_GET['filter'])) { |
|
489 | - Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter'])); |
|
490 | - } else { |
|
491 | - Blog :: display_blog_posts($blog_id); |
|
492 | - } |
|
446 | + break; |
|
447 | + case 'manage_rights' : |
|
448 | + Blog :: display_form_user_rights($blog_id); |
|
449 | + break; |
|
450 | + case 'manage_tasks' : |
|
451 | + if (api_is_allowed('BLOG_'.$blog_id, 'task_management')) { |
|
452 | + if (isset($_GET['do']) && $_GET['do'] == 'add') { |
|
453 | + Blog:: display_new_task_form($blog_id); |
|
454 | + } |
|
455 | + if (isset($_GET['do']) && $_GET['do'] == 'assign') { |
|
456 | + Blog:: display_assign_task_form($blog_id); |
|
457 | + } |
|
458 | + if (isset($_GET['do']) && $_GET['do'] == 'edit') { |
|
459 | + Blog:: display_edit_task_form( |
|
460 | + $blog_id, |
|
461 | + intval($_GET['task_id']) |
|
462 | + ); |
|
463 | + } |
|
464 | + if (isset($_GET['do']) && $_GET['do'] == 'edit_assignment') { |
|
465 | + Blog :: display_edit_assigned_task_form($blog_id, intval($_GET['task_id']), intval($_GET['user_id'])); |
|
466 | + } |
|
467 | + Blog :: display_task_list($blog_id); |
|
468 | + echo '<br /><br />'; |
|
469 | + Blog :: display_assigned_task_list($blog_id); |
|
470 | + echo '<br /><br />'; |
|
471 | + } |
|
472 | + else |
|
473 | + api_not_allowed(); |
|
474 | + |
|
475 | + break; |
|
476 | + case 'execute_task' : |
|
477 | + if (isset ($_GET['post_id'])) |
|
478 | + Blog :: display_post($blog_id, intval($_GET['post_id'])); |
|
479 | + else |
|
480 | + Blog :: display_select_task_post($blog_id, intval($_GET['task_id'])); |
|
481 | + |
|
482 | + break; |
|
483 | + case 'view_search_result' : |
|
484 | + Blog :: display_search_results($blog_id, Database::escape_string($_GET['q'])); |
|
485 | + break; |
|
486 | + case '' : |
|
487 | + default : |
|
488 | + if (isset ($_GET['filter']) && !empty ($_GET['filter'])) { |
|
489 | + Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter'])); |
|
490 | + } else { |
|
491 | + Blog :: display_blog_posts($blog_id); |
|
492 | + } |
|
493 | 493 | } |
494 | 494 | ?> |
495 | 495 | </div> |
@@ -400,8 +400,9 @@ |
||
400 | 400 | $extra .= $form->return_form(); |
401 | 401 | $extra .= '</div>'; |
402 | 402 | |
403 | -if ($is_allowedToEdit) |
|
403 | +if ($is_allowedToEdit) { |
|
404 | 404 | echo $extra; |
405 | +} |
|
405 | 406 | |
406 | 407 | echo $actions; |
407 | 408 |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | Display::addFlash( |
249 | 249 | Display::return_message(get_lang('MessageSent')) |
250 | 250 | ); |
251 | - header('Location: ' . api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId); |
|
251 | + header('Location: '.api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId); |
|
252 | 252 | exit; |
253 | 253 | } |
254 | 254 | } |
@@ -278,8 +278,8 @@ discard block |
||
278 | 278 | api_is_course_tutor() || api_is_course_coach() |
279 | 279 | ) { |
280 | 280 | $actions .= '<a href="admin.php?exerciseId='.intval($_GET['exerciseId']).'">'.Display :: return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>'; |
281 | - $actions .='<a href="live_stats.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'">'.Display :: return_icon('activity_monitor.png', get_lang('LiveResults'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
282 | - $actions .='<a href="stats.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'">'.Display :: return_icon('statistics.png', get_lang('ReportByQuestion'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
281 | + $actions .= '<a href="live_stats.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'">'.Display :: return_icon('activity_monitor.png', get_lang('LiveResults'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
282 | + $actions .= '<a href="stats.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'">'.Display :: return_icon('statistics.png', get_lang('ReportByQuestion'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
283 | 283 | |
284 | 284 | $actions .= '<a id="export_opener" href="'.api_get_self().'?export_report=1&exerciseId='.intval($_GET['exerciseId']).'" >'. |
285 | 285 | Display::return_icon('save.png', get_lang('Export'), '', ICON_SIZE_MEDIUM).'</a>'; |
@@ -1966,7 +1966,7 @@ discard block |
||
1966 | 1966 | $label = get_lang('NextQuestion'); |
1967 | 1967 | $class = 'btn btn-primary'; |
1968 | 1968 | } |
1969 | - $class .= ' question-validate-btn'; // used to select it with jquery |
|
1969 | + $class .= ' question-validate-btn'; // used to select it with jquery |
|
1970 | 1970 | if ($this->type == ONE_PER_PAGE) { |
1971 | 1971 | if ($questionNum != 1) { |
1972 | 1972 | $prev_question = $questionNum - 2; |
@@ -1991,7 +1991,7 @@ discard block |
||
1991 | 1991 | $all_label = get_lang('EndTest'); |
1992 | 1992 | $class = 'btn btn-warning'; |
1993 | 1993 | } |
1994 | - $class .= ' question-validate-btn'; // used to select it with jquery |
|
1994 | + $class .= ' question-validate-btn'; // used to select it with jquery |
|
1995 | 1995 | $all_button = ' <a href="javascript://" class="'.$class.'" onclick="validate_all(); ">'.$all_label.'</a>'; |
1996 | 1996 | $all_button .= ' ' . Display::span(null, ['id' => 'save_all_reponse']); |
1997 | 1997 | $html .= $all_button; |
@@ -3774,7 +3774,7 @@ discard block |
||
3774 | 3774 | |
3775 | 3775 | //Fixes multiple answer question in order to be exact |
3776 | 3776 | //if ($answerType == MULTIPLE_ANSWER || $answerType == GLOBAL_MULTIPLE_ANSWER) { |
3777 | - /* if ($answerType == GLOBAL_MULTIPLE_ANSWER) { |
|
3777 | + /* if ($answerType == GLOBAL_MULTIPLE_ANSWER) { |
|
3778 | 3778 | $diff = @array_diff($answer_correct_array, $real_answers); |
3779 | 3779 | |
3780 | 3780 | // All good answers or nothing works like exact |
@@ -5073,8 +5073,8 @@ discard block |
||
5073 | 5073 | } |
5074 | 5074 | |
5075 | 5075 | /** |
5076 | - * @return string |
|
5077 | - */ |
|
5076 | + * @return string |
|
5077 | + */ |
|
5078 | 5078 | public function get_formated_title() |
5079 | 5079 | { |
5080 | 5080 | return api_html_entity_decode($this->selectTitle()); |
@@ -538,10 +538,11 @@ discard block |
||
538 | 538 | */ |
539 | 539 | public function isInList($questionId) |
540 | 540 | { |
541 | - if (is_array($this->questionList)) |
|
542 | - return in_array($questionId,$this->questionList); |
|
543 | - else |
|
544 | - return false; |
|
541 | + if (is_array($this->questionList)) { |
|
542 | + return in_array($questionId,$this->questionList); |
|
543 | + } else { |
|
544 | + return false; |
|
545 | + } |
|
545 | 546 | } |
546 | 547 | |
547 | 548 | /** |
@@ -1227,10 +1228,11 @@ discard block |
||
1227 | 1228 | |
1228 | 1229 | $var = Exercise::selectTimeLimit(); |
1229 | 1230 | |
1230 | - if (($this->start_time != '0000-00-00 00:00:00')) |
|
1231 | - $form->addElement('html','<div id="start_date_div" style="display:block;">'); |
|
1232 | - else |
|
1233 | - $form->addElement('html','<div id="start_date_div" style="display:none;">'); |
|
1231 | + if (($this->start_time != '0000-00-00 00:00:00')) { |
|
1232 | + $form->addElement('html','<div id="start_date_div" style="display:block;">'); |
|
1233 | + } else { |
|
1234 | + $form->addElement('html','<div id="start_date_div" style="display:none;">'); |
|
1235 | + } |
|
1234 | 1236 | |
1235 | 1237 | $form->addElement('date_time_picker', 'start_time'); |
1236 | 1238 | |
@@ -1238,10 +1240,11 @@ discard block |
||
1238 | 1240 | |
1239 | 1241 | $form->addElement('checkbox', 'activate_end_date_check', null , get_lang('EnableEndTime'), array('onclick' => 'activate_end_date()')); |
1240 | 1242 | |
1241 | - if (($this->end_time != '0000-00-00 00:00:00')) |
|
1242 | - $form->addElement('html','<div id="end_date_div" style="display:block;">'); |
|
1243 | - else |
|
1244 | - $form->addElement('html','<div id="end_date_div" style="display:none;">'); |
|
1243 | + if (($this->end_time != '0000-00-00 00:00:00')) { |
|
1244 | + $form->addElement('html','<div id="end_date_div" style="display:block;">'); |
|
1245 | + } else { |
|
1246 | + $form->addElement('html','<div id="end_date_div" style="display:none;">'); |
|
1247 | + } |
|
1245 | 1248 | |
1246 | 1249 | $form->addElement('date_time_picker', 'end_time'); |
1247 | 1250 | $form->addElement('html','</div>'); |
@@ -2268,7 +2271,9 @@ discard block |
||
2268 | 2271 | $organs_at_risk_hit = 0; |
2269 | 2272 | $questionScore = 0; |
2270 | 2273 | |
2271 | - if ($debug) error_log('Start answer loop '); |
|
2274 | + if ($debug) { |
|
2275 | + error_log('Start answer loop '); |
|
2276 | + } |
|
2272 | 2277 | |
2273 | 2278 | $answer_correct_array = array(); |
2274 | 2279 | |
@@ -2383,7 +2388,9 @@ discard block |
||
2383 | 2388 | } |
2384 | 2389 | $totalScore += $answerWeighting; |
2385 | 2390 | |
2386 | - if ($debug) error_log("studentChoice: $studentChoice"); |
|
2391 | + if ($debug) { |
|
2392 | + error_log("studentChoice: $studentChoice"); |
|
2393 | + } |
|
2387 | 2394 | break; |
2388 | 2395 | case GLOBAL_MULTIPLE_ANSWER: |
2389 | 2396 | if ($from_database) { |
@@ -2408,7 +2415,9 @@ discard block |
||
2408 | 2415 | $real_answers[$answerId] = (bool)$studentChoice; |
2409 | 2416 | } |
2410 | 2417 | $totalScore += $answerWeighting; |
2411 | - if ($debug) error_log("studentChoice: $studentChoice"); |
|
2418 | + if ($debug) { |
|
2419 | + error_log("studentChoice: $studentChoice"); |
|
2420 | + } |
|
2412 | 2421 | break; |
2413 | 2422 | case MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE: |
2414 | 2423 | if ($from_database) { |
@@ -3125,9 +3134,13 @@ discard block |
||
3125 | 3134 | } // end switch Answertype |
3126 | 3135 | |
3127 | 3136 | if ($show_result) { |
3128 | - if ($debug) error_log('show result '.$show_result); |
|
3137 | + if ($debug) { |
|
3138 | + error_log('show result '.$show_result); |
|
3139 | + } |
|
3129 | 3140 | if ($from == 'exercise_result') { |
3130 | - if ($debug) error_log('Showing questions $from '.$from); |
|
3141 | + if ($debug) { |
|
3142 | + error_log('Showing questions $from '.$from); |
|
3143 | + } |
|
3131 | 3144 | //display answers (if not matching type, or if the answer is correct) |
3132 | 3145 | if ( |
3133 | 3146 | !in_array( |
@@ -3415,7 +3428,9 @@ discard block |
||
3415 | 3428 | } |
3416 | 3429 | } |
3417 | 3430 | } else { |
3418 | - if ($debug) error_log('Showing questions $from '.$from); |
|
3431 | + if ($debug) { |
|
3432 | + error_log('Showing questions $from '.$from); |
|
3433 | + } |
|
3419 | 3434 | |
3420 | 3435 | switch ($answerType) { |
3421 | 3436 | case UNIQUE_ANSWER: |
@@ -3747,10 +3762,14 @@ discard block |
||
3747 | 3762 | } |
3748 | 3763 | } |
3749 | 3764 | } |
3750 | - if ($debug) error_log(' ------ '); |
|
3765 | + if ($debug) { |
|
3766 | + error_log(' ------ '); |
|
3767 | + } |
|
3751 | 3768 | } // end for that loops over all answers of the current question |
3752 | 3769 | |
3753 | - if ($debug) error_log('-- end answer loop --'); |
|
3770 | + if ($debug) { |
|
3771 | + error_log('-- end answer loop --'); |
|
3772 | + } |
|
3754 | 3773 | |
3755 | 3774 | $final_answer = true; |
3756 | 3775 | |
@@ -3823,7 +3842,9 @@ discard block |
||
3823 | 3842 | // some results that haven't been stored in the database yet |
3824 | 3843 | if ($answerType == HOT_SPOT || $answerType == HOT_SPOT_ORDER || $answerType == HOT_SPOT_DELINEATION ) { |
3825 | 3844 | |
3826 | - if ($debug) error_log('$from AND this is a hotspot kind of question '); |
|
3845 | + if ($debug) { |
|
3846 | + error_log('$from AND this is a hotspot kind of question '); |
|
3847 | + } |
|
3827 | 3848 | |
3828 | 3849 | $my_exe_id = 0; |
3829 | 3850 | $from_database = 0; |
@@ -3999,8 +4020,12 @@ discard block |
||
3999 | 4020 | // stored by exercise_results.php (using the session) |
4000 | 4021 | |
4001 | 4022 | if ($saved_results) { |
4002 | - if ($debug) error_log("Save question results $saved_results"); |
|
4003 | - if ($debug) error_log(print_r($choice ,1 )); |
|
4023 | + if ($debug) { |
|
4024 | + error_log("Save question results $saved_results"); |
|
4025 | + } |
|
4026 | + if ($debug) { |
|
4027 | + error_log(print_r($choice ,1 )); |
|
4028 | + } |
|
4004 | 4029 | |
4005 | 4030 | if (empty($choice)) { |
4006 | 4031 | $choice = 0; |
@@ -4102,7 +4127,9 @@ discard block |
||
4102 | 4127 | $sql = 'UPDATE ' . $stat_table . ' SET |
4103 | 4128 | exe_result = exe_result + ' . floatval($questionScore) . ' |
4104 | 4129 | WHERE exe_id = ' . $exeId; |
4105 | - if ($debug) error_log($sql); |
|
4130 | + if ($debug) { |
|
4131 | + error_log($sql); |
|
4132 | + } |
|
4106 | 4133 | Database::query($sql); |
4107 | 4134 | } |
4108 | 4135 |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | } |
355 | 355 | |
356 | 356 | /** |
357 | - * @return int |
|
357 | + * @return string |
|
358 | 358 | */ |
359 | 359 | public function selectPassPercentage() |
360 | 360 | { |
@@ -473,7 +473,7 @@ discard block |
||
473 | 473 | * tells if questions are selected randomly, and if so returns the draws |
474 | 474 | * |
475 | 475 | * @author Olivier Brouckaert |
476 | - * @return integer - 0 if not random, otherwise the draws |
|
476 | + * @return boolean - 0 if not random, otherwise the draws |
|
477 | 477 | */ |
478 | 478 | public function isRandom() |
479 | 479 | { |
@@ -2830,7 +2830,7 @@ discard block |
||
2830 | 2830 | * @param int int lp id |
2831 | 2831 | * @param int int lp item id |
2832 | 2832 | * @param int int lp item_view id |
2833 | - * @param float $weight |
|
2833 | + * @param integer $weight |
|
2834 | 2834 | * @param array question list |
2835 | 2835 | */ |
2836 | 2836 | public function save_stat_track_exercise_info( |
@@ -5118,6 +5118,7 @@ discard block |
||
5118 | 5118 | /** |
5119 | 5119 | * Sends a notification when a user ends an examn |
5120 | 5120 | * |
5121 | + * @param integer $exe_id |
|
5121 | 5122 | */ |
5122 | 5123 | public function send_mail_notification_for_exam($question_list_answers, $origin, $exe_id) |
5123 | 5124 | { |
@@ -5198,6 +5199,7 @@ discard block |
||
5198 | 5199 | /** |
5199 | 5200 | * Sends a notification when a user ends an examn |
5200 | 5201 | * |
5202 | + * @param integer $exe_id |
|
5201 | 5203 | */ |
5202 | 5204 | function send_notification_for_open_questions($question_list_answers, $origin, $exe_id) |
5203 | 5205 | { |
@@ -5295,6 +5297,9 @@ discard block |
||
5295 | 5297 | } |
5296 | 5298 | } |
5297 | 5299 | |
5300 | + /** |
|
5301 | + * @param integer $exe_id |
|
5302 | + */ |
|
5298 | 5303 | function send_notification_for_oral_questions($question_list_answers, $origin, $exe_id) |
5299 | 5304 | { |
5300 | 5305 | if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) { |
@@ -5388,7 +5393,7 @@ discard block |
||
5388 | 5393 | |
5389 | 5394 | /** |
5390 | 5395 | * @param array $user_data result of api_get_user_info() |
5391 | - * @param null $start_date |
|
5396 | + * @param string $start_date |
|
5392 | 5397 | * @param null $duration |
5393 | 5398 | * @param string $ip Optional. The user IP |
5394 | 5399 | * @return string |
@@ -5446,7 +5451,7 @@ discard block |
||
5446 | 5451 | * @param int Maximum number of attempts (0 if no limit) |
5447 | 5452 | * @param int Feedback type |
5448 | 5453 | * @todo this was function was added due the import exercise via CSV |
5449 | - * @return int New exercise ID |
|
5454 | + * @return string New exercise ID |
|
5450 | 5455 | */ |
5451 | 5456 | public function createExercise( |
5452 | 5457 | $title, |
@@ -6795,7 +6800,7 @@ discard block |
||
6795 | 6800 | * @param bool $show_comment |
6796 | 6801 | * @param null $exercise_feedback |
6797 | 6802 | * @param bool $show_answers |
6798 | - * @param null $modelType |
|
6803 | + * @param integer $modelType |
|
6799 | 6804 | * @param bool $categoryMinusOne |
6800 | 6805 | * @return bool|null|string |
6801 | 6806 | */ |
@@ -7956,8 +7961,8 @@ discard block |
||
7956 | 7961 | /** |
7957 | 7962 | * Returns an HTML ribbon to show on top of the exercise result, with |
7958 | 7963 | * colouring depending on the success or failure of the student |
7959 | - * @param $score |
|
7960 | - * @param $weight |
|
7964 | + * @param integer $score |
|
7965 | + * @param integer $weight |
|
7961 | 7966 | * @param bool $check_pass_percentage |
7962 | 7967 | * @return string |
7963 | 7968 | */ |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | public $feedback_type; |
30 | 30 | public $end_time; |
31 | 31 | public $start_time; |
32 | - public $questionList; // array with the list of this exercise's questions |
|
32 | + public $questionList; // array with the list of this exercise's questions |
|
33 | 33 | /* including question list of the media */ |
34 | 34 | public $questionListUncompressed; |
35 | 35 | public $results_disabled; |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | $TBL_EXERCISES = Database::get_course_table(TABLE_QUIZ_TEST); |
133 | 133 | $table_lp_item = Database::get_course_table(TABLE_LP_ITEM); |
134 | 134 | |
135 | - $id = intval($id); |
|
135 | + $id = intval($id); |
|
136 | 136 | if (empty($this->course_id)) { |
137 | 137 | |
138 | 138 | return false; |
@@ -478,7 +478,7 @@ discard block |
||
478 | 478 | */ |
479 | 479 | public function isRandom() |
480 | 480 | { |
481 | - if($this->random > 0 || $this->random == -1) { |
|
481 | + if ($this->random > 0 || $this->random == -1) { |
|
482 | 482 | return true; |
483 | 483 | } else { |
484 | 484 | return false; |
@@ -639,7 +639,7 @@ discard block |
||
639 | 639 | $question_media = null; |
640 | 640 | if (!empty($objQuestionTmp->parent_id)) { |
641 | 641 | $objQuestionMedia = Question::read($objQuestionTmp->parent_id); |
642 | - $question_media = Question::getMediaLabel($objQuestionMedia->question); |
|
642 | + $question_media = Question::getMediaLabel($objQuestionMedia->question); |
|
643 | 643 | } |
644 | 644 | |
645 | 645 | $questionType = Display::tag('div', Display::return_icon($typeImg, $typeExpl, array(), ICON_SIZE_MEDIUM).$question_media); |
@@ -1032,7 +1032,7 @@ discard block |
||
1032 | 1032 | |
1033 | 1033 | foreach ($questions_by_category as $categoryId => $questionList) { |
1034 | 1034 | $cat = new TestCategory($categoryId); |
1035 | - $cat = (array)$cat; |
|
1035 | + $cat = (array) $cat; |
|
1036 | 1036 | $cat['iid'] = $cat['id']; |
1037 | 1037 | //*$cat['name'] = $cat['name']; |
1038 | 1038 | |
@@ -1097,7 +1097,7 @@ discard block |
||
1097 | 1097 | { |
1098 | 1098 | if ($this->specialCategoryOrders == false) { |
1099 | 1099 | if ($from_db && !empty($this->id)) { |
1100 | - $TBL_EXERCISE_QUESTION = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION); |
|
1100 | + $TBL_EXERCISE_QUESTION = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION); |
|
1101 | 1101 | $TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION); |
1102 | 1102 | |
1103 | 1103 | $sql = "SELECT DISTINCT e.question_order |
@@ -1124,7 +1124,7 @@ discard block |
||
1124 | 1124 | $question_list = array(); |
1125 | 1125 | |
1126 | 1126 | while ($new_object = Database::fetch_object($result)) { |
1127 | - $question_list[$new_object->question_order]= $new_object->question_id; |
|
1127 | + $question_list[$new_object->question_order] = $new_object->question_id; |
|
1128 | 1128 | $temp_question_list[$counter] = $new_object->question_id; |
1129 | 1129 | $counter++; |
1130 | 1130 | } |
@@ -1268,7 +1268,7 @@ discard block |
||
1268 | 1268 | public function isInList($questionId) |
1269 | 1269 | { |
1270 | 1270 | if (is_array($this->questionList)) |
1271 | - return in_array($questionId,$this->questionList); |
|
1271 | + return in_array($questionId, $this->questionList); |
|
1272 | 1272 | else |
1273 | 1273 | return false; |
1274 | 1274 | } |
@@ -1281,7 +1281,7 @@ discard block |
||
1281 | 1281 | */ |
1282 | 1282 | public function updateTitle($title) |
1283 | 1283 | { |
1284 | - $this->exercise=$title; |
|
1284 | + $this->exercise = $title; |
|
1285 | 1285 | } |
1286 | 1286 | |
1287 | 1287 | /** |
@@ -1291,7 +1291,7 @@ discard block |
||
1291 | 1291 | */ |
1292 | 1292 | public function updateAttempts($attempts) |
1293 | 1293 | { |
1294 | - $this->attempts=$attempts; |
|
1294 | + $this->attempts = $attempts; |
|
1295 | 1295 | } |
1296 | 1296 | |
1297 | 1297 | /** |
@@ -1301,7 +1301,7 @@ discard block |
||
1301 | 1301 | */ |
1302 | 1302 | public function updateFeedbackType($feedback_type) |
1303 | 1303 | { |
1304 | - $this->feedback_type=$feedback_type; |
|
1304 | + $this->feedback_type = $feedback_type; |
|
1305 | 1305 | } |
1306 | 1306 | |
1307 | 1307 | /** |
@@ -1312,7 +1312,7 @@ discard block |
||
1312 | 1312 | */ |
1313 | 1313 | public function updateDescription($description) |
1314 | 1314 | { |
1315 | - $this->description=$description; |
|
1315 | + $this->description = $description; |
|
1316 | 1316 | } |
1317 | 1317 | |
1318 | 1318 | /** |
@@ -1442,23 +1442,23 @@ discard block |
||
1442 | 1442 | * @param string $sound - exercise sound file |
1443 | 1443 | * @param string $delete - ask to delete the file |
1444 | 1444 | */ |
1445 | - public function updateSound($sound,$delete) |
|
1445 | + public function updateSound($sound, $delete) |
|
1446 | 1446 | { |
1447 | 1447 | global $audioPath, $documentPath; |
1448 | 1448 | $TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT); |
1449 | 1449 | |
1450 | - if ($sound['size'] && (strstr($sound['type'],'audio') || strstr($sound['type'],'video'))) { |
|
1451 | - $this->sound=$sound['name']; |
|
1450 | + if ($sound['size'] && (strstr($sound['type'], 'audio') || strstr($sound['type'], 'video'))) { |
|
1451 | + $this->sound = $sound['name']; |
|
1452 | 1452 | |
1453 | - if (@move_uploaded_file($sound['tmp_name'],$audioPath.'/'.$this->sound)) { |
|
1453 | + if (@move_uploaded_file($sound['tmp_name'], $audioPath.'/'.$this->sound)) { |
|
1454 | 1454 | $query = "SELECT 1 FROM $TBL_DOCUMENT |
1455 | - WHERE c_id = ".$this->course_id." AND path='".str_replace($documentPath,'',$audioPath).'/'.$this->sound."'"; |
|
1456 | - $result=Database::query($query); |
|
1455 | + WHERE c_id = ".$this->course_id." AND path='".str_replace($documentPath, '', $audioPath).'/'.$this->sound."'"; |
|
1456 | + $result = Database::query($query); |
|
1457 | 1457 | |
1458 | 1458 | if (!Database::num_rows($result)) { |
1459 | 1459 | $id = add_document( |
1460 | 1460 | $this->course, |
1461 | - str_replace($documentPath,'',$audioPath).'/'.$this->sound, |
|
1461 | + str_replace($documentPath, '', $audioPath).'/'.$this->sound, |
|
1462 | 1462 | 'file', |
1463 | 1463 | $sound['size'], |
1464 | 1464 | $sound['name'] |
@@ -1477,8 +1477,8 @@ discard block |
||
1477 | 1477 | ); |
1478 | 1478 | } |
1479 | 1479 | } |
1480 | - } elseif($delete && is_file($audioPath.'/'.$this->sound)) { |
|
1481 | - $this->sound=''; |
|
1480 | + } elseif ($delete && is_file($audioPath.'/'.$this->sound)) { |
|
1481 | + $this->sound = ''; |
|
1482 | 1482 | } |
1483 | 1483 | } |
1484 | 1484 | |
@@ -1490,7 +1490,7 @@ discard block |
||
1490 | 1490 | */ |
1491 | 1491 | public function updateType($type) |
1492 | 1492 | { |
1493 | - $this->type=$type; |
|
1493 | + $this->type = $type; |
|
1494 | 1494 | } |
1495 | 1495 | |
1496 | 1496 | /** |
@@ -1526,7 +1526,7 @@ discard block |
||
1526 | 1526 | */ |
1527 | 1527 | public function enable() |
1528 | 1528 | { |
1529 | - $this->active=1; |
|
1529 | + $this->active = 1; |
|
1530 | 1530 | } |
1531 | 1531 | |
1532 | 1532 | /** |
@@ -1536,7 +1536,7 @@ discard block |
||
1536 | 1536 | */ |
1537 | 1537 | public function disable() |
1538 | 1538 | { |
1539 | - $this->active=0; |
|
1539 | + $this->active = 0; |
|
1540 | 1540 | } |
1541 | 1541 | |
1542 | 1542 | /** |
@@ -1664,7 +1664,7 @@ discard block |
||
1664 | 1664 | api_get_user_id() |
1665 | 1665 | ); |
1666 | 1666 | |
1667 | - if (api_get_setting('search_enabled')=='true') { |
|
1667 | + if (api_get_setting('search_enabled') == 'true') { |
|
1668 | 1668 | $this->search_engine_edit(); |
1669 | 1669 | } |
1670 | 1670 | } else { |
@@ -1812,7 +1812,7 @@ discard block |
||
1812 | 1812 | public function removeFromList($questionId) |
1813 | 1813 | { |
1814 | 1814 | // searches the position of the question ID in the list |
1815 | - $pos = array_search($questionId,$this->questionList); |
|
1815 | + $pos = array_search($questionId, $this->questionList); |
|
1816 | 1816 | |
1817 | 1817 | // question not found |
1818 | 1818 | if ($pos === false) { |
@@ -1847,7 +1847,7 @@ discard block |
||
1847 | 1847 | api_item_property_update($this->course, TOOL_QUIZ, $this->id, 'QuizDeleted', api_get_user_id()); |
1848 | 1848 | api_item_property_update($this->course, TOOL_QUIZ, $this->id, 'delete', api_get_user_id()); |
1849 | 1849 | |
1850 | - if (api_get_setting('search_enabled')=='true' && extension_loaded('xapian') ) { |
|
1850 | + if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian')) { |
|
1851 | 1851 | $this->search_engine_delete(); |
1852 | 1852 | } |
1853 | 1853 | } |
@@ -1856,7 +1856,7 @@ discard block |
||
1856 | 1856 | * Creates the form to create / edit an exercise |
1857 | 1857 | * @param FormValidator $form |
1858 | 1858 | */ |
1859 | - public function createForm($form, $type='full') |
|
1859 | + public function createForm($form, $type = 'full') |
|
1860 | 1860 | { |
1861 | 1861 | if (empty($type)) { |
1862 | 1862 | $type = 'full'; |
@@ -1887,7 +1887,7 @@ discard block |
||
1887 | 1887 | 'Width' => '100%', |
1888 | 1888 | 'Height' => '150', |
1889 | 1889 | ); |
1890 | - if (is_array($type)){ |
|
1890 | + if (is_array($type)) { |
|
1891 | 1891 | $editor_config = array_merge($editor_config, $type); |
1892 | 1892 | } |
1893 | 1893 | |
@@ -1941,7 +1941,7 @@ discard block |
||
1941 | 1941 | '2', |
1942 | 1942 | array('id' => 'exerciseType_2') |
1943 | 1943 | ); |
1944 | - $form->addGroup($radios_feedback, null, array(get_lang('FeedbackType'),get_lang('FeedbackDisplayOptions')), ''); |
|
1944 | + $form->addGroup($radios_feedback, null, array(get_lang('FeedbackType'), get_lang('FeedbackDisplayOptions')), ''); |
|
1945 | 1945 | |
1946 | 1946 | // Type of results display on the final page |
1947 | 1947 | $radios_results_disabled = array(); |
@@ -1985,8 +1985,8 @@ discard block |
||
1985 | 1985 | // Type of questions disposition on page |
1986 | 1986 | $radios = array(); |
1987 | 1987 | |
1988 | - $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all')); |
|
1989 | - $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one')); |
|
1988 | + $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all')); |
|
1989 | + $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'), '2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one')); |
|
1990 | 1990 | |
1991 | 1991 | $form->addGroup($radios, null, get_lang('QuestionsPerPage'), ''); |
1992 | 1992 | |
@@ -1996,33 +1996,33 @@ discard block |
||
1996 | 1996 | |
1997 | 1997 | // feedback type |
1998 | 1998 | $radios_feedback = array(); |
1999 | - $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('ExerciseAtTheEndOfTheTest'),'0',array('id' =>'exerciseType_0', 'onclick' => 'check_feedback()')); |
|
1999 | + $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('ExerciseAtTheEndOfTheTest'), '0', array('id' =>'exerciseType_0', 'onclick' => 'check_feedback()')); |
|
2000 | 2000 | |
2001 | 2001 | if (api_get_setting('enable_quiz_scenario') == 'true') { |
2002 | - $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('DirectFeedback'), '1', array('id' =>'exerciseType_1' , 'onclick' => 'check_direct_feedback()')); |
|
2002 | + $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('DirectFeedback'), '1', array('id' =>'exerciseType_1', 'onclick' => 'check_direct_feedback()')); |
|
2003 | 2003 | } |
2004 | - $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('NoFeedback'),'2',array('id' =>'exerciseType_2')); |
|
2005 | - $form->addGroup($radios_feedback, null, array(get_lang('FeedbackType'),get_lang('FeedbackDisplayOptions'))); |
|
2004 | + $radios_feedback[] = $form->createElement('radio', 'exerciseFeedbackType', null, get_lang('NoFeedback'), '2', array('id' =>'exerciseType_2')); |
|
2005 | + $form->addGroup($radios_feedback, null, array(get_lang('FeedbackType'), get_lang('FeedbackDisplayOptions'))); |
|
2006 | 2006 | |
2007 | 2007 | //$form->addElement('select', 'exerciseFeedbackType',get_lang('FeedbackType'),$feedback_option,'onchange="javascript:feedbackselection()"'); |
2008 | 2008 | $radios_results_disabled = array(); |
2009 | 2009 | $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0')); |
2010 | - $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1',array('id'=>'result_disabled_1','onclick' => 'check_results_disabled()')); |
|
2011 | - $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2',array('id'=>'result_disabled_2','onclick' => 'check_results_disabled()')); |
|
2012 | - $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'),''); |
|
2010 | + $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1', array('id'=>'result_disabled_1', 'onclick' => 'check_results_disabled()')); |
|
2011 | + $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2', array('id'=>'result_disabled_2', 'onclick' => 'check_results_disabled()')); |
|
2012 | + $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'), ''); |
|
2013 | 2013 | |
2014 | 2014 | // Type of questions disposition on page |
2015 | 2015 | $radios = array(); |
2016 | - $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1'); |
|
2017 | - $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2'); |
|
2016 | + $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1'); |
|
2017 | + $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'), '2'); |
|
2018 | 2018 | $form->addGroup($radios, null, get_lang('ExerciseType')); |
2019 | 2019 | |
2020 | 2020 | } else { |
2021 | 2021 | //Show options freeze |
2022 | 2022 | $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('ShowScoreAndRightAnswer'), '0', array('id'=>'result_disabled_0')); |
2023 | - $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1',array('id'=>'result_disabled_1','onclick' => 'check_results_disabled()')); |
|
2024 | - $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2',array('id'=>'result_disabled_2','onclick' => 'check_results_disabled()')); |
|
2025 | - $result_disable_group = $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'),''); |
|
2023 | + $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('DoNotShowScoreNorRightAnswer'), '1', array('id'=>'result_disabled_1', 'onclick' => 'check_results_disabled()')); |
|
2024 | + $radios_results_disabled[] = $form->createElement('radio', 'results_disabled', null, get_lang('OnlyShowScore'), '2', array('id'=>'result_disabled_2', 'onclick' => 'check_results_disabled()')); |
|
2025 | + $result_disable_group = $form->addGroup($radios_results_disabled, null, get_lang('ShowResultsToStudents'), ''); |
|
2026 | 2026 | $result_disable_group->freeze(); |
2027 | 2027 | |
2028 | 2028 | //we force the options to the DirectFeedback exercisetype |
@@ -2030,8 +2030,8 @@ discard block |
||
2030 | 2030 | $form->addElement('hidden', 'exerciseType', ONE_PER_PAGE); |
2031 | 2031 | |
2032 | 2032 | // Type of questions disposition on page |
2033 | - $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all')); |
|
2034 | - $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'),'2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one')); |
|
2033 | + $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SimpleExercise'), '1', array('onclick' => 'check_per_page_all()', 'id'=>'option_page_all')); |
|
2034 | + $radios[] = $form->createElement('radio', 'exerciseType', null, get_lang('SequentialExercise'), '2', array('onclick' => 'check_per_page_one()', 'id'=>'option_page_one')); |
|
2035 | 2035 | |
2036 | 2036 | $type_group = $form->addGroup($radios, null, get_lang('QuestionsPerPage'), ''); |
2037 | 2037 | $type_group->freeze(); |
@@ -2163,26 +2163,26 @@ discard block |
||
2163 | 2163 | |
2164 | 2164 | // number of random question |
2165 | 2165 | |
2166 | - $max = ($this->id > 0) ? $this->selectNbrQuestions() : 10 ; |
|
2166 | + $max = ($this->id > 0) ? $this->selectNbrQuestions() : 10; |
|
2167 | 2167 | $option = range(0, $max); |
2168 | 2168 | $option[0] = get_lang('No'); |
2169 | 2169 | $option[-1] = get_lang('AllQuestionsShort'); |
2170 | - $form->addElement('select', 'randomQuestions',array(get_lang('RandomQuestions'), get_lang('RandomQuestionsHelp')), $option, array('id'=>'randomQuestions')); |
|
2170 | + $form->addElement('select', 'randomQuestions', array(get_lang('RandomQuestions'), get_lang('RandomQuestionsHelp')), $option, array('id'=>'randomQuestions')); |
|
2171 | 2171 | |
2172 | 2172 | // Random answers |
2173 | 2173 | $radios_random_answers = array(); |
2174 | - $radios_random_answers[] = $form->createElement('radio', 'randomAnswers', null, get_lang('Yes'),'1'); |
|
2175 | - $radios_random_answers[] = $form->createElement('radio', 'randomAnswers', null, get_lang('No'),'0'); |
|
2174 | + $radios_random_answers[] = $form->createElement('radio', 'randomAnswers', null, get_lang('Yes'), '1'); |
|
2175 | + $radios_random_answers[] = $form->createElement('radio', 'randomAnswers', null, get_lang('No'), '0'); |
|
2176 | 2176 | $form->addGroup($radios_random_answers, null, get_lang('RandomAnswers'), ''); |
2177 | 2177 | |
2178 | 2178 | // Random by category |
2179 | - $form->addElement('html','<div class="clear"> </div>'); |
|
2179 | + $form->addElement('html', '<div class="clear"> </div>'); |
|
2180 | 2180 | $radiocat = array(); |
2181 | - $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesShuffled'),'1'); |
|
2182 | - $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesSorted'),'2'); |
|
2183 | - $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('No'),'0'); |
|
2181 | + $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesShuffled'), '1'); |
|
2182 | + $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('YesWithCategoriesSorted'), '2'); |
|
2183 | + $radiocat[] = $form->createElement('radio', 'randomByCat', null, get_lang('No'), '0'); |
|
2184 | 2184 | $radioCatGroup = $form->addGroup($radiocat, null, get_lang('RandomQuestionByCategory'), ''); |
2185 | - $form->addElement('html','<div class="clear"> </div>'); |
|
2185 | + $form->addElement('html', '<div class="clear"> </div>'); |
|
2186 | 2186 | |
2187 | 2187 | // add the radio display the category name for student |
2188 | 2188 | $radio_display_cat_name = array(); |
@@ -2203,36 +2203,36 @@ discard block |
||
2203 | 2203 | ); |
2204 | 2204 | |
2205 | 2205 | // Exercise time limit |
2206 | - $form->addElement('checkbox', 'activate_start_date_check',null, get_lang('EnableStartTime'), array('onclick' => 'activate_start_date()')); |
|
2206 | + $form->addElement('checkbox', 'activate_start_date_check', null, get_lang('EnableStartTime'), array('onclick' => 'activate_start_date()')); |
|
2207 | 2207 | |
2208 | 2208 | $var = Exercise::selectTimeLimit(); |
2209 | 2209 | |
2210 | 2210 | if (($this->start_time != '0000-00-00 00:00:00')) |
2211 | - $form->addElement('html','<div id="start_date_div" style="display:block;">'); |
|
2211 | + $form->addElement('html', '<div id="start_date_div" style="display:block;">'); |
|
2212 | 2212 | else |
2213 | - $form->addElement('html','<div id="start_date_div" style="display:none;">'); |
|
2213 | + $form->addElement('html', '<div id="start_date_div" style="display:none;">'); |
|
2214 | 2214 | |
2215 | 2215 | $form->addElement('date_time_picker', 'start_time'); |
2216 | 2216 | |
2217 | - $form->addElement('html','</div>'); |
|
2217 | + $form->addElement('html', '</div>'); |
|
2218 | 2218 | |
2219 | - $form->addElement('checkbox', 'activate_end_date_check', null , get_lang('EnableEndTime'), array('onclick' => 'activate_end_date()')); |
|
2219 | + $form->addElement('checkbox', 'activate_end_date_check', null, get_lang('EnableEndTime'), array('onclick' => 'activate_end_date()')); |
|
2220 | 2220 | |
2221 | 2221 | if (($this->end_time != '0000-00-00 00:00:00')) |
2222 | - $form->addElement('html','<div id="end_date_div" style="display:block;">'); |
|
2222 | + $form->addElement('html', '<div id="end_date_div" style="display:block;">'); |
|
2223 | 2223 | else |
2224 | - $form->addElement('html','<div id="end_date_div" style="display:none;">'); |
|
2224 | + $form->addElement('html', '<div id="end_date_div" style="display:none;">'); |
|
2225 | 2225 | |
2226 | 2226 | $form->addElement('date_time_picker', 'end_time'); |
2227 | - $form->addElement('html','</div>'); |
|
2227 | + $form->addElement('html', '</div>'); |
|
2228 | 2228 | |
2229 | 2229 | //$check_option=$this->selectType(); |
2230 | 2230 | $diplay = 'block'; |
2231 | 2231 | $form->addElement('checkbox', 'propagate_neg', null, get_lang('PropagateNegativeResults')); |
2232 | - $form->addElement('html','<div class="clear"> </div>'); |
|
2232 | + $form->addElement('html', '<div class="clear"> </div>'); |
|
2233 | 2233 | $form->addElement('checkbox', 'review_answers', null, get_lang('ReviewAnswers')); |
2234 | 2234 | |
2235 | - $form->addElement('html','<div id="divtimecontrol" style="display:'.$diplay.';">'); |
|
2235 | + $form->addElement('html', '<div id="divtimecontrol" style="display:'.$diplay.';">'); |
|
2236 | 2236 | |
2237 | 2237 | //Timer control |
2238 | 2238 | //$time_hours_option = range(0,12); |
@@ -2248,12 +2248,12 @@ discard block |
||
2248 | 2248 | 'onload' => 'check_load_time()', |
2249 | 2249 | ) |
2250 | 2250 | ); |
2251 | - $expired_date = (int)$this->selectExpiredTime(); |
|
2251 | + $expired_date = (int) $this->selectExpiredTime(); |
|
2252 | 2252 | |
2253 | - if (($expired_date!='0')) { |
|
2254 | - $form->addElement('html','<div id="timercontrol" style="display:block;">'); |
|
2253 | + if (($expired_date != '0')) { |
|
2254 | + $form->addElement('html', '<div id="timercontrol" style="display:block;">'); |
|
2255 | 2255 | } else { |
2256 | - $form->addElement('html','<div id="timercontrol" style="display:none;">'); |
|
2256 | + $form->addElement('html', '<div id="timercontrol" style="display:none;">'); |
|
2257 | 2257 | } |
2258 | 2258 | $form->addText( |
2259 | 2259 | 'enabletimercontroltotalminutes', |
@@ -2264,7 +2264,7 @@ discard block |
||
2264 | 2264 | 'cols-size' => [2, 2, 8] |
2265 | 2265 | ] |
2266 | 2266 | ); |
2267 | - $form->addElement('html','</div>'); |
|
2267 | + $form->addElement('html', '</div>'); |
|
2268 | 2268 | |
2269 | 2269 | $form->addElement( |
2270 | 2270 | 'text', |
@@ -2288,23 +2288,23 @@ discard block |
||
2288 | 2288 | $defaults = array(); |
2289 | 2289 | |
2290 | 2290 | if (api_get_setting('search_enabled') === 'true') { |
2291 | - require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php'; |
|
2291 | + require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php'; |
|
2292 | 2292 | |
2293 | - $form->addElement ('checkbox', 'index_document','', get_lang('SearchFeatureDoIndexDocument')); |
|
2294 | - $form->addElement ('select_language', 'language', get_lang('SearchFeatureDocumentLanguage')); |
|
2293 | + $form->addElement('checkbox', 'index_document', '', get_lang('SearchFeatureDoIndexDocument')); |
|
2294 | + $form->addElement('select_language', 'language', get_lang('SearchFeatureDocumentLanguage')); |
|
2295 | 2295 | |
2296 | 2296 | $specific_fields = get_specific_field_list(); |
2297 | 2297 | |
2298 | 2298 | foreach ($specific_fields as $specific_field) { |
2299 | - $form->addElement ('text', $specific_field['code'], $specific_field['name']); |
|
2299 | + $form->addElement('text', $specific_field['code'], $specific_field['name']); |
|
2300 | 2300 | $filter = array( |
2301 | 2301 | 'c_id' => api_get_course_int_id(), |
2302 | 2302 | 'field_id' => $specific_field['id'], |
2303 | 2303 | 'ref_id' => $this->id, |
2304 | - 'tool_id' => "'" . TOOL_QUIZ . "'" |
|
2304 | + 'tool_id' => "'".TOOL_QUIZ."'" |
|
2305 | 2305 | ); |
2306 | 2306 | $values = get_specific_field_values_list($filter, array('value')); |
2307 | - if ( !empty($values) ) { |
|
2307 | + if (!empty($values)) { |
|
2308 | 2308 | $arr_str_values = array(); |
2309 | 2309 | foreach ($values as $value) { |
2310 | 2310 | $arr_str_values[] = $value['value']; |
@@ -2315,8 +2315,8 @@ discard block |
||
2315 | 2315 | //$form->addElement ('html','</div>'); |
2316 | 2316 | } |
2317 | 2317 | |
2318 | - $form->addElement('html','</div>'); //End advanced setting |
|
2319 | - $form->addElement('html','</div>'); |
|
2318 | + $form->addElement('html', '</div>'); //End advanced setting |
|
2319 | + $form->addElement('html', '</div>'); |
|
2320 | 2320 | } |
2321 | 2321 | |
2322 | 2322 | // submit |
@@ -2336,10 +2336,10 @@ discard block |
||
2336 | 2336 | } |
2337 | 2337 | |
2338 | 2338 | // defaults |
2339 | - if ($type=='full') { |
|
2339 | + if ($type == 'full') { |
|
2340 | 2340 | if ($this->id > 0) { |
2341 | 2341 | if ($this->random > $this->selectNbrQuestions()) { |
2342 | - $defaults['randomQuestions'] = $this->selectNbrQuestions(); |
|
2342 | + $defaults['randomQuestions'] = $this->selectNbrQuestions(); |
|
2343 | 2343 | } else { |
2344 | 2344 | $defaults['randomQuestions'] = $this->random; |
2345 | 2345 | } |
@@ -2366,8 +2366,8 @@ discard block |
||
2366 | 2366 | $defaults['activate_end_date_check'] = 1; |
2367 | 2367 | } |
2368 | 2368 | |
2369 | - $defaults['start_time'] = ($this->start_time!='0000-00-00 00:00:00') ? api_get_local_time($this->start_time) : date('Y-m-d 12:00:00'); |
|
2370 | - $defaults['end_time'] = ($this->end_time!='0000-00-00 00:00:00') ? api_get_local_time($this->end_time) : date('Y-m-d 12:00:00', time()+84600); |
|
2369 | + $defaults['start_time'] = ($this->start_time != '0000-00-00 00:00:00') ? api_get_local_time($this->start_time) : date('Y-m-d 12:00:00'); |
|
2370 | + $defaults['end_time'] = ($this->end_time != '0000-00-00 00:00:00') ? api_get_local_time($this->end_time) : date('Y-m-d 12:00:00', time() + 84600); |
|
2371 | 2371 | |
2372 | 2372 | // Get expired time |
2373 | 2373 | if ($this->expired_time != '0') { |
@@ -2388,7 +2388,7 @@ discard block |
||
2388 | 2388 | $defaults['text_when_finished'] = ""; |
2389 | 2389 | $defaults['start_time'] = date('Y-m-d 12:00:00'); |
2390 | 2390 | $defaults['display_category_name'] = 1; |
2391 | - $defaults['end_time'] = date('Y-m-d 12:00:00', time()+84600); |
|
2391 | + $defaults['end_time'] = date('Y-m-d 12:00:00', time() + 84600); |
|
2392 | 2392 | $defaults['pass_percentage'] = ''; |
2393 | 2393 | $defaults['end_button'] = $this->selectEndButton(); |
2394 | 2394 | $defaults['question_selection_type'] = 1; |
@@ -2474,7 +2474,7 @@ discard block |
||
2474 | 2474 | $end_time = $form->getSubmitValue('end_time'); |
2475 | 2475 | $this->end_time = api_get_utc_datetime($end_time); |
2476 | 2476 | } else { |
2477 | - $this->end_time = '0000-00-00 00:00:00'; |
|
2477 | + $this->end_time = '0000-00-00 00:00:00'; |
|
2478 | 2478 | } |
2479 | 2479 | |
2480 | 2480 | if ($form->getSubmitValue('enabletimercontrol') == 1) { |
@@ -2487,9 +2487,9 @@ discard block |
||
2487 | 2487 | } |
2488 | 2488 | |
2489 | 2489 | if ($form->getSubmitValue('randomAnswers') == 1) { |
2490 | - $this->random_answers=1; |
|
2490 | + $this->random_answers = 1; |
|
2491 | 2491 | } else { |
2492 | - $this->random_answers=0; |
|
2492 | + $this->random_answers = 0; |
|
2493 | 2493 | } |
2494 | 2494 | $this->save($type); |
2495 | 2495 | } |
@@ -2501,9 +2501,9 @@ discard block |
||
2501 | 2501 | } |
2502 | 2502 | $course_id = api_get_course_id(); |
2503 | 2503 | |
2504 | - require_once api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php'; |
|
2505 | - require_once api_get_path(LIBRARY_PATH) . 'search/IndexableChunk.class.php'; |
|
2506 | - require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php'; |
|
2504 | + require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php'; |
|
2505 | + require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php'; |
|
2506 | + require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php'; |
|
2507 | 2507 | |
2508 | 2508 | $specific_fields = get_specific_field_list(); |
2509 | 2509 | $ic_slide = new IndexableChunk(); |
@@ -2513,7 +2513,7 @@ discard block |
||
2513 | 2513 | if (isset($_REQUEST[$specific_field['code']])) { |
2514 | 2514 | $sterms = trim($_REQUEST[$specific_field['code']]); |
2515 | 2515 | if (!empty($sterms)) { |
2516 | - $all_specific_terms .= ' '. $sterms; |
|
2516 | + $all_specific_terms .= ' '.$sterms; |
|
2517 | 2517 | $sterms = explode(',', $sterms); |
2518 | 2518 | foreach ($sterms as $sterm) { |
2519 | 2519 | $ic_slide->addTerm(trim($sterm), $specific_field['code']); |
@@ -2530,15 +2530,15 @@ discard block |
||
2530 | 2530 | $xapian_data = array( |
2531 | 2531 | SE_COURSE_ID => $course_id, |
2532 | 2532 | SE_TOOL_ID => TOOL_QUIZ, |
2533 | - SE_DATA => array('type' => SE_DOCTYPE_EXERCISE_EXERCISE, 'exercise_id' => (int)$this->id), |
|
2534 | - SE_USER => (int)api_get_user_id(), |
|
2533 | + SE_DATA => array('type' => SE_DOCTYPE_EXERCISE_EXERCISE, 'exercise_id' => (int) $this->id), |
|
2534 | + SE_USER => (int) api_get_user_id(), |
|
2535 | 2535 | ); |
2536 | 2536 | $ic_slide->xapian_data = serialize($xapian_data); |
2537 | - $exercise_description = $all_specific_terms .' '. $this->description; |
|
2537 | + $exercise_description = $all_specific_terms.' '.$this->description; |
|
2538 | 2538 | $ic_slide->addValue("content", $exercise_description); |
2539 | 2539 | |
2540 | 2540 | $di = new ChamiloIndexer(); |
2541 | - isset($_POST['language'])? $lang=Database::escape_string($_POST['language']): $lang = 'english'; |
|
2541 | + isset($_POST['language']) ? $lang = Database::escape_string($_POST['language']) : $lang = 'english'; |
|
2542 | 2542 | $di->connectDb(NULL, NULL, $lang); |
2543 | 2543 | $di->addChunk($ic_slide); |
2544 | 2544 | |
@@ -2557,7 +2557,7 @@ discard block |
||
2557 | 2557 | function search_engine_edit() |
2558 | 2558 | { |
2559 | 2559 | // update search enchine and its values table if enabled |
2560 | - if (api_get_setting('search_enabled')=='true' && extension_loaded('xapian')) { |
|
2560 | + if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian')) { |
|
2561 | 2561 | $course_id = api_get_course_id(); |
2562 | 2562 | |
2563 | 2563 | // actually, it consists on delete terms from db, |
@@ -2569,9 +2569,9 @@ discard block |
||
2569 | 2569 | $res = Database::query($sql); |
2570 | 2570 | |
2571 | 2571 | if (Database::num_rows($res) > 0) { |
2572 | - require_once(api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php'); |
|
2573 | - require_once(api_get_path(LIBRARY_PATH) . 'search/IndexableChunk.class.php'); |
|
2574 | - require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php'); |
|
2572 | + require_once(api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php'); |
|
2573 | + require_once(api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php'); |
|
2574 | + require_once(api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php'); |
|
2575 | 2575 | |
2576 | 2576 | $se_ref = Database::fetch_array($res); |
2577 | 2577 | $specific_fields = get_specific_field_list(); |
@@ -2582,7 +2582,7 @@ discard block |
||
2582 | 2582 | delete_all_specific_field_value($course_id, $specific_field['id'], TOOL_QUIZ, $this->id); |
2583 | 2583 | if (isset($_REQUEST[$specific_field['code']])) { |
2584 | 2584 | $sterms = trim($_REQUEST[$specific_field['code']]); |
2585 | - $all_specific_terms .= ' '. $sterms; |
|
2585 | + $all_specific_terms .= ' '.$sterms; |
|
2586 | 2586 | $sterms = explode(',', $sterms); |
2587 | 2587 | foreach ($sterms as $sterm) { |
2588 | 2588 | $ic_slide->addTerm(trim($sterm), $specific_field['code']); |
@@ -2598,17 +2598,17 @@ discard block |
||
2598 | 2598 | $xapian_data = array( |
2599 | 2599 | SE_COURSE_ID => $course_id, |
2600 | 2600 | SE_TOOL_ID => TOOL_QUIZ, |
2601 | - SE_DATA => array('type' => SE_DOCTYPE_EXERCISE_EXERCISE, 'exercise_id' => (int)$this->id), |
|
2602 | - SE_USER => (int)api_get_user_id(), |
|
2601 | + SE_DATA => array('type' => SE_DOCTYPE_EXERCISE_EXERCISE, 'exercise_id' => (int) $this->id), |
|
2602 | + SE_USER => (int) api_get_user_id(), |
|
2603 | 2603 | ); |
2604 | 2604 | $ic_slide->xapian_data = serialize($xapian_data); |
2605 | - $exercise_description = $all_specific_terms .' '. $this->description; |
|
2605 | + $exercise_description = $all_specific_terms.' '.$this->description; |
|
2606 | 2606 | $ic_slide->addValue("content", $exercise_description); |
2607 | 2607 | |
2608 | 2608 | $di = new ChamiloIndexer(); |
2609 | - isset($_POST['language'])? $lang=Database::escape_string($_POST['language']): $lang = 'english'; |
|
2609 | + isset($_POST['language']) ? $lang = Database::escape_string($_POST['language']) : $lang = 'english'; |
|
2610 | 2610 | $di->connectDb(NULL, NULL, $lang); |
2611 | - $di->remove_document((int)$se_ref['search_did']); |
|
2611 | + $di->remove_document((int) $se_ref['search_did']); |
|
2612 | 2612 | $di->addChunk($ic_slide); |
2613 | 2613 | |
2614 | 2614 | //index and return search engine document id |
@@ -2633,7 +2633,7 @@ discard block |
||
2633 | 2633 | function search_engine_delete() |
2634 | 2634 | { |
2635 | 2635 | // remove from search engine if enabled |
2636 | - if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian') ) { |
|
2636 | + if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian')) { |
|
2637 | 2637 | $course_id = api_get_course_id(); |
2638 | 2638 | $tbl_se_ref = Database::get_main_table(TABLE_MAIN_SEARCH_ENGINE_REF); |
2639 | 2639 | $sql = 'SELECT * FROM %s WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=%s AND ref_id_second_level IS NULL LIMIT 1'; |
@@ -2641,19 +2641,19 @@ discard block |
||
2641 | 2641 | $res = Database::query($sql); |
2642 | 2642 | if (Database::num_rows($res) > 0) { |
2643 | 2643 | $row = Database::fetch_array($res); |
2644 | - require_once(api_get_path(LIBRARY_PATH) .'search/ChamiloIndexer.class.php'); |
|
2644 | + require_once(api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php'); |
|
2645 | 2645 | $di = new ChamiloIndexer(); |
2646 | - $di->remove_document((int)$row['search_did']); |
|
2646 | + $di->remove_document((int) $row['search_did']); |
|
2647 | 2647 | unset($di); |
2648 | 2648 | $tbl_quiz_question = Database::get_course_table(TABLE_QUIZ_QUESTION); |
2649 | - foreach ( $this->questionList as $question_i) { |
|
2649 | + foreach ($this->questionList as $question_i) { |
|
2650 | 2650 | $sql = 'SELECT type FROM %s WHERE id=%s'; |
2651 | 2651 | $sql = sprintf($sql, $tbl_quiz_question, $question_i); |
2652 | 2652 | $qres = Database::query($sql); |
2653 | 2653 | if (Database::num_rows($qres) > 0) { |
2654 | 2654 | $qrow = Database::fetch_array($qres); |
2655 | 2655 | $objQuestion = Question::getInstance($qrow['type']); |
2656 | - $objQuestion = Question::read((int)$question_i); |
|
2656 | + $objQuestion = Question::read((int) $question_i); |
|
2657 | 2657 | $objQuestion->search_engine_edit($this->id, FALSE, TRUE); |
2658 | 2658 | unset($objQuestion); |
2659 | 2659 | } |
@@ -2664,7 +2664,7 @@ discard block |
||
2664 | 2664 | Database::query($sql); |
2665 | 2665 | |
2666 | 2666 | // remove terms from db |
2667 | - require_once api_get_path(LIBRARY_PATH) .'specific_fields_manager.lib.php'; |
|
2667 | + require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php'; |
|
2668 | 2668 | delete_all_values_for_item($course_id, TOOL_QUIZ, $this->id); |
2669 | 2669 | } |
2670 | 2670 | } |
@@ -2759,7 +2759,7 @@ discard block |
||
2759 | 2759 | */ |
2760 | 2760 | public function copy_exercise() |
2761 | 2761 | { |
2762 | - $exercise_obj= new Exercise(); |
|
2762 | + $exercise_obj = new Exercise(); |
|
2763 | 2763 | $exercise_obj = $this; |
2764 | 2764 | |
2765 | 2765 | // force the creation of a new exercise |
@@ -2831,25 +2831,25 @@ discard block |
||
2831 | 2831 | $lp_id = 0; |
2832 | 2832 | } |
2833 | 2833 | if (empty($lp_item_id)) { |
2834 | - $lp_item_id = 0; |
|
2834 | + $lp_item_id = 0; |
|
2835 | 2835 | } |
2836 | 2836 | if (empty($lp_item_view_id)) { |
2837 | 2837 | $lp_item_view_id = 0; |
2838 | 2838 | } |
2839 | - $condition = ' WHERE exe_exo_id = ' . "'" . $this->id . "'" .' AND |
|
2840 | - exe_user_id = ' . "'" . api_get_user_id() . "'" . ' AND |
|
2841 | - c_id = ' . api_get_course_int_id() . ' AND |
|
2842 | - status = ' . "'" . Database::escape_string($status). "'" . ' AND |
|
2843 | - orig_lp_id = ' . "'" . $lp_id . "'" . ' AND |
|
2844 | - orig_lp_item_id = ' . "'" . $lp_item_id . "'" . ' AND |
|
2845 | - orig_lp_item_view_id = ' . "'" . $lp_item_view_id . "'" . ' AND |
|
2846 | - session_id = ' . "'" . api_get_session_id() . "' LIMIT 1"; //Adding limit 1 just in case |
|
2839 | + $condition = ' WHERE exe_exo_id = '."'".$this->id."'".' AND |
|
2840 | + exe_user_id = ' . "'".api_get_user_id()."'".' AND |
|
2841 | + c_id = ' . api_get_course_int_id().' AND |
|
2842 | + status = ' . "'".Database::escape_string($status)."'".' AND |
|
2843 | + orig_lp_id = ' . "'".$lp_id."'".' AND |
|
2844 | + orig_lp_item_id = ' . "'".$lp_item_id."'".' AND |
|
2845 | + orig_lp_item_view_id = ' . "'".$lp_item_view_id."'".' AND |
|
2846 | + session_id = ' . "'".api_get_session_id()."' LIMIT 1"; //Adding limit 1 just in case |
|
2847 | 2847 | |
2848 | 2848 | $sql_track = 'SELECT * FROM '.$track_exercises.$condition; |
2849 | 2849 | |
2850 | 2850 | $result = Database::query($sql_track); |
2851 | 2851 | $new_array = array(); |
2852 | - if (Database::num_rows($result) > 0 ) { |
|
2852 | + if (Database::num_rows($result) > 0) { |
|
2853 | 2853 | $new_array = Database::fetch_array($result, 'ASSOC'); |
2854 | 2854 | $new_array['num_exe'] = Database::num_rows($result); |
2855 | 2855 | } |
@@ -2892,12 +2892,12 @@ discard block |
||
2892 | 2892 | $questionList = array_map('intval', $questionList); |
2893 | 2893 | |
2894 | 2894 | $params = array( |
2895 | - 'exe_exo_id' => $this->id , |
|
2895 | + 'exe_exo_id' => $this->id, |
|
2896 | 2896 | 'exe_user_id' => api_get_user_id(), |
2897 | 2897 | 'c_id' => api_get_course_int_id(), |
2898 | 2898 | 'status' => 'incomplete', |
2899 | 2899 | 'session_id' => api_get_session_id(), |
2900 | - 'data_tracking' => implode(',', $questionList) , |
|
2900 | + 'data_tracking' => implode(',', $questionList), |
|
2901 | 2901 | 'start_date' => api_get_utc_datetime(), |
2902 | 2902 | 'orig_lp_id' => $safe_lp_id, |
2903 | 2903 | 'orig_lp_item_id' => $safe_lp_item_id, |
@@ -2929,7 +2929,7 @@ discard block |
||
2929 | 2929 | $nbrQuestions = $this->get_count_question_list(); |
2930 | 2930 | |
2931 | 2931 | $all_button = $html = $label = ''; |
2932 | - $hotspot_get = isset($_POST['hotspot']) ? Security::remove_XSS($_POST['hotspot']):null; |
|
2932 | + $hotspot_get = isset($_POST['hotspot']) ? Security::remove_XSS($_POST['hotspot']) : null; |
|
2933 | 2933 | |
2934 | 2934 | if ($this->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT && $this->type == ONE_PER_PAGE) { |
2935 | 2935 | $urlTitle = get_lang('ContinueTest'); |
@@ -2940,7 +2940,7 @@ discard block |
||
2940 | 2940 | |
2941 | 2941 | $html .= Display::url( |
2942 | 2942 | $urlTitle, |
2943 | - 'exercise_submit_modal.php?' . http_build_query([ |
|
2943 | + 'exercise_submit_modal.php?'.http_build_query([ |
|
2944 | 2944 | 'learnpath_id' => $safe_lp_id, |
2945 | 2945 | 'learnpath_item_id' => $safe_lp_item_id, |
2946 | 2946 | 'learnpath_item_view_id' => $safe_lp_item_view_id, |
@@ -2957,7 +2957,7 @@ discard block |
||
2957 | 2957 | 'data-size' => 'md' |
2958 | 2958 | ] |
2959 | 2959 | ); |
2960 | - $html .='<br />'; |
|
2960 | + $html .= '<br />'; |
|
2961 | 2961 | } else { |
2962 | 2962 | // User |
2963 | 2963 | if (api_is_allowed_to_session_edit()) { |
@@ -2982,7 +2982,7 @@ discard block |
||
2982 | 2982 | |
2983 | 2983 | //Next question |
2984 | 2984 | if (!empty($questions_in_media)) { |
2985 | - $questions_in_media = "['".implode("','",$questions_in_media)."']"; |
|
2985 | + $questions_in_media = "['".implode("','", $questions_in_media)."']"; |
|
2986 | 2986 | $all_button .= ' <a href="javascript://" class="'.$class.'" onclick="save_question_list('.$questions_in_media.'); ">'.$label.'</a>'; |
2987 | 2987 | } else { |
2988 | 2988 | $all_button .= ' <a href="javascript://" class="'.$class.'" onclick="save_now('.$question_id.', \'\', \''.$currentAnswer.'\'); ">'.$label.'</a>'; |
@@ -3000,7 +3000,7 @@ discard block |
||
3000 | 3000 | } |
3001 | 3001 | $class .= ' question-validate-btn'; // used to select it with jquery |
3002 | 3002 | $all_button = ' <a href="javascript://" class="'.$class.'" onclick="validate_all(); ">'.$all_label.'</a>'; |
3003 | - $all_button .= ' ' . Display::span(null, ['id' => 'save_all_reponse']); |
|
3003 | + $all_button .= ' '.Display::span(null, ['id' => 'save_all_reponse']); |
|
3004 | 3004 | $html .= $all_button; |
3005 | 3005 | } |
3006 | 3006 | } |
@@ -3242,8 +3242,8 @@ discard block |
||
3242 | 3242 | $params = array(); |
3243 | 3243 | $params['course_id'] = $course_id; |
3244 | 3244 | $params['session_id'] = api_get_session_id(); |
3245 | - $params['user_id'] = isset($exe_info['exe_user_id'])? $exe_info['exe_user_id'] : api_get_user_id(); |
|
3246 | - $params['exercise_id'] = isset($exe_info['exe_exo_id'])? $exe_info['exe_exo_id'] : $this->id; |
|
3245 | + $params['user_id'] = isset($exe_info['exe_user_id']) ? $exe_info['exe_user_id'] : api_get_user_id(); |
|
3246 | + $params['exercise_id'] = isset($exe_info['exe_exo_id']) ? $exe_info['exe_exo_id'] : $this->id; |
|
3247 | 3247 | $params['question_id'] = $questionId; |
3248 | 3248 | $params['exe_id'] = isset($exe_info['exe_id']) ? $exe_info['exe_id'] : $exeId; |
3249 | 3249 | |
@@ -3297,10 +3297,10 @@ discard block |
||
3297 | 3297 | $answer = $objAnswerTmp->selectAnswer($answerId); |
3298 | 3298 | $answerComment = $objAnswerTmp->selectComment($answerId); |
3299 | 3299 | $answerCorrect = $objAnswerTmp->isCorrect($answerId); |
3300 | - $answerWeighting = (float)$objAnswerTmp->selectWeighting($answerId); |
|
3300 | + $answerWeighting = (float) $objAnswerTmp->selectWeighting($answerId); |
|
3301 | 3301 | $answerAutoId = $objAnswerTmp->selectAutoId($answerId); |
3302 | 3302 | |
3303 | - $answer_correct_array[$answerId] = (bool)$answerCorrect; |
|
3303 | + $answer_correct_array[$answerId] = (bool) $answerCorrect; |
|
3304 | 3304 | |
3305 | 3305 | if ($debug) { |
3306 | 3306 | error_log("answer auto id: $answerAutoId "); |
@@ -3309,7 +3309,7 @@ discard block |
||
3309 | 3309 | |
3310 | 3310 | // Delineation |
3311 | 3311 | $delineation_cord = $objAnswerTmp->selectHotspotCoordinates(1); |
3312 | - $answer_delineation_destination=$objAnswerTmp->selectDestination(1); |
|
3312 | + $answer_delineation_destination = $objAnswerTmp->selectDestination(1); |
|
3313 | 3313 | |
3314 | 3314 | switch ($answerType) { |
3315 | 3315 | // for unique answer |
@@ -3322,7 +3322,7 @@ discard block |
||
3322 | 3322 | exe_id = '".$exeId."' AND |
3323 | 3323 | question_id= '".$questionId."'"; |
3324 | 3324 | $result = Database::query($sql); |
3325 | - $choice = Database::result($result,0,"answer"); |
|
3325 | + $choice = Database::result($result, 0, "answer"); |
|
3326 | 3326 | |
3327 | 3327 | $studentChoice = $choice == $answerAutoId ? 1 : 0; |
3328 | 3328 | if ($studentChoice) { |
@@ -3373,7 +3373,7 @@ discard block |
||
3373 | 3373 | } else { |
3374 | 3374 | // If no result then the user just hit don't know |
3375 | 3375 | $studentChoice = 3; |
3376 | - $questionScore += $doubt_score; |
|
3376 | + $questionScore += $doubt_score; |
|
3377 | 3377 | } |
3378 | 3378 | $totalScore = $questionScore; |
3379 | 3379 | break; |
@@ -3389,17 +3389,17 @@ discard block |
||
3389 | 3389 | } |
3390 | 3390 | |
3391 | 3391 | $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null; |
3392 | - $real_answers[$answerId] = (bool)$studentChoice; |
|
3392 | + $real_answers[$answerId] = (bool) $studentChoice; |
|
3393 | 3393 | |
3394 | 3394 | if ($studentChoice) { |
3395 | - $questionScore +=$answerWeighting; |
|
3395 | + $questionScore += $answerWeighting; |
|
3396 | 3396 | } |
3397 | 3397 | } else { |
3398 | 3398 | $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null; |
3399 | - $real_answers[$answerId] = (bool)$studentChoice; |
|
3399 | + $real_answers[$answerId] = (bool) $studentChoice; |
|
3400 | 3400 | |
3401 | 3401 | if (isset($studentChoice)) { |
3402 | - $questionScore += $answerWeighting; |
|
3402 | + $questionScore += $answerWeighting; |
|
3403 | 3403 | } |
3404 | 3404 | } |
3405 | 3405 | $totalScore += $answerWeighting; |
@@ -3417,16 +3417,16 @@ discard block |
||
3417 | 3417 | $choice[$ind] = 1; |
3418 | 3418 | } |
3419 | 3419 | $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null; |
3420 | - $real_answers[$answerId] = (bool)$studentChoice; |
|
3420 | + $real_answers[$answerId] = (bool) $studentChoice; |
|
3421 | 3421 | if ($studentChoice) { |
3422 | - $questionScore +=$answerWeighting; |
|
3422 | + $questionScore += $answerWeighting; |
|
3423 | 3423 | } |
3424 | 3424 | } else { |
3425 | 3425 | $studentChoice = isset($choice[$answerAutoId]) ? $choice[$answerAutoId] : null; |
3426 | 3426 | if (isset($studentChoice)) { |
3427 | 3427 | $questionScore += $answerWeighting; |
3428 | 3428 | } |
3429 | - $real_answers[$answerId] = (bool)$studentChoice; |
|
3429 | + $real_answers[$answerId] = (bool) $studentChoice; |
|
3430 | 3430 | } |
3431 | 3431 | $totalScore += $answerWeighting; |
3432 | 3432 | if ($debug) error_log("studentChoice: $studentChoice"); |
@@ -3438,7 +3438,7 @@ discard block |
||
3438 | 3438 | $resultans = Database::query($sql); |
3439 | 3439 | while ($row = Database::fetch_array($resultans)) { |
3440 | 3440 | $ind = $row['answer']; |
3441 | - $result = explode(':',$ind); |
|
3441 | + $result = explode(':', $ind); |
|
3442 | 3442 | if (isset($result[0])) { |
3443 | 3443 | $my_answer_id = isset($result[0]) ? $result[0] : ''; |
3444 | 3444 | $option = isset($result[1]) ? $result[1] : ''; |
@@ -3559,10 +3559,10 @@ discard block |
||
3559 | 3559 | } |
3560 | 3560 | // adds the piece of text that is before the blank |
3561 | 3561 | //and ends with '[' into a general storage array |
3562 | - $real_text[] = api_substr($temp, 0, $pos +1); |
|
3563 | - $answer .= api_substr($temp, 0, $pos +1); |
|
3562 | + $real_text[] = api_substr($temp, 0, $pos + 1); |
|
3563 | + $answer .= api_substr($temp, 0, $pos + 1); |
|
3564 | 3564 | //take the string remaining (after the last "[" we found) |
3565 | - $temp = api_substr($temp, $pos +1); |
|
3565 | + $temp = api_substr($temp, $pos + 1); |
|
3566 | 3566 | // quit the loop if there are no more blanks, and update $pos to the position of next ']' |
3567 | 3567 | if (($pos = api_strpos($temp, ']')) === false) { |
3568 | 3568 | // adds the end of the text |
@@ -3598,7 +3598,7 @@ discard block |
||
3598 | 3598 | //put the contents of the [] answer tag into correct_tags[] |
3599 | 3599 | $correct_tags[] = api_substr($temp, 0, $pos); |
3600 | 3600 | $j++; |
3601 | - $temp = api_substr($temp, $pos +1); |
|
3601 | + $temp = api_substr($temp, $pos + 1); |
|
3602 | 3602 | } |
3603 | 3603 | $answer = ''; |
3604 | 3604 | $real_correct_tags = $correct_tags; |
@@ -3621,7 +3621,7 @@ discard block |
||
3621 | 3621 | } elseif (!empty($user_tags[$i])) { |
3622 | 3622 | // else if the word entered by the student IS NOT the same as the one defined by the professor |
3623 | 3623 | // adds the word in red at the end of the string, and strikes it |
3624 | - $answer .= '<font color="red"><s>' . $user_tags[$i] . '</s></font>'; |
|
3624 | + $answer .= '<font color="red"><s>'.$user_tags[$i].'</s></font>'; |
|
3625 | 3625 | } else { |
3626 | 3626 | // adds a tabulation if no word has been typed by the student |
3627 | 3627 | $answer .= ''; // remove that causes issue |
@@ -3640,17 +3640,17 @@ discard block |
||
3640 | 3640 | } elseif (!empty ($user_tags[$i])) { |
3641 | 3641 | // else if the word entered by the student IS NOT the same as the one defined by the professor |
3642 | 3642 | // adds the word in red at the end of the string, and strikes it |
3643 | - $answer .= '<font color="red"><s>' . $user_tags[$i] . '</s></font>'; |
|
3643 | + $answer .= '<font color="red"><s>'.$user_tags[$i].'</s></font>'; |
|
3644 | 3644 | } else { |
3645 | 3645 | // adds a tabulation if no word has been typed by the student |
3646 | - $answer .= ''; // remove that causes issue |
|
3646 | + $answer .= ''; // remove that causes issue |
|
3647 | 3647 | } |
3648 | 3648 | } |
3649 | 3649 | |
3650 | 3650 | // adds the correct word, followed by ] to close the blank |
3651 | - $answer .= ' / <font color="green"><b>' . $real_correct_tags[$i] . '</b></font>]'; |
|
3652 | - if (isset($real_text[$i +1])) { |
|
3653 | - $answer .= $real_text[$i +1]; |
|
3651 | + $answer .= ' / <font color="green"><b>'.$real_correct_tags[$i].'</b></font>]'; |
|
3652 | + if (isset($real_text[$i + 1])) { |
|
3653 | + $answer .= $real_text[$i + 1]; |
|
3654 | 3654 | } |
3655 | 3655 | } |
3656 | 3656 | } else { |
@@ -3791,10 +3791,10 @@ discard block |
||
3791 | 3791 | } |
3792 | 3792 | // adds the piece of text that is before the blank |
3793 | 3793 | //and ends with '[' into a general storage array |
3794 | - $realText[] = api_substr($temp, 0, $pos +1); |
|
3795 | - $answer .= api_substr($temp, 0, $pos +1); |
|
3794 | + $realText[] = api_substr($temp, 0, $pos + 1); |
|
3795 | + $answer .= api_substr($temp, 0, $pos + 1); |
|
3796 | 3796 | //take the string remaining (after the last "[" we found) |
3797 | - $temp = api_substr($temp, $pos +1); |
|
3797 | + $temp = api_substr($temp, $pos + 1); |
|
3798 | 3798 | // quit the loop if there are no more blanks, and update $pos to the position of next ']' |
3799 | 3799 | if (($pos = api_strpos($temp, ']')) === false) { |
3800 | 3800 | // adds the end of the text |
@@ -3828,7 +3828,7 @@ discard block |
||
3828 | 3828 | //put the contents of the [] answer tag into correct_tags[] |
3829 | 3829 | $correctTags[] = api_substr($temp, 0, $pos); |
3830 | 3830 | $j++; |
3831 | - $temp = api_substr($temp, $pos +1); |
|
3831 | + $temp = api_substr($temp, $pos + 1); |
|
3832 | 3832 | } |
3833 | 3833 | $answer = ''; |
3834 | 3834 | $realCorrectTags = $correctTags; |
@@ -3858,22 +3858,22 @@ discard block |
||
3858 | 3858 | } elseif (!empty($userTags[$i])) { |
3859 | 3859 | // else if the word entered by the student IS NOT the same as the one defined by the professor |
3860 | 3860 | // adds the word in red at the end of the string, and strikes it |
3861 | - $answer .= '<font color="red"><s>' . $userTags[$i] . '</s></font>'; |
|
3861 | + $answer .= '<font color="red"><s>'.$userTags[$i].'</s></font>'; |
|
3862 | 3862 | } else { |
3863 | 3863 | // adds a tabulation if no word has been typed by the student |
3864 | 3864 | $answer .= ''; // remove that causes issue |
3865 | 3865 | } |
3866 | 3866 | // adds the correct word, followed by ] to close the blank |
3867 | - $answer .= ' / <font color="green"><b>' . $realCorrectTags[$i] . '</b></font>]'; |
|
3868 | - if (isset($realText[$i +1])) { |
|
3869 | - $answer .= $realText[$i +1]; |
|
3867 | + $answer .= ' / <font color="green"><b>'.$realCorrectTags[$i].'</b></font>]'; |
|
3868 | + if (isset($realText[$i + 1])) { |
|
3869 | + $answer .= $realText[$i + 1]; |
|
3870 | 3870 | } |
3871 | 3871 | } |
3872 | 3872 | break; |
3873 | 3873 | // for free answer |
3874 | 3874 | case FREE_ANSWER: |
3875 | 3875 | if ($from_database) { |
3876 | - $query = "SELECT answer, marks FROM ".$TBL_TRACK_ATTEMPT." |
|
3876 | + $query = "SELECT answer, marks FROM ".$TBL_TRACK_ATTEMPT." |
|
3877 | 3877 | WHERE exe_id = '".$exeId."' AND question_id= '".$questionId."'"; |
3878 | 3878 | $resq = Database::query($query); |
3879 | 3879 | $data = Database::fetch_array($resq); |
@@ -3884,9 +3884,9 @@ discard block |
||
3884 | 3884 | $questionScore = $data['marks']; |
3885 | 3885 | |
3886 | 3886 | if ($questionScore == -1) { |
3887 | - $totalScore+= 0; |
|
3887 | + $totalScore += 0; |
|
3888 | 3888 | } else { |
3889 | - $totalScore+= $questionScore; |
|
3889 | + $totalScore += $questionScore; |
|
3890 | 3890 | } |
3891 | 3891 | if ($questionScore == '') { |
3892 | 3892 | $questionScore = 0; |
@@ -3907,14 +3907,14 @@ discard block |
||
3907 | 3907 | $query = "SELECT answer, marks FROM ".$TBL_TRACK_ATTEMPT." |
3908 | 3908 | WHERE exe_id = '".$exeId."' AND question_id= '".$questionId."'"; |
3909 | 3909 | $resq = Database::query($query); |
3910 | - $choice = Database::result($resq,0,'answer'); |
|
3910 | + $choice = Database::result($resq, 0, 'answer'); |
|
3911 | 3911 | $choice = str_replace('\r\n', '', $choice); |
3912 | 3912 | $choice = stripslashes($choice); |
3913 | - $questionScore = Database::result($resq,0,"marks"); |
|
3914 | - if ($questionScore==-1) { |
|
3915 | - $totalScore+=0; |
|
3913 | + $questionScore = Database::result($resq, 0, "marks"); |
|
3914 | + if ($questionScore == -1) { |
|
3915 | + $totalScore += 0; |
|
3916 | 3916 | } else { |
3917 | - $totalScore+=$questionScore; |
|
3917 | + $totalScore += $questionScore; |
|
3918 | 3918 | } |
3919 | 3919 | $arrques = $questionName; |
3920 | 3920 | $arrans = $choice; |
@@ -3959,7 +3959,7 @@ discard block |
||
3959 | 3959 | |
3960 | 3960 | while ($a_answers = Database::fetch_array($res_answers)) { |
3961 | 3961 | $i_answer_id = $a_answers['id']; //3 |
3962 | - $s_answer_label = $a_answers['answer']; // your daddy - your mother |
|
3962 | + $s_answer_label = $a_answers['answer']; // your daddy - your mother |
|
3963 | 3963 | $i_answer_correct_answer = $a_answers['correct']; //1 - 2 |
3964 | 3964 | $i_answer_id_auto = $a_answers['id_auto']; // 3 - 4 |
3965 | 3965 | |
@@ -4011,8 +4011,8 @@ discard block |
||
4011 | 4011 | |
4012 | 4012 | if ($show_result) { |
4013 | 4013 | echo '<tr>'; |
4014 | - echo '<td>' . $s_answer_label . '</td>'; |
|
4015 | - echo '<td>' . $user_answer; |
|
4014 | + echo '<td>'.$s_answer_label.'</td>'; |
|
4015 | + echo '<td>'.$user_answer; |
|
4016 | 4016 | |
4017 | 4017 | if (in_array($answerType, [MATCHING, MATCHING_DRAGGABLE])) { |
4018 | 4018 | if (isset($real_list[$i_answer_correct_answer])) { |
@@ -4121,7 +4121,7 @@ discard block |
||
4121 | 4121 | if ($from_database) { |
4122 | 4122 | // getting the user answer |
4123 | 4123 | $TBL_TRACK_HOTSPOT = Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTSPOT); |
4124 | - $query = "SELECT hotspot_correct, hotspot_coordinate |
|
4124 | + $query = "SELECT hotspot_correct, hotspot_coordinate |
|
4125 | 4125 | FROM $TBL_TRACK_HOTSPOT |
4126 | 4126 | WHERE |
4127 | 4127 | hotspot_exe_id = '".$exeId."' AND |
@@ -4129,20 +4129,20 @@ discard block |
||
4129 | 4129 | hotspot_answer_id='1'"; |
4130 | 4130 | //by default we take 1 because it's a delineation |
4131 | 4131 | $resq = Database::query($query); |
4132 | - $row = Database::fetch_array($resq,'ASSOC'); |
|
4132 | + $row = Database::fetch_array($resq, 'ASSOC'); |
|
4133 | 4133 | |
4134 | 4134 | $choice = $row['hotspot_correct']; |
4135 | 4135 | $user_answer = $row['hotspot_coordinate']; |
4136 | 4136 | |
4137 | 4137 | // THIS is very important otherwise the poly_compile will throw an error!! |
4138 | 4138 | // round-up the coordinates |
4139 | - $coords = explode('/',$user_answer); |
|
4139 | + $coords = explode('/', $user_answer); |
|
4140 | 4140 | $user_array = ''; |
4141 | 4141 | foreach ($coords as $coord) { |
4142 | - list($x,$y) = explode(';',$coord); |
|
4142 | + list($x, $y) = explode(';', $coord); |
|
4143 | 4143 | $user_array .= round($x).';'.round($y).'/'; |
4144 | 4144 | } |
4145 | - $user_array = substr($user_array,0,-1); |
|
4145 | + $user_array = substr($user_array, 0, -1); |
|
4146 | 4146 | } else { |
4147 | 4147 | if (!empty($studentChoice)) { |
4148 | 4148 | $newquestionList[] = $questionId; |
@@ -4152,13 +4152,13 @@ discard block |
||
4152 | 4152 | $studentChoice = $choice[$answerId]; |
4153 | 4153 | $questionScore += $answerWeighting; |
4154 | 4154 | |
4155 | - if ($hotspot_delineation_result[1]==1) { |
|
4155 | + if ($hotspot_delineation_result[1] == 1) { |
|
4156 | 4156 | $totalScore += $answerWeighting; //adding the total |
4157 | 4157 | } |
4158 | 4158 | } |
4159 | 4159 | } |
4160 | - $_SESSION['hotspot_coord'][1] = $delineation_cord; |
|
4161 | - $_SESSION['hotspot_dest'][1] = $answer_delineation_destination; |
|
4160 | + $_SESSION['hotspot_coord'][1] = $delineation_cord; |
|
4161 | + $_SESSION['hotspot_dest'][1] = $answer_delineation_destination; |
|
4162 | 4162 | break; |
4163 | 4163 | } // end switch Answertype |
4164 | 4164 | |
@@ -4216,7 +4216,7 @@ discard block |
||
4216 | 4216 | $results_disabled |
4217 | 4217 | ); |
4218 | 4218 | //} |
4219 | - } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE ) { |
|
4219 | + } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE) { |
|
4220 | 4220 | // if ($origin!='learnpath') { |
4221 | 4221 | ExerciseShowFunctions::display_multiple_answer_combination_true_false( |
4222 | 4222 | $feedback_type, |
@@ -4233,11 +4233,11 @@ discard block |
||
4233 | 4233 | //} |
4234 | 4234 | } elseif ($answerType == FILL_IN_BLANKS) { |
4235 | 4235 | //if ($origin!='learnpath') { |
4236 | - ExerciseShowFunctions::display_fill_in_blanks_answer($feedback_type, $answer,0,0, $results_disabled); |
|
4236 | + ExerciseShowFunctions::display_fill_in_blanks_answer($feedback_type, $answer, 0, 0, $results_disabled); |
|
4237 | 4237 | // } |
4238 | 4238 | } elseif ($answerType == CALCULATED_ANSWER) { |
4239 | 4239 | //if ($origin!='learnpath') { |
4240 | - ExerciseShowFunctions::display_calculated_answer($feedback_type, $answer,0,0); |
|
4240 | + ExerciseShowFunctions::display_calculated_answer($feedback_type, $answer, 0, 0); |
|
4241 | 4241 | // } |
4242 | 4242 | } elseif ($answerType == FREE_ANSWER) { |
4243 | 4243 | //if($origin != 'learnpath') { |
@@ -4291,13 +4291,13 @@ discard block |
||
4291 | 4291 | $user_answer = $_SESSION['exerciseResultCoordinates'][$questionId]; |
4292 | 4292 | |
4293 | 4293 | //round-up the coordinates |
4294 | - $coords = explode('/',$user_answer); |
|
4294 | + $coords = explode('/', $user_answer); |
|
4295 | 4295 | $user_array = ''; |
4296 | 4296 | foreach ($coords as $coord) { |
4297 | - list($x,$y) = explode(';',$coord); |
|
4297 | + list($x, $y) = explode(';', $coord); |
|
4298 | 4298 | $user_array .= round($x).';'.round($y).'/'; |
4299 | 4299 | } |
4300 | - $user_array = substr($user_array,0,-1); |
|
4300 | + $user_array = substr($user_array, 0, -1); |
|
4301 | 4301 | |
4302 | 4302 | if ($next) { |
4303 | 4303 | |
@@ -4324,7 +4324,7 @@ discard block |
||
4324 | 4324 | //$overlap = round(polygons_overlap($poly_answer,$poly_user)); |
4325 | 4325 | // //this is an area in pixels |
4326 | 4326 | if ($debug > 0) { |
4327 | - error_log(__LINE__ . ' - Polygons results are ' . print_r($poly_results, 1), 0); |
|
4327 | + error_log(__LINE__.' - Polygons results are '.print_r($poly_results, 1), 0); |
|
4328 | 4328 | } |
4329 | 4329 | |
4330 | 4330 | if ($overlap < 1) { |
@@ -4337,43 +4337,43 @@ discard block |
||
4337 | 4337 | // that is overlapped by the user's polygon |
4338 | 4338 | $final_overlap = round(((float) $overlap / (float) $poly_answer_area) * 100); |
4339 | 4339 | if ($debug > 1) { |
4340 | - error_log(__LINE__ . ' - Final overlap is ' . $final_overlap, 0); |
|
4340 | + error_log(__LINE__.' - Final overlap is '.$final_overlap, 0); |
|
4341 | 4341 | } |
4342 | 4342 | // the final missing area is the percentage of the initial polygon |
4343 | 4343 | // that is not overlapped by the user's polygon |
4344 | 4344 | $final_missing = 100 - $final_overlap; |
4345 | 4345 | if ($debug > 1) { |
4346 | - error_log(__LINE__ . ' - Final missing is ' . $final_missing, 0); |
|
4346 | + error_log(__LINE__.' - Final missing is '.$final_missing, 0); |
|
4347 | 4347 | } |
4348 | 4348 | // the final excess area is the percentage of the initial polygon's size |
4349 | 4349 | // that is covered by the user's polygon outside of the initial polygon |
4350 | 4350 | $final_excess = round((((float) $poly_user_area - (float) $overlap) / (float) $poly_answer_area) * 100); |
4351 | 4351 | if ($debug > 1) { |
4352 | - error_log(__LINE__ . ' - Final excess is ' . $final_excess, 0); |
|
4352 | + error_log(__LINE__.' - Final excess is '.$final_excess, 0); |
|
4353 | 4353 | } |
4354 | 4354 | } |
4355 | 4355 | |
4356 | 4356 | //checking the destination parameters parsing the "@@" |
4357 | - $destination_items= explode('@@', $answerDestination); |
|
4357 | + $destination_items = explode('@@', $answerDestination); |
|
4358 | 4358 | $threadhold_total = $destination_items[0]; |
4359 | - $threadhold_items=explode(';',$threadhold_total); |
|
4359 | + $threadhold_items = explode(';', $threadhold_total); |
|
4360 | 4360 | $threadhold1 = $threadhold_items[0]; // overlap |
4361 | 4361 | $threadhold2 = $threadhold_items[1]; // excess |
4362 | - $threadhold3 = $threadhold_items[2]; //missing |
|
4362 | + $threadhold3 = $threadhold_items[2]; //missing |
|
4363 | 4363 | |
4364 | 4364 | // if is delineation |
4365 | - if ($answerId===1) { |
|
4365 | + if ($answerId === 1) { |
|
4366 | 4366 | //setting colors |
4367 | - if ($final_overlap>=$threadhold1) { |
|
4368 | - $overlap_color=true; //echo 'a'; |
|
4367 | + if ($final_overlap >= $threadhold1) { |
|
4368 | + $overlap_color = true; //echo 'a'; |
|
4369 | 4369 | } |
4370 | 4370 | //echo $excess.'-'.$threadhold2; |
4371 | - if ($final_excess<=$threadhold2) { |
|
4372 | - $excess_color=true; //echo 'b'; |
|
4371 | + if ($final_excess <= $threadhold2) { |
|
4372 | + $excess_color = true; //echo 'b'; |
|
4373 | 4373 | } |
4374 | 4374 | //echo '--------'.$missing.'-'.$threadhold3; |
4375 | - if ($final_missing<=$threadhold3) { |
|
4376 | - $missing_color=true; //echo 'c'; |
|
4375 | + if ($final_missing <= $threadhold3) { |
|
4376 | + $missing_color = true; //echo 'c'; |
|
4377 | 4377 | } |
4378 | 4378 | |
4379 | 4379 | // if pass |
@@ -4382,67 +4382,67 @@ discard block |
||
4382 | 4382 | $final_missing <= $threadhold3 && |
4383 | 4383 | $final_excess <= $threadhold2 |
4384 | 4384 | ) { |
4385 | - $next=1; //go to the oars |
|
4386 | - $result_comment=get_lang('Acceptable'); |
|
4387 | - $final_answer = 1; // do not update with update_exercise_attempt |
|
4385 | + $next = 1; //go to the oars |
|
4386 | + $result_comment = get_lang('Acceptable'); |
|
4387 | + $final_answer = 1; // do not update with update_exercise_attempt |
|
4388 | 4388 | } else { |
4389 | - $next=0; |
|
4390 | - $result_comment=get_lang('Unacceptable'); |
|
4391 | - $comment=$answerDestination=$objAnswerTmp->selectComment(1); |
|
4392 | - $answerDestination=$objAnswerTmp->selectDestination(1); |
|
4389 | + $next = 0; |
|
4390 | + $result_comment = get_lang('Unacceptable'); |
|
4391 | + $comment = $answerDestination = $objAnswerTmp->selectComment(1); |
|
4392 | + $answerDestination = $objAnswerTmp->selectDestination(1); |
|
4393 | 4393 | //checking the destination parameters parsing the "@@" |
4394 | - $destination_items= explode('@@', $answerDestination); |
|
4394 | + $destination_items = explode('@@', $answerDestination); |
|
4395 | 4395 | } |
4396 | - } elseif($answerId>1) { |
|
4396 | + } elseif ($answerId > 1) { |
|
4397 | 4397 | if ($objAnswerTmp->selectHotspotType($answerId) == 'noerror') { |
4398 | - if ($debug>0) { |
|
4399 | - error_log(__LINE__.' - answerId is of type noerror',0); |
|
4398 | + if ($debug > 0) { |
|
4399 | + error_log(__LINE__.' - answerId is of type noerror', 0); |
|
4400 | 4400 | } |
4401 | 4401 | //type no error shouldn't be treated |
4402 | 4402 | $next = 1; |
4403 | 4403 | continue; |
4404 | 4404 | } |
4405 | - if ($debug>0) { |
|
4406 | - error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR',0); |
|
4405 | + if ($debug > 0) { |
|
4406 | + error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR', 0); |
|
4407 | 4407 | } |
4408 | 4408 | //check the intersection between the oar and the user |
4409 | 4409 | //echo 'user'; print_r($x_user_list); print_r($y_user_list); |
4410 | 4410 | //echo 'official';print_r($x_list);print_r($y_list); |
4411 | 4411 | //$result = get_intersection_data($x_list,$y_list,$x_user_list,$y_user_list); |
4412 | - $inter= $result['success']; |
|
4412 | + $inter = $result['success']; |
|
4413 | 4413 | |
4414 | 4414 | //$delineation_cord=$objAnswerTmp->selectHotspotCoordinates($answerId); |
4415 | - $delineation_cord=$objAnswerTmp->selectHotspotCoordinates($answerId); |
|
4415 | + $delineation_cord = $objAnswerTmp->selectHotspotCoordinates($answerId); |
|
4416 | 4416 | |
4417 | - $poly_answer = convert_coordinates($delineation_cord,'|'); |
|
4418 | - $max_coord = poly_get_max($poly_user,$poly_answer); |
|
4419 | - $poly_answer_compiled = poly_compile($poly_answer,$max_coord); |
|
4420 | - $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled,$max_coord); |
|
4417 | + $poly_answer = convert_coordinates($delineation_cord, '|'); |
|
4418 | + $max_coord = poly_get_max($poly_user, $poly_answer); |
|
4419 | + $poly_answer_compiled = poly_compile($poly_answer, $max_coord); |
|
4420 | + $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled, $max_coord); |
|
4421 | 4421 | |
4422 | 4422 | if ($overlap == false) { |
4423 | 4423 | //all good, no overlap |
4424 | 4424 | $next = 1; |
4425 | 4425 | continue; |
4426 | 4426 | } else { |
4427 | - if ($debug>0) { |
|
4428 | - error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit',0); |
|
4427 | + if ($debug > 0) { |
|
4428 | + error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit', 0); |
|
4429 | 4429 | } |
4430 | 4430 | $organs_at_risk_hit++; |
4431 | 4431 | //show the feedback |
4432 | - $next=0; |
|
4433 | - $comment=$answerDestination=$objAnswerTmp->selectComment($answerId); |
|
4434 | - $answerDestination=$objAnswerTmp->selectDestination($answerId); |
|
4435 | - |
|
4436 | - $destination_items= explode('@@', $answerDestination); |
|
4437 | - $try_hotspot=$destination_items[1]; |
|
4438 | - $lp_hotspot=$destination_items[2]; |
|
4439 | - $select_question_hotspot=$destination_items[3]; |
|
4440 | - $url_hotspot=$destination_items[4]; |
|
4432 | + $next = 0; |
|
4433 | + $comment = $answerDestination = $objAnswerTmp->selectComment($answerId); |
|
4434 | + $answerDestination = $objAnswerTmp->selectDestination($answerId); |
|
4435 | + |
|
4436 | + $destination_items = explode('@@', $answerDestination); |
|
4437 | + $try_hotspot = $destination_items[1]; |
|
4438 | + $lp_hotspot = $destination_items[2]; |
|
4439 | + $select_question_hotspot = $destination_items[3]; |
|
4440 | + $url_hotspot = $destination_items[4]; |
|
4441 | 4441 | } |
4442 | 4442 | } |
4443 | 4443 | } else { // the first delineation feedback |
4444 | - if ($debug>0) { |
|
4445 | - error_log(__LINE__.' first',0); |
|
4444 | + if ($debug > 0) { |
|
4445 | + error_log(__LINE__.' first', 0); |
|
4446 | 4446 | } |
4447 | 4447 | } |
4448 | 4448 | } elseif (in_array($answerType, [MATCHING, MATCHING_DRAGGABLE])) { |
@@ -4450,7 +4450,7 @@ discard block |
||
4450 | 4450 | echo Display::tag('td', $answerMatching[$answerId]); |
4451 | 4451 | echo Display::tag( |
4452 | 4452 | 'td', |
4453 | - "$user_answer / " . Display::tag( |
|
4453 | + "$user_answer / ".Display::tag( |
|
4454 | 4454 | 'strong', |
4455 | 4455 | $answerMatching[$answerCorrect], |
4456 | 4456 | ['style' => 'color: #008000; font-weight: bold;'] |
@@ -4590,7 +4590,7 @@ discard block |
||
4590 | 4590 | $exeId, |
4591 | 4591 | $questionId, |
4592 | 4592 | $nano |
4593 | - ) . '</td> |
|
4593 | + ).'</td> |
|
4594 | 4594 | </tr> |
4595 | 4595 | </table>'; |
4596 | 4596 | break; |
@@ -4649,7 +4649,7 @@ discard block |
||
4649 | 4649 | |
4650 | 4650 | //$overlap = round(polygons_overlap($poly_answer,$poly_user)); //this is an area in pixels |
4651 | 4651 | if ($debug > 0) { |
4652 | - error_log(__LINE__ . ' - Polygons results are ' . print_r($poly_results, 1), 0); |
|
4652 | + error_log(__LINE__.' - Polygons results are '.print_r($poly_results, 1), 0); |
|
4653 | 4653 | } |
4654 | 4654 | if ($overlap < 1) { |
4655 | 4655 | //shortcut to avoid complicated calculations |
@@ -4660,17 +4660,17 @@ discard block |
||
4660 | 4660 | // the final overlap is the percentage of the initial polygon that is overlapped by the user's polygon |
4661 | 4661 | $final_overlap = round(((float) $overlap / (float) $poly_answer_area) * 100); |
4662 | 4662 | if ($debug > 1) { |
4663 | - error_log(__LINE__ . ' - Final overlap is ' . $final_overlap, 0); |
|
4663 | + error_log(__LINE__.' - Final overlap is '.$final_overlap, 0); |
|
4664 | 4664 | } |
4665 | 4665 | // the final missing area is the percentage of the initial polygon that is not overlapped by the user's polygon |
4666 | 4666 | $final_missing = 100 - $final_overlap; |
4667 | 4667 | if ($debug > 1) { |
4668 | - error_log(__LINE__ . ' - Final missing is ' . $final_missing, 0); |
|
4668 | + error_log(__LINE__.' - Final missing is '.$final_missing, 0); |
|
4669 | 4669 | } |
4670 | 4670 | // the final excess area is the percentage of the initial polygon's size that is covered by the user's polygon outside of the initial polygon |
4671 | 4671 | $final_excess = round((((float) $poly_user_area - (float) $overlap) / (float) $poly_answer_area) * 100); |
4672 | 4672 | if ($debug > 1) { |
4673 | - error_log(__LINE__ . ' - Final excess is ' . $final_excess, 0); |
|
4673 | + error_log(__LINE__.' - Final excess is '.$final_excess, 0); |
|
4674 | 4674 | } |
4675 | 4675 | } |
4676 | 4676 | |
@@ -4680,7 +4680,7 @@ discard block |
||
4680 | 4680 | $threadhold_items = explode(';', $threadhold_total); |
4681 | 4681 | $threadhold1 = $threadhold_items[0]; // overlap |
4682 | 4682 | $threadhold2 = $threadhold_items[1]; // excess |
4683 | - $threadhold3 = $threadhold_items[2]; //missing |
|
4683 | + $threadhold3 = $threadhold_items[2]; //missing |
|
4684 | 4684 | // if is delineation |
4685 | 4685 | if ($answerId === 1) { |
4686 | 4686 | //setting colors |
@@ -4712,14 +4712,14 @@ discard block |
||
4712 | 4712 | } elseif ($answerId > 1) { |
4713 | 4713 | if ($objAnswerTmp->selectHotspotType($answerId) == 'noerror') { |
4714 | 4714 | if ($debug > 0) { |
4715 | - error_log(__LINE__ . ' - answerId is of type noerror', 0); |
|
4715 | + error_log(__LINE__.' - answerId is of type noerror', 0); |
|
4716 | 4716 | } |
4717 | 4717 | //type no error shouldn't be treated |
4718 | 4718 | $next = 1; |
4719 | 4719 | continue; |
4720 | 4720 | } |
4721 | 4721 | if ($debug > 0) { |
4722 | - error_log(__LINE__ . ' - answerId is >1 so we\'re probably in OAR', 0); |
|
4722 | + error_log(__LINE__.' - answerId is >1 so we\'re probably in OAR', 0); |
|
4723 | 4723 | } |
4724 | 4724 | //check the intersection between the oar and the user |
4725 | 4725 | //echo 'user'; print_r($x_user_list); print_r($y_user_list); |
@@ -4733,7 +4733,7 @@ discard block |
||
4733 | 4733 | $poly_answer = convert_coordinates($delineation_cord, '|'); |
4734 | 4734 | $max_coord = poly_get_max($poly_user, $poly_answer); |
4735 | 4735 | $poly_answer_compiled = poly_compile($poly_answer, $max_coord); |
4736 | - $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled,$max_coord); |
|
4736 | + $overlap = poly_touch($poly_user_compiled, $poly_answer_compiled, $max_coord); |
|
4737 | 4737 | |
4738 | 4738 | if ($overlap == false) { |
4739 | 4739 | //all good, no overlap |
@@ -4741,7 +4741,7 @@ discard block |
||
4741 | 4741 | continue; |
4742 | 4742 | } else { |
4743 | 4743 | if ($debug > 0) { |
4744 | - error_log(__LINE__ . ' - Overlap is ' . $overlap . ': OAR hit', 0); |
|
4744 | + error_log(__LINE__.' - Overlap is '.$overlap.': OAR hit', 0); |
|
4745 | 4745 | } |
4746 | 4746 | $organs_at_risk_hit++; |
4747 | 4747 | //show the feedback |
@@ -4753,12 +4753,12 @@ discard block |
||
4753 | 4753 | $try_hotspot = $destination_items[1]; |
4754 | 4754 | $lp_hotspot = $destination_items[2]; |
4755 | 4755 | $select_question_hotspot = $destination_items[3]; |
4756 | - $url_hotspot=$destination_items[4]; |
|
4756 | + $url_hotspot = $destination_items[4]; |
|
4757 | 4757 | } |
4758 | 4758 | } |
4759 | 4759 | } else { // the first delineation feedback |
4760 | 4760 | if ($debug > 0) { |
4761 | - error_log(__LINE__ . ' first', 0); |
|
4761 | + error_log(__LINE__.' first', 0); |
|
4762 | 4762 | } |
4763 | 4763 | } |
4764 | 4764 | break; |
@@ -4780,7 +4780,7 @@ discard block |
||
4780 | 4780 | echo Display::tag('td', $answerMatching[$answerId]); |
4781 | 4781 | echo Display::tag( |
4782 | 4782 | 'td', |
4783 | - "$user_answer / " . Display::tag( |
|
4783 | + "$user_answer / ".Display::tag( |
|
4784 | 4784 | 'strong', |
4785 | 4785 | $answerMatching[$answerCorrect], |
4786 | 4786 | ['style' => 'color: #008000; font-weight: bold;'] |
@@ -4866,7 +4866,7 @@ discard block |
||
4866 | 4866 | // we use the results from the session (from_db=0) |
4867 | 4867 | // TODO Change this, because it is wrong to show the user |
4868 | 4868 | // some results that haven't been stored in the database yet |
4869 | - if ($answerType == HOT_SPOT || $answerType == HOT_SPOT_ORDER || $answerType == HOT_SPOT_DELINEATION ) { |
|
4869 | + if ($answerType == HOT_SPOT || $answerType == HOT_SPOT_ORDER || $answerType == HOT_SPOT_DELINEATION) { |
|
4870 | 4870 | |
4871 | 4871 | if ($debug) error_log('$from AND this is a hotspot kind of question '); |
4872 | 4872 | |
@@ -4875,19 +4875,19 @@ discard block |
||
4875 | 4875 | if ($answerType == HOT_SPOT_DELINEATION) { |
4876 | 4876 | if (0) { |
4877 | 4877 | if ($overlap_color) { |
4878 | - $overlap_color='green'; |
|
4878 | + $overlap_color = 'green'; |
|
4879 | 4879 | } else { |
4880 | - $overlap_color='red'; |
|
4880 | + $overlap_color = 'red'; |
|
4881 | 4881 | } |
4882 | 4882 | if ($missing_color) { |
4883 | - $missing_color='green'; |
|
4883 | + $missing_color = 'green'; |
|
4884 | 4884 | } else { |
4885 | - $missing_color='red'; |
|
4885 | + $missing_color = 'red'; |
|
4886 | 4886 | } |
4887 | 4887 | if ($excess_color) { |
4888 | - $excess_color='green'; |
|
4888 | + $excess_color = 'green'; |
|
4889 | 4889 | } else { |
4890 | - $excess_color='red'; |
|
4890 | + $excess_color = 'red'; |
|
4891 | 4891 | } |
4892 | 4892 | if (!is_numeric($final_overlap)) { |
4893 | 4893 | $final_overlap = 0; |
@@ -4899,33 +4899,33 @@ discard block |
||
4899 | 4899 | $final_excess = 0; |
4900 | 4900 | } |
4901 | 4901 | |
4902 | - if ($final_overlap>100) { |
|
4902 | + if ($final_overlap > 100) { |
|
4903 | 4903 | $final_overlap = 100; |
4904 | 4904 | } |
4905 | 4905 | |
4906 | - $table_resume='<table class="data_table"> |
|
4906 | + $table_resume = '<table class="data_table"> |
|
4907 | 4907 | <tr class="row_odd" > |
4908 | 4908 | <td></td> |
4909 | - <td ><b>' . get_lang('Requirements') . '</b></td> |
|
4910 | - <td><b>' . get_lang('YourAnswer') . '</b></td> |
|
4909 | + <td ><b>' . get_lang('Requirements').'</b></td> |
|
4910 | + <td><b>' . get_lang('YourAnswer').'</b></td> |
|
4911 | 4911 | </tr> |
4912 | 4912 | <tr class="row_even"> |
4913 | - <td><b>' . get_lang('Overlap') . '</b></td> |
|
4914 | - <td>' . get_lang('Min') . ' ' . $threadhold1 . '</td> |
|
4915 | - <td><div style="color:' . $overlap_color . '">' |
|
4916 | - . (($final_overlap < 0) ? 0 : intval($final_overlap)) . '</div></td> |
|
4913 | + <td><b>' . get_lang('Overlap').'</b></td> |
|
4914 | + <td>' . get_lang('Min').' '.$threadhold1.'</td> |
|
4915 | + <td><div style="color:' . $overlap_color.'">' |
|
4916 | + . (($final_overlap < 0) ? 0 : intval($final_overlap)).'</div></td> |
|
4917 | 4917 | </tr> |
4918 | 4918 | <tr> |
4919 | - <td><b>' . get_lang('Excess') . '</b></td> |
|
4920 | - <td>' . get_lang('Max') . ' ' . $threadhold2 . '</td> |
|
4921 | - <td><div style="color:' . $excess_color . '">' |
|
4922 | - . (($final_excess < 0) ? 0 : intval($final_excess)) . '</div></td> |
|
4919 | + <td><b>' . get_lang('Excess').'</b></td> |
|
4920 | + <td>' . get_lang('Max').' '.$threadhold2.'</td> |
|
4921 | + <td><div style="color:' . $excess_color.'">' |
|
4922 | + . (($final_excess < 0) ? 0 : intval($final_excess)).'</div></td> |
|
4923 | 4923 | </tr> |
4924 | 4924 | <tr class="row_even"> |
4925 | - <td><b>' . get_lang('Missing') . '</b></td> |
|
4926 | - <td>' . get_lang('Max') . ' ' . $threadhold3 . '</td> |
|
4927 | - <td><div style="color:' . $missing_color . '">' |
|
4928 | - . (($final_missing < 0) ? 0 : intval($final_missing)) . '</div></td> |
|
4925 | + <td><b>' . get_lang('Missing').'</b></td> |
|
4926 | + <td>' . get_lang('Max').' '.$threadhold3.'</td> |
|
4927 | + <td><div style="color:' . $missing_color.'">' |
|
4928 | + . (($final_missing < 0) ? 0 : intval($final_missing)).'</div></td> |
|
4929 | 4929 | </tr> |
4930 | 4930 | </table>'; |
4931 | 4931 | if ($next == 0) { |
@@ -4940,20 +4940,20 @@ discard block |
||
4940 | 4940 | $answerDestination = $objAnswerTmp->selectDestination($nbrAnswers); |
4941 | 4941 | } |
4942 | 4942 | |
4943 | - echo '<h1><div style="color:#333;">' . get_lang('Feedback') . '</div></h1> |
|
4943 | + echo '<h1><div style="color:#333;">'.get_lang('Feedback').'</div></h1> |
|
4944 | 4944 | <p style="text-align:center">'; |
4945 | 4945 | |
4946 | - $message = '<p>' . get_lang('YourDelineation') . '</p>'; |
|
4946 | + $message = '<p>'.get_lang('YourDelineation').'</p>'; |
|
4947 | 4947 | $message .= $table_resume; |
4948 | - $message .= '<br />' . get_lang('ResultIs') . ' ' . $result_comment . '<br />'; |
|
4948 | + $message .= '<br />'.get_lang('ResultIs').' '.$result_comment.'<br />'; |
|
4949 | 4949 | if ($organs_at_risk_hit > 0) { |
4950 | - $message .= '<p><b>' . get_lang('OARHit') . '</b></p>'; |
|
4950 | + $message .= '<p><b>'.get_lang('OARHit').'</b></p>'; |
|
4951 | 4951 | } |
4952 | - $message .='<p>' . $comment . '</p>'; |
|
4952 | + $message .= '<p>'.$comment.'</p>'; |
|
4953 | 4953 | echo $message; |
4954 | 4954 | } else { |
4955 | 4955 | echo $hotspot_delineation_result[0]; //prints message |
4956 | - $from_database = 1; // the hotspot_solution.swf needs this variable |
|
4956 | + $from_database = 1; // the hotspot_solution.swf needs this variable |
|
4957 | 4957 | } |
4958 | 4958 | |
4959 | 4959 | //save the score attempts |
@@ -4975,20 +4975,20 @@ discard block |
||
4975 | 4975 | $exerciseResultCoordinates[$quesId] |
4976 | 4976 | ); |
4977 | 4977 | } else { |
4978 | - if ($final_answer==0) { |
|
4978 | + if ($final_answer == 0) { |
|
4979 | 4979 | $questionScore = 0; |
4980 | - $answer=0; |
|
4980 | + $answer = 0; |
|
4981 | 4981 | Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0); |
4982 | 4982 | if (is_array($exerciseResultCoordinates[$quesId])) { |
4983 | - foreach($exerciseResultCoordinates[$quesId] as $idx => $val) { |
|
4984 | - Event::saveExerciseAttemptHotspot($exeId,$quesId,$idx,0,$val); |
|
4983 | + foreach ($exerciseResultCoordinates[$quesId] as $idx => $val) { |
|
4984 | + Event::saveExerciseAttemptHotspot($exeId, $quesId, $idx, 0, $val); |
|
4985 | 4985 | } |
4986 | 4986 | } |
4987 | 4987 | } else { |
4988 | 4988 | Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0); |
4989 | 4989 | if (is_array($exerciseResultCoordinates[$quesId])) { |
4990 | - foreach($exerciseResultCoordinates[$quesId] as $idx => $val) { |
|
4991 | - Event::saveExerciseAttemptHotspot($exeId,$quesId,$idx,$choice[$idx],$val); |
|
4990 | + foreach ($exerciseResultCoordinates[$quesId] as $idx => $val) { |
|
4991 | + Event::saveExerciseAttemptHotspot($exeId, $quesId, $idx, $choice[$idx], $val); |
|
4992 | 4992 | } |
4993 | 4993 | } |
4994 | 4994 | } |
@@ -5007,7 +5007,7 @@ discard block |
||
5007 | 5007 | echo " |
5008 | 5008 | <tr> |
5009 | 5009 | <td colspan=\"2\"> |
5010 | - <p><em>" . get_lang('HotSpot') . "</em></p> |
|
5010 | + <p><em>" . get_lang('HotSpot')."</em></p> |
|
5011 | 5011 | |
5012 | 5012 | <div id=\"hotspot-solution-$questionId\"></div> |
5013 | 5013 | |
@@ -5045,7 +5045,7 @@ discard block |
||
5045 | 5045 | |
5046 | 5046 | if ($saved_results) { |
5047 | 5047 | if ($debug) error_log("Save question results $saved_results"); |
5048 | - if ($debug) error_log(print_r($choice ,1 )); |
|
5048 | + if ($debug) error_log(print_r($choice, 1)); |
|
5049 | 5049 | |
5050 | 5050 | if (empty($choice)) { |
5051 | 5051 | $choice = 0; |
@@ -5057,14 +5057,14 @@ discard block |
||
5057 | 5057 | $ans = $reply[$i]; |
5058 | 5058 | Event::saveQuestionAttempt( |
5059 | 5059 | $questionScore, |
5060 | - $ans . ':' . $choice[$ans], |
|
5060 | + $ans.':'.$choice[$ans], |
|
5061 | 5061 | $quesId, |
5062 | 5062 | $exeId, |
5063 | 5063 | $i, |
5064 | 5064 | $this->id |
5065 | 5065 | ); |
5066 | 5066 | if ($debug) { |
5067 | - error_log('result =>' . $questionScore . ' ' . $ans . ':' . $choice[$ans]); |
|
5067 | + error_log('result =>'.$questionScore.' '.$ans.':'.$choice[$ans]); |
|
5068 | 5068 | } |
5069 | 5069 | } |
5070 | 5070 | } else { |
@@ -5075,7 +5075,7 @@ discard block |
||
5075 | 5075 | $reply = array_keys($choice); |
5076 | 5076 | |
5077 | 5077 | if ($debug) { |
5078 | - error_log("reply " . print_r($reply, 1) . ""); |
|
5078 | + error_log("reply ".print_r($reply, 1).""); |
|
5079 | 5079 | } |
5080 | 5080 | for ($i = 0; $i < sizeof($reply); $i++) { |
5081 | 5081 | $ans = $reply[$i]; |
@@ -5134,7 +5134,7 @@ discard block |
||
5134 | 5134 | |
5135 | 5135 | Event::saveQuestionAttempt($questionScore, implode('|', $answer), $quesId, $exeId, 0, $this->id); |
5136 | 5136 | } else { |
5137 | - Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0,$this->id); |
|
5137 | + Event::saveQuestionAttempt($questionScore, $answer, $quesId, $exeId, 0, $this->id); |
|
5138 | 5138 | } |
5139 | 5139 | } |
5140 | 5140 | |
@@ -5144,8 +5144,8 @@ discard block |
||
5144 | 5144 | |
5145 | 5145 | if ($saved_results) { |
5146 | 5146 | $stat_table = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES); |
5147 | - $sql = 'UPDATE ' . $stat_table . ' SET |
|
5148 | - exe_result = exe_result + ' . floatval($questionScore) . ' |
|
5147 | + $sql = 'UPDATE '.$stat_table.' SET |
|
5148 | + exe_result = exe_result + ' . floatval($questionScore).' |
|
5149 | 5149 | WHERE exe_id = ' . $exeId; |
5150 | 5150 | if ($debug) error_log($sql); |
5151 | 5151 | Database::query($sql); |
@@ -5169,7 +5169,7 @@ discard block |
||
5169 | 5169 | */ |
5170 | 5170 | public function send_mail_notification_for_exam($question_list_answers, $origin, $exe_id) |
5171 | 5171 | { |
5172 | - if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) { |
|
5172 | + if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1) { |
|
5173 | 5173 | return null; |
5174 | 5174 | } |
5175 | 5175 | // Email configuration settings |
@@ -5220,7 +5220,7 @@ discard block |
||
5220 | 5220 | $msg = str_replace("#course#", $courseInfo['name'], $msg1); |
5221 | 5221 | |
5222 | 5222 | if ($origin != 'learnpath') { |
5223 | - $msg.= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>'; |
|
5223 | + $msg .= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>'; |
|
5224 | 5224 | } |
5225 | 5225 | $msg1 = str_replace("#url#", $url_email, $msg); |
5226 | 5226 | $mail_content = $msg1; |
@@ -5249,7 +5249,7 @@ discard block |
||
5249 | 5249 | */ |
5250 | 5250 | function send_notification_for_open_questions($question_list_answers, $origin, $exe_id) |
5251 | 5251 | { |
5252 | - if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) { |
|
5252 | + if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1) { |
|
5253 | 5253 | return null; |
5254 | 5254 | } |
5255 | 5255 | // Email configuration settings |
@@ -5312,11 +5312,11 @@ discard block |
||
5312 | 5312 | $msg .= '</table><br />'; |
5313 | 5313 | |
5314 | 5314 | |
5315 | - $msg1 = str_replace("#exercise#", $this->exercise, $msg); |
|
5316 | - $msg = str_replace("#firstName#", $user_info['firstname'],$msg1); |
|
5317 | - $msg1 = str_replace("#lastName#", $user_info['lastname'],$msg); |
|
5318 | - $msg = str_replace("#mail#", $user_info['email'],$msg1); |
|
5319 | - $msg = str_replace("#course#", $course_info['name'],$msg1); |
|
5315 | + $msg1 = str_replace("#exercise#", $this->exercise, $msg); |
|
5316 | + $msg = str_replace("#firstName#", $user_info['firstname'], $msg1); |
|
5317 | + $msg1 = str_replace("#lastName#", $user_info['lastname'], $msg); |
|
5318 | + $msg = str_replace("#mail#", $user_info['email'], $msg1); |
|
5319 | + $msg = str_replace("#course#", $course_info['name'], $msg1); |
|
5320 | 5320 | |
5321 | 5321 | if ($origin != 'learnpath') { |
5322 | 5322 | $msg .= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>'; |
@@ -5345,7 +5345,7 @@ discard block |
||
5345 | 5345 | |
5346 | 5346 | function send_notification_for_oral_questions($question_list_answers, $origin, $exe_id) |
5347 | 5347 | { |
5348 | - if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) { |
|
5348 | + if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1) { |
|
5349 | 5349 | return null; |
5350 | 5350 | } |
5351 | 5351 | // Email configuration settings |
@@ -5369,7 +5369,7 @@ discard block |
||
5369 | 5369 | $answer_type = $item['answer_type']; |
5370 | 5370 | |
5371 | 5371 | if (!empty($question) && !empty($answer) && $answer_type == ORAL_EXPRESSION) { |
5372 | - $oral_question_list.='<br /><table width="730" height="136" border="0" cellpadding="3" cellspacing="3">' |
|
5372 | + $oral_question_list .= '<br /><table width="730" height="136" border="0" cellpadding="3" cellspacing="3">' |
|
5373 | 5373 | .'<tr>' |
5374 | 5374 | .'<td width="220" valign="top" bgcolor="#E5EDF8"> '.get_lang('Question').'</td>' |
5375 | 5375 | .'<td width="473" valign="top" bgcolor="#F3F3F3">'.$question.'</td>' |
@@ -5402,7 +5402,7 @@ discard block |
||
5402 | 5402 | .'<td> #mail#</td>' |
5403 | 5403 | .'</tr>' |
5404 | 5404 | .'</table>'; |
5405 | - $msg .= '<br />'.sprintf(get_lang('OralQuestionsAttemptedAreX'),$oral_question_list).'<br />'; |
|
5405 | + $msg .= '<br />'.sprintf(get_lang('OralQuestionsAttemptedAreX'), $oral_question_list).'<br />'; |
|
5406 | 5406 | $msg1 = str_replace("#exercise#", $this->exercise, $msg); |
5407 | 5407 | $msg = str_replace("#firstName#", $user_info['firstname'], $msg1); |
5408 | 5408 | $msg1 = str_replace("#lastName#", $user_info['lastname'], $msg); |
@@ -5410,7 +5410,7 @@ discard block |
||
5410 | 5410 | $msg = str_replace("#course#", $course_info['name'], $msg1); |
5411 | 5411 | |
5412 | 5412 | if ($origin != 'learnpath') { |
5413 | - $msg.= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>'; |
|
5413 | + $msg .= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>'; |
|
5414 | 5414 | } |
5415 | 5415 | $msg1 = str_replace("#url#", $url_email, $msg); |
5416 | 5416 | $mail_content = $msg1; |
@@ -5476,10 +5476,10 @@ discard block |
||
5476 | 5476 | } |
5477 | 5477 | $html = '<div class="question-result">'; |
5478 | 5478 | $html .= Display::page_header( |
5479 | - Display::return_icon('test-quiz.png', get_lang('Result'),null, ICON_SIZE_MEDIUM).' '.$this->exercise.' : '.get_lang('Result') |
|
5479 | + Display::return_icon('test-quiz.png', get_lang('Result'), null, ICON_SIZE_MEDIUM).' '.$this->exercise.' : '.get_lang('Result') |
|
5480 | 5480 | ); |
5481 | 5481 | $html .= Display::description($array); |
5482 | - $html .="</div>"; |
|
5482 | + $html .= "</div>"; |
|
5483 | 5483 | return $html; |
5484 | 5484 | } |
5485 | 5485 | |
@@ -5596,7 +5596,7 @@ discard block |
||
5596 | 5596 | false, |
5597 | 5597 | $objExercise->selectPropagateNeg() |
5598 | 5598 | ); |
5599 | - $totalScore += $question_result['score']; |
|
5599 | + $totalScore += $question_result['score']; |
|
5600 | 5600 | } |
5601 | 5601 | |
5602 | 5602 | if ($objExercise->selectPropagateNeg() == 0 && $totalScore < 0) { |
@@ -5802,7 +5802,7 @@ discard block |
||
5802 | 5802 | } |
5803 | 5803 | |
5804 | 5804 | $rawMessage = ""; |
5805 | - if (!empty($message)){ |
|
5805 | + if (!empty($message)) { |
|
5806 | 5806 | $rawMessage = $message; |
5807 | 5807 | $message = Display::return_message($message, 'warning', false); |
5808 | 5808 | } |
@@ -5818,7 +5818,7 @@ discard block |
||
5818 | 5818 | { |
5819 | 5819 | $TBL_LP_ITEM = Database::get_course_table(TABLE_LP_ITEM); |
5820 | 5820 | $sql = "SELECT max_score FROM $TBL_LP_ITEM |
5821 | - WHERE c_id = {$this->course_id} AND item_type = '" . TOOL_QUIZ . "' AND path = '{$this->id}'"; |
|
5821 | + WHERE c_id = {$this->course_id} AND item_type = '".TOOL_QUIZ."' AND path = '{$this->id}'"; |
|
5822 | 5822 | $result = Database::query($sql); |
5823 | 5823 | if (Database::num_rows($result) > 0) { |
5824 | 5824 | return true; |
@@ -6146,7 +6146,7 @@ discard block |
||
6146 | 6146 | $sql_track = "SELECT * FROM $track_exercises WHERE exe_id = $exe_id "; |
6147 | 6147 | $result = Database::query($sql_track); |
6148 | 6148 | $new_array = array(); |
6149 | - if (Database::num_rows($result) > 0 ) { |
|
6149 | + if (Database::num_rows($result) > 0) { |
|
6150 | 6150 | $new_array = Database::fetch_array($result, 'ASSOC'); |
6151 | 6151 | |
6152 | 6152 | $new_array['duration'] = null; |
@@ -6158,11 +6158,11 @@ discard block |
||
6158 | 6158 | $start_date = api_strtotime($start_date, 'UTC'); |
6159 | 6159 | $end_date = api_strtotime($end_date, 'UTC'); |
6160 | 6160 | if ($start_date && $end_date) { |
6161 | - $mytime = $end_date- $start_date; |
|
6161 | + $mytime = $end_date - $start_date; |
|
6162 | 6162 | $new_learnpath_item = new learnpathItem(null); |
6163 | 6163 | $time_attemp = $new_learnpath_item->get_scorm_time('js', $mytime); |
6164 | 6164 | $h = get_lang('h'); |
6165 | - $time_attemp = str_replace('NaN', '00' . $h . '00\'00"', $time_attemp); |
|
6165 | + $time_attemp = str_replace('NaN', '00'.$h.'00\'00"', $time_attemp); |
|
6166 | 6166 | $new_array['duration'] = $time_attemp; |
6167 | 6167 | } |
6168 | 6168 | } |
@@ -6184,7 +6184,7 @@ discard block |
||
6184 | 6184 | $result = Database::query($sql); |
6185 | 6185 | } |
6186 | 6186 | } else { |
6187 | - $remind_list = explode(',',$exercise_info['questions_to_check']); |
|
6187 | + $remind_list = explode(',', $exercise_info['questions_to_check']); |
|
6188 | 6188 | |
6189 | 6189 | $remind_list_string = ''; |
6190 | 6190 | if ($action == 'add') { |
@@ -6196,7 +6196,7 @@ discard block |
||
6196 | 6196 | } |
6197 | 6197 | $remind_list_string = implode(',', $remind_list); |
6198 | 6198 | } |
6199 | - } elseif ($action == 'delete') { |
|
6199 | + } elseif ($action == 'delete') { |
|
6200 | 6200 | if (!empty($remind_list)) { |
6201 | 6201 | if (in_array($question_id, $remind_list)) { |
6202 | 6202 | $remind_list = array_flip($remind_list); |
@@ -6438,7 +6438,7 @@ discard block |
||
6438 | 6438 | true |
6439 | 6439 | ); |
6440 | 6440 | |
6441 | - $counter += count($mediaQuestions[$questionId]) - 1 ; |
|
6441 | + $counter += count($mediaQuestions[$questionId]) - 1; |
|
6442 | 6442 | $before = count($questionList); |
6443 | 6443 | $wasMedia = true; |
6444 | 6444 | $nextValue += count($questionList); |
@@ -6517,7 +6517,7 @@ discard block |
||
6517 | 6517 | // If it was already seen, then merge the previous with |
6518 | 6518 | // the current category |
6519 | 6519 | $oldQuestionList = $newCategoryList[$rootElement]['question_list']; |
6520 | - $category['question_list'] = array_merge($oldQuestionList , $category['question_list']); |
|
6520 | + $category['question_list'] = array_merge($oldQuestionList, $category['question_list']); |
|
6521 | 6521 | $newCategoryList[$rootElement] = $category; |
6522 | 6522 | } |
6523 | 6523 | } |
@@ -6543,7 +6543,7 @@ discard block |
||
6543 | 6543 | |
6544 | 6544 | if ($useRootAsCategoryTitle) { |
6545 | 6545 | if (isset($category['parent_info'])) { |
6546 | - $categoryName = $category['parent_info']['title']; |
|
6546 | + $categoryName = $category['parent_info']['title']; |
|
6547 | 6547 | } |
6548 | 6548 | } |
6549 | 6549 | $html .= '<div class="row">'; |
@@ -6686,7 +6686,7 @@ discard block |
||
6686 | 6686 | // end foreach() |
6687 | 6687 | |
6688 | 6688 | if ($this->type == ALL_ON_ONE_PAGE) { |
6689 | - $exercise_actions = $this->show_button($questionId, $currentQuestion); |
|
6689 | + $exercise_actions = $this->show_button($questionId, $currentQuestion); |
|
6690 | 6690 | echo Display::div($exercise_actions, array('class'=>'exercise_actions')); |
6691 | 6691 | } |
6692 | 6692 | } |
@@ -6772,7 +6772,7 @@ discard block |
||
6772 | 6772 | |
6773 | 6773 | // Showing the question |
6774 | 6774 | |
6775 | - $exercise_actions = null; |
|
6775 | + $exercise_actions = null; |
|
6776 | 6776 | |
6777 | 6777 | echo '<a id="questionanchor'.$questionId.'"></a><br />'; |
6778 | 6778 | echo '<div id="question_div_'.$questionId.'" class="main_question '.$remind_highlight.'" >'; |
@@ -7040,7 +7040,7 @@ discard block |
||
7040 | 7040 | $header .= Display::tag('th', get_lang('Feedback')); |
7041 | 7041 | } |
7042 | 7042 | $s .= '<table class="data_table">'; |
7043 | - $s.= Display::tag('tr', $header, array('style' => 'text-align:left;')); |
|
7043 | + $s .= Display::tag('tr', $header, array('style' => 'text-align:left;')); |
|
7044 | 7044 | } |
7045 | 7045 | } |
7046 | 7046 | |
@@ -7140,7 +7140,7 @@ discard block |
||
7140 | 7140 | $s .= '<td>'; |
7141 | 7141 | $s .= $comment; |
7142 | 7142 | $s .= '</td>'; |
7143 | - $s .='</tr>'; |
|
7143 | + $s .= '</tr>'; |
|
7144 | 7144 | } else { |
7145 | 7145 | $s .= $answer_input; |
7146 | 7146 | } |
@@ -7154,7 +7154,7 @@ discard block |
||
7154 | 7154 | } |
7155 | 7155 | } |
7156 | 7156 | |
7157 | - $s .='<tr>'; |
|
7157 | + $s .= '<tr>'; |
|
7158 | 7158 | $s .= Display::tag('td', $answer); |
7159 | 7159 | |
7160 | 7160 | if (!empty($quiz_question_options)) { |
@@ -7181,7 +7181,7 @@ discard block |
||
7181 | 7181 | $s .= $comment; |
7182 | 7182 | $s .= '</td>'; |
7183 | 7183 | } |
7184 | - $s.='</tr>'; |
|
7184 | + $s .= '</tr>'; |
|
7185 | 7185 | } |
7186 | 7186 | |
7187 | 7187 | } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION) { |
@@ -7210,16 +7210,16 @@ discard block |
||
7210 | 7210 | $answer_input .= '</label>'; |
7211 | 7211 | |
7212 | 7212 | if ($show_comment) { |
7213 | - $s.= '<tr>'; |
|
7213 | + $s .= '<tr>'; |
|
7214 | 7214 | $s .= '<td>'; |
7215 | - $s.= $answer_input; |
|
7215 | + $s .= $answer_input; |
|
7216 | 7216 | $s .= '</td>'; |
7217 | 7217 | $s .= '<td>'; |
7218 | 7218 | $s .= $comment; |
7219 | 7219 | $s .= '</td>'; |
7220 | - $s.= '</tr>'; |
|
7220 | + $s .= '</tr>'; |
|
7221 | 7221 | } else { |
7222 | - $s.= $answer_input; |
|
7222 | + $s .= $answer_input; |
|
7223 | 7223 | } |
7224 | 7224 | } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE) { |
7225 | 7225 | $s .= '<input type="hidden" name="choice2['.$questionId.']" value="0" />'; |
@@ -7232,7 +7232,7 @@ discard block |
||
7232 | 7232 | } |
7233 | 7233 | } |
7234 | 7234 | $answer = Security::remove_XSS($answer); |
7235 | - $s .='<tr>'; |
|
7235 | + $s .= '<tr>'; |
|
7236 | 7236 | $s .= Display::tag('td', $answer); |
7237 | 7237 | |
7238 | 7238 | foreach ($objQuestionTmp->options as $key => $item) { |
@@ -7256,7 +7256,7 @@ discard block |
||
7256 | 7256 | $s .= $comment; |
7257 | 7257 | $s .= '</td>'; |
7258 | 7258 | } |
7259 | - $s.='</tr>'; |
|
7259 | + $s .= '</tr>'; |
|
7260 | 7260 | } elseif ($answerType == FILL_IN_BLANKS) { |
7261 | 7261 | list($answer) = explode('::', $answer); |
7262 | 7262 | |
@@ -7290,7 +7290,7 @@ discard block |
||
7290 | 7290 | $value = str_replace(' ', '', trim($value[0])); |
7291 | 7291 | } |
7292 | 7292 | $correct_item = preg_quote($correct_item); |
7293 | - $correct_item = api_preg_replace('|/|', '\/', $correct_item); // to prevent error if there is a / in the text to find |
|
7293 | + $correct_item = api_preg_replace('|/|', '\/', $correct_item); // to prevent error if there is a / in the text to find |
|
7294 | 7294 | $answer = api_preg_replace('/'.$correct_item.'/', Display::input('text', "choice[$questionId][]", $value), $answer, 1); |
7295 | 7295 | } |
7296 | 7296 | $i++; |
@@ -7347,7 +7347,7 @@ discard block |
||
7347 | 7347 | } |
7348 | 7348 | |
7349 | 7349 | if (!empty($answerCorrect) && !empty($selectedValue)) { |
7350 | - $s.= '<script> |
|
7350 | + $s .= '<script> |
|
7351 | 7351 | jsPlumb.ready(function() { |
7352 | 7352 | jsPlumb.connect({ |
7353 | 7353 | source: "window_'.$windowId.'", |
@@ -7362,14 +7362,14 @@ discard block |
||
7362 | 7362 | } |
7363 | 7363 | $s .= '</select></div></td>'; |
7364 | 7364 | |
7365 | - $s.='<td width="45%" valign="top" >'; |
|
7365 | + $s .= '<td width="45%" valign="top" >'; |
|
7366 | 7366 | |
7367 | 7367 | if (isset($select_items[$lines_count])) { |
7368 | - $s.= '<div id="window_'.$windowId.'_answer" class="window window_right_question"> |
|
7368 | + $s .= '<div id="window_'.$windowId.'_answer" class="window window_right_question"> |
|
7369 | 7369 | <b>'.$select_items[$lines_count]['letter'].'.</b> '.$select_items[$lines_count]['answer'].' |
7370 | 7370 | </div>'; |
7371 | 7371 | } else { |
7372 | - $s.=' '; |
|
7372 | + $s .= ' '; |
|
7373 | 7373 | } |
7374 | 7374 | |
7375 | 7375 | $s .= '</td>'; |
@@ -7383,16 +7383,16 @@ discard block |
||
7383 | 7383 | $s .= '<tr> |
7384 | 7384 | <td colspan="2"></td> |
7385 | 7385 | <td valign="top">'; |
7386 | - $s.='<b>'.$select_items[$lines_count]['letter'].'.</b>'; |
|
7386 | + $s .= '<b>'.$select_items[$lines_count]['letter'].'.</b>'; |
|
7387 | 7387 | $s .= $select_items[$lines_count]['answer']; |
7388 | - $s.="</td> |
|
7388 | + $s .= "</td> |
|
7389 | 7389 | </tr>"; |
7390 | 7390 | $lines_count++; |
7391 | 7391 | } // end while() |
7392 | 7392 | } // end if() |
7393 | 7393 | $matching_correct_answer++; |
7394 | 7394 | } |
7395 | - } elseif ($answerType == DRAGGABLE) { |
|
7395 | + } elseif ($answerType == DRAGGABLE) { |
|
7396 | 7396 | // matching type, showing suggestions and answers |
7397 | 7397 | // TODO: replace $answerId by $numAnswer |
7398 | 7398 | |
@@ -7435,7 +7435,7 @@ discard block |
||
7435 | 7435 | $s .= '</select>'; |
7436 | 7436 | |
7437 | 7437 | if (!empty($answerCorrect) && !empty($selectedValue)) { |
7438 | - $s.= '<script> |
|
7438 | + $s .= '<script> |
|
7439 | 7439 | $(function() { |
7440 | 7440 | deleteItem($("#'.$questionId.'_'.$selectedValue.'"), $("#drop_'.$windowId.'")); |
7441 | 7441 | }); |
@@ -7444,11 +7444,11 @@ discard block |
||
7444 | 7444 | |
7445 | 7445 | |
7446 | 7446 | if (isset($select_items[$lines_count])) { |
7447 | - $s.= '<div id="window_'.$windowId.'_answer" class=""> |
|
7447 | + $s .= '<div id="window_'.$windowId.'_answer" class=""> |
|
7448 | 7448 | <b>'.$select_items[$lines_count]['letter'].'.</b> '.$select_items[$lines_count]['answer'].' |
7449 | 7449 | </div>'; |
7450 | 7450 | } else { |
7451 | - $s.=' '; |
|
7451 | + $s .= ' '; |
|
7452 | 7452 | } |
7453 | 7453 | $lines_count++; |
7454 | 7454 | //if the left side of the "matching" has been completely |
@@ -7457,7 +7457,7 @@ discard block |
||
7457 | 7457 | if (($lines_count - 1) == $num_suggestions) { |
7458 | 7458 | // if it remains answers to shown at the right side |
7459 | 7459 | while (isset($select_items[$lines_count])) { |
7460 | - $s.='<b>'.$select_items[$lines_count]['letter'].'.</b>'; |
|
7460 | + $s .= '<b>'.$select_items[$lines_count]['letter'].'.</b>'; |
|
7461 | 7461 | $s .= $select_items[$lines_count]['answer']; |
7462 | 7462 | $lines_count++; |
7463 | 7463 | } |
@@ -7560,9 +7560,9 @@ discard block |
||
7560 | 7560 | |
7561 | 7561 | if (!$only_questions) { |
7562 | 7562 | if ($show_title) { |
7563 | - $html .= TestCategory::getCategoryNamesForQuestion($objQuestionTmp->id); |
|
7564 | - $html .= '<div class="question_title">'.$current_item.'. '.$questionName.'</div>'; |
|
7565 | - $html .= $questionDescription; |
|
7563 | + $html .= TestCategory::getCategoryNamesForQuestion($objQuestionTmp->id); |
|
7564 | + $html .= '<div class="question_title">'.$current_item.'. '.$questionName.'</div>'; |
|
7565 | + $html .= $questionDescription; |
|
7566 | 7566 | } else { |
7567 | 7567 | $html .= '<div class="media">'; |
7568 | 7568 | $html .= '<div class="pull-left">'; |
@@ -7578,11 +7578,11 @@ discard block |
||
7578 | 7578 | $html .= '</div>'; |
7579 | 7579 | } |
7580 | 7580 | //@todo I need to the get the feedback type |
7581 | - $html .= '<input type="hidden" name="hidden_hotspot_id" value="'.$questionId.'" />'; |
|
7582 | - $html .= '<table class="exercise_questions"> |
|
7581 | + $html .= '<input type="hidden" name="hidden_hotspot_id" value="'.$questionId.'" />'; |
|
7582 | + $html .= '<table class="exercise_questions"> |
|
7583 | 7583 | <tr> |
7584 | 7584 | <td valign="top" colspan="2">'; |
7585 | - $html .= '</td></tr>'; |
|
7585 | + $html .= '</td></tr>'; |
|
7586 | 7586 | } |
7587 | 7587 | |
7588 | 7588 | $canClick = isset($_GET['editQuestion']) ? '0' : (isset($_GET['modifyAnswers']) ? '0' : '1'); |
@@ -73,10 +73,10 @@ discard block |
||
73 | 73 | if ($is_allowedToEdit && $origin != 'learnpath') { |
74 | 74 | // the form |
75 | 75 | if (api_is_platform_admin() || api_is_course_admin() || api_is_course_tutor() || api_is_course_coach()) { |
76 | - $actions .= '<a id="export_opener" href="'.api_get_self().'?export_report=1&path='.Security::remove_XSS($hotpotatoes_path).' ">'.Display::return_icon('save.png', get_lang('Export'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
76 | + $actions .= '<a id="export_opener" href="'.api_get_self().'?export_report=1&path='.Security::remove_XSS($hotpotatoes_path).' ">'.Display::return_icon('save.png', get_lang('Export'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
77 | 77 | } |
78 | 78 | } else { |
79 | - $actions .= '<a href="exercise.php">' . Display :: return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
79 | + $actions .= '<a href="exercise.php">'.Display :: return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | if ($is_allowedToEdit) { |
@@ -98,13 +98,13 @@ discard block |
||
98 | 98 | |
99 | 99 | if ($is_allowedToEdit || $is_tutor) { |
100 | 100 | $nameTools = get_lang('StudentScore'); |
101 | - $interbreadcrumb[] = array("url" => "exercise.php","name" => get_lang('Exercises')); |
|
101 | + $interbreadcrumb[] = array("url" => "exercise.php", "name" => get_lang('Exercises')); |
|
102 | 102 | $objExerciseTmp = new Exercise(); |
103 | 103 | /*if ($objExerciseTmp->read($exercise_id)) { |
104 | 104 | $interbreadcrumb[] = array("url" => "admin.php?exerciseId=".$exercise_id, "name" => $objExerciseTmp->name); |
105 | 105 | }*/ |
106 | 106 | } else { |
107 | - $interbreadcrumb[] = array("url" => "exercise.php","name" => get_lang('Exercises')); |
|
107 | + $interbreadcrumb[] = array("url" => "exercise.php", "name" => get_lang('Exercises')); |
|
108 | 108 | $objExerciseTmp = new Exercise(); |
109 | 109 | /*if ($objExerciseTmp->read($exercise_id)) { |
110 | 110 | $nameTools = get_lang('Results').': '.$objExerciseTmp->name; |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | |
116 | 116 | $actions = Display::div($actions, array('class'=> 'actions')); |
117 | 117 | |
118 | -$extra = '<script type="text/javascript"> |
|
118 | +$extra = '<script type="text/javascript"> |
|
119 | 119 | $(document).ready(function() { |
120 | 120 | |
121 | 121 | $( "#dialog:ui-dialog" ).dialog( "destroy" ); |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | // Generating group list |
170 | 170 | |
171 | 171 | $group_list = GroupManager::get_group_list(); |
172 | -$group_parameters = array('group_all:'.get_lang('All'),'group_none:'.get_lang('None')); |
|
172 | +$group_parameters = array('group_all:'.get_lang('All'), 'group_none:'.get_lang('None')); |
|
173 | 173 | |
174 | 174 | foreach ($group_list as $group) { |
175 | 175 | $group_parameters[] = $group['id'].':'.$group['name']; |
@@ -192,14 +192,14 @@ discard block |
||
192 | 192 | |
193 | 193 | // Column config |
194 | 194 | // @todo fix search firstname/lastname that doesn't work. rmove search for the moment |
195 | - $column_model = array( |
|
196 | - array('name'=>'firstname', 'index'=>'firstname', 'width'=>'50', 'align'=>'left', 'search' => 'false'), |
|
197 | - array('name'=>'lastname', 'index'=>'lastname', 'width'=>'50', 'align'=>'left', 'formatter'=>'action_formatter', 'search' => 'false'), |
|
198 | - array('name'=>'login', 'hidden'=>'true', 'index'=>'username', 'width'=>'40', 'align'=>'left', 'search' => 'false'), |
|
199 | - array('name'=>'group_name', 'index'=>'group_id', 'width'=>'40', 'align'=>'left', 'search' => 'false'), |
|
200 | - array('name'=>'exe_date', 'index'=>'exe_date', 'width'=>'60', 'align'=>'left', 'search' => 'false'), |
|
201 | - array('name'=>'score', 'index'=>'exe_result', 'width'=>'50', 'align'=>'left', 'search' => 'false'), |
|
202 | - array('name'=>'actions', 'index'=>'actions', 'width'=>'60', 'align'=>'left', 'search' => 'false') |
|
195 | + $column_model = array( |
|
196 | + array('name'=>'firstname', 'index'=>'firstname', 'width'=>'50', 'align'=>'left', 'search' => 'false'), |
|
197 | + array('name'=>'lastname', 'index'=>'lastname', 'width'=>'50', 'align'=>'left', 'formatter'=>'action_formatter', 'search' => 'false'), |
|
198 | + array('name'=>'login', 'hidden'=>'true', 'index'=>'username', 'width'=>'40', 'align'=>'left', 'search' => 'false'), |
|
199 | + array('name'=>'group_name', 'index'=>'group_id', 'width'=>'40', 'align'=>'left', 'search' => 'false'), |
|
200 | + array('name'=>'exe_date', 'index'=>'exe_date', 'width'=>'60', 'align'=>'left', 'search' => 'false'), |
|
201 | + array('name'=>'score', 'index'=>'exe_result', 'width'=>'50', 'align'=>'left', 'search' => 'false'), |
|
202 | + array('name'=>'actions', 'index'=>'actions', 'width'=>'60', 'align'=>'left', 'search' => 'false') |
|
203 | 203 | ); |
204 | 204 | |
205 | 205 | $action_links = ' |
@@ -222,10 +222,10 @@ discard block |
||
222 | 222 | |
223 | 223 | //Column config |
224 | 224 | // @todo fix search firstname/lastname that doesn't work. rmove search for the moment |
225 | - $column_model = array( |
|
226 | - array('name'=>'exe_date', 'index'=>'exe_date', 'width'=>'60', 'align'=>'left', 'search' => 'false'), |
|
227 | - array('name'=>'score', 'index'=>'exe_result', 'width'=>'50', 'align'=>'left', 'search' => 'false'), |
|
228 | - array('name'=>'actions', 'index'=>'actions', 'width'=>'60', 'align'=>'left', 'search' => 'false') |
|
225 | + $column_model = array( |
|
226 | + array('name'=>'exe_date', 'index'=>'exe_date', 'width'=>'60', 'align'=>'left', 'search' => 'false'), |
|
227 | + array('name'=>'score', 'index'=>'exe_result', 'width'=>'50', 'align'=>'left', 'search' => 'false'), |
|
228 | + array('name'=>'actions', 'index'=>'actions', 'width'=>'60', 'align'=>'left', 'search' => 'false') |
|
229 | 229 | ); |
230 | 230 | } |
231 | 231 |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | } |
46 | 46 | |
47 | 47 | if (!$is_allowedToEdit) { |
48 | - // api_not_allowed(); |
|
48 | + // api_not_allowed(); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | if (!empty($_REQUEST['path'])) { |
@@ -190,9 +190,9 @@ discard block |
||
190 | 190 | get_lang('Actions') |
191 | 191 | ); |
192 | 192 | |
193 | - // Column config |
|
194 | - // @todo fix search firstname/lastname that doesn't work. rmove search for the moment |
|
195 | - $column_model = array( |
|
193 | + // Column config |
|
194 | + // @todo fix search firstname/lastname that doesn't work. rmove search for the moment |
|
195 | + $column_model = array( |
|
196 | 196 | array('name'=>'firstname', 'index'=>'firstname', 'width'=>'50', 'align'=>'left', 'search' => 'false'), |
197 | 197 | array('name'=>'lastname', 'index'=>'lastname', 'width'=>'50', 'align'=>'left', 'formatter'=>'action_formatter', 'search' => 'false'), |
198 | 198 | array('name'=>'login', 'hidden'=>'true', 'index'=>'username', 'width'=>'40', 'align'=>'left', 'search' => 'false'), |
@@ -18,10 +18,10 @@ |
||
18 | 18 | $file = file(api_get_path(SYS_LANG_PATH).'english/hotspot.inc.php'); |
19 | 19 | |
20 | 20 | foreach ($file as &$value) { |
21 | - $variable = explode('=', $value , 2); |
|
22 | - if (count($variable) > 1) { |
|
23 | - $variable = substr(trim($variable[0]), 1); |
|
24 | - $variable = '&'.$variable.'='.api_utf8_encode(get_lang($variable)).' '; |
|
25 | - echo $variable; |
|
26 | - } |
|
21 | + $variable = explode('=', $value , 2); |
|
22 | + if (count($variable) > 1) { |
|
23 | + $variable = substr(trim($variable[0]), 1); |
|
24 | + $variable = '&'.$variable.'='.api_utf8_encode(get_lang($variable)).' '; |
|
25 | + echo $variable; |
|
26 | + } |
|
27 | 27 | } |
@@ -18,7 +18,7 @@ |
||
18 | 18 | $file = file(api_get_path(SYS_LANG_PATH).'english/hotspot.inc.php'); |
19 | 19 | |
20 | 20 | foreach ($file as &$value) { |
21 | - $variable = explode('=', $value , 2); |
|
21 | + $variable = explode('=', $value, 2); |
|
22 | 22 | if (count($variable) > 1) { |
23 | 23 | $variable = substr(trim($variable[0]), 1); |
24 | 24 | $variable = '&'.$variable.'='.api_utf8_encode(get_lang($variable)).' '; |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | function add_category_form($action) { |
148 | 148 | $action = Security::remove_XSS($action); |
149 | 149 | // initiate the object |
150 | - $form = new FormValidator('note', 'post', api_get_self() . '?action=' . $action); |
|
150 | + $form = new FormValidator('note', 'post', api_get_self().'?action='.$action); |
|
151 | 151 | // Setting the form elements |
152 | 152 | $form->addElement('header', get_lang('AddACategory')); |
153 | 153 | $form->addElement('text', 'category_name', get_lang('CategoryName'), array('size' => '95')); |
@@ -189,19 +189,19 @@ discard block |
||
189 | 189 | |
190 | 190 | function display_add_category() { |
191 | 191 | echo '<div class="actions">'; |
192 | - echo '<a href="exercise.php?' . api_get_cidreq() . '">' . |
|
193 | - Display::return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM) . '</a>'; |
|
194 | - echo '<a href="' . api_get_self() . '?action=addcategory">' . |
|
195 | - Display::return_icon('question_category.gif', get_lang('AddACategory')) . '</a>'; |
|
192 | + echo '<a href="exercise.php?'.api_get_cidreq().'">'. |
|
193 | + Display::return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
194 | + echo '<a href="'.api_get_self().'?action=addcategory">'. |
|
195 | + Display::return_icon('question_category.gif', get_lang('AddACategory')).'</a>'; |
|
196 | 196 | echo '</div>'; |
197 | 197 | echo "<br/>"; |
198 | - echo "<fieldset><legend>" . get_lang('QuestionCategory') . "</legend></fieldset>"; |
|
198 | + echo "<fieldset><legend>".get_lang('QuestionCategory')."</legend></fieldset>"; |
|
199 | 199 | } |
200 | 200 | |
201 | 201 | // display goback to category list page link |
202 | 202 | function display_goback() { |
203 | 203 | echo '<div class="actions">'; |
204 | - echo '<a href="' . api_get_self() . '">' . |
|
205 | - Display::return_icon('back.png', get_lang('BackToCategoryList'), array(), 32) . '</a>'; |
|
204 | + echo '<a href="'.api_get_self().'">'. |
|
205 | + Display::return_icon('back.png', get_lang('BackToCategoryList'), array(), 32).'</a>'; |
|
206 | 206 | echo '</div>'; |
207 | 207 | } |
@@ -249,7 +249,7 @@ |
||
249 | 249 | break; |
250 | 250 | case RESULT_DISABLE_SHOW_SCORE_ONLY: |
251 | 251 | if ($objExercise->feedback_type != EXERCISE_FEEDBACK_TYPE_END) { |
252 | - $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score')); |
|
252 | + $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score')); |
|
253 | 253 | } |
254 | 254 | else { |
255 | 255 | $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'), get_lang('Details')); |
@@ -250,8 +250,7 @@ |
||
250 | 250 | case RESULT_DISABLE_SHOW_SCORE_ONLY: |
251 | 251 | if ($objExercise->feedback_type != EXERCISE_FEEDBACK_TYPE_END) { |
252 | 252 | $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score')); |
253 | - } |
|
254 | - else { |
|
253 | + } else { |
|
255 | 254 | $header_names = array(get_lang('Attempt'), get_lang('StartDate'), get_lang('IP'), get_lang('Score'), get_lang('Details')); |
256 | 255 | } |
257 | 256 | break; |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | |
13 | 13 | require_once '../inc/global.inc.php'; |
14 | 14 | |
15 | -$current_course_tool = TOOL_QUIZ; |
|
15 | +$current_course_tool = TOOL_QUIZ; |
|
16 | 16 | |
17 | 17 | // Clear the exercise session just in case |
18 | 18 | if (isset($_SESSION['objExercise'])) { |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | |
50 | 50 | if ($time_control) { |
51 | 51 | // Get time left for expiring time |
52 | - $time_left = api_strtotime($clock_expired_time,'UTC') - time(); |
|
52 | + $time_left = api_strtotime($clock_expired_time, 'UTC') - time(); |
|
53 | 53 | |
54 | 54 | $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/stylesheet/jquery.epiclock.css'); |
55 | 55 | $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/renderers/minute/epiclock.minute.css'); |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | |
73 | 73 | $html = ''; |
74 | 74 | $message = ''; |
75 | -$html.= '<div class="exercise">'; |
|
75 | +$html .= '<div class="exercise">'; |
|
76 | 76 | $is_allowed_to_edit = api_is_allowed_to_edit(null, true); |
77 | 77 | $edit_link = ''; |
78 | 78 | if ($is_allowed_to_edit && $objExercise->sessionId == $sessionId) { |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | |
172 | 172 | $blockShowAnswers = false; |
173 | 173 | if ($objExercise->results_disabled == RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT) { |
174 | - if (count($attempts) < $objExercise->attempts ) { |
|
174 | + if (count($attempts) < $objExercise->attempts) { |
|
175 | 175 | $blockShowAnswers = true; |
176 | 176 | } |
177 | 177 | } |
@@ -184,8 +184,8 @@ discard block |
||
184 | 184 | $attempt_result['exe_result'], |
185 | 185 | $attempt_result['exe_weighting'] |
186 | 186 | ); |
187 | - $attempt_url = api_get_path(WEB_CODE_PATH) . 'exercice/result.php?'; |
|
188 | - $attempt_url .= api_get_cidreq() . '&show_headers=1&'; |
|
187 | + $attempt_url = api_get_path(WEB_CODE_PATH).'exercice/result.php?'; |
|
188 | + $attempt_url .= api_get_cidreq().'&show_headers=1&'; |
|
189 | 189 | $attempt_url .= http_build_query([ |
190 | 190 | 'id' => $attempt_result['exe_id'] |
191 | 191 | ]); |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | get_lang('Show'), |
196 | 196 | $attempt_url, |
197 | 197 | [ |
198 | - 'class' => $btn_class . 'btn btn-default', |
|
198 | + 'class' => $btn_class.'btn btn-default', |
|
199 | 199 | 'data-title' => get_lang('Show'), |
200 | 200 | 'data-size' => 'lg' |
201 | 201 | ] |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | ), |
214 | 214 | 'userIp' => $attempt_result['user_ip'] |
215 | 215 | ); |
216 | - $attempt_link .= " " . $teacher_revised; |
|
216 | + $attempt_link .= " ".$teacher_revised; |
|
217 | 217 | |
218 | 218 | if (in_array( |
219 | 219 | $objExercise->results_disabled, |
@@ -304,12 +304,12 @@ discard block |
||
304 | 304 | $attempt_message = Display::return_message($attempt_message, 'info'); |
305 | 305 | } |
306 | 306 | if ($visible_return['value'] == true) { |
307 | - $message .= $attempt_message; |
|
307 | + $message .= $attempt_message; |
|
308 | 308 | } |
309 | 309 | } |
310 | 310 | |
311 | 311 | if ($time_control) { |
312 | - $html.= $objExercise->return_time_left_div(); |
|
312 | + $html .= $objExercise->return_time_left_div(); |
|
313 | 313 | } |
314 | 314 | |
315 | 315 | $html .= $message; |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | $table_content, |
330 | 330 | ['class' => 'table-responsive'] |
331 | 331 | ); |
332 | -$html.= '</div>'; |
|
332 | +$html .= '</div>'; |
|
333 | 333 | echo $html; |
334 | 334 | |
335 | 335 | Display::display_footer(); |
@@ -178,9 +178,9 @@ discard block |
||
178 | 178 | } |
179 | 179 | |
180 | 180 | /** |
181 | - * abstract function which creates the form to create/edit the answers of the question |
|
182 | - * @param FormValidator $form |
|
183 | - */ |
|
181 | + * abstract function which creates the form to create/edit the answers of the question |
|
182 | + * @param FormValidator $form |
|
183 | + */ |
|
184 | 184 | public function processAnswersCreation($form) |
185 | 185 | { |
186 | 186 | $questionWeighting = $nbrGoodAnswers = 0; |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | // sets the total weighting of the question |
222 | 222 | $this->updateWeighting($questionWeighting); |
223 | 223 | $this->save(); |
224 | - } |
|
224 | + } |
|
225 | 225 | |
226 | 226 | function return_header($feedback_type = null, $counter = null, $score = null) |
227 | 227 | { |
@@ -39,10 +39,10 @@ discard block |
||
39 | 39 | $html = '<table class="table table-striped table-hover">'; |
40 | 40 | $html .= '<thead>'; |
41 | 41 | $html .= '<tr>'; |
42 | - $html .= '<th width="10">' . get_lang('Number') . '</th>'; |
|
43 | - $html .= '<th width="10">' . get_lang('True') . '</th>'; |
|
44 | - $html .= '<th width="50%">' . get_lang('Comment') . '</th>'; |
|
45 | - $html .= '<th width="50%">' . get_lang('Answer') . '</th>'; |
|
42 | + $html .= '<th width="10">'.get_lang('Number').'</th>'; |
|
43 | + $html .= '<th width="10">'.get_lang('True').'</th>'; |
|
44 | + $html .= '<th width="50%">'.get_lang('Comment').'</th>'; |
|
45 | + $html .= '<th width="50%">'.get_lang('Answer').'</th>'; |
|
46 | 46 | $html .= '</tr>'; |
47 | 47 | $html .= '</thead>'; |
48 | 48 | $html .= '<tbody>'; |
@@ -74,10 +74,10 @@ discard block |
||
74 | 74 | $form->addHtml('<tr>'); |
75 | 75 | |
76 | 76 | if (is_object($answer)) { |
77 | - $defaults['answer[' . $i . ']'] = $answer->answer[$i]; |
|
78 | - $defaults['comment[' . $i . ']'] = $answer->comment[$i]; |
|
79 | - $defaults['weighting[' . $i . ']'] = float_format($answer->weighting[$i], 1); |
|
80 | - $defaults['correct[' . $i . ']'] = $answer->correct[$i]; |
|
77 | + $defaults['answer['.$i.']'] = $answer->answer[$i]; |
|
78 | + $defaults['comment['.$i.']'] = $answer->comment[$i]; |
|
79 | + $defaults['weighting['.$i.']'] = float_format($answer->weighting[$i], 1); |
|
80 | + $defaults['correct['.$i.']'] = $answer->correct[$i]; |
|
81 | 81 | } else { |
82 | 82 | $defaults['answer[1]'] = get_lang('DefaultMultipleAnswer2'); |
83 | 83 | $defaults['comment[1]'] = get_lang('DefaultMultipleComment2'); |
@@ -93,44 +93,44 @@ discard block |
||
93 | 93 | |
94 | 94 | $renderer->setElementTemplate( |
95 | 95 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
96 | - 'correct[' . $i . ']' |
|
96 | + 'correct['.$i.']' |
|
97 | 97 | ); |
98 | 98 | $renderer->setElementTemplate( |
99 | 99 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
100 | - 'counter[' . $i . ']' |
|
100 | + 'counter['.$i.']' |
|
101 | 101 | ); |
102 | 102 | $renderer->setElementTemplate( |
103 | 103 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
104 | - 'answer[' . $i . ']' |
|
104 | + 'answer['.$i.']' |
|
105 | 105 | ); |
106 | 106 | $renderer->setElementTemplate( |
107 | 107 | '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', |
108 | - 'comment[' . $i . ']' |
|
108 | + 'comment['.$i.']' |
|
109 | 109 | ); |
110 | 110 | |
111 | - $answer_number = $form->addElement('text', 'counter[' . $i . ']', null, 'value="' . $i . '"'); |
|
111 | + $answer_number = $form->addElement('text', 'counter['.$i.']', null, 'value="'.$i.'"'); |
|
112 | 112 | $answer_number->freeze(); |
113 | 113 | |
114 | 114 | $form->addElement('checkbox', |
115 | - 'correct[' . $i . ']', |
|
115 | + 'correct['.$i.']', |
|
116 | 116 | null, |
117 | 117 | null, |
118 | 118 | 'class="checkbox" style="margin-left: 0em;"' |
119 | 119 | ); |
120 | - $boxes_names[] = 'correct[' . $i . ']'; |
|
120 | + $boxes_names[] = 'correct['.$i.']'; |
|
121 | 121 | |
122 | 122 | $form->addElement( |
123 | 123 | 'html_editor', |
124 | - 'answer[' . $i . ']', |
|
124 | + 'answer['.$i.']', |
|
125 | 125 | null, |
126 | 126 | array(), |
127 | 127 | array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100') |
128 | 128 | ); |
129 | - $form->addRule('answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required'); |
|
129 | + $form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required'); |
|
130 | 130 | |
131 | 131 | $form->addElement( |
132 | 132 | 'html_editor', |
133 | - 'comment[' . $i . ']', |
|
133 | + 'comment['.$i.']', |
|
134 | 134 | null, |
135 | 135 | array(), |
136 | 136 | array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100') |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | function return_header($feedback_type = null, $counter = null, $score = null) |
227 | 227 | { |
228 | 228 | $header = parent::return_header($feedback_type, $counter, $score); |
229 | - $header .= '<table class="'.$this->question_table_class .'"> |
|
229 | + $header .= '<table class="'.$this->question_table_class.'"> |
|
230 | 230 | <tr> |
231 | 231 | <th>'.get_lang("Choice").'</th> |
232 | 232 | <th>'. get_lang("ExpectedChoice").'</th> |
@@ -17,7 +17,7 @@ |
||
17 | 17 | $result = $objExercise->read($exercise_id); |
18 | 18 | |
19 | 19 | if (!$result) { |
20 | - api_not_allowed(true); |
|
20 | + api_not_allowed(true); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | $interbreadcrumb[] = array( |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | $url = api_get_path(WEB_AJAX_PATH).'exercise.ajax.php?a=get_live_stats&exercise_id='.$objExercise->id.'&minutes='.$minutes; |
42 | 42 | |
43 | 43 | //The order is important you need to check the the $column variable in the model.ajax.php file |
44 | -$columns = array(get_lang('FirstName'), get_lang('LastName'), get_lang('Time'), get_lang('QuestionsAlreadyAnswered'), get_lang('Score')); |
|
44 | +$columns = array(get_lang('FirstName'), get_lang('LastName'), get_lang('Time'), get_lang('QuestionsAlreadyAnswered'), get_lang('Score')); |
|
45 | 45 | |
46 | 46 | //Column config |
47 | 47 | $column_model = array( |
@@ -93,15 +93,15 @@ discard block |
||
93 | 93 | |
94 | 94 | $(function() { |
95 | 95 | <?php |
96 | - echo Display::grid_js('live_stats', $url, $columns, $column_model, $extra_params, array(), null, true); |
|
96 | + echo Display::grid_js('live_stats', $url, $columns, $column_model, $extra_params, array(), null, true); |
|
97 | 97 | ?> |
98 | 98 | refreshGrid(); |
99 | 99 | }); |
100 | 100 | </script> |
101 | 101 | <?php |
102 | 102 | |
103 | -$actions = '<a href="exercise_report.php?exerciseId='.intval($_GET['exerciseId']).'&'.api_get_cidreq().'">' . |
|
104 | - Display :: return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
103 | +$actions = '<a href="exercise_report.php?exerciseId='.intval($_GET['exerciseId']).'&'.api_get_cidreq().'">'. |
|
104 | + Display :: return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
105 | 105 | echo $actions = Display::div($actions, array('class'=> 'actions')); |
106 | 106 | |
107 | 107 | echo Display::grid_html('live_stats'); |