@@ -26,11 +26,11 @@ discard block |
||
26 | 26 | $validResponse = md5("{$A1}:{$digestParts['nonce']}:{$digestParts['nc']}:{$digestParts['cnonce']}:{$digestParts['qop']}:{$A2}"); |
27 | 27 | |
28 | 28 | if ($digestParts['response'] != $validResponse) |
29 | - requireLogin($realm,$nonce); |
|
29 | + requireLogin($realm,$nonce); |
|
30 | 30 | else { |
31 | - // We're in! |
|
32 | - echo 'a7532ae474e5e66a0c16eddab02e02a7'; |
|
33 | - die(); |
|
31 | + // We're in! |
|
32 | + echo 'a7532ae474e5e66a0c16eddab02e02a7'; |
|
33 | + die(); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | // This function returns the digest string |
@@ -42,11 +42,11 @@ discard block |
||
42 | 42 | // most other servers |
43 | 43 | } |
44 | 44 | elseif (isset($_SERVER['HTTP_AUTHENTICATION'])) { |
45 | - if (strpos(strtolower($_SERVER['HTTP_AUTHENTICATION']),'digest')===0) |
|
45 | + if (strpos(strtolower($_SERVER['HTTP_AUTHENTICATION']),'digest')===0) |
|
46 | 46 | $digest = substr($_SERVER['HTTP_AUTHORIZATION'], 7); |
47 | 47 | } |
48 | 48 | elseif (isset($_SERVER['HTTP_WWW_AUTHENTICATE'])) { |
49 | - $digest = $_SERVER['HTTP_WWW_AUTHENTICATE']; |
|
49 | + $digest = $_SERVER['HTTP_WWW_AUTHENTICATE']; |
|
50 | 50 | } |
51 | 51 | return $digest; |
52 | 52 |
@@ -6,120 +6,120 @@ discard block |
||
6 | 6 | * Error returned by one of the methods of the web service. Contains an error code and an error message |
7 | 7 | */ |
8 | 8 | class WSCMError { |
9 | - /** |
|
10 | - * Error handler. This needs to be a class that implements the interface WSErrorHandler |
|
11 | - * |
|
12 | - * @var WSErrorHandler |
|
13 | - */ |
|
14 | - protected static $_handler; |
|
9 | + /** |
|
10 | + * Error handler. This needs to be a class that implements the interface WSErrorHandler |
|
11 | + * |
|
12 | + * @var WSErrorHandler |
|
13 | + */ |
|
14 | + protected static $_handler; |
|
15 | 15 | |
16 | - /** |
|
17 | - * Error code |
|
18 | - * |
|
19 | - * @var int |
|
20 | - */ |
|
21 | - public $code; |
|
16 | + /** |
|
17 | + * Error code |
|
18 | + * |
|
19 | + * @var int |
|
20 | + */ |
|
21 | + public $code; |
|
22 | 22 | |
23 | - /** |
|
24 | - * Error message |
|
25 | - * |
|
26 | - * @var string |
|
27 | - */ |
|
28 | - public $message; |
|
23 | + /** |
|
24 | + * Error message |
|
25 | + * |
|
26 | + * @var string |
|
27 | + */ |
|
28 | + public $message; |
|
29 | 29 | |
30 | - /** |
|
31 | - * Constructor |
|
32 | - * |
|
33 | - * @param int Error code |
|
34 | - * @param string Error message |
|
35 | - */ |
|
36 | - public function __construct($code, $message) { |
|
37 | - $this->code = $code; |
|
38 | - $this->message = $message; |
|
39 | - } |
|
30 | + /** |
|
31 | + * Constructor |
|
32 | + * |
|
33 | + * @param int Error code |
|
34 | + * @param string Error message |
|
35 | + */ |
|
36 | + public function __construct($code, $message) { |
|
37 | + $this->code = $code; |
|
38 | + $this->message = $message; |
|
39 | + } |
|
40 | 40 | |
41 | - /** |
|
42 | - * Sets the error handler |
|
43 | - * |
|
44 | - * @param WSErrorHandler Error handler |
|
45 | - */ |
|
46 | - public static function setErrorHandler($handler) { |
|
47 | - if($handler instanceof WSErrorHandler) { |
|
48 | - self::$_handler = $handler; |
|
49 | - } |
|
50 | - } |
|
41 | + /** |
|
42 | + * Sets the error handler |
|
43 | + * |
|
44 | + * @param WSErrorHandler Error handler |
|
45 | + */ |
|
46 | + public static function setErrorHandler($handler) { |
|
47 | + if($handler instanceof WSErrorHandler) { |
|
48 | + self::$_handler = $handler; |
|
49 | + } |
|
50 | + } |
|
51 | 51 | |
52 | - /** |
|
53 | - * Returns the error handler |
|
54 | - * |
|
55 | - * @return WSErrorHandler Error handler |
|
56 | - */ |
|
57 | - public static function getErrorHandler() { |
|
58 | - return self::$_handler; |
|
59 | - } |
|
52 | + /** |
|
53 | + * Returns the error handler |
|
54 | + * |
|
55 | + * @return WSErrorHandler Error handler |
|
56 | + */ |
|
57 | + public static function getErrorHandler() { |
|
58 | + return self::$_handler; |
|
59 | + } |
|
60 | 60 | |
61 | - /** |
|
62 | - * Transforms the error into an array |
|
63 | - * |
|
64 | - * @return array Associative array with code and message |
|
65 | - */ |
|
66 | - public function toArray() { |
|
67 | - return array('code' => $this->code, 'message' => $this->message); |
|
68 | - } |
|
61 | + /** |
|
62 | + * Transforms the error into an array |
|
63 | + * |
|
64 | + * @return array Associative array with code and message |
|
65 | + */ |
|
66 | + public function toArray() { |
|
67 | + return array('code' => $this->code, 'message' => $this->message); |
|
68 | + } |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
72 | 72 | * Interface that must be implemented by any error handler |
73 | 73 | */ |
74 | 74 | interface WSCMErrorHandler { |
75 | - /** |
|
76 | - * Handle method |
|
77 | - * |
|
78 | - * @param WSError Error |
|
79 | - */ |
|
80 | - public function handle($error); |
|
75 | + /** |
|
76 | + * Handle method |
|
77 | + * |
|
78 | + * @param WSError Error |
|
79 | + */ |
|
80 | + public function handle($error); |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | /** |
84 | 84 | * Main class of the webservice. Webservice classes extend this class |
85 | 85 | */ |
86 | 86 | class WSCM { |
87 | - /** |
|
88 | - * Chamilo configuration |
|
89 | - * |
|
90 | - * @var array |
|
91 | - */ |
|
92 | - protected $_configuration; |
|
87 | + /** |
|
88 | + * Chamilo configuration |
|
89 | + * |
|
90 | + * @var array |
|
91 | + */ |
|
92 | + protected $_configuration; |
|
93 | 93 | |
94 | - /** |
|
95 | - * Constructor |
|
96 | - */ |
|
97 | - public function __construct() { |
|
98 | - $this->_configuration = $GLOBALS['_configuration']; |
|
99 | - } |
|
94 | + /** |
|
95 | + * Constructor |
|
96 | + */ |
|
97 | + public function __construct() { |
|
98 | + $this->_configuration = $GLOBALS['_configuration']; |
|
99 | + } |
|
100 | 100 | |
101 | - /** |
|
102 | - * Verifies the API key |
|
103 | - * |
|
104 | - * @param string Secret key |
|
105 | - * @return mixed WSError in case of failure, null in case of success |
|
106 | - */ |
|
107 | - protected function verifyKey($secret_key) { |
|
108 | - $ip = trim($_SERVER['REMOTE_ADDR']); |
|
109 | - // if we are behind a reverse proxy, assume it will send the |
|
110 | - // HTTP_X_FORWARDED_FOR header and use this IP instead |
|
111 | - if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) { |
|
112 | - list($ip1,$ip2) = split(',',$_SERVER['HTTP_X_FORWARDED_FOR']); |
|
113 | - $ip = trim($ip1); |
|
114 | - } |
|
115 | - $security_key = $ip.$this->_configuration['security_key']; |
|
101 | + /** |
|
102 | + * Verifies the API key |
|
103 | + * |
|
104 | + * @param string Secret key |
|
105 | + * @return mixed WSError in case of failure, null in case of success |
|
106 | + */ |
|
107 | + protected function verifyKey($secret_key) { |
|
108 | + $ip = trim($_SERVER['REMOTE_ADDR']); |
|
109 | + // if we are behind a reverse proxy, assume it will send the |
|
110 | + // HTTP_X_FORWARDED_FOR header and use this IP instead |
|
111 | + if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) { |
|
112 | + list($ip1,$ip2) = split(',',$_SERVER['HTTP_X_FORWARDED_FOR']); |
|
113 | + $ip = trim($ip1); |
|
114 | + } |
|
115 | + $security_key = $ip.$this->_configuration['security_key']; |
|
116 | 116 | |
117 | - if(!api_is_valid_secret_key($secret_key, $security_key)) { |
|
118 | - return new WSCMError(1, "API key is invalid"); |
|
119 | - } else { |
|
120 | - return null; |
|
121 | - } |
|
122 | - } |
|
117 | + if(!api_is_valid_secret_key($secret_key, $security_key)) { |
|
118 | + return new WSCMError(1, "API key is invalid"); |
|
119 | + } else { |
|
120 | + return null; |
|
121 | + } |
|
122 | + } |
|
123 | 123 | |
124 | 124 | /** |
125 | 125 | * Verifies if the user is valid |
@@ -134,12 +134,12 @@ discard block |
||
134 | 134 | $login = $username; |
135 | 135 | $password = $pass; |
136 | 136 | |
137 | - //lookup the user in the main database |
|
137 | + //lookup the user in the main database |
|
138 | 138 | $user_table = Database::get_main_table(TABLE_MAIN_USER); |
139 | - $sql = "SELECT user_id, username, password, auth_source, active, expiration_date |
|
139 | + $sql = "SELECT user_id, username, password, auth_source, active, expiration_date |
|
140 | 140 | FROM $user_table |
141 | 141 | WHERE username = '".trim(addslashes($login))."'"; |
142 | - $result = Database::query($sql); |
|
142 | + $result = Database::query($sql); |
|
143 | 143 | |
144 | 144 | if (Database::num_rows($result) > 0) { |
145 | 145 | $uData = Database::fetch_array($result); |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | |
172 | 172 | /** |
173 | 173 | * Return the encrypted pass |
174 | - * @deprecated |
|
174 | + * @deprecated |
|
175 | 175 | * @param <String> $pass |
176 | 176 | * @return <String> $pass encrypted |
177 | 177 | */ |
@@ -180,112 +180,112 @@ discard block |
||
180 | 180 | }*/ |
181 | 181 | |
182 | 182 | /** |
183 | - * Gets the real user id based on the user id field name and value. Note that if the user id field name is "chamilo_user_id", it will use the user id |
|
184 | - * in the system database |
|
185 | - * |
|
186 | - * @param string User id field name |
|
187 | - * @param string User id value |
|
188 | - * @return mixed System user id if the user was found, WSError otherwise |
|
189 | - */ |
|
190 | - protected function getUserId($user_id_field_name, $user_id_value) { |
|
191 | - if($user_id_field_name == "chamilo_user_id") { |
|
192 | - if(UserManager::is_user_id_valid(intval($user_id_value))) { |
|
193 | - return intval($user_id_value); |
|
194 | - } else { |
|
195 | - return new WSCMError(100, "User not found"); |
|
196 | - } |
|
197 | - } else { |
|
198 | - $user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name); |
|
199 | - if($user_id == 0) { |
|
200 | - return new WSCMError(100, "User not found"); |
|
201 | - } else { |
|
202 | - return $user_id; |
|
203 | - } |
|
204 | - } |
|
205 | - } |
|
183 | + * Gets the real user id based on the user id field name and value. Note that if the user id field name is "chamilo_user_id", it will use the user id |
|
184 | + * in the system database |
|
185 | + * |
|
186 | + * @param string User id field name |
|
187 | + * @param string User id value |
|
188 | + * @return mixed System user id if the user was found, WSError otherwise |
|
189 | + */ |
|
190 | + protected function getUserId($user_id_field_name, $user_id_value) { |
|
191 | + if($user_id_field_name == "chamilo_user_id") { |
|
192 | + if(UserManager::is_user_id_valid(intval($user_id_value))) { |
|
193 | + return intval($user_id_value); |
|
194 | + } else { |
|
195 | + return new WSCMError(100, "User not found"); |
|
196 | + } |
|
197 | + } else { |
|
198 | + $user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name); |
|
199 | + if($user_id == 0) { |
|
200 | + return new WSCMError(100, "User not found"); |
|
201 | + } else { |
|
202 | + return $user_id; |
|
203 | + } |
|
204 | + } |
|
205 | + } |
|
206 | 206 | |
207 | - /** |
|
208 | - * Gets the real course id based on the course id field name and value. Note that if the course id field name is "chamilo_course_id", it will use the course id |
|
209 | - * in the system database |
|
210 | - * |
|
211 | - * @param string Course id field name |
|
212 | - * @param string Course id value |
|
213 | - * @return mixed System course id if the course was found, WSError otherwise |
|
214 | - */ |
|
215 | - protected function getCourseId($course_id_field_name, $course_id_value) { |
|
216 | - if($course_id_field_name == "chamilo_course_id") { |
|
217 | - if(CourseManager::get_course_code_from_course_id(intval($course_id_value)) != null) { |
|
218 | - return intval($course_id_value); |
|
219 | - } else { |
|
220 | - return new WSCMError(200, "Course not found"); |
|
221 | - } |
|
222 | - } else { |
|
223 | - $courseId = CourseManager::get_course_code_from_original_id($course_id_value, $course_id_field_name); |
|
224 | - if (empty($courseId)) { |
|
225 | - return new WSCMError(200, "Course not found"); |
|
226 | - } else { |
|
227 | - return $courseId; |
|
228 | - } |
|
229 | - } |
|
230 | - } |
|
207 | + /** |
|
208 | + * Gets the real course id based on the course id field name and value. Note that if the course id field name is "chamilo_course_id", it will use the course id |
|
209 | + * in the system database |
|
210 | + * |
|
211 | + * @param string Course id field name |
|
212 | + * @param string Course id value |
|
213 | + * @return mixed System course id if the course was found, WSError otherwise |
|
214 | + */ |
|
215 | + protected function getCourseId($course_id_field_name, $course_id_value) { |
|
216 | + if($course_id_field_name == "chamilo_course_id") { |
|
217 | + if(CourseManager::get_course_code_from_course_id(intval($course_id_value)) != null) { |
|
218 | + return intval($course_id_value); |
|
219 | + } else { |
|
220 | + return new WSCMError(200, "Course not found"); |
|
221 | + } |
|
222 | + } else { |
|
223 | + $courseId = CourseManager::get_course_code_from_original_id($course_id_value, $course_id_field_name); |
|
224 | + if (empty($courseId)) { |
|
225 | + return new WSCMError(200, "Course not found"); |
|
226 | + } else { |
|
227 | + return $courseId; |
|
228 | + } |
|
229 | + } |
|
230 | + } |
|
231 | 231 | |
232 | - /** |
|
233 | - * Gets the real session id based on the session id field name and value. Note that if the session id field name is "chamilo_session_id", it will use the session id |
|
234 | - * in the system database |
|
235 | - * |
|
236 | - * @param string Session id field name |
|
237 | - * @param string Session id value |
|
238 | - * @return mixed System session id if the session was found, WSError otherwise |
|
239 | - */ |
|
240 | - protected function getSessionId($session_id_field_name, $session_id_value) |
|
241 | - { |
|
242 | - if ($session_id_field_name == "chamilo_session_id") { |
|
243 | - $session = SessionManager::fetch((int)$session_id_value); |
|
244 | - if(!empty($session)) { |
|
245 | - return intval($session_id_value); |
|
246 | - } else { |
|
247 | - return new WSCMError(300, "Session not found"); |
|
248 | - } |
|
249 | - } else { |
|
250 | - $session_id = SessionManager::getSessionIdFromOriginalId( |
|
251 | - $session_id_value, |
|
252 | - $session_id_field_name |
|
253 | - ); |
|
254 | - if($session_id == 0) { |
|
255 | - return new WSCMError(300, "Session not found"); |
|
256 | - } else { |
|
257 | - return $session_id; |
|
258 | - } |
|
259 | - } |
|
260 | - } |
|
232 | + /** |
|
233 | + * Gets the real session id based on the session id field name and value. Note that if the session id field name is "chamilo_session_id", it will use the session id |
|
234 | + * in the system database |
|
235 | + * |
|
236 | + * @param string Session id field name |
|
237 | + * @param string Session id value |
|
238 | + * @return mixed System session id if the session was found, WSError otherwise |
|
239 | + */ |
|
240 | + protected function getSessionId($session_id_field_name, $session_id_value) |
|
241 | + { |
|
242 | + if ($session_id_field_name == "chamilo_session_id") { |
|
243 | + $session = SessionManager::fetch((int)$session_id_value); |
|
244 | + if(!empty($session)) { |
|
245 | + return intval($session_id_value); |
|
246 | + } else { |
|
247 | + return new WSCMError(300, "Session not found"); |
|
248 | + } |
|
249 | + } else { |
|
250 | + $session_id = SessionManager::getSessionIdFromOriginalId( |
|
251 | + $session_id_value, |
|
252 | + $session_id_field_name |
|
253 | + ); |
|
254 | + if($session_id == 0) { |
|
255 | + return new WSCMError(300, "Session not found"); |
|
256 | + } else { |
|
257 | + return $session_id; |
|
258 | + } |
|
259 | + } |
|
260 | + } |
|
261 | 261 | |
262 | - /** |
|
263 | - * Handles an error by calling the WSError error handler |
|
264 | - * |
|
265 | - * @param WSError Error |
|
266 | - */ |
|
267 | - protected function handleError($error) { |
|
268 | - $handler = WSCMError::getErrorHandler(); |
|
269 | - $handler->handle($error); |
|
270 | - } |
|
262 | + /** |
|
263 | + * Handles an error by calling the WSError error handler |
|
264 | + * |
|
265 | + * @param WSError Error |
|
266 | + */ |
|
267 | + protected function handleError($error) { |
|
268 | + $handler = WSCMError::getErrorHandler(); |
|
269 | + $handler->handle($error); |
|
270 | + } |
|
271 | 271 | |
272 | - /** |
|
273 | - * Gets a successful result |
|
274 | - * |
|
275 | - * @return array Array with a code of 0 and a message 'Operation was successful' |
|
276 | - */ |
|
277 | - protected function getSuccessfulResult() { |
|
278 | - return array('code' => 0, 'message' => 'Operation was successful'); |
|
279 | - } |
|
272 | + /** |
|
273 | + * Gets a successful result |
|
274 | + * |
|
275 | + * @return array Array with a code of 0 and a message 'Operation was successful' |
|
276 | + */ |
|
277 | + protected function getSuccessfulResult() { |
|
278 | + return array('code' => 0, 'message' => 'Operation was successful'); |
|
279 | + } |
|
280 | 280 | |
281 | - /** |
|
282 | - * Test function. Returns the string success |
|
283 | - * |
|
284 | - * @return string Success |
|
285 | - */ |
|
286 | - public function test() { |
|
287 | - return "success"; |
|
288 | - } |
|
281 | + /** |
|
282 | + * Test function. Returns the string success |
|
283 | + * |
|
284 | + * @return string Success |
|
285 | + */ |
|
286 | + public function test() { |
|
287 | + return "success"; |
|
288 | + } |
|
289 | 289 | |
290 | 290 | /** |
291 | 291 | * *Strictly* reverts PHP's nl2br() effects (whether it was used in XHTML mode or not) |
@@ -37,8 +37,8 @@ discard block |
||
37 | 37 | $table_message = Database::get_main_table(TABLE_MESSAGE); |
38 | 38 | |
39 | 39 | $sql_query = "SELECT id FROM $table_message " . |
40 | - " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)" . |
|
41 | - " ORDER BY send_date LIMIT $from,$number_of_items"; |
|
40 | + " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)" . |
|
41 | + " ORDER BY send_date LIMIT $from,$number_of_items"; |
|
42 | 42 | |
43 | 43 | $sql_result = Database::query($sql_query); |
44 | 44 | $message = "#"; |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | $table_message = Database::get_main_table(TABLE_MESSAGE); |
87 | 87 | |
88 | 88 | $sql_query = "SELECT ".$field_table." FROM $table_message " . |
89 | - " WHERE user_receiver_id=".$user_id." AND id=".$message_id; |
|
89 | + " WHERE user_receiver_id=".$user_id." AND id=".$message_id; |
|
90 | 90 | |
91 | 91 | $sql_result = Database::query($sql_query); |
92 | 92 | $result = Database::fetch_row($sql_result); |
@@ -107,8 +107,8 @@ discard block |
||
107 | 107 | $table_message = Database::get_main_table(TABLE_MESSAGE); |
108 | 108 | |
109 | 109 | $sql_query = "SELECT id FROM $table_message " . |
110 | - "WHERE user_sender_id=".$user_id." AND msg_status=".MESSAGE_STATUS_OUTBOX." " . |
|
111 | - "ORDER BY send_date LIMIT $from,$number_of_items"; |
|
110 | + "WHERE user_sender_id=".$user_id." AND msg_status=".MESSAGE_STATUS_OUTBOX." " . |
|
111 | + "ORDER BY send_date LIMIT $from,$number_of_items"; |
|
112 | 112 | |
113 | 113 | $sql_result = Database::query($sql_query); |
114 | 114 | $message = "#"; |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | $table_message = Database::get_main_table(TABLE_MESSAGE); |
158 | 158 | |
159 | 159 | $sql_query = "SELECT ".$field_table." FROM $table_message " . |
160 | - " WHERE user_sender_id=".$user_id." AND id=".$id; |
|
160 | + " WHERE user_sender_id=".$user_id." AND id=".$id; |
|
161 | 161 | |
162 | 162 | $sql_result = Database::query($sql_query); |
163 | 163 | $result = Database::fetch_row($sql_result); |
@@ -188,11 +188,11 @@ discard block |
||
188 | 188 | $table_message = Database::get_main_table(TABLE_MESSAGE); |
189 | 189 | |
190 | 190 | $query = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id, update_date ) ". |
191 | - " VALUES ('$user_sender_id', '$receiver_user_id', '1', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')"; |
|
191 | + " VALUES ('$user_sender_id', '$receiver_user_id', '1', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')"; |
|
192 | 192 | $result = Database::query($query); |
193 | 193 | |
194 | 194 | $query = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id, update_date ) ". |
195 | - " VALUES ('$user_sender_id', '$receiver_user_id', '4', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')"; |
|
195 | + " VALUES ('$user_sender_id', '$receiver_user_id', '4', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')"; |
|
196 | 196 | $result = Database::query($query); |
197 | 197 | |
198 | 198 | $inbox_last_id = Database::insert_id(); |
@@ -8,13 +8,13 @@ discard block |
||
8 | 8 | $s = WSCMSoapServer::singleton(); |
9 | 9 | |
10 | 10 | $s->register( |
11 | - 'WSCMUser.find_id_user', |
|
12 | - array( |
|
13 | - 'username' => 'xsd:string', |
|
14 | - 'password' => 'xsd:string', |
|
11 | + 'WSCMUser.find_id_user', |
|
12 | + array( |
|
13 | + 'username' => 'xsd:string', |
|
14 | + 'password' => 'xsd:string', |
|
15 | 15 | 'name' => 'xsd:string', |
16 | - ), |
|
17 | - array('return' => 'xsd:string'), |
|
16 | + ), |
|
17 | + array('return' => 'xsd:string'), |
|
18 | 18 | 'urn:WSCMService', |
19 | 19 | '', |
20 | 20 | '', |
@@ -23,14 +23,14 @@ discard block |
||
23 | 23 | ); |
24 | 24 | |
25 | 25 | $s->register( |
26 | - 'WSCMUser.get_user_name', |
|
27 | - array( |
|
28 | - 'username' => 'xsd:string', |
|
29 | - 'password' => 'xsd:string', |
|
26 | + 'WSCMUser.get_user_name', |
|
27 | + array( |
|
28 | + 'username' => 'xsd:string', |
|
29 | + 'password' => 'xsd:string', |
|
30 | 30 | 'id' => 'xsd:string', |
31 | 31 | 'field' => 'xsd:string' |
32 | - ), |
|
33 | - array('return' => 'xsd:string'), |
|
32 | + ), |
|
33 | + array('return' => 'xsd:string'), |
|
34 | 34 | 'urn:WSCMService', |
35 | 35 | '', |
36 | 36 | '', |
@@ -39,13 +39,13 @@ discard block |
||
39 | 39 | ); |
40 | 40 | |
41 | 41 | $s->register( |
42 | - 'WSCMUser.get_link_user_picture', |
|
43 | - array( |
|
44 | - 'username' => 'xsd:string', |
|
45 | - 'password' => 'xsd:string', |
|
42 | + 'WSCMUser.get_link_user_picture', |
|
43 | + array( |
|
44 | + 'username' => 'xsd:string', |
|
45 | + 'password' => 'xsd:string', |
|
46 | 46 | 'id' => 'xsd:string' |
47 | - ), |
|
48 | - array('return' => 'xsd:string'), |
|
47 | + ), |
|
48 | + array('return' => 'xsd:string'), |
|
49 | 49 | 'urn:WSCMService', |
50 | 50 | '', |
51 | 51 | '', |
@@ -54,14 +54,14 @@ discard block |
||
54 | 54 | ); |
55 | 55 | |
56 | 56 | $s->register( |
57 | - 'WSCMUser.send_invitation', |
|
58 | - array( |
|
59 | - 'username' => 'xsd:string', |
|
60 | - 'password' => 'xsd:string', |
|
57 | + 'WSCMUser.send_invitation', |
|
58 | + array( |
|
59 | + 'username' => 'xsd:string', |
|
60 | + 'password' => 'xsd:string', |
|
61 | 61 | 'userfriend_id' => 'xsd:string', |
62 | 62 | 'content_message' => 'xsd:string' |
63 | - ), |
|
64 | - array('return' => 'xsd:string'), |
|
63 | + ), |
|
64 | + array('return' => 'xsd:string'), |
|
65 | 65 | 'urn:WSCMService', |
66 | 66 | '', |
67 | 67 | '', |
@@ -70,13 +70,13 @@ discard block |
||
70 | 70 | ); |
71 | 71 | |
72 | 72 | $s->register( |
73 | - 'WSCMUser.accept_friend', |
|
74 | - array( |
|
75 | - 'username' => 'xsd:string', |
|
76 | - 'password' => 'xsd:string', |
|
73 | + 'WSCMUser.accept_friend', |
|
74 | + array( |
|
75 | + 'username' => 'xsd:string', |
|
76 | + 'password' => 'xsd:string', |
|
77 | 77 | 'userfriend_id' => 'xsd:string' |
78 | - ), |
|
79 | - array('return' => 'xsd:string'), |
|
78 | + ), |
|
79 | + array('return' => 'xsd:string'), |
|
80 | 80 | 'urn:WSCMService', |
81 | 81 | '', |
82 | 82 | '', |
@@ -85,13 +85,13 @@ discard block |
||
85 | 85 | ); |
86 | 86 | |
87 | 87 | $s->register( |
88 | - 'WSCMUser.denied_invitation', |
|
89 | - array( |
|
90 | - 'username' => 'xsd:string', |
|
91 | - 'password' => 'xsd:string', |
|
88 | + 'WSCMUser.denied_invitation', |
|
89 | + array( |
|
90 | + 'username' => 'xsd:string', |
|
91 | + 'password' => 'xsd:string', |
|
92 | 92 | 'userfriend_id' => 'xsd:string' |
93 | - ), |
|
94 | - array('return' => 'xsd:string'), |
|
93 | + ), |
|
94 | + array('return' => 'xsd:string'), |
|
95 | 95 | 'urn:WSCMService', |
96 | 96 | '', |
97 | 97 | '', |
@@ -22,7 +22,7 @@ |
||
22 | 22 | $sql = "SELECT user_id, username FROM $tuser ORDER BY user_id"; |
23 | 23 | $res = Database::query($sql); |
24 | 24 | while($row = Database::fetch_array($res)) { |
25 | - $sql2 = "INSERT INTO $tuserfv (item_id, field_id, value) |
|
25 | + $sql2 = "INSERT INTO $tuserfv (item_id, field_id, value) |
|
26 | 26 | VALUES (".$row['user_id'].", 11,'".$row['username']."')"; |
27 | - $res2 = Database::query($sql2); |
|
27 | + $res2 = Database::query($sql2); |
|
28 | 28 | } |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $event = $agenda->get_event($id); |
44 | 44 | |
45 | 45 | if (!empty($event)) { |
46 | - define('ICAL_LANG',api_get_language_isocode()); |
|
46 | + define('ICAL_LANG',api_get_language_isocode()); |
|
47 | 47 | |
48 | 48 | $ical = new vcalendar(); |
49 | 49 | $ical->setConfig('unique_id',api_get_path(WEB_PATH)); |
@@ -129,6 +129,6 @@ discard block |
||
129 | 129 | die(); |
130 | 130 | } |
131 | 131 | } else { |
132 | - header('location:'.Security::remove_XSS($_SERVER['HTTP_REFERER'])); |
|
133 | - die(); |
|
132 | + header('location:'.Security::remove_XSS($_SERVER['HTTP_REFERER'])); |
|
133 | + die(); |
|
134 | 134 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | //make some vars |
36 | 36 | $wamidir=$dir; |
37 | 37 | if($wamidir=="/"){ |
38 | - $wamidir=""; |
|
38 | + $wamidir=""; |
|
39 | 39 | } |
40 | 40 | $wamiurlplay = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$wamidir."/"; |
41 | 41 | $groupId = api_get_group_id(); |
@@ -45,48 +45,48 @@ discard block |
||
45 | 45 | // Please, do not modify this dirname formatting |
46 | 46 | |
47 | 47 | if (strstr($dir, '..')) { |
48 | - $dir = '/'; |
|
48 | + $dir = '/'; |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | if ($dir[0] == '.') { |
52 | - $dir = substr($dir, 1); |
|
52 | + $dir = substr($dir, 1); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | if ($dir[0] != '/') { |
56 | - $dir = '/'.$dir; |
|
56 | + $dir = '/'.$dir; |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | if ($dir[strlen($dir) - 1] != '/') { |
60 | - $dir .= '/'; |
|
60 | + $dir .= '/'; |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir; |
64 | 64 | |
65 | 65 | if (!is_dir($filepath)) { |
66 | - $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
67 | - $dir = '/'; |
|
66 | + $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
67 | + $dir = '/'; |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | //groups //TODO: clean |
71 | 71 | if (!empty($groupId)) { |
72 | - $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
73 | - $noPHP_SELF = true; |
|
74 | - $group = GroupManager :: get_group_properties($groupId); |
|
75 | - $path = explode('/', $dir); |
|
76 | - if ('/'.$path[1] != $group['directory']) { |
|
77 | - api_not_allowed(true); |
|
78 | - } |
|
72 | + $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
73 | + $noPHP_SELF = true; |
|
74 | + $group = GroupManager :: get_group_properties($groupId); |
|
75 | + $path = explode('/', $dir); |
|
76 | + if ('/'.$path[1] != $group['directory']) { |
|
77 | + api_not_allowed(true); |
|
78 | + } |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | $interbreadcrumb[] = array("url" => "./document.php?id=".$document_id.'&'.api_get_cidreq(), "name" => get_lang('Documents')); |
82 | 82 | |
83 | 83 | if (!$is_allowed_in_course) { |
84 | - api_not_allowed(true); |
|
84 | + api_not_allowed(true); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] || |
88 | - DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) { |
|
89 | - api_not_allowed(true); |
|
88 | + DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) { |
|
89 | + api_not_allowed(true); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | /* Header */ |
@@ -94,10 +94,10 @@ discard block |
||
94 | 94 | |
95 | 95 | $display_dir = $dir; |
96 | 96 | if (isset ($group)) { |
97 | - $display_dir = explode('/', $dir); |
|
98 | - unset ($display_dir[0]); |
|
99 | - unset ($display_dir[1]); |
|
100 | - $display_dir = implode('/', $display_dir); |
|
97 | + $display_dir = explode('/', $dir); |
|
98 | + unset ($display_dir[0]); |
|
99 | + unset ($display_dir[1]); |
|
100 | + $display_dir = implode('/', $display_dir); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | // Interbreadcrumb for the current directory root path |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | |
122 | 122 | Display :: display_header($nameTools, 'Doc'); |
123 | 123 | echo '<div class="actions">'; |
124 | - echo '<a href="document.php?id='.$document_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
124 | + echo '<a href="document.php?id='.$document_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
125 | 125 | echo '</div>'; |
126 | 126 | ?> |
127 | 127 | <!-- swfobject is a commonly used library to embed Flash content https://ajax.googleapis.com/ajax/libs/swfobject/2.2/ --> |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | //make some vars |
35 | 35 | $webcamdir=$dir; |
36 | 36 | if($webcamdir=="/"){ |
37 | - $webcamdir=""; |
|
37 | + $webcamdir=""; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | |
@@ -43,49 +43,49 @@ discard block |
||
43 | 43 | // Please, do not modify this dirname formatting |
44 | 44 | |
45 | 45 | if (strstr($dir, '..')) { |
46 | - $dir = '/'; |
|
46 | + $dir = '/'; |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | if ($dir[0] == '.') { |
50 | - $dir = substr($dir, 1); |
|
50 | + $dir = substr($dir, 1); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | if ($dir[0] != '/') { |
54 | - $dir = '/'.$dir; |
|
54 | + $dir = '/'.$dir; |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | if ($dir[strlen($dir) - 1] != '/') { |
58 | - $dir .= '/'; |
|
58 | + $dir .= '/'; |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir; |
62 | 62 | |
63 | 63 | if (!is_dir($filepath)) { |
64 | - $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
65 | - $dir = '/'; |
|
64 | + $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
65 | + $dir = '/'; |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | $groupId = api_get_group_id(); |
69 | 69 | |
70 | 70 | if (!empty($groupId)) { |
71 | - $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
72 | - $noPHP_SELF = true; |
|
73 | - $group = GroupManager :: get_group_properties($groupId); |
|
74 | - $path = explode('/', $dir); |
|
75 | - if ('/'.$path[1] != $group['directory']) { |
|
76 | - api_not_allowed(true); |
|
77 | - } |
|
71 | + $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
72 | + $noPHP_SELF = true; |
|
73 | + $group = GroupManager :: get_group_properties($groupId); |
|
74 | + $path = explode('/', $dir); |
|
75 | + if ('/'.$path[1] != $group['directory']) { |
|
76 | + api_not_allowed(true); |
|
77 | + } |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | $interbreadcrumb[] = array ("url" => "./document.php?id=".$document_id."&".api_get_cidreq(), "name" => get_lang('Documents')); |
81 | 81 | |
82 | 82 | if (!$is_allowed_in_course) { |
83 | - api_not_allowed(true); |
|
83 | + api_not_allowed(true); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] || |
87 | - DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) { |
|
88 | - api_not_allowed(true); |
|
87 | + DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) { |
|
88 | + api_not_allowed(true); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /* Header */ |
@@ -93,10 +93,10 @@ discard block |
||
93 | 93 | |
94 | 94 | $display_dir = $dir; |
95 | 95 | if (isset ($group)) { |
96 | - $display_dir = explode('/', $dir); |
|
97 | - unset ($display_dir[0]); |
|
98 | - unset ($display_dir[1]); |
|
99 | - $display_dir = implode('/', $display_dir); |
|
96 | + $display_dir = explode('/', $dir); |
|
97 | + unset ($display_dir[0]); |
|
98 | + unset ($display_dir[1]); |
|
99 | + $display_dir = implode('/', $display_dir); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | // Interbreadcrumb for the current directory root path |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | Display :: display_header($nameTools, 'Doc'); |
122 | 122 | echo '<div class="actions">'; |
123 | 123 | echo '<a href="document.php?id='.$document_id.'">'. |
124 | - Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
124 | + Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
125 | 125 | echo '</div>'; |
126 | 126 | ?> |
127 | 127 |
@@ -27,7 +27,7 @@ |
||
27 | 27 | $doc_url = str_replace(array('../', '\\..', '\\0', '..\\'), array('', '', '', ''), $doc_url); //echo $doc_url; |
28 | 28 | |
29 | 29 | if (strpos($doc_url, '../') OR strpos($doc_url, '/..')) { |
30 | - $doc_url = ''; |
|
30 | + $doc_url = ''; |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | // Dealing with image included into survey: when users receive a link towards a |