Passed
Push — release_2_1 ( 156650...595abe )
by Stefan
11:50
created
utils/ocspweb/index.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 exec("openssl ocsp -reqin $derFilePath -req_text", $output, $retval);
98 98
 
99 99
 if ($retval !== 0) {
100
-    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));
100
+    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));
101 101
 }
102 102
 if ($output === NULL) { // this can't really happen, but makes Scrutinizer happier
103 103
     $output = [];
@@ -127,14 +127,14 @@  discard block
 block discarded – undo
127 127
  * back (if we have it).
128 128
  */
129 129
 if (strcasecmp($nameHash, OUR_NAME_HASH) != 0 || strcasecmp($keyHash, OUR_KEY_HASH) != 0) {
130
-    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");
130
+    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");
131 131
 }
132
-error_log("base64-encoded request: " . base64_encode($ocspRequestDer));
132
+error_log("base64-encoded request: ".base64_encode($ocspRequestDer));
133 133
 
134
-$response = fopen(__DIR__ . "/statements/" . $serialHex . ".der", "r");
134
+$response = fopen(__DIR__."/statements/".$serialHex.".der", "r");
135 135
 if ($response === FALSE) { // not found
136 136
     // first lets load the unauthorised response, which is the default reply
137
-    $unauthResponse = fopen(__DIR__ . "/statements/UNAUTHORIZED.der", "r");
137
+    $unauthResponse = fopen(__DIR__."/statements/UNAUTHORIZED.der", "r");
138 138
     if ($unauthResponse === FALSE) {
139 139
         throw new Exception("Unable to open our canned UNAUTHORIZED response!");
140 140
     }
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 
177 177
 $responseContent = fread($response, 1000000);
178 178
 fclose($response);
179
-error_log("base64-encoded response: " . base64_encode($responseContent));
179
+error_log("base64-encoded response: ".base64_encode($responseContent));
180 180
 header('Content-Type: application/ocsp-response');
181
-header('Content-Length: ' . strlen($responseContent));
181
+header('Content-Length: '.strlen($responseContent));
182 182
 echo $responseContent;
Please login to merge, or discard this patch.
core/SilverbulletInvitation.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
         $this->activationsTotal = $invitationRow->quantity;
146 146
         $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);
147 147
         $certificatesNumber = ($certificatesResult ? $certificatesResult->num_rows : 0);
148
-        $this->loggerInstance->debug(5, "At token validation level, " . $certificatesNumber . " certificates exist.\n");
148
+        $this->loggerInstance->debug(5, "At token validation level, ".$certificatesNumber." certificates exist.\n");
149 149
         // SELECT -> resource, no boolean
150 150
         while ($runner = mysqli_fetch_object(/** @scrutinizer ignore-type */ $certificatesResult)) {
151 151
             $this->associatedCertificates[] = new \core\SilverbulletCertificate($runner->serial_number, $runner->ca_type);
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
                 throw new Exception("Uh. Something went seriously wrong with URL path mangling.");
205 205
             }
206 206
         }
207
-        $link = $link . $relPath;
207
+        $link = $link.$relPath;
208 208
 
209 209
         if (preg_match('/admin$/', $link)) {
210 210
             $link = substr($link, 0, -6);
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
             }
214 214
         }
215 215
 
216
-        return $link . '/accountstatus/accountstatus.php?token=' . $this->invitationTokenString;
216
+        return $link.'/accountstatus/accountstatus.php?token='.$this->invitationTokenString;
217 217
     }
218 218
 
219 219
     /**
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
         $text .= sprintf(_("A new %s access credential has been created for you by your network administrator."), \config\ConfAssistant::CONSORTIUM['display_name']);
241 241
         $text .= " ";
242 242
         $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']);
243
-        $text .= "\n\n" . $this->link() . "\n\n"; // gets replaced with the token value by getBody()
243
+        $text .= "\n\n".$this->link()."\n\n"; // gets replaced with the token value by getBody()
244 244
         $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']);
245 245
         $text .= "\n\n";
246 246
         $text .= _("Regards,");
Please login to merge, or discard this patch.
web/resources/css/cat.css.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
  *          <base_url>/copyright.php after deploying the software
20 20
  */
21 21
 
22
-require dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
22
+require dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
23 23
 $colour1 = \config\Master::APPEARANCE['colour1'];
24 24
 $colour2 = \config\Master::APPEARANCE['colour2'];
25 25
 header('Content-type: text/css; charset=utf-8');
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 }
30 30
 
31 31
 body {
32
-    background: <?php echo $colour1;?>;
32
+    background: <?php echo $colour1; ?>;
33 33
     color: #000000;
34 34
     font-family:Verdana, Arial, Helvetica, sans-serif;
35 35
     font-size:11px;
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 }
45 45
 
46 46
 button {
47
-    background: <?php echo $colour2;?>; 
47
+    background: <?php echo $colour2; ?>; 
48 48
     color: #FFFFFF; 
49 49
     min-height: 23px;
50 50
     border-left-style: outset; 
@@ -395,7 +395,7 @@  discard block
 block discarded – undo
395 395
 
396 396
 span.edu_cat {
397 397
     font-weight: bold;
398
-    color: <?php echo $colour2;?>;
398
+    color: <?php echo $colour2; ?>;
399 399
 }
400 400
 
401 401
 span.tooltip {
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
491 491
     border-bottom-style:solid;
492 492
     border-top-width:5px; 
493 493
     border-bottom-width:5px; 
494
-    border-color: <?php echo $colour1;?>; 
494
+    border-color: <?php echo $colour1; ?>; 
495 495
     padding-left:30px;
496 496
 }
497 497
 
@@ -561,7 +561,7 @@  discard block
 block discarded – undo
561 561
 }
562 562
 
563 563
 #close_button {
564
-    background: <?php echo $colour2;?>; 
564
+    background: <?php echo $colour2; ?>; 
565 565
     color: #FFFFFF; 
566 566
     height: 23px;
567 567
     border-left-style: inset; 
@@ -636,7 +636,7 @@  discard block
 block discarded – undo
636 636
     width: 30em; 
637 637
     padding-left: 10px; 
638 638
     padding-right: 0px; 
639
-    background: <?php echo $colour2;?>; 
639
+    background: <?php echo $colour2; ?>; 
640 640
     color: white; 
641 641
     box-shadow: 10px 10px 5px #888888;
642 642
 }
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
683 683
     padding-top: 4px; 
684 684
     padding-bottom: 12px; 
685 685
     padding-left: 30px; 
686
-    background: <?php echo $colour1;?>; 
686
+    background: <?php echo $colour1; ?>; 
687 687
     text-align: left; 
688 688
     text-shadow: 10px 10px 5px #888888;
689 689
 }
@@ -693,9 +693,9 @@  discard block
 block discarded – undo
693 693
     border-bottom-style:solid;
694 694
     border-top-width:5px;
695 695
     border-bottom-width:5px;
696
-    border-color: <?php echo $colour1;?>;
696
+    border-color: <?php echo $colour1; ?>;
697 697
     padding-left:30px;
698
-    color: <?php echo $colour2;?>;
698
+    color: <?php echo $colour2; ?>;
699 699
 }
700 700
 
701 701
 #heading h1 { 
@@ -714,7 +714,7 @@  discard block
 block discarded – undo
714 714
     text-align: justify;
715 715
     border-bottom-style:solid;
716 716
     border-bottom-width:5px;
717
-    border-color: <?php echo $colour1;?>;
717
+    border-color: <?php echo $colour1; ?>;
718 718
     font-size: 11px;
719 719
     font-weight: normal;
720 720
 }
@@ -761,7 +761,7 @@  discard block
 block discarded – undo
761 761
 
762 762
 #faq {
763 763
     padding: 20px;
764
-    color: <?php echo $colour2;?>;
764
+    color: <?php echo $colour2; ?>;
765 765
     background: #ffffff;
766 766
 }
767 767
 
@@ -813,7 +813,7 @@  discard block
 block discarded – undo
813 813
 
814 814
 #line1 {
815 815
     top:145px;
816
-    color: <?php echo $colour2;?>;
816
+    color: <?php echo $colour2; ?>;
817 817
     font-size:20px;
818 818
 }
819 819
 
@@ -860,7 +860,7 @@  discard block
 block discarded – undo
860 860
 
861 861
 #front_page_leftmenu {
862 862
     border-right:solid; 
863
-    border-color: <?php echo $colour1;?>; 
863
+    border-color: <?php echo $colour1; ?>; 
864 864
     border-width:5px; 
865 865
     min-height:400px; 
866 866
     padding-left: 10px; 
@@ -885,11 +885,11 @@  discard block
 block discarded – undo
885 885
 }
886 886
 
887 887
 a:link {
888
-    color:<?php echo $colour2;?>;
888
+    color:<?php echo $colour2; ?>;
889 889
 }
890 890
 
891 891
 a:visited {
892
-    color:<?php echo $colour2;?>;
892
+    color:<?php echo $colour2; ?>;
893 893
 }
894 894
 
895 895
 a:hover {
@@ -897,7 +897,7 @@  discard block
 block discarded – undo
897 897
 }
898 898
 
899 899
 a:active {
900
-    color:<?php echo $colour2;?>;
900
+    color:<?php echo $colour2; ?>;
901 901
 }
902 902
 
903 903
 .comment {
Please login to merge, or discard this patch.
web/admin/logout_check.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
  *          <base_url>/copyright.php after deploying the software
20 20
  */
21 21
 
22
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
22
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
23 23
 require_once \config\Master::AUTHENTICATION['ssp-path-to-autoloader'];
24 24
 
25 25
 $deco = new \web\lib\admin\PageDecoration();
@@ -38,13 +38,13 @@  discard block
 block discarded – undo
38 38
     if ($cutoff !== FALSE) {    
39 39
         $substring = substr($_SERVER['PHP_SELF'], 0, $cutoff);
40 40
         if ($substring !== FALSE) {
41
-            $url = "//" . htmlspecialchars($_SERVER['SERVER_NAME']) . $substring;
41
+            $url = "//".htmlspecialchars($_SERVER['SERVER_NAME']).$substring;
42 42
         }
43 43
     }
44 44
     header("Location: $url");
45 45
 } else {
46 46
     /* Logout failed. Tell the user to close the browser. */
47 47
     echo $deco->pageheader(_("Incomplete Logout"), "ADMIN", FALSE);
48
-    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>";
48
+    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>";
49 49
     echo $deco->footer();
50 50
 }
Please login to merge, or discard this patch.
web/user/about_cat.inc.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -42,10 +42,10 @@  discard block
 block discarded – undo
42 42
         \config\ConfAssistant::CONSORTIUM['display_name'], 
43 43
         \config\Master::APPEARANCE['productname'], 
44 44
         \config\Master::APPEARANCE['productname']);
45
-$out .= "<p>" . sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), \config\Master::APPEARANCE['productname']) . "</p>";
46
-$out .= "<table><tr><th>" . _("Device Group") . "</th><th>" . _("Device") . "</th>";
45
+$out .= "<p>".sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), \config\Master::APPEARANCE['productname'])."</p>";
46
+$out .= "<table><tr><th>"._("Device Group")."</th><th>"._("Device")."</th>";
47 47
 foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) {
48
-    $out .= "<th style='min-width: 80px;'>" . $oneeap->getPrintableRep() . "</th>";
48
+    $out .= "<th style='min-width: 80px;'>".$oneeap->getPrintableRep()."</th>";
49 49
 }
50 50
 $out .= "</tr>";
51 51
 foreach (\devices\Devices::listDevices() as $index => $onedevice) {
@@ -54,12 +54,12 @@  discard block
 block discarded – undo
54 54
             continue;
55 55
         }
56 56
     }
57
-    $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/" . $onedevice['group'] . ".png");
57
+    $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/".$onedevice['group'].".png");
58 58
     $vendorImg = "";
59 59
     if ($vendor !== FALSE) {
60 60
         $vendorImg = "<img src='$vendor' alt='logo'>";
61 61
     }
62
-    $out .= "<tr><td class='vendor'>$vendorImg</td><td>" . $onedevice['display'] . "</td>";
62
+    $out .= "<tr><td class='vendor'>$vendorImg</td><td>".$onedevice['display']."</td>";
63 63
     $device_instance = new \core\DeviceFactory($index);
64 64
     foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) {
65 65
         $out .= "<td>";
Please login to merge, or discard this patch.
web/user/devel.inc.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -19,13 +19,13 @@
 block discarded – undo
19 19
  *          <base_url>/copyright.php after deploying the software
20 20
  */
21 21
 
22
-$out = "<h3>" . _("Access the sources") . "</h3>" .
23
-        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" ) .
24
-        "<h3>" . _("Join the developers mailing list.") . "</h3>" .
25
-        sprintf(_("The list is available at: %s"), \config\Master::APPEARANCE['support-contact']['display']) .
26
-        "<h3>" . _("Add a translation") . "</h3>" .
27
-        _("If you would like to add a new language to CAT then please contact us ...") .
28
-        "<h3><a href='" . \core\CAT::getRootUrlPath() . "/apidoc' target='_blank'>". _("Documentation") . "</a></h3>" ;
22
+$out = "<h3>"._("Access the sources")."</h3>".
23
+        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").
24
+        "<h3>"._("Join the developers mailing list.")."</h3>".
25
+        sprintf(_("The list is available at: %s"), \config\Master::APPEARANCE['support-contact']['display']).
26
+        "<h3>"._("Add a translation")."</h3>".
27
+        _("If you would like to add a new language to CAT then please contact us ...").
28
+        "<h3><a href='".\core\CAT::getRootUrlPath()."/apidoc' target='_blank'>"._("Documentation")."</a></h3>";
29 29
 
30 30
         
31 31
 
Please login to merge, or discard this patch.
web/404.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
  * @package UserGUI
27 27
  */
28 28
 error_reporting(E_ALL | E_STRICT);
29
-require dirname(dirname(__FILE__)) . "/config/_config.php";
29
+require dirname(dirname(__FILE__))."/config/_config.php";
30 30
 $langObject = new \core\common\Language();
31 31
 $langObject->setTextDomain("web_user");
32 32
 
@@ -38,25 +38,25 @@  discard block
 block discarded – undo
38 38
 <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
39 39
     <div id="heading">
40 40
         <?php
41
-        print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
42
-        print '<div id="motd">' . ( isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp' ) . '</div>';
43
-        print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']) . '</h1>
44
-<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'] . '</h2>';
41
+        print '<img src="'.dirname($_SERVER['SCRIPT_NAME']).'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
42
+        print '<div id="motd">'.(isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp').'</div>';
43
+        print '<h1 style="padding-bottom:0px; height:1em;">'.sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']).'</h1>
44
+<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'].'</h2>';
45 45
         echo '<table id="lang_select"><tr><td>';
46 46
         echo _("View this page in");
47 47
         ?>
48 48
         <?php
49 49
         foreach (\config\Master::LANGUAGES as $lang => $value) {
50
-            echo "<a href='javascript:changeLang(\"$lang\")'>" . $value['display'] . "</a> ";
50
+            echo "<a href='javascript:changeLang(\"$lang\")'>".$value['display']."</a> ";
51 51
         }
52
-        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>';
52
+        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>';
53 53
         ?>
54 54
     </div> <!-- id="heading" -->
55 55
     <div id="main_body" style='padding:20px;'>
56
-        <h1><?php echo _("This is not the CAT you are looking for.");?></h1>
57
-        <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number");?></p>
56
+        <h1><?php echo _("This is not the CAT you are looking for."); ?></h1>
57
+        <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number"); ?></p>
58 58
         <h2>404</h2>
59
-        <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>
59
+        <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>
60 60
     </div> <!-- id="main_body" -->
61 61
 
62 62
         <?php echo $deco->footer();
Please login to merge, or discard this patch.
web/accountstatus/accountstatus.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
  * @author Stefan Winter <[email protected]>
27 27
  * @package Core
28 28
  */
29
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
29
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
30 30
 
31 31
 $cleanToken = FALSE;
32 32
 $invitationObject = new core\SilverbulletInvitation("INVALID");
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 
74 74
 $statusInfo = ["token" => $cleanToken,
75 75
     "invitation_object" => $invitationObject,
76
-    "OS" => $Gui->operatingSystem,];
76
+    "OS" => $Gui->operatingSystem, ];
77 77
 
78 78
 if ($profile !== NULL) {
79 79
     $attributes = $Gui->profileAttributes($profile->identifier);
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 $caAndSerial = filter_input(INPUT_GET, 'serial', FILTER_SANITIZE_STRING);
87 87
 
88 88
 if ($action !== NULL && $action !== FALSE && $action === \web\lib\common\FormElements::BUTTON_DELETE && $caAndSerial !== NULL && $caAndSerial !== FALSE) {
89
-    $tuple = explode(':',$caAndSerial);
89
+    $tuple = explode(':', $caAndSerial);
90 90
     $ca_type = $tuple[0];
91 91
     $serial = $tuple[1];
92 92
     if ($statusInfo['invitation_object']->invitationTokenStatus != \core\SilverbulletInvitation::SB_TOKENSTATUS_INVALID) {
@@ -101,12 +101,12 @@  discard block
 block discarded – undo
101 101
                 print "//REVOKING\n";
102 102
                 $certObject = new \core\SilverbulletCertificate($serial, $ca_type);
103 103
                 $certObject->revokeCertificate();
104
-                header("Location: accountstatus.php?token=" . $statusInfo['token']);
104
+                header("Location: accountstatus.php?token=".$statusInfo['token']);
105 105
                 exit;
106 106
             }
107 107
         }
108 108
     }
109
-    header("Location: accountstatus.php?token=" . $statusInfo['token']);
109
+    header("Location: accountstatus.php?token=".$statusInfo['token']);
110 110
     exit;
111 111
 }
112 112
 
@@ -131,4 +131,4 @@  discard block
 block discarded – undo
131 131
 $skinObject = new \web\lib\user\Skinjob($_REQUEST['skin'] ?? $_SESSION['skin'] ?? $fedskin[0] ?? \config\Master::APPEARANCE['skins'][0]);
132 132
 
133 133
 // and now, serve actual data
134
-require "../skins/" . $skinObject->skin . "/accountstatus/accountstatus.php";
134
+require "../skins/".$skinObject->skin."/accountstatus/accountstatus.php";
Please login to merge, or discard this patch.
web/4013.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
  * @package UserGUI
27 27
  */
28 28
 error_reporting(E_ALL | E_STRICT);
29
-require dirname(dirname(__FILE__)) . "/config/_config.php";
29
+require dirname(dirname(__FILE__))."/config/_config.php";
30 30
 
31 31
 $langObject = new \core\common\Language();
32 32
 $langObject->setTextDomain("web_user");
@@ -39,24 +39,24 @@  discard block
 block discarded – undo
39 39
 <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
40 40
     <div id="heading">
41 41
         <?php
42
-        print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
43
-        print '<div id="motd">' . ( isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp' ) . '</div>';
44
-        print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']) . '</h1>
45
-<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'] . '</h2>';
42
+        print '<img src="'.dirname($_SERVER['SCRIPT_NAME']).'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
43
+        print '<div id="motd">'.(isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp').'</div>';
44
+        print '<h1 style="padding-bottom:0px; height:1em;">'.sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']).'</h1>
45
+<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'].'</h2>';
46 46
         echo '<table id="lang_select"><tr><td>';
47 47
         echo _("View this page in");
48 48
         ?>
49 49
         <?php
50 50
         foreach (\config\Master::LANGUAGES as $lang => $value) {
51
-            echo "<a href='javascript:changeLang(\"$lang\")'>" . $value['display'] . "</a> ";
51
+            echo "<a href='javascript:changeLang(\"$lang\")'>".$value['display']."</a> ";
52 52
         }
53
-        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>';
53
+        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>';
54 54
         ?>
55 55
     </div> <!-- id="heading" -->
56 56
     <div id="main_body" style='padding:20px;'>
57
-        <h1><?php echo _("Maybe this is the CAT you are looking for...");?></h1>
58
-        <p><?php echo _("but we don't want to show it to you. You need to be authenticated and authorised to see this content. Since you are not, you got this error page usually known as");?></p>
57
+        <h1><?php echo _("Maybe this is the CAT you are looking for..."); ?></h1>
58
+        <p><?php echo _("but we don't want to show it to you. You need to be authenticated and authorised to see this content. Since you are not, you got this error page usually known as"); ?></p>
59 59
         <h2>401/403</h2>
60
-        <p><?php echo sprintf(_("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>
60
+        <p><?php echo sprintf(_("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>
61 61
     </div>
62 62
         <?php echo $deco->footer();
Please login to merge, or discard this patch.