[geeklog-cvs] geeklog-1.3/public_html article.php,1.59,1.60 comment.php,1.87,1.88
vinny at iowaoutdoors.org
vinny at iowaoutdoors.org
Mon Jan 24 23:04:17 EST 2005
Update of /var/cvs/geeklog-1.3/public_html
In directory www:/tmp/cvs-serv23614/public_html
Modified Files:
article.php comment.php
Log Message:
Comment form ready (including plugins), comment bar fixes, minor (though
important) theme change to commentbar.thtml, removed (ugly) legacy code
from article.php.
Index: comment.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/comment.php,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** comment.php 24 Jan 2005 06:00:09 -0000 1.87
--- comment.php 25 Jan 2005 04:04:15 -0000 1.88
***************
*** 60,85 ****
// echo COM_debug($_POST);
-
- // MAIN
- $display = '';
-
- if (isset ($_REQUEST['reply'])) {
- $_REQUEST['mode'] = '';
- }
-
- switch ( $_REQUEST['mode'] ) {
- case $LANG03[14]: // Preview
- $display .= COM_siteHeader()
- . CMT_commentForm (COM_applyFilter ($_POST['uid'], true),
- strip_tags ($_POST['title']), $_POST['comment'],
- COM_applyFilter ($_POST['sid']),
- COM_applyFilter ($_POST['pid'], true),
- COM_applyFilter ($_POST['type']), COM_applyFilter ($_POST['mode']),
- COM_applyFilter ($_POST['postmode']))
- . COM_siteFooter();
- break;
-
- case $LANG03[11]: // Submit Comment
$type = COM_applyFilter ($_POST['type']);
$sid = COM_applyFilter ($_POST['sid']);
--- 60,73 ----
// echo COM_debug($_POST);
+ /**
+ * Hanldes a comment submission
+ *
+ * @copyright Vincent Furia 2005
+ * @author Vincent Furia <vinny01 AT users DOT sourceforge DOT net>
+ * @return string HTML (possibly a refresh)
+ */
+ function handleSubmit() {
+ global $_POST, $_TABLES, $_CONF, $LANG03;
$type = COM_applyFilter ($_POST['type']);
$sid = COM_applyFilter ($_POST['sid']);
***************
*** 138,144 ****
break;
}
- break;
! case 'delete':
$type = COM_applyFilter ($_REQUEST['type']);
$sid = COM_applyFilter ($_REQUEST['sid']);
--- 126,143 ----
break;
}
! return $display;
! }
!
! /**
! * Hanldes a comment submission
! *
! * @copyright Vincent Furia 2005
! * @author Vincent Furia <vinny01 AT users DOT sourceforge DOT net>
! * @return string HTML (possibly a refresh)
! */
! function handleDelete() {
! global $_REQUEST, $_TABLES, $_CONF;
!
$type = COM_applyFilter ($_REQUEST['type']);
$sid = COM_applyFilter ($_REQUEST['sid']);
***************
*** 163,167 ****
$display .= COM_refresh ($_CONF['site_url'] . '/index.php');
}
-
break;
--- 162,165 ----
***************
*** 181,185 ****
$display .= COM_refresh ($_CONF['site_url'] . '/index.php');
}
-
break;
--- 179,182 ----
***************
*** 191,194 ****
--- 188,219 ----
break;
}
+
+ return $display;
+ }
+
+
+ // MAIN
+ $display = '';
+
+ if (isset ($_REQUEST['reply'])) {
+ $_REQUEST['mode'] = '';
+ }
+
+ switch ( $_REQUEST['mode'] ) {
+ case $LANG03[14]: // Preview
+ $display .= COM_siteHeader()
+ . CMT_commentForm ( strip_tags ($_POST['title']), $_POST['comment'],
+ COM_applyFilter ($_POST['sid']), COM_applyFilter ($_POST['pid'], true),
+ COM_applyFilter ($_POST['type']), COM_applyFilter ($_POST['mode']),
+ COM_applyFilter ($_POST['postmode']))
+ . COM_siteFooter();
+ break;
+
+ case $LANG03[11]: // Submit Comment
+ $display = handleSubmit(); // moved to function for readibility
+ break;
+
+ case 'delete':
+ $display = handleDelete(); // moved to function for readibility
break;
***************
*** 314,326 ****
break;
! default:
$sid = COM_applyFilter ($_REQUEST['sid']);
$type = COM_applyFilter ($_REQUEST['type']);
$title = strip_tags ($_REQUEST['title']);
- $pid = COM_applyFilter ($_REQUEST['pid'], true);
- $mode = COM_applyFilter ($_REQUEST['mode']);
- $postmode = COM_applyFilter ($_REQUEST['postmode']);
! if (!empty ($sid)) {
if (empty ($title)) {
if ($type == 'article') {
--- 339,348 ----
break;
! default: // New Comment
$sid = COM_applyFilter ($_REQUEST['sid']);
$type = COM_applyFilter ($_REQUEST['type']);
$title = strip_tags ($_REQUEST['title']);
! if (!empty ($sid) && !empty ($type)) {
if (empty ($title)) {
if ($type == 'article') {
***************
*** 333,359 ****
$title = str_replace ('$', '$', $title);
}
! if (!empty ($type)) {
! $display .= COM_siteHeader('menu', $LANG03[1])
! . CMT_commentForm ($_USER['uid'], $title, '', $sid, $pid, $type,
! $mode, $postmode)
! . COM_siteFooter();
! } else {
! $display .= COM_refresh($_CONF['site_url'] . '/index.php');
! }
} else {
! // This could still be a plugin wanting comments
! $cid = COM_applyFilter ($_REQUEST['cid'], true);
! $format = COM_applyFilter ($_REQUEST['format']);
! $order = COM_applyFilter ($_REQUEST['order']);
! $reply = COM_applyFilter ($_REQUEST['reply']);
! $type = COM_applyFilter ($_REQUEST['type']);
!
! if (!empty ($type) && !empty ($cid)) {
! $display .= PLG_callCommentForm ($type, $cid, $format, $order, $reply);
! } else {
! // must be a mistake at this point
! $display .= COM_refresh($_CONF['site_url'] . '/index.php');
! }
}
}
--- 355,366 ----
$title = str_replace ('$', '$', $title);
}
! $display .= COM_siteHeader('menu', $LANG03[1])
! . CMT_commentForm ($title, '', $sid, COM_applyFilter ($_REQUEST['pid'], true),
! $type, COM_applyFilter ($_REQUEST['mode']), COM_applyFilter ($_REQUEST['postmode']))
! . COM_siteFooter();
} else {
! $display .= COM_refresh($_CONF['site_url'] . '/index.php');
}
+ break;
}
Index: article.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/article.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** article.php 21 Jan 2005 23:31:44 -0000 1.59
--- article.php 25 Jan 2005 04:04:14 -0000 1.60
***************
*** 81,277 ****
}
- // First see if we have a plugin that may be trying to use the Geeklog comment engine
- $type = COM_applyFilter ($_REQUEST['type']);
- if (!empty ($type) && PLG_supportsComments ($type)) {
- // Yes, this is a plugin wanting to be commented on...do it
- $display .= PLG_callCommentForm($type,$story,$mode,$order,$reply);
- echo $display;
- exit();
- }
! if ($type == 'poll') {
! $result = DB_query("SELECT COUNT(*) AS count FROM {$_TABLES['pollquestions']} WHERE qid = '$story'" . COM_getPermSql ('AND'));
! } else {
! $result = DB_query("SELECT COUNT(*) AS count FROM {$_TABLES['stories']} WHERE sid = '$story'" . COM_getPermSql ('AND'));
! }
$A = DB_fetchArray($result);
if ($A['count'] > 0) {
! if ($reply == $LANG01[25]) {
! echo COM_refresh ($_CONF['site_url']
! . "/comment.php?sid=$story&pid=$pid&type=$type");
! } else {
! $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 "
! . "WHERE (s.uid = u.uid) AND (s.tid = t.tid) AND (sid = '$story')");
! $A = DB_fetchArray ($result);
! $access = SEC_hasAccess ($A['owner_id'], $A['group_id'],
! $A['perm_owner'], $A['perm_group'], $A['perm_members'],
! $A['perm_anon']);
! if (($access == 0) OR !SEC_hasTopicAccess ($A['tid']) OR
! (($A['draft_flag'] == 1) AND !SEC_hasRights ('story.edit'))) {
! $display .= COM_siteHeader ('menu')
! . COM_startBlock ($LANG_ACCESS['accessdenied'], '',
! COM_getBlockTemplate ('_msg_block', 'header'))
! . $LANG_ACCESS['storydenialmsg']
! . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'))
! . COM_siteFooter ();
! } elseif (($mode == 'print') && ($_CONF['hideprintericon'] == 0)) {
! $story_template = new Template($_CONF['path_layout'] . 'article');
! $story_template->set_file('article','printable.thtml');
! $story_template->set_var('page_title',
! $_CONF['site_name'] . ': ' . stripslashes($A['title']));
! $story_template->set_var('story_title',stripslashes($A['title']));
! $curtime = COM_getUserDateTimeFormat($A['day']);
! $story_template->set_var('story_date', $curtime[0]);
!
! if ($_CONF['contributedbyline'] == 1) {
! $story_template->set_var('lang_contributedby', $LANG01[1]);
! $story_template->set_var('story_author', $A['username']);
! }
! if ($A['postmode'] == 'html') {
! $story_template->set_var ('story_introtext',
! stripslashes ($A['introtext']));
! $story_template->set_var ('story_bodytext',
! stripslashes ($A['bodytext']));
! } else {
! $story_template->set_var ('story_introtext',
! nl2br (stripslashes ($A['introtext'])));
! $story_template->set_var ('story_bodytext',
! nl2br (stripslashes ($A['bodytext'])));
! }
! $story_template->set_var('site_url',$_CONF['site_url']);
! $story_template->set_var('layout_url',$_CONF['layout_url']);
! $story_template->set_var('story_id', $A['sid']);
! $story_template->set_var('story_comments', DB_count($_TABLES['comments'],'sid',$A['sid']));
! $story_template->set_var('lang_comments', $LANG01[3]);
! $articleUrl = COM_buildUrl ($_CONF['site_url']
! . '/article.php?story=' . $A['sid']);
! $story_template->set_var ('article_url', $articleUrl);
! $story_template->parse('output','article');
! $display = $story_template->finish($story_template->get_var('output'));
} else {
! // Set page title
! $pagetitle = stripslashes (str_replace ('$', '$', $A['title']));
! if ($_CONF['trackback_enabled']) {
! $permalink = COM_buildUrl ($_CONF['site_url']
! . '/article.php?story=' . $story);
! $trackbackurl = TRB_makeTrackbackUrl ($story);
! $rdf = '<!--' . LB
! . TRB_trackbackRdf ($permalink, $A['title'], $trackbackurl)
! . LB . '-->' . LB;
! } else {
! $rdf = '';
! }
! $display .= COM_siteHeader ('menu', $pagetitle, $rdf);
! DB_query ("UPDATE {$_TABLES['stories']} SET hits = hits + 1 WHERE (sid = '$story') AND (date <= NOW()) AND (draft_flag = 0)");
! if (!empty ($query)) {
! $A['introtext'] = COM_highlightQuery ($A['introtext'], $query);
! $A['bodytext'] = COM_highlightQuery ($A['bodytext'], $query);
! }
! // Display whats related any polls configured for this page
! $story_template = new Template($_CONF['path_layout'] . 'article');
! $story_template->set_file('article','article.thtml');
! $story_template->set_var('site_url', $_CONF['site_url']);
! $story_template->set_var('layout_url', $_CONF['layout_url']);
! $story_options = array ();
! if ($_CONF['hideemailicon'] == 0) {
! $emailUrl = $_CONF['site_url'] . '/profiles.php?sid=' . $story
! . '&what=emailstory';
! $story_options[] = '<a href="' . $emailUrl . '">' . $LANG11[2]
! . '</a>';
! $story_template->set_var ('email_story_url', $emailUrl);
! $story_template->set_var ('lang_email_story', $LANG11[2]);
! $story_template->set_var ('lang_email_story_alt', $LANG01[64]);
! }
! $printUrl = COM_buildUrl ($_CONF['site_url']
! . '/article.php?story=' . $story . '&mode=print');
! if ($_CONF['hideprintericon'] == 0) {
! $story_options[] = '<a href="' . $printUrl . '">' . $LANG11[3]
! . '</a>';
! $story_template->set_var ('print_story_url', $printUrl);
! $story_template->set_var ('lang_print_story', $LANG11[3]);
! $story_template->set_var ('lang_print_story_alt', $LANG01[65]);
! }
! if ($_CONF['pdf_enabled'] == 1) {
! $pdfUrl = $_CONF['site_url']
! . '/pdfgenerator.php?pageType=2&pageData='
! . urlencode ($printUrl);
! $story_options[] = '<a href="' . $pdfUrl . '">' . $LANG11[5]
! . '</a>';
! $story_template->set_var ('pdf_story_url', $printUrl);
! $story_template->set_var ('lang_pdf_story', $LANG11[5]);
! }
! $related = STORY_whatsRelated ($A['related'], $A['uid'], $A['tid']);
! if (!empty ($related)) {
! $related = COM_startBlock ($LANG11[1], '',
! COM_getBlockTemplate ('whats_related_block', 'header'))
! . $related
! . COM_endBlock (COM_getBlockTemplate ('whats_related_block',
! 'footer'));
! }
! if (count ($story_options) > 0) {
! $optionsblock = COM_startBlock ($LANG11[4], '',
! COM_getBlockTemplate ('story_options_block', 'header'))
! . COM_makeList ($story_options, 'list-story-options')
! . COM_endBlock (COM_getBlockTemplate ('story_options_block',
! 'footer'));
! } else {
! $optionsblock = '';
! }
! $story_template->set_var ('whats_related', $related);
! $story_template->set_var ('story_options', $optionsblock);
! $story_template->set_var ('whats_related_story_options',
! $related . $optionsblock);
! // if (DB_count($_TABLES['pollquestions'],'qid',$story) > 0) {
! // $display .= COM_showPoll(80,$story);
! // }
! $story_template->set_var ('formatted_article',
! STORY_renderArticle ($A, 'n'));
! // Display the comments, if there are any ..
! if ($A['commentcode'] >= 0) {
! $delete_option = (SEC_hasRights('story.edit') && ($access == 3)
! ? true : false);
! require_once ( $_CONF['path_system'] . 'lib-comment.php' );
! $story_template->set_var ('commentbar',
! CMT_userComments ($story, $A['title'], 'article',
! $order, $mode, 0, $page, false, $delete_option));
}
- if ($_CONF['trackback_enabled']) {
- if (SEC_inGroup ('Root')) {
- $url = $_CONF['site_admin_url']
- . '/trackback.php?mode=new&id=' . $A['sid'];
- $story_template->set_var ('send_trackback_link', '<a href="'
- . $url . '">' . $LANG_TRB['send_trackback'] . '</a>');
- $story_template->set_var ('send_trackback_url', $url);
- $story_template->set_var ('lang_send_trackback_text',
- $LANG_TRB['send_trackback']);
- }
! $permalink = COM_buildUrl ($_CONF['site_url']
! . '/article.php?story=' . $story);
! $story_template->set_var ('trackback',
! TRB_renderTrackbackComments ($story, 'article',
! $A['title'], $permalink));
! } else {
! $story_template->set_var ('trackback', '');
! }
! $display .= $story_template->finish ($story_template->parse ('output', 'article'));
! $display .= COM_siteFooter ();
}
}
} else {
$display .= COM_refresh($_CONF['site_url'] . '/index.php');
}
echo $display;
--- 81,262 ----
}
! $result = DB_query("SELECT COUNT(*) AS count FROM {$_TABLES['stories']} WHERE sid = '$story'"
! . COM_getPermSql ('AND'));
$A = DB_fetchArray($result);
if ($A['count'] > 0) {
! $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 "
! . "WHERE (s.uid = u.uid) AND (s.tid = t.tid) AND (sid = '$story')");
! $A = DB_fetchArray ($result);
! $access = SEC_hasAccess ($A['owner_id'], $A['group_id'],
! $A['perm_owner'], $A['perm_group'], $A['perm_members'],
! $A['perm_anon']);
! if (($access == 0) OR !SEC_hasTopicAccess ($A['tid']) OR
! (($A['draft_flag'] == 1) AND !SEC_hasRights ('story.edit'))) {
! $display .= COM_siteHeader ('menu')
! . COM_startBlock ($LANG_ACCESS['accessdenied'], '',
! COM_getBlockTemplate ('_msg_block', 'header'))
! . $LANG_ACCESS['storydenialmsg']
! . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'))
! . COM_siteFooter ();
! } elseif (($mode == 'print') && ($_CONF['hideprintericon'] == 0)) {
! $story_template = new Template($_CONF['path_layout'] . 'article');
! $story_template->set_file('article','printable.thtml');
! $story_template->set_var('page_title',
! $_CONF['site_name'] . ': ' . stripslashes($A['title']));
! $story_template->set_var('story_title',stripslashes($A['title']));
! $curtime = COM_getUserDateTimeFormat($A['day']);
! $story_template->set_var('story_date', $curtime[0]);
!
! if ($_CONF['contributedbyline'] == 1) {
! $story_template->set_var('lang_contributedby', $LANG01[1]);
! $story_template->set_var('story_author', $A['username']);
! }
! if ($A['postmode'] == 'html') {
! $story_template->set_var ('story_introtext',
! stripslashes ($A['introtext']));
! $story_template->set_var ('story_bodytext',
! stripslashes ($A['bodytext']));
} else {
! $story_template->set_var ('story_introtext',
! nl2br (stripslashes ($A['introtext'])));
! $story_template->set_var ('story_bodytext',
! nl2br (stripslashes ($A['bodytext'])));
! }
! $story_template->set_var('site_url',$_CONF['site_url']);
! $story_template->set_var('layout_url',$_CONF['layout_url']);
! $story_template->set_var('story_id', $A['sid']);
! $story_template->set_var('story_comments', DB_count($_TABLES['comments'],'sid',$A['sid']));
! $story_template->set_var('lang_comments', $LANG01[3]);
! $articleUrl = COM_buildUrl ($_CONF['site_url']
! . '/article.php?story=' . $A['sid']);
! $story_template->set_var ('article_url', $articleUrl);
! $story_template->parse('output','article');
! $display = $story_template->finish($story_template->get_var('output'));
! } else {
! // Set page title
! $pagetitle = stripslashes (str_replace ('$', '$', $A['title']));
! if ($_CONF['trackback_enabled']) {
! $permalink = COM_buildUrl ($_CONF['site_url']
! . '/article.php?story=' . $story);
! $trackbackurl = TRB_makeTrackbackUrl ($story);
! $rdf = '<!--' . LB
! . TRB_trackbackRdf ($permalink, $A['title'], $trackbackurl)
! . LB . '-->' . LB;
! } else {
! $rdf = '';
! }
! $display .= COM_siteHeader ('menu', $pagetitle, $rdf);
! DB_query ("UPDATE {$_TABLES['stories']} SET hits = hits + 1 WHERE (sid = '$story') AND (date <= NOW()) AND (draft_flag = 0)");
! if (!empty ($query)) {
! $A['introtext'] = COM_highlightQuery ($A['introtext'], $query);
! $A['bodytext'] = COM_highlightQuery ($A['bodytext'], $query);
! }
! // Display whats related any polls configured for this page
! $story_template = new Template($_CONF['path_layout'] . 'article');
! $story_template->set_file('article','article.thtml');
! $story_template->set_var('site_url', $_CONF['site_url']);
! $story_template->set_var('layout_url', $_CONF['layout_url']);
! $story_options = array ();
! if ($_CONF['hideemailicon'] == 0) {
! $emailUrl = $_CONF['site_url'] . '/profiles.php?sid=' . $story
! . '&what=emailstory';
! $story_options[] = '<a href="' . $emailUrl . '">' . $LANG11[2]
! . '</a>';
! $story_template->set_var ('email_story_url', $emailUrl);
! $story_template->set_var ('lang_email_story', $LANG11[2]);
! $story_template->set_var ('lang_email_story_alt', $LANG01[64]);
! }
! $printUrl = COM_buildUrl ($_CONF['site_url']
! . '/article.php?story=' . $story . '&mode=print');
! if ($_CONF['hideprintericon'] == 0) {
! $story_options[] = '<a href="' . $printUrl . '">' . $LANG11[3]
! . '</a>';
! $story_template->set_var ('print_story_url', $printUrl);
! $story_template->set_var ('lang_print_story', $LANG11[3]);
! $story_template->set_var ('lang_print_story_alt', $LANG01[65]);
! }
! if ($_CONF['pdf_enabled'] == 1) {
! $pdfUrl = $_CONF['site_url']
! . '/pdfgenerator.php?pageType=2&pageData='
! . urlencode ($printUrl);
! $story_options[] = '<a href="' . $pdfUrl . '">' . $LANG11[5]
! . '</a>';
! $story_template->set_var ('pdf_story_url', $printUrl);
! $story_template->set_var ('lang_pdf_story', $LANG11[5]);
! }
! $related = STORY_whatsRelated ($A['related'], $A['uid'], $A['tid']);
! if (!empty ($related)) {
! $related = COM_startBlock ($LANG11[1], '',
! COM_getBlockTemplate ('whats_related_block', 'header'))
! . $related
! . COM_endBlock (COM_getBlockTemplate ('whats_related_block',
! 'footer'));
! }
! if (count ($story_options) > 0) {
! $optionsblock = COM_startBlock ($LANG11[4], '',
! COM_getBlockTemplate ('story_options_block', 'header'))
! . COM_makeList ($story_options, 'list-story-options')
! . COM_endBlock (COM_getBlockTemplate ('story_options_block',
! 'footer'));
! } else {
! $optionsblock = '';
! }
! $story_template->set_var ('whats_related', $related);
! $story_template->set_var ('story_options', $optionsblock);
! $story_template->set_var ('whats_related_story_options',
! $related . $optionsblock);
! // if (DB_count($_TABLES['pollquestions'],'qid',$story) > 0) {
! // $display .= COM_showPoll(80,$story);
! // }
! $story_template->set_var ('formatted_article',
! STORY_renderArticle ($A, 'n'));
! // Display the comments, if there are any ..
! if ($A['commentcode'] >= 0) {
! $delete_option = (SEC_hasRights('story.edit') && ($access == 3)
! ? true : false);
! require_once ( $_CONF['path_system'] . 'lib-comment.php' );
! $story_template->set_var ('commentbar',
! CMT_userComments ($story, $A['title'], 'article',
! $order, $mode, 0, $page, false, $delete_option));
! }
! if ($_CONF['trackback_enabled']) {
! if (SEC_inGroup ('Root')) {
! $url = $_CONF['site_admin_url']
! . '/trackback.php?mode=new&id=' . $A['sid'];
! $story_template->set_var ('send_trackback_link', '<a href="'
! . $url . '">' . $LANG_TRB['send_trackback'] . '</a>');
! $story_template->set_var ('send_trackback_url', $url);
! $story_template->set_var ('lang_send_trackback_text',
! $LANG_TRB['send_trackback']);
}
! $permalink = COM_buildUrl ($_CONF['site_url']
! . '/article.php?story=' . $story);
! $story_template->set_var ('trackback',
! TRB_renderTrackbackComments ($story, 'article',
! $A['title'], $permalink));
! } else {
! $story_template->set_var ('trackback', '');
}
+ $display .= $story_template->finish ($story_template->parse ('output', 'article'));
+ $display .= COM_siteFooter ();
}
} else {
$display .= COM_refresh($_CONF['site_url'] . '/index.php');
}
+
echo $display;
More information about the geeklog-cvs
mailing list