r30 - in phpOpenTracker/branches: phpOpenTracker-1/phpOpenTracker/API/plugins phpOpenTracker-1.5/phpOpenTracker/API/plugins phpOpenTracker-1.5/phpOpenTracker/docs

Author: s_bergmann
Date: 2004-12-31 09:13:35 +0100 (Fri, 31 Dec 2004)
New Revision: 30

Modified:
   phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/API/plugins/visitors_online.php
   phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/docs/NEWS
   phpOpenTracker/branches/phpOpenTracker-1/phpOpenTracker/API/plugins/visitors_online.php
Log:
Contribution by Jean-Marc Fontaine <[email protected]>.

Modified: phpOpenTracker/branches/phpOpenTracker-1/phpOpenTracker/API/plugins/visitors_online.php
===================================================================
--- phpOpenTracker/branches/phpOpenTracker-1/phpOpenTracker/API/plugins/visitors_online.php	2004-12-30 11:04:02 UTC (rev 29)
+++ phpOpenTracker/branches/phpOpenTracker-1/phpOpenTracker/API/plugins/visitors_online.php	2004-12-31 08:13:35 UTC (rev 30)
@@ -275,6 +275,44 @@
           $result[$i]['referer'] = $referer;
         }
       }
+
+      $this->db->query(
+        sprintf(
+          "SELECT data_field,
+                  data_value
+             FROM %s
+            WHERE accesslog_id  = '%d'",
+
+          $this->config['additional_data_table'],
+          $accesslogIDs[$i]
+        )
+      );
+
+      switch ($parameters['result_format']) {
+        case 'xml':
+        case 'xml_object': {
+          $additionalDataNode = &$visitorNode->addChild('additional_data');
+        }
+        break;
+
+        default: {
+          $result[$i]['additional_data'] = array();
+        }
+      }
+
+      while ($row = $this->db->fetchRow()) {
+        switch ($parameters['result_format']) {
+          case 'xml':
+          case 'xml_object': {
+            $additionalDataNode->addChild($row['data_field'], $row['data_value']);
+          }
+          break;
+
+          default: {
+            $result[$i]['additional_data'][$row['data_field']] = $row['data_value'];
+          }
+        }
+      }
     }
 
     switch ($parameters['result_format']) {

Modified: phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/API/plugins/visitors_online.php
===================================================================
--- phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/API/plugins/visitors_online.php	2004-12-30 11:04:02 UTC (rev 29)
+++ phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/API/plugins/visitors_online.php	2004-12-31 08:13:35 UTC (rev 30)
@@ -275,6 +275,44 @@
           $result[$i]['referer'] = $referer;
         }
       }
+
+      $this->db->query(
+        sprintf(
+          "SELECT data_field,
+                  data_value
+             FROM %s
+            WHERE accesslog_id  = '%d'",
+
+          $this->config['additional_data_table'],
+          $accesslogIDs[$i]
+        )
+      );
+
+      switch ($parameters['result_format']) {
+        case 'xml':
+        case 'xml_object': {
+          $additionalDataNode = &$visitorNode->addChild('additional_data');
+        }
+        break;
+
+        default: {
+          $result[$i]['additional_data'] = array();
+        }
+      }
+
+      while ($row = $this->db->fetchRow()) {
+        switch ($parameters['result_format']) {
+          case 'xml':
+          case 'xml_object': {
+            $additionalDataNode->addChild($row['data_field'], $row['data_value']);
+          }
+          break;
+
+          default: {
+            $result[$i]['additional_data'][$row['data_field']] = $row['data_value'];
+          }
+        }
+      }
     }
 
     switch ($parameters['result_format']) {

Modified: phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/docs/NEWS
===================================================================
--- phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/docs/NEWS	2004-12-30 11:04:02 UTC (rev 29)
+++ phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/docs/NEWS	2004-12-31 08:13:35 UTC (rev 30)
@@ -14,6 +14,10 @@
     of the logfile phpOpenTracker optionally logs warning and error
     messages to.
 
+  * The 'visitors_online' API call now return additional data.
+
+    (Contribution by Jean-Marc Fontaine <[email protected]>)
+
   * Changes to the MyISAM and MyISAM Merge table creation scripts:
 
       + Added the 'PACK_KEYS=1' option to the pot_accesslog table