GEANT / CAT

web/lib/admin/http/UpdateUserCommand.php

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class UpdateUserCommand extends AbstractInvokerCommand{
+class UpdateUserCommand extends AbstractInvokerCommand {
 
     /**
      * Update command identifier.
@@ -29,7 +29,7 @@ 
      * @param string $commandToken
      * @param SilverbulletContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken, $context);
         $this->context = $context;
     }
@@ -39,7 +39,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]);
         $userExpiries = $this->parseArray($_POST[SaveUsersCommand::PARAM_EXPIRY]);
@@ -51,7 +51,7 @@ 
 
         $user->setExpiry($userExpiry);
         $username = $user->getUsername();
-        if(empty($user->get(SilverbulletUser::EXPIRY))){
+        if (empty($user->get(SilverbulletUser::EXPIRY))) {
             $this->storeErrorMessage(sprintf(_("Expiry date was incorrect for '%s'!"), $username));
         }
         $user->save();

web/lib/admin/http/RevokeCertificateCommand.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class RevokeCertificateCommand extends AbstractInvokerCommand{
+class RevokeCertificateCommand extends AbstractInvokerCommand {
 
     const COMMAND = 'revokecertificate';
 
@@ -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() {
         $profile = $this->context->getProfile();
         $certificateId = $this->parseInt($_POST[self::COMMAND]);
         

web/lib/admin/http/AbstractController.php

Spacing +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
      * @param string $commandToken
      * @return AbstractCommand
      */
-    public function createCommand($commandToken){
-        if(!isset($this->commands[$commandToken]) || $this->commands[$commandToken] == null){
+    public function createCommand($commandToken) {
+        if (!isset($this->commands[$commandToken]) || $this->commands[$commandToken] == null) {
             $this->commands[$commandToken] = $this->doCreateCommand($commandToken);
         }
         return $this->commands[$commandToken];

web/lib/admin/http/DefaultCommand.php

Spacing +2 added lines, -2 removed lines

@@ -7,14 +7,14 @@
  * @author Zilvinas Vaira
  *
  */
-class DefaultCommand extends AbstractCommand{
+class DefaultCommand extends AbstractCommand {
 
     /**
      * 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
+    public function execute() {
         
     }
 

web/lib/admin/http/TermsOfUseCommand.php

Spacing +4 added lines, -4 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class TermsOfUseCommand extends AbstractInvokerCommand{
+class TermsOfUseCommand extends AbstractInvokerCommand {
 
     const COMMAND = 'termsofuse';
     
@@ -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,8 +33,8 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
-        if(isset($_POST[self::AGREEMENT])){
+    public function execute() {
+        if (isset($_POST[self::AGREEMENT])) {
             $this->context->signAgreement();
         }
         $this->context->redirectAfterSubmit();

web/lib/admin/http/SaveUsersCommand.php

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class SaveUsersCommand extends AbstractInvokerCommand{
+class SaveUsersCommand extends AbstractInvokerCommand {
 
     const COMMAND = 'saveusers';
 
@@ -29,7 +29,7 @@ 
      * @param string $commandToken
      * @param SilverbulletContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken, $context);
         $this->context = $context;
     }
@@ -39,13 +39,13 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
-        if(isset($_POST[self::PARAM_ID]) && isset($_POST[self::PARAM_EXPIRY])){
+    public function execute() {
+        if (isset($_POST[self::PARAM_ID]) && isset($_POST[self::PARAM_EXPIRY])) {
             $userIds = $this->parseArray($_POST[self::PARAM_ID]);
             foreach ($userIds as $key => $userId) {
                 $user = SilverbulletUser::prepare($userId);
                 $user->load();
-                if(isset($_POST[self::PARAM_ACKNOWLEDGE]) && $_POST[self::PARAM_ACKNOWLEDGE]=='true'){
+                if (isset($_POST[self::PARAM_ACKNOWLEDGE]) && $_POST[self::PARAM_ACKNOWLEDGE] == 'true') {
                     $user->makeAcknowledged();
                 }
                 $user->save();

web/lib/admin/http/SilverbulletContext.php

Braces +4 added lines, -4 removed lines

@@ -92,14 +92,14 @@ 
         $user = new SilverbulletUser($this->profile->identifier, $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))){
                 $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));
             }
         }
@@ -146,7 +146,7 @@ 
         foreach ($this->users as $user) {
             if($user->hasActiveCertificates()){
                 $count[self::STATS_ACTIVE]++;
-            }else{
+            } else{
                 $count[self::STATS_PASSIVE]++;
             }
         }

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/skins/eduroam2016/div_institution.php

Spacing +1 added lines, -1 removed lines

@@ -3,5 +3,5 @@
     <a  id="select_another" class="signin" href=""><?php echo _("select another"); ?></a>
 </div>
 <div> <!-- IdP logo, if present -->
-    <img id="idp_logo" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","empty.png")?>" alt="IdP Logo"/>
+    <img id="idp_logo" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "empty.png")?>" alt="IdP Logo"/>
 </div>

web/skins/eduroam2016/div_other_installers.php

Indentation +18 added lines, -18 removed lines

@@ -3,24 +3,24 @@
          <?php echo _("Choose an installer to download"); ?>
          <table id="device_list" style="padding:0px;">
              <?php
-                 $langObject->setTextDomain("devices");
-                 foreach ($Gui->listDevices(isset($_REQUEST['hidden']) ? $_REQUEST['hidden'] : 0) as $group => $deviceGroup) {
-                      $groupIndex = count($deviceGroup);
-                      $deviceIndex = 0;
-                      print '<tbody><tr><td class="vendor" rowspan="' . $groupIndex . '"><img src="'. $Gui->skinObject->findResourceUrl("IMAGES","vendorlogo/".$group.".png").'" alt="' . $group . ' Device" title="' . $group . ' Device"></td>';
-                      foreach ($deviceGroup as $d => $D) {
-                          if ($deviceIndex) {
-                              print '<tr>';
-                          }
-                          $j = ($deviceIndex + 1) * 20;
-                          print "<td><button id='" . $d . "'>" . $D['display'] . "</button>";
-                          print "<div class='device_info' id='info_" . $d . "'></div></td>";
-                          print "<td><button class='more_info_b' id='info_b_" . $d . "'>i</button></td></tr>\n";
-                          $deviceIndex++;
-                      }
-                      print "</tbody>";
-                  }
-                  $langObject->setTextDomain("web_user");
+                    $langObject->setTextDomain("devices");
+                    foreach ($Gui->listDevices(isset($_REQUEST['hidden']) ? $_REQUEST['hidden'] : 0) as $group => $deviceGroup) {
+                        $groupIndex = count($deviceGroup);
+                        $deviceIndex = 0;
+                        print '<tbody><tr><td class="vendor" rowspan="' . $groupIndex . '"><img src="'. $Gui->skinObject->findResourceUrl("IMAGES","vendorlogo/".$group.".png").'" alt="' . $group . ' Device" title="' . $group . ' Device"></td>';
+                        foreach ($deviceGroup as $d => $D) {
+                            if ($deviceIndex) {
+                                print '<tr>';
+                            }
+                            $j = ($deviceIndex + 1) * 20;
+                            print "<td><button id='" . $d . "'>" . $D['display'] . "</button>";
+                            print "<div class='device_info' id='info_" . $d . "'></div></td>";
+                            print "<td><button class='more_info_b' id='info_b_" . $d . "'>i</button></td></tr>\n";
+                            $deviceIndex++;
+                        }
+                        print "</tbody>";
+                    }
+                    $langObject->setTextDomain("web_user");
             ?>
         </table>
     </div>

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
                  foreach ($Gui->listDevices(isset($_REQUEST['hidden']) ? $_REQUEST['hidden'] : 0) as $group => $deviceGroup) {
                       $groupIndex = count($deviceGroup);
                       $deviceIndex = 0;
-                      print '<tbody><tr><td class="vendor" rowspan="' . $groupIndex . '"><img src="'. $Gui->skinObject->findResourceUrl("IMAGES","vendorlogo/".$group.".png").'" alt="' . $group . ' Device" title="' . $group . ' Device"></td>';
+                      print '<tbody><tr><td class="vendor" rowspan="' . $groupIndex . '"><img src="' . $Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $group . ".png") . '" alt="' . $group . ' Device" title="' . $group . ' Device"></td>';
                       foreach ($deviceGroup as $d => $D) {
                           if ($deviceIndex) {
                               print '<tr>';