View GitHub Repository CAT

Schedule Inspection
Subscribe
Passed
Push — master ( 317f14...d27a18 )
by Tomasz
14:44
created
Status
Category
Toggle Patches
web/copyright.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -23,7 +23,7 @@
 
 block discarded – undo
23 23 
         <div id="heading">
24 24 
             <?php
25 25 
             print '<img src="resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
26 
-            print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>';
26 
+            print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>';
27 27 
             print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("%s Copyright and Licensing"), CONFIG['APPEARANCE']['productname']) . '</h1>
28 28 
 <h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'] . '</h2>';
29 29 
             echo '<table id="lang_select"><tr><td>';
Please login to merge, or discard this patch.
web/tou.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -46,7 +46,7 @@
 
 block discarded – undo
46 46 
     <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
47 47 
         <img src="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') ?>/resources/images/consortium_logo.png" style="padding-right:20px; padding-top:20px; float:right" alt="logo" />
48 48
49 
-        <div id="motd"><?php print ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp'); ?></div>
49 
+        <div id="motd"><?php print (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp'); ?></div>
50 50
51 51 
         <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang(); ?>"><?php echo CONFIG['APPEARANCE']['productname']; ?></a></h1>
52 52 
         <div id="tou">
Please login to merge, or discard this patch.
devices/ms/Files/geant_link.inc 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -75,7 +75,7 @@  discard block
 
 block discarded – undo
75 75 
   File "GEANTLink64.msi"
76 76 
   nsArray::Set Delete_files "GEANTLink64.msi"
77 77 
   DetailPrint "Install GEANTLink installer"
78 
-  MessageBox MB_OK  "<?php WindowsCommon::echo_nsi( _("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>"
78 
+  MessageBox MB_OK  "<?php WindowsCommon::echo_nsi(_("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>"
79 79 
   !insertmacro debug_cat 1 "Run GEANTLink installer"
80 80 
   !insertmacro debug_cat 3 'Execute: msiexec.exe /i "$OUTDIR\GEANTLink$Platform.msi" REBOOT=Supress'
81 81 
   ClearErrors
 
@@ -86,7 +86,7 @@  discard block
 
 block discarded – undo
86 86 
   Push 1
87 87 
   Pop $rebootRequired
88 88 
   ${Else}
89 
-  MessageBox MB_OK "<?php WindowsCommon::echo_nsi( _("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"
89 
+  MessageBox MB_OK "<?php WindowsCommon::echo_nsi(_("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"
90 90 
   Quit
91 91 
   ${EndIf}
92 92 
   Cont2:
Please login to merge, or discard this patch.
devices/xml/XML.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -342,7 +342,7 @@
 
 block discarded – undo
342 342 
     $qualClassName = get_class($object);
343 343 
     // remove namespace qualifier
344 344 
     $pos = strrpos($qualClassName, '\\');
345 
-    $className =  substr($qualClassName, $pos + 1);
345 
+    $className = substr($qualClassName, $pos + 1);
346 346 
     $name = preg_replace("/_/", "-", $className);
347 347 
     if ($object->getValue()) {
348 348 
         $val = $object->getValue();
Please login to merge, or discard this patch.
core/DeviceFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -50,7 +50,7 @@
 
 block discarded – undo
50 50 
         $Dev = \devices\Devices::listDevices();
51 51 
         if (isset($Dev[$blueprint])) {
52 52 
             $this->loggerInstance->debug(4, "loaded: devices/" . $Dev[$blueprint]['directory'] . "/" . $Dev[$blueprint]['module'] . ".php\n");
53 
-            $class_name = "\devices\\".$Dev[$blueprint]['directory']."\Device_" . $Dev[$blueprint]['module'];
53 
+            $class_name = "\devices\\" . $Dev[$blueprint]['directory'] . "\Device_" . $Dev[$blueprint]['module'];
54 54 
             $this->device = new $class_name();
55 55 
             if (!$this->device) {
56 56 
                 $this->loggerInstance->debug(2, "module loading failed");
Please login to merge, or discard this patch.
utils/ocsp_update.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -23,7 +23,7 @@
 
 block discarded – undo
23 23 
     core\ProfileSilverbullet::triggerNewOCSPStatement($serialRow->serial_number);
24 24 
 }
25 25
26 
- /*
26 
+    /*
27 27 
   * and then writes all recently updated statements to a temporary directory. The
28 28 
   * calling script ocsp_update.sh should then scp all the files to their
29 29 
   * destination.
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -30,16 +30,16 @@
 
 block discarded – undo
30 30 
   * destination.
31 31 
   */
32 32
33 
-$tempdir = __DIR__."/temp_ocsp";
33 
+$tempdir = __DIR__ . "/temp_ocsp";
34 34 
 mkdir($tempdir);
35 35
36 36 
 $allStatements = $dbLink->exec("SELECT serial_number,OCSP FROM silverbullet_certificate WHERE serial_number IS NOT NULL AND expiry > NOW() AND OCSP_timestamp > DATE_SUB(NOW(), INTERVAL 8 DAY)");
37 37 
 // SELECT -> mysqli_result, not boolean
38 38 
 while ($statementRow = mysqli_fetch_object(/** @scrutinizer ignore-type */ $allStatements)) {
39 39 
 #    echo "Writing OCSP statement for serial number $statementRow->serial_number\n";
40 
-    $filename = strtoupper(dechex($statementRow->serial_number)).".der";
40 
+    $filename = strtoupper(dechex($statementRow->serial_number)) . ".der";
41 41 
     if (strlen($filename) % 2 == 1) {
42 42 
         $filename = "0" . $filename;
43 43 
     }
44 
-    file_put_contents($tempdir."/$filename", $statementRow->OCSP);
44 
+    file_put_contents($tempdir . "/$filename", $statementRow->OCSP);
45 45 
 }
Please login to merge, or discard this patch.
web/4013.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -29,8 +29,8 @@  discard block
 
 block discarded – undo
29 29 
 <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
30 30 
     <div id="heading">
31 31 
         <?php
32 
-        print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
33 
-        print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>';
32 
+        print '<img src="' . dirname($_SERVER['SCRIPT_NAME']) . '/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
33 
+        print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>';
34 34 
         print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']) . '</h1>
35 35 
 <h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'] . '</h2>';
36 36 
         echo '<table id="lang_select"><tr><td>';
 
@@ -44,8 +44,8 @@  discard block
 
 block discarded – undo
44 44 
         ?>
45 45 
     </div> <!-- id="heading" -->
46 46 
     <div id="main_body" style='padding:20px;'>
47 
-        <h1><?php echo _("Maybe this is the CAT you are looking for...");?></h1>
48 
-        <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>
47 
+        <h1><?php echo _("Maybe this is the CAT you are looking for..."); ?></h1>
48 
+        <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>
49 49 
         <h2>401/403</h2>
50 50 
         <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>
51 51 
     </div>
Please login to merge, or discard this patch.
web/resources/css/cat.css.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch 
@@ -18,7 +18,7 @@  discard block
 
 block discarded – undo
18 18 
 }
19 19
20 20 
 body {
21 
-    background: <?php echo $colour1;?>;
21 
+    background: <?php echo $colour1; ?>;
22 22 
     color: #000000;
23 23 
     font-family:Verdana, Arial, Helvetica, sans-serif;
24 24 
     font-size:11px;
 
@@ -33,7 +33,7 @@  discard block
 
 block discarded – undo
33 33 
 }
34 34
35 35 
 button {
36 
-    background: <?php echo $colour2;?>;
36 
+    background: <?php echo $colour2; ?>;
37 37 
     color: #FFFFFF;
38 38 
     min-height: 23px;
39 39 
     border-left-style: outset; 
@@ -215,9 +215,9 @@  discard block
 
 block discarded – undo
215 215 
     border-bottom-style:solid;
216 216 
     border-top-width:5px;
217 217 
     border-bottom-width:5px;
218 
-    border-color: <?php echo $colour1;?>;
218 
+    border-color: <?php echo $colour1; ?>;
219 219 
     padding-left:30px;
220 
-    color: <?php echo $colour2;?>;
220 
+    color: <?php echo $colour2; ?>;
221 221 
 }
222 222
223 223 
 div.pagecontent {
 
@@ -410,7 +410,7 @@  discard block
 
 block discarded – undo
410 410
411 411 
 span.edu_cat {
412 412 
     font-weight: bold;
413 
-    color: <?php echo $colour2;?>;
413 
+    color: <?php echo $colour2; ?>;
414 414 
 }
415 415
416 416 
 span.tooltip {
 
@@ -523,7 +523,7 @@  discard block
 
 block discarded – undo
523 523 
     border-bottom-style:solid;
524 524 
     border-top-width:5px;
525 525 
     border-bottom-width:5px;
526 
-    border-color: <?php echo $colour1;?>;
526 
+    border-color: <?php echo $colour1; ?>;
527 527 
     padding-left:30px;
528 528 
 }
529 529 
 
@@ -577,7 +577,7 @@  discard block
 
 block discarded – undo
577 577 
 }
578 578
579 579 
 span.redirect_link {
580 
-    background: <?php echo $colour2;?>; color: #FFFFFF; height: 23px;
580 
+    background: <?php echo $colour2; ?>; color: #FFFFFF; height: 23px;
581 581 
     border-left-style: inset; border-left-width: 1px; border-left-color: #8bbacb;
582 582 
     border-top-style: inset; border-top-width: 1px; border-top-color: #8bbacb;
583 583 
     border-right-style: outset; border-right-width: 2px; border-right-color: #043d52;
 
@@ -624,7 +624,7 @@  discard block
 
 block discarded – undo
624 624 
 }
625 625
626 626 
 #close_button {
627 
-    background: <?php echo $colour2;?>;
627 
+    background: <?php echo $colour2; ?>;
628 628 
     color: #FFFFFF;
629 629 
     height: 23px;
630 630 
     border-left-style: inset; 
@@ -705,7 +705,7 @@  discard block
 
 block discarded – undo
705 705 
     width: 30em;
706 706 
     padding-left: 10px;
707 707 
     padding-right: 0px;
708 
-    background: <?php echo $colour2;?>;
708 
+    background: <?php echo $colour2; ?>;
709 709 
     color: white;
710 710 
     box-shadow: 10px 10px 5px #888888;
711 711 
 }
 
@@ -714,7 +714,7 @@  discard block
 
 block discarded – undo
714 714 
     width: 30em;
715 715 
     padding-left: 10px;
716 716 
     padding-right: 00px;
717 
-    background: <?php echo $colour2;?>;
717 
+    background: <?php echo $colour2; ?>;
718 718 
     color: #FFFFFF;
719 719 
     box-shadow: 10px 10px 5px #888888;
720 720 
 }
 
@@ -762,7 +762,7 @@  discard block
 
 block discarded – undo
762 762 
     padding-top: 4px;
763 763 
     padding-bottom: 12px;
764 764 
     padding-left: 30px;
765 
-    background: <?php echo $colour1;?>;
765 
+    background: <?php echo $colour1; ?>;
766 766 
     text-align: left;
767 767 
     text-shadow: 10px 10px 5px #888888;
768 768 
 }
 
@@ -772,9 +772,9 @@  discard block
 
 block discarded – undo
772 772 
     border-bottom-style:solid;
773 773 
     border-top-width:5px;
774 774 
     border-bottom-width:5px;
775 
-    border-color: <?php echo $colour1;?>;
775 
+    border-color: <?php echo $colour1; ?>;
776 776 
     padding-left:30px;
777 
-    color: <?php echo $colour2;?>;
777 
+    color: <?php echo $colour2; ?>;
778 778 
 }
779 779
780 780 
 #heading h1 { 
@@ -793,7 +793,7 @@  discard block
 
 block discarded – undo
793 793 
     text-align: justify;
794 794 
     border-bottom-style:solid;
795 795 
     border-bottom-width:5px;
796 
-    border-color: <?php echo $colour1;?>;
796 
+    border-color: <?php echo $colour1; ?>;
797 797 
     font-size: 11px;
798 798 
     font-weight: normal;
799 799 
 }
 
@@ -841,7 +841,7 @@  discard block
 
 block discarded – undo
841 841
842 842 
 #faq {
843 843 
     padding: 20px;
844 
-    color: <?php echo $colour2;?>;
844 
+    color: <?php echo $colour2; ?>;
845 845 
     background: #ffffff;
846 846 
 }
847 847 
 
@@ -894,7 +894,7 @@  discard block
 
 block discarded – undo
894 894
895 895 
 #line1 {
896 896 
     top:145px;
897 
-    color: <?php echo $colour2;?>;
897 
+    color: <?php echo $colour2; ?>;
898 898 
     font-size:20px;
899 899 
 }
900 900 
 
@@ -949,7 +949,7 @@  discard block
 
 block discarded – undo
949 949
950 950 
 #menu_column {
951 951 
     border-right:solid;
952 
-    border-color: <?php echo $colour1;?>;
952 
+    border-color: <?php echo $colour1; ?>;
953 953 
     border-width:5px;
954 954 
     min-height:400px;
955 955 
     padding-left: 10px;
 
@@ -960,7 +960,7 @@  discard block
 
 block discarded – undo
960 960
961 961 
 #front_page_leftmenu {
962 962 
     border-right:solid;
963 
-    border-color: <?php echo $colour1;?>;
963 
+    border-color: <?php echo $colour1; ?>;
964 964 
     border-width:5px;
965 965 
     min-height:400px;
966 966 
     padding-left: 10px; 
@@ -989,11 +989,11 @@  discard block
 
 block discarded – undo
989 989 
 }
990 990
991 991 
 a:link {
992 
-    color:<?php echo $colour2;?>;
992 
+    color:<?php echo $colour2; ?>;
993 993 
 }
994 994
995 995 
 a:visited {
996 
-    color:<?php echo $colour2;?>;
996 
+    color:<?php echo $colour2; ?>;
997 997 
 }
998 998
999 999 
 a:hover {
 
@@ -1001,7 +1001,7 @@  discard block
 
 block discarded – undo
1001 1001 
 }
1002 1002
1003 1003 
 a:active {
1004 
-    color:<?php echo $colour2;?>;
1004 
+    color:<?php echo $colour2; ?>;
1005 1005 
 }
1006 1006
1007 1007 
 .comment {
Please login to merge, or discard this patch.
tests/unit/core/MockProfileSilverbullet.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -13,7 +13,7 @@  discard block
 
 block discarded – undo
13 13 
  * @author Zilvinas Vaira
14 14 
  *
15 15 
  */
16 
-class MockProfileSilverbullet extends \core\ProfileSilverbullet{
16 
+class MockProfileSilverbullet extends \core\ProfileSilverbullet {
17 17
18 18 
     /**
19 19 
      * 
@@ -31,12 +31,12 @@  discard block
 
 block discarded – undo
31 31 
      *
32 32 
      * @param \core\DBConnection $databaseHandle
33 33 
      */
34 
-    public function __construct(\core\DBConnection $databaseHandle){
34 
+    public function __construct(\core\DBConnection $databaseHandle) {
35 35 
         $this->databaseHandle = $databaseHandle;
36 
-        if($this->databaseHandle->exec("INSERT INTO institution (country) VALUES('LT')")){
36 
+        if ($this->databaseHandle->exec("INSERT INTO institution (country) VALUES('LT')")) {
37 37 
             $this->instId = $this->databaseHandle->lastID();
38 38 
         }
39 
-        if($this->databaseHandle->exec("INSERT INTO profile (inst_id, realm) VALUES($this->instId, 'test.realm.tst')")){
39 
+        if ($this->databaseHandle->exec("INSERT INTO profile (inst_id, realm) VALUES($this->instId, 'test.realm.tst')")) {
40 40 
             $this->identifier = $this->databaseHandle->lastID();
41 41 
         }
42 42 
         $this->attributes = array(array('name' => 'hiddenprofile:tou_accepted'));
 
@@ -45,7 +45,7 @@  discard block
 
 block discarded – undo
45 45 
     /**
46 46 
      *
47 47 
      */
48 
-    public function delete(){
48 
+    public function delete() {
49 49 
         $this->databaseHandle->exec("DELETE FROM `institution` WHERE `inst_id`='" . $this->instId . "'");
50 50 
         $this->databaseHandle->exec("DELETE FROM `profile` WHERE `profile_id`='" . $this->identifier . "'");
51 51 
     }
 
@@ -55,7 +55,7 @@  discard block
 
 block discarded – undo
55 55 
      * {@inheritDoc}
56 56 
      * @see \core\ProfileSilverbullet::generateCertificate()
57 57 
      */
58 
-    public function generateCertificate($serial, $cn){
58 
+    public function generateCertificate($serial, $cn) {
59 59 
         $this->generatedCertificates[$serial] = $cn;
60 60 
     }
61 61 
     
@@ -64,8 +64,8 @@  discard block
 
 block discarded – undo
64 64 
      * {@inheritDoc}
65 65 
      * @see \core\ProfileSilverbullet::revokeCertificate()
66 66 
      */
67 
-    public function revokeCertificate($serial){
68 
-        if(isset($this->generatedCertificates[$serial])){
67 
+    public function revokeCertificate($serial) {
68 
+        if (isset($this->generatedCertificates[$serial])) {
69 69 
             unset($this->generatedCertificates[$serial]);
70 70 
             $nowSql = (new \DateTime())->format("Y-m-d H:i:s");
71 71 
             $this->databaseHandle->exec("UPDATE silverbullet_certificate SET revocation_status = 'REVOKED', revocation_time = ? WHERE serial_number = ?", "si", $nowSql, $serial);
 
@@ -78,7 +78,7 @@  discard block
 
 block discarded – undo
78 78 
      * @param string $cn
79 79 
      * @return boolean
80 80 
      */
81 
-    public function isGeneratedCertificate($serial, $cn){
82 
-        return isset($this->generatedCertificates[$serial]) && $this->generatedCertificates[$serial]==$cn;
81 
+    public function isGeneratedCertificate($serial, $cn) {
82 
+        return isset($this->generatedCertificates[$serial]) && $this->generatedCertificates[$serial] == $cn;
83 83 
     }
84 84 
 }
Please login to merge, or discard this patch.