GEANT / CAT

web/diag/action_userdiag.php

Braces +23 added lines, -16 removed lines

@@ -67,10 +67,11 @@ 
 
 function mainpage_url() {
     $main_url = valid_host($_SERVER['HTTP_HOST']);
-    if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on")
-        $main_url = "https://" . $main_url;
-    else
-        $main_url = "http://" . $main_url;
+    if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on") {
+            $main_url = "https://" . $main_url;
+    } else {
+            $main_url = "http://" . $main_url;
+    }
     $main_url .= substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], "/diag/"));
     return $main_url;
 }
@@ -135,8 +136,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 +199,12 @@ 
                 $checkresult[$number] = $check['instance']->UDP_reachability($number, FALSE, FALSE);
                 if ($checkresult[$number] == RETVAL_CONVERSATION_REJECT) { // so now things work?!
                     // either a packet size or Operator-Name problem!
-                    if ($check['instance']->UDP_reachability($number, TRUE, FALSE) != RETVAL_CONVERSATION_REJECT)
-                        $realmproblems[] = ["REALM" => $check['realm'], "STATUS" => "OPERATOR-NAME", "FROM" => $probe['display_name'], "DETAIL" => ""];
-                    if ($check['instance']->UDP_reachability($number, FALSE, TRUE) != RETVAL_CONVERSATION_REJECT)
-                        $realmproblems[] = ["REALM" => $check['realm'], "STATUS" => "PACKETSIZE", "FROM" => $probe['display_name'], "DETAIL" => ""];
+                    if ($check['instance']->UDP_reachability($number, TRUE, FALSE) != RETVAL_CONVERSATION_REJECT) {
+                                            $realmproblems[] = ["REALM" => $check['realm'], "STATUS" => "OPERATOR-NAME", "FROM" => $probe['display_name'], "DETAIL" => ""];
+                    }
+                    if ($check['instance']->UDP_reachability($number, FALSE, TRUE) != 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 +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'];
                     }
@@ -249,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
@@ -264,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']);
+        }
     }
     echo "<pre>";
     print_r($realmproblems);

web/admin/action_fedcheck.php

Braces +26 added lines, -17 removed lines

@@ -44,10 +44,11 @@ 
     // NAPTR existence check
     $tabletext .= "<td>";
     $naptr = $testsuite->NAPTR();
-    if ($naptr != RETVAL_NOTCONFIGURED)
-        switch ($naptr) {
+    if ($naptr != RETVAL_NOTCONFIGURED) {
+            switch ($naptr) {
             case RETVAL_NONAPTR:
                 $tabletext .= _("No NAPTR records");
+    }
                 break;
             case RETVAL_ONLYUNRELATEDNAPTR:
                 $tabletext .= sprintf(_("No associated NAPTR records"));
@@ -73,8 +74,9 @@ 
                 }
                 if ($srv > 0) {
                     $hosts = $testsuite->NAPTR_hostnames();
-                    if ($hosts == RETVAL_INVALID)
-                        $NAPTR_issues = true;
+                    if ($hosts == RETVAL_INVALID) {
+                                            $NAPTR_issues = true;
+                    }
                 }
                 break;
         }
@@ -91,14 +93,17 @@ 
     foreach (Config::$RADIUSTESTS['UDP-hosts'] as $hostindex => $host) {
         $testsuite->UDP_reachability($hostindex, true, true);
         $results = $testsuite->UDP_reachability_result[$hostindex];
-        if ($results['packetflow_sane'] != TRUE)
-            $UDPErrors = true;
-        if (empty($results['packetflow'][11]))
-            $UDPErrors = true;
+        if ($results['packetflow_sane'] != TRUE) {
+                    $UDPErrors = true;
+        }
+        if (empty($results['packetflow'][11])) {
+                    $UDPErrors = true;
+        }
         if (count($results['cert_oddities']) > 0) {
-            foreach ($results['cert_oddities'] as $oddity)
-                if ($oddity['level'] > $certBiggestOddity)
+            foreach ($results['cert_oddities'] as $oddity) {
+                            if ($oddity['level'] > $certBiggestOddity)
                     $certBiggestOddity = $oddity['level'];
+            }
         }
     }
 
@@ -119,8 +124,9 @@ 
     if ($naptr > 0 && count($testsuite->NAPTR_hostname_records) > 0) {
         foreach ($testsuite->NAPTR_hostname_records as $hostindex => $addr) {
             $retval = $testsuite->TLS_clients_side_check($addr);
-            if ($retval != RETVAL_OK && $retval != RETVAL_SKIPPED)
-                $dynamicErrors = true;
+            if ($retval != RETVAL_OK && $retval != RETVAL_SKIPPED) {
+                            $dynamicErrors = true;
+            }
         }
     }
     if (!$dynamicErrors) {
@@ -162,10 +168,11 @@ 
 $profiles_showtime = [];
 $profiles_readyconf = [];
 
-foreach ($allIDPs as $index => $oneidp)
+foreach ($allIDPs as $index => $oneidp) {
     foreach ($oneidp['instance']->listProfiles() as $profile)
         if ($profile->isShowtime()) {
             $profiles_showtime[] = ['idp' => $oneidp['instance'], 'profile' => $profile];
+}
         } else if ($profile->readyForShowtime()) {
             $profiles_confready[] = ['idp' => $oneidp['instance'], 'profile' => $profile];
         }
@@ -173,16 +180,18 @@ 
 if (count($profiles_showtime) > 0) {
     echo "<h2>" . _("Profiles marked as visible (V)") . "</h2>" . "<table>";
     echo rowdescription();
-    foreach ($profiles_showtime as $oneprofile)
-        echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
+    foreach ($profiles_showtime as $oneprofile) {
+            echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
+    }
     echo "</table>";
 }
 
 if (count($profiles_confready) > 0) {
     echo "<h2>" . _("Profiles with sufficient configuration, not marked as visible (C)") . "</h2>" . "<table>";
     echo rowdescription();
-    foreach ($profiles_confready as $oneprofile)
-        echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
+    foreach ($profiles_confready as $oneprofile) {
+            echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
+    }
     echo "</table>";
 }
 ?>

web/admin/lib/view/DefaultPage.php

Braces +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
     public function append($name, $value){
         if(isset($this->blocks [$name])){
             $this->blocks [$name] .= "\n".$value;
-        }else{
+        } else{
             $this->assign($name, $value);
         }
     }
@@ -42,7 +42,7 @@ 
     public function fetch($name){
         if(isset($this->blocks[$name])){
             return $this->blocks[$name];
-        }else{
+        } else{
             return '';
         }
     }

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

Braces +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     public function __toString(){
         if(!empty($this->name) && !empty($this->value)){
             return ' ' . $this->name . '="' . $this->value . '"';
-        }else{
+        } else{
             return '';
         }
     }

tests/unit/lib/view/InstitutionPageBuilderTest.php

Braces +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 function valid_IdP($input, $owner){
     if ($input == 1){
         return new MockInstitution();
-    }else{
+    } else{
         throw new Exception('IdP '.$input.' not found in database!');
     }
 }

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

Braces +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     public function __toString(){
         if(!empty($this->name) && !empty($this->value)){
             return ' ' . $this->name . '="' . $this->value . '"';
-        }else{
+        } else{
             return '';
         }
     }

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

Braces +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     public function __toString(){
         if(!empty($this->name) && !empty($this->value)){
             return ' ' . $this->name . '="' . $this->value . '"';
-        }else{
+        } else{
             return '';
         }
     }

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

Braces +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     public function __toString(){
         if(!empty($this->name) && !empty($this->value)){
             return ' ' . $this->name . '="' . $this->value . '"';
-        }else{
+        } else{
             return '';
         }
     }

web/admin/lib/domain/PersistentEntity.php

Braces +13 added lines, -7 removed lines

@@ -98,7 +98,7 @@ 
             $query = "";
             if(isset($this->row[self::ID])){
                 $query = $this->updateQuery();
-            }else{
+            } else{
                 $query = $this->insertQuery();
             }
             if(!empty($query)){
@@ -108,7 +108,7 @@ 
                 $this->set(self::ID, $this->databaseHandle->lastID());
             }
             return $result;
-        }else{
+        } else{
             return false;
         }
     }
@@ -122,8 +122,12 @@ 
         $keyString = "(";
         $valueString = "(";
         foreach ($this->row as $key => $value) {
-            if($keyString != "(") $keyString .= " ,";
-            if($valueString != "(") $valueString .= " ,";
+            if($keyString != "(") {
+                $keyString .= " ,";
+            }
+            if($valueString != "(") {
+                $valueString .= " ,";
+            }
             $keyString .= "`" . $key . "`";
             $valueString .= "'" . $value . "'";
         }
@@ -132,7 +136,7 @@ 
         if($keyString != "()"){
             $query .= " " .$keyString . " VALUES " . $valueString;
             return $query;
-        }else{
+        } else{
             return "";
         }
     }
@@ -145,13 +149,15 @@ 
         $query = "UPDATE `".$this->table."`";
         $updateString = "";
         foreach ($this->row as $key => $value) {
-            if(!empty($updateString)) $updateString .= " ,";
+            if(!empty($updateString)) {
+                $updateString .= " ,";
+            }
             $updateString .= "`" . $key . "`='" . $value . "'";
         }
         if(!empty($updateString)){
             $query .= " " .$updateString . " WHERE `" .self::ID. "`='".$this->get(self::ID)."'";
             return $query;
-        }else{
+        } else{
             return "";
         }
     }