GEANT / CAT

devices/xml/XML.inc.php

Spacing +1 added lines, -1 removed lines

@@ -342,7 +342,7 @@
     $qualClassName = get_class($object);
     // remove namespace qualifier
     $pos = strrpos($qualClassName, '\\');
-    $className =  substr($qualClassName, $pos + 1);
+    $className = substr($qualClassName, $pos + 1);
     $name = preg_replace("/_/", "-", $className);
     if ($object->getValue()) {
         $val = $object->getValue();

core/DeviceFactory.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         $Dev = \devices\Devices::listDevices();
         if (isset($Dev[$blueprint])) {
             $this->loggerInstance->debug(4, "loaded: devices/" . $Dev[$blueprint]['directory'] . "/" . $Dev[$blueprint]['module'] . ".php\n");
-            $class_name = "\devices\\".$Dev[$blueprint]['directory']."\Device_" . $Dev[$blueprint]['module'];
+            $class_name = "\devices\\" . $Dev[$blueprint]['directory'] . "\Device_" . $Dev[$blueprint]['module'];
             $this->device = new $class_name();
             if (!$this->device) {
                 $this->loggerInstance->debug(2, "module loading failed");

utils/ocsp_update.php

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
     core\ProfileSilverbullet::triggerNewOCSPStatement($serialRow->serial_number);
 }
 
- /* 
+    /* 
   * and then writes all recently updated statements to a temporary directory. The 
   * calling script ocsp_update.sh should then scp all the files to their 
   * destination.

Spacing +3 added lines, -3 removed lines

@@ -30,18 +30,18 @@
   * destination.
   */
 
-$tempdir = __DIR__."/temp_ocsp";
+$tempdir = __DIR__ . "/temp_ocsp";
 mkdir($tempdir);
 
 $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)");
 
 while ($statementRow = mysqli_fetch_object($allStatements)) {
 #    echo "Writing OCSP statement for serial number $statementRow->serial_number\n";
-    $filename = strtoupper(dechex($statementRow->serial_number)).".der";
+    $filename = strtoupper(dechex($statementRow->serial_number)) . ".der";
     if (strlen($filename) % 2 == 1) {
         $filename = "0" . $filename;
     }
-    $fileHandle = fopen($tempdir."/$filename","w");
+    $fileHandle = fopen($tempdir . "/$filename", "w");
     fwrite($fileHandle, $statementRow->OCSP);
     fclose($fileHandle);
 }

devices/ms/Files/common.inc

Indentation +2 added lines, -2 removed lines

@@ -1005,12 +1005,12 @@
         $certUsernameLabel = WindowsCommon::sprint_nsi(_("Username:"));
         $certUsernameLength = strlen($certUsernameLabel);
         $labelLength = max($certPasswordLenght,$certUsernameLength);
-  ?>
+    ?>
   ${NSD_CreateLabel} 0 0 100% 32u "<?php WindowsCommon::echo_nsi(_("Selected file: \$Cert_file"))?>"
   !else
   <?php $certPasswordLabel = WindowsCommon::sprint_nsi(_("import password:"));
         $certPasswordLenght = strlen($certPasswordLabel);
-  ?>
+    ?>
   !insertmacro debug_cat 4 "Unpacking SB_cert.p12"
   File "SB_cert.p12"
   nsArray::Set Delete_files "SB_cert.p12"

Spacing +33 added lines, -33 removed lines

@@ -120,10 +120,10 @@ 
 !define MUI_HEADERIMAGE_BITMAP "cat_150.bmp"
 !define MUI_COMPONENTSPAGE_SMALLDESC
 
-!define WELCOME_HEADER "<?php printf(WindowsCommon::sprint_nsi(_("Welcome to the %s installer")),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])?>"
-!define FAREWELL_HEADER "<?php WindowsCommon::echo_nsi( _("Installation complete"))?>"
-!define FAREWELL_TEXT	"<?php WindowsCommon::echo_nsi( _("Network profiles have been installed."))?>$\r$\n$\n <?php WindowsCommon::echo_nsi(  _("Your system is ready."))?>"
-!define FAREWELL_FAIL	"<?php WindowsCommon::echo_nsi( _("Network installation had errors."))?>$\r$\n$\n <?php WindowsCommon::echo_nsi( _("Please contact \${SUPPORT}."))?>"
+!define WELCOME_HEADER "<?php printf(WindowsCommon::sprint_nsi(_("Welcome to the %s installer")), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])?>"
+!define FAREWELL_HEADER "<?php WindowsCommon::echo_nsi(_("Installation complete"))?>"
+!define FAREWELL_TEXT	"<?php WindowsCommon::echo_nsi(_("Network profiles have been installed."))?>$\r$\n$\n <?php WindowsCommon::echo_nsi(_("Your system is ready."))?>"
+!define FAREWELL_FAIL	"<?php WindowsCommon::echo_nsi(_("Network installation had errors."))?>$\r$\n$\n <?php WindowsCommon::echo_nsi(_("Please contact \${SUPPORT}."))?>"
 ;--------------------------------
 ;Languages
 !insertmacro MUI_LANGUAGE "${LANG}"
@@ -131,14 +131,14 @@ 
 ;--------------------------------
 ; License file
 !ifdef LICENSE_FILE
-LicenseForceSelection checkbox "<?php WindowsCommon::echo_nsi( _("Accept"))?>"
+LicenseForceSelection checkbox "<?php WindowsCommon::echo_nsi(_("Accept"))?>"
 LicenseText "<?php WindowsCommon::echo_nsi(_("If you accept the conditions then select Accept and then click Install to continue."))?>"
 LicenseData ${LICENSE_FILE}
 !endif
 
 ;-----------------------------------
 
-MiscButtonText "" "" "" "<?php WindowsCommon::echo_nsi( _("Finish"))?>"
+MiscButtonText "" "" "" "<?php WindowsCommon::echo_nsi(_("Finish"))?>"
 ;----------------------------------
 ;  FUNCTIONS
 
@@ -171,7 +171,7 @@ 
 
 !macro install_ca_cert ca_file ca_fingerprint level
    !insertmacro debug_cat 2 "locating certificate  SHA=${ca_fingerprint} Level=${level}"
-   DetailPrint "<?php WindowsCommon::echo_nsi( _("searching for certificate"))?> ${ca_file}"
+   DetailPrint "<?php WindowsCommon::echo_nsi(_("searching for certificate"))?> ${ca_file}"
    File "${ca_file}"
    nsArray::Set Delete_files "${ca_file}"
    !insertmacro debug_cat 2 "Testing machine store root"
@@ -233,13 +233,13 @@ 
    ${EndIf}
    !insertmacro debug_cat 2 "installing certificate $TEMP\${ca_file}"
    !insertmacro debug_cat 3 "Execute: certutil -addstore -user ${level} $TEMP\${ca_file}"
-   DetailPrint "<?php WindowsCommon::echo_nsi( _("installing certificate"))?> ${ca_file}"
+   DetailPrint "<?php WindowsCommon::echo_nsi(_("installing certificate"))?> ${ca_file}"
    nsExec::Exec '"certutil" -addstore -user ${level} $TEMP\${ca_file}'
    Pop $0
    !insertmacro debug_cat 3 "certutil returned $0"
    ${If} $0 != 0
      IfSilent +2
-     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echo_nsi( _("could not install certificate"))?>  ${ca_file}"
+     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echo_nsi(_("could not install certificate"))?>  ${ca_file}"
      !insertmacro debug_cat 1 "could not install certificate ${ca_file}"
    ${EndIf}
 no_install_${ca_file}:
@@ -428,26 +428,26 @@ 
   pop $R0
   ${If} $tkip_count > 0
     ${If} $aes_count > 1
-      StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echo_nsi( _("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
+      StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echo_nsi(_("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
     ${Else}
-     StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echo_nsi( _("The non TKIP profile is preferred. Always use it if you have a choice."))?>"
+     StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echo_nsi(_("The non TKIP profile is preferred. Always use it if you have a choice."))?>"
     ${EndIf}
   ${Else}
     StrCpy $R1 ""
   ${EndIf}
   ${If} $profile_count > 0
-    StrCpy $welcome_message "<?php WindowsCommon::echo_nsi( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
-<?php WindowsCommon::echo_nsi( _("The installer will create the following wireless profiles:"))?>$\r$\n\
+    StrCpy $welcome_message "<?php WindowsCommon::echo_nsi(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
+<?php WindowsCommon::echo_nsi(_("The installer will create the following wireless profiles:"))?>$\r$\n\
 $R0.\
 $R1$\r$\n$\n\
-<?php WindowsCommon::echo_nsi( _("More information and comments:"))?>$\r$\n\
+<?php WindowsCommon::echo_nsi(_("More information and comments:"))?>$\r$\n\
    EMAIL: ${SUPPORT}$\r$\n\
    WWW: ${URL}"
 ${Else}
-StrCpy $welcome_message "<?php WindowsCommon::echo_nsi( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
-<?php WindowsCommon::echo_nsi( _("The installer will create the wireless profile:"))?> $R0.\
+StrCpy $welcome_message "<?php WindowsCommon::echo_nsi(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
+<?php WindowsCommon::echo_nsi(_("The installer will create the wireless profile:"))?> $R0.\
 $R1$\r$\n$\n\
-<?php WindowsCommon::echo_nsi( _("More information and comments:"))?>$\r$\n\
+<?php WindowsCommon::echo_nsi(_("More information and comments:"))?>$\r$\n\
    EMAIL: ${SUPPORT}$\r$\n\
    WWW: ${URL}"
 ${EndIf}
@@ -473,7 +473,7 @@ 
   SendMessage $HEADLINE ${WM_SETFONT} $HEADLINE_FONT 0
 ;TRANSLATION
   nsDialogs::CreateControl STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 120u 46u -130u -32u "$welcome_message\
-$\r$\n$\r$\n<?php WindowsCommon::echo_nsi( _("Installer created with software from the GEANT project."))?>"
+$\r$\n$\r$\n<?php WindowsCommon::echo_nsi(_("Installer created with software from the GEANT project."))?>"
   Pop $TEXT
 
   SetCtlColors $DIALOG "" 0xffffff
@@ -571,18 +571,18 @@ 
     ${If} $wireless_result == 1
       !insertmacro debug_cat 1 "wlan_test.exe did not find wireless configuration service"
       IfSilent +2
-      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echo_nsi( _("Windows wireless configuration service is not enabled. The installer cannot continue."))?>"
+      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echo_nsi(_("Windows wireless configuration service is not enabled. The installer cannot continue."))?>"
       Call Cleanup
     ${EndIf}
     ${If} $wireless_result == 2
       IfSilent +2
-      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echo_nsi( _("No wireless interfaces found. The installer cannot continue."))?>"
+      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echo_nsi(_("No wireless interfaces found. The installer cannot continue."))?>"
       Call Cleanup
     ${EndIf}
   ${Else}
     ${If} $wireless_result > 0
        IfSilent +3
-       MessageBox MB_YESNO "<?php WindowsCommon::echo_nsi( _("No wireless interfaces found. Wireless access will not be configured. Would you like to continue and configure access on the wired interface?"))?>" IDYES wired_yes
+       MessageBox MB_YESNO "<?php WindowsCommon::echo_nsi(_("No wireless interfaces found. Wireless access will not be configured. Would you like to continue and configure access on the wired interface?"))?>" IDYES wired_yes
        Call Cleanup
        wired_yes:
        Push 1
@@ -598,7 +598,7 @@ 
     ${If} $wired == 1
       ${If} $force_wired == 0
         IfSilent wired
-        MessageBox MB_YESNO "<?php WindowsCommon::echo_nsi( _("Do you want to enable access on wired interfaces?"))?>" IDYES wired
+        MessageBox MB_YESNO "<?php WindowsCommon::echo_nsi(_("Do you want to enable access on wired interfaces?"))?>" IDYES wired
         Push 0
         Pop $wired
       ${EndIf}
@@ -633,7 +633,7 @@ 
 ;================================
 
 Function ShowInstfiles
-  !insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echo_nsi( _("Profiles installation"))?>" " "
+  !insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echo_nsi(_("Profiles installation"))?>" " "
 FunctionEnd
 ;================================
 ;  Check if a wireless profile exist and put it on delete list
@@ -652,7 +652,7 @@ 
 
 Function FindProfile
   Pop $R8
-  DetailPrint "<?php WindowsCommon::echo_nsi( _("Checking for profile \$R8"))?>"
+  DetailPrint "<?php WindowsCommon::echo_nsi(_("Checking for profile \$R8"))?>"
   !insertmacro debug_cat 2 "Checking for profile $R8"
   !insertmacro debug_cat 3 "Exec: $Netsh wlan show profiles $R8"
   nsExec::Exec  '"$Netsh" wlan show profiles "$R8"'
@@ -660,7 +660,7 @@ 
   !insertmacro debug_cat 4 "netsh returned $0"
   ${If} $0 == 0
     !insertmacro debug_cat 1 "found profile $R8"
-    DetailPrint "<?php WindowsCommon::echo_nsi( _("found profile \$R8"))?>"
+    DetailPrint "<?php WindowsCommon::echo_nsi(_("found profile \$R8"))?>"
     Push 0
   ${Else}
     !insertmacro debug_cat 1 "profile $R8 not found"
@@ -755,7 +755,7 @@ 
     ${If} $Symantec_installed  != 0
      !insertmacro debug_cat 3 "Symantec problem"
      IfSilent +2
-     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php printf(WindowsCommon::sprint_nsi(_("Please READ this message it is IMPORTANT.$\\r$\\nInstallation problems may be due to the fact that Symantec Endpoint Protection is installed on your machine.$\\r$\\nWhile this is a well-known bug of the Symantec product, about which the installer can not do anything, there is a workaround.$\\r$\\nWhen you close this window the installer will exit and an explorer window will be started (it could appear underneath already opened windows). In this window you should see a script named inst_cat. Start it by double-clicking, It will install the profiles. You will need to login to %s with your username and password.")),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) ?>"
+     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php printf(WindowsCommon::sprint_nsi(_("Please READ this message it is IMPORTANT.$\\r$\\nInstallation problems may be due to the fact that Symantec Endpoint Protection is installed on your machine.$\\r$\\nWhile this is a well-known bug of the Symantec product, about which the installer can not do anything, there is a workaround.$\\r$\\nWhen you close this window the installer will exit and an explorer window will be started (it could appear underneath already opened windows). In this window you should see a script named inst_cat. Start it by double-clicking, It will install the profiles. You will need to login to %s with your username and password.")), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) ?>"
     Exec '"explorer" /select,"$EXEDIR\inst_cat.cmd"'
     Quit
 
@@ -988,7 +988,7 @@ 
 Function PFXCertificateSelect
   !ifndef SILVERBULLET
 ;TRANSLATION
-!insertmacro MUI_HEADER_TEXT "<?php printf(WindowsCommon::sprint_nsi(_("%s installer for")),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])?> " "<?php WindowsCommon::echo_nsi(_("Install personal certificate"))?>"
+!insertmacro MUI_HEADER_TEXT "<?php printf(WindowsCommon::sprint_nsi(_("%s installer for")), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])?> " "<?php WindowsCommon::echo_nsi(_("Install personal certificate"))?>"
 ;TRANSLATION
     IfSilent +2
   MessageBox MB_OK "<?php WindowsCommon::echo_nsi(_("Preparing to install personal certificate."))?>$\r$\n<?php WindowsCommon::echo_nsi(_("Click OK to continue"))?> "
@@ -1004,7 +1004,7 @@ 
         $certPasswordLenght = strlen($certPasswordLabel);
         $certUsernameLabel = WindowsCommon::sprint_nsi(_("Username:"));
         $certUsernameLength = strlen($certUsernameLabel);
-        $labelLength = max($certPasswordLenght,$certUsernameLength);
+        $labelLength = max($certPasswordLenght, $certUsernameLength);
   ?>
   ${NSD_CreateLabel} 0 0 100% 32u "<?php WindowsCommon::echo_nsi(_("Selected file: \$Cert_file"))?>"
   !else
@@ -1021,11 +1021,11 @@ 
   !insertmacro debug_cat 3 "Vista level (Vista without Service pack): $VistaNoSP";
   ${If} $VistaNoSP == 0
     !ifdef PFX_USERNAME
-       !define LABEL_LENGTH "<?php echo($labelLength*3.5)?>u"
-       !define TEXT_START "<?php echo($labelLength*3.5 +5)?>u"
+       !define LABEL_LENGTH "<?php echo($labelLength * 3.5)?>u"
+       !define TEXT_START "<?php echo($labelLength * 3.5 + 5)?>u"
     !else
-       !define LABEL_LENGTH "<?php echo($certPasswordLenght*3.5)?>u"
-       !define TEXT_START "<?php echo($certPasswordLenght*3.5 +5)?>u"
+       !define LABEL_LENGTH "<?php echo($certPasswordLenght * 3.5)?>u"
+       !define TEXT_START "<?php echo($certPasswordLenght * 3.5 + 5)?>u"
     !endif
     ${NSD_CreateLabel} 0 35u ${LABEL_LENGTH} 12u "<?php echo $certPasswordLabel?>"
     ${NSD_CreatePassword} ${TEXT_START} 34.5u 120u 12u ""
@@ -1212,7 +1212,7 @@ 
 Section "-start"
 SectionIn RO
 
-!insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echo_nsi( _("Installation"))?>" "<?php WindowsCommon::echo_nsi( _("Checking for existing wireless profiles"))?>"
+!insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echo_nsi(_("Installation"))?>" "<?php WindowsCommon::echo_nsi(_("Checking for existing wireless profiles"))?>"
 !ifndef PWD
 !include "certs.nsh"
 !endif

web/4013.php

Spacing +4 added lines, -4 removed lines

@@ -29,8 +29,8 @@ 
 <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['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>';
+        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['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>';
@@ -44,8 +44,8 @@ 
         ?>
     </div> <!-- id="heading" -->
     <div id="main_body" style='padding:20px;'>
-        <h1><?php echo _("Maybe this is the CAT you are looking for...");?></h1>
-        <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>
+        <h1><?php echo _("Maybe this is the CAT you are looking for..."); ?></h1>
+        <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>
         <h2>401/403</h2>
         <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>
     </div>

web/resources/css/cat.css.php

Spacing +21 added lines, -21 removed lines

@@ -18,7 +18,7 @@ 
 }
 
 body {
-    background: <?php echo $colour1;?>;
+    background: <?php echo $colour1; ?>;
     color: #000000;
     font-family:Verdana, Arial, Helvetica, sans-serif;
     font-size:11px;
@@ -33,7 +33,7 @@ 
 }
 
 button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     min-height: 23px;
     border-left-style: outset; 
@@ -215,9 +215,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; ?>;
 }
 
 div.pagecontent {
@@ -410,7 +410,7 @@ 
 
 span.edu_cat {
     font-weight: bold;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 span.tooltip {
@@ -523,7 +523,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;
 }
 
@@ -577,7 +577,7 @@ 
 }
 
 span.redirect_link {
-    background: <?php echo $colour2;?>; color: #FFFFFF; height: 23px;
+    background: <?php echo $colour2; ?>; color: #FFFFFF; height: 23px;
     border-left-style: inset; border-left-width: 1px; border-left-color: #8bbacb;
     border-top-style: inset; border-top-width: 1px; border-top-color: #8bbacb;
     border-right-style: outset; border-right-width: 2px; border-right-color: #043d52;
@@ -624,7 +624,7 @@ 
 }
 
 #close_button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     height: 23px;
     border-left-style: inset; 
@@ -705,7 +705,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;
 }
@@ -714,7 +714,7 @@ 
     width: 30em; 
     padding-left: 10px; 
     padding-right: 00px; 
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     box-shadow: 10px 10px 5px #888888;
 }
@@ -762,7 +762,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;
 }
@@ -772,9 +772,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 { 
@@ -793,7 +793,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;
 }
@@ -841,7 +841,7 @@ 
 
 #faq {
     padding: 20px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     background: #ffffff;
 }
 
@@ -894,7 +894,7 @@ 
 
 #line1 {
     top:145px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     font-size:20px;
 }
 
@@ -949,7 +949,7 @@ 
 
 #menu_column {
     border-right:solid;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     border-width:5px;
     min-height:400px;
     padding-left: 10px;
@@ -960,7 +960,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; 
@@ -989,11 +989,11 @@ 
 }
 
 a:link {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:visited {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:hover {
@@ -1001,7 +1001,7 @@ 
 }
 
 a:active {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 .comment {

core/ProfileSilverbullet.php

Doc Comments +3 added lines

@@ -52,6 +52,9 @@
      */
     const PRODUCTNAME = "Managed IdP";
 
+    /**
+     * @param integer $length
+     */
     public static function random_str(
     $length, $keyspace = '23456789abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
     ) {

Spacing +2 added lines, -2 removed lines

@@ -292,7 +292,7 @@ 
             $certificatesResult = $this->databaseHandle->exec("SELECT * FROM `silverbullet_certificate` WHERE `silverbullet_invitation_id`=? ORDER BY `revocation_status`, `expiry` DESC", "i", $invitationId);
             if (!$certificatesResult || $certificatesResult->num_rows < $invitationRow->quantity) {
                 $invitationProfile = $invitationRow->profile_id;
-                $invitationSbId =  $invitationRow->silverbullet_user_id;
+                $invitationSbId = $invitationRow->silverbullet_user_id;
                 $newCertificateResult = $this->databaseHandle->exec("INSERT INTO `silverbullet_certificate` (`profile_id`, `silverbullet_user_id`, `silverbullet_invitation_id`, `serial_number`, `cn` ,`expiry`) VALUES (?, ?, ?, ?, ?, ?)", "iiisss", $invitationProfile, $invitationSbId, $invitationId, $serial, $username, $realExpiryDate);
                 if ($newCertificateResult === true) {
                     $certificateId = $this->databaseHandle->lastID();
@@ -479,7 +479,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);

tests/unit/core/MockProfileSilverbullet.php

Spacing +10 added lines, -10 removed lines

@@ -13,7 +13,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class MockProfileSilverbullet extends \core\ProfileSilverbullet{
+class MockProfileSilverbullet extends \core\ProfileSilverbullet {
     
     /**
      * 
@@ -31,12 +31,12 @@ 
      * 
      * @param \core\DBConnection $databaseHandle
      */
-    public function __construct(\core\DBConnection $databaseHandle){
+    public function __construct(\core\DBConnection $databaseHandle) {
         $this->databaseHandle = $databaseHandle;
-        if($this->databaseHandle->exec("INSERT INTO institution (country) VALUES('LT')")){
+        if ($this->databaseHandle->exec("INSERT INTO institution (country) VALUES('LT')")) {
             $this->instId = $this->databaseHandle->lastID();
         }
-        if($this->databaseHandle->exec("INSERT INTO profile (inst_id, realm) VALUES($this->instId, 'test.realm.tst')")){
+        if ($this->databaseHandle->exec("INSERT INTO profile (inst_id, realm) VALUES($this->instId, 'test.realm.tst')")) {
             $this->identifier = $this->databaseHandle->lastID();
         }
         $this->attributes = array(array('name' => 'hiddenprofile:tou_accepted'));
@@ -45,7 +45,7 @@ 
     /**
      * 
      */
-    public function delete(){
+    public function delete() {
         $this->databaseHandle->exec("DELETE FROM `institution` WHERE `inst_id`='" . $this->instId . "'");
         $this->databaseHandle->exec("DELETE FROM `profile` WHERE `profile_id`='" . $this->identifier . "'");
     }
@@ -55,7 +55,7 @@ 
      * {@inheritDoc}
      * @see \core\ProfileSilverbullet::generateCertificate()
      */
-    public function generateCertificate($serial, $cn){
+    public function generateCertificate($serial, $cn) {
         $this->generatedCertificates[$serial] = $cn;
     }
     
@@ -64,8 +64,8 @@ 
      * {@inheritDoc}
      * @see \core\ProfileSilverbullet::revokeCertificate()
      */
-    public function revokeCertificate($serial){
-        if(isset($this->generatedCertificates[$serial])){
+    public function revokeCertificate($serial) {
+        if (isset($this->generatedCertificates[$serial])) {
             unset($this->generatedCertificates[$serial]);
             $nowSql = (new \DateTime())->format("Y-m-d H:i:s");
             $this->databaseHandle->exec("UPDATE silverbullet_certificate SET revocation_status = 'REVOKED', revocation_time = ? WHERE serial_number = ?", "si", $nowSql, $serial);
@@ -78,7 +78,7 @@ 
      * @param string $cn
      * @return boolean
      */
-    public function isGeneratedCertificate($serial, $cn){
-        return isset($this->generatedCertificates[$serial]) && $this->generatedCertificates[$serial]==$cn;
+    public function isGeneratedCertificate($serial, $cn) {
+        return isset($this->generatedCertificates[$serial]) && $this->generatedCertificates[$serial] == $cn;
     }
 }

web/skins/classic/resources/css/cat.css.php

Spacing +21 added lines, -21 removed lines

@@ -18,7 +18,7 @@ 
 }
 
 body {
-    background: <?php echo $colour1;?>;
+    background: <?php echo $colour1; ?>;
     color: #000000;
     font-family:Verdana, Arial, Helvetica, sans-serif;
     font-size:11px;
@@ -33,7 +33,7 @@ 
 }
 
 button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     min-height: 23px;
     border-left-style: outset; 
@@ -215,9 +215,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; ?>;
 }
 
 div.pagecontent {
@@ -410,7 +410,7 @@ 
 
 span.edu_cat {
     font-weight: bold;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 span.tooltip {
@@ -523,7 +523,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;
 }
 
@@ -577,7 +577,7 @@ 
 }
 
 span.redirect_link {
-    background: <?php echo $colour2;?>; color: #FFFFFF; height: 23px;
+    background: <?php echo $colour2; ?>; color: #FFFFFF; height: 23px;
     border-left-style: inset; border-left-width: 1px; border-left-color: #8bbacb;
     border-top-style: inset; border-top-width: 1px; border-top-color: #8bbacb;
     border-right-style: outset; border-right-width: 2px; border-right-color: #043d52;
@@ -624,7 +624,7 @@ 
 }
 
 #close_button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     height: 23px;
     border-left-style: inset; 
@@ -705,7 +705,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;
 }
@@ -714,7 +714,7 @@ 
     width: 30em; 
     padding-left: 10px; 
     padding-right: 00px; 
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     box-shadow: 10px 10px 5px #888888;
 }
@@ -762,7 +762,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;
 }
@@ -772,9 +772,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 { 
@@ -793,7 +793,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;
 }
@@ -841,7 +841,7 @@ 
 
 #faq {
     padding: 20px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     background: #ffffff;
 }
 
@@ -894,7 +894,7 @@ 
 
 #line1 {
     top:145px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     font-size:20px;
 }
 
@@ -949,7 +949,7 @@ 
 
 #menu_column {
     border-right:solid;
-    border-color: <?php echo $colour1;?>;
+    border-color: <?php echo $colour1; ?>;
     border-width:5px;
     min-height:400px;
     padding-left: 10px;
@@ -960,7 +960,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; 
@@ -989,11 +989,11 @@ 
 }
 
 a:link {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:visited {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 a:hover {
@@ -1001,7 +1001,7 @@ 
 }
 
 a:active {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 .comment {