[geeklog-cvs] Geeklog-1.x/system lib-webservices.php,1.14,1.15

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv49197/system

Modified Files:
	lib-webservices.php 
Log Message:
Fixed indentation - no other changes


Index: lib-webservices.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-webservices.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** lib-webservices.php	1 Nov 2007 15:55:06 -0000	1.14
--- lib-webservices.php	4 Nov 2007 19:00:17 -0000	1.15
***************
*** 261,328 ****
  
      if ($ret == PLG_RET_OK) {
!             header($_SERVER['SERVER_PROTOCOL'] . ' 200 OK');
!             header('Content-type: application/atom+xml; charset=UTF-8');
!             // Output the actual object/objects here
! 
!             if (!$svc_msg['gl_feed']) {
!                 /* This is an entry, not a feed */
!                 $etag = trim($_SERVER['HTTP_IF_NONE_MATCH'], '"');
!                 if (!empty($etag) && ($out['updated'] == $etag)) {
!                     header($_SERVER['SERVER_PROTOCOL'] . ' 304 Not Modified');
!                     exit();
!                 } else {
!                     header('Etag: "' . $out['updated'] . '"');
!                 }
!                 $atom_doc = new DOMDocument('1.0', 'utf-8');
! 
!                 $entry_elem = $atom_doc->createElementNS($WS_ATOM_NS, 'atom:entry');
!                 $atom_doc->appendChild($entry_elem);
!                 $atom_doc->createAttributeNS($WS_APP_NS, 'app:entry');
!                 $atom_doc->createAttributeNS($WS_EXTN_NS, 'gl:entry');
  
!                 WS_arrayToEntryXML($out, $svc_msg['output_fields'], $entry_elem, $atom_doc);
!                 WS_write($atom_doc->saveXML());
              } else {
!                 /* Output the feed here */
!                 $atom_doc = new DOMDocument('1.0', 'utf-8');
  
!                 $feed_elem = $atom_doc->createElementNS($WS_ATOM_NS, 'atom:feed');
!                 $atom_doc->appendChild($feed_elem);
!                 $atom_doc->createAttributeNS($WS_APP_NS, 'app:feed');
!                 $atom_doc->createAttributeNS($WS_EXTN_NS, 'gl:feed');
  
!                 $feed_id = $atom_doc->createElement('atom:id', $_CONF['site_name']);
!                 $feed_elem->appendChild($feed_id);
  
!                 $feed_title = $atom_doc->createElement('atom:title', $_CONF['site_name']);
!                 $feed_elem->appendChild($feed_title);
  
!                 $feed_updated = $atom_doc->createElement('atom:updated', date('c'));
!                 $feed_elem->appendChild($feed_updated);
  
!                 $feed_link = $atom_doc->createElement('atom:link');
!                 $feed_link->setAttribute('rel', 'self');
!                 $feed_link->setAttribute('type', 'application/atom+xml');
!                 $feed_link->setAttribute('href', $_CONF['site_url'] . '/webservices/atom/?plugin=' . htmlentities($WS_PLUGIN));
!                 $feed_elem->appendChild($feed_link);
  
!                 if (!empty($svc_msg['offset'])) {
!                     $next_link = $atom_doc->createElement('atom:link');
!                     $next_link->setAttribute('rel', 'next');
!                     $next_link->setAttribute('type', 'application/atom+xml');
!                     $next_link->setAttribute('href', $_CONF['site_url'] . '/webservices/atom/?plugin=' . htmlentities($WS_PLUGIN) . '&offset=' . $svc_msg['offset']);
!                     $feed_elem->appendChild($next_link);
!                 }
  
!                 foreach ($out as $entry_array) {
!                     $entry_elem = $atom_doc->createElement('atom:entry');
!                     WS_arrayToEntryXML($entry_array, $svc_msg['output_fields'], $entry_elem, $atom_doc);
!                     $feed_elem->appendChild($entry_elem);
!                 }
  
!                 WS_write($atom_doc->saveXML());
              }
  
!             return;
      }
  
--- 261,328 ----
  
      if ($ret == PLG_RET_OK) {
!         header($_SERVER['SERVER_PROTOCOL'] . ' 200 OK');
!         header('Content-type: application/atom+xml; charset=UTF-8');
!         // Output the actual object/objects here
  
!         if (!$svc_msg['gl_feed']) {
!             /* This is an entry, not a feed */
!             $etag = trim($_SERVER['HTTP_IF_NONE_MATCH'], '"');
!             if (!empty($etag) && ($out['updated'] == $etag)) {
!                 header($_SERVER['SERVER_PROTOCOL'] . ' 304 Not Modified');
!                 exit();
              } else {
!                 header('Etag: "' . $out['updated'] . '"');
!             }
!             $atom_doc = new DOMDocument('1.0', 'utf-8');
  
!             $entry_elem = $atom_doc->createElementNS($WS_ATOM_NS, 'atom:entry');
!             $atom_doc->appendChild($entry_elem);
!             $atom_doc->createAttributeNS($WS_APP_NS, 'app:entry');
!             $atom_doc->createAttributeNS($WS_EXTN_NS, 'gl:entry');
  
!             WS_arrayToEntryXML($out, $svc_msg['output_fields'], $entry_elem, $atom_doc);
!             WS_write($atom_doc->saveXML());
!         } else {
!             /* Output the feed here */
!             $atom_doc = new DOMDocument('1.0', 'utf-8');
  
!             $feed_elem = $atom_doc->createElementNS($WS_ATOM_NS, 'atom:feed');
!             $atom_doc->appendChild($feed_elem);
!             $atom_doc->createAttributeNS($WS_APP_NS, 'app:feed');
!             $atom_doc->createAttributeNS($WS_EXTN_NS, 'gl:feed');
  
!             $feed_id = $atom_doc->createElement('atom:id', $_CONF['site_name']);
!             $feed_elem->appendChild($feed_id);
  
!             $feed_title = $atom_doc->createElement('atom:title', $_CONF['site_name']);
!             $feed_elem->appendChild($feed_title);
  
!             $feed_updated = $atom_doc->createElement('atom:updated', date('c'));
!             $feed_elem->appendChild($feed_updated);
  
!             $feed_link = $atom_doc->createElement('atom:link');
!             $feed_link->setAttribute('rel', 'self');
!             $feed_link->setAttribute('type', 'application/atom+xml');
!             $feed_link->setAttribute('href', $_CONF['site_url'] . '/webservices/atom/?plugin=' . htmlentities($WS_PLUGIN));
!             $feed_elem->appendChild($feed_link);
  
!             if (!empty($svc_msg['offset'])) {
!                 $next_link = $atom_doc->createElement('atom:link');
!                 $next_link->setAttribute('rel', 'next');
!                 $next_link->setAttribute('type', 'application/atom+xml');
!                 $next_link->setAttribute('href', $_CONF['site_url'] . '/webservices/atom/?plugin=' . htmlentities($WS_PLUGIN) . '&offset=' . $svc_msg['offset']);
!                 $feed_elem->appendChild($next_link);
              }
  
!             foreach ($out as $entry_array) {
!                 $entry_elem = $atom_doc->createElement('atom:entry');
!                 WS_arrayToEntryXML($entry_array, $svc_msg['output_fields'], $entry_elem, $atom_doc);
!                 $feed_elem->appendChild($entry_elem);
!             }
! 
!             WS_write($atom_doc->saveXML());
!         }
! 
!         return;
      }