YunoHost-Apps/movim_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/movim_ynh.git synced 2024-09-03 19:46:19 +02:00
Code Issues Activity Actions

update to movim upstream

Browse source
This commit is contained in:
src386 2016-04-12 10:29:33 +02:00
parent 9d5f691247
commit aa758ad00c
93 changed files with 807 additions and 1133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG
View file

@ -1,5 +1,8 @@
**Changelog**
1.8 2016?
- Update to movim 0.9 git2016-04-12
1.7.1 2016-30-30
- Update to movim 0.9 git2016-03-30

2
README.md
View file

@ -5,7 +5,7 @@ Movim is a decentralized social network, written in PHP and HTML5 and based on t
It is recommended to use a "valid" certificate to use Movim, auto-signed is sometimes problematic. You might want to take a look a StartSSL or Let's Encrypt.
Provided Movim version : 0.9 git2016-03-30
Provided Movim version : 0.9 git2016-04-12
Please read CHANGELOG.

47
sources/app/models/conference/ConferenceDAO.php
View file

@ -82,53 +82,6 @@ class ConferenceDAO extends SQL {
return $this->run('Conference');
}
function getConnected() {
$this->_sql = '
select * from conference
where jid = :jid
and status= 1';
$this->prepare(
'Conference',
array(
'jid' => $this->_user
)
);
return $this->run('Conference');
}
/*
function getSubscribed() {
$this->_sql = '
select
subscription.jid,
subscription.server,
subscription.node,
subscription,
name
from subscription
left outer join item
on item.server = subscription.server
and item.node = subscription.node
where subscription.jid = :jid
group by
subscription.server,
subscription.node,
subscription.jid,
subscription, item.name
order by
subscription.server';
$this->prepare(
'Subscription',
array(
'jid' => $this->_user
)
);
return $this->run('Subscription');
}
*/
function delete() {
$this->_sql = '
delete from conference

46
sources/app/models/postn/Postn.php
View file

@ -20,6 +20,8 @@ class Postn extends Model {
public $commentplace;
public $open;
public $published; //
public $updated; //
public $delay; //
@ -31,11 +33,10 @@ class Postn extends Model {
public $links;
public $privacy;
public $hash;
private $youtube;
private $openlink;
public function __construct() {
$this->hash = md5(openssl_random_pseudo_bytes(5));
@ -65,6 +66,9 @@ class Postn extends Model {
"commentplace" :
{"type":"string", "size":128 },
"open" :
{"type":"bool"},
"published" :
{"type":"date" },
"updated" :
@ -256,8 +260,10 @@ class Postn extends Model {
return in_array($type, array('picture', 'image/jpeg', 'image/png', 'image/jpg', 'image/gif'));
}
private function typeIsLink($type) {
return $type == 'text/html';
private function typeIsLink($link) {
return (isset($link['type'])
&& $link['type'] == 'text/html'
&& Validator::url()->validate($link['href']));
}
private function setAttachements($links, $extra = false) {
@ -274,6 +280,9 @@ class Postn extends Model {
$this->picture = true;
}
if($enc['rel'] == 'alternate'
&& Validator::url()->validate($enc['href'])) $this->open = true;
if((string)$attachment->attributes()->title == 'comments') {
$substr = explode('?',substr((string)$attachment->attributes()->href, 5));
$this->commentplace = reset($substr);
@ -292,27 +301,38 @@ class Postn extends Model {
{
$attachements = null;
$this->picture = null;
$this->openlink = null;
if(isset($this->links)) {
$attachements = array('pictures' => array(), 'files' => array(), 'links' => array());
$attachements = array(
'pictures' => array(),
'files' => array(),
'links' => array()
);
$links = unserialize($this->links);
foreach($links as $l) {
if(isset($l['type']) && $this->typeIsPicture($l['type'])) {
if($this->picture == null) {
$this->picture = $l['href'];
}
array_push($attachements['pictures'], $l);
} elseif((isset($l['type']) && $this->typeIsLink($l['type'])
|| in_array($l['rel'], array('related', 'alternate')))
&& Validator::url()->validate($l['href'])) {
} elseif($this->typeIsLink($l)) {
if($this->youtube == null
&& preg_match('%(?:youtube(?:-nocookie)?\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu\.be/)([^"&?/ ]{11})%i', $l['href'], $match)) {
$this->youtube = $match[1];
}
if($l['rel'] == 'alternate') {
$this->openlink = $l['href'];
if(!$this->isMicroblog()) {
array_push($attachements['links'], array('href' => $l['href'], 'url' => parse_url($l['href'])));
} elseif(isset($l['rel']) && $l['rel'] == 'enclosure') {
}
}
} elseif(isset($l['rel'])
&& $l['rel'] == 'enclosure') {
array_push($attachements['files'], $l);
}
}
@ -389,11 +409,7 @@ class Postn extends Model {
public function getPublicUrl()
{
if($this->isMicroblog()) {
return \Route::urlize('blog', array($this->origin, $this->nodeid));
} else {
return \Route::urlize('node', array($this->origin, $this->node, $this->nodeid));
}
return $this->openlink;
}
public function getTags()
@ -414,7 +430,7 @@ class Postn extends Model {
}
public function isPublic() {
return (isset($this->privacy) && $this->privacy);
return ($this->open);
}
}

52
sources/app/models/postn/PostnDAO.php
View file

@ -17,6 +17,8 @@ class PostnDAO extends SQL {
commentplace = :commentplace,
open = :open,
published = :published,
updated = :updated,
delay = :delay,
@ -47,6 +49,8 @@ class PostnDAO extends SQL {
'commentplace' => $post->commentplace,
'open' => $post->open,
'published' => $post->published,
'updated' => $post->updated,
'delay' => $post->delay,
@ -86,6 +90,8 @@ class PostnDAO extends SQL {
commentplace,
open,
published,
updated,
delay,
@ -113,6 +119,8 @@ class PostnDAO extends SQL {
:commentplace,
:open,
:published,
:updated,
:delay,
@ -140,6 +148,8 @@ class PostnDAO extends SQL {
'commentplace' => $post->commentplace,
'open' => $post->open,
'published' => $post->published,
'updated' => $post->updated,
'delay' => $post->delay,
@ -196,9 +206,8 @@ class PostnDAO extends SQL {
function getNode($from, $node, $limitf = false, $limitr = false) {
$this->_sql = '
select *, postn.aid, privacy.value as privacy from postn
select *, postn.aid from postn
left outer join contact on postn.aid = contact.jid
left outer join privacy on postn.nodeid = privacy.pkey
where ((postn.origin, node) in (select server, node from subscription where jid = :aid))
and postn.origin = :origin
and postn.node = :node
@ -222,11 +231,10 @@ class PostnDAO extends SQL {
function getPublicTag($tag, $limitf = false, $limitr = false) {
$this->_sql = '
select *, postn.aid, privacy.value as privacy from postn
select *, postn.aid from postn
left outer join contact on postn.aid = contact.jid
left outer join privacy on postn.nodeid = privacy.pkey
where nodeid in (select nodeid from tag where tag = :title)
and privacy.value = 1
and postn.open = true
order by postn.published desc';
if($limitr !== false)
@ -244,9 +252,8 @@ class PostnDAO extends SQL {
function getNodeUnfiltered($from, $node, $limitf = false, $limitr = false) {
$this->_sql = '
select *, postn.aid, privacy.value as privacy from postn
select *, postn.aid from postn
left outer join contact on postn.aid = contact.jid
left outer join privacy on postn.nodeid = privacy.pkey
where postn.origin = :origin
and postn.node = :node
order by postn.published desc';
@ -267,9 +274,8 @@ class PostnDAO extends SQL {
function getGallery($from, $limitf = false, $limitr = false) {
$this->_sql = '
select *, postn.aid, privacy.value as privacy from postn
select *, postn.aid from postn
left outer join contact on postn.aid = contact.jid
left outer join privacy on postn.nodeid = privacy.pkey
where postn.aid = :aid
and postn.picture = 1
order by postn.published desc';
@ -310,9 +316,8 @@ class PostnDAO extends SQL {
function getItem($id) {
$this->_sql = '
select *, postn.aid, privacy.value as privacy from postn
select *, postn.aid from postn
left outer join contact on postn.aid = contact.jid
left outer join privacy on postn.nodeid = privacy.pkey
where postn.nodeid = :nodeid';
$this->prepare(
@ -327,9 +332,8 @@ class PostnDAO extends SQL {
function getAllPosts($jid = false, $limitf = false, $limitr = false) {
$this->_sql = '
select *, postn.aid, privacy.value as privacy from postn
select *, postn.aid from postn
left outer join contact on postn.aid = contact.jid
left outer join privacy on postn.nodeid = privacy.pkey
where (
(postn.origin in (select jid from rosterlink where session = :origin and rostersubscription in (\'both\', \'to\')) and node = \'urn:xmpp:microblog:0\')
or (postn.origin = :origin and node = \'urn:xmpp:microblog:0\')
@ -358,9 +362,8 @@ class PostnDAO extends SQL {
function getFeed($limitf = false, $limitr = false) {
$this->_sql = '
select *, postn.aid, privacy.value as privacy from postn
select *, postn.aid from postn
left outer join contact on postn.aid = contact.jid
left outer join privacy on postn.nodeid = privacy.pkey
where ((postn.origin in (select jid from rosterlink where session = :origin and rostersubscription in (\'both\', \'to\')) and node = \'urn:xmpp:microblog:0\')
or (postn.origin = :origin and node = \'urn:xmpp:microblog:0\'))
and postn.node not like \'urn:xmpp:microblog:0:comments/%\'
@ -383,9 +386,8 @@ class PostnDAO extends SQL {
function getNews($limitf = false, $limitr = false) {
$this->_sql = '
select *, postn.aid, privacy.value as privacy from postn
select *, postn.aid from postn
left outer join contact on postn.aid = contact.jid
left outer join privacy on postn.nodeid = privacy.pkey
where ((postn.origin, node) in (select server, node from subscription where jid = :origin))
order by postn.published desc
';
@ -407,9 +409,8 @@ class PostnDAO extends SQL {
function getMe($limitf = false, $limitr = false)
{
$this->_sql = '
select *, postn.aid, privacy.value as privacy from postn
select *, postn.aid from postn
left outer join contact on postn.aid = contact.jid
left outer join privacy on postn.nodeid = privacy.pkey
where postn.origin = :origin and postn.node = \'urn:xmpp:microblog:0\'
order by postn.published desc
';
@ -430,12 +431,11 @@ class PostnDAO extends SQL {
function getPublic($origin, $node, $limitf = false, $limitr = false)
{
$this->_sql = '
select *, postn.aid, privacy.value as privacy from postn
select *, postn.aid from postn
left outer join contact on postn.aid = contact.jid
left outer join privacy on postn.nodeid = privacy.pkey
where postn.origin = :origin
and postn.node = :node
and privacy.value = 1
and postn.open = true
order by postn.published desc';
if($limitr !== false)
@ -454,12 +454,11 @@ class PostnDAO extends SQL {
function getPublicItem($origin, $node, $nodeid) {
$this->_sql = '
select *, postn.aid, privacy.value as privacy from postn
select *, postn.aid from postn
left outer join contact on postn.aid = contact.jid
left outer join privacy on postn.nodeid = privacy.pkey
where postn.origin = :origin
and postn.node = :node
and privacy.value = 1
and postn.open = true
and postn.nodeid = :nodeid
order by postn.published desc';
@ -606,11 +605,10 @@ class PostnDAO extends SQL {
$this->_sql = '
select * from postn
left outer join contact on postn.aid = contact.jid
left outer join privacy on postn.nodeid = privacy.pkey
where
node = \'urn:xmpp:microblog:0\'
and postn.origin not in (select jid from rosterlink where session = :origin)
and privacy.value = 1
and postn.open = true
order by published desc
';

58
sources/app/models/sessionx/SessionxDAO.php
View file

@ -7,7 +7,6 @@ class SessionxDAO extends SQL {
$this->_sql = '
update sessionx
set username = :username,
password = :password,
hash = :hash,
resource = :resource,
rid = :rid,
@ -28,7 +27,6 @@ class SessionxDAO extends SQL {
array(
'session' => $s->session,
'username' => $s->username,
'password' => $s->password,
'hash' => $s->hash,
'resource' => $s->resource,
'rid' => $s->rid,
@ -52,7 +50,6 @@ class SessionxDAO extends SQL {
insert into sessionx
(session,
username,
password,
hash,
resource,
rid,
@ -69,7 +66,6 @@ class SessionxDAO extends SQL {
values
(:session,
:username,
:password,
:hash,
:resource,
:rid,
@ -89,7 +85,6 @@ class SessionxDAO extends SQL {
array(
'session' => $s->session,
'username' => $s->username,
'password' => $s->password,
'hash' => $s->hash,
'resource' => $s->resource,
'rid' => $s->rid,
@ -269,20 +264,6 @@ class SessionxDAO extends SQL {
return $this->run('Sessionx');
}
/*function clean() {
$this->_sql = '
delete from sessionx
where timestamp < :timestamp';
$this->prepare(
'Sessionx',
array(
'timestamp' => date(DATE_ISO8601, time() - 3600)
)
);
$this->run('Sessionx');
}*/
function clear() {
$this->_sql = '
truncate table sessionx';
@ -307,43 +288,4 @@ class SessionxDAO extends SQL {
return $this->run('Sessionx');
}
function getConnected() {
$this->_sql = '
select count(*) from sessionx';
$this->prepare(
'Sessionx',
array(
)
);
$results = $this->run(null, 'array');
$results = array_values($results[0]);
return (int)$results[0];
}
function checkConnected($username, $host)
{
$this->_sql = '
select count(*) from sessionx
where
username = :username
and host = :host';
$this->prepare(
'Sessionx',
array(
'username' => $username,
'host' => $host
)
);
$results = $this->run(null, 'array');
$results = array_values($results[0]);
return (int)$results[0];
}
}

1
sources/app/views/room.tpl
View file

@ -1,3 +1,4 @@
<?php $this->widget('Stickers');?>
<?php $this->widget('Presence'); ?>
<?php $this->widget('LoginAnonymous'); ?>
<main>

1
sources/app/widgets/About/about.tpl
View file

@ -37,6 +37,7 @@
Moxl - Movim XMPP Library - <a href="https://github.com/edhelas/moxl">GitHub Moxl</a> under AGPLv3<br/>
Map Library - Leaflet <a href="http://leafletjs.com/">leafletjs.com</a> under BSD<br/>
Chart.js - Nick Downie <a href="http://www.chartjs.org/">chart.js</a> under MIT<br/>
Favico.js - Miroslav Magda <a href="http://lab.ejci.net/favico.js/">lab.ejci.net/favico.js</a> under GPL and MIT<br/>
Markdown - Michel Fortin <a href="http://michelf.ca/projects/php-markdown/">michelf.ca</a> ©Michel Fortin<br/>
Template Engine - RainTPL - Federico Ulfo <a href="http://www.raintpl.com/">www.raintpl.com</a> under MIT<br/>

5
sources/app/widgets/AccountNext/AccountNext.php
View file

@ -102,8 +102,9 @@ class AccountNext extends \Movim\Widget\Base {
$domain = \Moxl\Utils::getDomain($host);
// We create a new session or clear the old one
$s = Sessionx::start();
$s->init(null, null, $host, $domain);
$s = Session::start();
$s->set('host', $host);
$s->set('domain', $domain);
\Moxl\Stanza\Stream::init($host);
}

2
sources/app/widgets/AccountNext/_accountnext_registered.tpl
View file

@ -3,7 +3,7 @@
<h2 id="username">username@server.com</h2>
<a class="button color" onclick="remoteUnregister(); MovimWebsocket.attach(function() {movim_redirect('{$c->route('login')}')});" href="#">
<a class="button color" onclick="remoteUnregister(); MovimWebsocket.attach(function() {movim_redirect('{$c->route('disconnect')}')});" href="#">
{$c->__('page.login')}
</a>
</div>

8
sources/app/widgets/AdHoc/AdHoc.php
View file

@ -60,10 +60,10 @@ class AdHoc extends \Movim\Widget\Base
function ajaxGet()
{
$session = \Sessionx::start();
$session = \Session::start();
$g = new Get;
$g->setTo($session->host)
$g->setTo($session->get('host'))
->request();
}
@ -77,10 +77,10 @@ class AdHoc extends \Movim\Widget\Base
function ajaxSubmit($data, $node, $sessionid)
{
$session = \Sessionx::start();
$session = \Session::start();
$s = new Submit;
$s->setTo($session->host)
$s->setTo($session->get('host'))
->setNode($node)
->setData($data)
->setSessionid($sessionid)

9
sources/app/widgets/AdminTest/AdminTest.php
View file

@ -24,7 +24,7 @@ class AdminTest extends \Movim\Widget\Base
public function version()
{
return (version_compare(PHP_VERSION, '5.3.0') >= 0);
return (version_compare(PHP_VERSION, '5.4.0') >= 0);
}
public function testDir($dir)
@ -39,15 +39,10 @@ class AdminTest extends \Movim\Widget\Base
function display()
{
$md = \modl\Modl::getInstance();
$md = \Modl\Modl::getInstance();
$supported = $md->getSupportedDatabases();
$cd = new \Modl\ConfigDAO();
$config = $cd->get();
$this->view->assign('dbconnected', $md->_connected);
$this->view->assign('dbtype', $supported[$config->type]);
$this->view->assign('dbinfos', sizeof($md->check()));
$this->view->assign('websocketurl', $config->websocketurl);
}
}

25
sources/app/widgets/Chat/Chat.php
View file

@ -224,7 +224,9 @@ class Chat extends \Movim\Widget\Base
* @return void
*/
function ajaxSendMessage($to, $message, $muc = false, $resource = false, $replace = false) {
if($message == '')
$body = trim(rawurldecode($message));
if($body == '' || $body == '/me')
return;
$m = new \Modl\Message();
@ -243,25 +245,18 @@ class Chat extends \Movim\Widget\Base
$m->published = gmdate('Y-m-d H:i:s');
}
$session = \Sessionx::start();
$session = \Session::start();
$m->type = 'chat';
$m->resource = $session->resource;
$m->resource = $session->get('resource');
if($muc) {
$m->type = 'groupchat';
$s = Session::start();
$m->resource = $s->get('username');
if($m->resource == null) {
$m->resource = $session->user;
}
$m->resource = $session->get('username');
$m->jidfrom = $to;
}
$m->body = trim(rawurldecode($message));
$m->body = $body;
//$m->html = prepareString($m->body, false, true);
if($resource != false) {
@ -290,7 +285,7 @@ class Chat extends \Movim\Widget\Base
/* Is it really clean ? */
if(!$p->getMuc()) {
if(!preg_match('#^\?OTR#', $m->body)) {
$md = new \Modl\MessageDAO();
$md = new \Modl\MessageDAO;
$md->set($m);
}
@ -368,7 +363,7 @@ class Chat extends \Movim\Widget\Base
{
if(!$this->validateJid($jid)) return;
$md = new \Modl\MessageDAO();
$md = new \Modl\MessageDAO;
$messages = $md->getHistory(echapJid($jid), date(DATE_ISO8601, strtotime($date)), $this->_pagination);
if(count($messages) > 0) {
@ -524,7 +519,7 @@ class Chat extends \Movim\Widget\Base
{
if(!$this->validateJid($jid)) return;
$md = new \Modl\MessageDAO();
$md = new \Modl\MessageDAO;
$messages = $md->getContact(echapJid($jid), 0, $this->_pagination);
if(is_array($messages)) {

8
sources/app/widgets/Chat/chat.js
View file

@ -131,7 +131,7 @@ var Chat = {
bubble.id = message.newid;
}
if(message.body.match(/^\/me/)) {
if(message.body.match(/^\/me\s/)) {
bubble.querySelector('div.bubble').className = 'bubble quote';
message.body = message.body.substr(4);
}
@ -235,12 +235,14 @@ MovimWebsocket.attach(function() {
}
});
Upload.attach(function() {
if(typeof Upload != 'undefined') {
Upload.attach(function() {
var textarea = document.querySelector('#chat_textarea');
textarea.value = Upload.get + ' ' + textarea.value;
textarea.focus();
movim_textarea_autoheight(textarea);
});
});
}
document.addEventListener('focus', function() {
var textarea = document.querySelector('#chat_textarea');

5
sources/app/widgets/Group/Group.php
View file

@ -368,11 +368,6 @@ class Group extends \Movim\Widget\Base
RPC::call('movim_fill', 'group_widget', $html);
}
function ajaxTogglePrivacy($id) {
$p = new Post;
$p->ajaxTogglePrivacy($id);
}
function prepareEmpty()
{
$id = new \modl\ItemDAO();

6
sources/app/widgets/Infos/Infos.php
View file

@ -34,7 +34,7 @@ class Infos extends \Movim\Widget\Base
$cd = new \Modl\ConfigDAO();
$config = $cd->get();
$sd = new \Modl\SessionxDAO();
$connected = (int)requestURL('http://localhost:1560/started/', 2);
$infos = array(
'url' => BASE_URI,
@ -46,7 +46,9 @@ class Infos extends \Movim\Widget\Base
'php_version' => phpversion(),
'version' => APP_VERSION,
'population' => $pop,
'connected' => $sd->getConnected()
'linked' => (int)requestURL('http://localhost:1560/linked/', 2),
'started' => $connected,
'connected' => $connected
);
$this->view->assign('json', json_encode($infos));

22
sources/app/widgets/Login/Login.php
View file

@ -38,10 +38,9 @@ class Login extends \Movim\Widget\Base
$pd = new \Modl\PresenceDAO();
$pd->clearPresence();
$session = \Sessionx::start();
$session->load();
$session = \Session::start();
if($session->mechanism != 'ANONYMOUS') {
if($session->get('mechanism') != 'ANONYMOUS') {
// http://xmpp.org/extensions/xep-0280.html
\Moxl\Stanza\Carbons::enable();
@ -84,12 +83,7 @@ class Login extends \Movim\Widget\Base
$pop++;
$this->view->assign('pop', $pop-2);
$sd = new \Modl\SessionxDAO();
$connected = $sd->getConnected();
$this->view->assign('connected', $connected);
$this->view->assign('connected', (int)requestURL('http://localhost:1560/started/', 2));
$this->view->assign('error', $this->prepareError());
if(isset($_SERVER['PHP_AUTH_USER'])
@ -202,12 +196,15 @@ class Login extends \Movim\Widget\Base
$here = $sd->getHash(sha1($username.$password.$host));
if($here) {
//if($s->get('hash') == sha1($username.$password.$host)) {
RPC::call('Login.setCookie', $here->session);
RPC::call('movim_redirect', Route::urlize('main'));
$this->showErrorBlock('conflict');
return;
}
$s = Session::start();
// We try to get the domain
$domain = \Moxl\Utils::getDomain($host);
@ -215,6 +212,13 @@ class Login extends \Movim\Widget\Base
RPC::call('register', $host);
// We create a new session or clear the old one
$s->set('password', $password);
$s->set('username', $username);
$s->set('host', $host);
$s->set('domain', $domain);
$s->set('jid', $login);
$s->set('hash', sha1($username.$password.$host));
$s = Sessionx::start();
$s->init($username, $password, $host, $domain);

5
sources/app/widgets/Login/login.tpl
View file

@ -21,9 +21,9 @@
data-action="{$submit}"
name="login">
<div>
<input type="text" id="complete" tabindex="-1"/>
<input type="email" name="login" id="login" autofocus required disabled
placeholder="username@server.com"/>
<input type="text" id="complete" tabindex="-1"/>
<label for="login">{$c->__('form.username')}</label>
</div>
<div>
@ -53,7 +53,8 @@
{if="isset($info) && $info != ''"}
<ul class="list thin card">
<li class="info">
<p class="normal">{$info}</p>
<p></p>
<p class="center normal">{$info}</p>
</li>
</ul>
{/if}

2
sources/app/widgets/Menu/_menu_list.tpl
View file

@ -61,7 +61,7 @@
<span class="primary icon thumb color {$value->node|stringToColor}">{$value->node|firstLetterCapitalize}</span>
{/if}
{if="$value->privacy"}
{if="$value->isPublic()"}
<span class="control icon gray" title="{$c->__('menu.public')}">
<i class="zmdi zmdi-portable-wifi"></i>
</span>

21
sources/app/widgets/Post/Post.php
View file

@ -214,27 +214,6 @@ class Post extends \Movim\Widget\Base
}
}
function ajaxTogglePrivacy($id) {
$validate = Validator::stringType()->length(6, 128);
if(!$validate->validate($id))
return;
$pd = new \Modl\PostnDAO;
$po = $pd->getItem($id);
if($po->isMine()) {
if($po->privacy == 1) {
Notification::append(false, $this->__('post.public_no'));
\Modl\Privacy::set($id, 0);
}
if($po->privacy == 0) {
Notification::append(false, $this->__('post.public_yes'));
\Modl\Privacy::set($id, 1);
}
}
}
function getComments($post)
{
$pd = new \Modl\PostnDAO();

35
sources/app/widgets/Post/_post.tpl
View file

@ -139,7 +139,8 @@
</a>
{/if}
{/loop}
{elseif="$post->getYoutube()"}
{/if}
{if="$post->getYoutube()"}
<div class="video_embed">
<iframe src="https://www.youtube.com/embed/{$post->getYoutube()}" frameborder="0" allowfullscreen></iframe>
</div>
@ -165,7 +166,6 @@
<ul class="list middle divided spaced">
{if="isset($attachements.links)"}
{loop="$attachements.links"}
{if="substr($value.href, 0, 5) != 'xmpp:' && filter_var($value.href, FILTER_VALIDATE_URL)"}
<li>
<span class="primary icon">
<img src="https://icons.duckduckgo.com/ip2/{$value.url.host}.ico"/>
@ -176,7 +176,6 @@
</a>
</p>
</li>
{/if}
{/loop}
{/if}
{if="isset($attachements.files)"}
@ -189,7 +188,9 @@
<a
href="{$value.href}"
class="enclosure"
{if="isset($value.type)"}
type="{$value.type}"
{/if}
target="_blank">
{$value.href|urldecode}
</a>
@ -214,36 +215,14 @@
{/loop}
</ul>
{/if}
{if="$post->isMine() && !$public"}
<ul class="list middle">
{if="$post->isPublic() && !$public"}
<ul class="list thick">
<li>
<span class="primary icon gray">
<i class="zmdi zmdi-portable-wifi"></i>
</span>
<span class="control">
<form>
<div class="action">
<div class="checkbox">
<input
type="checkbox"
id="privacy_{$post->nodeid}"
name="privacy_{$post->nodeid}"
{if="$post->privacy"}
checked
{/if}
{if="$external"}
onclick="Group_ajaxTogglePrivacy('{$post->nodeid}')"
{else}
onclick="Post_ajaxTogglePrivacy('{$post->nodeid}')"
{/if}
>
<label for="privacy_{$post->nodeid}"></label>
</div>
</div>
</form>
</span>
<p class="line normal">
{$c->__('post.public')}
{$c->__('post.public_yes')}
</p>
<p>
<a target="_blank" href="{$post->getPublicUrl()}">

2
sources/app/widgets/Post/_post_comments.tpl
View file

@ -43,7 +43,7 @@
<span class="primary icon gray">
<i class="zmdi zmdi-comment"></i>
</span>
<span class="control icon gray" onclick="Post_ajaxPublishComment(movim_form_to_json('comment'),'{$server}', '{$node}', '{$id}')">
<span class="control icon gray active" onclick="Post_ajaxPublishComment(movim_form_to_json('comment'),'{$server}', '{$node}', '{$id}')">
<i class="zmdi zmdi-mail-send"></i>
</span>
<form name="comment">

4
sources/app/widgets/Post/locales.ini
View file

@ -12,8 +12,8 @@ repost_profile = See %s profile
blog_last = Public posts from users
public = Publish this post publicly?
public_yes = This post is now public
public_no = This post is now private
public_yes = This post is public
public_no = This post is private
public_url = Public URL of this post
delete_title = Delete this post

39
sources/app/widgets/Presence/Presence.php
View file

@ -113,16 +113,22 @@ class Presence extends \Movim\Widget\Base
$pd = new \Modl\PresenceDAO();
$pd->clearPresence();
$session = \Sessionx::start();
$session = \Session::start();
$p = new Unavailable;
$p->setType('terminate')
->setResource($session->resource)
->setTo($this->user->getLogin())
->setResource($session->get('resource'))
->setTo($session->get('jid'))
->request();
Stream::end();
}
function ajaxGetPresence()
{
$html = $this->preparePresence();
RPC::call('movim_fill', 'presence_widget', $html);
}
function ajaxConfigGet() {
$s = new Get;
$s->setXmlns('movim:prefs')
@ -132,27 +138,27 @@ class Presence extends \Movim\Widget\Base
// We get the server capabilities
function ajaxServerCapsGet()
{
$session = \Sessionx::start();
$session = \Session::start();
$c = new \Moxl\Xec\Action\Disco\Request;
$c->setTo($session->host)
$c->setTo($session->get('host'))
->request();
}
// We discover the server services
function ajaxServerDisco()
{
$session = \Sessionx::start();
$session = \Session::start();
$c = new \Moxl\Xec\Action\Disco\Items;
$c->setTo($session->host)
$c->setTo($session->get('host'))
->request();
}
// We refresh the bookmarks
function ajaxBookmarksGet()
{
$session = \Sessionx::start();
$session = \Session::start();
$b = new \Moxl\Xec\Action\Bookmark\Get;
$b->setTo($session->user.'@'.$session->host)
$b->setTo($session->get('jid'))
->request();
}
@ -182,11 +188,11 @@ class Presence extends \Movim\Widget\Base
function preparePresence()
{
$cd = new \Modl\ContactDAO();
$pd = new \Modl\PresenceDAO();
$cd = new \Modl\ContactDAO;
$pd = new \Modl\PresenceDAO;
$session = \Sessionx::start();
$presence = $pd->getPresence($this->user->getLogin(), $session->resource);
$session = \Session::start();
$presence = $pd->getPresence($session->get('jid'), $session->get('resource'));
$presencetpl = $this->tpl();
@ -214,13 +220,13 @@ class Presence extends \Movim\Widget\Base
$txt = getPresences();
$txts = getPresencesTxt();
$session = \Sessionx::start();
$session = \Session::start();
$pd = new \Modl\PresenceDAO();
$p = $pd->getPresence($this->user->getLogin(), $session->resource);
$p = $pd->getPresence($session->get('jid'), $session->get('resource'));
$cd = new \Modl\ContactDAO();
$contact = $cd->get($this->user->getLogin());
$contact = $cd->get($session->get('jid'));
if($contact == null) {
$contact = new \Modl\Contact;
}
@ -239,7 +245,6 @@ class Presence extends \Movim\Widget\Base
function display()
{
$this->view->assign('presence', $this->preparePresence());
}
}

1
sources/app/widgets/Presence/presence.js
View file

@ -44,4 +44,5 @@ MovimWebsocket.attach(function()
{
Presence.refresh();
Presence.postStart();
Presence_ajaxGetPresence();
});

8
sources/app/widgets/Presence/presence.tpl
View file

@ -1,3 +1,9 @@
<ul id="presence_widget" class="list active thick">
{$presence}
<li>
<span class="primary icon bubble color status">
<i class="zmdi zmdi-account"></i>
</span>
<p class="line bold">{$c->__('status.status')}</p>
<p class="line">{$c->__('status.status')}</p>
</li>
</ul>

6
sources/app/widgets/Publish/Publish.php
View file

@ -205,7 +205,7 @@ class Publish extends \Movim\Widget\Base
));
}
if($form->embed->value != '' && filter_var($form->embed->value, FILTER_VALIDATE_URL)) {
if(Validator::notEmpty()->url()->validate($form->embed->value)) {
try {
$embed = Embed\Embed::create($form->embed->value);
$p->setLink($form->embed->value);
@ -222,6 +222,10 @@ class Publish extends \Movim\Widget\Base
}
}
if($form->open->value === true) {
$p->isOpen();
}
if($content != '') {
$p->setContent(htmlspecialchars($content));
}

50
sources/app/widgets/Publish/_publish_create.tpl
View file

@ -76,17 +76,6 @@
<label for="content">{$c->__('post.content_label')}</label>
</div>
<ul class="list middle flex active">
{if="$c->supported('upload')"}
<li class="block large" onclick="Upload_ajaxRequest()">
<span class="primary icon">
<i class="zmdi zmdi-attachment-alt"></i>
</span>
<p class="normal line">{$c->__('publish.attach')}</p>
</li>
{/if}
</ul>
<div>
{if="$item != false"}
{$tags = $item->getTagsImploded()}
@ -100,4 +89,43 @@
{/if}>
<label for="title">{$c->__('post.tags')}</label>
</div>
<ul class="list middle active">
{if="$c->supported('upload')"}
<li class="block large" onclick="Upload_ajaxRequest()">
<span class="primary icon gray">
<i class="zmdi zmdi-attachment-alt"></i>
</span>
<p class="normal line">{$c->__('publish.attach')}</p>
</li>
{/if}
</ul>
<div>
<ul class="list thin">
<li>
<span class="primary icon gray">
<i class="zmdi zmdi-portable-wifi"></i>
</span>
<span class="control">
<div class="action">
<div class="checkbox">
<input
type="checkbox"
id="open"
name="open"
{if="$item != false && $item->open"}
checked
{/if}
>
<label for="open"></label>
</div>
</div>
</span>
<p class="line normal">
{$c->__('post.public')}
</p>
</li>
</ul>
</div>
</form>

4
sources/app/widgets/Publish/publish.css
View file

@ -11,3 +11,7 @@ form[name=post] #enable_content:hover > * {
form[name=post] #content_field {
display: none;
}
form[name=post] article section {
padding-top: 0;
}

44
sources/app/widgets/Rooms/Rooms.php
View file

@ -51,6 +51,14 @@ class Rooms extends \Movim\Widget\Base
RPC::call('Rooms.refresh');
}
/**
* @brief Get the Rooms
*/
public function ajaxDisplay()
{
$this->refreshRooms();
}
/**
* @brief Display the add room form
*/
@ -99,7 +107,7 @@ class Rooms extends \Movim\Widget\Base
{
if(!$this->validateRoom($room)) return;
$cd = new \modl\ConferenceDAO();
$cd = new \Modl\ConferenceDAO;
$cd->deleteNode($room);
$this->setBookmark();
@ -120,11 +128,6 @@ class Rooms extends \Movim\Widget\Base
$nickname = $s->get('username');
}
if($nickname == false || $nickname == null) {
$session = \Sessionx::start();
$nickname = $session->username;
}
$p->setNickname($nickname);
$p->request();
@ -142,11 +145,6 @@ class Rooms extends \Movim\Widget\Base
$s = Session::start();
$resource = $s->get('username');
if($resource == null) {
$session = \Sessionx::start();
$resource = $session->username;
}
$pu = new Unavailable;
$pu->setTo($room)
->setResource($resource)
@ -178,14 +176,15 @@ class Rooms extends \Movim\Widget\Base
public function setBookmark($item = false)
{
$arr = array();
$arr = [];
if($item) {
array_push($arr, $item);
}
$sd = new \modl\SubscriptionDAO();
$cd = new \modl\ConferenceDAO();
$sd = new \Modl\SubscriptionDAO;
$cd = new \Modl\ConferenceDAO;
$session = Session::start();
if($sd->getSubscribed()) {
foreach($sd->getSubscribed() as $s) {
@ -213,7 +212,7 @@ class Rooms extends \Movim\Widget\Base
$b = new Set;
$b->setArr($arr)
->setTo($this->user->getLogin())
->setTo($session->get('jid'))
->request();
}
@ -225,11 +224,11 @@ class Rooms extends \Movim\Widget\Base
return;
}
$pd = new \modl\PresenceDAO();
$pd = new \Modl\PresenceDAO;
if($resource == false) {
$session = \Sessionx::start();
$resource = $session->user;
$session = \Session::start();
$resource = $session->get('username');
}
$presence = $pd->getPresence($room, $resource);
@ -248,8 +247,9 @@ class Rooms extends \Movim\Widget\Base
$list = $cod->getAll();
$connected = array();
$connected = [];
if(is_array($list)) {
foreach($list as $key => $room) {
if($this->checkConnected($room->conference, $room->nick)) {
$room->connected = true;
@ -258,9 +258,10 @@ class Rooms extends \Movim\Widget\Base
}
}
$list = array_merge($connected, $list);
$connected = array_merge($connected, $list);
}
$view->assign('conferences', $list);
$view->assign('conferences', $connected);
$view->assign('room', $this->get('r'));
return $view->draw('_rooms', true);
@ -292,6 +293,5 @@ class Rooms extends \Movim\Widget\Base
function display()
{
$this->view->assign('list', $this->prepareRooms());
}
}

1
sources/app/widgets/Rooms/rooms.js
View file

@ -69,4 +69,5 @@ var Rooms = {
MovimWebsocket.attach(function() {
Rooms.refresh();
Rooms.anonymousInit();
Rooms_ajaxDisplay();
});

2
sources/app/widgets/Rooms/rooms.tpl
View file

@ -1 +1 @@
<div id="rooms_widget">{$list}</div>
<div id="rooms_widget"></div>

80
sources/app/widgets/Statistics/Statistics.php
View file

@ -1,39 +1,18 @@
<?php
/**
* @package Widgets
*
* @file Statistics.php
* This file is part of MOVIM.
*
* @brief The administration widget.
*
* @author Timothée Jaussoin <edhelas@gmail.com>
* *
* Copyright (C)2014 MOVIM project
*
* See COPYING for licensing information.
*/
use Modl\SessionxDAO;
class Statistics extends \Movim\Widget\Base
{
function load()
{
$this->addjs('chart.min.js');
$this->addjs('statistics.js');
}
function display()
function ajaxDisplay()
{
$sd = new SessionxDAO;
$this->view->assign('sessions', $sd->getAll());
$cd = new \Modl\ConfigDAO();
$config = $cd->get();
$this->view->assign('hash', $config->password);
$tmp = array();
$tmp = [];
foreach(scandir(USERS_PATH) as $f) {
if(is_dir(USERS_PATH.'/'.$f)) {
@ -45,9 +24,9 @@ class Statistics extends \Movim\Widget\Base
}
sort($tmp);
$days = array();
$days = [];
$pattern = "Y-m";
$pattern = "M Y";
foreach($tmp as $k => $time) {
$key = date($pattern, $time);
@ -59,15 +38,34 @@ class Statistics extends \Movim\Widget\Base
}
}
$this->renderTimeLineChart($days, $this->__('statistics.monthly_sub'), "monthly.png");
$data = new stdClass;
$data->labels = [];
$data->datasets = [];
$sum = 0;
$first = new StdClass;
$first->label = "Monthly Subscriptions";
$first->fillColor = "rgba(255,152,0,0.5)";
$first->strokeColor = "rgba(255,152,0,0.8)";
$first->highlightFill = "rgba(220,220,220,0.75)";
$first->highlightStroke = "rgba(220,220,220,1)";
$values = [];
foreach($days as $key => $value) {
$sum = $sum + $value;
$days[$key] = $sum;
array_push($data->labels, $key);
array_push($values, $value);
}
$this->renderTimeLineChart($days, $this->__('statistics.monthly_sub_cum'), "monthly_cumulated.png");
$first->data = $values;
array_push($data->datasets, $first);
RPC::call('Statistics.drawGraphs', $data);
}
function display()
{
$sd = new SessionxDAO;
$this->view->assign('sessions', $sd->getAll());
}
public function getContact($username, $host)
@ -77,24 +75,6 @@ class Statistics extends \Movim\Widget\Base
return $cd->get($jid);
}
private function renderTimeLineChart($data, $title, $filename)
{
$chart = new Libchart\View\Chart\LineChart(750, 450);
$dataSet = new Libchart\Model\XYDataSet();
foreach($data as $key => $value) {
$dataSet->addPoint(new Libchart\Model\Point($key, $value));
}
$chart->setDataSet($dataSet);
$chart->setTitle($title);
$chart->render(CACHE_PATH.$filename);
$this->view->assign('cache_path', BASE_URI.'cache/');
}
function getTime($date)
{
return prepareDate(strtotime($date));

11
sources/app/widgets/Statistics/chart.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

46
sources/app/widgets/Statistics/statistics.js Normal file
View file

@ -0,0 +1,46 @@
var Statistics = {
drawGraphs: function(data)
{
var options = {
//Boolean - Whether the scale should start at zero, or an order of magnitude down from the lowest value
scaleBeginAtZero : true,
//Boolean - Whether grid lines are shown across the chart
scaleShowGridLines : true,
//String - Colour of the grid lines
scaleGridLineColor : "rgba(0,0,0,.05)",
//Number - Width of the grid lines
scaleGridLineWidth : 1,
responsive : true,
//Boolean - Whether to show horizontal lines (except X axis)
scaleShowHorizontalLines: true,
//Boolean - Whether to show vertical lines (except Y axis)
scaleShowVerticalLines: true,
//Boolean - If there is a stroke on each bar
barShowStroke : true,
//Number - Pixel width of the bar stroke
barStrokeWidth : 2,
//Number - Spacing between each of the X value sets
barValueSpacing : 5,
//Number - Spacing between data sets within X values
barDatasetSpacing : 1,
//String - A legend template
legendTemplate : "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].fillColor%>\"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>"
};
var ctx = document.getElementById("monthly").getContext("2d");
var chart = new Chart(ctx).Line(data, options);
}
}

14
sources/app/widgets/Statistics/statistics.tpl
View file

@ -27,15 +27,7 @@
</ul>
<h3 class="padded_top_bottom">{$c->__('statistics.subscriptions')}</h3>
<div class="card">
<img src="{$cache_path}monthly.png">
</div>
<div class="card">
<img src="{$cache_path}monthly_cumulated.png">
</div>
<script type="text/javascript">
MovimWebsocket.attach(function() {
MovimWebsocket.connection.admin("{$hash}");
});
</script>
<br />
<canvas id="monthly" width="800" height="400"></canvas>
</div>

8
sources/app/widgets/Stickers/Stickers.php
View file

@ -57,7 +57,7 @@ class Stickers extends \Movim\Widget\Base
$p->set($key, 'png');
// Creating a message
$m = new \Modl\Message();
$m = new \Modl\Message;
$m->session = $this->user->getLogin();
$m->jidto = echapJid($to);
$m->jidfrom = $this->user->getLogin();
@ -66,11 +66,11 @@ class Stickers extends \Movim\Widget\Base
$m->published = gmdate('Y-m-d H:i:s');
$session = \Sessionx::start();
$session = \Session::start();
$m->id = Uuid::uuid4();
$m->type = 'chat';
$m->resource = $session->resource;
$m->resource = $session->get('resource');
// Sending the sticker
$html = "<p><img alt='Sticker' src='cid:sha1+".$key."@bob.xmpp.org'/></p>";
@ -82,7 +82,7 @@ class Stickers extends \Movim\Widget\Base
->setId($m->id)
->request();
$md = new \Modl\MessageDAO();
$md = new \Modl\MessageDAO;
$md->set($m);
// Sending it to Chat

6
sources/app/widgets/Subscribe/subscribe.tpl
View file

@ -6,7 +6,7 @@
</li>
</ul>
<ul class="list thick active flex card">
<ul class="list card shadow active flex">
{loop="$servers"}
<li
class="block"
@ -30,9 +30,9 @@
</p>
<p>
{$value->description}<br />
<a target="_blank" href="{$value->url}">
<!--<a target="_blank" href="{$value->url}">
{$value->url}
</a>
</a>-->
</p>
</li>
{/loop}

5
sources/app/widgets/Tabs/tabs.js
View file

@ -59,6 +59,11 @@ var Tabs = {
var baseUrl = window.location.href.split('#')[0];
window.location.replace(baseUrl + '#' + n);
// We try to call ajaxDisplay
if(typeof window[tabOn.title + '_ajaxDisplay'] == 'function') {
window[tabOn.title + '_ajaxDisplay'].apply();
}
// We reset the scroll
document.querySelector('#navtabs').parentNode.scrollTop = 0;
}

1
sources/composer.json
View file

@ -12,7 +12,6 @@
"ext-imagick": "*",
"monolog/monolog": "1.8.*",
"libchart/libchart": "dev-master",
"rain/raintpl": "dev-master",
"michelf/php-markdown": "1.4.*@dev",
"movim/modl": "dev-master",

185
sources/composer.lock generated
View file

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "b54958b944f29089f98f8ba4280c604b",
"content-hash": "a8f2cba127179fc763654ce07480f16c",
"hash": "959957c08a6e0a7b09d5b3bccf6f6979",
"content-hash": "958b7ab7a85b3465f8038d6848504ff1",
"packages": [
{
"name": "cboden/ratchet",
@ -536,52 +536,6 @@
],
"time": "2015-06-06 08:55:07"
},
{
"name": "libchart/libchart",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/astehlik/libchart.git",
"reference": "408d6729f59c3d1641af4c5fee39bb3bcb7fd575"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/astehlik/libchart/zipball/408d6729f59c3d1641af4c5fee39bb3bcb7fd575",
"reference": "408d6729f59c3d1641af4c5fee39bb3bcb7fd575",
"shasum": ""
},
"type": "library",
"autoload": {
"psr-0": {
"Libchart\\": "libchart/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-3.0"
],
"authors": [
{
"name": "Jean-Marc Trémeaux",
"homepage": "http://naku.dohcrew.com/",
"role": "Developer"
},
{
"name": "Alexander Stehlik",
"role": "Developer"
}
],
"description": "Simple PHP chart drawing library",
"homepage": "http://naku.dohcrew.com/libchart/pages/introduction/",
"keywords": [
"bar charts",
"chart",
"charts",
"line charts",
"pie charts"
],
"time": "2013-10-19 22:30:10"
},
{
"name": "michelf/php-markdown",
"version": "dev-lib",
@ -751,12 +705,12 @@
"source": {
"type": "git",
"url": "https://github.com/movim/moxl.git",
"reference": "bc73793d532eb9c2e9af1ffd5a42d31341347dd0"
"reference": "497a2111872660f3ebbeb1ad71ec8425c0be9d43"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/movim/moxl/zipball/bc73793d532eb9c2e9af1ffd5a42d31341347dd0",
"reference": "bc73793d532eb9c2e9af1ffd5a42d31341347dd0",
"url": "https://api.github.com/repos/movim/moxl/zipball/497a2111872660f3ebbeb1ad71ec8425c0be9d43",
"reference": "497a2111872660f3ebbeb1ad71ec8425c0be9d43",
"shasum": ""
},
"require": {
@ -791,7 +745,7 @@
"php",
"xmpp"
],
"time": "2016-03-26 20:56:59"
"time": "2016-04-10 08:19:13"
},
{
"name": "movim/sasl2",
@ -846,16 +800,16 @@
},
{
"name": "paragonie/random_compat",
"version": "v2.0.1",
"version": "v2.0.2",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
"reference": "76e90f747b769b347fe584e8015a014549107d35"
"reference": "088c04e2f261c33bed6ca5245491cfca69195ccf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/76e90f747b769b347fe584e8015a014549107d35",
"reference": "76e90f747b769b347fe584e8015a014549107d35",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/088c04e2f261c33bed6ca5245491cfca69195ccf",
"reference": "088c04e2f261c33bed6ca5245491cfca69195ccf",
"shasum": ""
},
"require": {
@ -890,7 +844,7 @@
"pseudorandom",
"random"
],
"time": "2016-03-18 20:36:13"
"time": "2016-04-03 06:00:07"
},
{
"name": "pear/net_dns2",
@ -1351,16 +1305,16 @@
},
{
"name": "react/promise",
"version": "v2.3.0",
"version": "v2.4.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/promise.git",
"reference": "8ffacee1171e33a1c129f424bf1ec36e062eba82"
"reference": "f942da7b505d1a294284ab343d05df42d02ad6d9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/reactphp/promise/zipball/8ffacee1171e33a1c129f424bf1ec36e062eba82",
"reference": "8ffacee1171e33a1c129f424bf1ec36e062eba82",
"url": "https://api.github.com/repos/reactphp/promise/zipball/f942da7b505d1a294284ab343d05df42d02ad6d9",
"reference": "f942da7b505d1a294284ab343d05df42d02ad6d9",
"shasum": ""
},
"require": {
@ -1391,7 +1345,7 @@
}
],
"description": "A lightweight implementation of CommonJS Promises/A for PHP",
"time": "2016-03-24 21:20:22"
"time": "2016-03-31 13:10:33"
},
{
"name": "react/promise-timer",
@ -1574,16 +1528,16 @@
},
{
"name": "respect/validation",
"version": "1.0.4",
"version": "1.0.5",
"source": {
"type": "git",
"url": "https://github.com/Respect/Validation.git",
"reference": "4b2f15920627b93a0a4302e1e6e7db1bab1946e2"
"reference": "294368294f9cd207f81474bab27d99875a19ac55"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Respect/Validation/zipball/4b2f15920627b93a0a4302e1e6e7db1bab1946e2",
"reference": "4b2f15920627b93a0a4302e1e6e7db1bab1946e2",
"url": "https://api.github.com/repos/Respect/Validation/zipball/294368294f9cd207f81474bab27d99875a19ac55",
"reference": "294368294f9cd207f81474bab27d99875a19ac55",
"shasum": ""
},
"require": {
@ -1634,7 +1588,7 @@
"validation",
"validator"
],
"time": "2016-02-26 15:21:26"
"time": "2016-03-31 17:39:15"
},
{
"name": "stojg/crop",
@ -1684,16 +1638,16 @@
},
{
"name": "symfony/event-dispatcher",
"version": "v3.0.3",
"version": "v3.0.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "4dd5df31a28c0f82b41cb1e1599b74b5dcdbdafa"
"reference": "9002dcf018d884d294b1ef20a6f968efc1128f39"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4dd5df31a28c0f82b41cb1e1599b74b5dcdbdafa",
"reference": "4dd5df31a28c0f82b41cb1e1599b74b5dcdbdafa",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9002dcf018d884d294b1ef20a6f968efc1128f39",
"reference": "9002dcf018d884d294b1ef20a6f968efc1128f39",
"shasum": ""
},
"require": {
@ -1740,24 +1694,25 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2016-01-27 05:14:46"
"time": "2016-03-10 10:34:12"
},
{
"name": "symfony/http-foundation",
"version": "v3.0.3",
"version": "v3.0.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "52065702c71743c05d415a8facfcad6d4257e8d7"
"reference": "99f38445a874e7becb8afc4b4a79ee181cf6ec3f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/52065702c71743c05d415a8facfcad6d4257e8d7",
"reference": "52065702c71743c05d415a8facfcad6d4257e8d7",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/99f38445a874e7becb8afc4b4a79ee181cf6ec3f",
"reference": "99f38445a874e7becb8afc4b4a79ee181cf6ec3f",
"shasum": ""
},
"require": {
"php": ">=5.5.9"
"php": ">=5.5.9",
"symfony/polyfill-mbstring": "~1.1"
},
"require-dev": {
"symfony/expression-language": "~2.8|~3.0"
@ -1792,20 +1747,79 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
"time": "2016-02-28 16:24:34"
"time": "2016-03-27 14:50:32"
},
{
"name": "symfony/routing",
"version": "v3.0.3",
"name": "symfony/polyfill-mbstring",
"version": "v1.1.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "fa1e9a8173cf0077dd995205da453eacd758fdf6"
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "1289d16209491b584839022f29257ad859b8532d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/fa1e9a8173cf0077dd995205da453eacd758fdf6",
"reference": "fa1e9a8173cf0077dd995205da453eacd758fdf6",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d",
"reference": "1289d16209491b584839022f29257ad859b8532d",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"suggest": {
"ext-mbstring": "For best performance"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Mbstring\\": ""
},
"files": [
"bootstrap.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill for the Mbstring extension",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"mbstring",
"polyfill",
"portable",
"shim"
],
"time": "2016-01-20 09:13:37"
},
{
"name": "symfony/routing",
"version": "v3.0.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "d061b609f2d0769494c381ec92f5c5cc5e4a20aa"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/d061b609f2d0769494c381ec92f5c5cc5e4a20aa",
"reference": "d061b609f2d0769494c381ec92f5c5cc5e4a20aa",
"shasum": ""
},
"require": {
@ -1867,14 +1881,13 @@
"uri",
"url"
],
"time": "2016-02-04 13:53:13"
"time": "2016-03-23 13:23:25"
}
],
"packages-dev": [],
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
"libchart/libchart": 20,
"rain/raintpl": 20,
"michelf/php-markdown": 20,
"movim/modl": 20,

28
sources/linker.php
View file

@ -38,11 +38,23 @@ function handleSSLErrors($errno, $errstr) {
// Temporary linker killer
$loop->addPeriodicTimer(5, function() use(&$conn, &$timestamp) {
if($timestamp < time() - 3600*2) {
if($timestamp < time() - 3600*6) {
$conn->close();
}
});
// One connected ping each 5 mins
/*$loop->addPeriodicTimer(5*60, function() use (&$conn) {
if(isset($conn)
&& is_resource($conn->stream)) {
$ping = new \Moxl\Xec\Action\Ping\Server;
$ping->request();
$conn->write(trim(\Moxl\API::commit()));
\Moxl\API::clear();
}
});*/
$stdin_behaviour = function ($data) use (&$conn, $loop, &$buffer, &$connector, &$xmpp_behaviour, &$parser, &$timestamp) {
if(substr($data, -1) == "") {
$messages = explode("", $buffer . substr($data, 0, -1));
@ -91,7 +103,6 @@ $stdin_behaviour = function ($data) use (&$conn, $loop, &$buffer, &$connector, &
\RPC::clear();
if(!empty($msg)) {
//echo json_encode($msg)."";
echo base64_encode(gzcompress(json_encode($msg), 9))."";
//fwrite(STDERR, colorize(json_encode($msg), 'yellow')." : ".colorize('sent to the browser', 'green')."\n");
}
@ -100,7 +111,6 @@ $stdin_behaviour = function ($data) use (&$conn, $loop, &$buffer, &$connector, &
\Moxl\API::clear();
if(!empty($xml) && $conn) {
//$timestamp = time();
$conn->write(trim($xml));
#fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
}
@ -119,7 +129,7 @@ $xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$s
$stdin->on('data', $stdin_behaviour);
// We define a huge buffer to prevent issues with SSL streams, see https://bugs.php.net/bug.php?id=65137
//$conn->bufferSize = 1024*32;
$conn->bufferSize = 1024*32;
$conn->on('data', function($message) use (&$conn, $loop, $parser, &$timestamp) {
if(!empty($message)) {
$restart = false;
@ -131,10 +141,10 @@ $xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$s
$loop->stop();
} elseif($message == "<proceed xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>"
|| $message == '<proceed xmlns="urn:ietf:params:xml:ns:xmpp-tls"/>') {
$session = \Sessionx::start();
$session = \Session::start();
stream_set_blocking($conn->stream, 1);
stream_context_set_option($conn->stream, 'ssl', 'SNI_enabled', false);
stream_context_set_option($conn->stream, 'ssl', 'peer_name', $session->host);
stream_context_set_option($conn->stream, 'ssl', 'peer_name', $session->get('host'));
stream_context_set_option($conn->stream, 'ssl', 'allow_self_signed', true);
#stream_context_set_option($conn->stream, 'ssl', 'verify_peer_name', false);
#stream_context_set_option($conn->stream, 'ssl', 'verify_peer', false);
@ -164,8 +174,8 @@ $xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$s
}
if($restart) {
$session = \Sessionx::start();
\Moxl\Stanza\Stream::init($session->host);
$session = \Session::start();
\Moxl\Stanza\Stream::init($session->get('host'));
stream_set_blocking($conn->stream, 0);
$restart = false;
}
@ -173,7 +183,6 @@ $xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$s
$msg = \RPC::commit();
if(!empty($msg)) {
//echo json_encode($msg)."";
echo base64_encode(gzcompress(json_encode($msg), 9))."";
//fwrite(STDERR, colorize(json_encode($msg).' '.strlen($msg), 'yellow')." : ".colorize('sent to browser', 'green')."\n");
}
@ -183,7 +192,6 @@ $xmpp_behaviour = function (React\Stream\Stream $stream) use (&$conn, $loop, &$s
$xml = \Moxl\API::commit();
if(!empty($xml)) {
//$timestamp = time();
$conn->write(trim($xml));
#fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n");
}

12
sources/locales/ach.po
View file

@ -76,7 +76,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Acoli (http://www.transifex.com/movim/movim/language/ach/)\n"
@ -415,7 +415,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1203,7 +1203,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1279,12 +1279,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/ady.po
View file

@ -76,7 +76,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Adyghe (http://www.transifex.com/movim/movim/language/ady/)\n"
@ -415,7 +415,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1203,7 +1203,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1279,12 +1279,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/af.po
View file

@ -76,7 +76,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Afrikaans (http://www.transifex.com/movim/movim/language/af/)\n"
@ -415,7 +415,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1203,7 +1203,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1279,12 +1279,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/ar.po
View file

@ -77,7 +77,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/movim/movim/language/ar/)\n"
@ -416,7 +416,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1204,7 +1204,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1280,12 +1280,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/be.po
View file

@ -76,7 +76,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/movim/movim/language/be/)\n"
@ -415,7 +415,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1203,7 +1203,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1279,12 +1279,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/bg.po
View file

@ -77,7 +77,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Bulgarian (http://www.transifex.com/movim/movim/language/bg/)\n"
@ -416,7 +416,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1204,7 +1204,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1280,12 +1280,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/bn.po
View file

@ -77,7 +77,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Bengali (http://www.transifex.com/movim/movim/language/bn/)\n"
@ -416,7 +416,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1204,7 +1204,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1280,12 +1280,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/br.po
View file

@ -76,7 +76,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Breton (http://www.transifex.com/movim/movim/language/br/)\n"
@ -415,7 +415,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1203,7 +1203,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1279,12 +1279,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/ca.po
View file

@ -77,7 +77,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/movim/movim/language/ca/)\n"
@ -416,7 +416,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1204,7 +1204,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1280,12 +1280,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

17
sources/locales/da.po
View file

@ -77,7 +77,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Danish (http://www.transifex.com/movim/movim/language/da/)\n"
@ -416,7 +416,8 @@ msgid "XMPP"
msgstr "XMPP"
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
#, fuzzy
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr "Her kan du registrere din pod på den officielle %sMovim API%s og blive listet på %spod siden%s."
#: [api]register
@ -1204,7 +1205,7 @@ msgstr "Velkommen til din nyhedsstrøm, her vil du se alle de indlæg der public
msgid "Refresh all the streams"
msgstr "Genopfrisk alle strømmene"
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr "Dette indlæg er offentligt"
@ -1280,12 +1281,9 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr "Publicer dette indlæg offentligt?"
#: [post]public_yes
msgid "This post is now public"
msgstr "Dette indlæg er nu offentligt"
#: [post]public_no
msgid "This post is now private"
#, fuzzy
msgid "This post is private"
msgstr "Dette indlæg er nu privat"
#: [post]public_url
@ -2537,3 +2535,6 @@ msgstr "API'et kan ikke nåes, prøv igen senere"
#: [field]type_here
msgid "Type here"
msgstr "Skriv her"
#~ msgid "This post is now public"
#~ msgstr "Dette indlæg er nu offentligt"

17
sources/locales/de.po
View file

@ -83,7 +83,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: German (http://www.transifex.com/movim/movim/language/de/)\n"
@ -422,7 +422,8 @@ msgid "XMPP"
msgstr "XMPP"
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
#, fuzzy
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr "Hier können Sie Ihren eigenen Pod bei der offiziellen %sMovim-API%s registrieren und auf der %sPod-Seite%s gelistet werden."
#: [api]register
@ -1210,7 +1211,7 @@ msgstr "Willkommen zu Ihren Neuigkeiten, hier können Sie alle Beiträge sehen,
msgid "Refresh all the streams"
msgstr "Alle Daten auffrischen"
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr "Dieser Beitrag ist öffentlich"
@ -1286,12 +1287,9 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr "Diesen Beitrag öffentlich zeigen?"
#: [post]public_yes
msgid "This post is now public"
msgstr "Dieser Beitrag ist jetzt öffentlich"
#: [post]public_no
msgid "This post is now private"
#, fuzzy
msgid "This post is private"
msgstr "Dieser Beitrag ist jetzt privat"
#: [post]public_url
@ -2543,3 +2541,6 @@ msgstr "Die API ist nicht erreichbar, bitte später erneut versuchen"
#: [field]type_here
msgid "Type here"
msgstr "Hier tippen"
#~ msgid "This post is now public"
#~ msgstr "Dieser Beitrag ist jetzt öffentlich"

12
sources/locales/el.po
View file

@ -77,7 +77,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Greek (http://www.transifex.com/movim/movim/language/el/)\n"
@ -416,7 +416,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1204,7 +1204,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1280,12 +1280,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

17
sources/locales/en.po
View file

@ -76,7 +76,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: English (http://www.transifex.com/movim/movim/language/en/)\n"
@ -415,7 +415,8 @@ msgid "XMPP"
msgstr "XMPP"
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
#, fuzzy
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
#: [api]register
@ -1203,7 +1204,7 @@ msgstr "Welcome on your news feed, here you will see all the posts published by
msgid "Refresh all the streams"
msgstr "Refresh all the streams"
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr "This post is public"
@ -1279,12 +1280,9 @@ msgstr "Public posts from users"
msgid "Publish this post publicly?"
msgstr "Publish this post publicly?"
#: [post]public_yes
msgid "This post is now public"
msgstr "This post is now public"
#: [post]public_no
msgid "This post is now private"
#, fuzzy
msgid "This post is private"
msgstr "This post is now private"
#: [post]public_url
@ -2536,3 +2534,6 @@ msgstr "The API is not reachable, try again later"
#: [field]type_here
msgid "Type here"
msgstr "Type here"
#~ msgid "This post is now public"
#~ msgstr "This post is now public"

12
sources/locales/eo.po
View file

@ -76,7 +76,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/movim/movim/language/eo/)\n"
@ -415,7 +415,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1203,7 +1203,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1279,12 +1279,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

16
sources/locales/es.po
View file

@ -79,7 +79,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/movim/movim/language/es/)\n"
@ -418,7 +418,8 @@ msgid "XMPP"
msgstr "XMPP"
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
#, fuzzy
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr "Aquí puedes registrar tu pod en la %sAPI de Movim%s oficial y puede ser escuchado en %la página pod%s"
#: [api]register
@ -1206,7 +1207,7 @@ msgstr "Bienvenido al contenido de tus noticias, aquí verás todos las publicac
msgid "Refresh all the streams"
msgstr "Refrescar todas las retransmisiones"
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr "Esta publicación es pública"
@ -1282,13 +1283,10 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgstr ""
#, fuzzy
msgid "This post is private"
msgstr "Esta publicación es pública"
#: [post]public_url
msgid "Public URL of this post"

12
sources/locales/fa.po
View file

@ -77,7 +77,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Persian (http://www.transifex.com/movim/movim/language/fa/)\n"
@ -416,7 +416,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1204,7 +1204,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1280,12 +1280,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/fi.po
View file

@ -76,7 +76,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Finnish (http://www.transifex.com/movim/movim/language/fi/)\n"
@ -415,7 +415,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1203,7 +1203,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1279,12 +1279,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

201
sources/locales/fr.po
View file

@ -2,7 +2,7 @@
# Translators:
# Cypouz, 2015
# Éfrit, 2015
# Jaussoin Timothée <edhelas@movim.eu>, 2015
# Jaussoin Timothée <edhelas@movim.eu>, 2015-2016
# Maxime Buquet <tidusx62@gmail.com>, 2015
# Thirty Thirds <thirtythirds@gmail.com>, 2015
# Tom <caporaldead@gmail.com>, 2015
@ -82,8 +82,8 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"PO-Revision-Date: 2015-12-29 12:51+0000\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-04-08 06:34+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: French (France) (http://www.transifex.com/movim/movim/language/fr_FR/)\n"
"Language: fr_FR\n"
@ -421,8 +421,8 @@ msgid "XMPP"
msgstr "XMPP"
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgstr "Vous pouvez enregistrer ici votre pod sur %sl’API officielle%s et être listé sur %sla page des pods%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr "Vous pouvez enregistrer ici votre pod sur %sl’API officielle%s"
#: [api]register
msgid "Your pod is not registered on the API"
@ -649,7 +649,7 @@ msgstr "Afficher plus de contacts"
#: [button]new
msgid "New conversation"
msgstr ""
msgstr "Nouvelle conversation"
#: [config]general
msgid "General"
@ -1209,7 +1209,7 @@ msgstr "Bienvenue sur votre flux d’actualité, ici vous verrez toutes les publ
msgid "Refresh all the streams"
msgstr "Rafraîchir tous les flux"
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr "Ce billet est public"
@ -1218,18 +1218,16 @@ msgid "All"
msgstr "Tous"
#: [menu]mine
#, fuzzy
msgid "My publications"
msgstr "Mes Souscriptions"
msgstr "Mes publications"
#: [menu]contacts [page]contacts
msgid "Contacts"
msgstr "Contacts"
#: [menu]add_post
#, fuzzy
msgid "Add a post"
msgstr "Commenter"
msgstr ""
#: [notifs]title
msgid "Pending Invitations"
@ -1280,26 +1278,20 @@ msgid "See %s profile"
msgstr "Voir le profil de %s"
#: [post]blog_last
#, fuzzy
msgid "Public posts from users"
msgstr "Groupes publics"
msgstr "Billets publics d'utilisateurs"
#: [post]public
msgid "Publish this post publicly?"
msgstr "Publier ce billet publiquement?"
#: [post]public_yes
msgid "This post is now public"
msgstr "Ce billet est désormais publique"
#: [post]public_no
msgid "This post is now private"
msgstr "Ce billet est désormais privé"
msgid "This post is private"
msgstr "Ce billet est privé"
#: [post]public_url
#, fuzzy
msgid "Public URL of this post"
msgstr "Publier ce billet publiquement?"
msgstr "URL publique pour ce billet"
#: [post]delete_title [post]delete
msgid "Delete this post"
@ -1574,9 +1566,8 @@ msgid "Search in your contacts"
msgstr "Chercher dans vos contacts "
#: [roster]search_pod
#, fuzzy
msgid "Search a contact"
msgstr "Chercher dans vos contacts "
msgstr "Chercher un contact"
#: [share]error
msgid "This is not a valid url"
@ -1608,7 +1599,7 @@ msgstr "Souscriptions par mois cumulés"
#: [sticker]sent
msgid "A sticker has been sent using Movim"
msgstr ""
msgstr "Un autocollant a été envoyé via Movim"
#: [subscribe]info
msgid "Movim is a decentralized social network, before creating a new account you need to choose a server to register."
@ -1683,7 +1674,6 @@ msgid "Is this profile public ?"
msgstr "Ce profil est-il public ?"
#: [privacy]privacy_info
#, fuzzy
msgid "Please pay attention ! By making your profile public, all the information listed bellow will be available for all the Movim users and on the whole Internet."
msgstr "Faites attention ! En rendant votre profil public, toutes les informations listées ci-dessus seront visibles par les utilisateurs de Movim mais également par tous les internautes."
@ -2548,164 +2538,3 @@ msgstr "L’API est indisponible pour le moment, réessayez plus tard."
#: [field]type_here
msgid "Type here"
msgstr "Rédigez votre message ici"
#~ msgid "Go on the Chat page"
#~ msgstr "Aller sur la page Discussions"
#~ msgid "Read all theses articles on the News page"
#~ msgstr "Lire tous ces articles sur la page Actualité"
#~ msgid "Discover"
#~ msgstr "Découvrir"
#~ msgid "Server"
#~ msgstr "Serveur"
#~ msgid "Viewer"
#~ msgstr "Visionneuse"
#~ msgid "Media"
#~ msgstr "Médias"
#~ msgid "Route error, please set all the parameters for the page %s"
#~ msgstr "Erreur de chemin, veuillez configurer tous les paramètres de la page %s"
#~ msgid "It seem that you don't have any pictures here?"
#~ msgstr "Il semblerait que vous n’avez aucune image ici ?"
#~ msgid "You can try to upload a couple by going to the Media page"
#~ msgstr "Vous pouvez essayer d’en envoyer via la page Médias"
#~ msgid "%s - About"
#~ msgstr "%s – À propos"
#~ msgid "%s - Account"
#~ msgstr "%s – Compte"
#~ msgid "%s - Administration Panel"
#~ msgstr "%s – Panneau d’administration"
#~ msgid "%s - Blog"
#~ msgstr "%s – Blog"
#~ msgid "%s - Configuration"
#~ msgstr "%s – Configuration"
#~ msgid "%s - Discover"
#~ msgstr "%s – Découvrir"
#~ msgid "%s - Explore"
#~ msgstr "%s – Explorer"
#~ msgid "%s - Help Page"
#~ msgstr "%s – Page d’aide"
#~ msgid "%s - Login to Movim"
#~ msgstr "%s – Connexion à Movim"
#~ msgid "%s - Welcome to Movim"
#~ msgstr "%s – Bienvenue sur Movim"
#~ msgid "%s - Media"
#~ msgstr "%s – Médias"
#~ msgid "%s - News"
#~ msgstr "%s – Actualités"
#~ msgid "%s - Group Configuration"
#~ msgstr "%s – Configuration du groupe"
#~ msgid "%s - Group"
#~ msgstr "%s – Groupe"
#~ msgid "%s - 404"
#~ msgstr "%s – 404"
#~ msgid "%s - Profile"
#~ msgstr "%s – Profil"
#~ msgid "%s - Server"
#~ msgstr "%s – Serveur"
#~ msgid "Step %s"
#~ msgstr "Étape %s"
#~ msgid "Data"
#~ msgstr "Données"
#~ msgid "Cache"
#~ msgstr "Cache"
#~ msgid "Messages"
#~ msgstr "Messages"
#~ msgid "Location"
#~ msgstr "Position"
#~ msgid "Wrong position"
#~ msgstr "Mauvaise position"
#~ msgid "Location updated"
#~ msgstr "Position géographique mise à jour"
#~ msgid "Update my position"
#~ msgstr "Mettre à jour ma position"
#~ msgid "Manage your members"
#~ msgstr "Gérer vos membres"
#~ msgid "Get the members"
#~ msgstr "Récupérer les membres"
#~ msgid "Affiliations saved"
#~ msgstr "Affiliations sauvegardées"
#~ msgid "Manage your subscriptions"
#~ msgstr "Gérer vos abonnements"
#~ msgid "Manage the subscriptions"
#~ msgstr "Gérer les abonnements"
#~ msgid "Get the subscriptions"
#~ msgstr "Récupérer les abonnements"
#~ msgid "Subscriptions saved"
#~ msgstr "Abonnements sauvegardés"
#~ msgid "Shared"
#~ msgstr "Partagé"
#~ msgid "%s has been added to your public groups"
#~ msgstr "%s a été ajouté à vos groupes publics"
#~ msgid "Search"
#~ msgstr "Rechercher"
#~ msgctxt "[general]nickname"
#~ msgid "Nickname"
#~ msgstr "Surnom"
#~ msgctxt "[accounts]accounts_nickname"
#~ msgid "Nickname"
#~ msgstr "Surnom"
#~ msgid "Hung up"
#~ msgstr "Fin d'appel"
#~ msgid "Your contact is busy"
#~ msgstr "Votre contact est occupé"
#~ msgid "Declined"
#~ msgstr "Rejeté"
#~ msgid "Is calling you"
#~ msgstr "Vous appelle"
#~ msgid "Call"
#~ msgstr "Appeler"
#~ msgid "Hang up"
#~ msgstr "Raccrocher"
#~ msgid "Connection"
#~ msgstr "Connexion"

12
sources/locales/ga.po
View file

@ -77,7 +77,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Irish (http://www.transifex.com/movim/movim/language/ga/)\n"
@ -416,7 +416,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1204,7 +1204,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1280,12 +1280,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/gl.po
View file

@ -76,7 +76,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Galician (http://www.transifex.com/movim/movim/language/gl/)\n"
@ -415,7 +415,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1203,7 +1203,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1279,12 +1279,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

13
sources/locales/he.po
View file

@ -77,7 +77,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/movim/movim/language/he/)\n"
@ -416,7 +416,8 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
#, fuzzy
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr "באפשרותך לרשום כאן את השרת שלך בתוך %sMovim API%s הרשמי בו יהיה מנוי בתוך %sעמוד השרתים%s."
#: [api]register
@ -1204,7 +1205,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr "רענון של כל הזרמים"
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1280,12 +1281,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/hr.po
View file

@ -77,7 +77,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/movim/movim/language/hr/)\n"
@ -416,7 +416,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1204,7 +1204,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1280,12 +1280,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

16
sources/locales/hu.po
View file

@ -79,7 +79,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Hungarian (http://www.transifex.com/movim/movim/language/hu/)\n"
@ -418,7 +418,8 @@ msgid "XMPP"
msgstr "XMPP"
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
#, fuzzy
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr "Itt tudod regisztrálni a podod a hivatalos %sMovim API%kon és listázhatod a %sthe pods page%n."
#: [api]register
@ -1206,7 +1207,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr "Adatfolyamok frissítése"
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr "Ez a megosztás nyílvános"
@ -1282,13 +1283,10 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgstr ""
#, fuzzy
msgid "This post is private"
msgstr "Ez a megosztás nyílvános"
#: [post]public_url
msgid "Public URL of this post"

12
sources/locales/id.po
View file

@ -78,7 +78,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/movim/movim/language/id/)\n"
@ -417,7 +417,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1205,7 +1205,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1281,12 +1281,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/io.po
View file

@ -78,7 +78,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Ido (http://www.transifex.com/movim/movim/language/io/)\n"
@ -417,7 +417,7 @@ msgid "XMPP"
msgstr "XMPP"
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1205,7 +1205,7 @@ msgstr "Bonvenez a vua niuzo-adporto, hike vu spektebla omna di la postigi publi
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1281,12 +1281,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/is.po
View file

@ -77,7 +77,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/movim/movim/language/is/)\n"
@ -416,7 +416,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1204,7 +1204,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1280,12 +1280,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

16
sources/locales/it.po
View file

@ -78,7 +78,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Italian (http://www.transifex.com/movim/movim/language/it/)\n"
@ -417,7 +417,8 @@ msgid "XMPP"
msgstr "XMPP"
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
#, fuzzy
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr "Qui puoi registrare il tuo pod su %sMovim API% ufficiale ed essere elencato su %sthe pods page%s."
#: [api]register
@ -1205,7 +1206,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr "Aggiorna tutti gli stream"
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr "Questo articolo è pubblico"
@ -1281,13 +1282,10 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgstr ""
#, fuzzy
msgid "This post is private"
msgstr "Questo articolo è pubblico"
#: [post]public_url
msgid "Public URL of this post"

12
sources/locales/ja.po
View file

@ -77,7 +77,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Japanese (http://www.transifex.com/movim/movim/language/ja/)\n"
@ -416,7 +416,7 @@ msgid "XMPP"
msgstr "XMPP"
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1204,7 +1204,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1280,12 +1280,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/jbo.po
View file

@ -77,7 +77,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Lojban (http://www.transifex.com/movim/movim/language/jbo/)\n"
@ -416,7 +416,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1204,7 +1204,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1280,12 +1280,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/kk.po
View file

@ -76,7 +76,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Kazakh (http://www.transifex.com/movim/movim/language/kk/)\n"
@ -415,7 +415,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1203,7 +1203,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1279,12 +1279,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/la.po
View file

@ -76,7 +76,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Latin (http://www.transifex.com/movim/movim/language/la/)\n"
@ -415,7 +415,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1203,7 +1203,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1279,12 +1279,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/lb.po
View file

@ -76,7 +76,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/movim/movim/language/lb/)\n"
@ -415,7 +415,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1203,7 +1203,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1279,12 +1279,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/lv.po
View file

@ -77,7 +77,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/movim/movim/language/lv/)\n"
@ -416,7 +416,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1204,7 +1204,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1280,12 +1280,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/lzh.po
View file

@ -76,7 +76,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Chinese (Literary) (http://www.transifex.com/movim/movim/language/lzh/)\n"
@ -415,7 +415,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1203,7 +1203,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1279,12 +1279,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

14
sources/locales/messages.pot
View file

@ -75,7 +75,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -427,9 +427,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid ""
"Here you can register your pod on the official %sMovim API%s and be listed "
"on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1240,7 +1238,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1316,12 +1314,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/ne.po
View file

@ -77,7 +77,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/movim/movim/language/ne/)\n"
@ -416,7 +416,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1204,7 +1204,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1280,12 +1280,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

16
sources/locales/nl.po
View file

@ -79,7 +79,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/movim/movim/language/nl/)\n"
@ -418,7 +418,8 @@ msgid "XMPP"
msgstr "XMPP"
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
#, fuzzy
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr "Hier kun je je pod registreren op de officiele %sMovim API%s waarna de pod op %sde pods pagina%s getoond wordt."
#: [api]register
@ -1206,7 +1207,7 @@ msgstr "Welkom op je nieuws feed. Hier zie je alle berichten die door je contact
msgid "Refresh all the streams"
msgstr "Vernieuw alle streams"
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr "Dit bericht is openbaar"
@ -1282,13 +1283,10 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr "Post dit bericht openbaar?"
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgstr ""
#, fuzzy
msgid "This post is private"
msgstr "Dit bericht is openbaar"
#: [post]public_url
msgid "Public URL of this post"

12
sources/locales/no.po
View file

@ -76,7 +76,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Norwegian (http://www.transifex.com/movim/movim/language/no/)\n"
@ -415,7 +415,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1203,7 +1203,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1279,12 +1279,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/oc.po
View file

@ -76,7 +76,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/movim/movim/language/oc/)\n"
@ -415,7 +415,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1203,7 +1203,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1279,12 +1279,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

16
sources/locales/pl.po
View file

@ -77,7 +77,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Polish (http://www.transifex.com/movim/movim/language/pl/)\n"
@ -416,7 +416,8 @@ msgid "XMPP"
msgstr "XMPP"
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
#, fuzzy
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr "Tutaj możesz zarejestrować swojego poda na oficjalnym %sMovim API%s i mieć go oznaczonego na %sthe pods page%s."
#: [api]register
@ -1204,7 +1205,7 @@ msgstr "Witaj w zakładce nowinek. Tutaj znajdziesz wszystkie posty opublikowany
msgid "Refresh all the streams"
msgstr "Odśwież wszystkie strumienie"
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr "Wpis jest publiczny"
@ -1280,13 +1281,10 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr "Opublikować wpis publicznie?"
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgstr ""
#, fuzzy
msgid "This post is private"
msgstr "Wpis jest publiczny"
#: [post]public_url
msgid "Public URL of this post"

12
sources/locales/pt.po
View file

@ -77,7 +77,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Portuguese (http://www.transifex.com/movim/movim/language/pt/)\n"
@ -416,7 +416,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1204,7 +1204,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1280,12 +1280,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/ro.po
View file

@ -76,7 +76,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/movim/movim/language/ro/)\n"
@ -415,7 +415,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1203,7 +1203,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1279,12 +1279,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

13
sources/locales/ru.po
View file

@ -78,7 +78,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Russian (http://www.transifex.com/movim/movim/language/ru/)\n"
@ -417,7 +417,8 @@ msgid "XMPP"
msgstr "XMPP"
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
#, fuzzy
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr "Здесь Вы можете зарегистрировать свою установку Movim в %sMovim API%s с упомянанием на %sстранице установок%s."
#: [api]register
@ -1205,7 +1206,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr "Обновить все потоки"
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1281,12 +1282,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/sv.po
View file

@ -77,7 +77,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/movim/movim/language/sv/)\n"
@ -416,7 +416,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1204,7 +1204,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1280,12 +1280,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/tr.po
View file

@ -78,7 +78,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/movim/movim/language/tr/)\n"
@ -417,7 +417,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1205,7 +1205,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1281,12 +1281,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

12
sources/locales/uk.po
View file

@ -77,7 +77,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2016-03-23 22:27+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/movim/movim/language/uk/)\n"
@ -416,7 +416,7 @@ msgid "XMPP"
msgstr ""
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr ""
#: [api]register
@ -1204,7 +1204,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr ""
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1280,12 +1280,8 @@ msgstr ""
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

13
sources/locales/zh.po
View file

@ -79,7 +79,7 @@ msgid ""
msgstr ""
"Project-Id-Version: movim\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-23 23:26+0200\n"
"POT-Creation-Date: 2016-04-08 08:29+0200\n"
"PO-Revision-Date: 2015-12-29 12:43+0000\n"
"Last-Translator: Jaussoin Timothée <edhelas@movim.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/movim/movim/language/zh_CN/)\n"
@ -418,7 +418,8 @@ msgid "XMPP"
msgstr "XMPP"
#: [api]info
msgid "Here you can register your pod on the official %sMovim API%s and be listed on %sthe pods page%s."
#, fuzzy
msgid "Here you can register your pod on the official %sMovim API%s"
msgstr "在这里你可以注册你的容器在官方的 %sMovim API%s , 同时他会显示在 %sthe pods page%s."
#: [api]register
@ -1206,7 +1207,7 @@ msgstr ""
msgid "Refresh all the streams"
msgstr "刷新所有流"
#: [menu]public
#: [menu]public [post]public_yes
msgid "This post is public"
msgstr ""
@ -1285,12 +1286,8 @@ msgstr "公共分组"
msgid "Publish this post publicly?"
msgstr ""
#: [post]public_yes
msgid "This post is now public"
msgstr ""
#: [post]public_no
msgid "This post is now private"
msgid "This post is private"
msgstr ""
#: [post]public_url

29
sources/src/Movim/Daemon/Api.php
View file

@ -25,8 +25,15 @@ class Api {
case 'exists':
$response->write($api->sessionExists($request->getPost()));
break;
case 'linked':
$response->write($api->sessionsLinked());
break;
case 'started':
$response->write($api->sessionsStarted());
break;
case 'unregister':
$response->write($api->sessionUnregister($request->getPost()));
break;
case 'disconnect';
$response->write($api->sessionDisconnect($request->getPost()));
break;
@ -36,6 +43,9 @@ class Api {
case 'emojis':
$response->write($api->addEmojis($request->getPost()));
break;
case 'session':
$response->write($api->getSession($request->getPost()));
break;
}
$response->end();
@ -51,6 +61,25 @@ class Api {
&& $sessions[$sid] == true);
}
public function sessionsLinked()
{
return count($this->_core->getSessions());
}
public function getSession()
{
return count($this->_core->getSessions());
}
public function sessionsStarted()
{
$started = 0;
foreach($this->_core->getSessions() as $s) {
if($s == true) $started++;
}
return $started;
}
public function sessionUnregister($post)
{
$sid = $post['sid'];

2
sources/src/Movim/Daemon/Core.php
View file

@ -148,7 +148,7 @@ class Core implements MessageComponentInterface {
public function getSessions()
{
return array_map(
function($session) { return $session->registered; },
function($session) { return $session->started; },
$this->sessions);
}

3
sources/src/Movim/Daemon/Session.php
View file

@ -12,6 +12,7 @@ class Session {
public $process;
public $registered;
public $started;
protected $buffer;
private $state;
@ -102,6 +103,8 @@ class Session {
$this->process->stderr->on('data', function($output) use ($me, $self) {
if(strpos($output, 'registered') !== false) {
$self->registered = true;
} elseif(strpos($output, 'started') !== false) {
$self->started = true;
} else {
echo $output;
}

13
sources/src/Movim/i18n/Locale.php
View file

@ -5,7 +5,7 @@ class Locale {
private static $_instance;
public $translations;
public $language;
public $hash = array();
public $hash = [];
private function __construct()
{
@ -57,10 +57,11 @@ class Locale {
$lang_list = get_lang_list();
$dir = scandir(LOCALES_PATH);
$po = array();
$po = [];
foreach($dir as $files) {
$explode = explode('.', $files);
if(end($explode) == 'po') {
if(end($explode) == 'po'
&& array_key_exists($explode[0], $lang_list)) {
$po[$explode[0]] = $lang_list[$explode[0]];
}
}
@ -121,7 +122,7 @@ class Locale {
*/
public function detect()
{
$langs = array();
$langs = [];
preg_match_all(
'/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i',
@ -178,7 +179,7 @@ class Locale {
// Parsing the file.
$handle = fopen($pofile, 'r');
$this->translations = array();
$this->translations = [];
$msgid = "";
$msgstr = "";
@ -214,7 +215,7 @@ class Locale {
private function getQuotedString($string)
{
$matches = array();
$matches = [];
preg_match('#"(.+)"#', $string, $matches);
if(isset($matches[1]))