GEANT / CAT

web/lib/admin/http/AddUsersCommand.php

Braces +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
                     $this->context->createInvitation($user, $this, $max);
                     $userCount++;
                 }
-            }else{
+            } else{
                  $this->storeErrorMessage(sprintf(_('Username or expiry date missing for %s record!'), $userCount + 1));
             }
         }

web/lib/admin/view/UserCredentialsForm.php

Braces +3 added lines, -3 removed lines

@@ -158,7 +158,7 @@ 
         $acknowledgeLevel = $user->getAcknowledgeLevel();
         if($acknowledgeLevel == SilverbulletUser::LEVEL_YELLOW){
             $row->addAttribute('style', 'background-color:#F0EAC0;');
-        }elseif ($acknowledgeLevel == SilverbulletUser::LEVEL_RED){
+        } elseif ($acknowledgeLevel == SilverbulletUser::LEVEL_RED){
             $row->addAttribute('style', 'background-color:#F0C0C0;');
         }
         
@@ -215,11 +215,11 @@ 
                 $certificateBox->addAttribute('style', 'background-color:#F0C0C0;');
                 $buttonContainer->addAttribute('style', 'height:22px; margin-top:7px; text-align:center;');
                 $buttonContainer->addText(_("REVOKED"));
-            }elseif ($certificate->isExpired()){
+            } elseif ($certificate->isExpired()){
                 $certificateBox->addAttribute('style', 'background-color:lightgrey;');
                 $buttonContainer->addAttribute('style', 'height:22px; margin-top:7px; text-align:center;');
                 $buttonContainer->addText(_("EXPIRED"));
-            }else{
+            } else{
                 $buttonContainer->addAttribute('style', 'text-align:right;padding-top: 5px;');
                 $buttonContainer->addText(new Button(_('Revoke'), 'submit', RevokeCertificateCommand::COMMAND, $certificate->getIdentifier(), 'delete'));
             }

tests/unit/web/lib/admin/domain/SilverbulletControllerTest.php

Braces +3 added lines, -1 removed lines

@@ -15,7 +15,9 @@
 use web\lib\admin\http\SilverbulletContext;
 use web\lib\admin\domain\SilverbulletInvitation;
 
-if ( !isset( $_SESSION ) ) $_SESSION = array();
+if ( !isset( $_SESSION ) ) {
+    $_SESSION = array();
+}
 
 class MockInstitutionPageBuilder extends InstitutionPageBuilder{
     

web/lib/admin/http/AddInvitationCommand.php

Braces +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         
         if($user->isExpired()){
             $this->storeErrorMessage(sprintf(_("User '%s' has expired. In order to generate credentials please extend the expiry date!"), $user->getUsername()));
-        }else{
+        } else{
             $this->context->createInvitation($user, $this, (int) $invitationsQuantity);
             if(!is_numeric($invitationsQuantity)){
                 $this->storeErrorMessage(sprintf(_("Invitations quantity '%' provided for user '%s' was not numeric. Assumed quantity as '1' !"), $invitationsQuantity, $user->getUsername()));

web/lib/admin/domain/SilverbulletInvitation.php

Braces +2 added lines, -2 removed lines

@@ -160,9 +160,9 @@
         
         if ($this->isRevoked()){
             $link = _('This token has been revoked!');
-        }else if($this->isAbsent()){
+        } else if($this->isAbsent()){
             $link = _('All available activations were used!');
-        }else if ($this->isExpired()) {
+        } else if ($this->isExpired()) {
             $link = _('User did not consume the token and it expired!');
         } else {
             $link .= '/accountstatus/accountstatus.php?token=' . $this->get(self::TOKEN);

web/diag/action_userdiag.php

Braces +18 added lines, -12 removed lines

@@ -134,8 +134,9 @@ 
                     array_multisort($name, SORT_ASC, SORT_LOCALE_STRING, $displaylist);
                     setlocale(LC_ALL, $current_locale);
 
-                    foreach ($displaylist as $id => $oneinst)
-                        echo "<option id='" . $id . "' value='" . $oneinst['realmlist'] . "'>" . $oneinst['name'] . "</option>";
+                    foreach ($displaylist as $id => $oneinst) {
+                                            echo "<option id='" . $id . "' value='" . $oneinst['realmlist'] . "'>" . $oneinst['name'] . "</option>";
+                    }
                     ?>
                 </select>
                 <button type='submit' class='submit'><?php echo _("Submit Information"); ?></button>
@@ -198,10 +199,12 @@ 
                 $checkresult[$number] = $check['instance']->udpReachability($number, FALSE, FALSE);
                 if ($checkresult[$number] == \core\diag\RADIUSTests::RETVAL_CONVERSATION_REJECT) { // so now things work?!
                     // either a packet size or Operator-Name problem!
-                    if ($check['instance']->udpReachability($number, TRUE, FALSE) != \core\diag\RADIUSTests::RETVAL_CONVERSATION_REJECT)
-                        $realmproblems[] = ["REALM" => $check['realm'], "STATUS" => "OPERATOR-NAME", "FROM" => $probe['display_name'], "DETAIL" => ""];
-                    if ($check['instance']->udpReachability($number, FALSE, TRUE) != \core\diag\RADIUSTests::RETVAL_CONVERSATION_REJECT)
-                        $realmproblems[] = ["REALM" => $check['realm'], "STATUS" => "PACKETSIZE", "FROM" => $probe['display_name'], "DETAIL" => ""];
+                    if ($check['instance']->udpReachability($number, TRUE, FALSE) != \core\diag\RADIUSTests::RETVAL_CONVERSATION_REJECT) {
+                                            $realmproblems[] = ["REALM" => $check['realm'], "STATUS" => "OPERATOR-NAME", "FROM" => $probe['display_name'], "DETAIL" => ""];
+                    }
+                    if ($check['instance']->udpReachability($number, FALSE, TRUE) != \core\diag\RADIUSTests::RETVAL_CONVERSATION_REJECT) {
+                                            $realmproblems[] = ["REALM" => $check['realm'], "STATUS" => "PACKETSIZE", "FROM" => $probe['display_name'], "DETAIL" => ""];
+                    }
                 } else { // still no response or immediate reject
                     // if this is a CAT realm with anon ID set, we can't be seeing an NPS ignorance problem
                     // and consequently, the realm has actual issues
@@ -235,12 +238,13 @@ 
 // re-write check history with that extra knowledge
     $copycat = $realmproblems;
 
-    foreach ($realmproblems as &$problem)
-        if ($problem['STATUS'] == "REALM_POSSIBLY_NPS")
+    foreach ($realmproblems as &$problem) {
+            if ($problem['STATUS'] == "REALM_POSSIBLY_NPS")
             foreach ($copycat as $otherproblem)
                 if ($problem['REALM'] == $otherproblem['REALM'] && $problem['FROM'] != $otherproblem['FROM'] && $otherproblem['STATUS'] != "REALM_POSSIBLY_NPS")
                     if ($otherproblem['STATUS'] == "REACHABLE") { // worked elsewhere, but not on this probe:
                         $problem['STATUS'] = "REALM_DOWN";
+    }
                     } else { // inherit other problem; in any case not an NPS problem
                         $problem['STATUS'] = $otherproblem['STATUS'];
                     }
@@ -250,11 +254,12 @@ 
 
     $copycat = $realmproblems;
 
-    foreach ($realmproblems as &$problem)
-        if ($problem['STATUS'] == "REALM_DOWN")
+    foreach ($realmproblems as &$problem) {
+            if ($problem['STATUS'] == "REALM_DOWN")
             foreach ($copycat as $otherproblem)
                 if ($problem['REALM'] == $otherproblem['REALM'] && $problem['FROM'] != $otherproblem['FROM'] && $otherproblem['STATUS'] == "REACHABLE")
                     $problem['STATUS'] = "INFRASTRUCTURE";
+    }
     unset($problem);
 
 // finally, extract all certprobs we got from the reachability checks; merge from all
@@ -265,8 +270,9 @@ 
     foreach ($checks as $check) {
         $instance = $check['instance'];
         $resultset = $instance->UDP_reachability_result;
-        foreach ($resultset as $result)
-            $all_certprobs = array_merge($all_certprobs, $result['cert_oddities']);
+        foreach ($resultset as $result) {
+                    $all_certprobs = array_merge($all_certprobs, $result['cert_oddities']);
+        }
     }
 
 // now we have something to say...

devices/ms/Device_W10.php

Braces +5 added lines, -4 removed lines

@@ -251,10 +251,11 @@
 <allow-save>true</allow-save>
 ';
                 if ($useAnon == 1) {
-                    if ($outer_user == '')
-                        $profileFileCont .= '<AnonymousIdentity>@</AnonymousIdentity>';
-                    else
-                        $profileFileCont .= '<AnonymousIdentity>' . $outer_id . '</AnonymousIdentity>';
+                    if ($outer_user == '') {
+                                            $profileFileCont .= '<AnonymousIdentity>@</AnonymousIdentity>';
+                    } else {
+                                            $profileFileCont .= '<AnonymousIdentity>' . $outer_id . '</AnonymousIdentity>';
+                    }
                 }
                 $profileFileCont .= '</ClientSideCredential>
 <ServerSideCredential>