Added emailer class, did alterations and templates for registration

Welcome message vars can be removed from lang file


git-svn-id: file:///svn/phpbb/trunk@844 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/common.php

@@ -32,56 +32,56 @@ set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
 //
 if( !get_magic_quotes_gpc() )
 {
-	while( list($k, $v) = each($HTTP_GET_VARS) ) 
+	while( list($k, $v) = each($HTTP_GET_VARS) )
 	{
 		if( is_array($HTTP_GET_VARS[$k]) )
 		{
 			while( list($k2, $v2) = each($HTTP_GET_VARS[$k]) )
 			{
-				$HTTP_GET_VARS[$k][$k2] = addslashes($v2); 
+				$HTTP_GET_VARS[$k][$k2] = addslashes($v2);
 			}
 			@reset($HTTP_GET_VARS[$k]);
 		}
 		else
 		{
-			$HTTP_GET_VARS[$k] = addslashes($v); 
+			$HTTP_GET_VARS[$k] = addslashes($v);
 		}
 	}
-	@reset($HTTP_GET_VARS); 
+	@reset($HTTP_GET_VARS);
 
-	while( list($k, $v) = each($HTTP_POST_VARS) ) 
+	while( list($k, $v) = each($HTTP_POST_VARS) )
 	{
 		if( is_array($HTTP_POST_VARS[$k]) )
 		{
 			while( list($k2, $v2) = each($HTTP_POST_VARS[$k]) )
 			{
-				$HTTP_POST_VARS[$k][$k2] = addslashes($v2); 
+				$HTTP_POST_VARS[$k][$k2] = addslashes($v2);
 			}
 			@reset($HTTP_POST_VARS[$k]);
 		}
 		else
 		{
-			$HTTP_POST_VARS[$k] = addslashes($v); 
+			$HTTP_POST_VARS[$k] = addslashes($v);
 		}
 	}
-	@reset($HTTP_POST_VARS); 
+	@reset($HTTP_POST_VARS);
 
-	while( list($k, $v) = each($HTTP_COOKIE_VARS) ) 
+	while( list($k, $v) = each($HTTP_COOKIE_VARS) )
 	{
 		if( is_array($HTTP_COOKIE_VARS[$k]) )
 		{
 			while( list($k2, $v2) = each($HTTP_COOKIE_VARS[$k]) )
 			{
-				$HTTP_COOKIE_VARS[$k][$k2] = addslashes($v2); 
+				$HTTP_COOKIE_VARS[$k][$k2] = addslashes($v2);
 			}
 			@reset($HTTP_COOKIE_VARS[$k]);
 		}
 		else
 		{
-			$HTTP_COOKIE_VARS[$k] = addslashes($v); 
+			$HTTP_COOKIE_VARS[$k] = addslashes($v);
 		}
 	}
-	@reset($HTTP_COOKIE_VARS); 
+	@reset($HTTP_COOKIE_VARS);
 }
 
 //
@@ -107,13 +107,14 @@ include($phpbb_root_path . 'includes/sessions.'.$phpEx);
 include($phpbb_root_path . 'includes/auth.'.$phpEx);
 include($phpbb_root_path . 'includes/functions.'.$phpEx);
 include($phpbb_root_path . 'includes/db.'.$phpEx);
+include($phpbb_root_path . 'includes/emailer.'.$phpEx);
 
 //
 // Obtain and encode users IP
 //
 if(!empty($HTTP_CLIENT_IP))
 {
-	$client_ip = (ereg("[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+", $HTTP_CLIENT_IP)) ? $HTTP_CLIENT_IP : $REMOTE_ADDR; 
+	$client_ip = (ereg("[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+", $HTTP_CLIENT_IP)) ? $HTTP_CLIENT_IP : $REMOTE_ADDR;
 }
 else if(!empty($HTTP_X_FORWARDED_FOR))
 {
@@ -200,4 +201,9 @@ if($board_config['board_disable'] && !defined("IN_ADMIN"))
 	message_die(GENERAL_MESSAGE, $lang['Board_disable'], $lang['Information']);
 }
 
+//
+// Setup the emailer
+//
+$emailer = new emailer($board_config['smtp_delivery']);
+
 ?>

phpBB/includes/emailer.php

@@ -0,0 +1,296 @@
+<?php
+/***************************************************************************
+                          smtp.php  -  description
+                             -------------------
+    begin                : Sunday Aug. 12, 2001
+    copyright            : (C) 2001 The phpBB Group
+    email                : support@phpbb.com
+
+    $Id$
+
+***************************************************************************/
+
+/***************************************************************************
+ *
+ *   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 $tpl_file;
+	var $use_smtp;
+	var $msg;
+	var $mimeOut;
+	var $arrPlaceHolders = array();	// an associative array that has the key = placeHolderName and val = placeHolderValue.
+	var $subject, $extra_headers, $address;
+
+	function emailer($use_smtp)
+	{
+		$this->use_smtp = $use_smtp;
+		$this->tpl_file = NULL;
+		$this->sddress = NULL;
+ 		$this->msg = "";
+	   $this->mimeOut = "";
+	}
+
+	//
+	// Sets an email address to send to
+	//
+	function email_address($address)
+	{
+
+		$success = true;
+
+		$this->address = '';
+		$this->address .= $address;
+
+		return $success;
+	}
+
+	//
+	// set up subject for mail
+	//
+	function set_subject($subject)
+	{
+		$this->subject = $subject;
+	}
+
+	//
+	// set up extra mail headers
+	//
+	function extra_headers($headers)
+	{
+		$this->extra_headers = $headers;
+	}
+
+	function use_template($template_file)
+	{
+		global $board_config;
+
+		$phpbb_root_path = "./";
+		$template_file = $phpbb_root_path . "language/email/" . $template_file . "_" . $board_config['default_lang'] . ".tpl";
+		if (!file_exists($template_file))
+		{
+			message_die(GENERAL_ERROR, "Couldn't find template file: $template_file", "", __LINE__, __FILE__);
+		}
+		else
+		{
+			$this->tpl_file = $template_file;
+			//
+			// Load the email text into the $this->msg variable
+			//
+			if(!$this->load_msg())
+			{
+				message_die(GENERAL_ERROR, "Couldn't load template file: $template_file", "", __LINE__, __FILE__);
+			}
+		}
+
+		return TRUE;
+	}
+
+	//
+	// Open the template file and read in the message
+	//
+	function load_msg()
+	{
+		if ($this->tpl_file == NULL)
+		{
+			message_die(GENERAL_ERROR, "No template file set", "", __LINE__, __FILE__);
+		}
+		else
+		{
+			if(!($fd = fopen($this->tpl_file, 'r')))
+			{
+				message_die(GENERAL_ERROR, "fopen failed opening template file", "", __LINE__, __FILE__);
+			}
+			else
+			{
+				$this->msg .= fread($fd, filesize($this->tpl_file));
+				fclose($fd);
+			}
+		}
+		return TRUE;
+	}
+
+	function assign_vars($vars)
+	{
+		if(empty($this->vars))
+		{
+			$this->vars = $vars;
+		}
+		else
+		{
+			$this->vars .= $vars;
+		}
+	}
+
+	function parse_email()
+	{
+		@reset($this->vars);
+		while (list($key, $val) = @each($this->vars))
+		{
+			$$key = $val;
+		}
+
+		//$this->mailMsg = ereg_replace("<!!( )*([^>]*)( )*!!>", '$this->arrPlaceHolders['."\\2".']', $this->mailMsg);
+		// $this->msg = ereg_replace("{( )*([^>]*)( )*}", '$'."\\2", $this->msg);
+		$this->msg = preg_replace('#\{([a-z0-9\-_]*?)\}#is', '$'."\\1", $this->msg);
+
+    	// Escape all quotes, else the eval will fail.
+		$this->msg = str_replace ("\"", "\\\"", $this->msg);
+
+		eval("\$this->msg = \"$this->msg\";");
+
+		return TRUE;
+	}
+
+	//
+	// Send the mail out to the recipients set previously in var $this->address
+	//
+	function send()
+	{
+		global $phpEx;
+
+		$phpbb_root_path = "./";
+
+		if ($this->address == NULL)
+		{
+			message_die(GENERAL_ERROR, "No email address set", "", __LINE__, __FILE__);
+		}
+		else
+		{
+			if(!$this->parse_email())
+			{
+				return FALSE;
+			}
+			if($this->use_smtp)
+			{
+				include($phpbb_root_path . "includes/smtp.".$phpEx);
+				if(!smtpmail($this->address, $this->subject, $this->msg, $this->extra_headers))
+				{
+					message_die(GENERAL_ERROR, "Sending via SMTP failed", "", __LINE__, __FILE__);
+				}
+			}
+			else
+			{
+				@mail($this->address, $this->subject, $this->msg, $this->extra_headers);
+			}
+		}
+
+		return TRUE;
+	}
+
+
+	//
+   // Attach files via MIME.
+	//
+	function attachFile($filename, $mimetype="application/octet-stream", $szFromAddress, $szFilenameToDisplay)
+	{
+		$mime_boundary = "--==================_846811060==_";
+
+		$this->mailMsg = "--".$mime_boundary."\nContent-Type: text/plain;\n\tcharset=\"iso-8859-1\"\n\n".$this->mailMsg;
+
+		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 G:i:s ").$this->getTimeZoneInEmailFormat()."\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($sourcefile))
+		{
+			$fd = fopen($sourcefile, "r");
+			$contents = fread($fd, filesize($sourcefile));
+	      $encoded = $this->myChunkSplit(base64_encode($contents));
+	      fclose($fd);
+		}
+
+		return $encoded;
+	}
+
+} // class emailer
+
+?>

phpBB/language/email/welcome_english.tpl

@@ -0,0 +1,19 @@
+{WELCOME_MSG}
+
+Please keep this email for your records.
+
+Your account information is as follows:
+
+----------------------------
+Username: {USERNAME}
+Password: {PASSWORD}
+----------------------------
+
+Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you.
+However, should you forget your password you can request a new one which will be activated in the same way as this account.
+
+Thank you for registering.
+
+{EMAIL_SIG}
+
+

phpBB/language/email/welcome_inactive_english.tpl

@@ -0,0 +1,21 @@
+{WELCOME_MSG}
+
+Please keep this email for your records.
+
+Your account information is as follows:
+
+----------------------------
+Username: {USERNAME}
+Password: {PASSWORD}
+----------------------------
+
+Your account is currently inactive. You cannot use it until you visit the following link:
+
+{ACTIVATE_URL}
+
+Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you.
+However, should you forget your password you can request a new one which will be activated in the same way as this account.
+
+Thank you for registering.
+
+{EMAIL_SIG}

phpBB/language/lang_english.php

@@ -425,6 +425,7 @@ $lang['Avatar_imagesize'] = "The avatar must be less than " . $board_config['ava
 
 $lang['Account_added'] = "Thank you for registering, your account has been created. You may now login with your username and password";
 $lang['Account_inactive'] = "Your account has been created. However, this forum requires account activation, an activation key has been sent to the email address you provided. Pease check your email for further information";
+$lang['Account_active'] = "Your account has now been activated. Thank you for registering";
 
 $lang['Welcome_subject'] = "Welcome to " . $board_config['sitename'] . " Forums";
 

phpBB/profile.php

@@ -61,9 +61,9 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 
 		$jumpbox = make_jumpbox();
 		$template->assign_vars(array(
-			"L_GO" => $lang['Go'], 
+			"L_GO" => $lang['Go'],
-			"L_JUMP_TO" => $lang['Jump_to'], 
+			"L_JUMP_TO" => $lang['Jump_to'],
-			"L_SELECT_FORUM" => $lang['Select_forum'], 
+			"L_SELECT_FORUM" => $lang['Select_forum'],
 			"JUMPBOX_LIST" => $jumpbox,
 			"SELECT_NAME" => POST_FORUM_URL)
 		);
@@ -146,20 +146,20 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 			"POSTS" => $profiledata['user_posts'],
 			"PERCENTAGE" => $percentage . "%",
 			"EMAIL" => $email,
-			"EMAIL_IMG" => $email_img, 
+			"EMAIL_IMG" => $email_img,
-			"PM_IMG" => $pm_img, 
+			"PM_IMG" => $pm_img,
-			"UL_SEARCH" => $search, 
+			"UL_SEARCH" => $search,
-			"SEARCH_IMG" => $search_img, 
+			"SEARCH_IMG" => $search_img,
-			"ICQ_ADD_IMG" => $icq_add_img, 
+			"ICQ_ADD_IMG" => $icq_add_img,
 			"ICQ_STATUS_IMG" => $icq_status_img,
 			"AIM" => ( ($profiledata['user_aim']) ? stripslashes($profiledata['user_aim']) : " " ),
-			"AIM_IMG" => $aim_img, 
+			"AIM_IMG" => $aim_img,
 			"MSN" => ( ($profiledata['user_msnm']) ? stripslashes($profiledata['user_msnm']) : " " ),
-			"MSN_IMG" => $msnm_img, 
+			"MSN_IMG" => $msnm_img,
 			"YIM" => ( ($profiledata['user_yim']) ? stripslashes($profiledata['user_yim']) : " " ),
-			"YIM_IMG" => $yim_img, 
+			"YIM_IMG" => $yim_img,
 			"WEBSITE" => ( ($profiledata['user_website']) ? stripslashes($profiledata['user_website']) : " " ),
-			"WEBSITE_IMG" => $www_img, 
+			"WEBSITE_IMG" => $www_img,
 			"LOCATION" => ( ($profiledata['user_from']) ? stripslashes($profiledata['user_from']) : " " ),
 			"OCCUPATION" => ( ($profiledata['user_occ']) ? stripslashes($profiledata['user_occ']) : " " ),
 			"INTERESTS" => ( ($profiledata['user_interests']) ? stripslashes($profiledata['user_interests']) : " " ),
@@ -169,9 +169,9 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 			"L_PER_DAY" => $lang['posts_per_day'],
 			"L_OF_TOTAL" => $lang['of_total'],
 			"L_CONTACT" => $lang['Contact'],
-			"L_EMAIL_ADDRESS" => $lang['Email_address'], 
+			"L_EMAIL_ADDRESS" => $lang['Email_address'],
-			"L_EMAIL" => $lang['Email'], 
+			"L_EMAIL" => $lang['Email'],
-			"L_PM" => $lang['Private_message'], 
+			"L_PM" => $lang['Private_message'],
 			"L_ICQ_NUMBER" => $lang['ICQ'],
 			"L_YAHOO" => $lang['YIM'],
 			"L_AIM" => $lang['AIM'],
@@ -222,9 +222,9 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 
 				$jumpbox = make_jumpbox();
 				$template->assign_vars(array(
-					"L_GO" => $lang['Go'], 
+					"L_GO" => $lang['Go'],
-					"L_JUMP_TO" => $lang['Jump_to'], 
+					"L_JUMP_TO" => $lang['Jump_to'],
-					"L_SELECT_FORUM" => $lang['Select_forum'], 
+					"L_SELECT_FORUM" => $lang['Select_forum'],
 					"JUMPBOX_LIST" => $jumpbox,
 					"SELECT_NAME" => POST_FORUM_URL)
 				);
@@ -321,8 +321,8 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 			//
 			// Do a ban check on this email address
 			//
-			$sql = "SELECT ban_email 
+			$sql = "SELECT ban_email
-				FROM " . BANLIST_TABLE; 
+				FROM " . BANLIST_TABLE;
 			if(!$result = $db->sql_query($sql))
 			{
 				message_die(GENERAL_ERROR, "Couldn't obtain email ban information.", "", __LINE__, __FILE__, $sql);
@@ -408,7 +408,7 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 			if($board_config['allow_avatar_upload'] && !$error)
 			{
 				//
-				// Only allow one type of upload, either a 
+				// Only allow one type of upload, either a
 				// filename or a URL
 				//
 				if(!empty($user_avatar_loc) && !empty($user_avatar_url))
@@ -469,7 +469,7 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 								{
 									list($width, $height) = getimagesize($user_avatar_loc);
 
-									if( $width <= $board_config['avatar_max_width'] && 
+									if( $width <= $board_config['avatar_max_width'] &&
 										$height <= $board_config['avatar_max_height'] )
 									{
 										$user_id = ($mode == "register") ? $new_user_id : $userdata['user_id'];
@@ -511,7 +511,7 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 					if($board_config['allow_avatar_upload'])
 					{
 						//
-						// First check what port we should connect 
+						// First check what port we should connect
 						// to, look for a :[xxxx]/ or, if that doesn't
 						// exist assume port 80 (http)
 						//
@@ -531,14 +531,14 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 								//
 								fputs($fsock, "GET $base_get HTTP/1.1\r\n");
 								fputs($fsock, "HOST: " . $url_ary[2] . "\r\n");
-								fputs($fsock, "Connection: close\r\n\r\n"); 
+								fputs($fsock, "Connection: close\r\n\r\n");
 
 								unset($avatar_data);
 								while(!feof($fsock))
-								{ 
+								{
-									$avatar_data .= fread($fsock, $board_config['avatar_filesize']); 
+									$avatar_data .= fread($fsock, $board_config['avatar_filesize']);
-								} 
+								}
-								fclose($fsock); 
+								fclose($fsock);
 
 								if(preg_match("/Content-Length\: ([0-9]+)[^\/]+Content-Type\: (image\/[a-z]+)[\s]+/i", $avatar_data, $file_data))
 								{
@@ -705,7 +705,7 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 								if($board_config['require_activation'])
 								{
 									$msg = $lang['Account_inactive'];
-									$email_msg = $lang['Welcome_email_activate'];
+									$email_msg = "welcome_inactive";
 								}
 								else if($coppa)
 								{
@@ -714,24 +714,25 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 								}
 								else
 								{
-									$msg = $lang['Account_added']; 
+									$msg = $lang['Account_added'];
-									$email_msg = $lang['Welcome_email']; 
+									$email_msg = "welcome";
 								}
 
 								if(!$coppa)
 								{
-									$email_msg .= "\r\n" . $board_config['board_email'];
 									$email_headers = "From: " . $board_config['board_email_from'] . "\r\n";
-								
+
-									if($board_config['smtp_delivery'] && $board_config['smtp_host'] != "")
+									$emailer->use_template($email_msg);
-									{
+									$emailer->email_address($email);
-										include($phpbb_root_path . 'includes/smtp.'.$phpEx);
+									$emailer->set_subject($lang['Welcome_subject']);
-										smtpmail($email, $lang['Welcome_subject'], $email_msg, $email_headers);
+									$emailer->extra_headers($email_headers);
-									}
+
-									else
+									$emailer->assign_vars(array("WELCOME_MSG" => $lang['Welcome_subject'],
-									{
+																		 "USERNAME" => $username,
-										mail($email, $lang['Welcome_subject'], $email_msg, $email_headers);
+																		 "PASSWORD" => $password_confirm,
-									}
+																		 "ACTIVATE_URL" => "http://".$SERVER_NAME."/".$PHP_SELF."?mode=activate&act_key=$act_key",
+																		 "EMAIL_SIG" => $board_config['board_email']));
+									$emailer->send();
 								}
 
 								message_die(GENERAL_MESSAGE, $msg);
@@ -743,7 +744,7 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 						}
 						else
 						{
-							message_die(GENERAL_ERROR, "Couldn't insert data into groups table", "", __LINE__, __FILE__, $sql);	
+							message_die(GENERAL_ERROR, "Couldn't insert data into groups table", "", __LINE__, __FILE__, $sql);
 						}
 					}
 					else
@@ -818,7 +819,7 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 		{
 			$s_hidden_fields .= '<input type="hidden" name="user_id" value="' . $userdata['user_id'] . '" />';
 		}
-			
+
 		$template->set_filenames(array(
 			"body" => "profile_add_body.tpl",
 			"jumpbox" => "jumpbox.tpl")
@@ -826,9 +827,9 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 
 		$jumpbox = make_jumpbox();
 		$template->assign_vars(array(
-			"L_GO" => $lang['Go'], 
+			"L_GO" => $lang['Go'],
-			"L_JUMP_TO" => $lang['Jump_to'], 
+			"L_JUMP_TO" => $lang['Jump_to'],
-			"L_SELECT_FORUM" => $lang['Select_forum'], 
+			"L_SELECT_FORUM" => $lang['Select_forum'],
 			"JUMPBOX_LIST" => $jumpbox,
 			"SELECT_NAME" => POST_FORUM_URL)
 		);
@@ -847,11 +848,11 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 			"WEBSITE" => stripslashes($website),
 			"SIGNATURE" => stripslashes(str_replace("<br />", "\n", $signature)),
 			"VIEW_EMAIL_YES" => ($viewemail) ? "checked=\"checked\"" : "",
-			"VIEW_EMAIL_NO" => (!$viewemail) ? "checked=\"checked\"" : "", 
+			"VIEW_EMAIL_NO" => (!$viewemail) ? "checked=\"checked\"" : "",
 			"HIDE_USER_YES" => (!$allowviewonline) ? "checked=\"checked\"" : "",
-			"HIDE_USER_NO" => ($allowviewonline) ? "checked=\"checked\"" : "", 
+			"HIDE_USER_NO" => ($allowviewonline) ? "checked=\"checked\"" : "",
-			"NOTIFY_PM_YES" => ($notifypm) ? "checked=\"checked\"" : "", 
+			"NOTIFY_PM_YES" => ($notifypm) ? "checked=\"checked\"" : "",
-			"NOTIFY_PM_NO" => (!$notifypm) ? "checked=\"checked\"" : "", 
+			"NOTIFY_PM_NO" => (!$notifypm) ? "checked=\"checked\"" : "",
 			"ALWAYS_ADD_SIGNATURE_YES" => ($attachsig) ? "checked=\"checked\"" : "",
 			"ALWAYS_ADD_SIGNATURE_NO" => (!$attachsig) ? "checked=\"checked\"" : "",
 			"ALWAYS_ALLOW_BBCODE_YES" => ($allowbbcode) ? "checked=\"checked\"" : "",
@@ -862,20 +863,20 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 			"ALWAYS_ALLOW_SMILIES_NO" => (!$allowsmilies) ? "checked=\"checked\"" : "",
 			"ALLOW_AVATAR" => $board_config['allow_avatar_upload'],
 			"AVATAR" => ($user_avatar != "") ? "<img src=\"" . $board_config['avatar_path'] . "/" . stripslashes($user_avatar) . "\" alt=\"\" />" : "",
-			"AVATAR_SIZE" => $board_config['avatar_filesize'], 
+			"AVATAR_SIZE" => $board_config['avatar_filesize'],
 			"LANGUAGE_SELECT" => language_select(stripslashes($user_lang)),
 			"THEME_SELECT" => theme_select($user_theme),
 			"TIMEZONE_SELECT" => tz_select($user_timezone),
 			"DATE_FORMAT" => stripslashes($user_dateformat),
 			"TEMPLATE_SELECT" => template_select(stripslashes($user_template)),
-			"HTML_STATUS" => $html_status, 
+			"HTML_STATUS" => $html_status,
-			"BBCODE_STATUS" => $bbcode_status, 
+			"BBCODE_STATUS" => $bbcode_status,
-			"SMILIES_STATUS" => $smilies_status, 
+			"SMILIES_STATUS" => $smilies_status,
 
 			"L_PASSWORD_IF_CHANGED" => ($mode == "editprofile") ? $lang['password_if_changed'] : "",
 			"L_PASSWORD_CONFIRM_IF_CHANGED" => ($mode == "editprofile") ? $lang['password_confirm_if_changed'] : "",
-			"L_SUBMIT" => $lang['Submit'], 
+			"L_SUBMIT" => $lang['Submit'],
-			"L_RESET" => $lang['Reset'], 
+			"L_RESET" => $lang['Reset'],
 			"L_ICQ_NUMBER" => $lang['ICQ'],
 			"L_MESSENGER" => $lang['MSNM'],
 			"L_YAHOO" => $lang['YIM'],
@@ -890,29 +891,29 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 			"L_DATE_FORMAT" => $lang['Date_format'],
 			"L_DATE_FORMAT_EXPLAIN" => $lang['Date_format_explain'],
 			"L_YES" => $lang['Yes'],
-			"L_NO" => $lang['No'], 
+			"L_NO" => $lang['No'],
 			"L_INTERESTS" => $lang['Interests'],
 			"L_ALWAYS_ALLOW_SMILIES" => $lang['Always_smile'],
 			"L_ALWAYS_ALLOW_BBCODE" => $lang['Always_bbcode'],
-			"L_ALWAYS_ALLOW_HTML" => $lang['Always_html'], 
+			"L_ALWAYS_ALLOW_HTML" => $lang['Always_html'],
-			"L_HIDE_USER" => $lang['Hide_user'], 
+			"L_HIDE_USER" => $lang['Hide_user'],
 			"L_ALWAYS_ADD_SIGNATURE" => $lang['Always_add_sig'],
 
 			"L_AVATAR_PANEL" => $lang['Avatar_panel'],
 			"L_AVATAR_EXPLAIN" => $lang['Avatar_explain'],
 			"L_UPLOAD_AVATAR_FILE" => $lang['Upload_Avatar_file'],
-			"L_UPLOAD_AVATAR_URL" => $lang['Upload_Avatar_URL'], 
+			"L_UPLOAD_AVATAR_URL" => $lang['Upload_Avatar_URL'],
-			"L_UPLOAD_AVATAR_URL_EXPLAIN" => $lang['Upload_Avatar_URL_explain'], 
+			"L_UPLOAD_AVATAR_URL_EXPLAIN" => $lang['Upload_Avatar_URL_explain'],
-			"L_AVATAR_GALLERY" => $lang['Select_from_gallery'], 
+			"L_AVATAR_GALLERY" => $lang['Select_from_gallery'],
-			"L_SHOW_GALLERY" => $lang['Avatar_gallery'], 
+			"L_SHOW_GALLERY" => $lang['Avatar_gallery'],
-			"L_LINK_REMOTE_AVATAR" => $lang['Link_remote_Avatar'], 
+			"L_LINK_REMOTE_AVATAR" => $lang['Link_remote_Avatar'],
-			"L_LINK_REMOTE_AVATAR_EXPLAIN" => $lang['Link_remote_Avatar_explain'], 
+			"L_LINK_REMOTE_AVATAR_EXPLAIN" => $lang['Link_remote_Avatar_explain'],
 			"L_DELETE_AVATAR" => $lang['Delete_Image'],
 			"L_CURRENT_IMAGE" => $lang['Current_Image'],
 
 			"L_SIGNATURE" => $lang['Signature'],
-			"L_SIGNATURE_EXPLAIN" => $lang['Signature_explain'], 
+			"L_SIGNATURE_EXPLAIN" => $lang['Signature_explain'],
-			"L_NOTIFY_ON_PRIVMSG" => $lang['Notify_on_privmsg'], 
+			"L_NOTIFY_ON_PRIVMSG" => $lang['Notify_on_privmsg'],
 			"L_PREFERENCES" => $lang['Preferences'],
 			"L_PUBLIC_VIEW_EMAIL" => $lang['Public_view_email'],
 			"L_ITEMS_REQUIRED" => $lang['Items_required'],
@@ -926,10 +927,10 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 			"L_BBCODE_IS" => $lang['BBCode'] . " " . $lang['is'],
 			"L_SMILIES_ARE" => $lang['Smilies'] . " " . $lang['are'],
 
-			"S_ALLOW_AVATAR_UPLOAD" => $board_config['allow_avatar_upload'], 
+			"S_ALLOW_AVATAR_UPLOAD" => $board_config['allow_avatar_upload'],
 			"S_ALLOW_AVATAR_LOCAL" => $board_config['allow_avatar_local'],
-			"S_ALLOW_AVATAR_REMOTE" => $board_config['allow_avatar_remote'], 
+			"S_ALLOW_AVATAR_REMOTE" => $board_config['allow_avatar_remote'],
-			"S_HIDDEN_FIELDS" => $s_hidden_fields, 
+			"S_HIDDEN_FIELDS" => $s_hidden_fields,
 			"S_PROFILE_ACTION" => append_sid("profile.$phpEx"))
 		);
 

phpBB/templates/PSO/admin/admin_config_body.tpl

@@ -58,7 +58,7 @@
 			</tr>
 			<tr>
 				<td class="row1">Enable GZip Compression:</td>
-				<td class="row2"><input type="radio" name="gzip" value="1" {GZIP_YES}> Yes&nbsp;&nbsp;<input type="radio" name="gzip" value="1" {GZIP_NO}> No</td>
+				<td class="row2"><input type="radio" name="gzip" value="1" {GZIP_YES}> Yes&nbsp;&nbsp;<input type="radio" name="gzip" value="0" {GZIP_NO}> No</td>
 			</tr>
 			<tr>
 				<td class="cat" colspan="2"><span class="cattitle">User/Forum Ability Settings</span></td>
@@ -142,5 +142,5 @@
 </table>
 
 </form>
-		
+
 <br clear="all">