Add compatibility to Smarty 3

diff --git a/public_html/includes/class/class.LSsession.php b/public_html/includes/class/class.LSsession.php
index d758049..525a837 100644 (file)
--- a/public_html/includes/class/class.LSsession.php
+++ b/public_html/includes/class/class.LSsession.php
@@ -149,7 +149,19 @@ class LSsession {
         }
       }
 
-      $GLOBALS['Smarty'] -> register_function('getFData','smarty_getFData');
+      if (method_exists($GLOBALS['Smarty'],'register_function')) {
+        define('SMARTY3',False);
+        $GLOBALS['Smarty'] -> register_function('getFData','smarty_getFData');
+        $GLOBALS['Smarty'] -> register_function('tr','smarty_tr');
+      }
+      elseif (method_exists($GLOBALS['Smarty'],'registerPlugin')) {
+        define('SMARTY3',True);
+        $GLOBALS['Smarty'] -> registerPlugin("function","getFData", "smarty_getFData");
+        $GLOBALS['Smarty'] -> registerPlugin("function","tr", "smarty_tr");
+      }
+      else {
+        die("Smarty : Can't register getFData fonction");
+      }
       
       $GLOBALS['Smarty'] -> assign('LS_CSS_DIR',LS_CSS_DIR);
       $GLOBALS['Smarty'] -> assign('LS_IMAGES_DIR',LS_IMAGES_DIR);

diff --git a/public_html/includes/functions.php b/public_html/includes/functions.php
index af34595..0e2e7b7 100644 (file)
--- a/public_html/includes/functions.php
+++ b/public_html/includes/functions.php
@@ -456,21 +456,9 @@ function LSdebugDefined() {
     return _($msg);
   }
   
-  function tr($msg,$key=null) {
-    if (is_array($msg)) {
-      echo __($msg[$key]);
-    }
-    else {
-      $val = $GLOBALS['Smarty']->get_template_vars($msg);
-      if (!$val)
-        $val=$msg;
-      if (is_array($val)) {
-        echo __($val[$key]);
-      }
-      else {
-        echo __($val);
-      }
-    }
+  function smarty_tr($params) {
+    extract($params);
+    echo __($msg);
   }
 
  /**

diff --git a/public_html/templates/default/LSform.tpl b/public_html/templates/default/LSform.tpl
index cafdad4..805ff15 100644 (file)
--- a/public_html/templates/default/LSform.tpl
+++ b/public_html/templates/default/LSform.tpl
@@ -4,7 +4,7 @@
   <!-- Tabs - Start Title -->
   <ul class='LSform_layout'>
   {foreach from=$LSform_layout item=tab key=tab_key}
-    <li class='LSform_layout' id='LSform_layout_btn_{$tab_key}'><a href="#{$tab_key}">{php}tr('tab','label'){/php}</a></li>
+    <li class='LSform_layout' id='LSform_layout_btn_{$tab_key}'><a href="#{$tab_key}">{tr msg=$tab.label}</a></li>
   {/foreach}
   </ul>
   <!-- Tabs - End Title -->
@@ -12,7 +12,7 @@
   <!-- Tabs - Start Content -->
   {foreach from=$LSform_layout item=tab key=tab_key}
     <a name='{$tab_key}'></a>
-    <h2 class='LSform_layout'>{php}tr('tab','label'){/php}</h2>
+    <h2 class='LSform_layout'>{tr msg=$tab.label}</h2>
     <div class='LSform LSform_layout' id='LSform_layout_div_{$tab_key}'>
       {if $LSformElement_image!='' && $tab.img==1}
       <div class='LSformElement_image{if $LSformElement_image_errors} LSformElement_image_errors{/if}'>

diff --git a/public_html/templates/default/LSform_view.tpl b/public_html/templates/default/LSform_view.tpl
index 2d84943..d24a588 100644 (file)
--- a/public_html/templates/default/LSform_view.tpl
+++ b/public_html/templates/default/LSform_view.tpl
@@ -4,7 +4,7 @@
   <!-- Tabs - Start Title -->
   <ul class='LSform_layout'>
   {foreach from=$LSform_layout item=tab key=tab_key}
-    <li class='LSform_layout' id='LSform_layout_btn_{$tab_key}'><a href="#{$tab_key}">{php}tr('tab','label'){/php}</a></li>
+    <li class='LSform_layout' id='LSform_layout_btn_{$tab_key}'><a href="#{$tab_key}">{tr msg=$tab.label}</a></li>
   {/foreach}
   </ul>
   <!-- Tabs - End Title -->

diff --git a/public_html/templates/default/top.tpl b/public_html/templates/default/top.tpl
index 887d27a..ae5af80 100644 (file)
--- a/public_html/templates/default/top.tpl
+++ b/public_html/templates/default/top.tpl
@@ -31,7 +31,7 @@
       {/if}
       <ul class='menu'>
       {foreach from=$LSaccess item=label key=LSobject_type}
-        <li class='menu'><a href='view.php?LSobject={$LSobject_type}' class='menu'>{php}tr('label'){/php}</a></li>
+        <li class='menu'><a href='view.php?LSobject={$LSobject_type}' class='menu'>{tr msg=$label}</a></li>
       {/foreach}
       </ul>
     </td>

diff --git a/public_html/templates/default/viewSearch.tpl b/public_html/templates/default/viewSearch.tpl
index b8d7b9f..eb6b539 100644 (file)
--- a/public_html/templates/default/viewSearch.tpl
+++ b/public_html/templates/default/viewSearch.tpl
@@ -22,7 +22,7 @@
 <ul class='LSview-actions'>
   {foreach from=$LSview_actions item=item}
     {if is_array($item)}
-      <li class='LSview-actions'><a href='{$item.url}' class='LSview-actions'><img src='{$LS_IMAGES_DIR}/{$item.action}.png' alt='{php}tr('label');{/php}' title='{php}tr('label');{/php}' /> {php}tr('item','label');{/php}</a></li>
+      <li class='LSview-actions'><a href='{$item.url}' class='LSview-actions'><img src='{$LS_IMAGES_DIR}/{$item.action}.png' alt='{tr msg=$label}' title='{tr msg=$label}' /> {tr msg=$item.label}</a></li>
     {/if}
   {/foreach}
 </ul>