GEANT / CAT

web/skins/msp/index.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
     print "vendorlogo ='';\n";
 }
 
-print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE] . '";';
+print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE].'";';
 //TODO modify this based on OS detection
 $userAgent = $_SERVER['HTTP_USER_AGENT'] ?? "";
 if (preg_match('/Android/', $userAgent)) {
@@ -79,7 +79,7 @@ 
     <?php echo $divs->divHeading($visibility); ?>
     <div id="main_page">
         <div id="loading_ico">
-          <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif"); ?>" alt="Authenticating ..."/>
+          <?php echo _("Authenticating")."..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif"); ?>" alt="Authenticating ..."/>
         </div>
         <div id="info_overlay"> <!-- device info -->
             <div id="info_window"></div>

web/skins/msp/Divs.php

Spacing +20 added lines, -20 removed lines

@@ -67,7 +67,7 @@ 
     public function divSilverbullet() {
         $retval = "
 <div id='silverbullet'>"
-    . $this->Gui->textTemplates->templates[user\SB_GO_AWAY] . 
+    . $this->Gui->textTemplates->templates[user\SB_GO_AWAY]. 
     "</div>
     ";
         return $retval;
@@ -109,9 +109,9 @@ 
     public function divProfiles() {
         return "
 <div id='profiles'> <!-- this is the profile selection filled during run time -->
-    <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION] . "
+    <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION]."
     </div>" .
-"<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>" .
+"<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>".
                 "</div>";
     }
 
@@ -126,7 +126,7 @@ 
     public function divInstitution($selectButton = TRUE) {
         $retval = "<div id='institution_name'>
     <span id='inst_name_span'></span> <div id='inst_extra_text'></div><!-- this will be filled with the IdP name -->" .
-                ($selectButton ? "<a  id='select_another' class='signin' href=\"\">" . $this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION] . "</a>" : "") .
+                ($selectButton ? "<a  id='select_another' class='signin' href=\"\">".$this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION]."</a>" : "").
                 "</div>";
         $retval .= $this->emptyImage('idp_logo', 'IdP Logo');
         return $retval;
@@ -140,7 +140,7 @@ 
     public function divOtherinstallers() {
         $retval = "
 <div class='sub_h'>
-    <div id='other_installers'>".$this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . "
+    <div id='other_installers'>".$this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]."
          <table id='device_list' style='padding:0px;'>";
 
         foreach ($this->Gui->listDevices(isset($_REQUEST['hidden']) ? $_REQUEST['hidden'] : 0) as $group => $deviceGroup) {
@@ -148,18 +148,18 @@ 
             $deviceIndex = 0;
 
             $imgTag = "";
-            $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $group . ".png");
+            $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$group.".png");
             if ($imgLocation !== FALSE) {
-                $imgTag = '<img src="' . $imgLocation . '" alt="' . $group . ' Device" title="' . $group . ' Device">';
+                $imgTag = '<img src="'.$imgLocation.'" alt="'.$group.' Device" title="'.$group.' Device">';
             }
-            $retval .= '<tbody><tr><td class="vendor" rowspan="' . $groupIndex . '">' . $imgTag . '</td>';
+            $retval .= '<tbody><tr><td class="vendor" rowspan="'.$groupIndex.'">'.$imgTag.'</td>';
             foreach ($deviceGroup as $d => $D) {
                 if ($deviceIndex) {
                     $retval .= '<tr>';
                 }
-                $retval .= "<td><button id='" . $d . "'>" . $D['display'] . "</button>"
-                        . "<div class='device_info' id='info_" . $d . "'></div></td>"
-                        . "<td><button class='more_info_b' id='info_b_" . $d . "'>i</button></td></tr>\n";
+                $retval .= "<td><button id='".$d."'>".$D['display']."</button>"
+                        . "<div class='device_info' id='info_".$d."'></div></td>"
+                        . "<td><button class='more_info_b' id='info_b_".$d."'>i</button></td></tr>\n";
                 $deviceIndex++;
             }
             $retval .= "</tbody>";
@@ -172,15 +172,15 @@ 
     }
 
     public function divGuessOs($operatingSystem) {
-        $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $operatingSystem['group'] . ".png");
+        $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$operatingSystem['group'].".png");
         $vendorstyle = "";
         if ($vendorlogo !== FALSE) {
-            $vendorstyle = "style='background-image:url(\"" . $vendorlogo . "\")'";
+            $vendorstyle = "style='background-image:url(\"".$vendorlogo."\")'";
         }
         $deleteIcon = $this->Gui->skinObject->findResourceUrl("IMAGES", "icons/delete_32.png");
         $deleteImg = "";
         if ($deleteIcon !== FALSE) {
-            $deleteImg = "<img id='cross_icon_" . $operatingSystem['device'] . "' src='$deleteIcon' >";
+            $deleteImg = "<img id='cross_icon_".$operatingSystem['device']."' src='$deleteIcon' >";
         }
         return "
 <div class='sub_h' id='guess_os'>
@@ -188,23 +188,23 @@ 
     <table id='browser'>
         <tr>
             <td>
-                <button class='large_button guess_os' $vendorstyle id='g_" . $operatingSystem['device'] . "'>
+                <button class='large_button guess_os' $vendorstyle id='g_".$operatingSystem['device']."'>
                     $deleteImg
-                    <div class='download_button_text_1' id='download_button_header_" . $operatingSystem['device'] . "'> " . $this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE] . "
+                    <div class='download_button_text_1' id='download_button_header_".$operatingSystem['device']."'> ".$this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE]."
                     </div>
                     <div class='download_button_text'>" .
-                $operatingSystem['display'] . "
+                $operatingSystem['display']."
                     </div>
                 </button>
-                <div class='device_info' id='info_g_" . $operatingSystem['device'] . "'></div>
+                <div class='device_info' id='info_g_" . $operatingSystem['device']."'></div>
           </td>
           <td style='vertical-align:top'>
-               <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device'] . "'>i</button>
+               <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device']."'>i</button>
           </td>
       </tr>
     </table> <!-- id='browser' -->
     <div class='sub_h'>
-       <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . "</a>
+       <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]."</a>
     </div>
 </div> <!-- id='guess_os' -->";
     }

web/skins/msp/user/cat_info.php

Spacing +18 added lines, -18 removed lines

@@ -31,7 +31,7 @@ 
  * the receiving end to strip this marker and not add the title by itself.
  *
  */
-require_once dirname(dirname(dirname((dirname(dirname(__FILE__)))))) . "/config/_config.php";
+require_once dirname(dirname(dirname((dirname(dirname(__FILE__))))))."/config/_config.php";
 
 $Gui = new \web\lib\user\Gui();
 
@@ -41,46 +41,46 @@ 
 $subpage = $_REQUEST['subpage'];
 switch ($page) {
     case 'about':
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/about_cat.inc.php";
+        include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/about_cat.inc.php";
         $out = "<div class='padding'>$out</div>";
         break;
     case 'tou':
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/tou.inc.php";
+        include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/tou.inc.php";
         $out = "no_title<div>
            <h1>
-         " . $Tou['title'] . "
+         " . $Tou['title']."
     </h1>
-<div id='tou_1'>" . $Tou['subtitle'] .
-               '<div style="direction:ltr">' . $Tou['short'] . "</div>
+<div id='tou_1'>" . $Tou['subtitle'].
+               '<div style="direction:ltr">'.$Tou['short']."</div>
 </div>
 <div id='all_tou_link'><a href='javascript:showTOU()'>Click here to see the full terms</a></div>
 <div id='tou_2' style='display:none; padding-top:20px; direction:ltr'>" .
-                $Tou['full'] . "
+                $Tou['full']."
 </div>
 </div>
 ";
         break;
     case 'help':
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/faq.inc.php";
+        include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/faq.inc.php";
         switch ($subpage) {
             case 'contact':
             case 'idp_not_listed':
             case 'device_not_listed':
             case 'what_is_eduroam':
-                $out = "no_title<div><h1>" . _("Help") . "</h1>";
+                $out = "no_title<div><h1>"._("Help")."</h1>";
                 foreach ($Faq as $faqItem) {
                     if (!empty($faqItem['id']) && $faqItem['id'] == $subpage) {
-                        $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
-                        $out .= "" . $faqItem['text'] . "</div>\n";
+                        $out .= "<div><h3>".$faqItem['title']."</h3>\n";
+                        $out .= "".$faqItem['text']."</div>\n";
                     }
                 }
                 $out .= "</div>";
                 break;
             case 'faq':
-                $out = "no_title<div><h1>" . _("Frequently Asked Questions") . "</h1>";
+                $out = "no_title<div><h1>"._("Frequently Asked Questions")."</h1>";
                 foreach ($Faq as $faqItem) {
-                    $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
-                    $out .= "" . $faqItem['text'] . "</div>\n";
+                    $out .= "<div><h3>".$faqItem['title']."</h3>\n";
+                    $out .= "".$faqItem['text']."</div>\n";
                 }
                 $out .= "</div>";
                 break;
@@ -104,15 +104,15 @@ 
                     $rn = uniqid();
                     $_SESSION['remindIdP'] = $rn;
                     $out .= "<input type='hidden' id='remindIdPs' value='$rn'>";
-                    $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>" . _("Login") . "</button>";
-                    $out .= "<br/><br/><p>" . _("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.") . "</p>";
-                    $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>" . _("Get IdP Reminder") . "</button>";
+                    $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>"._("Login")."</button>";
+                    $out .= "<br/><br/><p>"._("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.")."</p>";
+                    $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>"._("Get IdP Reminder")."</button>";
                     $out .= "<div id='remindIdPd'><span id='remindIdPh'></span><ul id='remindIdPl'></ul></div>";
                     $out = "<div  class='padding'>$out</div>";
                 }
                 break;
             case 'develop':
-                include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/devel.inc.php";
+                include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/devel.inc.php";
                 $out = "<div class='padding'>$out</div>";
                 break;
         }

web/skins/msp/resources/css/cat-user.css.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 header("Content-Type:text/css");
-require dirname(dirname(dirname(dirname(dirname(dirname(__FILE__)))))) . "/config/_config.php";
+require dirname(dirname(dirname(dirname(dirname(dirname(__FILE__))))))."/config/_config.php";
 $langInstance = new core\common\Language();
 $start = $langInstance->rtl ? "right" : "left";
 $end = $langInstance->rtl ? "left" : "right";
@@ -399,8 +399,8 @@ 
 
 #message_only {
     padding-top: 20px;
-    padding-<?php echo $start;?>: 30px;
-    padding-<?php echo $end;?>: 30px;
+    padding-<?php echo $start; ?>: 30px;
+    padding-<?php echo $end; ?>: 30px;
     font-weight: normal;
     position: relative;
     font-size: 15px;

utils/update_monitor_copy_2.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
  * in a separate way and it is crucial that the updates are porformed more often (hourly)
  */
 namespace utils;
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 setlocale(LC_CTYPE, "en_US.UTF-8");
 
@@ -52,4 +52,4 @@ 
 
 $timeEnd = microtime(true);
 $timeElapsed = $timeEnd - $timeStart;
-printf("Whole update done in %.2fs\n",$timeElapsed);
\ No newline at end of file
+printf("Whole update done in %.2fs\n", $timeElapsed);
\ No newline at end of file

utils/UpdateFromMonitor.php

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
  * update the local copy
  */
 namespace utils;
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 setlocale(LC_CTYPE, "en_US.UTF-8");
 
@@ -98,7 +98,7 @@ 
         $this->db_ext->query("SET NAMES 'utf8'");
         $this->db_local->query("SET NAMES 'utf8mb4'");
         $result = $this->db_ext->query("SELECT * FROM $table");
-        $queryFields = implode(',', array_column($this->fields[$db][$table_name],0));
+        $queryFields = implode(',', array_column($this->fields[$db][$table_name], 0));
         while ($row = $result->fetch_assoc()) {
             $v = [];
             foreach ($this->fields[$db][$table_name] as $field) {
@@ -116,7 +116,7 @@ 
                     }
                 }
             }
-            $queryValues = implode(',',$v);
+            $queryValues = implode(',', $v);
             $query = "INSERT INTO $tmpTable (".$queryFields.") VALUES (".$queryValues.")";
             $this->db_local->query($query);
         }
@@ -134,9 +134,9 @@ 
             $realms = explode(',', $row[1]);
             foreach ($contacts as $contact) {
                 foreach ($realms as $realm) {
-                    $email = empty($contact['mail']) ? 'NULL' :'"'.$contact['mail'].'"';
-                    $name = empty($contact['name']) ? 'NULL' :'"'.$contact['name'].'"';
-                    $phone = empty($contact['phone']) ? 'NULL' :'"'.$contact['phone'].'"';
+                    $email = empty($contact['mail']) ? 'NULL' : '"'.$contact['mail'].'"';
+                    $name = empty($contact['name']) ? 'NULL' : '"'.$contact['name'].'"';
+                    $phone = empty($contact['phone']) ? 'NULL' : '"'.$contact['phone'].'"';
                     $id = '"'.$row[2].'"';
                     $ROid = '"'.$row[3].'"';
                     $query = "INSERT INTO tmp_institution_admins (name, email, phone, inst_realm, instid, ROid)"
@@ -161,9 +161,9 @@ 
     }
 
     private function escape($inp) {
-        $out=str_replace('\\','\\\\',$inp);
-        $out=str_replace('"','\"',$out);
-        $out=str_replace('?','\?',$out);
+        $out = str_replace('\\', '\\\\', $inp);
+        $out = str_replace('"', '\"', $out);
+        $out = str_replace('?', '\?', $out);
         $out = 'convert(cast(convert("'.$out.'" using latin1) as binary) using utf8)';
         return($out);
     }

config/autoloader.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once __DIR__ . "/../core/Psr4Autoloader.php";
+require_once __DIR__."/../core/Psr4Autoloader.php";
 use core\autoloader\Psr4Autoloader;
 
 // instantiate the loader
@@ -30,12 +30,12 @@ 
 
 // register the base directories for the namespace prefix
 // include configuration
-$loader->addNamespace('config', __DIR__ );
+$loader->addNamespace('config', __DIR__);
 // include CAT/core library
-$loader->addNamespace('core', __DIR__ . "/../core");
+$loader->addNamespace('core', __DIR__."/../core");
 // include CAT/devices library
-$loader->addNamespace('devices', __DIR__ . "/../devices");
+$loader->addNamespace('devices', __DIR__."/../devices");
 // include CAT/web library
-$loader->addNamespace('web', __DIR__ . "/../web");
+$loader->addNamespace('web', __DIR__."/../web");
 // include CAT/utils
-$loader->addNamespace('utils', __DIR__ . "/../utils");
+$loader->addNamespace('utils', __DIR__."/../utils");

docker/MSP/web/html/lib.inc

Spacing +3 added lines, -3 removed lines

@@ -6,9 +6,9 @@
 function cat_socket($obj) {
    $sock = socket_create(AF_UNIX, SOCK_STREAM, 0);
    $conn = socket_connect($sock, SOCKET);
-   if ( $conn ) {
-     socket_write ($sock, $obj, strlen($obj));
-     $out = socket_read ($sock, 2048);
+   if ($conn) {
+     socket_write($sock, $obj, strlen($obj));
+     $out = socket_read($sock, 2048);
      return $out;
    }
    return 'FAILURE';

core/CertificationAuthorityEduPkiServer.php

Spacing +42 added lines, -42 removed lines

@@ -35,10 +35,10 @@ 
     public function __construct()
     {
             
-        if ( \config\ConfAssistant::eduPKI['testing'] === true ) {
-            $this->locationRaCert = ROOT . "/config/SilverbulletClientCerts/edupki-test-ra.pem";
-            $this->locationRaKey = ROOT . "/config/SilverbulletClientCerts/edupki-test-ra.clearkey";
-            $this->locationWebRoot = ROOT . "/config/SilverbulletClientCerts/eduPKI-webserver-root.pem";
+        if (\config\ConfAssistant::eduPKI['testing'] === true) {
+            $this->locationRaCert = ROOT."/config/SilverbulletClientCerts/edupki-test-ra.pem";
+            $this->locationRaKey = ROOT."/config/SilverbulletClientCerts/edupki-test-ra.clearkey";
+            $this->locationWebRoot = ROOT."/config/SilverbulletClientCerts/eduPKI-webserver-root.pem";
             $this->eduPkiRaId = 700;
             $this->eduPkiCertProfileBoth = "Radius Server SOAP";
             $this->eduPkiCertProfileIdp = "Radius Server SOAP";
@@ -47,9 +47,9 @@ 
             $this->eduPkiEndpointPublic = "https://pki.edupki.org/edupki-test-ca/cgi-bin/pub/soap?wsdl=1";
             $this->eduPkiEndpointRa = "https://ra.edupki.org/edupki-test-ca/cgi-bin/ra/soap?wsdl=1";
         } else {
-            $this->locationRaCert = ROOT . "/config/SilverbulletClientCerts/edupki-prod-ra.pem";
-            $this->locationRaKey = ROOT . "/config/SilverbulletClientCerts/edupki-prod-ra.clearkey";
-            $this->locationWebRoot = ROOT . "/config/SilverbulletClientCerts/eduPKI-webserver-root.pem";
+            $this->locationRaCert = ROOT."/config/SilverbulletClientCerts/edupki-prod-ra.pem";
+            $this->locationRaKey = ROOT."/config/SilverbulletClientCerts/edupki-prod-ra.clearkey";
+            $this->locationWebRoot = ROOT."/config/SilverbulletClientCerts/eduPKI-webserver-root.pem";
             $this->eduPkiRaId = 100;
             $this->eduPkiCertProfileBoth = "eduroam IdP and SP";
             $this->eduPkiCertProfileIdp = "eduroam IdP";
@@ -63,13 +63,13 @@ 
         parent::__construct();
 
         if (stat($this->locationRaCert) === FALSE) {
-            throw new Exception("RA operator PEM file not found: " . $this->locationRaCert);
+            throw new Exception("RA operator PEM file not found: ".$this->locationRaCert);
         }
         if (stat($this->locationRaKey) === FALSE) {
-            throw new Exception("RA operator private key file not found: " . $this->locationRaKey);
+            throw new Exception("RA operator private key file not found: ".$this->locationRaKey);
         }
         if (stat($this->locationWebRoot) === FALSE) {
-            throw new Exception("CA website root CA file not found: " . $this->locationWebRoot);
+            throw new Exception("CA website root CA file not found: ".$this->locationWebRoot);
         }
     }
 
@@ -136,26 +136,26 @@ 
                 throw new Exception("Unexpected policies requested.");
             }
             $altArray = [# Array mit den Subject Alternative Names
-                "email:" . $csr["USERMAIL"]
+                "email:".$csr["USERMAIL"]
             ];
             foreach ($csr["ALTNAMES"] as $oneAltName) {
                 if (!empty($oneAltName) && preg_match('/(?=^.{1,254}$)(^(?:(?!\d|-)[a-z0-9\-]{1,63}(?<!-)\.)+(?:[a-z]{2,})$)/i', $oneAltName) > 0) {
-                    $altArray[] = "DNS:" . $oneAltName;
+                    $altArray[] = "DNS:".$oneAltName;
                 } else {
-                    $altArray[] = "IP:" . $oneAltName;
+                    $altArray[] = "IP:".$oneAltName;
                 }
             }
             $soapPub = $this->initEduPKISoapSession("PUBLIC");
             $this->loggerInstance->debug(5, "FIRST ACTUAL SOAP REQUEST (Public, newRequest)!\n");
-            $this->loggerInstance->debug(5, "PARAM_1: " . $this->eduPkiRaId . "\n");
-            $this->loggerInstance->debug(5, "PARAM_2: " . $csr["CSR_STRING"] . "\n");
+            $this->loggerInstance->debug(5, "PARAM_1: ".$this->eduPkiRaId."\n");
+            $this->loggerInstance->debug(5, "PARAM_2: ".$csr["CSR_STRING"]."\n");
             $this->loggerInstance->debug(5, "PARAM_3: ");
             $this->loggerInstance->debug(5, $altArray);
-            $this->loggerInstance->debug(5, "PARAM_4: " . $profile . "\n");
-            $this->loggerInstance->debug(5, "PARAM_5: " . sha1("notused") . "\n");
-            $this->loggerInstance->debug(5, "PARAM_6: " . $csr["USERNAME"] . "\n");
-            $this->loggerInstance->debug(5, "PARAM_7: " . $csr["USERMAIL"] . "\n");
-            $this->loggerInstance->debug(5, "PARAM_8: " . ProfileSilverbullet::PRODUCTNAME . "\n");
+            $this->loggerInstance->debug(5, "PARAM_4: ".$profile."\n");
+            $this->loggerInstance->debug(5, "PARAM_5: ".sha1("notused")."\n");
+            $this->loggerInstance->debug(5, "PARAM_6: ".$csr["USERNAME"]."\n");
+            $this->loggerInstance->debug(5, "PARAM_7: ".$csr["USERMAIL"]."\n");
+            $this->loggerInstance->debug(5, "PARAM_8: ".ProfileSilverbullet::PRODUCTNAME."\n");
             $this->loggerInstance->debug(5, "PARAM_9: false\n");
             
             $soapNewRequest = $soapPub->newRequest(
@@ -185,7 +185,7 @@ 
                 #}\n");
                 return 0;
             }
-            throw new Exception("Something odd happened while doing the SOAP request:" . $e->getMessage());
+            throw new Exception("Something odd happened while doing the SOAP request:".$e->getMessage());
         }
         try {
             $soap = $this->initEduPKISoapSession("RA");
@@ -217,7 +217,7 @@ 
             // for obnoxious reasons, we have to dump the request into a file and let pkcs7_sign read from the file
             // rather than just using the string. Grr.
             $tempdir = \core\common\Entity::createTemporaryDirectory("test");
-            file_put_contents($tempdir['dir'] . "/content.txt", $soapCleartext);
+            file_put_contents($tempdir['dir']."/content.txt", $soapCleartext);
             // retrieve our RA cert from filesystem                    
             // the RA certificates are not needed right now because we
             // have resorted to S/MIME signatures with openssl command-line
@@ -229,7 +229,7 @@ 
             // sign the data, using cmdline because openssl_pkcs7_sign produces strange results
             // -binary didn't help, nor switch -md to sha1 sha256 or sha512
             $this->loggerInstance->debug(2, "Actual content to be signed is this:\n  $soapCleartext\n");
-            $execCmd = \config\Master::PATHS['openssl'] . " smime -sign -binary -in " . $tempdir['dir'] . "/content.txt -out " . $tempdir['dir'] . "/signature.txt -outform pem -inkey " . $this->locationRaKey . " -signer " . $this->locationRaCert;
+            $execCmd = \config\Master::PATHS['openssl']." smime -sign -binary -in ".$tempdir['dir']."/content.txt -out ".$tempdir['dir']."/signature.txt -outform pem -inkey ".$this->locationRaKey." -signer ".$this->locationRaCert;
             $this->loggerInstance->debug(2, "Calling openssl smime with following cmdline:   $execCmd\n");
             $output = [];
             $return = 999;
@@ -238,21 +238,21 @@ 
                 throw new Exception("Non-zero return value from openssl smime!");
             }
             // and get the signature blob back from the filesystem
-            $detachedSig = trim(file_get_contents($tempdir['dir'] . "/signature.txt"));
+            $detachedSig = trim(file_get_contents($tempdir['dir']."/signature.txt"));
             $this->loggerInstance->debug(5, "Request for server approveRequest has parameters:\n");
-            $this->loggerInstance->debug(5, $soapReqnum . "\n");
-            $this->loggerInstance->debug(5, $soapCleartext . "\n"); // PHP magically encodes this as base64 while sending!
-            $this->loggerInstance->debug(5, $detachedSig . "\n");
+            $this->loggerInstance->debug(5, $soapReqnum."\n");
+            $this->loggerInstance->debug(5, $soapCleartext."\n"); // PHP magically encodes this as base64 while sending!
+            $this->loggerInstance->debug(5, $detachedSig."\n");
             $soapIssueCert = $soap->approveRequest($soapReqnum, $soapCleartext, $detachedSig);
-            $this->loggerInstance->debug(5, "approveRequest Request was: \n" . $soap->__getLastRequest());
-            $this->loggerInstance->debug(5, "approveRequest Response was: \n" . $soap->__getLastResponse());
+            $this->loggerInstance->debug(5, "approveRequest Request was: \n".$soap->__getLastRequest());
+            $this->loggerInstance->debug(5, "approveRequest Response was: \n".$soap->__getLastResponse());
             if ($soapIssueCert === FALSE) {
                 throw new Exception("The locally approved request was NOT processed by the CA.");
             }
         } catch (SoapFault $e) {
-            throw new Exception("SoapFault: Error when sending or receiving SOAP message: " . "{$e->faultcode}: {$e->faultname}: {$e->faultstring}: {$e->faultactor}: {$e->detail}: {$e->headerfault}\n");
+            throw new Exception("SoapFault: Error when sending or receiving SOAP message: "."{$e->faultcode}: {$e->faultname}: {$e->faultstring}: {$e->faultactor}: {$e->detail}: {$e->headerfault}\n");
         } catch (Exception $e) {
-            throw new Exception("Exception: Something odd happened between the SOAP requests:" . $e->getMessage());
+            throw new Exception("Exception: Something odd happened between the SOAP requests:".$e->getMessage());
         }
         return $soapReqnum;
     }
@@ -304,9 +304,9 @@ 
                 throw new Exception("CAInfo has no root certificate for us!");
             }
         } catch (SoapFault $e) {
-            throw new Exception("SoapFault: Error when sending or receiving SOAP message: " . "{$e->faultcode}: {$e->faultname}: {$e->faultstring}: {$e->faultactor}: {$e->detail}: {$e->headerfault}\n");
+            throw new Exception("SoapFault: Error when sending or receiving SOAP message: "."{$e->faultcode}: {$e->faultname}: {$e->faultstring}: {$e->faultactor}: {$e->detail}: {$e->headerfault}\n");
         } catch (Exception $e) {
-            throw new Exception("Exception: Something odd happened between the SOAP requests:" . $e->getMessage());
+            throw new Exception("Exception: Something odd happened between the SOAP requests:".$e->getMessage());
         }
         return [
             "CERT" => openssl_x509_read($parsedCert['pem']),
@@ -339,12 +339,12 @@ 
             // for obnoxious reasons, we have to dump the request into a file and let pkcs7_sign read from the file
             // rather than just using the string. Grr.
             $tempdir = \core\common\Entity::createTemporaryDirectory("test");
-            file_put_contents($tempdir['dir'] . "/content.txt", $soapRawRevRequest);
+            file_put_contents($tempdir['dir']."/content.txt", $soapRawRevRequest);
             // retrieve our RA cert from filesystem
             // sign the data, using cmdline because openssl_pkcs7_sign produces strange results
             // -binary didn't help, nor switch -md to sha1 sha256 or sha512
             $this->loggerInstance->debug(5, "Actual content to be signed is this:\n$soapRawRevRequest\n");
-        $execCmd = \config\Master::PATHS['openssl'] . " smime -sign -binary -in " . $tempdir['dir'] . "/content.txt -out " . $tempdir['dir'] . "/signature.txt -outform pem -inkey " . $this->locationRaKey . " -signer " . $this->locationRaCert;
+        $execCmd = \config\Master::PATHS['openssl']." smime -sign -binary -in ".$tempdir['dir']."/content.txt -out ".$tempdir['dir']."/signature.txt -outform pem -inkey ".$this->locationRaKey." -signer ".$this->locationRaCert;
             $this->loggerInstance->debug(2, "Calling openssl smime with following cmdline: $execCmd\n");
             $output = [];
             $return = 999;
@@ -353,7 +353,7 @@ 
                 throw new Exception("Non-zero return value from openssl smime!");
             }
             // and get the signature blob back from the filesystem
-            $detachedSig = trim(file_get_contents($tempdir['dir'] . "/signature.txt"));
+            $detachedSig = trim(file_get_contents($tempdir['dir']."/signature.txt"));
             $soapIssueRev = $soap->approveRevocationRequest($soapRevocationSerial, $soapRawRevRequest, $detachedSig);
             if ($soapIssueRev === FALSE) {
                 throw new Exception("The locally approved revocation request was NOT processed by the CA.");
@@ -361,9 +361,9 @@ 
         } catch (Exception $e) {
             // PHP 7.1 can do this much better
             if (is_soap_fault($e)) {
-                throw new Exception("Error when sending SOAP request: " . "{$e->faultcode}: {$e->faultstring}\n");
+                throw new Exception("Error when sending SOAP request: "."{$e->faultcode}: {$e->faultstring}\n");
             }
-            throw new Exception("Something odd happened while doing the SOAP request:" . $e->getMessage());
+            throw new Exception("Something odd happened while doing the SOAP request:".$e->getMessage());
         }
     }
 
@@ -465,9 +465,9 @@ 
      */
     public function soapToXmlInteger($x)
     {
-        return '<' . $x[0] . '>'
+        return '<'.$x[0].'>'
                 . htmlentities($x[1], ENT_NOQUOTES | ENT_XML1)
-                . '</' . $x[0] . '>';
+                . '</'.$x[0].'>';
     }
 
     /**
@@ -486,9 +486,9 @@ 
         // dump private key into directory
         $outstring = "";
         openssl_pkey_export($privateKey, $outstring);
-        file_put_contents($tempdir . "/pkey.pem", $outstring);
+        file_put_contents($tempdir."/pkey.pem", $outstring);
         // PHP can only do one DC in the Subject. But we need three.
-        $execCmd = \config\Master::PATHS['openssl'] . " req -new -sha256 -key $tempdir/pkey.pem -out $tempdir/request.csr -subj /DC=test/DC=test/DC=eduroam/C=$fed/O=" . \config\ConfAssistant::CONSORTIUM['name'] . "/OU=$fed/CN=$username/emailAddress=$username";
+        $execCmd = \config\Master::PATHS['openssl']." req -new -sha256 -key $tempdir/pkey.pem -out $tempdir/request.csr -subj /DC=test/DC=test/DC=eduroam/C=$fed/O=".\config\ConfAssistant::CONSORTIUM['name']."/OU=$fed/CN=$username/emailAddress=$username";
         $this->loggerInstance->debug(2, "Calling openssl req with following cmdline: $execCmd\n");
         $output = [];
         $return = 999;