@@ -138,6 +138,9 @@ |
||
138 | 138 | $this->test_result['global'] = max($this->test_result['global'],$level); |
139 | 139 | } |
140 | 140 | |
141 | + /** |
|
142 | + * @param string $s |
|
143 | + */ |
|
141 | 144 | private function get_exec_path($s) { |
142 | 145 | $the_path = ""; |
143 | 146 | $exec_is = "UNDEFINED"; |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | * The function's single parameter $option_name is optional - if specified, it only returns the attributes of the given type. |
125 | 125 | * Otherwise, all known attributes are returned. |
126 | 126 | * |
127 | - * @param string $option_name name of the option whose values are to be returned |
|
127 | + * @param integer $option_name name of the option whose values are to be returned |
|
128 | 128 | * @return array of attributes |
129 | 129 | */ |
130 | 130 | public function getAttributes($option_name = 0) { |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | * user is a federation administrator of *any* federation. When given a parameter (ISO shortname of federation), it checks |
195 | 195 | * if the user administers this particular federation. |
196 | 196 | * |
197 | - * @param string $federation optional: federation to be checked |
|
197 | + * @param integer $federation optional: federation to be checked |
|
198 | 198 | * @return boolean TRUE if the user is federation admin, FALSE if not |
199 | 199 | */ |
200 | 200 | public function isFederationAdmin($federation = 0) { |
@@ -226,6 +226,7 @@ discard block |
||
226 | 226 | /** |
227 | 227 | * This function tests if the current user is an ovner of a given IdP |
228 | 228 | * |
229 | + * @param integer $idp |
|
229 | 230 | * @return boolean TRUE if the user is an owner, FALSE if not |
230 | 231 | */ |
231 | 232 | public function isIdPOwner($idp) { |
@@ -236,6 +237,9 @@ discard block |
||
236 | 237 | return FALSE; |
237 | 238 | } |
238 | 239 | |
240 | + /** |
|
241 | + * @param string $content |
|
242 | + */ |
|
239 | 243 | public function sendMailToUser($subject, $content) { |
240 | 244 | // use PHPMailer to send the mail |
241 | 245 | $mail = new PHPMailer(); |
@@ -260,7 +260,6 @@ discard block |
||
260 | 260 | /** |
261 | 261 | * Return the list of IdPs in a given country |
262 | 262 | * |
263 | - * @param int $idp_id the IdP identifier |
|
264 | 263 | * @return string JSON encoded data |
265 | 264 | */ |
266 | 265 | |
@@ -301,7 +300,6 @@ discard block |
||
301 | 300 | /** |
302 | 301 | * Return the list of IdPs in a given country ordered with respect to the user location |
303 | 302 | * |
304 | - * @param int $idp_id the IdP identifier |
|
305 | 303 | * @return string JSON encoded data |
306 | 304 | */ |
307 | 305 |
@@ -211,10 +211,9 @@ discard block |
||
211 | 211 | * |
212 | 212 | * @param boolean $by_fedadmin is the invitation token created for a federation admin or from an existing inst admin |
213 | 213 | * @param type $for identifier (typically email address) for which the invitation is created |
214 | - * @param mixed $inst either an instance of the IdP class (for existing institutions to invite new admins) or a string (new institution - this is the inst name then) |
|
215 | - * @param string $external_id if the IdP to be created is related to an external DB entity, this parameter contains that ID |
|
216 | - * @param type $country if the institution is new (i.e. $inst is a string) this parameter needs to specify the federation of the new inst |
|
217 | - * @return mixed The function returns either the token (as string) or FALSE if something went wrong |
|
214 | + * @param integer $external_id if the IdP to be created is related to an external DB entity, this parameter contains that ID |
|
215 | + * @param integer $country if the institution is new (i.e. $inst is a string) this parameter needs to specify the federation of the new inst |
|
216 | + * @return string|false The function returns either the token (as string) or FALSE if something went wrong |
|
218 | 217 | */ |
219 | 218 | public function createToken($by_fedadmin, $for, $inst_identifier, $external_id = 0, $country = 0) { |
220 | 219 | $for = DBConnection::escape_value(UserManagement::$DB_TYPE, $for); |
@@ -245,7 +244,7 @@ discard block |
||
245 | 244 | /** |
246 | 245 | * Retrieves all pending invitations for an institution or for a federation. |
247 | 246 | * |
248 | - * @param type $idp_identifier the identifier of the institution. If not set, returns invitations for not-yet-created insts |
|
247 | + * @param integer $idp_identifier the identifier of the institution. If not set, returns invitations for not-yet-created insts |
|
249 | 248 | * @return if idp_identifier is set: an array of strings (mail addresses); otherwise an array of tuples (country;name;mail) |
250 | 249 | */ |
251 | 250 | public function listPendingInvitations($idp_identifier = 0) { |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | /** transform PEM formed certificate to DER format |
29 | 29 | * |
30 | 30 | * @param mixed $pem_data blob of data, which is hopefully a PEM certificate |
31 | - * @return the DER representation of the certificate |
|
31 | + * @return string DER representation of the certificate |
|
32 | 32 | * |
33 | 33 | * @author http://php.net/manual/en/ref.openssl.php (comment from 29-Mar-2007) |
34 | 34 | */ |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | * returns an array containing the PEM format of the certificate (s) |
138 | 138 | * if the file contains multiple certificates it gets split into components |
139 | 139 | * |
140 | - * @param blob $cadata certificate in ether PEM or DER format |
|
140 | + * @param string $cadata certificate in ether PEM or DER format |
|
141 | 141 | * @return array |
142 | 142 | */ |
143 | 143 |
@@ -78,9 +78,6 @@ |
||
78 | 78 | * It is CRUTCIAL that the constructor sets $this->supportedEapMethods to an array of methods |
79 | 79 | * available for the particular device. |
80 | 80 | * {@source} |
81 | - * @param string $device a pointer to a device module, which must |
|
82 | - * be an index of one of the devices defined in the {@link Devices} |
|
83 | - * array in {@link devices.php}. |
|
84 | 81 | * @final not to be redefined |
85 | 82 | */ |
86 | 83 | final public function __construct() { |
@@ -350,6 +350,9 @@ |
||
350 | 350 | |
351 | 351 | /** |
352 | 352 | * produce PEAP and TLS configuration files for Vista and Windows 7 |
353 | + * @param string $auth |
|
354 | + * @param string $encryption |
|
355 | + * @param integer $i |
|
353 | 356 | */ |
354 | 357 | private function writeWLANprofile($wlan_profile_name,$ssid,$auth,$encryption,$eap_config,$i) { |
355 | 358 | $profile_file_contents = '<?xml version="1.0"?> |
@@ -308,6 +308,9 @@ |
||
308 | 308 | |
309 | 309 | /** |
310 | 310 | * produce PEAP, TLS and TTLS configuration files for Windows 8 |
311 | + * @param string $auth |
|
312 | + * @param string $encryption |
|
313 | + * @param integer $i |
|
311 | 314 | */ |
312 | 315 | private function writeWLANprofile($wlan_profile_name,$ssid,$auth,$encryption,$eap_config,$i) { |
313 | 316 | $profile_file_contents = '<?xml version="1.0"?> |
@@ -21,6 +21,9 @@ |
||
21 | 21 | echo preg_replace('/"/','$\"',$in); |
22 | 22 | } |
23 | 23 | |
24 | +/** |
|
25 | + * @return string |
|
26 | + */ |
|
24 | 27 | function sprint_nsi($in) { |
25 | 28 | return preg_replace('/"/','$\"',$in); |
26 | 29 | } |