GEANT / CAT

web/diag/action_realmcheck.php

Spacing +58 added lines, -58 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
+require_once dirname(dirname(__DIR__))."/config/_config.php";
 
 $loggerInstance = new \core\common\Logging();
 
@@ -65,13 +65,13 @@ 
         $testsuite = new \core\diag\RADIUSTests($check_realm, $testedProfile->getRealmCheckOuterUsername(), $testedProfile->getEapMethodsinOrderOfPreference(1), $testedProfile->getCollapsedAttributes()['eap:server_name'], $testedProfile->getCollapsedAttributes()["eap:ca_file"]);
         $rfc7585suite = new \core\diag\RFC7585Tests($check_realm);
     } else {
-        $error_message = _("You asked for a realm check, but we don't know the realm for this profile!") . "</p>";
+        $error_message = _("You asked for a realm check, but we don't know the realm for this profile!")."</p>";
     }
 } else { // someone else's realm, and we don't know anything about it... only shallow checks
     $check_realm = $validator->realm($realm ?? $_SESSION['check_realm'] ?? "");
     if ($check_realm !== FALSE) {
         $_SESSION['check_realm'] = $check_realm;
-        $testsuite = new \core\diag\RADIUSTests($check_realm, "@" . $check_realm);
+        $testsuite = new \core\diag\RADIUSTests($check_realm, "@".$check_realm);
         $rfc7585suite = new \core\diag\RFC7585Tests($check_realm);
     } else {
         $error_message = _("No valid realm name given, cannot execute any checks!");
@@ -119,7 +119,7 @@ 
     var listofcas = "<?php echo _("You should update your list of accredited CAs") ?>";
     var getitfrom = "<?php echo _("Get it from here.") ?>";
     var listsource = "<?php echo CONFIG_DIAGNOSTICS['RADIUSTESTS']['accreditedCAsURL'] ?>";
-    var moretext = "<?php echo _("more") . "&raquo;" ?>";
+    var moretext = "<?php echo _("more")."&raquo;" ?>";
     var lesstext = "<?php echo "&laquo" ?>";
     var morealltext = "<?php echo _("Show detailed information for all tests") ?>";
     var unknownca_code = "<?php echo \core\diag\RADIUSTests::CERTPROB_UNKNOWN_CA ?>";
@@ -256,7 +256,7 @@ 
                         }
                     }
                     cliinfo = cliinfo + '<li><table><tbody><tr><td class="icon_td"><img class="icon" src="' + icons[level] + '" style="width: 24px;"></td><td>' + state;
-                    cliinfo = cliinfo + ' <?php echo "(" . sprintf(_("elapsed time: %sms."), "'+data.ca[key].certificate[c].time_millisec+'&nbsp;") . ")"; ?>' + add + '</td></tr>';
+                    cliinfo = cliinfo + ' <?php echo "(".sprintf(_("elapsed time: %sms."), "'+data.ca[key].certificate[c].time_millisec+'&nbsp;").")"; ?>' + add + '</td></tr>';
                     cliinfo = cliinfo + '</tbody></table></ul></li>';
                     if (data.ca[key].certificate[c].finalerror === 1) {
                         cliinfo = cliinfo + '<li>' + restskipped + '</li>';
@@ -426,8 +426,8 @@ 
 <?php
 foreach (CONFIG_DIAGNOSTICS['RADIUSTESTS']['UDP-hosts'] as $hostindex => $host) {
     print "
-$(\"#live_src" . $hostindex . "_img\").attr('src',icon_loading);
-$(\"#live_src" . $hostindex . "_img\").show();
+$(\"#live_src" . $hostindex."_img\").attr('src',icon_loading);
+$(\"#live_src" . $hostindex."_img\").show();
 $.ajax({
     url: 'radius_tests.php?src=0&hostindex=$hostindex&realm='+realm,
     type: 'POST',
@@ -457,15 +457,15 @@ 
 <?php
 foreach (CONFIG_DIAGNOSTICS['RADIUSTESTS']['UDP-hosts'] as $hostindex => $host) {
     if ($testedProfile !== NULL) {
-        $extraarg = "profile_id: " . $testedProfile->identifier . ", ";
+        $extraarg = "profile_id: ".$testedProfile->identifier.", ";
     } else {
         $extraarg = "";
     }
     print "
-$(\"#src" . $hostindex . "_img\").attr('src',icon_loading);
+$(\"#src" . $hostindex."_img\").attr('src',icon_loading);
 $(\"#src$hostindex\").html('');
 running_ajax_stat++;
-$.get('radius_tests.php',{test_type: 'udp', $extraarg realm: realm, src: $hostindex, lang: '" . $gui->langObject->getLang() . "', hostindex: '$hostindex'  }, udp, 'json');
+$.get('radius_tests.php',{test_type: 'udp', $extraarg realm: realm, src: $hostindex, lang: '".$gui->langObject->getLang()."', hostindex: '$hostindex'  }, udp, 'json');
 
 ";
 }
@@ -492,7 +492,7 @@ 
     if ($check_realm === FALSE) {
         print "<p>$error_message</p>";
     } else {
-        print "<h1>" . sprintf(_("Realm testing for: %s"), $check_realm) . "</h1>\n";
+        print "<h1>".sprintf(_("Realm testing for: %s"), $check_realm)."</h1>\n";
         ?>
         <div id="debug_out" style="display: none"></div>
         <div id="tabs" style="min-width: 600px; max-width:800px">
@@ -509,12 +509,12 @@ 
                     </legend>
                     <?php
                     // NAPTR existence check
-                    echo "<strong>" . _("DNS chekcs") . "</strong><div>";
+                    echo "<strong>"._("DNS chekcs")."</strong><div>";
                     $naptr = $rfc7585suite->relevantNAPTR();
                     if ($naptr != \core\diag\RADIUSTests::RETVAL_NOTCONFIGURED) {
                         echo "<table>";
                         // output in friendly words
-                        echo "<tr><td>" . _("Checking NAPTR existence:") . "</td><td>";
+                        echo "<tr><td>"._("Checking NAPTR existence:")."</td><td>";
                         switch ($naptr) {
                             case \core\diag\RFC7585Tests::RETVAL_NONAPTR:
                                 echo _("This realm has no NAPTR records.");
@@ -529,7 +529,7 @@ 
 
                         // compliance checks for NAPTRs
                         if ($naptr > 0) {
-                            echo "<tr><td>" . _("Checking NAPTR compliance (flag = S and regex = {empty}):") . "</td><td>";
+                            echo "<tr><td>"._("Checking NAPTR compliance (flag = S and regex = {empty}):")."</td><td>";
                             $naptr_valid = $rfc7585suite->relevantNAPTRcompliance();
                             switch ($naptr_valid) {
                                 case \core\diag\RADIUSTests::RETVAL_OK:
@@ -546,7 +546,7 @@ 
 
                         if ($naptr > 0 && $naptr_valid == \core\diag\RADIUSTests::RETVAL_OK) {
                             $srv = $rfc7585suite->relevantNAPTRsrvResolution();
-                            echo "<tr><td>" . _("Checking SRVs:") . "</td><td>";
+                            echo "<tr><td>"._("Checking SRVs:")."</td><td>";
                             switch ($srv) {
                                 case \core\diag\RADIUSTests::RETVAL_SKIPPED:
                                     echo _("This check was skipped.");
@@ -562,7 +562,7 @@ 
                         // IP addresses for the hosts
                         if ($naptr > 0 && $naptr_valid == \core\diag\RADIUSTests::RETVAL_OK && $srv > 0) {
                             $hosts = $rfc7585suite->relevantNAPTRhostnameResolution();
-                            echo "<tr><td>" . _("Checking IP address resolution:") . "</td><td>";
+                            echo "<tr><td>"._("Checking IP address resolution:")."</td><td>";
                             switch ($srv) {
                                 case \core\diag\RADIUSTests::RETVAL_SKIPPED:
                                     echo _("This check was skipped.");
@@ -578,12 +578,12 @@ 
 
                         echo "</table><br/><br/>";
                         if (count($testsuite->listerrors()) == 0) {
-                            echo sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC"))) . _("with no DNS errors encountered. Congratulations!");
+                            echo sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC")))._("with no DNS errors encountered. Congratulations!");
                         } else {
-                            echo sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC"))) . _("but there were DNS errors! Check them!") . " " . _("You should re-run the tests after fixing the errors; more errors might be uncovered at that point. The exact error causes are listed below.");
+                            echo sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC")))._("but there were DNS errors! Check them!")." "._("You should re-run the tests after fixing the errors; more errors might be uncovered at that point. The exact error causes are listed below.");
                             echo "<div class='notacceptable'><table>";
                             foreach ($testsuite->listerrors() as $details) {
-                                echo "<tr><td>" . $details['TYPE'] . "</td><td>" . $details['TARGET'] . "</td></tr>";
+                                echo "<tr><td>".$details['TYPE']."</td><td>".$details['TARGET']."</td></tr>";
                             }
                             echo "</table></div>";
                         }
@@ -599,25 +599,25 @@ 
                  $("#dynamic_tests").show();
               ';
                         foreach ($rfc7585suite->NAPTR_hostname_records as $hostindex => $addr) {
-                            $host = ($addr['family'] == "IPv6" ? "[" : "") . $addr['IP'] . ($addr['family'] == "IPv6" ? "]" : "") . ":" . $addr['port'];
+                            $host = ($addr['family'] == "IPv6" ? "[" : "").$addr['IP'].($addr['family'] == "IPv6" ? "]" : "").":".$addr['port'];
                             print "
                             running_ajax_dyn++;
-                            $.ajax({url:'radius_tests.php', data:{test_type: 'capath', realm: realm, src: '$host', lang: '" . $gui->langObject->getLang() . "', hostindex: '$hostindex' }, error: eee, success: capath, dataType: 'json'}); 
+                            $.ajax({url:'radius_tests.php', data:{test_type: 'capath', realm: realm, src: '$host', lang: '".$gui->langObject->getLang()."', hostindex: '$hostindex' }, error: eee, success: capath, dataType: 'json'}); 
                             running_ajax_dyn++;
-                            $.ajax({url:'radius_tests.php', data:{test_type: 'clients', realm: realm, src: '$host', lang: '" . $gui->langObject->getLang() . "', hostindex: '$hostindex' }, error: eee, success: clients, dataType: 'json'}); 
+                            $.ajax({url:'radius_tests.php', data:{test_type: 'clients', realm: realm, src: '$host', lang: '".$gui->langObject->getLang()."', hostindex: '$hostindex' }, error: eee, success: clients, dataType: 'json'}); 
                        ";
                         }
                         echo "}
               </script><hr>";
                     } else {
-                        echo "<tr><td>" . _("Dynamic discovery test is not configured") . "</td><td>";
+                        echo "<tr><td>"._("Dynamic discovery test is not configured")."</td><td>";
                     }
-                    echo "<strong>" . _("Static connectivity tests") . "</strong>
+                    echo "<strong>"._("Static connectivity tests")."</strong>
          <table><tr>
          <td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='main_static_ico' class='icon'></td><td id='main_static_result' style='display:none'>&nbsp;</td>
          </tr></table>";
                     if ($naptr > 0) {
-                        echo "<hr><strong>" . _("Dynamic connectivity tests") . "</strong>
+                        echo "<hr><strong>"._("Dynamic connectivity tests")."</strong>
          <table><tr>
          <td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='main_dynamic_ico' class='icon'></td><td id='main_dynamic_result' style='display:none'>&nbsp;</td>
          </tr></table>";
@@ -637,12 +637,12 @@ 
                     print "<p>";
                     foreach (CONFIG_DIAGNOSTICS['RADIUSTESTS']['UDP-hosts'] as $hostindex => $host) {
                         print "<hr>";
-                        printf(_("Testing from: %s"), "<strong>" . CONFIG_DIAGNOSTICS['RADIUSTESTS']['UDP-hosts'][$hostindex]['display_name'] . "</strong>");
+                        printf(_("Testing from: %s"), "<strong>".CONFIG_DIAGNOSTICS['RADIUSTESTS']['UDP-hosts'][$hostindex]['display_name']."</strong>");
                         print "<table id='results$hostindex'  style='width:100%' class='udp_results'>
 <tr>
-<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='src" . $hostindex . "_img'></td>
+<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='src".$hostindex."_img'></td>
 <td id='src$hostindex' colspan=2>
-" . _("testing...") . "
+"._("testing...")."
 </td>
 </tr>
 </table>";
@@ -661,21 +661,21 @@ 
 
                     <?php
                     echo "<div id='dynamic_tests'><fieldset class='option_container'>
-                <legend><strong>" . _("DYNAMIC connectivity tests") . "</strong></legend>";
+                <legend><strong>" . _("DYNAMIC connectivity tests")."</strong></legend>";
 
                     $resultstoprint = [];
                     if (count($rfc7585suite->NAPTR_hostname_records) > 0) {
-                        $resultstoprint[] = '<table style="align:right; display: none;" id="dynamic_result_fail">' . _("Some errors were found during the tests, see below") . '</table><table style="align:right; display: none;" id="dynamic_result_pass">' . _("All tests passed, congratulations!") . '</table>';
-                        $resultstoprint[] = '<div style="align:right;"><a href="" class="moreall">' . _('Show detailed information for all tests') . '</a></div>' . '<p><strong>' . _("Checking server handshake...") . "</strong><p>";
+                        $resultstoprint[] = '<table style="align:right; display: none;" id="dynamic_result_fail">'._("Some errors were found during the tests, see below").'</table><table style="align:right; display: none;" id="dynamic_result_pass">'._("All tests passed, congratulations!").'</table>';
+                        $resultstoprint[] = '<div style="align:right;"><a href="" class="moreall">'._('Show detailed information for all tests').'</a></div>'.'<p><strong>'._("Checking server handshake...")."</strong><p>";
                         foreach ($rfc7585suite->NAPTR_hostname_records as $hostindex => $addr) {
-                            $bracketaddr = ($addr["family"] == "IPv6" ? "[" . $addr["IP"] . "]" : $addr["IP"]);
-                            $resultstoprint[] = '<p><strong>' . $bracketaddr . ' TCP/' . $addr['port'] . '</strong>';
+                            $bracketaddr = ($addr["family"] == "IPv6" ? "[".$addr["IP"]."]" : $addr["IP"]);
+                            $resultstoprint[] = '<p><strong>'.$bracketaddr.' TCP/'.$addr['port'].'</strong>';
                             $resultstoprint[] = '<ul style="list-style-type: none;" class="caresult"><li>';
                             $resultstoprint[] = "<table id='caresults$hostindex'  style='width:100%'>
 <tr>
-<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='srcca" . $hostindex . "_img'></td>
+<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='srcca".$hostindex."_img'></td>
 <td id='srcca$hostindex'>
-" . _("testing...") . "
+"._("testing...")."
 </td>
 </tr>
 </table>";
@@ -683,12 +683,12 @@ 
                         }
                         $clientstest = [];
                         foreach ($rfc7585suite->NAPTR_hostname_records as $hostindex => $addr) {
-                            $clientstest[] = '<p><strong>' . $addr['IP'] . ' TCP/' . $addr['port'] . '</strong></p><ol>';
+                            $clientstest[] = '<p><strong>'.$addr['IP'].' TCP/'.$addr['port'].'</strong></p><ol>';
                             $clientstest[] = "<span id='clientresults$hostindex$clinx'><table style='width:100%'>
 <tr>
-<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='srcclient" . $hostindex . "_img'></td>
+<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='srcclient".$hostindex."_img'></td>
 <td id='srcclient$hostindex'>
-" . _("testing...") . "
+"._("testing...")."
 </td>
 </tr>
 </table></span>";
@@ -696,7 +696,7 @@ 
                         }
                         echo '<div style="align:right;">';
                         echo join('', $resultstoprint);
-                        echo '<span id="clientstest" style="display: none;"><p><hr><b>' . _('Checking if certificates from  CAs are accepted...') . '</b><p>' . _('A few client certificates will be tested to check if servers are resistant to some certificate problems.') . '<p>';
+                        echo '<span id="clientstest" style="display: none;"><p><hr><b>'._('Checking if certificates from  CAs are accepted...').'</b><p>'._('A few client certificates will be tested to check if servers are resistant to some certificate problems.').'<p>';
                         print join('', $clientstest);
                         echo '</span>';
                         echo '</div>';
@@ -710,7 +710,7 @@ 
                 //     check if truncates/dies on Operator-Name
                 if ($my_profile !== NULL) {
                     echo "<div id='tabs-4'><fieldset class='option_container'>
-                <legend><strong>" . _("Live login test") . "</strong></legend>";
+                <legend><strong>" . _("Live login test")."</strong></legend>";
                     $prof_compl = $my_profile->getEapMethodsinOrderOfPreference(1);
                     if (count($prof_compl) > 0) {
                         $passwordReqired = FALSE;
@@ -723,34 +723,34 @@ 
                                 $clientCertRequired = TRUE;
                             }
                         }
-                        echo "<div id='disposable_credential_container'><p>" . _("If you enter an existing login credential here, you can test the actual authentication from various checkpoints all over the world.") . "</p>
-                    <p>" . _("The test will use all EAP types you have set in your profile information to check whether the right CAs and server names are used, and of course whether the login with these credentials and the given EAP type actually worked. If you have set anonymous outer ID, the test will use that.") . "</p>
-                    <p>" . _("Note: the tool purposefully does not offer you to save these credentials, and they will never be saved in any way on the server side. Please use only <strong>temporary test accounts</strong> here; permanently valid test accounts in the wild are considered harmful!") . "</p></div>
+                        echo "<div id='disposable_credential_container'><p>"._("If you enter an existing login credential here, you can test the actual authentication from various checkpoints all over the world.")."</p>
+                    <p>" . _("The test will use all EAP types you have set in your profile information to check whether the right CAs and server names are used, and of course whether the login with these credentials and the given EAP type actually worked. If you have set anonymous outer ID, the test will use that.")."</p>
+                    <p>" . _("Note: the tool purposefully does not offer you to save these credentials, and they will never be saved in any way on the server side. Please use only <strong>temporary test accounts</strong> here; permanently valid test accounts in the wild are considered harmful!")."</p></div>
                     <form enctype='multipart/form-data' id='live_form' accept-charset='UTF-8'>
                     <input type='hidden' name='test_type' value='udp_login'>
-                    <input type='hidden' name='lang' value='" . $gui->langObject->getLang() . "'>
-                    <input type='hidden' name='profile_id' value='" . $my_profile->identifier . "'>
+                    <input type='hidden' name='lang' value='" . $gui->langObject->getLang()."'>
+                    <input type='hidden' name='profile_id' value='" . $my_profile->identifier."'>
                     <table id='live_tests'>";
 // if any password based EAP methods are available enable this section
                         if ($passwordReqired) {
-                            echo "<tr><td colspan='2'><strong>" . _("Password-based EAP types") . "</strong></td></tr>
-                        <tr><td>" . _("Real (inner) username:") . "</td><td><input type='text' id='username' class='mandatory' name='username'/></td></tr>";
-                            echo "<tr><td>" . _("Anonymous outer ID (optional):") . "</td><td><input type='text' id='outer_username' name='outer_username'/></td></tr>";
-                            echo "<tr><td>" . _("Password:") . "</td><td><input type='text' id='password' class='mandatory' name='password'/></td></tr>";
+                            echo "<tr><td colspan='2'><strong>"._("Password-based EAP types")."</strong></td></tr>
+                        <tr><td>" . _("Real (inner) username:")."</td><td><input type='text' id='username' class='mandatory' name='username'/></td></tr>";
+                            echo "<tr><td>"._("Anonymous outer ID (optional):")."</td><td><input type='text' id='outer_username' name='outer_username'/></td></tr>";
+                            echo "<tr><td>"._("Password:")."</td><td><input type='text' id='password' class='mandatory' name='password'/></td></tr>";
                         }
                         // ask for cert + privkey if TLS-based method is active
                         if ($clientCertRequired) {
-                            echo "<tr><td colspan='2'><strong>" . _("Certificate-based EAP types") . "</strong></td></tr>
-                        <tr><td>" . _("Certificate file (.p12 or .pfx):") . "</td><td><input type='file' id='cert' accept='application/x-pkcs12' name='cert'/></td></tr>
-                        <tr><td>" . _("Certificate password, if any:") . "</td><td><input type='text' id='privkey' name='privkey_pass'/></td></tr>
-                        <tr><td>" . _("Username, if different from certificate Subject:") . "</td><td><input type='text' id='tls_username' name='tls_username'/></td></tr>";
+                            echo "<tr><td colspan='2'><strong>"._("Certificate-based EAP types")."</strong></td></tr>
+                        <tr><td>" . _("Certificate file (.p12 or .pfx):")."</td><td><input type='file' id='cert' accept='application/x-pkcs12' name='cert'/></td></tr>
+                        <tr><td>" . _("Certificate password, if any:")."</td><td><input type='text' id='privkey' name='privkey_pass'/></td></tr>
+                        <tr><td>" . _("Username, if different from certificate Subject:")."</td><td><input type='text' id='tls_username' name='tls_username'/></td></tr>";
                         }
-                        echo "<tr><td colspan='2'><button id='submit_credentials'>" . _("Submit credentials") . "</button></td></tr></table></form>";
+                        echo "<tr><td colspan='2'><button id='submit_credentials'>"._("Submit credentials")."</button></td></tr></table></form>";
                         echo "<div id='live_login_results' style='display:none'>";
                         foreach (CONFIG_DIAGNOSTICS['RADIUSTESTS']['UDP-hosts'] as $hostindex => $host) {
                             print "<hr>";
-                            printf(_("Testing from: %s"), "<strong>" . CONFIG_DIAGNOSTICS['RADIUSTESTS']['UDP-hosts'][$hostindex]['display_name'] . "</strong>");
-                            print "<span style='position:relative'><img src='../resources/images/icons/loading51.gif' id='live_src" . $hostindex . "_img' style='width:24px; position: absolute; left: 20px; bottom: 0px; '></span>";
+                            printf(_("Testing from: %s"), "<strong>".CONFIG_DIAGNOSTICS['RADIUSTESTS']['UDP-hosts'][$hostindex]['display_name']."</strong>");
+                            print "<span style='position:relative'><img src='../resources/images/icons/loading51.gif' id='live_src".$hostindex."_img' style='width:24px; position: absolute; left: 20px; bottom: 0px; '></span>";
                             print "<div id='eap_test$hostindex' class='eap_test_results'></div>";
                         }
                         echo "</div>";
@@ -765,9 +765,9 @@ 
             }
 
             if (isset($_POST['comefrom'])) {
-                $return = htmlspecialchars_decode($_POST['comefrom']) . "?inst_id=" . $my_inst->identifier;
+                $return = htmlspecialchars_decode($_POST['comefrom'])."?inst_id=".$my_inst->identifier;
                 echo "<form method='post' action='$return' accept-charset='UTF-8'>
-                    <button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_CLOSE . "'>" . sprintf(_("Return to %s administrator area"), core\common\Entity::$nomenclature_inst) . "</button>"
+                    <button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_CLOSE."'>".sprintf(_("Return to %s administrator area"), core\common\Entity::$nomenclature_inst)."</button>"
                 . "</form>";
             }
             if ($check_realm !== FALSE) {

core/SanityTests.php

Spacing +41 added lines, -41 removed lines

@@ -49,9 +49,9 @@ 
 use GeoIp2\Database\Reader;
 use \Exception;
 
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
-require_once dirname(dirname(__FILE__)) . "/core/PHPMailer/src/PHPMailer.php";
-require_once dirname(dirname(__FILE__)) . "/core/PHPMailer/src/SMTP.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
+require_once dirname(dirname(__FILE__))."/core/PHPMailer/src/PHPMailer.php";
+require_once dirname(dirname(__FILE__))."/core/PHPMailer/src/SMTP.php";
 
 class SanityTests extends CAT
 {
@@ -93,7 +93,7 @@ 
         $this->test_result = [];
         $this->test_result['global'] = 0;
         // parse the schema file to find out the number of expected rows...
-        $schema = file(dirname(dirname(__FILE__)) . "/schema/schema.sql");
+        $schema = file(dirname(dirname(__FILE__))."/schema/schema.sql");
         $this->profile_option_ct = 0;
         $passedTheWindmill = FALSE;
         foreach ($schema as $schemaLine) {
@@ -120,7 +120,7 @@ 
     {
         $this->out[$test] = [];
         $this->name = $test;
-        $m_name = $test . '_test';
+        $m_name = $test.'_test';
         $this->test_result[$test] = 0;
         if (!method_exists($this, $m_name)) {
             $this->testReturn(\core\common\Entity::L_ERROR, "Configuration error, no test configured for <strong>$test</strong>.");
@@ -229,9 +229,9 @@ 
     private function php_test()
     {
         if (version_compare(phpversion(), $this->php_needversion, '>=')) {
-            $this->testReturn(\core\common\Entity::L_OK, "<strong>PHP</strong> is sufficiently recent. You are running " . phpversion() . ".");
+            $this->testReturn(\core\common\Entity::L_OK, "<strong>PHP</strong> is sufficiently recent. You are running ".phpversion().".");
         } else {
-            $this->testReturn(\core\common\Entity::L_ERROR, "<strong>PHP</strong> is too old. We need at least $this->php_needversion, but you only have " . phpversion() . ".");
+            $this->testReturn(\core\common\Entity::L_ERROR, "<strong>PHP</strong> is too old. We need at least $this->php_needversion, but you only have ".phpversion().".");
         }
     }
 
@@ -248,7 +248,7 @@ 
             $this->testReturn(\core\common\Entity::L_OK, "<strong>cat_base_url</strong> set correctly");
         } else {
             $rootFromScript = $m[1] === '' ? '/' : $m[1];
-            $this->testReturn(\core\common\Entity::L_ERROR, "<strong>cat_base_url</strong> is set to <strong>" . CONFIG['PATHS']['cat_base_url'] . "</strong> and should be <strong>$rootFromScript</strong>");
+            $this->testReturn(\core\common\Entity::L_ERROR, "<strong>cat_base_url</strong> is set to <strong>".CONFIG['PATHS']['cat_base_url']."</strong> and should be <strong>$rootFromScript</strong>");
         }
     }
 
@@ -266,9 +266,9 @@ 
             $SSPconfig = \SimpleSAML\Configuration::getInstance();
             $sspVersion = explode('.', $SSPconfig->getVersion());
             if ((int) $sspVersion[0] >= $this->ssp_needversion['major'] && (int) $sspVersion[1] >= $this->ssp_needversion['minor']) {
-                $this->testReturn(\core\common\Entity::L_OK, "<strong>simpleSAMLphp</strong> is sufficently recent. You are running " . implode('.', $sspVersion));
+                $this->testReturn(\core\common\Entity::L_OK, "<strong>simpleSAMLphp</strong> is sufficently recent. You are running ".implode('.', $sspVersion));
             } else {
-                $this->testReturn(\core\common\Entity::L_ERROR, "<strong>simpleSAMLphp</strong> is too old. We need at least " . implode('.', $this->ssp_needversion));
+                $this->testReturn(\core\common\Entity::L_ERROR, "<strong>simpleSAMLphp</strong> is too old. We need at least ".implode('.', $this->ssp_needversion));
             }
         }
     }
@@ -329,8 +329,8 @@ 
      */
     private function logdir_test()
     {
-        if (fopen(CONFIG['PATHS']['logdir'] . "/debug.log", "a") == FALSE) {
-            $this->testReturn(\core\common\Entity::L_WARN, "Log files in <strong>" . CONFIG['PATHS']['logdir'] . "</strong> are not writable!");
+        if (fopen(CONFIG['PATHS']['logdir']."/debug.log", "a") == FALSE) {
+            $this->testReturn(\core\common\Entity::L_WARN, "Log files in <strong>".CONFIG['PATHS']['logdir']."</strong> are not writable!");
         } else {
             $this->testReturn(\core\common\Entity::L_OK, "Log directory is writable.");
         }
@@ -367,10 +367,10 @@ 
         } else {
             $classname = 'Imagick';
         }
-        if (class_exists('\\' . $classname)) {
+        if (class_exists('\\'.$classname)) {
             $this->testReturn(\core\common\Entity::L_OK, "PHP extension <strong>$classname</strong> is installed.");
         } else {
-            $this->testReturn(\core\common\Entity::L_ERROR, "PHP extension <strong>$classname</strong> not found! Get it from your distribution or <a href='http://pecl.php.net/get/" . strtolower($classname) . "'>here</a>.");
+            $this->testReturn(\core\common\Entity::L_ERROR, "PHP extension <strong>$classname</strong> not found! Get it from your distribution or <a href='http://pecl.php.net/get/".strtolower($classname)."'>here</a>.");
         }
 
         if (function_exists('ImageCreate')) {
@@ -468,15 +468,15 @@ 
         }
         $output = [];
         $retval = -100;
-        $t = exec($A['exec'] . ' version', $output, $retval);
+        $t = exec($A['exec'].' version', $output, $retval);
         if ($retval != 0 || count($output) != 1) {
             $this->testReturn(\core\common\Entity::L_ERROR, "<strong>openssl</strong> was not found on your system despite being configured!");
             return;
         }
         if ($A['exec_is'] == "EXPLICIT") {
-            $this->testReturn(\core\common\Entity::L_OK, "<strong>" . $output[0] . "</strong> was found and is configured explicitly in your config.");
+            $this->testReturn(\core\common\Entity::L_OK, "<strong>".$output[0]."</strong> was found and is configured explicitly in your config.");
         } else {
-            $this->testReturn(\core\common\Entity::L_WARN, "<strong>" . $output[0] . "</strong> was found, but is not configured with an absolute path in your config.");
+            $this->testReturn(\core\common\Entity::L_WARN, "<strong>".$output[0]."</strong> was found, but is not configured with an absolute path in your config.");
         }
     }
 
@@ -502,7 +502,7 @@ 
         }
         $output = [];
         $retval = -100;
-        $t = exec($A['exec'] . ' -VERSION', $output, $retval);
+        $t = exec($A['exec'].' -VERSION', $output, $retval);
         if ($retval != 0 || count($output) != 1) {
             $this->testReturn(\core\common\Entity::L_ERROR, "<strong>makensis</strong> was not found on your system despite being configured!");
             return;
@@ -513,7 +513,7 @@ 
             $this->testReturn(\core\common\Entity::L_WARN, "<strong>makensis $t</strong> was found, but is not configured with an absolute path in your config.");
         }
         $outputArray = [];
-        exec($A['exec'] . ' -HELP', $outputArray);
+        exec($A['exec'].' -HELP', $outputArray);
         $t1 = count(preg_grep('/INPUTCHARSET/', $outputArray));
         if ($t1 == 1 && CONFIG_CONFASSISTANT['NSIS_VERSION'] == 2) {
             $this->testReturn(\core\common\Entity::L_ERROR, "Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
@@ -540,7 +540,7 @@ 
         $NSIS_Module_status = [];
         foreach ($this->NSIS_Modules as $module) {
             unset($out);
-            exec(CONFIG_CONFASSISTANT['PATHS']['makensis'] . " -V1 '-X!include $module' '-XOutFile $exe' '-XSection X' '-XSectionEnd'", $out, $retval);
+            exec(CONFIG_CONFASSISTANT['PATHS']['makensis']." -V1 '-X!include $module' '-XOutFile $exe' '-XSection X' '-XSectionEnd'", $out, $retval);
             if ($retval > 0) {
                 $NSIS_Module_status[$module] = 0;
             } else {
@@ -605,8 +605,8 @@ 
         $locales = shell_exec("locale -a");
         $allthere = "";
         foreach (CONFIG['LANGUAGES'] as $onelanguage) {
-            if (preg_match("/" . $onelanguage['locale'] . "/", $locales) == 0) {
-                $allthere .= $onelanguage['locale'] . " ";
+            if (preg_match("/".$onelanguage['locale']."/", $locales) == 0) {
+                $allthere .= $onelanguage['locale']." ";
             }
         }
         if ($allthere == "") {
@@ -620,47 +620,47 @@ 
         ["SETTING" => CONFIG['APPEARANCE']['from-mail'],
             "DEFVALUE" => "cat-invite@your-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/from-mail ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => CONFIG['APPEARANCE']['support-contact']['url'],
             "DEFVALUE" => "cat-support@our-cat-installation.example?body=Only%20English%20language%20please!",
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/url ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => CONFIG['APPEARANCE']['support-contact']['display'],
             "DEFVALUE" => "cat-support@our-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/display ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => CONFIG['APPEARANCE']['support-contact']['developer-mail'],
             "DEFVALUE" => "cat-develop@our-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/mail ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => CONFIG['APPEARANCE']['abuse-mail'],
             "DEFVALUE" => "my-abuse-contact@your-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/abuse-mail ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => CONFIG['APPEARANCE']['MOTD'],
             "DEFVALUE" => "Release Candidate. All bugs to be shot on sight!",
             "COMPLAINTSTRING" => "APPEARANCE/MOTD ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => CONFIG['APPEARANCE']['webcert_CRLDP'],
             "DEFVALUE" => ['list', 'of', 'CRL', 'pointers'],
             "COMPLAINTSTRING" => "APPEARANCE/webcert_CRLDP ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => CONFIG['APPEARANCE']['webcert_OCSP'],
             "DEFVALUE" => ['list', 'of', 'OCSP', 'pointers'],
             "COMPLAINTSTRING" => "APPEARANCE/webcert_OCSP ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => CONFIG['DB']['INST']['host'],
             "DEFVALUE" => "db.host.example",
             "COMPLAINTSTRING" => "DB/INST ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => CONFIG['DB']['INST']['host'],
             "DEFVALUE" => "db.host.example",
             "COMPLAINTSTRING" => "DB/USER ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => CONFIG['DB']['EXTERNAL']['host'],
             "DEFVALUE" => "customerdb.otherhost.example",
             "COMPLAINTSTRING" => "DB/EXTERNAL ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
     ];
 
     /**
@@ -688,11 +688,11 @@ 
         if (isset(CONFIG_DIAGNOSTICS['RADIUSTESTS']['TLS-clientcerts'])) {
             foreach (CONFIG_DIAGNOSTICS['RADIUSTESTS']['TLS-clientcerts'] as $cadata) {
                 foreach ($cadata['certificates'] as $cert_files) {
-                    if (file_get_contents(ROOT . "/config/cli-certs/" . $cert_files['public']) === FALSE) {
-                        $defaultvalues .= "CERTIFICATE/" . $cert_files['public'] . " ";
+                    if (file_get_contents(ROOT."/config/cli-certs/".$cert_files['public']) === FALSE) {
+                        $defaultvalues .= "CERTIFICATE/".$cert_files['public']." ";
                     }
-                    if (file_get_contents(ROOT . "/config/cli-certs/" . $cert_files['private']) === FALSE) {
-                        $defaultvalues .= "CERTIFICATE/" . $cert_files['private'] . " ";
+                    if (file_get_contents(ROOT."/config/cli-certs/".$cert_files['private']) === FALSE) {
+                        $defaultvalues .= "CERTIFICATE/".$cert_files['private']." ";
                     }
                 }
             }
@@ -785,14 +785,14 @@ 
         if ($global_no_cache) {
             foreach ($Devs as $dev => $D) {
                 if (empty($D['options']['no_cache']) || $D['options']['no_cache'] != 0) {
-                    $no_cache_dev .= $dev . " ";
+                    $no_cache_dev .= $dev." ";
                     $no_cache_dev_count++;
                 }
             }
         } else {
             foreach ($Devs as $dev => $D) {
                 if (!empty($D['options']['no_cache']) && $D['options']['no_cache'] != 0) {
-                    $no_cache_dev .= $dev . " ";
+                    $no_cache_dev .= $dev." ";
                     $no_cache_dev_count++;
                 }
             }
@@ -831,13 +831,13 @@ 
         $mail->isHTML(FALSE);
         $mail->CharSet = 'UTF-8';
         $mail->From = CONFIG['APPEARANCE']['from-mail'];
-        $mail->FromName = CONFIG['APPEARANCE']['productname'] . " Invitation System";
+        $mail->FromName = CONFIG['APPEARANCE']['productname']." Invitation System";
         $mail->addAddress(CONFIG['APPEARANCE']['abuse-mail']);
         $mail->Subject = "testing CAT configuration mail";
         $mail->Body = "Testing CAT mailing\n";
         $sent = $mail->send();
         if ($sent) {
-            $this->testReturn(\core\common\Entity::L_OK, "mailer settings appear to be working, check " . CONFIG['APPEARANCE']['abuse-mail'] . " mailbox if the message was receiced.");
+            $this->testReturn(\core\common\Entity::L_OK, "mailer settings appear to be working, check ".CONFIG['APPEARANCE']['abuse-mail']." mailbox if the message was receiced.");
         } else {
             $this->testReturn(\core\common\Entity::L_ERROR, "mailer settings failed, check the Config::MAILSETTINGS");
         }

core/common/Entity.php

Spacing +15 added lines, -15 removed lines

@@ -94,7 +94,7 @@ 
      */
     public function __construct() {
         $this->loggerInstance = new Logging();
-        $this->loggerInstance->debug(3, "--- BEGIN constructing class " . get_class($this) . " .\n");
+        $this->loggerInstance->debug(3, "--- BEGIN constructing class ".get_class($this)." .\n");
         $this->languageInstance = new Language();
         Entity::intoThePotatoes("core");
         // some config elements are displayable. We need some dummies to 
@@ -106,7 +106,7 @@ 
         $dummy_inst2 = _("organisation");
         $dummy_inst3 = _("Identity Provider");
         // and do something useless with the strings so that there's no "unused" complaint
-        if (strlen($dummy_NRO . $dummy_inst1 . $dummy_inst2 . $dummy_inst3) < 0) {
+        if (strlen($dummy_NRO.$dummy_inst1.$dummy_inst2.$dummy_inst3) < 0) {
             throw new \Exception("Strings are usually not shorter than 0 characters. We've encountered a string blackhole.");
         }
         Entity::$nomenclature_fed = _(CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation']);
@@ -121,7 +121,7 @@ 
      * Logs the end of lifetime of the entity to the debug log on level 5.
      */
     public function __destruct() {
-        (new Logging())->debug(5, "--- KILL Destructing class " . get_class($this) . " .\n");
+        (new Logging())->debug(5, "--- KILL Destructing class ".get_class($this)." .\n");
     }
 
     /**
@@ -151,7 +151,7 @@ 
      */
     public function createTemporaryDirectory($purpose = 'installer', $failIsFatal = 1) {
         $loggerInstance = new Logging();
-        $name = md5(time() . rand());
+        $name = md5(time().rand());
         $path = ROOT;
         switch ($purpose) {
             case 'silverbullet':
@@ -169,7 +169,7 @@ 
             default:
                 throw new Exception("unable to create temporary directory due to unknown purpose: $purpose\n");
         }
-        $tmpDir = $path . '/' . $name;
+        $tmpDir = $path.'/'.$name;
         $loggerInstance->debug(4, "temp dir: $purpose : $tmpDir\n");
         if (!mkdir($tmpDir, 0700, true)) {
             if ($failIsFatal) {
@@ -189,7 +189,7 @@ 
      * @return void
      */
     public static function rrmdir($dir) {
-        foreach (glob($dir . '/*') as $file) {
+        foreach (glob($dir.'/*') as $file) {
             if (is_dir($file)) {
                 Entity::rrmdir($file);
             } else {
@@ -214,12 +214,12 @@ 
         }
         // these substr() are guaranteed to yield actual string data, as the
         // base string is an MD5 hash - has sufficient length
-        $uuid = /** @scrutinizer ignore-type */ substr($chars, 0, 8) . '-';
-        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 8, 4) . '-';
-        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 12, 4) . '-';
-        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 16, 4) . '-';
+        $uuid = /** @scrutinizer ignore-type */ substr($chars, 0, 8).'-';
+        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 8, 4).'-';
+        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 12, 4).'-';
+        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 16, 4).'-';
         $uuid .= /** @scrutinizer ignore-type */ substr($chars, 20, 12);
-        return $prefix . $uuid;
+        return $prefix.$uuid;
     }
 
     /**
@@ -258,7 +258,7 @@ 
         for ($i = count($trace); $i--; $i > 0) {
             if (isset($trace[$i - 1]['class']) && preg_match('/Entity/', $trace[$i - 1]['class'])) {
                 if ($showTrace) {
-                    echo "FOUND caller: ".print_r($trace[$i],true). " - class is ".$trace[$i]['class'];
+                    echo "FOUND caller: ".print_r($trace[$i], true)." - class is ".$trace[$i]['class'];
                 }
                 $caller = $trace[$i];
                 break;
@@ -269,7 +269,7 @@ 
         $myName = $caller['class'] ?? substr($caller['file'], strlen(ROOT));
         if ($showTrace === TRUE) {   
             echo "<pre>".print_r($trace, true)."</pre>";
-            echo "CLASS = " . $myName ."<br/>";
+            echo "CLASS = ".$myName."<br/>";
         }
         if (preg_match("/diag/", $myName) == 1) {
             $ret = "diagnostics";
@@ -302,10 +302,10 @@ 
         if ($catalogue === NULL) {
             $theCatalogue = Entity::determineOwnCatalogue($trace);
             textdomain($theCatalogue);
-            bindtextdomain($theCatalogue, ROOT . "/translation/");
+            bindtextdomain($theCatalogue, ROOT."/translation/");
         } else {
             textdomain($catalogue);
-            bindtextdomain($catalogue, ROOT . "/translation/");
+            bindtextdomain($catalogue, ROOT."/translation/");
         }
     }
 

core/CertificationAuthorityEduPkiServer.php

Spacing +37 added lines, -37 removed lines

@@ -17,9 +17,9 @@ 
 class CertificationAuthorityEduPkiServer extends EntityWithDBProperties implements CertificationAuthorityInterface
 {
 
-    private const LOCATION_RA_CERT = ROOT . "/config/SilverbulletClientCerts/edupki-test-ra.pem";
-    private const LOCATION_RA_KEY = ROOT . "/config/SilverbulletClientCerts/edupki-test-ra.clearkey";
-    private const LOCATION_WEBROOT = ROOT . "/config/SilverbulletClientCerts/eduPKI-webserver-root.pem";
+    private const LOCATION_RA_CERT = ROOT."/config/SilverbulletClientCerts/edupki-test-ra.pem";
+    private const LOCATION_RA_KEY = ROOT."/config/SilverbulletClientCerts/edupki-test-ra.clearkey";
+    private const LOCATION_WEBROOT = ROOT."/config/SilverbulletClientCerts/eduPKI-webserver-root.pem";
     private const EDUPKI_RA_ID = 700;
     private const EDUPKI_CERT_PROFILE = "Radius Server SOAP";
     private const EDUPKI_RA_PKEY_PASSPHRASE = "...";
@@ -35,13 +35,13 @@ 
         parent::__construct();
 
         if (stat(CertificationAuthorityEduPkiServer::LOCATION_RA_CERT) === FALSE) {
-            throw new Exception("RA operator PEM file not found: " . CertificationAuthorityEduPkiServer::LOCATION_RA_CERT);
+            throw new Exception("RA operator PEM file not found: ".CertificationAuthorityEduPkiServer::LOCATION_RA_CERT);
         }
         if (stat(CertificationAuthorityEduPkiServer::LOCATION_RA_KEY) === FALSE) {
-            throw new Exception("RA operator private key file not found: " . CertificationAuthorityEduPkiServer::LOCATION_RA_KEY);
+            throw new Exception("RA operator private key file not found: ".CertificationAuthorityEduPkiServer::LOCATION_RA_KEY);
         }
         if (stat(CertificationAuthorityEduPkiServer::LOCATION_WEBROOT) === FALSE) {
-            throw new Exception("CA website root CA file not found: " . CertificationAuthorityEduPkiServer::LOCATION_WEBROOT);
+            throw new Exception("CA website root CA file not found: ".CertificationAuthorityEduPkiServer::LOCATION_WEBROOT);
         }
     }
 
@@ -91,19 +91,19 @@ 
         // initialise connection to eduPKI CA / eduroam RA and send the request to them
         try {
             $altArray = [# Array mit den Subject Alternative Names
-                "email:" . $csr["USERMAIL"]
+                "email:".$csr["USERMAIL"]
             ];
             $soapPub = $this->initEduPKISoapSession("PUBLIC");
             $this->loggerInstance->debug(5, "FIRST ACTUAL SOAP REQUEST (Public, newRequest)!\n");
-            $this->loggerInstance->debug(5, "PARAM_1: " . CertificationAuthorityEduPkiServer::EDUPKI_RA_ID . "\n");
-            $this->loggerInstance->debug(5, "PARAM_2: " . $csr["CSR"] . "\n");
+            $this->loggerInstance->debug(5, "PARAM_1: ".CertificationAuthorityEduPkiServer::EDUPKI_RA_ID."\n");
+            $this->loggerInstance->debug(5, "PARAM_2: ".$csr["CSR"]."\n");
             $this->loggerInstance->debug(5, "PARAM_3: ");
             $this->loggerInstance->debug(5, $altArray);
-            $this->loggerInstance->debug(5, "PARAM_4: " . CertificationAuthorityEduPkiServer::EDUPKI_CERT_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: ".CertificationAuthorityEduPkiServer::EDUPKI_CERT_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(
                     CertificationAuthorityEduPkiServer::EDUPKI_RA_ID, # RA-ID
@@ -125,11 +125,11 @@ 
         } 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}:  {
+                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());
         }
         try {
             $soap = $this->initEduPKISoapSession("RA");
@@ -163,7 +163,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
@@ -175,7 +175,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(5, "Actual content to be signed is this:\n  $soapCleartext\n");
-            $execCmd = CONFIG['PATHS']['openssl'] . " smime -sign -binary -in " . $tempdir['dir'] . "/content.txt -out " . $tempdir['dir'] . "/signature.txt -outform pem -inkey " . ROOT . "/config/SilverbulletClientCerts/edupki-test-ra.clearkey -signer " . ROOT . "/config/SilverbulletClientCerts/edupki-test-ra.pem";
+            $execCmd = CONFIG['PATHS']['openssl']." smime -sign -binary -in ".$tempdir['dir']."/content.txt -out ".$tempdir['dir']."/signature.txt -outform pem -inkey ".ROOT."/config/SilverbulletClientCerts/edupki-test-ra.clearkey -signer ".ROOT."/config/SilverbulletClientCerts/edupki-test-ra.pem";
             $this->loggerInstance->debug(2, "Calling openssl smime with following cmdline:   $execCmd\n");
             $output = [];
             $return = 999;
@@ -184,21 +184,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;
     }
@@ -248,9 +248,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']),
@@ -283,12 +283,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['PATHS']['openssl'] . " smime -sign -binary -in " . $tempdir['dir'] . "/content.txt -out " . $tempdir['dir'] . "/signature.txt -outform pem -inkey " . CertificationAuthorityEduPkiServer::LOCATION_RA_KEY . " -signer " . CertificationAuthorityEduPkiServer::LOCATION_RA_CERT;
+            $execCmd = CONFIG['PATHS']['openssl']." smime -sign -binary -in ".$tempdir['dir']."/content.txt -out ".$tempdir['dir']."/signature.txt -outform pem -inkey ".CertificationAuthorityEduPkiServer::LOCATION_RA_KEY." -signer ".CertificationAuthorityEduPkiServer::LOCATION_RA_CERT;
             $this->loggerInstance->debug(2, "Calling openssl smime with following cmdline: $execCmd\n");
             $output = [];
             $return = 999;
@@ -297,7 +297,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.");
@@ -305,9 +305,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());
         }
     }
 
@@ -407,9 +407,9 @@ 
      */
     public function soapToXmlInteger($x)
     {
-        return '<' . $x[0] . '>'
+        return '<'.$x[0].'>'
                 . htmlentities($x[1], ENT_NOQUOTES | ENT_XML1)
-                . '</' . $x[0] . '>';
+                . '</'.$x[0].'>';
     }
 
     /**
@@ -428,9 +428,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['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['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;

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>";
         }

web/admin/action_req_certificate.php

Spacing +17 added lines, -17 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();
@@ -72,7 +72,7 @@ 
     // also send user back to the overview page
     if (isset($_POST['requestcert']) && $_POST['requestcert'] == \web\lib\common\FormElements::BUTTON_SAVE) {
         // basic sanity checks before we hand this over to openssl
-        $sanitisedCsr = $validator->string($_POST['CSR'] ?? "" , TRUE);
+        $sanitisedCsr = $validator->string($_POST['CSR'] ?? "", TRUE);
         if (openssl_csr_get_public_key($sanitisedCsr) === FALSE) {
             throw new Exception("Sorry: Unable to parse the submitted public key - no public key inside?");
         }
@@ -86,7 +86,7 @@ 
                 $fed = $validator->Federation($_POST['NRO-list']);
                 $country = strtoupper($fed->tld);
                 $DN[] = "C=$country";
-                $DN[] = "O=NRO of " . $cat->knownFederations[strtoupper($fed->tld)];
+                $DN[] = "O=NRO of ".$cat->knownFederations[strtoupper($fed->tld)];
                 $DN[] = "CN=comes.from.eduroam.db";
                 $policies[] = "eduroam IdP";
                 $policies[] = "eduroam SP";
@@ -104,11 +104,11 @@ 
             default:
                 throw new Exception("Sorry: Unknown level of issuance requested.");
         }
-        echo "<p>" . _("Requesting a certificate with the following properties");
+        echo "<p>"._("Requesting a certificate with the following properties");
         echo "<ul>";
-        echo "<li>" . _("Policy OIDs: ") . implode(", ", $policies) . "</li>";
-        echo "<li>" . _("Distinguished Name: ") . implode(", ", $DN) . "</li>";
-        echo "<li>" . _("Requester Contact Details: will come from eduroam DB (using stub 'Someone, &lt;someone@somewhere.xy&gt;').") . "</li>";
+        echo "<li>"._("Policy OIDs: ").implode(", ", $policies)."</li>";
+        echo "<li>"._("Distinguished Name: ").implode(", ", $DN)."</li>";
+        echo "<li>"._("Requester Contact Details: will come from eduroam DB (using stub 'Someone, &lt;someone@somewhere.xy&gt;').")."</li>";
         echo "</ul></p>";
         /* $ossl = proc_open("openssl req -subj '/".implode("/", $DN)."'", [ 0 => ["pipe", "r"], 1 => ["pipe", "w"], 2 => [ "file", "/tmp/voodoo-error", "a"] ], $pipes);
         if (is_resource($ossl)) {
@@ -121,13 +121,13 @@ 
             throw new Exception("Calling openssl in a fancy way did not work.");
         }
         echo "<p>"._("This is the new CSR (return code was $retval)")."<pre>$newCsr</pre></p>"; */
-        $newCsrWithMeta = ["CSR" => /* $newCsr */ $_POST['CSR'], "USERNAME" => "Someone", "USERMAIL" => "someone@somewhere.xy", "SUBJECT" => implode(",", $DN) ,"FED" => $country];
+        $newCsrWithMeta = ["CSR" => /* $newCsr */ $_POST['CSR'], "USERNAME" => "Someone", "USERMAIL" => "someone@somewhere.xy", "SUBJECT" => implode(",", $DN), "FED" => $country];
         // our certs can be good for max 5 years
         $fed->requestCertificate($newCsrWithMeta, 1825);
         echo "<p>"._("The certificate was requested.")."</p>";
         ?>
         <form action="overview_certificates.php" method="GET">
-            <button type="submit"><?php echo _("Back to Certificate Overview");?></button>
+            <button type="submit"><?php echo _("Back to Certificate Overview"); ?></button>
         </form>
     <?php
     echo $deco->footer();
@@ -136,14 +136,14 @@ 
 
     // if we did not get a SAVE button, display UI for a fresh request instead
     ?>
-    <h2><?php echo _("1. Certificate Holder Details");?></h2>
+    <h2><?php echo _("1. Certificate Holder Details"); ?></h2>
     <form action="action_req_certificate.php" method="POST">
         <input type="radio" name="LEVEL" id="NRO" value="NRO" checked><?php printf(_("Certificate for %s role"), $uiElements->nomenclatureFed); ?></input>
         <?php
         if (count($feds) == 1) {
             $fedObject = new \core\Federation($feds[0]['value']);
-            echo " <strong>" . $cat->knownFederations[$fedObject->tld] . "</strong>";
-            echo '<input type="hidden" name="NRO-list" id="NRO-list" value="' . $fedObject->tld . '"/>';
+            echo " <strong>".$cat->knownFederations[$fedObject->tld]."</strong>";
+            echo '<input type="hidden" name="NRO-list" id="NRO-list" value="'.$fedObject->tld.'"/>';
         } else {
             ?>
             <select name="NRO-list" id="NRO-list">
@@ -151,7 +151,7 @@ 
                 <?php
                 foreach ($feds as $oneFed) {
                     $fedObject = new \core\Federation($oneFed['value']);
-                    echo '<option value="' . strtoupper($fedObject->tld) . '">' . $cat->knownFederations[$fedObject->tld] . "</option>";
+                    echo '<option value="'.strtoupper($fedObject->tld).'">'.$cat->knownFederations[$fedObject->tld]."</option>";
                 }
                 ?>
             </select>
@@ -171,15 +171,15 @@ 
                 }
             }
             foreach ($allIdPs as $id => $name) {
-                echo '<option value="' . $id . '">' . $name . "</option>";
+                echo '<option value="'.$id.'">'.$name."</option>";
             }
             ?>
         </select>
         <br/>
-        <h2><?php echo _("2. CSR generation");?></h2>
-        <p><?php echo _("One way to generate an acceptable certificate request is via this openssl one-liner:");?></p>
+        <h2><?php echo _("2. CSR generation"); ?></h2>
+        <p><?php echo _("One way to generate an acceptable certificate request is via this openssl one-liner:"); ?></p>
         <p>openssl req -new -newkey rsa:4096 -out test.csr -keyout test.key -subj /DC=test/DC=test/DC=eduroam/C=XY/O=WillBeReplaced/CN=will.be.replaced</p>
-        <h2><?php echo _("3. Submission");?></h2>
+        <h2><?php echo _("3. Submission"); ?></h2>
         <?php echo _("Please paste your CSR here:"); ?><br/><textarea name="CSR" id="CSR" rows="20" cols="85"/></textarea><br/>
     <button type="submit" name="requestcert" id="requestcert" value="<?php echo \web\lib\common\FormElements::BUTTON_SAVE ?>"><?php echo _("Send request"); ?></button>
 </form>

web/admin/edit_idp_result.php

Spacing +14 added lines, -14 removed lines

@@ -20,7 +20,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $loggerInstance = new \core\common\Logging();
@@ -40,7 +40,7 @@ 
 switch ($_POST['submitbutton']) {
     case web\lib\common\FormElements::BUTTON_DELETE:
         $myInstOriginal->destroy();
-        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP " . $instId);
+        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP ".$instId);
         header("Location: overview_user.php");
         exit;
     case web\lib\common\FormElements::BUTTON_FLUSH_AND_RESTART:
@@ -50,7 +50,7 @@ 
         }
         // flush all IdP attributes and send user to creation wizard
         $myInstOriginal->flushAttributes();
-        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP starting over" . $instId);
+        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP starting over".$instId);
         header("Location: edit_idp.php?inst_id=$instId&wizard=true");
         exit;
     case web\lib\common\FormElements::BUTTON_SAVE:
@@ -63,19 +63,19 @@ 
             exit(0);
         }
         $inst_name = $myInstOriginal->name;
-        echo "<h1>" . sprintf(_("Submitted attributes for IdP '%s'"), $inst_name) . "</h1>";
+        echo "<h1>".sprintf(_("Submitted attributes for IdP '%s'"), $inst_name)."</h1>";
         echo "<table>";
         echo $optionParser->processSubmittedFields($myInstOriginal, $_POST, $_FILES);
         echo "</table>";
 // delete cached logo, if present
-        $dir = ROOT . '/web/downloads/logos/';
-        $globResult = glob($dir . $myInstOriginal->identifier . "_*.png");
+        $dir = ROOT.'/web/downloads/logos/';
+        $globResult = glob($dir.$myInstOriginal->identifier."_*.png");
         if ($globResult === FALSE) { // we should catch the improbable error condition
             $globResult = [];
         }
         array_map('unlink', $globResult);
         $loggerInstance->debug(4, "UNLINK from $dir\n");
-        $loggerInstance->writeAudit($_SESSION['user'], "MOD", "IdP " . $myInstOriginal->identifier . " - attributes changed");
+        $loggerInstance->writeAudit($_SESSION['user'], "MOD", "IdP ".$myInstOriginal->identifier." - attributes changed");
 
 // re-instantiate ourselves... profiles need fresh data
 
@@ -85,15 +85,15 @@ 
 
         if (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) && count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0) {
             foreach (CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'] as $ssidname) {
-                $ssids[] = $ssidname . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)") );
+                $ssids[] = $ssidname." ".(isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)"));
             }
         }
 
         foreach ($myInstReinstantiated->getAttributes("media:SSID_with_legacy") as $ssidname) {
-            $ssids[] = $ssidname['value'] . " " . _("(WPA2/AES and WPA/TKIP)");
+            $ssids[] = $ssidname['value']." "._("(WPA2/AES and WPA/TKIP)");
         }
         foreach ($myInstReinstantiated->getAttributes("media:SSID") as $ssidname) {
-            $ssids[] = $ssidname['value'] . " " . _("(WPA2/AES)");
+            $ssids[] = $ssidname['value']." "._("(WPA2/AES)");
         }
 
         echo "<table>";
@@ -101,7 +101,7 @@ 
         if (count($ssids) > 0) {
             $printedlist = "";
             foreach ($ssids as $names) {
-                $printedlist = $printedlist . "$names ";
+                $printedlist = $printedlist."$names ";
             }
             echo $uiElements->boxOkay(sprintf(_("Your installers will configure the following SSIDs: <strong>%s</strong>"), $printedlist), _("SSIDs configured"));
         }
@@ -129,7 +129,7 @@ 
                 // did we get an email address? then, show the silverbullet jumpstart button
                 // otherwise, issue a smartass comment
                 if (count($myInstReinstantiated->getAttributes("support:email")) > 0) {
-                    echo "<form method='post' action='edit_silverbullet.php?inst_id=$myInstReinstantiated->identifier' accept-charset='UTF-8'><button type='submit'>" . sprintf(_("Continue to %s properties"), \core\ProfileSilverbullet::PRODUCTNAME) . "</button></form>";
+                    echo "<form method='post' action='edit_silverbullet.php?inst_id=$myInstReinstantiated->identifier' accept-charset='UTF-8'><button type='submit'>".sprintf(_("Continue to %s properties"), \core\ProfileSilverbullet::PRODUCTNAME)."</button></form>";
                 } else {
                     echo "<table>";
                     echo $uiElements->boxError(sprintf(_("You did not submit an e-mail address. This is required for %s. Please go to the %s dashboard and edit your helpdesk settings to include a helpdesk e-mail address."), core\ProfileSilverbullet::PRODUCTNAME, $ui->nomenclatureInst), _("No support e-mail!"));
@@ -137,10 +137,10 @@ 
                 }
             }
             if (CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_RADIUS'] == "LOCAL") {
-                echo "<br/><form method='post' action='edit_profile.php?inst_id=$myInstReinstantiated->identifier' accept-charset='UTF-8'><button type='submit'>" . _("Continue to RADIUS/EAP profile definition") . "</button></form>";
+                echo "<br/><form method='post' action='edit_profile.php?inst_id=$myInstReinstantiated->identifier' accept-charset='UTF-8'><button type='submit'>"._("Continue to RADIUS/EAP profile definition")."</button></form>";
             }
         }
-        echo "<br/><form method='post' action='overview_idp.php?inst_id=$myInstReinstantiated->identifier' accept-charset='UTF-8'><button type='submit'>" . _("Continue to dashboard") . "</button></form>";
+        echo "<br/><form method='post' action='overview_idp.php?inst_id=$myInstReinstantiated->identifier' accept-charset='UTF-8'><button type='submit'>"._("Continue to dashboard")."</button></form>";
         echo $deco->footer();
         break;
     default:

web/admin/edit_profile_result.php

Spacing +13 added lines, -13 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-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();
@@ -55,7 +55,7 @@ 
             $profile = $validator->Profile($_GET['profile_id'], $my_inst->identifier);
         } else {
             $profile = $my_inst->newProfile(core\AbstractProfile::PROFILETYPE_RADIUS);
-            $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP " . $my_inst->identifier . " - Profile created");
+            $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP ".$my_inst->identifier." - Profile created");
         }
         
         if (!$profile instanceof \core\ProfileRADIUS) {
@@ -117,7 +117,7 @@ 
             $uiElements = new web\lib\admin\UIElements();
             // set realm info, if submitted
             if ($realm !== FALSE) {
-                $profile->setRealm($anonLocal . "@" . $realm);
+                $profile->setRealm($anonLocal."@".$realm);
                 echo $uiElements->boxOkay(sprintf(_("Realm: <strong>%s</strong>"), $realm));
             } else {
                 $profile->setRealm("");
@@ -140,7 +140,7 @@ 
                     echo $uiElements->boxError(_("Realm check username cannot be configured: realm is missing!"));
                 } else {
                     $profile->setRealmcheckUser(true, $checkuser_name);
-                    echo $uiElements->boxOkay(sprintf(_("Special username for realm check is <strong>%s</strong>, the value is <strong>%s</strong>"), _("ON"), $checkuser_name . "@" . $realm));
+                    echo $uiElements->boxOkay(sprintf(_("Special username for realm check is <strong>%s</strong>, the value is <strong>%s</strong>"), _("ON"), $checkuser_name."@".$realm));
                 }
             } else {
                 $profile->setRealmCheckUser(false);
@@ -153,7 +153,7 @@ 
                 } else {
                     $profile->setInputVerificationPreference($verify, $hint);
                     if ($hint !== FALSE) {
-                        $extratext = " " . sprintf(_("and the input field will be prefilled with '<strong>@%s</strong>'."), $realm);
+                        $extratext = " ".sprintf(_("and the input field will be prefilled with '<strong>@%s</strong>'."), $realm);
                     } else {
                         $extratext = ".";
                     }
@@ -190,30 +190,30 @@ 
                 echo $uiElements->boxOkay(_("Redirection is <strong>OFF</strong>"));
             }
 
-            $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile " . $profile->identifier . " - attributes changed");
+            $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile ".$profile->identifier." - attributes changed");
 
             // re-instantiate $profile, we need to do completion checks and need fresh data for isEapTypeDefinitionComplete()
             foreach (\core\common\EAP::listKnownEAPTypes() as $a) {
                 if ($a->getIntegerRep() == \core\common\EAP::INTEGER_SILVERBULLET) { // do not allow adding silverbullet via the backdoor
                     continue;
                 }
-                if (isset($_POST[$a->getPrintableRep()]) && isset($_POST[$a->getPrintableRep() . "-priority"]) && is_numeric($_POST[$a->getPrintableRep() . "-priority"])) {
-                    $priority = (int) $_POST[$a->getPrintableRep() . "-priority"];
+                if (isset($_POST[$a->getPrintableRep()]) && isset($_POST[$a->getPrintableRep()."-priority"]) && is_numeric($_POST[$a->getPrintableRep()."-priority"])) {
+                    $priority = (int) $_POST[$a->getPrintableRep()."-priority"];
                     // add EAP type to profile as requested, but ...
                     $profile->addSupportedEapMethod($a, $priority);
-                    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile " . $profile->identifier . " - supported EAP types changed");
+                    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile ".$profile->identifier." - supported EAP types changed");
                     // see if we can enable the EAP type, or if info is missing
                     $eapcompleteness = $profile->isEapTypeDefinitionComplete($a);
                     if ($eapcompleteness === true) {
-                        echo $uiElements->boxOkay(_("Supported EAP Type: ") . "<strong>" . $a->getPrintableRep() . "</strong>");
+                        echo $uiElements->boxOkay(_("Supported EAP Type: ")."<strong>".$a->getPrintableRep()."</strong>");
                     } else {
                         $warntext = "";
                         if (is_array($eapcompleteness)) {
                             foreach ($eapcompleteness as $item) {
-                                $warntext .= "<strong>" . $uiElements->displayName($item) . "</strong> ";
+                                $warntext .= "<strong>".$uiElements->displayName($item)."</strong> ";
                             }
                         }
-                        echo $uiElements->boxWarning(sprintf(_("Supported EAP Type: <strong>%s</strong> is missing required information %s !"), $a->getPrintableRep(), $warntext) . "<br/>" . _("The EAP type was added to the profile, but you need to complete the missing information before we can produce installers for you."));
+                        echo $uiElements->boxWarning(sprintf(_("Supported EAP Type: <strong>%s</strong> is missing required information %s !"), $a->getPrintableRep(), $warntext)."<br/>"._("The EAP type was added to the profile, but you need to complete the missing information before we can produce installers for you."));
                     }
                 }
             }
@@ -229,7 +229,7 @@ 
         <?php
         if (count($reloadedProfile->getEapMethodsinOrderOfPreference(1)) > 0) {
             echo "<form method='post' action='overview_installers.php?inst_id=$my_inst->identifier&profile_id=$reloadedProfile->identifier' accept-charset='UTF-8'>
-        <button type='submit'>" . _("Continue to Installer Fine-Tuning and Download") . "</button>
+        <button type='submit'>"._("Continue to Installer Fine-Tuning and Download")."</button>
     </form>";
         }
         echo $deco->footer();