@@ -8,83 +8,83 @@ discard block |
||
8 | 8 | * SOAP error handler. Handles an error sending a SOAP fault |
9 | 9 | */ |
10 | 10 | class WSCMSoapErrorHandler implements WSCMErrorHandler { |
11 | - /** |
|
12 | - * Handles the error by sending a SOAP fault through the server |
|
13 | - * |
|
14 | - * @param WSError Error to handle |
|
15 | - */ |
|
16 | - public function handle($error) { |
|
17 | - $server = WSCMSoapServer::singleton(); |
|
18 | - $server->fault(strval($error->code), $error->message); |
|
19 | - } |
|
11 | + /** |
|
12 | + * Handles the error by sending a SOAP fault through the server |
|
13 | + * |
|
14 | + * @param WSError Error to handle |
|
15 | + */ |
|
16 | + public function handle($error) { |
|
17 | + $server = WSCMSoapServer::singleton(); |
|
18 | + $server->fault(strval($error->code), $error->message); |
|
19 | + } |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | /** |
23 | 23 | * SOAP server wrapper implementing a Singleton |
24 | 24 | */ |
25 | 25 | class WSCMSoapServer { |
26 | - /** |
|
27 | - * SOAP server instance |
|
28 | - * |
|
29 | - * @var soap_server |
|
30 | - */ |
|
31 | - private static $_instance; |
|
26 | + /** |
|
27 | + * SOAP server instance |
|
28 | + * |
|
29 | + * @var soap_server |
|
30 | + */ |
|
31 | + private static $_instance; |
|
32 | 32 | |
33 | - /** |
|
34 | - * Private constructor |
|
35 | - */ |
|
36 | - private function __construct() { |
|
37 | - } |
|
33 | + /** |
|
34 | + * Private constructor |
|
35 | + */ |
|
36 | + private function __construct() { |
|
37 | + } |
|
38 | 38 | |
39 | - /** |
|
40 | - * Singleton method |
|
41 | - */ |
|
42 | - public static function singleton() { |
|
43 | - if(!isset(self::$_instance)) { |
|
44 | - self::$_instance = new soap_server(); |
|
45 | - // Set the error handler |
|
46 | - WSCMError::setErrorHandler(new WSCMSoapErrorHandler()); |
|
47 | - // Configure the service |
|
48 | - self::$_instance->configureWSDL('WSCMService', 'urn:WSCMService'); |
|
49 | - } |
|
39 | + /** |
|
40 | + * Singleton method |
|
41 | + */ |
|
42 | + public static function singleton() { |
|
43 | + if(!isset(self::$_instance)) { |
|
44 | + self::$_instance = new soap_server(); |
|
45 | + // Set the error handler |
|
46 | + WSCMError::setErrorHandler(new WSCMSoapErrorHandler()); |
|
47 | + // Configure the service |
|
48 | + self::$_instance->configureWSDL('WSCMService', 'urn:WSCMService'); |
|
49 | + } |
|
50 | 50 | |
51 | - return self::$_instance; |
|
52 | - } |
|
51 | + return self::$_instance; |
|
52 | + } |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | $s = WSCMSoapServer::singleton(); |
56 | 56 | |
57 | 57 | $s->wsdl->addComplexType( |
58 | - 'result', |
|
59 | - 'complexType', |
|
60 | - 'struct', |
|
61 | - 'all', |
|
62 | - '', |
|
63 | - array( |
|
64 | - 'code' => array('name' => 'code', 'type' => 'xsd:int'), |
|
65 | - 'message' => array('name' => 'message', 'type' => 'xsd:string') |
|
66 | - ) |
|
58 | + 'result', |
|
59 | + 'complexType', |
|
60 | + 'struct', |
|
61 | + 'all', |
|
62 | + '', |
|
63 | + array( |
|
64 | + 'code' => array('name' => 'code', 'type' => 'xsd:int'), |
|
65 | + 'message' => array('name' => 'message', 'type' => 'xsd:string') |
|
66 | + ) |
|
67 | 67 | ); |
68 | 68 | |
69 | 69 | $s->wsdl->addComplexType( |
70 | - 'extra_field', |
|
71 | - 'complexType', |
|
72 | - 'struct', |
|
73 | - 'all', |
|
74 | - '', |
|
75 | - array( |
|
76 | - 'field_name' => array('name' => 'field_name', 'type' => 'xsd:string'), |
|
77 | - 'field_value' => array('name' => 'field_value', 'type' => 'xsd:string') |
|
78 | - ) |
|
70 | + 'extra_field', |
|
71 | + 'complexType', |
|
72 | + 'struct', |
|
73 | + 'all', |
|
74 | + '', |
|
75 | + array( |
|
76 | + 'field_name' => array('name' => 'field_name', 'type' => 'xsd:string'), |
|
77 | + 'field_value' => array('name' => 'field_value', 'type' => 'xsd:string') |
|
78 | + ) |
|
79 | 79 | ); |
80 | 80 | |
81 | 81 | $s->register( |
82 | - 'WSCM.verifyUserPass', |
|
83 | - array( |
|
84 | - 'username' => 'xsd:string', |
|
85 | - 'password' => 'xsd:string', |
|
86 | - ), |
|
87 | - array('return' => 'xsd:string') |
|
82 | + 'WSCM.verifyUserPass', |
|
83 | + array( |
|
84 | + 'username' => 'xsd:string', |
|
85 | + 'password' => 'xsd:string', |
|
86 | + ), |
|
87 | + array('return' => 'xsd:string') |
|
88 | 88 | ); |
89 | 89 | |
90 | 90 | $s->register( |
@@ -94,9 +94,9 @@ discard block |
||
94 | 94 | ); |
95 | 95 | |
96 | 96 | $s->register( |
97 | - 'WSCM.test', |
|
98 | - array(), |
|
99 | - array('return' => 'xsd:string'), |
|
97 | + 'WSCM.test', |
|
98 | + array(), |
|
99 | + array('return' => 'xsd:string'), |
|
100 | 100 | 'urn:WSCMService', |
101 | 101 | '', |
102 | 102 | '', |
@@ -11,13 +11,13 @@ discard block |
||
11 | 11 | |
12 | 12 | |
13 | 13 | $s->register( |
14 | - 'WSCMAnnouncements.get_announcements_id', |
|
15 | - array( |
|
16 | - 'username' => 'xsd:string', |
|
17 | - 'password' => 'xsd:string', |
|
14 | + 'WSCMAnnouncements.get_announcements_id', |
|
15 | + array( |
|
16 | + 'username' => 'xsd:string', |
|
17 | + 'password' => 'xsd:string', |
|
18 | 18 | 'course_code' => 'xsd:string' |
19 | - ), |
|
20 | - array('return' => 'xsd:string'), |
|
19 | + ), |
|
20 | + array('return' => 'xsd:string'), |
|
21 | 21 | 'urn:WSCMService', |
22 | 22 | '', |
23 | 23 | '', |
@@ -27,15 +27,15 @@ discard block |
||
27 | 27 | ); |
28 | 28 | |
29 | 29 | $s->register( |
30 | - 'WSCMAnnouncements.get_announcement_data', |
|
31 | - array( |
|
32 | - 'username' => 'xsd:string', |
|
33 | - 'password' => 'xsd:string', |
|
30 | + 'WSCMAnnouncements.get_announcement_data', |
|
31 | + array( |
|
32 | + 'username' => 'xsd:string', |
|
33 | + 'password' => 'xsd:string', |
|
34 | 34 | 'course_code' => 'xsd:string', |
35 | 35 | 'announcement_id' => 'xsd:string', |
36 | 36 | 'field' => 'xsd:string' |
37 | - ), |
|
38 | - array('return' => 'xsd:string'), |
|
37 | + ), |
|
38 | + array('return' => 'xsd:string'), |
|
39 | 39 | 'urn:WSCMService', |
40 | 40 | '', |
41 | 41 | '', |
@@ -11,12 +11,12 @@ discard block |
||
11 | 11 | |
12 | 12 | |
13 | 13 | $s->register( |
14 | - 'WSCMInbox.unreadMessage', |
|
15 | - array( |
|
16 | - 'username' => 'xsd:string', |
|
17 | - 'password' => 'xsd:string', |
|
18 | - ), |
|
19 | - array('return' => 'xsd:string'), |
|
14 | + 'WSCMInbox.unreadMessage', |
|
15 | + array( |
|
16 | + 'username' => 'xsd:string', |
|
17 | + 'password' => 'xsd:string', |
|
18 | + ), |
|
19 | + array('return' => 'xsd:string'), |
|
20 | 20 | 'urn:WSCMService', |
21 | 21 | '', |
22 | 22 | '', |
@@ -26,14 +26,14 @@ discard block |
||
26 | 26 | ); |
27 | 27 | |
28 | 28 | $s->register( |
29 | - 'WSCMInbox.get_message_id', |
|
30 | - array( |
|
31 | - 'username' => 'xsd:string', |
|
32 | - 'password' => 'xsd:string', |
|
29 | + 'WSCMInbox.get_message_id', |
|
30 | + array( |
|
31 | + 'username' => 'xsd:string', |
|
32 | + 'password' => 'xsd:string', |
|
33 | 33 | 'from' => 'xsd:string', |
34 | 34 | 'number_of_items' => 'xsd:string' |
35 | - ), |
|
36 | - array('return' => 'xsd:string'), |
|
35 | + ), |
|
36 | + array('return' => 'xsd:string'), |
|
37 | 37 | 'urn:WSCMService', |
38 | 38 | '', |
39 | 39 | '', |
@@ -44,14 +44,14 @@ discard block |
||
44 | 44 | |
45 | 45 | |
46 | 46 | $s->register( |
47 | - 'WSCMInbox.get_message_data', |
|
48 | - array( |
|
49 | - 'username' => 'xsd:string', |
|
50 | - 'password' => 'xsd:string', |
|
47 | + 'WSCMInbox.get_message_data', |
|
48 | + array( |
|
49 | + 'username' => 'xsd:string', |
|
50 | + 'password' => 'xsd:string', |
|
51 | 51 | 'id' => 'xsd:string', |
52 | 52 | 'field' => 'xsd:string' |
53 | - ), |
|
54 | - array('return' => 'xsd:string'), |
|
53 | + ), |
|
54 | + array('return' => 'xsd:string'), |
|
55 | 55 | 'urn:WSCMService', |
56 | 56 | '', |
57 | 57 | '', |
@@ -61,14 +61,14 @@ discard block |
||
61 | 61 | ); |
62 | 62 | |
63 | 63 | $s->register( |
64 | - 'WSCMInbox.get_message_id_sent', |
|
65 | - array( |
|
66 | - 'username' => 'xsd:string', |
|
67 | - 'password' => 'xsd:string', |
|
64 | + 'WSCMInbox.get_message_id_sent', |
|
65 | + array( |
|
66 | + 'username' => 'xsd:string', |
|
67 | + 'password' => 'xsd:string', |
|
68 | 68 | 'from' => 'xsd:string', |
69 | 69 | 'number_of_items' => 'xsd:string' |
70 | - ), |
|
71 | - array('return' => 'xsd:string'), |
|
70 | + ), |
|
71 | + array('return' => 'xsd:string'), |
|
72 | 72 | 'urn:WSCMService', |
73 | 73 | '', |
74 | 74 | '', |
@@ -78,14 +78,14 @@ discard block |
||
78 | 78 | ); |
79 | 79 | |
80 | 80 | $s->register( |
81 | - 'WSCMInbox.get_message_data_sent', |
|
82 | - array( |
|
83 | - 'username' => 'xsd:string', |
|
84 | - 'password' => 'xsd:string', |
|
81 | + 'WSCMInbox.get_message_data_sent', |
|
82 | + array( |
|
83 | + 'username' => 'xsd:string', |
|
84 | + 'password' => 'xsd:string', |
|
85 | 85 | 'id' => 'xsd:string', |
86 | 86 | 'field' => 'xsd:string' |
87 | - ), |
|
88 | - array('return' => 'xsd:string'), |
|
87 | + ), |
|
88 | + array('return' => 'xsd:string'), |
|
89 | 89 | 'urn:WSCMService', |
90 | 90 | '', |
91 | 91 | '', |
@@ -95,15 +95,15 @@ discard block |
||
95 | 95 | ); |
96 | 96 | |
97 | 97 | $s->register( |
98 | - 'WSCMInbox.message_send', |
|
99 | - array( |
|
100 | - 'username' => 'xsd:string', |
|
101 | - 'password' => 'xsd:string', |
|
98 | + 'WSCMInbox.message_send', |
|
99 | + array( |
|
100 | + 'username' => 'xsd:string', |
|
101 | + 'password' => 'xsd:string', |
|
102 | 102 | 'receiver_user_id' => 'xsd:string', |
103 | 103 | 'subject' => 'xsd:string', |
104 | 104 | 'content' => 'xsd:string' |
105 | - ), |
|
106 | - array('return' => 'xsd:string'), |
|
105 | + ), |
|
106 | + array('return' => 'xsd:string'), |
|
107 | 107 | 'urn:WSCMService', |
108 | 108 | '', |
109 | 109 | '', |
@@ -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 |
@@ -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 | } |
@@ -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 |