[geeklog-cvs] geeklog-1.3/public_html/admin story.php,1.115,1.116

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html/admin
In directory www:/tmp/cvs-serv18549/public_html/admin

Modified Files:
	story.php 
Log Message:
Fixed date handling


Index: story.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/story.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** story.php	11 May 2004 18:00:38 -0000	1.115
--- story.php	16 May 2004 08:44:43 -0000	1.116
***************
*** 119,123 ****
  
      if (!empty($sid) && $mode == 'edit') {
! 	$result = DB_query ("SELECT STRAIGHT_JOIN s.*, UNIX_TIMESTAMP(s.date) as day, "
           . "u.username, u.fullname, u.photo, t.topic, t.imageurl "
           . "FROM {$_TABLES['stories']} as s, {$_TABLES['users']} as u, {$_TABLES['topics']} as t "
--- 119,123 ----
  
      if (!empty($sid) && $mode == 'edit') {
!         $result = DB_query ("SELECT STRAIGHT_JOIN s.*, UNIX_TIMESTAMP(s.date) as unixdate, "
           . "u.username, u.fullname, u.photo, t.topic, t.imageurl "
           . "FROM {$_TABLES['stories']} as s, {$_TABLES['users']} as u, {$_TABLES['topics']} as t "
***************
*** 143,149 ****
          }
      } elseif (!empty($sid) && $mode == 'editsubmission') {
! 	$result = DB_query ("SELECT STRAIGHT_JOIN s.*, UNIX_TIMESTAMP(s.date) as day, "
           . "u.username, u.fullname, u.photo, t.topic, t.imageurl, t.group_id, "
! 	 . "t.perm_owner, t.perm_group, t.perm_members, t.perm_anon "
           . "FROM {$_TABLES['storysubmission']} as s, {$_TABLES['users']} as u, {$_TABLES['topics']} as t "
           . "WHERE (s.uid = u.uid) AND (s.tid = t.tid) AND (sid = '$sid')");
--- 143,149 ----
          }
      } elseif (!empty($sid) && $mode == 'editsubmission') {
!         $result = DB_query ("SELECT STRAIGHT_JOIN s.*, UNIX_TIMESTAMP(s.date) as unixdate, "
           . "u.username, u.fullname, u.photo, t.topic, t.imageurl, t.group_id, "
!          . "t.perm_owner, t.perm_group, t.perm_members, t.perm_anon "
           . "FROM {$_TABLES['storysubmission']} as s, {$_TABLES['users']} as u, {$_TABLES['topics']} as t "
           . "WHERE (s.uid = u.uid) AND (s.tid = t.tid) AND (sid = '$sid')");
***************
*** 181,188 ****
      } else {
          $A = $HTTP_POST_VARS;
! 	$res = DB_query("SELECT username, fullname, photo FROM {$_TABLES['users']} WHERE uid = {$A['uid']}");
! 	$A += DB_fetchArray($res);
! 	$res = DB_query("SELECT topic, imageurl FROM {$_TABLES['topics']} WHERE tid = '{$A['tid']}'");
! 	$A += DB_fetchArray($res);
          if (empty ($A['ampm'])) {
              $A['ampm'] = $A['publish_ampm'];
--- 181,188 ----
      } else {
          $A = $HTTP_POST_VARS;
!         $res = DB_query("SELECT username, fullname, photo FROM {$_TABLES['users']} WHERE uid = {$A['uid']}");
!         $A += DB_fetchArray($res);
!         $res = DB_query("SELECT topic, imageurl FROM {$_TABLES['topics']} WHERE tid = '{$A['tid']}'");
!         $A += DB_fetchArray($res);
          if (empty ($A['ampm'])) {
              $A['ampm'] = $A['publish_ampm'];