[geeklog-cvs] geeklog-1.3/public_html/admin story.php,1.116,1.117
dhaun at iowaoutdoors.org
dhaun at iowaoutdoors.org
Fri Jul 2 14:30:19 EDT 2004
Update of /var/cvs/geeklog-1.3/public_html/admin
In directory www:/tmp/cvs-serv30606
Modified Files:
story.php
Log Message:
Fixed a bug where a story submission wasn't removed from the submission queue if you previewed it. Also added parameter filtering.
Index: story.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/story.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** story.php 16 May 2004 08:44:43 -0000 1.116
--- story.php 2 Jul 2004 18:30:16 -0000 1.117
***************
*** 477,481 ****
$current_topic = $HTTP_POST_VARS['tid'];
} else {
! $current_topic = $LANG09['9'];
}
if (empty($page)) {
--- 477,481 ----
$current_topic = $HTTP_POST_VARS['tid'];
} else {
! $current_topic = $LANG09[9];
}
if (empty($page)) {
***************
*** 511,519 ****
}
! $alltopics = '<option value="' .$LANG09['9']. '"';
! if ($current_topic == $LANG09['9']) {
$alltopics .= ' selected="selected"';
}
! $alltopics .= '>' .$LANG09['9']. '</option>' . LB;
$story_templates->set_var ('topic_selection', '<select name="tid" style="width: 125px" onchange="this.form.submit()">' . $alltopics . $seltopics . '</select>');
--- 511,519 ----
}
! $alltopics = '<option value="' .$LANG09[9]. '"';
! if ($current_topic == $LANG09[9]) {
$alltopics .= ' selected="selected"';
}
! $alltopics .= '>' .$LANG09[9]. '</option>' . LB;
$story_templates->set_var ('topic_selection', '<select name="tid" style="width: 125px" onchange="this.form.submit()">' . $alltopics . $seltopics . '</select>');
***************
*** 1004,1020 ****
}
! 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 the moderation then delete the submission
! if ($type == 'submission') {
! DB_delete($_TABLES['storysubmission'],'sid',$sid);
! }
COM_rdfUpToDateCheck ();
COM_olderStuff ();
} else {
$display .= COM_siteHeader('menu');
--- 1004,1022 ----
}
! 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");
// If this is done as part of the moderation then delete the submission
! DB_delete ($_TABLES['storysubmission'], 'sid', $sid);
!
! // update feed(s) and Older Stories block
COM_rdfUpToDateCheck ();
COM_olderStuff ();
+
+ if ($type == 'submission') {
+ echo COM_refresh ($_CONF['site_admin_url'] . '/moderation.php?msg=9');
+ } else {
+ echo COM_refresh ($_CONF['site_admin_url'] . '/story.php?msg=9');
+ }
+ exit;
} else {
$display .= COM_siteHeader('menu');
***************
*** 1091,1094 ****
--- 1093,1098 ----
$display = '';
if (($mode == $LANG24[11]) && !empty ($LANG24[11])) { // delete
+ $sid = COM_applyFilter ($HTTP_POST_VARS['sid']);
+ $type = COM_applyFilter ($HTTP_POST_VARS['type']);
if (!isset ($sid) || empty ($sid) || ($sid == 0)) {
COM_errorLog ('Attempted to delete story sid=' . $sid);
***************
*** 1098,1102 ****
if (SEC_hasTopicAccess ($tid) < 3) {
COM_accessLog ("User {$_USER['username']} tried to illegally delete story submission $sid.");
! return COM_refresh ($_CONF['site_admin_url'] . '/index.php');
} else {
DB_delete ($_TABLES['storysubmission'], 'sid', $sid,
--- 1102,1106 ----
if (SEC_hasTopicAccess ($tid) < 3) {
COM_accessLog ("User {$_USER['username']} tried to illegally delete story submission $sid.");
! echo COM_refresh ($_CONF['site_admin_url'] . '/index.php');
} else {
DB_delete ($_TABLES['storysubmission'], 'sid', $sid,
***************
*** 1108,1125 ****
} else if (($mode == $LANG24[9]) && !empty ($LANG24[9])) { // preview
$display .= COM_siteHeader('menu');
! $display .= storyeditor($sid,$mode);
$display .= COM_siteFooter();
echo $display;
} else if ($mode == 'edit') {
$display .= COM_siteHeader('menu');
! $display .= storyeditor($sid,$mode);
$display .= COM_siteFooter();
echo $display;
} else if ($mode == 'editsubmission') {
$display .= COM_siteHeader('menu');
! $display .= storyeditor($id,$mode);
$display .= COM_siteFooter();
echo $display;
} else if (($mode == $LANG24[8]) && !empty ($LANG24[8])) { // save
if ($publish_ampm == 'pm') {
if ($publish_hour < 12) {
--- 1112,1133 ----
} else if (($mode == $LANG24[9]) && !empty ($LANG24[9])) { // preview
$display .= COM_siteHeader('menu');
! $display .= storyeditor (COM_applyFilter ($HTTP_POST_VARS['sid']), $mode);
$display .= COM_siteFooter();
echo $display;
} else if ($mode == 'edit') {
$display .= COM_siteHeader('menu');
! $display .= storyeditor (COM_applyFilter ($HTTP_GET_VARS['sid']), $mode);
$display .= COM_siteFooter();
echo $display;
} else if ($mode == 'editsubmission') {
$display .= COM_siteHeader('menu');
! $display .= storyeditor (COM_applyFilter ($HTTP_GET_VARS['id']), $mode);
$display .= COM_siteFooter();
echo $display;
} else if (($mode == $LANG24[8]) && !empty ($LANG24[8])) { // save
+ $publish_ampm = COM_applyFilter ($HTTP_POST_VARS['publish_ampm']);
+ $publish_hour = COM_applyFilter ($HTTP_POST_VARS['publish_hour'], true);
+ $publish_minute = COM_applyFilter ($HTTP_POST_VARS['publish_minute'], true);
+ $publish_second = COM_applyFilter ($HTTP_POST_VARS['publish_second'], true);
if ($publish_ampm == 'pm') {
if ($publish_hour < 12) {
***************
*** 1130,1146 ****
$publish_hour = '00';
}
$unixdate = strtotime("$publish_month/$publish_day/$publish_year $publish_hour:$publish_minute:$publish_second");
if (isset ($HTTP_POST_VARS['author_from_list'])) {
! $uid = $HTTP_POST_VARS['author_from_list'];
}
! 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();
}
--- 1138,1180 ----
$publish_hour = '00';
}
+ $publish_year = COM_applyFilter ($HTTP_POST_VARS['publish_year'], true);
+ $publish_month = COM_applyFilter ($HTTP_POST_VARS['publish_month'], true);
+ $publish_day = COM_applyFilter ($HTTP_POST_VARS['publish_day'], true);
$unixdate = strtotime("$publish_month/$publish_day/$publish_year $publish_hour:$publish_minute:$publish_second");
if (isset ($HTTP_POST_VARS['author_from_list'])) {
! $uid = COM_applyFilter ($HTTP_POST_VARS['author_from_list'], true);
! } else {
! $uid = COM_applyFilter ($HTTP_POST_VARS['uid'], true);
}
! submitstory (COM_applyFilter ($HTTP_POST_VARS['type']),
! COM_applyFilter ($HTTP_POST_VARS['sid']), $uid,
! COM_applyFilter ($HTTP_POST_VARS['tid']),
! $HTTP_POST_VARS['title'],
! $HTTP_POST_VARS['introtext'], $HTTP_POST_VARS['bodytext'],
! COM_applyFilter ($HTTP_POST_VARS['hits'], true), $unixdate,
! COM_applyFilter ($HTTP_POST_VARS['comments'], true),
! COM_applyFilter ($HTTP_POST_VARS['featured'], true),
! COM_applyFilter ($HTTP_POST_VARS['commentcode']),
! COM_applyFilter ($HTTP_POST_VARS['statuscode']),
! COM_applyFilter ($HTTP_POST_VARS['postmode']),
! COM_applyFilter ($HTTP_POST_VARS['frontpage']),
! COM_applyFilter ($HTTP_POST_VARS['draft_flag']),
! COM_applyFilter ($HTTP_POST_VARS['numemails'], true),
! COM_applyFilter ($HTTP_POST_VARS['owner_id'], true),
! COM_applyFilter ($HTTP_POST_VARS['group_id'], true),
! $HTTP_POST_VARS['perm_owner'], $HTTP_POST_VARS['perm_group'],
! $HTTP_POST_VARS['perm_members'], $HTTP_POST_VARS['perm_anon'],
! $HTTP_POST_VARS['delete'],
! COM_applyFilter ($HTTP_POST_VARS['show_topic_icon']));
} else { // 'cancel' or no mode at all
+ $type = COM_applyFilter ($HTTP_POST_VARS['type']);
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 (COM_applyFilter ($HTTP_GET_VARS['msg'],
! true));
! $display .= liststories (COM_applyFilter ($HTTP_GET_VARS['page'], true));
$display .= COM_siteFooter();
}
More information about the geeklog-cvs
mailing list