View GitHub Repository CAT

Schedule Inspection
Subscribe
Passed
Push — master ( 0682fa...e35183 )
by Maja
13:58
created
Status
Category
Toggle Patches
web/skins/modern/test.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -91,7 +91,7 @@
 
 block discarded – undo
91 91 
          <?php if (empty($_REQUEST['idp'])) { ?>
92 92 
               <div id="front_page">
93 93 
                   <?php
94 
-                         echo $divs->divTopWelcome();
94 
+                            echo $divs->divTopWelcome();
95 95 
 //                         echo $divs->div_roller();
96 96 
 //                         echo $divs->div_main_button(); ?>
97 97 
               </div> <!-- id="front_page" -->
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -28,9 +28,9 @@  discard block
 
 block discarded – undo
28 28 
 ?>
29 29
30 30 
 <!-- JQuery -->
31 
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script>
32 
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate-1.2.1.js") ?>"></script>
33 
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script>
31 
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script>
32 
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate-1.2.1.js") ?>"></script>
33 
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script>
34 34 
 <!-- JQuery -->
35 35
36 36 
 <script type="text/javascript">
 
@@ -44,10 +44,10 @@  discard block
 
 block discarded – undo
44 44 
 $operatingSystem = $Gui->detectOS();
45 45 
 $Gui->loggerInstance->debug(4, $operatingSystem);
46 46 
 if ($operatingSystem) {
47 
-    print "recognisedOS = '" . $operatingSystem['device'] . "';\n";
47 
+    print "recognisedOS = '".$operatingSystem['device']."';\n";
48 48 
 }
49 49
50 
-print 'downloadMessage = "' . $Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE] . '";';
50 
+print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE].'";';
51 51 
 //TODO modify this based on OS detection
52 52 
 if (preg_match('/Android/', $_SERVER['HTTP_USER_AGENT'])) {
53 53 
     $profile_list_size = 1;
 
@@ -58,7 +58,7 @@  discard block
 
 block discarded – undo
58 58 
 require "user/js/cat_js.php";
59 59 
 ?>
60 60 
     var loading_ico = new Image();
61 
-    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>";
61 
+    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>";
62 62 
 </script>
63 63 
 <?php $Gui->languageInstance->setTextDomain("web_user"); ?>
64 64 
 <!-- DiscoJuice -->
 
@@ -67,9 +67,9 @@  discard block
 
 block discarded – undo
67 67 
     front_page = 0;
68 68 
     var lang = "<?php echo($Gui->languageInstance->getLang()) ?>";
69 69 
 </script>
70 
-<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","discojuice/css/discojuice.css")?>" />
70 
+<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "discojuice/css/discojuice.css")?>" />
71 71 
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
72 
-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
72 
+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
73 73 
 </head>
74 74 
 <body>
75 75 
 <div id="wrap">
 
@@ -77,14 +77,14 @@  discard block
 
 block discarded – undo
77 77 
     <?php echo $divs->divHeading($visibility); ?>
78 78 
     <div id="main_page">
79 79 
         <div id="loading_ico">
80 
-          <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>" alt="Authenticating ..."/>
80 
+          <?php echo _("Authenticating")."..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>" alt="Authenticating ..."/>
81 81 
         </div>
82 82 
         <div id="info_overlay"> <!-- device info -->
83 83 
             <div id="info_window"></div>
84 
-            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
84 
+            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
85 85 
         </div>
86 86 
         <div id="main_menu_info" style="display:none"> <!-- stuff triggered form main menu -->
87 
-          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
87 
+          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
88 88 
           <div id="main_menu_content"></div>
89 89 
         </div>
90 90 
         <div id="main_body">
Please login to merge, or discard this patch.
devices/ms/Files/common.inc 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -1115,12 +1115,12 @@
 
 block discarded – undo
1115 1115 
         $certUsernameLabel = WindowsCommon::sprintNsis(_("Username:"));
1116 1116 
         $certUsernameLength = strlen($certUsernameLabel);
1117 1117 
         $labelLength = max($certPasswordLength,$certUsernameLength);
1118 
-  ?>
1118 
+    ?>
1119 1119 
   ${NSD_CreateLabel} 0 0 100% 32u "<?php WindowsCommon::echoNsis(_("Selected file: \$Cert_file"))?>"
1120 1120 
   !else
1121 1121 
   <?php $certPasswordLabel = WindowsCommon::sprintNsis(_("import password:"));
1122 1122 
         $certPasswordLength = strlen($certPasswordLabel);
1123 
-  ?>
1123 
+    ?>
1124 1124 
   !insertmacro debug_cat 4 "Unpacking SB_cert.p12"
1125 1125 
   File "SB_cert.p12"
1126 1126 
   nsArray::Set Delete_files "SB_cert.p12"
Please login to merge, or discard this patch.
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch 
@@ -135,10 +135,10 @@  discard block
 
 block discarded – undo
135 135 
 !define MUI_HEADERIMAGE_BITMAP "cat_150.bmp"
136 136 
 !define MUI_COMPONENTSPAGE_SMALLDESC
137 137
138 
-!define WELCOME_HEADER "<?php printf(WindowsCommon::sprintNsis(_("Welcome to the %s installer")),\config\ConfAssistant::CONSORTIUM['display_name'])?>"
139 
-!define FAREWELL_HEADER "<?php WindowsCommon::echoNsis( _("Installation complete"))?>"
140 
-!define FAREWELL_TEXT	"<?php WindowsCommon::echoNsis( _("Network profiles have been installed."))?>$\r$\n$\n <?php WindowsCommon::echoNsis(  _("Your system is ready."))?>"
141 
-!define FAREWELL_FAIL	"<?php WindowsCommon::echoNsis( _("Network installation had errors."))?>$\r$\n$\n <?php WindowsCommon::echoNsis( _("Please contact \${SUPPORT}."))?>"
138 
+!define WELCOME_HEADER "<?php printf(WindowsCommon::sprintNsis(_("Welcome to the %s installer")), \config\ConfAssistant::CONSORTIUM['display_name'])?>"
139 
+!define FAREWELL_HEADER "<?php WindowsCommon::echoNsis(_("Installation complete"))?>"
140 
+!define FAREWELL_TEXT	"<?php WindowsCommon::echoNsis(_("Network profiles have been installed."))?>$\r$\n$\n <?php WindowsCommon::echoNsis(_("Your system is ready."))?>"
141 
+!define FAREWELL_FAIL	"<?php WindowsCommon::echoNsis(_("Network installation had errors."))?>$\r$\n$\n <?php WindowsCommon::echoNsis(_("Please contact \${SUPPORT}."))?>"
142 142 
 ;--------------------------------
143 143 
 ;Languages
144 144 
 !insertmacro MUI_LANGUAGE "${LANG}"
 
@@ -146,14 +146,14 @@  discard block
 
 block discarded – undo
146 146 
 ;--------------------------------
147 147 
 ; License file
148 148 
 !ifdef LICENSE_FILE
149 
-LicenseForceSelection checkbox "<?php WindowsCommon::echoNsis( _("Accept"))?>"
149 
+LicenseForceSelection checkbox "<?php WindowsCommon::echoNsis(_("Accept"))?>"
150 150 
 LicenseText "<?php WindowsCommon::echoNsis(_("If you accept the conditions then select Accept and then click Install to continue."))?>"
151 151 
 LicenseData ${LICENSE_FILE}
152 152 
 !endif
153 153
154 154 
 ;-----------------------------------
155 155
156 
-MiscButtonText "" "" "" "<?php WindowsCommon::echoNsis( _("Finish"))?>"
156 
+MiscButtonText "" "" "" "<?php WindowsCommon::echoNsis(_("Finish"))?>"
157 157 
 ;----------------------------------
158 158 
 ;  FUNCTIONS
159 159 
 
@@ -186,7 +186,7 @@  discard block
 
 block discarded – undo
186 186
187 187 
 !macro install_ca_cert ca_file ca_fingerprint level
188 188 
    !insertmacro debug_cat 2 "locating certificate  SHA=${ca_fingerprint} Level=${level}"
189 
-   DetailPrint "<?php WindowsCommon::echoNsis( _("searching for certificate"))?> ${ca_file}"
189 
+   DetailPrint "<?php WindowsCommon::echoNsis(_("searching for certificate"))?> ${ca_file}"
190 190 
    File "${ca_file}"
191 191 
    nsArray::Set Delete_files "${ca_file}"
192 192 
    !insertmacro debug_cat 2 "Testing machine store root"
 
@@ -248,13 +248,13 @@  discard block
 
 block discarded – undo
248 248 
    ${EndIf}
249 249 
    !insertmacro debug_cat 2 "installing certificate $TEMP\${ca_file}"
250 250 
    !insertmacro debug_cat 3 "Execute: certutil -addstore -user ${level} $TEMP\${ca_file}"
251 
-   DetailPrint "<?php WindowsCommon::echoNsis( _("installing certificate"))?> ${ca_file}"
251 
+   DetailPrint "<?php WindowsCommon::echoNsis(_("installing certificate"))?> ${ca_file}"
252 252 
    nsExec::Exec '"certutil" -addstore -user ${level} "$TEMP"\${ca_file}'
253 253 
    Pop $0
254 254 
    !insertmacro debug_cat 3 "certutil returned $0"
255 255 
    ${If} $0 != 0
256 256 
      IfSilent +2
257 
-     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis( _("could not install certificate"))?>  ${ca_file}"
257 
+     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis(_("could not install certificate"))?>  ${ca_file}"
258 258 
      !insertmacro debug_cat 1 "could not install certificate ${ca_file}"
259 259 
    ${EndIf}
260 260 
 no_install_${ca_file}:
 
@@ -461,26 +461,26 @@  discard block
 
 block discarded – undo
461 461 
   pop $R0
462 462 
   ${If} $tkip_count > 0
463 463 
     ${If} $aes_count > 1
464 
-      StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis( _("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
464 
+      StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis(_("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
465 465 
     ${Else}
466 
-     StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis( _("The non TKIP profile is preferred. Always use it if you have a choice."))?>"
466 
+     StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis(_("The non TKIP profile is preferred. Always use it if you have a choice."))?>"
467 467 
     ${EndIf}
468 468 
   ${Else}
469 469 
     StrCpy $R1 ""
470 470 
   ${EndIf}
471 471 
   ${If} $profile_count > 0
472 
-    StrCpy $welcome_message "<?php WindowsCommon::echoNsis( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
473 
-<?php WindowsCommon::echoNsis( _("The installer will create the following wireless profiles:"))?>$\r$\n\
472 
+    StrCpy $welcome_message "<?php WindowsCommon::echoNsis(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
473 
+<?php WindowsCommon::echoNsis(_("The installer will create the following wireless profiles:"))?>$\r$\n\
474 474 
 $R0.\
475 475 
 $R1$\r$\n$\n\
476 
-<?php WindowsCommon::echoNsis( _("More information and comments:"))?>$\r$\n\
476 
+<?php WindowsCommon::echoNsis(_("More information and comments:"))?>$\r$\n\
477 477 
    EMAIL: ${SUPPORT}$\r$\n\
478 478 
    WWW: ${URL}"
479 479 
 ${Else}
480 
-StrCpy $welcome_message "<?php WindowsCommon::echoNsis( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
481 
-<?php WindowsCommon::echoNsis( _("The installer will create the wireless profile:"))?> $R0.\
480 
+StrCpy $welcome_message "<?php WindowsCommon::echoNsis(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
481 
+<?php WindowsCommon::echoNsis(_("The installer will create the wireless profile:"))?> $R0.\
482 482 
 $R1$\r$\n$\n\
483 
-<?php WindowsCommon::echoNsis( _("More information and comments:"))?>$\r$\n\
483 
+<?php WindowsCommon::echoNsis(_("More information and comments:"))?>$\r$\n\
484 484 
    EMAIL: ${SUPPORT}$\r$\n\
485 485 
    WWW: ${URL}"
486 486 
 ${EndIf}
 
@@ -506,7 +506,7 @@  discard block
 
 block discarded – undo
506 506 
   SendMessage $HEADLINE ${WM_SETFONT} $HEADLINE_FONT 0
507 507 
 ;TRANSLATION
508 508 
   nsDialogs::CreateControl STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 120u 46u -130u -32u "$welcome_message\
509 
-$\r$\n$\r$\n<?php WindowsCommon::echoNsis( _("Installer created with software from the GEANT project."))?>"
509 
+$\r$\n$\r$\n<?php WindowsCommon::echoNsis(_("Installer created with software from the GEANT project."))?>"
510 510 
   Pop $TEXT
511 511
512 512 
   SetCtlColors $DIALOG "" 0xffffff
 
@@ -619,18 +619,18 @@  discard block
 
 block discarded – undo
619 619 
     ${If} $wireless_result == 1
620 620 
       !insertmacro debug_cat 1 "wlan_test.exe did not find wireless configuration service"
621 621 
       IfSilent +2
622 
-      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis( _("Windows wireless configuration service is not enabled. The installer cannot continue."))?>"
622 
+      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis(_("Windows wireless configuration service is not enabled. The installer cannot continue."))?>"
623 623 
       Call Cleanup
624 624 
     ${EndIf}
625 625 
     ${If} $wireless_result == 2
626 626 
       IfSilent +2
627 
-      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis( _("No wireless interfaces found. The installer cannot continue."))?>"
627 
+      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis(_("No wireless interfaces found. The installer cannot continue."))?>"
628 628 
       Call Cleanup
629 629 
     ${EndIf}
630 630 
   ${Else}
631 631 
     ${If} $wireless_result > 0
632 632 
        IfSilent +3
633 
-       MessageBox MB_YESNO "<?php WindowsCommon::echoNsis( _("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
633 
+       MessageBox MB_YESNO "<?php WindowsCommon::echoNsis(_("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
634 634 
        Call Cleanup
635 635 
        wired_yes:
636 636 
        Push 1
 
@@ -646,7 +646,7 @@  discard block
 
 block discarded – undo
646 646 
     ${If} $wired == 1
647 647 
       ${If} $force_wired == 0
648 648 
         IfSilent wired
649 
-        MessageBox MB_YESNO "<?php WindowsCommon::echoNsis( _("Do you want to enable access on wired interfaces?"))?>" IDYES wired
649 
+        MessageBox MB_YESNO "<?php WindowsCommon::echoNsis(_("Do you want to enable access on wired interfaces?"))?>" IDYES wired
650 650 
         Push 0
651 651 
         Pop $wired
652 652 
       ${EndIf}
 
@@ -687,7 +687,7 @@  discard block
 
 block discarded – undo
687 687 
 ;================================
688 688
689 689 
 Function ShowInstfiles
690 
-  !insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis( _("Profiles installation"))?>" " "
690 
+  !insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis(_("Profiles installation"))?>" " "
691 691 
 FunctionEnd
692 692 
 ;================================
693 693 
 ;  Check if a wireless profile exist and put it on delete list
 
@@ -706,7 +706,7 @@  discard block
 
 block discarded – undo
706 706
707 707 
 Function FindProfile
708 708 
   Pop $R8
709 
-  DetailPrint "<?php WindowsCommon::echoNsis( _("Checking for profile \$R8"))?>"
709 
+  DetailPrint "<?php WindowsCommon::echoNsis(_("Checking for profile \$R8"))?>"
710 710 
   !insertmacro debug_cat 2 "Checking for profile $R8"
711 711 
   !insertmacro debug_cat 3 "Exec: $Netsh wlan show profiles $R8"
712 712 
   nsExec::Exec  '"$Netsh" wlan show profiles "$R8"'
 
@@ -714,7 +714,7 @@  discard block
 
 block discarded – undo
714 714 
   !insertmacro debug_cat 4 "netsh returned $0"
715 715 
   ${If} $0 == 0
716 716 
     !insertmacro debug_cat 1 "found profile $R8"
717 
-    DetailPrint "<?php WindowsCommon::echoNsis( _("found profile \$R8"))?>"
717 
+    DetailPrint "<?php WindowsCommon::echoNsis(_("found profile \$R8"))?>"
718 718 
     Push 0
719 719 
   ${Else}
720 720 
     !insertmacro debug_cat 1 "profile $R8 not found"
 
@@ -809,7 +809,7 @@  discard block
 
 block discarded – undo
809 809 
     ${If} $Symantec_installed  != 0
810 810 
      !insertmacro debug_cat 3 "Symantec problem"
811 811 
      IfSilent +2
812 
-     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php printf(WindowsCommon::sprintNsis(_("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']) ?>"
812 
+     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php printf(WindowsCommon::sprintNsis(_("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']) ?>"
813 813 
     Exec '"explorer" /select,"$EXEDIR\inst_cat.cmd"'
814 814 
     Quit
815 815 
 
@@ -1098,7 +1098,7 @@  discard block
 
 block discarded – undo
1098 1098 
 Function PFXCertificateSelect
1099 1099 
   !ifndef SILVERBULLET
1100 1100 
 ;TRANSLATION
1101 
-!insertmacro MUI_HEADER_TEXT "<?php printf(WindowsCommon::sprintNsis(_("%s installer for")),\config\ConfAssistant::CONSORTIUM['display_name'])?> " "<?php WindowsCommon::echoNsis(_("Install personal certificate"))?>"
1101 
+!insertmacro MUI_HEADER_TEXT "<?php printf(WindowsCommon::sprintNsis(_("%s installer for")), \config\ConfAssistant::CONSORTIUM['display_name'])?> " "<?php WindowsCommon::echoNsis(_("Install personal certificate"))?>"
1102 1102 
 ;TRANSLATION
1103 1103 
     IfSilent +2
1104 1104 
   MessageBox MB_OK "<?php WindowsCommon::echoNsis(_("Preparing to install personal certificate."))?>$\r$\n<?php WindowsCommon::echoNsis(_("Click OK to continue"))?> "
 
@@ -1114,7 +1114,7 @@  discard block
 
 block discarded – undo
1114 1114 
         $certPasswordLength = strlen($certPasswordLabel);
1115 1115 
         $certUsernameLabel = WindowsCommon::sprintNsis(_("Username:"));
1116 1116 
         $certUsernameLength = strlen($certUsernameLabel);
1117 
-        $labelLength = max($certPasswordLength,$certUsernameLength);
1117 
+        $labelLength = max($certPasswordLength, $certUsernameLength);
1118 1118 
   ?>
1119 1119 
   ${NSD_CreateLabel} 0 0 100% 32u "<?php WindowsCommon::echoNsis(_("Selected file: \$Cert_file"))?>"
1120 1120 
   !else
 
@@ -1131,11 +1131,11 @@  discard block
 
 block discarded – undo
1131 1131 
   !insertmacro debug_cat 3 "Vista level (Vista without Service pack): $VistaNoSP";
1132 1132 
   ${If} $VistaNoSP == 0
1133 1133 
     !ifdef PFX_USERNAME
1134 
-       !define LABEL_LENGTH "<?php echo($labelLength*3.5)?>u"
1135 
-       !define TEXT_START "<?php echo($labelLength*3.5 +5)?>u"
1134 
+       !define LABEL_LENGTH "<?php echo($labelLength * 3.5)?>u"
1135 
+       !define TEXT_START "<?php echo($labelLength * 3.5 + 5)?>u"
1136 1136 
     !else
1137 
-       !define LABEL_LENGTH "<?php echo($certPasswordLength*3.5)?>u"
1138 
-       !define TEXT_START "<?php echo($certPasswordLength*3.5 +5)?>u"
1137 
+       !define LABEL_LENGTH "<?php echo($certPasswordLength * 3.5)?>u"
1138 
+       !define TEXT_START "<?php echo($certPasswordLength * 3.5 + 5)?>u"
1139 1139 
     !endif
1140 1140 
     ${NSD_CreateLabel} 0 35u ${LABEL_LENGTH} 12u "<?php echo $certPasswordLabel?>"
1141 1141 
     ${NSD_CreatePassword} ${TEXT_START} 34.5u 120u 12u ""
 
@@ -1505,7 +1505,7 @@  discard block
 
 block discarded – undo
1505 1505 
 Section "-start"
1506 1506 
 SectionIn RO
1507 1507
1508 
-!insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis( _("Installation"))?>" "<?php WindowsCommon::echoNsis( _("Checking for existing wireless profiles"))?>"
1508 
+!insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis(_("Installation"))?>" "<?php WindowsCommon::echoNsis(_("Checking for existing wireless profiles"))?>"
1509 1509 
 !ifndef PWD
1510 1510 
 !include "certs.nsh"
1511 1511 
 !endif
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 
@@ -92,7 +92,7 @@  discard block
 
 block discarded – undo
92 92 
   nsArray::Set Delete_files "GEANTLink-ARM64.msi"
93 93 
   File "GEANTLink-ARM64.msi"
94 94 
   IfSilent +2
95 
-  MessageBox MB_OK  "<?php WindowsCommon::echoNsis( _("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."))?>"
95 
+  MessageBox MB_OK  "<?php WindowsCommon::echoNsis(_("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."))?>"
96 96 
   !insertmacro debug_cat 1 "Run GEANTLink installer"
97 97 
   !insertmacro debug_cat 3 'Execute: msiexec.exe /i "$OUTDIR\GEANTLink-$Platform.msi" REBOOT=Supress'
98 98 
   ClearErrors
 
@@ -104,7 +104,7 @@  discard block
 
 block discarded – undo
104 104 
   Pop $rebootRequired
105 105 
   ${Else}
106 106 
   IfSilent +2
107 
-  MessageBox MB_OK "<?php WindowsCommon::echoNsis( _("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"
107 
+  MessageBox MB_OK "<?php WindowsCommon::echoNsis(_("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"
108 108 
   Quit
109 109 
   ${EndIf}
110 110 
   Cont2:
Please login to merge, or discard this patch.
core/diag/RFC5997Tests.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch 
@@ -88,24 +88,24 @@  discard block
 
 block discarded – undo
88 88 
         $reqAuthenticator = random_bytes(16);
89 89 
         $packetIdentifier = random_bytes(1);
90 90 
         // construct Status-Server packet
91 
-        $prePacket = RFC5997Tests::PACKET_TYPE_STATUS_SERVER .
92 
-                $packetIdentifier .
93 
-                RFC5997Tests::PACKET_LENGTH .
94 
-                $reqAuthenticator .
95 
-                RFC5997Tests::ATTRIBUTE_NAS_IDENTIFIER .
96 
-                RFC5997Tests::LENGTH_NAS_IDENTIFIER .
91 
+        $prePacket = RFC5997Tests::PACKET_TYPE_STATUS_SERVER.
92 
+                $packetIdentifier.
93 
+                RFC5997Tests::PACKET_LENGTH.
94 
+                $reqAuthenticator.
95 
+                RFC5997Tests::ATTRIBUTE_NAS_IDENTIFIER.
96 
+                RFC5997Tests::LENGTH_NAS_IDENTIFIER.
97 97 
                 RFC5997Tests::VALUE_NAS_IDENTIFIER;
98 
-        $sigPacket = $prePacket .
99 
-                RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR .
100 
-                RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR .
98 
+        $sigPacket = $prePacket.
99 
+                RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR.
100 
+                RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR.
101 101 
                 "\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0";
102 
-        $authPacket = $prePacket .
103 
-                RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR .
104 
-                RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR .
102 
+        $authPacket = $prePacket.
103 
+                RFC5997Tests::ATTRIBUTE_MESSAGE_AUTHENTICATOR.
104 
+                RFC5997Tests::LENGTH_MESSAGE_AUTHENTICATOR.
105 105 
                 hash_hmac("md5", $sigPacket, $this->secret, TRUE);
106 106 
         $connectErrorNumber = 0;
107 107 
         $connectErrorString = "";
108 
-        $netHandle = fsockopen("udp://" . $this->ipAddr, $this->port, $connectErrorNumber, $connectErrorString, RFC5997Tests::CONNECTION_TIMEOUT);
108 
+        $netHandle = fsockopen("udp://".$this->ipAddr, $this->port, $connectErrorNumber, $connectErrorString, RFC5997Tests::CONNECTION_TIMEOUT);
109 109 
         if ($netHandle === FALSE) {
110 110 
             throw new Exception("Unable to establish UDP socket resource. Error number was $connectErrorNumber, '$connectErrorString'");
111 111 
         }
 
@@ -123,11 +123,11 @@  discard block
 
 block discarded – undo
123 123 
             return AbstractTest::RETVAL_INVALID;
124 124 
         }
125 125 
         // check the response authenticator to prevent spoofing.
126 
-        $sigResponse = RFC5997Tests::PACKET_TYPE_ACCESS_ACCEPT .
127 
-                $packetIdentifier .
128 
-                $read[2] . $read[3] .
129 
-                $reqAuthenticator .
130 
-                substr($read, 20) .
126 
+        $sigResponse = RFC5997Tests::PACKET_TYPE_ACCESS_ACCEPT.
127 
+                $packetIdentifier.
128 
+                $read[2].$read[3].
129 
+                $reqAuthenticator.
130 
+                substr($read, 20).
131 131 
                 $this->secret;
132 132 
         $expected = hash("md5", $sigResponse, TRUE);
133 133 
         if ($expected != substr($read, 4, 16)) {
Please login to merge, or discard this patch.
core/SilverbulletCertificate.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -195,7 +195,7 @@  discard block
 
 block discarded – undo
195 195 
         $invitationObject = new SilverbulletInvitation($token);
196 196 
         $profile = new ProfileSilverbullet($invitationObject->profile);
197 197 
         $inst = new IdP($profile->institution);
198 
-        $loggerInstance->debug(5, "tokenStatus: done, got " . $invitationObject->invitationTokenStatus . ", " . $invitationObject->profile . ", " . $invitationObject->userId . ", " . $invitationObject->expiry . ", " . $invitationObject->invitationTokenString . "\n");
198 
+        $loggerInstance->debug(5, "tokenStatus: done, got ".$invitationObject->invitationTokenStatus.", ".$invitationObject->profile.", ".$invitationObject->userId.", ".$invitationObject->expiry.", ".$invitationObject->invitationTokenString."\n");
199 199 
         if ($invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_VALID && $invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_PARTIALLY_REDEEMED) {
200 200 
             throw new Exception("Attempt to generate a SilverBullet installer with an invalid/redeemed/expired token. The user should never have gotten that far!");
201 201 
         }
 
@@ -208,12 +208,12 @@  discard block
 
 block discarded – undo
208 208 
             throw new Exception("Despite a valid token, the corresponding user was not found in database or database query error!");
209 209 
         }
210 210 
         $expiryObject = mysqli_fetch_object(/** @scrutinizer ignore-type */ $userrow);
211 
-        $loggerInstance->debug(5, "EXP: " . $expiryObject->expiry . "\n");
211 
+        $loggerInstance->debug(5, "EXP: ".$expiryObject->expiry."\n");
212 212 
         $expiryDateObject = date_create_from_format("Y-m-d H:i:s", $expiryObject->expiry);
213 213 
         if ($expiryDateObject === FALSE) {
214 214 
             throw new Exception("The expiry date we got from the DB is bogus!");
215 215 
         }
216 
-        $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s") . "\n");
216 
+        $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s")."\n");
217 217 
         // date_create with no parameters can't fail, i.e. is never FALSE
218 218 
         $validity = date_diff(/** @scrutinizer ignore-type */ date_create(), $expiryDateObject);
219 219 
         $expiryDays = $validity->days + 1;
 
@@ -251,7 +251,7 @@  discard block
 
 block discarded – undo
251 251 
         $certString = "";
252 252 
         openssl_x509_export($cert, $certString);
253 253 
         $parsedCert = $x509->processCertificate($certString);
254 
-        $loggerInstance->debug(5, "CERTINFO: " . print_r($parsedCert['full_details'], true));
254 
+        $loggerInstance->debug(5, "CERTINFO: ".print_r($parsedCert['full_details'], true));
255 255 
         $realExpiryDate = date_create_from_format("U", $parsedCert['full_details']['validTo_time_t'])->format("Y-m-d H:i:s");
256 256
257 257 
         // store new cert info in DB
 
@@ -298,7 +298,7 @@  discard block
 
 block discarded – undo
298 298 
         $username = "";
299 299 
         while ($usernameIsUnique === FALSE) {
300 300 
             $usernameLocalPart = common\Entity::randomString(64 - 1 - strlen($realm), "0123456789abcdefghijklmnopqrstuvwxyz");
301 
-            $username = $usernameLocalPart . "@" . $realm;
301 
+            $username = $usernameLocalPart."@".$realm;
302 302 
             $uniquenessQuery = $databaseHandle->exec("SELECT cn from silverbullet_certificate WHERE cn = ? AND ca_type = ?", "ss", $username, $certtype);
303 303 
             // SELECT -> resource, not boolean
304 304 
             if (mysqli_num_rows(/** @scrutinizer ignore-type */ $uniquenessQuery) == 0) {
Please login to merge, or discard this patch.
devices/Devices-template.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -377,7 +377,7 @@  discard block
 
 block discarded – undo
377 377 
                             "eduroamCAT",
378 378 
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
379 379 
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
380 
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
380 
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
381 381 
                 ],
382 382 
             ],
383 383 
             'android_pie' => [
 
@@ -392,7 +392,7 @@  discard block
 
 block discarded – undo
392 392 
                             "eduroamCAT",
393 393 
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
394 394 
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
395 
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
395 
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
396 396 
                 ],
397 397 
             ],
398 398 
             'android_oreo' => [
 
@@ -407,7 +407,7 @@  discard block
 
 block discarded – undo
407 407 
                             "eduroamCAT",
408 408 
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
409 409 
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
410 
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
410 
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
411 411 
                 ],
412 412 
             ],
413 413 
             'android_nougat' => [
 
@@ -422,7 +422,7 @@  discard block
 
 block discarded – undo
422 422 
                             "eduroamCAT",
423 423 
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
424 424 
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
425 
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
425 
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
426 426 
                 ],
427 427 
             ],
428 428 
             'android_marshmallow' => [
 
@@ -437,7 +437,7 @@  discard block
 
 block discarded – undo
437 437 
                             "eduroamCAT",
438 438 
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
439 439 
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
440 
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
440 
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
441 441 
                 ],
442 442 
             ],
443 443 
             'android_lollipop' => [
 
@@ -452,7 +452,7 @@  discard block
 
 block discarded – undo
452 452 
                             "eduroamCAT",
453 453 
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
454 454 
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
455 
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
455 
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
456 456 
                 ],
457 457 
             ],
458 458 
             'android_kitkat' => [
 
@@ -467,7 +467,7 @@  discard block
 
 block discarded – undo
467 467 
                             "eduroamCAT",
468 468 
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
469 469 
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
470 
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
470 
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
471 471 
                 ],
472 472 
             ],
473 473 
             'android_43' => [
 
@@ -482,7 +482,7 @@  discard block
 
 block discarded – undo
482 482 
                             "eduroamCAT",
483 483 
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
484 484 
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
485 
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
485 
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
486 486 
                 ],
487 487 
             ],
488 488 
             'android_legacy' => [
Please login to merge, or discard this patch.
web/lib/user/Gui.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -52,10 +52,10 @@
 
 block discarded – undo
52 52 
         $ourlocale = $this->languageInstance->getLang();
53 53 
         header("Content-Type:text/html;charset=utf-8");
54 54 
         echo "<!DOCTYPE html>
55 
-          <html xmlns='http://www.w3.org/1999/xhtml' lang='" . $ourlocale . "'>
56 
-          <head lang='" . $ourlocale . "'>
55 
+          <html xmlns='http://www.w3.org/1999/xhtml' lang='" . $ourlocale."'>
56 
+          <head lang='" . $ourlocale."'>
57 57 
           <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
58 
-        echo "<title>" . htmlspecialchars($pagetitle) . "</title>";
58 
+        echo "<title>".htmlspecialchars($pagetitle)."</title>";
59 59 
         echo '<script type="text/javascript">ie_version = 0;</script>
60 60 
 <!--[if IE]>
61 61 
 <script type="text/javascript">ie_version=1;</script>
Please login to merge, or discard this patch.
web/skins/modern/user/cat_info.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch 
@@ -31,7 +31,7 @@  discard block
 
 block discarded – undo
31 31 
  * the receiving end to strip this marker and not add the title by itself.
32 32 
  *
33 33 
  */
34 
-require_once dirname(dirname(dirname((dirname(dirname(__FILE__)))))) . "/config/_config.php";
34 
+require_once dirname(dirname(dirname((dirname(dirname(__FILE__))))))."/config/_config.php";
35 35
36 36 
 $Gui = new \web\lib\user\Gui();
37 37 
 
@@ -41,46 +41,46 @@  discard block
 
 block discarded – undo
41 41 
 $subpage = $_REQUEST['subpage'];
42 42 
 switch ($page) {
43 43 
     case 'about':
44 
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/about_cat.inc.php";
44 
+        include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/about_cat.inc.php";
45 45 
         $out = "<div class='padding'>$out</div>";
46 46 
         break;
47 47 
     case 'tou':
48 
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/tou.inc.php";
48 
+        include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/tou.inc.php";
49 49 
         $out = "no_title<div>
50 50 
            <h1>
51 
-         " . $Tou['title'] . "
51 
+         " . $Tou['title']."
52 52 
     </h1>
53 
-<div id='tou_1'>" . $Tou['subtitle'] .
54 
-                $Tou['short'] . "
53 
+<div id='tou_1'>" . $Tou['subtitle'].
54 
+                $Tou['short']."
55 55 
 </div>
56 56 
 <div id='all_tou_link'><a href='javascript:showTOU()'>Click here to see the full terms</a></div>
57 57 
 <div id='tou_2' style='display:none; padding-top:20px'>" .
58 
-                $Tou['full'] . "
58 
+                $Tou['full']."
59 59 
 </div>
60 60 
 </div>
61 61 
 ";
62 62 
         break;
63 63 
     case 'help':
64 
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/faq.inc.php";
64 
+        include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/faq.inc.php";
65 65 
         switch ($subpage) {
66 66 
             case 'contact':
67 67 
             case 'idp_not_listed':
68 68 
             case 'device_not_listed':
69 69 
             case 'what_is_eduroam':
70 
-                $out = "no_title<div><h1>" . _("Help") . "</h1>";
70 
+                $out = "no_title<div><h1>"._("Help")."</h1>";
71 71 
                 foreach ($Faq as $faqItem) {
72 72 
                     if (!empty($faqItem['id']) && $faqItem['id'] == $subpage) {
73 
-                        $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
74 
-                        $out .= "" . $faqItem['text'] . "</div>\n";
73 
+                        $out .= "<div><h3>".$faqItem['title']."</h3>\n";
74 
+                        $out .= "".$faqItem['text']."</div>\n";
75 75 
                     }
76 76 
                 }
77 77 
                 $out .= "</div>";
78 78 
                 break;
79 79 
             case 'faq':
80 
-                $out = "no_title<div><h1>" . _("Frequently Asked Questions") . "</h1>";
80 
+                $out = "no_title<div><h1>"._("Frequently Asked Questions")."</h1>";
81 81 
                 foreach ($Faq as $faqItem) {
82 
-                    $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
83 
-                    $out .= "" . $faqItem['text'] . "</div>\n";
82 
+                    $out .= "<div><h3>".$faqItem['title']."</h3>\n";
83 
+                    $out .= "".$faqItem['text']."</div>\n";
84 84 
                 }
85 85 
                 $out .= "</div>";
86 86 
                 break;
 
@@ -104,15 +104,15 @@  discard block
 
 block discarded – undo
104 104 
                     $rn = uniqid();
105 105 
                     $_SESSION['remindIdP'] = $rn;
106 106 
                     $out .= "<input type='hidden' id='remindIdPs' value='$rn'>";
107 
-                    $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>" . _("Login") . "</button>";
108 
-                    $out .= "<br/><br/><p>" . _("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.") . "</p>";
109 
-                    $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>" . _("Get IdP Reminder") . "</button>";
107 
+                    $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>"._("Login")."</button>";
108 
+                    $out .= "<br/><br/><p>"._("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.")."</p>";
109 
+                    $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>"._("Get IdP Reminder")."</button>";
110 110 
                     $out .= "<div id='remindIdPd'><span id='remindIdPh'></span><ul id='remindIdPl'></ul></div>";
111 111 
                     $out = "<div  class='padding'>$out</div>";
112 112 
                 }
113 113 
                 break;
114 114 
             case 'develop':
115 
-                include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/devel.inc.php";
115 
+                include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/devel.inc.php";
116 116 
                 $out = "<div class='padding'>$out</div>";
117 117 
                 break;
118 118 
         }
Please login to merge, or discard this patch.
web/diag/processSociopath.php 1 patch
Spacing   +2 added lines, -2 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(__DIR__)) . "/config/_config.php";
22 
+require_once dirname(dirname(__DIR__))."/config/_config.php";
23 23 
 \core\CAT::sessionStart();
24 24 
 $loggerInstance = new \core\common\Logging();
25 25 
 $loggerInstance->debug(4, "Sociopath test\n");
 
@@ -33,7 +33,7 @@  discard block
 
 block discarded – undo
33 33 
         return NULL;
34 34 
     }
35 35 
     $loggerInstance->debug(4, $_SESSION['EVIDENCE']['QUESTIONSASKED']);
36 
-    $loggerInstance->debug(4, "\nAnswer question " . $QNUM . "\n");
36 
+    $loggerInstance->debug(4, "\nAnswer question ".$QNUM."\n");
37 37 
     switch ($answer) {
38 38 
         case 1:
39 39 
             $loggerInstance->debug(4, "Revaluate with FALSE");
Please login to merge, or discard this patch.