X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot_cfg.php.dist;h=93d1d00a6974003b43a1ead8997a6b9d6f1432a9;hp=42baa169a62cacc871d91dccc82df6aa8cf9e0a2;hb=d1882698df97b2eabcf1135eef71e5a4547d4a8e;hpb=6e2d319e3b4fb0aac55413bbcc121669a19e3720

diff --git a/phpfspot_cfg.php.dist b/phpfspot_cfg.php.dist
index 42baa16..93d1d00 100644
--- a/phpfspot_cfg.php.dist
+++ b/phpfspot_cfg.php.dist
@@ -26,12 +26,25 @@ class PHPFSPOT_CFG {
    var $page_title = "phpfspot - dynamic PHP gallery for F-Spot";
 
    var $product = "phpfspot";
-   var $version = "0.1";
+   var $version = "1.0";
 
    var $base_path = "/var/www/htdocs";
 
    var $web_path = "/phpfspot";
 
+   var $theme_name = "default";
+ 
+   /* 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";
 
@@ -64,6 +77,12 @@ class PHPFSPOT_CFG {
    */
    var $hide_tags = Array("Favorites", "Hidden", "People", "Places", "Events");
 
+   /* logging = display || errorlog || logfile */
+   var $logging = "display";
+
+   /* set this if you chose logging = logfile */
+   var $log_file = "phpfspot_err.log";
+
    /* no need to modified anything below this line */
    var $error_found = 0;
 
@@ -79,7 +98,7 @@ class PHPFSPOT_CFG {
          $this->showError("Please set \$version in phpfspot_cfg");
 
       if(!isset($this->base_path) || $this->base_path == "")
-         $this->this->showError("Please set \$base_path in phpfspot_cfg");
+         $this->showError("Please set \$base_path in phpfspot_cfg");
 
       if(!isset($this->web_path) || $this->web_path == "")
          $this->showError("Please set \$web_path in phpfspot_cfg");
@@ -87,6 +106,9 @@ class PHPFSPOT_CFG {
       if(!isset($this->fspot_db) || $this->fspot_db == "")
          $this->showError("Please set \$fspot_db in phpfspot_cfg");
 
+      if(!isset($this->db_access) || $this->db_access == "")
+         $this->showError("Please set \$db_access in phpfspot_cfg");
+
       if(!isset($this->phpfspot_db) || $this->phpfspot_db == "")
          $this->showError("Please set \$phpfspot_db in phpfspot_cfg");
 
@@ -114,9 +136,29 @@ class PHPFSPOT_CFG {
       if(!isset($this->hide_tags))
          $this->showError("Please set \$hide_tags in phpfspot_cfg");
 
+      if(!isset($this->theme_name))
+         $this->showError("Please set \$theme_name in phpfspot_cfg");
+
+      if(!isset($this->logging))
+         $this->showError("Please set \$logging in phpfspot_cfg");
+
+      if(isset($this->logging) && $this->logging == 'logfile') {
+
+         if(!isset($this->log_file))
+            $this->showError("Please set \$log_file because you set logging = log_file in phpfspot_cfg");
+
+         if(!is_writeable($this->log_file))
+            $this->showError("The specified \$log_file ". $log_file ." is not writeable!");
+
+      }
+
       if(isset($this->error_found) && $this->error_found)
          exit(1);
 
+      /* check for pending slash on web_path */
+      if(!preg_match("/\/$/", $this->web_path))
+         $this->web_path.= "/";
+
    } // __construct()
 
    private function showError($text)