GEANT / CAT

web/lib/admin/view/AbstractDialogBox.php

Spacing +2 added lines, -2 removed lines

@@ -13,13 +13,13 @@
     
     protected $action = '';
     
-    protected $params = array ();
+    protected $params = array();
     
     /**
      * 
      * @param string $action
      */
-    public function __construct($action){
+    public function __construct($action) {
         $this->action = $action;
     }
     

core/common/OutsideComm.php

Spacing +2 added lines, -2 removed lines

@@ -172,9 +172,9 @@
                 $totalFailures = 0;
                 foreach ($decoded_response['messages'] as $message) {
                     if ($message['status'] == 0) {
-                        $loggerInstance->debug(2, $message['message-id']. ": Success");
+                        $loggerInstance->debug(2, $message['message-id'] . ": Success");
                     } else {
-                        $loggerInstance->debug(2, $message['message-id']. ": Failed (failure code = ".$message['status'].")");
+                        $loggerInstance->debug(2, $message['message-id'] . ": Failed (failure code = " . $message['status'] . ")");
                         $totalFailures++;
                     }
                 }

core/diag/Telepath.php

Doc Comments +3 added lines

@@ -120,6 +120,9 @@
         return Telepath::STATUS_GOOD;
     }
 
+    /**
+     * @param string $homeFlr
+     */
     private function checkNROFlow($visitedFlr, $homeFlr) {
         // TODO: this is a stub, need eduroam OT API to query the current server status
         // APIQueryNRODirect($visitedFlr, $homeFlr);

web/lib/admin/view/ComposeEmailBox.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,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>Send email using client aplication:</label>

web/lib/admin/http/SendTokenBySms.php

Spacing +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class SendTokenBySms extends AbstractInvokerCommand{
+class SendTokenBySms extends AbstractInvokerCommand {
     
     const COMMAND = "sendtokenbysms";
     const PARAM_PHONE = "phone";
@@ -38,7 +38,7 @@ 
      * @param string $commandToken
      * @param SilverbulletContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken, $context);
         $this->detailsCommand = new GetTokenEmailDetails(GetTokenEmailDetails::COMMAND, $context);
         $this->context = $context;
@@ -49,7 +49,7 @@ 
      * @param string $phone
      * @param string $content
      */
-    private function sendSMS($phone, $content){
+    private function sendSMS($phone, $content) {
         $error = "";
         $result = -1;
         try {
@@ -79,7 +79,7 @@ 
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
     public function execute() {
-        if(isset($_POST[GetTokenEmailDetails::PARAM_TOKENLINK]) && isset($_POST[SendTokenBySms::PARAM_PHONE])){
+        if (isset($_POST[GetTokenEmailDetails::PARAM_TOKENLINK]) && isset($_POST[SendTokenBySms::PARAM_PHONE])) {
             
             $invitationToken = $this->parseString($_POST[GetTokenEmailDetails::PARAM_TOKENLINK]);
             $phone = $this->parseString($_POST[SendTokenBySms::PARAM_PHONE]);

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