mass kernel_config renaming for users_

6 files changed, 27 insertions, 27 deletions

diff --git a/templates/admin_login.tpl b/templates/admin_login.tpl
index 5748680..52c845b 100644
--- a/templates/admin_login.tpl
+++ b/templates/admin_login.tpl
@@ -7,9 +7,9 @@
 				{formlabel label="Authentication method" for="users_auth_method"}
 				{forminput}
 					<select name="users_auth_method" id="users_auth_method">
-						<option value="tiki" {if $users_auth_method eq 'tiki'} selected="selected"{/if}>{tr}Just bitweaver{/tr}</option>
-						<option value="ws" {if $users_auth_method eq 'ws'} selected="selected"{/if}>{tr}Web Server{/tr}</option>
-						<option value="auth" {if $users_auth_method eq 'auth'} selected="selected"{/if}>{tr}bitweaver and PEAR::Auth{/tr}</option>
+						<option value="tiki" {if $gBitSystem->getConfig('users_auth_method') eq 'tiki'} selected="selected"{/if}>{tr}Just bitweaver{/tr}</option>
+						<option value="ws" {if $gBitSystem->getConfig('users_auth_method') eq 'ws'} selected="selected"{/if}>{tr}Web Server{/tr}</option>
+						<option value="auth" {if $gBitSystem->getConfig('users_auth_method') eq 'auth'} selected="selected"{/if}>{tr}bitweaver and PEAR::Auth{/tr}</option>
 					</select>
 					{formhelp note=""}
 				{/forminput}
@@ -39,17 +39,17 @@
 				{formlabel label="Duration of 'Remember me' feature" for="users_remember_time"}
 				{forminput}
 					<select name="users_remember_time" id="users_remember_time">
-						<option value="300" {if $users_remember_time eq 300} selected="selected"{/if}>5 {tr}minutes{/tr}</option>
-						<option value="900" {if $users_remember_time eq 900} selected="selected"{/if}>15 {tr}minutes{/tr}</option>
-						<option value="1800" {if $users_remember_time eq 1800} selected="selected"{/if}>30 {tr}minutes{/tr}</option>
-						<option value="3600" {if $users_remember_time eq 3600} selected="selected"{/if}>1 {tr}hour{/tr}</option>
-						<option value="7200" {if $users_remember_time eq 7200} selected="selected"{/if}>2 {tr}hours{/tr}</option>
-						<option value="43200" {if $users_remember_time eq 43200} selected="selected"{/if}>12 {tr}hours{/tr}</option>
-						<option value="86400" {if $users_remember_time eq 86400} selected="selected"{/if}>1 {tr}day{/tr}</option>
-						<option value="604800" {if $users_remember_time eq 604800} selected="selected"{/if}>1 {tr}week{/tr}</option>
-						<option value="2592000" {if $users_remember_time eq 2592000} selected="selected"{/if}>1 {tr}month{/tr}</option>
-						<option value="15724800" {if $users_remember_time eq 15724800} selected="selected"{/if}>6 {tr}months{/tr}</option>
-						<option value="31449600" {if $users_remember_time eq 31449600} selected="selected"{/if}>1 {tr}year{/tr}</option>
+						<option value="300" {if $tSystem->getConfig('users_remember_time') eq 300} selected="selected"{/if}>5 {tr}minutes{/tr}</option>
+						<option value="900" {if $gBitSystem->getConfig('users_remember_time') eq 900} selected="selected"{/if}>15 {tr}minutes{/tr}</option>
+						<option value="1800" {if $gBitSystem->getConfig('users_remember_time') eq 1800} selected="selected"{/if}>30 {tr}minutes{/tr}</option>
+						<option value="3600" {if $gBitSystem->getConfig('users_remember_time') eq 3600} selected="selected"{/if}>1 {tr}hour{/tr}</option>
+						<option value="7200" {if $gBitSystem->getConfig('users_remember_time') eq 7200} selected="selected"{/if}>2 {tr}hours{/tr}</option>
+						<option value="43200" {if $gBitSystem->getConfig('users_remember_time') eq 43200} selected="selected"{/if}>12 {tr}hours{/tr}</option>
+						<option value="86400" {if $gBitSystem->getConfig('users_remember_time') eq 86400} selected="selected"{/if}>1 {tr}day{/tr}</option>
+						<option value="604800" {if $gBitSystem->getConfig('users_remember_time') eq 604800} selected="selected"{/if}>1 {tr}week{/tr}</option>
+						<option value="2592000" {if $gBitSystem->getConfig('users_remember_time') eq 2592000} selected="selected"{/if}>1 {tr}month{/tr}</option>
+						<option value="15724800" {if $gBitSystem->getConfig('users_remember_time') eq 15724800} selected="selected"{/if}>6 {tr}months{/tr}</option>
+						<option value="31449600" {if $gBitSystem->getConfig('users_remember_time') eq 31449600} selected="selected"{/if}>1 {tr}year{/tr}</option>
 					</select>
 					{formhelp note=""}
 				{/forminput}
@@ -148,9 +148,9 @@
 				{formlabel label="LDAP Scope" for="users_ldap_scope"}
 				{forminput}
 					<select name="users_ldap_scope" id="users_ldap_scope">
-						<option value="sub" {if $users_ldap_scope eq "sub"} selected="selected"{/if}>sub</option>
-						<option value="one" {if $users_ldap_scope eq "one"} selected="selected"{/if}>one</option>
-						<option value="base" {if $users_ldap_scope eq "base"} selected="selected"{/if}>base</option>
+						<option value="sub" {if $gBitSystem->getConfig('users_ldap_scope') eq "sub"} selected="selected"{/if}>sub</option>
+						<option value="one" {if $gBitSystem->getConfig('users_ldap_scope') eq "one"} selected="selected"{/if}>one</option>
+						<option value="base" {if $gBitSystem->getConfig('users_ldap_scope') eq "base"} selected="selected"{/if}>base</option>
 					</select>
 					{formhelp note=""}
 				{/forminput}
diff --git a/templates/login.tpl b/templates/login.tpl
index c1b284f..cd76b8b 100644
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_users/templates/login.tpl,v 1.5 2006/03/29 19:38:40 sylvieg Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_users/templates/login.tpl,v 1.6 2006/04/19 17:11:19 spiderr Exp $ *}
 
 {strip}
 <div class="display login">
@@ -11,11 +11,11 @@
 		{include file=bitpackage:users/login_inc.tpl}
 
 		<ul>
-			{if $gBitSystem->isFeatureActive('forgot_pass')}
+			{if $gBitSystem->isFeatureActive('users_forgot_pass')}
 				<li><a href="{$smarty.const.USERS_PKG_URL}remind_password.php">{tr}Click here to retrieve your password.{/tr}</a></li>
 			{/if}
 
-			{if $gBitSystem->isFeatureActive('allow_register')}
+			{if $gBitSystem->isFeatureActive('users_allow_register')}
 				<li><a href="{$smarty.const.USERS_PKG_URL}register.php">{tr}Click here to register with us.{/tr}</a></li>
 			{/if}
 		</ul>
diff --git a/templates/login_inc.tpl b/templates/login_inc.tpl
index 2d7a2af..50056d0 100644
--- a/templates/login_inc.tpl
+++ b/templates/login_inc.tpl
@@ -17,7 +17,7 @@
 		{/forminput}
 	</div>
 
-	{if $gBitSystem->isFeatureActive('rememberme')}
+	{if $gBitSystem->isFeatureActive('users_remember_me')}
 		<div class="row">
 			{formlabel label="Remember me" for="rme"}
 			{forminput}
diff --git a/templates/menu_users.tpl b/templates/menu_users.tpl
index e4d0f3c..2207a37 100644
--- a/templates/menu_users.tpl
+++ b/templates/menu_users.tpl
@@ -60,7 +60,7 @@
 				</a>
 			</li>
 		{/if}
-		{if $gBitSystem->isFeatureActive('user_watches') }
+		{if $gBitSystem->isFeatureActive('users_watches') }
 			<li>
 				<a class="item" href="{$smarty.const.USERS_PKG_URL}watches.php">
 					{biticon ipackage=users iname=watch iexplain="My Watches" iforce=icon}{if !$icons_only} {tr}My watches{/tr}{/if}
diff --git a/templates/register.tpl b/templates/register.tpl
index 209d4df..2da397d 100644
--- a/templates/register.tpl
+++ b/templates/register.tpl
@@ -52,7 +52,7 @@
 					{/forminput}
 				</div>
 
-				{if $gBitSystem->mPrefs.use_register_passcode eq 'y'}
+				{if $gBitSystem->isFeatureActive('users_register_passcode')}
 					<div class="row">
 						{formfeedback error=$errors.passcode}
 						{formlabel label="Passcode to register<br />(not your user password)" for="passcode"}
@@ -62,7 +62,7 @@
 					</div>
 				{/if}
 
-				{if $gBitSystem->isFeatureActive( 'validate_user' )}
+				{if $gBitSystem->isFeatureActive( 'users_validate_user' )}
 					<div class="row">
 						{formfeedback warning="A confirmation email will be sent to you with instructions how to login"}
 					</div>
@@ -159,11 +159,11 @@
 					</div>
 				{/section}
 
-				{if $gBitSystem->isFeatureActive('rnd_num_reg')}
+				{if $gBitSystem->isFeatureActive('users_random_number_reg')}
 					<hr />
 
 					<div class="row">
-						{formfeedback error=$errors.rnd_num_reg}
+						{formfeedback error=$errors.users_random_number_reg}
 						{formlabel label="Your registration code"}
 						{forminput}
 							<img src="{$smarty.const.USERS_PKG_URL}random_num_img.php" alt="{tr}Random Image{/tr}"/>
diff --git a/templates/user_preferences.tpl b/templates/user_preferences.tpl
index 7bd99c0..58af199 100644
--- a/templates/user_preferences.tpl
+++ b/templates/user_preferences.tpl
@@ -71,7 +71,7 @@
 						{/forminput}
 					</div>
 
-					{if $change_language eq 'y'}
+					{if $users_change_language eq 'y'}
 						<div class="row">
 							{formlabel label="Language" for="language"}
 							{forminput}