@@ -35,12 +35,12 @@ discard block |
||
35 | 35 | $interbreadcrumb[] = array('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs')); |
36 | 36 | |
37 | 37 | $add_type = 'multiple'; |
38 | -if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!='') { |
|
38 | +if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') { |
|
39 | 39 | $add_type = Security::remove_XSS($_REQUEST['add_type']); |
40 | 40 | } |
41 | 41 | |
42 | 42 | $access_url_id = 1; |
43 | -if (isset($_REQUEST['access_url_id']) && $_REQUEST['access_url_id']!='') { |
|
43 | +if (isset($_REQUEST['access_url_id']) && $_REQUEST['access_url_id'] != '') { |
|
44 | 44 | $access_url_id = Security::remove_XSS($_REQUEST['access_url_id']); |
45 | 45 | } |
46 | 46 | |
@@ -157,23 +157,23 @@ discard block |
||
157 | 157 | <?php echo $link_add_type_unique ?> | <?php echo $link_add_type_multiple ?> |
158 | 158 | </div> |
159 | 159 | <br /><br /> |
160 | - <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?> > |
|
160 | + <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?> > |
|
161 | 161 | <?php echo get_lang('SelectUrl').' : '; ?> |
162 | 162 | <select name="access_url_id" onchange="javascript:send();"> |
163 | 163 | <option value="0">-- <?php echo get_lang('SelectUrl')?> -- </option> |
164 | 164 | <?php |
165 | - $url_selected=''; |
|
165 | + $url_selected = ''; |
|
166 | 166 | foreach ($url_list as $url_obj) { |
167 | 167 | $checked = ''; |
168 | 168 | if (!empty($access_url_id)) { |
169 | - if ($url_obj[0]==$access_url_id) { |
|
169 | + if ($url_obj[0] == $access_url_id) { |
|
170 | 170 | $checked = 'selected=true'; |
171 | - $url_selected=$url_obj[1]; |
|
171 | + $url_selected = $url_obj[1]; |
|
172 | 172 | } |
173 | 173 | } |
174 | - if ($url_obj['active']==1) { |
|
174 | + if ($url_obj['active'] == 1) { |
|
175 | 175 | ?> |
176 | - <option <?php echo $checked;?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?></option> |
|
176 | + <option <?php echo $checked; ?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?></option> |
|
177 | 177 | <?php |
178 | 178 | } |
179 | 179 | } |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | <td align="center"> |
197 | 197 | <div id="content_source"> |
198 | 198 | <?php |
199 | - if($ajax_search) { |
|
199 | + if ($ajax_search) { |
|
200 | 200 | ?> |
201 | 201 | <input type="text" id="course_to_add" onkeyup="xajax_search_courses(this.value,document.formulaire.access_url_id.options[document.formulaire.access_url_id.selectedIndex].value)" /> |
202 | 202 | <div id="ajax_list_courses"></div> |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | ?> |
206 | 206 | <select id="origin_users" name="no_course_list[]" multiple="multiple" size="15" style="width:380px;"> |
207 | 207 | <?php |
208 | - foreach($no_course_list as $no_course) { |
|
208 | + foreach ($no_course_list as $no_course) { |
|
209 | 209 | ?> |
210 | 210 | <option value="<?php echo $no_course['id']; ?>"><?php echo $no_course['title'].' ('.$no_course['code'].')'; ?></option> |
211 | 211 | <?php |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | </td> |
221 | 221 | <td width="10%" valign="middle" align="center"> |
222 | 222 | <?php |
223 | - if($ajax_search) { |
|
223 | + if ($ajax_search) { |
|
224 | 224 | ?> |
225 | 225 | <button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('destination_users'))" > |
226 | 226 | <em class="fa fa-arrow-left"></em> |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | <td align="center"> |
244 | 244 | <select id="destination_users" name="course_list[]" multiple="multiple" size="15" style="width:380px;"> |
245 | 245 | <?php |
246 | - foreach($course_list as $course) { |
|
246 | + foreach ($course_list as $course) { |
|
247 | 247 | $courseInfo = api_get_course_info_by_id($course['id']); |
248 | 248 | ?> |
249 | 249 | <option value="<?php echo $course['id']; ?>"><?php echo $course['title'].' ('.$courseInfo['code'].')'; ?></option> |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | <td colspan="3" align="center"> |
259 | 259 | <br /> |
260 | 260 | <?php |
261 | - if(isset($_GET['add'])) |
|
261 | + if (isset($_GET['add'])) |
|
262 | 262 | echo '<button class="btn btn-default" onclick="valide()" >'.get_lang('AddCoursesToURL').'</button>'; |
263 | 263 | else |
264 | 264 | echo '<button class="btn btn-default" onclick="valide()" >'.get_lang('EditCoursesToURL').'</button>'; |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | $dir .= '/'; |
26 | 26 | |
27 | 27 | do { |
28 | - $path = $dir . $prefix . mt_rand(0, 9999999); |
|
28 | + $path = $dir.$prefix.mt_rand(0, 9999999); |
|
29 | 29 | } while (!mkdir($path, $mode)); |
30 | 30 | |
31 | 31 | return $path; |
@@ -39,8 +39,8 @@ discard block |
||
39 | 39 | { |
40 | 40 | $name_tools = get_lang('ImportAikenQuiz'); |
41 | 41 | $form = '<div class="actions">'; |
42 | - $form .= '<a href="exercise.php?show=test&'.api_get_cidreq().'">' . |
|
43 | - Display :: return_icon('back.png', get_lang('BackToExercisesList'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
42 | + $form .= '<a href="exercise.php?show=test&'.api_get_cidreq().'">'. |
|
43 | + Display :: return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
44 | 44 | $form .= '</div>'; |
45 | 45 | $form_validator = new FormValidator( |
46 | 46 | 'aiken_upload', |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | function aiken_import_exercise($file) |
94 | 94 | { |
95 | 95 | global $exercise_info; |
96 | - $archive_path = api_get_path(SYS_ARCHIVE_PATH) . 'aiken'; |
|
96 | + $archive_path = api_get_path(SYS_ARCHIVE_PATH).'aiken'; |
|
97 | 97 | $baseWorkDir = $archive_path; |
98 | 98 | |
99 | 99 | if (!is_dir($baseWorkDir)) { |
@@ -130,9 +130,9 @@ discard block |
||
130 | 130 | |
131 | 131 | // Parse every subdirectory to search txt question files |
132 | 132 | while (false !== ($file = readdir($exerciseHandle))) { |
133 | - if (is_dir($baseWorkDir . '/' . $file) && $file != "." && $file != "..") { |
|
133 | + if (is_dir($baseWorkDir.'/'.$file) && $file != "." && $file != "..") { |
|
134 | 134 | //find each manifest for each question repository found |
135 | - $questionHandle = opendir($baseWorkDir . '/' . $file); |
|
135 | + $questionHandle = opendir($baseWorkDir.'/'.$file); |
|
136 | 136 | while (false !== ($questionFile = readdir($questionHandle))) { |
137 | 137 | if (preg_match('/.txt$/i', $questionFile)) { |
138 | 138 | $result = aiken_parse_file( |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | } |
217 | 217 | |
218 | 218 | // Delete the temp dir where the exercise was unzipped |
219 | - my_delete($baseWorkDir . $uploadPath); |
|
219 | + my_delete($baseWorkDir.$uploadPath); |
|
220 | 220 | $operation = $last_exercise_id; |
221 | 221 | } |
222 | 222 | |
@@ -239,8 +239,8 @@ discard block |
||
239 | 239 | function aiken_parse_file(&$exercise_info, $exercisePath, $file, $questionFile) { |
240 | 240 | global $questionTempDir; |
241 | 241 | |
242 | - $questionTempDir = $exercisePath . '/' . $file . '/'; |
|
243 | - $questionFilePath = $questionTempDir . $questionFile; |
|
242 | + $questionTempDir = $exercisePath.'/'.$file.'/'; |
|
243 | + $questionFilePath = $questionTempDir.$questionFile; |
|
244 | 244 | |
245 | 245 | if (!is_file($questionFilePath)) { |
246 | 246 | return 'FileNotFound'; |
@@ -252,13 +252,13 @@ discard block |
||
252 | 252 | $answers_array = array(); |
253 | 253 | $new_question = true; |
254 | 254 | foreach ($data as $line => $info) { |
255 | - if ($question_index > 0 && $new_question == true && preg_match('/^(\r)?\n/',$info)) { |
|
255 | + if ($question_index > 0 && $new_question == true && preg_match('/^(\r)?\n/', $info)) { |
|
256 | 256 | // double empty line |
257 | 257 | continue; |
258 | 258 | } |
259 | 259 | $new_question = false; |
260 | 260 | //make sure it is transformed from iso-8859-1 to utf-8 if in that form |
261 | - if (!mb_check_encoding($info,'utf-8') && mb_check_encoding($info,'iso-8859-1')) { |
|
261 | + if (!mb_check_encoding($info, 'utf-8') && mb_check_encoding($info, 'iso-8859-1')) { |
|
262 | 262 | $info = utf8_encode($info); |
263 | 263 | } |
264 | 264 | $exercise_info['question'][$question_index]['type'] = 'MCUA'; |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | } elseif (preg_match('/^ETIQUETAS:\s?([A-Z])\s?/', $info, $matches)) { |
291 | 291 | //TAGS for chamilo >= 1.10 (Spanish e-ducativa format) |
292 | 292 | $exercise_info['question'][$question_index]['answer_tags'] = explode(',', $matches[1]); |
293 | - } elseif (preg_match('/^(\r)?\n/',$info)) { |
|
293 | + } elseif (preg_match('/^(\r)?\n/', $info)) { |
|
294 | 294 | //moving to next question (tolerate \r\n or just \n) |
295 | 295 | if (empty($exercise_info['question'][$question_index]['correct_answers'])) { |
296 | 296 | error_log('Aiken: Error in question index '.$question_index.': no correct answer defined'); |
@@ -310,7 +310,7 @@ discard block |
||
310 | 310 | $exercise_info['question'][$question_index]['title'] = $info; |
311 | 311 | } else { |
312 | 312 | //Question itself (use a 100-chars long title and a larger description) |
313 | - $exercise_info['question'][$question_index]['title'] = trim(substr($info, 0, 100)) . '...'; |
|
313 | + $exercise_info['question'][$question_index]['title'] = trim(substr($info, 0, 100)).'...'; |
|
314 | 314 | $exercise_info['question'][$question_index]['description'] = $info; |
315 | 315 | } |
316 | 316 | } else { |
@@ -320,7 +320,7 @@ discard block |
||
320 | 320 | } |
321 | 321 | $total_questions = count($exercise_info['question']); |
322 | 322 | $total_weight = (!empty($_POST['total_weight'])) ? intval($_POST['total_weight']) : 20; |
323 | - foreach ($exercise_info['question'] as $key => $question) { |
|
323 | + foreach ($exercise_info['question'] as $key => $question) { |
|
324 | 324 | $exercise_info['question'][$key]['weighting'][current(array_keys($exercise_info['question'][$key]['weighting']))] = $total_weight / $total_questions; |
325 | 325 | } |
326 | 326 | return true; |
@@ -32,7 +32,7 @@ |
||
32 | 32 | if (isset($_POST['submit'])) { |
33 | 33 | $id = aiken_import_file($_FILES['userFile']); |
34 | 34 | if (is_numeric($id) && !empty($id)) { |
35 | - header('Location: admin.php?' . api_get_cidreq() . '&exerciseId=' . $id); |
|
35 | + header('Location: admin.php?'.api_get_cidreq().'&exerciseId='.$id); |
|
36 | 36 | exit; |
37 | 37 | } |
38 | 38 | } |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | |
27 | 27 | $rs = Database::query($sql); |
28 | 28 | |
29 | - if (Database::affected_rows($rs)>0){ |
|
29 | + if (Database::affected_rows($rs) > 0) { |
|
30 | 30 | $message = get_lang('ServiceActivated'); |
31 | 31 | } |
32 | 32 | |
@@ -76,18 +76,18 @@ discard block |
||
76 | 76 | WHERE variable LIKE "service_%" AND subkey="active" and selected_value="true"'; |
77 | 77 | |
78 | 78 | $rs = Database::query($sql); |
79 | -while($row = Database::fetch_array($rs)){ |
|
79 | +while ($row = Database::fetch_array($rs)) { |
|
80 | 80 | $listActiveServices[] = $row['variable']; |
81 | 81 | } |
82 | 82 | |
83 | 83 | // javascript to handle accordion behaviour |
84 | 84 | $javascript_message = ''; |
85 | -if(!empty($message)){ |
|
85 | +if (!empty($message)) { |
|
86 | 86 | $javascript_message = ' |
87 | 87 | document.getElementById("message").style.display = "block"; |
88 | 88 | var timer = setTimeout(hideMessage, 5000);'; |
89 | 89 | } |
90 | -$htmlHeadXtra[]= '<script> |
|
90 | +$htmlHeadXtra[] = '<script> |
|
91 | 91 | var listeDiv; |
92 | 92 | var extensionsHeader = new Array(); |
93 | 93 | var extensionsContent = new Array(); |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | ?> |
136 | 136 | <div id="message" style="display: none"> |
137 | 137 | <?php |
138 | - if(!empty($message)) |
|
138 | + if (!empty($message)) |
|
139 | 139 | Display::display_normal_message($message) |
140 | 140 | ?> |
141 | 141 | </div> |
@@ -22,16 +22,16 @@ discard block |
||
22 | 22 | $objSkill = new Skill(); |
23 | 23 | $skill = $objSkill->get($skillId); |
24 | 24 | |
25 | -$htmlHeadXtra[] = '<link href="'. api_get_path(WEB_LIBRARY_JS_PATH) .'badge-studio/media/css/core.css" rel="stylesheet">'; |
|
25 | +$htmlHeadXtra[] = '<link href="'.api_get_path(WEB_LIBRARY_JS_PATH).'badge-studio/media/css/core.css" rel="stylesheet">'; |
|
26 | 26 | |
27 | 27 | // Add badge studio paths |
28 | 28 | |
29 | 29 | $badgeStudio = [ |
30 | - 'core' => api_get_path(WEB_LIBRARY_JS_PATH) .'badge-studio/', |
|
31 | - 'media' => api_get_path(WEB_LIBRARY_JS_PATH) .'badge-studio/media/', |
|
32 | - 'templates' => api_get_path(WEB_LIBRARY_JS_PATH) .'badge-studio/media/images/templates/', |
|
33 | - 'masks' => api_get_path(WEB_LIBRARY_JS_PATH) .'badge-studio/media/images/masks/', |
|
34 | - 'script_js' => '<script src="'. api_get_path(WEB_LIBRARY_JS_PATH) .'badge-studio/media/js/studio.js?"></script>' |
|
30 | + 'core' => api_get_path(WEB_LIBRARY_JS_PATH).'badge-studio/', |
|
31 | + 'media' => api_get_path(WEB_LIBRARY_JS_PATH).'badge-studio/media/', |
|
32 | + 'templates' => api_get_path(WEB_LIBRARY_JS_PATH).'badge-studio/media/images/templates/', |
|
33 | + 'masks' => api_get_path(WEB_LIBRARY_JS_PATH).'badge-studio/media/images/masks/', |
|
34 | + 'script_js' => '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'badge-studio/media/js/studio.js?"></script>' |
|
35 | 35 | ]; |
36 | 36 | |
37 | 37 | |
@@ -59,10 +59,10 @@ discard block |
||
59 | 59 | if ($existsBadgesDirectory) { |
60 | 60 | |
61 | 61 | if (!empty($skill['icon'])) { |
62 | - $iconFileAbsolutePath = $badgePath . $skill['icon']; |
|
62 | + $iconFileAbsolutePath = $badgePath.$skill['icon']; |
|
63 | 63 | |
64 | 64 | if (Security::check_abs_path($iconFileAbsolutePath, $badgePath)) { |
65 | - unlink($badgePath . $skill['icon']); |
|
65 | + unlink($badgePath.$skill['icon']); |
|
66 | 66 | } |
67 | 67 | } |
68 | 68 | |
@@ -85,24 +85,24 @@ discard block |
||
85 | 85 | |
86 | 86 | $objSkill->update($params); |
87 | 87 | |
88 | - header('Location: ' . api_get_path(WEB_CODE_PATH) . 'admin/skill_badge_list.php'); |
|
88 | + header('Location: '.api_get_path(WEB_CODE_PATH).'admin/skill_badge_list.php'); |
|
89 | 89 | exit; |
90 | 90 | } |
91 | 91 | |
92 | 92 | $interbreadcrumb = array( |
93 | 93 | array( |
94 | - 'url' => api_get_path(WEB_CODE_PATH) . 'admin/index.php', |
|
94 | + 'url' => api_get_path(WEB_CODE_PATH).'admin/index.php', |
|
95 | 95 | 'name' => get_lang('Administration') |
96 | 96 | ), |
97 | 97 | array( |
98 | - 'url' => api_get_path(WEB_CODE_PATH) . 'admin/skill_badge.php', |
|
98 | + 'url' => api_get_path(WEB_CODE_PATH).'admin/skill_badge.php', |
|
99 | 99 | 'name' => get_lang('Badges') |
100 | 100 | ) |
101 | 101 | ); |
102 | 102 | |
103 | 103 | $toolbar = Display::toolbarButton( |
104 | 104 | get_lang('ManageSkills'), |
105 | - api_get_path(WEB_CODE_PATH) . 'admin/skill_list.php', |
|
105 | + api_get_path(WEB_CODE_PATH).'admin/skill_list.php', |
|
106 | 106 | 'list', |
107 | 107 | 'primary', |
108 | 108 | ['title' => get_lang('ManageSkills')] |
@@ -86,31 +86,31 @@ discard block |
||
86 | 86 | |
87 | 87 | </script>'; |
88 | 88 | |
89 | -$allowed_views = array('mygroups','newest','pop'); |
|
89 | +$allowed_views = array('mygroups', 'newest', 'pop'); |
|
90 | 90 | $content = null; |
91 | 91 | |
92 | -if (isset($_GET['view']) && in_array($_GET['view'],$allowed_views)) { |
|
92 | +if (isset($_GET['view']) && in_array($_GET['view'], $allowed_views)) { |
|
93 | 93 | if ($_GET['view'] == 'mygroups') { |
94 | - $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups')); |
|
95 | - $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('MyGroups')); |
|
96 | - } else if ( $_GET['view'] == 'newest') { |
|
97 | - $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups')); |
|
98 | - $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Newest')); |
|
99 | - } else { |
|
100 | - $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups')); |
|
101 | - $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Popular')); |
|
94 | + $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups')); |
|
95 | + $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('MyGroups')); |
|
96 | + } else if ($_GET['view'] == 'newest') { |
|
97 | + $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups')); |
|
98 | + $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('Newest')); |
|
99 | + } else { |
|
100 | + $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups')); |
|
101 | + $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('Popular')); |
|
102 | 102 | } |
103 | 103 | } else { |
104 | - $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups')); |
|
104 | + $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups')); |
|
105 | 105 | if (!isset($_GET['id'])) { |
106 | - $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('GroupList')); |
|
106 | + $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('GroupList')); |
|
107 | 107 | } else { |
108 | 108 | //$interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Group')); |
109 | 109 | } |
110 | 110 | } |
111 | 111 | |
112 | 112 | // getting group information |
113 | -$group_id = isset($_GET['id']) ? intval($_GET['id']) : null; |
|
113 | +$group_id = isset($_GET['id']) ? intval($_GET['id']) : null; |
|
114 | 114 | $relation_group_title = ''; |
115 | 115 | $role = 0; |
116 | 116 | |
@@ -120,9 +120,9 @@ discard block |
||
120 | 120 | $group_info = $usergroup->get($group_id); |
121 | 121 | |
122 | 122 | |
123 | - $interbreadcrumb[]= array ('url' =>'#','name' => $group_info['name']); |
|
123 | + $interbreadcrumb[] = array('url' =>'#', 'name' => $group_info['name']); |
|
124 | 124 | |
125 | - if (isset($_GET['action']) && $_GET['action']=='leave') { |
|
125 | + if (isset($_GET['action']) && $_GET['action'] == 'leave') { |
|
126 | 126 | $user_leaved = intval($_GET['u']); |
127 | 127 | // I can "leave me myself" |
128 | 128 | if (api_get_user_id() == $user_leaved) { |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | } |
137 | 137 | |
138 | 138 | // add a user to a group if its open |
139 | - if (isset($_GET['action']) && $_GET['action']=='join') { |
|
139 | + if (isset($_GET['action']) && $_GET['action'] == 'join') { |
|
140 | 140 | // we add a user only if is a open group |
141 | 141 | $user_join = intval($_GET['u']); |
142 | 142 | if (api_get_user_id() == $user_join && !empty($group_id)) { |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | $group_info = $usergroup->get($group_id); |
166 | 166 | |
167 | 167 | //Loading group information |
168 | -if (isset($_GET['status']) && $_GET['status']=='sent') { |
|
168 | +if (isset($_GET['status']) && $_GET['status'] == 'sent') { |
|
169 | 169 | $social_right_content .= Display::return_message(get_lang('MessageHasBeenSent'), 'confirmation', false); |
170 | 170 | } |
171 | 171 | |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | |
175 | 175 | if (!$is_group_member && $group_info['visibility'] == GROUP_PERMISSION_CLOSED) { |
176 | 176 | if ($role == GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER) { |
177 | - $social_right_content .= Display::return_message(get_lang('YouAlreadySentAnInvitation')); |
|
177 | + $social_right_content .= Display::return_message(get_lang('YouAlreadySentAnInvitation')); |
|
178 | 178 | } |
179 | 179 | } |
180 | 180 | |
@@ -185,19 +185,19 @@ discard block |
||
185 | 185 | ) { |
186 | 186 | $social_right_content .= '<div class="group-tool">'; |
187 | 187 | $social_right_content .= '<div class="pull-right">'; |
188 | - $social_right_content .= '<a class="btn btn-default btn-sm" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'. |
|
188 | + $social_right_content .= '<a class="btn btn-default btn-sm" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'. |
|
189 | 189 | get_lang('JoinGroup').'</a>'; |
190 | - $social_right_content .= '</div>'; |
|
191 | - $social_right_content .= '</div>'; |
|
190 | + $social_right_content .= '</div>'; |
|
191 | + $social_right_content .= '</div>'; |
|
192 | 192 | } elseif ($role == GROUP_USER_PERMISSION_PENDING_INVITATION) { |
193 | 193 | $social_right_content .= '<div class="group-tool">'; |
194 | 194 | $social_right_content .= '<div class="pull-right">'; |
195 | - $social_right_content .= '<a class="btn btn-default btn-sm" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'. |
|
195 | + $social_right_content .= '<a class="btn btn-default btn-sm" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'. |
|
196 | 196 | Display::returnFontAwesomeIcon('envelope').' '. |
197 | 197 | get_lang('YouHaveBeenInvitedJoinNow').'</a>'; |
198 | 198 | } |
199 | - $social_right_content .= '</div>'; |
|
200 | - $social_right_content .= '</div>'; |
|
199 | + $social_right_content .= '</div>'; |
|
200 | + $social_right_content .= '</div>'; |
|
201 | 201 | } |
202 | 202 | $content = MessageManager::display_messages_for_group($group_id); |
203 | 203 | if ($is_group_member) { |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | 'action' => 'add_message_group' |
212 | 212 | ]); |
213 | 213 | $create_thread_link = Display::url( |
214 | - Display::returnFontAwesomeIcon('commenting') . ' ' . |
|
214 | + Display::returnFontAwesomeIcon('commenting').' '. |
|
215 | 215 | get_lang('YouShouldCreateATopic'), |
216 | 216 | $createThreadUrl, |
217 | 217 | [ |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | 'action' => 'add_message_group', |
232 | 232 | ]); |
233 | 233 | $create_thread_link = Display::url( |
234 | - Display::returnFontAwesomeIcon('commenting') . ' ' . |
|
234 | + Display::returnFontAwesomeIcon('commenting').' '. |
|
235 | 235 | get_lang('NewTopic'), |
236 | 236 | $createThreadUrl, |
237 | 237 | [ |
@@ -271,21 +271,21 @@ discard block |
||
271 | 271 | foreach ($members as $member) { |
272 | 272 | // if is a member |
273 | 273 | if (in_array($member['relation_type'], |
274 | - array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER,GROUP_USER_PERMISSION_MODERATOR)) |
|
274 | + array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR)) |
|
275 | 275 | ) { |
276 | 276 | //add icons |
277 | 277 | if ($member['relation_type'] == GROUP_USER_PERMISSION_ADMIN) { |
278 | - $icon= Display::return_icon('social_group_admin.png', get_lang('Admin')); |
|
278 | + $icon = Display::return_icon('social_group_admin.png', get_lang('Admin')); |
|
279 | 279 | } elseif ($member['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) { |
280 | - $icon= Display::return_icon('social_group_moderator.png', get_lang('Moderator')); |
|
280 | + $icon = Display::return_icon('social_group_moderator.png', get_lang('Moderator')); |
|
281 | 281 | } else { |
282 | - $icon= ''; |
|
282 | + $icon = ''; |
|
283 | 283 | } |
284 | 284 | |
285 | 285 | $userPicture = UserManager::getUserPicture($member['id']); |
286 | 286 | $member_content .= '<div class="col-md-3">'; |
287 | 287 | $member_content .= '<div class="items-user">'; |
288 | - $member_name = Display::url(api_get_person_name(cut($member['user_info']['firstname'],15),cut($member['user_info']['lastname'],15)).' '.$icon, $member['user_info']['profile_url']); |
|
288 | + $member_name = Display::url(api_get_person_name(cut($member['user_info']['firstname'], 15), cut($member['user_info']['lastname'], 15)).' '.$icon, $member['user_info']['profile_url']); |
|
289 | 289 | $member_content .= Display::div('<img class="img-circle" src="'.$userPicture.'"/>', array('class' => 'avatar')); |
290 | 290 | $member_content .= Display::div($member_name, array('class' => 'name')); |
291 | 291 | $member_content .= '</div>'; |
@@ -297,10 +297,10 @@ discard block |
||
297 | 297 | } |
298 | 298 | |
299 | 299 | if (!empty($create_thread_link)) { |
300 | - $create_thread_link = Display::div($create_thread_link, array('class'=>'pull-right')); |
|
300 | + $create_thread_link = Display::div($create_thread_link, array('class'=>'pull-right')); |
|
301 | 301 | } |
302 | 302 | $headers = array(get_lang('Discussions'), get_lang('Members')); |
303 | - $socialForum = Display::tabs($headers, array($content, $member_content),'tabs'); |
|
303 | + $socialForum = Display::tabs($headers, array($content, $member_content), 'tabs'); |
|
304 | 304 | |
305 | 305 | } else { |
306 | 306 | // if I already sent an invitation message |
@@ -312,9 +312,9 @@ discard block |
||
312 | 312 | ) |
313 | 313 | ) |
314 | 314 | ) { |
315 | - $social_right_content .= '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>'; |
|
315 | + $social_right_content .= '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>'; |
|
316 | 316 | } elseif ($role == GROUP_USER_PERMISSION_PENDING_INVITATION) { |
317 | - $social_right_content .= '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('YouHaveBeenInvitedJoinNow').'</a>'; |
|
317 | + $social_right_content .= '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('YouHaveBeenInvitedJoinNow').'</a>'; |
|
318 | 318 | } |
319 | 319 | } |
320 | 320 |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | |
19 | 19 | // Database Table Definitions |
20 | 20 | $tbl_user = Database::get_main_table(TABLE_MAIN_USER); |
21 | -$tbl_group_rel_user = Database::get_main_table(TABLE_USERGROUP_REL_USER); |
|
21 | +$tbl_group_rel_user = Database::get_main_table(TABLE_USERGROUP_REL_USER); |
|
22 | 22 | |
23 | 23 | // setting the name of the tool |
24 | 24 | $tool_name = get_lang('SubscribeUsersToGroup'); |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | } |
41 | 41 | } |
42 | 42 | |
43 | -$interbreadcrumb[] = array('url' =>'groups.php','name' => get_lang('Groups')); |
|
43 | +$interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups')); |
|
44 | 44 | $interbreadcrumb[] = array('url' => 'group_view.php?id='.$group_id, 'name' => $group_info['name']); |
45 | 45 | $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('SubscribeUsersToGroup')); |
46 | 46 | |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | |
75 | 75 | if (is_array($user_list) && count($user_list) > 0) { |
76 | 76 | //send invitation message |
77 | - foreach ($user_list as $user_id){ |
|
77 | + foreach ($user_list as $user_id) { |
|
78 | 78 | $result = MessageManager::send_message( |
79 | 79 | $user_id, |
80 | 80 | $title, |
@@ -110,8 +110,8 @@ discard block |
||
110 | 110 | |
111 | 111 | if (!isset($group_friend_list[$group_id]) || |
112 | 112 | isset($group_friend_list[$group_id]) && |
113 | - $group_friend_list[$group_id]['relation_type'] == '' ) { |
|
114 | - $Users[$friend['friend_user_id']]= array( |
|
113 | + $group_friend_list[$group_id]['relation_type'] == '') { |
|
114 | + $Users[$friend['friend_user_id']] = array( |
|
115 | 115 | 'user_id' => $friend['friend_user_id'], |
116 | 116 | 'firstname' => $friend['firstName'], |
117 | 117 | 'lastname' => $friend['lastName'], |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | ); |
121 | 121 | } |
122 | 122 | } else { |
123 | - $Users[$friend['friend_user_id']]= array( |
|
123 | + $Users[$friend['friend_user_id']] = array( |
|
124 | 124 | 'user_id' => $friend['friend_user_id'], |
125 | 125 | 'firstname' =>$friend['firstName'], |
126 | 126 | 'lastname' => $friend['lastName'], |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | } |
132 | 132 | } |
133 | 133 | |
134 | -if (is_array($Users) && count($Users) > 0 ) { |
|
134 | +if (is_array($Users) && count($Users) > 0) { |
|
135 | 135 | foreach ($Users as $user) { |
136 | 136 | if ($user['group_id'] != $group_id) { |
137 | 137 | $nosessionUsersList[$user['user_id']] = api_get_person_name( |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | } |
144 | 144 | |
145 | 145 | $social_left_content = SocialManager::show_social_menu('invite_friends', $group_id); |
146 | -$social_right_content = '<h3 class="group-title">'.Security::remove_XSS($group_info['name'], STUDENT, true).'</h3>'; |
|
146 | +$social_right_content = '<h3 class="group-title">'.Security::remove_XSS($group_info['name'], STUDENT, true).'</h3>'; |
|
147 | 147 | |
148 | 148 | if (count($nosessionUsersList) == 0) { |
149 | 149 | $friends = SocialManager::get_friends(api_get_user_id()); |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | array(GROUP_USER_PERMISSION_PENDING_INVITATION) |
180 | 180 | ); |
181 | 181 | |
182 | -if (is_array($members) && count($members)>0) { |
|
182 | +if (is_array($members) && count($members) > 0) { |
|
183 | 183 | foreach ($members as &$member) { |
184 | 184 | $image = UserManager::getUserPicture($member['id']); |
185 | 185 | $member['image'] = '<img class="img-circle" src="'.$image.'" width="50px" height="50px" />'; |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | 'thematic_advance_delete' |
47 | 47 | ); |
48 | 48 | |
49 | -$action = 'thematic_details'; |
|
49 | +$action = 'thematic_details'; |
|
50 | 50 | if (isset($_REQUEST['action']) && in_array($_REQUEST['action'], $actions)) { |
51 | 51 | $action = $_REQUEST['action']; |
52 | 52 | } |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | $thematicControl = Session::read('thematic_control'); |
185 | 185 | |
186 | 186 | if ($action == 'thematic_list') { |
187 | - $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('ThematicControl')); |
|
187 | + $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('ThematicControl')); |
|
188 | 188 | } |
189 | 189 | if ($action == 'thematic_add') { |
190 | 190 | $interbreadcrumb[] = array( |
@@ -198,10 +198,10 @@ discard block |
||
198 | 198 | 'url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl, |
199 | 199 | 'name' => get_lang('ThematicControl') |
200 | 200 | ); |
201 | - $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('EditThematicSection')); |
|
201 | + $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('EditThematicSection')); |
|
202 | 202 | } |
203 | 203 | if ($action == 'thematic_details') { |
204 | - $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('ThematicControl')); |
|
204 | + $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('ThematicControl')); |
|
205 | 205 | } |
206 | 206 | if ($action == 'thematic_plan_list' || $action == 'thematic_plan_delete') { |
207 | 207 | $interbreadcrumb[] = array( |
@@ -216,22 +216,22 @@ discard block |
||
216 | 216 | } |
217 | 217 | } |
218 | 218 | if ($action == 'thematic_plan_add' || $action == 'thematic_plan_edit') { |
219 | - $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl, 'name' => get_lang('ThematicControl')); |
|
220 | - $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action=thematic_plan_list&thematic_id='.$thematic_id, 'name' => get_lang('ThematicPlan').' ('.$thematic_data['title'].')'); |
|
219 | + $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl, 'name' => get_lang('ThematicControl')); |
|
220 | + $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq().'&action=thematic_plan_list&thematic_id='.$thematic_id, 'name' => get_lang('ThematicPlan').' ('.$thematic_data['title'].')'); |
|
221 | 221 | if ($description_type >= ADD_THEMATIC_PLAN) { |
222 | - $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('NewBloc')); |
|
222 | + $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('NewBloc')); |
|
223 | 223 | } else { |
224 | - $interbreadcrumb[] = array ('url' => '#', 'name' => $default_thematic_plan_title[$description_type]); |
|
224 | + $interbreadcrumb[] = array('url' => '#', 'name' => $default_thematic_plan_title[$description_type]); |
|
225 | 225 | } |
226 | 226 | } |
227 | 227 | if ($action == 'thematic_advance_list' || $action == 'thematic_advance_delete') { |
228 | - $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl, 'name' => get_lang('ThematicControl')); |
|
229 | - $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('ThematicAdvance').' ('.$thematic_data['title'].')'); |
|
228 | + $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl, 'name' => get_lang('ThematicControl')); |
|
229 | + $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('ThematicAdvance').' ('.$thematic_data['title'].')'); |
|
230 | 230 | } |
231 | 231 | if ($action == 'thematic_advance_add' || $action == 'thematic_advance_edit') { |
232 | - $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl, 'name' => get_lang('ThematicControl')); |
|
233 | - $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action=thematic_advance_list&thematic_id='.$thematic_id, 'name' => get_lang('ThematicAdvance').' ('.$thematic_data['title'].')'); |
|
234 | - $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('NewThematicAdvance')); |
|
232 | + $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl, 'name' => get_lang('ThematicControl')); |
|
233 | + $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq().'&action=thematic_advance_list&thematic_id='.$thematic_id, 'name' => get_lang('ThematicAdvance').' ('.$thematic_data['title'].')'); |
|
234 | + $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('NewThematicAdvance')); |
|
235 | 235 | } |
236 | 236 | |
237 | 237 | // Distpacher actions to controller |
@@ -426,7 +426,7 @@ discard block |
||
426 | 426 | // Extra options |
427 | 427 | $plugin_settings = api_get_settings_params( |
428 | 428 | array( |
429 | - "subkey = ? AND category = ? AND type = ? " => array($plugin_name, 'Plugins','setting') |
|
429 | + "subkey = ? AND category = ? AND type = ? " => array($plugin_name, 'Plugins', 'setting') |
|
430 | 430 | ) |
431 | 431 | ); |
432 | 432 | |
@@ -532,7 +532,7 @@ discard block |
||
532 | 532 | if (!empty($obj->course_settings)) { |
533 | 533 | if (is_file(api_get_path(SYS_CODE_PATH).'img/icons/'.ICON_SIZE_SMALL.'/'.$plugin_name.'.png')) { |
534 | 534 | $icon = Display::return_icon( |
535 | - $plugin_name . '.png', |
|
535 | + $plugin_name.'.png', |
|
536 | 536 | Security::remove_XSS($pluginTitle), |
537 | 537 | '', |
538 | 538 | ICON_SIZE_SMALL |
@@ -548,18 +548,18 @@ discard block |
||
548 | 548 | |
549 | 549 | $form->addHtml('<div class="panel panel-default">'); |
550 | 550 | $form->addHtml(' |
551 | - <div class="panel-heading" role="tab" id="heading-' . $plugin_name . '-settings"> |
|
551 | + <div class="panel-heading" role="tab" id="heading-' . $plugin_name.'-settings"> |
|
552 | 552 | <h4 class="panel-title"> |
553 | - <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse-' . $plugin_name . '-settings" aria-expanded="false" aria-controls="collapse-' . $plugin_name . '-settings"> |
|
553 | + <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse-' . $plugin_name.'-settings" aria-expanded="false" aria-controls="collapse-'.$plugin_name.'-settings"> |
|
554 | 554 | '); |
555 | - $form->addHtml($icon . ' ' . $pluginTitle); |
|
555 | + $form->addHtml($icon.' '.$pluginTitle); |
|
556 | 556 | $form->addHtml(' |
557 | 557 | </a> |
558 | 558 | </h4> |
559 | 559 | </div> |
560 | 560 | '); |
561 | 561 | $form->addHtml(' |
562 | - <div id="collapse-' . $plugin_name . '-settings" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading-' . $plugin_name . '-settings"> |
|
562 | + <div id="collapse-' . $plugin_name.'-settings" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading-'.$plugin_name.'-settings"> |
|
563 | 563 | <div class="panel-body"> |
564 | 564 | '); |
565 | 565 |