GEANT / CAT

web/admin/overview_sp.php

Indentation +4 added lines, -4 removed lines

@@ -150,8 +150,8 @@ 
                         <td>
                             <?php
                                 echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] . 
-                                     "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . 
-                                     "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>";
+                                        "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . 
+                                        "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>";
                             ?>
                         </td>
                     </tr>
@@ -173,8 +173,8 @@ 
                         <td>
                             <?php
                                 echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] .
-                                     "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . 
-                                     "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "'>";
+                                        "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . 
+                                        "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "'>";
                             ?>
                         </td>
                     </tr>

Spacing +25 added lines, -25 removed lines

@@ -26,7 +26,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $deco = new \web\lib\admin\PageDecoration();
 $validator = new \web\lib\common\InputValidation();
@@ -38,7 +38,7 @@ 
 } else {
     $link = 'http://';
 }
-$link .= $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME'];
+$link .= $_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME'];
 $link = htmlspecialchars($link);
 
 echo $deco->defaultPagePrelude(sprintf(_("%s: %s Dashboard"), \config\Master::APPEARANCE['productname'], $uiElements->nomenclatureHotspot));
@@ -102,21 +102,21 @@ 
         <?php
         if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] !== NULL) {
             echo "<tr>
-                        <td>" . sprintf(_("Diagnose reachability and connection parameters of %ss"),$uiElements->nomenclatureInst) . "</td>
+                        <td>" . sprintf(_("Diagnose reachability and connection parameters of %ss"), $uiElements->nomenclatureInst)."</td>
                         <td><form method='post' action='../diag/action_realmcheck.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'>
                               <!--<input type='text' name='realm' id='realm'>-->
                               <input type='hidden' name='comefrom' id='comefrom' value='$link'/>
-                              <button id='realmcheck' style='cursor:pointer;' type='submit'>" . _("Go!") . "</button>
+                              <button id='realmcheck' style='cursor:pointer;' type='submit'>"._("Go!")."</button>
                             </form>
                         </td>
                     </tr>";
         }
         if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam") { // SW: APPROVED
             echo "<tr>
-                        <td>" . sprintf(_("Check %s server status"), $uiElements->nomenclatureFed) . "</td>
+                        <td>" . sprintf(_("Check %s server status"), $uiElements->nomenclatureFed)."</td>
                         <td>
                            <form action='https://monitor.eduroam.org/mon_direct.php' accept-charset='UTF-8'>
-                              <button style='cursor:pointer;' type='submit'>" . _("Go!") . "</button>
+                              <button style='cursor:pointer;' type='submit'>" . _("Go!")."</button>
                            </form>
                         </td>
                     </tr>";
@@ -127,10 +127,10 @@ 
     <?php
     $hotspotProfiles = $my_inst->listDeployments();
     if (count($hotspotProfiles) == 0) { // no profiles yet.
-        echo "<h2>" . sprintf(_("There are not yet any known deployments for your %s."), $uiElements->nomenclatureHotspot) . "</h2>";
+        echo "<h2>".sprintf(_("There are not yet any known deployments for your %s."), $uiElements->nomenclatureHotspot)."</h2>";
     }
     if (count($hotspotProfiles) > 0) { // no profiles yet.
-        echo "<h2>" . sprintf(_("Deployments for this %s"), $uiElements->nomenclatureHotspot) . "</h2>";
+        echo "<h2>".sprintf(_("Deployments for this %s"), $uiElements->nomenclatureHotspot)."</h2>";
         // display an info box with the connection data
     }
    
@@ -149,19 +149,19 @@ 
         ?>
         <div style='display: table-row; margin-bottom: 20px;'>
             <div class='profilebox' style='display: table-cell;'>
-                <h2><?php echo core\DeploymentManaged::PRODUCTNAME . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)"; ?></h2>
+                <h2><?php echo core\DeploymentManaged::PRODUCTNAME." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)"; ?></h2>
                 <table>
                     <tr>
                         <td><strong><?php echo _("Your primary RADIUS server") ?></strong><br/>
                         <?php
                             if ($deploymentObject->host1_v4 !== NULL) {
-                                echo _("IPv4") . ": " . $deploymentObject->host1_v4;
+                                echo _("IPv4").": ".$deploymentObject->host1_v4;
                             }
                             if ($deploymentObject->host1_v4 !== NULL && $deploymentObject->host1_v6 !== NULL) {
                                 echo "<br/>";
                             }
                             if ($deploymentObject->host1_v6 !== NULL) {
-                                echo _("IPv6") . ": " . $deploymentObject->host1_v6;
+                                echo _("IPv6").": ".$deploymentObject->host1_v6;
                             }
                             ?>
                         </td>
@@ -169,9 +169,9 @@ 
                         <td><?php echo $deploymentObject->port1; ?></td>
                         <td>
                             <?php
-                                echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] . 
-                                     "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . 
-                                     "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>";
+                                echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon']. 
+                                     "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text']. 
+                                     "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."'>";
                             ?>
                         </td>
                     </tr>
@@ -179,22 +179,22 @@ 
                         <td><strong><?php echo _("Your backup RADIUS server") ?><br/></strong>
                             <?php
                             if ($deploymentObject->host2_v4 !== NULL) {
-                                echo _("IPv4") . ": " . $deploymentObject->host2_v4;
+                                echo _("IPv4").": ".$deploymentObject->host2_v4;
                             }
                             if ($deploymentObject->host2_v4 !== NULL && $deploymentObject->host2_v6 !== NULL) {
                                 echo "<br/>";
                             }
                             if ($deploymentObject->host2_v6 !== NULL) {
-                                echo _("IPv6") . ": " . $deploymentObject->host2_v6;
+                                echo _("IPv6").": ".$deploymentObject->host2_v6;
                             }
                             ?></td>
                         <td><?php echo _("RADIUS port number: ") ?></td>
                         <td><?php echo $deploymentObject->port2; ?></td>
                         <td>
                             <?php
-                                echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] .
-                                     "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . 
-                                     "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "'>";
+                                echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon'].
+                                     "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text']. 
+                                     "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."'>";
                             ?>
                         </td>
                     </tr>
@@ -245,12 +245,12 @@ 
                                     if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) {
                                         echo '<br>';
                                         if ($res['FAILURE'] == 2) {
-                                            echo ' <span style="color: red;">' . _("Activation failure.") . '</span>';
+                                            echo ' <span style="color: red;">'._("Activation failure.").'</span>';
                                         } else {
                                             if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') {
-                                                echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>';
+                                                echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>';
                                             } else {
-                                                echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>';
+                                                echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>';
                                             }
                                         }
                                     }
@@ -270,12 +270,12 @@ 
                                     if ($res['FAILURE'] > 0) {
                                         echo '<br>';
                                         if ($res['FAILURE'] == 2) {
-                                            echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>';
+                                            echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>';
                                         } else {
                                             if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') {
-                                                echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>';
+                                                echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>';
                                             } else {
-                                                echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>';
+                                                echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>';
                                             }
                                         }
                                     }

utils/SP_consistency_check.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 require_once dirname(dirname(__FILE__)) . "/config/_config.php";
 /**
-    * check if URL responds with 200
-    *
-    * @param string $srv server name
-    * @return integer or NULL
+ * check if URL responds with 200
+ *
+ * @param string $srv server name
+ * @return integer or NULL
 */
 function checkConfigRADIUSDaemon ($srv) {
     $ch = curl_init();

Spacing +8 added lines, -8 removed lines

@@ -1,22 +1,22 @@ 
 <?php
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 /**
     * check if URL responds with 200
     *
     * @param string $srv server name
     * @return integer or NULL
 */
-function checkConfigRADIUSDaemon ($srv) {
+function checkConfigRADIUSDaemon($srv) {
     $ch = curl_init();
     if ($ch === FALSE) {
         return NULL;
     }
     $timeout = 10;
-    curl_setopt ( $ch, CURLOPT_URL, $srv );
-    curl_setopt ( $ch, CURLOPT_RETURNTRANSFER, 1 );
-    curl_setopt ( $ch, CURLOPT_TIMEOUT, $timeout );
+    curl_setopt($ch, CURLOPT_URL, $srv);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+    curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
     curl_exec($ch);
-    $http_code = curl_getinfo( $ch, CURLINFO_HTTP_CODE );
+    $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
     curl_close($ch);
     if ($http_code == 200) {
         return 1;
@@ -53,8 +53,8 @@ 
 }
 $siteStatus = array();
 foreach (array_keys($brokenDeployments) as $server_id) {
-    print "check $server_id " . $radiusSite[$server_id] . "\n";
-    $siteStatus[$server_id]  = checkConfigRADIUSDaemon('http://' . $radiusSite[$server_id]);
+    print "check $server_id ".$radiusSite[$server_id]."\n";
+    $siteStatus[$server_id] = checkConfigRADIUSDaemon('http://'.$radiusSite[$server_id]);
     if ($siteStatus[$server_id]) {
         echo "\ncheck radius\n";
         echo \config\Diagnostics::RADIUSSPTEST['port']."\n";

devices/PP_OSU_XML/DevicePPOSUXML.php

Spacing +9 added lines, -9 removed lines

@@ -92,10 +92,10 @@ 
         <NodeName>AAAServerTrustRoot</NodeName>';
         foreach ($this->attributes['internal:CAs'][0] as $oneCert) {
             $retval .= '<Node>
-                         <NodeName>' . $oneCert['uuid'] . '</NodeName>
+                         <NodeName>' . $oneCert['uuid'].'</NodeName>
                              <Node>
                                <NodeName>CertSHA256Fingerprint</NodeName>
-                               <Value>' . $oneCert['sha256'] . '</Value>
+                               <Value>' . $oneCert['sha256'].'</Value>
                              </Node>
                        </Node>
                   ';
@@ -114,7 +114,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>';
     }
 
@@ -128,11 +128,11 @@ 
         <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>
-          <Value>' . $this->attributes['eap:server_name'][0] /* what, only one FQDN allowed? */ . '</Value>
+          <Value>' . $this->attributes['eap:server_name'][0] /* what, only one FQDN allowed? */.'</Value>
         </Node>
         <Node>
           <NodeName>RoamingConsortiumOI</NodeName>
@@ -148,7 +148,7 @@ 
                 $oiList .= ",";
             }
         }
-        $retval .= $oiList . '</Value>
+        $retval .= $oiList.'</Value>
         </Node>
       </Node>
 ';
@@ -165,7 +165,7 @@ 
         <NodeName>Credential</NodeName>
         <Node>
               <NodeName>Realm</NodeName>
-              <Value>' . $this->attributes['internal:realm'][0] . '</Value>
+              <Value>' . $this->attributes['internal:realm'][0].'</Value>
             </Node>';
         /* the example file I got did not include CreationDate, so omit it
          * 
@@ -180,7 +180,7 @@ 
             </Node>
             <Node>
               <NodeName>CertSHA256Fingerprint</NodeName>
-              <Value>' . strtoupper($this->clientCert["sha256"]) /* the actual cert has to go... where? */ . '</Value>
+              <Value>' . strtoupper($this->clientCert["sha256"]) /* the actual cert has to go... where? */.'</Value>
             </Node>
           </Node>
       </Node>
@@ -298,7 +298,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");
         }

devices/linux/DeviceLinuxSh.php

Indentation +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
         }
 
         if (!empty($this->attributes['internal:realm'][0])) {
-           $config['USER_REALM'] = $this->attributes['internal:realm'][0];
+            $config['USER_REALM'] = $this->attributes['internal:realm'][0];
         }
 
         if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {

Braces +1 added lines, -2 removed lines

@@ -203,8 +203,7 @@
 
         if ($this->selectedEap == \core\common\EAP::EAPTYPE_TLS && isset($this->attributes['eap-specific:tls_use_other_id']) && $this->attributes['eap-specific:tls_use_other_id'][0] == 'on') {
             $configRaw['USE_OTHER_TLS_ID'] = true;
-        }
-        else {
+        } else {
             $configRaw['USE_OTHER_TLS_ID'] = false;
         }
 

Spacing +8 added lines, -8 removed lines

@@ -51,7 +51,7 @@ 
         $installerPath = $this->installerBasename.".sh";
         $this->copyFile("eduroam_linux_main.sh", $installerPath);
 
-        if ( !file_exists($installerPath) ) {
+        if (!file_exists($installerPath)) {
             throw new Exception('File not found.');
         }
 
@@ -68,7 +68,7 @@ 
             fwrite($installer, 'printf -v INIT_CONFIRMATION "$INIT_CONFIRMATION_TMP" "$ORGANISATION"'."\n\n");
             fwrite($installer, 'main "$@"; exit'."\n");
         } catch (Exception $e) {
-            echo 'Error message: ' .$e->getMessage();
+            echo 'Error message: '.$e->getMessage();
         } finally {
             fclose($installer);
             return($installerPath);
@@ -204,11 +204,11 @@ 
            $config['USER_REALM'] = $this->attributes['internal:realm'][0];
         }
 
-        if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
+        if (!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
             $configRaw['HINT_USER_INPUT'] = true;
         }
 
-        if(!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
+        if (!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
             $configRaw['VERIFY_USER_REALM_INPUT'] = true;
         } else {
             $configRaw['VERIFY_USER_REALM_INPUT'] = false;
@@ -219,7 +219,7 @@ 
         }
 
         foreach ($configRaw as $name => $value) {
-            fwrite($file, $name ."=". $value."\n");
+            fwrite($file, $name."=".$value."\n");
         }
 
         if ($tou === '') {
@@ -283,7 +283,7 @@ 
             }
             $out .= "'DNS:$oneServer'";
         }
-        return "(".$out. ")";
+        return "(".$out.")";
     }
 
     /**
@@ -323,7 +323,7 @@ 
      *
      * @return string
      */
-    private function mkCAfile(){
+    private function mkCAfile() {
         $out = '';
         $cAlist = $this->attributes['internal:CAs'][0];
         foreach ($cAlist as $oneCa) {
@@ -339,7 +339,7 @@ 
      */
     private function mkIntro() {
         \core\common\Entity::intoThePotatoes();
-        $out = _("This installer has been prepared for %s").'\n\n'._("More information and comments:").'\n\nE-Mail: %s\nWWW: %s\n\n' .
+        $out = _("This installer has been prepared for %s").'\n\n'._("More information and comments:").'\n\nE-Mail: %s\nWWW: %s\n\n'.
             _("Installer created with software from the GEANT project.");
         \core\common\Entity::outOfThePotatoes();
         return $out;

web/admin/overview_certificates.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $deco = new \web\lib\admin\PageDecoration();
@@ -81,7 +81,7 @@ 
         foreach ($theFed->listTlsCertificates() as $oneCert) { // fetch list a second time, in case we got a cert
             $status = $oneCert['STATUS'];
             if ($status == "ISSUED") {
-                $status = "<span onclick='alert(\"".str_replace("\n","\\n",$oneCert['CERT'])."\");'>$status</span>";
+                $status = "<span onclick='alert(\"".str_replace("\n", "\\n", $oneCert['CERT'])."\");'>$status</span>";
             }
             echo "<tr><td>".$oneCert['REQSERIAL']."</td><td>".$oneCert['DN']."</td><td>".$status."</td><td>".$oneCert['EXPIRY']."</td></tr>";
         }

core/ProfileSilverbullet.php

Spacing +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
 
 // realm is automatically calculated, then stored in DB
 
-        $this->realm = "opaquehash@$myInst->identifier-$this->identifier." . strtolower($myInst->federation) . \config\ConfAssistant::SILVERBULLET['realm_suffix'];
+        $this->realm = "opaquehash@$myInst->identifier-$this->identifier.".strtolower($myInst->federation).\config\ConfAssistant::SILVERBULLET['realm_suffix'];
         $localValueIfAny = "";
 
 // but there's some common internal attributes populated directly
@@ -113,11 +113,11 @@ 
 
         // and we need to populate eap:server_name and eap:ca_file with the NRO-specific EAP information
         $silverbulletAttributes = [
-            "eap:server_name" => "auth." . strtolower($myFed->tld) . \config\ConfAssistant::SILVERBULLET['server_suffix'],
+            "eap:server_name" => "auth.".strtolower($myFed->tld).\config\ConfAssistant::SILVERBULLET['server_suffix'],
         ];
         $temp = array_merge($this->addInternalAttributes($internalAttributes), $this->addInternalAttributes($silverbulletAttributes));
         $x509 = new \core\common\X509();
-        $caHandle = fopen(dirname(__FILE__) . "/../config/SilverbulletServerCerts/" . strtoupper($myFed->tld) . "/root.pem", "r");
+        $caHandle = fopen(dirname(__FILE__)."/../config/SilverbulletServerCerts/".strtoupper($myFed->tld)."/root.pem", "r");
         if ($caHandle !== FALSE) {
             $cAFile = fread($caHandle, 16000000);
             foreach ($x509->splitCertificate($cAFile) as $oneCa) {
@@ -273,7 +273,7 @@ 
         if (empty($certNames)) {
             return [];
         }
-        $namesCondensed = "'" . implode("' OR username = '", $certNames) . "'";
+        $namesCondensed = "'".implode("' OR username = '", $certNames)."'";
         $serverHandles = DBConnection::handle("RADIUS");
         $returnarray = [];
         foreach ($serverHandles as $oneDbServer) {

core/common/X509.php

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
     public function der2pem($derData)
     {
         $pem = chunk_split(base64_encode($derData), 64, "\n");
-        $pem = "-----BEGIN CERTIFICATE-----\n" . $pem . "-----END CERTIFICATE-----\n";
+        $pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n";
         return $pem;
     }
 

core/common/Logging.php

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
      */
     private function writeToFile($filename, $message)
     {
-        file_put_contents(\config\Master::PATHS['logdir'] . "/$filename", sprintf("%-015s", microtime(TRUE)) . $message, FILE_APPEND);
+        file_put_contents(\config\Master::PATHS['logdir']."/$filename", sprintf("%-015s", microtime(TRUE)).$message, FILE_APPEND);
     }
 
     /**
@@ -81,7 +81,7 @@ 
         } else {
             $output .= var_export($stuff, TRUE);
         }
-        $output = $prefix . $output . $suffix;
+        $output = $prefix.$output.$suffix;
         $this->writeToFile("debug.log", $output);
 
         return;
@@ -129,6 +129,6 @@ 
         $logTextStep1 = preg_replace("/[\n\r]/", "", $query);
         $logTextStep2 = preg_replace("/ +/", " ", $logTextStep1);
         $logTextStep3 = iconv("UTF-8", "UTF-8//IGNORE", $logTextStep2);
-        $this->writeToFile("audit-SQL.log", " " . $logTextStep3 . "\n");
+        $this->writeToFile("audit-SQL.log", " ".$logTextStep3."\n");
     }
 }
\ No newline at end of file

core/DeviceFactory.php

Spacing +3 added lines, -3 removed lines

@@ -65,8 +65,8 @@ 
         parent::__construct();
         $Dev = \devices\Devices::listDevices();
         if (isset($Dev[$blueprint])) {
-            $this->loggerInstance->debug(4, "loaded: devices/" . $Dev[$blueprint]['directory'] . "/" . $Dev[$blueprint]['module'] . ".php\n");
-            $class_name = "\devices\\" . $Dev[$blueprint]['directory'] . "\Device" . $Dev[$blueprint]['module'];
+            $this->loggerInstance->debug(4, "loaded: devices/".$Dev[$blueprint]['directory']."/".$Dev[$blueprint]['module'].".php\n");
+            $class_name = "\devices\\".$Dev[$blueprint]['directory']."\Device".$Dev[$blueprint]['module'];
             $this->device = new $class_name();
             if (!$this->device) {
                 $this->loggerInstance->debug(2, "module loading failed");
@@ -75,7 +75,7 @@ 
         } else {
             echo("unknown devicename:$blueprint\n");
         }
-        $this->device->module_path = ROOT . '/devices/' . $Dev[$blueprint]['directory'];
+        $this->device->module_path = ROOT.'/devices/'.$Dev[$blueprint]['directory'];
         $this->device->signer = isset($Dev[$blueprint]['signer']) ? $Dev[$blueprint]['signer'] : 0;
         $this->device->device_id = $blueprint;
         $options = \devices\Devices::$Options;