@@ -233,7 +233,7 @@ |
||
233 | 233 | */ |
234 | 234 | public static function getMailer() |
235 | 235 | { |
236 | - return self::$container->get('mailer'); |
|
236 | + return self::$container->get('mailer'); |
|
237 | 237 | } |
238 | 238 | |
239 | 239 | /** |
@@ -88,7 +88,7 @@ |
||
88 | 88 | |
89 | 89 | // Admins have access to everything |
90 | 90 | if ($authChecker->isGranted('ROLE_ADMIN')) { |
91 | - // return true; |
|
91 | + // return true; |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | // Check if I'm the owner |
@@ -40,11 +40,11 @@ |
||
40 | 40 | // search users where username or firstname or lastname begins likes $needle |
41 | 41 | $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username'; |
42 | 42 | $sql = 'SELECT u.user_id, username, lastname, firstname FROM '.$tbl_user.' u '. |
43 | - ' WHERE (username LIKE "'.$needle.'%" '. |
|
44 | - ' OR firstname LIKE "'.$needle.'%" '. |
|
45 | - ' OR lastname LIKE "'.$needle.'%") '. |
|
43 | + ' WHERE (username LIKE "'.$needle.'%" '. |
|
44 | + ' OR firstname LIKE "'.$needle.'%" '. |
|
45 | + ' OR lastname LIKE "'.$needle.'%") '. |
|
46 | 46 | $order_clause . |
47 | - ' LIMIT 11'; |
|
47 | + ' LIMIT 11'; |
|
48 | 48 | |
49 | 49 | $rs = Database::query($sql); |
50 | 50 | $i=0; |
@@ -41,7 +41,7 @@ |
||
41 | 41 | public function getUser() |
42 | 42 | { |
43 | 43 | if (!$this->container->has('security.context')) { |
44 | - return false; |
|
44 | + return false; |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | if (null === $token = $this->container->get('security.context')->getToken()) { |
@@ -26,9 +26,9 @@ |
||
26 | 26 | protected function getTasks() |
27 | 27 | { |
28 | 28 | return array( |
29 | - new TaskModel('make stuff', 30, TaskModel::COLOR_GREEN), |
|
30 | - new TaskModel('make more stuff', 60), |
|
31 | - new TaskModel('some more tasks to do', 10, TaskModel::COLOR_RED) |
|
29 | + new TaskModel('make stuff', 30, TaskModel::COLOR_GREEN), |
|
30 | + new TaskModel('make more stuff', 60), |
|
31 | + new TaskModel('some more tasks to do', 10, TaskModel::COLOR_RED) |
|
32 | 32 | ); |
33 | 33 | |
34 | 34 | } |
@@ -56,9 +56,9 @@ discard block |
||
56 | 56 | * for all j in [O..max[y][ : for all i in bords[$j] : |
57 | 57 | * (i,j) is a point inside an edge of the polygone |
58 | 58 | */ |
59 | - $bord_lenght = $max['x']; |
|
59 | + $bord_lenght = $max['x']; |
|
60 | 60 | if ($max['y'] > $bord_lenght) { |
61 | - $bord_lenght = $max['y']; |
|
61 | + $bord_lenght = $max['y']; |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | //$bords = array_fill(0, $bord_lenght-1, array()); // building this array |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | |
67 | 67 | /* adding the first point of the polygone */ |
68 | 68 | if (is_array($bords[$poly[0]['y']])) //avoid warning |
69 | - array_push($bords[$poly[0]['y']], $poly[0]['x']); |
|
69 | + array_push($bords[$poly[0]['y']], $poly[0]['x']); |
|
70 | 70 | |
71 | 71 | $i = 1; // we re-use $i and $old_pente bellow the loop |
72 | 72 | $old_pente=0; |
@@ -78,14 +78,14 @@ discard block |
||
78 | 78 | if ($poly[$i-1]['x'] == $poly[$i]['x']) |
79 | 79 | continue; // twice the same point |
80 | 80 | else { // infinite elevation of the edge |
81 | - if (is_array($bords[$poly[$i]['y']])) |
|
82 | - array_push($bords[$poly[$i]['y']],$poly[$i]['x']); |
|
81 | + if (is_array($bords[$poly[$i]['y']])) |
|
82 | + array_push($bords[$poly[$i]['y']],$poly[$i]['x']); |
|
83 | 83 | $old_pente=0; |
84 | 84 | continue; |
85 | 85 | } |
86 | 86 | } |
87 | 87 | |
88 | - //echo 'point:'.$poly[$i]['y']; bug here |
|
88 | + //echo 'point:'.$poly[$i]['y']; bug here |
|
89 | 89 | // adding the point as a part of an edge |
90 | 90 | if (is_array($bords[$poly[$i]['y']])) //avoid warning |
91 | 91 | array_push($bords[$poly[$i]['y']], $poly[$i]['x']); |
@@ -102,13 +102,13 @@ discard block |
||
102 | 102 | if ($i>1) |
103 | 103 | if (($old_pente<0 && $pente>0) |
104 | 104 | || ($old_pente>0 && $pente<0)) { |
105 | - if (is_array($bords[$poly[$i]['y']])) //avoid warning |
|
106 | - array_push($bords[$poly[$i]['y']],$poly[$i]['x']); |
|
105 | + if (is_array($bords[$poly[$i]['y']])) //avoid warning |
|
106 | + array_push($bords[$poly[$i]['y']],$poly[$i]['x']); |
|
107 | 107 | |
108 | 108 | if (DEBUG) |
109 | 109 | echo '*('.$poly[$i]['x']. |
110 | 110 | ';'.$poly[$i]['y'].') '; |
111 | - } |
|
111 | + } |
|
112 | 112 | |
113 | 113 | /* detect the direction of the elevation in Y */ |
114 | 114 | $dy_inc = ($poly[$i]['y']-$poly[$i-1]['y']) > 0 ? 1 : -1; |
@@ -137,9 +137,9 @@ discard block |
||
137 | 137 | // elevation between $poly[0]['x'] and $poly[1]['x']) |
138 | 138 | $rest = $poly[0]['y']-$poly[1]['y']; |
139 | 139 | if ($rest!=0) |
140 | - $pente1 = ($poly[0]['x']-$poly[1]['x'])/($rest); |
|
140 | + $pente1 = ($poly[0]['x']-$poly[1]['x'])/($rest); |
|
141 | 141 | else |
142 | - $pente1 = 0; |
|
142 | + $pente1 = 0; |
|
143 | 143 | |
144 | 144 | // elevation between $poly[$i-1]['x'] and $poly[0]['x']) |
145 | 145 | $pente = ($poly[$i-1]['x']-$poly[0]['x'])/ |
@@ -151,14 +151,14 @@ discard block |
||
151 | 151 | |
152 | 152 | // doubling the first point if needed (see above) |
153 | 153 | if (($pente1<0 && $pente>0) || ($pente1>0 && $pente<0)) { |
154 | - if (is_array($bords[$poly[$i - 1]['y']])) |
|
155 | - array_push($bords[$poly[$i - 1]['y']], round($poly[$i - 1]['x'])); |
|
154 | + if (is_array($bords[$poly[$i - 1]['y']])) |
|
155 | + array_push($bords[$poly[$i - 1]['y']], round($poly[$i - 1]['x'])); |
|
156 | 156 | //if (DEBUG) echo '('.$poly[$i-1]['x'].';'.$poly[$i-1]['y'].') '; |
157 | 157 | } |
158 | 158 | // doubling the last point if neededd |
159 | 159 | if (($old_pente<0 && $pente>0) || ($old_pente>0 && $pente<0)) { |
160 | - if (is_array($bords[$poly[$i-1]['y']])) //avoid warning |
|
161 | - array_push($bords[$poly[$i-1]['y']], round($poly[$i-1]['x'])); |
|
160 | + if (is_array($bords[$poly[$i-1]['y']])) //avoid warning |
|
161 | + array_push($bords[$poly[$i-1]['y']], round($poly[$i-1]['x'])); |
|
162 | 162 | //if (DEBUG) echo '*('.$poly[$i-1]['x'].';'.$poly[$i-1]['y'].') '; |
163 | 163 | } |
164 | 164 | |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | for ($i = 0; $i<$n; $i++) { // Y |
186 | 186 | //error_log(__FILE__.' - Border Num '.$i,0); |
187 | 187 | if (is_array($bords[$i])) { |
188 | - sort($bords[$i]); |
|
188 | + sort($bords[$i]); |
|
189 | 189 | } |
190 | 190 | |
191 | 191 | for ($j = 0; $j<sizeof($bords[$i]);$j+=2) { // bords |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | for ($k = round($bords[$i][$j]); $k<=$bords[$i][$j+1];$k++) { |
197 | 197 | $res[$k][$i] = true; //filling the array with trues |
198 | 198 | if ($test == 1) { |
199 | - /*how to draw the polygon in a human way: |
|
199 | + /*how to draw the polygon in a human way: |
|
200 | 200 | In ubuntu : sudo apt-get install gnuplot |
201 | 201 | Create an empty file with all points with the result of this echos (No commas, no point, no headers) |
202 | 202 | In gnuplot: |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | For 2 polygons: plot "/home/jmontoya/test", "/home/jmontoya/test2" |
205 | 205 | A new window will appear with the plot |
206 | 206 | */ |
207 | - echo $k.' '.$i; echo '<br />'; |
|
207 | + echo $k.' '.$i; echo '<br />'; |
|
208 | 208 | } |
209 | 209 | } |
210 | 210 | } |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | list($x,$y) = explode(';',$pcoord); |
309 | 309 | $points[] = array('x'=>$x,'y'=>$y); |
310 | 310 | } |
311 | - return $points; |
|
311 | + return $points; |
|
312 | 312 | } |
313 | 313 | |
314 | 314 | /** |
@@ -321,11 +321,11 @@ discard block |
||
321 | 321 | $mx = 0; |
322 | 322 | $my = 0; |
323 | 323 | foreach ($coords1 as $coord) { |
324 | - if ($coord['x'] > $mx) { |
|
324 | + if ($coord['x'] > $mx) { |
|
325 | 325 | $mx = $coord['x']; |
326 | - } |
|
326 | + } |
|
327 | 327 | if ($coord['y'] > $my) { |
328 | - $my = $coord['y']; |
|
328 | + $my = $coord['y']; |
|
329 | 329 | } |
330 | 330 | } |
331 | 331 | foreach ($coords2 as $coord) { |
@@ -1,9 +1,9 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | $reports_template['exercicesMultiCourses'] = array( |
4 | - 'description' => 'Result of each test per student', |
|
5 | - 'getSQL' => 'reports_template_exercicesMultiCourses_getSQL', |
|
6 | - 'wizard' => |
|
4 | + 'description' => 'Result of each test per student', |
|
5 | + 'getSQL' => 'reports_template_exercicesMultiCourses_getSQL', |
|
6 | + 'wizard' => |
|
7 | 7 | ' |
8 | 8 | <span id="exercicesMultiCourses" class="step"> |
9 | 9 | <span class="font_normal_07em_black">Result of each test per student</span><br /> |
@@ -32,39 +32,39 @@ discard block |
||
32 | 32 | '); |
33 | 33 | |
34 | 34 | function reports_template_exercicesMultiCourses_getSQL() { |
35 | - // foreach quiz |
|
36 | - $result = array(); |
|
37 | - $columns = Database::query('select r.id as kid, c.title as course, '. |
|
38 | - 'r.child_name as test from '. |
|
39 | - Database::get_main_table(TABLE_MAIN_REPORTS_KEYS).' r, '. |
|
40 | - Database::get_main_table(TABLE_MAIN_COURSE).' c '. |
|
41 | - 'where r.course_id=c.id and r.tool_id='. |
|
42 | - reports_getToolId(TOOL_QUIZ). |
|
43 | - ' order by r.course_id, r.child_name'); |
|
44 | - if (Database::num_rows($columns) == 0) |
|
45 | - die('<b>'.get_lang('no data found').'</b>'); |
|
46 | - $query = 'select u.lastname Name, u.firstname Firstname'; |
|
47 | - $columns = Database::store_result($columns); |
|
48 | - if ($_REQUEST['tattempt'] == 'min' || $_REQUEST['tattempt'] == 'max') |
|
49 | - $function = $_REQUEST['tattempt']; |
|
50 | - else |
|
51 | - $function = 'avg'; |
|
52 | - foreach ($columns as $key => $column) |
|
53 | - $query .= ', '.$function.'(k'.$key.'.score) as `'. |
|
54 | - $column['course'].' - '. |
|
55 | - $column['test'].'` '; |
|
56 | - $query .= ' from '.Database::get_main_table(TABLE_MAIN_USER).' u '; |
|
57 | - foreach ($columns as $key => $column) // fixme sessions |
|
58 | - $query .= 'left outer join '. |
|
59 | - Database::get_main_table(TABLE_MAIN_REPORTS_VALUES). |
|
60 | - ' k'.$key. |
|
61 | - ' on k'.$key.'.key_id = '.$column['kid']. |
|
62 | - ' and k'.$key.'.user_id = u.user_id '; |
|
63 | - $query .= ' group by '; |
|
64 | - foreach ($columns as $key => $column) // grouping attempt |
|
65 | - $query .= 'k'.$key.'.attempt, '; |
|
66 | - $query = substr($query, 0, -2); // removing last ', '; |
|
35 | + // foreach quiz |
|
36 | + $result = array(); |
|
37 | + $columns = Database::query('select r.id as kid, c.title as course, '. |
|
38 | + 'r.child_name as test from '. |
|
39 | + Database::get_main_table(TABLE_MAIN_REPORTS_KEYS).' r, '. |
|
40 | + Database::get_main_table(TABLE_MAIN_COURSE).' c '. |
|
41 | + 'where r.course_id=c.id and r.tool_id='. |
|
42 | + reports_getToolId(TOOL_QUIZ). |
|
43 | + ' order by r.course_id, r.child_name'); |
|
44 | + if (Database::num_rows($columns) == 0) |
|
45 | + die('<b>'.get_lang('no data found').'</b>'); |
|
46 | + $query = 'select u.lastname Name, u.firstname Firstname'; |
|
47 | + $columns = Database::store_result($columns); |
|
48 | + if ($_REQUEST['tattempt'] == 'min' || $_REQUEST['tattempt'] == 'max') |
|
49 | + $function = $_REQUEST['tattempt']; |
|
50 | + else |
|
51 | + $function = 'avg'; |
|
52 | + foreach ($columns as $key => $column) |
|
53 | + $query .= ', '.$function.'(k'.$key.'.score) as `'. |
|
54 | + $column['course'].' - '. |
|
55 | + $column['test'].'` '; |
|
56 | + $query .= ' from '.Database::get_main_table(TABLE_MAIN_USER).' u '; |
|
57 | + foreach ($columns as $key => $column) // fixme sessions |
|
58 | + $query .= 'left outer join '. |
|
59 | + Database::get_main_table(TABLE_MAIN_REPORTS_VALUES). |
|
60 | + ' k'.$key. |
|
61 | + ' on k'.$key.'.key_id = '.$column['kid']. |
|
62 | + ' and k'.$key.'.user_id = u.user_id '; |
|
63 | + $query .= ' group by '; |
|
64 | + foreach ($columns as $key => $column) // grouping attempt |
|
65 | + $query .= 'k'.$key.'.attempt, '; |
|
66 | + $query = substr($query, 0, -2); // removing last ', '; |
|
67 | 67 | |
68 | 68 | |
69 | - return $query; |
|
69 | + return $query; |
|
70 | 70 | } |
@@ -27,7 +27,7 @@ |
||
27 | 27 | $tool_name = get_lang('AddSpecificSearchField'); |
28 | 28 | |
29 | 29 | if (isset($_GET['action']) && $_GET['action'] === 'edit') { |
30 | - $tool_name = get_lang('EditSpecificSearchField'); |
|
30 | + $tool_name = get_lang('EditSpecificSearchField'); |
|
31 | 31 | } |
32 | 32 | // Create the form |
33 | 33 | $form = new FormValidator('specific_fields_add'); |
@@ -46,10 +46,9 @@ discard block |
||
46 | 46 | - Universite Jean Monet (J Dubois / Michel Courbon) |
47 | 47 | - Michel Panckoucke for reporting and fixing a bug |
48 | 48 | - Patrick Cool: fixing security hole |
49 | - |
|
50 | - * @author Roan Embrechts |
|
51 | - * @version 3.0 |
|
52 | - * @package chamilo.auth.ldap |
|
49 | + * @author Roan Embrechts |
|
50 | + * @version 3.0 |
|
51 | + * @package chamilo.auth.ldap |
|
53 | 52 | * Note: |
54 | 53 | * If you are using a firewall, you might need to check port 389 is open in |
55 | 54 | * order for Chamilo to communicate with the LDAP server. |
@@ -211,8 +210,8 @@ discard block |
||
211 | 210 | $language = api_get_setting('platformLanguage'); |
212 | 211 | if (empty($language)) { $language = 'english'; } |
213 | 212 | $_userId = UserManager::create_user($prenom, $nom, $status, |
214 | - $email, $uname, $password, $official_code, |
|
215 | - $language,'', '', 'ldap'); |
|
213 | + $email, $uname, $password, $official_code, |
|
214 | + $language,'', '', 'ldap'); |
|
216 | 215 | |
217 | 216 | //echo "new user added to Chamilo, id = $_userId"; |
218 | 217 | |
@@ -271,7 +270,7 @@ discard block |
||
271 | 270 | // Open anonymous LDAP connection |
272 | 271 | $result=false; |
273 | 272 | $ldap_bind_res = ldap_handle_bind($ds,$result); |
274 | - // Executing the search with the $filter parametr |
|
273 | + // Executing the search with the $filter parametr |
|
275 | 274 | //error_log('Searching for '.$filter.' on LDAP server',0); |
276 | 275 | $sr=ldap_search($ds,$ldap_basedn,$filter); |
277 | 276 | $info = ldap_get_entries($ds, $sr); |
@@ -564,35 +563,35 @@ discard block |
||
564 | 563 | foreach ($UserList as $enreg_user) { |
565 | 564 | $enreg_user = (int) $enreg_user; |
566 | 565 | Database::query("INSERT IGNORE ". |
567 | - " INTO $tbl_session_rel_course_rel_user ". |
|
568 | - "(session_id,c_id,user_id) VALUES ". |
|
569 | - "('$id_session','$enreg_course','$enreg_user')"); |
|
566 | + " INTO $tbl_session_rel_course_rel_user ". |
|
567 | + "(session_id,c_id,user_id) VALUES ". |
|
568 | + "('$id_session','$enreg_course','$enreg_user')"); |
|
570 | 569 | } |
571 | 570 | $sql = "SELECT COUNT(user_id) as nbUsers ". |
572 | - " FROM $tbl_session_rel_course_rel_user " . |
|
573 | - " WHERE session_id='$id_session' ". |
|
574 | - " AND c_id='$enreg_course'"; |
|
571 | + " FROM $tbl_session_rel_course_rel_user " . |
|
572 | + " WHERE session_id='$id_session' ". |
|
573 | + " AND c_id='$enreg_course'"; |
|
575 | 574 | $rs = Database::query($sql); |
576 | 575 | list($nbr_users) = Database::fetch_array($rs); |
577 | 576 | Database::query("UPDATE $tbl_session_rel_course ". |
578 | - " SET nbr_users=$nbr_users " . |
|
579 | - " WHERE session_id='$id_session' ". |
|
580 | - " AND c_id='$enreg_course'"); |
|
577 | + " SET nbr_users=$nbr_users " . |
|
578 | + " WHERE session_id='$id_session' ". |
|
579 | + " AND c_id='$enreg_course'"); |
|
581 | 580 | } |
582 | 581 | foreach ($UserList as $enreg_user) { |
583 | 582 | $enreg_user = (int) $enreg_user; |
584 | 583 | Database::query("INSERT IGNORE INTO $tbl_session_rel_user ". |
585 | - " (session_id, user_id, registered_at) " . |
|
586 | - " VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')"); |
|
584 | + " (session_id, user_id, registered_at) " . |
|
585 | + " VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')"); |
|
587 | 586 | } |
588 | 587 | // We update the number of users in the session |
589 | 588 | $sql = "SELECT COUNT(user_id) as nbUsers FROM $tbl_session_rel_user ". |
590 | - " WHERE session_id='$id_session' ". |
|
591 | - " AND relation_type<>".SESSION_RELATION_TYPE_RRHH." "; |
|
589 | + " WHERE session_id='$id_session' ". |
|
590 | + " AND relation_type<>".SESSION_RELATION_TYPE_RRHH." "; |
|
592 | 591 | $rs = Database::query($sql); |
593 | 592 | list($nbr_users) = Database::fetch_array($rs); |
594 | 593 | Database::query("UPDATE $tbl_session SET nbr_users=$nbr_users ". |
595 | - " WHERE id='$id_session'"); |
|
594 | + " WHERE id='$id_session'"); |
|
596 | 595 | } |
597 | 596 | |
598 | 597 | function syncro_users() { |