@@ -228,36 +228,51 @@ discard block |
||
228 | 228 | } |
229 | 229 | |
230 | 230 | if (isset ($user_id)) { |
231 | - if ($paramcount != 0) $sql .= ' AND'; |
|
232 | - else $sql .= ' WHERE'; |
|
231 | + if ($paramcount != 0) { |
|
232 | + $sql .= ' AND'; |
|
233 | + } else { |
|
234 | + $sql .= ' WHERE'; |
|
235 | + } |
|
233 | 236 | $sql .= ' user_id = '.intval($user_id); |
234 | 237 | $paramcount ++; |
235 | 238 | } |
236 | 239 | |
237 | 240 | if (isset ($course_code) && $course_code <> '-1') { |
238 | - if ($paramcount != 0) $sql .= ' AND'; |
|
239 | - else $sql .= ' WHERE'; |
|
241 | + if ($paramcount != 0) { |
|
242 | + $sql .= ' AND'; |
|
243 | + } else { |
|
244 | + $sql .= ' WHERE'; |
|
245 | + } |
|
240 | 246 | $sql .= " course_code = '".Database::escape_string($course_code)."'"; |
241 | 247 | $paramcount ++; |
242 | 248 | } |
243 | 249 | |
244 | 250 | if (isset ($category_id)) { |
245 | - if ($paramcount != 0) $sql .= ' AND'; |
|
246 | - else $sql .= ' WHERE'; |
|
251 | + if ($paramcount != 0) { |
|
252 | + $sql .= ' AND'; |
|
253 | + } else { |
|
254 | + $sql .= ' WHERE'; |
|
255 | + } |
|
247 | 256 | $sql .= ' category_id = '.intval($category_id); |
248 | 257 | $paramcount ++; |
249 | 258 | } |
250 | 259 | |
251 | 260 | if (isset ($visible)) { |
252 | - if ($paramcount != 0) $sql .= ' AND'; |
|
253 | - else $sql .= ' WHERE'; |
|
261 | + if ($paramcount != 0) { |
|
262 | + $sql .= ' AND'; |
|
263 | + } else { |
|
264 | + $sql .= ' WHERE'; |
|
265 | + } |
|
254 | 266 | $sql .= ' visible = '.intval($visible); |
255 | 267 | $paramcount ++; |
256 | 268 | } |
257 | 269 | |
258 | 270 | if (isset ($locked)) { |
259 | - if ($paramcount != 0) $sql .= ' AND'; |
|
260 | - else $sql .= ' WHERE'; |
|
271 | + if ($paramcount != 0) { |
|
272 | + $sql .= ' AND'; |
|
273 | + } else { |
|
274 | + $sql .= ' WHERE'; |
|
275 | + } |
|
261 | 276 | $sql .= ' locked = '.intval($locked); |
262 | 277 | } |
263 | 278 | |
@@ -397,7 +412,7 @@ discard block |
||
397 | 412 | .', description = '; |
398 | 413 | if (isset($this->description)) { |
399 | 414 | $sql .= "'".Database::escape_string($this->get_description())."'"; |
400 | - }else { |
|
415 | + } else { |
|
401 | 416 | $sql .= 'null'; |
402 | 417 | } |
403 | 418 | $sql .= ', user_id = '.intval($this->get_user_id()) |
@@ -468,7 +483,7 @@ discard block |
||
468 | 483 | $sql .= ' AND user_id = '.api_get_user_id(); |
469 | 484 | } |
470 | 485 | |
471 | - }else { |
|
486 | + } else { |
|
472 | 487 | $sql .= ' AND user_id = '.api_get_user_id(); |
473 | 488 | } |
474 | 489 |
@@ -269,8 +269,7 @@ |
||
269 | 269 | echo '<br /><br />'; |
270 | 270 | echo '</div>'; |
271 | 271 | |
272 | -} |
|
273 | -elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes')) |
|
272 | +} elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes')) |
|
274 | 273 | { |
275 | 274 | $id=$_POST['username_form']; |
276 | 275 | $UserList=array(); |
@@ -99,7 +99,10 @@ discard block |
||
99 | 99 | <td width="40%" align="center"> |
100 | 100 | <select name="user_group_list[]" multiple="multiple" size="20" style="width:400px;"> |
101 | 101 | <?php foreach ($dbUserGroups as $item) { ?> |
102 | - <option value="<?php echo $item['id']; ?>" <?php if (in_array($item['id'], $courses)) echo 'selected="selected"'; ?>><?php echo $item['name']; ?> |
|
102 | + <option value="<?php echo $item['id']; ?>" <?php if (in_array($item['id'], $courses)) { |
|
103 | + echo 'selected="selected"'; |
|
104 | +} |
|
105 | +?>><?php echo $item['name']; ?> |
|
103 | 106 | </option> |
104 | 107 | <?php } ?> |
105 | 108 | </select> |
@@ -110,7 +113,10 @@ discard block |
||
110 | 113 | <td width="40%" align="center"> |
111 | 114 | <select name="url_list[]" multiple="multiple" size="20" style="width:300px;"> |
112 | 115 | <?php foreach ($db_urls as $url_obj) { ?> |
113 | - <option value="<?php echo $url_obj['id']; ?>" <?php if (in_array($url_obj['id'], $url_list)) echo 'selected="selected"'; ?>><?php echo $url_obj['url']; ?> |
|
116 | + <option value="<?php echo $url_obj['id']; ?>" <?php if (in_array($url_obj['id'], $url_list)) { |
|
117 | + echo 'selected="selected"'; |
|
118 | +} |
|
119 | +?>><?php echo $url_obj['url']; ?> |
|
114 | 120 | </option> |
115 | 121 | <?php } ?> |
116 | 122 | </select> |
@@ -200,8 +200,9 @@ |
||
200 | 200 | continue; |
201 | 201 | } |
202 | 202 | |
203 | - if (is_array($variable_value)) |
|
204 | - echo $lang_file; |
|
203 | + if (is_array($variable_value)) { |
|
204 | + echo $lang_file; |
|
205 | + } |
|
205 | 206 | $founded = false; |
206 | 207 | if ($search_in_english && $search_in_variable) { |
207 | 208 | // searching the item in the parent tool |
@@ -144,7 +144,10 @@ |
||
144 | 144 | echo '</div>'; |
145 | 145 | ?> |
146 | 146 | |
147 | -<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>> |
|
147 | +<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) { |
|
148 | + echo '&add=true' ; |
|
149 | +} |
|
150 | +?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>> |
|
148 | 151 | <?php echo '<legend>'.$tool_name.' '.$promotion_data['name'].'</legend>'; |
149 | 152 | |
150 | 153 | if ($add_type=='multiple') { |
@@ -119,7 +119,10 @@ discard block |
||
119 | 119 | <td width="40%" align="center"> |
120 | 120 | <select name="course_list[]" multiple="multiple" size="20" style="width:400px;"> |
121 | 121 | <?php foreach ($db_courses as $course) { ?> |
122 | - <option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) echo 'selected="selected"'; ?>><?php echo $course['title'].' ('.$course['code'].')'; ?> |
|
122 | + <option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) { |
|
123 | + echo 'selected="selected"'; |
|
124 | +} |
|
125 | +?>><?php echo $course['title'].' ('.$course['code'].')'; ?> |
|
123 | 126 | </option> |
124 | 127 | <?php } ?> |
125 | 128 | </select> |
@@ -130,7 +133,10 @@ discard block |
||
130 | 133 | <td width="40%" align="center"> |
131 | 134 | <select name="url_list[]" multiple="multiple" size="20" style="width:300px;"> |
132 | 135 | <?php foreach ($db_urls as $url_obj) { ?> |
133 | - <option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) echo 'selected="selected"'; ?>><?php echo $url_obj['url']; ?> |
|
136 | + <option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) { |
|
137 | + echo 'selected="selected"'; |
|
138 | +} |
|
139 | +?>><?php echo $url_obj['url']; ?> |
|
134 | 140 | </option> |
135 | 141 | <?php } ?> |
136 | 142 | </select> |
@@ -63,8 +63,7 @@ discard block |
||
63 | 63 | echo '</form>'; |
64 | 64 | echo '</div>'; |
65 | 65 | |
66 | -} |
|
67 | -elseif(!empty($annee) && empty($id_session)) |
|
66 | +} elseif(!empty($annee) && empty($id_session)) |
|
68 | 67 | { |
69 | 68 | Display::display_header($tool_name); |
70 | 69 | echo '<div style="align:center">'; |
@@ -142,8 +141,7 @@ discard block |
||
142 | 141 | echo '<br /><br />'; |
143 | 142 | echo '</div>'; |
144 | 143 | |
145 | -} |
|
146 | -elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed']=='yes')) |
|
144 | +} elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed']=='yes')) |
|
147 | 145 | { |
148 | 146 | $id=$_POST['username_form']; |
149 | 147 | $UserList=array(); |
@@ -118,7 +118,10 @@ discard block |
||
118 | 118 | <?php |
119 | 119 | foreach ($db_users as $user) { |
120 | 120 | ?> |
121 | - <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'], $users)) echo 'selected="selected"'; ?>> |
|
121 | + <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'], $users)) { |
|
122 | + echo 'selected="selected"'; |
|
123 | +} |
|
124 | +?>> |
|
122 | 125 | <?php echo api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; ?> |
123 | 126 | </option> |
124 | 127 | <?php |
@@ -134,7 +137,10 @@ discard block |
||
134 | 137 | <?php |
135 | 138 | foreach ($db_urls as $url_obj) { |
136 | 139 | ?> |
137 | - <option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) echo 'selected="selected"'; ?>> |
|
140 | + <option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) { |
|
141 | + echo 'selected="selected"'; |
|
142 | +} |
|
143 | +?>> |
|
138 | 144 | <?php echo $url_obj['url']; ?> |
139 | 145 | </option> |
140 | 146 | <?php |
@@ -118,8 +118,7 @@ |
||
118 | 118 | if (isset($included) && ($included)) |
119 | 119 | { |
120 | 120 | $message .= "> $name_session: ".count($UserAdd)." ".get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified').'<br/>'; |
121 | - } |
|
122 | - else |
|
121 | + } else |
|
123 | 122 | { |
124 | 123 | print "> $name_session: ".count($UserAdd).get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified')."\n"; |
125 | 124 | } |