@@ -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 |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | //path for svg-edit save |
39 | 39 | $_SESSION['draw_dir']=Security::remove_XSS($dir); |
40 | 40 | if ($_SESSION['draw_dir']=='/'){ |
41 | - $_SESSION['draw_dir'] = ''; |
|
41 | + $_SESSION['draw_dir'] = ''; |
|
42 | 42 | } |
43 | 43 | $_SESSION['draw_file']=basename(Security::remove_XSS($file_path)); |
44 | 44 | $get_file = Security::remove_XSS($file_path); |
@@ -55,42 +55,42 @@ discard block |
||
55 | 55 | /* Please, do not modify this dirname formatting */ |
56 | 56 | |
57 | 57 | if (strstr($dir, '..')) { |
58 | - $dir = '/'; |
|
58 | + $dir = '/'; |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | if ($dir[0] == '.') { |
62 | - $dir = substr($dir, 1); |
|
62 | + $dir = substr($dir, 1); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | if ($dir[0] != '/') { |
66 | - $dir = '/'.$dir; |
|
66 | + $dir = '/'.$dir; |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | if ($dir[strlen($dir) - 1] != '/') { |
70 | - $dir .= '/'; |
|
70 | + $dir .= '/'; |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir; |
74 | 74 | |
75 | 75 | if (!is_dir($filepath)) { |
76 | - $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
77 | - $dir = '/'; |
|
76 | + $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
77 | + $dir = '/'; |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | //groups //TODO:clean |
81 | 81 | if (!empty($group_id)) { |
82 | - $req_gid = '&gidReq='.$group_id; |
|
83 | - $interbreadcrumb[] = array ('url' => '../group/group_space.php?gidReq='.$group_id, 'name' => get_lang('GroupSpace')); |
|
84 | - $group_document = true; |
|
85 | - $noPHP_SELF = true; |
|
82 | + $req_gid = '&gidReq='.$group_id; |
|
83 | + $interbreadcrumb[] = array ('url' => '../group/group_space.php?gidReq='.$group_id, 'name' => get_lang('GroupSpace')); |
|
84 | + $group_document = true; |
|
85 | + $noPHP_SELF = true; |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | $is_certificate_mode = DocumentManager::is_certificate_mode($dir); |
89 | 89 | |
90 | 90 | if (!$is_certificate_mode) |
91 | - $interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).$req_gid, "name"=> get_lang('Documents')); |
|
91 | + $interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).$req_gid, "name"=> get_lang('Documents')); |
|
92 | 92 | else |
93 | - $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
93 | + $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); |
|
94 | 94 | |
95 | 95 | // Interbreadcrumb for the current directory root path |
96 | 96 | if (empty($document_data['parents'])) { |
@@ -105,30 +105,30 @@ discard block |
||
105 | 105 | } |
106 | 106 | |
107 | 107 | $is_allowedToEdit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights'] || |
108 | - DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id); |
|
108 | + DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id); |
|
109 | 109 | |
110 | 110 | if (!$is_allowedToEdit) { |
111 | - api_not_allowed(true); |
|
111 | + api_not_allowed(true); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | Event::event_access_tool(TOOL_DOCUMENT); |
115 | 115 | |
116 | 116 | Display :: display_header($nameTools, 'Doc'); |
117 | 117 | echo '<div class="actions">'; |
118 | - echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
119 | - echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.$req_gid.'&origin=editdraw">'.Display::return_icon('edit.png',get_lang('Rename').'/'.get_lang('Comments'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
118 | + echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
119 | + echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.$req_gid.'&origin=editdraw">'.Display::return_icon('edit.png',get_lang('Rename').'/'.get_lang('Comments'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
120 | 120 | echo '</div>'; |
121 | 121 | |
122 | 122 | if (api_browser_support('svg')) { |
123 | - //automatic loading the course language |
|
124 | - $svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn'); |
|
125 | - $langsvgedit = api_get_language_isocode(); |
|
126 | - $langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit; |
|
127 | - $langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'svg-edit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en'; |
|
123 | + //automatic loading the course language |
|
124 | + $svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn'); |
|
125 | + $langsvgedit = api_get_language_isocode(); |
|
126 | + $langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit; |
|
127 | + $langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'svg-edit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en'; |
|
128 | 128 | |
129 | - $svg_url= api_get_path(WEB_LIBRARY_PATH).'svg-edit/svg-editor.php?url=../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit; |
|
129 | + $svg_url= api_get_path(WEB_LIBRARY_PATH).'svg-edit/svg-editor.php?url=../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit; |
|
130 | 130 | |
131 | - ?> |
|
131 | + ?> |
|
132 | 132 | |
133 | 133 | <script type="text/javascript"> |
134 | 134 | |
@@ -148,9 +148,9 @@ discard block |
||
148 | 148 | |
149 | 149 | <?php |
150 | 150 | echo '<noscript>'; |
151 | - echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0\' src="'.$svg_url.'"<noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>'; |
|
152 | - echo '</noscript>'; |
|
151 | + echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0\' src="'.$svg_url.'"<noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>'; |
|
152 | + echo '</noscript>'; |
|
153 | 153 | } else { |
154 | - Display::display_error_message(get_lang('BrowserDontSupportsSVG')); |
|
154 | + Display::display_error_message(get_lang('BrowserDontSupportsSVG')); |
|
155 | 155 | } |
156 | 156 | Display::display_footer(); |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | $sessionId = api_get_session_id(); |
66 | 66 | |
67 | 67 | if (api_is_in_group()) { |
68 | - $group_properties = GroupManager::get_group_properties($group_id); |
|
68 | + $group_properties = GroupManager::get_group_properties($group_id); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | $dir = '/'; |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | $_GET['id'], |
78 | 78 | api_get_course_id(), |
79 | 79 | true, |
80 | - 0 |
|
80 | + 0 |
|
81 | 81 | ); |
82 | 82 | |
83 | 83 | if (!empty($sessionId) && empty($document_data)) { |
@@ -89,13 +89,13 @@ discard block |
||
89 | 89 | ); |
90 | 90 | } |
91 | 91 | |
92 | - $document_id = $document_data['id']; |
|
93 | - $file = $document_data['path']; |
|
94 | - $parent_id = DocumentManager::get_document_id($course_info, dirname($file)); |
|
95 | - $dir = dirname($document_data['path']); |
|
96 | - $dir_original = $dir; |
|
97 | - $doc = basename($file); |
|
98 | - $readonly = $document_data['readonly']; |
|
92 | + $document_id = $document_data['id']; |
|
93 | + $file = $document_data['path']; |
|
94 | + $parent_id = DocumentManager::get_document_id($course_info, dirname($file)); |
|
95 | + $dir = dirname($document_data['path']); |
|
96 | + $dir_original = $dir; |
|
97 | + $doc = basename($file); |
|
98 | + $readonly = $document_data['readonly']; |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | if (empty($document_data)) { |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | |
118 | 118 | // Level correction for group documents. |
119 | 119 | if (!empty($group_properties['directory'])) { |
120 | - $count_dir = $count_dir > 0 ? $count_dir - 1 : 0; |
|
120 | + $count_dir = $count_dir > 0 ? $count_dir - 1 : 0; |
|
121 | 121 | } |
122 | 122 | $relative_url = ''; |
123 | 123 | for ($i = 0; $i < ($count_dir); $i++) { |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | } |
146 | 146 | |
147 | 147 | $is_allowed_to_edit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights']|| |
148 | - DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $sessionId); |
|
148 | + DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $sessionId); |
|
149 | 149 | $noPHP_SELF = true; |
150 | 150 | |
151 | 151 | /* Other initialization code */ |
@@ -158,8 +158,8 @@ discard block |
||
158 | 158 | 'url' => '../group/group_space.php?'.api_get_cidreq(), |
159 | 159 | 'name' => get_lang('GroupSpace'), |
160 | 160 | ); |
161 | - $group_document = true; |
|
162 | - $noPHP_SELF = true; |
|
161 | + $group_document = true; |
|
162 | + $noPHP_SELF = true; |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | if (!$is_certificate_mode) { |
@@ -194,9 +194,9 @@ discard block |
||
194 | 194 | |
195 | 195 | //TODO:check the below code and his funcionality |
196 | 196 | if (!api_is_allowed_to_edit()) { |
197 | - if (DocumentManager::check_readonly($course_info, $user_id, $file)) { |
|
198 | - api_not_allowed(); |
|
199 | - } |
|
197 | + if (DocumentManager::check_readonly($course_info, $user_id, $file)) { |
|
198 | + api_not_allowed(); |
|
199 | + } |
|
200 | 200 | } |
201 | 201 | |
202 | 202 | /* MAIN TOOL CODE */ |
@@ -204,18 +204,18 @@ discard block |
||
204 | 204 | /* Code to change the comment */ |
205 | 205 | |
206 | 206 | if (isset($_POST['comment'])) { |
207 | - // Fixing the path if it is wrong |
|
208 | - $comment = trim($_POST['comment']); |
|
209 | - $title = trim($_POST['title']); |
|
207 | + // Fixing the path if it is wrong |
|
208 | + $comment = trim($_POST['comment']); |
|
209 | + $title = trim($_POST['title']); |
|
210 | 210 | |
211 | 211 | // Just in case see BT#3525 |
212 | 212 | if (empty($title)) { |
213 | - $title = $document_data['title']; |
|
214 | - } |
|
213 | + $title = $document_data['title']; |
|
214 | + } |
|
215 | 215 | |
216 | - if (empty($title)) { |
|
217 | - $title = get_document_title($_POST['filename']); |
|
218 | - } |
|
216 | + if (empty($title)) { |
|
217 | + $title = get_document_title($_POST['filename']); |
|
218 | + } |
|
219 | 219 | |
220 | 220 | if (!empty($document_id)) { |
221 | 221 | $params = [ |
@@ -227,43 +227,43 @@ discard block |
||
227 | 227 | $params, |
228 | 228 | ['c_id = ? AND id = ?' => [$course_id, $document_id]] |
229 | 229 | ); |
230 | - Display::addFlash(Display::return_message(get_lang('fileModified'))); |
|
230 | + Display::addFlash(Display::return_message(get_lang('fileModified'))); |
|
231 | 231 | } |
232 | 232 | } |
233 | 233 | |
234 | 234 | /* WYSIWYG HTML EDITOR - Program Logic */ |
235 | 235 | if ($is_allowed_to_edit) { |
236 | - if (isset($_POST['formSent']) && $_POST['formSent'] == 1) { |
|
236 | + if (isset($_POST['formSent']) && $_POST['formSent'] == 1) { |
|
237 | 237 | |
238 | - $filename = stripslashes($_POST['filename']); |
|
238 | + $filename = stripslashes($_POST['filename']); |
|
239 | 239 | $extension = $_POST['extension']; |
240 | - $content = isset($_POST['content']) ? trim(str_replace(array("\r", "\n"), '', stripslashes($_POST['content']))) : null; |
|
241 | - $content = Security::remove_XSS($content, COURSEMANAGERLOWSECURITY); |
|
240 | + $content = isset($_POST['content']) ? trim(str_replace(array("\r", "\n"), '', stripslashes($_POST['content']))) : null; |
|
241 | + $content = Security::remove_XSS($content, COURSEMANAGERLOWSECURITY); |
|
242 | 242 | |
243 | 243 | if ($dir == '/') { |
244 | 244 | $dir = ''; |
245 | 245 | } |
246 | 246 | |
247 | - $file = $dir.'/'.$filename.'.'.$extension; |
|
248 | - $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null; |
|
249 | - $read_only_flag = empty($read_only_flag) ? 0 : 1; |
|
247 | + $file = $dir.'/'.$filename.'.'.$extension; |
|
248 | + $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null; |
|
249 | + $read_only_flag = empty($read_only_flag) ? 0 : 1; |
|
250 | 250 | |
251 | - if (empty($filename)) { |
|
251 | + if (empty($filename)) { |
|
252 | 252 | Display::addFlash(Display::return_message(get_lang('NoFileName'), 'warning')); |
253 | - } else { |
|
253 | + } else { |
|
254 | 254 | |
255 | - $file_size = filesize($document_data['absolute_path']); |
|
255 | + $file_size = filesize($document_data['absolute_path']); |
|
256 | 256 | |
257 | - if ($read_only_flag == 0) { |
|
258 | - if (!empty($content)) { |
|
259 | - if ($fp = @fopen($document_data['absolute_path'], 'w')) { |
|
260 | - // For flv player, change absolute path temporarily to prevent from erasing it in the following lines |
|
261 | - $content = str_replace(array('flv=h', 'flv=/'), array('flv=h|', 'flv=/|'), $content); |
|
262 | - fputs($fp, $content); |
|
263 | - fclose($fp); |
|
257 | + if ($read_only_flag == 0) { |
|
258 | + if (!empty($content)) { |
|
259 | + if ($fp = @fopen($document_data['absolute_path'], 'w')) { |
|
260 | + // For flv player, change absolute path temporarily to prevent from erasing it in the following lines |
|
261 | + $content = str_replace(array('flv=h', 'flv=/'), array('flv=h|', 'flv=/|'), $content); |
|
262 | + fputs($fp, $content); |
|
263 | + fclose($fp); |
|
264 | 264 | |
265 | 265 | $filepath = $document_data['absolute_parent_path']; |
266 | - /* |
|
266 | + /* |
|
267 | 267 | if (!is_dir($filepath.'css')) { |
268 | 268 | mkdir($filepath.'css', api_get_permissions_for_new_directories()); |
269 | 269 | $doc_id = add_document($_course, $dir.'css', 'folder', 0, 'css'); |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | ); |
294 | 294 | }*/ |
295 | 295 | |
296 | - /*if (!is_file($filepath.'css/frames.css')) { |
|
296 | + /*if (!is_file($filepath.'css/frames.css')) { |
|
297 | 297 | $platform_theme = api_get_setting('stylesheets'); |
298 | 298 | if (file_exists(api_get_path(SYS_CODE_PATH).'css/'.$platform_theme.'/frames.css')) { |
299 | 299 | copy(api_get_path(SYS_CODE_PATH).'css/'.$platform_theme.'/frames.css', $filepath.'css/frames.css'); |
@@ -331,54 +331,54 @@ discard block |
||
331 | 331 | } |
332 | 332 | }*/ |
333 | 333 | |
334 | - // "WHAT'S NEW" notification: update table item_property |
|
335 | - $document_id = DocumentManager::get_document_id($_course, $file); |
|
336 | - |
|
337 | - if ($document_id) { |
|
338 | - update_existing_document( |
|
339 | - $_course, |
|
340 | - $document_id, |
|
341 | - $file_size, |
|
342 | - $read_only_flag |
|
343 | - ); |
|
344 | - api_item_property_update( |
|
345 | - $_course, |
|
346 | - TOOL_DOCUMENT, |
|
347 | - $document_id, |
|
348 | - 'DocumentUpdated', |
|
349 | - api_get_user_id(), |
|
350 | - null, |
|
351 | - null, |
|
352 | - null, |
|
353 | - null, |
|
354 | - $sessionId |
|
355 | - ); |
|
356 | - // Update parent folders |
|
357 | - item_property_update_on_folder( |
|
358 | - $_course, |
|
359 | - $dir, |
|
360 | - api_get_user_id() |
|
361 | - ); |
|
362 | - header('Location: document.php?id=' . $document_data['parent_id'] . '&' . api_get_cidreq() . ($is_certificate_mode?'&curdirpath=/certificates&selectcat=1':'')); |
|
363 | - exit; |
|
364 | - } else { |
|
334 | + // "WHAT'S NEW" notification: update table item_property |
|
335 | + $document_id = DocumentManager::get_document_id($_course, $file); |
|
336 | + |
|
337 | + if ($document_id) { |
|
338 | + update_existing_document( |
|
339 | + $_course, |
|
340 | + $document_id, |
|
341 | + $file_size, |
|
342 | + $read_only_flag |
|
343 | + ); |
|
344 | + api_item_property_update( |
|
345 | + $_course, |
|
346 | + TOOL_DOCUMENT, |
|
347 | + $document_id, |
|
348 | + 'DocumentUpdated', |
|
349 | + api_get_user_id(), |
|
350 | + null, |
|
351 | + null, |
|
352 | + null, |
|
353 | + null, |
|
354 | + $sessionId |
|
355 | + ); |
|
356 | + // Update parent folders |
|
357 | + item_property_update_on_folder( |
|
358 | + $_course, |
|
359 | + $dir, |
|
360 | + api_get_user_id() |
|
361 | + ); |
|
362 | + header('Location: document.php?id=' . $document_data['parent_id'] . '&' . api_get_cidreq() . ($is_certificate_mode?'&curdirpath=/certificates&selectcat=1':'')); |
|
363 | + exit; |
|
364 | + } else { |
|
365 | 365 | Display::addFlash(Display::return_message(get_lang('Impossible'), 'warning')); |
366 | - } |
|
367 | - } else { |
|
366 | + } |
|
367 | + } else { |
|
368 | 368 | Display::addFlash(Display::return_message(get_lang('Impossible'), 'warning')); |
369 | - } |
|
370 | - } else { |
|
371 | - if ($document_id) { |
|
369 | + } |
|
370 | + } else { |
|
371 | + if ($document_id) { |
|
372 | 372 | update_existing_document($_course, $document_id, $file_size, $read_only_flag); |
373 | - } |
|
374 | - } |
|
375 | - } else { |
|
373 | + } |
|
374 | + } |
|
375 | + } else { |
|
376 | 376 | if ($document_id) { |
377 | 377 | update_existing_document($_course, $document_id, $file_size, $read_only_flag); |
378 | 378 | } |
379 | - } |
|
380 | - } |
|
381 | - } |
|
379 | + } |
|
380 | + } |
|
381 | + } |
|
382 | 382 | } |
383 | 383 | |
384 | 384 | // Replace relative paths by absolute web paths (e.g. './' => 'http://www.chamilo.org/courses/ABC/document/') |
@@ -432,35 +432,35 @@ discard block |
||
432 | 432 | api_get_group_id() |
433 | 433 | ) |
434 | 434 | ) { |
435 | - $action = api_get_self().'?id='.$document_data['id'].'&'.api_get_cidreq(); |
|
435 | + $action = api_get_self().'?id='.$document_data['id'].'&'.api_get_cidreq(); |
|
436 | 436 | if ($is_certificate_mode) { |
437 | 437 | $action .= '&curdirpath=/certificates&selectcat=1'; |
438 | 438 | } |
439 | - $form = new FormValidator('formEdit', 'post', $action, null, array('class' => 'form-vertical')); |
|
440 | - |
|
441 | - // Form title |
|
442 | - $form->addElement('header', $nameTools); |
|
443 | - $form->addElement('hidden', 'filename'); |
|
444 | - $form->addElement('hidden', 'extension'); |
|
445 | - $form->addElement('hidden', 'file_path'); |
|
446 | - $form->addElement('hidden', 'commentPath'); |
|
447 | - $form->addElement('hidden', 'showedit'); |
|
448 | - $form->addElement('hidden', 'origin'); |
|
449 | - $form->addElement('hidden', 'origin_opt'); |
|
439 | + $form = new FormValidator('formEdit', 'post', $action, null, array('class' => 'form-vertical')); |
|
440 | + |
|
441 | + // Form title |
|
442 | + $form->addElement('header', $nameTools); |
|
443 | + $form->addElement('hidden', 'filename'); |
|
444 | + $form->addElement('hidden', 'extension'); |
|
445 | + $form->addElement('hidden', 'file_path'); |
|
446 | + $form->addElement('hidden', 'commentPath'); |
|
447 | + $form->addElement('hidden', 'showedit'); |
|
448 | + $form->addElement('hidden', 'origin'); |
|
449 | + $form->addElement('hidden', 'origin_opt'); |
|
450 | 450 | $form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus')); |
451 | 451 | |
452 | - $defaults['title'] = $document_data['title']; |
|
452 | + $defaults['title'] = $document_data['title']; |
|
453 | 453 | |
454 | - $form->addElement('hidden', 'formSent'); |
|
455 | - $defaults['formSent'] = 1; |
|
454 | + $form->addElement('hidden', 'formSent'); |
|
455 | + $defaults['formSent'] = 1; |
|
456 | 456 | |
457 | - $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null; |
|
457 | + $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null; |
|
458 | 458 | |
459 | - // Desactivation of IE proprietary commenting tags inside the text before loading it on the online editor. |
|
460 | - // This fix has been proposed by Hubert Borderiou, see Bug #573, http://support.chamilo.org/issues/573 |
|
461 | - $defaults['content'] = str_replace('<!--[', '<!-- [', $content); |
|
459 | + // Desactivation of IE proprietary commenting tags inside the text before loading it on the online editor. |
|
460 | + // This fix has been proposed by Hubert Borderiou, see Bug #573, http://support.chamilo.org/issues/573 |
|
461 | + $defaults['content'] = str_replace('<!--[', '<!-- [', $content); |
|
462 | 462 | |
463 | - // HotPotatoes tests are html files, but they should not be edited in order their functionality to be preserved. |
|
463 | + // HotPotatoes tests are html files, but they should not be edited in order their functionality to be preserved. |
|
464 | 464 | |
465 | 465 | $showSystemFolders = api_get_course_setting('show_system_folders'); |
466 | 466 | $condition = stripos($dir, '/HotPotatoes_files') === false; |
@@ -468,44 +468,44 @@ discard block |
||
468 | 468 | $condition = true; |
469 | 469 | } |
470 | 470 | |
471 | - if (($extension == 'htm' || $extension == 'html') && $condition) { |
|
472 | - if (empty($readonly) && $readonly == 0) { |
|
471 | + if (($extension == 'htm' || $extension == 'html') && $condition) { |
|
472 | + if (empty($readonly) && $readonly == 0) { |
|
473 | 473 | $form->addHtmlEditor('content', '', true, true, $editorConfig); |
474 | - } |
|
475 | - } |
|
474 | + } |
|
475 | + } |
|
476 | 476 | |
477 | - if (!$group_document && !DocumentManager::is_my_shared_folder(api_get_user_id(), $currentDirPath, $sessionId)) { |
|
478 | - // Updated on field |
|
479 | - $last_edit_date = api_get_local_time($last_edit_date); |
|
477 | + if (!$group_document && !DocumentManager::is_my_shared_folder(api_get_user_id(), $currentDirPath, $sessionId)) { |
|
478 | + // Updated on field |
|
479 | + $last_edit_date = api_get_local_time($last_edit_date); |
|
480 | 480 | $display_date = date_to_str_ago($last_edit_date).' <span class="dropbox_date">'.api_format_date($last_edit_date).'</span>'; |
481 | - $form->addElement('static', null, get_lang('UpdatedOn'), $display_date); |
|
482 | - } |
|
481 | + $form->addElement('static', null, get_lang('UpdatedOn'), $display_date); |
|
482 | + } |
|
483 | 483 | |
484 | - $form->addElement('textarea', 'comment', get_lang('Comment'), ['cols-size' => [2, 10, 0]]); |
|
484 | + $form->addElement('textarea', 'comment', get_lang('Comment'), ['cols-size' => [2, 10, 0]]); |
|
485 | 485 | |
486 | - if ($owner_id == api_get_user_id() || api_is_platform_admin()) { |
|
487 | - $checked =& $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly')); |
|
488 | - if ($readonly == 1) { |
|
489 | - $checked->setChecked(true); |
|
490 | - } |
|
491 | - } |
|
486 | + if ($owner_id == api_get_user_id() || api_is_platform_admin()) { |
|
487 | + $checked =& $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly')); |
|
488 | + if ($readonly == 1) { |
|
489 | + $checked->setChecked(true); |
|
490 | + } |
|
491 | + } |
|
492 | 492 | |
493 | - if ($is_certificate_mode) { |
|
494 | - $form->addButtonUpdate(get_lang('SaveCertificate')); |
|
493 | + if ($is_certificate_mode) { |
|
494 | + $form->addButtonUpdate(get_lang('SaveCertificate')); |
|
495 | 495 | } else { |
496 | - $form->addButtonUpdate(get_lang('SaveDocument')); |
|
496 | + $form->addButtonUpdate(get_lang('SaveDocument')); |
|
497 | 497 | } |
498 | 498 | |
499 | - $defaults['filename'] = $filename; |
|
500 | - $defaults['extension'] = $extension; |
|
501 | - $defaults['file_path'] = isset($_GET['file']) ? Security::remove_XSS($_GET['file']) : null; |
|
502 | - $defaults['commentPath'] = $file; |
|
503 | - $defaults['renameTo'] = $file_name; |
|
504 | - $defaults['comment'] = $document_data['comment']; |
|
505 | - $defaults['origin'] = isset($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : null; |
|
506 | - $defaults['origin_opt'] = isset($_GET['origin_opt']) ? Security::remove_XSS($_GET['origin_opt']) : null; |
|
499 | + $defaults['filename'] = $filename; |
|
500 | + $defaults['extension'] = $extension; |
|
501 | + $defaults['file_path'] = isset($_GET['file']) ? Security::remove_XSS($_GET['file']) : null; |
|
502 | + $defaults['commentPath'] = $file; |
|
503 | + $defaults['renameTo'] = $file_name; |
|
504 | + $defaults['comment'] = $document_data['comment']; |
|
505 | + $defaults['origin'] = isset($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : null; |
|
506 | + $defaults['origin_opt'] = isset($_GET['origin_opt']) ? Security::remove_XSS($_GET['origin_opt']) : null; |
|
507 | 507 | |
508 | - $form->setDefaults($defaults); |
|
508 | + $form->setDefaults($defaults); |
|
509 | 509 | |
510 | 510 | show_return( |
511 | 511 | $parent_id, |
@@ -515,25 +515,25 @@ discard block |
||
515 | 515 | $is_certificate_mode |
516 | 516 | ); |
517 | 517 | |
518 | - if ($is_certificate_mode) { |
|
519 | - $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate( |
|
520 | - api_get_user_id(), |
|
521 | - api_get_course_id() |
|
522 | - ); |
|
523 | - $str_info = ''; |
|
524 | - foreach ($all_information_by_create_certificate[0] as $info_value) { |
|
525 | - $str_info .= $info_value.'<br/>'; |
|
526 | - } |
|
527 | - $create_certificate=get_lang('CreateCertificateWithTags'); |
|
528 | - Display::display_normal_message( |
|
529 | - $create_certificate.': <br /><br />'.$str_info, |
|
530 | - false |
|
531 | - ); |
|
532 | - } |
|
533 | - |
|
534 | - if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){ |
|
535 | - Display::display_warning_message(get_lang('BrowserDontSupportsSVG')); |
|
536 | - } |
|
518 | + if ($is_certificate_mode) { |
|
519 | + $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate( |
|
520 | + api_get_user_id(), |
|
521 | + api_get_course_id() |
|
522 | + ); |
|
523 | + $str_info = ''; |
|
524 | + foreach ($all_information_by_create_certificate[0] as $info_value) { |
|
525 | + $str_info .= $info_value.'<br/>'; |
|
526 | + } |
|
527 | + $create_certificate=get_lang('CreateCertificateWithTags'); |
|
528 | + Display::display_normal_message( |
|
529 | + $create_certificate.': <br /><br />'.$str_info, |
|
530 | + false |
|
531 | + ); |
|
532 | + } |
|
533 | + |
|
534 | + if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){ |
|
535 | + Display::display_warning_message(get_lang('BrowserDontSupportsSVG')); |
|
536 | + } |
|
537 | 537 | echo '<div class="row" style="overflow:hidden"> |
538 | 538 | <div id="template_col" class="col-md-2"> |
539 | 539 | <div class="panel panel-default"> |
@@ -561,57 +561,57 @@ discard block |
||
561 | 561 | */ |
562 | 562 | function change_name($base_work_dir, $source_file, $rename_to, $dir, $doc) |
563 | 563 | { |
564 | - $file_name_for_change = $base_work_dir.$dir.$source_file; |
|
564 | + $file_name_for_change = $base_work_dir.$dir.$source_file; |
|
565 | 565 | $rename_to = disable_dangerous_file($rename_to); // Avoid renaming to .htaccess file |
566 | - $rename_to = my_rename($file_name_for_change, stripslashes($rename_to)); // fileManage API |
|
567 | - |
|
568 | - if ($rename_to) { |
|
569 | - if (isset($dir) && $dir != '') { |
|
570 | - $source_file = $dir.$source_file; |
|
571 | - $new_full_file_name = dirname($source_file).'/'.$rename_to; |
|
572 | - } else { |
|
573 | - $source_file = '/'.$source_file; |
|
574 | - $new_full_file_name = '/'.$rename_to; |
|
575 | - } |
|
576 | - |
|
577 | - update_db_info('update', $source_file, $new_full_file_name); // fileManage API |
|
566 | + $rename_to = my_rename($file_name_for_change, stripslashes($rename_to)); // fileManage API |
|
567 | + |
|
568 | + if ($rename_to) { |
|
569 | + if (isset($dir) && $dir != '') { |
|
570 | + $source_file = $dir.$source_file; |
|
571 | + $new_full_file_name = dirname($source_file).'/'.$rename_to; |
|
572 | + } else { |
|
573 | + $source_file = '/'.$source_file; |
|
574 | + $new_full_file_name = '/'.$rename_to; |
|
575 | + } |
|
576 | + |
|
577 | + update_db_info('update', $source_file, $new_full_file_name); // fileManage API |
|
578 | 578 | Display::addFlash(Display::return_message(get_lang('fileModified'))); |
579 | 579 | |
580 | - return true; |
|
581 | - } else { |
|
580 | + return true; |
|
581 | + } else { |
|
582 | 582 | Display::addFlash(Display::return_message(get_lang('FileExists'))); |
583 | - } |
|
583 | + } |
|
584 | 584 | } |
585 | 585 | |
586 | 586 | //return button back to |
587 | 587 | function show_return($document_id, $path, $call_from_tool='', $slide_id=0, $is_certificate_mode=false) |
588 | 588 | { |
589 | 589 | global $parent_id; |
590 | - echo '<div class="actions">'; |
|
590 | + echo '<div class="actions">'; |
|
591 | 591 | |
592 | 592 | $url = api_get_path(WEB_CODE_PATH).'document/document.php?'.api_get_cidreq().'&id='.$parent_id; |
593 | 593 | |
594 | - if ($is_certificate_mode) { |
|
595 | - echo '<a href="document.php?curdirpath='.Security::remove_XSS($_GET['curdirpath']).'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'. |
|
594 | + if ($is_certificate_mode) { |
|
595 | + echo '<a href="document.php?curdirpath='.Security::remove_XSS($_GET['curdirpath']).'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'. |
|
596 | 596 | Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
597 | - } elseif($call_from_tool=='slideshow') { |
|
598 | - echo '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'. |
|
597 | + } elseif($call_from_tool=='slideshow') { |
|
598 | + echo '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'. |
|
599 | 599 | Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('ViewSlideshow'),'',ICON_SIZE_MEDIUM).'</a>'; |
600 | - } elseif($call_from_tool=='editdraw') { |
|
601 | - echo '<a href="'.$url.'">'. |
|
600 | + } elseif($call_from_tool=='editdraw') { |
|
601 | + echo '<a href="'.$url.'">'. |
|
602 | 602 | Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
603 | - echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>'; |
|
604 | - } elseif($call_from_tool=='editodf') { |
|
603 | + echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>'; |
|
604 | + } elseif($call_from_tool=='editodf') { |
|
605 | 605 | echo '<a href="'.$url.'">'. |
606 | 606 | Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
607 | 607 | echo '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Write'), array(), 32).'</a>'; |
608 | 608 | } elseif($call_from_tool=='editpaint'){ |
609 | - echo '<a href="'.$url.'">'. |
|
609 | + echo '<a href="'.$url.'">'. |
|
610 | 610 | Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), array(), ICON_SIZE_MEDIUM).'</a>'; |
611 | - echo '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>'; |
|
612 | - } else { |
|
613 | - echo '<a href="'.$url.'">'. |
|
611 | + echo '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>'; |
|
612 | + } else { |
|
613 | + echo '<a href="'.$url.'">'. |
|
614 | 614 | Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
615 | - } |
|
616 | - echo '</div>'; |
|
615 | + } |
|
616 | + echo '</div>'; |
|
617 | 617 | } |