Passed
Push — 1.10.x ( ffa1de...5c22eb )
by Yannick
1010:23 queued 946:48
created
main/admin/add_courses_to_usergroup.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -229,31 +229,31 @@  discard block
 block discarded – undo
229 229
   <td align="center">
230 230
   <div id="content_source">
231 231
       <?php
232
-      if (!($add_type=='multiple')) {
232
+        if (!($add_type=='multiple')) {
233 233
         ?>
234 234
         <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
235 235
         <div id="ajax_list_users_single"></div>
236 236
         <?php
237
-      } else {
238
-      ?>
237
+        } else {
238
+        ?>
239 239
       <div id="ajax_list_multiple">
240 240
         <?php echo Display::select('elements_not_in_name', $elements_not_in, '', array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'elements_not_in','size'=>'15px'),false); ?>
241 241
       </div>
242 242
     <?php
243
-      }
244
-     ?>
243
+        }
244
+        ?>
245 245
   </div>
246 246
   </td>
247 247
   <td width="10%" valign="middle" align="center">
248 248
   <?php
249
-  if ($ajax_search) {
250
-  ?>
249
+    if ($ajax_search) {
250
+    ?>
251 251
     <button class="btn bt-default" type="button" onclick="remove_item(document.getElementById('elements_in'))" >
252 252
         <em class="fa fa-arrow-left"></em>
253 253
     </button>
254 254
   <?php
255
-  } else {
256
-  ?>
255
+    } else {
256
+    ?>
257 257
     <button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))">
258 258
         <em class="fa fa-arrow-right"></em>
259 259
     </button>
@@ -262,8 +262,8 @@  discard block
 block discarded – undo
262 262
         <em class="fa fa-arrow-left"></em>
263 263
     </button>
264 264
     <?php
265
-  }
266
-  ?>
265
+    }
266
+    ?>
267 267
     <br /><br /><br /><br /><br /><br />
268 268
   </td>
269 269
   <td align="center">
Please login to merge, or discard this patch.
main/admin/course_export.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
         $courses = $course_list;
47 47
     }
48 48
 
49
-	if (!empty($courses)) {
49
+    if (!empty($courses)) {
50 50
 
51 51
         $archiveFile = 'export_courses_list_'.api_get_local_time();
52 52
 
@@ -98,13 +98,13 @@  discard block
 block discarded – undo
98 98
                 Export::arrayToXls($listToExport, $archiveFile);
99 99
                 break;
100 100
         }
101
-	} else {
101
+    } else {
102 102
         Display::addFlash(
103 103
             Display::return_message(
104 104
                 get_lang('ThereAreNotSelectedCoursesOrCoursesListIsEmpty')
105 105
             )
106 106
         );
107
-	}
107
+    }
108 108
 }
109 109
 
110 110
 
@@ -114,29 +114,29 @@  discard block
 block discarded – undo
114 114
 $form->addHeader($tool_name);
115 115
 $form->addHidden('formSent', 1);
116 116
 $form->addElement(
117
-	'radio',
118
-	'select_type',
119
-	get_lang('Option'),
120
-	get_lang('ExportAllCoursesList'),
121
-	 '1',
122
-	 ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='none';}"]
117
+    'radio',
118
+    'select_type',
119
+    get_lang('Option'),
120
+    get_lang('ExportAllCoursesList'),
121
+        '1',
122
+        ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='none';}"]
123 123
 );
124 124
 
125 125
 $form->addElement(
126
-	'radio',
127
-	'select_type',
128
-	'',
129
-	get_lang('ExportSelectedCoursesFromCoursesList'),
130
-	'2',
131
-	['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='block';}"]
126
+    'radio',
127
+    'select_type',
128
+    '',
129
+    get_lang('ExportSelectedCoursesFromCoursesList'),
130
+    '2',
131
+    ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='block';}"]
132 132
 );
133 133
 
134 134
 if (!empty($course_list)) {
135
-	$form->addHtml('<div id="div-course-list" style="display:none">');
136
-	$coursesInList = [];
137
-	foreach ($course_list as $course) {
138
-		$coursesInList[$course['code']] = $course['title'].' ('.$course['code'].')';
139
-	}
135
+    $form->addHtml('<div id="div-course-list" style="display:none">');
136
+    $coursesInList = [];
137
+    foreach ($course_list as $course) {
138
+        $coursesInList[$course['code']] = $course['title'].' ('.$course['code'].')';
139
+    }
140 140
 
141 141
     $form->addSelect(
142 142
         'course_code',
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
         ['multiple' => 'multiple']
146 146
     );
147 147
 
148
-	$form->addHtml('</div>');
148
+    $form->addHtml('</div>');
149 149
 }
150 150
 
151 151
 $form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV' , 'csv', null);
Please login to merge, or discard this patch.
main/admin/ldap_form_add_users_group.php 1 patch
Indentation   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -11,58 +11,58 @@
 block discarded – undo
11 11
  */
12 12
 $nbre=0;
13 13
 echo '<form name="form" method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'">';
14
-	if($statut==1)
15
-	{
16
-		echo get_lang('EmailNotifySubscription').': <input type="checkbox" name="mailling" value="1" checked="checked"><i>'.get_lang('DontUnchek').'</i>';
17
-	}
18
-	else
19
-	{
20
-		echo '<input type="hidden" name="mailling" value="1">';
21
-	}
14
+    if($statut==1)
15
+    {
16
+        echo get_lang('EmailNotifySubscription').': <input type="checkbox" name="mailling" value="1" checked="checked"><i>'.get_lang('DontUnchek').'</i>';
17
+    }
18
+    else
19
+    {
20
+        echo '<input type="hidden" name="mailling" value="1">';
21
+    }
22 22
 if(!empty($course))
23 23
 {
24
-	echo '<input type="hidden" name="course" value="'.Security::remove_XSS($course).'">';
24
+    echo '<input type="hidden" name="course" value="'.Security::remove_XSS($course).'">';
25 25
 }
26 26
 elseif(!empty($id_session))
27 27
 {
28
-	echo '<input type="hidden" name="id_session" value="'.Security::remove_XSS($id_session).'">';
28
+    echo '<input type="hidden" name="id_session" value="'.Security::remove_XSS($id_session).'">';
29 29
 }
30 30
 $is_western_name_order = api_is_western_name_order();
31 31
 echo '<input type="hidden" name="confirmed" value="yes">';
32 32
 echo '<table border="0" cellspacing="0" width="100%">';
33 33
 echo '<tr align="center" id="header3">' .
34
-		'<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>' .
35
-		'<td width="40%"><b>'.get_lang('Email').'</b></td>' .
36
-		($is_western_name_order
37
-			? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' .
38
-			'<td width="15%"><b>'.get_lang('Name').'</b></td>'
39
-			: '<td width="15%"><b>'.get_lang('Name').'</b></td>' .
40
-			'<td width="15%"><b>'.get_lang('FirstName').'</b></td>') .
41
-		'<td width="15%"><b>'.get_lang('Login').'</b></td>' .
42
-	  '</tr>'."\n";
34
+        '<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>' .
35
+        '<td width="40%"><b>'.get_lang('Email').'</b></td>' .
36
+        ($is_western_name_order
37
+            ? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' .
38
+            '<td width="15%"><b>'.get_lang('Name').'</b></td>'
39
+            : '<td width="15%"><b>'.get_lang('Name').'</b></td>' .
40
+            '<td width="15%"><b>'.get_lang('FirstName').'</b></td>') .
41
+        '<td width="15%"><b>'.get_lang('Login').'</b></td>' .
42
+        '</tr>'."\n";
43 43
 while (list ($key, $val) = each($nom_form)) {
44
-	$nbre=$nbre+1;
45
-	if($nbre & 1) $ndiv=2; else $ndiv=3;
46
-	echo '<tr align="center" id="header'.$ndiv.'">';
47
-	echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
48
-	echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';
49
-	if ($is_western_name_order)
50
-	{
51
-		echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
52
-		echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
53
-	}
54
-	else
55
-	{
56
-		echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
57
-		echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
58
-	}
59
-	echo '<td>'.$username_form[$key].'<input type="hidden" name="username_form['.$key.']" size="10" value="'.$username_form[$key].'">';
60
-	echo '<input type="hidden" name="tutor_form['.$key.']" value="0">';
61
-	echo '<input type="hidden" name="admin_form['.$key.']" value="1">';
62
-	echo '<input type="hidden" name="password_form['.$key.']"  value="'.$password_form[$key].'">';
63
-	echo '<input type="hidden" name="statut['.$key.']"  value="'.$statut.'">';
64
-	echo '</td>';
65
-	echo '</tr>';
44
+    $nbre=$nbre+1;
45
+    if($nbre & 1) $ndiv=2; else $ndiv=3;
46
+    echo '<tr align="center" id="header'.$ndiv.'">';
47
+    echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
48
+    echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';
49
+    if ($is_western_name_order)
50
+    {
51
+        echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
52
+        echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
53
+    }
54
+    else
55
+    {
56
+        echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
57
+        echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
58
+    }
59
+    echo '<td>'.$username_form[$key].'<input type="hidden" name="username_form['.$key.']" size="10" value="'.$username_form[$key].'">';
60
+    echo '<input type="hidden" name="tutor_form['.$key.']" value="0">';
61
+    echo '<input type="hidden" name="admin_form['.$key.']" value="1">';
62
+    echo '<input type="hidden" name="password_form['.$key.']"  value="'.$password_form[$key].'">';
63
+    echo '<input type="hidden" name="statut['.$key.']"  value="'.$statut.'">';
64
+    echo '</td>';
65
+    echo '</tr>';
66 66
 }
67 67
 echo '</table>';
68 68
 echo '<br />';
Please login to merge, or discard this patch.
main/admin/dashboard_add_users_to_user.php 1 patch
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 
55 55
 $add_type = 'multiple';
56 56
 if (isset($_GET['add_type']) && $_GET['add_type']!='') {
57
-	$add_type = Security::remove_XSS($_REQUEST['add_type']);
57
+    $add_type = Security::remove_XSS($_REQUEST['add_type']);
58 58
 }
59 59
 
60 60
 if (!api_is_platform_admin()) {
@@ -120,8 +120,8 @@  discard block
 block discarded – undo
120 120
             ";
121 121
         }
122 122
 
123
-		$rs	= Database::query($sql);
124
-		$xajax_response->addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
123
+        $rs	= Database::query($sql);
124
+        $xajax_response->addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
125 125
 
126 126
         if ($type == 'single') {
127 127
             $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
                     $return .= '...<br />';
161 161
                 }
162 162
             }
163
-           $xajax_response->addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
163
+            $xajax_response->addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
164 164
         } else {
165 165
             $return .= '<select id="origin" class="form-control" name="NoAssignedUsersList[]" multiple="multiple" size="15" ">';
166 166
             while($user = Database :: fetch_array($rs)) {
@@ -170,8 +170,8 @@  discard block
 block discarded – undo
170 170
             $return .= '</select>';
171 171
             $xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
172 172
         }
173
-	}
174
-	return $xajax_response;
173
+    }
174
+    return $xajax_response;
175 175
 }
176 176
 
177 177
 $xajax->processRequests();
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
 
285 285
 $msg = '';
286 286
 if (isset($_POST['formSent']) && intval($_POST['formSent']) == 1) {
287
-	$user_list = $_POST['UsersList'];
287
+    $user_list = $_POST['UsersList'];
288 288
 
289 289
     switch ($userStatus) {
290 290
         case DRH:
@@ -349,13 +349,13 @@  discard block
 block discarded – undo
349 349
 $assigned_users_id = array_keys($assigned_users_to_hrm);
350 350
 $without_assigned_users = '';
351 351
 if (count($assigned_users_id) > 0) {
352
-	$without_assigned_users = " user.user_id NOT IN(".implode(',',$assigned_users_id).") AND ";
352
+    $without_assigned_users = " user.user_id NOT IN(".implode(',',$assigned_users_id).") AND ";
353 353
 }
354 354
 
355 355
 $search_user = '';
356 356
 if (!empty($firstLetterUser)) {
357
-	$needle = Database::escape_string($firstLetterUser);
358
-	$search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
357
+    $needle = Database::escape_string($firstLetterUser);
358
+    $search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
359 359
 }
360 360
 
361 361
 $sqlConditions = null;
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 }
376 376
 
377 377
 if (api_is_multiple_url_enabled()) {
378
-	$sql = "SELECT user.user_id, username, lastname, firstname
378
+    $sql = "SELECT user.user_id, username, lastname, firstname
379 379
 	        FROM $tbl_user user  LEFT JOIN $tbl_access_url_rel_user au ON (au.user_id = user.user_id)
380 380
 			WHERE
381 381
                 $without_assigned_users
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
                 $sqlConditions
386 386
             ORDER BY firstname";
387 387
 } else {
388
-	$sql = "SELECT user_id, username, lastname, firstname
388
+    $sql = "SELECT user_id, username, lastname, firstname
389 389
 	        FROM $tbl_user user
390 390
 			WHERE
391 391
 			    $without_assigned_users
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
 <input type="hidden" name="formSent" value="1" />
402 402
 <?php
403 403
 if(!empty($msg)) {
404
-	Display::display_normal_message($msg); //main API
404
+    Display::display_normal_message($msg); //main API
405 405
 }
406 406
 ?>
407 407
 
@@ -454,26 +454,26 @@  discard block
 block discarded – undo
454 454
             </div>
455 455
             
456 456
           <?php
457
-          }
458
-          ?>
457
+            }
458
+            ?>
459 459
             <div class="separate-action">
460 460
                 <?php
461
-		echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>';
461
+        echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>';
462 462
             ?>
463 463
             </div>
464 464
         </div>
465 465
     </div>
466 466
     <div class="col-md-4">
467 467
         <?php
468
-	if (UserManager::is_admin($user_id)) {
469
-		echo get_lang('AssignedUsersListToPlatformAdministrator');
468
+    if (UserManager::is_admin($user_id)) {
469
+        echo get_lang('AssignedUsersListToPlatformAdministrator');
470 470
             } else if ($user_info['status'] == SESSIONADMIN) {
471 471
                     echo get_lang('AssignedUsersListToSessionsAdministrator');
472 472
             } else if ($user_info['status'] == STUDENT_BOSS) {
473 473
                     echo get_lang('AssignedUsersListToStudentBoss');
474 474
             } else {
475 475
                     echo get_lang('AssignedUsersListToHumanResourcesManager');
476
-	}
476
+    }
477 477
         ?>
478 478
         <div class="form-group">
479 479
             <div class="col-sm-12">
Please login to merge, or discard this patch.
main/admin/user_add.php 1 patch
Indentation   +69 added lines, -69 removed lines patch added patch discarded remove patch
@@ -149,27 +149,27 @@  discard block
 block discarded – undo
149 149
 $form = new FormValidator('user_add');
150 150
 $form->addElement('header', '', $tool_name);
151 151
 if (api_is_western_name_order()) {
152
-	// Firstname
153
-	$form->addElement('text', 'firstname', get_lang('FirstName'));
154
-	$form->applyFilter('firstname', 'html_filter');
155
-	$form->applyFilter('firstname', 'trim');
156
-	$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
157
-	// Lastname
158
-	$form->addElement('text', 'lastname', get_lang('LastName'));
159
-	$form->applyFilter('lastname', 'html_filter');
160
-	$form->applyFilter('lastname', 'trim');
161
-	$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
152
+    // Firstname
153
+    $form->addElement('text', 'firstname', get_lang('FirstName'));
154
+    $form->applyFilter('firstname', 'html_filter');
155
+    $form->applyFilter('firstname', 'trim');
156
+    $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
157
+    // Lastname
158
+    $form->addElement('text', 'lastname', get_lang('LastName'));
159
+    $form->applyFilter('lastname', 'html_filter');
160
+    $form->applyFilter('lastname', 'trim');
161
+    $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
162 162
 } else {
163
-	// Lastname
164
-	$form->addElement('text', 'lastname', get_lang('LastName'));
165
-	$form->applyFilter('lastname', 'html_filter');
166
-	$form->applyFilter('lastname', 'trim');
167
-	$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
168
-	// Firstname
169
-	$form->addElement('text', 'firstname', get_lang('FirstName'));
170
-	$form->applyFilter('firstname', 'html_filter');
171
-	$form->applyFilter('firstname', 'trim');
172
-	$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
163
+    // Lastname
164
+    $form->addElement('text', 'lastname', get_lang('LastName'));
165
+    $form->applyFilter('lastname', 'html_filter');
166
+    $form->applyFilter('lastname', 'trim');
167
+    $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
168
+    // Firstname
169
+    $form->addElement('text', 'firstname', get_lang('FirstName'));
170
+    $form->applyFilter('firstname', 'html_filter');
171
+    $form->applyFilter('firstname', 'trim');
172
+    $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
173 173
 }
174 174
 // Official code
175 175
 $form->addElement('text', 'official_code', get_lang('OfficialCode'), array('size' => '40'));
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
 $auth_sources = 0; //make available wider as we need it in case of form reset (see below)
225 225
 $nb_ext_auth_source_added = 0;
226 226
 if (isset($extAuthSource) && count($extAuthSource) > 0) {
227
-	$auth_sources = array();
227
+    $auth_sources = array();
228 228
     foreach ($extAuthSource as $key => $info) {
229 229
         // @todo : make uniform external authentification configuration (ex : cas and external_login ldap)
230 230
         // Special case for CAS. CAS is activated from Chamilo > Administration > Configuration > CAS
@@ -235,10 +235,10 @@  discard block
 block discarded – undo
235 235
             $nb_ext_auth_source_added++;
236 236
         }
237 237
     }
238
-	if ($nb_ext_auth_source_added > 0) {
239
-    	$group[] = $form->createElement('radio', 'password_auto', null, get_lang('ExternalAuthentication').' ', 2);
240
-    	$group[] = $form->createElement('select', 'auth_source', null, $auth_sources);
241
-    	$group[] = $form->createElement('static', '', '', '<br />');
238
+    if ($nb_ext_auth_source_added > 0) {
239
+        $group[] = $form->createElement('radio', 'password_auto', null, get_lang('ExternalAuthentication').' ', 2);
240
+        $group[] = $form->createElement('select', 'auth_source', null, $auth_sources);
241
+        $group[] = $form->createElement('static', '', '', '<br />');
242 242
     }
243 243
 }
244 244
 
@@ -307,12 +307,12 @@  discard block
 block discarded – undo
307 307
 $form->addElement('html', '<div id="drh_list" style="display:'.$display.';">');
308 308
 
309 309
 if (isset($drh_list) && is_array($drh_list)) {
310
-	foreach ($drh_list as $drh) {
310
+    foreach ($drh_list as $drh) {
311 311
         $drh_select->addOption(
312 312
             api_get_person_name($drh['firstname'], $drh['lastname']),
313 313
             $drh['user_id']
314 314
         );
315
-	}
315
+    }
316 316
 }
317 317
 $form->addElement('html', '</div>');
318 318
 
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
 
387 387
 // Validate form
388 388
 if ($form->validate()) {
389
-	$check = Security::check_token('post');
389
+    $check = Security::check_token('post');
390 390
     if ($check) {
391 391
         $user = $form->exportValues();
392 392
         $lastname = $user['lastname'];
@@ -402,15 +402,15 @@  discard block
 block discarded – undo
402 402
         $send_mail = intval($user['mail']['send_mail']);
403 403
         $hr_dept_id = isset($user['hr_dept_id']) ? intval($user['hr_dept_id']) : 0;
404 404
 
405
-		if (isset($extAuthSource) && count($extAuthSource) > 0 &&
405
+        if (isset($extAuthSource) && count($extAuthSource) > 0 &&
406 406
             $user['password']['password_auto'] == '2'
407 407
         ) {
408
-			$auth_source = $user['password']['auth_source'];
409
-			$password = 'PLACEHOLDER';
410
-		} else {
411
-			$auth_source = PLATFORM_AUTH_SOURCE;
412
-			$password = $user['password']['password_auto'] == '1' ? api_generate_password() : $user['password']['password'];
413
-		}
408
+            $auth_source = $user['password']['auth_source'];
409
+            $password = 'PLACEHOLDER';
410
+        } else {
411
+            $auth_source = PLATFORM_AUTH_SOURCE;
412
+            $password = $user['password']['password_auto'] == '1' ? api_generate_password() : $user['password']['password'];
413
+        }
414 414
 
415 415
         if ($user['radio_expiration_date'] == '1') {
416 416
             $expiration_date = $user['expiration_date'];
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
             $expiration_date = null;
419 419
         }
420 420
 
421
-		$active = intval($user['active']);
421
+        $active = intval($user['active']);
422 422
 
423 423
         if (api_get_setting('login_is_email') == 'true') {
424 424
             $username = $email;
@@ -449,21 +449,21 @@  discard block
 block discarded – undo
449 449
             $extra,
450 450
             null,
451 451
             $send_mail,
452
-			$platform_admin
452
+            $platform_admin
453 453
         );
454 454
 
455
-		Security::clear_token();
456
-		$tok = Security::get_token();
457
-		if ($user_id === false) {
458
-			//If any error ocurred during user creation, print it (api_failureList
459
-			// stores values as separate words, so rework it
460
-			$message = '';
461
-			$message_bits = explode(' ',api_get_last_failure());
462
-			foreach ($message_bits as $bit) {
463
-				$message .= ucfirst($bit);
464
-			}
465
-		} else {
466
- 			if (!empty($picture['name'])) {
455
+        Security::clear_token();
456
+        $tok = Security::get_token();
457
+        if ($user_id === false) {
458
+            //If any error ocurred during user creation, print it (api_failureList
459
+            // stores values as separate words, so rework it
460
+            $message = '';
461
+            $message_bits = explode(' ',api_get_last_failure());
462
+            foreach ($message_bits as $bit) {
463
+                $message .= ucfirst($bit);
464
+            }
465
+        } else {
466
+                if (!empty($picture['name'])) {
467 467
                 $picture_uri = UserManager::update_user_picture(
468 468
                     $user_id,
469 469
                     $_FILES['picture']['name'],
@@ -489,35 +489,35 @@  discard block
 block discarded – undo
489 489
                     null,
490 490
                     $language
491 491
                 );
492
-			}
492
+            }
493 493
 
494 494
             $extraFieldValues = new ExtraFieldValue('user');
495 495
             $user['item_id'] = $user_id;
496 496
             $extraFieldValues->saveFieldValues($user);
497 497
 
498
-			$message = get_lang('UserAdded');
499
-		}
500
-		if (isset($user['submit_plus'])) {
501
-			//we want to add more. Prepare report message and redirect to the same page (to clean the form)
502
-			header('Location: user_add.php?message='.urlencode($message).'&sec_token='.$tok);
503
-			exit ();
504
-		} else {
505
-			$tok = Security::get_token();
506
-			header('Location: user_list.php?action=show_message&message='.urlencode($message).'&sec_token='.$tok);
507
-			exit ();
508
-		}
509
-	}
498
+            $message = get_lang('UserAdded');
499
+        }
500
+        if (isset($user['submit_plus'])) {
501
+            //we want to add more. Prepare report message and redirect to the same page (to clean the form)
502
+            header('Location: user_add.php?message='.urlencode($message).'&sec_token='.$tok);
503
+            exit ();
504
+        } else {
505
+            $tok = Security::get_token();
506
+            header('Location: user_list.php?action=show_message&message='.urlencode($message).'&sec_token='.$tok);
507
+            exit ();
508
+        }
509
+    }
510 510
 } else {
511
-	if (isset($_POST['submit'])) {
512
-		Security::clear_token();
513
-	}
514
-	$token = Security::get_token();
515
-	$form->addElement('hidden', 'sec_token');
516
-	$form->setConstants(array('sec_token' => $token));
511
+    if (isset($_POST['submit'])) {
512
+        Security::clear_token();
513
+    }
514
+    $token = Security::get_token();
515
+    $form->addElement('hidden', 'sec_token');
516
+    $form->setConstants(array('sec_token' => $token));
517 517
 }
518 518
 
519 519
 if (!empty($message)){
520
-	$message = Display::return_message(stripslashes($message));
520
+    $message = Display::return_message(stripslashes($message));
521 521
 }
522 522
 $content = $form->returnForm();
523 523
 
Please login to merge, or discard this patch.
main/admin/add_sessions_to_usergroup.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
     if (!empty($needle) && !empty($type)) {
127 127
         if ($type == 'single') {
128 128
             // search users where username or firstname or lastname begins likes $needle
129
-          /*  $sql = 'SELECT user.user_id, username, lastname, firstname FROM '.$tbl_user.' user
129
+            /*  $sql = 'SELECT user.user_id, username, lastname, firstname FROM '.$tbl_user.' user
130 130
                     WHERE (username LIKE "'.$needle.'%"
131 131
                     OR firstname LIKE "'.$needle.'%"
132 132
                 OR lastname LIKE "'.$needle.'%") AND user.user_id<>"'.$user_anonymous.'"   AND user.status<>'.DRH.''.
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
       <option value = "%">--</option>
232 232
       <?php
233 233
         echo Display :: get_alphabet_options();
234
-      ?>
234
+        ?>
235 235
      </select>
236 236
 <?php echo '<br />'; ?>
237 237
 </td>
@@ -242,31 +242,31 @@  discard block
 block discarded – undo
242 242
   <td align="center">
243 243
   <div id="content_source">
244 244
       <?php
245
-      if (!($add_type=='multiple')) {
245
+        if (!($add_type=='multiple')) {
246 246
         ?>
247 247
         <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
248 248
         <div id="ajax_list_users_single"></div>
249 249
         <?php
250
-      } else {
251
-      ?>
250
+        } else {
251
+        ?>
252 252
       <div id="ajax_list_multiple">
253 253
         <?php echo Display::select('elements_not_in_name',$elements_not_in, '',array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'elements_not_in','size'=>'15px'),false); ?>
254 254
       </div>
255 255
     <?php
256
-      }
257
-     ?>
256
+        }
257
+        ?>
258 258
   </div>
259 259
   </td>
260 260
   <td width="10%" valign="middle" align="center">
261 261
   <?php
262
-  if ($ajax_search) {
263
-  ?>
262
+    if ($ajax_search) {
263
+    ?>
264 264
     <button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('elements_in'))" >
265 265
         <em class="fa fa-arrow-left"></em>
266 266
     </button>
267 267
   <?php
268
-  } else {
269
-  ?>
268
+    } else {
269
+    ?>
270 270
     <button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))">
271 271
         <em class="fa fa-arrow-right"></em>
272 272
     </button>
@@ -275,8 +275,8 @@  discard block
 block discarded – undo
275 275
         <em class="fa fa-arrow-left"></em>
276 276
     </button>
277 277
     <?php
278
-  }
279
-  ?>
278
+    }
279
+    ?>
280 280
     <br /><br /><br /><br /><br /><br />
281 281
   </td>
282 282
   <td align="center">
Please login to merge, or discard this patch.
main/admin/sub_language_add.php 1 patch
Indentation   +144 added lines, -144 removed lines patch added patch discarded remove patch
@@ -62,43 +62,43 @@  discard block
 block discarded – undo
62 62
  *       inside the add_sub_language function.
63 63
  */
64 64
 function check_if_language_exist ($original_name, $english_name, $isocode, $sublanguage_available) {
65
-	$tbl_admin_languages 	= Database :: get_main_table(TABLE_MAIN_LANGUAGE);
66
-	$sql_original_name='SELECT count(*) AS count_original_name FROM '.$tbl_admin_languages.' WHERE original_name="'.Database::escape_string($original_name).'" ';
67
-	$sql_english_name='SELECT count(*) AS count_english_name FROM '.$tbl_admin_languages.' WHERE english_name="'.Database::escape_string($english_name).'" ';
68
-	//$sql_isocode='SELECT count(*) AS count_isocode FROM '.$tbl_admin_languages.' WHERE isocode="'.Database::escape_string($isocode).'" ';
69
-	$rs_original_name=Database::query($sql_original_name);
70
-	$rs_english_name=Database::query($sql_english_name);
71
-	//$rs_isocode=Database::query($sql_isocode);
72
-	$count_original_name=Database::result($rs_original_name,0,'count_original_name');
73
-	$count_english_name=Database::result($rs_english_name,0,'count_english_name');
74
-	//$count_isocode=Database::result($rs_isocode,0,'count_isocode');
75
-	$has_error=false;
76
-	$message_information=array();
65
+    $tbl_admin_languages 	= Database :: get_main_table(TABLE_MAIN_LANGUAGE);
66
+    $sql_original_name='SELECT count(*) AS count_original_name FROM '.$tbl_admin_languages.' WHERE original_name="'.Database::escape_string($original_name).'" ';
67
+    $sql_english_name='SELECT count(*) AS count_english_name FROM '.$tbl_admin_languages.' WHERE english_name="'.Database::escape_string($english_name).'" ';
68
+    //$sql_isocode='SELECT count(*) AS count_isocode FROM '.$tbl_admin_languages.' WHERE isocode="'.Database::escape_string($isocode).'" ';
69
+    $rs_original_name=Database::query($sql_original_name);
70
+    $rs_english_name=Database::query($sql_english_name);
71
+    //$rs_isocode=Database::query($sql_isocode);
72
+    $count_original_name=Database::result($rs_original_name,0,'count_original_name');
73
+    $count_english_name=Database::result($rs_english_name,0,'count_english_name');
74
+    //$count_isocode=Database::result($rs_isocode,0,'count_isocode');
75
+    $has_error=false;
76
+    $message_information=array();
77 77
 
78
-	if ($count_original_name==1) {
79
-		$has_error=true;
80
-		$message_information['original_name']=true;
81
-	}
82
-	if ($count_english_name==1) {
83
-		$has_error=true;
84
-		$message_information['english_name']=true;
85
-	}
78
+    if ($count_original_name==1) {
79
+        $has_error=true;
80
+        $message_information['original_name']=true;
81
+    }
82
+    if ($count_english_name==1) {
83
+        $has_error=true;
84
+        $message_information['english_name']=true;
85
+    }
86 86
 
87
-	$iso_list = api_get_platform_isocodes();
88
-	$iso_list = array_values($iso_list);
87
+    $iso_list = api_get_platform_isocodes();
88
+    $iso_list = array_values($iso_list);
89 89
 
90
-	if (!in_array($isocode, $iso_list)) {
91
-		$has_error=true;
92
-		$message_information['isocode']=true;
93
-	}
94
-	if ($has_error===true) {
95
-		$message_information['execute_add']=false;
96
-	}
97
-	if ($has_error===false) {
98
-		$message_information['execute_add']=true;
99
-	}
90
+    if (!in_array($isocode, $iso_list)) {
91
+        $has_error=true;
92
+        $message_information['isocode']=true;
93
+    }
94
+    if ($has_error===true) {
95
+        $message_information['execute_add']=false;
96
+    }
97
+    if ($has_error===false) {
98
+        $message_information['execute_add']=true;
99
+    }
100 100
 
101
-	return $message_information;
101
+    return $message_information;
102 102
 }
103 103
 
104 104
 /**
@@ -109,50 +109,50 @@  discard block
 block discarded – undo
109 109
  * @todo    deprecate this function and use the static method directly
110 110
  */
111 111
 function check_if_exist_language_by_id ($language_id) {
112
-	return SubLanguageManager::check_if_exist_language_by_id($language_id);
112
+    return SubLanguageManager::check_if_exist_language_by_id($language_id);
113 113
 }
114 114
 /**
115
- * Check if the given language is a parent of any sub-language
116
- * @param   int     Language ID of the presumed parent
117
- * @return  bool    True if this language has children, false otherwise
118
- */
115
+     * Check if the given language is a parent of any sub-language
116
+     * @param   int     Language ID of the presumed parent
117
+     * @return  bool    True if this language has children, false otherwise
118
+     */
119 119
 function ckeck_if_is_parent_of_sub_language ($parent_id) {
120
-	$sql='SELECT count(*) AS count FROM language WHERE parent_id= '.intval($parent_id).'';
121
-	$rs=Database::query($sql);
122
-	if (Database::num_rows($rs)>0 && Database::result($rs,0,'count')==1) {
123
-		return true;
124
-	} else {
125
-		return false;
126
-	}
120
+    $sql='SELECT count(*) AS count FROM language WHERE parent_id= '.intval($parent_id).'';
121
+    $rs=Database::query($sql);
122
+    if (Database::num_rows($rs)>0 && Database::result($rs,0,'count')==1) {
123
+        return true;
124
+    } else {
125
+        return false;
126
+    }
127 127
 }
128 128
 /**
129
- * Get all information of sub-language
130
- * @param   int     Parent language ID
131
- * @param   int     Child language ID
132
- * @return  array
133
- */
129
+     * Get all information of sub-language
130
+     * @param   int     Parent language ID
131
+     * @param   int     Child language ID
132
+     * @return  array
133
+     */
134 134
 function allow_get_all_information_of_sub_language ($parent_id,$sub_language_id) {
135
-	return SubLanguageManager::get_all_information_of_sub_language($parent_id,$sub_language_id);
135
+    return SubLanguageManager::get_all_information_of_sub_language($parent_id,$sub_language_id);
136 136
 }
137 137
 /*end declare functions*/
138 138
 
139 139
 //add data
140 140
 
141 141
 if (isset($_GET['sub_language_id']) && $_GET['sub_language_id']==strval(intval($_GET['sub_language_id']))) {
142
-	$language_name=SubLanguageManager::get_name_of_language_by_id($_GET['sub_language_id']);
143
-		if (check_if_exist_language_by_id ($_GET['sub_language_id'])===true) {
144
-			$sub_language_id=$_GET['sub_language_id'];
145
-			$sub_language_id_exist=true;
146
-		} else {
147
-			$sub_language_id_exist=false;
148
-		}
142
+    $language_name=SubLanguageManager::get_name_of_language_by_id($_GET['sub_language_id']);
143
+        if (check_if_exist_language_by_id ($_GET['sub_language_id'])===true) {
144
+            $sub_language_id=$_GET['sub_language_id'];
145
+            $sub_language_id_exist=true;
146
+        } else {
147
+            $sub_language_id_exist=false;
148
+        }
149 149
 
150 150
 }
151 151
 $language_details = array();
152 152
 $language_name='';
153 153
 if (isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) {
154 154
         $language_details = SubLanguageManager::get_all_information_of_language($_GET['id']);
155
-	$language_name = $language_details['original_name'];
155
+    $language_name = $language_details['original_name'];
156 156
         if (check_if_exist_language_by_id ($_GET['id'])===true) {
157 157
             $parent_id=$_GET['id'];
158 158
             $language_id_exist=true;
@@ -160,67 +160,67 @@  discard block
 block discarded – undo
160 160
             $language_id_exist=false;
161 161
         }
162 162
 } else {
163
-	$language_id_exist=false;
163
+    $language_id_exist=false;
164 164
 }
165 165
 
166 166
 //removed and register
167 167
 
168 168
 if ((isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) && (isset($_GET['sub_language_id']) && $_GET['sub_language_id']==strval(intval($_GET['sub_language_id'])))) {
169
-	if (check_if_exist_language_by_id($_GET['id'])===true && check_if_exist_language_by_id($_GET['sub_language_id'])===true) {
170
-	 	$get_all_information=allow_get_all_information_of_sub_language ($_GET['id'],$_GET['sub_language_id']);
171
-		$original_name=$get_all_information['original_name'];
172
-		$english_name=$get_all_information['english_name'];
173
-		$isocode=$get_all_information['isocode'];
169
+    if (check_if_exist_language_by_id($_GET['id'])===true && check_if_exist_language_by_id($_GET['sub_language_id'])===true) {
170
+            $get_all_information=allow_get_all_information_of_sub_language ($_GET['id'],$_GET['sub_language_id']);
171
+        $original_name=$get_all_information['original_name'];
172
+        $english_name=$get_all_information['english_name'];
173
+        $isocode=$get_all_information['isocode'];
174 174
 
175
-	}
175
+    }
176 176
 }
177 177
 
178 178
 $language_name=get_lang('CreateSubLanguageForLanguage').' ( '.strtolower($language_name).' )';
179 179
 
180 180
 if (ckeck_if_is_parent_of_sub_language($parent_id)===true && isset($_GET['action']) && $_GET['action']=='deletesublanguage') {
181
-	$language_name=get_lang('DeleteSubLanguage');
181
+    $language_name=get_lang('DeleteSubLanguage');
182 182
 }
183 183
 
184 184
 $msg = '';
185 185
 
186 186
 if (isset($_POST['SubmitAddNewLanguage'])) {
187
-	$original_name=$_POST['original_name'];
188
-	$english_name=$_POST['english_name'];
189
-	$isocode=$_POST['isocode'];
190
-	$english_name=str_replace(' ','_',$english_name);
191
-	$isocode=str_replace(' ','_',$isocode);
187
+    $original_name=$_POST['original_name'];
188
+    $english_name=$_POST['english_name'];
189
+    $isocode=$_POST['isocode'];
190
+    $english_name=str_replace(' ','_',$english_name);
191
+    $isocode=str_replace(' ','_',$isocode);
192 192
 
193
-	$sublanguage_available=$_POST['sub_language_is_visible'];
194
-	$check_information=array();
195
-	$check_information=check_if_language_exist($original_name,$english_name,$isocode,$sublanguage_available);
196
-	foreach ($check_information as $index_information => $value_information) {
197
-		$allow_insert_info=false;
198
-		if ($index_information=='original_name') {
199
-			$msg .= Display::return_message(get_lang('AlreadyExists').' "'.get_lang('OriginalName').'" '.'('.$original_name.')','error');
200
-		}
201
-		if ($index_information=='english_name') {
202
-			$msg .= Display::return_message(get_lang('AlreadyExists').' "'.get_lang('EnglishName').'" '.'('.$english_name.')','error');
203
-		}
204
-		if ($index_information=='isocode') {
205
-			$msg .= Display::return_message(get_lang('CodeDoesNotExists').': '.$isocode.'','error');
206
-		}
207
-		if ($index_information=='execute_add' && $value_information===true) {
208
-			$allow_insert_info=true;
209
-		}
210
-	}
193
+    $sublanguage_available=$_POST['sub_language_is_visible'];
194
+    $check_information=array();
195
+    $check_information=check_if_language_exist($original_name,$english_name,$isocode,$sublanguage_available);
196
+    foreach ($check_information as $index_information => $value_information) {
197
+        $allow_insert_info=false;
198
+        if ($index_information=='original_name') {
199
+            $msg .= Display::return_message(get_lang('AlreadyExists').' "'.get_lang('OriginalName').'" '.'('.$original_name.')','error');
200
+        }
201
+        if ($index_information=='english_name') {
202
+            $msg .= Display::return_message(get_lang('AlreadyExists').' "'.get_lang('EnglishName').'" '.'('.$english_name.')','error');
203
+        }
204
+        if ($index_information=='isocode') {
205
+            $msg .= Display::return_message(get_lang('CodeDoesNotExists').': '.$isocode.'','error');
206
+        }
207
+        if ($index_information=='execute_add' && $value_information===true) {
208
+            $allow_insert_info=true;
209
+        }
210
+    }
211 211
 
212
-	if (strlen($original_name)>0 && strlen($english_name)>0 && strlen($isocode)>0) {
213
-		if ($allow_insert_info===true && $language_id_exist===true) {
214
-			$english_name=str_replace(' ','_',$english_name);
212
+    if (strlen($original_name)>0 && strlen($english_name)>0 && strlen($isocode)>0) {
213
+        if ($allow_insert_info===true && $language_id_exist===true) {
214
+            $english_name=str_replace(' ','_',$english_name);
215 215
                         //Fixes BT#1636
216 216
                         $english_name=api_strtolower($english_name);
217 217
 
218
-			$isocode=str_replace(' ','_',$isocode);
219
-			$str_info='<br/>'.get_lang('OriginalName').' : '.$original_name.'<br/>'.get_lang('EnglishName').' : '.$english_name.'<br/>'.get_lang('PlatformCharsetTitle').' : '.$isocode;
218
+            $isocode=str_replace(' ','_',$isocode);
219
+            $str_info='<br/>'.get_lang('OriginalName').' : '.$original_name.'<br/>'.get_lang('EnglishName').' : '.$english_name.'<br/>'.get_lang('PlatformCharsetTitle').' : '.$isocode;
220 220
 
221
-			$mkdir_result=SubLanguageManager::add_language_directory($english_name);
222
-			if ($mkdir_result) {
223
-			  	$sl_id = add_sub_language($original_name,$english_name,$isocode,$sublanguage_available,$parent_id);
221
+            $mkdir_result=SubLanguageManager::add_language_directory($english_name);
222
+            if ($mkdir_result) {
223
+                    $sl_id = add_sub_language($original_name,$english_name,$isocode,$sublanguage_available,$parent_id);
224 224
                                 if ($sl_id === false) {
225 225
                                     SubLanguageManager::remove_language_directory($english_name);
226 226
                                     $msg .= Display::return_message(get_lang('LanguageDirectoryNotWriteableContactAdmin'),'error');
@@ -232,17 +232,17 @@  discard block
 block discarded – undo
232 232
                                     require 'sub_language.php';
233 233
                                     exit();
234 234
                                 }
235
-			} else {
236
-			    $msg .= Display::return_message(get_lang('LanguageDirectoryNotWriteableContactAdmin'),'error');
237
-			}
238
-		} else {
239
-			if ($language_id_exist===false) {
240
-				$msg .= Display::return_message(get_lang('LanguageParentNotExist'),'error');
241
-			}
242
-		}
243
-	} else {
235
+            } else {
236
+                $msg .= Display::return_message(get_lang('LanguageDirectoryNotWriteableContactAdmin'),'error');
237
+            }
238
+        } else {
239
+            if ($language_id_exist===false) {
240
+                $msg .= Display::return_message(get_lang('LanguageParentNotExist'),'error');
241
+            }
242
+        }
243
+    } else {
244 244
             $msg .= Display::return_message(get_lang('FormHasErrorsPleaseComplete'),'error');
245
-	}
245
+    }
246 246
 }
247 247
 
248 248
 Display :: display_header($language_name);
@@ -250,51 +250,51 @@  discard block
 block discarded – undo
250 250
 echo $msg;
251 251
 
252 252
 if (isset($_POST['SubmitAddDeleteLanguage'])) {
253
-	$rs = SubLanguageManager::remove_sub_language($_GET['id'], $_GET['sub_language_id']);
254
-	if ($rs===true) {
255
-		Display::display_confirmation_message(get_lang('TheSubLanguageHasBeenRemoved'));
256
-	} else {
257
-		Display::display_error_message(get_lang('TheSubLanguageHasNotBeenRemoved'));
258
-	}
253
+    $rs = SubLanguageManager::remove_sub_language($_GET['id'], $_GET['sub_language_id']);
254
+    if ($rs===true) {
255
+        Display::display_confirmation_message(get_lang('TheSubLanguageHasBeenRemoved'));
256
+    } else {
257
+        Display::display_error_message(get_lang('TheSubLanguageHasNotBeenRemoved'));
258
+    }
259 259
 }
260 260
 // ckeck_if_is_parent_of_sub_language($parent_id)===false
261 261
 //
262 262
 if (isset($_GET['action']) && $_GET['action']=='definenewsublanguage') {
263
-	$text = $language_name;
264
-	$form = new FormValidator('addsublanguage', 'post', 'sub_language_add.php?id='.Security::remove_XSS($_GET['id']).'&action=definenewsublanguage');
265
-	$class='add';
266
-	$form->addElement('header', '', $text);
267
-	$form->addElement('text', 'original_name', get_lang('OriginalName'),'class="input_titles"');
268
-	$form->addRule('original_name', get_lang('ThisFieldIsRequired'), 'required');
269
-	$form->addElement('text', 'english_name', get_lang('EnglishName'),'class="input_titles"');
270
-	$form->addRule('english_name', get_lang('ThisFieldIsRequired'), 'required');
271
-	$form->addElement('text', 'isocode', get_lang('ISOCode'), 'class="input_titles"');
272
-	$form->addRule('isocode', get_lang('ThisFieldIsRequired'), 'required');
273
-	$form->addElement('static', null, '&nbsp;', '<i>en, es, fr</i>');
274
-	$form->addElement('checkbox', 'sub_language_is_visible', '', get_lang('Visibility'));
275
-	$form->addButtonCreate(get_lang('CreateSubLanguage'), 'SubmitAddNewLanguage');
263
+    $text = $language_name;
264
+    $form = new FormValidator('addsublanguage', 'post', 'sub_language_add.php?id='.Security::remove_XSS($_GET['id']).'&action=definenewsublanguage');
265
+    $class='add';
266
+    $form->addElement('header', '', $text);
267
+    $form->addElement('text', 'original_name', get_lang('OriginalName'),'class="input_titles"');
268
+    $form->addRule('original_name', get_lang('ThisFieldIsRequired'), 'required');
269
+    $form->addElement('text', 'english_name', get_lang('EnglishName'),'class="input_titles"');
270
+    $form->addRule('english_name', get_lang('ThisFieldIsRequired'), 'required');
271
+    $form->addElement('text', 'isocode', get_lang('ISOCode'), 'class="input_titles"');
272
+    $form->addRule('isocode', get_lang('ThisFieldIsRequired'), 'required');
273
+    $form->addElement('static', null, '&nbsp;', '<i>en, es, fr</i>');
274
+    $form->addElement('checkbox', 'sub_language_is_visible', '', get_lang('Visibility'));
275
+    $form->addButtonCreate(get_lang('CreateSubLanguage'), 'SubmitAddNewLanguage');
276 276
         //$values['original_name'] = $language_details['original_name'].'...'; -> cannot be used because of quickform filtering (freeze)
277 277
         $values['english_name'] = $language_details['english_name'].'2';
278 278
         $values['isocode'] = $language_details['isocode'];
279 279
         $form->setDefaults($values);
280
-	$form->display();
280
+    $form->display();
281 281
 } else {
282
-	if (isset($_GET['action']) && $_GET['action']=='deletesublanguage') {
283
-		$text=$language_name;
284
-		$form = new FormValidator('deletesublanguage', 'post', 'sub_language_add.php?id='.Security::remove_XSS($_GET['id']).'&sub_language_id='.Security::remove_XSS($_GET['sub_language_id']));
285
-		$class='minus';
286
-		$form->addElement('header', '', $text);
287
-		$form->addElement('static', '', get_lang('OriginalName'),$original_name);
288
-		$form->addElement('static', '', get_lang('EnglishName'),$english_name);
289
-		$form->addElement('static', '', get_lang('PlatformCharsetTitle'),$isocode);
290
-		$form->addButtonCreate(get_lang('DeleteSubLanguage'), 'SubmitAddDeleteLanguage');
291
-		$form->display();
292
-	}
293
-	if (isset($_GET['action']) && $_GET['action']=='definenewsublanguage') {
294
-		Display::display_normal_message(get_lang('TheSubLanguageForThisLanguageHasBeenAdded'));
295
-	}
282
+    if (isset($_GET['action']) && $_GET['action']=='deletesublanguage') {
283
+        $text=$language_name;
284
+        $form = new FormValidator('deletesublanguage', 'post', 'sub_language_add.php?id='.Security::remove_XSS($_GET['id']).'&sub_language_id='.Security::remove_XSS($_GET['sub_language_id']));
285
+        $class='minus';
286
+        $form->addElement('header', '', $text);
287
+        $form->addElement('static', '', get_lang('OriginalName'),$original_name);
288
+        $form->addElement('static', '', get_lang('EnglishName'),$english_name);
289
+        $form->addElement('static', '', get_lang('PlatformCharsetTitle'),$isocode);
290
+        $form->addButtonCreate(get_lang('DeleteSubLanguage'), 'SubmitAddDeleteLanguage');
291
+        $form->display();
292
+    }
293
+    if (isset($_GET['action']) && $_GET['action']=='definenewsublanguage') {
294
+        Display::display_normal_message(get_lang('TheSubLanguageForThisLanguageHasBeenAdded'));
295
+    }
296 296
 }
297 297
 /**
298
- * Footer
299
- */
298
+     * Footer
299
+     */
300 300
 Display :: display_footer();
Please login to merge, or discard this patch.
main/admin/group_edit.php 1 patch
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
 $sql = "SELECT * FROM $table_group WHERE id = '".$group_id."'";
36 36
 $res = Database::query($sql);
37 37
 if (Database::num_rows($res) != 1) {
38
-	header('Location: group_list.php');
39
-	exit;
38
+    header('Location: group_list.php');
39
+    exit;
40 40
 }
41 41
 
42 42
 $group_data = Database::fetch_array($res, 'ASSOC');
@@ -54,15 +54,15 @@  discard block
 block discarded – undo
54 54
 
55 55
 // Description
56 56
 $form->addElement(
57
-	'textarea',
58
-	'description',
59
-	get_lang('Description'),
60
-	array(
61
-		'rows' => 3,
62
-		'cols' => 58,
63
-		'onKeyDown' => "text_longitud()",
64
-		'onKeyUp' => "text_longitud()",
65
-	)
57
+    'textarea',
58
+    'description',
59
+    get_lang('Description'),
60
+    array(
61
+        'rows' => 3,
62
+        'cols' => 58,
63
+        'onKeyDown' => "text_longitud()",
64
+        'onKeyUp' => "text_longitud()",
65
+    )
66 66
 );
67 67
 $form->applyFilter('description', 'html_filter');
68 68
 $form->applyFilter('description', 'trim');
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 $allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
77 77
 $form->addRule('picture', get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')', 'filetype', $allowed_picture_types);
78 78
 if (strlen($group_data['picture_uri']) > 0) {
79
-	$form->addElement('checkbox', 'delete_picture', '', get_lang('DelImage'));
79
+    $form->addElement('checkbox', 'delete_picture', '', get_lang('DelImage'));
80 80
 }
81 81
 
82 82
 // Group parent
@@ -101,28 +101,28 @@  discard block
 block discarded – undo
101 101
 
102 102
 // Validate form
103 103
 if ( $form->validate()) {
104
-	$group = $form->exportValues();
104
+    $group = $form->exportValues();
105 105
 
106
-	$picture_element = $form->getElement('picture');
107
-	$picture = $picture_element->getValue();
106
+    $picture_element = $form->getElement('picture');
107
+    $picture = $picture_element->getValue();
108 108
 
109
-	$picture_uri = $group_data['picture_uri'];
110
-	if ($group['delete_picture']) {
111
-		$picture_uri = GroupPortalManager::delete_group_picture($group_id);
112
-		}
113
-	elseif (!empty($picture['name'])) {
109
+    $picture_uri = $group_data['picture_uri'];
110
+    if ($group['delete_picture']) {
111
+        $picture_uri = GroupPortalManager::delete_group_picture($group_id);
112
+        }
113
+    elseif (!empty($picture['name'])) {
114 114
         $picture_uri = GroupPortalManager::update_group_picture(
115 115
             $group_id,
116 116
             $_FILES['picture']['name'],
117 117
             $_FILES['picture']['tmp_name']
118 118
         );
119
-	}
119
+    }
120 120
 
121
-	$name = $group['name'];
122
-	$description = $group['description'];
123
-	$url = $group['url'];
124
-	$status = intval($group['visibility']);
125
-	$parent_group_id = intval($group['parent_group']);
121
+    $name = $group['name'];
122
+    $description = $group['description'];
123
+    $url = $group['url'];
124
+    $status = intval($group['visibility']);
125
+    $parent_group_id = intval($group['parent_group']);
126 126
 
127 127
     GroupPortalManager::update(
128 128
         $group_id,
@@ -134,9 +134,9 @@  discard block
 block discarded – undo
134 134
     );
135 135
     GroupPortalManager::set_parent_group($group_id, $parent_group_id);
136 136
 
137
-	$tok = Security::get_token();
138
-	header('Location: group_list.php?action=show_message&message='.urlencode(get_lang('GroupUpdated')).'&sec_token='.$tok);
139
-	exit();
137
+    $tok = Security::get_token();
138
+    header('Location: group_list.php?action=show_message&message='.urlencode(get_lang('GroupUpdated')).'&sec_token='.$tok);
139
+    exit();
140 140
 }
141 141
 
142 142
 Display::display_header($tool_name);
@@ -149,11 +149,11 @@  discard block
 block discarded – undo
149 149
 $image_size = api_getimagesize($image_file);
150 150
 
151 151
 $img_attributes = 'src="'.$image_file.'?rand='.time().'" '
152
-	.'style="float:'.($text_dir == 'rtl' ? 'left' : 'right').'; padding:5px;" ';
152
+    .'style="float:'.($text_dir == 'rtl' ? 'left' : 'right').'; padding:5px;" ';
153 153
 
154 154
 if ($image_size['width'] > 300) {
155 155
     // limit display width to 300px
156
-	$img_attributes .= 'width="300" ';
156
+    $img_attributes .= 'width="300" ';
157 157
 }
158 158
 
159 159
 // get the path,width and height from original picture
@@ -164,9 +164,9 @@  discard block
 block discarded – undo
164 164
 $url_big_image = $big_image.'?rnd='.time();
165 165
 
166 166
 if ($image == '') {
167
-	echo '<img '.$img_attributes.' />';
167
+    echo '<img '.$img_attributes.' />';
168 168
 } else {
169
-	echo '<input type="image" '.$img_attributes.' onclick="javascript: return show_image(\''.$url_big_image.'\',\''.$big_image_width.'\',\''.$big_image_height.'\');"/>';
169
+    echo '<input type="image" '.$img_attributes.' onclick="javascript: return show_image(\''.$url_big_image.'\',\''.$big_image_width.'\',\''.$big_image_height.'\');"/>';
170 170
 }
171 171
 
172 172
 // Display form
Please login to merge, or discard this patch.
main/admin/access_url_edit_courses_to_url.php 1 patch
Indentation   +91 added lines, -91 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
 $xajax = new xajax();
13 13
 $xajax->registerFunction(
14
-	array('search_courses', 'Accessurleditcoursestourl', 'search_courses')
14
+    array('search_courses', 'Accessurleditcoursestourl', 'search_courses')
15 15
 );
16 16
 
17 17
 // setting the section (for the tabs)
@@ -20,8 +20,8 @@  discard block
 block discarded – undo
20 20
 // Access restrictions
21 21
 api_protect_global_admin_script();
22 22
 if (!api_get_multiple_access_url()) {
23
-	header('Location: index.php');
24
-	exit;
23
+    header('Location: index.php');
24
+    exit;
25 25
 }
26 26
 
27 27
 // Database Table Definitions
@@ -36,12 +36,12 @@  discard block
 block discarded – undo
36 36
 
37 37
 $add_type = 'multiple';
38 38
 if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!='') {
39
-	$add_type = Security::remove_XSS($_REQUEST['add_type']);
39
+    $add_type = Security::remove_XSS($_REQUEST['add_type']);
40 40
 }
41 41
 
42 42
 $access_url_id = 1;
43 43
 if (isset($_REQUEST['access_url_id']) && $_REQUEST['access_url_id']!='') {
44
-	$access_url_id = Security::remove_XSS($_REQUEST['access_url_id']);
44
+    $access_url_id = Security::remove_XSS($_REQUEST['access_url_id']);
45 45
 }
46 46
 
47 47
 $xajax -> processRequests();
@@ -83,21 +83,21 @@  discard block
 block discarded – undo
83 83
 $users = $sessions = array();
84 84
 
85 85
 if (isset($_POST['form_sent']) && $_POST['form_sent']) {
86
-	$form_sent = $_POST['form_sent'];
87
-	$course_list = $_POST['course_list'];
88
-
89
-	if (!is_array($course_list)) {
90
-		$course_list = array();
91
-	}
92
-
93
-	if ($form_sent == 1) {
94
-		if ($access_url_id==0) {
95
-			header('Location: access_url_edit_users_to_url.php?action=show_message&message='.get_lang('SelectURL'));
96
-		} elseif (is_array($course_list)) {
97
-			UrlManager::update_urls_rel_course($course_list, $access_url_id);
98
-			header('Location: access_urls.php?action=show_message&message='.get_lang('CoursesWereEdited'));
99
-		}
100
-	}
86
+    $form_sent = $_POST['form_sent'];
87
+    $course_list = $_POST['course_list'];
88
+
89
+    if (!is_array($course_list)) {
90
+        $course_list = array();
91
+    }
92
+
93
+    if ($form_sent == 1) {
94
+        if ($access_url_id==0) {
95
+            header('Location: access_url_edit_users_to_url.php?action=show_message&message='.get_lang('SelectURL'));
96
+        } elseif (is_array($course_list)) {
97
+            UrlManager::update_urls_rel_course($course_list, $access_url_id);
98
+            header('Location: access_urls.php?action=show_message&message='.get_lang('CoursesWereEdited'));
99
+        }
100
+    }
101 101
 }
102 102
 
103 103
 Display::display_header($tool_name);
@@ -109,45 +109,45 @@  discard block
 block discarded – undo
109 109
 api_display_tool_title($tool_name);
110 110
 
111 111
 if (isset($_GET['action']) && $_GET['action'] == 'show_message')
112
-	Display :: display_normal_message(Security::remove_XSS(stripslashes($_GET['message'])));
112
+    Display :: display_normal_message(Security::remove_XSS(stripslashes($_GET['message'])));
113 113
 
114 114
 $no_course_list = $course_list = array();
115 115
 $ajax_search = $add_type == 'unique' ? true : false;
116 116
 
117 117
 if($ajax_search) {
118
-	$courses = UrlManager::get_url_rel_course_data($access_url_id);
119
-	foreach ($courses as $course) {
120
-		$course_list[$course['c_id']] = $course;
121
-	}
118
+    $courses = UrlManager::get_url_rel_course_data($access_url_id);
119
+    foreach ($courses as $course) {
120
+        $course_list[$course['c_id']] = $course;
121
+    }
122 122
 } else {
123
-	$courses = UrlManager::get_url_rel_course_data();
123
+    $courses = UrlManager::get_url_rel_course_data();
124 124
 
125
-	foreach ($courses as $course) {
126
-		if ($course['access_url_id'] == $access_url_id) {
127
-			$course_list[$course['c_id']] = $course;
128
-		}
129
-	}
125
+    foreach ($courses as $course) {
126
+        if ($course['access_url_id'] == $access_url_id) {
127
+            $course_list[$course['c_id']] = $course;
128
+        }
129
+    }
130 130
 
131
-	$tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE);
132
-	$sql="SELECT id, code, title
131
+    $tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE);
132
+    $sql="SELECT id, code, title
133 133
 	  	  	FROM $tbl_course u
134 134
 			ORDER BY title, code";
135
-	$result = Database::query($sql);
136
-	$courses = Database::store_result($result);
137
-	$course_list_leys = array_keys($course_list);
138
-	foreach ($courses as $course) {
139
-		if (!in_array($course['id'], $course_list_leys)) {
140
-			$no_course_list[$course['id']] = $course;
141
-		}
142
-	}
135
+    $result = Database::query($sql);
136
+    $courses = Database::store_result($result);
137
+    $course_list_leys = array_keys($course_list);
138
+    foreach ($courses as $course) {
139
+        if (!in_array($course['id'], $course_list_leys)) {
140
+            $no_course_list[$course['id']] = $course;
141
+        }
142
+    }
143 143
 }
144 144
 
145 145
 if($add_type == 'multiple') {
146
-	$link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeUnique').'</a>';
147
-	$link_add_type_multiple = get_lang('SessionAddTypeMultiple');
146
+    $link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeUnique').'</a>';
147
+    $link_add_type_multiple = get_lang('SessionAddTypeMultiple');
148 148
 } else {
149
-	$link_add_type_unique = get_lang('SessionAddTypeUnique');
150
-	$link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeMultiple').'</a>';
149
+    $link_add_type_unique = get_lang('SessionAddTypeUnique');
150
+    $link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeMultiple').'</a>';
151 151
 }
152 152
 $url_list = UrlManager::get_url_data();
153 153
 ?>
@@ -160,31 +160,31 @@  discard block
 block discarded – undo
160 160
 		<select name="access_url_id" onchange="javascript:send();">
161 161
 			<option value="0">-- <?php echo get_lang('SelectUrl')?> -- </option>
162 162
 			<?php
163
-			$url_selected='';
164
-			foreach ($url_list as $url_obj) {
165
-				$checked = '';
166
-				if (!empty($access_url_id)) {
167
-					if ($url_obj[0]==$access_url_id) {
168
-						$checked = 'selected=true';
169
-						$url_selected=$url_obj[1];
170
-					}
171
-				}
172
-				if ($url_obj['active']==1) {
173
-					?>
163
+            $url_selected='';
164
+            foreach ($url_list as $url_obj) {
165
+                $checked = '';
166
+                if (!empty($access_url_id)) {
167
+                    if ($url_obj[0]==$access_url_id) {
168
+                        $checked = 'selected=true';
169
+                        $url_selected=$url_obj[1];
170
+                    }
171
+                }
172
+                if ($url_obj['active']==1) {
173
+                    ?>
174 174
 					<option <?php echo $checked;?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?></option>
175 175
 				<?php
176
-				}
177
-			}
178
-			?>
176
+                }
177
+            }
178
+            ?>
179 179
 		</select>
180 180
 		<br /><br />
181 181
 		<input type="hidden" name="form_sent" value="1" />
182 182
 		<input type="hidden" name="add_type" value = "<?php echo $add_type ?>" />
183 183
 		<?php
184
-		if(!empty($errorMsg)) {
185
-			Display::display_normal_message($errorMsg); //main API
186
-		}
187
-		?>
184
+        if(!empty($errorMsg)) {
185
+            Display::display_normal_message($errorMsg); //main API
186
+        }
187
+        ?>
188 188
 		<table border="0" cellpadding="5" cellspacing="0" width="100%">
189 189
 
190 190
 			<!-- Users -->
@@ -199,38 +199,38 @@  discard block
 block discarded – undo
199 199
 				<td align="center">
200 200
 					<div id="content_source">
201 201
 						<?php
202
-						if($ajax_search) {
203
-							?>
202
+                        if($ajax_search) {
203
+                            ?>
204 204
 							<input type="text" id="course_to_add" onkeyup="xajax_search_courses(this.value,document.formulaire.access_url_id.options[document.formulaire.access_url_id.selectedIndex].value)" />
205 205
 							<div id="ajax_list_courses"></div>
206 206
 						<?php
207
-						} else {
208
-							?>
207
+                        } else {
208
+                            ?>
209 209
 							<select id="origin_users" name="no_course_list[]" multiple="multiple" size="15" style="width:380px;">
210 210
 								<?php
211
-								foreach($no_course_list as $no_course) {
212
-									?>
211
+                                foreach($no_course_list as $no_course) {
212
+                                    ?>
213 213
 									<option value="<?php echo $no_course['id']; ?>"><?php echo $no_course['title'].' ('.$no_course['code'].')'; ?></option>
214 214
 								<?php
215
-								}
216
-								unset($no_course_list);
217
-								?>
215
+                                }
216
+                                unset($no_course_list);
217
+                                ?>
218 218
 							</select>
219 219
 						<?php
220
-						}
221
-						?>
220
+                        }
221
+                        ?>
222 222
 					</div>
223 223
 				</td>
224 224
 				<td width="10%" valign="middle" align="center">
225 225
 					<?php
226
-					if($ajax_search) {
227
-						?>
226
+                    if($ajax_search) {
227
+                        ?>
228 228
 						<button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('destination_users'))" >
229 229
                             <em class="fa fa-arrow-left"></em>
230 230
 						</button>
231 231
 					<?php
232
-					} else {
233
-						?>
232
+                    } else {
233
+                        ?>
234 234
 						<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" >
235 235
                             <em class="fa fa-arrow-right"></em>
236 236
 						</button>
@@ -239,21 +239,21 @@  discard block
 block discarded – undo
239 239
                             <em class="fa fa-arrow-left"></em>
240 240
 						</button>
241 241
 					<?php
242
-					}
243
-					?>
242
+                    }
243
+                    ?>
244 244
 					<br /><br /><br /><br /><br /><br />
245 245
 				</td>
246 246
 				<td align="center">
247 247
 					<select id="destination_users" name="course_list[]" multiple="multiple" size="15" style="width:380px;">
248 248
 						<?php
249
-						foreach($course_list as $course) {
250
-							$courseInfo = api_get_course_info_by_id($course['id']);
251
-							?>
249
+                        foreach($course_list as $course) {
250
+                            $courseInfo = api_get_course_info_by_id($course['id']);
251
+                            ?>
252 252
 							<option value="<?php echo $course['id']; ?>"><?php echo $course['title'].' ('.$courseInfo['code'].')'; ?></option>
253 253
 						<?php
254
-						}
255
-						unset($course_list);
256
-						?>
254
+                        }
255
+                        unset($course_list);
256
+                        ?>
257 257
 
258 258
 					</select></td>
259 259
 			</tr>
@@ -261,11 +261,11 @@  discard block
 block discarded – undo
261 261
 				<td colspan="3" align="center">
262 262
 					<br />
263 263
 					<?php
264
-					if(isset($_GET['add']))
265
-						echo '<button class="btn btn-default" onclick="valide()" >'.get_lang('AddCoursesToURL').'</button>';
266
-					else
267
-						echo '<button class="btn btn-default" onclick="valide()" >'.get_lang('EditCoursesToURL').'</button>';
268
-					?>
264
+                    if(isset($_GET['add']))
265
+                        echo '<button class="btn btn-default" onclick="valide()" >'.get_lang('AddCoursesToURL').'</button>';
266
+                    else
267
+                        echo '<button class="btn btn-default" onclick="valide()" >'.get_lang('EditCoursesToURL').'</button>';
268
+                    ?>
269 269
 				</td>
270 270
 			</tr>
271 271
 		</table>
Please login to merge, or discard this patch.