rename some user settings in liberty_content_prefs

3 files changed, 22 insertions, 22 deletions

diff --git a/messages_lib.php b/messages_lib.php
index 7f8baa8..5bea6b8 100644
--- a/messages_lib.php
+++ b/messages_lib.php
@@ -3,7 +3,7 @@
 * message package modules
 *
 * @author   
-* @version  $Revision: 1.9 $
+* @version  $Revision: 1.10 $
 * @package  messages
 */
 
@@ -52,7 +52,7 @@ class Messages extends BitBase {
 					$foo = parse_url($_SERVER["REQUEST_URI"]);
 					$machine = httpPrefix(). $foo["path"];
 
-					if ($gBitUser->getPreference( 'minPrio', 3 ) <= $priority && FALSE) {
+					if ($gBitUser->getPreference( 'messages_min_priority', 3 ) <= $priority && FALSE) {
 						$mailSite = $gBitSystem->getConfig( 'kernel_server_name', $_SERVER["SERVER_NAME"] );
 						$gBitSmarty->assign( 'mail_site', $mailSite );
 						$gBitSmarty->assign( 'mail_machine', $machine);
diff --git a/templates/header_inc.tpl b/templates/header_inc.tpl
index 10a8854..8a3644d 100644
--- a/templates/header_inc.tpl
+++ b/templates/header_inc.tpl
@@ -1,4 +1,4 @@
-{if $unreadMsgs and $gBitUser->getPreference('message_alert')}
+{if $unreadMsgs and $gBitUser->getPreference('messages_alert')}
 	<script type="text/javascript">
 		var redirect = confirm( '{tr}You have {$unreadMsgs} message(s) waiting for you in your personal message box. Click OK to view your messages.{/tr}' );
 		if( redirect == true && !getCookie( 'message_alert_sent' ) ) {ldelim}
diff --git a/templates/messages_preferences_inc.tpl b/templates/messages_preferences_inc.tpl
index c67752c..13522ff 100644
--- a/templates/messages_preferences_inc.tpl
+++ b/templates/messages_preferences_inc.tpl
@@ -10,16 +10,16 @@
 	</div>
 
 	<div class="row">
-		{formlabel label="Messages per page" for="mess_max_records"}
+		{formlabel label="Messages per page" for="messages_max_records"}
 		{forminput}
-			<select name="mess_max_records" id="mess_max_records">
-				<option value="2"  {if $userPrefs.mess_max_records eq 2}selected="selected"{/if}>{tr}2{/tr}</option>
-				<option value="5"  {if $userPrefs.mess_max_records eq 5}selected="selected"{/if}>{tr}5{/tr}</option>
-				<option value="10" {if $userPrefs.mess_max_records eq 10}selected="selected"{/if}>{tr}10{/tr}</option>
-				<option value="20" {if $userPrefs.mess_max_records eq 20}selected="selected"{/if}>{tr}20{/tr}</option>
-				<option value="30" {if $userPrefs.mess_max_records eq 30}selected="selected"{/if}>{tr}30{/tr}</option>
-				<option value="40" {if $userPrefs.mess_max_records eq 40}selected="selected"{/if}>{tr}40{/tr}</option>
-				<option value="50" {if $userPrefs.mess_max_records eq 50}selected="selected"{/if}>{tr}50{/tr}</option>
+			<select name="messages_max_records" id="messages_max_records">
+				<option value="2"  {if $userPrefs.messages_max_records eq 2}selected="selected"{/if}>{tr}2{/tr}</option>
+				<option value="5"  {if $userPrefs.messages_max_records eq 5}selected="selected"{/if}>{tr}5{/tr}</option>
+				<option value="10" {if $userPrefs.messages_max_records eq 10}selected="selected"{/if}>{tr}10{/tr}</option>
+				<option value="20" {if $userPrefs.messages_max_records eq 20}selected="selected"{/if}>{tr}20{/tr}</option>
+				<option value="30" {if $userPrefs.messages_max_records eq 30}selected="selected"{/if}>{tr}30{/tr}</option>
+				<option value="40" {if $userPrefs.messages_max_records eq 40}selected="selected"{/if}>{tr}40{/tr}</option>
+				<option value="50" {if $userPrefs.messages_max_records eq 50}selected="selected"{/if}>{tr}50{/tr}</option>
 			</select>
 			{formhelp note=""}
 		{/forminput}
@@ -35,24 +35,24 @@
 
 	{* the header_inc.tpl file needs some better js for this to work - xing
 	<div class="row">
-		{formlabel label="Message Alert" for="message_alert"}
+		{formlabel label="Message Alert" for="messages_alert"}
 		{forminput}
-			<input type="checkbox" name="message_alert" id="message_alert" {if $userPrefs.message_alert eq 'y'}checked="checked"{/if} />
+			<input type="checkbox" name="messages_alert" id="messages_alert" {if $userPrefs.messages_alert eq 'y'}checked="checked"{/if} />
 			{formhelp note="Whenever you have new messages, a popup will apear and take you directly to your message box."}
 		{/forminput}
 	</div>
 	*}
 
 	<div class="row">
-		{formlabel label="Send an email" for="minPrio"}
+		{formlabel label="Send an email" for="messages_min_priority"}
 		{forminput}
-			<select name="minPrio" id="minPrio">
-				<option value="1" {if $userPrefs.minPrio eq 1}selected="selected"{/if}>{tr}at least priority:{/tr} 1</option>
-				<option value="2" {if $userPrefs.minPrio eq 2}selected="selected"{/if}>{tr}at least priority:{/tr} 2</option>
-				<option value="3" {if $userPrefs.minPrio eq 3}selected="selected"{/if}>{tr}at least priority:{/tr} 3</option>
-				<option value="4" {if $userPrefs.minPrio eq 4}selected="selected"{/if}>{tr}at least priority:{/tr} 4</option>
-				<option value="5" {if $userPrefs.minPrio eq 5}selected="selected"{/if}>{tr}at least priority:{/tr} 5</option>
-				<option value="6" {if $userPrefs.minPrio eq 6}selected="selected"{/if}>{tr}never send message{/tr}</option>
+			<select name="messages_min_priority" id="messages_min_priority">
+				<option value="1" {if $userPrefs.messages_min_priority eq 1}selected="selected"{/if}>{tr}at least priority:{/tr} 1</option>
+				<option value="2" {if $userPrefs.messages_min_priority eq 2}selected="selected"{/if}>{tr}at least priority:{/tr} 2</option>
+				<option value="3" {if $userPrefs.messages_min_priority eq 3}selected="selected"{/if}>{tr}at least priority:{/tr} 3</option>
+				<option value="4" {if $userPrefs.messages_min_priority eq 4}selected="selected"{/if}>{tr}at least priority:{/tr} 4</option>
+				<option value="5" {if $userPrefs.messages_min_priority eq 5}selected="selected"{/if}>{tr}at least priority:{/tr} 5</option>
+				<option value="6" {if $userPrefs.messages_min_priority eq 6}selected="selected"{/if}>{tr}never send message{/tr}</option>
 			</select>
 			{formhelp note="Here you can indicate when an email should be sent to you when you recieve a personal message."}
 		{/forminput}