Browse Source

Fix various bugs and PHP errors

pull/1021/head
Timothée Jaussoin 4 years ago
parent
commit
4f9ce4554f
  1. 4
      app/widgets/ContactActions/_contactactions_drawer.tpl
  2. 2
      app/widgets/Picture/Picture.php
  3. 4
      app/widgets/Post/_post.tpl
  4. 2
      app/widgets/Publish/Publish.php
  5. 2
      lib/JingletoSDP.php
  6. 2
      src/Movim/Route.php
  7. 2
      src/Movim/Session.php

4
app/widgets/ContactActions/_contactactions_drawer.tpl

@ -138,11 +138,11 @@
<ul class="tabs" id="navtabs"></ul>
{if="$picturesCount > 0"}
{if="isset($picturesCount) && $picturesCount > 0"}
<div class="tabelem spin" title="{$c->__('general.pictures')}" id="contact_pictures"></div>
{/if}
{if="$linksCount > 0"}
{if="isset($linksCount) && $linksCount > 0"}
<div class="tabelem spin" title="{$c->__('general.links')}" id="contact_links"></div>
{/if}

2
app/widgets/Picture/Picture.php

@ -51,7 +51,7 @@ class Picture extends Base
$headers = preg_split('/[\r\n]+/', substr($response, 0, $header_size));
$body = substr($response, $header_size);
if ($compress) {
if ($compress && $body) {
$picture = new MovimPicture;
$picture->fromBin($body);
$body = $picture->set(false, 'webp', 85);

4
app/widgets/Post/_post.tpl

@ -199,7 +199,7 @@
<img class="big_picture"
type="{$value->type}"
src="{$value->href}"
{if="!empty($value)"}
{if="!empty($value->title)"}
title="{$value->title}"
alt="{$value->title}"
{/if}
@ -237,7 +237,7 @@
</ul>
{/if}
{if="$post->openlink && (!defined('BASE_BOST') || $post->openlink->url.host != BASE_HOST)"}
{if="$post->openlink && $post->openlink->url && (!defined('BASE_HOST') || $post->openlink->url.host != BASE_HOST)"}
<ul class="list middle active">
<li onclick="MovimUtils.openInNew('{$post->openlink->href}')">
<span class="primary icon gray">

2
app/widgets/Publish/Publish.php

@ -331,7 +331,7 @@ class Publish extends Base
$draft->reply_id = null;
$draft->save();
$this->rpc('MovimUtils.redirect', $this->route('publish', $draft->server, $draft->node, $draft->nodeid));
$this->rpc('MovimUtils.redirect', $this->route('publish', [$draft->server, $draft->node, $draft->nodeid]));
}
}

2
lib/JingletoSDP.php

@ -41,7 +41,7 @@ class JingletoSDP
public function getSessionId()
{
$s = Session::start();
return substr(base_convert($s->get('jingleSid'), 30, 10), 0, 6);
return substr(base_convert($s->get('jingleSid') ?? '', 30, 10), 0, 6);
}
public function generate()

2
src/Movim/Route.php

@ -98,7 +98,7 @@ class Route extends Base
return $this->_redirect;
}
public static function urlize($page, $params = false, $get = [], $tab = false)
public static function urlize(string $page, $params = false, array $get = [], $tab = false)
{
$routes = (new Route)->_routes;

2
src/Movim/Session.php

@ -24,7 +24,7 @@ class Session
/**
* Gets a session variable. Returns false if doesn't exist.
*/
public function get($varname)
public function get(string $varname)
{
if (\array_key_exists($varname, $this->values)) {
return $this->values[$varname]->value;

Loading…
Cancel
Save