Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't put the SMTP password into the HTML code #4372

Merged
merged 4 commits into from
Apr 18, 2017
Merged

Conversation

nickvergessen
Copy link
Member

Fix #4354

Signed-off-by: Joas Schilling <coding@schilljs.com>
@mention-bot
Copy link

@nickvergessen, thanks for your PR! By analyzing the history of the files in this pull request, we identified @LukasReschke, @MorrisJobke and @schiessle to be potential reviewers.

Signed-off-by: Joas Schilling <coding@schilljs.com>
@codecov
Copy link

codecov bot commented Apr 18, 2017

Codecov Report

Merging #4372 into master will decrease coverage by 16.44%.
The diff coverage is 0%.

@@              Coverage Diff              @@
##             master    #4372       +/-   ##
=============================================
- Coverage     54.07%   37.63%   -16.45%     
- Complexity    21589    21591        +2     
=============================================
  Files          1327     1327               
  Lines         82303    82280       -23     
  Branches       1305     1305               
=============================================
- Hits          44509    30966    -13543     
- Misses        37794    51314    +13520
Impacted Files Coverage Δ Complexity Δ
lib/private/Settings/Admin/Additional.php 0% <0%> (-90.48%) 5 <0> (+1)
settings/templates/admin/additional-mail.php 0% <0%> (ø) 0 <0> (ø) ⬇️
settings/Controller/MailSettingsController.php 12.96% <0%> (-40.47%) 11 <0> (+1)
.../Exceptions/EncryptionHeaderKeyExistsException.php 0% <0%> (-100%) 1% <0%> (ø)
core/Command/TwoFactorAuth/Disable.php 0% <0%> (-100%) 4% <0%> (ø)
core/Command/TwoFactorAuth/Enable.php 0% <0%> (-100%) 4% <0%> (ø)
apps/user_ldap/lib/Settings/Section.php 0% <0%> (-100%) 5% <0%> (ø)
...curity/Exceptions/StrictCookieMissingException.php 0% <0%> (-100%) 1% <0%> (ø)
...factor_backupcodes/lib/Activity/GenericSetting.php 0% <0%> (-100%) 8% <0%> (ø)
apps/files/lib/Activity/Settings/FileChanged.php 0% <0%> (-100%) 8% <0%> (ø)
... and 445 more

Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works 👍

@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Apr 18, 2017
@MorrisJobke MorrisJobke merged commit d379ac7 into master Apr 18, 2017
@MorrisJobke MorrisJobke deleted the smtp-password branch April 18, 2017 21:13
<select name='mail_smtpauthtype' id='mail_smtpauthtype'>
<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
<label for="mail_smtpauthtype"><?php p($l->t('Authentication method')); ?></label>
<select name="mail_smtpauthtype" id="mail_smtpauthtype'>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One ' was not replaced 🙈 (see #11218)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish feature: settings
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants