GEANT / CAT

core/User.php

Doc Comments +4 added lines, -1 removed lines

@@ -80,7 +80,7 @@ 
      * user is a federation administrator of *any* federation. When given a parameter (ISO shortname of federation), it checks
      * if the user administers this particular federation.
      * 
-     * @param string $federation optional: federation to be checked
+     * @param integer $federation optional: federation to be checked
      * @return boolean TRUE if the user is federation admin, FALSE if not 
      */
     public function isFederationAdmin($federation = 0) {
@@ -124,6 +124,9 @@ 
         return FALSE;
     }
 
+    /**
+     * @param string $content
+     */
     public function sendMailToUser($subject, $content) {
         $mailaddr = $this->getAttributes("user:email");
         if (count($mailaddr) == 0) { // we don't know user's mail address

Spacing +3 added lines, -3 removed lines

@@ -186,7 +186,7 @@ 
                 }
                 $lookFor .= "$name";
             }
-            $finding = preg_match("/^(".$lookFor."):(.*)/", $oneRow->user_id, $matches);
+            $finding = preg_match("/^(" . $lookFor . "):(.*)/", $oneRow->user_id, $matches);
             if ($finding === 0 || $finding === FALSE) {
                 return FALSE;
             }
@@ -207,7 +207,7 @@ 
                             $url = CONFIG_DIAGNOSTICS['eduGainResolver']['url'] . "?action=get_entity_name&type=idp&e_id=$idp&lang=pl";
                             $ch = curl_init($url);
                             curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-                            curl_setopt($ch,CURLOPT_TIMEOUT, CONFIG_DIAGNOSTICS['eduGainResolver']['timeout']);
+                            curl_setopt($ch, CURLOPT_TIMEOUT, CONFIG_DIAGNOSTICS['eduGainResolver']['timeout']);
                             $response = curl_exec($ch);
                             if ($response == FALSE) {
                                 $skipCurl = 1;
@@ -224,7 +224,7 @@ 
                 case $providerStrings[3]:
                 case $providerStrings[4]:
                 case $providerStrings[5]:
-                    if (!in_array(User::PROVIDER_STRINGS[$matches[1]],$listOfProviders)) {
+                    if (!in_array(User::PROVIDER_STRINGS[$matches[1]], $listOfProviders)) {
                         $providerName = $this->getEdugainName(User::PROVIDER_STRINGS[$matches[1]]);
                         $listOfProviders[] = $providerName . "xx";
 //                        $listOfProviders[] = User::PROVIDER_STRINGS[$matches[1]];

config/config-diagnostics-template.php

Indentation +18 added lines, -18 removed lines

@@ -59,12 +59,12 @@ 
      */
 
         /**
-     * Various paths.
-     * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken.
-     * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken.
-     *   See also NSIS_VERSION further down
-     * @var array
-     */
+         * Various paths.
+         * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken.
+         * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken.
+         *   See also NSIS_VERSION further down
+         * @var array
+         */
     'PATHS' => [
         'c_rehash' => 'c_rehash',
         'eapol_test' => 'eapol_test',
@@ -101,45 +101,45 @@ 
         ],
 
         'TLS-clientcerts' => [
-          'CA1' => [
+            'CA1' => [
             'status' => 'ACCREDITED',
             'issuerCA' => '/DC=org/DC=pki1/CN=PKI 1',
             'certificates' => [
-              [
+                [
                 'status' => 'CORRECT',
                 'public' => 'ca1-client-cert.pem',
                 'private' => 'ca1-client-key.pem',
                 'expected' => 'PASS'],
-              [
+                [
                 'status' => 'WRONGPOLICY',
                 'public' => 'ca1-nopolicy-cert.pem',
                 'private' => 'ca1-nopolicy-key.key',
                 'expected' => 'FAIL'],
-              [
+                [
                 'status' => 'EXPIRED',
                 'public' => 'ca1-exp.pem',
                 'private' => 'ca1-exp.key',
                 'expected' => 'FAIL'],
-              [
+                [
                 'status' => 'REVOKED',
                 'public' => 'ca1-revoked.pem',
                 'private' => 'ca1-revoked.key',
                 'expected' => 'FAIL'],
             ]
-          ],
-          'CA-N' => [
+            ],
+            'CA-N' => [
             'status' => 'NONACCREDITED',
             'issuerCA' => '/DC=org/DC=pkiN/CN=PKI N',
             'certificates' => [
-               [
+                [
                 'status' => 'CORRECT',
                 'public' => 'caN-client-cert.pem',
                 'private' => 'caN-client-cert.key',
                 'expected' => 'FAIL'],
-               ]
-          ]
-      ],
-      'accreditedCAsURL' => '',
+                ]
+            ]
+        ],
+        'accreditedCAsURL' => '',
     ],
     'eduGainResolver' => [
         'url' => 'http://technical.edugain.org/api.php',