GEANT / CAT

devices/PP_OSU_XML/DevicePPOSUXML.php

Indentation +8 added lines, -8 removed lines

@@ -82,10 +82,10 @@ 
     
     private function aaaServerTrustRoot() {
         
-      $retval = '<Node>
+        $retval = '<Node>
         <NodeName>AAAServerTrustRoot</NodeName>';
-      foreach ($this->attributes['internal:CAs'][0] as $oneCert) {
-          $retval .= '<Node>
+        foreach ($this->attributes['internal:CAs'][0] as $oneCert) {
+            $retval .= '<Node>
                          <NodeName>'.$oneCert['uuid'].'</NodeName>
                              <Node>
                                <NodeName>CertSHA256Fingerprint</NodeName>
@@ -93,9 +93,9 @@ 
                              </Node>
                        </Node>
                   ';
-      }
-      $retval .= '</Node>';
-      return $retval;
+        }
+        $retval .= '</Node>';
+        return $retval;
     }
     
     private function credentialCreationDate() {
@@ -181,8 +181,8 @@ 
 
       $content .= $this->aaaServerTrustRoot();
          */
-      $retval .= $this->homeSP();
-      $retval .= $this->credential();
+        $retval .= $this->homeSP();
+        $retval .= $this->credential();
       
     $retval .= '</Node>
   </Node>

Spacing +5 added lines, -5 removed lines

@@ -102,7 +102,7 @@ 
         $now = new \DateTime();
         return '<Node>
           <NodeName>CreationDate</NodeName>
-          <Value>'.$now->format("Y-m-d") . "T" . $now->format("H:i:s") . "Z".'</Value>
+          <Value>'.$now->format("Y-m-d")."T".$now->format("H:i:s")."Z".'</Value>
         </Node>';
     }
     
@@ -111,7 +111,7 @@ 
         <NodeName>HomeSP</NodeName>
         <Node>
           <NodeName>FriendlyName</NodeName>
-          <Value>'.sprintf(_("%s via Passpoint"),\config\ConfAssistant::CONSORTIUM['display_name']).'</Value>
+          <Value>'.sprintf(_("%s via Passpoint"), \config\ConfAssistant::CONSORTIUM['display_name']).'</Value>
         </Node>
         <Node>
           <NodeName>FQDN</NodeName>
@@ -125,7 +125,7 @@ 
         foreach (\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi'] as $index => $oneOi) {
             // according to spec, must be lowercase ASCII without dashes
             // but sample I got was all uppercase, so let's try with that
-            $oiList .= str_replace("-","",trim(strtoupper($oneOi)));
+            $oiList .= str_replace("-", "", trim(strtoupper($oneOi)));
             if ($index < $numberOfOi - 1) {
                 // according to spec, comma-separated
                 $oiList .= ",";
@@ -223,7 +223,7 @@ 
 Content-Type: application/x-pkcs12
 Content-Transfer-Encoding: base64
 
-'.chunk_split(base64_encode($this->clientCert['certdataclear']), 76, "\n"). // is PKCS#12, with cleartext key
+'.chunk_split(base64_encode($this->clientCert['certdataclear']), 76, "\n").// is PKCS#12, with cleartext key
 '--{boundary}';
 
         // trail this with a double slash and a newline
@@ -243,7 +243,7 @@ 
         // foresee signing.
         // but if they ever change their mind, we are prepared
 
-        $outputFromSigning = system($this->sign . " installer_profile '$fileName' > /dev/null");
+        $outputFromSigning = system($this->sign." installer_profile '$fileName' > /dev/null");
         if ($outputFromSigning === FALSE) {
             $this->loggerInstance->debug(2, "Signing the ONC installer $fileName FAILED!\n");
         }