GEANT / CAT

web/lib/common/InputValidation.php

Spacing +8 added lines, -8 removed lines

@@ -40,7 +40,7 @@ 
     private function inputValidationError($customtext)
     {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<p>" . _("Input validation error: ") . $customtext . "</p>";
+        $retval = "<p>"._("Input validation error: ").$customtext."</p>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -97,7 +97,7 @@ 
         $postFed = $fedIdentifiers[$correctIndex];
         $temp = new \core\Federation($postFed);
         if ($owner === NULL) {
-            return [$temp,'readonly'];
+            return [$temp, 'readonly'];
         }
         $user = new \core\User($owner);        
         foreach ($temp->listFederationAdmins() as $oneowner) {
@@ -105,9 +105,9 @@ 
                 return [$temp, 'fullaccess'];
             }
         }
-        if ($user->isSuperadmin()|| $user->isSupport()) {
+        if ($user->isSuperadmin() || $user->isSupport()) {
                 $this->loggerInstance->debug(4, "You are the superadmin/support\n");
-                return [$temp,'readonly'];                
+                return [$temp, 'readonly'];                
             }
         throw new Exception($this->inputValidationError(sprintf("User is not %s administrator!", \core\common\Entity::$nomenclature_fed)));
     }
@@ -168,18 +168,18 @@ 
             }
             if ($user->isFederationAdmin($temp->federation)) {
                 $this->loggerInstance->debug(4, "You are fed admin for this IdP\n");
-                return [$temp,'readonly'];
+                return [$temp, 'readonly'];
             }
             if ($user->isSuperadmin() || $user->isSupport()) {
                 $this->loggerInstance->debug(4, "You are the superadmin/support\n");
-                return [$temp,'readonly'];                
+                return [$temp, 'readonly'];                
             }
             throw new Exception($this->inputValidationError("This IdP identifier is not accessible!"));
         }
         if ($claimedFedBinding !== NULL && strtoupper($temp->federation) != strtoupper($claimedFedBinding->tld)) {
             throw new Exception($this->inputValidationError("This IdP does not belong to the claimed federation!"));
         }
-        return [$temp,'nouser'];
+        return [$temp, 'nouser'];
     }
 
     /**
@@ -621,7 +621,7 @@ 
         try {
             $image->readImageBlob($binary);
         } catch (\ImagickException $exception) {
-            echo "Error" . $exception->getMessage();
+            echo "Error".$exception->getMessage();
             return FALSE;
         }
         // image survived the sanity check

web/resources/css/cat.css.php

Spacing +126 added lines, -126 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 $colour1 = \config\Master::APPEARANCE['colour1'];
 $colour2 = \config\Master::APPEARANCE['colour2'];
 // we need to know if we are serving a RTL language so we can flip some heading
@@ -34,14 +34,14 @@ 
 }
 
 body {
-    background: <?php echo $colour1;?>;
+    background: <?php echo $colour1; ?>;
     color: #000000;
     font-family:Verdana, Arial, Helvetica, sans-serif;
     font-size:11px;
     height: 100%;
     margin: 0px;
     padding: 0px;
-    padding-<?php echo $start;?>: 0px;
+    padding-<?php echo $start; ?>: 0px;
     min-width: 700px;
     font-size: 11px;
     font-weight: normal;
@@ -57,18 +57,18 @@ 
 }
 
 button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     min-height: 23px;
-    border-<?php echo $start;?>-style: outset; 
-    border-<?php echo $start;?>-width: 1px; 
-    border-<?php echo $start;?>-color: #8bbacb;
+    border-<?php echo $start; ?>-style: outset; 
+    border-<?php echo $start; ?>-width: 1px; 
+    border-<?php echo $start; ?>-color: #8bbacb;
     border-top-style: outset; 
     border-top-width: 1px; 
     border-top-color: #8bbacb;
-    border-<?php echo $end;?>-style: outset; 
-    border-<?php echo $end;?>-width: 2px; 
-    border-<?php echo $end;?>-color: #043d52;
+    border-<?php echo $end; ?>-style: outset; 
+    border-<?php echo $end; ?>-width: 2px; 
+    border-<?php echo $end; ?>-color: #043d52;
     border-bottom-style: outset; 
     border-bottom-width: 2px; 
     border-bottom-color: #043d52;
@@ -78,14 +78,14 @@ 
     background:#095e80;
     border-style:inset;
     position: relative;
-    <?php echo $start;?>: 3px;
+    <?php echo $start; ?>: 3px;
 }
 
 button.pressedDisabled {
     background:#999;
     border-style:inset;
     position: relative;
-    <?php echo $start;?>: 3px;
+    <?php echo $start; ?>: 3px;
 }
 
 button.delete {
@@ -93,14 +93,14 @@ 
 }
 
 .problemdescription {
-    padding-<?php echo $start;?>:40px;
+    padding-<?php echo $start; ?>:40px;
     padding-top: 10px;
     padding-bottom: 10px;
     background-color: lightyellow;
 }
 
 .problemsolution {
-    padding-<?php echo $start;?>:40px;
+    padding-<?php echo $start; ?>:40px;
     padding-top: 10px;
     padding-bottom: 10px;
     background-color: lightgreen;
@@ -109,15 +109,15 @@ 
 .use_borders button.alertButton {
     color: maroon; 
     background: #bbb; 
-    border-<?php echo $start;?>-style: outset; 
-    border-<?php echo $start;?>-width: 1px; 
-    border-<?php echo $start;?>-color: #eee;
+    border-<?php echo $start; ?>-style: outset; 
+    border-<?php echo $start; ?>-width: 1px; 
+    border-<?php echo $start; ?>-color: #eee;
     border-top-style: outset; 
     border-top-width: 1px; 
     border-top-color: #eee;
-    border-<?php echo $end;?>-style: outset; 
-    border-<?php echo $end;?>-width: 2px; 
-    border-<?php echo $end;?>-color: #444;
+    border-<?php echo $end; ?>-style: outset; 
+    border-<?php echo $end; ?>-width: 2px; 
+    border-<?php echo $end; ?>-color: #444;
     border-bottom-style: outset; 
     border-bottom-width: 2px; 
     border-bottom-color: #444;
@@ -127,15 +127,15 @@ 
 button[disabled] {
     background: #bababa;
     color: #6a6a6a;
-    border-<?php echo $start;?>-style: inset;
-    border-<?php echo $start;?>-width: 1px;
-    border-<?php echo $start;?>-color: #dadada;
+    border-<?php echo $start; ?>-style: inset;
+    border-<?php echo $start; ?>-width: 1px;
+    border-<?php echo $start; ?>-color: #dadada;
     border-top-style: inset;
     border-top-width: 1px;
     border-top-color: #dadada;
-    border-<?php echo $end;?>-style: outset;
-    border-<?php echo $end;?>-width: 2px;
-    border-<?php echo $end;?>-color: #dadada;
+    border-<?php echo $end; ?>-style: outset;
+    border-<?php echo $end; ?>-width: 2px;
+    border-<?php echo $end; ?>-color: #dadada;
     border-bottom-style: outset;
     border-bottom-width: 2px;
     border-bottom-color: #dadada;
@@ -167,8 +167,8 @@ 
 div.profilemodulebuttons {
     position: inherit;
     bottom: 5px;
-    <?php echo $end;?>: 5px;
-    text-align: <?php echo $end;?>;
+    <?php echo $end; ?>: 5px;
+    text-align: <?php echo $end; ?>;
 }
 
 div.profilebox {
@@ -189,15 +189,15 @@ 
     display: block;
     position: absolute;
     top:0;
-    <?php echo $end;?>:0;
-    padding-<?php echo $end;?>:20px;
+    <?php echo $end; ?>:0;
+    padding-<?php echo $end; ?>:20px;
     padding-top:7px;
 }
 
 div.sidebar {
     display: inline;
-    float: <?php echo $end;?>;
-    padding-<?php echo $end;?>: 20px;
+    float: <?php echo $end; ?>;
+    padding-<?php echo $end; ?>: 20px;
 }
 div.sidebar a {
     color: white;
@@ -206,7 +206,7 @@ 
 div.header {
     height: 54px;
     background: #FFFFFF;
-    padding-<?php echo $start;?>:30px;
+    padding-<?php echo $start; ?>:30px;
     padding-bottom: 10px;
     color: <?php echo $colour2?>;
 }
@@ -216,8 +216,8 @@ 
     top: 54px;
     bottom: 50px;
     padding-top: 10px;
-    padding-<?php echo $start;?>: 0px;
-    padding-<?php echo $end;?>: 0px;
+    padding-<?php echo $start; ?>: 0px;
+    padding-<?php echo $end; ?>: 0px;
     width:100%;
 }
 
@@ -231,18 +231,18 @@ 
     color: #FFFFFF;
     min-height:100px;
     overflow: auto;
-    padding-<?php echo $start;?>:20px
+    padding-<?php echo $start; ?>:20px
 }
 
 #thirdrow {
-    padding-<?php echo $start;?>: 10px;
-    padding-<?php echo $end;?>: 10px;
+    padding-<?php echo $start; ?>: 10px;
+    padding-<?php echo $end; ?>: 10px;
 }
 
 #footer {
     width: 100%;
-    <?php echo $start;?>: 0;
-    <?php echo $end;?>: 0;
+    <?php echo $start; ?>: 0;
+    <?php echo $end; ?>: 0;
     bottom: 0;
     position: absolute;
     background: white;
@@ -268,8 +268,8 @@ 
     height: 100% !important;
     position: relative;
     min-width: 1000px;
-    margin-<?php echo $start;?>: auto;
-    margin-<?php echo $end;?>: auto;
+    margin-<?php echo $start; ?>: auto;
+    margin-<?php echo $end; ?>: auto;
 }
 
 div.device_info {
@@ -289,8 +289,8 @@ 
     position: fixed;
     top: 0;
     bottom: 0;
-    <?php echo $start;?>: 0;
-    <?php echo $end;?>: 0;
+    <?php echo $start; ?>: 0;
+    <?php echo $end; ?>: 0;
     background-color: #000000;
     opacity: 0.5;
     z-index: 90;
@@ -316,7 +316,7 @@ 
     padding: 15px;
     text-align: start;
     width: 850px;
-    <?php echo $start;?>: 100px;
+    <?php echo $start; ?>: 100px;
     top: 50px;
     z-index: 100;
 }
@@ -325,15 +325,15 @@ 
     position: absolute;
     top: 0;
     bottom: 0;
-    <?php echo $start;?>: 0;
-    <?php echo $end;?>: 0;
+    <?php echo $start; ?>: 0;
+    <?php echo $end; ?>: 0;
     z-index: 100;
 }
 
 div#msgbox div {
     position: fixed;
-    <?php echo $start;?>: 0;
-    <?php echo $end;?>: 0;
+    <?php echo $start; ?>: 0;
+    <?php echo $end; ?>: 0;
 }
 
 div#msgbox div div.graybox {
@@ -347,13 +347,13 @@ 
 div.graybox img {
     display: block;
     cursor: pointer;
-    float: <?php echo $end;?>;
+    float: <?php echo $end; ?>;
     margin: 0px 0px 10px 10px;
 }
 
 img.icon {
-    float: <?php echo $start;?>;
-    margin-<?php echo $end;?>: 5px;
+    float: <?php echo $start; ?>;
+    margin-<?php echo $end; ?>: 5px;
     margin-top: 3px;
 }
 
@@ -408,15 +408,15 @@ 
 div.ca-summary {
     border: 1px dotted;
     background-color: #ccccff;
-    border-<?php echo $start;?>: 10px solid;
-    border-<?php echo $start;?>-color: green;
+    border-<?php echo $start; ?>: 10px solid;
+    border-<?php echo $start; ?>-color: green;
     padding: 2px;
-    padding-<?php echo $start;?>: 8px;
+    padding-<?php echo $start; ?>: 8px;
 }
 
 span.edu_cat {
     font-weight: bold;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 span.tooltip {
@@ -475,7 +475,7 @@ 
 }
 
 table.authrecord td {
-    padding-<?php echo $end;?>: 10px;
+    padding-<?php echo $end; ?>: 10px;
 }
 
 p.MOTD {
@@ -493,15 +493,15 @@ 
 }
 
 .use_borders button {
-    border-<?php echo $start;?>-style: outset; 
-    border-<?php echo $start;?>-width: 1px; 
-    border-<?php echo $start;?>-color: #8bbacb;
+    border-<?php echo $start; ?>-style: outset; 
+    border-<?php echo $start; ?>-width: 1px; 
+    border-<?php echo $start; ?>-color: #8bbacb;
     border-top-style: outset; 
     border-top-width: 1px; 
     border-top-color: #8bbacb;
-    border-<?php echo $end;?>-style: outset; 
-    border-<?php echo $end;?>-width: 2px; 
-    border-<?php echo $end;?>-color: #043d52;
+    border-<?php echo $end; ?>-style: outset; 
+    border-<?php echo $end; ?>-width: 2px; 
+    border-<?php echo $end; ?>-color: #043d52;
     border-bottom-style: outset; 
     border-bottom-width: 2px; 
     border-bottom-color: #043d52;
@@ -524,8 +524,8 @@ 
     border-bottom-style:solid;
     border-top-width:5px; 
     border-bottom-width:5px; 
-    border-color: <?php echo $colour1;?>; 
-    padding-<?php echo $start;?>:30px;
+    border-color: <?php echo $colour1; ?>; 
+    padding-<?php echo $start; ?>:30px;
 }
 
 .no_borders button.disabledDevice {
@@ -541,13 +541,13 @@ 
 }
 
 input {
-    margin-<?php echo $end;?>: 5px;
+    margin-<?php echo $end; ?>: 5px;
 
 }
 
 select {
     vertical-align: middle;
-    margin-<?php echo $start;?>: 10px;
+    margin-<?php echo $start; ?>: 10px;
 }
 
 td.notapplicable {
@@ -580,8 +580,8 @@ 
 
 .signin_large {
     vertical-align: top;
-    padding-<?php echo $start;?>:20px;
-    padding-<?php echo $end;?>:20px;
+    padding-<?php echo $start; ?>:20px;
+    padding-<?php echo $end; ?>:20px;
     color: #bfd5dc;
     font-size: 20px;
 }
@@ -594,34 +594,34 @@ 
 }
 
 #close_button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     height: 23px;
-    border-<?php echo $start;?>-style: inset; 
-    border-<?php echo $start;?>-width: 1px; 
-    border-<?php echo $start;?>-color: #8bbacb;
+    border-<?php echo $start; ?>-style: inset; 
+    border-<?php echo $start; ?>-width: 1px; 
+    border-<?php echo $start; ?>-color: #8bbacb;
     border-top-style: inset; 
     border-top-width: 1px; 
     border-top-color: #8bbacb;
-    border-<?php echo $end;?>-style: outset; 
-    border-<?php echo $end;?>-width: 2px; 
-    border-<?php echo $end;?>-color: #043d52;
+    border-<?php echo $end; ?>-style: outset; 
+    border-<?php echo $end; ?>-width: 2px; 
+    border-<?php echo $end; ?>-color: #043d52;
     border-bottom-style: outset; 
     border-bottom-width: 2px; 
     border-bottom-color: #043d52;
-    padding-<?php echo $start;?>: 5px;
-    padding-<?php echo $end;?>: 5px;
+    padding-<?php echo $start; ?>: 5px;
+    padding-<?php echo $end; ?>: 5px;
     padding-top: 1px;
     padding-bottom: 1px;
     position: relative;
-    <?php echo $start;?>: 640px;
+    <?php echo $start; ?>: 640px;
     cursor:pointer;
 }
 
 #loading_ico {
     display: none;
     position: absolute;
-    <?php echo $start;?>: 200px;
+    <?php echo $start; ?>: 200px;
     top: 220px;
     z-index: 200;
     text-align: center;
@@ -635,7 +635,7 @@ 
     z-index: 100;
     position: absolute;
     width: 700px;
-    <?php echo $start;?>: 200px;
+    <?php echo $start; ?>: 200px;
     text-align: justify;
     top: 200px;
     box-shadow: 5px 5px 5px #666666;
@@ -643,23 +643,23 @@ 
 }
 
 #user_info {
-    padding-<?php echo $start;?>: 30px; 
+    padding-<?php echo $start; ?>: 30px; 
     font-size: 11px;  
     font-weight: normal; 
 }
 
 #user_welcome {
     background: #ffffff;
-    padding-<?php echo $start;?>: 30px; 
+    padding-<?php echo $start; ?>: 30px; 
     padding-top: 20px; 
-    padding-<?php echo $end;?>: 180px;
+    padding-<?php echo $end; ?>: 180px;
     font-size: 12px;  
     font-weight: normal; 
 }
 
 #devices {
     z-index:90;
-    padding-<?php echo $start;?>: 30px;
+    padding-<?php echo $start; ?>: 30px;
     font-size: 11px;  
     font-weight: normal;
     position: relative;
@@ -667,15 +667,15 @@ 
 
 #profile_list {
     width: 30em; 
-    padding-<?php echo $start;?>: 10px; 
-    padding-<?php echo $end;?>: 0px; 
-    background: <?php echo $colour2;?>; 
+    padding-<?php echo $start; ?>: 10px; 
+    padding-<?php echo $end; ?>: 0px; 
+    background: <?php echo $colour2; ?>; 
     color: white; 
     box-shadow: 10px 10px 5px #888888;
 }
 
 #profile_redirect {
-    padding-<?php echo $start;?>: 30px;
+    padding-<?php echo $start; ?>: 30px;
     padding-top: 20px;
     font-size: 11px;
     font-weight: normal;
@@ -685,13 +685,13 @@ 
 }
 
 #profiles {
-    padding-<?php echo $start;?>: 30px; 
+    padding-<?php echo $start; ?>: 30px; 
     font-size: 11px; 
     padding-bottom: 10px 
 }
 
 #signin {
-    padding-<?php echo $start;?>: 30px;
+    padding-<?php echo $start; ?>: 30px;
     padding-top: 10px;
 }
 
@@ -715,8 +715,8 @@ 
     font-size: 14px; 
     padding-top: 4px; 
     padding-bottom: 12px; 
-    padding-<?php echo $start;?>: 30px; 
-    background: <?php echo $colour1;?>; 
+    padding-<?php echo $start; ?>: 30px; 
+    background: <?php echo $colour1; ?>; 
     text-align: start; 
     text-shadow: 10px 10px 5px #888888;
 }
@@ -726,9 +726,9 @@ 
     border-bottom-style:solid;
     border-top-width:5px;
     border-bottom-width:5px;
-    border-color: <?php echo $colour1;?>;
-    padding-<?php echo $start;?>:30px;
-    color: <?php echo $colour2;?>;
+    border-color: <?php echo $colour1; ?>;
+    padding-<?php echo $start; ?>:30px;
+    color: <?php echo $colour2; ?>;
 }
 
 #heading h1 { 
@@ -743,11 +743,11 @@ 
 
 #welcome {
     padding: 20px;
-    padding-<?php echo $start;?>: 30px;
+    padding-<?php echo $start; ?>: 30px;
     text-align: justify;
     border-bottom-style:solid;
     border-bottom-width:5px;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     font-size: 11px;
     font-weight: normal;
 }
@@ -756,14 +756,14 @@ 
 #main_menu_info { 
                     position: relative;
                     top: 15px;
-                    <?php echo $start;?>: 0px;
-                    padding:10px; padding-<?php echo $start;?>:20px; padding-<?php echo $end;?>:20px;
+                    <?php echo $start; ?>: 0px;
+                    padding:10px; padding-<?php echo $start; ?>:20px; padding-<?php echo $end; ?>:20px;
                     background: #f0f0f0;
                     border: 1px solid #dddddd;
-                    margin-<?php echo $start;?>: 25px;
-                    padding-<?php echo $start;?>: 25px;
-                    margin-<?php echo $end;?>: 25px;
-                    padding-<?php echo $end;?>: 25px;
+                    margin-<?php echo $start; ?>: 25px;
+                    padding-<?php echo $start; ?>: 25px;
+                    margin-<?php echo $end; ?>: 25px;
+                    padding-<?php echo $end; ?>: 25px;
                     padding-bottom: 10px;
                     vertical-align: top;
                     box-shadow: 5px 5px 5px #666666;
@@ -794,7 +794,7 @@ 
 
 #faq {
     padding: 20px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     background: #ffffff;
 }
 
@@ -812,7 +812,7 @@ 
 #idp_logo {
    display:none;
    position:absolute;
-   <?php echo $end;?>:30px;
+   <?php echo $end; ?>:30px;
    max-height:150px;
    max-width:150px;
    padding-top:10px;
@@ -835,18 +835,18 @@ 
 #slides img {
     position: absolute;
     top: 145px;
-    <?php echo $end;?>: 60px;
+    <?php echo $end; ?>: 60px;
 }
 
 #slides span {
     position: absolute;
-    <?php echo $start;?>: 180px;
+    <?php echo $start; ?>: 180px;
     z-index: 20;
 }
 
 #line1 {
     top:145px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     font-size:20px;
 }
 
@@ -858,7 +858,7 @@ 
 
 #line3 {
     top:245px;
-    <?php echo $start;?>: 200px;
+    <?php echo $start; ?>: 200px;
     color: maroon;
     font-size:25px;
 }
@@ -887,16 +887,16 @@ 
     height:100%;
     border-spacing:0; 
     border-collapse:collapse;
-    padding-<?php echo $start;?>:200px;
+    padding-<?php echo $start; ?>:200px;
     padding-top:10px;
 }
 
 #front_page_leftmenu {
-    border-<?php echo $end;?>:solid; 
-    border-color: <?php echo $colour1;?>; 
+    border-<?php echo $end; ?>:solid; 
+    border-color: <?php echo $colour1; ?>; 
     border-width:5px; 
     min-height:400px; 
-    padding-<?php echo $start;?>: 10px; 
+    padding-<?php echo $start; ?>: 10px; 
     vertical-align:top; 
     width:110px; 
     padding-top:30px;
@@ -906,8 +906,8 @@ 
     vertical-align: top;
     height:280px;
     background: #fff;
-    padding-<?php echo $start;?>: 20px;
-    padding-<?php echo $end;?>: 20px;
+    padding-<?php echo $start; ?>: 20px;
+    padding-<?php echo $end; ?>: 20px;
 }
 
 #user_button_td {
@@ -918,11 +918,11 @@ 
 }
 
 a:link {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:visited {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:hover {
@@ -930,7 +930,7 @@ 
 }
 
 a:active {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 .comment {
@@ -961,14 +961,14 @@ 
 table.user_overview th {
     text-align: start;  
     background: #f0f0f0;
-    padding-<?php echo $start;?>: 4px;
-    padding-<?php echo $end;?>: 4px;
+    padding-<?php echo $start; ?>: 4px;
+    padding-<?php echo $end; ?>: 4px;
 }
 
 table.user_overview td {
     border-top-style: none;
-    padding-<?php echo $start;?>: 4px;
-    padding-<?php echo $end;?>: 4px;
+    padding-<?php echo $start; ?>: 4px;
+    padding-<?php echo $end; ?>: 4px;
     vertical-align: middle;
     height: 28px;
 }
@@ -985,14 +985,14 @@ 
 .download_button_text {
     width: 380px;
     position:absolute;
-    <?php echo $end;?>: 5px;
+    <?php echo $end; ?>: 5px;
     padding-top:0px;
 }
 
 #download_info {
    background: #f0f0f0;
-   padding-<?php echo $start;?>: 20px;
-   padding-<?php echo $end;?>: 20px;
+   padding-<?php echo $start; ?>: 20px;
+   padding-<?php echo $end; ?>: 20px;
    padding-top:3px;
    padding-bottom:3px;
 }

utils/test_openroaming.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
  * License: see the web/copyright.php file in the file structure
  * ******************************************************************************
  */
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 /**
  * The sctipt will be called from crontab
@@ -28,7 +28,7 @@ 
 }
 
 
-while ( $row = mysqli_fetch_object(/** @scrutinizer ignore-type */ $allOpenRoamingProfiles)) {
+while ($row = mysqli_fetch_object(/** @scrutinizer ignore-type */ $allOpenRoamingProfiles)) {
     $profileId = $row->profile_id;
     $profile = \core\ProfileFactory::instantiate($profileId);
     $res = $profile->openroamingRedinessTest();

utils/update_monitor_copy.php

Spacing +8 added lines, -8 removed lines

@@ -24,7 +24,7 @@ 
  * update the local copy
  */
 
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 setlocale(LC_CTYPE, "en_US.UTF-8");
 
 class updateFromMonitor {
@@ -113,7 +113,7 @@ 
         $tmp_table = 'tmp_'.$table_name;
         if ($this->tablesource[$table_name] == 'eduroam') {
             $this->db_local->select_db('monitor_copy');
-        } elseif($this->tablesource[$table_name] == 'eduroamv2') {
+        } elseif ($this->tablesource[$table_name] == 'eduroamv2') {
             $this->db_local->select_db('eduroamv2');
         }
         $this->db_local->query("CREATE TEMPORARY TABLE $tmp_table SELECT * FROM $table LIMIT 0");
@@ -122,7 +122,7 @@ 
         $this->db->query("SET NAMES 'utf8'");
         $this->db_local->query("SET NAMES 'utf8mb4'");
         $result = $this->db->query("SELECT * FROM $table");
-        $queryFields = implode(',', array_column($this->fields[$table_name],0));
+        $queryFields = implode(',', array_column($this->fields[$table_name], 0));
         while ($row = $result->fetch_assoc()) {
             $v = [];
             foreach ($this->fields[$table_name] as $field) {
@@ -140,7 +140,7 @@ 
                     }
                 }
             }
-            $queryValues = implode(',',$v);
+            $queryValues = implode(',', $v);
             $query = "INSERT INTO $tmp_table (".$queryFields.") VALUES (".$queryValues.")";
             $this->db_local->query($query);
         }
@@ -152,7 +152,7 @@ 
         $tmp_table = 'tmp_'.$table_name;
         if ($this->tablesource[$table_name] == 'eduroam') {
                 $this->db_local->select_db('monitor_copy');
-        } elseif($this->tablesource[$table_name] == 'eduroamv2') {
+        } elseif ($this->tablesource[$table_name] == 'eduroamv2') {
                 $this->db_local->select_db('eduroamv2');
         }
         $this->db_local->query("SET NAMES 'utf8mb4'");
@@ -161,9 +161,9 @@ 
     }
 
     private function escape($inp) {
-        $out=str_replace('\\','\\\\',$inp);
-        $out=str_replace('"','\"',$out);
-        $out=str_replace('?','\?',$out);
+        $out = str_replace('\\', '\\\\', $inp);
+        $out = str_replace('"', '\"', $out);
+        $out = str_replace('?', '\?', $out);
         $out = 'convert(cast(convert("'.$out.'" using latin1) as binary) using utf8)';
         return($out);
     }

core/DBConnection.php

Spacing +20 added lines, -20 removed lines

@@ -62,24 +62,24 @@ 
             case "EXTERNAL":
             case "FRONTEND":
             case "DIAGNOSTICS":
-                if (!isset(self::${"instance" . $theDb})) {
+                if (!isset(self::${"instance".$theDb})) {
                     $class = __CLASS__;
-                    self::${"instance" . $theDb} = new $class($database);
-                    DBConnection::${"instance" . $theDb}->databaseInstance = $theDb;
+                    self::${"instance".$theDb} = new $class($database);
+                    DBConnection::${"instance".$theDb}->databaseInstance = $theDb;
                 }
-                return self::${"instance" . $theDb};
+                return self::${"instance".$theDb};
             case "RADIUS":
-                if (!isset(self::${"instance" . $theDb})) {
+                if (!isset(self::${"instance".$theDb})) {
                     $class = __CLASS__;
                     foreach (\config\ConfAssistant::DB as $name => $oneRadiusAuthDb) {
                         $theInstance = new $class($name);
-                        self::${"instance" . $theDb}[] = $theInstance;
+                        self::${"instance".$theDb}[] = $theInstance;
                         $theInstance->databaseInstance = $theDb;
                     }
                 }
-                return self::${"instance" . $theDb};
+                return self::${"instance".$theDb};
             default:
-                throw new Exception("This type of database (" . strtoupper($database) . ") is not known!");
+                throw new Exception("This type of database (".strtoupper($database).") is not known!");
         }
     }
 
@@ -121,18 +121,18 @@ 
             }
         }
         // log exact query to debug log, if log level is at 5
-        $this->loggerInstance->debug(5, "DB ATTEMPT: ".$this->databaseInstance .": " . $querystring . "\n");
+        $this->loggerInstance->debug(5, "DB ATTEMPT: ".$this->databaseInstance.": ".$querystring."\n");
         if ($types !== NULL) {
-            $this->loggerInstance->debug(5, "Argument type sequence: $types, parameters are: " . /** @scrutinizer ignore-type */ print_r($arguments, true));
+            $this->loggerInstance->debug(5, "Argument type sequence: $types, parameters are: "./** @scrutinizer ignore-type */ print_r($arguments, true));
         }
 
         if ($this->connection->connect_error) {
-            throw new Exception("ERROR: Cannot send query to $this->databaseInstance database (no connection, error number" . $this->connection->connect_error . ")!");
+            throw new Exception("ERROR: Cannot send query to $this->databaseInstance database (no connection, error number".$this->connection->connect_error.")!");
         }
         if ($types === NULL) {
             $result = $this->connection->query($querystring);
             if ($result === FALSE) {
-                throw new Exception("DB: Unable to execute simple statement! Error was --> " . $this->connection->error . " <--");
+                throw new Exception("DB: Unable to execute simple statement! Error was --> ".$this->connection->error." <--");
             }
         } else {
             // fancy! prepared statement with dedicated argument list
@@ -148,7 +148,7 @@ 
                 }
                 $prepResult = $statementObject->prepare($querystring);
                 if ($prepResult === FALSE) {
-                    throw new Exception("DB: Unable to prepare statement! Statement was --> $querystring <--, error was --> " . $statementObject->error . " <--.");
+                    throw new Exception("DB: Unable to prepare statement! Statement was --> $querystring <--, error was --> ".$statementObject->error." <--.");
                 }
                 $this->preparedStatements[$querystring] = $statementObject;
             }
@@ -161,11 +161,11 @@ 
             array_unshift($localArray, $types);
             $retval = call_user_func_array([$statementObject, "bind_param"], $localArray);
             if ($retval === FALSE) {
-                throw new Exception("DB: Unable to bind parameters to prepared statement! Argument array was --> " . var_export($localArray, TRUE) . " <--. Error was --> " . $statementObject->error . " <--");
+                throw new Exception("DB: Unable to bind parameters to prepared statement! Argument array was --> ".var_export($localArray, TRUE)." <--. Error was --> ".$statementObject->error." <--");
             }
             $result = $statementObject->execute();
             if ($result === FALSE) {
-                throw new Exception("DB: Unable to execute prepared statement! Error was --> " . $statementObject->error . " <--");
+                throw new Exception("DB: Unable to execute prepared statement! Error was --> ".$statementObject->error." <--");
             }
             $selectResult = $statementObject->get_result();
             if ($selectResult !== FALSE) {
@@ -175,14 +175,14 @@ 
 
         // all cases where $result could be FALSE have been caught earlier
         if ($this->connection->errno) {
-            throw new Exception("ERROR: Cannot execute query in $this->databaseInstance database - (hopefully escaped) query was '$querystring', errno was " . $this->connection->errno . "!");
+            throw new Exception("ERROR: Cannot execute query in $this->databaseInstance database - (hopefully escaped) query was '$querystring', errno was ".$this->connection->errno."!");
         }
 
 
         if ($isMoreThanSelect || \config\Master::DEBUG_LEVEL == 5) {
-            $this->loggerInstance->writeSQLAudit("[DB: " . strtoupper($this->databaseInstance) . "] " . $querystring);
+            $this->loggerInstance->writeSQLAudit("[DB: ".strtoupper($this->databaseInstance)."] ".$querystring);
             if ($types !== NULL) {
-                $this->loggerInstance->writeSQLAudit("Argument type sequence: $types, parameters are: " . /** @scrutinizer ignore-type */ print_r($arguments, true));
+                $this->loggerInstance->writeSQLAudit("Argument type sequence: $types, parameters are: "./** @scrutinizer ignore-type */ print_r($arguments, true));
             }
         }
         return $result;
@@ -280,13 +280,13 @@ 
         if (isset(\config\Master::DB[$databaseCapitalised])) {
             $this->connection = new \mysqli(\config\Master::DB[$databaseCapitalised]['host'], \config\Master::DB[$databaseCapitalised]['user'], \config\Master::DB[$databaseCapitalised]['pass'], \config\Master::DB[$databaseCapitalised]['db']);
             if ($this->connection->connect_error) {
-                throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number " . $this->connection->connect_errno . ").");
+                throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number ".$this->connection->connect_errno.").");
             }
             $this->readOnly = \config\Master::DB[$databaseCapitalised]['readonly'];
         } else { // one of the RADIUS DBs
             $this->connection = new \mysqli(\config\ConfAssistant::DB[$databaseCapitalised]['host'], \config\ConfAssistant::DB[$databaseCapitalised]['user'], \config\ConfAssistant::DB[$databaseCapitalised]['pass'], \config\ConfAssistant::DB[$databaseCapitalised]['db']);
             if ($this->connection->connect_error) {
-                throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number " . $this->connection->connect_errno . ").");
+                throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number ".$this->connection->connect_errno.").");
             }
             $this->readOnly = \config\ConfAssistant::DB[$databaseCapitalised]['readonly'];
         }

web/diag/magicTelepath.php

Spacing +3 added lines, -3 removed lines

@@ -19,10 +19,10 @@
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
+require_once dirname(dirname(__DIR__))."/config/_config.php";
 $realm = htmlspecialchars(strip_tags(filter_input(INPUT_GET, 'realm')));
-$visited = htmlspecialchars(strip_tags(filter_input(INPUT_GET,'visited')));
-$nro = htmlspecialchars(strip_tags(filter_input(INPUT_GET,'nro')));
+$visited = htmlspecialchars(strip_tags(filter_input(INPUT_GET, 'visited')));
+$nro = htmlspecialchars(strip_tags(filter_input(INPUT_GET, 'nro')));
 \core\CAT::sessionStart();
 $languageObject = new core\common\Language();
 $languageObject->setTextDomain("diagonstics");

web/diag/testTelepath.php

Spacing +2 added lines, -2 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";
 
 $therealm = htmlspecialchars(strip_tags(filter_input(INPUT_GET, 'realm')));
 $thevisited = htmlspecialchars(strip_tags(filter_input(INPUT_GET, 'visited')));
@@ -35,7 +35,7 @@ 
     $validator = new \web\lib\common\InputValidation();
     
     echo "<pre>";
-    echo "Testing " . $validatedRealm . " in " . $validator->string($thevisited);
+    echo "Testing ".$validatedRealm." in ".$validator->string($thevisited);
     print_r($telepath->magic());
     echo "</pre>";
 }
\ No newline at end of file

web/accountstatus/accountstatus.php

Spacing +6 added lines, -6 removed lines

@@ -26,7 +26,7 @@ 
  * @author Stefan Winter <stefan.winter@restena.lu>
  * @package Core
  */
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $cleanToken = FALSE;
 $invitationObject = new core\SilverbulletInvitation("INVALID");
@@ -74,7 +74,7 @@ 
 
 $statusInfo = ["token" => $cleanToken,
     "invitation_object" => $invitationObject,
-    "OS" => $Gui->operatingSystem,];
+    "OS" => $Gui->operatingSystem, ];
 
 if ($profile !== NULL) {
     $attributes = $Gui->profileAttributes($profile->identifier);
@@ -88,7 +88,7 @@ 
 $caAndSerial = htmlspecialchars(strip_tags($caAndSerialUnfiltered));
 
 if ($action !== NULL && $action !== FALSE && $action === \web\lib\common\FormElements::BUTTON_DELETE && $caAndSerial !== NULL && $caAndSerial !== FALSE) {
-    $tuple = explode(':',$caAndSerial);
+    $tuple = explode(':', $caAndSerial);
     $ca_type = $tuple[0];
     $serial = $tuple[1];
     if ($statusInfo['invitation_object']->invitationTokenStatus != \core\SilverbulletInvitation::SB_TOKENSTATUS_INVALID) {
@@ -103,12 +103,12 @@ 
                 print "//REVOKING\n";
                 $certObject = new \core\SilverbulletCertificate($serial, $ca_type);
                 $certObject->revokeCertificate();
-                header("Location: accountstatus.php?token=" . $statusInfo['token']);
+                header("Location: accountstatus.php?token=".$statusInfo['token']);
                 exit;
             }
         }
     }
-    header("Location: accountstatus.php?token=" . $statusInfo['token']);
+    header("Location: accountstatus.php?token=".$statusInfo['token']);
     exit;
 }
 
@@ -133,4 +133,4 @@ 
 $skinObject = new \web\lib\user\Skinjob($_REQUEST['skin'] ?? $_SESSION['skin'] ?? $fedskin[0] ?? \config\Master::APPEARANCE['skins'][0]);
 
 // and now, serve actual data
-require "../skins/" . $skinObject->skin . "/accountstatus/accountstatus.php";
+require "../skins/".$skinObject->skin."/accountstatus/accountstatus.php";

web/lib/admin/UIElements.php

Spacing +38 added lines, -38 removed lines

@@ -135,7 +135,7 @@ 
             sprintf(_("%s: Do not terminate EAP"), \core\ProfileSilverbullet::PRODUCTNAME) => "fed:silverbullet-noterm",
             sprintf(_("%s: max users per profile"), \core\ProfileSilverbullet::PRODUCTNAME) => "fed:silverbullet-maxusers",
             sprintf(_("Mint %s with CA on creation"), $this->nomenclatureIdP) => "fed:minted_ca_file",
-            sprintf(_("OpenRoaming: Allow %s Opt-In"),$this->nomenclatureParticipant) => "fed:openroaming",
+            sprintf(_("OpenRoaming: Allow %s Opt-In"), $this->nomenclatureParticipant) => "fed:openroaming",
             _("OpenRoaming: Custom NAPTR Target") => "fed:openroaming_customtarget",
             $ssidText => "media:SSID",
             $passpointOiText => "media:consortium_OI",
@@ -147,7 +147,7 @@ 
         $find = array_keys($displayNames, $input, TRUE);
 
         if (count($find) == 0) { // this is an error! throw an Exception
-            throw new \Exception("The translation of an option name was requested, but the option is not known to the system: " . htmlentities($input));
+            throw new \Exception("The translation of an option name was requested, but the option is not known to the system: ".htmlentities($input));
         }
         \core\common\Entity::outOfThePotatoes();
         // none of the strings have HTML in them, only translators can provide own text for it -> no threat, but complained about by the security review
@@ -169,7 +169,7 @@ 
 
         foreach ($optionlist as $option) {
             $type = $optioninfo->optionType($option['name']);
-            if (preg_match('/^' . $class . '/', $option['name']) && $option['level'] == "$level") {
+            if (preg_match('/^'.$class.'/', $option['name']) && $option['level'] == "$level") {
                 // all non-multilang attribs get this assignment ...
                 $language = "";
                 $content = $option['value'];
@@ -187,19 +187,19 @@ 
                         $locationMarkers[] = $coords;
                         break;
                     case "file":
-                        $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td>";
+                        $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td>";
                         switch ($option['name']) {
                             case "general:logo_file":
                             case "fed:logo_file":
-                                $retval .= $this->previewImageinHTML('ROWID-' . $option['level'] . '-' . $option['row_id']);
+                                $retval .= $this->previewImageinHTML('ROWID-'.$option['level'].'-'.$option['row_id']);
                                 break;
                             case "eap:ca_file":
                             // fall-through intended: display both the same way
                             case "fed:minted_ca_file":
-                                $retval .= $this->previewCAinHTML('ROWID-' . $option['level'] . '-' . $option['row_id']);
+                                $retval .= $this->previewCAinHTML('ROWID-'.$option['level'].'-'.$option['row_id']);
                                 break;
                             case "support:info_file":
-                                $retval .= $this->previewInfoFileinHTML('ROWID-' . $option['level'] . '-' . $option['row_id']);
+                                $retval .= $this->previewInfoFileinHTML('ROWID-'.$option['level'].'-'.$option['row_id']);
                                 break;
                             default:
                         }
@@ -209,10 +209,10 @@ 
                             // do not display the option at all; it gets auto-set by the ProfileSilverbullet constructor and doesn't have to be seen
                             break;
                         }
-                        $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off") ) . "</strong></td></tr>";
+                        $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td><strong>".($content == "on" ? _("on") : _("off"))."</strong></td></tr>";
                         break;
                     default:
-                        $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>$content</strong></td></tr>";
+                        $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td><strong>$content</strong></td></tr>";
                 }
             }
         }
@@ -221,11 +221,11 @@ 
             $locationCount = 0;
             foreach ($locationMarkers as $g) {
                 $locationCount++;
-                $marker .= '<marker name="' . $locationCount . '" lat="' . $g['lat'] . '" lng="' . $g['lon'] . '" />';
+                $marker .= '<marker name="'.$locationCount.'" lat="'.$g['lat'].'" lng="'.$g['lon'].'" />';
             }
             $marker .= '<\/markers>'; // some validator says this should be escaped
             $jMarker = json_encode($locationMarkers);
-            $retval .= '<tr><td><script>markers=\'' . $marker . '\'; jmarkers = \'' . $jMarker . '\';</script></td><td></td><td></td></tr>';
+            $retval .= '<tr><td><script>markers=\''.$marker.'\'; jmarkers = \''.$jMarker.'\';</script></td><td></td><td></td></tr>';
         }
         \core\common\Entity::outOfThePotatoes();
         return $retval;
@@ -241,11 +241,11 @@ 
         \core\common\Entity::intoThePotatoes();
         $idpoptions = $myInst->getAttributes();
         $retval = "<div class='infobox'>
-        <h2>" . sprintf(_("General %s details"), $this->nomenclatureParticipant) . "</h2>
+        <h2>" . sprintf(_("General %s details"), $this->nomenclatureParticipant)."</h2>
         <table>
             <tr>
                 <td>
-                    " . _("Country:") . "
+                    " . _("Country:")."
                 </td>
                 <td>
                 </td>
@@ -255,16 +255,16 @@ 
         $retval .= $myFed->name;
         $retval .= "</strong>
                 </td>
-            </tr>" . $this->infoblock($idpoptions, "general", "IdP") . "
+            </tr>" . $this->infoblock($idpoptions, "general", "IdP")."
         </table>
     </div>";
 
         $blocks = [["support", _("Global Helpdesk Details")], ["media", _("Media Properties")]];
         foreach ($blocks as $block) {
             $retval .= "<div class='infobox'>
-            <h2>" . $block[1] . "</h2>
+            <h2>" . $block[1]."</h2>
             <table>" .
-                    $this->infoblock($idpoptions, $block[0], "IdP") .
+                    $this->infoblock($idpoptions, $block[0], "IdP").
                     "</table>
         </div>";
         }
@@ -279,12 +279,12 @@ 
      */
     private function displaySize(int $number) {
         if ($number > 1024 * 1024) {
-            return round($number / 1024 / 1024, 2) . " MiB";
+            return round($number / 1024 / 1024, 2)." MiB";
         }
         if ($number > 1024) {
-            return round($number / 1024, 2) . " KiB";
+            return round($number / 1024, 2)." KiB";
         }
-        return $number . " B";
+        return $number." B";
     }
 
     /**
@@ -339,7 +339,7 @@ 
         $caExpiryTrashhold = \config\ConfAssistant::CERT_WARNINGS['expiry_warning'];
         $rawResult = UIElements::getBlobFromDB($ref['table'], $ref['rowindex'], FALSE);
         if (is_bool($rawResult)) { // we didn't actually get a CA!
-            $retval = "<div class='ca-summary'>" . _("There was an error while retrieving the certificate from the database!") . "</div>";
+            $retval = "<div class='ca-summary'>"._("There was an error while retrieving the certificate from the database!")."</div>";
             \core\common\Entity::outOfThePotatoes();
             return $retval;
         }
@@ -355,8 +355,8 @@ 
 
         $details['name'] = preg_replace('/(.)\/(.)/', "$1<br/>$2", $details['name']);
         $details['name'] = preg_replace('/\//', "", $details['name']);
-        $certstatus = ( $details['root'] == 1 ? "R" : "I");
-        $certTooltip = ( $details['root'] == 1 ? _("Root CA") : _("Intermediate CA"));
+        $certstatus = ($details['root'] == 1 ? "R" : "I");
+        $certTooltip = ($details['root'] == 1 ? _("Root CA") : _("Intermediate CA"));
         $innerbgColor = "#0000ff";
         $leftBorderColor = "#00ff00";
         $message = "";
@@ -364,35 +364,35 @@ 
             $leftBorderColor = "red";
             $message = _("This is a <strong>SERVER</strong> certificate!");
             if (\config\ConfAssistant::CERT_GUIDELINES !== '') {
-                $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>". _("more info")."</a>";
+                $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>"._("more info")."</a>";
             }
             $message .= "<br/>";
-            $retval = "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>" . $message . $details['name'] . "</div>";
+            $retval = "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>".$message.$details['name']."</div>";
             \core\common\Entity::outOfThePotatoes();
             return $retval;
         }
         $now = time();
         if ($now + \config\ConfAssistant::CERT_WARNINGS['expiry_critical'] > $details['full_details']['validTo_time_t']) {
             $leftBorderColor = "red";
-            $message = _("Certificate expired!") . "<br>";
-        } elseif($now + \config\ConfAssistant::CERT_WARNINGS['expiry_warning']  > $details['full_details']['validTo_time_t'] - $caExpiryTrashhold) {
+            $message = _("Certificate expired!")."<br>";
+        } elseif ($now + \config\ConfAssistant::CERT_WARNINGS['expiry_warning'] > $details['full_details']['validTo_time_t'] - $caExpiryTrashhold) {
             if ($leftBorderColor == "#00ff00") {
                 $leftBorderColor = "yellow";
             }
-            $message = _("Certificate close to expiry!") . "<br/>";            
+            $message = _("Certificate close to expiry!")."<br/>";            
         }
    
         if ($details['root'] == 1 && $details['basicconstraints_set'] == 0) {
             if ($leftBorderColor == "#00ff00") {
                 $leftBorderColor = "yellow";
             }
-            $message .= "<div style='max-width: 25em'><strong>" . _("Improper root certificate, required critical CA extension missing, will not reliably install!") . "</strong>";
+            $message .= "<div style='max-width: 25em'><strong>"._("Improper root certificate, required critical CA extension missing, will not reliably install!")."</strong>";
             if (\config\ConfAssistant::CERT_GUIDELINES !== '') {
-                $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>". _("more info")."</a>";
+                $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>"._("more info")."</a>";
             }
             $message .= "</div><br/>";
         }
-        $retval =  "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div title='$certTooltip' style='padding-top:3px; font-weight:bold; color:#ffffff;'>$certstatus</div></div>" . $message . $details['name'] . "<br>" . $this->displayName('eap:ca_vailduntil') . " " . gmdate('Y-m-d H:i:s', $details['full_details']['validTo_time_t']) . " UTC</div>";
+        $retval = "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div title='$certTooltip' style='padding-top:3px; font-weight:bold; color:#ffffff;'>$certstatus</div></div>".$message.$details['name']."<br>".$this->displayName('eap:ca_vailduntil')." ".gmdate('Y-m-d H:i:s', $details['full_details']['validTo_time_t'])." UTC</div>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -405,7 +405,7 @@ 
      */
     public function previewImageinHTML($imageReference) {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<img style='max-width:150px' src='inc/filepreview.php?id=" . $imageReference . "' alt='" . _("Preview of logo file") . "'/>";
+        $retval = "<img style='max-width:150px' src='inc/filepreview.php?id=".$imageReference."' alt='"._("Preview of logo file")."'/>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -422,13 +422,13 @@ 
         $ref = $validator->databaseReference($fileReference);
         $fileBlob = UIElements::getBlobFromDB($ref['table'], $ref['rowindex'], FALSE);
         if (is_bool($fileBlob)) { // we didn't actually get a file!
-            $retval = "<div class='ca-summary'>" . _("There was an error while retrieving the file from the database!") . "</div>";
+            $retval = "<div class='ca-summary'>"._("There was an error while retrieving the file from the database!")."</div>";
             \core\common\Entity::outOfThePotatoes();
             return $retval;
         }
         $decodedFileBlob = base64_decode($fileBlob);
         $fileinfo = new \finfo();
-        $retval = "<div class='ca-summary'>" . _("File exists") . " (" . $fileinfo->buffer($decodedFileBlob, FILEINFO_MIME_TYPE) . ", " . $this->displaySize(strlen($decodedFileBlob)) . ")<br/><a href='inc/filepreview.php?id=$fileReference'>" . _("Preview") . "</a></div>";
+        $retval = "<div class='ca-summary'>"._("File exists")." (".$fileinfo->buffer($decodedFileBlob, FILEINFO_MIME_TYPE).", ".$this->displaySize(strlen($decodedFileBlob)).")<br/><a href='inc/filepreview.php?id=$fileReference'>"._("Preview")."</a></div>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -585,8 +585,8 @@ 
             return "";
         }
 
-        $loggerInstance->debug(4, "Consortium logo is at: " . ROOT . "/web/resources/images/consortium_logo_large.png");
-        $logogd = imagecreatefrompng(ROOT . "/web/resources/images/consortium_logo_large.png");
+        $loggerInstance->debug(4, "Consortium logo is at: ".ROOT."/web/resources/images/consortium_logo_large.png");
+        $logogd = imagecreatefrompng(ROOT."/web/resources/images/consortium_logo_large.png");
         if ($logogd === FALSE) { // consortium logo is bogus; don't do anything
             return "";
         }
@@ -612,7 +612,7 @@ 
         imagecolorallocate($whiteimage, 255, 255, 255);
         // also make sure the initial placement is a multitude of 12; otherwise "two half" symbols might be affected
         $targetplacementx = (int) ($symbolsize * round(($sizeinput[0] / 2 - ($targetwidth - $symbolsize + 1) / 2) / $symbolsize));
-        $targetplacementy = (int) ($symbolsize * round(($sizeinput[1] / 2 - ($targetheight - $symbolsize + 1 ) / 2) / $symbolsize));
+        $targetplacementy = (int) ($symbolsize * round(($sizeinput[1] / 2 - ($targetheight - $symbolsize + 1) / 2) / $symbolsize));
         imagecopyresized($inputgd, $whiteimage, $targetplacementx - $symbolsize, $targetplacementy - $symbolsize, 0, 0, $targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize, $targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize);
         imagecopyresized($inputgd, $logogd, $targetplacementx, $targetplacementy, 0, 0, $targetwidth, $targetheight, $sizelogo[0], $sizelogo[1]);
         ob_start();
@@ -662,9 +662,9 @@ 
                 $message = "Your configuration appears to be fine.";
                 break;
             default:
-                throw new Exception("The result code level " . $test->test_result['global'] . " is not defined!");
+                throw new Exception("The result code level ".$test->test_result['global']." is not defined!");
         }
-        $out .= $this->boxFlexible($test->test_result['global'], "<br><strong>Test Summary</strong><br>" . $message . "<br>See below for details<br><hr>");
+        $out .= $this->boxFlexible($test->test_result['global'], "<br><strong>Test Summary</strong><br>".$message."<br>See below for details<br><hr>");
         foreach ($test->out as $testValue) {
             foreach ($testValue as $o) {
                 $out .= $this->boxFlexible($o['level'], $o['message']);