From c00477482e00b2f9accbd464cbd668a770f2c0e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaussoin=20Timoth=C3=A9e?= <edhelas@movim.eu>
Date: Sun, 30 Mar 2014 00:01:47 +0100
Subject: [PATCH] - Fix fatal error with the new RainTPL library

---
 app/widgets/Bookmark/_bookmark_list.tpl    |  4 ++--
 app/widgets/Chat/_chat_muc_list.tpl        |  2 +-
 app/widgets/Config/config.tpl              |  2 +-
 app/widgets/ConfigData/configdata.tpl      |  4 ++--
 app/widgets/Explore/_explore_chatrooms.tpl |  2 +-
 app/widgets/Explore/_explore_groups.tpl    |  2 +-
 app/widgets/Roster/_roster_contact.tpl     |  2 +-
 app/widgets/Roster/_roster_list.tpl        |  2 +-
 app/widgets/WidgetCommon/WidgetCommon.php  | 16 ++++++++++++----
 app/widgets/WidgetCommon/_submit_form.tpl  |  2 +-
 10 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/app/widgets/Bookmark/_bookmark_list.tpl b/app/widgets/Bookmark/_bookmark_list.tpl
index ff45d16b7..4df8e4b9f 100644
--- a/app/widgets/Bookmark/_bookmark_list.tpl
+++ b/app/widgets/Bookmark/_bookmark_list.tpl
@@ -1,6 +1,6 @@
 <h2>{$c->t('Conferences')}</h2>
 <ul>
-    {loop="conferences"}
+    {loop="$conferences"}
         <li>
             <a href="#" onclick="{$c->getMucJoin($value)}">{$value->name}</a>
             <a href="#" onclick="{$c->getMucRemove($value)}">X</a>
@@ -9,7 +9,7 @@
 </ul>
 
 <h2>{$c->t('Groups')}</h2>
-{loop="subscriptions"}
+{loop="$subscriptions"}
     {if="$c->checkNewServer($value)"}
         <a href="{$c->route('server', $value->server)}">
             <h3>{$value->server}</h3>
diff --git a/app/widgets/Chat/_chat_muc_list.tpl b/app/widgets/Chat/_chat_muc_list.tpl
index 182dba878..12a69c7aa 100644
--- a/app/widgets/Chat/_chat_muc_list.tpl
+++ b/app/widgets/Chat/_chat_muc_list.tpl
@@ -1,5 +1,5 @@
 <ul>
-{loop="muclist"}
+{loop="$muclist"}
     {if="$value->value < 5"}
         <li class="{$c->colorNameMuc($value->ressource)}">
             {$value->ressource}
diff --git a/app/widgets/Config/config.tpl b/app/widgets/Config/config.tpl
index 71a4c8125..162c35924 100644
--- a/app/widgets/Config/config.tpl
+++ b/app/widgets/Config/config.tpl
@@ -13,7 +13,7 @@
                 <div class="select">
                     <select name="language" id="language">
                         <option value="en">English (default)</option>
-                            {loop="languages"}
+                            {loop="$languages"}
                                 {if="$key == $conf"}
                                     <option 
                                         value="{$key}" 
diff --git a/app/widgets/ConfigData/configdata.tpl b/app/widgets/ConfigData/configdata.tpl
index 7c0316183..fe3bd9f5a 100644
--- a/app/widgets/ConfigData/configdata.tpl
+++ b/app/widgets/ConfigData/configdata.tpl
@@ -17,7 +17,7 @@
             <legend>{$c->t('Posts')} - {$stats.post}</legend>
             <div class="clear"></div>
             <ul class="stats">
-                {loop="pstats"}
+                {loop="$pstats"}
                     <li style="height: {$c->formatHeight($value.count)}%;">
                         <span class="date">
                             {$c->formatDate($value.month, $value.year)}
@@ -41,7 +41,7 @@
             <legend>{$c->t('Messages')} - {$stats.message}</legend>
             <div class="clear"></div>
             <ul class="stats">
-                {loop="mstats"}
+                {loop="$mstats"}
                     <li style="height: {$c->formatHeight($value.count)}%">
                         <span class="date">
                             {$c->formatDate($value.month, $value.year)}
diff --git a/app/widgets/Explore/_explore_chatrooms.tpl b/app/widgets/Explore/_explore_chatrooms.tpl
index faa9c1ebe..0defd5fa1 100644
--- a/app/widgets/Explore/_explore_chatrooms.tpl
+++ b/app/widgets/Explore/_explore_chatrooms.tpl
@@ -1,4 +1,4 @@
-{loop="chatrooms"}
+{loop="$chatrooms"}
     <li class="block">
         <a href="{$c->route('server', $value->server)}">
             <span class="tag green">{$c->t('Chatrooms')}</span>
diff --git a/app/widgets/Explore/_explore_groups.tpl b/app/widgets/Explore/_explore_groups.tpl
index e9acd263c..967b7c6df 100644
--- a/app/widgets/Explore/_explore_groups.tpl
+++ b/app/widgets/Explore/_explore_groups.tpl
@@ -1,4 +1,4 @@
-{loop="groups"}
+{loop="$groups"}
     <li class="block">
         <a href="{$c->route('server', $value->server)}">
             <span class="tag orange">{$c->t('Groups')}</span>
diff --git a/app/widgets/Roster/_roster_contact.tpl b/app/widgets/Roster/_roster_contact.tpl
index e55fd49ef..66b4a8098 100644
--- a/app/widgets/Roster/_roster_contact.tpl
+++ b/app/widgets/Roster/_roster_contact.tpl
@@ -3,7 +3,7 @@
     title="{$jid}_{$name}"
     class="{$presence}">
     <ul class="contact">
-        {loop="contact"}
+        {loop="$contact"}
             <li
                 title="{$value.jid}{if="$value.status != ''"} - {$value.status}{/if}"
                 class="{$value.presencetxt} {$value.inactive} {if="$value.client"}client {$value.client}{/if}">
diff --git a/app/widgets/Roster/_roster_list.tpl b/app/widgets/Roster/_roster_list.tpl
index 20264e136..3d4993ee7 100644
--- a/app/widgets/Roster/_roster_list.tpl
+++ b/app/widgets/Roster/_roster_list.tpl
@@ -7,7 +7,7 @@
         <a class="button color green icon users" href="{$c->route('explore')}">{$c->t('Explore')}</a>
     </span>
 {else}
-    {loop="roster"}
+    {loop="$roster"}
     <div id="group{$value->name}" class="{$value->shown}">
         <h1 onclick="{$value->toggle}">{$key}</h1>
         {$value->html}
diff --git a/app/widgets/WidgetCommon/WidgetCommon.php b/app/widgets/WidgetCommon/WidgetCommon.php
index 16c2b6cad..bac9925aa 100644
--- a/app/widgets/WidgetCommon/WidgetCommon.php
+++ b/app/widgets/WidgetCommon/WidgetCommon.php
@@ -13,16 +13,24 @@
  * Copyright (C)2010 MOVIM Project
  *
  * See COPYING for licensing information.
+ *
  */
 
+use Rain\Tpl;
 use \Michelf\Markdown;
 
 class WidgetCommon extends WidgetBase {
     private function loadTemplate() {
-        $view = new RainTPL;
-        $view->configure('tpl_dir', APP_PATH.'widgets/WidgetCommon/'); 
-        $view->configure('cache_dir',    CACHE_PATH);
-        $view->configure('tpl_ext',      'tpl'); 
+        $config = array(
+            'tpl_dir'       => APP_PATH.'widgets/WidgetCommon/',
+            'cache_dir'     => CACHE_PATH,
+            'tpl_ext'       => 'tpl',
+            'auto_escape'   => false
+        );
+
+        // We load the template engine
+        $view = new Tpl;
+        $view->objectConfigure($config);
         $view->assign('c', $this);
         
         return $view;
diff --git a/app/widgets/WidgetCommon/_submit_form.tpl b/app/widgets/WidgetCommon/_submit_form.tpl
index a2463f4d0..ecebadfe5 100644
--- a/app/widgets/WidgetCommon/_submit_form.tpl
+++ b/app/widgets/WidgetCommon/_submit_form.tpl
@@ -24,7 +24,7 @@
 
 <div class="popup post" id="galleryselect" style="padding: 0;">
     <ul class="thumb">
-    {loop="gallery"}
+    {loop="$gallery"}
         <li style="background-image: url({$value.thumb});">
             <a 
                 href="#"