X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot_db.php;h=90fdb8cc17392088a0d83763b7508b940dc764ce;hp=4e87cf9c87927978eb2ed671d7554cc5e2fe5458;hb=14eb0419012155b6d36f25dd9bd1d2ba683dbed7;hpb=af140085fe603c00c7ce98435b89d2ee56a10cd9;ds=sidebyside

diff --git a/phpfspot_db.php b/phpfspot_db.php
index 4e87cf9..90fdb8c 100644
--- a/phpfspot_db.php
+++ b/phpfspot_db.php
@@ -2,8 +2,9 @@
 
 /***************************************************************************
  *
- * Copyright (c) by Andreas Unterkircher, unki@netshadow.at
- * All rights reserved
+ * phpfspot, presents your F-Spot photo collection in Web browsers.
+ *
+ * Copyright (c) by Andreas Unterkircher
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,6 +22,10 @@
  *
  ***************************************************************************/
 
+/**
+ * PHPFSPOT_DB class
+ * @package phpfspot
+ */
 class PHPFSPOT_DB {
 
    private $db;
@@ -37,7 +42,9 @@ class PHPFSPOT_DB {
     */
    public function __construct($parent, $db_path)
    {
-      $this->parent = $parent;
+      global $phpfspot;
+
+      $this->parent = $phpfspot;
       $this->db_path = $db_path;
 
       /* We are starting disconnected */
@@ -73,6 +80,7 @@ class PHPFSPOT_DB {
                $this->setConnStatus(false);
             }
             else {
+               sqlite3_create_function($this->db, 'basename', 1, 'basename');
                $this->setConnStatus(true);
             }
             break;
@@ -202,10 +210,10 @@ class PHPFSPOT_DB {
          $result = $this->db_query($query);
          switch($this->parent->cfg->db_access) {
             case 'native':
-               $row = $result->fetchRow();
+               $row = $this->db_fetch_object($result);
                break;
             case 'pdo':
-               $row = $result[0];
+               $row = $result->fetch();
                break;
          }
          return $row;