GEANT / CAT

web/lib/admin/http/SilverbulletContext.php

Spacing +30 added lines, -30 removed lines

@@ -11,7 +11,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class SilverbulletContext extends DefaultContext  implements MessageDistributor{
+class SilverbulletContext extends DefaultContext  implements MessageDistributor {
     
     const STATS_TOTAL = 'total';
     const STATS_ACTIVE = 'active';
@@ -61,7 +61,7 @@ 
      * 
      * @param SilverbulletController $controller
      */
-    public function setController($controller){
+    public function setController($controller) {
         $this->controller = $controller;
     }
     
@@ -70,7 +70,7 @@ 
      *
      * @return ProfileSilverbullet
      */
-    public function getProfile(){
+    public function getProfile() {
         return $this->profile;
     }
     
@@ -79,7 +79,7 @@ 
      *
      * @return InstitutionPageBuilder
      */
-    public function getBuilder(){
+    public function getBuilder() {
         return $this->builder;
     }
     
@@ -88,7 +88,7 @@ 
      *
      * @return boolean
      */
-    public function isAgreementSigned(){
+    public function isAgreementSigned() {
         $agreement_attributes = $this->profile->getAttributes("hiddenprofile:tou_accepted");
         return count($agreement_attributes) > 0;
     }
@@ -96,8 +96,8 @@ 
     /**
      * Marks agreement as signed inside the database
      */
-    public function signAgreement(){
-        $this->profile->addAttribute("hiddenprofile:tou_accepted",NULL,TRUE);
+    public function signAgreement() {
+        $this->profile->addAttribute("hiddenprofile:tou_accepted", NULL, TRUE);
     }
     
     /**
@@ -108,18 +108,18 @@ 
      * @param AbstractInvokerCommand $command
      * @return SilverbulletUser
      */
-    public function createUser($username, $expiry, $command){
+    public function createUser($username, $expiry, $command) {
         $user = new SilverbulletUser($this->profile->identifier, $username);
-        if(empty($username)){
+        if (empty($username)) {
             $command->storeErrorMessage(_('User name should not be empty!'));
-        }elseif(empty($expiry)){
+        }elseif (empty($expiry)) {
             $command->storeErrorMessage(_('No expiry date has been provided!'));
-        }else{
+        } else {
             $user->setExpiry($expiry);
             $user->save();
-            if(empty($user->get(SilverbulletUser::EXPIRY))){
+            if (empty($user->get(SilverbulletUser::EXPIRY))) {
                 $command->storeErrorMessage(sprintf(_("Expiry date was incorect for '%s'!"), $username));
-            }elseif(empty($user->getIdentifier())){
+            }elseif (empty($user->getIdentifier())) {
                 $command->storeErrorMessage(sprintf(_("Username '%s' already exist!"), $username));
             }
         }
@@ -133,13 +133,13 @@ 
      * @param AbstractInvokerCommand $command
      * @return SilverbulletInvitation
      */
-    public function createInvitation($user, $command, $quantity = 1){
+    public function createInvitation($user, $command, $quantity = 1) {
         $invitation = new SilverbulletInvitation($user);
-        if($quantity > 1){
+        if ($quantity > 1) {
             $invitation->setQuantity($quantity);
         }
         $invitation->save();
-        if(empty($invitation->getIdentifier())){
+        if (empty($invitation->getIdentifier())) {
             $command->storeErrorMessage(_('Could not create invitation!'));
         }
         return $invitation;
@@ -150,7 +150,7 @@ 
      *
      * @return SilverbulletUser
      */
-    public function createUsers(){
+    public function createUsers() {
         $this->users = SilverbulletUser::getList($this->profile->identifier);
         return $this->users;
     }
@@ -160,16 +160,16 @@ 
      *
      * @return array
      */
-    public function getUserStats(){
+    public function getUserStats() {
         $silverbulletMaxUsers = $this->profile->getAttributes("internal:silverbullet_maxusers");
         $count = array();
         $count[self::STATS_TOTAL] = isset($silverbulletMaxUsers[0]['value']) ? $silverbulletMaxUsers[0]['value'] : -1;
         $count[self::STATS_ACTIVE] = 0;
         $count[self::STATS_PASSIVE] = 0;
         foreach ($this->users as $user) {
-            if($user->hasActiveCertificates()){
+            if ($user->hasActiveCertificates()) {
                 $count[self::STATS_ACTIVE]++;
-            }else{
+            } else {
                 $count[self::STATS_PASSIVE]++;
             }
         }
@@ -179,10 +179,10 @@ 
     /**
      * Redirects page to itself in order to prevent acidental form resubmition
      */
-    public function redirectAfterSubmit(){
-        if(isset($_SERVER['REQUEST_URI'])){
+    public function redirectAfterSubmit() {
+        if (isset($_SERVER['REQUEST_URI'])) {
             $location = $this->addQuery($_SERVER['SCRIPT_NAME']);
-            header('Location: ' . $location );
+            header('Location: ' . $location);
             exit;
         }
     }
@@ -193,11 +193,11 @@ 
      * @param string $url
      * @return string
      */
-    public function addQuery($url){
+    public function addQuery($url) {
         $query = '';
         if (is_array($_GET) && count($_GET)) {
-            foreach($_GET as $key => $val) {
-                if(strpos($key , '/') === false){
+            foreach ($_GET as $key => $val) {
+                if (strpos($key, '/') === false) {
                     if (empty($key) || empty($val)) { continue; }
                     $query .= ($query == '') ? '?' : "&";
                     $query .= urlencode($key) . '=' . urlencode($val);
@@ -212,7 +212,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\MessageDistributor::addMessageInvoker()
      */
-    public function addMessageInvoker($commandToken, $invoker){
+    public function addMessageInvoker($commandToken, $invoker) {
         $this->invokers[$commandToken] = $invoker;
     }
     
@@ -221,10 +221,10 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\MessageDistributor::distributeMessages()
      */
-    public function distributeMessages($commandToken, $receiver){
-        if($this->controller != null){
+    public function distributeMessages($commandToken, $receiver) {
+        if ($this->controller != null) {
             $this->controller->createCommand($commandToken);
-            if(isset($this->invokers[$commandToken])){
+            if (isset($this->invokers[$commandToken])) {
                 $this->invokers[$commandToken]->publishMessages($receiver);
             }
         }

web/lib/admin/http/AddInvitationCommand.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class AddInvitationCommand extends AbstractInvokerCommand{
+class AddInvitationCommand extends AbstractInvokerCommand {
 
     const COMMAND = 'newinvitation';
 
@@ -23,7 +23,7 @@ 
      * @param string $commandToken
      * @param SilverbulletContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken, $context);
         $this->context = $context;
     }
@@ -33,7 +33,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
+    public function execute() {
         $userIndex = $this->parseInt($_POST[self::COMMAND]);
         $userIds = $this->parseArray($_POST[SaveUsersCommand::PARAM_ID]);
         $invitationsQuantities = $this->parseArray($_POST[SaveUsersCommand::PARAM_QUANTITY]);
@@ -43,14 +43,14 @@ 
         $user = SilverbulletUser::prepare($userId);
         $user->load();
         
-        if($user->isExpired()){
+        if ($user->isExpired()) {
             $this->storeErrorMessage(sprintf(_("User '%s' has expired. In order to generate credentials please extend the expiry date!"), $user->getUsername()));
-        }else{
+        } else {
             $this->context->createInvitation($user, $this, (int) $invitationsQuantity);
-            if(!is_numeric($invitationsQuantity)){
+            if (!is_numeric($invitationsQuantity)) {
                 $this->storeErrorMessage(sprintf(_("Invitations quantity '%' provided for user '%s' was not numeric. Assumed quantity as '1' !"), $invitationsQuantity, $user->getUsername()));
             }
-            if($user->isDeactivated()){
+            if ($user->isDeactivated()) {
                 $user->setDeactivated(false, $this->context->getProfile());
                 $user->save();
             }

web/skins/classic/basic.php

Spacing +3 added lines, -3 removed lines

@@ -142,7 +142,7 @@ 
     public function listIdPs() {
         $instList = $this->orderIdentityProviders($this->country->identifier);
         $out = '';
-        $out .= sprintf(_("Select your %s"), $this->nomenclature_inst );
+        $out .= sprintf(_("Select your %s"), $this->nomenclature_inst);
         $out .= '<select name="idp" onchange="submit_form(this)">';
         if (!empty($instList)) {
             if (!isset($this->idp)) {
@@ -236,7 +236,7 @@ 
                 }
             }
             $out .= '>' . $disp . '</option>';
-            $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ( $oneDevice['redirect'] ? 1 : 0 ) . ';';
+            $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ($oneDevice['redirect'] ? 1 : 0) . ';';
             $iterator++;
         }
         $out .= '</select>';
@@ -430,7 +430,7 @@ 
         </script>
     </head>
     <body style="">
-        <?php print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>'; ?>
+        <?php print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>'; ?>
         <form name="my_form" method="POST" action="<?php echo $_SERVER['SCRIPT_NAME'] ?>" accept-charset='UTF-8'>
             <img src="<?php echo $skinObject->findResourceUrl("IMAGES", "consortium_logo.png"); ?>" style="width: 20%; padding-right:20px; padding-top:0px; float:right" alt="logo" />
             <?php

web/admin/edit_federation.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
         ?>
     </h1>
     <div class='infobox'>
-        <h2><?php echo sprintf(_("%s Properties"),$uiElements->nomenclature_fed); ?></h2>
+        <h2><?php echo sprintf(_("%s Properties"), $uiElements->nomenclature_fed); ?></h2>
         <table>
             <tr>
                 <td><?php echo _("Country:"); ?></td>
@@ -57,7 +57,7 @@ 
               <input type='hidden' name='MAX_FILE_SIZE' value='" . CONFIG['MAX_UPLOAD_SIZE'] . "'>";
     ?>
     <fieldset class="option_container">
-        <legend><strong><?php echo sprintf(_("%s Properties"),$uiElements->nomenclature_fed); ?></strong></legend>
+        <legend><strong><?php echo sprintf(_("%s Properties"), $uiElements->nomenclature_fed); ?></strong></legend>
         <?php
         $optionDisplay = new \web\lib\admin\OptionDisplay($fed_options, "FED");
         echo $optionDisplay->prefilledOptionTable("fed");

web/lib/admin/GeoWidget.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      */
     public function insertInHead($inst_country, $inst_name) {
         $cat = new \core\CAT();
-        return "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=".CONFIG['APPEARANCE']['google_maps_api_key']."'></script>
+        return "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=" . CONFIG['APPEARANCE']['google_maps_api_key'] . "'></script>
     <script type='text/javascript'>
         // some global variables;
         var center_lat=49.6114885608729;

web/admin/edit_idp_result.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 
 if (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) && count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0) {
     foreach (CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'] as $ssidname) {
-        $ssids[] = $ssidname . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)") );
+        $ssids[] = $ssidname . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)"));
     }
 }
 

web/user/tou.inc.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 /* 
 */
 
-        $Tou =  [
+        $Tou = [
     'title' => _("Terms of Use"),
     'short' => "<p>The purpose of this service is to make eduroam configuration easier for end users and eduroam
 Identity Providers by making available customised and securely configured eduroam installers.</p>
@@ -49,7 +49,7 @@ 
     they are from the same user group. You are not allowed to share them to an unlimited
     audience (e.g. on a publicly accessible web server).</li>
 <li>If You are an eduroam Identity Provider administrator, you are allowed to download and pass on the Installers to
-your own ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." end users, e.g. on the support web pages of your ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'].", on Welcome Package CDs or USB sticks, etc.</li>
+your own ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " end users, e.g. on the support web pages of your " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . ", on Welcome Package CDs or USB sticks, etc.</li>
 <li>If You are a third-party not affiliated with eduroam, you are only allowed to download and pass on
 the Metadata and/or the Installers after having received written permission by the eduroam Operations team.</li>
 </ul>

web/user/tou.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     they are from the same user group. You are not allowed to share them to an unlimited
     audience (e.g. on a publicly accessible web server).</li>
 <li>If You are an eduroam Identity Provider administrator, you are allowed to download and pass on the Installers to
-your own <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?> end users, e.g. on the support web pages of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?>, on Welcome Package CDs or USB sticks, etc.</li>
+your own <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?> end users, e.g. on the support web pages of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?>, on Welcome Package CDs or USB sticks, etc.</li>
 <li>If You are a third-party not affiliated with eduroam, you are only allowed to download and pass on
 the Metadata and/or the Installers after having received written permission by the eduroam Operations team.</li>
 </ul>

utils/notify_invitation_expiry.php

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
     $admins = $this_fed->listFederationAdmins();
     $mailtext = "Hello,
 
-invitation tokens for the following new ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] ." have recently expired:
+invitation tokens for the following new ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " have recently expired:
 
 ";
     foreach ($listofinstnames as $instname) {
@@ -54,7 +54,7 @@ 
     if ($numberofexistingidps > 0) {
         $mailtext .= "
 
-Additionally, $numberofexistingidps invitations for an existing ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." have expired.
+Additionally, $numberofexistingidps invitations for an existing " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " have expired.
         ";
     }
     $mailtext .= "