GEANT / CAT

web/lib/admin/http/SendTokenByEmail.php

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class SendTokenByEmail extends AbstractInvokerCommand{
+class SendTokenByEmail extends AbstractInvokerCommand {
     
     const COMMAND = "sendtokenbyemail";
     
@@ -39,7 +39,7 @@ 
      * @param string $commandToken
      * @param SilverbulletContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken, $context);
         $this->mail = OutsideComm::mailHandle();
         $this->detailsCommand = new GetTokenEmailDetails(GetTokenEmailDetails::COMMAND, $context);
@@ -52,7 +52,7 @@ 
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
     public function execute() {
-        if(isset($_POST[GetTokenEmailDetails::PARAM_TOKENLINK]) && isset($_POST[ValidateEmailAddress::PARAM_ADDRESS])){
+        if (isset($_POST[GetTokenEmailDetails::PARAM_TOKENLINK]) && isset($_POST[ValidateEmailAddress::PARAM_ADDRESS])) {
             
             $invitationToken = $this->parseString($_POST[GetTokenEmailDetails::PARAM_TOKENLINK]);
             $address = $this->parseString($_POST[ValidateEmailAddress::PARAM_ADDRESS]);
@@ -64,7 +64,7 @@ 
             $this->mail->addStringAttachment($bytestream, "qr-code-invitation.png", "base64", "image/png");
             
             $this->mail->addAddress($address);
-            if($this->mail->send()) {
+            if ($this->mail->send()) {
                 $this->storeInfoMessage(sprintf(_("Email message has been sent successfuly to '%s'!"), $address));
             } else {
                 $this->storeErrorMessage(sprintf(_("Email message could not be sent to '%s'. Mailer error: '%s'."), $address, $this->mail->ErrorInfo));

web/lib/admin/view/SendSmsBox.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
      * {@inheritDoc}
      * @see \web\lib\admin\view\AbstractDialogBox::renderControls()
      */
-    protected function renderControls(){
+    protected function renderControls() {
         ?>
         <div style="position: relative; padding-bottom: 10px; width: 450px;">
              <label>Enter user phone: +</label>

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

Spacing +9 added lines, -9 removed lines

@@ -8,7 +8,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class AddUsersCommand extends AbstractInvokerCommand{
+class AddUsersCommand extends AbstractInvokerCommand {
 
     const COMMAND = 'newusers';
 
@@ -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,27 +33,27 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
+    public function execute() {
         $parser = new CSVParser($_FILES[self::COMMAND], "\n", ',');
-        if(!$parser->isValid()){
+        if (!$parser->isValid()) {
             $this->storeErrorMessage(_('File either is empty or is not CSV file!'));
         }
         $userCount = 0;
         $invitationsCount = 0;
-        while($parser->hasMoreRows()){
+        while ($parser->hasMoreRows()) {
             $row = $parser->nextRow();
-            if(isset($row[0]) && isset($row[1])){
+            if (isset($row[0]) && isset($row[1])) {
                 $user = $this->context->createUser($row[0], $row[1], $this);
                 $max = empty($row[2]) ? 1 : intval($row[2]);
-                if(!empty($user->getIdentifier())){
+                if (!empty($user->getIdentifier())) {
                     $this->context->createInvitation($user, $this, $max);
                     $userCount++;
                 }
-            }else{
+            } else {
                  $this->storeErrorMessage(sprintf(_('Username or expiry date missing for %s record!'), $userCount + 1));
             }
         }
-        if($userCount>0){
+        if ($userCount > 0) {
             $this->storeInfoMessage(sprintf(_('%s total users were imported and %s invitations created!'), $userCount, $invitationsCount));
         }
     }

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

web/lib/admin/http/SilverbulletController.php

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/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