[mxbb-commits] mx_phpCA/ads_mod ads_emailer.php, NONE, 1.1 ads_common.php, 1.1, 1.2 ads_constants.php, 1.1, 1.2 ads_functions.php, 1.2, 1.3 ads_integration.php, 1.1, 1.2 ads_renewal_mailer.php, 1.2, 1.3

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_phpCA/ads_mod
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21483/mx_phpCA/ads_mod

Modified Files:
	ads_common.php ads_constants.php ads_functions.php 
	ads_integration.php ads_renewal_mailer.php 
Added Files:
	ads_emailer.php 
Log Message:
cvs commit test

Index: ads_common.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpCA/ads_mod/ads_common.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ads_common.php	6 Jun 2007 22:24:31 -0000	1.1
--- ads_common.php	28 Feb 2008 06:26:20 -0000	1.2
***************
*** 1,3 ****
! <?
  /***************************************************************************
   *                              ads_common.php
--- 1,3 ----
! <?php
  /***************************************************************************
   *                              ads_common.php
***************
*** 79,83 ****
  if ( !$result = $db->sql_query($sql) )
  {
! 	message_die(GENERAL_ERROR, "Could not query ads config information", "", __LINE__, __FILE__, $sql);
  }
  
--- 79,83 ----
  if ( !$result = $db->sql_query($sql) )
  {
! 	mx_message_die(GENERAL_ERROR, "Could not query ads config information", "", __LINE__, __FILE__, $sql);
  }
  
***************
*** 95,99 ****
  if ( !$ads_config['version'] == '0.5.5' )
  {
! 	message_die(GENERAL_ERROR, "Script and data out of sync. Please run dbupgrade.php", "", __LINE__, __FILE__);
  }
  
--- 95,99 ----
  if ( !$ads_config['version'] == '0.5.5' )
  {
! 	mx_message_die(GENERAL_ERROR, "Script and data out of sync. Please run dbupgrade.php", "", __LINE__, __FILE__);
  }
  
***************
*** 108,112 ****
  	if ( !$result = $db->sql_query($sql) )
  	{
! 		message_die(GENERAL_ERROR, "Could not query paid ads config information", "", __LINE__, __FILE__, $sql);
  	}
  
--- 108,112 ----
  	if ( !$result = $db->sql_query($sql) )
  	{
! 		mx_message_die(GENERAL_ERROR, "Could not query paid ads config information", "", __LINE__, __FILE__, $sql);
  	}
  

Index: ads_renewal_mailer.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpCA/ads_mod/ads_renewal_mailer.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ads_renewal_mailer.php	28 Jan 2008 21:58:51 -0000	1.2
--- ads_renewal_mailer.php	28 Feb 2008 06:26:21 -0000	1.3
***************
*** 1,3 ****
! <?
  /***************************************************************************
   *                          ads_renewal_mailer.php
--- 1,3 ----
! <?php
  /***************************************************************************
   *                          ads_renewal_mailer.php
***************
*** 23,27 ****
  
  $file = fopen($filename, 'w');
! if ( !$file )
  {
  	message_die(GENERAL_ERROR, 'Error creating chaser log file');
--- 23,27 ----
  
  $file = fopen($filename, 'w');
! if ( !$file ) 
  {
  	message_die(GENERAL_ERROR, 'Error creating chaser log file');
***************
*** 29,34 ****
  
  // Get all active ads
! $sql = "SELECT *
! 		FROM ". ADS_ADVERTS_TABLE ."
  		WHERE status = 'active'
  		AND USER_ID <>	 ". ADS_GUEST;
--- 29,34 ----
  
  // Get all active ads
! $sql = "SELECT * 
! 		FROM ". ADS_ADVERTS_TABLE ." 
  		WHERE status = 'active'
  		AND USER_ID <>	 ". ADS_GUEST;
***************
*** 41,45 ****
  	srand((double) microtime() * 1000000);
  
! 	while ($row = $db->sql_fetchrow($result))
  	{
  		$id = $row['id'];
--- 41,45 ----
  	srand((double) microtime() * 1000000);
  
! 	while ($row = $db->sql_fetchrow($result)) 
  	{
  		$id = $row['id'];
***************
*** 49,53 ****
  		$status = $row['status'];
  
! 		$sql = "SELECT *
  				FROM ". ADS_CHASERS_TABLE ."
  				WHERE id = '$id'";
--- 49,53 ----
  		$status = $row['status'];
  
! 		$sql = "SELECT * 
  				FROM ". ADS_CHASERS_TABLE ."
  				WHERE id = '$id'";
***************
*** 62,67 ****
  			{
  				// Get recipients details from phpBB
! 				$profiledata = mx_get_userdata($username,'true');
! 				$recip_email = $profiledata['user_email'];
  
  				// Renewal passwords only for free ads!
--- 62,67 ----
  			{
  				// Get recipients details from phpBB
! 				$profiledata = get_userdata($username,'true'); 
! 				$recip_email = $profiledata['user_email']; 
  
  				// Renewal passwords only for free ads!
***************
*** 105,114 ****
  		{
  			// Is second chase due?
! 			if ( $row2['last_chase_type'] == '1'
  			and time() >= ($expiry_date - ($ads_config['second_chase_days']*60*60*24)) )
  			{
  				// Get recipients details from phpBB
! 				$profiledata = mx_get_userdata($username,'true');
! 				$recip_email = $profiledata['user_email'];
  
  				// Renewal passwords only for free ads!
--- 105,114 ----
  		{
  			// Is second chase due?
! 			if ( $row2['last_chase_type'] == '1' 
  			and time() >= ($expiry_date - ($ads_config['second_chase_days']*60*60*24)) )
  			{
  				// Get recipients details from phpBB
! 				$profiledata = get_userdata($username,'true'); 
! 				$recip_email = $profiledata['user_email']; 
  
  				// Renewal passwords only for free ads!
***************
*** 137,141 ****
  
  				$sql = "UPDATE ". ADS_CHASERS_TABLE ."
! 						SET last_chase_type = '$last_chase_type'
  						WHERE id = $id";
  
--- 137,141 ----
  
  				$sql = "UPDATE ". ADS_CHASERS_TABLE ."
! 						SET last_chase_type = '$last_chase_type' 
  						WHERE id = $id";
  
***************
*** 149,159 ****
  				fwrite ($file, $record);
  			}
! 
  			// Is final chase due?
  			if ( $row2['last_chase_type'] == '2' and time() >= $expiry_date )
  			{
  				// Get recipients details from phpBB
! 				$profiledata = mx_get_userdata($username,'true');
! 				$recip_email = $profiledata['user_email'];
  
  				// Renewal passwords only for free ads!
--- 149,159 ----
  				fwrite ($file, $record);
  			}
! 		
  			// Is final chase due?
  			if ( $row2['last_chase_type'] == '2' and time() >= $expiry_date )
  			{
  				// Get recipients details from phpBB
! 				$profiledata = get_userdata($username,'true'); 
! 				$recip_email = $profiledata['user_email']; 
  
  				// Renewal passwords only for free ads!
***************
*** 182,186 ****
  
  				$sql = "UPDATE ". ADS_CHASERS_TABLE ."
! 						SET last_chase_type = '$last_chase_type'
  						WHERE id = $id";
  
--- 182,186 ----
  
  				$sql = "UPDATE ". ADS_CHASERS_TABLE ."
! 						SET last_chase_type = '$last_chase_type' 
  						WHERE id = $id";
  
***************
*** 198,202 ****
  
  				$sql = "UPDATE ". ADS_ADVERTS_TABLE ."
! 						SET status = '$status'
  						WHERE id = $id";
  
--- 198,202 ----
  
  				$sql = "UPDATE ". ADS_ADVERTS_TABLE ."
! 						SET status = '$status' 
  						WHERE id = $id";
  
***************
*** 207,211 ****
  
  				// Delete the images
! 				$sql = "SELECT *
  						FROM ". ADS_IMAGES_TABLE ."
  						WHERE id = $id
--- 207,211 ----
  
  				// Delete the images
! 				$sql = "SELECT * 
  						FROM ". ADS_IMAGES_TABLE ."
  						WHERE id = $id
***************
*** 214,218 ****
  				$result = $db->sql_query($sql);
  
! 				while ($row = $db->sql_fetchrow($result))
  				{
  					$img_seq_no = $row['img_seq_no'];
--- 214,218 ----
  				$result = $db->sql_query($sql);
  
! 				while ($row = $db->sql_fetchrow($result)) 
  				{
  					$img_seq_no = $row['img_seq_no'];
***************
*** 220,224 ****
  					$sql2 = "UPDATE ". ADS_IMAGES_TABLE ."
  							SET img_deleted_ind = 1
! 							WHERE id = '$id'
  							AND img_seq_no = '$img_seq_no'";
  
--- 220,224 ----
  					$sql2 = "UPDATE ". ADS_IMAGES_TABLE ."
  							SET img_deleted_ind = 1
! 							WHERE id = '$id' 
  							AND img_seq_no = '$img_seq_no'";
  
***************
*** 245,248 ****
  fwrite ($file, $record);
  
! fclose ($file);
  ?>
\ No newline at end of file
--- 245,248 ----
  fwrite ($file, $record);
  
! fclose ($file); 
  ?>
\ No newline at end of file

Index: ads_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpCA/ads_mod/ads_constants.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ads_constants.php	6 Jun 2007 22:24:31 -0000	1.1
--- ads_constants.php	28 Feb 2008 06:26:20 -0000	1.2
***************
*** 1,3 ****
! <?
  /***************************************************************************
   *                             ads_constants.php
--- 1,3 ----
! <?php
  /***************************************************************************
   *                             ads_constants.php
***************
*** 26,54 ****
  
  // User Levels for Ads system <- do NOT change these values
! define('ADS_ANONYMOUS', -1);
! define('ADS_GUEST', -1);
  
! define('ADS_USER', 0);
! define('ADS_ADMIN', 1);
! define('ADS_MOD', 2);
! define('ADS_PRIVATE', 3);
  
  // Path (trailing slash required)
! define('ADS_IMAGES_PATH', $module_root_path . 'upload/images/');
  // define('ADS_CHASERS_PATH', $module_root_path . 'upload/chasers/');
! define('ADS_CHASERS_PATH', $module_root_path . 'upload/chasers/');
! define('ADS_PAYMENTS_PATH', $module_root_path . 'upload/payments/');
  
  // Table names
! !defined('ADS_ADVERTS_TABLE') ? define('ADS_ADVERTS_TABLE', $mx_table_prefix.'ads_adverts') : false;
! !defined('ADS_CATEGORIES_TABLE') ? define('ADS_CATEGORIES_TABLE', $mx_table_prefix.'ads_categories') : false;
! !defined('ADS_CHASERS_TABLE') ? define('ADS_CHASERS_TABLE', $mx_table_prefix.'ads_chasers') : false;
! !defined('ADS_COMMENTS_TABLE') ? define('ADS_COMMENTS_TABLE', $mx_table_prefix.'ads_comments') : false;
! !defined('ADS_CONFIG_TABLE') ? define('ADS_CONFIG_TABLE', $mx_table_prefix.'ads_config') : false;
! !defined('ADS_DETAILS_TABLE') ? define('ADS_DETAILS_TABLE', $mx_table_prefix.'ads_details') : false;
! !defined('ADS_IMAGES_TABLE') ? define('ADS_IMAGES_TABLE', $mx_table_prefix.'ads_images') : false;
! !defined('ADS_PAID_ADS_CONFIG_TABLE') ? define('ADS_PAID_ADS_CONFIG_TABLE', $mx_table_prefix.'ads_paid_ads_config') : false;
! !defined('ADS_PAYPAL_PAYMENTS') ? define('ADS_PAYPAL_PAYMENTS', $mx_table_prefix.'ads_paypal_payments') : false;
! !defined('ADS_RATE_TABLE') ? define('ADS_RATE_TABLE', $mx_table_prefix.'ads_rate') : false;
! !defined('ADS_USERS_TABLE') ? define('ADS_USERS_TABLE', $mx_table_prefix.'ads_users') : false;
  ?>
\ No newline at end of file
--- 26,54 ----
  
  // User Levels for Ads system <- do NOT change these values
! @define('ADS_ANONYMOUS', -1);
! @define('ADS_GUEST', -1);
  
! @define('ADS_USER', 0);
! @define('ADS_ADMIN', 1);
! @define('ADS_MOD', 2);
! @define('ADS_PRIVATE', 3);
  
  // Path (trailing slash required)
! @define('ADS_IMAGES_PATH', $module_root_path . 'upload/images/');
  // define('ADS_CHASERS_PATH', $module_root_path . 'upload/chasers/');
! @define('ADS_CHASERS_PATH', $module_root_path . 'upload/chasers/');
! @define('ADS_PAYMENTS_PATH', $module_root_path . 'upload/payments/');
  
  // Table names
! @define('ADS_ADVERTS_TABLE', $mx_table_prefix.'ads_adverts');
! @define('ADS_CATEGORIES_TABLE', $mx_table_prefix.'ads_categories');
! @define('ADS_CHASERS_TABLE', $mx_table_prefix.'ads_chasers');
! @define('ADS_COMMENTS_TABLE', $mx_table_prefix.'ads_comments');
! @define('ADS_CONFIG_TABLE', $mx_table_prefix.'ads_config');
! @define('ADS_DETAILS_TABLE', $mx_table_prefix.'ads_details');
! @define('ADS_IMAGES_TABLE', $mx_table_prefix.'ads_images');
! @define('ADS_PAID_ADS_CONFIG_TABLE', $mx_table_prefix.'ads_paid_ads_config');
! @define('ADS_PAYPAL_PAYMENTS', $mx_table_prefix.'ads_paypal_payments');
! @define('ADS_RATE_TABLE', $mx_table_prefix.'ads_rate');
! @define('ADS_USERS_TABLE', $mx_table_prefix.'ads_users');
  ?>
\ No newline at end of file


--- NEW FILE: ads_emailer.php ---
<?php
/***************************************************************************
                                ads_emailer.php
                             -------------------
    begin                : Sunday Aug. 12, 2001
    copyright            : (C) 2001 The phpBB Group
    email                : su...@ph...

    $Id: ads_emailer.php,v 1.1 2008/02/28 06:26:21 orynider Exp $

***************************************************************************/

/***************************************************************************
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 ***************************************************************************/

//
// The emailer class has support for attaching files, that isn't implemented
// in the 2.0 release but we can probable find some way of using it in a future
// release
//
class emailer
{
	var $msg, $subject, $extra_headers;
	var $addresses, $reply_to, $from;
	var $use_smtp;

	var $tpl_msg = array();

	function emailer($use_smtp)
	{
		$this->reset();
		$this->use_smtp = $use_smtp;
		$this->reply_to = $this->from = '';
	}

	// Resets all the data (address, template file, etc etc to default
	function reset()
	{
		$this->addresses = array();
		$this->vars = $this->msg = $this->extra_headers = '';
	}

	// Sets an email address to send to
	function email_address($address)
	{
		$this->addresses['to'] = trim($address);
	}

	function cc($address)
	{
		$this->addresses['cc'][] = trim($address);
	}

	function bcc($address)
	{
		$this->addresses['bcc'][] = trim($address);
	}

	function replyto($address)
	{
		$this->reply_to = trim($address);
	}

	function from($address)
	{
		$this->from = trim($address);
	}

	// set up subject for mail
	function set_subject($subject = '')
	{
		$this->subject = trim(preg_replace('#[\n\r]+#s', '', $subject));
	}

	// set up extra mail headers
	function extra_headers($headers)
	{
		$this->extra_headers .= trim($headers) . "\n";
	}

	function use_template($template_file, $template_lang = '')
	{
		global $board_config, $phpbb_root_path, $module_root_path, $mx_root_path;

		if (trim($template_file) == '')
		{
			mx_message_die(GENERAL_ERROR, 'No template file set', '', __LINE__, __FILE__);
		}

		if (trim($template_lang) == '')
		{
			$template_lang = $board_config['default_lang'];
		}

		if (empty($this->tpl_msg[$template_lang . $template_file]))
		{
			$tpl_file = $module_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.tpl';

			if (!@file_exists(@phpbb_realpath($tpl_file)))
			{
				$tpl_file = $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/email/' . $template_file . '.tpl';

				if (!@file_exists(@phpbb_realpath($tpl_file)))
				{
					mx_message_die(GENERAL_ERROR, 'Could not find email template file :: ' . $template_file . ' @:' . $tpl_file, '', __LINE__, __FILE__);
				}
			}

			if (!($fd = @fopen($tpl_file, 'r')))
			{
				mx_message_die(GENERAL_ERROR, 'Failed opening template file :: ' . $template_file . ' @:' . $tpl_file, '', __LINE__, __FILE__);
			}

			$this->tpl_msg[$template_lang . $template_file] = fread($fd, filesize($tpl_file));
			fclose($fd);
		}

		$this->msg = $this->tpl_msg[$template_lang . $template_file];

		return true;
	}

	// assign variables
	function assign_vars($vars)
	{
		$this->vars = (empty($this->vars)) ? $vars : $this->vars . $vars;
	}

	// Send the mail out to the recipients set previously in var $this->address
	function send()
	{
		global $board_config, $lang, $phpEx, $phpbb_root_path, $db;

 		// Added by Email Disable MOD
 		if (!$board_config['email_enabled'])
 		{
 			mx_message_die(GENERAL_ERROR, $lang['Email_disabled']);
 		}
 		// Finish Email Disable MOD

    	// Escape all quotes, else the eval will fail.
		$this->msg = str_replace ("'", "\'", $this->msg);
		$this->msg = preg_replace('#\{([a-z0-9\-_]*?)\}#is', "' . $\\1 . '", $this->msg);

		// Set vars
		reset ($this->vars);
		while (list($key, $val) = each($this->vars)) 
		{
			$$key = $val;
		}

		eval("\$this->msg = '$this->msg';");

		// Clear vars
		reset ($this->vars);
		while (list($key, $val) = each($this->vars)) 
		{
			unset($$key);
		}

		// We now try and pull a subject from the email body ... if it exists,
		// do this here because the subject may contain a variable
		$drop_header = '';
		$match = array();
		if (preg_match('#^(Subject:(.*?))$#m', $this->msg, $match))
		{
			$this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : 'No Subject');
			$drop_header .= '[\r\n]*?' . preg_quote($match[1], '#');
		}
		else
		{
			$this->subject = (($this->subject != '') ? $this->subject : 'No Subject');
		}

		if (preg_match('#^(Charset:(.*?))$#m', $this->msg, $match))
		{
			$this->encoding = (trim($match[2]) != '') ? trim($match[2]) : trim($lang['ENCODING']);
			$drop_header .= '[\r\n]*?' . preg_quote($match[1], '#');
		}
		else
		{
			$this->encoding = trim($lang['ENCODING']);
		}

		if ($drop_header != '')
		{
			$this->msg = trim(preg_replace('#' . $drop_header . '#s', '', $this->msg));
		}

		$to = $this->addresses['to'];

		$cc = (count($this->addresses['cc'])) ? implode(', ', $this->addresses['cc']) : '';
		$bcc = (count($this->addresses['bcc'])) ? implode(', ', $this->addresses['bcc']) : '';

		// Build header
		$this->extra_headers = (($this->reply_to != '') ? "Reply-to: $this->reply_to\n" : '') . (($this->from != '') ? "From: $this->from\n" : "From: " . $board_config['board_email'] . "\n") . "Return-Path: " . $board_config['board_email'] . "\nMessage-ID: <" . md5(uniqid(time())) . "@" . $board_config['server_name'] . ">\nMIME-Version: 1.0\nContent-type: text/plain; charset=" . $this->encoding . "\nContent-transfer-encoding: 8bit\nDate: " . date('r', time()) . "\nX-Priority: 3\nX-MSMail-Priority: Normal\nX-Mailer: PHP\nX-MimeOLE: Produced By phpBB2\n" . $this->extra_headers . (($cc != '') ? "Cc: $cc\n" : '')  . (($bcc != '') ? "Bcc: $bcc\n" : ''); 

		// Send message ... removed $this->encode() from subject for time being
		if ( $this->use_smtp )
		{
			if ( !defined('SMTP_INCLUDED') ) 
			{
				include($phpbb_root_path . 'includes/smtp.' . $phpEx);
			}

			$result = smtpmail($to, $this->subject, $this->msg, $this->extra_headers);
		}
		else
		{
			$empty_to_header = ($to == '') ? TRUE : FALSE;
			$to = ($to == '') ? (($board_config['sendmail_fix']) ? ' ' : 'Undisclosed-recipients:;') : $to;
	
			$result = @mail($to, $this->subject, preg_replace("#(?<!\r)\n#s", "\n", $this->msg), $this->extra_headers);
			
			if (!$result && !$board_config['sendmail_fix'] && $empty_to_header)
			{
				$to = ' ';

				$sql = "UPDATE " . CONFIG_TABLE . " 
					SET config_value = '1'
					WHERE config_name = 'sendmail_fix'";
				if (!$db->sql_query($sql))
				{
					mx_message_die(GENERAL_ERROR, 'Unable to update config table', '', __LINE__, __FILE__, $sql);
				}

				$board_config['sendmail_fix'] = 1;
				$result = mail($to, $this->subject, preg_replace("#(?<!\r)\n#s", "\n", $this->msg), $this->extra_headers);
			}
		}

		// Did it work?
		if (!$result)
		{
			mx_message_die(GENERAL_ERROR, 'Failed sending email, mail() disabled? :: ' . (($this->use_smtp) ? 'SMTP' : 'PHP') . ' :: ' . $result, '', __LINE__ , __FILE__);
		}

		return true;
	}

	// Encodes the given string for proper display for this encoding ... nabbed 
	// from php.net and modified. There is an alternative encoding method which 
	// may produce lesd output but it's questionable as to its worth in this 
	// scenario IMO
	function encode($str)
	{
		if ($this->encoding == '')
		{
			return $str;
		}

		// define start delimimter, end delimiter and spacer
		$end = "?=";
		$start = "=?$this->encoding?B?";
		$spacer = "$end\r\n $start";

		// determine length of encoded text within chunks and ensure length is even
		$length = 75 - strlen($start) - strlen($end);
		$length = floor($length / 2) * 2;

		// encode the string and split it into chunks with spacers after each chunk
		$str = chunk_split(base64_encode($str), $length, $spacer);

		// remove trailing spacer and add start and end delimiters
		$str = preg_replace('#' . preg_quote($spacer, '#') . '$#', '', $str);

		return $start . $str . $end;
	}

	//
	// Attach files via MIME.
	//
	function attachFile($filename, $mimetype = "application/octet-stream", $szFromAddress, $szFilenameToDisplay)
	{
		global $lang;
		$mime_boundary = "--==================_846811060==_";

		$this->msg = '--' . $mime_boundary . "\nContent-Type: text/plain;\n\tcharset=\"" . $lang['ENCODING'] . "\"\n\n" . $this->msg;

		if ($mime_filename)
		{
			$filename = $mime_filename;
			$encoded = $this->encode_file($filename);
		}

		$fd = fopen($filename, "r");
		$contents = fread($fd, filesize($filename));

		$this->mimeOut = "--" . $mime_boundary . "\n";
		$this->mimeOut .= "Content-Type: " . $mimetype . ";\n\tname=\"$szFilenameToDisplay\"\n";
		$this->mimeOut .= "Content-Transfer-Encoding: quoted-printable\n";
		$this->mimeOut .= "Content-Disposition: attachment;\n\tfilename=\"$szFilenameToDisplay\"\n\n";

		if ( $mimetype == "message/rfc822" )
		{
			$this->mimeOut .= "From: ".$szFromAddress."\n";
			$this->mimeOut .= "To: ".$this->emailAddress."\n";
			$this->mimeOut .= "Date: ".date("D, d M Y H:i:s") . " UT\n";
			$this->mimeOut .= "Reply-To:".$szFromAddress."\n";
			$this->mimeOut .= "Subject: ".$this->mailSubject."\n";
			$this->mimeOut .= "X-Mailer: PHP/".phpversion()."\n";
			$this->mimeOut .= "MIME-Version: 1.0\n";
		}

		$this->mimeOut .= $contents."\n";
		$this->mimeOut .= "--" . $mime_boundary . "--" . "\n";

		return $out;
		// added -- to notify email client attachment is done
	}

	function getMimeHeaders($filename, $mime_filename="")
	{
		$mime_boundary = "--==================_846811060==_";

		if ($mime_filename)
		{
			$filename = $mime_filename;
		}

		$out = "MIME-Version: 1.0\n";
		$out .= "Content-Type: multipart/mixed;\n\tboundary=\"$mime_boundary\"\n\n";
		$out .= "This message is in MIME format. Since your mail reader does not understand\n";
		$out .= "this format, some or all of this message may not be legible.";

		return $out;
	}

	//
   // Split string by RFC 2045 semantics (76 chars per line, end with \r\n).
	//
	function myChunkSplit($str)
	{
		$stmp = $str;
		$len = strlen($stmp);
		$out = "";

		while ($len > 0)
		{
			if ($len >= 76)
			{
				$out .= substr($stmp, 0, 76) . "\r\n";
				$stmp = substr($stmp, 76);
				$len = $len - 76;
			}
			else
			{
				$out .= $stmp . "\r\n";
				$stmp = "";
				$len = 0;
			}
		}
		return $out;
	}

	//
   // Split the specified file up into a string and return it
	//
	function encode_file($sourcefile)
	{
		if (is_readable(phpbb_realpath($sourcefile)))
		{
			$fd = fopen($sourcefile, "r");
			$contents = fread($fd, filesize($sourcefile));
	      $encoded = $this->myChunkSplit(base64_encode($contents));
	      fclose($fd);
		}

		return $encoded;
	}

} // class emailer

?>
Index: ads_functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpCA/ads_mod/ads_functions.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ads_functions.php	28 Jan 2008 21:58:51 -0000	1.2
--- ads_functions.php	28 Feb 2008 06:26:20 -0000	1.3
***************
*** 1,3 ****
! <?
  /***************************************************************************
   *                             ads_functions.php
--- 1,3 ----
! <?php
  /***************************************************************************
   *                             ads_functions.php
***************
*** 27,31 ****
  	global $userdata, $phpEx;
  
! 	if ( $view_level == ADS_GUEST )
  	{
  		$view_allowed = TRUE;
--- 27,31 ----
  	global $userdata, $phpEx;
  
! 	if ( $view_level == ADS_GUEST ) 
  	{
  		$view_allowed = TRUE;
***************
*** 57,92 ****
  }
  
! // =========================
! // Move allowed
! // =========================
! function move_allowed($user_id, $ads_move_level)
! {
! 	global $userdata, $phpEx;
  
! 	if ( ( $ads_move_level == ADS_USER and $userdata['user_id'] == $user_id and $userdata['session_logged_in'] )
! 	or   ( $ads_move_level == ADS_USER and $userdata['user_level'] == MOD ) )
! 	{
! 		$move_allowed = TRUE;
! 	}
  
! 	if ( $ads_move_level == ADS_MOD and $userdata['user_level'] == MOD )
! 	{
! 		$move_allowed = TRUE;
! 	}
  
! 	if ($userdata['user_level'] == ADMIN )
! 	{
! 		$move_allowed = TRUE;
! 	}
  
! 	if ( $move_allowed == TRUE)
! 	{
! 		return TRUE;
! 	}
! 	else
! 	{
! 		return FALSE;
! 	}
! }
  
  // =========================
--- 57,92 ----
  }
  
! // ========================= 
! // Move allowed 
! // ========================= 
! function move_allowed($user_id, $ads_move_level) 
! { 
! 	global $userdata, $phpEx; 
  
! 	if ( ( $ads_move_level == ADS_USER and $userdata['user_id'] == $user_id and $userdata['session_logged_in'] ) 
! 	or   ( $ads_move_level == ADS_USER and $userdata['user_level'] == MOD ) ) 
! 	{ 
! 		$move_allowed = TRUE; 
! 	} 
  
! 	if ( $ads_move_level == ADS_MOD and $userdata['user_level'] == MOD ) 
! 	{ 
! 		$move_allowed = TRUE; 
! 	} 
  
! 	if ($userdata['user_level'] == ADMIN ) 
! 	{ 
! 		$move_allowed = TRUE; 
! 	} 
  
! 	if ( $move_allowed == TRUE) 
! 	{ 
! 		return TRUE; 
! 	} 
! 	else 
! 	{ 
! 		return FALSE; 
! 	} 
! } 
  
  // =========================
***************
*** 97,101 ****
  	global $userdata, $phpEx;
  
! 	if ( $search_level == ADS_GUEST )
  	{
  		$search_allowed = TRUE;
--- 97,101 ----
  	global $userdata, $phpEx;
  
! 	if ( $search_level == ADS_GUEST ) 
  	{
  		$search_allowed = TRUE;
***************
*** 134,138 ****
  	global $userdata, $phpEx;
  
! 	if ( $cat_create_level == ADS_GUEST )
  	{
  		$create_allowed = TRUE;
--- 134,138 ----
  	global $userdata, $phpEx;
  
! 	if ( $cat_create_level == ADS_GUEST ) 
  	{
  		$create_allowed = TRUE;
***************
*** 140,146 ****
  	else
  	{
! 		if ( !$userdata['session_logged_in'] )
  		{
! 			mx_redirect(append_sid("login.$phpEx?redirect=ads_create.$phpEx"));
  		}
  	}
--- 140,146 ----
  	else
  	{
! 		if ( !$userdata['session_logged_in'] ) 
  		{
! 			redirect(append_sid("login.$phpEx?redirect=ads_create.$phpEx"));
  		}
  	}
***************
*** 277,281 ****
  	global $userdata, $phpEx;
  
! 	if ( $cat_comment_level == ADS_GUEST )
  	{
  		$comment_allowed = TRUE;
--- 277,281 ----
  	global $userdata, $phpEx;
  
! 	if ( $cat_comment_level == ADS_GUEST ) 
  	{
  		$comment_allowed = TRUE;
***************
*** 315,319 ****
  	$height = imagesy($im);
  
! 	if (($resizewidth and $width > $resizewidth)
  	or ($resizeheight and $height > $resizeheight))
  	{
--- 315,319 ----
  	$height = imagesy($im);
  
! 	if (($resizewidth and $width > $resizewidth) 
  	or ($resizeheight and $height > $resizeheight))
  	{
***************
*** 360,364 ****
  			imagecopyresized($newim, $im, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
  		}
! 		touch($filename . ".jpg");
  		ImageJpeg ($newim,$filename . ".jpg");
  //		ImageDestroy ($newim);
--- 360,364 ----
  			imagecopyresized($newim, $im, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
  		}
! 		touch($filename . ".jpg"); 
  		ImageJpeg ($newim,$filename . ".jpg");
  //		ImageDestroy ($newim);
***************
*** 366,370 ****
  	else
  	{
! 		touch($filename . ".jpg");
  		ImageJpeg ($im,$filename . ".jpg");
  	}
--- 366,370 ----
  	else
  	{
! 		touch($filename . ".jpg"); 
  		ImageJpeg ($im,$filename . ".jpg");
  	}
***************
*** 374,378 ****
  // Image popups
  // =========================
! //function popup($medium_img_url, $large_img_url, $title, $width=false, $height=false)
  //{
  //	$title_urlencoded = rawurlencode($title);
--- 374,378 ----
  // Image popups
  // =========================
! //function popup($medium_img_url, $large_img_url, $title, $width=false, $height=false) 
  //{
  //	$title_urlencoded = rawurlencode($title);
***************
*** 400,404 ****
  srand((double)microtime()*1000000);
  
! for ($i = 0; $i < 30; $i++)
  {
  	$x1 = rand(0,120);
--- 400,404 ----
  srand((double)microtime()*1000000);
  
! for ($i = 0; $i < 30; $i++) 
  {
  	$x1 = rand(0,120);
***************
*** 406,413 ****
  	$x2 = rand(0,120);
  	$y2 = rand(0,30);
! 	imageline($image, $x1, $y1, $x2, $y2 , $gray);
  }
  
! for ($i = 0; $i < 5; $i++)
  {
  	$cnum[$i] = rand(0,9);
--- 406,413 ----
  	$x2 = rand(0,120);
  	$y2 = rand(0,30);
! 	imageline($image, $x1, $y1, $x2, $y2 , $gray);  
  }
  
! for ($i = 0; $i < 5; $i++) 
  {
  	$cnum[$i] = rand(0,9);
***************
*** 418,423 ****
  	$fnt = rand(5,8);
  	$x = $x + rand(12 , 20);
! 	$y = rand(7 , 12);
! 	imagestring($image, $fnt, $x, $y, $cnum[$i] , $darkgray);
  }
  
--- 418,423 ----
  	$fnt = rand(5,8);
  	$x = $x + rand(12 , 20);
! 	$y = rand(7 , 12); 
! 	imagestring($image, $fnt, $x, $y, $cnum[$i] , $darkgray); 
  }
  
***************
*** 429,433 ****
  //header('Content-type: image/png');
  $image = imagepng($image);
! imagedestroy($image);
  
  return $image;
--- 429,433 ----
  //header('Content-type: image/png');
  $image = imagepng($image);
! imagedestroy($image);  
  
  return $image;
***************
*** 439,446 ****
  function chaser_email($sender_email, $recip_email, $subject, $message)
  {
! 	global $board_config, $phpEx, $phpbb_root_path;
  	global $email_headers, $user_lang;
  
! include_once($phpbb_root_path . 'includes/emailer.'.$phpEx);
  
  // Left in for debugging
--- 439,446 ----
  function chaser_email($sender_email, $recip_email, $subject, $message)
  {
! 	global $board_config, $phpEx, $phpbb_root_path, $module_root_path;
  	global $email_headers, $user_lang;
  
! include_once($module_root_path . 'includes/ads_emailer.'.$phpEx);
  
  // Left in for debugging
***************
*** 455,467 ****
  $emailer->from($sender_email);
  $emailer->replyto($sender_email);
! 
  $emailer->use_template('admin_send_email', $user_lang);
  $emailer->email_address($recip_email);
  $emailer->set_subject($subject);
  $emailer->extra_headers($email_headers);
! 
  $emailer->assign_vars(array(
! 	'SITENAME' => $board_config['sitename'],
! 	'BOARD_EMAIL' => $board_config['board_email'],
  	'MESSAGE' => $message));
  
--- 455,467 ----
  $emailer->from($sender_email);
  $emailer->replyto($sender_email);
! 					
  $emailer->use_template('admin_send_email', $user_lang);
  $emailer->email_address($recip_email);
  $emailer->set_subject($subject);
  $emailer->extra_headers($email_headers);
! 					
  $emailer->assign_vars(array(
! 	'SITENAME' => $board_config['sitename'], 
! 	'BOARD_EMAIL' => $board_config['board_email'], 
  	'MESSAGE' => $message));
  
***************
*** 473,511 ****
  // Create a comma separated value file from an array
  // ==========================================================
! function create_csv_file($file, $data)
  {
  	//check for array
! 	if (is_array($data))
! 	{
! 		$post_values=array_values($data);
  
  		//build csv data
! 		foreach($post_values as $i)
  			{$csv.="\"$i\",";}
  
  		//remove the last comma from string
! 		$csv = substr($csv,0,-1);
  
  		//check for existence of file
! 		if (file_exists($file) and is_writeable($file))
! 			{$mode = "a";}
! 		else
  			{$mode="w";}
  
  		//create file pointer
  		$fp = @fopen($file,$mode);
! 
  		//write to file
! 		fwrite($fp,$csv . "\n");
  
  		//close file pointer
! 		fclose($fp);
  
! 		return true;
! 	}
  	else
! 	{
! 		return false;
! 	}
  }
  
--- 473,511 ----
  // Create a comma separated value file from an array
  // ==========================================================
! function create_csv_file($file, $data) 
  {
  	//check for array
! 	if (is_array($data)) 
! 	{ 
! 		$post_values=array_values($data); 
  
  		//build csv data
! 		foreach($post_values as $i) 
  			{$csv.="\"$i\",";}
  
  		//remove the last comma from string
! 		$csv = substr($csv,0,-1); 
  
  		//check for existence of file
! 		if (file_exists($file) and is_writeable($file)) 
! 			{$mode = "a";} 
! 		else 
  			{$mode="w";}
  
  		//create file pointer
  		$fp = @fopen($file,$mode);
!  
  		//write to file
! 		fwrite($fp,$csv . "\n"); 
  
  		//close file pointer
! 		fclose($fp); 
  
! 		return true; 
! 	} 
  	else
! 	{ 
! 		return false; 
! 	} 
  }
  
***************
*** 513,517 ****
  // Create a comma separated value file from an array
  // ==========================================================
! function create_error_file($file, $message)
  {
  	$open = fopen ($file, "a");
--- 513,517 ----
  // Create a comma separated value file from an array
  // ==========================================================
! function create_error_file($file, $message) 
  {
  	$open = fopen ($file, "a");
***************
*** 519,523 ****
  	{
  		fwrite ($open, $message."\r\n");
! 		fclose ($open);
  	}
  }
--- 519,523 ----
  	{
  		fwrite ($open, $message."\r\n");
! 		fclose ($open); 
  	}
  }
***************
*** 572,576 ****
  // htmlspecialchars_decode
  // ==========================================================
! function htmlspecialchars_decode_php4($str, $quote_style = ENT_COMPAT)
  {
  	if ( function_exists('htmlspecialchars_decode') )
--- 572,576 ----
  // htmlspecialchars_decode
  // ==========================================================
! function htmlspecialchars_decode_php4($str, $quote_style = ENT_COMPAT) 
  {
  	if ( function_exists('htmlspecialchars_decode') )