GEANT / CAT

web/lib/admin/domain/SilverbulletUser.php

Braces +4 added lines, -4 removed lines

@@ -102,7 +102,7 @@ 
         $tokenExpiry = date('Y-m-d H:i:s', strtotime($date));
         if($tokenExpiry > $this->defaultUserExpiry){
             $this->set(self::EXPIRY, $tokenExpiry);
-        }else{
+        } else{
             $this->clear();
         }
     }
@@ -124,9 +124,9 @@ 
         $days = $this->getAcknowledgeDays();
         if($days <= $max * 0.2 && $days > $max * 0.1){
             return self::LEVEL_YELLOW;
-        }elseif ($days <= $max * 0.1){
+        } elseif ($days <= $max * 0.1){
             return self::LEVEL_RED;
-        }else{
+        } else{
             return self::LEVEL_GREEN;
         }
     }
@@ -212,7 +212,7 @@ 
             foreach ($this->certificates as $certificate) {
                 $certificate->revoke($profile);
             }
-        }else{
+        } else{
             $this->set(self::DEACTIVATION_TIME, '0000-00-00 00:00:00');
         }
     }

web/lib/admin/view/MessageBox.php

Braces +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     public function __toString(){
         if($this->hasMessages()){
             return $this->box->__toString();
-        }else{
+        } else{
             return '';
         }
     }

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>
@@ -197,10 +198,12 @@ 
                 $checkresult[$number] = $check['instance']->UDP_reachability($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']->UDP_reachability($number, TRUE, FALSE) != \core\diag\RADIUSTests::RETVAL_CONVERSATION_REJECT)
-                        $realmproblems[] = ["REALM" => $check['realm'], "STATUS" => "OPERATOR-NAME", "FROM" => $probe['display_name'], "DETAIL" => ""];
-                    if ($check['instance']->UDP_reachability($number, FALSE, TRUE) != \core\diag\RADIUSTests::RETVAL_CONVERSATION_REJECT)
-                        $realmproblems[] = ["REALM" => $check['realm'], "STATUS" => "PACKETSIZE", "FROM" => $probe['display_name'], "DETAIL" => ""];
+                    if ($check['instance']->UDP_reachability($number, TRUE, FALSE) != \core\diag\RADIUSTests::RETVAL_CONVERSATION_REJECT) {
+                                            $realmproblems[] = ["REALM" => $check['realm'], "STATUS" => "OPERATOR-NAME", "FROM" => $probe['display_name'], "DETAIL" => ""];
+                    }
+                    if ($check['instance']->UDP_reachability($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
@@ -234,12 +237,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'];
                     }
@@ -249,11 +253,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
@@ -264,8 +269,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...

web/lib/admin/PageDecoration.php

Braces +1 added lines, -2 removed lines

@@ -206,8 +206,7 @@
             $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "accountstatus/");
         } elseif (strrpos($_SERVER['PHP_SELF'], "diag/")) {
             $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "diag/");
-        }
-            else {
+        } else {
             $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "/");
         }
 

web/lib/admin/http/SilverbulletAjaxController.php

Braces +2 added lines, -2 removed lines

@@ -33,9 +33,9 @@
     protected function doCreateCommand($commandToken) {
         if($commandToken == ValidateEmailAddress::COMMAND){
             return new ValidateEmailAddress($commandToken, $this->context);
-        }elseif($commandToken == GetTokenEmailDetails::COMMAND) {
+        } elseif($commandToken == GetTokenEmailDetails::COMMAND) {
             return new GetTokenEmailDetails($commandToken, $this->context);
-        }else {
+        } else {
             return new DefaultCommand($commandToken);
         }
     }

web/lib/admin/http/DeleteUserCommand.php

Braces +2 added lines, -2 removed lines

@@ -45,12 +45,12 @@
             if($confirmation=='true'){
                 $user->setDeactivated(true, $this->context->getProfile());
                 $user->save();
-            }else{
+            } else{
                 $this->storeInfoMessage("User '".$user->getUsername()."' deactivation has been canceled!");
             }
 
             $this->context->redirectAfterSubmit();
-        }else{
+        } else{
             //Append terms of use popup
             $builder = $this->context->getBuilder();
             $dialogTitle = _('Deactivate User');

web/lib/admin/view/AbstractPage.php

Braces +3 added lines, -3 removed lines

@@ -49,12 +49,12 @@ 
         if(isset($this->groups [$name])){
             $group = $this->groups [$name];
             $group->addElement($element);
-        }else if(isset($this->blocks[$name])){
+        } else if(isset($this->blocks[$name])){
             $group = new PageElementGroup();
             $group->addElement($this->blocks[$name]);
             $this->blocks[$name] = $this->groups[$name] = $group;
             $group->addElement($element);
-        }else{
+        } else{
             $this->assign($name, $element);
         }
     }
@@ -101,7 +101,7 @@ 
     public function fetch($name){
         if(isset($this->blocks[$name])){
             return $this->blocks[$name];
-        }else{
+        } else{
             return $this->nullElement;
         }
     }

web/lib/admin/view/html/Tag.php

Braces +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
         $innerString = $this->composeInnerString();
         if(!empty($innerString)){
             $tagString = "\n".$this->tab."<" . $this->name . $attributeString . ">" . $innerString . "</" . $this->name . ">";
-        }else{
+        } else{
             $tagString = "\n".$this->tab."<" . $this->name . $attributeString . "></" . $this->name . ">";
         }
         return $tagString;

tests/unit/web/lib/admin/http/MockPHPMailer.php

Braces +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     public function send(){
         if($this->Subject && $this->Body && count($this->to)>0){
             return true;
-        }else{
+        } else{
             $this->ErrorInfo = "Missing subject, body or email address!";
             return false;
         }