Completed
Push — 1.10.x ( fe0e5a...3a6f9c )
by Yannick
134:15 queued 86:39
created
main/admin/subscribe_user2course.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
       <option value="">--</option>
264 264
       <?php
265 265
         echo Display :: get_alphabet_options($first_letter_user);
266
-      ?>
266
+        ?>
267 267
      </select>
268 268
     </td>
269 269
     <td width="20%">&nbsp;</td>
@@ -274,8 +274,8 @@  discard block
 block discarded – undo
274 274
      <select name="firstLetterCourse" onchange="javascript:document.formulaire.form_sent.value='2'; document.formulaire.submit();">
275 275
       <option value="">--</option>
276 276
       <?php
277
-      echo Display :: get_alphabet_options($first_letter_course);
278
-      ?>
277
+        echo Display :: get_alphabet_options($first_letter_course);
278
+        ?>
279 279
      </select>
280 280
     </td>
281 281
    </tr>
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
         }
296 296
 
297 297
         echo $userName;
298
-      ?>
298
+        ?>
299 299
       </option>
300 300
 <?php
301 301
 }
Please login to merge, or discard this patch.
main/admin/legal_list.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -24,9 +24,9 @@  discard block
 block discarded – undo
24 24
 
25 25
 // Actions
26 26
 if (isset ($_GET['action'])) {
27
-	if ($_GET['action'] == 'show_message')
28
-		Display :: display_normal_message(Security::remove_XSS(stripslashes($_GET['message'])));
29
-	Security::clear_token();
27
+    if ($_GET['action'] == 'show_message')
28
+        Display :: display_normal_message(Security::remove_XSS(stripslashes($_GET['message'])));
29
+    Security::clear_token();
30 30
 }
31 31
 
32 32
 $legal_count = LegalManager::count();
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
 
53 53
 // this 2 "mask" function are here just because the SortableTable
54 54
 function get_legal_data_mask($id, $params=null, $row=null) {
55
-	return LegalManager::get_legal_data($id, $params, $row);
55
+    return LegalManager::get_legal_data($id, $params, $row);
56 56
 }
57 57
 function count_mask() {
58
-	return LegalManager::count();
58
+    return LegalManager::count();
59 59
 }
60 60
 Display :: display_footer();
Please login to merge, or discard this patch.
main/admin/skills_gradebook.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
                         array('name'=>'certificate',    'index'=>'certificate', 'width'=>'25', 'align'=>'left', 'sortable'=>'false'),
51 51
                         array('name'=>'skills',         'index'=>'skills',      'width'=>'300', 'align'=>'left', 'sortable'=>'false'),
52 52
                         array('name'=>'actions',        'index'=>'actions',     'width'=>'30', 'align'=>'left','formatter'=>'action_formatter','sortable'=>'false')
53
-                       );
53
+                        );
54 54
 //Autowidth
55 55
 $extra_params['autowidth'] = 'true';
56 56
 //height auto
Please login to merge, or discard this patch.
main/admin/add_sessions_to_promotion.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
       <option value = "%">--</option>
198 198
       <?php
199 199
         echo Display :: get_alphabet_options();
200
-      ?>
200
+        ?>
201 201
      </select>
202 202
 </td>
203 203
 <td align="center">&nbsp;</td>
@@ -207,31 +207,31 @@  discard block
 block discarded – undo
207 207
   <td align="center">
208 208
   <div id="content_source">
209 209
       <?php
210
-      if (!($add_type=='multiple')) {
210
+        if (!($add_type=='multiple')) {
211 211
         ?>
212 212
         <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
213 213
         <div id="ajax_list_users_single"></div>
214 214
         <?php
215
-      } else {
216
-      ?>
215
+        } else {
216
+        ?>
217 217
       <div id="ajax_list_multiple">
218 218
         <?php echo Display::select('session_not_in_promotion_name',$session_not_in_promotion, '',array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'session_not_in_promotion','size'=>'15px'),false); ?>
219 219
       </div>
220 220
     <?php
221
-      }
222
-     ?>
221
+        }
222
+        ?>
223 223
   </div>
224 224
   </td>
225 225
   <td width="10%" valign="middle" align="center">
226 226
   <?php
227
-  if ($ajax_search) {
228
-  ?>
227
+    if ($ajax_search) {
228
+    ?>
229 229
     <button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('session_in_promotion'))" >
230 230
         <em class="fa fa-arrow-left"></em>
231 231
     </button>
232 232
   <?php
233
-  } else {
234
-  ?>
233
+    } else {
234
+    ?>
235 235
     <button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('session_not_in_promotion'), document.getElementById('session_in_promotion'))" onclick="moveItem(document.getElementById('session_not_in_promotion'), document.getElementById('session_in_promotion'))">
236 236
         <em class="fa fa-arrow-right"></em>
237 237
     </button>
@@ -240,8 +240,8 @@  discard block
 block discarded – undo
240 240
         <em class="fa fa-arrow-left"></em>
241 241
     </button>
242 242
     <?php
243
-  }
244
-  ?>
243
+    }
244
+    ?>
245 245
     <br /><br /><br /><br /><br /><br />
246 246
   </td>
247 247
   <td align="center">
Please login to merge, or discard this patch.
main/admin/dashboard_add_courses_to_user.php 1 patch
Indentation   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -36,20 +36,20 @@  discard block
 block discarded – undo
36 36
 
37 37
 // setting the name of the tool
38 38
 if (UserManager::is_admin($user_id)) {
39
-	$tool_name= get_lang('AssignCoursesToPlatformAdministrator');
39
+    $tool_name= get_lang('AssignCoursesToPlatformAdministrator');
40 40
 } else if ($user_info['status'] == SESSIONADMIN) {
41
-	$tool_name= get_lang('AssignCoursesToSessionsAdministrator');
41
+    $tool_name= get_lang('AssignCoursesToSessionsAdministrator');
42 42
 } else {
43
-	$tool_name= get_lang('AssignCoursesToHumanResourcesManager');
43
+    $tool_name= get_lang('AssignCoursesToHumanResourcesManager');
44 44
 }
45 45
 
46 46
 $add_type = 'multiple';
47 47
 if(isset($_GET['add_type']) && $_GET['add_type']!='') {
48
-	$add_type = Security::remove_XSS($_REQUEST['add_type']);
48
+    $add_type = Security::remove_XSS($_REQUEST['add_type']);
49 49
 }
50 50
 
51 51
 if (!api_is_platform_admin()) {
52
-	api_not_allowed(true);
52
+    api_not_allowed(true);
53 53
 }
54 54
 
55 55
 function search_courses($needle, $type)
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
     $return = '';
61 61
     if (!empty($needle) && !empty($type)) {
62 62
         // xajax send utf8 datas... datas in db can be non-utf8 datas
63
-		$needle = Database::escape_string($needle);
63
+        $needle = Database::escape_string($needle);
64 64
 
65 65
         $assigned_courses_to_hrm = CourseManager::get_courses_followed_by_drh($user_id);
66 66
         $assigned_courses_code = array_keys($assigned_courses_to_hrm);
@@ -88,16 +88,16 @@  discard block
 block discarded – undo
88 88
                 		$without_assigned_courses ";
89 89
         }
90 90
 
91
-		$rs	= Database::query($sql);
91
+        $rs	= Database::query($sql);
92 92
 
93
-		$return .= '<select id="origin" name="NoAssignedCoursesList[]" multiple="multiple" size="20" >';
94
-		while($course = Database :: fetch_array($rs)) {
95
-			$return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'],ENT_QUOTES).'">'.$course['title'].' ('.$course['code'].')</option>';
96
-		}
97
-		$return .= '</select>';
98
-		$xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
99
-	}
100
-	return $xajax_response;
93
+        $return .= '<select id="origin" name="NoAssignedCoursesList[]" multiple="multiple" size="20" >';
94
+        while($course = Database :: fetch_array($rs)) {
95
+            $return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'],ENT_QUOTES).'">'.$course['title'].' ('.$course['code'].')</option>';
96
+        }
97
+        $return .= '</select>';
98
+        $xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
99
+    }
100
+    return $xajax_response;
101 101
 }
102 102
 
103 103
 $xajax->processRequests();
@@ -181,23 +181,23 @@  discard block
 block discarded – undo
181 181
 $assigned_courses_to_hrm = CourseManager::get_courses_followed_by_drh($user_id);
182 182
 $assigned_courses_code = array_keys($assigned_courses_to_hrm);
183 183
 foreach ($assigned_courses_code as &$value) {
184
-	$value = "'".$value."'";
184
+    $value = "'".$value."'";
185 185
 }
186 186
 
187 187
 $without_assigned_courses = '';
188 188
 if (count($assigned_courses_code) > 0) {
189
-	$without_assigned_courses = " AND c.code NOT IN(".implode(',',$assigned_courses_code).")";
189
+    $without_assigned_courses = " AND c.code NOT IN(".implode(',',$assigned_courses_code).")";
190 190
 }
191 191
 
192 192
 $needle = '%';
193 193
 $firstLetter = null;
194 194
 if (isset($_POST['firstLetterCourse'])) {
195
-	$firstLetter = $_POST['firstLetterCourse'];
196
-	$needle = Database::escape_string($firstLetter.'%');
195
+    $firstLetter = $_POST['firstLetterCourse'];
196
+    $needle = Database::escape_string($firstLetter.'%');
197 197
 }
198 198
 
199 199
 if (api_is_multiple_url_enabled()) {
200
-	$sql = " SELECT c.code, c.title
200
+    $sql = " SELECT c.code, c.title
201 201
             FROM $tbl_course c
202 202
             LEFT JOIN $tbl_course_rel_access_url a
203 203
             ON (a.c_id = c.id)
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
             ORDER BY c.title";
208 208
 
209 209
 } else {
210
-	$sql= " SELECT c.code, c.title
210
+    $sql= " SELECT c.code, c.title
211 211
 	        FROM $tbl_course c
212 212
             WHERE  c.code LIKE '$needle' $without_assigned_courses
213 213
             ORDER BY c.title";
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 <input type="hidden" name="formSent" value="1" />
222 222
 <?php
223 223
 if(!empty($msg)) {
224
-	Display::display_normal_message($msg); //main API
224
+    Display::display_normal_message($msg); //main API
225 225
 }
226 226
 ?>
227 227
 
@@ -269,13 +269,13 @@  discard block
 block discarded – undo
269 269
     </div>
270 270
     <div class="col-md-4">
271 271
         <h5><?php
272
-	  	if (UserManager::is_admin($user_id)) {
273
-			echo get_lang('AssignedCoursesListToPlatformAdministrator');
274
-		} else if ($user_info['status'] == SESSIONADMIN) {
275
-			echo get_lang('AssignedCoursesListToSessionsAdministrator');
276
-		} else {
277
-			echo get_lang('AssignedCoursesListToHumanResourcesManager');
278
-		}
272
+            if (UserManager::is_admin($user_id)) {
273
+            echo get_lang('AssignedCoursesListToPlatformAdministrator');
274
+        } else if ($user_info['status'] == SESSIONADMIN) {
275
+            echo get_lang('AssignedCoursesListToSessionsAdministrator');
276
+        } else {
277
+            echo get_lang('AssignedCoursesListToHumanResourcesManager');
278
+        }
279 279
             ?>: </h5>
280 280
         
281 281
         <select id='destination' name="CoursesList[]" multiple="multiple" size="20" style="width:320px;">
Please login to merge, or discard this patch.
main/admin/access_url_edit_usergroup_to_url.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
         $userGroupList[$item['id']] = $item;
122 122
     }
123 123
 } else {
124
-	$userGroups = UrlManager::get_url_rel_usergroup_data();
124
+    $userGroups = UrlManager::get_url_rel_usergroup_data();
125 125
 
126 126
     foreach ($userGroups as $item) {
127 127
         if ($item['access_url_id'] == $access_url_id) {
@@ -132,11 +132,11 @@  discard block
 block discarded – undo
132 132
 }
133 133
 
134 134
 if ($add_type == 'multiple') {
135
-	$link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeUnique').'</a>';
136
-	$link_add_type_multiple = get_lang('SessionAddTypeMultiple');
135
+    $link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeUnique').'</a>';
136
+    $link_add_type_multiple = get_lang('SessionAddTypeMultiple');
137 137
 } else {
138
-	$link_add_type_unique = get_lang('SessionAddTypeUnique');
139
-	$link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeMultiple').'</a>';
138
+    $link_add_type_unique = get_lang('SessionAddTypeUnique');
139
+    $link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeMultiple').'</a>';
140 140
 }
141 141
 
142 142
 $url_list = UrlManager::get_url_data();
@@ -200,30 +200,30 @@  discard block
 block discarded – undo
200 200
     <?php } else { ?>
201 201
 	  <select id="origin_users" name="no_course_list[]" multiple="multiple" size="15" style="width:380px;">
202 202
 		<?php
203
-		foreach ($noUserGroupList as $noItem) {
204
-		?>
203
+        foreach ($noUserGroupList as $noItem) {
204
+        ?>
205 205
 			<option value="<?php echo $noItem['id']; ?>">
206 206
                 <?php echo $noItem['name']; ?>
207 207
             </option>
208 208
 		<?php
209
-		}
210
-		?>
209
+        }
210
+        ?>
211 211
 	  </select>
212 212
 	<?php
213
-  	  }
214
-  	 ?>
213
+        }
214
+        ?>
215 215
   </div>
216 216
   </td>
217 217
   <td width="10%" valign="middle" align="center">
218 218
   <?php
219
-  if ($ajax_search) {
220
-	?>
219
+    if ($ajax_search) {
220
+    ?>
221 221
 	<button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('destination_users'))" >
222 222
         <em class="fa fa-arrow-left"></em>
223 223
 	</button>
224 224
   	<?php
225
-  } else {
226
-  	?>
225
+    } else {
226
+        ?>
227 227
 	<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" >
228 228
         <em class="fa fa-arrow-right"></em>
229 229
 	</button>
@@ -232,8 +232,8 @@  discard block
 block discarded – undo
232 232
         <em class="fa fa-arrow-left"></em>
233 233
 	</button>
234 234
 	<?php
235
-  }
236
-  ?>
235
+    }
236
+    ?>
237 237
 	<br /><br /><br /><br /><br /><br />
238 238
   </td>
239 239
   <td align="center">
@@ -254,11 +254,11 @@  discard block
 block discarded – undo
254 254
 	<td colspan="3" align="center">
255 255
 		<br />
256 256
 		<?php
257
-		if(isset($_GET['add']))
258
-			echo '<button class="save" onclick="valide()" >'.get_lang('AddUserGroupToURL').'</button>';
259
-		else
260
-			echo '<button class="save" onclick="valide()" >'.get_lang('EditUserGroupToURL').'</button>';
261
-		?>
257
+        if(isset($_GET['add']))
258
+            echo '<button class="save" onclick="valide()" >'.get_lang('AddUserGroupToURL').'</button>';
259
+        else
260
+            echo '<button class="save" onclick="valide()" >'.get_lang('EditUserGroupToURL').'</button>';
261
+        ?>
262 262
 	</td>
263 263
 </tr>
264 264
 </table>
Please login to merge, or discard this patch.
main/admin/group_add.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -100,9 +100,9 @@  discard block
 block discarded – undo
100 100
 
101 101
 // Validate form
102 102
 if ($form->validate()) {
103
-	$check = Security::check_token('post');
104
-	if ($check) {
105
-		$values = $form->exportValues();
103
+    $check = Security::check_token('post');
104
+    if ($check) {
105
+        $values = $form->exportValues();
106 106
 
107 107
         $picture_element = $form->getElement('picture');
108 108
         $picture = $picture_element->getValue();
@@ -114,10 +114,10 @@  discard block
 block discarded – undo
114 114
         $picture = $_FILES['picture'];
115 115
         $parent_group_id = intval($values['parent_group']);
116 116
 
117
-		$group_id = GroupPortalManager::add($name, $description, $url, $status);
117
+        $group_id = GroupPortalManager::add($name, $description, $url, $status);
118 118
         GroupPortalManager::set_parent_group($group_id,$parent_group_id);
119 119
 
120
-		if (!empty($picture['name'])) {
120
+        if (!empty($picture['name'])) {
121 121
             $picture_uri = GroupPortalManager::update_group_picture(
122 122
                 $group_id,
123 123
                 $_FILES['picture']['name'],
@@ -131,9 +131,9 @@  discard block
 block discarded – undo
131 131
                 $status,
132 132
                 $picture_uri
133 133
             );
134
-		}
134
+        }
135 135
 
136
-		//@todo send emails
136
+        //@todo send emails
137 137
 
138 138
 /*		if (!empty($email) && $send_mail) {
139 139
 			$recipient_name = api_get_person_name($firstname, $lastname, null, PERSON_NAME_EMAIL_ADDRESS);
@@ -155,18 +155,18 @@  discard block
 block discarded – undo
155 155
 			@api_mail_html($recipient_name, $email, $emailsubject, $emailbody, $sender_name, $email_admin);
156 156
 		}*/
157 157
 
158
-		Security::clear_token();
159
-		$tok = Security::get_token();
160
-		header('Location: group_list.php?action=show_message&message='.urlencode(get_lang('GroupAdded')).'&sec_token='.$tok);
158
+        Security::clear_token();
159
+        $tok = Security::get_token();
160
+        header('Location: group_list.php?action=show_message&message='.urlencode(get_lang('GroupAdded')).'&sec_token='.$tok);
161 161
         exit ();
162
-	}
162
+    }
163 163
 } else {
164
-	if (isset($_POST['submit'])) {
165
-		Security::clear_token();
166
-	}
167
-	$token = Security::get_token();
168
-	$form->addElement('hidden', 'sec_token');
169
-	$form->setConstants(array('sec_token' => $token));
164
+    if (isset($_POST['submit'])) {
165
+        Security::clear_token();
166
+    }
167
+    $token = Security::get_token();
168
+    $form->addElement('hidden', 'sec_token');
169
+    $form->setConstants(array('sec_token' => $token));
170 170
 }
171 171
 
172 172
 // Display form
Please login to merge, or discard this patch.
main/admin/promotions.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@
 block discarded – undo
112 112
 <script>
113 113
 $(function() {
114 114
 <?php
115
-     echo Display::grid_js('promotions', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
115
+        echo Display::grid_js('promotions', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
116 116
 ?>
117 117
 });
118 118
 </script>
Please login to merge, or discard this patch.
main/admin/access_url_add_courses_to_url.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@
 block discarded – undo
107 107
       <?php
108 108
         echo Display :: get_alphabet_options($first_letter_course);
109 109
         echo Display :: get_numeric_options(0,9,$first_letter_course);
110
-      ?>
110
+        ?>
111 111
      </select>
112 112
     </td>
113 113
         <td width="20%">&nbsp;</td>
Please login to merge, or discard this patch.