GEANT / CAT

web/lib/admin/domain/SilverbulletCertificate.php

Spacing +1 added lines, -1 removed lines

@@ -255,7 +255,7 @@
             $userId = $silverbulletUser->getAttribute(self::ID);
             $query = sprintf("SELECT * FROM `%s` WHERE `%s`=? AND `%s`=? ORDER BY `%s`, `%s` DESC", self::TABLE, self::SILVERBULLETUSERID, $searchAttribute->key, self::REVOCATION_STATUS, self::EXPIRY);
             $result = $databaseHandle->exec($query, $userId->getType() . $searchAttribute->getType(), $userId->value, $searchAttribute->value);
-        } else if($silverbulletUser != null) {
+        } else if ($silverbulletUser != null) {
             $userId = $silverbulletUser->getAttribute(self::ID);
             $query = sprintf("SELECT * FROM `%s` WHERE `%s`=? ORDER BY `%s`, `%s` DESC", self::TABLE, self::SILVERBULLETUSERID, self::REVOCATION_STATUS, self::EXPIRY);
             $result = $databaseHandle->exec($query, $userId->getType(), $userId->value);

web/lib/admin/http/SilverbulletController.php

Braces +17 added lines, -17 removed lines

@@ -37,15 +37,15 @@ 
             if($commandToken == SaveUsersCommand::COMMAND){
                 if(isset($_POST[DeleteUserCommand::COMMAND])){
                     $commandToken = DeleteUserCommand::COMMAND;
-                }elseif(isset($_POST[AddInvitationCommand::COMMAND])){
+                } elseif(isset($_POST[AddInvitationCommand::COMMAND])){
                     $commandToken = AddInvitationCommand::COMMAND;
-                }elseif(isset($_POST[UpdateUserCommand::COMMAND])){
+                } elseif(isset($_POST[UpdateUserCommand::COMMAND])){
                     $commandToken = UpdateUserCommand::COMMAND;
-                }elseif (isset($_POST[RevokeCertificateCommand::COMMAND])){
+                } elseif (isset($_POST[RevokeCertificateCommand::COMMAND])){
                     $commandToken = RevokeCertificateCommand::COMMAND;
-                }elseif (isset($_POST[RevokeInvitationCommand::COMMAND])){
+                } elseif (isset($_POST[RevokeInvitationCommand::COMMAND])){
                     $commandToken = RevokeInvitationCommand::COMMAND;
-                }elseif (isset($_POST[SaveUsersCommand::COMMAND])){
+                } elseif (isset($_POST[SaveUsersCommand::COMMAND])){
                     $commandToken = SaveUsersCommand::COMMAND;
                 }
             }
@@ -63,31 +63,31 @@ 
         if($this->context->isAgreementSigned()){
             if($commandToken == AddUserCommand::COMMAND){
                 return new AddUserCommand($commandToken, $this->context);
-            }elseif ($commandToken == AddUsersCommand::COMMAND){
+            } elseif ($commandToken == AddUsersCommand::COMMAND){
                 return new AddUsersCommand($commandToken, $this->context);
-            }elseif ($commandToken == DeleteUserCommand::COMMAND){
+            } elseif ($commandToken == DeleteUserCommand::COMMAND){
                 return new DeleteUserCommand($commandToken, $this->context);
-            }elseif ($commandToken == AddInvitationCommand::COMMAND){
+            } elseif ($commandToken == AddInvitationCommand::COMMAND){
                 return new AddInvitationCommand($commandToken, $this->context);
-            }elseif ($commandToken == UpdateUserCommand::COMMAND){
+            } elseif ($commandToken == UpdateUserCommand::COMMAND){
                 return new UpdateUserCommand($commandToken, $this->context);
-            }elseif ($commandToken == RevokeCertificateCommand::COMMAND){
+            } elseif ($commandToken == RevokeCertificateCommand::COMMAND){
                 return new RevokeCertificateCommand($commandToken, $this->context);
-            }elseif ($commandToken == RevokeInvitationCommand::COMMAND){
+            } elseif ($commandToken == RevokeInvitationCommand::COMMAND){
                 return new RevokeInvitationCommand($commandToken, $this->context);
-            }elseif ($commandToken == SaveUsersCommand::COMMAND){
+            } elseif ($commandToken == SaveUsersCommand::COMMAND){
                 return new SaveUsersCommand($commandToken, $this->context);
-            }elseif ($commandToken == SendTokenByEmail::COMMAND){
+            } elseif ($commandToken == SendTokenByEmail::COMMAND){
                 return new SendTokenByEmail($commandToken, $this->context);
-            }elseif ($commandToken == SendTokenBySms::COMMAND){
+            } elseif ($commandToken == SendTokenBySms::COMMAND){
                 return new SendTokenBySms($commandToken, $this->context);
-            }else{
+            } else{
                 return new DefaultCommand($commandToken);
             }
-        }else{
+        } else{
             if($commandToken == TermsOfUseCommand::COMMAND){
                 return new TermsOfUseCommand($commandToken, $this->context);
-            }else{
+            } else{
                 return new DefaultCommand($commandToken);
             }
         }

Spacing +27 added lines, -27 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class SilverbulletController extends AbstractController{
+class SilverbulletController extends AbstractController {
     
     /**
      * 
@@ -19,7 +19,7 @@ 
      * 
      * @param SilverbulletContext $context Requires silverbullet page context object
      */
-    public function __construct($context){
+    public function __construct($context) {
         $context->setController($this);
         $this->context = $context;
     }
@@ -29,22 +29,22 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractController::parseRequest()
      */
-    public function parseRequest(){
+    public function parseRequest() {
         $commandToken = '';
-        if(isset($_POST[SilverbulletController::COMMAND])){
+        if (isset($_POST[SilverbulletController::COMMAND])) {
             $commandToken = $_POST[SilverbulletController::COMMAND];
-            if($commandToken == SaveUsersCommand::COMMAND){
-                if(isset($_POST[DeleteUserCommand::COMMAND])){
+            if ($commandToken == SaveUsersCommand::COMMAND) {
+                if (isset($_POST[DeleteUserCommand::COMMAND])) {
                     $commandToken = DeleteUserCommand::COMMAND;
-                }elseif(isset($_POST[AddInvitationCommand::COMMAND])){
+                }elseif (isset($_POST[AddInvitationCommand::COMMAND])) {
                     $commandToken = AddInvitationCommand::COMMAND;
-                }elseif(isset($_POST[UpdateUserCommand::COMMAND])){
+                }elseif (isset($_POST[UpdateUserCommand::COMMAND])) {
                     $commandToken = UpdateUserCommand::COMMAND;
-                }elseif (isset($_POST[RevokeCertificateCommand::COMMAND])){
+                }elseif (isset($_POST[RevokeCertificateCommand::COMMAND])) {
                     $commandToken = RevokeCertificateCommand::COMMAND;
-                }elseif (isset($_POST[RevokeInvitationCommand::COMMAND])){
+                }elseif (isset($_POST[RevokeInvitationCommand::COMMAND])) {
                     $commandToken = RevokeInvitationCommand::COMMAND;
-                }elseif (isset($_POST[SaveUsersCommand::COMMAND])){
+                }elseif (isset($_POST[SaveUsersCommand::COMMAND])) {
                     $commandToken = SaveUsersCommand::COMMAND;
                 }
             }
@@ -58,35 +58,35 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractController::doCreateCommand()
      */
-    protected function doCreateCommand($commandToken){
-        if($this->context->isAgreementSigned()){
-            if($commandToken == AddUserCommand::COMMAND){
+    protected function doCreateCommand($commandToken) {
+        if ($this->context->isAgreementSigned()) {
+            if ($commandToken == AddUserCommand::COMMAND) {
                 return new AddUserCommand($commandToken, $this->context);
-            }elseif ($commandToken == AddUsersCommand::COMMAND){
+            }elseif ($commandToken == AddUsersCommand::COMMAND) {
                 return new AddUsersCommand($commandToken, $this->context);
-            }elseif ($commandToken == DeleteUserCommand::COMMAND){
+            }elseif ($commandToken == DeleteUserCommand::COMMAND) {
                 return new DeleteUserCommand($commandToken, $this->context);
-            }elseif ($commandToken == AddInvitationCommand::COMMAND){
+            }elseif ($commandToken == AddInvitationCommand::COMMAND) {
                 return new AddInvitationCommand($commandToken, $this->context);
-            }elseif ($commandToken == UpdateUserCommand::COMMAND){
+            }elseif ($commandToken == UpdateUserCommand::COMMAND) {
                 return new UpdateUserCommand($commandToken, $this->context);
-            }elseif ($commandToken == RevokeCertificateCommand::COMMAND){
+            }elseif ($commandToken == RevokeCertificateCommand::COMMAND) {
                 return new RevokeCertificateCommand($commandToken, $this->context);
-            }elseif ($commandToken == RevokeInvitationCommand::COMMAND){
+            }elseif ($commandToken == RevokeInvitationCommand::COMMAND) {
                 return new RevokeInvitationCommand($commandToken, $this->context);
-            }elseif ($commandToken == SaveUsersCommand::COMMAND){
+            }elseif ($commandToken == SaveUsersCommand::COMMAND) {
                 return new SaveUsersCommand($commandToken, $this->context);
-            }elseif ($commandToken == SendTokenByEmail::COMMAND){
+            }elseif ($commandToken == SendTokenByEmail::COMMAND) {
                 return new SendTokenByEmail($commandToken, $this->context);
-            }elseif ($commandToken == SendTokenBySms::COMMAND){
+            }elseif ($commandToken == SendTokenBySms::COMMAND) {
                 return new SendTokenBySms($commandToken, $this->context);
-            }else{
+            } else {
                 return new DefaultCommand($commandToken);
             }
-        }else{
-            if($commandToken == TermsOfUseCommand::COMMAND){
+        } else {
+            if ($commandToken == TermsOfUseCommand::COMMAND) {
                 return new TermsOfUseCommand($commandToken, $this->context);
-            }else{
+            } else {
                 return new DefaultCommand($commandToken);
             }
         }

web/lib/admin/http/RevokeInvitationCommand.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class RevokeInvitationCommand extends AbstractInvokerCommand{
+class RevokeInvitationCommand extends AbstractInvokerCommand {
 
     const COMMAND = 'revokeinvitation';
 
@@ -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() {
         $invitationId = $this->parseInt($_POST[self::COMMAND]);
         
         $invitation = SilverbulletInvitation::prepare($invitationId);

web/lib/admin/view/UserCredentialsForm.php

Braces +3 added lines, -3 removed lines

@@ -158,7 +158,7 @@ 
         $acknowledgeLevel = $user->getAcknowledgeLevel();
         if($acknowledgeLevel == SilverbulletUser::LEVEL_YELLOW){
             $row->addAttribute('style', 'background-color:#F0EAC0;');
-        }elseif ($acknowledgeLevel == SilverbulletUser::LEVEL_RED){
+        } elseif ($acknowledgeLevel == SilverbulletUser::LEVEL_RED){
             $row->addAttribute('style', 'background-color:#F0C0C0;');
         }
         
@@ -215,11 +215,11 @@ 
                 $certificateBox->addAttribute('style', 'background-color:#F0C0C0;');
                 $buttonContainer->addAttribute('style', 'height:22px; margin-top:7px; text-align:center;');
                 $buttonContainer->addText(_("REVOKED"));
-            }elseif ($certificate->isExpired()){
+            } elseif ($certificate->isExpired()){
                 $certificateBox->addAttribute('style', 'background-color:lightgrey;');
                 $buttonContainer->addAttribute('style', 'height:22px; margin-top:7px; text-align:center;');
                 $buttonContainer->addText(_("EXPIRED"));
-            }else{
+            } else{
                 $buttonContainer->addAttribute('style', 'text-align:right;padding-top: 5px;');
                 $buttonContainer->addText(new Button(_('Revoke'), 'submit', RevokeCertificateCommand::COMMAND, $certificate->getIdentifier(), 'delete'));
             }

Spacing +23 added lines, -23 removed lines

@@ -26,7 +26,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class UserCredentialsForm implements PageElementInterface{
+class UserCredentialsForm implements PageElementInterface {
     
     const EDITABLEBLOCK_CLASS = 'sb-editable-block';
     const TITLEROW_CLASS = 'sb-title-row';
@@ -118,10 +118,10 @@ 
         
         $this->acknowledgeDays = CONFIG_CONFASSISTANT['SILVERBULLET']['gracetime'] ?? SilverbulletUser::MAX_ACKNOWLEDGE;
         $this->acknowledgeText = $acknowledgeText;
-        if($isAcknowledgeEnabled){
+        if ($isAcknowledgeEnabled) {
             $div = new CompositeTag('div');
             $div->addAttribute('style', 'padding-bottom: 20px;');
-            $this->acknowledgeNotice = new Tag ('p');
+            $this->acknowledgeNotice = new Tag('p');
             $div->addTag($this->acknowledgeNotice);
             $checkbox = new UnaryTag('input');
             $checkbox->addAttribute('type', 'checkbox');
@@ -132,7 +132,7 @@ 
             $label->addText('I have verified that all configured users are still eligible for eduroam');
             $div->addTag($label);
             $this->decorator->addHtmlElement($div);
-            $this->decorator->addHtmlElement(new Button(_('Save'),'submit', SaveUsersCommand::COMMAND, SaveUsersCommand::COMMAND));
+            $this->decorator->addHtmlElement(new Button(_('Save'), 'submit', SaveUsersCommand::COMMAND, SaveUsersCommand::COMMAND));
         }
         
         $this->addTitleRow();
@@ -141,7 +141,7 @@ 
     /**
      * 
      */
-    private function addTitleRow(){
+    private function addTitleRow() {
         $row = new Row(array(self::USER_COLUMN => _('User'), self::TOKEN_COLUMN => _('Token/Certificate details'), self::EXPIRY_COLUMN => _('User/Token Expiry'), self::ACTION_COLUMN => _('Actions')));
         $row->addAttribute('class', self::TITLEROW_CLASS);
         $this->table->addRow($row);
@@ -151,19 +151,19 @@ 
      * 
      * @param SilverbulletUser $user
      */
-    public function addUserRow($user){
+    public function addUserRow($user) {
         $row = new Row(array(self::USER_COLUMN => $user->getUsername(), self::EXPIRY_COLUMN => new DatePicker(SaveUsersCommand::PARAM_EXPIRY_MULTIPLE, $user->getExpiry())));
         $row->addAttribute('class', self::USERROW_CLASS);
         
         $acknowledgeLevel = $user->getAcknowledgeLevel();
-        if($acknowledgeLevel == SilverbulletUser::LEVEL_YELLOW){
+        if ($acknowledgeLevel == SilverbulletUser::LEVEL_YELLOW) {
             $row->addAttribute('style', 'background-color:#F0EAC0;');
-        }elseif ($acknowledgeLevel == SilverbulletUser::LEVEL_RED){
+        }elseif ($acknowledgeLevel == SilverbulletUser::LEVEL_RED) {
             $row->addAttribute('style', 'background-color:#F0C0C0;');
         }
         
         $acknowledgeDays = $user->getAcknowledgeDays();
-        if($acknowledgeDays < $this->acknowledgeDays){
+        if ($acknowledgeDays < $this->acknowledgeDays) {
             $this->acknowledgeDays = $acknowledgeDays;
         }
         
@@ -183,7 +183,7 @@ 
         $action = new CompositeTag('div');
         $action->addAttribute('class', 'sb-user-buttons');
             $deactivationButton = new Button(_('Deactivate User'), 'submit', DeleteUserCommand::COMMAND, $user->getIdentifier(), 'delete');
-            if($user->isDeactivated()){
+            if ($user->isDeactivated()) {
                 $deactivationButton->addAttribute('disabled', 'disabled'); 
             }
         $action->addTag($deactivationButton);
@@ -206,8 +206,8 @@ 
      * 
      * @param SilverbulletCertificate $certificate
      */
-    public function addCertificateRow($certificate){
-        if($certificate->isGenerated()){
+    public function addCertificateRow($certificate) {
+        if ($certificate->isGenerated()) {
 
             //Create certificate box
             $certificateBox = new CompositeTag('div');
@@ -221,15 +221,15 @@ 
 
             //Create button container div
             $buttonContainer = new Tag('div');
-            if($certificate->isRevoked()){
+            if ($certificate->isRevoked()) {
                 $certificateBox->addAttribute('style', 'background-color:#F0C0C0;');
                 $buttonContainer->addAttribute('style', 'height:22px; margin-top:7px; text-align:center;');
                 $buttonContainer->addText(_("REVOKED"));
-            }elseif ($certificate->isExpired()){
+            }elseif ($certificate->isExpired()) {
                 $certificateBox->addAttribute('style', 'background-color:lightgrey;');
                 $buttonContainer->addAttribute('style', 'height:22px; margin-top:7px; text-align:center;');
                 $buttonContainer->addText(_("EXPIRED"));
-            }else{
+            } else {
                 $buttonContainer->addAttribute('style', 'text-align:right;padding-top: 5px;');
                 $buttonContainer->addText(new Button(_('Revoke'), 'submit', RevokeCertificateCommand::COMMAND, $certificate->getIdentifier(), 'delete'));
             }
@@ -243,7 +243,7 @@ 
      *
      * @param SilverbulletInvitation $invitation
      */
-    public function addInvitationRow($invitation){
+    public function addInvitationRow($invitation) {
         $expiryColumn = _("Expiry Date: ") . $invitation->getExpiry();
         $expiryColumn .= "<br>";
         $expiryColumn .= _("Activations: ") . $invitation->getRemainingActivations();
@@ -251,13 +251,13 @@ 
         $row->addAttribute('class', self::CERTIFICATEROW_CLASS);
         $index = $this->table->size();
         $this->table->addRow($row);
-        if(!$invitation->isExpired() && !$invitation->isRevoked() && !$invitation->isAbsent()){
+        if (!$invitation->isExpired() && !$invitation->isRevoked() && !$invitation->isAbsent()) {
             $this->table->addToCell($index, self::TOKEN_COLUMN, new Button(_('Copy to Clipboard'), 'button', '', '', self::INVITATION_TOKEN_CLASS . '-copy'));
-            $this->table->addToCell($index, self::TOKEN_COLUMN, new Button(_('Compose mail...'), 'button', '', '', self::INVITATION_TOKEN_CLASS. '-compose'));
-            $this->table->addToCell($index, self::TOKEN_COLUMN, new Button(_('Send in SMS...'), 'button', '', '', self::INVITATION_TOKEN_CLASS. '-sms'));
-            $this->table->addToCell($index, self::TOKEN_COLUMN, new Button(_('Generate QR code...'), 'button', '', '', self::INVITATION_TOKEN_CLASS. '-qrcode'));
+            $this->table->addToCell($index, self::TOKEN_COLUMN, new Button(_('Compose mail...'), 'button', '', '', self::INVITATION_TOKEN_CLASS . '-compose'));
+            $this->table->addToCell($index, self::TOKEN_COLUMN, new Button(_('Send in SMS...'), 'button', '', '', self::INVITATION_TOKEN_CLASS . '-sms'));
+            $this->table->addToCell($index, self::TOKEN_COLUMN, new Button(_('Generate QR code...'), 'button', '', '', self::INVITATION_TOKEN_CLASS . '-qrcode'));
         }
-        if(!$invitation->isRevoked()){
+        if (!$invitation->isRevoked()) {
             $this->table->addToCell($index, self::ACTION_COLUMN, new Button(_('Revoke'), 'submit', RevokeInvitationCommand::COMMAND, $invitation->getIdentifier(), 'delete'));
         }
     }
@@ -268,11 +268,11 @@ 
      * @see \web\lib\admin\view\PageElementInterface::render()
      */
     public function render() {
-        if($this->acknowledgeNotice!=null){
+        if ($this->acknowledgeNotice != null) {
             $this->acknowledgeNotice->addText(sprintf($this->acknowledgeText, $this->acknowledgeDays));
         }
         ?>
-        <div class="<?php echo self::EDITABLEBLOCK_CLASS;?>">
+        <div class="<?php echo self::EDITABLEBLOCK_CLASS; ?>">
             <?php $this->decorator->render(); ?>
         </div>
         <?php

web/lib/admin/domain/SilverbulletInvitation.php

Doc Comments +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
     
     /**
      * 
-     * @param $silverbulletUser SilverbulletUser
+     * @param SilverbulletUser|null $silverbulletUser SilverbulletUser
      */
     public function __construct($silverbulletUser) {
         parent::__construct(self::TABLE, self::TYPE_INST);

Spacing +11 added lines, -11 removed lines

@@ -97,7 +97,7 @@ 
      * 
      * @param int $quantity
      */
-    public function setQuantity($quantity){
+    public function setQuantity($quantity) {
         $this->set(self::QUANTITY, $quantity);
     }
 
@@ -105,7 +105,7 @@ 
      *
      * @return string
      */
-    public function getRemainingActivations(){
+    public function getRemainingActivations() {
         return sprintf(_("%s of %s"), count($this->certificates), $this->get(self::QUANTITY));
     }
     
@@ -113,12 +113,12 @@ 
      * 
      * @return boolean
      */
-    public function isRevoked(){
+    public function isRevoked() {
         $quantity = $this->get(self::QUANTITY);
         return $quantity <= 0;
     }
     
-    public function isAbsent(){
+    public function isAbsent() {
         $quantity = $this->get(self::QUANTITY);
         return count($this->certificates) >= $quantity;
     }
@@ -150,7 +150,7 @@ 
             }
             $link .= $_SERVER['SERVER_NAME'];
             $relPath = dirname(dirname($_SERVER['SCRIPT_NAME']));
-            if ($relPath[strlen($relPath) -1] == '/') {
+            if ($relPath[strlen($relPath) - 1] == '/') {
                 $relPath = substr($relPath, 0, strlen($relPath) - 1);
             }
             $link = $link . $relPath;
@@ -158,11 +158,11 @@ 
             $link = $host;
         }
         
-        if ($this->isRevoked()){
+        if ($this->isRevoked()) {
             $link = _('This token has been revoked!');
-        }else if($this->isAbsent()){
+        } else if ($this->isAbsent()) {
             $link = _('All available activations were used!');
-        }else if ($this->isExpired()) {
+        } else if ($this->isExpired()) {
             $link = _('User did not consume the token and it expired!');
         } else {
             $link .= '/accountstatus/accountstatus.php?token=' . $this->get(self::TOKEN);
@@ -222,7 +222,7 @@ 
      * 
      * @return \web\lib\admin\domain\SilverbulletCertificate[]
      */
-    public function getCertificates(){
+    public function getCertificates() {
         return $this->certificates;
     }
     
@@ -231,7 +231,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentEntity::load()
      */
-    public function load($searchAttribute = null){
+    public function load($searchAttribute = null) {
         $state = parent::load($searchAttribute);
         $this->certificates = SilverbulletCertificate::getList(null, new Attribute(SilverbulletCertificate::SILVERBULLETINVITATIONID, $this->getIdentifier(), Attribute::TYPE_INTEGER));
         return $state;
@@ -260,7 +260,7 @@ 
             $userId = $silverbulletUser->getAttribute(self::ID);
             $query = sprintf("SELECT * FROM `%s` WHERE `%s`=? AND `%s`=? ORDER BY `%s` DESC", self::TABLE, self::SILVERBULLETUSERID, $searchAttribute->key, self::EXPIRY);
             $result = $databaseHandle->exec($query, $userId->getType() . $searchAttribute->getType(), $userId->value, $searchAttribute->value);
-        } else if($silverbulletUser != null) {
+        } else if ($silverbulletUser != null) {
             $userId = $silverbulletUser->getAttribute(self::ID);
             $query = sprintf("SELECT * FROM `%s` WHERE `%s`=? ORDER BY `%s` DESC", self::TABLE, self::SILVERBULLETUSERID, self::EXPIRY);
             $result = $databaseHandle->exec($query, $userId->getType(), $userId->value);

Braces +2 added lines, -2 removed lines

@@ -160,9 +160,9 @@
         
         if ($this->isRevoked()){
             $link = _('This token has been revoked!');
-        }else if($this->isAbsent()){
+        } else if($this->isAbsent()){
             $link = _('All available activations were used!');
-        }else if ($this->isExpired()) {
+        } else if ($this->isExpired()) {
             $link = _('User did not consume the token and it expired!');
         } else {
             $link .= '/accountstatus/accountstatus.php?token=' . $this->get(self::TOKEN);

tests/unit/web/lib/admin/domain/SilverBulletUserTest.php

Spacing +8 added lines, -8 removed lines

@@ -5,7 +5,7 @@ 
 use web\lib\admin\domain\Attribute;
 use web\lib\admin\domain\SilverbulletInvitation;
 
-class SilverbulletUserTest extends PHPUnit_Framework_TestCase{
+class SilverbulletUserTest extends PHPUnit_Framework_TestCase {
     
     private $username = 'testusername';
     
@@ -26,7 +26,7 @@ 
         $this->newUser->setExpiry('now');
     }
     
-    public function testNewUser(){
+    public function testNewUser() {
         $this->newUser->save();
         $this->assertNotEmpty($this->newUser->getIdentifier());
         
@@ -50,7 +50,7 @@ 
         $list = SilverbulletUser::getList($this->profileId);
         $found = false;
         foreach ($list as $user) {
-            if($user->getIdentifier() == $this->newUser->getIdentifier()){
+            if ($user->getIdentifier() == $this->newUser->getIdentifier()) {
                 $found = true;
                 break;
             }
@@ -61,12 +61,12 @@ 
         $this->assertTrue($result);
     }
     
-    public function testInactiveUser(){
+    public function testInactiveUser() {
         $this->newUser->save();
         $this->assertFalse($this->newUser->hasCertificates());
     }
     
-    public function testActiveUser(){
+    public function testActiveUser() {
         $this->newUser->save();
         $invitation = new SilverbulletInvitation($this->newUser);
         $invitation->setQuantity(2);
@@ -83,10 +83,10 @@ 
         $this->assertEquals(2, count($certificates));
     }
     
-    public function testSetDeactivated(){
+    public function testSetDeactivated() {
         $serial = '29837498273948';
         $cn = 'testCommonName';
-        $expiry = date('Y-m-d',strtotime("tomorrow"));
+        $expiry = date('Y-m-d', strtotime("tomorrow"));
         
         //Testing new user deactivation
         $this->newUser->save();
@@ -130,7 +130,7 @@ 
         $this->assertEquals(SilverbulletUser::ACTIVE, $existingUser->get(SilverbulletUser::DEACTIVATION_STATUS));
     }
     
-    protected function tearDown(){
+    protected function tearDown() {
         $this->newUser->delete();
         $this->profile->delete();
     }

tests/unit/web/lib/admin/domain/SilverbulletControllerTest.php

Spacing +12 added lines, -12 removed lines

@@ -15,24 +15,24 @@ 
 use web\lib\admin\http\SilverbulletContext;
 use web\lib\admin\domain\SilverbulletInvitation;
 
-if ( !isset( $_SESSION ) ) $_SESSION = array();
+if (!isset($_SESSION)) $_SESSION = array();
 
-class MockInstitutionPageBuilder extends InstitutionPageBuilder{
+class MockInstitutionPageBuilder extends InstitutionPageBuilder {
     
     private $profile;
     
-    public function __construct($profile){
+    public function __construct($profile) {
         parent::__construct(new DefaultHtmlPage("Test Page"));
         $this->profile = $profile; 
     }
     
-    public function getProfile(){
+    public function getProfile() {
         return $this->profile;
     }
     
 }
 
-class SilverbulletControllerTest extends PHPUnit_Framework_TestCase{
+class SilverbulletControllerTest extends PHPUnit_Framework_TestCase {
     
     private $username = 'testusername';
     
@@ -44,7 +44,7 @@ 
     
     private $factory;
     
-    protected function setUp(){
+    protected function setUp() {
         $this->databaseHandle = \core\DBConnection::handle('INST');
         
         $this->profile = new MockProfileSilverbullet($this->databaseHandle);
@@ -64,7 +64,7 @@ 
         $usersAfter = count(SilverbulletUser::getList($this->profile->identifier));
         $this->assertFalse($usersAfter > $usersBefore);
         
-        $_POST[AddUserCommand::PARAM_EXPIRY] = date('Y-m-d',strtotime("tomorrow"));
+        $_POST[AddUserCommand::PARAM_EXPIRY] = date('Y-m-d', strtotime("tomorrow"));
         $this->factory->parseRequest();
 
         $usersAfter = count(SilverbulletUser::getList($this->profile->identifier));
@@ -72,10 +72,10 @@ 
         
     }
 
-    private function countActiveUsers($users){
+    private function countActiveUsers($users) {
         $count = 0;
         foreach ($users as $user) {
-            if(!$user->isDeactivated()){
+            if (!$user->isDeactivated()) {
                 $count++;
             }
         }
@@ -147,7 +147,7 @@ 
     public function testRevokeGeneratedCertificate() {
         $serial = '29837498273948';
         $cn = 'testCommonName';
-        $expiry = date('Y-m-d',strtotime("tomorrow"));
+        $expiry = date('Y-m-d', strtotime("tomorrow"));
         
         $this->user->save();
 
@@ -172,9 +172,9 @@ 
         
     }
     
-    protected function tearDown(){
+    protected function tearDown() {
         $this->user->delete();
-        $this->databaseHandle->exec("DELETE FROM `".SilverbulletUser::TABLE."` WHERE `".SilverbulletUser::USERNAME."`='".$this->username."'");
+        $this->databaseHandle->exec("DELETE FROM `" . SilverbulletUser::TABLE . "` WHERE `" . SilverbulletUser::USERNAME . "`='" . $this->username . "'");
         $this->profile->delete();
     }
 }

Braces +3 added lines, -1 removed lines

@@ -15,7 +15,9 @@
 use web\lib\admin\http\SilverbulletContext;
 use web\lib\admin\domain\SilverbulletInvitation;
 
-if ( !isset( $_SESSION ) ) $_SESSION = array();
+if ( !isset( $_SESSION ) ) {
+    $_SESSION = array();
+}
 
 class MockInstitutionPageBuilder extends InstitutionPageBuilder{
     

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

Braces +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         
         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)){
                 $this->storeErrorMessage(sprintf(_("Invitations quantity '%' provided for user '%s' was not numeric. Assumed quantity as '1' !"), $invitationsQuantity, $user->getUsername()));

web/accountstatus/accountstatus.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 $cleanToken = FALSE;
 $operatingSystem = FALSE;
 $tokenStatus = ["status" => \core\ProfileSilverbullet::SB_TOKENSTATUS_INVALID,
-    "cert_status" => [],];
+    "cert_status" => [], ];
 $profile = NULL;
 $idp = NULL;
 $fed = NULL;
@@ -38,7 +38,7 @@ 
         // it can be VALID (exists and not redeemed, EXPIRED, REDEEMED or INVALID (non existent)
         $tokenStatus = \core\ProfileSilverbullet::tokenStatus($cleanToken);
     }
-} elseif (isset($_SERVER['SSL_CLIENT_SAN_Email']) || isset($_SERVER['SSL_CLIENT_SAN_Email_0']) ) {
+} elseif (isset($_SERVER['SSL_CLIENT_SAN_Email']) || isset($_SERVER['SSL_CLIENT_SAN_Email_0'])) {
     // maybe the user authenticated with his client cert? Then pick any of his
     // tokens to go on
     $certname = $_SERVER['SSL_CLIENT_SAN_Email'] ?? $_SERVER['SSL_CLIENT_SAN_Email_0'];