GEANT / CAT

web/admin/edit_user_result.php

Spacing +2 added lines, -2 removed lines

@@ -56,8 +56,8 @@
 
 $i = 0;
 foreach ($salvageFedPrivs as $oneFed) {
-    $_POST['option']["S123456789".$i] = "user:fedadmin#string##";
-    $_POST['value']["S123456789".$i."-0"] = $oneFed;
+    $_POST['option']["S123456789" . $i] = "user:fedadmin#string##";
+    $_POST['value']["S123456789" . $i . "-0"] = $oneFed;
     $i++;
 }
 ?>

web/index.php

Spacing +1 added lines, -1 removed lines

@@ -26,4 +26,4 @@
 $Gui->defaultPagePrelude();
 
 // and now, serve actual data
-include("skins/".$Gui->skinObject->skin."/index.php");
+include("skins/" . $Gui->skinObject->skin . "/index.php");

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);
                 }

web/lib/admin/PageDecoration.php

Spacing +7 added lines, -7 removed lines

@@ -65,7 +65,7 @@ 
                         <select id='lang' name='lang' onchange='this.form.submit()'>";
 
         foreach (CONFIG['LANGUAGES'] as $lang => $value) {
-            $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $value['display'] . "</option> ";
+            $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "") . " >" . $value['display'] . "</option> ";
         }
         $retval .= "</select>";
 
@@ -77,7 +77,7 @@ 
         $retval .= "</form>
                 </div><!--langselection-->";
 
-        $logoUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, (strrpos($_SERVER['PHP_SELF'], "admin/") !== FALSE ? strrpos($_SERVER['PHP_SELF'], "admin/") : strrpos($_SERVER['PHP_SELF'], "/")))."/resources/images/consortium_logo.png";        
+        $logoUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, (strrpos($_SERVER['PHP_SELF'], "admin/") !== FALSE ? strrpos($_SERVER['PHP_SELF'], "admin/") : strrpos($_SERVER['PHP_SELF'], "/"))) . "/resources/images/consortium_logo.png";        
         $retval .= "<div class='consortium_logo'>
                     <img id='test_locate' src='$logoUrl' alt='Consortium Logo'>
                 </div> <!-- consortium_logo -->
@@ -119,7 +119,7 @@ 
         switch ($area) {
             case "ADMIN-IDP":
                 $cap1 = CONFIG['APPEARANCE']['productname_long'];
-                $cap2 = sprintf(_("Administrator Interface - Identity Provider"),$this->ui->nomenclature_inst);
+                $cap2 = sprintf(_("Administrator Interface - Identity Provider"), $this->ui->nomenclature_inst);
                 $advancedControls = TRUE;
                 break;
             case "ADMIN-IDP-USERS":
@@ -139,7 +139,7 @@ 
                 break;
             case "FEDERATION":
                 $cap1 = CONFIG['APPEARANCE']['productname_long'];
-                $cap2 = sprintf(_("Administrator Interface - %s Management"),$this->ui->nomenclature_fed);
+                $cap2 = sprintf(_("Administrator Interface - %s Management"), $this->ui->nomenclature_fed);
                 $advancedControls = TRUE;
                 break;
             case "USER":
@@ -168,7 +168,7 @@ 
         // content from here on will SCROLL instead of being fixed at the top
         $retval .= "<div class='pagecontent'>"; // closes in footer again
         $retval .= "<div class='trick'>"; // closes in footer again
-        $retval .= "<div id='secondrow' style='border-bottom:5px solid ".CONFIG['APPEARANCE']['colour1']."; min-height:100px;'>
+        $retval .= "<div id='secondrow' style='border-bottom:5px solid " . CONFIG['APPEARANCE']['colour1'] . "; min-height:100px;'>
             <div id='secondarycaptions' style='display:inline-block; float:left'>
                 <h2>$cap2</h2>
             </div><!--secondarycaptions-->";
@@ -213,7 +213,7 @@ 
             $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "/");
         }
 
-        $cssUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition )."/resources/css/cat.css.php";
+        $cssUrl = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition) . "/resources/css/cat.css.php";
         
         $retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
         $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>";
@@ -241,7 +241,7 @@ 
             $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "/");
         }
         
-        $logoBase = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition)."/resources/images";
+        $logoBase = "//" . $this->validator->hostname($_SERVER['SERVER_NAME']) . substr($_SERVER['PHP_SELF'], 0, $cutoffPosition) . "/resources/images";
 
         return "<span id='logos' style='position:fixed; left:50%;'><img src='$logoBase/dante.png' alt='DANTE' style='height:23px;width:47px'/>
               <img src='$logoBase/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span>

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/http/GetTokenEmailDetails.php

Spacing +5 added lines, -5 removed lines

@@ -11,7 +11,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class GetTokenEmailDetails extends AbstractAjaxCommand{
+class GetTokenEmailDetails extends AbstractAjaxCommand {
     
     const COMMAND = "gettokenemaildetails";
     const PARAM_TOKENLINK = "tokenlink";
@@ -25,7 +25,7 @@ 
      * @param string $commandToken
      * @param DefaultContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken, $context);
         $this->subject = sprintf(_("Your %s access is ready"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
         $this->body = sprintf(_("Hello!\n\nA new %s access credential has been created for you by your network administrator.\n\nPlease follow the following link with the device you want to enable for eduroam to get a custom %s installation program just for you:"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
@@ -37,7 +37,7 @@ 
      * 
      * @return string
      */
-    public function getSubject(){
+    public function getSubject() {
         return $this->subject;
     }
     
@@ -46,7 +46,7 @@ 
      * @param string $invitationToken
      * @return string
      */
-    public function getBody($invitationToken){
+    public function getBody($invitationToken) {
         return sprintf($this->body, $invitationToken);
     }
     
@@ -56,7 +56,7 @@ 
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
     public function execute() {
-        if(isset($_POST[self::PARAM_TOKENLINK])){
+        if (isset($_POST[self::PARAM_TOKENLINK])) {
             
             $invitationToken = $this->parseString($_POST[self::PARAM_TOKENLINK]);
 

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/admin/edit_idp.php

Spacing +4 added lines, -4 removed lines

@@ -86,7 +86,7 @@ 
         ?>
     </h1>
     <div class='infobox'>
-        <h2><?php echo sprintf(_("General %s properties"),$uiElements->nomenclature_inst); ?></h2>
+        <h2><?php echo sprintf(_("General %s properties"), $uiElements->nomenclature_inst); ?></h2>
         <table>
             <tr>
                 <td><?php echo _("Country:"); ?></td>
@@ -105,7 +105,7 @@ 
 
     if ($wizardStyle) {
         echo "<p>" .
-        sprintf(_("Hello, newcomer. Your %s is new to us. This wizard will ask you several questions about your IdP, so that we can generate beautiful profiles for you in the end. All of the information below is optional, but it is important to fill out as many fields as possible for the benefit of your end users."), $uiElements->nomenclature_inst ) . "</p>";
+        sprintf(_("Hello, newcomer. Your %s is new to us. This wizard will ask you several questions about your IdP, so that we can generate beautiful profiles for you in the end. All of the information below is optional, but it is important to fill out as many fields as possible for the benefit of your end users."), $uiElements->nomenclature_inst) . "</p>";
     }
     $optionDisplay = new web\lib\admin\OptionDisplay($idpoptions, "IdP");
     ?>
@@ -136,7 +136,7 @@ 
             sprintf(_("In this section, you define on which media %s should be configured on user devices."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) . "</p>
           <ul>";
             echo "<li>";
-            echo "<strong>" . ( count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>";
+            echo "<strong>" . (count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>";
             if (count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0) {
                 $ssidlist = "";
                 foreach (CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'] as $ssid) {
@@ -155,7 +155,7 @@ 
             echo "</li>";
 
             echo "<li>";
-            echo "<strong>" . ( count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
+            echo "<strong>" . (count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
             if (count(CONFIG_CONFASSISTANT['CONSORTIUM']['interworking-consortium-oi']) > 0) {
                 $consortiumlist = "";
                 foreach (CONFIG_CONFASSISTANT['CONSORTIUM']['interworking-consortium-oi'] as $oi) {