use ignore_once instead of ignore for requirement checks, or rpc.php will fail becaus...

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

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 391589a591d11c2068a34a87d36845b5c12a58d6..e052f3c08e206e75e9e66ba3ca0a9149daccabac 100644 (file)
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -23,8 +23,7 @@ class PHPFSPOT {
 
       $this->cfg = new PHPFSPOT_CFG;
 
 
       $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();
 
       $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()
    {
 
    private function get_tags()
    {

+   

       $this->avail_tags = Array();
       $count = 0;
    
       $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);
 
       /* 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;
       if(isset($php_errormsg)) {
          print "PEAR HTML_AJAX package is missing<br />\n";
          $missing = true;

diff --git a/rpc.php b/rpc.php
index b5d5d357f162aa50568d05a84d4bc550077f5cee..80c80b1c53d9225a0c787a688e5040d449cdee15 100644 (file)
--- a/rpc.php
+++ b/rpc.php
@@ -27,14 +27,12 @@ class PHPFSPOT_RPC {
 
    public function __construct()
    {
 
    public function __construct()
    {

-

       session_start();
 
    } // __construct()
 
    function process_ajax_request()
    {
       session_start();
 
    } // __construct()
 
    function process_ajax_request()
    {

-

       require_once 'HTML/AJAX/Server.php';
 
       $server = new HTML_AJAX_Server();
       require_once 'HTML/AJAX/Server.php';
 
       $server = new HTML_AJAX_Server();