@@ -60,11 +60,11 @@ |
||
60 | 60 | $courses_list = courses_list($_POST['security-key'], $_POST['visibility']); |
61 | 61 | foreach ($courses_list as $code => $cd) { |
62 | 62 | echo '<course>'; |
63 | - echo '<code>' , $code , '</code>'; |
|
64 | - echo '<title>' , $cd['title'] , '</title>'; |
|
65 | - echo '<url>' , $cd['url'] , '</url>'; |
|
66 | - echo '<teacher>' , $cd['teacher'] , '</teacher>'; |
|
67 | - echo '<language>' , $cd['language'] , '</language>'; |
|
63 | + echo '<code>', $code, '</code>'; |
|
64 | + echo '<title>', $cd['title'], '</title>'; |
|
65 | + echo '<url>', $cd['url'], '</url>'; |
|
66 | + echo '<teacher>', $cd['teacher'], '</teacher>'; |
|
67 | + echo '<language>', $cd['language'], '</language>'; |
|
68 | 68 | echo '</course>'; |
69 | 69 | } |
70 | 70 | } |
@@ -22,32 +22,32 @@ discard block |
||
22 | 22 | */ |
23 | 23 | function courses_list($security_key, $visibilities = 'public') { |
24 | 24 | |
25 | - global $_configuration; |
|
25 | + global $_configuration; |
|
26 | 26 | |
27 | - // Check if this script is launch by server and if security key is ok. |
|
28 | - if ($security_key != $_configuration['security_key']) { |
|
29 | - return array('error_msg' => 'Security check failed'); |
|
30 | - } |
|
27 | + // Check if this script is launch by server and if security key is ok. |
|
28 | + if ($security_key != $_configuration['security_key']) { |
|
29 | + return array('error_msg' => 'Security check failed'); |
|
30 | + } |
|
31 | 31 | |
32 | - $vis = array('public' => '3', 'public-registered' => '2', 'private' => '1', 'closed' => '0'); |
|
32 | + $vis = array('public' => '3', 'public-registered' => '2', 'private' => '1', 'closed' => '0'); |
|
33 | 33 | |
34 | - $courses_list = array(); |
|
34 | + $courses_list = array(); |
|
35 | 35 | |
36 | - if (!is_array($visibilities)) { |
|
37 | - $tmp = $visibilities; |
|
38 | - $visibilities = array($tmp); |
|
39 | - } |
|
40 | - foreach ($visibilities as $visibility) { |
|
41 | - if (!in_array($visibility, array_keys($vis))) { |
|
42 | - return array('error_msg' => 'Security check failed'); |
|
43 | - } |
|
44 | - $courses_list_tmp = CourseManager::get_courses_list(null, null, null, null, $vis[$visibility]); |
|
45 | - foreach ($courses_list_tmp as $index => $course) { |
|
46 | - $course_info = CourseManager::get_course_information($course['code']); |
|
47 | - $courses_list[$course['code']] = array('title' => api_utf8_encode($course_info['title']), 'url' => api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/', 'teacher' => api_utf8_encode($course_info['tutor_name']), 'language' => $course_info['course_language']); |
|
48 | - } |
|
49 | - } |
|
50 | - return $courses_list; |
|
36 | + if (!is_array($visibilities)) { |
|
37 | + $tmp = $visibilities; |
|
38 | + $visibilities = array($tmp); |
|
39 | + } |
|
40 | + foreach ($visibilities as $visibility) { |
|
41 | + if (!in_array($visibility, array_keys($vis))) { |
|
42 | + return array('error_msg' => 'Security check failed'); |
|
43 | + } |
|
44 | + $courses_list_tmp = CourseManager::get_courses_list(null, null, null, null, $vis[$visibility]); |
|
45 | + foreach ($courses_list_tmp as $index => $course) { |
|
46 | + $course_info = CourseManager::get_course_information($course['code']); |
|
47 | + $courses_list[$course['code']] = array('title' => api_utf8_encode($course_info['title']), 'url' => api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/', 'teacher' => api_utf8_encode($course_info['tutor_name']), 'language' => $course_info['course_language']); |
|
48 | + } |
|
49 | + } |
|
50 | + return $courses_list; |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | header('Content-Type: text/xml; charset=utf-8'); |
@@ -55,17 +55,17 @@ discard block |
||
55 | 55 | echo '<courseslist>'; |
56 | 56 | |
57 | 57 | if (empty($_POST['security-key']) || empty($_POST['visibility'])) { |
58 | - echo '<errormsg>Invalid parameters, this script expects a security-key and a visibility parameters</errormsg>'; |
|
58 | + echo '<errormsg>Invalid parameters, this script expects a security-key and a visibility parameters</errormsg>'; |
|
59 | 59 | } else { |
60 | - $courses_list = courses_list($_POST['security-key'], $_POST['visibility']); |
|
61 | - foreach ($courses_list as $code => $cd) { |
|
62 | - echo '<course>'; |
|
63 | - echo '<code>' , $code , '</code>'; |
|
64 | - echo '<title>' , $cd['title'] , '</title>'; |
|
65 | - echo '<url>' , $cd['url'] , '</url>'; |
|
66 | - echo '<teacher>' , $cd['teacher'] , '</teacher>'; |
|
67 | - echo '<language>' , $cd['language'] , '</language>'; |
|
68 | - echo '</course>'; |
|
69 | - } |
|
60 | + $courses_list = courses_list($_POST['security-key'], $_POST['visibility']); |
|
61 | + foreach ($courses_list as $code => $cd) { |
|
62 | + echo '<course>'; |
|
63 | + echo '<code>' , $code , '</code>'; |
|
64 | + echo '<title>' , $cd['title'] , '</title>'; |
|
65 | + echo '<url>' , $cd['url'] , '</url>'; |
|
66 | + echo '<teacher>' , $cd['teacher'] , '</teacher>'; |
|
67 | + echo '<language>' , $cd['language'] , '</language>'; |
|
68 | + echo '</course>'; |
|
69 | + } |
|
70 | 70 | } |
71 | 71 | echo '</courseslist>'; |
@@ -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 | '', |
@@ -40,7 +40,7 @@ |
||
40 | 40 | * Singleton method |
41 | 41 | */ |
42 | 42 | public static function singleton() { |
43 | - if(!isset(self::$_instance)) { |
|
43 | + if (!isset(self::$_instance)) { |
|
44 | 44 | self::$_instance = new soap_server(); |
45 | 45 | // Set the error handler |
46 | 46 | WSCMError::setErrorHandler(new WSCMSoapErrorHandler()); |
@@ -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 | '', |
@@ -15,12 +15,12 @@ discard block |
||
15 | 15 | { |
16 | 16 | |
17 | 17 | public function get_courses_code($username, $password) { |
18 | - if($this->verifyUserPass($username, $password) == "valid") { |
|
18 | + if ($this->verifyUserPass($username, $password) == "valid") { |
|
19 | 19 | $user_id = UserManager::get_user_id_from_username($username); |
20 | 20 | $listOfCourses = UserManager::get_personal_session_course_list($user_id); |
21 | 21 | |
22 | 22 | $courses_id = "#"; |
23 | - foreach ($listOfCourses as $course){ |
|
23 | + foreach ($listOfCourses as $course) { |
|
24 | 24 | $courses_id .= $course['code']."#"; |
25 | 25 | } |
26 | 26 | return $courses_id; |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | |
32 | 32 | public function get_course_title($username, $password, $course_code) |
33 | 33 | { |
34 | - if($this->verifyUserPass($username, $password) == "valid") |
|
34 | + if ($this->verifyUserPass($username, $password) == "valid") |
|
35 | 35 | { |
36 | 36 | $course_info = CourseManager::get_course_information($course_code); |
37 | 37 | return $course_info['title']; |
@@ -35,8 +35,9 @@ |
||
35 | 35 | { |
36 | 36 | $course_info = CourseManager::get_course_information($course_code); |
37 | 37 | return $course_info['title']; |
38 | - } else |
|
39 | - return get_lang('InvalidId'); |
|
38 | + } else { |
|
39 | + return get_lang('InvalidId'); |
|
40 | + } |
|
40 | 41 | |
41 | 42 | } |
42 | 43 |
@@ -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 |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | $digest = getDigest(); |
13 | 13 | |
14 | 14 | // If there was no digest, show login |
15 | -if (is_null($digest)) requireLogin($realm,$nonce); |
|
15 | +if (is_null($digest)) requireLogin($realm, $nonce); |
|
16 | 16 | |
17 | 17 | $digestParts = digestParse($digest); |
18 | 18 | |
@@ -26,7 +26,7 @@ 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 | 31 | // We're in! |
32 | 32 | echo 'a7532ae474e5e66a0c16eddab02e02a7'; |
@@ -42,7 +42,7 @@ 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'])) { |
@@ -53,8 +53,8 @@ discard block |
||
53 | 53 | } |
54 | 54 | |
55 | 55 | // This function forces a login prompt |
56 | -function requireLogin($realm,$nonce) { |
|
57 | - header('WWW-Authenticate: Digest realm="' . $realm . '",qop="auth",nonce="' . $nonce . '",opaque="' . md5($realm) . '"'); |
|
56 | +function requireLogin($realm, $nonce) { |
|
57 | + header('WWW-Authenticate: Digest realm="'.$realm.'",qop="auth",nonce="'.$nonce.'",opaque="'.md5($realm).'"'); |
|
58 | 58 | header('HTTP/1.1 401'); |
59 | 59 | echo 'Authentication Canceled'; |
60 | 60 | die(); |
@@ -12,7 +12,9 @@ discard block |
||
12 | 12 | $digest = getDigest(); |
13 | 13 | |
14 | 14 | // If there was no digest, show login |
15 | -if (is_null($digest)) requireLogin($realm,$nonce); |
|
15 | +if (is_null($digest)) { |
|
16 | + requireLogin($realm,$nonce); |
|
17 | +} |
|
16 | 18 | |
17 | 19 | $digestParts = digestParse($digest); |
18 | 20 | |
@@ -25,9 +27,9 @@ discard block |
||
25 | 27 | |
26 | 28 | $validResponse = md5("{$A1}:{$digestParts['nonce']}:{$digestParts['nc']}:{$digestParts['cnonce']}:{$digestParts['qop']}:{$A2}"); |
27 | 29 | |
28 | -if ($digestParts['response'] != $validResponse) |
|
30 | +if ($digestParts['response'] != $validResponse) { |
|
29 | 31 | requireLogin($realm,$nonce); |
30 | -else { |
|
32 | +} else { |
|
31 | 33 | // We're in! |
32 | 34 | echo 'a7532ae474e5e66a0c16eddab02e02a7'; |
33 | 35 | die(); |
@@ -40,12 +42,11 @@ discard block |
||
40 | 42 | if (isset($_SERVER['PHP_AUTH_DIGEST'])) { |
41 | 43 | $digest = $_SERVER['PHP_AUTH_DIGEST']; |
42 | 44 | // most other servers |
43 | - } |
|
44 | - elseif (isset($_SERVER['HTTP_AUTHENTICATION'])) { |
|
45 | - if (strpos(strtolower($_SERVER['HTTP_AUTHENTICATION']),'digest')===0) |
|
46 | - $digest = substr($_SERVER['HTTP_AUTHORIZATION'], 7); |
|
47 | - } |
|
48 | - elseif (isset($_SERVER['HTTP_WWW_AUTHENTICATE'])) { |
|
45 | + } elseif (isset($_SERVER['HTTP_AUTHENTICATION'])) { |
|
46 | + if (strpos(strtolower($_SERVER['HTTP_AUTHENTICATION']),'digest')===0) { |
|
47 | + $digest = substr($_SERVER['HTTP_AUTHORIZATION'], 7); |
|
48 | + } |
|
49 | + } elseif (isset($_SERVER['HTTP_WWW_AUTHENTICATE'])) { |
|
49 | 50 | $digest = $_SERVER['HTTP_WWW_AUTHENTICATE']; |
50 | 51 | } |
51 | 52 | return $digest; |
@@ -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 | } |
@@ -21,7 +21,7 @@ |
||
21 | 21 | $tuserfv = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES); |
22 | 22 | $sql = "SELECT user_id, username FROM $tuser ORDER BY user_id"; |
23 | 23 | $res = Database::query($sql); |
24 | -while($row = Database::fetch_array($res)) { |
|
24 | +while ($row = Database::fetch_array($res)) { |
|
25 | 25 | $sql2 = "INSERT INTO $tuserfv (item_id, field_id, value) |
26 | 26 | VALUES (".$row['user_id'].", 11,'".$row['username']."')"; |
27 | 27 | $res2 = Database::query($sql2); |
@@ -36,7 +36,7 @@ |
||
36 | 36 | if (isset($_REQUEST['cidReq']) && !empty($_REQUEST['cidReq'])) { |
37 | 37 | if ($_REQUEST['cidReq'] == -1) { |
38 | 38 | // When is out of the course tool (e.g My agenda) |
39 | - header('Location: ' . api_get_self()); |
|
39 | + header('Location: '.api_get_self()); |
|
40 | 40 | exit; |
41 | 41 | } else { |
42 | 42 | $type = 'course'; |