@@ -56,7 +56,7 @@ |
||
56 | 56 | |
57 | 57 | |
58 | 58 | ob_start(); |
59 | - include dirname(__FILE__) . '/template/model.php'; |
|
59 | + include dirname(__FILE__).'/template/model.php'; |
|
60 | 60 | $result = ob_get_clean(); |
61 | 61 | return $result; |
62 | 62 | } |
@@ -246,9 +246,9 @@ discard block |
||
246 | 246 | |
247 | 247 | $db_name = $this->get_db_name($object); |
248 | 248 | $sql = "INSERT INTO `{$db_name}`.`{$this->table_name}` "; |
249 | - $sql .= ' (' . join(', ', $keys) . ') '; |
|
249 | + $sql .= ' ('.join(', ', $keys).') '; |
|
250 | 250 | $sql .= 'VALUES'; |
251 | - $sql .= ' (' . join(', ', $values) . ') '; |
|
251 | + $sql .= ' ('.join(', ', $values).') '; |
|
252 | 252 | |
253 | 253 | $result = $this->execute($sql); |
254 | 254 | if ($result) |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | $items = array(); |
296 | 296 | foreach ($args as $key => $val) |
297 | 297 | { |
298 | - $items[] = $key . ' = ' . $this->format_value($val); |
|
298 | + $items[] = $key.' = '.$this->format_value($val); |
|
299 | 299 | } |
300 | 300 | return implode(' AND ', $items); |
301 | 301 | } |
@@ -107,8 +107,7 @@ discard block |
||
107 | 107 | if ($this->is_new($object)) |
108 | 108 | { |
109 | 109 | $result = $this->insert($object); |
110 | - } |
|
111 | - else |
|
110 | + } else |
|
112 | 111 | { |
113 | 112 | $result = $this->update($object); |
114 | 113 | } |
@@ -257,8 +256,7 @@ discard block |
||
257 | 256 | $object->{$this->id_name} = $id; |
258 | 257 | $object->{db_name} = $db_name; |
259 | 258 | return $id; |
260 | - } |
|
261 | - else |
|
259 | + } else |
|
262 | 260 | { |
263 | 261 | return false; |
264 | 262 | } |
@@ -278,16 +276,13 @@ discard block |
||
278 | 276 | return ''; |
279 | 277 | } |
280 | 278 | $args = array($this->pk_name, $arg); |
281 | - } |
|
282 | - else if (is_string($arg)) |
|
279 | + } else if (is_string($arg)) |
|
283 | 280 | { |
284 | 281 | return $arg; |
285 | - } |
|
286 | - else if (is_array($arg)) |
|
282 | + } else if (is_array($arg)) |
|
287 | 283 | { |
288 | 284 | $args = $arg; |
289 | - } |
|
290 | - else |
|
285 | + } else |
|
291 | 286 | { |
292 | 287 | return $arg; |
293 | 288 | } |
@@ -309,17 +304,14 @@ discard block |
||
309 | 304 | if (is_bool($var)) |
310 | 305 | { |
311 | 306 | return $value ? '1' : '0'; |
312 | - } |
|
313 | - else if (is_numeric($value)) |
|
307 | + } else if (is_numeric($value)) |
|
314 | 308 | { |
315 | 309 | return empty($value) ? '0' : $value; |
316 | - } |
|
317 | - else if (is_string($value)) |
|
310 | + } else if (is_string($value)) |
|
318 | 311 | { |
319 | 312 | $value = mysql_escape_string($value); |
320 | 313 | return "'$value'"; |
321 | - } |
|
322 | - else |
|
314 | + } else |
|
323 | 315 | { |
324 | 316 | return $value; |
325 | 317 | } |
@@ -41,10 +41,10 @@ |
||
41 | 41 | 'identity' => $user['email'] |
42 | 42 | ), |
43 | 43 | 'issuedOn' => strtotime($userSkill['acquired_skill_at']), |
44 | - 'badge' => api_get_path(WEB_CODE_PATH) . "badge/class.php?id=$skillId", |
|
44 | + 'badge' => api_get_path(WEB_CODE_PATH)."badge/class.php?id=$skillId", |
|
45 | 45 | 'verify' => array( |
46 | 46 | 'type' => 'hosted', |
47 | - 'url' => api_get_path(WEB_CODE_PATH) . "badge/assertion.php?" . http_build_query(array( |
|
47 | + 'url' => api_get_path(WEB_CODE_PATH)."badge/assertion.php?".http_build_query(array( |
|
48 | 48 | 'user' => $userId, |
49 | 49 | 'skill' => $skillId, |
50 | 50 | 'course' => $courseId, |
@@ -17,9 +17,9 @@ |
||
17 | 17 | $json = array( |
18 | 18 | 'name' => $skill['name'], |
19 | 19 | 'description' => $skill['description'], |
20 | - 'image' => api_get_path(WEB_UPLOAD_PATH) . "badges/{$skill['icon']}", |
|
21 | - 'criteria' => api_get_path(WEB_CODE_PATH) . "badge/criteria.php?id=$skillId", |
|
22 | - 'issuer' => api_get_path(WEB_CODE_PATH) . "badge/issuer.php", |
|
20 | + 'image' => api_get_path(WEB_UPLOAD_PATH)."badges/{$skill['icon']}", |
|
21 | + 'criteria' => api_get_path(WEB_CODE_PATH)."badge/criteria.php?id=$skillId", |
|
22 | + 'issuer' => api_get_path(WEB_CODE_PATH)."badge/issuer.php", |
|
23 | 23 | ); |
24 | 24 | |
25 | 25 | echo json_encode($json); |
@@ -15,7 +15,7 @@ |
||
15 | 15 | Display::return_message(get_lang('SkillNotFound'), 'error') |
16 | 16 | ); |
17 | 17 | |
18 | - header('Location: ' . api_get_path(WEB_PATH)); |
|
18 | + header('Location: '.api_get_path(WEB_PATH)); |
|
19 | 19 | exit; |
20 | 20 | } |
21 | 21 |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | $skillId = isset($_GET['skill']) ? intval($_GET['skill']) : 0; |
13 | 13 | |
14 | 14 | if (!isset($_GET['user'], $_GET['skill'])) { |
15 | - header('Location: ' . api_get_path(WEB_PATH)); |
|
15 | + header('Location: '.api_get_path(WEB_PATH)); |
|
16 | 16 | exit; |
17 | 17 | } |
18 | 18 | |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | Display::return_message(get_lang('NoResults'), 'error') |
26 | 26 | ); |
27 | 27 | |
28 | - header('Location: ' . api_get_path(WEB_PATH)); |
|
28 | + header('Location: '.api_get_path(WEB_PATH)); |
|
29 | 29 | exit; |
30 | 30 | } |
31 | 31 | |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | Display::return_message(get_lang('TheUserXNotYetAchievedTheSkillX'), 'error') |
41 | 41 | ); |
42 | 42 | |
43 | - header('Location: ' . api_get_path(WEB_PATH)); |
|
43 | + header('Location: '.api_get_path(WEB_PATH)); |
|
44 | 44 | exit; |
45 | 45 | } |
46 | 46 | |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | 'date_issued' => api_format_date($userSkillDate, DATE_TIME_FORMAT_LONG) |
79 | 79 | ]; |
80 | 80 | |
81 | - $assertionUrl = api_get_path(WEB_CODE_PATH) . "badge/assertion.php?"; |
|
81 | + $assertionUrl = api_get_path(WEB_CODE_PATH)."badge/assertion.php?"; |
|
82 | 82 | $assertionUrl .= http_build_query(array( |
83 | 83 | 'user' => $user->getId(), |
84 | 84 | 'skill' => $skill->getId(), |
@@ -100,11 +100,11 @@ discard block |
||
100 | 100 | $backpack = $configBackpack; |
101 | 101 | } |
102 | 102 | |
103 | - $htmlHeadXtra[] = '<script src="' . $backpack . 'issuer.js"></script>'; |
|
103 | + $htmlHeadXtra[] = '<script src="'.$backpack.'issuer.js"></script>'; |
|
104 | 104 | } |
105 | 105 | $objSkill = new Skill(); |
106 | 106 | $skills = $objSkill->get($skillId); |
107 | -$unbakedBadge = api_get_path(SYS_UPLOAD_PATH) . "badges/".$skills['icon']; |
|
107 | +$unbakedBadge = api_get_path(SYS_UPLOAD_PATH)."badges/".$skills['icon']; |
|
108 | 108 | |
109 | 109 | $unbakedBadge = file_get_contents($unbakedBadge); |
110 | 110 | $badgeInfoError = false; |
@@ -119,12 +119,12 @@ discard block |
||
119 | 119 | mkdir($bakedBadge, api_get_permissions_for_new_directories(), true); |
120 | 120 | } |
121 | 121 | $skillRelUserId = $userSkills[0]->getId(); |
122 | - if (!file_exists($bakedBadge . "/badge_" . $skillRelUserId)) { |
|
123 | - file_put_contents($bakedBadge . "/badge_" . $skillRelUserId . ".png", $bakedInfo); |
|
122 | + if (!file_exists($bakedBadge."/badge_".$skillRelUserId)) { |
|
123 | + file_put_contents($bakedBadge."/badge_".$skillRelUserId.".png", $bakedInfo); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | //Process to validate a baked badge |
127 | - $badgeContent = file_get_contents($bakedBadge . "/badge_" . $skillRelUserId . ".png"); |
|
127 | + $badgeContent = file_get_contents($bakedBadge."/badge_".$skillRelUserId.".png"); |
|
128 | 128 | $verifyBakedBadge = $png->extractBadgeInfo($badgeContent); |
129 | 129 | if (!is_array($verifyBakedBadge)) { |
130 | 130 | $badgeInfoError = true; |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | |
133 | 133 | if (!$badgeInfoError) { |
134 | 134 | $personalBadge = UserManager::getUserPathById($userId, "web"); |
135 | - $personalBadge = $personalBadge."badges/badge_" . $skillRelUserId . ".png"; |
|
135 | + $personalBadge = $personalBadge."badges/badge_".$skillRelUserId.".png"; |
|
136 | 136 | } |
137 | 137 | } |
138 | 138 |
@@ -53,10 +53,10 @@ |
||
53 | 53 | $table_header[] = array('tag', true); |
54 | 54 | $table_header[] = array('attributes', false); |
55 | 55 | foreach ($tags as $tag => & $attributes) { |
56 | - $row = array(); |
|
57 | - $row[] = '<kbd>'.$tag.'</kbd>'; |
|
58 | - $row[] = '<kbd> '.implode(', ', array_keys($attributes)).'</kbd>'; |
|
59 | - $table_data[] = $row; |
|
56 | + $row = array(); |
|
57 | + $row[] = '<kbd>'.$tag.'</kbd>'; |
|
58 | + $row[] = '<kbd> '.implode(', ', array_keys($attributes)).'</kbd>'; |
|
59 | + $table_data[] = $row; |
|
60 | 60 | } |
61 | 61 | Display::display_sortable_table($table_header, $table_data, array(), array(), array('fullpage' => intval($_GET['fullpage']))); |
62 | 62 | ?> |
@@ -41,9 +41,9 @@ |
||
41 | 41 | $form->display(); |
42 | 42 | } |
43 | 43 | } else { |
44 | - $faq_content = @(string)file_get_contents(api_get_path(SYS_APP_PATH).'home/'.$faq_file); |
|
45 | - $faq_content = api_to_system_encoding($faq_content, api_detect_encoding(strip_tags($faq_content))); |
|
46 | - echo $faq_content; |
|
44 | + $faq_content = @(string)file_get_contents(api_get_path(SYS_APP_PATH).'home/'.$faq_file); |
|
45 | + $faq_content = api_to_system_encoding($faq_content, api_detect_encoding(strip_tags($faq_content))); |
|
46 | + echo $faq_content; |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | Display::display_footer(); |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | $form = new FormValidator('set_faq', 'post', 'faq.php?edit=true'); |
24 | 24 | $form->addHtmlEditor('faq_content', null, false, false, array('ToolbarSet' => 'FAQ', 'Width' => '100%', 'Height' => '300')); |
25 | 25 | $form->addButtonSave(get_lang('Ok'), 'faq_submit'); |
26 | - $faq_content = @(string)file_get_contents(api_get_path(SYS_APP_PATH).'home/faq.html'); |
|
26 | + $faq_content = @(string) file_get_contents(api_get_path(SYS_APP_PATH).'home/faq.html'); |
|
27 | 27 | $faq_content = api_to_system_encoding($faq_content, api_detect_encoding(strip_tags($faq_content))); |
28 | 28 | $form->setDefaults(array('faq_content' => $faq_content)); |
29 | 29 | if ($form->validate()) { |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | $form->display(); |
42 | 42 | } |
43 | 43 | } else { |
44 | - $faq_content = @(string)file_get_contents(api_get_path(SYS_APP_PATH).'home/'.$faq_file); |
|
44 | + $faq_content = @(string) file_get_contents(api_get_path(SYS_APP_PATH).'home/'.$faq_file); |
|
45 | 45 | $faq_content = api_to_system_encoding($faq_content, api_detect_encoding(strip_tags($faq_content))); |
46 | 46 | echo $faq_content; |
47 | 47 | } |
@@ -14,9 +14,9 @@ discard block |
||
14 | 14 | |
15 | 15 | // load templates |
16 | 16 | function reports_loadTemplates() { |
17 | - global $reports_enabled_templates, $reports_template; |
|
18 | - foreach ($reports_enabled_templates as $t) |
|
19 | - require_once 'templates/'.$t.'.reports.php'; |
|
17 | + global $reports_enabled_templates, $reports_template; |
|
18 | + foreach ($reports_enabled_templates as $t) |
|
19 | + require_once 'templates/'.$t.'.reports.php'; |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | |
@@ -149,18 +149,18 @@ discard block |
||
149 | 149 | */ |
150 | 150 | // return tools ID (parametre is a constant from main_api |
151 | 151 | function reports_getToolId($tool) { |
152 | - $tools = array_flip(api_get_tools_lists()); |
|
153 | - if (array_key_exists($tool, $tools)) |
|
154 | - return $tools[$tool]; |
|
155 | - else |
|
156 | - return null; |
|
152 | + $tools = array_flip(api_get_tools_lists()); |
|
153 | + if (array_key_exists($tool, $tools)) |
|
154 | + return $tools[$tool]; |
|
155 | + else |
|
156 | + return null; |
|
157 | 157 | } |
158 | 158 | |
159 | 159 | // return a sql clause returning triplet of (course, $session, $uid) the |
160 | 160 | // current user is authorized to reed |
161 | 161 | function reports_getVisibilitySQL () { |
162 | - return "select cru.user_id from ".Database::get_main_table(TABLE_MAIN_COURSE_USER).' cru'; |
|
163 | - // fixme sessions |
|
162 | + return "select cru.user_id from ".Database::get_main_table(TABLE_MAIN_COURSE_USER).' cru'; |
|
163 | + // fixme sessions |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | // this function execute keys_query (SQL statement) |
@@ -3,11 +3,11 @@ discard block |
||
3 | 3 | require_once '../inc/global.inc.php'; |
4 | 4 | |
5 | 5 | |
6 | -define ('REPORTS_PROGRESS_COMPLETED', 1); |
|
6 | +define('REPORTS_PROGRESS_COMPLETED', 1); |
|
7 | 7 | |
8 | 8 | $reports_modules = array(); |
9 | 9 | |
10 | -$reports_enabled_modules = array('quiz','course','scorm'); |
|
10 | +$reports_enabled_modules = array('quiz', 'course', 'scorm'); |
|
11 | 11 | |
12 | 12 | $reports_enabled_templates = array('exercicesMultiCourses', 'courseTime', 'courseArticulate'); |
13 | 13 | |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | |
159 | 159 | // return a sql clause returning triplet of (course, $session, $uid) the |
160 | 160 | // current user is authorized to reed |
161 | -function reports_getVisibilitySQL () { |
|
161 | +function reports_getVisibilitySQL() { |
|
162 | 162 | return "select cru.user_id from ".Database::get_main_table(TABLE_MAIN_COURSE_USER).' cru'; |
163 | 163 | // fixme sessions |
164 | 164 | } |
@@ -15,9 +15,10 @@ discard block |
||
15 | 15 | // load templates |
16 | 16 | function reports_loadTemplates() { |
17 | 17 | global $reports_enabled_templates, $reports_template; |
18 | - foreach ($reports_enabled_templates as $t) |
|
19 | - require_once 'templates/'.$t.'.reports.php'; |
|
20 | -} |
|
18 | + foreach ($reports_enabled_templates as $t) { |
|
19 | + require_once 'templates/'.$t.'.reports.php'; |
|
20 | + } |
|
21 | + } |
|
21 | 22 | |
22 | 23 | |
23 | 24 | // clear all reporting data |
@@ -150,11 +151,12 @@ discard block |
||
150 | 151 | // return tools ID (parametre is a constant from main_api |
151 | 152 | function reports_getToolId($tool) { |
152 | 153 | $tools = array_flip(api_get_tools_lists()); |
153 | - if (array_key_exists($tool, $tools)) |
|
154 | - return $tools[$tool]; |
|
155 | - else |
|
156 | - return null; |
|
157 | -} |
|
154 | + if (array_key_exists($tool, $tools)) { |
|
155 | + return $tools[$tool]; |
|
156 | + } else { |
|
157 | + return null; |
|
158 | + } |
|
159 | + } |
|
158 | 160 | |
159 | 161 | // return a sql clause returning triplet of (course, $session, $uid) the |
160 | 162 | // current user is authorized to reed |