@@ -80,7 +80,12 @@ discard block |
||
80 | 80 | |
81 | 81 | if ($res==1) { //WRONG PASSWORD |
82 | 82 | //$errorMessage = "LDAP User or password incorrect, try again.<br />"; |
83 | - if (isset($log)) unset($log); if (isset($uid)) unset($uid); |
|
83 | + if (isset($log)) { |
|
84 | + unset($log); |
|
85 | + } |
|
86 | + if (isset($uid)) { |
|
87 | + unset($uid); |
|
88 | + } |
|
84 | 89 | $loginLdapSucces = false; |
85 | 90 | } |
86 | 91 | if ($res==-1) { //WRONG USERNAME |
@@ -401,8 +406,9 @@ discard block |
||
401 | 406 | return $info; |
402 | 407 | |
403 | 408 | } else { |
404 | - if (count($ldap_query)!=0) |
|
405 | - Display :: display_error_message(get_lang('LDAPConnectionError')); |
|
409 | + if (count($ldap_query)!=0) { |
|
410 | + Display :: display_error_message(get_lang('LDAPConnectionError')); |
|
411 | + } |
|
406 | 412 | return array(); |
407 | 413 | } |
408 | 414 | } |
@@ -206,8 +206,7 @@ |
||
206 | 206 | echo $message; |
207 | 207 | var_dump(debug_backtrace()); |
208 | 208 | die; |
209 | - } |
|
210 | - else |
|
209 | + } else |
|
211 | 210 | { |
212 | 211 | $message = "Assert successful $message <br/>"; |
213 | 212 | echo $message; |
@@ -168,12 +168,10 @@ |
||
168 | 168 | if (empty($result)) |
169 | 169 | { |
170 | 170 | $result = $default; |
171 | - } |
|
172 | - else if (count($result) == 1) |
|
171 | + } else if (count($result) == 1) |
|
173 | 172 | { |
174 | 173 | $result = reset($result); |
175 | - } |
|
176 | - else |
|
174 | + } else |
|
177 | 175 | { |
178 | 176 | $result = $result; |
179 | 177 | } |
@@ -56,8 +56,7 @@ discard block |
||
56 | 56 | if ($email = $form->get_email()) |
57 | 57 | { |
58 | 58 | $user->email = $email; |
59 | - } |
|
60 | - else |
|
59 | + } else |
|
61 | 60 | { |
62 | 61 | $content = $form->display(); |
63 | 62 | Shibboleth::display()->page($content); |
@@ -71,8 +70,7 @@ discard block |
||
71 | 70 | if ($is_new_user && $user->status_request) |
72 | 71 | { |
73 | 72 | Shibboleth::redirect('/main/auth/shibboleth/app/view/request.php'); |
74 | - } |
|
75 | - else |
|
73 | + } else |
|
76 | 74 | { |
77 | 75 | Shibboleth::redirect(); |
78 | 76 | } |
@@ -141,8 +139,7 @@ discard block |
||
141 | 139 | { |
142 | 140 | $request_submitted = get_lang('RequestSubmitted'); |
143 | 141 | Shibboleth::display()->message_page($request_submitted); |
144 | - } |
|
145 | - else |
|
142 | + } else |
|
146 | 143 | { |
147 | 144 | $request_failed = get_lang('RequestFailed'); |
148 | 145 | Shibboleth::display()->error_page($request_failed); |
@@ -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 | } |
@@ -25,8 +25,9 @@ |
||
25 | 25 | $tool_name=get_lang('Reports'); |
26 | 26 | |
27 | 27 | // Displaying the header |
28 | -foreach (array('jquery.ba-bbq.min.js', 'jquery.validate.js', 'jquery.form.js', 'jquery.form.wizard.js', 'jquery.dataTables.min.js') as $js) |
|
28 | +foreach (array('jquery.ba-bbq.min.js', 'jquery.validate.js', 'jquery.form.js', 'jquery.form.wizard.js', 'jquery.dataTables.min.js') as $js) { |
|
29 | 29 | $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/'.$js.'" type="text/javascript" language="javascript"></script>'."\n"; |
30 | +} |
|
30 | 31 | |
31 | 32 | // FIXME |
32 | 33 | $htmlHeadXtra[] = ' <style type="text/css"> |
@@ -8,8 +8,9 @@ discard block |
||
8 | 8 | // mysql handler |
9 | 9 | $result[$i]['mysql'] = mysql_query($array[$i]); |
10 | 10 | |
11 | - if (! $result[$i]['mysql']) |
|
12 | - die("error in query $i : ".$array[$i]); |
|
11 | + if (! $result[$i]['mysql']) { |
|
12 | + die("error in query $i : ".$array[$i]); |
|
13 | + } |
|
13 | 14 | |
14 | 15 | // fields |
15 | 16 | $result[$i]['num_fields'] = mysql_num_fields($result[$i]['mysql']); |
@@ -25,10 +26,11 @@ discard block |
||
25 | 26 | $result['num_queries'] = sizeof($array); |
26 | 27 | // rows |
27 | 28 | $numberOfResult = mysql_num_rows($result[0]['mysql']); |
28 | - for ($i = 1; $i <$result['num_queries']; $i++) |
|
29 | - if ($numberOfResult != mysql_num_rows($result[$i]['mysql'])) |
|
29 | + for ($i = 1; $i <$result['num_queries']; $i++) { |
|
30 | + if ($numberOfResult != mysql_num_rows($result[$i]['mysql'])) |
|
30 | 31 | die("wrong number of row: $numberOfResult vs ". |
31 | 32 | mysql_num_rows($result[$i]['mysql'])." on query $i"); |
33 | + } |
|
32 | 34 | |
33 | 35 | $result['num_rows'] = $numberOfResult; |
34 | 36 | $result['num_fields'] = $field; |
@@ -53,7 +55,10 @@ discard block |
||
53 | 55 | $pos = 0; |
54 | 56 | for ($i = 0; $i < $mq_h['num_queries']; $i++) { |
55 | 57 | $row = mysql_fetch_row($mq_h[$i]['mysql']); |
56 | - if (!$row) return false; // last line |
|
58 | + if (!$row) { |
|
59 | + return false; |
|
60 | + } |
|
61 | + // last line |
|
57 | 62 | for ($j = 0; $j < sizeof($row); $j++) { |
58 | 63 | $result[$pos] = $row[$j]; |
59 | 64 | $pos++; |
@@ -39,8 +39,9 @@ discard block |
||
39 | 39 | // Stored Value |
40 | 40 | $sv = array(); |
41 | 41 | foreach ($sv as $k => $v) { |
42 | - if (!isset($v['sql'])) |
|
43 | - $v['sql'] = 'FIELD'; |
|
42 | + if (!isset($v['sql'])) { |
|
43 | + $v['sql'] = 'FIELD'; |
|
44 | + } |
|
44 | 45 | $sqlField = str_replace('FIELD', 'sv.sv_value', $v['sql']); |
45 | 46 | $query = 'select '.$sqlField.' as "'.$v['title'].'" '; |
46 | 47 | // $query = 'select sec_to_time(sv.sv_value) as "'.$v.'" '; |
@@ -110,8 +111,9 @@ discard block |
||
110 | 111 | $query .= ' on u.user_id = lv.user_id and lv.lp_id = '.$v['lid']; |
111 | 112 | $query .= ' left outer join '.Database::get_course_table(TABLE_LP_ITEM_VIEW).' liv '; |
112 | 113 | $query .= ' on lv.id = liv.lp_view_id '; |
113 | - if ($v['target_view_count']) |
|
114 | - $query .= ' and liv.view_count = '.$v['target_view_count']; |
|
114 | + if ($v['target_view_count']) { |
|
115 | + $query .= ' and liv.view_count = '.$v['target_view_count']; |
|
116 | + } |
|
115 | 117 | $query .= ' and liv.lp_item_id = '.$v['liid'].' '; |
116 | 118 | $query .= ' where u.user_id in ('.reports_getVisibilitySQL().') '; |
117 | 119 | $query .= ' group by u.user_id '; |
@@ -21,21 +21,25 @@ |
||
21 | 21 | 'where r.course_id=c.id and r.tool_id is null and r.child_id is null'. |
22 | 22 | ' order by c.title'; |
23 | 23 | $columns = Database::query($query); |
24 | - if (Database::num_rows($columns) == 0) |
|
25 | - die('<b>'.get_lang('no data found: '.$query).'</b>'); |
|
24 | + if (Database::num_rows($columns) == 0) { |
|
25 | + die('<b>'.get_lang('no data found: '.$query).'</b>'); |
|
26 | + } |
|
26 | 27 | $columns = Database::store_result($columns); |
27 | 28 | |
28 | 29 | // fetch data |
29 | 30 | $query = 'select u.lastname Name, u.firstname Firstname'; |
30 | - foreach ($columns as $key => $column) |
|
31 | - $query .= ', sec_to_time(k'.$key.'.report_time) as `'. |
|
32 | - $column['course'].'` '; |
|
31 | + foreach ($columns as $key => $column) { |
|
32 | + $query .= ', sec_to_time(k'.$key.'.report_time) as `'. |
|
33 | + $column['course'].'` '; |
|
34 | + } |
|
33 | 35 | $query .= ' from '.Database::get_main_table(TABLE_MAIN_USER).' u '; |
34 | - foreach ($columns as $key => $column) // fixme sessions |
|
36 | + foreach ($columns as $key => $column) { |
|
37 | + // fixme sessions |
|
35 | 38 | $query .= 'left outer join '. |
36 | 39 | Database::get_main_table(TABLE_MAIN_REPORTS_VALUES). |
37 | 40 | ' k'.$key. |
38 | 41 | ' on k'.$key.'.key_id = '.$column['kid']. |
39 | 42 | ' and k'.$key.'.user_id = u.user_id '; |
43 | + } |
|
40 | 44 | return $query; |
41 | 45 | } |