From 5e3a1a62043cc4602f5fc4fb871d09da65b5a277 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Sat, 29 Sep 2012 10:23:09 +0200
Subject: Some adaptations required for Smarty3

---
 include/main.php                  | 3 ++-
 smarty/templates/rpmphp/all.tpl   | 6 +++---
 smarty/templates/rpmphp/index.tpl | 2 +-
 smarty/templates/rpmphp/main.tpl  | 4 ++--
 smarty/templates/rpmphp/rpm.tpl   | 6 +++---
 smarty/templates/rpmphp/zoom.tpl  | 4 ++--
 zoom.php                          | 6 +++++-
 7 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/include/main.php b/include/main.php
index 8134307..e54f6f9 100644
--- a/include/main.php
+++ b/include/main.php
@@ -38,7 +38,8 @@ define('RPMPHP_VERSION', '1.0.0-dev');
 require 'config.php';
 
 if (!defined('CLIONLY')) {
-    include 'Smarty2/Smarty.class.php';
+    //ACTHUNG: Smarty3!
+    include 'Smarty/Smarty.class.php';
 
     $smarty = new Smarty();
 
diff --git a/smarty/templates/rpmphp/all.tpl b/smarty/templates/rpmphp/all.tpl
index 8d9c20a..9b84373 100644
--- a/smarty/templates/rpmphp/all.tpl
+++ b/smarty/templates/rpmphp/all.tpl
@@ -22,7 +22,7 @@
                 <div id="filter">
                     <form action="all.php" method="get">
                         <fieldset>
-                            <legend>Filter {$type|upper} packages</legend>
+                            <legend>Filter{if isset($type)} {$type|upper}{/if} packages</legend>
                             <label for="what">Criteria:  </label>
                             <select name="what" id="what">
                                 <optgroup label="Pakages">
@@ -45,7 +45,7 @@
                     </form>
                 </div><!-- /filter -->
 
-{if $error}
+{if isset($error)}
         <p id="error"><strong>Ooops, an error occured:</strong><br/>{$error}</p>
 {/if}
 
@@ -79,7 +79,7 @@
     {/foreach}
                             </td>
     {foreach from=$p.versions key=k item=version}
-                            <td{if $version.class} class="{$version.class}"{/if}>
+                            <td{if isset($version.class)} class="{$version.class}"{/if}>
                                 {$version.display}
                             </td>
     {/foreach}
diff --git a/smarty/templates/rpmphp/index.tpl b/smarty/templates/rpmphp/index.tpl
index 3cd47b0..8b73af7 100644
--- a/smarty/templates/rpmphp/index.tpl
+++ b/smarty/templates/rpmphp/index.tpl
@@ -37,7 +37,7 @@
                         </tr>
                     </thead>
                     <tbody>
-{if $error}
+{if isset($error)}
                         <tr>
                             <td colspan="5">{$error}</td>
                         </tr>
diff --git a/smarty/templates/rpmphp/main.tpl b/smarty/templates/rpmphp/main.tpl
index a19f862..b0cae4b 100644
--- a/smarty/templates/rpmphp/main.tpl
+++ b/smarty/templates/rpmphp/main.tpl
@@ -28,7 +28,7 @@
         <script type="text/javascript" src="scripts/jquery-1.4.2.min.js"></script>
         <script type="text/javascript" src="scripts/jquery.autocomplete.pack.js"></script>
         <script type="text/javascript" src="scripts/rpmphp.js"></script>
-{if $name}
+{if isset($name)}
         <script type="text/javascript">
             // <![CDATA[
             $(function(){ldelim}
@@ -65,7 +65,7 @@
 {/foreach}
                     </ul>
                 </div><!-- /ariane -->
-{if $name_required and not $name}
+{if isset($name_required) and !isset($name)}
                 <h1>Missing package name</h1>
                 <form action="?" method="get">
                     <p>You have not specified any package name.</p>
diff --git a/smarty/templates/rpmphp/rpm.tpl b/smarty/templates/rpmphp/rpm.tpl
index b2a4f50..9d8689c 100644
--- a/smarty/templates/rpmphp/rpm.tpl
+++ b/smarty/templates/rpmphp/rpm.tpl
@@ -74,7 +74,7 @@
                         <tr class="{if $smarty.foreach.plist.iteration % 2 eq 0}even{else}odd{/if}">
                             <td>
                                 {$p.name}
-    {if $p.channel}
+    {if isset($p.channel)}
                                 <br/><small>channel: {$p.channel}</small>
     {/if}
                             </td>
@@ -87,10 +87,10 @@
     {/foreach}
                             </td>
                             <td>
-    {if $p.upstream_stable}
+    {if isset($p.upstream_stable)}
                                 <strong>{$p.upstream_stable}</strong>
     {/if}
-    {if $p.upstream_unstable}
+    {if isset($p.upstream_unstable)}
                                 <br/>{$p.upstream_unstable}
     {/if}
                             </td>
diff --git a/smarty/templates/rpmphp/zoom.tpl b/smarty/templates/rpmphp/zoom.tpl
index 4dcd7a2..09eb98f 100644
--- a/smarty/templates/rpmphp/zoom.tpl
+++ b/smarty/templates/rpmphp/zoom.tpl
@@ -19,7 +19,7 @@
  * along with rpmphp.  If not, see <http://www.gnu.org/licenses/>.
 *}
 
-{if $error}
+{if isset($error)}
     {if $error eq 'missing_name'}
                 <h1>Missing package name</h1>
                 <form action="?" method="get">
@@ -30,7 +30,7 @@
         <p id="error"><strong>Ooops, an error occured:</strong><br/>{$error}</p>
     {/if}
 {/if}
-{if $pkgdb}
+{if isset($pkgdb)}
                 <p id="pkgdb-link"><a href="?rpm={$name}">Hide pkgdb informations</a></p>
 {else}
                 <p id="pkgdb-link"><a href="?rpm={$name}&amp;pkgdb=1">Show more informations from pkgdb</a></p>
diff --git a/zoom.php b/zoom.php
index 979cea9..dedd3fa 100644
--- a/zoom.php
+++ b/zoom.php
@@ -89,7 +89,11 @@ function getBranchPeople($params)
     }
     return $ret;
 }
-$smarty->register_function('getBranchPeople', 'getBranchPeople');
+$smarty->registerPlugin(
+    'function',
+    'getBranchPeople',
+    'getBranchPeople'
+);
 
 if ( !isset($name) || !$name ) {
     $smarty->assign('error', 'missing_name');
-- 
cgit