...
 
Commits (12)
......@@ -41,27 +41,12 @@ define('controls/system/settings/Mail', [
* event : on import
*/
$onImport: function () {
var self = this,
Panel = this.$Panel,
var Panel = this.$Panel,
Content = Panel.getContent();
var Table = Content.getElement('table:last-child');
// ssl select
var Select = Content.getElement('[name="mail.SMTPSecure"]');
Select.addEvent('change', function () {
if (this.value == 'ssl') {
self.showSSLOptions();
return;
}
self.hideSSLOptions();
});
if (Select.value == 'ssl') {
self.showSSLOptions();
}
this.showSSLOptions();
new QUIButton({
text : QUILocale.get('quiqqer/quiqqer', 'test.mail.button'),
......@@ -104,35 +89,35 @@ define('controls/system/settings/Mail', [
VerifyPeer.set({
html: '<td>' +
' <p>' +
' <label class="checkbox-label hasCheckbox">' +
' <input type="checkbox" name="mail.SMTPSecureSSL_verify_peer" />' +
QUILocale.get('quiqqer/quiqqer', 'mail.settings.verify_peer') +
' </label>' +
' </p>' +
'</td>'
' <p>' +
' <label class="checkbox-label hasCheckbox">' +
' <input type="checkbox" name="mail.SMTPSecureSSL_verify_peer" />' +
QUILocale.get('quiqqer/quiqqer', 'mail.settings.verify_peer') +
' </label>' +
' </p>' +
'</td>'
});
VerifyPeerName.set({
html: '<td>' +
' <p>' +
' <label class="checkbox-label hasCheckbox">' +
' <input type="checkbox" name="mail.SMTPSecureSSL_verify_peer_name" />' +
QUILocale.get('quiqqer/quiqqer', 'mail.settings.verify_peer_name') +
' </label>' +
' </p>' +
'</td>'
' <p>' +
' <label class="checkbox-label hasCheckbox">' +
' <input type="checkbox" name="mail.SMTPSecureSSL_verify_peer_name" />' +
QUILocale.get('quiqqer/quiqqer', 'mail.settings.verify_peer_name') +
' </label>' +
' </p>' +
'</td>'
});
AllowSelfSigned.set({
html: '<td>' +
' <p>' +
' <label class="checkbox-label hasCheckbox">' +
' <input type="checkbox" name="mail.SMTPSecureSSL_allow_self_signed" />' +
QUILocale.get('quiqqer/quiqqer', 'mail.settings.allow_self_signed') +
' </label>' +
' </p>' +
'</td>'
' <p>' +
' <label class="checkbox-label hasCheckbox">' +
' <input type="checkbox" name="mail.SMTPSecureSSL_allow_self_signed" />' +
QUILocale.get('quiqqer/quiqqer', 'mail.settings.allow_self_signed') +
' </label>' +
' </p>' +
'</td>'
});
VerifyPeer.addClass(evenCssClass ? 'odd' : 'even');
......
......@@ -51,7 +51,7 @@ define('controls/upload/Form', [
action : URL_LIB_DIR + 'QUI/Upload/bin/upload.php',
method : 'POST', // form method
maxuploads : false, // how many uploads are allowed
multible : false, // are multible uploads allowed?
multiple : false, // are multiple uploads allowed?
sendbutton : false, // insert a send button
cancelbutton: false, // insert a cancel button
styles : false
......@@ -74,6 +74,12 @@ define('controls/upload/Form', [
this.setParams(options.params);
}
// quiqqer/quiqqer#772
if (typeof options.multible !== 'undefined') {
options.multiple = options.multible;
delete options.multible;
}
var self = this;
this.parent(options);
......@@ -218,10 +224,10 @@ define('controls/upload/Form', [
this.$Elm = new Element('div', {
'class': 'controls-upload-form',
html : '<div class="controls-upload-info"></div>' +
'<div class="controls-upload-buttons"></div>' +
'<div class="controls-upload-bg-text">' +
Locale.get(lg, 'upload.form.background.text') +
'</div>',
'<div class="controls-upload-buttons"></div>' +
'<div class="controls-upload-bg-text">' +
Locale.get(lg, 'upload.form.background.text') +
'</div>',
styles : {
height: 140
}
......@@ -423,7 +429,7 @@ define('controls/upload/Form', [
if (this.getAttribute('maxuploads') !== false &&
elms.length !== 0 &&
this.getAttribute('maxuploads') < elms.length) {
this.getAttribute('maxuploads') <= elms.length) {
QUI.getMessageHandler(function (MH) {
MH.addError(
......@@ -441,7 +447,7 @@ define('controls/upload/Form', [
var Input = new Element('input', {
type : "file",
name : "files",
multiple: true,
multiple: !!this.getAttribute('multiple'),
events : {
change: this.$onInputChange.bind(this)
},
......@@ -601,10 +607,10 @@ define('controls/upload/Form', [
createInfo: function () {
this.$Info = new Element('div', {
html : '<div class="file-name">' +
Locale.get(lg, 'upload.form.info.text') +
'</div>' +
'<div class="upload-time"></div>' +
'<div class="progress"></div>',
Locale.get(lg, 'upload.form.info.text') +
'</div>' +
'<div class="upload-time"></div>' +
'<div class="progress"></div>',
'class': 'upload-manager-file box smooth'
});
......
......@@ -2,7 +2,7 @@
"name": "quiqqer/quiqqer",
"type": "quiqqer-system",
"description": "A modular based management system written in JavaScript and PHP",
"version": "dev-master",
"version": "1.2.5",
"license": "GPL-3.0+",
"authors": [
{
......@@ -29,7 +29,7 @@
}
],
"require": {
"php": ">=5.3",
"php": ">=5.6",
"composer/composer": "1.5.*",
"tedivm/stash": "0.14.*",
"robloach/component-installer": "0.0.12",
......@@ -43,25 +43,25 @@
"dusank/knapsack": "8.*",
"league/climate": "3.*",
"ramsey/uuid": "3.*",
"quiqqer/composer": ">=1.3|dev-master|dev-dev",
"quiqqer/controls": "dev-master|dev-dev",
"quiqqer/qui": ">=1|dev-master|dev-dev",
"quiqqer/qui-php": "0.10.0|dev-master|dev-dev",
"quiqqer/smarty3": "1.*|dev-master|dev-dev",
"quiqqer/ckeditor4": "2.*|1.*|dev-master|dev-dev",
"quiqqer/calendar-controls": "1.*|dev-master|dev-dev",
"quiqqer/countries": "1.*|dev-master|dev-dev",
"quiqqer/colorpicker": ">=1.1|dev-master|dev-dev",
"quiqqer/translator": "1.*|dev-master|dev-dev",
"quiqqer/utils": ">=1.9|dev-master|dev-dev",
"quiqqer/cron": "1.*|dev-master|dev-dev",
"quiqqer/log": "1.*|dev-master|dev-dev",
"quiqqer/diashow": ">=0.9|dev-master|dev-dev",
"quiqqer/lockclient": "1.*|dev-master|dev-dev",
"quiqqer/messages": "1.*|dev-master|dev-dev",
"quiqqer/meta": "0.9.*|dev-master|dev-dev",
"quiqqer/composer": ">=1.3",
"quiqqer/controls": "1.*|>=0.9.0",
"quiqqer/qui": ">=1",
"quiqqer/qui-php": ">=0.11.0",
"quiqqer/smarty3": "1.*",
"quiqqer/ckeditor4": "2.*|1.*",
"quiqqer/calendar-controls": "1.*",
"quiqqer/countries": "1.*",
"quiqqer/colorpicker": ">=1.1",
"quiqqer/translator": "1.*",
"quiqqer/utils": ">=1.9",
"quiqqer/cron": "1.*",
"quiqqer/log": "1.*",
"quiqqer/diashow": ">=0.9|1.*",
"quiqqer/lockclient": "1.*",
"quiqqer/messages": "1.*",
"quiqqer/meta": "1.*",
"quiqqer/fontawesome": "*",
"quiqqer/backendsearch": "1.*|dev-master|dev-dev",
"quiqqer/backendsearch": "1.*",
"quiqqer/requirements": "2.*",
"npm-asset/intl": "1.*",
"npm-asset/nouislider": "*",
......
......@@ -107,20 +107,25 @@ class Manager
switch ($config['SMTPSecure']) {
case "ssl":
$Mail->SMTPSecure = $config['SMTPSecure'];
$Mail->SMTPOptions = [
'ssl' => [
'verify_peer' => (int)$config['SMTPSecureSSL_verify_peer'],
'verify_peer_name' => (int)$config['SMTPSecureSSL_verify_peer_name'],
'allow_self_signed' => (int)$config['SMTPSecureSSL_allow_self_signed']
]
];
break;
case "tls":
$Mail->SMTPSecure = $config['SMTPSecure'];
break;
}
}
/**
* These options are set regardless of the "SMTPSecure" setting
* because PHPMailer may try to establish a secure connection if the mail
* server supports it regardless of the "SMTPSecure" setting.
*/
$Mail->SMTPOptions = [
'ssl' => [
'verify_peer' => (int)$config['SMTPSecureSSL_verify_peer'],
'verify_peer_name' => (int)$config['SMTPSecureSSL_verify_peer_name'],
'allow_self_signed' => (int)$config['SMTPSecureSSL_allow_self_signed']
]
];
}
$Mail->From = $config['MAILFrom'];
......
......@@ -549,7 +549,8 @@ class Manager
foreach ($obj_permissions as $obj_permission => $value) {
// parse var type
if (isset($permissions[$obj_permission])) {
if (isset($permissions[$obj_permission]) ||
isset($obj_permissions[$obj_permission])) {
$permissions[$obj_permission] = $value;
}
}
......
......@@ -1560,7 +1560,7 @@ class Manager
*/
public static function clearUsername($username)
{
return preg_replace('/[^a-zA-Z0-9-_äöüß@\.]/', '', $username);
return preg_replace('/[^a-zA-Z0-9-_äöüß@\.\+]/', '', $username);
}
/**
......
......@@ -212,11 +212,11 @@
{assign var=projectLang value=$Project->getLang()}
{assign var=projectLangs value=$Project->getAttribute('langs')}
{foreach from=$projectLangs item=lang}
{if $Site->existLang($lang)}
<link rel="alternate" hreflang="{$lang}"
href="{url id=$Site->getId($lang) lang=$lang rewritten=true host=true}"
/>
{/if}
{if $Site->existsAttribute("`$lang`-link")}
<link rel="alternate" hreflang="{$lang}" href="{$Site->getAttribute("`$lang`-link")}"/>
{elseif $Site->existLang($lang)}
<link rel="alternate" hreflang="{$lang}" href="{url id=$Site->getId($lang) lang=$lang rewritten=true host=true}" />
{/if}
{/foreach}
......