@@ -37,15 +37,15 @@ discard block |
||
| 37 | 37 | if($commandToken == SaveUsersCommand::COMMAND){ |
| 38 | 38 | if(isset($_POST[DeleteUserCommand::COMMAND])){ |
| 39 | 39 | $commandToken = DeleteUserCommand::COMMAND; |
| 40 | - }elseif(isset($_POST[AddInvitationCommand::COMMAND])){ |
|
| 40 | + } elseif(isset($_POST[AddInvitationCommand::COMMAND])){ |
|
| 41 | 41 | $commandToken = AddInvitationCommand::COMMAND; |
| 42 | - }elseif(isset($_POST[UpdateUserCommand::COMMAND])){ |
|
| 42 | + } elseif(isset($_POST[UpdateUserCommand::COMMAND])){ |
|
| 43 | 43 | $commandToken = UpdateUserCommand::COMMAND; |
| 44 | - }elseif (isset($_POST[RevokeCertificateCommand::COMMAND])){ |
|
| 44 | + } elseif (isset($_POST[RevokeCertificateCommand::COMMAND])){ |
|
| 45 | 45 | $commandToken = RevokeCertificateCommand::COMMAND; |
| 46 | - }elseif (isset($_POST[RevokeInvitationCommand::COMMAND])){ |
|
| 46 | + } elseif (isset($_POST[RevokeInvitationCommand::COMMAND])){ |
|
| 47 | 47 | $commandToken = RevokeInvitationCommand::COMMAND; |
| 48 | - }elseif (isset($_POST[SaveUsersCommand::COMMAND])){ |
|
| 48 | + } elseif (isset($_POST[SaveUsersCommand::COMMAND])){ |
|
| 49 | 49 | $commandToken = SaveUsersCommand::COMMAND; |
| 50 | 50 | } |
| 51 | 51 | } |
@@ -63,31 +63,31 @@ discard block |
||
| 63 | 63 | if($this->context->isAgreementSigned()){ |
| 64 | 64 | if($commandToken == AddUserCommand::COMMAND){ |
| 65 | 65 | return new AddUserCommand($commandToken, $this->context); |
| 66 | - }elseif ($commandToken == AddUsersCommand::COMMAND){ |
|
| 66 | + } elseif ($commandToken == AddUsersCommand::COMMAND){ |
|
| 67 | 67 | return new AddUsersCommand($commandToken, $this->context); |
| 68 | - }elseif ($commandToken == DeleteUserCommand::COMMAND){ |
|
| 68 | + } elseif ($commandToken == DeleteUserCommand::COMMAND){ |
|
| 69 | 69 | return new DeleteUserCommand($commandToken, $this->context); |
| 70 | - }elseif ($commandToken == AddInvitationCommand::COMMAND){ |
|
| 70 | + } elseif ($commandToken == AddInvitationCommand::COMMAND){ |
|
| 71 | 71 | return new AddInvitationCommand($commandToken, $this->context); |
| 72 | - }elseif ($commandToken == UpdateUserCommand::COMMAND){ |
|
| 72 | + } elseif ($commandToken == UpdateUserCommand::COMMAND){ |
|
| 73 | 73 | return new UpdateUserCommand($commandToken, $this->context); |
| 74 | - }elseif ($commandToken == RevokeCertificateCommand::COMMAND){ |
|
| 74 | + } elseif ($commandToken == RevokeCertificateCommand::COMMAND){ |
|
| 75 | 75 | return new RevokeCertificateCommand($commandToken, $this->context); |
| 76 | - }elseif ($commandToken == RevokeInvitationCommand::COMMAND){ |
|
| 76 | + } elseif ($commandToken == RevokeInvitationCommand::COMMAND){ |
|
| 77 | 77 | return new RevokeInvitationCommand($commandToken, $this->context); |
| 78 | - }elseif ($commandToken == SaveUsersCommand::COMMAND){ |
|
| 78 | + } elseif ($commandToken == SaveUsersCommand::COMMAND){ |
|
| 79 | 79 | return new SaveUsersCommand($commandToken, $this->context); |
| 80 | - }elseif ($commandToken == SendTokenByEmail::COMMAND){ |
|
| 80 | + } elseif ($commandToken == SendTokenByEmail::COMMAND){ |
|
| 81 | 81 | return new SendTokenByEmail($commandToken, $this->context); |
| 82 | - }elseif ($commandToken == SendTokenBySms::COMMAND){ |
|
| 82 | + } elseif ($commandToken == SendTokenBySms::COMMAND){ |
|
| 83 | 83 | return new SendTokenBySms($commandToken, $this->context); |
| 84 | - }else{ |
|
| 84 | + } else{ |
|
| 85 | 85 | return new DefaultCommand($commandToken); |
| 86 | 86 | } |
| 87 | - }else{ |
|
| 87 | + } else{ |
|
| 88 | 88 | if($commandToken == TermsOfUseCommand::COMMAND){ |
| 89 | 89 | return new TermsOfUseCommand($commandToken, $this->context); |
| 90 | - }else{ |
|
| 90 | + } else{ |
|
| 91 | 91 | return new DefaultCommand($commandToken); |
| 92 | 92 | } |
| 93 | 93 | } |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | $this->context->createInvitation($user, $this, $max); |
| 50 | 50 | $userCount++; |
| 51 | 51 | } |
| 52 | - }else{ |
|
| 52 | + } else{ |
|
| 53 | 53 | $this->storeErrorMessage(sprintf(_('Username or expiry date missing for %s record!'), $userCount + 1)); |
| 54 | 54 | } |
| 55 | 55 | } |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | $acknowledgeLevel = $user->getAcknowledgeLevel(); |
| 159 | 159 | if($acknowledgeLevel == SilverbulletUser::LEVEL_YELLOW){ |
| 160 | 160 | $row->addAttribute('style', 'background-color:#F0EAC0;'); |
| 161 | - }elseif ($acknowledgeLevel == SilverbulletUser::LEVEL_RED){ |
|
| 161 | + } elseif ($acknowledgeLevel == SilverbulletUser::LEVEL_RED){ |
|
| 162 | 162 | $row->addAttribute('style', 'background-color:#F0C0C0;'); |
| 163 | 163 | } |
| 164 | 164 | |
@@ -215,11 +215,11 @@ discard block |
||
| 215 | 215 | $certificateBox->addAttribute('style', 'background-color:#F0C0C0;'); |
| 216 | 216 | $buttonContainer->addAttribute('style', 'height:22px; margin-top:7px; text-align:center;'); |
| 217 | 217 | $buttonContainer->addText(_("REVOKED")); |
| 218 | - }elseif ($certificate->isExpired()){ |
|
| 218 | + } elseif ($certificate->isExpired()){ |
|
| 219 | 219 | $certificateBox->addAttribute('style', 'background-color:lightgrey;'); |
| 220 | 220 | $buttonContainer->addAttribute('style', 'height:22px; margin-top:7px; text-align:center;'); |
| 221 | 221 | $buttonContainer->addText(_("EXPIRED")); |
| 222 | - }else{ |
|
| 222 | + } else{ |
|
| 223 | 223 | $buttonContainer->addAttribute('style', 'text-align:right;padding-top: 5px;'); |
| 224 | 224 | $buttonContainer->addText(new Button(_('Revoke'), 'submit', RevokeCertificateCommand::COMMAND, $certificate->getIdentifier(), 'delete')); |
| 225 | 225 | } |
@@ -15,7 +15,9 @@ |
||
| 15 | 15 | use web\lib\admin\http\SilverbulletContext; |
| 16 | 16 | use web\lib\admin\domain\SilverbulletInvitation; |
| 17 | 17 | |
| 18 | -if ( !isset( $_SESSION ) ) $_SESSION = array(); |
|
| 18 | +if ( !isset( $_SESSION ) ) { |
|
| 19 | + $_SESSION = array(); |
|
| 20 | +} |
|
| 19 | 21 | |
| 20 | 22 | class MockInstitutionPageBuilder extends InstitutionPageBuilder{ |
| 21 | 23 | |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | |
| 46 | 46 | if($user->isExpired()){ |
| 47 | 47 | $this->storeErrorMessage(sprintf(_("User '%s' has expired. In order to generate credentials please extend the expiry date!"), $user->getUsername())); |
| 48 | - }else{ |
|
| 48 | + } else{ |
|
| 49 | 49 | $this->context->createInvitation($user, $this, (int) $invitationsQuantity); |
| 50 | 50 | if(!is_numeric($invitationsQuantity)){ |
| 51 | 51 | $this->storeErrorMessage(sprintf(_("Invitations quantity '%' provided for user '%s' was not numeric. Assumed quantity as '1' !"), $invitationsQuantity, $user->getUsername())); |
@@ -160,9 +160,9 @@ |
||
| 160 | 160 | |
| 161 | 161 | if ($this->isRevoked()){ |
| 162 | 162 | $link = _('This token has been revoked!'); |
| 163 | - }else if($this->isAbsent()){ |
|
| 163 | + } else if($this->isAbsent()){ |
|
| 164 | 164 | $link = _('All available activations were used!'); |
| 165 | - }else if ($this->isExpired()) { |
|
| 165 | + } else if ($this->isExpired()) { |
|
| 166 | 166 | $link = _('User did not consume the token and it expired!'); |
| 167 | 167 | } else { |
| 168 | 168 | $link .= '/accountstatus/accountstatus.php?token=' . $this->get(self::TOKEN); |
@@ -297,10 +297,11 @@ |
||
| 297 | 297 | <allow-save>true</allow-save> |
| 298 | 298 | '; |
| 299 | 299 | if ($use_anon == 1) { |
| 300 | - if ($outer_user == '') |
|
| 301 | - $profileFileCont .= '<AnonymousIdentity>@</AnonymousIdentity>'; |
|
| 302 | - else |
|
| 303 | - $profileFileCont .= '<AnonymousIdentity>' . $outer_id . '</AnonymousIdentity>'; |
|
| 300 | + if ($outer_user == '') { |
|
| 301 | + $profileFileCont .= '<AnonymousIdentity>@</AnonymousIdentity>'; |
|
| 302 | + } else { |
|
| 303 | + $profileFileCont .= '<AnonymousIdentity>' . $outer_id . '</AnonymousIdentity>'; |
|
| 304 | + } |
|
| 304 | 305 | } |
| 305 | 306 | $profileFileCont .= '</ClientSideCredential> |
| 306 | 307 | <ServerSideCredential> |