[Customisation Database Commits] r712 - /trunk/titania/includes/tools/subscriptions.php

[Sam Thompson]

Author: syntaxerror90
Date: Mon Mar  8 23:07:20 2010
New Revision: 712

Log:
General cleanup of unnecessary code

Modified:
    trunk/titania/includes/tools/subscriptions.php

Modified: trunk/titania/includes/tools/subscriptions.php
==============================================================================
*** trunk/titania/includes/tools/subscriptions.php (original)
--- trunk/titania/includes/tools/subscriptions.php Mon Mar  8 23:07:20 2010
***************
*** 52,76 ****
  			'watch_user_id'			=> (int) $user_id,
  			'watch_mark_time'		=> time(),
  		));
! 		
  		// Query and we're done
  		phpbb::$db->sql_query($sql);
  		
- 		$sql = 'SELECT contrib_name 
- 			FROM ' . TITANIA_CONTRIBS_TABLE . '
- 			WHERE contrib_id = ' . (int) $object_id;
- 		phpbb::$db->sql_query($sql);
- 		
- 		$messenger->template('subscribe_conf', 'en'); // Forcing English
- 		$messenger->to(phpbb::$user->data['user_email'], phpbb::$user->data['username']);
- 		
- 		$messenger->assign_vars(array(
- 			'SUBJECT'   	=> $row['contrib_name'],
- 			'USERNAME'		=> phpbb::$user->data['username'],
- 		));
- 		
- 		$messenger->send();		
- 		
  		return true;
  	}
  	
--- 52,61 ----
  			'watch_user_id'			=> (int) $user_id,
  			'watch_mark_time'		=> time(),
  		));
! 				
  		// Query and we're done
  		phpbb::$db->sql_query($sql);
  		
  		return true;
  	}
  	
***************
*** 114,129 ****
  			WHERE contrib_id = ' . (int) $object_id;
  		phpbb::$db->sql_query($sql);
  		
- 		$messenger->template('subscribe_remove', 'en'); // Forcing English
- 		$messenger->to(phpbb::$user->data['user_email'], phpbb::$user->data['username']);
- 		
- 		$messenger->assign_vars(array(
- 			'SUBJECT'   	=> $row['contrib_name'],
- 			'USERNAME'		=> phpbb::$user->data['username'],
- 		));
- 		
- 		$messenger->send();
- 		
  		return true;
  	}
  	
--- 99,104 ----
***************
*** 218,230 ****
  					}
  					
  					$messenger->template('subscribe_generic', 'en');
! 					$messenger->from('nobody at phpbb.com', 'Titania Mailer');
  					$messenger->to($data['user_email'], $data['username']);
  					
  					$messenger->assign_vars(array_merge($vars, array(
  						'SUBJECT'			=> $vars['SUBJECT'],
  						'MESSAGE'			=> $message,
! 				//		'EMAIL_SIG'			=> '',
  					)));
  					
  					$messenger->send();					
--- 193,205 ----
  					}
  					
  					$messenger->template('subscribe_generic', 'en');
! 					$messenger->from('nobody at phpbb.com', 'Titania Mailer'); // @TODO - Make this not hardcoded.
  					$messenger->to($data['user_email'], $data['username']);
  					
  					$messenger->assign_vars(array_merge($vars, array(
  						'SUBJECT'			=> $vars['SUBJECT'],
  						'MESSAGE'			=> $message,
! 				//		'EMAIL_SIG'			=> '', // @TODO - Email Sig
  					)));
  					
  					$messenger->send();