Passed
Push — 1.11.x ( 6edc89...d177c2 )
by José
36:58 queued 07:08
created
main/admin/user_export.php 1 patch
Indentation   +98 added lines, -98 removed lines patch added patch discarded remove patch
@@ -36,20 +36,20 @@  discard block
 block discarded – undo
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);
40
-	$access_url_id = api_get_current_access_url_id();
41
-	if ($access_url_id != -1){
42
-	$sql = "SELECT code,visual_code,title
39
+    $tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
40
+    $access_url_id = api_get_current_access_url_id();
41
+    if ($access_url_id != -1){
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
45 45
 		ON (c.id = course_rel_url.c_id)
46 46
 		WHERE access_url_id = $access_url_id
47 47
 		ORDER BY visual_code";
48
-	}
48
+    }
49 49
 }
50 50
 $result = Database::query($sql);
51 51
 while ($course = Database::fetch_object($result)) {
52
-	$courses[$course->code] = $course->visual_code.' - '.$course->title;
52
+    $courses[$course->code] = $course->visual_code.' - '.$course->title;
53 53
 }
54 54
 $form = new FormValidator('export_users');
55 55
 $form->addElement('header', $tool_name);
@@ -64,19 +64,19 @@  discard block
 block discarded – undo
64 64
 $form->setDefaults(array('file_type' => 'csv'));
65 65
 
66 66
 if ($form->validate()) {
67
-	$export = $form->exportValues();
68
-	$file_type = $export['file_type'];
69
-	$course_code = Database::escape_string($export['course_code']);
70
-	$courseInfo = api_get_course_info($course_code);
67
+    $export = $form->exportValues();
68
+    $file_type = $export['file_type'];
69
+    $course_code = Database::escape_string($export['course_code']);
70
+    $courseInfo = api_get_course_info($course_code);
71 71
     $courseId = isset($courseInfo['real_id']) ? $courseInfo['real_id'] : 0;
72 72
 
73
-	$courseSessionValue = explode(':', $export['course_session']);
74
-	$courseSessionCode = '';
75
-	$sessionId = 0;
76
-	$courseSessionId = 0;
77
-	$sessionInfo = [];
73
+    $courseSessionValue = explode(':', $export['course_session']);
74
+    $courseSessionCode = '';
75
+    $sessionId = 0;
76
+    $courseSessionId = 0;
77
+    $sessionInfo = [];
78 78
 
79
-	if (is_array($courseSessionValue) && isset($courseSessionValue[1])) {
79
+    if (is_array($courseSessionValue) && isset($courseSessionValue[1])) {
80 80
         $courseSessionCode = $courseSessionValue[0];
81 81
         $sessionId = $courseSessionValue[1];
82 82
         $courseSessionInfo= api_get_course_info($courseSessionCode);
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
         $sessionInfo = api_get_session_info($sessionId);
85 85
     }
86 86
 
87
-	$sql = "SELECT
87
+    $sql = "SELECT
88 88
 				u.user_id 	AS UserId,
89 89
 				u.lastname 	AS LastName,
90 90
 				u.firstname 	AS FirstName,
@@ -95,15 +95,15 @@  discard block
 block discarded – undo
95 95
 				u.status		AS Status,
96 96
 				u.official_code	AS OfficialCode,
97 97
 				u.phone		AS Phone";
98
-	if (strlen($course_code) > 0) {
99
-		$sql .= " FROM $user_table u, $course_user_table cu
98
+    if (strlen($course_code) > 0) {
99
+        $sql .= " FROM $user_table u, $course_user_table cu
100 100
 					WHERE
101 101
 						u.user_id = cu.user_id AND
102 102
 						cu.c_id = $courseId AND
103 103
 						cu.relation_type<>".COURSE_RELATION_TYPE_RRHH."
104 104
 					ORDER BY lastname,firstname";
105
-		$filename = 'export_users_'.$course_code.'_'.api_get_local_time();
106
-	} else if (strlen($courseSessionCode) > 0) {
105
+        $filename = 'export_users_'.$course_code.'_'.api_get_local_time();
106
+    } else if (strlen($courseSessionCode) > 0) {
107 107
         $sql .= " FROM $user_table u, $session_course_user_table scu
108 108
 					WHERE
109 109
 						u.user_id = scu.user_id AND
@@ -112,87 +112,87 @@  discard block
 block discarded – undo
112 112
 					ORDER BY lastname,firstname";
113 113
         $filename = 'export_users_'.$courseSessionCode.'_'.$sessionInfo['name'].'_'.api_get_local_time();
114 114
     } else {
115
-		if (api_is_multiple_url_enabled()) {
116
-			$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
117
-			$access_url_id = api_get_current_access_url_id();
118
-			if ($access_url_id != -1) {
119
-			$sql.= " FROM $user_table u
115
+        if (api_is_multiple_url_enabled()) {
116
+            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
117
+            $access_url_id = api_get_current_access_url_id();
118
+            if ($access_url_id != -1) {
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
123 123
 				ORDER BY lastname,firstname";
124
-			}
125
-		} else {
126
-			$sql .= " FROM $user_table u ORDER BY lastname,firstname";
127
-		}
128
-		$filename = 'export_users_'.api_get_local_time();
129
-	}
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') {
133
-		if ($_configuration['password_encryption'] != 'none') {
134
-			$data[] = array(
135
-				'UserId',
136
-				'LastName',
137
-				'FirstName',
138
-				'Email',
139
-				'UserName',
140
-				'AuthSource',
141
-				'Status',
142
-				'OfficialCode',
143
-				'PhoneNumber',
144
-			);
145
-		} else {
146
-			$data[] = array(
147
-				'UserId',
148
-				'LastName',
149
-				'FirstName',
150
-				'Email',
151
-				'UserName',
152
-				'Password',
153
-				'AuthSource',
154
-				'Status',
155
-				'OfficialCode',
156
-				'PhoneNumber',
157
-			);
158
-		}
159
-
160
-		foreach($extra_fields as $extra) {
161
-			$data[0][]=$extra[1];
162
-		}
163
-	}
164
-
165
-	$res = Database::query($sql);
166
-	while($user = Database::fetch_array($res,'ASSOC')) {
167
-		$student_data = UserManager:: get_extra_user_data(
168
-			$user['UserId'],
169
-			true,
170
-			false
171
-		);
172
-		foreach($student_data as $key=>$value) {
173
-			$key = substr($key, 6);
174
-			if (is_array($value)) {
175
-				$user[$key] = $value['extra_' . $key];
176
-			} else {
177
-				$user[$key] = $value;
178
-			}
179
-		}
180
-		$data[] = $user	;
181
-	}
182
-
183
-	switch ($file_type) {
184
-		case 'xml':
185
-			Export::arrayToXml($data, $filename, 'Contact', 'Contacts');
186
-			exit;
187
-			break;
188
-		case 'csv':
189
-			Export::arrayToCsv($data, $filename);
190
-			exit;
191
-		case 'xls':
192
-			Export::arrayToXls($data, $filename);
193
-			exit;
194
-			break;
195
-	}
124
+            }
125
+        } else {
126
+            $sql .= " FROM $user_table u ORDER BY lastname,firstname";
127
+        }
128
+        $filename = 'export_users_'.api_get_local_time();
129
+    }
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') {
133
+        if ($_configuration['password_encryption'] != 'none') {
134
+            $data[] = array(
135
+                'UserId',
136
+                'LastName',
137
+                'FirstName',
138
+                'Email',
139
+                'UserName',
140
+                'AuthSource',
141
+                'Status',
142
+                'OfficialCode',
143
+                'PhoneNumber',
144
+            );
145
+        } else {
146
+            $data[] = array(
147
+                'UserId',
148
+                'LastName',
149
+                'FirstName',
150
+                'Email',
151
+                'UserName',
152
+                'Password',
153
+                'AuthSource',
154
+                'Status',
155
+                'OfficialCode',
156
+                'PhoneNumber',
157
+            );
158
+        }
159
+
160
+        foreach($extra_fields as $extra) {
161
+            $data[0][]=$extra[1];
162
+        }
163
+    }
164
+
165
+    $res = Database::query($sql);
166
+    while($user = Database::fetch_array($res,'ASSOC')) {
167
+        $student_data = UserManager:: get_extra_user_data(
168
+            $user['UserId'],
169
+            true,
170
+            false
171
+        );
172
+        foreach($student_data as $key=>$value) {
173
+            $key = substr($key, 6);
174
+            if (is_array($value)) {
175
+                $user[$key] = $value['extra_' . $key];
176
+            } else {
177
+                $user[$key] = $value;
178
+            }
179
+        }
180
+        $data[] = $user	;
181
+    }
182
+
183
+    switch ($file_type) {
184
+        case 'xml':
185
+            Export::arrayToXml($data, $filename, 'Contact', 'Contacts');
186
+            exit;
187
+            break;
188
+        case 'csv':
189
+            Export::arrayToCsv($data, $filename);
190
+            exit;
191
+        case 'xls':
192
+            Export::arrayToXls($data, $filename);
193
+            exit;
194
+            break;
195
+    }
196 196
 }
197 197
 
198 198
 Display :: display_header($tool_name);
Please login to merge, or discard this patch.
main/user/user_export.php 2 patches
Switch Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -149,15 +149,15 @@
 block discarded – undo
149 149
 }
150 150
 
151 151
 switch ($file_type) {
152
-    case 'xml':
153
-        Export::arrayToXml($data, $filename, 'Contact', 'Contacts');
154
-        exit;
155
-        break;
156
-    case 'csv':
157
-        Export::arrayToCsv($data, $filename);
158
-        exit;
159
-    case 'xls':
160
-        Export::arrayToXls($data, $filename);
161
-        exit;
162
-        break;
152
+        case 'xml':
153
+            Export::arrayToXml($data, $filename, 'Contact', 'Contacts');
154
+            exit;
155
+            break;
156
+        case 'csv':
157
+            Export::arrayToCsv($data, $filename);
158
+            exit;
159
+        case 'xls':
160
+            Export::arrayToXls($data, $filename);
161
+            exit;
162
+            break;
163 163
 }
164 164
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 if (is_array($courseSessionValue) && isset($courseSessionValue[1])) {
41 41
     $courseSessionCode = $courseSessionValue[0];
42 42
     $sessionId = $courseSessionValue[1];
43
-    $courseSessionInfo= api_get_course_info($courseSessionCode);
43
+    $courseSessionInfo = api_get_course_info($courseSessionCode);
44 44
     $courseSessionId = $courseSessionInfo['real_id'];
45 45
     $sessionInfo = api_get_session_info($sessionId);
46 46
 }
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 				u.firstname 	AS FirstName,
52 52
 				u.email 		AS Email,
53 53
 				u.username	AS UserName,
54
-				".(($_configuration['password_encryption']!='none')?" ":"u.password AS Password, ")."
54
+				".(($_configuration['password_encryption'] != 'none') ? " " : "u.password AS Password, ")."
55 55
 				u.auth_source	AS AuthSource,
56 56
 				u.status		AS Status,
57 57
 				u.official_code	AS OfficialCode,
@@ -81,10 +81,10 @@  discard block
 block discarded – undo
81 81
     $filename = 'export_users_'.$sessionInfo['name'].'_'.api_get_local_time();
82 82
 } else {
83 83
     if (api_is_multiple_url_enabled()) {
84
-        $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
84
+        $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
85 85
         $access_url_id = api_get_current_access_url_id();
86 86
         if ($access_url_id != -1) {
87
-            $sql.= " FROM $user_table u
87
+            $sql .= " FROM $user_table u
88 88
 					INNER JOIN $tbl_user_rel_access_url as user_rel_url
89 89
 				ON (u.user_id= user_rel_url.user_id)
90 90
 				WHERE access_url_id = $access_url_id
@@ -96,8 +96,8 @@  discard block
 block discarded – undo
96 96
     $filename = 'export_users_'.api_get_local_time();
97 97
 }
98 98
 $data = array();
99
-$extra_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC',false);
100
-if ($export['addcsvheader']=='1' AND $export['file_type']=='csv') {
99
+$extra_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC', false);
100
+if ($export['addcsvheader'] == '1' AND $export['file_type'] == 'csv') {
101 101
     if ($_configuration['password_encryption'] != 'none') {
102 102
         $data[] = array(
103 103
             'UserId',
@@ -125,27 +125,27 @@  discard block
 block discarded – undo
125 125
         );
126 126
     }
127 127
 
128
-    foreach($extra_fields as $extra) {
129
-        $data[0][]=$extra[1];
128
+    foreach ($extra_fields as $extra) {
129
+        $data[0][] = $extra[1];
130 130
     }
131 131
 }
132 132
 
133 133
 $res = Database::query($sql);
134
-while($user = Database::fetch_array($res,'ASSOC')) {
134
+while ($user = Database::fetch_array($res, 'ASSOC')) {
135 135
     $student_data = UserManager:: get_extra_user_data(
136 136
         $user['UserId'],
137 137
         true,
138 138
         false
139 139
     );
140
-    foreach($student_data as $key=>$value) {
140
+    foreach ($student_data as $key=>$value) {
141 141
         $key = substr($key, 6);
142 142
         if (is_array($value)) {
143
-            $user[$key] = $value['extra_' . $key];
143
+            $user[$key] = $value['extra_'.$key];
144 144
         } else {
145 145
             $user[$key] = $value;
146 146
         }
147 147
     }
148
-    $data[] = $user	;
148
+    $data[] = $user;
149 149
 }
150 150
 
151 151
 switch ($file_type) {
Please login to merge, or discard this patch.