[geeklog-cvs] geeklog-1.3/public_html/admin moderation.php,1.33,1.34 story.php,1.86,1.87

[geeklog-cvs-admin at lists.geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin
In directory internal.geeklog.net:/tmp/cvs-serv10094

Modified Files:
	moderation.php story.php 
Log Message:
Go back to moderation.php after editing a story submission.


Index: moderation.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/moderation.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** moderation.php	21 Mar 2003 14:58:49 -0000	1.33
--- moderation.php	10 Apr 2003 17:23:07 -0000	1.34
***************
*** 483,488 ****
  
  $display = '';
- 
  $display .= COM_siteHeader();
  
  switch ($mode) {
--- 483,488 ----
  
  $display = '';
  $display .= COM_siteHeader();
+ $display .= COM_showMessage($msg);
  
  switch ($mode) {

Index: story.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/story.php,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** story.php	10 Apr 2003 14:32:00 -0000	1.86
--- story.php	10 Apr 2003 17:23:07 -0000	1.87
***************
*** 878,882 ****
              }
          }
!         DB_save($_TABLES['stories'],'sid,uid,tid,title,introtext,bodytext,hits,date,comments,related,featured,commentcode,statuscode,postmode,frontpage,draft_flag,numemails,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon,show_topic_icon',"$sid,$uid,'$tid','$title','$introtext','$bodytext',$hits,'$date','$comments','$related',$featured,'$commentcode','$statuscode','$postmode','$frontpage',$draft_flag,$numemails,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$show_topic_icon", $_CONF['site_admin_url'] . '/story.php?msg=9');
          
          // If this is done as part of moderation stuff then delete the submission
--- 878,888 ----
              }
          }
! 
!         if ($type = 'submission') {
!             $return_to = $_CONF['site_admin_url'] . '/moderation.php?msg=9';
!         } else {
!             $return_to = $_CONF['site_admin_url'] . '/story.php?msg=9';
!         }
!         DB_save($_TABLES['stories'],'sid,uid,tid,title,introtext,bodytext,hits,date,comments,related,featured,commentcode,statuscode,postmode,frontpage,draft_flag,numemails,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon,show_topic_icon',"$sid,$uid,'$tid','$title','$introtext','$bodytext',$hits,'$date','$comments','$related',$featured,'$commentcode','$statuscode','$postmode','$frontpage',$draft_flag,$numemails,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$show_topic_icon", $return_to);
          
          // If this is done as part of moderation stuff then delete the submission
***************
*** 957,964 ****
      submitstory($type,$sid,$uid,$tid,$title,$introtext,$bodytext,$hits,$unixdate,$comments,$featured,$commentcode,$statuscode,$postmode,$frontpage, $draft_flag,$numemails,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$delete,$show_topic_icon);
  } else { // 'cancel' or no mode at all
!     $display .= COM_siteHeader('menu');
!     $display .= COM_showMessage($msg);
!     $display .= liststories($page);
!     $display .= COM_siteFooter();
      echo $display;
  }
--- 963,975 ----
      submitstory($type,$sid,$uid,$tid,$title,$introtext,$bodytext,$hits,$unixdate,$comments,$featured,$commentcode,$statuscode,$postmode,$frontpage, $draft_flag,$numemails,$owner_id,$group_id,$perm_owner,$perm_group,$perm_members,$perm_anon,$delete,$show_topic_icon);
  } else { // 'cancel' or no mode at all
!     if (($mode == $LANG24[10]) && !empty ($LANG24[10]) &&
!             ($type == 'submission')) {
!         $display .= COM_refresh ($_CONF['site_admin_url'] . '/moderation.php');
!     } else {
!         $display .= COM_siteHeader('menu');
!         $display .= COM_showMessage($msg);
!         $display .= liststories($page);
!         $display .= COM_siteFooter();
!     }
      echo $display;
  }