From: Andreas Unterkircher <unki@netshadow.at>
Date: Sat, 3 Nov 2007 12:33:50 +0000 (+0000)
Subject: issue77, make Smarty path configureable
X-Git-Tag: phpfspot-1.2~50
X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=commitdiff_plain;h=d1882698df97b2eabcf1135eef71e5a4547d4a8e;ds=sidebyside

issue77, make Smarty path configureable


git-svn-id: file:///var/lib/svn/phpfspot/trunk@288 fa6a889d-dae6-447d-9e79-4ba9a3039384
---

diff --git a/phpfspot.class.php b/phpfspot.class.php
index f88ddf8..ca8542b 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -23,7 +23,6 @@
 
 require_once "phpfspot_cfg.php";
 require_once "phpfspot_db.php";
-require_once "phpfspot_tmpl.php";
 
 class PHPFSPOT {
 
@@ -64,7 +63,10 @@ class PHPFSPOT {
       }
       $this->check_config_table();
 
-
+      /* include Smarty template engine */
+      require $this->cfg->smarty_path .'/libs/Smarty.class.php';
+      /* overload Smarty class if our own template handler */
+      require_once "phpfspot_tmpl.php";
       $this->tmpl = new PHPFSPOT_TMPL($this);
 
       $this->get_tags();
diff --git a/phpfspot_cfg.php.dist b/phpfspot_cfg.php.dist
index 75b874f..93d1d00 100644
--- a/phpfspot_cfg.php.dist
+++ b/phpfspot_cfg.php.dist
@@ -37,6 +37,14 @@ class PHPFSPOT_CFG {
    /* database access via "native" sqlite3 support or via "pdo" */
    var $db_access = "native";
 
+   /* path to Smarty (http://smarty.php.net) installation. this option
+      should directly point to the Smarty main directory containing the
+      sub directories 'libs', 'misc', 'unit_test', ...
+      the default value 'smarty' is enough for Debian-systems where
+      Smarty is installed through as dpkg.
+   */
+   var $smarty_path = "smarty";
+
    /* it's enough if this database is readonly for the webserver */
    var $fspot_db = "/var/www/f-spot-dbs/photos.db";
 
diff --git a/phpfspot_tmpl.php b/phpfspot_tmpl.php
index 996ff44..5eff544 100644
--- a/phpfspot_tmpl.php
+++ b/phpfspot_tmpl.php
@@ -21,8 +21,6 @@
  *
  ***************************************************************************/
 
-require 'smarty/libs/Smarty.class.php';
-
 class PHPFSPOT_TMPL extends Smarty {
 
    var $parent;