GEANT / CAT

web/user/API.php

Spacing +11 added lines, -11 removed lines

@@ -39,7 +39,7 @@ 
     'getUserCerts',
 ];
 
-function getRequest($varName,$filter) {
+function getRequest($varName, $filter) {
     $safeText = ["options"=>["regexp"=>"/^[\w\d-]+$/"]];
     switch ($filter) {
         case 'safe_text':
@@ -57,7 +57,7 @@ 
 
 // make sure this is a known action
 $actionR = getRequest('action', 'safe_text');
-$action = array_search($actionR,LISTOFACTIONS) ? $actionR : FALSE;
+$action = array_search($actionR, LISTOFACTIONS) ? $actionR : FALSE;
 if ($action === FALSE) {
     exit;
 }
@@ -65,18 +65,18 @@ 
 $lang = $langR ? $validator->supportedLanguage($langR) : FALSE;
 $deviceR = getRequest('device', 'safe_text');
 $device = $deviceR ? $validator->Device($deviceR) : FALSE;
-$idpR = getRequest('idp','int');
+$idpR = getRequest('idp', 'int');
 $idp = $idpR ? $validator->IdP($idpR)->identifier : FALSE;
-$profileR = getRequest('profile','int');
+$profileR = getRequest('profile', 'int');
 $profile = $profileR ? $validator->Profile($profileR)->identifier : FALSE;
-$federationR = getRequest('federation','safe_text');
+$federationR = getRequest('federation', 'safe_text');
 $federation = $federationR ? $validator->Federation($deviceR)->identifier : FALSE;
-$disco = getRequest('disco','int');
-$width = getRequest('width','int') ?? 0;
-$height = getRequest('height','int') ?? 0;
-$sort = getRequest('sort','int') ?? 0;
-$generatedforR = getRequest('generatedfor','safe_text') ?? 'user';
-$token = getRequest('token','safe_text');
+$disco = getRequest('disco', 'int');
+$width = getRequest('width', 'int') ?? 0;
+$height = getRequest('height', 'int') ?? 0;
+$sort = getRequest('sort', 'int') ?? 0;
+$generatedforR = getRequest('generatedfor', 'safe_text') ?? 'user';
+$token = getRequest('token', 'safe_text');
 
 
 switch ($action) {

devices/apple_mobileconfig/mobileconfigSuperclass.php

Spacing +4 added lines, -4 removed lines

@@ -72,7 +72,7 @@ 
       <key>PayloadIdentifier</key>
          <string>" . self::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string>
       <key>PayloadOrganization</key>
-         <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ( $this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
+         <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ($this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
       <key>PayloadType</key>
          <string>Configuration</string>
       <key>PayloadUUID</key>
@@ -325,9 +325,9 @@ 
         $retval .= "
                          </array>";
         if ($eapType['INNER'] == \core\common\EAP::NE_SILVERBULLET) {
-            $retval .= "<key>UserName</key><string>".$this->clientCert["username"]."</string>";
+            $retval .= "<key>UserName</key><string>" . $this->clientCert["username"] . "</string>";
         }
-        $retval .="
+        $retval .= "
                       <key>TTLSInnerAuthentication</key>
                          <string>" . ($eapType['INNER'] == \core\common\EAP::NONE ? "PAP" : "MSCHAPv2") . "</string>
                    </dict>";
@@ -504,7 +504,7 @@ 
                   <key>PayloadVersion</key>
                      <integer>1</integer>
                 </dict>",
-            "UUID" => $payloadUUID,];
+            "UUID" => $payloadUUID, ];
     }
 
     private function expiryBlock() {

devices/ms/WindowsCommon.php

Spacing +5 added lines, -5 removed lines

@@ -232,7 +232,7 @@ 
             $fcontents .= "\n" . '!define USER_GROUP "' . $this->translateString(str_replace('"', '$\\"', $attr['profile:name'][0]), $this->codePage) . '"
 ';
         }
-        $fcontents .=  '
+        $fcontents .= '
 Caption "' . $this->translateString(sprintf(WindowsCommon::sprint_nsi(_("%s installer for %s")), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $attr['general:instname'][0]), $this->codePage) . '"
 !define APPLICATION "' . $this->translateString(sprintf(WindowsCommon::sprint_nsi(_("%s installer for %s")), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $attr['general:instname'][0]), $this->codePage) . '"
 !define VERSION "' . \core\CAT::VERSION_MAJOR . '.' . \core\CAT::VERSION_MINOR . '"
@@ -241,8 +241,8 @@ 
 !define LOCALE "' . preg_replace('/\..*$/', '', CONFIG['LANGUAGES'][$this->languageInstance->getLang()]['locale']) . '"
 ;--------------------------------
 !define ORGANISATION "' . $this->translateString($attr['general:instname'][0], $this->codePage) . '"
-!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0] ) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->codePage)) . '"
-!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0] ) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->codePage)) . '"
+!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0]) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->codePage)) . '"
+!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0]) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->codePage)) . '"
     ';
 
 
@@ -256,11 +256,11 @@ 
             $fcontents .= '!define REALM "' . $attr['internal:realm'][0] . '"
 ';
         }
-        if(!empty($attr['internal:hint_userinput_suffix'][0]) && $attr['internal:hint_userinput_suffix'][0] == 1) {
+        if (!empty($attr['internal:hint_userinput_suffix'][0]) && $attr['internal:hint_userinput_suffix'][0] == 1) {
             $fcontents .= '!define HINT_USER_INPUT "' . $attr['internal:hint_userinput_suffix'][0] . '"
 ';
         }
-        if(!empty($attr['internal:verify_userinput_suffix'][0]) && $attr['internal:verify_userinput_suffix'][0] == 1) {
+        if (!empty($attr['internal:verify_userinput_suffix'][0]) && $attr['internal:verify_userinput_suffix'][0] == 1) {
             $fcontents .= '!define VERIFY_USER_REALM_INPUT "' . $attr['internal:verify_userinput_suffix'][0] . '"
 ';
         }

devices/linux/Device_Linux.php

Indentation +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
         
         $out .= 'Config.sb_user_file = """' . $this->mkSbUserFile() . '"""' . "\n";
         if (!empty($this->attributes['internal:realm'][0])) {
-           $out .= 'Config.user_realm = "' . $this->attributes['internal:realm'][0] . "\"\n";
+            $out .= 'Config.user_realm = "' . $this->attributes['internal:realm'][0] . "\"\n";
         }
         if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
             $out .= "Config.hint_user_input = True\n";

Spacing +10 added lines, -10 removed lines

@@ -33,9 +33,9 @@ 
     public function writeInstaller() {
         $installerPath = $this->installerBasename . ".py";
         $this->copyFile("main.py", $installerPath);
-        $installer = fopen($installerPath,"a");
-        fwrite($installer,$this->writeMessages());
-        fwrite($installer,$this->writeConfigVars());
+        $installer = fopen($installerPath, "a");
+        fwrite($installer, $this->writeMessages());
+        fwrite($installer, $this->writeConfigVars());
         fwrite($installer, "run_installer()\n");
         return($installerPath);
     }
@@ -100,7 +100,7 @@ 
         $out .= 'Messages.p12_title = "' . _("personal certificate file (p12 or pfx)") . "\"\n";
         $out .= 'Messages.save_wpa_conf = "' . _("Network Manager configuration failed, but we may generate a wpa_supplicant configuration file if you wish. Be warned that your connection password will be saved in this file as clear text.") . "\"\n";
         $out .= 'Messages.save_wpa_confirm = "' . _("Write the file") . "\"\n";
-        $out .= 'Messages.wrongUsernameFormat = "' ._("Error: Your username must be of the form 'xxx@institutionID' e.g. 'john@example.net'!") . "\"\n";
+        $out .= 'Messages.wrongUsernameFormat = "' . _("Error: Your username must be of the form 'xxx@institutionID' e.g. 'john@example.net'!") . "\"\n";
         $out .= 'Messages.wrong_realm = "' . _("Error: your username must be in the form of 'xxx@{}'. Please enter the username in the correct format.") . "\"\n";
         $out .= 'Messages.wrong_realm_suffix = "' . _("Error: your username must be in the form of 'xxx@institutionID' and end with '{}'. Please enter the username in the correct format.") . "\"\n";
     
@@ -129,8 +129,8 @@ 
             $out .= "Config.use_other_tls_id = False\n";
         }
         $tou = $this->mkUserConsent();
-        $out .= 'Config.tou = ' . ( $tou ? '"""' . $tou . '"""' : 'None' ) . "\n"; 
-        $out .= 'Config.CA = """' . $this->mkCAfile()  . '"""' . "\n";
+        $out .= 'Config.tou = ' . ($tou ? '"""' . $tou . '"""' : 'None') . "\n"; 
+        $out .= 'Config.CA = """' . $this->mkCAfile() . '"""' . "\n";
         $out .= "Config.anonymous_identity = '" . $this->determineOuterIdString() . "'\n";
         $out .= 'Config.init_info = """' . $this->mkIntro() . '"""' . "\n";
         $out .= 'Config.init_confirmation = "' . $this->mkProfileConfirmation() . "\"\n";
@@ -139,10 +139,10 @@ 
         if (!empty($this->attributes['internal:realm'][0])) {
            $out .= 'Config.user_realm = "' . $this->attributes['internal:realm'][0] . "\"\n";
         }
-        if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
+        if (!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
             $out .= "Config.hint_user_input = True\n";
         }
-        if(!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
+        if (!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
             $out .= "Config.verify_user_realm_input = True\n";
         }        
         return $out;
@@ -182,7 +182,7 @@ 
             }
             $out .= "'DNS:$oneServer'";
         }
-        return "[" . $out. "]";
+        return "[" . $out . "]";
     }
 
     
@@ -206,7 +206,7 @@ 
         return '[' . implode(', ', $outArray) . ']';
     }
     
-    private function mkCAfile(){
+    private function mkCAfile() {
         $out = '';
         $cAlist = $this->attributes['internal:CAs'][0];
         foreach ($cAlist as $oneCa) {

Braces +1 added lines, -2 removed lines

@@ -124,8 +124,7 @@
         $out .= "Config.eap_inner = '" . $eapMethod['INNER'] . "'\n";
         if ($this->selectedEap == \core\common\EAP::EAPTYPE_TLS && isset($this->attributes['eap-specific:tls_use_other_id']) && $this->attributes['eap-specific:tls_use_other_id'][0] == 'on') {
             $out .= "Config.use_other_tls_id = True\n";
-        }
-        else {
+        } else {
             $out .= "Config.use_other_tls_id = False\n";
         }
         $tou = $this->mkUserConsent();

core/ProfileSilverbullet.php

Doc Comments +5 added lines, -1 removed lines

@@ -56,6 +56,9 @@ 
 
     const PRODUCTNAME = "Managed IdP";
 
+    /**
+     * @param integer $length
+     */
     public static function randomString(
     $length, $keyspace = '23456789abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
     ) {
@@ -236,6 +239,7 @@ 
     /**
      * create a CSR
      * 
+     * @param resource $privateKey
      * @return 
      */
     private function generateCsr($privateKey) {
@@ -274,6 +278,7 @@ 
      * take a CSR and sign it with our issuing CA's certificate
      * 
      * @param $csr the CSR
+     * @param integer $expiryDays
      */
     private function signCsr($csr, $expiryDays) {
         switch (CONFIG_CONFASSISTANT['SILVERBULLET']['CA']['type']) {
@@ -698,7 +703,6 @@ 
     
     /**
      * 
-     * @param string $host
      * @return string
      */
     public static function generateTokenLink($token) {

Spacing +5 added lines, -5 removed lines

@@ -176,11 +176,11 @@ 
     public function invitationMailBody($invitationLink) {
         $text = _("Hello!");
         $text .= "\n\n";
-        $text .= sprintf(_("A new %s access credential has been created for you by your network administrator."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
+        $text .= sprintf(_("A new %s access credential has been created for you by your network administrator."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
         $text .= " ";
         $text .= sprintf(_("Please follow the following link with the device you want to enable for %s to get a custom %s installation program just for you. You can click on the link, copy and paste it into a browser or scan the attached QR code."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
         $text .= "\n\n$invitationLink\n\n"; // gets replaced with the token value by getBody()
-        $text .= sprintf(_("Please keep this email or bookmark this link for future use. After picking up your %s installation program, you can use the same link to get status information about your %s account."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
+        $text .= sprintf(_("Please keep this email or bookmark this link for future use. After picking up your %s installation program, you can use the same link to get status information about your %s account."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
         $text .= "\n\n";
         $text .= _("Regards,");
         $text .= "\n\n";
@@ -561,7 +561,7 @@ 
         if (!$invitationsResult || $invitationsResult->num_rows == 0) {
             $loggerInstance->debug(2, "Token  $tokenvalue not found in database or database query error!\n");
             return ["status" => self::SB_TOKENSTATUS_INVALID,
-                "cert_status" => [],];
+                "cert_status" => [], ];
         }
         // if not returned, we found the token in the DB
         $invitationRow = mysqli_fetch_object($invitationsResult);
@@ -716,9 +716,9 @@ 
         $link = $link . $relPath;
 
         if (preg_match('/admin$/', $link)) {
-            $link = substr($link, 0, strlen($link)-6);
+            $link = substr($link, 0, strlen($link) - 6);
         }
-        $link .= '/accountstatus/accountstatus.php?token='.$token;
+        $link .= '/accountstatus/accountstatus.php?token=' . $token;
         return $link;
     }
 

schema/1_1-2_0-script.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 
 while ($oneAttrib = mysqli_fetch_object($idpWideOptionsQuery)) {
     if (!isset($profiles[$oneAttrib->institution_id])) {
-        $idp = new \core\IdP((int)$oneAttrib->institution_id);
+        $idp = new \core\IdP((int) $oneAttrib->institution_id);
         $profiles[$oneAttrib->institution_id] = ['IdP' => $idp, 'Profiles' => $idp->listProfiles()];
         echo "Debug: IdP " . $idp->identifier . " has profiles ";
         foreach ($profiles[$oneAttrib->institution_id]['Profiles'] as $oneProfileObject) {

web/admin/inc/displayQRcode.inc.php

Spacing +3 added lines, -3 removed lines

@@ -29,6 +29,6 @@
 $link = \core\ProfileSilverbullet::generateTokenLink($cleanToken);
 header("Content-Type:text/html;charset=utf-8");
 ?>
-<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code");?></h1>
-<img style='float:none' src='data:image/png;base64,<?php echo base64_encode($uiElements->pngInjectConsortiumLogo(\QRcode::png($link, FALSE, QR_ECLEVEL_Q, 11), 11));?>'/>
-<p>(<a href='<?php echo $link;?>'><?php echo $link;?>)</a></p>
\ No newline at end of file
+<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code"); ?></h1>
+<img style='float:none' src='data:image/png;base64,<?php echo base64_encode($uiElements->pngInjectConsortiumLogo(\QRcode::png($link, FALSE, QR_ECLEVEL_Q, 11), 11)); ?>'/>
+<p>(<a href='<?php echo $link; ?>'><?php echo $link; ?>)</a></p>
\ No newline at end of file

web/admin/edit_silverbullet.php

Spacing +8 added lines, -8 removed lines

@@ -388,7 +388,7 @@ 
                                     $jsEncodedBody = str_replace('\n', '%0D%0A', str_replace('"', '', json_encode($profile->invitationMailBody($link))));
                                     $tokenHtmlBuffer .= "<td>
                                 
-                                    The invitation token <input type='text' readonly='readonly' color='grey' size='60' value='$link' name='token' class='identifiedtokenarea-".$tokenWithoutCert['db_id']."'>(…)<br/> is ready for sending! Choose how to send it:
+                                    The invitation token <input type='text' readonly='readonly' color='grey' size='60' value='$link' name='token' class='identifiedtokenarea-" . $tokenWithoutCert['db_id'] . "'>(…)<br/> is ready for sending! Choose how to send it:
                                     <table>
                                     <tr><td style='vertical-align:bottom;'>E-Mail:</td><td>
                                     $formtext
@@ -406,7 +406,7 @@ 
                                     </form>
 				</td></tr>
                                     <tr><td style='vertical-align:bottom;'>Manual:</td><td>
-				<button type='button' class='clipboardButton' onclick='clipboardCopy(".$tokenWithoutCert['db_id'].");'>" . _("Copy to Clipboard") . "</button>
+				<button type='button' class='clipboardButton' onclick='clipboardCopy(".$tokenWithoutCert['db_id'] . ");'>" . _("Copy to Clipboard") . "</button>
                                     <form style='display:inline-block;' method='post' action='inc/displayQRcode.inc.php' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
                                     <input type='hidden' value='" . $tokenWithoutCert['value'] . "' name='token'><br/>
                                       <button type='submit'>" . _("Display QR code") . "</button>
@@ -437,7 +437,7 @@ 
                         ?>
 
                         <td>
-                            <?php echo $formtext;?>
+                            <?php echo $formtext; ?>
                                 <div class="sb-date-container">
                                     <input type="text" maxlength="10" id="sb-date-picker-1" class="sb-date-picker" name="userexpiry" value="<?php echo $profile->getUserExpiryDate($oneUserId); ?>">
                                     <button class="sb-date-button" type="button">▼</button>
@@ -450,7 +450,7 @@ 
                             <div class="sb-user-buttons">
                                 <?php
                                 if ($hasOnePendingInvite || count($validCerts) > 0) {
-                                    echo $formtext ."
+                                    echo $formtext . "
                                     <input type='hidden' name='userid' value='$oneUserId'/>
                                     <button type='submit' id='userdel' name='command' value='" . \web\lib\common\FormElements::BUTTON_DEACTIVATEUSER . "' class='delete'>" . _("Deactivate User") . "</button>
                                 </form>";
@@ -488,7 +488,7 @@ 
                                     . ' If all accounts shown as active above are indeed still valid, please check the box below and push "Save".'
                                     . ' If any of the accounts are stale, please deactivate them by pushing the corresponding button before doing this.'), CONFIG_CONFASSISTANT['SILVERBULLET']['gracetime'] ?? core\ProfileSilverbullet::SB_ACKNOWLEDGEMENT_REQUIRED_DAYS);
 
-                    echo $formtext."<div style='padding-bottom: 20px;'>"
+                    echo $formtext . "<div style='padding-bottom: 20px;'>"
                     . "
                     <p>$acknowledgeText</p>
                     <input type='checkbox' name='acknowledge' value='true'>
@@ -512,7 +512,7 @@ 
         </ul>
         <!--adding manual -->
         <div id="tabs-1">
-            <?php echo $formtext;?>
+            <?php echo $formtext; ?>
                 <div class="sb-add-new-user">
                     <label for="username"><?php echo _("Please enter a username of your choice and user expiry date to create a new user:"); ?></label>
                     <div style="margin: 5px 0px 10px 0px;">
@@ -529,7 +529,7 @@ 
         <!--CSV -->
         <div id="tabs-2">
             <div>
-                <?php echo $formtext;?>
+                <?php echo $formtext; ?>
                     <div class="sb-add-new-user">
                         <p><?php echo _("Comma separated values should be provided in CSV file: username, expiration date 'yyyy-mm-dd', number of tokens (optional):"); ?></p>
                         <div style="margin: 5px 0px 10px 0px;">
@@ -557,7 +557,7 @@ 
                             <hr>
                             <?php echo $profile->termsAndConditions; ?>
                             <hr>
-                            <?php echo $formtext;?>
+                            <?php echo $formtext; ?>
                                 <div style="position: relative; padding-bottom: 5px;">
                                     <input type="checkbox" name="agreement" value="true"> <label><?php echo _("I have read and agree to the terms."); ?></label>
                                 </div>

web/skins/classic/index.php

Spacing +6 added lines, -6 removed lines

@@ -60,11 +60,11 @@ 
 
 $deco = new \web\lib\admin\PageDecoration();
 ?>
-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
 <!-- JQuery -->
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script>
 <!-- JQuery -->
 <script type="text/javascript">
     if (screen.width <= 480) {
@@ -106,7 +106,7 @@ 
     <div id="heading">
         <?php
         print '<img src="' . $Gui->skinObject->findResourceUrl("IMAGES", "consortium_logo.png") . '" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
-        print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>';
+        print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>';
         print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']) . '</h1>
 <h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'] . '</h2>';
         echo '<table id="lang_select"><tr><td>';
@@ -160,7 +160,7 @@ 
                                             <span id="line1"><?php printf(_("%s installation made easy:"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) ?></span>
                                             <span id="line2"></span>
                                             <span id="line3"></span>
-                                            <span id="line4"><?php echo sprintf(_("Custom built for your %s"),$Gui->nomenclature_inst) ?></span>
+                                            <span id="line4"><?php echo sprintf(_("Custom built for your %s"), $Gui->nomenclature_inst) ?></span>
                                             <span id="line5">
                                                 <?php
                                                 if (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "") {