diff --git a/advancedcontentfilter/composer.lock b/advancedcontentfilter/composer.lock index 774b5ec8..0b0114db 100644 --- a/advancedcontentfilter/composer.lock +++ b/advancedcontentfilter/composer.lock @@ -1,7 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], "content-hash": "d0e3662dd9d910ffe4f71d325bc39319", @@ -35,7 +35,6 @@ ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", "homepage": "https://github.com/container-interop/container-interop", - "abandoned": "psr/container", "time": "2017-02-14T19:40:03+00:00" }, { @@ -281,16 +280,16 @@ }, { "name": "psr/log", - "version": "1.1.2", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", + "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", "shasum": "" }, "require": { @@ -299,7 +298,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { @@ -324,7 +323,7 @@ "psr", "psr-3" ], - "time": "2019-11-01T11:05:21+00:00" + "time": "2016-10-10T12:19:37+00:00" }, { "name": "psr/simple-cache", @@ -447,16 +446,16 @@ }, { "name": "symfony/cache", - "version": "v3.4.36", + "version": "v3.4.8", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "3d9f46a6960fd5cd7f030f86adc5b4b63bcfa4e3" + "reference": "13255ddd056e49f3154747943f8ee175d555d394" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/3d9f46a6960fd5cd7f030f86adc5b4b63bcfa4e3", - "reference": "3d9f46a6960fd5cd7f030f86adc5b4b63bcfa4e3", + "url": "https://api.github.com/repos/symfony/cache/zipball/13255ddd056e49f3154747943f8ee175d555d394", + "reference": "13255ddd056e49f3154747943f8ee175d555d394", "shasum": "" }, "require": { @@ -513,7 +512,7 @@ "caching", "psr6" ], - "time": "2019-12-01T10:45:41+00:00" + "time": "2018-04-02T14:35:16+00:00" }, { "name": "symfony/expression-language", @@ -567,16 +566,16 @@ }, { "name": "symfony/polyfill-apcu", - "version": "v1.13.1", + "version": "v1.7.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-apcu.git", - "reference": "a8e961c841b9ec52927a87914f8820a1ad8f8116" + "reference": "e8ae2136ddb53dea314df56fcd88e318ab936c00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/a8e961c841b9ec52927a87914f8820a1ad8f8116", - "reference": "a8e961c841b9ec52927a87914f8820a1ad8f8116", + "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/e8ae2136ddb53dea314df56fcd88e318ab936c00", + "reference": "e8ae2136ddb53dea314df56fcd88e318ab936c00", "shasum": "" }, "require": { @@ -585,7 +584,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.7-dev" } }, "autoload": { @@ -619,7 +618,7 @@ "portable", "shim" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2018-01-30T19:27:44+00:00" } ], "packages-dev": [], diff --git a/js_upload/templates/js_upload.tpl b/js_upload/templates/js_upload.tpl index f45b495c..4f0ad14f 100644 --- a/js_upload/templates/js_upload.tpl +++ b/js_upload/templates/js_upload.tpl @@ -34,19 +34,14 @@ let newalbumElm = document.getElementById('photos-upload-newalbum'); let albumElm = document.getElementById('photos-upload-album-select'); - let contact_allow = document.querySelector('[name="contact_allow"]:not(:disabled)'); - let group_allow = document.querySelector('[name="group_allow"]:not(:disabled)'); - let contact_deny = document.querySelector('[name="contact_deny"]:not(:disabled)'); - let group_deny = document.querySelector('[name="group_deny"]:not(:disabled)'); - uploader.setParams({ newalbum : newalbumElm ? newalbumElm.value : '', album : albumElm ? albumElm.value : '', not_visible : document.getElementById('photos-upload-noshare').checked, - contact_allow : contact_allow ? contact_allow.value : '', - group_allow : group_allow ? group_allow.value : '', - contact_deny : contact_deny ? contact_deny.value : '', - group_deny : group_deny ? group_deny.value : '', + contact_allow : document.querySelector('[name="contact_allow"]').value, + group_allow : document.querySelector('[name="group_allow"]').value, + contact_deny : document.querySelector('[name="contact_deny"]').value, + group_deny : document.querySelector('[name="group_deny"]').value, }); } }); diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php index 30c6cf60..242fe96d 100644 --- a/windowsphonepush/windowsphonepush.php +++ b/windowsphonepush/windowsphonepush.php @@ -27,8 +27,10 @@ */ use Friendica\App; +use Friendica\BaseObject; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; +use Friendica\App\Authentication; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; @@ -473,7 +475,9 @@ function windowsphonepush_login(App $a) die('This api requires login'); } - Session::setAuthenticatedForUser($a, $record); + /** @var Authentication $authentication */ + $authentication = BaseObject::getClass(Authentication::class); + $authentication->setForUser($a, $record); $_SESSION["allow_api"] = true; Hook::callAll('logged_in', $a->user); }