Inspection of "code cleanup" - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 30d070...476e2a )

by Tomasz

created 2018-01-15 07:52 UTC

Status

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -23,7 +23,7 @@
 block discarded – undo
         <div id="heading">
             <?php
             print '<img src="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 '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>';
             print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("%s Copyright and Licensing"), 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>';

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
     <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
         <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" />
 
-        <div id="motd"><?php print ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp'); ?></div>
+        <div id="motd"><?php print (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp'); ?></div>
 
         <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang(); ?>"><?php echo CONFIG['APPEARANCE']['productname']; ?></a></h1>
         <div id="tou">

Please login to merge, or discard this patch.

devices/Devices-template.php 2 patches

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -19,7 +19,7 @@  discard block
 block discarded – undo
  * 
  * @package ModuleWriting
  */
-class Devices{
+class Devices {
 
 /**
  * This array lists available configuration options for local device management.
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
  *         The default is unset, so it is not listed in the Options array.
  */
 
-public static $Options=[
+public static $Options = [
   'sign'=>0,
   'no_cache'=>0,
   'hidden'=>0,
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
       ],
    ],
 
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
       ],
    ],
 
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
       ],
    ],
 
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
       ],
    ],
 

Please login to merge, or discard this patch.

Indentation +159 added lines, -159 removed lines patch added patch discarded remove patch

@@ -64,10 +64,10 @@  discard block
 block discarded – undo
  */
 
 public static $Options=[
-  'sign'=>0,
-  'no_cache'=>0,
-  'hidden'=>0,
-  'redirect'=>0,
+    'sign'=>0,
+    'no_cache'=>0,
+    'hidden'=>0,
+    'redirect'=>0,
 ];
 
 /**
@@ -105,76 +105,76 @@  discard block
 block discarded – undo
 
 public static function listDevices() {
     return [
- 'w10'=>[
-   'group' => "microsoft",
-   'display'=>_("MS Windows 10"),
-   'match'=>'Windows NT 10',
-   'directory'=>'ms',
-   'module'=>'W8_10',
-   'signer'=>'ms_windows_sign',
+    'w10'=>[
+    'group' => "microsoft",
+    'display'=>_("MS Windows 10"),
+    'match'=>'Windows NT 10',
+    'directory'=>'ms',
+    'module'=>'W8_10',
+    'signer'=>'ms_windows_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'W10',
+        'sign'=>1,
+        'device_id'=>'W10',
         'args' => 'gl',
-       'mime'=>'application/x-dosexec',
-      ],
-   ],
+        'mime'=>'application/x-dosexec',
+        ],
+    ],
 	
- 'w8'=>[
-   'group' => "microsoft",
-   'display'=>_("MS Windows 8, 8.1"),
-   'match'=>'Windows NT 6[._][23]',
-   'directory'=>'ms',
-   'module'=>'W8_10',
-   'signer'=>'ms_windows_sign',
+    'w8'=>[
+    'group' => "microsoft",
+    'display'=>_("MS Windows 8, 8.1"),
+    'match'=>'Windows NT 6[._][23]',
+    'directory'=>'ms',
+    'module'=>'W8_10',
+    'signer'=>'ms_windows_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'W8',
-       'mime'=>'application/x-dosexec',
-      ],
-   ],
+        'sign'=>1,
+        'device_id'=>'W8',
+        'mime'=>'application/x-dosexec',
+        ],
+    ],
 	
- 'w7'=>[
-   'group' => "microsoft",
-   'display'=>_("MS Windows 7"),
-   'match'=>'Windows NT 6[._]1',
-   'directory'=>'ms',
-   'module'=>'Vista7',
-   'signer'=>'ms_windows_sign',
+    'w7'=>[
+    'group' => "microsoft",
+    'display'=>_("MS Windows 7"),
+    'match'=>'Windows NT 6[._]1',
+    'directory'=>'ms',
+    'module'=>'Vista7',
+    'signer'=>'ms_windows_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'W7',
-       'mime'=>'application/x-dosexec',
-      ],
-   ],
+        'sign'=>1,
+        'device_id'=>'W7',
+        'mime'=>'application/x-dosexec',
+        ],
+    ],
 	
- 'vista'=>[
-   'group' => "microsoft",
-   'display'=>_("MS Windows Vista"),
-   'match'=>'Windows NT 6[._]0',
-   'directory'=>'ms',
-   'module'=>'Vista7',
-   'signer'=>'ms_windows_sign',
+    'vista'=>[
+    'group' => "microsoft",
+    'display'=>_("MS Windows Vista"),
+    'match'=>'Windows NT 6[._]0',
+    'directory'=>'ms',
+    'module'=>'Vista7',
+    'signer'=>'ms_windows_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'Vista',
-       'mime'=>'application/x-dosexec',
-      ],
-   ],
+        'sign'=>1,
+        'device_id'=>'Vista',
+        'mime'=>'application/x-dosexec',
+        ],
+    ],
 	
- 'win-rt'=>[
+    'win-rt'=>[
     'group' => "microsoft",
     'display'=>_("Windows RT"),
     'directory'=>'redirect_dev',
     'module'=>'RedirectDev',
     'options'=>[
-      'hidden'=>0,
-      'redirect'=>1,
-      ],
-   ],
+        'hidden'=>0,
+        'redirect'=>1,
+        ],
+    ],
     
      
- 'apple_hi_sierra'=>array(
+    'apple_hi_sierra'=>array(
     'group' => "apple",
     'display'=>_("Apple macOS High Sierra"),
     'match'=>'Mac OS X 10[._]13',
@@ -182,14 +182,14 @@  discard block
 block discarded – undo
     'module'=>'mobileconfig_os_x',
     'signer'=>'mobileconfig_sign',
     'options'=>array(
-       'sign'=>1,
-       'device_id'=>'OS_X',
-       'mime'=>'application/x-apple-aspen-config',
-      ),
+        'sign'=>1,
+        'device_id'=>'OS_X',
+        'mime'=>'application/x-apple-aspen-config',
+        ),
     ),
 	
    
- 'apple_sierra'=>array(
+    'apple_sierra'=>array(
     'group' => "apple",
     'display'=>_("Apple macOS Sierra"),
     'match'=>'Mac OS X 10[._]12',
@@ -197,14 +197,14 @@  discard block
 block discarded – undo
     'module'=>'mobileconfig_os_x',
     'signer'=>'mobileconfig_sign',
     'options'=>array(
-       'sign'=>1,
-       'device_id'=>'OS_X',
-       'mime'=>'application/x-apple-aspen-config',
-      ),
+        'sign'=>1,
+        'device_id'=>'OS_X',
+        'mime'=>'application/x-apple-aspen-config',
+        ),
     ),
 	
 
- 'apple_el_cap'=>[
+    'apple_el_cap'=>[
     'group' => "apple",
     'display'=>_("Apple OS X El Capitan"),
     'match'=>'Mac OS X 10[._]11',
@@ -212,13 +212,13 @@  discard block
 block discarded – undo
     'module'=>'mobileconfig_os_x',
     'signer'=>'mobileconfig_sign',
     'options'=>array(
-       'sign'=>1,
-       'device_id'=>'OS_X',
-       'mime'=>'application/x-apple-aspen-config',
-      ),
+        'sign'=>1,
+        'device_id'=>'OS_X',
+        'mime'=>'application/x-apple-aspen-config',
+        ),
     ],
 
- 'apple_yos'=>[
+    'apple_yos'=>[
     'group' => "apple",
     'display'=>_("Apple OS X Yosemite"),
     'match'=>'Mac OS X 10[._]10',
@@ -226,13 +226,13 @@  discard block
 block discarded – undo
     'module'=>'mobileconfig_os_x',
     'signer'=>'mobileconfig_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'OS_X',
-       'mime'=>'application/x-apple-aspen-config',
-      ],
+        'sign'=>1,
+        'device_id'=>'OS_X',
+        'mime'=>'application/x-apple-aspen-config',
+        ],
     ],
 
- 'apple_mav'=>[
+    'apple_mav'=>[
     'group' => "apple",
     'display'=>_("Apple OS X Mavericks"),
     'match'=>'Mac OS X 10[._]9',
@@ -240,13 +240,13 @@  discard block
 block discarded – undo
     'module'=>'mobileconfig_os_x',
     'signer'=>'mobileconfig_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'OS_X',
-       'mime'=>'application/x-apple-aspen-config',
-      ],
+        'sign'=>1,
+        'device_id'=>'OS_X',
+        'mime'=>'application/x-apple-aspen-config',
+        ],
     ],
 
- 'apple_m_lion'=>[
+    'apple_m_lion'=>[
     'group' => "apple",
     'display'=>_("Apple OS X Mountain Lion"),
     'match'=>'Mac OS X 10[._]8',
@@ -254,13 +254,13 @@  discard block
 block discarded – undo
     'module'=>'mobileconfig_os_x',
     'signer'=>'mobileconfig_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'OS_X',
-       'mime'=>'application/x-apple-aspen-config',
-      ],
+        'sign'=>1,
+        'device_id'=>'OS_X',
+        'mime'=>'application/x-apple-aspen-config',
+        ],
     ],
 	
- 'apple_lion'=>[
+    'apple_lion'=>[
     'group' => "apple",
     'display'=>_("Apple OS X Lion"),
     'match'=>'Mac OS X 10[._]7',
@@ -268,13 +268,13 @@  discard block
 block discarded – undo
     'module'=>'mobileconfig_os_x',
     'signer'=>'mobileconfig_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'OS_X',
-       'mime'=>'application/x-apple-aspen-config',
-      ],
+        'sign'=>1,
+        'device_id'=>'OS_X',
+        'mime'=>'application/x-apple-aspen-config',
+        ],
     ],
         
- 'mobileconfig'=>[
+    'mobileconfig'=>[
     'group' => "apple",     
     'display'=>_("Apple iOS mobile devices"),
     'match'=>'(iPad|iPhone|iPod);.*OS ([7-9]|1[0-5])_',
@@ -282,13 +282,13 @@  discard block
 block discarded – undo
     'module'=>'mobileconfig_ios',
     'signer'=>'mobileconfig_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'iOS',
-       'mime'=>'application/x-apple-aspen-config',
-      ],
+        'sign'=>1,
+        'device_id'=>'iOS',
+        'mime'=>'application/x-apple-aspen-config',
+        ],
     ],
 
- 'mobileconfig-56'=>[
+    'mobileconfig-56'=>[
     'group' => "apple",
     'display'=>_("Apple iOS mobile devices (iOS 5 and 6)"),
     'match'=>'(iPad|iPhone|iPod);.*OS [56]_',
@@ -296,132 +296,132 @@  discard block
 block discarded – undo
     'module'=>'mobileconfig_ios_56',
     'signer'=>'mobileconfig_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'iOS',
-       'mime'=>'application/x-apple-aspen-config',
-      ],
+        'sign'=>1,
+        'device_id'=>'iOS',
+        'mime'=>'application/x-apple-aspen-config',
+        ],
     ],
 
         
- 'linux'=>[
-     'group' => "linux",
-     'display'=>_("Linux"),
-     'match'=>'Linux(?!.*Android)',
-     'directory'=>'linux',
-     'module' => 'Linux',
-     'options'=>[
-       'mime'=>'application/x-sh',
-      ],
-   ],
+    'linux'=>[
+        'group' => "linux",
+        'display'=>_("Linux"),
+        'match'=>'Linux(?!.*Android)',
+        'directory'=>'linux',
+        'module' => 'Linux',
+        'options'=>[
+        'mime'=>'application/x-sh',
+        ],
+    ],
 
- 'chromeos'=>[
+    'chromeos'=>[
     'group' => "chrome",
     'display'=>_("Chrome OS"),
     'match'=>'CrOS',
     'directory'=>'chromebook',
     'module'=>'chromebook',
     'options'=>[
-       'mime'=>'application/x-onc',
-       'message'=>sprintf(_("After downloading the file, open the Chrome browser and browse to this URL: <a href='chrome://net-internals/#chromeos'>chrome://net-internals/#chromeos</a>. Then, use the 'Import ONC file' button. The import is silent; the new network definitions will be added to the preferred networks.")),
-      ],
-   ],
+        'mime'=>'application/x-onc',
+        'message'=>sprintf(_("After downloading the file, open the Chrome browser and browse to this URL: <a href='chrome://net-internals/#chromeos'>chrome://net-internals/#chromeos</a>. Then, use the 'Import ONC file' button. The import is silent; the new network definitions will be added to the preferred networks.")),
+        ],
+    ],
         
- 'android_marshmallow'=>[
+    'android_marshmallow'=>[
     'group' => "android",
     'display'=>_("Android 6.0 Marshmallow"),
-     'match'=>'Android 6\.[0-9]',
+        'match'=>'Android 6\.[0-9]',
     'directory'=>'xml',
     'module'=>'Lollipop',
     'options'=>[
-       'mime'=>'application/eap-config',
-       'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
+        'mime'=>'application/eap-config',
+        'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
                             "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
-      ],
-   ],
+        ],
+    ],
 
- 'android_lollipop'=>[
+    'android_lollipop'=>[
     'group' => "android",
     'display'=>_("Android 5.0 Lollipop"),
-     'match'=>'Android 5\.[0-9]',
+        'match'=>'Android 5\.[0-9]',
     'directory'=>'xml',
     'module'=>'Lollipop',
     'options'=>[
-       'mime'=>'application/eap-config',
-       'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
+        'mime'=>'application/eap-config',
+        'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
                             "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
-      ],
-   ],
+        ],
+    ],
 
- 'android_kitkat'=>[
+    'android_kitkat'=>[
     'group' => "android",
     'display'=>_("Android 4.4 KitKat"),
-     'match'=>'Android 4\.[4-9]',
+        'match'=>'Android 4\.[4-9]',
     'directory'=>'xml',
     'module'=>'KitKat',
     'options'=>[
-       'mime'=>'application/eap-config',
-       'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
+        'mime'=>'application/eap-config',
+        'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
                             "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
-      ],
-   ],
+        ],
+    ],
 
 
- 'android_43'=>[
+    'android_43'=>[
     'group' => "android",
     'display'=>_("Android 4.3"),
-     'match'=>'Android 4\.3',
+        'match'=>'Android 4\.3',
     'directory'=>'xml',
     'module'=>'KitKat',
     'options'=>[
-       'mime'=>'application/eap-config',
-       'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
+        'mime'=>'application/eap-config',
+        'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
                             "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
-      ],
-   ],
+        ],
+    ],
 
- 'android_legacy'=>[
-     'group' => "android",
-     'display'=>_("Android"),
-     'match'=>'Android',
-     'directory'=>'redirect_dev',
-     'module'=>'RedirectDev',
-     'options'=>[
-       'redirect'=>1,
-      ],
-   ],
+    'android_legacy'=>[
+        'group' => "android",
+        'display'=>_("Android"),
+        'match'=>'Android',
+        'directory'=>'redirect_dev',
+        'module'=>'RedirectDev',
+        'options'=>[
+        'redirect'=>1,
+        ],
+    ],
 
- 'eap-config'=>[
+    'eap-config'=>[
     'group' => "eap-config",
     'display'=>_("EAP config"),
     'directory'=>'xml',
     'module'=>'XML_ALL',
     'options'=>[
-       'mime'=>'application/eap-config',
-       'message'=>sprintf(_("This option provides a generic EAP config XML file, which can be consumed by dedicated applications like eduroamCAT for Android and Linux platforms. This is still an experimental feature.")),
-      ],
+        'mime'=>'application/eap-config',
+        'message'=>sprintf(_("This option provides a generic EAP config XML file, which can be consumed by dedicated applications like eduroamCAT for Android and Linux platforms. This is still an experimental feature.")),
+        ],
     ],
 
- 'test'=>[
+    'test'=>[
     'group' => "other",
     'display'=>_("Test"),
     'directory'=>'test_module',
     'module'=>'TestModule',
     'options'=>[
-       'hidden'=>1,
-      ],
-   ],
+        'hidden'=>1,
+        ],
+    ],
 
 
 /*    

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
   File "GEANTLink64.msi"
   nsArray::Set Delete_files "GEANTLink64.msi"
   DetailPrint "Install GEANTLink installer"
-  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."))?>"
+  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."))?>"
   !insertmacro debug_cat 1 "Run GEANTLink installer"
   !insertmacro debug_cat 3 'Execute: msiexec.exe /i "$OUTDIR\GEANTLink$Platform.msi" REBOOT=Supress'
   ClearErrors
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
   Push 1
   Pop $rebootRequired
   ${Else}
-  MessageBox MB_OK "<?php WindowsCommon::echo_nsi( _("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"
+  MessageBox MB_OK "<?php WindowsCommon::echo_nsi(_("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"
   Quit
   ${EndIf}
   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
     $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();

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
         $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");

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
     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.

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
   * 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)");
 // SELECT -> mysqli_result, not boolean
 while ($statementRow = mysqli_fetch_object(/** @scrutinizer ignore-type */ $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;
     }
-    file_put_contents($tempdir."/$filename", $statementRow->OCSP);
+    file_put_contents($tempdir . "/$filename", $statementRow->OCSP);
 }

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
 <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 @@  discard block
 block discarded – undo
         ?>
     </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>

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
 }
 
 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 @@  discard block
 block discarded – undo
 }
 
 button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     min-height: 23px;
     border-left-style: outset; 
@@ -215,9 +215,9 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
 
 span.edu_cat {
     font-weight: bold;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
 }
 
 span.tooltip {
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
 }
 
 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 @@  discard block
 block discarded – undo
 }
 
 #close_button {
-    background: <?php echo $colour2;?>; 
+    background: <?php echo $colour2; ?>; 
     color: #FFFFFF; 
     height: 23px;
     border-left-style: inset; 
@@ -705,7 +705,7 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
 
 #faq {
     padding: 20px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     background: #ffffff;
 }
 
@@ -894,7 +894,7 @@  discard block
 block discarded – undo
 
 #line1 {
     top:145px;
-    color: <?php echo $colour2;?>;
+    color: <?php echo $colour2; ?>;
     font-size:20px;
 }
 
@@ -949,7 +949,7 @@  discard block
 block discarded – undo
 
 #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 @@  discard block
 block discarded – undo
 
 #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 @@  discard block
 block discarded – undo
 }
 
 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 @@  discard block
 block discarded – undo
 }
 
 a:active {
-    color:<?php echo $colour2;?>;
+    color:<?php echo $colour2; ?>;
 }
 
 .comment {

Please login to merge, or discard this 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 {

		@@ -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>';

		@@ -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">

		@@ -19,7 +19,7 @@ discard block
		block discarded – undo
19	19	*
20	20	* @package ModuleWriting
21	21	*/
22		-class Devices{
	22	+class Devices {
23	23
24	24	/**
25	25	* This array lists available configuration options for local device management.
		@@ -54,7 +54,7 @@ discard block
		block discarded – undo
54	54	* The default is unset, so it is not listed in the Options array.
55	55	*/
56	56
57		-public static $Options=[
	57	+public static $Options = [
58	58	'sign'=>0,
59	59	'no_cache'=>0,
60	60	'hidden'=>0,
		@@ -298,7 +298,7 @@ discard block
		block discarded – undo
298	298	"eduroamCAT",
299	299	"<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
300	300	"<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
301		- "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
	301	+ "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
302	302	],
303	303	],
304	304
		@@ -314,7 +314,7 @@ discard block
		block discarded – undo
314	314	"eduroamCAT",
315	315	"<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
316	316	"<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
317		- "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
	317	+ "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
318	318	],
319	319	],
320	320
		@@ -330,7 +330,7 @@ discard block
		block discarded – undo
330	330	"eduroamCAT",
331	331	"<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
332	332	"<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
333		- "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
	333	+ "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
334	334	],
335	335	],
336	336
		@@ -347,7 +347,7 @@ discard block
		block discarded – undo
347	347	"eduroamCAT",
348	348	"<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
349	349	"<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
350		- "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
	350	+ "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
351	351	],
352	352	],
353	353

		@@ -64,10 +64,10 @@ discard block
		block discarded – undo
64	64	*/
65	65
66	66	public static $Options=[
67		- 'sign'=>0,
68		- 'no_cache'=>0,
69		- 'hidden'=>0,
70		- 'redirect'=>0,
	67	+ 'sign'=>0,
	68	+ 'no_cache'=>0,
	69	+ 'hidden'=>0,
	70	+ 'redirect'=>0,
71	71	];
72	72
73	73	/**
		@@ -105,76 +105,76 @@ discard block
		block discarded – undo
105	105
106	106	public static function listDevices() {
107	107	return [
108		- 'w10'=>[
109		- 'group' => "microsoft",
110		- 'display'=>_("MS Windows 10"),
111		- 'match'=>'Windows NT 10',
112		- 'directory'=>'ms',
113		- 'module'=>'W8_10',
114		- 'signer'=>'ms_windows_sign',
	108	+ 'w10'=>[
	109	+ 'group' => "microsoft",
	110	+ 'display'=>_("MS Windows 10"),
	111	+ 'match'=>'Windows NT 10',
	112	+ 'directory'=>'ms',
	113	+ 'module'=>'W8_10',
	114	+ 'signer'=>'ms_windows_sign',
115	115	'options'=>[
116		- 'sign'=>1,
117		- 'device_id'=>'W10',
	116	+ 'sign'=>1,
	117	+ 'device_id'=>'W10',
118	118	'args' => 'gl',
119		- 'mime'=>'application/x-dosexec',
120		- ],
121		- ],
	119	+ 'mime'=>'application/x-dosexec',
	120	+ ],
	121	+ ],
122	122
123		- 'w8'=>[
124		- 'group' => "microsoft",
125		- 'display'=>_("MS Windows 8, 8.1"),
126		- 'match'=>'Windows NT 6[._][23]',
127		- 'directory'=>'ms',
128		- 'module'=>'W8_10',
129		- 'signer'=>'ms_windows_sign',
	123	+ 'w8'=>[
	124	+ 'group' => "microsoft",
	125	+ 'display'=>_("MS Windows 8, 8.1"),
	126	+ 'match'=>'Windows NT 6[._][23]',
	127	+ 'directory'=>'ms',
	128	+ 'module'=>'W8_10',
	129	+ 'signer'=>'ms_windows_sign',
130	130	'options'=>[
131		- 'sign'=>1,
132		- 'device_id'=>'W8',
133		- 'mime'=>'application/x-dosexec',
134		- ],
135		- ],
	131	+ 'sign'=>1,
	132	+ 'device_id'=>'W8',
	133	+ 'mime'=>'application/x-dosexec',
	134	+ ],
	135	+ ],
136	136
137		- 'w7'=>[
138		- 'group' => "microsoft",
139		- 'display'=>_("MS Windows 7"),
140		- 'match'=>'Windows NT 6[._]1',
141		- 'directory'=>'ms',
142		- 'module'=>'Vista7',
143		- 'signer'=>'ms_windows_sign',
	137	+ 'w7'=>[
	138	+ 'group' => "microsoft",
	139	+ 'display'=>_("MS Windows 7"),
	140	+ 'match'=>'Windows NT 6[._]1',
	141	+ 'directory'=>'ms',
	142	+ 'module'=>'Vista7',
	143	+ 'signer'=>'ms_windows_sign',
144	144	'options'=>[
145		- 'sign'=>1,
146		- 'device_id'=>'W7',
147		- 'mime'=>'application/x-dosexec',
148		- ],
149		- ],
	145	+ 'sign'=>1,
	146	+ 'device_id'=>'W7',
	147	+ 'mime'=>'application/x-dosexec',
	148	+ ],
	149	+ ],
150	150
151		- 'vista'=>[
152		- 'group' => "microsoft",
153		- 'display'=>_("MS Windows Vista"),
154		- 'match'=>'Windows NT 6[._]0',
155		- 'directory'=>'ms',
156		- 'module'=>'Vista7',
157		- 'signer'=>'ms_windows_sign',
	151	+ 'vista'=>[
	152	+ 'group' => "microsoft",
	153	+ 'display'=>_("MS Windows Vista"),
	154	+ 'match'=>'Windows NT 6[._]0',
	155	+ 'directory'=>'ms',
	156	+ 'module'=>'Vista7',
	157	+ 'signer'=>'ms_windows_sign',
158	158	'options'=>[
159		- 'sign'=>1,
160		- 'device_id'=>'Vista',
161		- 'mime'=>'application/x-dosexec',
162		- ],
163		- ],
	159	+ 'sign'=>1,
	160	+ 'device_id'=>'Vista',
	161	+ 'mime'=>'application/x-dosexec',
	162	+ ],
	163	+ ],
164	164
165		- 'win-rt'=>[
	165	+ 'win-rt'=>[
166	166	'group' => "microsoft",
167	167	'display'=>_("Windows RT"),
168	168	'directory'=>'redirect_dev',
169	169	'module'=>'RedirectDev',
170	170	'options'=>[
171		- 'hidden'=>0,
172		- 'redirect'=>1,
173		- ],
174		- ],
	171	+ 'hidden'=>0,
	172	+ 'redirect'=>1,
	173	+ ],
	174	+ ],
175	175
176	176
177		- 'apple_hi_sierra'=>array(
	177	+ 'apple_hi_sierra'=>array(
178	178	'group' => "apple",
179	179	'display'=>_("Apple macOS High Sierra"),
180	180	'match'=>'Mac OS X 10[._]13',
		@@ -182,14 +182,14 @@ discard block
		block discarded – undo
182	182	'module'=>'mobileconfig_os_x',
183	183	'signer'=>'mobileconfig_sign',
184	184	'options'=>array(
185		- 'sign'=>1,
186		- 'device_id'=>'OS_X',
187		- 'mime'=>'application/x-apple-aspen-config',
188		- ),
	185	+ 'sign'=>1,
	186	+ 'device_id'=>'OS_X',
	187	+ 'mime'=>'application/x-apple-aspen-config',
	188	+ ),
189	189	),
190	190
191	191
192		- 'apple_sierra'=>array(
	192	+ 'apple_sierra'=>array(
193	193	'group' => "apple",
194	194	'display'=>_("Apple macOS Sierra"),
195	195	'match'=>'Mac OS X 10[._]12',
		@@ -197,14 +197,14 @@ discard block
		block discarded – undo
197	197	'module'=>'mobileconfig_os_x',
198	198	'signer'=>'mobileconfig_sign',
199	199	'options'=>array(
200		- 'sign'=>1,
201		- 'device_id'=>'OS_X',
202		- 'mime'=>'application/x-apple-aspen-config',
203		- ),
	200	+ 'sign'=>1,
	201	+ 'device_id'=>'OS_X',
	202	+ 'mime'=>'application/x-apple-aspen-config',
	203	+ ),
204	204	),
205	205
206	206
207		- 'apple_el_cap'=>[
	207	+ 'apple_el_cap'=>[
208	208	'group' => "apple",
209	209	'display'=>_("Apple OS X El Capitan"),
210	210	'match'=>'Mac OS X 10[._]11',
		@@ -212,13 +212,13 @@ discard block
		block discarded – undo
212	212	'module'=>'mobileconfig_os_x',
213	213	'signer'=>'mobileconfig_sign',
214	214	'options'=>array(
215		- 'sign'=>1,
216		- 'device_id'=>'OS_X',
217		- 'mime'=>'application/x-apple-aspen-config',
218		- ),
	215	+ 'sign'=>1,
	216	+ 'device_id'=>'OS_X',
	217	+ 'mime'=>'application/x-apple-aspen-config',
	218	+ ),
219	219	],
220	220
221		- 'apple_yos'=>[
	221	+ 'apple_yos'=>[
222	222	'group' => "apple",
223	223	'display'=>_("Apple OS X Yosemite"),
224	224	'match'=>'Mac OS X 10[._]10',
		@@ -226,13 +226,13 @@ discard block
		block discarded – undo
226	226	'module'=>'mobileconfig_os_x',
227	227	'signer'=>'mobileconfig_sign',
228	228	'options'=>[
229		- 'sign'=>1,
230		- 'device_id'=>'OS_X',
231		- 'mime'=>'application/x-apple-aspen-config',
232		- ],
	229	+ 'sign'=>1,
	230	+ 'device_id'=>'OS_X',
	231	+ 'mime'=>'application/x-apple-aspen-config',
	232	+ ],
233	233	],
234	234
235		- 'apple_mav'=>[
	235	+ 'apple_mav'=>[
236	236	'group' => "apple",
237	237	'display'=>_("Apple OS X Mavericks"),
238	238	'match'=>'Mac OS X 10[._]9',
		@@ -240,13 +240,13 @@ discard block
		block discarded – undo
240	240	'module'=>'mobileconfig_os_x',
241	241	'signer'=>'mobileconfig_sign',
242	242	'options'=>[
243		- 'sign'=>1,
244		- 'device_id'=>'OS_X',
245		- 'mime'=>'application/x-apple-aspen-config',
246		- ],
	243	+ 'sign'=>1,
	244	+ 'device_id'=>'OS_X',
	245	+ 'mime'=>'application/x-apple-aspen-config',
	246	+ ],
247	247	],
248	248
249		- 'apple_m_lion'=>[
	249	+ 'apple_m_lion'=>[
250	250	'group' => "apple",
251	251	'display'=>_("Apple OS X Mountain Lion"),
252	252	'match'=>'Mac OS X 10[._]8',
		@@ -254,13 +254,13 @@ discard block
		block discarded – undo
254	254	'module'=>'mobileconfig_os_x',
255	255	'signer'=>'mobileconfig_sign',
256	256	'options'=>[
257		- 'sign'=>1,
258		- 'device_id'=>'OS_X',
259		- 'mime'=>'application/x-apple-aspen-config',
260		- ],
	257	+ 'sign'=>1,
	258	+ 'device_id'=>'OS_X',
	259	+ 'mime'=>'application/x-apple-aspen-config',
	260	+ ],
261	261	],
262	262
263		- 'apple_lion'=>[
	263	+ 'apple_lion'=>[
264	264	'group' => "apple",
265	265	'display'=>_("Apple OS X Lion"),
266	266	'match'=>'Mac OS X 10[._]7',
		@@ -268,13 +268,13 @@ discard block
		block discarded – undo
268	268	'module'=>'mobileconfig_os_x',
269	269	'signer'=>'mobileconfig_sign',
270	270	'options'=>[
271		- 'sign'=>1,
272		- 'device_id'=>'OS_X',
273		- 'mime'=>'application/x-apple-aspen-config',
274		- ],
	271	+ 'sign'=>1,
	272	+ 'device_id'=>'OS_X',
	273	+ 'mime'=>'application/x-apple-aspen-config',
	274	+ ],
275	275	],
276	276
277		- 'mobileconfig'=>[
	277	+ 'mobileconfig'=>[
278	278	'group' => "apple",
279	279	'display'=>_("Apple iOS mobile devices"),
280	280	'match'=>'(iPad\|iPhone\|iPod);.*OS ([7-9]\|1[0-5])_',
		@@ -282,13 +282,13 @@ discard block
		block discarded – undo
282	282	'module'=>'mobileconfig_ios',
283	283	'signer'=>'mobileconfig_sign',
284	284	'options'=>[
285		- 'sign'=>1,
286		- 'device_id'=>'iOS',
287		- 'mime'=>'application/x-apple-aspen-config',
288		- ],
	285	+ 'sign'=>1,
	286	+ 'device_id'=>'iOS',
	287	+ 'mime'=>'application/x-apple-aspen-config',
	288	+ ],
289	289	],
290	290
291		- 'mobileconfig-56'=>[
	291	+ 'mobileconfig-56'=>[
292	292	'group' => "apple",
293	293	'display'=>_("Apple iOS mobile devices (iOS 5 and 6)"),
294	294	'match'=>'(iPad\|iPhone\|iPod);.*OS [56]_',
		@@ -296,132 +296,132 @@ discard block
		block discarded – undo
296	296	'module'=>'mobileconfig_ios_56',
297	297	'signer'=>'mobileconfig_sign',
298	298	'options'=>[
299		- 'sign'=>1,
300		- 'device_id'=>'iOS',
301		- 'mime'=>'application/x-apple-aspen-config',
302		- ],
	299	+ 'sign'=>1,
	300	+ 'device_id'=>'iOS',
	301	+ 'mime'=>'application/x-apple-aspen-config',
	302	+ ],
303	303	],
304	304
305	305
306		- 'linux'=>[
307		- 'group' => "linux",
308		- 'display'=>_("Linux"),
309		- 'match'=>'Linux(?!.*Android)',
310		- 'directory'=>'linux',
311		- 'module' => 'Linux',
312		- 'options'=>[
313		- 'mime'=>'application/x-sh',
314		- ],
315		- ],
	306	+ 'linux'=>[
	307	+ 'group' => "linux",
	308	+ 'display'=>_("Linux"),
	309	+ 'match'=>'Linux(?!.*Android)',
	310	+ 'directory'=>'linux',
	311	+ 'module' => 'Linux',
	312	+ 'options'=>[
	313	+ 'mime'=>'application/x-sh',
	314	+ ],
	315	+ ],
316	316
317		- 'chromeos'=>[
	317	+ 'chromeos'=>[
318	318	'group' => "chrome",
319	319	'display'=>_("Chrome OS"),
320	320	'match'=>'CrOS',
321	321	'directory'=>'chromebook',
322	322	'module'=>'chromebook',
323	323	'options'=>[
324		- 'mime'=>'application/x-onc',
325		- 'message'=>sprintf(_("After downloading the file, open the Chrome browser and browse to this URL: <a href='chrome://net-internals/#chromeos'>chrome://net-internals/#chromeos</a>. Then, use the 'Import ONC file' button. The import is silent; the new network definitions will be added to the preferred networks.")),
326		- ],
327		- ],
	324	+ 'mime'=>'application/x-onc',
	325	+ 'message'=>sprintf(_("After downloading the file, open the Chrome browser and browse to this URL: <a href='chrome://net-internals/#chromeos'>chrome://net-internals/#chromeos</a>. Then, use the 'Import ONC file' button. The import is silent; the new network definitions will be added to the preferred networks.")),
	326	+ ],
	327	+ ],
328	328
329		- 'android_marshmallow'=>[
	329	+ 'android_marshmallow'=>[
330	330	'group' => "android",
331	331	'display'=>_("Android 6.0 Marshmallow"),
332		- 'match'=>'Android 6\.[0-9]',
	332	+ 'match'=>'Android 6\.[0-9]',
333	333	'directory'=>'xml',
334	334	'module'=>'Lollipop',
335	335	'options'=>[
336		- 'mime'=>'application/eap-config',
337		- 'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
	336	+ 'mime'=>'application/eap-config',
	337	+ 'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
338	338	"eduroamCAT",
339	339	"<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
340	340	"<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
341	341	"<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
342		- ],
343		- ],
	342	+ ],
	343	+ ],
344	344
345		- 'android_lollipop'=>[
	345	+ 'android_lollipop'=>[
346	346	'group' => "android",
347	347	'display'=>_("Android 5.0 Lollipop"),
348		- 'match'=>'Android 5\.[0-9]',
	348	+ 'match'=>'Android 5\.[0-9]',
349	349	'directory'=>'xml',
350	350	'module'=>'Lollipop',
351	351	'options'=>[
352		- 'mime'=>'application/eap-config',
353		- 'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
	352	+ 'mime'=>'application/eap-config',
	353	+ 'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
354	354	"eduroamCAT",
355	355	"<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
356	356	"<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
357	357	"<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
358		- ],
359		- ],
	358	+ ],
	359	+ ],
360	360
361		- 'android_kitkat'=>[
	361	+ 'android_kitkat'=>[
362	362	'group' => "android",
363	363	'display'=>_("Android 4.4 KitKat"),
364		- 'match'=>'Android 4\.[4-9]',
	364	+ 'match'=>'Android 4\.[4-9]',
365	365	'directory'=>'xml',
366	366	'module'=>'KitKat',
367	367	'options'=>[
368		- 'mime'=>'application/eap-config',
369		- 'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
	368	+ 'mime'=>'application/eap-config',
	369	+ 'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
370	370	"eduroamCAT",
371	371	"<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
372	372	"<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
373	373	"<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
374		- ],
375		- ],
	374	+ ],
	375	+ ],
376	376
377	377
378		- 'android_43'=>[
	378	+ 'android_43'=>[
379	379	'group' => "android",
380	380	'display'=>_("Android 4.3"),
381		- 'match'=>'Android 4\.3',
	381	+ 'match'=>'Android 4\.3',
382	382	'directory'=>'xml',
383	383	'module'=>'KitKat',
384	384	'options'=>[
385		- 'mime'=>'application/eap-config',
386		- 'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
	385	+ 'mime'=>'application/eap-config',
	386	+ 'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
387	387	"eduroamCAT",
388	388	"<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
389	389	"<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
390	390	"<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
391		- ],
392		- ],
	391	+ ],
	392	+ ],
393	393
394		- 'android_legacy'=>[
395		- 'group' => "android",
396		- 'display'=>_("Android"),
397		- 'match'=>'Android',
398		- 'directory'=>'redirect_dev',
399		- 'module'=>'RedirectDev',
400		- 'options'=>[
401		- 'redirect'=>1,
402		- ],
403		- ],
	394	+ 'android_legacy'=>[
	395	+ 'group' => "android",
	396	+ 'display'=>_("Android"),
	397	+ 'match'=>'Android',
	398	+ 'directory'=>'redirect_dev',
	399	+ 'module'=>'RedirectDev',
	400	+ 'options'=>[
	401	+ 'redirect'=>1,
	402	+ ],
	403	+ ],
404	404
405		- 'eap-config'=>[
	405	+ 'eap-config'=>[
406	406	'group' => "eap-config",
407	407	'display'=>_("EAP config"),
408	408	'directory'=>'xml',
409	409	'module'=>'XML_ALL',
410	410	'options'=>[
411		- 'mime'=>'application/eap-config',
412		- 'message'=>sprintf(_("This option provides a generic EAP config XML file, which can be consumed by dedicated applications like eduroamCAT for Android and Linux platforms. This is still an experimental feature.")),
413		- ],
	411	+ 'mime'=>'application/eap-config',
	412	+ 'message'=>sprintf(_("This option provides a generic EAP config XML file, which can be consumed by dedicated applications like eduroamCAT for Android and Linux platforms. This is still an experimental feature.")),
	413	+ ],
414	414	],
415	415
416		- 'test'=>[
	416	+ 'test'=>[
417	417	'group' => "other",
418	418	'display'=>_("Test"),
419	419	'directory'=>'test_module',
420	420	'module'=>'TestModule',
421	421	'options'=>[
422		- 'hidden'=>1,
423		- ],
424		- ],
	422	+ 'hidden'=>1,
	423	+ ],
	424	+ ],
425	425
426	426
427	427	/*

		@@ -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:

		@@ -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();

		@@ -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");

		@@ -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.

		@@ -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	}

		@@ -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>

GEANT / CAT

Push — master ( 30d070...476e2a )

Status

Category

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Indentation +159 added lines, -159 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +21 added lines, -21 removed lines patch added patch discarded remove patch