Added urldecode parsing for env var
This commit is contained in:
parent
cf4d4c30d0
commit
54f80e588a
9 changed files with 19 additions and 13 deletions
|
@ -124,7 +124,7 @@ $register->set('smtp', function () use ($request) {
|
|||
$mail->SMTPSecure = $request->getServer('_APP_SMTP_SECURE', false);
|
||||
$mail->SMTPAutoTLS = false;
|
||||
|
||||
$from = $request->getServer('_APP_SYSTEM_EMAIL_NAME', APP_NAME.' Server');
|
||||
$from = urldecode($request->getServer('_APP_SYSTEM_EMAIL_NAME', APP_NAME.' Server'));
|
||||
$email = $request->getServer('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
|
||||
|
||||
$mail->setFrom($email, $from);
|
||||
|
@ -267,7 +267,7 @@ $register->get('smtp')
|
|||
->setFrom(
|
||||
$request->getServer('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM),
|
||||
($project->getUid() === 'console')
|
||||
? $request->getServer('_APP_SYSTEM_EMAIL_NAME', APP_NAME.' Server')
|
||||
? urldecode($request->getServer('_APP_SYSTEM_EMAIL_NAME', APP_NAME.' Server'))
|
||||
: sprintf(Locale::getText('account.emails.team'), $project->getAttribute('name')
|
||||
)
|
||||
);
|
||||
|
|
|
@ -277,7 +277,7 @@ $providers = $this->getParam('providers', []);
|
|||
</form>
|
||||
</div>
|
||||
</td>
|
||||
<td data-title="Members: "><span data-ls-bind="{{team.sum}} Users"></span></td>
|
||||
<td data-title="Members: "><span data-ls-bind="{{team.sum}} members"></span></td>
|
||||
<td data-title="Date Created: "><small data-ls-bind="{{team.dateCreated|date-text}}"></small></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
|
2
public/dist/styles/default-ltr.css
vendored
2
public/dist/styles/default-ltr.css
vendored
File diff suppressed because one or more lines are too long
2
public/dist/styles/default-rtl.css
vendored
2
public/dist/styles/default-rtl.css
vendored
File diff suppressed because one or more lines are too long
|
@ -6,7 +6,7 @@
|
|||
padding: 0;
|
||||
right: 0;
|
||||
left: 0;
|
||||
color: #ffffff;
|
||||
color: var(--config-color-background-fade);
|
||||
z-index: 1002;
|
||||
margin: 0 auto;
|
||||
bottom: 15px;
|
||||
|
|
|
@ -159,8 +159,8 @@ a.box:hover {
|
|||
border-bottom: none;
|
||||
border-right: none;
|
||||
border-left: none;
|
||||
background: #f8fdff;
|
||||
box-shadow: 0 0 1px rgba(0, 0, 0, .2);
|
||||
opacity: .7;
|
||||
}
|
||||
|
||||
.box-asidex {
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
}
|
||||
|
||||
p {
|
||||
color: #737373;
|
||||
color: var(--config-color-fade);
|
||||
}
|
||||
|
||||
.button {
|
||||
|
|
|
@ -106,10 +106,10 @@
|
|||
.info {
|
||||
margin: 0 -30px;
|
||||
padding: 20px 30px;
|
||||
background: #f5fbff;
|
||||
color: #3b5d73;
|
||||
border-top: solid 1px #eaf2f7;
|
||||
border-bottom: solid 1px #eaf2f7;
|
||||
background: var(--config-modal-note-background);
|
||||
color: var(--config-modal-note-color);
|
||||
border-top: solid 1px var(--config-modal-note-border);
|
||||
border-bottom: solid 1px var(--config-modal-note-border);
|
||||
}
|
||||
|
||||
button.close {
|
||||
|
|
|
@ -56,6 +56,9 @@
|
|||
--config-language-go-contrast: #ffffff;
|
||||
--config-language-dart: #035698;
|
||||
--config-language-dart-contrast: #2bb1f0;
|
||||
--config-modal-note-background: #f5fbff;
|
||||
--config-modal-note-border: #eaf2f7;
|
||||
--config-modal-note-color: #3b5d73;
|
||||
|
||||
// Console
|
||||
--config-console-background: #eceff1;
|
||||
|
@ -69,7 +72,7 @@
|
|||
.theme-dark {
|
||||
--config-color-background: #061F2F;
|
||||
--config-color-background-fade: #1c223a;
|
||||
--config-color-background-focus: #1c2138;
|
||||
--config-color-background-focus: #1f253e;
|
||||
--config-color-background-input: #dce8f5;
|
||||
--config-color-tooltip-text: #061F2F;
|
||||
--config-color-tooltip-background: #dce8f5;
|
||||
|
@ -116,6 +119,9 @@
|
|||
--config-language-go-contrast: var(--config-color-background);
|
||||
--config-language-dart: var(--config-color-normal);
|
||||
--config-language-dart-contrast: var(--config-color-background);
|
||||
--config-modal-note-background: #15192b;
|
||||
--config-modal-note-border: #161b31;
|
||||
--config-modal-note-color: var(--config-color-normal);
|
||||
|
||||
// Console
|
||||
--config-console-background: #20263f;
|
||||
|
|
Loading…
Reference in a new issue