merge recent changes with HEAD - R1 and HEAD are identical now

1 files changed, 10 insertions, 10 deletions

diff --git a/remind_password.php b/remind_password.php
index 7b8cbb9..7eef22b 100644
--- a/remind_password.php
+++ b/remind_password.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_users/remind_password.php,v 1.3 2005/07/17 17:36:44 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/remind_password.php,v 1.4 2005/08/01 18:42:02 squareing Exp $
  *
  * Copyright (c) 2004 bitweaver.org
  * Copyright (c) 2003 tikwiki.org
@@ -8,7 +8,7 @@
  * All Rights Reserved. See copyright.txt for details and a complete list of authors.
  * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
  *
- * $Id: remind_password.php,v 1.3 2005/07/17 17:36:44 squareing Exp $
+ * $Id: remind_password.php,v 1.4 2005/08/01 18:42:02 squareing Exp $
  * @package users
  * @subpackage functions
  */
@@ -18,7 +18,7 @@
  */
 require_once( '../bit_setup_inc.php' );
 if ($forgotPass != 'y') {
-	$smarty->assign('msg', tra("This feature is disabled").": forgotPass");
+	$gBitSmarty->assign('msg', tra("This feature is disabled").": forgotPass");
 	$gBitSystem->display( 'error.tpl' );
 	die;
 } elseif( $gBitUser->isRegistered() ) {
@@ -35,20 +35,20 @@ if ($forgotPass != 'y') {
 		}
 		$tmp['success'] .= tra("to the registered email address for")." " . $_REQUEST["username"] . ".";
 
-		$smarty->assign('mail_site', $_SERVER["SERVER_NAME"]);
-		$smarty->assign('mail_user', $_REQUEST["username"]);
-		$smarty->assign('mail_same', $gBitSystem->isFeatureActive( 'feature_clear_passwords' ));
-		$smarty->assign('mail_pass', $pass);
-		$mail_data = $smarty->fetch('bitpackage:users/password_reminder.tpl');
+		$gBitSmarty->assign('mail_site', $_SERVER["SERVER_NAME"]);
+		$gBitSmarty->assign('mail_user', $_REQUEST["username"]);
+		$gBitSmarty->assign('mail_same', $gBitSystem->isFeatureActive( 'feature_clear_passwords' ));
+		$gBitSmarty->assign('mail_pass', $pass);
+		$mail_data = $gBitSmarty->fetch('bitpackage:users/password_reminder.tpl');
 		$subject = "Your password for ".$gBitSystem->getPreference( 'siteTitle', $_SERVER['HTTP_HOST'] );
 		mail( $userInfo['email'], $subject, $mail_data, "From: ".$gBitSystem->getPreference( 'sender_email' )."\r\nContent-type: text/plain;charset=utf-8\r\n");
 		// Just show "success" message and no form
 	} else {
 		// Show error message (and leave form visible so user can fix problem)
-		$smarty->assign('showmsg', 'e');
+		$gBitSmarty->assign('showmsg', 'e');
 		$tmp['error'] = tra("Invalid or unknown username").": ".$_REQUEST["username"];
 	}
-	$smarty->assign('msg', $tmp);
+	$gBitSmarty->assign('msg', $tmp);
 }
 // Display the template
 $gBitSystem->display( 'bitpackage:users/remind_password.tpl');