@@ -13,19 +13,19 @@ discard block |
||
13 | 13 | $s->register( |
14 | 14 | 'WSSession.CreateSession', |
15 | 15 | array( |
16 | - 'secret_key' => 'xsd:string', |
|
17 | - 'name' => 'xsd:string', |
|
18 | - 'start_date' => 'xsd:string', |
|
19 | - 'end_date' => 'xsd:string', |
|
20 | - 'nb_days_access_before' => 'xsd:int', |
|
21 | - 'nb_days_access_after' => 'xsd:int', |
|
22 | - 'nolimit' => 'xsd:int', |
|
23 | - 'visibility' => 'xsd:int', |
|
24 | - 'user_id_field_name' => 'xsd:string', |
|
25 | - 'user_id_value' => 'xsd:string', |
|
26 | - 'session_id_field_name' => 'xsd:string', |
|
27 | - 'session_id_value' => 'xsd:string', |
|
28 | - 'extras' => 'tns:extra_field' |
|
16 | + 'secret_key' => 'xsd:string', |
|
17 | + 'name' => 'xsd:string', |
|
18 | + 'start_date' => 'xsd:string', |
|
19 | + 'end_date' => 'xsd:string', |
|
20 | + 'nb_days_access_before' => 'xsd:int', |
|
21 | + 'nb_days_access_after' => 'xsd:int', |
|
22 | + 'nolimit' => 'xsd:int', |
|
23 | + 'visibility' => 'xsd:int', |
|
24 | + 'user_id_field_name' => 'xsd:string', |
|
25 | + 'user_id_value' => 'xsd:string', |
|
26 | + 'session_id_field_name' => 'xsd:string', |
|
27 | + 'session_id_value' => 'xsd:string', |
|
28 | + 'extras' => 'tns:extra_field' |
|
29 | 29 | ), |
30 | 30 | array('return' => 'xsd:int') |
31 | 31 | ); |
@@ -33,50 +33,50 @@ discard block |
||
33 | 33 | $s->register( |
34 | 34 | 'WSSession.DeleteSession', |
35 | 35 | array( |
36 | - 'secret_key' => 'xsd:string', |
|
37 | - 'session_id_field_name' => 'xsd:string', |
|
38 | - 'session_id_value' => 'xsd:string' |
|
36 | + 'secret_key' => 'xsd:string', |
|
37 | + 'session_id_field_name' => 'xsd:string', |
|
38 | + 'session_id_value' => 'xsd:string' |
|
39 | 39 | ) |
40 | 40 | ); |
41 | 41 | |
42 | 42 | $s->register( |
43 | 43 | 'WSSession.EditSession', |
44 | 44 | array( |
45 | - 'secret_key' => 'xsd:string', |
|
46 | - 'name' => 'xsd:string', |
|
47 | - 'start_date' => 'xsd:string', |
|
48 | - 'end_date' => 'xsd:string', |
|
49 | - 'nb_days_access_before' => 'xsd:int', |
|
50 | - 'nb_days_access_after' => 'xsd:int', |
|
51 | - 'nolimit' => 'xsd:int', |
|
52 | - 'visibility' => 'xsd:int', |
|
53 | - 'user_id_field_name' => 'xsd:string', |
|
54 | - 'user_id_value' => 'xsd:string', |
|
55 | - 'session_id_field_name' => 'xsd:string', |
|
56 | - 'session_id_value' => 'xsd:string', |
|
57 | - 'extras' => 'tns:extra_field' |
|
45 | + 'secret_key' => 'xsd:string', |
|
46 | + 'name' => 'xsd:string', |
|
47 | + 'start_date' => 'xsd:string', |
|
48 | + 'end_date' => 'xsd:string', |
|
49 | + 'nb_days_access_before' => 'xsd:int', |
|
50 | + 'nb_days_access_after' => 'xsd:int', |
|
51 | + 'nolimit' => 'xsd:int', |
|
52 | + 'visibility' => 'xsd:int', |
|
53 | + 'user_id_field_name' => 'xsd:string', |
|
54 | + 'user_id_value' => 'xsd:string', |
|
55 | + 'session_id_field_name' => 'xsd:string', |
|
56 | + 'session_id_value' => 'xsd:string', |
|
57 | + 'extras' => 'tns:extra_field' |
|
58 | 58 | ) |
59 | 59 | ); |
60 | 60 | |
61 | 61 | $s->register( |
62 | 62 | 'WSSession.SubscribeUserToSession', |
63 | 63 | array( |
64 | - 'secret_key' => 'xsd:string', |
|
65 | - 'user_id_field_name' => 'xsd:string', |
|
66 | - 'user_id_value' => 'xsd:string', |
|
67 | - 'session_id_field_name' => 'xsd:string', |
|
68 | - 'session_id_value' => 'xsd:string' |
|
64 | + 'secret_key' => 'xsd:string', |
|
65 | + 'user_id_field_name' => 'xsd:string', |
|
66 | + 'user_id_value' => 'xsd:string', |
|
67 | + 'session_id_field_name' => 'xsd:string', |
|
68 | + 'session_id_value' => 'xsd:string' |
|
69 | 69 | ) |
70 | 70 | ); |
71 | 71 | |
72 | 72 | $s->register( |
73 | 73 | 'WSSession.UnsubscribeUserFromSession', |
74 | 74 | array( |
75 | - 'secret_key' => 'xsd:string', |
|
76 | - 'user_id_field_name' => 'xsd:string', |
|
77 | - 'user_id_value' => 'xsd:string', |
|
78 | - 'session_id_field_name' => 'xsd:string', |
|
79 | - 'session_id_value' => 'xsd:string' |
|
75 | + 'secret_key' => 'xsd:string', |
|
76 | + 'user_id_field_name' => 'xsd:string', |
|
77 | + 'user_id_value' => 'xsd:string', |
|
78 | + 'session_id_field_name' => 'xsd:string', |
|
79 | + 'session_id_value' => 'xsd:string' |
|
80 | 80 | ) |
81 | 81 | ); |
82 | 82 | |
@@ -84,46 +84,46 @@ discard block |
||
84 | 84 | 'WSSession.SubscribeTeacherToSessionCourse', |
85 | 85 | array( |
86 | 86 | 'secret_key' => 'xsd:string', |
87 | - 'user_id_field_name' => 'xsd:string', |
|
88 | - 'user_id_value' => 'xsd:string', |
|
89 | - 'session_id_field_name' => 'xsd:string', |
|
90 | - 'session_id_value' => 'xsd:string', |
|
87 | + 'user_id_field_name' => 'xsd:string', |
|
88 | + 'user_id_value' => 'xsd:string', |
|
89 | + 'session_id_field_name' => 'xsd:string', |
|
90 | + 'session_id_value' => 'xsd:string', |
|
91 | 91 | 'course_id_field_name' => 'xsd:string', |
92 | - 'course_id_value' => 'xsd:string' |
|
92 | + 'course_id_value' => 'xsd:string' |
|
93 | 93 | ) |
94 | 94 | ); |
95 | 95 | |
96 | 96 | $s->register( |
97 | 97 | 'WSSession.UnsubscribeTeacherFromSessionCourse', |
98 | 98 | array( |
99 | - 'secret_key' => 'xsd:string', |
|
100 | - 'user_id_field_name' => 'xsd:string', |
|
101 | - 'user_id_value' => 'xsd:string', |
|
102 | - 'session_id_field_name' => 'xsd:string', |
|
103 | - 'session_id_value' => 'xsd:string', |
|
99 | + 'secret_key' => 'xsd:string', |
|
100 | + 'user_id_field_name' => 'xsd:string', |
|
101 | + 'user_id_value' => 'xsd:string', |
|
102 | + 'session_id_field_name' => 'xsd:string', |
|
103 | + 'session_id_value' => 'xsd:string', |
|
104 | 104 | 'course_id_field_name' => 'xsd:string', |
105 | - 'course_id_value' => 'xsd:string' |
|
105 | + 'course_id_value' => 'xsd:string' |
|
106 | 106 | ) |
107 | 107 | ); |
108 | 108 | |
109 | 109 | $s->register( |
110 | 110 | 'WSSession.SubscribeCourseToSession', |
111 | 111 | array( |
112 | - 'secret_key' => 'xsd:string', |
|
113 | - 'course_id_field_name' => 'xsd:string', |
|
114 | - 'course_id_value' => 'xsd:string', |
|
115 | - 'session_id_field_name' => 'xsd:string', |
|
116 | - 'session_id_value' => 'xsd:string' |
|
112 | + 'secret_key' => 'xsd:string', |
|
113 | + 'course_id_field_name' => 'xsd:string', |
|
114 | + 'course_id_value' => 'xsd:string', |
|
115 | + 'session_id_field_name' => 'xsd:string', |
|
116 | + 'session_id_value' => 'xsd:string' |
|
117 | 117 | ) |
118 | 118 | ); |
119 | 119 | |
120 | 120 | $s->register( |
121 | 121 | 'WSSession.UnsubscribeCourseFromSession', |
122 | 122 | array( |
123 | - 'secret_key' => 'xsd:string', |
|
124 | - 'course_id_field_name' => 'xsd:string', |
|
125 | - 'course_id_value' => 'xsd:string', |
|
126 | - 'session_id_field_name' => 'xsd:string', |
|
127 | - 'session_id_value' => 'xsd:string' |
|
123 | + 'secret_key' => 'xsd:string', |
|
124 | + 'course_id_field_name' => 'xsd:string', |
|
125 | + 'course_id_value' => 'xsd:string', |
|
126 | + 'session_id_field_name' => 'xsd:string', |
|
127 | + 'session_id_value' => 'xsd:string' |
|
128 | 128 | ) |
129 | 129 | ); |
@@ -9,194 +9,194 @@ |
||
9 | 9 | // See http://demo.icu-project.org/icu-bin/convexp |
10 | 10 | return array( |
11 | 11 | |
12 | - // UTF-8 multibyte encoding |
|
13 | - |
|
14 | - 'UTF-8' => 'UTF-8', |
|
15 | - 'WINDOWS-65001' => 'UTF-8', |
|
16 | - 'CP65001' => 'UTF-8', |
|
17 | - 'WIN-65001' => 'UTF-8', |
|
18 | - 'WIN65001' => 'UTF-8', |
|
19 | - '65001' => 'UTF-8', |
|
20 | - |
|
21 | - // HTML entities |
|
22 | - |
|
23 | - 'HTML-ENTITIES' => 'HTML-ENTITIES', |
|
24 | - |
|
25 | - // Singlebyte encodings |
|
26 | - |
|
27 | - 'US-ASCII' => 'US-ASCII', |
|
28 | - 'US' => 'US-ASCII', |
|
29 | - 'ASCII' => 'US-ASCII', |
|
30 | - 'CP367' => 'US-ASCII', |
|
31 | - 'ISO646-US' => 'US-ASCII', |
|
32 | - |
|
33 | - 'ISO-8859-1' => '8859-1', |
|
34 | - 'ISO8859-1' => '8859-1', |
|
35 | - '8859-1' => '8859-1', |
|
36 | - 'LATIN1' => '8859-1', |
|
37 | - 'CP819' => '8859-1', |
|
38 | - |
|
39 | - 'ISO-8859-2' => '8859-2', |
|
40 | - 'ISO8859-2' => '8859-2', |
|
41 | - '8859-2' => '8859-2', |
|
42 | - 'LATIN2' => '8859-2', |
|
43 | - 'CP912' => '8859-2', |
|
44 | - |
|
45 | - 'ISO-8859-3' => '8859-3', |
|
46 | - 'ISO8859-3' => '8859-3', |
|
47 | - '8859-3' => '8859-3', |
|
48 | - 'LATIN3' => '8859-3', |
|
49 | - 'CP913' => '8859-3', |
|
50 | - |
|
51 | - 'ISO-8859-4' => '8859-4', |
|
52 | - 'ISO8859-4' => '8859-4', |
|
53 | - '8859-4' => '8859-4', |
|
54 | - 'LATIN4' => '8859-4', |
|
55 | - 'CP914' => '8859-4', |
|
56 | - |
|
57 | - 'ISO-8859-5' => '8859-5', |
|
58 | - 'ISO8859-5' => '8859-5', |
|
59 | - '8859-5' => '8859-5', |
|
60 | - 'CYRILLIC' => '8859-5', |
|
61 | - 'CP915' => '8859-5', |
|
62 | - |
|
63 | - 'ISO-8859-6' => '8859-6', |
|
64 | - 'ISO8859-6' => '8859-6', |
|
65 | - '8859-6' => '8859-6', |
|
66 | - 'ARABIC' => '8859-6', |
|
67 | - 'CP1089' => '8859-6', |
|
68 | - |
|
69 | - 'ISO-8859-7' => '8859-7', |
|
70 | - 'ISO8859-7' => '8859-7', |
|
71 | - '8859-7' => '8859-7', |
|
72 | - 'GREEK' => '8859-7', |
|
73 | - |
|
74 | - 'ISO-8859-8' => '8859-8', |
|
75 | - 'ISO8859-8' => '8859-8', |
|
76 | - '8859-8' => '8859-8', |
|
77 | - 'HEBREW' => '8859-8', |
|
78 | - |
|
79 | - 'ISO-8859-9' => '8859-9', |
|
80 | - 'ISO8859-9' => '8859-9', |
|
81 | - '8859-9' => '8859-9', |
|
82 | - 'LATIN5' => '8859-9', |
|
83 | - 'TURKISH' => '8859-9', |
|
84 | - 'CP920' => '8859-9', |
|
85 | - |
|
86 | - 'ISO-8859-10' => '8859-10', |
|
87 | - 'ISO8859-10' => '8859-10', |
|
88 | - '8859-10' => '8859-10', |
|
89 | - 'LATIN6' => '8859-10', |
|
90 | - |
|
91 | - 'ISO-8859-11' => '8859-11', |
|
92 | - 'ISO8859-11' => '8859-11', |
|
93 | - '8859-11' => '8859-11', |
|
94 | - 'THAI8' => '8859-11', |
|
95 | - |
|
96 | - 'ISO-8859-13' => '8859-13', |
|
97 | - 'ISO8859-13' => '8859-13', |
|
98 | - '8859-13' => '8859-13', |
|
99 | - 'CP921' => '8859-13', |
|
100 | - |
|
101 | - 'ISO-8859-14' => '8859-14', |
|
102 | - 'ISO8859-14' => '8859-14', |
|
103 | - '8859-14' => '8859-14', |
|
104 | - 'LATIN8' => '8859-14', |
|
105 | - 'ISO-CELTIC' => '8859-14', |
|
106 | - |
|
107 | - 'ISO-8859-15' => '8859-15', |
|
108 | - 'ISO8859-15' => '8859-15', |
|
109 | - '8859-15' => '8859-15', |
|
110 | - 'LATIN0' => '8859-15', |
|
111 | - 'LATIN-9' => '8859-15', |
|
112 | - 'CP923' => '8859-15', |
|
113 | - |
|
114 | - 'WINDOWS-855' => 'CP855', |
|
115 | - 'CP855' => 'CP855', |
|
116 | - 'WINDOWS-855' => 'CP855', |
|
117 | - 'WIN-855' => 'CP855', |
|
118 | - 'WIN855' => 'CP855', |
|
119 | - '855' => 'CP855', |
|
120 | - 'IBM-855' => 'CP855', |
|
121 | - 'IBM855' => 'CP855', |
|
122 | - |
|
123 | - 'WINDOWS-866' => 'CP866', |
|
124 | - 'CP866' => 'CP866', |
|
125 | - 'WINDOWS-866' => 'CP866', |
|
126 | - 'WIN-866' => 'CP866', |
|
127 | - 'WIN866' => 'CP866', |
|
128 | - '866' => 'CP866', |
|
129 | - 'IBM-866' => 'CP866', |
|
130 | - 'IBM866' => 'CP866', |
|
131 | - |
|
132 | - 'WINDOWS-874' => 'CP874', |
|
133 | - 'TIS-620' => 'CP874', |
|
134 | - 'CP874' => 'CP874', |
|
135 | - 'EUCTH' => 'CP874', |
|
136 | - 'WIN-874' => 'CP874', |
|
137 | - 'WIN874' => 'CP874', |
|
138 | - '874' => 'CP874', |
|
139 | - |
|
140 | - 'WINDOWS-1250' => 'CP1250', |
|
141 | - 'CP1250' => 'CP1250', |
|
142 | - 'WIN-1250' => 'CP1250', |
|
143 | - 'WIN1250' => 'CP1250', |
|
144 | - '1250' => 'CP1250', |
|
145 | - |
|
146 | - 'WINDOWS-1251' => 'CP1251', |
|
147 | - 'CP1251' => 'CP1251', |
|
148 | - 'ANSI1251' => 'CP1251', |
|
149 | - 'WIN-1251' => 'CP1251', |
|
150 | - 'WIN1251' => 'CP1251', |
|
151 | - '1251' => 'CP1251', |
|
152 | - |
|
153 | - 'WINDOWS-1252' => 'CP1252', |
|
154 | - 'CP1252' => 'CP1252', |
|
155 | - 'WIN-1252' => 'CP1252', |
|
156 | - 'WIN1252' => 'CP1252', |
|
157 | - '1252' => 'CP1252', |
|
158 | - |
|
159 | - 'WINDOWS-1253' => 'CP1253', |
|
160 | - 'CP1253' => 'CP1253', |
|
161 | - 'WIN-1253' => 'CP1253', |
|
162 | - 'WIN1253' => 'CP1253', |
|
163 | - '1253' => 'CP1253', |
|
164 | - |
|
165 | - 'WINDOWS-1254' => 'CP1254', |
|
166 | - 'CP1254' => 'CP1254', |
|
167 | - 'WIN-1254' => 'CP1254', |
|
168 | - 'WIN1254' => 'CP1254', |
|
169 | - '1254' => 'CP1254', |
|
170 | - |
|
171 | - 'WINDOWS-1255' => 'CP1255', |
|
172 | - 'CP1255' => 'CP1255', |
|
173 | - 'WIN-1255' => 'CP1255', |
|
174 | - 'WIN1255' => 'CP1255', |
|
175 | - '1255' => 'CP1255', |
|
176 | - |
|
177 | - 'WINDOWS-1256' => 'CP1256', |
|
178 | - 'CP1256' => 'CP1256', |
|
179 | - 'WIN-1256' => 'CP1256', |
|
180 | - 'WIN1256' => 'CP1256', |
|
181 | - '1256' => 'CP1256', |
|
182 | - |
|
183 | - 'WINDOWS-1257' => 'CP1257', |
|
184 | - 'CP1257' => 'CP1257', |
|
185 | - 'WIN-1257' => 'CP1257', |
|
186 | - 'WIN1257' => 'CP1257', |
|
187 | - '1257' => 'CP1257', |
|
188 | - |
|
189 | - 'WINDOWS-1258' => 'CP1258', |
|
190 | - 'CP1258' => 'CP1258', |
|
191 | - 'WIN-1258' => 'CP1258', |
|
192 | - 'WIN1258' => 'CP1258', |
|
193 | - '1258' => 'CP1258', |
|
194 | - |
|
195 | - 'KOI8-R' => 'KOI8-R', |
|
196 | - 'CP878' => 'KOI8-R', |
|
197 | - 'KOI8R' => 'KOI8-R', |
|
198 | - 'KOI8-RU' => 'KOI8-R', |
|
199 | - |
|
200 | - 'KOI8-U' => 'KOI8-U', |
|
12 | + // UTF-8 multibyte encoding |
|
13 | + |
|
14 | + 'UTF-8' => 'UTF-8', |
|
15 | + 'WINDOWS-65001' => 'UTF-8', |
|
16 | + 'CP65001' => 'UTF-8', |
|
17 | + 'WIN-65001' => 'UTF-8', |
|
18 | + 'WIN65001' => 'UTF-8', |
|
19 | + '65001' => 'UTF-8', |
|
20 | + |
|
21 | + // HTML entities |
|
22 | + |
|
23 | + 'HTML-ENTITIES' => 'HTML-ENTITIES', |
|
24 | + |
|
25 | + // Singlebyte encodings |
|
26 | + |
|
27 | + 'US-ASCII' => 'US-ASCII', |
|
28 | + 'US' => 'US-ASCII', |
|
29 | + 'ASCII' => 'US-ASCII', |
|
30 | + 'CP367' => 'US-ASCII', |
|
31 | + 'ISO646-US' => 'US-ASCII', |
|
32 | + |
|
33 | + 'ISO-8859-1' => '8859-1', |
|
34 | + 'ISO8859-1' => '8859-1', |
|
35 | + '8859-1' => '8859-1', |
|
36 | + 'LATIN1' => '8859-1', |
|
37 | + 'CP819' => '8859-1', |
|
38 | + |
|
39 | + 'ISO-8859-2' => '8859-2', |
|
40 | + 'ISO8859-2' => '8859-2', |
|
41 | + '8859-2' => '8859-2', |
|
42 | + 'LATIN2' => '8859-2', |
|
43 | + 'CP912' => '8859-2', |
|
44 | + |
|
45 | + 'ISO-8859-3' => '8859-3', |
|
46 | + 'ISO8859-3' => '8859-3', |
|
47 | + '8859-3' => '8859-3', |
|
48 | + 'LATIN3' => '8859-3', |
|
49 | + 'CP913' => '8859-3', |
|
50 | + |
|
51 | + 'ISO-8859-4' => '8859-4', |
|
52 | + 'ISO8859-4' => '8859-4', |
|
53 | + '8859-4' => '8859-4', |
|
54 | + 'LATIN4' => '8859-4', |
|
55 | + 'CP914' => '8859-4', |
|
56 | + |
|
57 | + 'ISO-8859-5' => '8859-5', |
|
58 | + 'ISO8859-5' => '8859-5', |
|
59 | + '8859-5' => '8859-5', |
|
60 | + 'CYRILLIC' => '8859-5', |
|
61 | + 'CP915' => '8859-5', |
|
62 | + |
|
63 | + 'ISO-8859-6' => '8859-6', |
|
64 | + 'ISO8859-6' => '8859-6', |
|
65 | + '8859-6' => '8859-6', |
|
66 | + 'ARABIC' => '8859-6', |
|
67 | + 'CP1089' => '8859-6', |
|
68 | + |
|
69 | + 'ISO-8859-7' => '8859-7', |
|
70 | + 'ISO8859-7' => '8859-7', |
|
71 | + '8859-7' => '8859-7', |
|
72 | + 'GREEK' => '8859-7', |
|
73 | + |
|
74 | + 'ISO-8859-8' => '8859-8', |
|
75 | + 'ISO8859-8' => '8859-8', |
|
76 | + '8859-8' => '8859-8', |
|
77 | + 'HEBREW' => '8859-8', |
|
78 | + |
|
79 | + 'ISO-8859-9' => '8859-9', |
|
80 | + 'ISO8859-9' => '8859-9', |
|
81 | + '8859-9' => '8859-9', |
|
82 | + 'LATIN5' => '8859-9', |
|
83 | + 'TURKISH' => '8859-9', |
|
84 | + 'CP920' => '8859-9', |
|
85 | + |
|
86 | + 'ISO-8859-10' => '8859-10', |
|
87 | + 'ISO8859-10' => '8859-10', |
|
88 | + '8859-10' => '8859-10', |
|
89 | + 'LATIN6' => '8859-10', |
|
90 | + |
|
91 | + 'ISO-8859-11' => '8859-11', |
|
92 | + 'ISO8859-11' => '8859-11', |
|
93 | + '8859-11' => '8859-11', |
|
94 | + 'THAI8' => '8859-11', |
|
95 | + |
|
96 | + 'ISO-8859-13' => '8859-13', |
|
97 | + 'ISO8859-13' => '8859-13', |
|
98 | + '8859-13' => '8859-13', |
|
99 | + 'CP921' => '8859-13', |
|
100 | + |
|
101 | + 'ISO-8859-14' => '8859-14', |
|
102 | + 'ISO8859-14' => '8859-14', |
|
103 | + '8859-14' => '8859-14', |
|
104 | + 'LATIN8' => '8859-14', |
|
105 | + 'ISO-CELTIC' => '8859-14', |
|
106 | + |
|
107 | + 'ISO-8859-15' => '8859-15', |
|
108 | + 'ISO8859-15' => '8859-15', |
|
109 | + '8859-15' => '8859-15', |
|
110 | + 'LATIN0' => '8859-15', |
|
111 | + 'LATIN-9' => '8859-15', |
|
112 | + 'CP923' => '8859-15', |
|
113 | + |
|
114 | + 'WINDOWS-855' => 'CP855', |
|
115 | + 'CP855' => 'CP855', |
|
116 | + 'WINDOWS-855' => 'CP855', |
|
117 | + 'WIN-855' => 'CP855', |
|
118 | + 'WIN855' => 'CP855', |
|
119 | + '855' => 'CP855', |
|
120 | + 'IBM-855' => 'CP855', |
|
121 | + 'IBM855' => 'CP855', |
|
122 | + |
|
123 | + 'WINDOWS-866' => 'CP866', |
|
124 | + 'CP866' => 'CP866', |
|
125 | + 'WINDOWS-866' => 'CP866', |
|
126 | + 'WIN-866' => 'CP866', |
|
127 | + 'WIN866' => 'CP866', |
|
128 | + '866' => 'CP866', |
|
129 | + 'IBM-866' => 'CP866', |
|
130 | + 'IBM866' => 'CP866', |
|
131 | + |
|
132 | + 'WINDOWS-874' => 'CP874', |
|
133 | + 'TIS-620' => 'CP874', |
|
134 | + 'CP874' => 'CP874', |
|
135 | + 'EUCTH' => 'CP874', |
|
136 | + 'WIN-874' => 'CP874', |
|
137 | + 'WIN874' => 'CP874', |
|
138 | + '874' => 'CP874', |
|
139 | + |
|
140 | + 'WINDOWS-1250' => 'CP1250', |
|
141 | + 'CP1250' => 'CP1250', |
|
142 | + 'WIN-1250' => 'CP1250', |
|
143 | + 'WIN1250' => 'CP1250', |
|
144 | + '1250' => 'CP1250', |
|
145 | + |
|
146 | + 'WINDOWS-1251' => 'CP1251', |
|
147 | + 'CP1251' => 'CP1251', |
|
148 | + 'ANSI1251' => 'CP1251', |
|
149 | + 'WIN-1251' => 'CP1251', |
|
150 | + 'WIN1251' => 'CP1251', |
|
151 | + '1251' => 'CP1251', |
|
152 | + |
|
153 | + 'WINDOWS-1252' => 'CP1252', |
|
154 | + 'CP1252' => 'CP1252', |
|
155 | + 'WIN-1252' => 'CP1252', |
|
156 | + 'WIN1252' => 'CP1252', |
|
157 | + '1252' => 'CP1252', |
|
158 | + |
|
159 | + 'WINDOWS-1253' => 'CP1253', |
|
160 | + 'CP1253' => 'CP1253', |
|
161 | + 'WIN-1253' => 'CP1253', |
|
162 | + 'WIN1253' => 'CP1253', |
|
163 | + '1253' => 'CP1253', |
|
164 | + |
|
165 | + 'WINDOWS-1254' => 'CP1254', |
|
166 | + 'CP1254' => 'CP1254', |
|
167 | + 'WIN-1254' => 'CP1254', |
|
168 | + 'WIN1254' => 'CP1254', |
|
169 | + '1254' => 'CP1254', |
|
170 | + |
|
171 | + 'WINDOWS-1255' => 'CP1255', |
|
172 | + 'CP1255' => 'CP1255', |
|
173 | + 'WIN-1255' => 'CP1255', |
|
174 | + 'WIN1255' => 'CP1255', |
|
175 | + '1255' => 'CP1255', |
|
176 | + |
|
177 | + 'WINDOWS-1256' => 'CP1256', |
|
178 | + 'CP1256' => 'CP1256', |
|
179 | + 'WIN-1256' => 'CP1256', |
|
180 | + 'WIN1256' => 'CP1256', |
|
181 | + '1256' => 'CP1256', |
|
182 | + |
|
183 | + 'WINDOWS-1257' => 'CP1257', |
|
184 | + 'CP1257' => 'CP1257', |
|
185 | + 'WIN-1257' => 'CP1257', |
|
186 | + 'WIN1257' => 'CP1257', |
|
187 | + '1257' => 'CP1257', |
|
188 | + |
|
189 | + 'WINDOWS-1258' => 'CP1258', |
|
190 | + 'CP1258' => 'CP1258', |
|
191 | + 'WIN-1258' => 'CP1258', |
|
192 | + 'WIN1258' => 'CP1258', |
|
193 | + '1258' => 'CP1258', |
|
194 | + |
|
195 | + 'KOI8-R' => 'KOI8-R', |
|
196 | + 'CP878' => 'KOI8-R', |
|
197 | + 'KOI8R' => 'KOI8-R', |
|
198 | + 'KOI8-RU' => 'KOI8-R', |
|
199 | + |
|
200 | + 'KOI8-U' => 'KOI8-U', |
|
201 | 201 | |
202 | 202 | ); |
@@ -14,223 +14,223 @@ |
||
14 | 14 | $s = WSSoapServer::singleton(); |
15 | 15 | |
16 | 16 | $s->wsdl->addComplexType( |
17 | - 'user_id', |
|
18 | - 'complexType', |
|
19 | - 'struct', |
|
20 | - 'all', |
|
21 | - '', |
|
22 | - array( |
|
23 | - 'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'), |
|
24 | - 'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string') |
|
25 | - ) |
|
17 | + 'user_id', |
|
18 | + 'complexType', |
|
19 | + 'struct', |
|
20 | + 'all', |
|
21 | + '', |
|
22 | + array( |
|
23 | + 'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'), |
|
24 | + 'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string') |
|
25 | + ) |
|
26 | 26 | ); |
27 | 27 | |
28 | 28 | $s->wsdl->addComplexType( |
29 | - 'user_result', |
|
30 | - 'complexType', |
|
31 | - 'struct', |
|
32 | - 'all', |
|
33 | - '', |
|
34 | - array( |
|
35 | - 'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'), |
|
36 | - 'result' => array('name' => 'result', 'type' => 'tns:result') |
|
37 | - ) |
|
29 | + 'user_result', |
|
30 | + 'complexType', |
|
31 | + 'struct', |
|
32 | + 'all', |
|
33 | + '', |
|
34 | + array( |
|
35 | + 'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'), |
|
36 | + 'result' => array('name' => 'result', 'type' => 'tns:result') |
|
37 | + ) |
|
38 | 38 | ); |
39 | 39 | |
40 | 40 | $s->wsdl->addComplexType( |
41 | - 'user_result_array', |
|
42 | - 'complexType', |
|
43 | - 'array', |
|
44 | - '', |
|
45 | - 'SOAP-ENC:Array', |
|
46 | - array(), |
|
47 | - array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_result[]')), |
|
48 | - 'tns:user_result' |
|
41 | + 'user_result_array', |
|
42 | + 'complexType', |
|
43 | + 'array', |
|
44 | + '', |
|
45 | + 'SOAP-ENC:Array', |
|
46 | + array(), |
|
47 | + array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_result[]')), |
|
48 | + 'tns:user_result' |
|
49 | 49 | ); |
50 | 50 | |
51 | 51 | $s->register( |
52 | - 'WSUser.DisableUser', |
|
53 | - array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string') |
|
52 | + 'WSUser.DisableUser', |
|
53 | + array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string') |
|
54 | 54 | ); |
55 | 55 | |
56 | 56 | $s->register( |
57 | - 'WSUser.DisableUsers', |
|
58 | - array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'), |
|
59 | - array('return' => 'tns:user_result_array') |
|
57 | + 'WSUser.DisableUsers', |
|
58 | + array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'), |
|
59 | + array('return' => 'tns:user_result_array') |
|
60 | 60 | ); |
61 | 61 | |
62 | 62 | $s->register( |
63 | - 'WSUser.EnableUser', |
|
64 | - array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string') |
|
63 | + 'WSUser.EnableUser', |
|
64 | + array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string') |
|
65 | 65 | ); |
66 | 66 | |
67 | 67 | $s->register( |
68 | - 'WSUser.EnableUsers', |
|
69 | - array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'), |
|
70 | - array('return' => 'tns:user_result_array') |
|
68 | + 'WSUser.EnableUsers', |
|
69 | + array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'), |
|
70 | + array('return' => 'tns:user_result_array') |
|
71 | 71 | ); |
72 | 72 | |
73 | 73 | $s->register( |
74 | - 'WSUser.DeleteUser', |
|
75 | - array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string') |
|
74 | + 'WSUser.DeleteUser', |
|
75 | + array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string') |
|
76 | 76 | ); |
77 | 77 | |
78 | 78 | $s->register( |
79 | - 'WSUser.DeleteUsers', |
|
80 | - array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'), |
|
81 | - array('return' => 'tns:user_result_array') |
|
79 | + 'WSUser.DeleteUsers', |
|
80 | + array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'), |
|
81 | + array('return' => 'tns:user_result_array') |
|
82 | 82 | ); |
83 | 83 | |
84 | 84 | $s->register( |
85 | - 'WSUser.CreateUser', |
|
86 | - array( |
|
87 | - 'secret_key' => 'xsd:string', |
|
88 | - 'firstname' => 'xsd:string', |
|
89 | - 'lastname' => 'xsd:string', |
|
90 | - 'status' => 'xsd:int', |
|
91 | - 'loginname' => 'xsd:string', |
|
92 | - 'password' => 'xsd:string', |
|
93 | - 'encrypt_method' => 'xsd:string', |
|
94 | - 'user_id_field_name' => 'xsd:string', |
|
95 | - 'user_id_value' => 'xsd:string', |
|
96 | - 'visibility' => 'xsd:int', |
|
97 | - 'email' => 'xsd:string', |
|
98 | - 'language' => 'xsd:string', |
|
99 | - 'phone' => 'xsd:string', |
|
100 | - 'expiration_date' => 'xsd:string', |
|
101 | - 'extras' => 'tns:extra_field' |
|
102 | - ), |
|
103 | - array('return' => 'xsd:int') |
|
85 | + 'WSUser.CreateUser', |
|
86 | + array( |
|
87 | + 'secret_key' => 'xsd:string', |
|
88 | + 'firstname' => 'xsd:string', |
|
89 | + 'lastname' => 'xsd:string', |
|
90 | + 'status' => 'xsd:int', |
|
91 | + 'loginname' => 'xsd:string', |
|
92 | + 'password' => 'xsd:string', |
|
93 | + 'encrypt_method' => 'xsd:string', |
|
94 | + 'user_id_field_name' => 'xsd:string', |
|
95 | + 'user_id_value' => 'xsd:string', |
|
96 | + 'visibility' => 'xsd:int', |
|
97 | + 'email' => 'xsd:string', |
|
98 | + 'language' => 'xsd:string', |
|
99 | + 'phone' => 'xsd:string', |
|
100 | + 'expiration_date' => 'xsd:string', |
|
101 | + 'extras' => 'tns:extra_field' |
|
102 | + ), |
|
103 | + array('return' => 'xsd:int') |
|
104 | 104 | ); |
105 | 105 | |
106 | 106 | $s->wsdl->addComplexType( |
107 | - 'user_create', |
|
108 | - 'complexType', |
|
109 | - 'struct', |
|
110 | - 'all', |
|
111 | - '', |
|
112 | - array( |
|
113 | - 'firstname' => array('name' => 'firstname', 'type' => 'xsd:string'), |
|
114 | - 'lastname' => array('name' => 'lastname', 'type' => 'xsd:string'), |
|
115 | - 'status' => array('name' => 'status', 'type' => 'xsd:int'), |
|
116 | - 'loginname' => array('name' => 'loginname', 'type' => 'xsd:string'), |
|
117 | - 'password' => array('name' => 'password', 'type' => 'xsd:string'), |
|
118 | - 'encrypt_method' => array('name' => 'encrypt_method', 'type' => 'xsd:string'), |
|
119 | - 'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'), |
|
120 | - 'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'), |
|
121 | - 'visibility' => array('name' => 'visibility', 'type' => 'xsd:int'), |
|
122 | - 'email' => array('name' => 'email', 'type' => 'xsd:string'), |
|
123 | - 'language' => array('name' => 'language', 'type' => 'xsd:string'), |
|
124 | - 'phone' => array('name' => 'phone', 'type' => 'xsd:string'), |
|
125 | - 'expiration_date' => array('name' => 'expiration_date', 'type' => 'xsd:string'), |
|
126 | - 'extras' => array('name' => 'extras', 'type' => 'tns:extra_field') |
|
127 | - ) |
|
107 | + 'user_create', |
|
108 | + 'complexType', |
|
109 | + 'struct', |
|
110 | + 'all', |
|
111 | + '', |
|
112 | + array( |
|
113 | + 'firstname' => array('name' => 'firstname', 'type' => 'xsd:string'), |
|
114 | + 'lastname' => array('name' => 'lastname', 'type' => 'xsd:string'), |
|
115 | + 'status' => array('name' => 'status', 'type' => 'xsd:int'), |
|
116 | + 'loginname' => array('name' => 'loginname', 'type' => 'xsd:string'), |
|
117 | + 'password' => array('name' => 'password', 'type' => 'xsd:string'), |
|
118 | + 'encrypt_method' => array('name' => 'encrypt_method', 'type' => 'xsd:string'), |
|
119 | + 'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'), |
|
120 | + 'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'), |
|
121 | + 'visibility' => array('name' => 'visibility', 'type' => 'xsd:int'), |
|
122 | + 'email' => array('name' => 'email', 'type' => 'xsd:string'), |
|
123 | + 'language' => array('name' => 'language', 'type' => 'xsd:string'), |
|
124 | + 'phone' => array('name' => 'phone', 'type' => 'xsd:string'), |
|
125 | + 'expiration_date' => array('name' => 'expiration_date', 'type' => 'xsd:string'), |
|
126 | + 'extras' => array('name' => 'extras', 'type' => 'tns:extra_field') |
|
127 | + ) |
|
128 | 128 | ); |
129 | 129 | |
130 | 130 | $s->wsdl->addComplexType( |
131 | - 'user_create_result', |
|
132 | - 'complexType', |
|
133 | - 'struct', |
|
134 | - 'all', |
|
135 | - '', |
|
136 | - array( |
|
137 | - 'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'), |
|
138 | - 'user_id_generated' => array('name' => 'user_id_generated', 'type' => 'xsd:int'), |
|
139 | - 'result' => array('name' => 'result', 'type' => 'tns:result') |
|
140 | - ) |
|
131 | + 'user_create_result', |
|
132 | + 'complexType', |
|
133 | + 'struct', |
|
134 | + 'all', |
|
135 | + '', |
|
136 | + array( |
|
137 | + 'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'), |
|
138 | + 'user_id_generated' => array('name' => 'user_id_generated', 'type' => 'xsd:int'), |
|
139 | + 'result' => array('name' => 'result', 'type' => 'tns:result') |
|
140 | + ) |
|
141 | 141 | ); |
142 | 142 | |
143 | 143 | $s->wsdl->addComplexType( |
144 | - 'user_create_result_array', |
|
145 | - 'complexType', |
|
146 | - 'array', |
|
147 | - '', |
|
148 | - 'SOAP-ENC:Array', |
|
149 | - array(), |
|
150 | - array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_create_result[]')), |
|
151 | - 'tns:user_create_result' |
|
144 | + 'user_create_result_array', |
|
145 | + 'complexType', |
|
146 | + 'array', |
|
147 | + '', |
|
148 | + 'SOAP-ENC:Array', |
|
149 | + array(), |
|
150 | + array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_create_result[]')), |
|
151 | + 'tns:user_create_result' |
|
152 | 152 | ); |
153 | 153 | |
154 | 154 | $s->register( |
155 | - 'WSUser.CreateUsers', |
|
156 | - array( |
|
157 | - 'secret_key' => 'xsd:string', |
|
158 | - 'users' => 'tns:user_create[]' |
|
159 | - ), |
|
160 | - array('return' => 'tns:user_create_result_array') |
|
155 | + 'WSUser.CreateUsers', |
|
156 | + array( |
|
157 | + 'secret_key' => 'xsd:string', |
|
158 | + 'users' => 'tns:user_create[]' |
|
159 | + ), |
|
160 | + array('return' => 'tns:user_create_result_array') |
|
161 | 161 | ); |
162 | 162 | |
163 | 163 | $s->register( |
164 | - 'WSUser.EditUser', |
|
165 | - array( |
|
166 | - 'secret_key' => 'xsd:string', |
|
167 | - 'user_id_field_name' => 'xsd:string', |
|
168 | - 'user_id_value' => 'xsd:string', |
|
169 | - 'firstname' => 'xsd:string', |
|
170 | - 'lastname' => 'xsd:string', |
|
171 | - 'status' => 'xsd:int', |
|
172 | - 'loginname' => 'xsd:string', |
|
173 | - 'password' => 'xsd:string', |
|
174 | - 'encrypt_method' => 'xsd:string', |
|
175 | - 'email' => 'xsd:string', |
|
176 | - 'language' => 'xsd:string', |
|
177 | - 'phone' => 'xsd:string', |
|
178 | - 'expiration_date' => 'xsd:string', |
|
179 | - 'extras' => 'tns:extra_field' |
|
180 | - ) |
|
164 | + 'WSUser.EditUser', |
|
165 | + array( |
|
166 | + 'secret_key' => 'xsd:string', |
|
167 | + 'user_id_field_name' => 'xsd:string', |
|
168 | + 'user_id_value' => 'xsd:string', |
|
169 | + 'firstname' => 'xsd:string', |
|
170 | + 'lastname' => 'xsd:string', |
|
171 | + 'status' => 'xsd:int', |
|
172 | + 'loginname' => 'xsd:string', |
|
173 | + 'password' => 'xsd:string', |
|
174 | + 'encrypt_method' => 'xsd:string', |
|
175 | + 'email' => 'xsd:string', |
|
176 | + 'language' => 'xsd:string', |
|
177 | + 'phone' => 'xsd:string', |
|
178 | + 'expiration_date' => 'xsd:string', |
|
179 | + 'extras' => 'tns:extra_field' |
|
180 | + ) |
|
181 | 181 | ); |
182 | 182 | |
183 | 183 | $s->wsdl->addComplexType( |
184 | - 'user_edit', |
|
185 | - 'complexType', |
|
186 | - 'struct', |
|
187 | - 'all', |
|
188 | - '', |
|
189 | - array( |
|
190 | - 'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'), |
|
191 | - 'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'), |
|
192 | - 'firstname' => array('name' => 'firstname', 'type' => 'xsd:string'), |
|
193 | - 'lastname' => array('name' => 'lastname', 'type' => 'xsd:string'), |
|
194 | - 'status' => array('name' => 'status', 'type' => 'xsd:int'), |
|
195 | - 'loginname' => array('name' => 'loginname', 'type' => 'xsd:string'), |
|
196 | - 'password' => array('name' => 'password', 'type' => 'xsd:string'), |
|
197 | - 'encrypt_method' => array('name' => 'encrypt_method', 'type' => 'xsd:string'), |
|
198 | - 'email' => array('name' => 'email', 'type' => 'xsd:string'), |
|
199 | - 'language' => array('name' => 'language', 'type' => 'xsd:string'), |
|
200 | - 'phone' => array('name' => 'phone', 'type' => 'xsd:string'), |
|
201 | - 'expiration_date' => array('name' => 'expiration_date', 'type' => 'xsd:string'), |
|
202 | - 'extras' => array('name' => 'extras', 'type' => 'tns:extra_field') |
|
203 | - ) |
|
184 | + 'user_edit', |
|
185 | + 'complexType', |
|
186 | + 'struct', |
|
187 | + 'all', |
|
188 | + '', |
|
189 | + array( |
|
190 | + 'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'), |
|
191 | + 'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'), |
|
192 | + 'firstname' => array('name' => 'firstname', 'type' => 'xsd:string'), |
|
193 | + 'lastname' => array('name' => 'lastname', 'type' => 'xsd:string'), |
|
194 | + 'status' => array('name' => 'status', 'type' => 'xsd:int'), |
|
195 | + 'loginname' => array('name' => 'loginname', 'type' => 'xsd:string'), |
|
196 | + 'password' => array('name' => 'password', 'type' => 'xsd:string'), |
|
197 | + 'encrypt_method' => array('name' => 'encrypt_method', 'type' => 'xsd:string'), |
|
198 | + 'email' => array('name' => 'email', 'type' => 'xsd:string'), |
|
199 | + 'language' => array('name' => 'language', 'type' => 'xsd:string'), |
|
200 | + 'phone' => array('name' => 'phone', 'type' => 'xsd:string'), |
|
201 | + 'expiration_date' => array('name' => 'expiration_date', 'type' => 'xsd:string'), |
|
202 | + 'extras' => array('name' => 'extras', 'type' => 'tns:extra_field') |
|
203 | + ) |
|
204 | 204 | ); |
205 | 205 | |
206 | 206 | $s->wsdl->addComplexType( |
207 | - 'user_edit_result', |
|
208 | - 'complexType', |
|
209 | - 'struct', |
|
210 | - 'all', |
|
211 | - '', |
|
212 | - array( |
|
213 | - 'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'), |
|
214 | - 'result' => array('name' => 'result', 'type' => 'tns:result') |
|
215 | - ) |
|
207 | + 'user_edit_result', |
|
208 | + 'complexType', |
|
209 | + 'struct', |
|
210 | + 'all', |
|
211 | + '', |
|
212 | + array( |
|
213 | + 'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'), |
|
214 | + 'result' => array('name' => 'result', 'type' => 'tns:result') |
|
215 | + ) |
|
216 | 216 | ); |
217 | 217 | |
218 | 218 | $s->wsdl->addComplexType( |
219 | - 'user_edit_result_array', |
|
220 | - 'complexType', |
|
221 | - 'array', |
|
222 | - '', |
|
223 | - 'SOAP-ENC:Array', |
|
224 | - array(), |
|
225 | - array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_edit_result[]')), |
|
226 | - 'tns:user_edit_result' |
|
219 | + 'user_edit_result_array', |
|
220 | + 'complexType', |
|
221 | + 'array', |
|
222 | + '', |
|
223 | + 'SOAP-ENC:Array', |
|
224 | + array(), |
|
225 | + array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_edit_result[]')), |
|
226 | + 'tns:user_edit_result' |
|
227 | 227 | ); |
228 | 228 | |
229 | 229 | $s->register( |
230 | - 'WSUser.EditUsers', |
|
231 | - array( |
|
232 | - 'secret_key' => 'xsd:string', |
|
233 | - 'users' => 'tns:user_edit[]' |
|
234 | - ), |
|
235 | - array('return' => 'tns:user_edit_result_array') |
|
230 | + 'WSUser.EditUsers', |
|
231 | + array( |
|
232 | + 'secret_key' => 'xsd:string', |
|
233 | + 'users' => 'tns:user_edit[]' |
|
234 | + ), |
|
235 | + array('return' => 'tns:user_edit_result_array') |
|
236 | 236 | ); |
@@ -55,7 +55,7 @@ |
||
55 | 55 | //$gradebook['name'] = $gradebook['name']; |
56 | 56 | //$gradebook_list[] = $gradebook; |
57 | 57 | } else { |
58 | - // $gradebook['name'] = $gradebook_list[$gradebook['parent_id']]['name'].' > '.$gradebook['name']; |
|
58 | + // $gradebook['name'] = $gradebook_list[$gradebook['parent_id']]['name'].' > '.$gradebook['name']; |
|
59 | 59 | //$gradebook_list[] = $gradebook; |
60 | 60 | } |
61 | 61 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | $return_skills = array(); |
42 | 42 | foreach ($skills as $skill) { |
43 | 43 | $skill['key'] = $skill['name']; |
44 | - $skill['value'] = $skill['id']; |
|
44 | + $skill['value'] = $skill['id']; |
|
45 | 45 | $return_skills[] = $skill; |
46 | 46 | } |
47 | 47 | echo json_encode($return_skills); |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | if (!empty($gradebooks)) { |
54 | 54 | foreach ($gradebooks as $gradebook) { |
55 | 55 | if ($gradebook['parent_id'] == 0 && !empty($gradebook['certif_min_score']) && !empty($gradebook['document_id'])) { |
56 | - $gradebook_list[] = $gradebook; |
|
56 | + $gradebook_list[] = $gradebook; |
|
57 | 57 | //$gradebook['name'] = $gradebook['name']; |
58 | 58 | //$gradebook_list[] = $gradebook; |
59 | 59 | } else { |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $return = array(); |
70 | 70 | foreach ($gradebooks as $item) { |
71 | 71 | $item['key'] = $item['name']; |
72 | - $item['value'] = $item['id']; |
|
72 | + $item['value'] = $item['id']; |
|
73 | 73 | $return[] = $item; |
74 | 74 | } |
75 | 75 | echo json_encode($return); |
@@ -94,13 +94,13 @@ discard block |
||
94 | 94 | } |
95 | 95 | break; |
96 | 96 | case 'get_skills_by_profile': |
97 | - $skill_rel_profile = new SkillRelProfile(); |
|
97 | + $skill_rel_profile = new SkillRelProfile(); |
|
98 | 98 | $profile_id = isset($_REQUEST['profile_id']) ? $_REQUEST['profile_id'] : null; |
99 | 99 | $skills = $skill_rel_profile->get_skills_by_profile($profile_id); |
100 | 100 | echo json_encode($skills); |
101 | 101 | break; |
102 | 102 | case 'get_saved_profiles': |
103 | - $skill_profile = new SkillProfile(); |
|
103 | + $skill_profile = new SkillProfile(); |
|
104 | 104 | $profiles = $skill_profile->get_all(); |
105 | 105 | Display::display_no_header(); |
106 | 106 | Display::$global_template->assign('profiles', $profiles); |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | $success = false; |
188 | 188 | } |
189 | 189 | |
190 | - $result = array ( |
|
190 | + $result = array( |
|
191 | 191 | 'success' => $success, |
192 | 192 | 'data' => $return |
193 | 193 | ); |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | $skills = $skill->get_direct_parents($id); |
199 | 199 | $return = array(); |
200 | 200 | foreach ($skills as $skill) { |
201 | - $return [$skill['data']['id']] = array ( |
|
201 | + $return [$skill['data']['id']] = array( |
|
202 | 202 | 'id' => $skill['data']['id'], |
203 | 203 | 'parent_id' => $skill['data']['parent_id'], |
204 | 204 | 'name' => $skill['data']['name'] |
@@ -207,8 +207,8 @@ discard block |
||
207 | 207 | echo json_encode($return); |
208 | 208 | break; |
209 | 209 | case 'profile_matches': |
210 | - $skill_rel_user = new SkillRelUser(); |
|
211 | - $skills = (!empty($_REQUEST['skill_id'])?$_REQUEST['skill_id']:array()); |
|
210 | + $skill_rel_user = new SkillRelUser(); |
|
211 | + $skills = (!empty($_REQUEST['skill_id']) ? $_REQUEST['skill_id'] : array()); |
|
212 | 212 | |
213 | 213 | $total_skills_to_search = $skills; |
214 | 214 | $users = $skill_rel_user->get_user_by_skills($skills); |
@@ -70,13 +70,13 @@ |
||
70 | 70 | <tr> |
71 | 71 | <td align="center"> |
72 | 72 | <?php |
73 | - echo Display::select( |
|
74 | - 'sessions[]', |
|
75 | - $sessionList, |
|
76 | - '', |
|
77 | - array('style'=>'width:100%', 'multiple'=>'multiple', 'id'=>'sessions', 'size'=>'15px'), |
|
78 | - false |
|
79 | - ); |
|
73 | + echo Display::select( |
|
74 | + 'sessions[]', |
|
75 | + $sessionList, |
|
76 | + '', |
|
77 | + array('style'=>'width:100%', 'multiple'=>'multiple', 'id'=>'sessions', 'size'=>'15px'), |
|
78 | + false |
|
79 | + ); |
|
80 | 80 | ?> |
81 | 81 | </td> |
82 | 82 | <td align="center"> |
@@ -13,12 +13,12 @@ |
||
13 | 13 | $this_section = SECTION_PLATFORM_ADMIN; |
14 | 14 | |
15 | 15 | // setting breadcrumbs |
16 | -$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList')); |
|
16 | +$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList')); |
|
17 | 17 | |
18 | 18 | // Setting the name of the tool |
19 | 19 | $tool_name = get_lang('SubscribeStudentsToSession'); |
20 | 20 | $add_type = 'multiple'; |
21 | -if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!='') { |
|
21 | +if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') { |
|
22 | 22 | $add_type = Security::remove_XSS($_REQUEST['add_type']); |
23 | 23 | } |
24 | 24 | $form_sent = 0; |
@@ -38,17 +38,17 @@ |
||
38 | 38 | $needle = Database::escape_string($needle); |
39 | 39 | // search courses where username or firstname or lastname begins likes $needle |
40 | 40 | $sql = 'SELECT code, title FROM '.$tbl_course.' u '. |
41 | - ' WHERE (title LIKE "'.$needle.'%" '. |
|
42 | - ' OR code LIKE "'.$needle.'%" '. |
|
43 | - ' ) '. |
|
44 | - ' ORDER BY title, code '. |
|
45 | - ' LIMIT 11'; |
|
41 | + ' WHERE (title LIKE "'.$needle.'%" '. |
|
42 | + ' OR code LIKE "'.$needle.'%" '. |
|
43 | + ' ) '. |
|
44 | + ' ORDER BY title, code '. |
|
45 | + ' LIMIT 11'; |
|
46 | 46 | $rs = Database::query($sql); |
47 | 47 | $i=0; |
48 | 48 | while ($course = Database :: fetch_array($rs)) { |
49 | 49 | $i++; |
50 | 50 | if ($i<=10) { |
51 | - $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />'; |
|
51 | + $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />'; |
|
52 | 52 | } else { |
53 | 53 | $return .= '...<br />'; |
54 | 54 | } |
@@ -44,17 +44,17 @@ |
||
44 | 44 | ' ORDER BY title, code '. |
45 | 45 | ' LIMIT 11'; |
46 | 46 | $rs = Database::query($sql); |
47 | - $i=0; |
|
47 | + $i = 0; |
|
48 | 48 | while ($course = Database :: fetch_array($rs)) { |
49 | 49 | $i++; |
50 | - if ($i<=10) { |
|
50 | + if ($i <= 10) { |
|
51 | 51 | $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />'; |
52 | 52 | } else { |
53 | 53 | $return .= '...<br />'; |
54 | 54 | } |
55 | 55 | } |
56 | 56 | } |
57 | - $xajax_response -> addAssign('ajax_list_courses','innerHTML',api_utf8_encode($return)); |
|
57 | + $xajax_response -> addAssign('ajax_list_courses', 'innerHTML', api_utf8_encode($return)); |
|
58 | 58 | |
59 | 59 | return $xajax_response; |
60 | 60 | } |
@@ -57,6 +57,7 @@ discard block |
||
57 | 57 | * Add a value to the indexed item |
58 | 58 | * @param string Key |
59 | 59 | * @param string Value |
60 | + * @param string $key |
|
60 | 61 | * @return void |
61 | 62 | */ |
62 | 63 | function addValue($key, $value) { |
@@ -109,6 +110,7 @@ discard block |
||
109 | 110 | |
110 | 111 | /** |
111 | 112 | * Let add tool id term |
113 | + * @param string $tool_id |
|
112 | 114 | */ |
113 | 115 | public function addToolId($tool_id) |
114 | 116 | { |
@@ -187,6 +187,7 @@ discard block |
||
187 | 187 | * Build the prefilter form. |
188 | 188 | * |
189 | 189 | * This type allow filter all other multiple select terms by one term in a dinamic way |
190 | + * @param string $prefilter_prefix |
|
190 | 191 | */ |
191 | 192 | function search_widget_prefilter_form($action, $show_thesaurus, $sf_terms, $op, $prefilter_prefix=NULL) { |
192 | 193 | $thesaurus_icon = Display::return_icon('thesaurus.gif', get_lang('SearchAdvancedOptions'), array('id'=>'thesaurus-icon')); |
@@ -277,6 +278,8 @@ discard block |
||
277 | 278 | |
278 | 279 | /** |
279 | 280 | * Show search form |
281 | + * @param string $action |
|
282 | + * @param boolean $show_thesaurus |
|
280 | 283 | */ |
281 | 284 | function display_search_form($action, $show_thesaurus, $sf_terms, $op) { |
282 | 285 | $type = (!empty($_REQUEST['type'])? htmlentities($_REQUEST['type']): 'normal'); |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | /** |
8 | 8 | * Code |
9 | 9 | */ |
10 | -require_once dirname(__FILE__) . '/IndexableChunk.class.php'; |
|
10 | +require_once dirname(__FILE__).'/IndexableChunk.class.php'; |
|
11 | 11 | require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php'; |
12 | 12 | |
13 | 13 | /** |
@@ -29,13 +29,13 @@ discard block |
||
29 | 29 | /** |
30 | 30 | * Get one term html select |
31 | 31 | */ |
32 | -function format_one_specific_field_select($prefix, $sf_term_array, $op, $extra_select_attr='size="7" class="sf-select-multiple"') { |
|
32 | +function format_one_specific_field_select($prefix, $sf_term_array, $op, $extra_select_attr = 'size="7" class="sf-select-multiple"') { |
|
33 | 33 | global $charset; |
34 | - $multiple_select = '<select '. $extra_select_attr .' title="'. $prefix .'" id="sf-'. $prefix .'" name="sf_'. $prefix .'[]">'; |
|
34 | + $multiple_select = '<select '.$extra_select_attr.' title="'.$prefix.'" id="sf-'.$prefix.'" name="sf_'.$prefix.'[]">'; |
|
35 | 35 | |
36 | 36 | $all_selected = ''; |
37 | - if (!empty($_REQUEST['sf_'. $prefix]) ) { |
|
38 | - if (in_array('__all__', $_REQUEST['sf_'. $prefix])) { |
|
37 | + if (!empty($_REQUEST['sf_'.$prefix])) { |
|
38 | + if (in_array('__all__', $_REQUEST['sf_'.$prefix])) { |
|
39 | 39 | $all_selected = 'selected="selected"'; |
40 | 40 | } |
41 | 41 | } |
@@ -44,17 +44,17 @@ discard block |
||
44 | 44 | } else if ($op == 'or') { |
45 | 45 | $all_selected_name = get_lang('Any'); |
46 | 46 | } |
47 | - $multiple_select .= '<option value="__all__" '. $all_selected .' >-- '. $all_selected_name .' --</option>'; |
|
47 | + $multiple_select .= '<option value="__all__" '.$all_selected.' >-- '.$all_selected_name.' --</option>'; |
|
48 | 48 | |
49 | 49 | foreach ($sf_term_array as $raw_term) { |
50 | 50 | $term = substr($raw_term, 1); |
51 | 51 | if (empty($term)) continue; |
52 | 52 | $html_term = htmlspecialchars($term, ENT_QUOTES, $charset); |
53 | 53 | $selected = ''; |
54 | - if (!empty($_REQUEST['sf_'.$prefix]) && is_array($_REQUEST['sf_'.$prefix]) && in_array($term,$_REQUEST['sf_'.$prefix])) { |
|
54 | + if (!empty($_REQUEST['sf_'.$prefix]) && is_array($_REQUEST['sf_'.$prefix]) && in_array($term, $_REQUEST['sf_'.$prefix])) { |
|
55 | 55 | $selected = 'selected="selected"'; |
56 | 56 | } |
57 | - $multiple_select .= '<option value="'. $html_term .'" '.$selected.'>'. $html_term .'</option>'; |
|
57 | + $multiple_select .= '<option value="'.$html_term.'" '.$selected.'>'.$html_term.'</option>'; |
|
58 | 58 | } |
59 | 59 | $multiple_select .= '</select>'; |
60 | 60 | return $multiple_select; |
@@ -63,15 +63,15 @@ discard block |
||
63 | 63 | /** |
64 | 64 | * Get terms html selects |
65 | 65 | */ |
66 | -function format_specific_fields_selects($sf_terms, $op, $prefilter_prefix='') { |
|
66 | +function format_specific_fields_selects($sf_terms, $op, $prefilter_prefix = '') { |
|
67 | 67 | // Process each prefix type term |
68 | 68 | $i = 0; |
69 | 69 | $max = count($sf_terms); |
70 | - $multiple_selects =''; |
|
70 | + $multiple_selects = ''; |
|
71 | 71 | foreach ($sf_terms as $prefix => $sf_term_array) { |
72 | 72 | if ($prefix == $prefilter_prefix) continue; |
73 | 73 | $multiple_select = ''; |
74 | - if ($i>0) { |
|
74 | + if ($i > 0) { |
|
75 | 75 | //print "+" image |
76 | 76 | $multiple_select .= '<td><img class="sf-select-splitter" src="../img/search-big-plus.gif" alt="plus-sign-decoration"/></td>'; |
77 | 77 | } |
@@ -89,9 +89,9 @@ discard block |
||
89 | 89 | |
90 | 90 | $sf_copy = $sf_term_array; |
91 | 91 | // get specific field name |
92 | - $sf_value = get_specific_field_list(array( 'code' => "'$prefix'" )); |
|
92 | + $sf_value = get_specific_field_list(array('code' => "'$prefix'")); |
|
93 | 93 | $sf_value = array_shift($sf_value); |
94 | - $multiple_select .= '<td><label class="sf-select-multiple-title" for="sf_'. $prefix .'[]">' . $sf_value['name'].'</label><br />'; |
|
94 | + $multiple_select .= '<td><label class="sf-select-multiple-title" for="sf_'.$prefix.'[]">'.$sf_value['name'].'</label><br />'; |
|
95 | 95 | $multiple_select .= format_one_specific_field_select($prefix, $sf_term_array, $op, 'multiple="multiple" size="7" class="sf-select-multiple"'); |
96 | 96 | $multiple_select .= '</td>'; |
97 | 97 | $multiple_selects .= $multiple_select; |
@@ -107,11 +107,11 @@ discard block |
||
107 | 107 | */ |
108 | 108 | function search_widget_normal_form($action, $show_thesaurus, $sf_terms, $op) { |
109 | 109 | $thesaurus_icon = Display::return_icon('thesaurus.gif', get_lang('SearchAdvancedOptions'), array('id'=>'thesaurus-icon')); |
110 | - $advanced_options = '<a id="tags-toggle" href="#">'. get_lang('SearchAdvancedOptions') .'</a>'; |
|
111 | - $display_thesaurus = ($show_thesaurus==true? 'block': 'none'); |
|
112 | - $help = '<h3>'. get_lang('SearchKeywordsHelpTitle') .'</h3>'. get_lang('SearchKeywordsHelpComment'); |
|
113 | - $mode = (!empty($_REQUEST['mode'])? htmlentities($_REQUEST['mode']): 'gallery'); |
|
114 | - $type = (!empty($_REQUEST['type'])? htmlentities($_REQUEST['type']): 'normal'); |
|
110 | + $advanced_options = '<a id="tags-toggle" href="#">'.get_lang('SearchAdvancedOptions').'</a>'; |
|
111 | + $display_thesaurus = ($show_thesaurus == true ? 'block' : 'none'); |
|
112 | + $help = '<h3>'.get_lang('SearchKeywordsHelpTitle').'</h3>'.get_lang('SearchKeywordsHelpComment'); |
|
113 | + $mode = (!empty($_REQUEST['mode']) ? htmlentities($_REQUEST['mode']) : 'gallery'); |
|
114 | + $type = (!empty($_REQUEST['type']) ? htmlentities($_REQUEST['type']) : 'normal'); |
|
115 | 115 | |
116 | 116 | /** |
117 | 117 | * POST avoid long urls, but we are using GET because |
@@ -119,36 +119,36 @@ discard block |
||
119 | 119 | * could not send a form in pagination |
120 | 120 | */ |
121 | 121 | |
122 | - if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) { |
|
123 | - $action='index.php'; |
|
122 | + if (isset($_GET['action']) && strcmp(trim($_GET['action']), 'search') === 0) { |
|
123 | + $action = 'index.php'; |
|
124 | 124 | } |
125 | 125 | $navigator_info = api_get_navigator(); |
126 | 126 | |
127 | - if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') { |
|
128 | - $submit_button1 = '<input type="submit" id="submit" value="'. get_lang('Search') .'" />'; |
|
129 | - $submit_button2 = '<input class="lower-submit" type="submit" value="'. get_lang('Search') .'" />'; |
|
130 | - $reset_button = '<input type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords') .'" />'; |
|
127 | + if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') { |
|
128 | + $submit_button1 = '<input type="submit" id="submit" value="'.get_lang('Search').'" />'; |
|
129 | + $submit_button2 = '<input class="lower-submit" type="submit" value="'.get_lang('Search').'" />'; |
|
130 | + $reset_button = '<input type="submit" id="tags-clean" value="'.get_lang('SearchResetKeywords').'" />'; |
|
131 | 131 | } else { |
132 | - $submit_button1 = '<button class="search" type="submit" id="submit" value="'. get_lang("Search") .'" /> '. get_lang('Search') .'</button>'; |
|
133 | - $submit_button2 = '<button class="search" type="submit" value="'. get_lang('Search') .'" />'. get_lang('Search') .'</button>'; |
|
134 | - $reset_button = '<button class="save" type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords') .'" />'. get_lang('SearchResetKeywords') .'</button> '; |
|
132 | + $submit_button1 = '<button class="search" type="submit" id="submit" value="'.get_lang("Search").'" /> '.get_lang('Search').'</button>'; |
|
133 | + $submit_button2 = '<button class="search" type="submit" value="'.get_lang('Search').'" />'.get_lang('Search').'</button>'; |
|
134 | + $reset_button = '<button class="save" type="submit" id="tags-clean" value="'.get_lang('SearchResetKeywords').'" />'.get_lang('SearchResetKeywords').'</button> '; |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | $query = isset($_REQUEST['query']) ? Security::remove_XSS($_REQUEST['query']) : null; |
138 | 138 | |
139 | - $form = '<form id="chamilo_search" action="'. $action .'" method="GET"> |
|
140 | - <input type="text" id="query" name="query" size="40" value="' . $query . '" /> |
|
141 | - <input type="hidden" name="mode" value="'. $mode .'"/> |
|
142 | - <input type="hidden" name="type" value="'. $type .'"/> |
|
139 | + $form = '<form id="chamilo_search" action="'.$action.'" method="GET"> |
|
140 | + <input type="text" id="query" name="query" size="40" value="' . $query.'" /> |
|
141 | + <input type="hidden" name="mode" value="'. $mode.'"/> |
|
142 | + <input type="hidden" name="type" value="'. $type.'"/> |
|
143 | 143 | <input type="hidden" name="tablename_page_nr" value="1" /> |
144 | 144 | '.$submit_button1.' |
145 | 145 | <br /><br />'; |
146 | 146 | $list = get_specific_field_list(); |
147 | 147 | |
148 | - if(!empty($list)) { |
|
149 | - $form .= '<span class="search-links-box">'. $advanced_options .' </span> |
|
150 | - <div id="tags" class="tags" style="display:'. $display_thesaurus .';"> |
|
151 | - <div class="search-help-box">'. $help .'</div> |
|
148 | + if (!empty($list)) { |
|
149 | + $form .= '<span class="search-links-box">'.$advanced_options.' </span> |
|
150 | + <div id="tags" class="tags" style="display:'. $display_thesaurus.';"> |
|
151 | + <div class="search-help-box">'. $help.'</div> |
|
152 | 152 | <table> |
153 | 153 | <tr>'; |
154 | 154 | $form .= format_specific_fields_selects($sf_terms, $op); |
@@ -162,9 +162,9 @@ discard block |
||
162 | 162 | $form .= '</tr> |
163 | 163 | <tr> |
164 | 164 | <td id="operator-select"> |
165 | - '. get_lang('SearchCombineSearchWith') .':<br /> |
|
166 | - <input type="radio" class="search-operator" name="operator" value="or" '. $or_checked .'>'. api_strtoupper(get_lang('Or')) .'</input> |
|
167 | - <input type="radio" class="search-operator" name="operator" value="and" '. $and_checked .'>'. api_strtoupper(get_lang('And')) .'</input> |
|
165 | + '. get_lang('SearchCombineSearchWith').':<br /> |
|
166 | + <input type="radio" class="search-operator" name="operator" value="or" '. $or_checked.'>'.api_strtoupper(get_lang('Or')).'</input> |
|
167 | + <input type="radio" class="search-operator" name="operator" value="and" '. $and_checked.'>'.api_strtoupper(get_lang('And')).'</input> |
|
168 | 168 | </td> |
169 | 169 | <td></td> |
170 | 170 | <td> |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | </table> |
177 | 177 | </div>'; |
178 | 178 | } |
179 | - $form .='</form> |
|
179 | + $form .= '</form> |
|
180 | 180 | <br style="clear: both;"/>'; |
181 | 181 | return $form; |
182 | 182 | } |
@@ -186,36 +186,36 @@ discard block |
||
186 | 186 | * |
187 | 187 | * This type allow filter all other multiple select terms by one term in a dinamic way |
188 | 188 | */ |
189 | -function search_widget_prefilter_form($action, $show_thesaurus, $sf_terms, $op, $prefilter_prefix=NULL) { |
|
189 | +function search_widget_prefilter_form($action, $show_thesaurus, $sf_terms, $op, $prefilter_prefix = NULL) { |
|
190 | 190 | $thesaurus_icon = Display::return_icon('thesaurus.gif', get_lang('SearchAdvancedOptions'), array('id'=>'thesaurus-icon')); |
191 | - $advanced_options = '<a id="tags-toggle" href="#">'. get_lang('SearchAdvancedOptions') .'</a>'; |
|
192 | - $display_thesaurus = ($show_thesaurus==true? 'block': 'none'); |
|
193 | - $help = '<h3>'. get_lang('SearchKeywordsHelpTitle') .'</h3>'. get_lang('SearchKeywordsHelpComment'); |
|
194 | - $mode = (!empty($_REQUEST['mode'])? htmlentities($_REQUEST['mode']): 'gallery'); |
|
195 | - $type = (!empty($_REQUEST['type'])? htmlentities($_REQUEST['type']): 'normal'); |
|
191 | + $advanced_options = '<a id="tags-toggle" href="#">'.get_lang('SearchAdvancedOptions').'</a>'; |
|
192 | + $display_thesaurus = ($show_thesaurus == true ? 'block' : 'none'); |
|
193 | + $help = '<h3>'.get_lang('SearchKeywordsHelpTitle').'</h3>'.get_lang('SearchKeywordsHelpComment'); |
|
194 | + $mode = (!empty($_REQUEST['mode']) ? htmlentities($_REQUEST['mode']) : 'gallery'); |
|
195 | + $type = (!empty($_REQUEST['type']) ? htmlentities($_REQUEST['type']) : 'normal'); |
|
196 | 196 | |
197 | 197 | /** |
198 | 198 | * POST avoid long urls, but we are using GET because |
199 | 199 | * SortableTableFromArray pagination is done with simple links, so now we |
200 | 200 | * could not send a form in pagination |
201 | 201 | */ |
202 | - if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) { |
|
203 | - $action='index.php'; |
|
202 | + if (isset($_GET['action']) && strcmp(trim($_GET['action']), 'search') === 0) { |
|
203 | + $action = 'index.php'; |
|
204 | 204 | } |
205 | 205 | |
206 | 206 | $form = ' |
207 | - <form id="chamilo_search" action="'. $action .'" method="GET"> |
|
207 | + <form id="chamilo_search" action="'. $action.'" method="GET"> |
|
208 | 208 | <input type="text" id="query" name="query" size="40" /> |
209 | - <input type="hidden" name="mode" value="'. $mode .'"/> |
|
210 | - <input type="hidden" name="type" value="'. $type .'"/> |
|
209 | + <input type="hidden" name="mode" value="'. $mode.'"/> |
|
210 | + <input type="hidden" name="type" value="'. $type.'"/> |
|
211 | 211 | <input type="hidden" name="tablename_page_nr" value="1" /> |
212 | - <input type="submit" id="submit" value="'. get_lang("Search") .'" /> |
|
212 | + <input type="submit" id="submit" value="'. get_lang("Search").'" /> |
|
213 | 213 | <br /><br />'; |
214 | 214 | $list = get_specific_field_list(); |
215 | - if(!empty($list)) { |
|
216 | - $form .=' <span class="search-links-box">'. $thesaurus_icon . $advanced_options .' </span> |
|
217 | - <div id="tags" class="tags" style="display:'. $display_thesaurus .';"> |
|
218 | - <div class="search-help-box">'. $help .'</div> |
|
215 | + if (!empty($list)) { |
|
216 | + $form .= ' <span class="search-links-box">'.$thesaurus_icon.$advanced_options.' </span> |
|
217 | + <div id="tags" class="tags" style="display:'. $display_thesaurus.';"> |
|
218 | + <div class="search-help-box">'. $help.'</div> |
|
219 | 219 | <table> |
220 | 220 | <tr>'; |
221 | 221 | if (!is_null($prefilter_prefix)) { |
@@ -230,9 +230,9 @@ discard block |
||
230 | 230 | $sf_term_array = $temp; |
231 | 231 | |
232 | 232 | // get specific field name |
233 | - $sf_value = get_specific_field_list(array( 'code' => "'$prefilter_prefix'" )); |
|
233 | + $sf_value = get_specific_field_list(array('code' => "'$prefilter_prefix'")); |
|
234 | 234 | $sf_value = array_shift($sf_value); |
235 | - $form .= '<label class="sf-select-multiple-title" for="sf_'. $prefix .'[]">'.$icons_for_search_terms[$prefix].' '.$sf_value['name'].'</label><br />'; |
|
235 | + $form .= '<label class="sf-select-multiple-title" for="sf_'.$prefix.'[]">'.$icons_for_search_terms[$prefix].' '.$sf_value['name'].'</label><br />'; |
|
236 | 236 | |
237 | 237 | $form .= format_one_specific_field_select($prefilter_prefix, $sf_term_array, $op, 'id="prefilter"'); |
238 | 238 | $form .= format_specific_fields_selects($sf_terms, $op, $prefilter_prefix); |
@@ -252,15 +252,15 @@ discard block |
||
252 | 252 | </tr> |
253 | 253 | <tr> |
254 | 254 | <td id="operator-select"> |
255 | - '. get_lang('SearchCombineSearchWith') .':<br /> |
|
256 | - <input type="radio" class="search-operator" name="operator" value="or" '. $or_checked .'>'. api_strtoupper(get_lang('Or')) .'</input> |
|
257 | - <input type="radio" class="search-operator" name="operator" value="and" '. $and_checked .'>'. api_strtoupper(get_lang('And')) .'</input> |
|
255 | + '. get_lang('SearchCombineSearchWith').':<br /> |
|
256 | + <input type="radio" class="search-operator" name="operator" value="or" '. $or_checked.'>'.api_strtoupper(get_lang('Or')).'</input> |
|
257 | + <input type="radio" class="search-operator" name="operator" value="and" '. $and_checked.'>'.api_strtoupper(get_lang('And')).'</input> |
|
258 | 258 | </td> |
259 | 259 | <td></td> |
260 | 260 | <td> |
261 | 261 | <br /> |
262 | - <input class="lower-submit" type="submit" value="'. get_lang('Search') .'" /> |
|
263 | - <input type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords') .'" /> |
|
262 | + <input class="lower-submit" type="submit" value="'. get_lang('Search').'" /> |
|
263 | + <input type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords').'" /> |
|
264 | 264 | </td> |
265 | 265 | </tr> |
266 | 266 | </table> |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | * Show search form |
278 | 278 | */ |
279 | 279 | function display_search_form($action, $show_thesaurus, $sf_terms, $op) { |
280 | - $type = (!empty($_REQUEST['type'])? htmlentities($_REQUEST['type']): 'normal'); |
|
280 | + $type = (!empty($_REQUEST['type']) ? htmlentities($_REQUEST['type']) : 'normal'); |
|
281 | 281 | |
282 | 282 | switch ($type) { |
283 | 283 | case 'prefilter': |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | * @param string $action Just in case your action is not |
305 | 305 | * index.php |
306 | 306 | */ |
307 | -function search_widget_show($action='index.php') |
|
307 | +function search_widget_show($action = 'index.php') |
|
308 | 308 | { |
309 | 309 | require_once api_get_path(LIBRARY_PATH).'search/ChamiloQuery.php'; |
310 | 310 | // TODO: load images dinamically when they're avalaible from specific field ui to add |
@@ -317,14 +317,14 @@ discard block |
||
317 | 317 | if (($cid = api_get_course_id()) != -1) { // with cid |
318 | 318 | |
319 | 319 | // get search engine terms |
320 | - $course_filter = chamilo_get_boolean_query(XAPIAN_PREFIX_COURSEID . $cid); |
|
320 | + $course_filter = chamilo_get_boolean_query(XAPIAN_PREFIX_COURSEID.$cid); |
|
321 | 321 | $dkterms = chamilo_query_simple_query('', 0, 1000, array($course_filter)); |
322 | 322 | |
323 | 323 | //prepare specific fields names (and also get possible URL param names) |
324 | 324 | foreach ($specific_fields as $specific_field) { |
325 | 325 | $temp = array(); |
326 | - if (is_array($dkterms) && count($dkterms)>0) { |
|
327 | - foreach($dkterms[1] as $obj) { |
|
326 | + if (is_array($dkterms) && count($dkterms) > 0) { |
|
327 | + foreach ($dkterms[1] as $obj) { |
|
328 | 328 | $temp = array_merge($obj['sf-'.$specific_field['code']], $temp); |
329 | 329 | } |
330 | 330 | } |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | } |
353 | 353 | |
354 | 354 | $op = 'or'; |
355 | - if (!empty($_REQUEST['operator']) && in_array($op,array('or','and'))) { |
|
355 | + if (!empty($_REQUEST['operator']) && in_array($op, array('or', 'and'))) { |
|
356 | 356 | $op = $_REQUEST['operator']; |
357 | 357 | } |
358 | 358 |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | * Get one term html select |
31 | 31 | */ |
32 | 32 | function format_one_specific_field_select($prefix, $sf_term_array, $op, $extra_select_attr='size="7" class="sf-select-multiple"') { |
33 | - global $charset; |
|
33 | + global $charset; |
|
34 | 34 | $multiple_select = '<select '. $extra_select_attr .' title="'. $prefix .'" id="sf-'. $prefix .'" name="sf_'. $prefix .'[]">'; |
35 | 35 | |
36 | 36 | $all_selected = ''; |
@@ -119,20 +119,20 @@ discard block |
||
119 | 119 | * could not send a form in pagination |
120 | 120 | */ |
121 | 121 | |
122 | - if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) { |
|
123 | - $action='index.php'; |
|
124 | - } |
|
125 | - $navigator_info = api_get_navigator(); |
|
122 | + if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) { |
|
123 | + $action='index.php'; |
|
124 | + } |
|
125 | + $navigator_info = api_get_navigator(); |
|
126 | 126 | |
127 | - if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') { |
|
128 | - $submit_button1 = '<input type="submit" id="submit" value="'. get_lang('Search') .'" />'; |
|
129 | - $submit_button2 = '<input class="lower-submit" type="submit" value="'. get_lang('Search') .'" />'; |
|
127 | + if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') { |
|
128 | + $submit_button1 = '<input type="submit" id="submit" value="'. get_lang('Search') .'" />'; |
|
129 | + $submit_button2 = '<input class="lower-submit" type="submit" value="'. get_lang('Search') .'" />'; |
|
130 | 130 | $reset_button = '<input type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords') .'" />'; |
131 | - } else { |
|
132 | - $submit_button1 = '<button class="search" type="submit" id="submit" value="'. get_lang("Search") .'" /> '. get_lang('Search') .'</button>'; |
|
133 | - $submit_button2 = '<button class="search" type="submit" value="'. get_lang('Search') .'" />'. get_lang('Search') .'</button>'; |
|
131 | + } else { |
|
132 | + $submit_button1 = '<button class="search" type="submit" id="submit" value="'. get_lang("Search") .'" /> '. get_lang('Search') .'</button>'; |
|
133 | + $submit_button2 = '<button class="search" type="submit" value="'. get_lang('Search') .'" />'. get_lang('Search') .'</button>'; |
|
134 | 134 | $reset_button = '<button class="save" type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords') .'" />'. get_lang('SearchResetKeywords') .'</button> '; |
135 | - } |
|
135 | + } |
|
136 | 136 | |
137 | 137 | $query = isset($_REQUEST['query']) ? Security::remove_XSS($_REQUEST['query']) : null; |
138 | 138 | |
@@ -199,9 +199,9 @@ discard block |
||
199 | 199 | * SortableTableFromArray pagination is done with simple links, so now we |
200 | 200 | * could not send a form in pagination |
201 | 201 | */ |
202 | - if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) { |
|
203 | - $action='index.php'; |
|
204 | - } |
|
202 | + if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) { |
|
203 | + $action='index.php'; |
|
204 | + } |
|
205 | 205 | |
206 | 206 | $form = ' |
207 | 207 | <form id="chamilo_search" action="'. $action .'" method="GET"> |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | </table> |
267 | 267 | </div>'; |
268 | 268 | } |
269 | - $form .= ' |
|
269 | + $form .= ' |
|
270 | 270 | </form> |
271 | 271 | <br style="clear: both;"/>'; |
272 | 272 | |
@@ -324,10 +324,10 @@ discard block |
||
324 | 324 | foreach ($specific_fields as $specific_field) { |
325 | 325 | $temp = array(); |
326 | 326 | if (is_array($dkterms) && count($dkterms)>0) { |
327 | - foreach($dkterms[1] as $obj) { |
|
328 | - $temp = array_merge($obj['sf-'.$specific_field['code']], $temp); |
|
329 | - } |
|
330 | - } |
|
327 | + foreach($dkterms[1] as $obj) { |
|
328 | + $temp = array_merge($obj['sf-'.$specific_field['code']], $temp); |
|
329 | + } |
|
330 | + } |
|
331 | 331 | $sf_terms[$specific_field['code']] = $temp; |
332 | 332 | $url_params[] = 'sf_'.$specific_field['code']; |
333 | 333 | unset($temp); |
@@ -342,7 +342,7 @@ discard block |
||
342 | 342 | } |
343 | 343 | echo '<h2>'.get_lang('Search').'</h2>'; |
344 | 344 | |
345 | - // Tool introduction |
|
345 | + // Tool introduction |
|
346 | 346 | // TODO: Settings for the online editor to be checked (insert an image for example). Probably this is a special case here. |
347 | 347 | if (api_get_course_id() !== -1) |
348 | 348 | if (!empty($groupId)) { |
@@ -48,7 +48,9 @@ discard block |
||
48 | 48 | |
49 | 49 | foreach ($sf_term_array as $raw_term) { |
50 | 50 | $term = substr($raw_term, 1); |
51 | - if (empty($term)) continue; |
|
51 | + if (empty($term)) { |
|
52 | + continue; |
|
53 | + } |
|
52 | 54 | $html_term = htmlspecialchars($term, ENT_QUOTES, $charset); |
53 | 55 | $selected = ''; |
54 | 56 | if (!empty($_REQUEST['sf_'.$prefix]) && is_array($_REQUEST['sf_'.$prefix]) && in_array($term,$_REQUEST['sf_'.$prefix])) { |
@@ -69,7 +71,9 @@ discard block |
||
69 | 71 | $max = count($sf_terms); |
70 | 72 | $multiple_selects =''; |
71 | 73 | foreach ($sf_terms as $prefix => $sf_term_array) { |
72 | - if ($prefix == $prefilter_prefix) continue; |
|
74 | + if ($prefix == $prefilter_prefix) { |
|
75 | + continue; |
|
76 | + } |
|
73 | 77 | $multiple_select = ''; |
74 | 78 | if ($i>0) { |
75 | 79 | //print "+" image |
@@ -344,9 +348,10 @@ discard block |
||
344 | 348 | |
345 | 349 | // Tool introduction |
346 | 350 | // TODO: Settings for the online editor to be checked (insert an image for example). Probably this is a special case here. |
347 | - if (api_get_course_id() !== -1) |
|
348 | - if (!empty($groupId)) { |
|
351 | + if (api_get_course_id() !== -1) { |
|
352 | + if (!empty($groupId)) { |
|
349 | 353 | Display::display_introduction_section(TOOL_SEARCH.$groupId); |
354 | + } |
|
350 | 355 | } else { |
351 | 356 | Display::display_introduction_section(TOOL_SEARCH); |
352 | 357 | } |
@@ -368,7 +373,9 @@ discard block |
||
368 | 373 | break; |
369 | 374 | } |
370 | 375 | } |
371 | - if ($thesaurus_decided) break; |
|
376 | + if ($thesaurus_decided) { |
|
377 | + break; |
|
378 | + } |
|
372 | 379 | } |
373 | 380 | } |
374 | 381 |
@@ -392,7 +392,7 @@ discard block |
||
392 | 392 | } |
393 | 393 | |
394 | 394 | /** |
395 | - * @return ArrayCollection |
|
395 | + * @return CTool[] |
|
396 | 396 | */ |
397 | 397 | public function getTools() |
398 | 398 | { |
@@ -427,7 +427,7 @@ discard block |
||
427 | 427 | } |
428 | 428 | |
429 | 429 | /** |
430 | - * @param $urls |
|
430 | + * @param ArrayCollection $urls |
|
431 | 431 | */ |
432 | 432 | public function setUrls($urls) |
433 | 433 | { |
@@ -1244,7 +1244,7 @@ discard block |
||
1244 | 1244 | } |
1245 | 1245 | |
1246 | 1246 | /** |
1247 | - * @return array |
|
1247 | + * @return string[] |
|
1248 | 1248 | */ |
1249 | 1249 | public static function getStatusList() |
1250 | 1250 | { |
@@ -1191,7 +1191,7 @@ discard block |
||
1191 | 1191 | */ |
1192 | 1192 | public function hasPicture() |
1193 | 1193 | { |
1194 | - return file_exists(api_get_path(SYS_COURSE_PATH) . $this->directory . '/course-pic85x85.png'); |
|
1194 | + return file_exists(api_get_path(SYS_COURSE_PATH).$this->directory.'/course-pic85x85.png'); |
|
1195 | 1195 | } |
1196 | 1196 | |
1197 | 1197 | /** |
@@ -1206,9 +1206,9 @@ discard block |
||
1206 | 1206 | } |
1207 | 1207 | |
1208 | 1208 | if ($fullSize) { |
1209 | - return api_get_path(WEB_COURSE_PATH) . $this->directory . '/course-pic.png'; |
|
1209 | + return api_get_path(WEB_COURSE_PATH).$this->directory.'/course-pic.png'; |
|
1210 | 1210 | } |
1211 | 1211 | |
1212 | - return api_get_path(WEB_COURSE_PATH) . $this->directory . '/course-pic85x85.png'; |
|
1212 | + return api_get_path(WEB_COURSE_PATH).$this->directory.'/course-pic85x85.png'; |
|
1213 | 1213 | } |
1214 | 1214 | } |