From c9981fe8ea38e7646777c3f78525f9977d5edcf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaussoin=20Timoth=C3=A9e?= Date: Fri, 6 Feb 2015 19:00:18 +0100 Subject: [PATCH 1/2] - Fix the URL rewriting (part 1) - Re-implement the Blog + Feed pages - Add the avatars in the Menu + Post (if microblog) - Fix the linker when not connected to XMPP --- app/models/config/Config.php | 4 ++ app/models/config/ConfigDAO.php | 5 ++ app/models/contact/Contact.php | 1 + app/models/postn/Postn.php | 7 +++ app/views/blog.tpl | 23 ++++------ app/views/login.tpl | 7 ++- app/widgets/AdminDB/AdminDB.php | 2 +- app/widgets/AdminDB/admindb.tpl | 9 ++-- app/widgets/AdminMain/AdminMain.php | 15 ++++++ app/widgets/AdminMain/adminmain.tpl | 28 +++++++++++- app/widgets/AdminMain/locales.ini | 4 ++ app/widgets/Avatar/avatar.js | 2 +- app/widgets/Blog/Blog.php | 38 +++++++++------ app/widgets/Blog/blog.tpl | 61 +++++++++++++++++++------ app/widgets/Menu/_menu_list.tpl | 7 +-- app/widgets/Post/Post.php | 18 ++++++++ app/widgets/Post/_post.tpl | 48 +++++++++++++++++-- app/widgets/Post/locales.ini | 5 ++ app/widgets/Syndication/Syndication.php | 26 +++++++++-- app/widgets/Syndication/syndication.tpl | 16 +++++-- linker.php | 55 ++++++++++++---------- system/Route.php | 10 +++- themes/material/css/article.css | 6 ++- themes/material/css/grid.css | 3 ++ 24 files changed, 305 insertions(+), 95 deletions(-) diff --git a/app/models/config/Config.php b/app/models/config/Config.php index 18d081bfb..3c890b668 100755 --- a/app/models/config/Config.php +++ b/app/models/config/Config.php @@ -16,6 +16,7 @@ class Config extends Model { public $unregister; public $username; public $password; + public $rewrite; public $sizelimit; public function __construct() { @@ -47,6 +48,8 @@ class Config extends Model { {"type":"string", "size":32, "mandatory":true }, "password" : {"type":"string", "size":64, "mandatory":true }, + "rewrite" : + {"type":"int", "size":1 }, "sizelimit" : {"type":"int", "size":16 } }'; @@ -66,6 +69,7 @@ class Config extends Model { $this->unregister = false; $this->username = 'admin'; $this->password = sha1('password'); + $this->rewrite = false; $this->sizelimit = 20240001; } } diff --git a/app/models/config/ConfigDAO.php b/app/models/config/ConfigDAO.php index c881774a8..ff5af5a7a 100755 --- a/app/models/config/ConfigDAO.php +++ b/app/models/config/ConfigDAO.php @@ -19,6 +19,7 @@ class ConfigDAO extends SQL { unregister = :unregister, username = :username, password = :password, + rewrite = :rewrite, sizelimit = :sizelimit'; $this->prepare( @@ -37,6 +38,7 @@ class ConfigDAO extends SQL { 'unregister' => $c->unregister, 'username' => $c->username, 'password' => $c->password, + 'rewrite' => $c->rewrite, 'sizelimit' => $c->sizelimit ) ); @@ -71,6 +73,7 @@ class ConfigDAO extends SQL { unregister, username, password, + rewrite, sizelimit ) values @@ -88,6 +91,7 @@ class ConfigDAO extends SQL { :unregister, :username, :password, + :rewrite, :sizelimit ) '; @@ -108,6 +112,7 @@ class ConfigDAO extends SQL { 'unregister' => $c->unregister, 'username' => $c->username, 'password' => $c->password, + 'rewrite' => $c->rewrite, 'sizelimit' => $c->sizelimit ) ); diff --git a/app/models/contact/Contact.php b/app/models/contact/Contact.php index fa553846d..c7e18ef5a 100755 --- a/app/models/contact/Contact.php +++ b/app/models/contact/Contact.php @@ -208,6 +208,7 @@ class Contact extends Model { if(isset($jid)) { $sizes = array( + 'wall' => array(1920, 1080), 'xxl' => array(1280, 300), 'l' => array(210 , false), 'm' => array(120 , false), diff --git a/app/models/postn/Postn.php b/app/models/postn/Postn.php index 6300fc260..fd2a53b0b 100755 --- a/app/models/postn/Postn.php +++ b/app/models/postn/Postn.php @@ -269,6 +269,13 @@ class Postn extends Model { return false; } + public function isMine() { + if($this->jid == $this->session) + return true; + else + return false; + } + public function isMicroblog() { if($this->node == "urn:xmpp:microblog:0") return true; diff --git a/app/views/blog.tpl b/app/views/blog.tpl index 3d73fc2cd..a426a1d3d 100755 --- a/app/views/blog.tpl +++ b/app/views/blog.tpl @@ -1,14 +1,11 @@ - +
+
+
+ widget('Tabs');?> -
-
- widget('ContactSummary');?> -
- - widget('Tabs');?> -
- widget('Blog');?> - widget('ContactCard');?> -
-
+ widget('Blog');?> + widget('ContactSummary');?> + widget('ContactCard');?> +
+
+
diff --git a/app/views/login.tpl b/app/views/login.tpl index 24fed6f21..a015eb388 100755 --- a/app/views/login.tpl +++ b/app/views/login.tpl @@ -1,9 +1,8 @@ widget('Presence'); ?>
-
- widget('Login'); ?> -
+
+ widget('Login'); ?> +
-
diff --git a/app/widgets/AdminDB/AdminDB.php b/app/widgets/AdminDB/AdminDB.php index e3dddde82..8d668a622 100755 --- a/app/widgets/AdminDB/AdminDB.php +++ b/app/widgets/AdminDB/AdminDB.php @@ -42,7 +42,7 @@ class AdminDB extends WidgetBase $this->view->assign('infos', $infos); $this->view->assign('db_update', $this->call('ajaxUpdateDatabase') - ."this.className='button color orange icon loading'; setTimeout(function() {location.reload(false)}, 1000);"); + ."this.className='button color loading';"); try { $md->connect(); } catch(Exception $e) { diff --git a/app/widgets/AdminDB/admindb.tpl b/app/widgets/AdminDB/admindb.tpl index 6a3a6746c..75cacbb8e 100755 --- a/app/widgets/AdminDB/admindb.tpl +++ b/app/widgets/AdminDB/admindb.tpl @@ -19,15 +19,14 @@ {$c->__('db.connect_success')} {if="null !== $infos"} -
  • +
  • +
    + {$c->__('button.update')} +
    {$c->__('db.update')} -
    - {$c->__('button.update')} -
    {loop="$infos"}

    {$value}

    {/loop} diff --git a/app/widgets/AdminMain/AdminMain.php b/app/widgets/AdminMain/AdminMain.php index 09d73cccc..a35a010e0 100755 --- a/app/widgets/AdminMain/AdminMain.php +++ b/app/widgets/AdminMain/AdminMain.php @@ -25,6 +25,7 @@ class AdminMain extends WidgetBase $config = $cd->get(); if(isset($form)) { + \movim_log(serialize($form)); if(isset($form['password']) && $form['password'] != '' && $form['repassword'] != '' && $form['password'] == $form['repassword']) { @@ -34,9 +35,18 @@ class AdminMain extends WidgetBase } unset($form['repassword']); + + if($form['rewrite'] == 'on') { + $form['rewrite'] = 1; + } else { + $form['rewrite'] = 0; + } + foreach($form as $key => $value) { $config->$key = $value; } + + \movim_log(serialize($config)); $cd->set($config); //set timezone @@ -86,6 +96,11 @@ class AdminMain extends WidgetBase if(isset($json) && $json->status != 404) { $this->view->assign('websockets', $json); } + + $this->view->assign('server_rewrite', false); + if(isset($_SERVER['HTTP_MOD_REWRITE']) && $_SERVER['HTTP_MOD_REWRITE']) { + $this->view->assign('server_rewrite', true); + } $this->view->assign('timezones', getTimezoneList()); $this->view->assign('langs', loadLangArray()); diff --git a/app/widgets/AdminMain/adminmain.tpl b/app/widgets/AdminMain/adminmain.tpl index 2b24e5490..4fffc777d 100755 --- a/app/widgets/AdminMain/adminmain.tpl +++ b/app/widgets/AdminMain/adminmain.tpl @@ -156,6 +156,32 @@
    • + {if="$server_rewrite"} +
    +

    {$c->__('rewrite.title')}

    + + +
    + +
    + {/if} +

    {$c->__('credentials.title')}

    @@ -186,4 +212,4 @@ value="{$c->__('button.submit')}"/>
    - + diff --git a/app/widgets/AdminMain/locales.ini b/app/widgets/AdminMain/locales.ini index 0c4319490..49da0a16c 100755 --- a/app/widgets/AdminMain/locales.ini +++ b/app/widgets/AdminMain/locales.ini @@ -39,3 +39,7 @@ information.label = 'Information Message' log.empty = 'Empty' log.syslog = 'Syslog' log.syslog_files = 'Syslog and files' + +[rewrite] +rewrite.title = 'URL Rewriting' +rewrite.info = 'The URL Rewriting can be enabled' diff --git a/app/widgets/Avatar/avatar.js b/app/widgets/Avatar/avatar.js index 30771fb9d..72ca4fe50 100755 --- a/app/widgets/Avatar/avatar.js +++ b/app/widgets/Avatar/avatar.js @@ -16,7 +16,7 @@ var Avatar = { }, preview : function(src) { var canvas = document.createElement('canvas'); - width = height = canvas.width = canvas.height = 210; + width = height = canvas.width = canvas.height = 410; var image = new Image(); image.src = src; image.onload = function(){ diff --git a/app/widgets/Blog/Blog.php b/app/widgets/Blog/Blog.php index 1ba9b7650..0b81b382a 100755 --- a/app/widgets/Blog/Blog.php +++ b/app/widgets/Blog/Blog.php @@ -8,26 +8,31 @@ class Blog extends WidgetCommon { function display() { - if(!isset($_GET['f']) || !isset($_GET['n'])) { + if(!isset($_GET['f'])) { return; } $from = $_GET['f']; - $node = $_GET['n']; - - $this->view->assign('from', $from); + if(filter_var($from, FILTER_VALIDATE_EMAIL)) { + $node = 'urn:xmpp:microblog:0'; + } else { + return; + //$node = $_GET['n']; + } + + /*$this->view->assign('from', $from); if(isset($node)) - $this->view->assign('node', $node); + $this->view->assign('node', $node);*/ $pd = new \modl\PostnDAO(); - if(isset($from) && isset($node)) - $messages = $pd->getPublic($from, $node); + //if(isset($from) && isset($node)) + $messages = $pd->getPublic($from, $node); if($messages[0] != null) { // Title and logo // For a Pubsub feed - if(isset($from) && isset($node) && $node != 'urn:xmpp:microblog:0') { + /*if(isset($from) && isset($node) && $node != 'urn:xmpp:microblog:0') { $pd = new \modl\NodeDAO(); $n = $pd->getNode($from, $node); if(isset($n->title)) @@ -38,15 +43,20 @@ class Blog extends WidgetCommon { } else { $this->view->assign('title', $this->__('blog.title',$messages[0]->getContact()->getTrueName())); $this->view->assign('logo', $messages[0]->getContact()->getPhoto('l')); - } - - $this->view->assign('date', date('c')); - $this->view->assign('name', $messages[0]->getContact()->getTrueName()); - $this->view->assign('feed', Route::urlize('feed',array($from, $node))); + }*/ + + $cd = new \modl\ContactDAO(); + $c = $cd->get($from); + $this->view->assign('contact', $c); + + //$this->view->assign('date', date('c')); + //$this->view->assign('name', $messages[0]->getContact()->getTrueName()); + //$this->view->assign('feed', Route::urlize('feed',array($from, $node))); } else { $this->view->assign('title', $this->__('page.feed')); } - $this->view->assign('posts', $this->preparePosts($messages, true)); + $this->view->assign('posts', $messages); + //$this->view->assign('posts', $this->preparePosts($messages, true)); } } diff --git a/app/widgets/Blog/blog.tpl b/app/widgets/Blog/blog.tpl index 8c9ad0593..dab091eda 100755 --- a/app/widgets/Blog/blog.tpl +++ b/app/widgets/Blog/blog.tpl @@ -1,16 +1,51 @@ -
    -

    {$title}

    -
    - - {$c->__('page.feed')} (Atom) - -
    +
    - {$posts} +
      +
    • +
      + + Atom + +
      + + + + +

      {$c->__('blog.title', $contact->getTrueName())}

      +       +
      • +
    -
    + {loop="$posts"} +
    +
    +
      +
    • + + + +

      + {if="$value->title != null"} + {$value->title} + {else} + {$c->__('post.default_title')} + {/if} +

      +

      + {if="$value->node == 'urn:xmpp:microblog:0'"} + {$value->getContact()->getTrueName()} - + {/if} + {$value->published|strtotime|prepareDate} +

      +
      • +
    +
    +
    + {$value->contentcleaned} +
    +
    + {/loop}
    diff --git a/app/widgets/Menu/_menu_list.tpl b/app/widgets/Menu/_menu_list.tpl index e5bfbc098..b95daa3cd 100644 --- a/app/widgets/Menu/_menu_list.tpl +++ b/app/widgets/Menu/_menu_list.tpl @@ -17,8 +17,9 @@ {elseif="$value->node == 'urn:xmpp:microblog:0'"} - - + + + {else} {$value->node|firstLetterCapitalize} @@ -33,7 +34,7 @@ {$value->published|strtotime|prepareDate} {if="$value->node == 'urn:xmpp:microblog:0'"} -

    {$value->jid}

    +

    {$value->getContact()->getTrueName()}

    {else}

    {$value->node}

    {/if} diff --git a/app/widgets/Post/Post.php b/app/widgets/Post/Post.php index 93ff73569..a9ae2497c 100644 --- a/app/widgets/Post/Post.php +++ b/app/widgets/Post/Post.php @@ -211,6 +211,24 @@ class Post extends WidgetCommon return $this->prepareEmpty(); } } + function ajaxTogglePrivacy($id) { + if(!preg_match('/^[a-f0-9]{32}$/', $id)) + return; + + $pd = new \Modl\PrivacyDAO(); + $p = $pd->get($id); + + $pd = new \Modl\PostnDAO; + $po = $pd->getItem($id); + + if($po->privacy == 1) { + Notification::append(false, $this->__('post.blog_remove')); + \Modl\Privacy::set($id, 0); + } if($po->privacy == 0) { + Notification::append(false, $this->__('post.blog_add')); + \Modl\Privacy::set($id, 1); + } + } function display() { diff --git a/app/widgets/Post/_post.tpl b/app/widgets/Post/_post.tpl index 7f5072f0c..eeb33334e 100644 --- a/app/widgets/Post/_post.tpl +++ b/app/widgets/Post/_post.tpl @@ -10,15 +10,28 @@
    • + {if="$post->node == 'urn:xmpp:microblog:0'"} + + + + {else} {$post->node|firstLetterCapitalize} - {if="$post->title != null"} - {$post->title} - {else} - {$c->__('post.default_title')} {/if} -

      {$post->published|strtotime|prepareDate}

      + + {if="$post->title != null"} + {$post->title} + {else} + {$c->__('post.default_title')} + {/if} + +

      + {if="$post->node == 'urn:xmpp:microblog:0'"} + {$post->getContact()->getTrueName()} - + {/if} + {$post->published|strtotime|prepareDate} +

    @@ -56,6 +69,31 @@ {/loop} {/if} + {if="$post->isMine()"} +
      +
    • +
      +
      +
      + + +
      +
      +
      + + + + {$c->__('post.public')} +
      • +
    + {/if}
    diff --git a/app/widgets/Post/locales.ini b/app/widgets/Post/locales.ini index d9fe0f391..b67d2a556 100644 --- a/app/widgets/Post/locales.ini +++ b/app/widgets/Post/locales.ini @@ -14,3 +14,8 @@ post.no_content_preview = 'No content to preview' post.no_content = 'No content' post.published = 'Post published' post.gallery = 'This picture will be added to your gallery' + +[manage] +post.public = 'Publish this post on your public feed?' +post.blog_add = 'Post published on your blog' +post.blog_remove = 'Post removed from your blog' diff --git a/app/widgets/Syndication/Syndication.php b/app/widgets/Syndication/Syndication.php index 0c0c1842d..ef6608827 100755 --- a/app/widgets/Syndication/Syndication.php +++ b/app/widgets/Syndication/Syndication.php @@ -28,6 +28,19 @@ class Syndication extends WidgetBase { ob_clean(); + if(!isset($_GET['f'])) { + return; + } + + $from = $_GET['f']; + if(filter_var($from, FILTER_VALIDATE_EMAIL)) { + $node = 'urn:xmpp:microblog:0'; + } else { + return; + //$node = $_GET['n']; + } + + /* if(!isset($_GET['f']) || !isset($_GET['n'])) { return; } @@ -36,7 +49,7 @@ class Syndication extends WidgetBase $node = $_GET['n']; $this->view->assign('from', $from); - $this->view->assign('node', $node); + $this->view->assign('node', $node);*/ $pd = new \modl\PostnDAO(); @@ -47,9 +60,16 @@ class Syndication extends WidgetBase if(isset($messages[0])) { header("Content-Type: application/atom+xml; charset=UTF-8"); + + $cd = new \modl\ContactDAO(); + + $this->view->assign('date', date('c')); + $this->view->assign('contact', $cd->get($from)); + + $this->view->assign('uri', htmlentities(Route::urlize('blog',array($from, $node)))); // Title and logo // For a Pubsub feed - if(isset($from) && isset($node) && $node != 'urn:xmpp:microblog:0') { + /*if(isset($from) && isset($node) && $node != 'urn:xmpp:microblog:0') { $pd = new \modl\NodeDAO(); $n = $pd->getNode($from, $node); if(isset($n->title)) @@ -66,7 +86,7 @@ class Syndication extends WidgetBase $this->view->assign('name', $messages[0]->getContact()->getTrueName()); $this->view->assign('uri', htmlentities(Route::urlize('blog',array($from, $node)))); $this->view->assign('link', ''); - $this->view->assign('uuid', generateUUID($from.$node)); + $this->view->assign('uuid', generateUUID($from.$node));*/ } } diff --git a/app/widgets/Syndication/syndication.tpl b/app/widgets/Syndication/syndication.tpl index d9d799c85..9d7e30f4f 100755 --- a/app/widgets/Syndication/syndication.tpl +++ b/app/widgets/Syndication/syndication.tpl @@ -1,15 +1,15 @@ -{if="isset($from)"} +{if="isset($contact)"} {if="!empty($messages)"} - {$title} + {$c->__('feed.title', $contact->getTrueName())} {$date} - {$name} + {$contact->getTrueName()} {$uri} {$link} - {$logo} + {$contact->getPhoto('xl')} Movim @@ -18,7 +18,13 @@ urn:uuid:{$uuid} {loop="$messages"} - {$c->prepareTitle($value->title)} + + {if="$value->title != null"} + {$c->prepareTitle($value->title)} + {else} + {$c->__('post.default_title')} + {/if} + urn:uuid:{$c->generateUUID($value->content)} {$c->prepareUpdated($value->published)} diff --git a/linker.php b/linker.php index 12ffa2cad..913da346f 100755 --- a/linker.php +++ b/linker.php @@ -45,7 +45,7 @@ $connector($config->websocketurl, array('xmpp'))->then(function($conn) use (&$st $conn->on('message', function($message) use ($conn, $loop) { if($message != '') { - #fwrite(STDERR, colorize($message, 'yellow')." : ".colorize('received', 'green')."\n"); + fwrite(STDERR, colorize($message, 'yellow')." : ".colorize('received', 'green')."\n"); if($message == '') { $conn->close(); @@ -76,7 +76,7 @@ $connector($config->websocketurl, array('xmpp'))->then(function($conn) use (&$st } if(!empty($xml)) { - #fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n"); + fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n"); $conn->send(trim($xml)); } } @@ -118,7 +118,7 @@ $connector($config->websocketurl, array('xmpp'))->then(function($conn) use (&$st \Moxl\API::clear(); if(!empty($xml)) { - #fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n"); + fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n"); $conn->send(trim($xml)); } @@ -145,31 +145,38 @@ $connector($config->websocketurl, array('xmpp'))->then(function($conn) use (&$st // Fallback event, when the WebSocket is not enabled, // we still handle browser to Movim requests $stdin->on('data', function ($data) use ($loop) { - $messages = explode("\n", trim($data)); - foreach ($messages as $message) { - //fwrite(STDERR, colorize($message, 'yellow')." : ".colorize('received from the browser', 'green')."\n"); - - $msg = json_decode($message); - - if(isset($msg)) { - if($msg->func == 'message' && $msg->body != '') { - $msg = $msg->body; - } elseif($msg->func == 'unregister') { - $loop->stop(); + if(substr($data, -3) == "END") { + $messages = explode("END", $buffer . substr($data, 0, -3)); + $buffer = ''; + + foreach ($messages as $message) { + #fwrite(STDERR, colorize($message, 'yellow')." : ".colorize('received from the browser', 'green')."\n"); + + $msg = json_decode($message); + + if(isset($msg)) { + if($msg->func == 'message' && $msg->body != '') { + $msg = $msg->body; + } elseif($msg->func == 'unregister') { + $loop->stop(); + } + } else { + return; } - } else { - return; - } - - $rpc = new \RPC(); - $rpc->handle_json($msg); + + $rpc = new \RPC(); + $rpc->handle_json($msg); - $msg = json_encode(\RPC::commit()); - \RPC::clear(); + $msg = json_encode(\RPC::commit()); + \RPC::clear(); - if(!empty($msg)) { - echo base64_encode(gzcompress($msg, 9))."END"; + if(!empty($msg)) { + #fwrite(STDERR, colorize($msg, 'yellow')." : ".colorize('sent to the browser', 'green')."\n"); + echo base64_encode(gzcompress($msg, 9))."END"; + } } + } else { + $buffer .= $data; } }); diff --git a/system/Route.php b/system/Route.php index 457865060..cf443c706 100755 --- a/system/Route.php +++ b/system/Route.php @@ -35,7 +35,10 @@ class Route extends \BaseController { } public function find() { - if(isset($_SERVER['HTTP_MOD_REWRITE']) && $_SERVER['HTTP_MOD_REWRITE']) { + $cd = new \Modl\ConfigDAO(); + $config = $cd->get(); + + if($config->rewrite == true) { $request = explode('/', $this->fetchGet('query')); $this->_page = $request[0]; array_shift($request); @@ -69,6 +72,9 @@ class Route extends \BaseController { $r = new Route(); $routes = $r->_routes; + $cd = new \Modl\ConfigDAO(); + $config = $cd->get(); + if($page === 'root') return BASE_URI; @@ -79,7 +85,7 @@ class Route extends \BaseController { if($tab != false) $tab = '#'.$tab; //We construct a classic URL if the rewriting is disabled - if(!isset($_SERVER['HTTP_MOD_REWRITE']) || !$_SERVER['HTTP_MOD_REWRITE']) { + if($config->rewrite == false) { $uri = BASE_URI . '?q='.$page; if($params != false && is_array($params)) { diff --git a/themes/material/css/article.css b/themes/material/css/article.css index 7b955be13..a29b5346b 100644 --- a/themes/material/css/article.css +++ b/themes/material/css/article.css @@ -14,6 +14,10 @@ article header h1 { line-height: 12rem; } +article header h2 { + line-height: 3.75rem; +} + article section { font-size: 2rem; line-height: 3rem; @@ -33,7 +37,7 @@ article section p { article section content ul li, article section content ol li { - font-size: 2rem; + font-size: 1.75rem; line-height: 3rem; padding-left: 2rem; list-style-position: inside; diff --git a/themes/material/css/grid.css b/themes/material/css/grid.css index aff30a817..a889e8fe4 100644 --- a/themes/material/css/grid.css +++ b/themes/material/css/grid.css @@ -21,6 +21,9 @@ ul.grid nav { width: 100%; padding: 0 2rem; box-sizing: border-box; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; } @media screen and (max-width: 1024px) { From 555489a20b7cef61b7463604326bf91535ce286e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaussoin=20Timoth=C3=A9e?= Date: Fri, 6 Feb 2015 19:01:54 +0100 Subject: [PATCH 2/2] - Comment some lines in the linker --- linker.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linker.php b/linker.php index 913da346f..83afd0395 100755 --- a/linker.php +++ b/linker.php @@ -45,7 +45,7 @@ $connector($config->websocketurl, array('xmpp'))->then(function($conn) use (&$st $conn->on('message', function($message) use ($conn, $loop) { if($message != '') { - fwrite(STDERR, colorize($message, 'yellow')." : ".colorize('received', 'green')."\n"); + #fwrite(STDERR, colorize($message, 'yellow')." : ".colorize('received', 'green')."\n"); if($message == '') { $conn->close(); @@ -76,7 +76,7 @@ $connector($config->websocketurl, array('xmpp'))->then(function($conn) use (&$st } if(!empty($xml)) { - fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n"); + #fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n"); $conn->send(trim($xml)); } } @@ -118,7 +118,7 @@ $connector($config->websocketurl, array('xmpp'))->then(function($conn) use (&$st \Moxl\API::clear(); if(!empty($xml)) { - fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n"); + #fwrite(STDERR, colorize(trim($xml), 'yellow')." : ".colorize('sent to XMPP', 'green')."\n"); $conn->send(trim($xml)); }