Browse Source

Add support for weird JID urls (xmpp://username@server)

Add BottomNavigation for tag and help page
Update the dependencies
pull/978/head
Timothée Jaussoin 5 years ago
parent
commit
679ec53329
  1. 2
      app/helpers/StringHelper.php
  2. 2
      app/views/help.tpl
  3. 2
      app/views/tag.tpl
  4. 2
      app/widgets/Share/Share.php
  5. 2
      app/widgets/Share/share.js
  6. 245
      composer.lock

2
app/helpers/StringHelper.php

@ -205,6 +205,8 @@ function explodeXMPPURI(string $uri): array
if (isset($params['node'])) {
return ['type' => 'community', 'params' => [$uri['path'], $params['node']]];
}
} elseif(isset($uri['host']) && isset($uri['user'])) {
return ['type' => 'contact', 'params' => $uri['user'].'@'.$uri['host']];
} else {
return ['type' => 'contact', 'params' => $uri['path']];
}

2
app/views/help.tpl

@ -9,6 +9,8 @@
<?php $this->widget('Navigation');?>
</nav>
<?php $this->widget('BottomNavigation');?>
<main>
<div>
<header>

2
app/views/tag.tpl

@ -10,6 +10,8 @@
<?php $this->widget('Presence');?>
<?php $this->widget('Navigation');?>
</nav>
<?php $this->widget('BottomNavigation');?>
<?php } ?>
<main style="background-color: var(--movim-background);">

2
app/widgets/Share/Share.php

@ -12,7 +12,7 @@ class Share extends Base
$this->addjs('share.js');
}
public function ajaxGet($link)
public function ajaxHttpGet($link)
{
$validate_url = Validator::url();

2
app/widgets/Share/share.js

@ -3,7 +3,7 @@ var Share = {
var parts = MovimUtils.urlParts();
if (parts.params[0]) {
document.querySelector('h4').innerHTML = parts.params[0];
Share_ajaxGet(parts.params[0]);
Share_ajaxHttpGet(parts.params[0]);
}
},
redirect: function(url) {

245
composer.lock

@ -54,6 +54,12 @@
"core",
"framework"
],
"support": {
"forum": "https://stackoverflow.com/tags/cakephp",
"irc": "irc://irc.freenode.org/cakephp",
"issues": "https://github.com/cakephp/cakephp/issues",
"source": "https://github.com/cakephp/core"
},
"time": "2020-10-21T22:39:20+00:00"
},
{
@ -103,6 +109,12 @@
"database abstraction",
"pdo"
],
"support": {
"forum": "https://stackoverflow.com/tags/cakephp",
"irc": "irc://irc.freenode.org/cakephp",
"issues": "https://github.com/cakephp/cakephp/issues",
"source": "https://github.com/cakephp/database"
},
"time": "2020-12-05T06:01:57+00:00"
},
{
@ -155,6 +167,12 @@
"entity",
"query"
],
"support": {
"forum": "https://stackoverflow.com/tags/cakephp",
"irc": "irc://irc.freenode.org/cakephp",
"issues": "https://github.com/cakephp/cakephp/issues",
"source": "https://github.com/cakephp/datasource"
},
"time": "2020-10-19T19:03:43+00:00"
},
{
@ -208,6 +226,12 @@
"string",
"utility"
],
"support": {
"forum": "https://stackoverflow.com/tags/cakephp",
"irc": "irc://irc.freenode.org/cakephp",
"issues": "https://github.com/cakephp/cakephp/issues",
"source": "https://github.com/cakephp/utility"
},
"time": "2020-11-28T00:16:31+00:00"
},
{
@ -265,6 +289,11 @@
"sockets",
"websocket"
],
"support": {
"chat": "https://gitter.im/reactphp/reactphp",
"issues": "https://github.com/ratchetphp/Ratchet/issues",
"source": "https://github.com/ratchetphp/Ratchet/tree/master"
},
"time": "2020-07-07T15:50:14+00:00"
},
{
@ -335,6 +364,10 @@
"slug",
"slugify"
],
"support": {
"issues": "https://github.com/cocur/slugify/issues",
"source": "https://github.com/cocur/slugify/tree/master"
},
"time": "2019-12-14T13:04:14+00:00"
},
{
@ -391,6 +424,11 @@
"ssl",
"tls"
],
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/ca-bundle/issues",
"source": "https://github.com/composer/ca-bundle/tree/1.2.8"
},
"funding": [
{
"url": "https://packagist.com",
@ -468,6 +506,10 @@
"security",
"symmetric key cryptography"
],
"support": {
"issues": "https://github.com/defuse/php-encryption/issues",
"source": "https://github.com/defuse/php-encryption/tree/master"
},
"time": "2018-07-24T23:27:56+00:00"
},
{
@ -608,6 +650,10 @@
"redis",
"xcache"
],
"support": {
"issues": "https://github.com/doctrine/cache/issues",
"source": "https://github.com/doctrine/cache/tree/1.10.x"
},
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
@ -809,6 +855,10 @@
"event system",
"events"
],
"support": {
"issues": "https://github.com/doctrine/event-manager/issues",
"source": "https://github.com/doctrine/event-manager/tree/1.1.x"
},
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
@ -900,6 +950,10 @@
"uppercase",
"words"
],
"support": {
"issues": "https://github.com/doctrine/inflector/issues",
"source": "https://github.com/doctrine/inflector/tree/2.0.x"
},
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
@ -918,16 +972,16 @@
},
{
"name": "embed/embed",
"version": "v3.4.10",
"version": "v3.4.12",
"source": {
"type": "git",
"url": "https://github.com/oscarotero/Embed.git",
"reference": "3978fb9eb6a6e3240d034c1c3cfa9a24eb060768"
"reference": "0ba0aabbdfd252d4b8fe908c5559efe34b640569"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/oscarotero/Embed/zipball/3978fb9eb6a6e3240d034c1c3cfa9a24eb060768",
"reference": "3978fb9eb6a6e3240d034c1c3cfa9a24eb060768",
"url": "https://api.github.com/repos/oscarotero/Embed/zipball/0ba0aabbdfd252d4b8fe908c5559efe34b640569",
"reference": "0ba0aabbdfd252d4b8fe908c5559efe34b640569",
"shasum": ""
},
"require": {
@ -971,9 +1025,9 @@
"support": {
"email": "oom@oscarotero.com",
"issues": "https://github.com/oscarotero/Embed/issues",
"source": "https://github.com/oscarotero/Embed/tree/v3.4.10"
"source": "https://github.com/oscarotero/Embed/tree/v3.4.12"
},
"time": "2020-12-01T18:36:06+00:00"
"time": "2020-12-16T20:16:17+00:00"
},
{
"name": "evenement/evenement",
@ -1016,6 +1070,10 @@
"event-dispatcher",
"event-emitter"
],
"support": {
"issues": "https://github.com/igorw/evenement/issues",
"source": "https://github.com/igorw/evenement/tree/master"
},
"time": "2017-07-23T21:35:13+00:00"
},
{
@ -1066,6 +1124,10 @@
"keywords": [
"html"
],
"support": {
"issues": "https://github.com/ezyang/htmlpurifier/issues",
"source": "https://github.com/ezyang/htmlpurifier/tree/master"
},
"time": "2020-06-29T00:56:53+00:00"
},
{
@ -1133,6 +1195,10 @@
"sasl",
"scram"
],
"support": {
"issues": "https://github.com/fabiang/sasl/issues",
"source": "https://github.com/fabiang/sasl/tree/v1.0.1"
},
"time": "2019-12-03T15:31:45+00:00"
},
{
@ -1204,6 +1270,10 @@
"uri",
"url"
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/1.7.0"
},
"time": "2020-09-30T07:37:11+00:00"
},
{
@ -1253,6 +1323,10 @@
],
"description": "The Illuminate Bus package.",
"homepage": "https://laravel.com",
"support": {
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2020-12-09T18:07:50+00:00"
},
{
@ -1303,6 +1377,10 @@
],
"description": "The Illuminate Collections package.",
"homepage": "https://laravel.com",
"support": {
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2020-12-08T17:15:16+00:00"
},
{
@ -1350,6 +1428,10 @@
],
"description": "The Illuminate Container package.",
"homepage": "https://laravel.com",
"support": {
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2020-12-01T14:31:29+00:00"
},
{
@ -1394,6 +1476,10 @@
],
"description": "The Illuminate Contracts package.",
"homepage": "https://laravel.com",
"support": {
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2020-12-11T14:35:03+00:00"
},
{
@ -1458,6 +1544,10 @@
"orm",
"sql"
],
"support": {
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2020-12-10T14:55:42+00:00"
},
{
@ -1509,6 +1599,10 @@
],
"description": "The Illuminate Events package.",
"homepage": "https://laravel.com",
"support": {
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2020-12-09T18:07:50+00:00"
},
{
@ -1551,6 +1645,10 @@
],
"description": "The Illuminate Macroable package.",
"homepage": "https://laravel.com",
"support": {
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2020-10-27T15:20:30+00:00"
},
{
@ -1595,6 +1693,10 @@
],
"description": "The Illuminate Pipeline package.",
"homepage": "https://laravel.com",
"support": {
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2020-10-27T15:20:30+00:00"
},
{
@ -1658,6 +1760,10 @@
],
"description": "The Illuminate Support package.",
"homepage": "https://laravel.com",
"support": {
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2020-12-14T14:16:56+00:00"
},
{
@ -1707,6 +1813,10 @@
"keywords": [
"markdown"
],
"support": {
"issues": "https://github.com/michelf/php-markdown/issues",
"source": "https://github.com/michelf/php-markdown/tree/1.9.0"
},
"time": "2019-12-02T02:32:27+00:00"
},
{
@ -1789,6 +1899,10 @@
"logging",
"psr-3"
],
"support": {
"issues": "https://github.com/Seldaek/monolog/issues",
"source": "https://github.com/Seldaek/monolog/tree/2.2.0"
},
"funding": [
{
"url": "https://github.com/Seldaek",
@ -1937,6 +2051,11 @@
"pseudorandom",
"random"
],
"support": {
"email": "info@paragonie.com",
"issues": "https://github.com/paragonie/random_compat/issues",
"source": "https://github.com/paragonie/random_compat"
},
"time": "2020-10-15T08:29:30+00:00"
},
{
@ -1986,6 +2105,10 @@
"container-interop",
"psr"
],
"support": {
"issues": "https://github.com/php-fig/container/issues",
"source": "https://github.com/php-fig/container/tree/master"
},
"time": "2017-02-14T16:28:37+00:00"
},
{
@ -2036,6 +2159,9 @@
"request",
"response"
],
"support": {
"source": "https://github.com/php-fig/http-message/tree/master"
},
"time": "2016-08-06T14:39:51+00:00"
},
{
@ -2083,6 +2209,9 @@
"psr",
"psr-3"
],
"support": {
"source": "https://github.com/php-fig/log/tree/1.1.3"
},
"time": "2020-03-23T09:12:05+00:00"
},
{
@ -2131,6 +2260,9 @@
"psr-16",
"simple-cache"
],
"support": {
"source": "https://github.com/php-fig/simple-cache/tree/master"
},
"time": "2017-10-23T01:57:42+00:00"
},
{
@ -2174,6 +2306,10 @@
],
"description": "easy and fast template engine",
"homepage": "http://raintpl.com",
"support": {
"issues": "https://github.com/feulf/raintpl3/issues",
"source": "https://github.com/feulf/raintpl3/tree/master"
},
"time": "2018-06-08T21:19:55+00:00"
},
{
@ -2214,6 +2350,10 @@
}
],
"description": "A polyfill for getallheaders.",
"support": {
"issues": "https://github.com/ralouphie/getallheaders/issues",
"source": "https://github.com/ralouphie/getallheaders/tree/develop"
},
"time": "2019-03-08T08:55:37+00:00"
},
{
@ -2263,6 +2403,10 @@
"websocket",
"websocket client"
],
"support": {
"issues": "https://github.com/ratchetphp/Pawl/issues",
"source": "https://github.com/ratchetphp/Pawl/tree/master"
},
"time": "2020-07-17T15:32:47+00:00"
},
{
@ -2315,6 +2459,11 @@
"rfc6455",
"websocket"
],
"support": {
"chat": "https://gitter.im/reactphp/reactphp",
"issues": "https://github.com/ratchetphp/RFC6455/issues",
"source": "https://github.com/ratchetphp/RFC6455/tree/v0.3"
},
"time": "2020-05-15T18:31:24+00:00"
},
{
@ -2377,6 +2526,10 @@
"promise",
"reactphp"
],
"support": {
"issues": "https://github.com/reactphp/cache/issues",
"source": "https://github.com/reactphp/cache/tree/v1.1.0"
},
"funding": [
{
"url": "https://github.com/WyriHaximus",
@ -2430,6 +2583,10 @@
"process",
"reactphp"
],
"support": {
"issues": "https://github.com/reactphp/child-process/issues",
"source": "https://github.com/reactphp/child-process/tree/v0.6.1"
},
"time": "2019-02-15T13:48:16+00:00"
},
{
@ -2496,6 +2653,10 @@
"dns-resolver",
"reactphp"
],
"support": {
"issues": "https://github.com/reactphp/dns/issues",
"source": "https://github.com/reactphp/dns/tree/v1.4.0"
},
"funding": [
{
"url": "https://github.com/WyriHaximus",
@ -2548,6 +2709,10 @@
"asynchronous",
"event-loop"
],
"support": {
"issues": "https://github.com/reactphp/event-loop/issues",
"source": "https://github.com/reactphp/event-loop/tree/v1.1.1"
},
"time": "2020-01-01T18:39:52+00:00"
},
{
@ -2688,6 +2853,10 @@
"promise",
"promises"
],
"support": {
"issues": "https://github.com/reactphp/promise/issues",
"source": "https://github.com/reactphp/promise/tree/v2.8.0"
},
"time": "2020-05-12T15:16:56+00:00"
},
{
@ -2744,6 +2913,10 @@
"stream",
"unwrap"
],
"support": {
"issues": "https://github.com/reactphp/promise-stream/issues",
"source": "https://github.com/reactphp/promise-stream/tree/v1.2.0"
},
"time": "2019-07-03T12:29:10+00:00"
},
{
@ -2797,6 +2970,10 @@
"timeout",
"timer"
],
"support": {
"issues": "https://github.com/reactphp/promise-timer/issues",
"source": "https://github.com/reactphp/promise-timer/tree/v1.6.0"
},
"time": "2020-07-10T12:18:06+00:00"
},
{
@ -2867,6 +3044,10 @@
"reactphp",
"stream"
],
"support": {
"issues": "https://github.com/reactphp/socket/issues",
"source": "https://github.com/reactphp/socket/tree/v1.6.0"
},
"funding": [
{
"url": "https://github.com/WyriHaximus",
@ -2923,6 +3104,10 @@
"stream",
"writable"
],
"support": {
"issues": "https://github.com/reactphp/stream/issues",
"source": "https://github.com/reactphp/stream/tree/v1.1.1"
},
"time": "2020-05-04T10:17:57+00:00"
},
{
@ -2973,6 +3158,10 @@
"stringifier",
"stringify"
],
"support": {
"issues": "https://github.com/Respect/Stringifier/issues",
"source": "https://github.com/Respect/Stringifier/tree/0.2.0"
},
"time": "2017-12-29T19:39:25+00:00"
},
{
@ -3039,6 +3228,10 @@
"validation",
"validator"
],
"support": {
"issues": "https://github.com/Respect/Validation/issues",
"source": "https://github.com/Respect/Validation/tree/2.1.0"
},
"time": "2020-10-04T12:09:34+00:00"
},
{
@ -3097,6 +3290,9 @@
"stream",
"uri"
],
"support": {
"source": "https://github.com/ringcentral/psr7/tree/master"
},
"time": "2018-05-29T20:21:04+00:00"
},
{
@ -3179,6 +3375,10 @@
"migrations",
"phinx"
],
"support": {
"issues": "https://github.com/cakephp/phinx/issues",
"source": "https://github.com/cakephp/phinx/tree/master"
},
"time": "2020-08-15T07:42:40+00:00"
},
{
@ -3404,6 +3604,9 @@
],
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/master"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -3615,6 +3818,9 @@
"polyfill",
"portable"
],
"support": {
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.20.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -3693,6 +3899,9 @@
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.20.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -3774,6 +3983,9 @@
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.20.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -3851,6 +4063,9 @@
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.20.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -3927,6 +4142,9 @@
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php73/tree/v1.20.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -4007,6 +4225,9 @@
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php80/tree/v1.20.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -4173,6 +4394,9 @@
"interoperability",
"standards"
],
"support": {
"source": "https://github.com/symfony/service-contracts/tree/master"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -4424,6 +4648,9 @@
"interoperability",
"standards"
],
"support": {
"source": "https://github.com/symfony/translation-contracts/tree/v2.3.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -4486,6 +4713,10 @@
"clean",
"php"
],
"support": {
"issues": "https://github.com/voku/portable-ascii/issues",
"source": "https://github.com/voku/portable-ascii/tree/1.5.6"
},
"funding": [
{
"url": "https://www.paypal.me/moelleken",
@ -4530,5 +4761,5 @@
"platform-overrides": {
"php": "7.3"
},
"plugin-api-version": "1.1.0"
"plugin-api-version": "2.0.0"
}
Loading…
Cancel
Save