GEANT / CAT

core/common/Logging.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 namespace core\common;
 use \Exception;
 
-require_once(dirname(dirname(__DIR__))."/config/_config.php");
+require_once(dirname(dirname(__DIR__)) . "/config/_config.php");
 
 class Logging {
 
@@ -86,7 +86,7 @@ 
                 echo " ($category) ";
                 echo " " . $user . ": ";
                 if (is_string($message)) {
-                    echo $message ."\n";
+                    echo $message . "\n";
                 } else {
                     echo var_export($message);
                 }

devices/xml/Device_XML.php

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
  * @package ModuleWriting
  */
 namespace devices\xml;
-require_once(dirname(__FILE__).'/XML.inc.php');
+require_once(dirname(__FILE__) . '/XML.inc.php');
 
 /**
  * This class implements full functionality of the generic XML device
@@ -154,7 +154,7 @@ 
         $objs = [];
         if ($this->langScope === 'global') {
             foreach ($attributeList['langs'] as $language => $value) {
-                $language = ( $language === 'C' ? 'any' : $language );
+                $language = ($language === 'C' ? 'any' : $language);
                 $obj = new $className();
                 $obj->setValue($value);
                 $obj->setAttributes(['lang' => $language]);
@@ -178,7 +178,7 @@ 
                 $profileNameLangs = $attr['profile:name']['langs'];
             }
             foreach ($instNameLangs as $language => $value) {
-                $language = ( $language === 'C' ? 'any' : $language );
+                $language = ($language === 'C' ? 'any' : $language);
                 $displayname = new DisplayName();
                 if (isset($profileNameLangs)) {
                     $langOrC = isset($profileNameLangs[$language]) ? $profileNameLangs[$language] : $profileNameLangs['C'];
@@ -351,7 +351,7 @@ 
             $clientCertificateObject->setValue(base64_encode($this->clientCert["certdata"]));
             $clientCertificateObject->setAttributes(['format' => 'PKCS12', 'encoding' => 'base64']);
             
-            $clientsidecredential->setProperty('ClientCertificate',$clientCertificateObject);
+            $clientsidecredential->setProperty('ClientCertificate', $clientCertificateObject);
         }
         
         $authmethod->setProperty('ClientSideCredential', $clientsidecredential);

web/lib/admin/view/TermsOfUseBox.php

Spacing +11 added lines, -11 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class TermsOfUseBox extends AbstractDialogBox{
+class TermsOfUseBox extends AbstractDialogBox {
     
     private $command = '';
     private $parameter = '';
@@ -28,28 +28,28 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\view\AbstractDialogBox::renderContent()
      */
-    public function renderContent(){
+    public function renderContent() {
         ?>
         <hr>
         <h2>Product Definition</h2>
-        <p><?php echo \core\ProfileSilverbullet::PRODUCTNAME;?> outsources the technical setup of <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'] ." ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?> functions to the <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'];?> Operations Team. The system includes</p>
+        <p><?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?> outsources the technical setup of <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'] . " " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?> functions to the <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']; ?> Operations Team. The system includes</p>
             <ul>
                 <li>a web-based user management interface where user accounts and access credentials can be created and revoked (there is a limit to the number of active users)</li>
                 <li>a technical infrastructure ("CA") which issues and revokes credentials</li>
-                <li>a technical infrastructure ("RADIUS") which verifies access credentials and subsequently grants access to <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'];?></li>
-                <li><span style='color: red;'>TBD: a lookup/notification system which informs you of network abuse complaints by <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'];?> Service Providers that pertain to your users</span></li>
+                <li>a technical infrastructure ("RADIUS") which verifies access credentials and subsequently grants access to <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']; ?></li>
+                <li><span style='color: red;'>TBD: a lookup/notification system which informs you of network abuse complaints by <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']; ?> Service Providers that pertain to your users</span></li>
             </ul>
         <h2>User Account Liability</h2>
-        <p>As an <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'] ." ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?> administrator using this system, you are authorized to create user accounts according to your local <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] ?> policy. You are fully responsible for the accounts you issue. In particular, you</p>
+        <p>As an <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'] . " " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?> administrator using this system, you are authorized to create user accounts according to your local <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] ?> policy. You are fully responsible for the accounts you issue. In particular, you</p>
         <ul>
-            <li>only issue accounts to members of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?>, as defined by your local policy.</li>
+            <li>only issue accounts to members of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?>, as defined by your local policy.</li>
             <li>must make sure that all accounts that you issue can be linked by you to actual human end users</li>
-            <li>have to immediately revoke accounts of users when they leave or otherwise stop being a member of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?></li>
+            <li>have to immediately revoke accounts of users when they leave or otherwise stop being a member of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?></li>
             <li>will act upon notifications about possible network abuse by your users and will appropriately sanction them</li>
         </ul>
-        <p>Failure to comply with these requirements may lead to the deletion of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?> (and all the users you create inside) in this system.</p>
+        <p>Failure to comply with these requirements may lead to the deletion of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?> (and all the users you create inside) in this system.</p>
         <h2>Privacy</h2>
-        <p>With <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>, we are not interested in and strive not to collect any personally identifiable information about the end users you create. To that end,</p>
+        <p>With <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>, we are not interested in and strive not to collect any personally identifiable information about the end users you create. To that end,</p>
         <ul>
             <li>the usernames you create in the system are not expected to be human-readable identifiers of actual humans. We encourage you to create usernames like 'hr-user-12' rather than 'Jane Doe, Human Resources Department'. You are the only one who needs to be able to make a link to the human behind the identifiers you create.</li>
             <li>the identifiers in the credentials we create are not linked to the usernames you add to the system; they are pseudonyms.</li>
@@ -64,7 +64,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\view\AbstractDialogBox::renderControls()
      */
-    public function renderControls(){
+    public function renderControls() {
         ?>
         <div style="position: relative; padding-bottom: 5px;">
             <input type="checkbox" name="<?php echo $this->parameter; ?>" value="true"> <label>I have read and agree to the terms.</label>

web/skins/classic/index.php

Spacing +6 added lines, -6 removed lines

@@ -60,11 +60,11 @@ 
 
 $deco = new \web\lib\admin\PageDecoration();
 ?>
-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
 <!-- JQuery -->
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate-1.2.1.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate-1.2.1.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script>
 <!-- JQuery -->
 <script type="text/javascript">
     if (screen.width <= 480) {
@@ -106,7 +106,7 @@ 
     <div id="heading">
         <?php
         print '<img src="' . $Gui->skinObject->findResourceUrl("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(_("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>';
@@ -160,7 +160,7 @@ 
                                             <span id="line1"><?php printf(_("%s installation made easy:"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) ?></span>
                                             <span id="line2"></span>
                                             <span id="line3"></span>
-                                            <span id="line4"><?php echo sprintf(_("Custom built for your %s"),$Gui->nomenclature_inst) ?></span>
+                                            <span id="line4"><?php echo sprintf(_("Custom built for your %s"), $Gui->nomenclature_inst) ?></span>
                                             <span id="line5">
                                                 <?php
                                                 if (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "") {

web/user/faq.php

Spacing +5 added lines, -5 removed lines

@@ -12,11 +12,11 @@ 
 
 array_push($FAQ, [
     'title' => sprintf(_("My %s is not listed. Can't I just use any of the other ones?"), $skinObject->nomenclature_inst),
-    'text' => sprintf(_("No! The installers contain security settings which are specific to the %s. If you are not from that %s, your computer will detect that you are about to send your username and credential to an unauthorised server and will abort the login. Using a different %s installer is <i>guaranteed to not work</i>!"),$skinObject->nomenclature_inst,$skinObject->nomenclature_inst,$skinObject->nomenclature_inst)
+    'text' => sprintf(_("No! The installers contain security settings which are specific to the %s. If you are not from that %s, your computer will detect that you are about to send your username and credential to an unauthorised server and will abort the login. Using a different %s installer is <i>guaranteed to not work</i>!"), $skinObject->nomenclature_inst, $skinObject->nomenclature_inst, $skinObject->nomenclature_inst)
 ]);
 
 array_push($FAQ, [
-    'title' => sprintf(_("What can I do to get my %s listed?"),$skinObject->nomenclature_inst),
+    'title' => sprintf(_("What can I do to get my %s listed?"), $skinObject->nomenclature_inst),
     'text' => sprintf(_("Contact %s administrators at your %s and complain. It will take at most one hour of their time to get things done."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $skinObject->nomenclature_inst)
 ]);
 
@@ -32,14 +32,14 @@ 
 
 if (CONFIG_CONFASSISTANT['CONSORTIUM']['name'] == "eduroam") {
     array_push($FAQ, [
-        'title' => sprintf(_("What is this %s thing anyway?"),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
-        'text' => sprintf(_("%s is a global WiFi roaming consortium which gives members of education and research access to the internet <i>for free</i> on all %s hotspots on the planet. There are several million %s users already, enjoying free internet access on more than 6.000 hotspots! Visit <a href='http://www.eduroam.org'>the %s homepage</a> for more details."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'],CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'],CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'],CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
+        'title' => sprintf(_("What is this %s thing anyway?"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
+        'text' => sprintf(_("%s is a global WiFi roaming consortium which gives members of education and research access to the internet <i>for free</i> on all %s hotspots on the planet. There are several million %s users already, enjoying free internet access on more than 6.000 hotspots! Visit <a href='http://www.eduroam.org'>the %s homepage</a> for more details."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
     ]);
 }
 
 array_push($FAQ, [
     'title' => sprintf(_("Is it safe to use %s installers?"), CONFIG['APPEARANCE']['productname']),
-    'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), CONFIG['APPEARANCE']['productname']) . ' ' . ( isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), CONFIG['APPEARANCE']['productname'], CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) : ""),
+    'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), CONFIG['APPEARANCE']['productname']) . ' ' . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), CONFIG['APPEARANCE']['productname'], CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) : ""),
 ]);
 
 array_push($FAQ, [

core/UserAPI.php

Doc Comments +5 added lines, -1 removed lines

@@ -125,6 +125,7 @@ 
      * 
      * @param string $device
      * @param AbstractProfile $profile
+     * @param string $generatedFor
      * @return array info about the new installer (mime and link)
      */
     private function generateNewInstaller($device, $profile, $generatedFor, $token, $password) {
@@ -459,6 +460,10 @@ 
         readfile($file);
     }
 
+    /**
+     * @param string $destFile
+     * @param integer $resize
+     */
     private function processImage($inputImage, $destFile, $width, $height, $resize) {
         $info = new \finfo();
         $filetype = $info->buffer($inputImage, FILEINFO_MIME_TYPE);
@@ -485,7 +490,6 @@ 
      * When called for DiscoJuice, first check if file cache exists
      * If not then generate the file and save it in the cache
      * @param int $idp IdP identifier
-     * @param int $disco flag turning on image generation for DiscoJuice
      * @param int $width maximum width of the generated image 
      * @param int $height  maximum height of the generated image
      * if one of these is 0 then it is treated as no upper bound

Spacing +5 added lines, -5 removed lines

@@ -176,7 +176,7 @@ 
             if (isset($deviceProperties['options']['hidden']) && $deviceProperties['options']['hidden'] && $showHidden == 0) {
                 continue;
             }
-            $count ++;
+            $count++;
 
             $deviceProperties['device'] = $device;
 
@@ -563,7 +563,7 @@ 
     }
 
 
-    public function sendLogo($identifier, $type, $width = 0, $height = 0){
+    public function sendLogo($identifier, $type, $width = 0, $height = 0) {
         if ($type === "federation") {
             $logo = $this->getFedLogo($identifier, $width, $height);
         }
@@ -581,7 +581,7 @@ 
             return ['status' => 'error', 'error' => 'Function for GEOIPv1 called, but config says this is not the version to use!'];
         }
         //$host = $_SERVER['REMOTE_ADDR'];
-        $host = input_filter(INPUT_SERVER,'REMOTE_ADDR',FILTER_VALIDATE_IP);
+        $host = input_filter(INPUT_SERVER, 'REMOTE_ADDR', FILTER_VALIDATE_IP);
         $record = geoip_record_by_name($host);
         if ($record === FALSE) {
             return ['status' => 'error', 'error' => 'Problem listing countries'];
@@ -743,12 +743,12 @@ 
                     $this->loggerInstance->debug(4, "Browser_id: $dev_id\n");
                     return(['device' => $dev_id, 'display' => $device['display'], 'group' => $device['group']]);
                 } else {
-                    $this->loggerInstance->debug(2, "Unrecognised system: " . filter_input(INPUT_SERVER,'HTTP_USER_AGENT', FILTER_SANITIZE_STRING) . "\n");
+                    $this->loggerInstance->debug(2, "Unrecognised system: " . filter_input(INPUT_SERVER, 'HTTP_USER_AGENT', FILTER_SANITIZE_STRING) . "\n");
                     return(false);
                 }
             }
         }
-        $this->loggerInstance->debug(2, "Unrecognised system: " . filter_input(INPUT_SERVER,'HTTP_USER_AGENT', FILTER_SANITIZE_STRING) . "\n");
+        $this->loggerInstance->debug(2, "Unrecognised system: " . filter_input(INPUT_SERVER, 'HTTP_USER_AGENT', FILTER_SANITIZE_STRING) . "\n");
         return(false);
     }
 

core/DeviceConfig.php

Doc Comments +6 added lines

@@ -260,6 +260,9 @@ 
         return _("Sorry, this should not happen - no additional information is available");
     }
     
+    /**
+     * @param string $file
+     */
     private function findSourceFile($file) {
         if (is_file($this->module_path . '/Files/' . $this->device_id . '/' . $file)) {
             return $this->module_path . '/Files/' . $this->device_id . '/' . $file;
@@ -540,6 +543,9 @@ 
         'application/pdf' => 'pdf',
     ];
 
+    /**
+     * @param string $type
+     */
     private function saveLogoFile($logos,$type) {
         $iterator = 0;
         $returnarray = [];

Spacing +2 added lines, -2 removed lines

@@ -212,7 +212,7 @@ 
         }
         if (isset($this->attributes['general:logo_file'])) {
             $this->loggerInstance->debug(5, "saving IDP logo\n");
-            $this->attributes['internal:logo_file'] = $this->saveLogoFile($this->attributes['general:logo_file'],'idp');
+            $this->attributes['internal:logo_file'] = $this->saveLogoFile($this->attributes['general:logo_file'], 'idp');
         }
         if (isset($this->attributes['fed:logo_file'])) {
             $this->loggerInstance->debug(5, "saving FED logo\n");
@@ -540,7 +540,7 @@ 
         'application/pdf' => 'pdf',
     ];
 
-    private function saveLogoFile($logos,$type) {
+    private function saveLogoFile($logos, $type) {
         $iterator = 0;
         $returnarray = [];
         foreach ($logos as $blob) {

schema/1_1-1_2-script.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 
 while ($oneAttrib = mysqli_fetch_object($idpWideOptionsQuery)) {
     if (!isset($profiles[$oneAttrib->institution_id])) {
-        $idp = new \core\IdP((int)$oneAttrib->institution_id);
+        $idp = new \core\IdP((int) $oneAttrib->institution_id);
         $profiles[$oneAttrib->institution_id] = ['IdP' => $idp, 'Profiles' => $idp->listProfiles()];
         echo "Debug: IdP " . $idp->identifier . " has profiles ";
         foreach ($profiles[$oneAttrib->institution_id]['Profiles'] as $oneProfileObject) {

devices/ms/Device_W10.php

Braces +5 added lines, -4 removed lines

@@ -297,10 +297,11 @@
 <allow-save>true</allow-save>
 ';
                 if ($use_anon == 1) {
-                    if ($outer_user == '')
-                        $profileFileCont .= '<AnonymousIdentity>@</AnonymousIdentity>';
-                    else
-                        $profileFileCont .= '<AnonymousIdentity>' . $outer_id . '</AnonymousIdentity>';
+                    if ($outer_user == '') {
+                                            $profileFileCont .= '<AnonymousIdentity>@</AnonymousIdentity>';
+                    } else {
+                                            $profileFileCont .= '<AnonymousIdentity>' . $outer_id . '</AnonymousIdentity>';
+                    }
                 }
                 $profileFileCont .= '</ClientSideCredential>
 <ServerSideCredential>

Spacing +2 added lines, -2 removed lines

@@ -446,8 +446,8 @@
 
         $fcontents .= ';--------------------------------
 !define ORGANISATION "' . $this->translateString($attr['general:instname'][0], $this->codePage) . '"
-!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0] ) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->codePage)) . '"
-!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0] ) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->codePage)) . '"
+!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0]) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->codePage)) . '"
+!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0]) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->codePage)) . '"
 
 !ifdef TLS
 ';