Completed
Push — 1.10.x ( f2aaaf...ef00db )
by Yannick
241:15 queued 197:35
created
main/admin/add_courses_to_usergroup.php 3 patches
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.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -19,14 +19,14 @@  discard block
 block discarded – undo
19 19
 api_protect_admin_script(true);
20 20
 
21 21
 // Setting breadcrumbs.
22
-$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
23
-$interbreadcrumb[] = array('url' => 'usergroups.php','name' => get_lang('Classes'));
22
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
23
+$interbreadcrumb[] = array('url' => 'usergroups.php', 'name' => get_lang('Classes'));
24 24
 
25 25
 // Setting the name of the tool.
26 26
 $tool_name = get_lang('SubscribeClassToCourses');
27 27
 
28 28
 $add_type = 'multiple';
29
-if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){
29
+if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
30 30
     $add_type = Security::remove_XSS($_REQUEST['add_type']);
31 31
 }
32 32
 
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 
98 98
 $searchForm = new FormValidator('search', 'get', api_get_self().'?id='.$id);
99 99
 $searchForm->addHeader(get_lang('AdvancedSearch'));
100
-$renderer =& $searchForm->defaultRenderer();
100
+$renderer = & $searchForm->defaultRenderer();
101 101
 $searchForm->addElement('hidden', 'id', $id);
102 102
 foreach ($filters as $param) {
103 103
     $searchForm->addElement($param['type'], $param['name'], $param['label']);
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 
142 142
 //checking for extra field with filter on
143 143
 
144
-function search($needle,$type)
144
+function search($needle, $type)
145 145
 {
146 146
     global $elements_in;
147 147
     $xajax_response = new xajaxResponse();
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
         } else {
152 152
             $list = CourseManager::get_courses_list(0, 0, 2, 'ASC', -1, $needle);
153 153
         }
154
-        if ($type=='single') {
154
+        if ($type == 'single') {
155 155
         } else {
156 156
             $return .= '<select id="elements_not_in" name="elements_not_in_name[]" multiple="multiple" size="15" style="width:360px;">';
157 157
 
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 }
183 183
 
184 184
 echo '<div class="actions">';
185
-echo '<a href="usergroups.php">'.Display::return_icon('back.png',get_lang('Back'), array(), ICON_SIZE_MEDIUM).'</a>';
185
+echo '<a href="usergroups.php">'.Display::return_icon('back.png', get_lang('Back'), array(), ICON_SIZE_MEDIUM).'</a>';
186 186
 echo Display::url(get_lang('AdvancedSearch'), '#', array('class' => 'advanced_options', 'id' => 'advanced_search'));
187 187
 echo '</div>';
188 188
 
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 
193 193
 ?>
194 194
 
195
-<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();"';}?>>
195
+<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();"'; }?>>
196 196
 
197 197
 <?php echo '<legend>'.$data['name'].': '.$tool_name.'</legend>';
198 198
 echo Display::input('hidden', 'id', $id);
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
   <td align="center"><b><?php echo get_lang('CoursesInGroup') ?> :</b></td>
212 212
 </tr>
213 213
 
214
-<?php if ($add_type=='multiple') { ?>
214
+<?php if ($add_type == 'multiple') { ?>
215 215
 <tr>
216 216
 <td align="center">
217 217
 <?php echo get_lang('FirstLetterCourseTitle'); ?> :
@@ -229,7 +229,7 @@  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>
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
       } else {
238 238
       ?>
239 239
       <div id="ajax_list_multiple">
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); ?>
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 243
       }
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
   </td>
269 269
   <td align="center">
270 270
 <?php
271
-    echo Display::select('elements_in_name[]', $elements_in, '', array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'elements_in','size'=>'15px'),false );
271
+    echo Display::select('elements_in_name[]', $elements_in, '', array('style'=>'width:360px', 'multiple'=>'multiple', 'id'=>'elements_in', 'size'=>'15px'), false);
272 272
     unset($sessionUsersList);
273 273
 ?>
274 274
  </td>
Please login to merge, or discard this patch.
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -144,7 +144,10 @@
 block discarded – undo
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') {
Please login to merge, or discard this patch.
main/admin/user_export.php 2 patches
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -22,16 +22,16 @@  discard block
 block discarded – undo
22 22
 
23 23
 set_time_limit(0);
24 24
 
25
-$courses = array ();
25
+$courses = array();
26 26
 $courses[''] = '--';
27 27
 $sql = "SELECT code,visual_code,title FROM $course_table ORDER BY visual_code";
28 28
 
29 29
 global $_configuration;
30 30
 
31 31
 if (api_is_multiple_url_enabled()) {
32
-	$tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
32
+	$tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
33 33
 	$access_url_id = api_get_current_access_url_id();
34
-	if ($access_url_id != -1){
34
+	if ($access_url_id != -1) {
35 35
 	$sql = "SELECT code,visual_code,title
36 36
 		FROM $course_table as c
37 37
 		INNER JOIN $tbl_course_rel_access_url as course_rel_url
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
 }
47 47
 $form = new FormValidator('export_users');
48 48
 $form->addElement('header', $tool_name);
49
-$form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'XML','xml');
49
+$form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'XML', 'xml');
50 50
 $form->addElement('radio', 'file_type', null, 'CSV', 'csv');
51 51
 $form->addElement('radio', 'file_type', null, 'XLS', 'xls');
52 52
 
53
-$form->addElement('checkbox', 'addcsvheader', get_lang('AddCSVHeader'), get_lang('YesAddCSVHeader'),'1');
53
+$form->addElement('checkbox', 'addcsvheader', get_lang('AddCSVHeader'), get_lang('YesAddCSVHeader'), '1');
54 54
 $form->addElement('select', 'course_code', get_lang('OnlyUsersFromCourse'), $courses);
55 55
 $form->addButtonExport(get_lang('Export'));
56 56
 $form->setDefaults(array('file_type' => 'csv'));
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 				u.firstname 	AS FirstName,
69 69
 				u.email 		AS Email,
70 70
 				u.username	AS UserName,
71
-				".(($_configuration['password_encryption']!='none')?" ":"u.password AS Password, ")."
71
+				".(($_configuration['password_encryption'] != 'none') ? " " : "u.password AS Password, ")."
72 72
 				u.auth_source	AS AuthSource,
73 73
 				u.status		AS Status,
74 74
 				u.official_code	AS OfficialCode,
@@ -83,10 +83,10 @@  discard block
 block discarded – undo
83 83
 		$filename = 'export_users_'.$course_code.'_'.api_get_local_time();
84 84
 	} else {
85 85
 		if (api_is_multiple_url_enabled()) {
86
-			$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
86
+			$tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
87 87
 			$access_url_id = api_get_current_access_url_id();
88 88
 			if ($access_url_id != -1) {
89
-			$sql.= " FROM $user_table u
89
+			$sql .= " FROM $user_table u
90 90
 					INNER JOIN $tbl_user_rel_access_url as user_rel_url
91 91
 				ON (u.user_id= user_rel_url.user_id)
92 92
 				WHERE access_url_id = $access_url_id
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
98 98
 		$filename = 'export_users_'.api_get_local_time();
99 99
 	}
100 100
 	$data = array();
101
-	$extra_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC',false);
102
-	if ($export['addcsvheader']=='1' AND $export['file_type']=='csv') {
101
+	$extra_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC', false);
102
+	if ($export['addcsvheader'] == '1' AND $export['file_type'] == 'csv') {
103 103
 		if ($_configuration['password_encryption'] != 'none') {
104 104
 			$data[] = array(
105 105
 				'UserId',
@@ -127,19 +127,19 @@  discard block
 block discarded – undo
127 127
 			);
128 128
 		}
129 129
 
130
-		foreach($extra_fields as $extra) {
131
-			$data[0][]=$extra[1];
130
+		foreach ($extra_fields as $extra) {
131
+			$data[0][] = $extra[1];
132 132
 		}
133 133
 	}
134 134
 
135 135
 	$res = Database::query($sql);
136
-	while($user = Database::fetch_array($res,'ASSOC')) {
136
+	while ($user = Database::fetch_array($res, 'ASSOC')) {
137 137
 		$student_data = UserManager:: get_extra_user_data(
138 138
 			$user['UserId'],
139 139
 			true,
140 140
 			false
141 141
 		);
142
-		foreach($student_data as $key=>$value) {
142
+		foreach ($student_data as $key=>$value) {
143 143
 			$key = substr($key, 6);
144 144
 			if (is_array($value)) {
145 145
 				$user[$key] = $value[$key];
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 				$user[$key] = $value;
148 148
 			}
149 149
 		}
150
-		$data[] = $user	;
150
+		$data[] = $user;
151 151
 	}
152 152
 
153 153
 	switch ($file_type) {
Please login to merge, or discard this patch.
Indentation   +93 added lines, -93 removed lines patch added patch discarded remove patch
@@ -29,20 +29,20 @@  discard block
 block discarded – undo
29 29
 global $_configuration;
30 30
 
31 31
 if (api_is_multiple_url_enabled()) {
32
-	$tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
33
-	$access_url_id = api_get_current_access_url_id();
34
-	if ($access_url_id != -1){
35
-	$sql = "SELECT code,visual_code,title
32
+    $tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
33
+    $access_url_id = api_get_current_access_url_id();
34
+    if ($access_url_id != -1){
35
+    $sql = "SELECT code,visual_code,title
36 36
 		FROM $course_table as c
37 37
 		INNER JOIN $tbl_course_rel_access_url as course_rel_url
38 38
 		ON (c.id = course_rel_url.c_id)
39 39
 		WHERE access_url_id = $access_url_id
40 40
 		ORDER BY visual_code";
41
-	}
41
+    }
42 42
 }
43 43
 $result = Database::query($sql);
44 44
 while ($course = Database::fetch_object($result)) {
45
-	$courses[$course->code] = $course->visual_code.' - '.$course->title;
45
+    $courses[$course->code] = $course->visual_code.' - '.$course->title;
46 46
 }
47 47
 $form = new FormValidator('export_users');
48 48
 $form->addElement('header', $tool_name);
@@ -56,13 +56,13 @@  discard block
 block discarded – undo
56 56
 $form->setDefaults(array('file_type' => 'csv'));
57 57
 
58 58
 if ($form->validate()) {
59
-	$export = $form->exportValues();
60
-	$file_type = $export['file_type'];
61
-	$course_code = Database::escape_string($export['course_code']);
62
-	$courseInfo = api_get_course_info($course_code);
63
-	$courseId = $courseInfo['real_id'];
59
+    $export = $form->exportValues();
60
+    $file_type = $export['file_type'];
61
+    $course_code = Database::escape_string($export['course_code']);
62
+    $courseInfo = api_get_course_info($course_code);
63
+    $courseId = $courseInfo['real_id'];
64 64
 
65
-	$sql = "SELECT
65
+    $sql = "SELECT
66 66
 				u.user_id 	AS UserId,
67 67
 				u.lastname 	AS LastName,
68 68
 				u.firstname 	AS FirstName,
@@ -73,96 +73,96 @@  discard block
 block discarded – undo
73 73
 				u.status		AS Status,
74 74
 				u.official_code	AS OfficialCode,
75 75
 				u.phone		AS Phone";
76
-	if (strlen($course_code) > 0) {
77
-		$sql .= " FROM $user_table u, $course_user_table cu
76
+    if (strlen($course_code) > 0) {
77
+        $sql .= " FROM $user_table u, $course_user_table cu
78 78
 					WHERE
79 79
 						u.user_id = cu.user_id AND
80 80
 						cu.c_id = $courseId AND
81 81
 						cu.relation_type<>".COURSE_RELATION_TYPE_RRHH."
82 82
 					ORDER BY lastname,firstname";
83
-		$filename = 'export_users_'.$course_code.'_'.api_get_local_time();
84
-	} else {
85
-		if (api_is_multiple_url_enabled()) {
86
-			$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
87
-			$access_url_id = api_get_current_access_url_id();
88
-			if ($access_url_id != -1) {
89
-			$sql.= " FROM $user_table u
83
+        $filename = 'export_users_'.$course_code.'_'.api_get_local_time();
84
+    } else {
85
+        if (api_is_multiple_url_enabled()) {
86
+            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
87
+            $access_url_id = api_get_current_access_url_id();
88
+            if ($access_url_id != -1) {
89
+            $sql.= " FROM $user_table u
90 90
 					INNER JOIN $tbl_user_rel_access_url as user_rel_url
91 91
 				ON (u.user_id= user_rel_url.user_id)
92 92
 				WHERE access_url_id = $access_url_id
93 93
 				ORDER BY lastname,firstname";
94
-			}
95
-		} else {
96
-			$sql .= " FROM $user_table u ORDER BY lastname,firstname";
97
-		}
98
-		$filename = 'export_users_'.api_get_local_time();
99
-	}
100
-	$data = array();
101
-	$extra_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC',false);
102
-	if ($export['addcsvheader']=='1' AND $export['file_type']=='csv') {
103
-		if ($_configuration['password_encryption'] != 'none') {
104
-			$data[] = array(
105
-				'UserId',
106
-				'LastName',
107
-				'FirstName',
108
-				'Email',
109
-				'UserName',
110
-				'AuthSource',
111
-				'Status',
112
-				'OfficialCode',
113
-				'PhoneNumber',
114
-			);
115
-		} else {
116
-			$data[] = array(
117
-				'UserId',
118
-				'LastName',
119
-				'FirstName',
120
-				'Email',
121
-				'UserName',
122
-				'Password',
123
-				'AuthSource',
124
-				'Status',
125
-				'OfficialCode',
126
-				'PhoneNumber',
127
-			);
128
-		}
129
-
130
-		foreach($extra_fields as $extra) {
131
-			$data[0][]=$extra[1];
132
-		}
133
-	}
134
-
135
-	$res = Database::query($sql);
136
-	while($user = Database::fetch_array($res,'ASSOC')) {
137
-		$student_data = UserManager:: get_extra_user_data(
138
-			$user['UserId'],
139
-			true,
140
-			false
141
-		);
142
-		foreach($student_data as $key=>$value) {
143
-			$key = substr($key, 6);
144
-			if (is_array($value)) {
145
-				$user[$key] = $value[$key];
146
-			} else {
147
-				$user[$key] = $value;
148
-			}
149
-		}
150
-		$data[] = $user	;
151
-	}
152
-
153
-	switch ($file_type) {
154
-		case 'xml':
155
-			Export::arrayToXml($data, $filename, 'Contact', 'Contacts');
156
-			exit;
157
-			break;
158
-		case 'csv':
159
-			Export::arrayToCsv($data, $filename);
160
-			exit;
161
-		case 'xls':
162
-			Export::arrayToXls($data, $filename);
163
-			exit;
164
-			break;
165
-	}
94
+            }
95
+        } else {
96
+            $sql .= " FROM $user_table u ORDER BY lastname,firstname";
97
+        }
98
+        $filename = 'export_users_'.api_get_local_time();
99
+    }
100
+    $data = array();
101
+    $extra_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC',false);
102
+    if ($export['addcsvheader']=='1' AND $export['file_type']=='csv') {
103
+        if ($_configuration['password_encryption'] != 'none') {
104
+            $data[] = array(
105
+                'UserId',
106
+                'LastName',
107
+                'FirstName',
108
+                'Email',
109
+                'UserName',
110
+                'AuthSource',
111
+                'Status',
112
+                'OfficialCode',
113
+                'PhoneNumber',
114
+            );
115
+        } else {
116
+            $data[] = array(
117
+                'UserId',
118
+                'LastName',
119
+                'FirstName',
120
+                'Email',
121
+                'UserName',
122
+                'Password',
123
+                'AuthSource',
124
+                'Status',
125
+                'OfficialCode',
126
+                'PhoneNumber',
127
+            );
128
+        }
129
+
130
+        foreach($extra_fields as $extra) {
131
+            $data[0][]=$extra[1];
132
+        }
133
+    }
134
+
135
+    $res = Database::query($sql);
136
+    while($user = Database::fetch_array($res,'ASSOC')) {
137
+        $student_data = UserManager:: get_extra_user_data(
138
+            $user['UserId'],
139
+            true,
140
+            false
141
+        );
142
+        foreach($student_data as $key=>$value) {
143
+            $key = substr($key, 6);
144
+            if (is_array($value)) {
145
+                $user[$key] = $value[$key];
146
+            } else {
147
+                $user[$key] = $value;
148
+            }
149
+        }
150
+        $data[] = $user	;
151
+    }
152
+
153
+    switch ($file_type) {
154
+        case 'xml':
155
+            Export::arrayToXml($data, $filename, 'Contact', 'Contacts');
156
+            exit;
157
+            break;
158
+        case 'csv':
159
+            Export::arrayToCsv($data, $filename);
160
+            exit;
161
+        case 'xls':
162
+            Export::arrayToXls($data, $filename);
163
+            exit;
164
+            break;
165
+    }
166 166
 }
167 167
 
168 168
 Display :: display_header($tool_name);
Please login to merge, or discard this patch.
main/admin/user_information.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
     api_not_allowed();
22 22
 }
23 23
 $user = api_get_user_info($_GET['user_id'], true);
24
-$tool_name = $user['complete_name'].(empty($user['official_code'])?'':' ('.$user['official_code'].')');
24
+$tool_name = $user['complete_name'].(empty($user['official_code']) ? '' : ' ('.$user['official_code'].')');
25 25
 $table_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
26 26
 $table_course = Database :: get_main_table(TABLE_MAIN_COURSE);
27 27
 
@@ -47,13 +47,13 @@  discard block
 block discarded – undo
47 47
 
48 48
     $exportLink = Display::url(
49 49
         Display::return_icon(
50
-            'export_csv.png', get_lang('ExportAsCSV'),'', ICON_SIZE_MEDIUM
50
+            'export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM
51 51
         ),
52 52
         api_get_self().'?user_id='.$user['user_id'].'&action=export'
53 53
     );
54 54
     $vCardExportLink = Display::url(
55 55
         Display::return_icon(
56
-            'vcard.png', get_lang('UserInfo'),'', ICON_SIZE_MEDIUM
56
+            'vcard.png', get_lang('UserInfo'), '', ICON_SIZE_MEDIUM
57 57
         ),
58 58
         api_get_path(WEB_PATH).'main/social/vcard_export.php?userId='.$user['user_id']
59 59
     );
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
         $tools = '<a href="course_information.php?code='.$courseCode.'">'.
294 294
             Display::return_icon('synthese_view.gif', get_lang('Overview')).'</a>'.
295 295
             '<a href="'.$courseInfo['course_public_url'].'">'.
296
-            Display::return_icon('course_home.gif', get_lang('CourseHomepage')).'</a>' .
296
+            Display::return_icon('course_home.gif', get_lang('CourseHomepage')).'</a>'.
297 297
             '<a href="course_edit.php?id='.$course->c_id.'">'.
298 298
             Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
299 299
         if ($course->status == STUDENT) {
Please login to merge, or discard this patch.
main/admin/course_export.php 2 patches
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.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 api_protect_admin_script();
15 15
 
16 16
 $tool_name = get_lang('ExportCourses');
17
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
17
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
18 18
 
19 19
 set_time_limit(0);
20 20
 
@@ -62,11 +62,11 @@  discard block
 block discarded – undo
62 62
 
63 63
         $dataToExport = [];
64 64
         foreach ($courses as $course) {
65
-            $dataToExport['code'] = str_replace(';',',',$course['code']);
66
-            $dataToExport['title'] = str_replace(';',',',$course['title']);
67
-            $dataToExport['category_code'] = str_replace(';',',',$course['category_code']);
68
-            $dataToExport['tutor_name'] = str_replace(';',',',$course['tutor_name']);
69
-            $dataToExport['course_language'] = str_replace(';',',',$course['course_language']);
65
+            $dataToExport['code'] = str_replace(';', ',', $course['code']);
66
+            $dataToExport['title'] = str_replace(';', ',', $course['title']);
67
+            $dataToExport['category_code'] = str_replace(';', ',', $course['category_code']);
68
+            $dataToExport['tutor_name'] = str_replace(';', ',', $course['tutor_name']);
69
+            $dataToExport['course_language'] = str_replace(';', ',', $course['course_language']);
70 70
 
71 71
             $dataToExport['students'] = '';
72 72
             $dataToExport['teachers'] = '';
@@ -148,8 +148,8 @@  discard block
 block discarded – undo
148 148
 	$form->addHtml('</div>');
149 149
 }
150 150
 
151
-$form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV' , 'csv', null);
152
-$form->addElement('radio', 'file_type', '' , 'XLS' , 'xls', null);
151
+$form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV', 'csv', null);
152
+$form->addElement('radio', 'file_type', '', 'XLS', 'xls', null);
153 153
 $form->addElement('radio', 'file_type', null, 'XML', 'xml', null, array('id' => 'file_type_xml'));
154 154
 
155 155
 $form->setDefaults(['select_type' => '1', 'file_type' => 'csv']);
Please login to merge, or discard this patch.
main/admin/ldap_form_add_users_group.php 3 patches
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.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@  discard block
 block discarded – undo
9 9
 /**
10 10
  * This form is included by ldap_import_students.php and ldap_import_students_to_session.php
11 11
  */
12
-$nbre=0;
12
+$nbre = 0;
13 13
 echo '<form name="form" method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'">';
14
-	if($statut==1)
14
+	if ($statut == 1)
15 15
 	{
16 16
 		echo get_lang('EmailNotifySubscription').': <input type="checkbox" name="mailling" value="1" checked="checked"><i>'.get_lang('DontUnchek').'</i>';
17 17
 	}
@@ -19,30 +19,30 @@  discard block
 block discarded – undo
19 19
 	{
20 20
 		echo '<input type="hidden" name="mailling" value="1">';
21 21
 	}
22
-if(!empty($course))
22
+if (!empty($course))
23 23
 {
24 24
 	echo '<input type="hidden" name="course" value="'.Security::remove_XSS($course).'">';
25 25
 }
26
-elseif(!empty($id_session))
26
+elseif (!empty($id_session))
27 27
 {
28 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
-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>' .
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 36
 		($is_western_name_order
37
-			? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' .
37
+			? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>'.
38 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>' .
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 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;
44
+	$nbre = $nbre + 1;
45
+	if ($nbre & 1) $ndiv = 2; else $ndiv = 3;
46 46
 	echo '<tr align="center" id="header'.$ndiv.'">';
47 47
 	echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
48 48
 	echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';
Please login to merge, or discard this patch.
Braces   +8 added lines, -7 removed lines patch added patch discarded remove patch
@@ -14,16 +14,14 @@  discard block
 block discarded – undo
14 14
 	if($statut==1)
15 15
 	{
16 16
 		echo get_lang('EmailNotifySubscription').': <input type="checkbox" name="mailling" value="1" checked="checked"><i>'.get_lang('DontUnchek').'</i>';
17
-	}
18
-	else
17
+	} else
19 18
 	{
20 19
 		echo '<input type="hidden" name="mailling" value="1">';
21 20
 	}
22 21
 if(!empty($course))
23 22
 {
24 23
 	echo '<input type="hidden" name="course" value="'.Security::remove_XSS($course).'">';
25
-}
26
-elseif(!empty($id_session))
24
+} elseif(!empty($id_session))
27 25
 {
28 26
 	echo '<input type="hidden" name="id_session" value="'.Security::remove_XSS($id_session).'">';
29 27
 }
@@ -42,7 +40,11 @@  discard block
 block discarded – undo
42 40
 	  '</tr>'."\n";
43 41
 while (list ($key, $val) = each($nom_form)) {
44 42
 	$nbre=$nbre+1;
45
-	if($nbre & 1) $ndiv=2; else $ndiv=3;
43
+	if($nbre & 1) {
44
+	    $ndiv=2;
45
+	} else {
46
+	    $ndiv=3;
47
+	}
46 48
 	echo '<tr align="center" id="header'.$ndiv.'">';
47 49
 	echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
48 50
 	echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';
@@ -50,8 +52,7 @@  discard block
 block discarded – undo
50 52
 	{
51 53
 		echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
52 54
 		echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
53
-	}
54
-	else
55
+	} else
55 56
 	{
56 57
 		echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
57 58
 		echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
Please login to merge, or discard this patch.
main/admin/skill_list.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 }
21 21
 
22 22
 $action = isset($_GET['action']) ? $_GET['action'] : 'list';
23
-$skillId = isset($_GET['id']) ? intval($_GET['id']): 0;
23
+$skillId = isset($_GET['id']) ? intval($_GET['id']) : 0;
24 24
 
25 25
 $entityManager = Database::getManager();
26 26
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
             );
56 56
         }
57 57
 
58
-        header('Location: ' . api_get_self());
58
+        header('Location: '.api_get_self());
59 59
         exit;
60 60
         break;
61 61
     case 'disable':
@@ -108,33 +108,33 @@  discard block
 block discarded – undo
108 108
             );
109 109
         }
110 110
 
111
-        header('Location: ' . api_get_self());
111
+        header('Location: '.api_get_self());
112 112
         exit;
113 113
         break;
114 114
     case 'list':
115 115
         //no break
116 116
     default:
117
-        $interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
117
+        $interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
118 118
 
119 119
         $message = Session::has('message') ? Session::read('message') : null;
120 120
 
121 121
         $toolbar = Display::toolbarButton(
122 122
             get_lang('CreateSkill'),
123
-            api_get_path(WEB_CODE_PATH) . 'admin/skill_create.php',
123
+            api_get_path(WEB_CODE_PATH).'admin/skill_create.php',
124 124
             'plus',
125 125
             'success',
126 126
             ['title' => get_lang('CreateSkill')]
127 127
         );
128 128
         $toolbar .= Display::toolbarButton(
129 129
             get_lang('SkillsWheel'),
130
-            api_get_path(WEB_CODE_PATH) . 'admin/skills_wheel.php',
130
+            api_get_path(WEB_CODE_PATH).'admin/skills_wheel.php',
131 131
             'bullseye',
132 132
             'primary',
133 133
             ['title' => get_lang('CreateSkill')]
134 134
         );
135 135
         $toolbar .= Display::toolbarButton(
136 136
             get_lang('BadgesManagement'),
137
-            api_get_path(WEB_CODE_PATH) . 'admin/skill_badge_list.php',
137
+            api_get_path(WEB_CODE_PATH).'admin/skill_badge_list.php',
138 138
             'shield',
139 139
             'warning',
140 140
             ['title' => get_lang('BadgesManagement')]
Please login to merge, or discard this patch.
main/admin/inactive_user_list.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,10 +24,10 @@
 block discarded – undo
24 24
 Display :: display_header($tool_name, "");
25 25
 
26 26
 //On sélectionne les user élèves
27
-$sql = "SELECT user_id FROM ".$table_user." user WHERE user.status= '5' ORDER by lastname " ;
27
+$sql = "SELECT user_id FROM ".$table_user." user WHERE user.status= '5' ORDER by lastname ";
28 28
 $result = Database::query($sql);
29 29
 
30
-while($row = Database::fetch_array($result)) {
30
+while ($row = Database::fetch_array($result)) {
31 31
     $user_id = $row['user_id'];
32 32
     //  pour chaque élève, on trouve la dernière connexion
33 33
     //$last_connection_date = UserManager:: delete_inactive_student($user_id, 2, true);
Please login to merge, or discard this patch.
Indentation   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -4,8 +4,7 @@
 block discarded – undo
4 4
     @author Andre Boivin base code
5 5
 	@author Julio Montoya fixing lot of little details
6 6
 	@todo this script is not ready for a production use that's why I'm commenting the function delete_inactive_student
7
-
8
-*	@package chamilo.admin
7
+ *	@package chamilo.admin
9 8
 *	script pour effacer les user inactif depuis x temps
10 9
 */
11 10
 $cidReset = true;
Please login to merge, or discard this patch.
main/admin/usergroup_user_import.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 
26 26
         foreach ($mandatory_fields as $field) {
27 27
             if (!isset($user_class[$field]) || strlen($user_class[$field]) == 0) {
28
-                $user_class['error'] = get_lang($field . 'Mandatory');
28
+                $user_class['error'] = get_lang($field.'Mandatory');
29 29
                 $errors[] = $user_class;
30 30
             }
31 31
         }
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
                 // 2.1.1 Check whether code exists in DB
38 38
                 $exists = $usergroup->usergroup_exists($user_class['ClassName']);
39 39
                 if (!$exists) {
40
-                    $user_class['error'] = get_lang('CodeDoesNotExists') . ': ' . $user_class['ClassName'];
40
+                    $user_class['error'] = get_lang('CodeDoesNotExists').': '.$user_class['ClassName'];
41 41
                     $errors[] = $user_class;
42 42
                 } else {
43 43
                     $classcodes[$user_class['CourseCode']] = 1;
@@ -49,14 +49,14 @@  discard block
 block discarded – undo
49 49
         if (!UserManager::is_username_empty($user_class['UserName'])) {
50 50
             // 3.1. Check whether username is too long.
51 51
             if (UserManager::is_username_too_long($user_class['UserName'])) {
52
-                $user_class['error'] = get_lang('UserNameTooLong') . ': ' . $user_class['UserName'];
52
+                $user_class['error'] = get_lang('UserNameTooLong').': '.$user_class['UserName'];
53 53
                 $errors[] = $user_class;
54 54
             }
55 55
 
56 56
             $username = UserManager::purify_username($user_class['UserName'], $purification_option_for_usernames);
57 57
             // 3.2. Check whether username exists.
58 58
             if (UserManager::is_username_available($username)) {
59
-                $user_class['error'] = get_lang('UnknownUser') . ': ' . $username;
59
+                $user_class['error'] = get_lang('UnknownUser').': '.$username;
60 60
                 $errors[] = $user_class;
61 61
             }
62 62
         }
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
105 105
             $class_name = $user_data['class_name'];
106 106
             $user_list_name = $user_data['user_list_name'];
107 107
             $usergroup->subscribe_users_to_usergroup($class_id, $user_list, $deleteUsersNotInList);
108
-            $message .= Display::return_message(get_lang('Class') . ': ' . $class_name . '<br />', 'normal', false);
109
-            $message .= Display::return_message(get_lang('Users') . ': ' . implode(', ', $user_list_name));
108
+            $message .= Display::return_message(get_lang('Class').': '.$class_name.'<br />', 'normal', false);
109
+            $message .= Display::return_message(get_lang('Users').': '.implode(', ', $user_list_name));
110 110
         }
111 111
     }
112 112
     return $message;
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 $this_section = SECTION_PLATFORM_ADMIN;
129 129
 api_protect_admin_script(true);
130 130
 
131
-$tool_name = get_lang('AddUsersToAClass') . ' CSV';
131
+$tool_name = get_lang('AddUsersToAClass').' CSV';
132 132
 
133 133
 $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
134 134
 $interbreadcrumb[] = array('url' => 'usergroups.php', 'name' => get_lang('Classes'));
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 if (count($errors) != 0) {
165 165
     $error_message = "\n";
166 166
     foreach ($errors as $index => $error_class_user) {
167
-        $error_message .= get_lang('Line') . ' ' . $error_class_user['line'] . ': ' . $error_class_user['error'] . '</b>';
167
+        $error_message .= get_lang('Line').' '.$error_class_user['line'].': '.$error_class_user['error'].'</b>';
168 168
         $error_message .= "<br />";
169 169
     }
170 170
     $error_message .= "\n";
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 }
173 173
 $form->display();
174 174
 ?>
175
-<p><?php echo get_lang('CSVMustLookLike') . ' (' . get_lang('MandatoryFields') . ')'; ?> :</p>
175
+<p><?php echo get_lang('CSVMustLookLike').' ('.get_lang('MandatoryFields').')'; ?> :</p>
176 176
 <pre>
177 177
 <b>UserName</b>;<b>ClassName</b>
178 178
 jdoe;class01
Please login to merge, or discard this patch.
main/admin/index.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 $nameTools = get_lang('PlatformAdmin');
20 20
 
21 21
 $accessUrlId = 0;
22
-$adminExtraContentDir = api_get_path(SYS_APP_PATH) . "home/admin/";
22
+$adminExtraContentDir = api_get_path(SYS_APP_PATH)."home/admin/";
23 23
 
24 24
 if (api_is_multiple_url_enabled()) {
25 25
     $accessUrlId = api_get_current_access_url_id();
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
         $urlInfo = api_get_access_url($accessUrlId);
29 29
         $url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $urlInfo['url']));
30 30
         $cleanUrl = str_replace('/', '-', $url);
31
-        $adminExtraContentDir = api_get_path(SYS_APP_PATH) . "home/$cleanUrl/admin/";
31
+        $adminExtraContentDir = api_get_path(SYS_APP_PATH)."home/$cleanUrl/admin/";
32 32
     }
33 33
 }
34 34
 
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
             <div class="form-group">
97 97
                 <input class="form-control" type="text" name="keyword" value="">
98 98
                 <button class="btn btn-default" type="submit">
99
-                    <em class="fa fa-search"></em> ' . get_lang('Search') . '
99
+                    <em class="fa fa-search"></em> ' . get_lang('Search').'
100 100
                 </button>
101 101
             </div>
102 102
         </form>';
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
             <div class="form-group">
150 150
                 <input class="form-control" type="text" name="keyword" value="">
151 151
                 <button class="btn btn-default" type="submit">
152
-                    <em class="fa fa-search"></em> ' . get_lang('Search') . '
152
+                    <em class="fa fa-search"></em> ' . get_lang('Search').'
153 153
                 </button>
154 154
             </div>
155 155
         </form>';
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
                 <input class="form-control" type="text" name="search_field" value="" >
210 210
                 <input type="hidden" value="search_setting" name="category">
211 211
                 <button class="btn btn-default" type="submit">
212
-                    <em class="fa fa-search"></em> ' . get_lang('Search') . '
212
+                    <em class="fa fa-search"></em> ' . get_lang('Search').'
213 213
                 </button>
214 214
             </div>
215 215
         </form>';
@@ -222,18 +222,18 @@  discard block
 block discarded – undo
222 222
     $items[] = array('url' => 'settings.php?category=Regions', 'label' => get_lang('Regions'));
223 223
     $items[] = array('url' => 'system_announcements.php', 'label' => get_lang('SystemAnnouncements'));
224 224
     $items[] = array(
225
-        'url' => api_get_path(WEB_CODE_PATH) . 'calendar/agenda_js.php?type=admin',
225
+        'url' => api_get_path(WEB_CODE_PATH).'calendar/agenda_js.php?type=admin',
226 226
         'label' => get_lang('GlobalAgenda')
227 227
     );
228 228
     $items[] = array('url' => 'configure_homepage.php', 'label' => get_lang('ConfigureHomePage'));
229 229
     $items[] = array('url' => 'configure_inscription.php', 'label' => get_lang('ConfigureInscription'));
230 230
     $items[] = array('url' => 'statistics/index.php', 'label' => get_lang('Statistics'));
231 231
     $items[] = array(
232
-        'url' => api_get_path(WEB_CODE_PATH) . 'mySpace/company_reports.php',
232
+        'url' => api_get_path(WEB_CODE_PATH).'mySpace/company_reports.php',
233 233
         'label' => get_lang('Reports')
234 234
     );
235 235
     $items[] = array(
236
-        'url' => api_get_path(WEB_CODE_PATH) . 'admin/teacher_time_report.php',
236
+        'url' => api_get_path(WEB_CODE_PATH).'admin/teacher_time_report.php',
237 237
         'label' => get_lang('TeacherTimeReport')
238 238
     );
239 239
 
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
                     <div class="form-group">
283 283
                         <input class="form-control" type="text" name="keyword" value="">
284 284
                         <button class="btn btn-default" type="submit">
285
-                            <em class="fa fa-search"></em> ' . get_lang('Search') . '
285
+                            <em class="fa fa-search"></em> ' . get_lang('Search').'
286 286
                         </button>
287 287
                     </div>
288 288
                 </form>';
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 
311 311
 if (api_is_platform_admin()) {
312 312
     // option only visible in development mode. Enable through code if required
313
-    if (is_dir(api_get_path(SYS_TEST_PATH) . 'datafiller/')) {
313
+    if (is_dir(api_get_path(SYS_TEST_PATH).'datafiller/')) {
314 314
         $items[] = array('url' => 'user_move_stats.php', 'label' => get_lang('MoveUserStats'));
315 315
     }
316 316
     $items[] = array('url' => 'career_dashboard.php', 'label' => get_lang('CareersAndPromotions'));
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
     $items = array();
338 338
     $items[] = array('url' => 'special_exports.php', 'label' => get_lang('SpecialExports'));
339 339
     $items[] = array('url' => 'system_status.php', 'label' => get_lang('SystemStatus'));
340
-    if (is_dir(api_get_path(SYS_TEST_PATH) . 'datafiller/')) {
340
+    if (is_dir(api_get_path(SYS_TEST_PATH).'datafiller/')) {
341 341
         $items[] = array('url' => 'filler.php', 'label' => get_lang('DataFiller'));
342 342
     }
343 343
 
@@ -381,12 +381,12 @@  discard block
 block discarded – undo
381 381
         $items[] = array('url' => 'skill_list.php', 'label' => get_lang('ManageSkills'));
382 382
         //$items[] = array('url'=>'skills_profile.php',   'label' => get_lang('SkillsProfile'));
383 383
         $items[] = array(
384
-            'url' => api_get_path(WEB_CODE_PATH) . 'social/skills_ranking.php',
384
+            'url' => api_get_path(WEB_CODE_PATH).'social/skills_ranking.php',
385 385
             'label' => get_lang('SkillsRanking')
386 386
         );
387 387
         $items[] = array('url' => 'skills_gradebook.php', 'label' => get_lang('SkillsAndGradebooks'));
388 388
         $items[] = array(
389
-            'url' => api_get_path(WEB_CODE_PATH) . 'admin/skill_badge.php',
389
+            'url' => api_get_path(WEB_CODE_PATH).'admin/skill_badge.php',
390 390
             'label' => get_lang('Badges')
391 391
         );
392 392
         $blocks['skills']['items'] = $items;
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
439 439
         }
440 440
     }
441 441
 }
442
-$admin_ajax_url = api_get_path(WEB_AJAX_PATH) . 'admin.ajax.php';
442
+$admin_ajax_url = api_get_path(WEB_AJAX_PATH).'admin.ajax.php';
443 443
 
444 444
 $tpl = new Template();
445 445
 
@@ -492,7 +492,7 @@  discard block
 block discarded – undo
492 492
                 die;
493 493
             }
494 494
 
495
-            $fullFilePath = $adminExtraContentDir . $extraData['block'];
495
+            $fullFilePath = $adminExtraContentDir.$extraData['block'];
496 496
             $fullFilePath .= "_extra.html";
497 497
 
498 498
             file_put_contents($fullFilePath, $extraData['extra_content']);
Please login to merge, or discard this patch.