@@ -52,6 +52,9 @@ |
||
52 | 52 | */ |
53 | 53 | const PRODUCTNAME = "Managed IdP"; |
54 | 54 | |
55 | + /** |
|
56 | + * @param integer $length |
|
57 | + */ |
|
55 | 58 | public static function random_str( |
56 | 59 | $length, $keyspace = '23456789abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' |
57 | 60 | ) { |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | |
30 | 30 | /** |
31 | 31 | * |
32 | - * @return number |
|
32 | + * @return integer |
|
33 | 33 | */ |
34 | 34 | public function size(){ |
35 | 35 | return count($this->rows); |
@@ -53,7 +53,6 @@ discard block |
||
53 | 53 | |
54 | 54 | /** |
55 | 55 | * |
56 | - * @param array $row |
|
57 | 56 | */ |
58 | 57 | public function addRowArray($cells){ |
59 | 58 | $this->addRow(new Row($cells)); |
@@ -15,7 +15,7 @@ |
||
15 | 15 | * @param unknown $input |
16 | 16 | * @param unknown $owner |
17 | 17 | * @throws Exception |
18 | - * @return mixed |
|
18 | + * @return MockInstitution |
|
19 | 19 | */ |
20 | 20 | private function valid_IdP($input, $owner){ |
21 | 21 | if ($input == 1){ |
@@ -97,14 +97,14 @@ |
||
97 | 97 | case "SUCCESS": |
98 | 98 | $cryptText = ""; |
99 | 99 | switch ($_GET['transportsecurity']) { |
100 | - case "ENCRYPTED": |
|
101 | - $cryptText = _("and <b>encrypted</b> to the mail domain"); |
|
102 | - break; |
|
103 | - case "CLEAR": |
|
104 | - $cryptText = _("but <b>in clear text</b> to the mail domain"); |
|
105 | - break; |
|
106 | - default: |
|
107 | - throw new Exception("Error: unknown encryption status of invitation!?!"); |
|
100 | + case "ENCRYPTED": |
|
101 | + $cryptText = _("and <b>encrypted</b> to the mail domain"); |
|
102 | + break; |
|
103 | + case "CLEAR": |
|
104 | + $cryptText = _("but <b>in clear text</b> to the mail domain"); |
|
105 | + break; |
|
106 | + default: |
|
107 | + throw new Exception("Error: unknown encryption status of invitation!?!"); |
|
108 | 108 | } |
109 | 109 | echo $uiElements->boxRemark(sprintf(_("The invitation email was sent successfully %s."), $cryptText), _("The invitation email was sent.")); |
110 | 110 | break; |
@@ -478,6 +478,9 @@ discard block |
||
478 | 478 | return $cmdline; |
479 | 479 | } |
480 | 480 | |
481 | + /** |
|
482 | + * @param string $tmpDir |
|
483 | + */ |
|
481 | 484 | private function thoroughChainChecks(&$testresults, &$intermOdditiesCAT, $tmpDir, $servercert, $eapIntermediates, $eapIntermediateCRLs) { |
482 | 485 | |
483 | 486 | // collect CA certificates, both the incoming EAP chain and from CAT config |
@@ -636,6 +639,14 @@ discard block |
||
636 | 639 | } |
637 | 640 | } |
638 | 641 | |
642 | + /** |
|
643 | + * @param string $tmpDir |
|
644 | + * @param integer $probeindex |
|
645 | + * @param string $innerUser |
|
646 | + * @param string $password |
|
647 | + * @param boolean $opnameCheck |
|
648 | + * @param boolean $frag |
|
649 | + */ |
|
639 | 650 | private function executeEapolTest($tmpDir, $probeindex, $eaptype, $innerUser, $password, $opnameCheck, $frag) { |
640 | 651 | $finalInner = $innerUser; |
641 | 652 | $finalOuter = $this->outerUsernameForChecks; |
@@ -120,6 +120,9 @@ |
||
120 | 120 | return Telepath::STATUS_GOOD; |
121 | 121 | } |
122 | 122 | |
123 | + /** |
|
124 | + * @param string $homeFlr |
|
125 | + */ |
|
123 | 126 | private function checkNROFlow($visitedFlr, $homeFlr) { |
124 | 127 | // TODO: this is a stub, need eduroam OT API to query the current server status |
125 | 128 | // APIQueryNRODirect($visitedFlr, $homeFlr); |
@@ -53,7 +53,7 @@ |
||
53 | 53 | |
54 | 54 | /** |
55 | 55 | * |
56 | - * @param $silverbulletUser SilverbulletUser |
|
56 | + * @param SilverbulletUser|null $silverbulletUser SilverbulletUser |
|
57 | 57 | */ |
58 | 58 | public function __construct($silverbulletUser) { |
59 | 59 | parent::__construct(self::TABLE, self::TYPE_INST); |
@@ -37,14 +37,14 @@ |
||
37 | 37 | } |
38 | 38 | |
39 | 39 | switch ($_GET['token']) { |
40 | - case "SELF-REGISTER": |
|
41 | - $token = "SELF-REGISTER"; |
|
42 | - $checkval = \core\UserManagement::TOKENSTATUS_OK_NEW; |
|
43 | - $federation = CONFIG_CONFASSISTANT['CONSORTIUM']['selfservice_registration']; |
|
44 | - break; |
|
45 | - default: |
|
46 | - $token = $validator->token($_GET['token']); |
|
47 | - $checkval = $usermgmt->checkTokenValidity($token); |
|
40 | + case "SELF-REGISTER": |
|
41 | + $token = "SELF-REGISTER"; |
|
42 | + $checkval = \core\UserManagement::TOKENSTATUS_OK_NEW; |
|
43 | + $federation = CONFIG_CONFASSISTANT['CONSORTIUM']['selfservice_registration']; |
|
44 | + break; |
|
45 | + default: |
|
46 | + $token = $validator->token($_GET['token']); |
|
47 | + $checkval = $usermgmt->checkTokenValidity($token); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | if ($checkval < 0) { |
@@ -230,7 +230,7 @@ |
||
230 | 230 | * @param int $rowid the HTML field base name of the option to be displayed |
231 | 231 | * @param string $optionName the name of the option to display |
232 | 232 | * @param string $optionValue the value of the option to display |
233 | - * @param mixed $optionLang the language of the option to display |
|
233 | + * @param null|string $optionLang the language of the option to display |
|
234 | 234 | * @param int $locationIndex which n of m locations is this, in case we are displaying a coordinate |
235 | 235 | * @param int $allLocationCount how many locations in total exist, in case we are displaying a coordinate |
236 | 236 | * @return string HTML code |