[geeklog-cvs] Geeklog-1.x/system lib-story.php,1.110,1.111

[Dirk Haun]

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

Modified Files:
	lib-story.php 
Log Message:
Minimize the number of Geeklog-specific elements we're sending: 'access' and 'in_transit' shouldn't have been included in the first place; send 'expire_date' only when valid (i.e. when 'statuscode' is set to archive or delete on expire).


Index: lib-story.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-story.php,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** lib-story.php	2 Nov 2007 16:19:05 -0000	1.110
--- lib-story.php	4 Nov 2007 20:19:31 -0000	1.111
***************
*** 1444,1448 ****
                                      'advanced_editor_mode',
                                      'frontpage',
-                                     'in_transit',
                                      'owner_id',
                                      'group_id',
--- 1444,1447 ----
***************
*** 1450,1455 ****
                                      'perm_group',
                                      'perm_members',
!                                     'perm_anon',
!                                     'access'
                                       );
  
--- 1449,1453 ----
                                      'perm_group',
                                      'perm_members',
!                                     'perm_anon'
                                       );
  
***************
*** 1497,1503 ****
          }
  
!         if($args['gl_svc']) {
!             /* This date format is PHP 5 only, but only the web-service uses the value */
!             $output['expire_date']  = date('c', $output['expire']);
              $output['id']           = $output['sid'];
              $output['category']     = array($output['tid']);
--- 1495,1505 ----
          }
  
!         if ($args['gl_svc']) {
!             if (($output['statuscode'] == STORY_ARCHIVE_ON_EXPIRE) ||
!                 ($output['statuscode'] == STORY_DELETE_ON_EXPIRE)) {
!                 // This date format is PHP 5 only,
!                 // but only the web-service uses the value
!                 $output['expire_date']  = date('c', $output['expire']);
!             }
              $output['id']           = $output['sid'];
              $output['category']     = array($output['tid']);
***************
*** 1577,1583 ****
              }
  
!             if($args['gl_svc']) {
!                 /* This date format is PHP 5 only, but only the web-service uses the value */
!                 $output_item['expire_date']  = date('c', $output_item['expire']);
                  $output_item['id']           = $output_item['sid'];
                  $output_item['category']     = array($output_item['tid']);
--- 1579,1589 ----
              }
  
!             if ($args['gl_svc']) {
!                 if (($output_item['statuscode'] == STORY_ARCHIVE_ON_EXPIRE) ||
!                     ($output_item['statuscode'] == STORY_DELETE_ON_EXPIRE)) {
!                     // This date format is PHP 5 only,
!                     // but only the web-service uses the value
!                     $output_item['expire_date']  = date('c', $output_item['expire']);
!                 }
                  $output_item['id']           = $output_item['sid'];
                  $output_item['category']     = array($output_item['tid']);