From 78e756e8a4137861697bb1a1b20b6c2e7e13d7cf Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Sat, 24 Sep 2011 12:56:53 +1200
Subject: [PATCH] Add source/contact information to capabilities.

---
 inc/tz/capabilities.php                       | 23 +++++++++++++++----
 .../tests/timezone/5000-capabilities.result   |  7 +++---
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/inc/tz/capabilities.php b/inc/tz/capabilities.php
index fd2610d3..7d8105f2 100644
--- a/inc/tz/capabilities.php
+++ b/inc/tz/capabilities.php
@@ -8,14 +8,26 @@
 * @copyright Morphoss Ltd
 * @license   http://gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-
+$primary_source = '';
+$source = '';
+if ( substr($c->tzsource,0,4) == 'http' ) {
+  $source = '<source>'.$c->tzsource.'</source>';
+}
+else {
+  if ( empty($c->tzsource) ) $c->tzsource = '../zonedb/vtimezones';
+  if ( file_exists($c->tzsource.'/primary-source') ) {
+    $primary_source = '<primary-source>'.file_get_contents($c->tzsource.'/primary-source').'</primary-source>';
+  }
+}
+$contact = $c->admin_email;
 header('Content-Type: application/xml; charset="utf-8"');
-?>
+
+echo <<<EOCAP
 <?xml version="1.0" encoding="utf-8" ?>
 <capabilities xmlns="urn:ietf:params:xml:ns:timezone-service">
   <info>
-    <primary-source>Olson:2011m</primary-source>
-    <contact>mailto:tzs@example.org</contact>
+    $primary_source$source
+    <contact>mailto:$contact</contact>
   </info>
 
   <operation>
@@ -121,5 +133,6 @@ header('Content-Type: application/xml; charset="utf-8"');
     <description>Gets the capabilities of the server</description>
   </operation>
 </capabilities>
-<?php 
+EOCAP;
+
 exit(0);
\ No newline at end of file
diff --git a/testing/tests/timezone/5000-capabilities.result b/testing/tests/timezone/5000-capabilities.result
index 9f0dcbf6..ed7d5c98 100644
--- a/testing/tests/timezone/5000-capabilities.result
+++ b/testing/tests/timezone/5000-capabilities.result
@@ -1,12 +1,13 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Content-Length: 2986
+Content-Length: 2992
 Content-Type: application/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <capabilities xmlns="urn:ietf:params:xml:ns:timezone-service">
   <info>
-    <primary-source>Olson:2011m</primary-source>
+    <primary-source>Olson tzdata2011j
+</primary-source>
     <contact>mailto:tzs@example.org</contact>
   </info>
 
@@ -112,4 +113,4 @@ Content-Type: application/xml; charset="utf-8"
     <action>capabilities</action>
     <description>Gets the capabilities of the server</description>
   </operation>
-</capabilities>
+</capabilities>
\ No newline at end of file