diff options
| -rw-r--r-- | admin/admin_messages_inc.php | 6 | ||||
| -rw-r--r-- | admin/schema_inc.php | 4 | ||||
| -rw-r--r-- | contact.php | 6 | ||||
| -rw-r--r-- | templates/admin_messages.tpl | 12 | ||||
| -rw-r--r-- | templates/contact.tpl | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/admin/admin_messages_inc.php b/admin/admin_messages_inc.php index 65993b1..c9956dd 100644 --- a/admin/admin_messages_inc.php +++ b/admin/admin_messages_inc.php @@ -1,6 +1,6 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_messages/admin/admin_messages_inc.php,v 1.1 2006/04/12 06:38:35 squareing Exp $ +// $Header: /cvsroot/bitweaver/_bit_messages/admin/admin_messages_inc.php,v 1.2 2006/04/14 20:25:52 squareing Exp $ // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al. // All Rights Reserved. See copyright.txt for details and a complete list of authors. @@ -14,8 +14,8 @@ $users_list = $gBitUser->get_users_names(); $gBitSmarty->assign( 'users_list', ( count( $users_list ) < 50 ) ? $users_list : NULL ); if( !empty( $_REQUEST['anonymous_settings'] ) ) { - simple_set_toggle( "site_contact", MESSAGES_PKG_NAME ); - simple_set_value( "contact_user", MESSAGES_PKG_NAME ); + simple_set_toggle( "messages_site_contact", MESSAGES_PKG_NAME ); + simple_set_value( "messages_contact_user", MESSAGES_PKG_NAME ); } $gBitSystem->setHelpInfo( 'Features', 'Settings', 'Help with the features settings' ); diff --git a/admin/schema_inc.php b/admin/schema_inc.php index 44cb2cb..398ef88 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -68,7 +68,7 @@ $gBitInstaller->registerSchemaIndexes( MESSAGES_PKG_NAME, $indices ); // ### Default Preferences $gBitInstaller->registerPreferences( MESSAGES_PKG_NAME, array( - //array(MESSAGES_PKG_NAME,'site_contact','n'), - array(MESSAGES_PKG_NAME,'contact_user','admin'), + //array(MESSAGES_PKG_NAME,'messages_site_contact','n'), + array(MESSAGES_PKG_NAME,'messages_contact_user','admin'), ) ); ?> diff --git a/contact.php b/contact.php index bcebef0..1a887de 100644 --- a/contact.php +++ b/contact.php @@ -3,7 +3,7 @@ * message package modules * * @author -* @version $Header: /cvsroot/bitweaver/_bit_messages/contact.php,v 1.8 2006/03/01 20:16:15 spiderr Exp $ +* @version $Header: /cvsroot/bitweaver/_bit_messages/contact.php,v 1.9 2006/04/14 20:25:52 squareing Exp $ * @package messages * @subpackage functions */ @@ -17,13 +17,13 @@ */ require_once( '../bit_setup_inc.php' ); -if( !$gBitSystem->isFeatureActive( 'site_contact' ) ) { +if( !$gBitSystem->isFeatureActive( 'messages_site_contact' ) ) { $gBitSystem->fatalError( "The Contact feature is disabled." ); } include_once( MESSAGES_PKG_PATH.'messages_lib.php' ); -$userInfo = $gBitUser->getUserInfo( array( 'login' => $gBitSystem->getConfig( 'contact_user' ) ) ); +$userInfo = $gBitUser->getUserInfo( array( 'login' => $gBitSystem->getConfig( 'messages_contact_user' ) ) ); $email = $userInfo['email']; if( empty( $email ) ) { $gBitSystem->fatalError( "This feature is not correctly set up. The email address is missing." ); diff --git a/templates/admin_messages.tpl b/templates/admin_messages.tpl index 033dbc6..0e86b92 100644 --- a/templates/admin_messages.tpl +++ b/templates/admin_messages.tpl @@ -1,23 +1,23 @@ -{* $Header: /cvsroot/bitweaver/_bit_messages/templates/admin_messages.tpl,v 1.1 2006/04/12 06:38:35 squareing Exp $ *} +{* $Header: /cvsroot/bitweaver/_bit_messages/templates/admin_messages.tpl,v 1.2 2006/04/14 20:25:52 squareing Exp $ *} {strip} {form legend="Anonymous Contact"} <input type="hidden" name="page" value="{$page}" /> <div class="row"> - {formlabel label="Contact Us" for="site_contact"} + {formlabel label="Contact Us" for="messages_site_contact"} {forminput} - {html_checkboxes name="site_contact" values="y" checked=$gBitSystem->getConfig('site_contact') labels=false id="site_contact"} + {html_checkboxes name="messages_site_contact" values="y" checked=$gBitSystem->getConfig('messages_site_contact') labels=false id="messages_site_contact"} {formhelp note="Enables anonymous users to send a message to a specified user using a form"} {/forminput} </div> <div class="row"> - {formlabel label="Contact user" for="contact_user"} + {formlabel label="Contact user" for="messages_contact_user"} {forminput} {if $users_list} - {html_options name="contact_user" output=$users_list values=$users_list selected=$gBitSystem->getConfig('contact_user') id="contact_user"} + {html_options name="messages_contact_user" output=$users_list values=$users_list selected=$gBitSystem->getConfig('messages_contact_user') id="messages_contact_user"} {else} - <input name="contact_user" value="{$gBitSystem->getConfig('contact_user')}" id="contact_user" /> + <input name="messages_contact_user" value="{$gBitSystem->getConfig('messages_contact_user')}" id="messages_contact_user" /> {/if} {formhelp note="Pick the user who should recieve the meassages sent using the 'Contact Us' feature"} {/forminput} diff --git a/templates/contact.tpl b/templates/contact.tpl index 4516aa1..f321302 100644 --- a/templates/contact.tpl +++ b/templates/contact.tpl @@ -8,7 +8,7 @@ {formfeedback hash=$feedback} {form legend="Send us a message"} - <input type="hidden" name="to" value="{$gBitSystem->getConfig('contact_user')|escape}" /> + <input type="hidden" name="to" value="{$gBitSystem->getConfig('messages_contact_user')|escape}" /> <div class="row"> {formlabel label="Priority" for="priority"} |