Skip to content

Commit

Permalink
Merge branch 'bugfix'
Browse files Browse the repository at this point in the history
  • Loading branch information
@gharlan
gharlan committed Mar 12, 2023
2 parents f96c257 + a1639f7 commit a5245af
Show file tree
Hide file tree
Showing 38 changed files with 520 additions and 195 deletions.
45 changes: 20 additions & 25 deletions .idea/inspectionProfiles/Project_Default.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .tools/psalm/baseline-taint.xml
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.7.7@e028ba46ba0d7f9a78bc3201c251e137383e145f">
<files psalm-version="5.8.0@9cf4f60a333f779ad3bc704a555920e81d4fdcda">
<file src="redaxo/src/addons/backup/lib/backup.php">
<TaintedFile>
<code>$filename</code>
Expand Down
49 changes: 48 additions & 1 deletion .tools/psalm/baseline.xml
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.7.7@e028ba46ba0d7f9a78bc3201c251e137383e145f">
<files psalm-version="5.8.0@9cf4f60a333f779ad3bc704a555920e81d4fdcda">
<file src="redaxo/src/addons/backup/lib/backup.php">
<LessSpecificReturnStatement>
<code>$tables</code>
Expand Down Expand Up @@ -938,6 +938,9 @@
</MixedOperand>
</file>
<file src="redaxo/src/addons/mediapool/lib/media.php">
<InvalidAttribute>
<code>AllowDynamicProperties</code>
</InvalidAttribute>
<MixedArgument>
<code>$filename</code>
<code>$name</code>
Expand Down Expand Up @@ -1933,6 +1936,9 @@
</MixedAssignment>
</file>
<file src="redaxo/src/addons/structure/lib/structure_element.php">
<InvalidAttribute>
<code>AllowDynamicProperties</code>
</InvalidAttribute>
<MixedArgument>
<code>$clang</code>
<code>$id</code>
Expand Down Expand Up @@ -3478,6 +3484,9 @@
</MixedMethodCall>
</file>
<file src="redaxo/src/core/lib/clang/clang.php">
<InvalidAttribute>
<code>AllowDynamicProperties</code>
</InvalidAttribute>
<MixedArrayAccess>
<code><![CDATA[$data['priority']]]></code>
<code><![CDATA[$data['status']]]></code>
Expand Down Expand Up @@ -4157,6 +4166,9 @@
'samesite' => $sessionConfig['samesite'] ?? 'lax',
]]]></code>
</InvalidArgument>
<InvalidAttribute>
<code>SensitiveParameter</code>
</InvalidAttribute>
<MixedArgument>
<code><![CDATA[rex::getProperty('session_duration')]]></code>
</MixedArgument>
Expand All @@ -4181,6 +4193,11 @@
<ArgumentTypeCoercion>
<code>$previousPasswords</code>
</ArgumentTypeCoercion>
<InvalidAttribute>
<code>SensitiveParameter</code>
<code>SensitiveParameter</code>
<code>SensitiveParameter</code>
</InvalidAttribute>
<MixedArgument>
<code>$previousPasswords</code>
</MixedArgument>
Expand All @@ -4197,6 +4214,15 @@
</MixedAssignment>
</file>
<file src="redaxo/src/core/lib/login/login.php">
<InvalidAttribute>
<code>SensitiveParameter</code>
<code>SensitiveParameter</code>
<code>SensitiveParameter</code>
<code>SensitiveParameter</code>
<code>SensitiveParameter</code>
<code>SensitiveParameter</code>
<code>SensitiveParameter</code>
</InvalidAttribute>
<MixedArrayAccess>
<code><![CDATA[$_SESSION[static::getSessionNamespace()][$this->systemId]]]></code>
<code>$sessionConfig[$key]</code>
Expand Down Expand Up @@ -4235,6 +4261,10 @@
</PossiblyNullArgument>
</file>
<file src="redaxo/src/core/lib/login/password_policy.php">
<InvalidAttribute>
<code>SensitiveParameter</code>
<code>SensitiveParameter</code>
</InvalidAttribute>
<PossiblyNullArgument>
<code><![CDATA[$this->getDescription()]]></code>
</PossiblyNullArgument>
Expand All @@ -4261,6 +4291,9 @@
<ArgumentTypeCoercion>
<code>$role</code>
</ArgumentTypeCoercion>
<InvalidAttribute>
<code>SensitiveParameter</code>
</InvalidAttribute>
<LessSpecificReturnStatement>
<code><![CDATA[$this->sql->getValue($key)]]></code>
<code><![CDATA[$this->sql->getValue('email')]]></code>
Expand Down Expand Up @@ -4680,6 +4713,16 @@
<code><![CDATA[$this->getValue($column)]]></code>
<code>$value</code>
</ArgumentTypeCoercion>
<InvalidAttribute>
<code>SensitiveParameter</code>
<code>SensitiveParameter</code>
<code>SensitiveParameter</code>
<code>SensitiveParameter</code>
<code>SensitiveParameter</code>
<code>SensitiveParameter</code>
<code>SensitiveParameter</code>
<code>SensitiveParameter</code>
</InvalidAttribute>
<LessSpecificReturnStatement>
<code><![CDATA[$sql->getValue('Create Table')]]></code>
</LessSpecificReturnStatement>
Expand Down Expand Up @@ -5021,6 +5064,10 @@
}
}]]></code>
</InvalidArgument>
<InvalidAttribute>
<code>SensitiveParameter</code>
<code>SensitiveParameter</code>
</InvalidAttribute>
<MixedArgument>
<code><![CDATA[$parts['host']]]></code>
<code><![CDATA[$parts['path']]]></code>
Expand Down
2 changes: 1 addition & 1 deletion README.de.md
View file
Expand Up @@ -15,7 +15,7 @@
<a href="https://redaxo.org/doku/main">Documentation</a> &nbsp;|&nbsp;
<a href="https://friendsofredaxo.github.io/phpdoc/">API&nbsp;Docs</a> &nbsp;|&nbsp;
<a href="https://friendsofredaxo.github.io/tricks/">Tricks</a> &nbsp;|&nbsp;
<a href="https://www.redaxo.org/slack/">Slack</a></a> &nbsp;|&nbsp;
<a href="https://www.redaxo.org/slack/">Slack</a> &nbsp;|&nbsp;
<a href="https://twitter.com/REDAXO">Twitter</a> &nbsp;|&nbsp;
<a href="https://friendsofredaxo.github.io">Friends&nbsp;Of&nbsp;REDAXO</a> &nbsp;|&nbsp;
<a href="https://friendsofredaxo.github.io/community/">Community Map</a>
Expand Down
12 changes: 6 additions & 6 deletions composer.json
View file
Expand Up @@ -24,17 +24,17 @@
"psalm/plugin-phpunit": "0.18.4",
"psalm/plugin-symfony": "v5.0.1",
"rector/rector": "0.15.21",
"redaxo/php-cs-fixer-config": "2.1.0",
"redaxo/php-cs-fixer-config": "2.1.1",
"redaxo/psalm-plugin": "2.0.0",
"vimeo/psalm": "5.7.7"
"vimeo/psalm": "5.8.0"
},
"replace": {
"erusev/parsedown": "1.7.4",
"erusev/parsedown-extra": "0.8.1",
"filp/whoops": "2.14.5",
"itsgoingd/clockwork": "v5.1.12",
"lbuchs/webauthn": "v1.1.3",
"phpmailer/phpmailer": "v6.7.1",
"phpmailer/phpmailer": "v6.8.0",
"psr/container": "2.0.2",
"psr/http-message": "1.0.1",
"psr/log": "1.1.4",
Expand All @@ -43,18 +43,18 @@
"scssphp/scssphp": "v1.11.0",
"splitbrain/php-archive": "1.3.1",
"symfony/console": "v6.2.7",
"symfony/deprecation-contracts": "v3.2.0",
"symfony/deprecation-contracts": "v3.2.1",
"symfony/http-foundation": "v6.2.7",
"symfony/polyfill-ctype": "*",
"symfony/polyfill-php80": "*",
"symfony/polyfill-php81": "*",
"symfony/service-contracts": "v3.2.0",
"symfony/service-contracts": "v3.2.1",
"symfony/string": "v6.2.7",
"symfony/var-dumper": "v6.2.7",
"symfony/yaml": "v6.2.7",
"voku/anti-xss": "4.1.41",
"voku/portable-ascii": "2.0.1",
"voku/portable-utf8": "6.0.12"
"voku/portable-utf8": "6.0.13"
},
"autoload": {
"classmap": [
Expand Down
2 changes: 1 addition & 1 deletion redaxo/src/addons/be_style/assets/css/styles.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion redaxo/src/addons/be_style/scss/_base.scss
View file
Expand Up @@ -412,7 +412,7 @@ body:after {
z-index: 2000;
background: rgba(#000, .5);

.rex-ajax-loader-element1
.rex-ajax-loader-element1,
.rex-ajax-loader-element2,
.rex-ajax-loader-element3,
.rex-ajax-loader-element4,
Expand Down
2 changes: 1 addition & 1 deletion redaxo/src/addons/phpmailer/composer.json
View file
@@ -1,5 +1,5 @@
{
"require": { "phpmailer/phpmailer": "^6.7.1" },
"require": { "phpmailer/phpmailer": "^6.8.0" },

"config": {
"platform": {
Expand Down
14 changes: 7 additions & 7 deletions redaxo/src/addons/phpmailer/composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion redaxo/src/addons/phpmailer/vendor/phpmailer/phpmailer/VERSION
View file
@@ -1 +1 @@
6.7.1
6.8.0
12 changes: 10 additions & 2 deletions redaxo/src/addons/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-hi.php
View file
Expand Up @@ -4,24 +4,32 @@
* Hindi PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
* @author Yash Karanke <mr.karanke@gmail.com>
* Rewrite and extension of the work by Jayanti Suthar <suthar.jayanti93@gmail.com>
*/

$PHPMAILER_LANG['authenticate'] = 'SMTP त्रुटि: प्रामाणिकता की जांच नहीं हो सका। ';
$PHPMAILER_LANG['buggy_php'] = 'PHP का आपका संस्करण एक बग से प्रभावित है जिसके परिणामस्वरूप संदेश दूषित हो सकते हैं. इसे ठीक करने हेतु, भेजने के लिए SMTP का उपयोग करे, अपने php.ini में mail.add_x_header विकल्प को अक्षम करें, MacOS या Linux पर जाए, या अपने PHP संस्करण को 7.0.17+ या 7.1.3+ बदले.';
$PHPMAILER_LANG['connect_host'] = 'SMTP त्रुटि: SMTP सर्वर से कनेक्ट नहीं हो सका। ';
$PHPMAILER_LANG['data_not_accepted'] = 'SMTP त्रुटि: डेटा स्वीकार नहीं किया जाता है। ';
$PHPMAILER_LANG['empty_message'] = 'संदेश खाली है। ';
$PHPMAILER_LANG['encoding'] = 'अज्ञात एन्कोडिंग प्रकार। ';
$PHPMAILER_LANG['execute'] = 'आदेश को निष्पादित करने में विफल। ';
$PHPMAILER_LANG['extension_missing'] = 'एक्सटेन्षन गायब है: ';
$PHPMAILER_LANG['file_access'] = 'फ़ाइल उपलब्ध नहीं है। ';
$PHPMAILER_LANG['file_open'] = 'फ़ाइल त्रुटि: फाइल को खोला नहीं जा सका। ';
$PHPMAILER_LANG['from_failed'] = 'प्रेषक का पता गलत है। ';
$PHPMAILER_LANG['instantiate'] = 'मेल फ़ंक्शन कॉल नहीं कर सकता है।';
$PHPMAILER_LANG['invalid_address'] = 'पता गलत है। ';
$PHPMAILER_LANG['invalid_header'] = 'अमान्य हेडर नाम या मान';
$PHPMAILER_LANG['invalid_hostentry'] = 'अमान्य hostentry: ';
$PHPMAILER_LANG['invalid_host'] = 'अमान्य होस्ट: ';
$PHPMAILER_LANG['mailer_not_supported'] = 'मेल सर्वर के साथ काम नहीं करता है। ';
$PHPMAILER_LANG['provide_address'] = 'आपको कम से कम एक प्राप्तकर्ता का ई-मेल पता प्रदान करना होगा।';
$PHPMAILER_LANG['recipients_failed'] = 'SMTP त्रुटि: निम्न प्राप्तकर्ताओं को पते भेजने में विफल। ';
$PHPMAILER_LANG['signing'] = 'साइनअप त्रुटि:। ';
$PHPMAILER_LANG['signing'] = 'साइनअप त्रुटि: ';
$PHPMAILER_LANG['smtp_code'] = 'SMTP कोड: ';
$PHPMAILER_LANG['smtp_code_ex'] = 'अतिरिक्त SMTP जानकारी: ';
$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP का connect () फ़ंक्शन विफल हुआ। ';
$PHPMAILER_LANG['smtp_detail'] = 'विवरण: ';
$PHPMAILER_LANG['smtp_error'] = 'SMTP सर्वर त्रुटि। ';
$PHPMAILER_LANG['variable_set'] = 'चर को बना या संशोधित नहीं किया जा सकता। ';
$PHPMAILER_LANG['extension_missing'] = 'एक्सटेन्षन गायब है: ';

0 comments on commit a5245af

Please sign in to comment.