@@ -12,8 +12,8 @@ |
||
12 | 12 | * @author Laurent Opprecht <[email protected]>, Nicolas Rod for the University of Geneva |
13 | 13 | */ |
14 | 14 | $dir = dirname(__FILE__); |
15 | -include_once($dir . '/../init.php'); |
|
16 | -include_once($dir . '/../app/lib/scaffolder/scaffolder.class.php'); |
|
15 | +include_once($dir.'/../init.php'); |
|
16 | +include_once($dir.'/../app/lib/scaffolder/scaffolder.class.php'); |
|
17 | 17 | |
18 | 18 | if (!ShibbolethTest::is_enabled()) |
19 | 19 | { |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html |
24 | 24 | * @author Laurent Opprecht <[email protected]> |
25 | 25 | */ |
26 | -class <?php echo $prefix . $class_name ?> |
|
26 | +class <?php echo $prefix.$class_name ?> |
|
27 | 27 | |
28 | 28 | { |
29 | 29 | |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | return self::store()->create_object($data); |
52 | 52 | } |
53 | 53 | |
54 | -<?php foreach($fields as $field){?> |
|
54 | +<?php foreach ($fields as $field) {?> |
|
55 | 55 | public $<?php echo $field->name; ?> = <?php echo $field->def ? $field->def : 'null'; ?>; |
56 | 56 | <?php }?> |
57 | 57 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | * @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html |
74 | 74 | * @author Laurent Opprecht <[email protected]> |
75 | 75 | */ |
76 | -class <?php echo $prefix . $class_name ?>Store extends Store |
|
76 | +class <?php echo $prefix.$class_name ?>Store extends Store |
|
77 | 77 | { |
78 | 78 | |
79 | 79 | /** |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | |
93 | 93 | public function __construct() |
94 | 94 | { |
95 | - parent::__construct('<?php echo $table_name;?>', '<?php echo $class_name;?>', '<?php echo $id_name;?>'); |
|
95 | + parent::__construct('<?php echo $table_name; ?>', '<?php echo $class_name; ?>', '<?php echo $id_name; ?>'); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | { |
115 | 115 | return parent::create_object($data); |
116 | 116 | } |
117 | -<?php foreach($keys as $key){?> |
|
117 | +<?php foreach ($keys as $key) {?> |
|
118 | 118 | |
119 | 119 | /** |
120 | 120 | * |
@@ -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 |
@@ -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 | } |