[geeklog-cvs] geeklog-1.3/public_html comment.php,1.74,1.75 lib-common.php,1.370,1.371

[tony at iowaoutdoors.org]

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

Modified Files:
	comment.php lib-common.php 
Log Message:
Spamx is officially part of Geeklog.  All should work fine minus the upgrade file...I'm still missing some key data that I will add yet this weekend


Index: comment.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/comment.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** comment.php	23 Aug 2004 12:38:50 -0000	1.74
--- comment.php	3 Sep 2004 19:59:56 -0000	1.75
***************
*** 241,244 ****
--- 241,246 ----
  * @param        string      $type       Type of comment this is (article, poll, etc)
  * @param        string      $postmode   Indicates if text is HTML or plain text
+ * @param		string		$prepocessed Indicates that preprocessing by another plugin
+ *                                        i.e. Spamx has already occured
  * @return       string      either nothing or HTML formated error
  *
***************
*** 247,251 ****
  {
      global $_CONF, $_TABLES, $_USER, $LANG03, $HTTP_SERVER_VARS;
! 
      $retval = '';
  
--- 249,253 ----
  {
      global $_CONF, $_TABLES, $_USER, $LANG03, $HTTP_SERVER_VARS;
!     
      $retval = '';
  
***************
*** 276,279 ****
--- 278,289 ----
      }
  
+     // Let plugins have a chance to decide what to do before saving the comment.
+     $someError = PLG_commentPreSave($uid, $title, $comment, $sid, $pid, $type, $postmode);
+     
+     // If a plugin returned an error, return it
+     if ($someError) {
+     	return $someError;
+     }
+     
      $commentcode = 0;
      if ($type == 'article') {

Index: lib-common.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.370
retrieving revision 1.371
diff -C2 -d -r1.370 -r1.371
*** lib-common.php	29 Aug 2004 03:44:03 -0000	1.370
--- lib-common.php	3 Sep 2004 19:59:56 -0000	1.371
***************
*** 68,72 ****
  */
  
! require_once( '/path/to/geeklog/config.php' );
  
  
--- 68,72 ----
  */
  
! require_once( '/srv/www/htdocs/geeklog-1.3/config.php' );