Completed
Push — 1.11.x ( 4463da...cd5efc )
by José
55:32 queued 28:22
created
main/admin/user_export.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -29,16 +29,16 @@  discard block
 block discarded – undo
29 29
 
30 30
 $coursesSessions = array_merge($coursesSessions, $allCoursesFromSessions);
31 31
 
32
-$courses = array ();
32
+$courses = array();
33 33
 $courses[''] = '--';
34 34
 $sql = "SELECT code,visual_code,title FROM $course_table ORDER BY visual_code";
35 35
 
36 36
 global $_configuration;
37 37
 
38 38
 if (api_is_multiple_url_enabled()) {
39
-	$tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
39
+	$tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
40 40
 	$access_url_id = api_get_current_access_url_id();
41
-	if ($access_url_id != -1){
41
+	if ($access_url_id != -1) {
42 42
 	$sql = "SELECT code,visual_code,title
43 43
 		FROM $course_table as c
44 44
 		INNER JOIN $tbl_course_rel_access_url as course_rel_url
@@ -53,11 +53,11 @@  discard block
 block discarded – undo
53 53
 }
54 54
 $form = new FormValidator('export_users');
55 55
 $form->addElement('header', $tool_name);
56
-$form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'XML','xml');
56
+$form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'XML', 'xml');
57 57
 $form->addElement('radio', 'file_type', null, 'CSV', 'csv');
58 58
 $form->addElement('radio', 'file_type', null, 'XLS', 'xls');
59 59
 
60
-$form->addElement('checkbox', 'addcsvheader', get_lang('AddCSVHeader'), get_lang('YesAddCSVHeader'),'1');
60
+$form->addElement('checkbox', 'addcsvheader', get_lang('AddCSVHeader'), get_lang('YesAddCSVHeader'), '1');
61 61
 $form->addElement('select', 'course_code', get_lang('OnlyUsersFromCourse'), $courses);
62 62
 $form->addElement('select', 'course_session', get_lang('OnlyUsersFromCourseSession'), $coursesSessions);
63 63
 $form->addButtonExport(get_lang('Export'));
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	if (is_array($courseSessionValue) && isset($courseSessionValue[1])) {
80 80
         $courseSessionCode = $courseSessionValue[0];
81 81
         $sessionId = $courseSessionValue[1];
82
-        $courseSessionInfo= api_get_course_info($courseSessionCode);
82
+        $courseSessionInfo = api_get_course_info($courseSessionCode);
83 83
         $courseSessionId = $courseSessionInfo['real_id'];
84 84
         $sessionInfo = api_get_session_info($sessionId);
85 85
     }
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 				u.firstname 	AS FirstName,
91 91
 				u.email 		AS Email,
92 92
 				u.username	AS UserName,
93
-				".(($_configuration['password_encryption']!='none')?" ":"u.password AS Password, ")."
93
+				".(($_configuration['password_encryption'] != 'none') ? " " : "u.password AS Password, ")."
94 94
 				u.auth_source	AS AuthSource,
95 95
 				u.status		AS Status,
96 96
 				u.official_code	AS OfficialCode,
@@ -113,10 +113,10 @@  discard block
 block discarded – undo
113 113
         $filename = 'export_users_'.$courseSessionCode.'_'.$sessionInfo['name'].'_'.api_get_local_time();
114 114
     } else {
115 115
 		if (api_is_multiple_url_enabled()) {
116
-			$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
116
+			$tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
117 117
 			$access_url_id = api_get_current_access_url_id();
118 118
 			if ($access_url_id != -1) {
119
-			$sql.= " FROM $user_table u
119
+			$sql .= " FROM $user_table u
120 120
 					INNER JOIN $tbl_user_rel_access_url as user_rel_url
121 121
 				ON (u.user_id= user_rel_url.user_id)
122 122
 				WHERE access_url_id = $access_url_id
@@ -128,8 +128,8 @@  discard block
 block discarded – undo
128 128
 		$filename = 'export_users_'.api_get_local_time();
129 129
 	}
130 130
 	$data = array();
131
-	$extra_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC',false);
132
-	if ($export['addcsvheader']=='1' AND $export['file_type']=='csv') {
131
+	$extra_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC', false);
132
+	if ($export['addcsvheader'] == '1' AND $export['file_type'] == 'csv') {
133 133
 		if ($_configuration['password_encryption'] != 'none') {
134 134
 			$data[] = array(
135 135
 				'UserId',
@@ -157,27 +157,27 @@  discard block
 block discarded – undo
157 157
 			);
158 158
 		}
159 159
 
160
-		foreach($extra_fields as $extra) {
161
-			$data[0][]=$extra[1];
160
+		foreach ($extra_fields as $extra) {
161
+			$data[0][] = $extra[1];
162 162
 		}
163 163
 	}
164 164
 
165 165
 	$res = Database::query($sql);
166
-	while($user = Database::fetch_array($res,'ASSOC')) {
166
+	while ($user = Database::fetch_array($res, 'ASSOC')) {
167 167
 		$student_data = UserManager:: get_extra_user_data(
168 168
 			$user['UserId'],
169 169
 			true,
170 170
 			false
171 171
 		);
172
-		foreach($student_data as $key=>$value) {
172
+		foreach ($student_data as $key=>$value) {
173 173
 			$key = substr($key, 6);
174 174
 			if (is_array($value)) {
175
-				$user[$key] = $value['extra_' . $key];
175
+				$user[$key] = $value['extra_'.$key];
176 176
 			} else {
177 177
 				$user[$key] = $value;
178 178
 			}
179 179
 		}
180
-		$data[] = $user	;
180
+		$data[] = $user;
181 181
 	}
182 182
 
183 183
 	switch ($file_type) {
Please login to merge, or discard this patch.