Commit 011027d0 authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'release/v4.8.2'

parents 74088e41 0d3df25d
......@@ -14,7 +14,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string
*/
const VERSION = '4.8.1';
const VERSION = '4.8.2';
/**
* Performs some startup checks
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1"
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1"
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -9,7 +9,7 @@ jQuery(document).ready(function ($) {
'captcha.extension.recaptcha_captcha_extension'
];
$('#captcha').on('change', function() {
$(':input[name="captcha"]').on('change', function() {
$recaptchaWrapper.toggle(serviceIds.indexOf(this.value) !== -1);
}).filter(':selected').triggerHandler('change');
}).triggerHandler('change');
});
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1",
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2",
"google/recaptcha": "^1.1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1"
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1"
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1"
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1"
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1"
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1",
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1"
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1",
"acp3/module-categories": "^4.8.1"
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2",
"acp3/module-categories": "^4.8.2"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1"
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1"
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1"
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1",
"acp3/module-categories": "^4.8.1"
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2",
"acp3/module-categories": "^4.8.2"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -45,25 +45,23 @@ class AccountStatus
/**
* @param int $status
* @param int|array $id
* @param int|array $entryId
*
* @return bool|int
*/
public function changeAccountStatus($status, $id)
public function changeAccountStatus($status, $entryId)
{
$bool = $this->accountRepository->update(
['status' => $status], $id
);
$result = $this->accountRepository->update(['status' => $status], $entryId);
if (is_array($id)) {
$accountId = $this->retrieveAccountId($id);
if (is_array($entryId)) {
$accountId = $this->retrieveAccountId($entryId);
$this->addAccountHistory($status, $accountId);
} else {
$this->addAccountHistory($status, $id);
$this->addAccountHistory($status, $entryId);
}
return $bool;
return $result;
}
/**
......@@ -83,18 +81,18 @@ class AccountStatus
}
/**
* @param array $id
* @param array $entry
*
* @return int
*/
protected function retrieveAccountId(array $id)
protected function retrieveAccountId(array $entry)
{
switch (key($id)) {
switch (key($entry)) {
case 'mail':
$account = $this->accountRepository->getOneByEmail($id['mail']);
$account = $this->accountRepository->getOneByEmail($entry['mail']);
break;
case 'hash':
$account = $this->accountRepository->getOneByHash($id['hash']);
$account = $this->accountRepository->getOneByHash($entry['hash']);
}
return (!empty($account)) ? $account['id'] : 0;
......
......@@ -144,34 +144,40 @@ class Subscribe
$systemSettings = $this->config->getSettings(\ACP3\Modules\ACP3\System\Installer\Schema::MODULE_NAME);
$settings = $this->config->getSettings(Schema::MODULE_NAME);
$subject = $this->translator->t('newsletter', 'subscribe_mail_subject', ['%title%' => $systemSettings['site_title']]);
$body = $this->translator->t('newsletter', 'subscribe_mail_body',
['{host}' => $this->request->getHost()]) . "\n\n";
$from = [
$body = $this->translator->t(
'newsletter',
'subscribe_mail_body',
['{host}' => $this->request->getHost()]
);
$body .= "\n\n";
$data = (new Core\Mailer\MailerMessage())
->setFrom([
'email' => $settings['mail'],
'name' => $systemSettings['site_title']
];
$this->mailer
->reset()
->setFrom($from)
->setSubject($subject)
->setMailSignature($settings['mailsig']);
])
->setSubject($this->translator->t(
'newsletter',
'subscribe_mail_subject',
['%title%' => $systemSettings['site_title']]
))
->setMailSignature($settings['mailsig'])
->setRecipients($emailAddress);
if ($settings['html'] == 1) {
$this->mailer->setTemplate('newsletter/layout.email.tpl');
$data->setTemplate('newsletter/layout.email.subscribe.tpl');
$body .= '<a href="' . $url . '">' . $url . '<a>';
$this->mailer->setHtmlBody($this->stringFormatter->nl2p($body));
$data->setHtmlBody($this->stringFormatter->nl2p($body));
} else {
$body .= $url;
$this->mailer->setBody($body);
$data->setBody($body);
}
$this->mailer->setRecipients($emailAddress);
return $this->mailer->send();
return $this->mailer
->reset()
->setData($data)
->send();
}
/**
......
{extends file="asset:Newsletter/layout.email.tpl"}
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1"
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1"
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1"
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2"
},
"autoload": {
"psr-4": {
......
......@@ -30,7 +30,7 @@
{include file="asset:System/Partials/form_group.button_group.tpl" options=$search_areas required=true label={lang t="search|search_after_areas"}}
{include file="asset:System/Partials/form_group.button_group.tpl" options=$sort_hits required=true label={lang t="search|sort_hits"}}
</div>
{include file="asset:System/Partials/form_group.submit.tpl" submitLabel={lang t="search|submit_search"}}
{include file="asset:System/Partials/form_group.submit.tpl" submit_label={lang t="search|submit_search"}}
{javascripts}
{include_js module="search" file="frontend/index.index"}
{/javascripts}
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1"
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1",
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
{extends file="asset:System/Partials/form_group.base.tpl"}
{block FORM_GROUP_FORM_FIELD}
<button type="submit" name="submit" class="btn btn-primary{if !empty($btn_class_submit)} {$btn_class_submit}{/if}">
{if !empty($submitLabel)}
{$submitLabel}
<button type="submit" name="submit" class="btn{if !empty($submit_btn_class)} {$submit_btn_class}{else} btn-primary{/if}">
{if !empty($submit_label)}
{$submit_label}
{else}
{lang t="system|submit"}
{/if}
</button>
{if !empty($back_url)}
<a href="{$back_url}" class="btn btn-default{if !empty($btn_class_back)} {$btn_class_back}{/if}">
<a href="{$back_url}" class="btn{if !empty($back_btn_class)} {$back_btn_class}{else} btn-default{/if}">
{if !empty($back_label)}
{$back_label}
{else}
{lang t="system|cancel"}
{/if}
</a>
{/if}
{if !empty($form_token)}
......
......@@ -46,7 +46,7 @@
margin: 0 auto;
}
.logo {
height: 89px;
padding: 15px 0;
}
.text-left {
text-align: left;
......@@ -74,9 +74,9 @@
<center>
<table border="0" cellpadding="0" cellspacing="0" class="email-content-wrapper">
<tr>
<td class="text-center">
<td class="text-center logo">
{block EMAIL_HEADER}
<img src="{image file="logo.png" absolute=true}" alt="{site_title}" class="logo">
<img src="{image file="logo.png" absolute=true}" alt="{site_title}">
{/block}
</td>
</tr>
......
......@@ -18,11 +18,11 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-users": "^4.8.1"
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-users": "^4.8.2"
},
"autoload": {
"psr-4": {
......
......@@ -4,13 +4,5 @@
{include file="asset:System/Partials/form_group.input_text.tpl" name="nickname" required=true maxlength=30 label={lang t="users|nickname"}}
{include file="asset:System/Partials/form_group.input_password.tpl" name="pwd" required=true label={lang t="users|pwd"}}
{include file="asset:System/Partials/form_group.checkbox.tpl" options=$remember_me}
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" name="submit" class="btn btn-primary">
<i class="glyphicon glyphicon-lock"></i>
{lang t="users|log_in"}
</button>
<a href="{uri args="users/index/forgot_pwd"}" class="btn btn-link">{lang t="users|forgot_pwd"}</a>
</div>
</div>
{include file="asset:System/Partials/form_group.submit.tpl" submit_label={lang t="users|log_in"} back_url={uri args="users/index/forgot_pwd"} back_label={lang t="users|forgot_pwd"} back_btn_class='btn-link'}
{/block}
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1"
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1",
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2",
"ckeditor/ckeditor": "dev-full/4.6.x"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.8.1",
"acp3/setup": "^4.8.1",
"acp3/module-errors": "^4.8.1",
"acp3/module-permissions": "^4.8.1",
"acp3/module-system": "^4.8.1",
"acp3/module-users": "^4.8.1",
"acp3/core": "^4.8.2",
"acp3/setup": "^4.8.2",
"acp3/module-errors": "^4.8.2",
"acp3/module-permissions": "^4.8.2",
"acp3/module-system": "^4.8.2",
"acp3/module-users": "^4.8.2",