GEANT / CAT

web/copyright.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
         <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>';

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

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
    font-size:25px;
    font-size:5vw;
    width: 100%;
-   background: <?php echo $colour2;?>;
+   background: <?php echo $colour2; ?>;
    color: #ffffff;
 }
 
@@ -48,7 +48,7 @@ 
    font-size:25px;
    font-size:5vw;
    width: 100%;
-   background: <?php echo $colour2;?>;
+   background: <?php echo $colour2; ?>;
    color: #ffffff;
    border-radius:10px ; 
    border-radius:2vw ; 

web/skins/classic/user/js/roll.php

Indentation +6 added lines, -7 removed lines

@@ -68,13 +68,12 @@
 
 <?php
 /**
-  * The OS object holds operating system descriptions
-  * @param name is the main title
-  * @param subtitle - the subtitle
-  * @param path - the path to the scriin-dump image
-  * @param signed - if true show information that the module is signed
-    
-*/
+ * The OS object holds operating system descriptions
+ * @param name is the main title
+ * @param subtitle - the subtitle
+ * @param path - the path to the scriin-dump image
+ * @param signed - if true show information that the module is signed
+ */
 ?>
 
 function OS(name, subtitle, path, signed) {

Spacing +6 added lines, -6 removed lines

@@ -128,12 +128,12 @@
  */
 ?>
 
-var win8 = new OS('<?php echo _("MS Windows")?>', '<?php echo _("10, 8, 7, Vista") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-win8-english-h234.png");?>",true);
-var mac = new OS('<?php echo _("Apple OS X")?>','10.7+',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-mac-english-h234.png");?>",true);
-var android = new OS('<?php echo _("Android")?>','<?php echo _("4.3+") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-android-english-h234.png");?>",false);
-var iphone = new OS('<?php echo _("Apple iOS devices")?>','<?php echo _("iPhone, iPad, iPod touch") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-iphone-english-h234.png");?>",true);
-var linux = new OS('<?php echo _("Linux")?>','<?php echo _("all major distributions") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-linux-english-h234.png");?>",false);
-var chromeos = new OS('<?php echo _("Chrome OS")?>','',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-chromeos-english-h234.png");?>",false);
+var win8 = new OS('<?php echo _("MS Windows")?>', '<?php echo _("10, 8, 7, Vista") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-win8-english-h234.png"); ?>",true);
+var mac = new OS('<?php echo _("Apple OS X")?>','10.7+',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-mac-english-h234.png"); ?>",true);
+var android = new OS('<?php echo _("Android")?>','<?php echo _("4.3+") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-android-english-h234.png"); ?>",false);
+var iphone = new OS('<?php echo _("Apple iOS devices")?>','<?php echo _("iPhone, iPad, iPod touch") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-iphone-english-h234.png"); ?>",true);
+var linux = new OS('<?php echo _("Linux")?>','<?php echo _("all major distributions") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-linux-english-h234.png"); ?>",false);
+var chromeos = new OS('<?php echo _("Chrome OS")?>','',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-chromeos-english-h234.png"); ?>",false);
 
 
 

web/tou.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
     <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">

devices/test_module/Device_TestModule.php

Spacing +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
      * return string
      */
     private function zipInstaller($attr) {
-        if (count($attr)==0) {
+        if (count($attr) == 0) {
             // never mind, just checking. You CAN use the $attr array to extract
             // information about the IdP/Profile if there's a need
         }

devices/Devices-template.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
  * 
  * @package ModuleWriting
  */
-class Devices{
+class Devices {
 
 /**
  * This array lists available configuration options for local device management.
@@ -54,7 +54,7 @@ 
  *         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 @@ 
                             "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 @@ 
                             "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 @@ 
                             "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 @@ 
                             "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>"),
       ],
    ],
 

Indentation +159 added lines, -159 removed lines

@@ -59,10 +59,10 @@ 
  */
 
 public static $Options=[
-  'sign'=>0,
-  'no_cache'=>0,
-  'hidden'=>0,
-  'redirect'=>0,
+    'sign'=>0,
+    'no_cache'=>0,
+    'hidden'=>0,
+    'redirect'=>0,
 ];
 
 /**
@@ -100,75 +100,75 @@ 
 
 public static function listDevices() {
     return [
- 'w10'=>[
-   'group' => "microsoft",
-   'display'=>_("MS Windows 10"),
-   'match'=>'Windows NT 10',
-   'directory'=>'ms',
-   'module'=>'W10',
-   'signer'=>'ms_windows_sign',
+    'w10'=>[
+    'group' => "microsoft",
+    'display'=>_("MS Windows 10"),
+    'match'=>'Windows NT 10',
+    'directory'=>'ms',
+    'module'=>'W10',
+    'signer'=>'ms_windows_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'W10',
-       'mime'=>'application/x-dosexec',
-      ],
-   ],
+        'sign'=>1,
+        'device_id'=>'W10',
+        'mime'=>'application/x-dosexec',
+        ],
+    ],
 	
- 'w8'=>[
-   'group' => "microsoft",
-   'display'=>_("MS Windows 8, 8.1"),
-   'match'=>'Windows NT 6[._][23]',
-   'directory'=>'ms',
-   'module'=>'W8',
-   'signer'=>'ms_windows_sign',
+    'w8'=>[
+    'group' => "microsoft",
+    'display'=>_("MS Windows 8, 8.1"),
+    'match'=>'Windows NT 6[._][23]',
+    'directory'=>'ms',
+    'module'=>'W8',
+    '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',
@@ -176,14 +176,14 @@ 
     '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',
@@ -191,14 +191,14 @@ 
     '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',
@@ -206,13 +206,13 @@ 
     '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',
@@ -220,13 +220,13 @@ 
     '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',
@@ -234,13 +234,13 @@ 
     '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',
@@ -248,13 +248,13 @@ 
     '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',
@@ -262,13 +262,13 @@ 
     '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])_',
@@ -276,13 +276,13 @@ 
     '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]_',
@@ -290,132 +290,132 @@ 
     '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,
+        ],
+    ],
 
 
 /*    

devices/ms/Files/geant_link.inc

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
   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 @@ 
   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:

devices/xml/XML.inc.php

Spacing +1 added lines, -1 removed lines

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

core/DeviceFactory.php

Spacing +1 added lines, -1 removed lines

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