From 6c6ffd19fb0b2f9a150fd0064597b3d3da9fe1e5 Mon Sep 17 00:00:00 2001
From: Andreas Unterkircher <unki@netshadow.at>
Date: Sat, 30 Jun 2007 07:33:50 +0000
Subject: [PATCH] use ignore_once instead of ignore for requirement checks, or
 rpc.php will fail because HTML_AJAX get redeclared

git-svn-id: file:///var/lib/svn/phpfspot/trunk@136 fa6a889d-dae6-447d-9e79-4ba9a3039384
---
 phpfspot.class.php | 6 +++---
 rpc.php            | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 391589a..e052f3c 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -23,8 +23,7 @@ class PHPFSPOT {
 
       $this->cfg = new PHPFSPOT_CFG;
 
-      $this->db = new PHPFSPOT_DB(&$this, $this->cfg->fspot_db);
-
+      $this->db  = new PHPFSPOT_DB(&$this, $this->cfg->fspot_db);
       $this->cfg_db = new PHPFSPOT_DB(&$this, $this->cfg->phpfspot_db);
       $this->check_config_table();
 
@@ -69,6 +68,7 @@ class PHPFSPOT {
 
    private function get_tags()
    {
+   
       $this->avail_tags = Array();
       $count = 0;
    
@@ -846,7 +846,7 @@ class PHPFSPOT {
 
       /* Check for HTML_AJAX PEAR package, lent from Horde project */
       ini_set('track_errors', 1);
-      @include 'HTML/AJAX/Server.php';
+      @include_once 'HTML/AJAX/Server.php';
       if(isset($php_errormsg)) {
          print "PEAR HTML_AJAX package is missing<br />\n";
          $missing = true;
diff --git a/rpc.php b/rpc.php
index b5d5d35..80c80b1 100644
--- a/rpc.php
+++ b/rpc.php
@@ -27,14 +27,12 @@ class PHPFSPOT_RPC {
 
    public function __construct()
    {
-
       session_start();
 
    } // __construct()
 
    function process_ajax_request()
    {
-
       require_once 'HTML/AJAX/Server.php';
 
       $server = new HTML_AJAX_Server();
-- 
2.25.1