GEANT / CAT

config/autoloader.php

Spacing +5 added lines, -5 removed lines

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

utils/ocspweb/index.php

Spacing +7 added lines, -7 removed lines

@@ -97,7 +97,7 @@ 
 exec("openssl ocsp -reqin $derFilePath -req_text", $output, $retval);
 
 if ($retval !== 0) {
-    throw new Exception("openssl ocsp returned a non-zero return code. The DER data is probably bogus. B64 representation of DER data is: " . base64_encode($ocspRequestDer));
+    throw new Exception("openssl ocsp returned a non-zero return code. The DER data is probably bogus. B64 representation of DER data is: ".base64_encode($ocspRequestDer));
 }
 if ($output === NULL) { // this can't really happen, but makes Scrutinizer happier
     $output = [];
@@ -127,14 +127,14 @@ 
  * back (if we have it).
  */
 if (strcasecmp($nameHash, OUR_NAME_HASH) != 0 || strcasecmp($keyHash, OUR_KEY_HASH) != 0) {
-    throw new Exception("The request is about a different Issuer name / public key. Expected vs. actual name hash: " . OUR_NAME_HASH . " / $nameHash, " . OUR_KEY_HASH . " / $keyHash");
+    throw new Exception("The request is about a different Issuer name / public key. Expected vs. actual name hash: ".OUR_NAME_HASH." / $nameHash, ".OUR_KEY_HASH." / $keyHash");
 }
-error_log("base64-encoded request: " . base64_encode($ocspRequestDer));
+error_log("base64-encoded request: ".base64_encode($ocspRequestDer));
 
-$response = fopen(__DIR__ . "/statements/" . $serialHex . ".der", "r");
+$response = fopen(__DIR__."/statements/".$serialHex.".der", "r");
 if ($response === FALSE) { // not found
     // first lets load the unauthorised response, which is the default reply
-    $unauthResponse = fopen(__DIR__ . "/statements/UNAUTHORIZED.der", "r");
+    $unauthResponse = fopen(__DIR__."/statements/UNAUTHORIZED.der", "r");
     if ($unauthResponse === FALSE) {
         throw new Exception("Unable to open our canned UNAUTHORIZED response!");
     }
@@ -176,7 +176,7 @@ 
 
 $responseContent = fread($response, 1000000);
 fclose($response);
-error_log("base64-encoded response: " . base64_encode($responseContent));
+error_log("base64-encoded response: ".base64_encode($responseContent));
 header('Content-Type: application/ocsp-response');
-header('Content-Length: ' . strlen($responseContent));
+header('Content-Length: '.strlen($responseContent));
 echo $responseContent;

devices/linux/DeviceLinux.php

Spacing +21 added lines, -21 removed lines

@@ -55,9 +55,9 @@ 
      *
      */
     public function writeInstaller() {
-        $installerPath = $this->installerBasename . ".py";
+        $installerPath = $this->installerBasename.".py";
         $this->copyFile("main.py", $installerPath);
-        $installer = fopen($installerPath,"a");
+        $installer = fopen($installerPath, "a");
         if ($installer === FALSE) {
             throw new Exception("Unable to open installer file for writing!");
         }
@@ -84,9 +84,9 @@ 
         $out .= "<p>";
         if ($ssidCount > 1) {
             if ($ssidCount > 2) {
-                $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"), implode(', ', \config\ConfAssistant::CONSORTIUM['ssid'])) . " ";
+                $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"), implode(', ', \config\ConfAssistant::CONSORTIUM['ssid']))." ";
             } else {
-                $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"), implode(', ', \config\ConfAssistant::CONSORTIUM['ssid'])) . " ";
+                $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"), implode(', ', \config\ConfAssistant::CONSORTIUM['ssid']))." ";
             }
             $iterator = 0;
             foreach ($this->attributes['internal:SSID'] as $ssid => $v) {
@@ -124,8 +124,8 @@ 
      * @return void
      */
     private function writeConfigLine($file, $prefix, $name, $text) {
-        $out = $prefix . $name . ' = "' . $text;
-        fwrite($file, wordwrap($out, 70, " \" \\\n    \"") . "\n");
+        $out = $prefix.$name.' = "'.$text;
+        fwrite($file, wordwrap($out, 70, " \" \\\n    \"")."\n");
     }
     
     /**
@@ -164,7 +164,7 @@ 
         'user_cert_missing' => _("personal certificate file not found"),
         ];
         foreach ($messages as $name => $value) {
-            $this->writeConfigLine($file, 'Messages.', $name, $value . '"');
+            $this->writeConfigLine($file, 'Messages.', $name, $value.'"');
         }
         \core\common\Entity::outOfThePotatoes();
     }
@@ -208,39 +208,39 @@ 
         }
 
         if ($outerId !== NULL) {
-            $configRaw['anonymous_identity'] = '"' . $outerId . '"';
+            $configRaw['anonymous_identity'] = '"'.$outerId.'"';
         }
 
         if (!empty($this->attributes['internal:realm'][0])) {
            $config['user_realm'] = $this->attributes['internal:realm'][0];
         }
         
-        if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
+        if (!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
             $configRaw['hint_user_input'] = "True";
         }
         
-        if(!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
+        if (!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
             $configRaw['verify_user_realm_input'] = "True";
         }
         
         foreach ($config as $name => $value) {
-            $this->writeConfigLine($file, 'Config.', $name, $value . '"');
+            $this->writeConfigLine($file, 'Config.', $name, $value.'"');
         }
         
         foreach ($configRaw as $name => $value) {
-            fwrite($file, 'Config.' . $name . ' = ' . $value . "\n");
+            fwrite($file, 'Config.'.$name.' = '.$value."\n");
         }
         
         if ($tou === '') {
-            fwrite($file, 'Config.tou = ""' . "\n");
+            fwrite($file, 'Config.tou = ""'."\n");
         } else {
-            fwrite($file, 'Config.tou = """' . $tou . '"""' . "\n");
+            fwrite($file, 'Config.tou = """'.$tou.'"""'."\n");
         }
         
-        fwrite($file, 'Config.CA = """' . $this->mkCAfile() . '"""' . "\n");
+        fwrite($file, 'Config.CA = """'.$this->mkCAfile().'"""'."\n");
         $sbUserFile = $this->mkSbUserFile();
         if ($sbUserFile !== '') {
-            fwrite($file, 'Config.sb_user_file = """' . $sbUserFile . '"""' . "\n");
+            fwrite($file, 'Config.sb_user_file = """'.$sbUserFile.'"""'."\n");
         }
     }
 
@@ -292,7 +292,7 @@ 
             }
             $out .= "'DNS:$oneServer'";
         }
-        return "[" . $out. "]";
+        return "[".$out."]";
     }
 
     /**
@@ -306,7 +306,7 @@ 
         foreach ($ssids as $ssid => $cipher) {
             $outArray[] = "'$ssid'";
         }
-        return '[' . implode(', ', $outArray) . ']';
+        return '['.implode(', ', $outArray).']';
     }
     
     /**
@@ -322,7 +322,7 @@ 
                 $outArray[] = "'$ssid'";
             }
         }
-        return '[' . implode(', ', $outArray) . ']';
+        return '['.implode(', ', $outArray).']';
     }
     
     /**
@@ -330,7 +330,7 @@ 
      * 
      * @return string
      */
-    private function mkCAfile(){
+    private function mkCAfile() {
         $out = '';
         $cAlist = $this->attributes['internal:CAs'][0];
         foreach ($cAlist as $oneCa) {
@@ -346,7 +346,7 @@ 
      */
     private function mkIntro() {
         \core\common\Entity::intoThePotatoes();
-        $out = _("This installer has been prepared for {0}") . '\n\n' . _("More information and comments:") . '\n\nEMAIL: {1}\nWWW: {2}\n\n' .
+        $out = _("This installer has been prepared for {0}").'\n\n'._("More information and comments:").'\n\nEMAIL: {1}\nWWW: {2}\n\n'.
             _("Installer created with software from the GEANT project.");
         \core\common\Entity::outOfThePotatoes();
         return $out;

core/SilverbulletInvitation.php

Spacing +4 added lines, -4 removed lines

@@ -145,7 +145,7 @@ 
         $this->activationsTotal = $invitationRow->quantity;
         $certificatesResult = $this->databaseHandle->exec("SELECT `serial_number`, `ca_type` FROM `silverbullet_certificate` WHERE `silverbullet_invitation_id` = ? ORDER BY `revocation_status`, `expiry` DESC", "i", $this->identifier);
         $certificatesNumber = ($certificatesResult ? $certificatesResult->num_rows : 0);
-        $this->loggerInstance->debug(5, "At token validation level, " . $certificatesNumber . " certificates exist.\n");
+        $this->loggerInstance->debug(5, "At token validation level, ".$certificatesNumber." certificates exist.\n");
         // SELECT -> resource, no boolean
         while ($runner = mysqli_fetch_object(/** @scrutinizer ignore-type */ $certificatesResult)) {
             $this->associatedCertificates[] = new \core\SilverbulletCertificate($runner->serial_number, $runner->ca_type);
@@ -204,7 +204,7 @@ 
                 throw new Exception("Uh. Something went seriously wrong with URL path mangling.");
             }
         }
-        $link = $link . $relPath;
+        $link = $link.$relPath;
 
         if (preg_match('/admin$/', $link)) {
             $link = substr($link, 0, -6);
@@ -213,7 +213,7 @@ 
             }
         }
 
-        return $link . '/accountstatus/accountstatus.php?token=' . $this->invitationTokenString;
+        return $link.'/accountstatus/accountstatus.php?token='.$this->invitationTokenString;
     }
 
     /**
@@ -240,7 +240,7 @@ 
         $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" . $this->link() . "\n\n"; // gets replaced with the token value by getBody()
+        $text .= "\n\n".$this->link()."\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 .= "\n\n";
         $text .= _("Regards,");

web/resources/css/cat.css.php

Spacing +17 added lines, -17 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'];
 header('Content-type: text/css; charset=utf-8');
@@ -29,7 +29,7 @@ 
 }
 
 body {
-    background: <?php echo $colour1;?>;
+    background: <?php echo $colour1; ?>;
     color: #000000;
     font-family:Verdana, Arial, Helvetica, sans-serif;
     font-size:11px;
@@ -44,7 +44,7 @@ 
 }
 
 button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     min-height: 23px;
     border-left-style: outset; 
@@ -395,7 +395,7 @@ 
 
 span.edu_cat {
     font-weight: bold;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 span.tooltip {
@@ -491,7 +491,7 @@ 
     border-bottom-style:solid;
     border-top-width:5px; 
     border-bottom-width:5px; 
-    border-color: <?php echo $colour1;?>; 
+    border-color: <?php echo $colour1; ?>; 
     padding-left:30px;
 }
 
@@ -561,7 +561,7 @@ 
 }
 
 #close_button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     height: 23px;
     border-left-style: inset; 
@@ -636,7 +636,7 @@ 
     width: 30em; 
     padding-left: 10px; 
     padding-right: 0px; 
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: white; 
     box-shadow: 10px 10px 5px #888888;
 }
@@ -683,7 +683,7 @@ 
     padding-top: 4px; 
     padding-bottom: 12px; 
     padding-left: 30px; 
-    background: <?php echo $colour1;?>; 
+    background: <?php echo $colour1; ?>; 
     text-align: left; 
     text-shadow: 10px 10px 5px #888888;
 }
@@ -693,9 +693,9 @@ 
     border-bottom-style:solid;
     border-top-width:5px;
     border-bottom-width:5px;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     padding-left:30px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 #heading h1 { 
@@ -714,7 +714,7 @@ 
     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;
 }
@@ -761,7 +761,7 @@ 
 
 #faq {
     padding: 20px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     background: #ffffff;
 }
 
@@ -813,7 +813,7 @@ 
 
 #line1 {
     top:145px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     font-size:20px;
 }
 
@@ -860,7 +860,7 @@ 
 
 #front_page_leftmenu {
     border-right:solid; 
-    border-color: <?php echo $colour1;?>; 
+    border-color: <?php echo $colour1; ?>; 
     border-width:5px; 
     min-height:400px; 
     padding-left: 10px; 
@@ -885,11 +885,11 @@ 
 }
 
 a:link {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:visited {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:hover {
@@ -897,7 +897,7 @@ 
 }
 
 a:active {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 .comment {

web/admin/logout_check.php

Spacing +3 added lines, -3 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";
 require_once \config\Master::AUTHENTICATION['ssp-path-to-autoloader'];
 
 $deco = new \web\lib\admin\PageDecoration();
@@ -38,13 +38,13 @@ 
     if ($cutoff !== FALSE) {    
         $substring = substr($_SERVER['PHP_SELF'], 0, $cutoff);
         if ($substring !== FALSE) {
-            $url = "//" . htmlspecialchars($_SERVER['SERVER_NAME']) . $substring;
+            $url = "//".htmlspecialchars($_SERVER['SERVER_NAME']).$substring;
         }
     }
     header("Location: $url");
 } else {
     /* Logout failed. Tell the user to close the browser. */
     echo $deco->pageheader(_("Incomplete Logout"), "ADMIN", FALSE);
-    echo "<p>" . _("We were unable to log you out of all your sessions. To be completely sure that you are logged out, you need to close your web browser.") . "</p>";
+    echo "<p>"._("We were unable to log you out of all your sessions. To be completely sure that you are logged out, you need to close your web browser.")."</p>";
     echo $deco->footer();
 }

web/user/about_cat.inc.php

Spacing +5 added lines, -5 removed lines

@@ -42,10 +42,10 @@ 
         \config\ConfAssistant::CONSORTIUM['display_name'], 
         \config\Master::APPEARANCE['productname'], 
         \config\Master::APPEARANCE['productname']);
-$out .= "<p>" . sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), \config\Master::APPEARANCE['productname']) . "</p>";
-$out .= "<table><tr><th>" . _("Device Group") . "</th><th>" . _("Device") . "</th>";
+$out .= "<p>".sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), \config\Master::APPEARANCE['productname'])."</p>";
+$out .= "<table><tr><th>"._("Device Group")."</th><th>"._("Device")."</th>";
 foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) {
-    $out .= "<th style='min-width: 80px;'>" . $oneeap->getPrintableRep() . "</th>";
+    $out .= "<th style='min-width: 80px;'>".$oneeap->getPrintableRep()."</th>";
 }
 $out .= "</tr>";
 foreach (\devices\Devices::listDevices() as $index => $onedevice) {
@@ -54,12 +54,12 @@ 
             continue;
         }
     }
-    $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/" . $onedevice['group'] . ".png");
+    $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/".$onedevice['group'].".png");
     $vendorImg = "";
     if ($vendor !== FALSE) {
         $vendorImg = "<img src='$vendor' alt='logo'>";
     }
-    $out .= "<tr><td class='vendor'>$vendorImg</td><td>" . $onedevice['display'] . "</td>";
+    $out .= "<tr><td class='vendor'>$vendorImg</td><td>".$onedevice['display']."</td>";
     $device_instance = new \core\DeviceFactory($index);
     foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) {
         $out .= "<td>";

web/user/devel.inc.php

Spacing +7 added lines, -7 removed lines

@@ -19,13 +19,13 @@
  *          <base_url>/copyright.php after deploying the software
  */
 
-$out = "<h3>" . _("Access the sources") . "</h3>" .
-        sprintf(_("%s is an opensource project. If you are interested in the details of the implementation, please visit <a href='%s'>GitHub</a>."), \config\Master::APPEARANCE['productname'], "https://github.com/GEANT/CAT" ) .
-        "<h3>" . _("Join the developers mailing list.") . "</h3>" .
-        sprintf(_("The list is available at: %s"), \config\Master::APPEARANCE['support-contact']['display']) .
-        "<h3>" . _("Add a translation") . "</h3>" .
-        _("If you would like to add a new language to CAT then please contact us ...") .
-        "<h3><a href='" . \core\CAT::getRootUrlPath() . "/apidoc' target='_blank'>". _("Documentation") . "</a></h3>" ;
+$out = "<h3>"._("Access the sources")."</h3>".
+        sprintf(_("%s is an opensource project. If you are interested in the details of the implementation, please visit <a href='%s'>GitHub</a>."), \config\Master::APPEARANCE['productname'], "https://github.com/GEANT/CAT").
+        "<h3>"._("Join the developers mailing list.")."</h3>".
+        sprintf(_("The list is available at: %s"), \config\Master::APPEARANCE['support-contact']['display']).
+        "<h3>"._("Add a translation")."</h3>".
+        _("If you would like to add a new language to CAT then please contact us ...").
+        "<h3><a href='".\core\CAT::getRootUrlPath()."/apidoc' target='_blank'>"._("Documentation")."</a></h3>";
 
         
 

web/404.php

Spacing +10 added lines, -10 removed lines

@@ -26,7 +26,7 @@ 
  * @package UserGUI
  */
 error_reporting(E_ALL | E_STRICT);
-require dirname(dirname(__FILE__)) . "/config/_config.php";
+require dirname(dirname(__FILE__))."/config/_config.php";
 $langObject = new \core\common\Language();
 $langObject->setTextDomain("web_user");
 
@@ -38,25 +38,25 @@ 
 <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
     <div id="heading">
         <?php
-        print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
-        print '<div id="motd">' . ( isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp' ) . '</div>';
-        print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']) . '</h1>
-<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'] . '</h2>';
+        print '<img src="'.dirname($_SERVER['SCRIPT_NAME']).'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
+        print '<div id="motd">'.(isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp').'</div>';
+        print '<h1 style="padding-bottom:0px; height:1em;">'.sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']).'</h1>
+<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'].'</h2>';
         echo '<table id="lang_select"><tr><td>';
         echo _("View this page in");
         ?>
         <?php
         foreach (\config\Master::LANGUAGES as $lang => $value) {
-            echo "<a href='javascript:changeLang(\"$lang\")'>" . $value['display'] . "</a> ";
+            echo "<a href='javascript:changeLang(\"$lang\")'>".$value['display']."</a> ";
         }
-        echo '</td><td style="text-align:right;padding-right:20px"><a href="' . dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang() . '">' . _("Start page") . '</a></td></tr></table>';
+        echo '</td><td style="text-align:right;padding-right:20px"><a href="'.dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang().'">'._("Start page").'</a></td></tr></table>';
         ?>
     </div> <!-- id="heading" -->
     <div id="main_body" style='padding:20px;'>
-        <h1><?php echo _("This is not the CAT you are looking for.");?></h1>
-        <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number");?></p>
+        <h1><?php echo _("This is not the CAT you are looking for."); ?></h1>
+        <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number"); ?></p>
         <h2>404</h2>
-        <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang());?></p>
+        <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang()); ?></p>
     </div> <!-- id="main_body" -->
 
         <?php echo $deco->footer();