diff options
| -rw-r--r-- | compose.php | 4 | ||||
| -rw-r--r-- | contact.php | 4 | ||||
| -rw-r--r-- | message_box.php | 4 | ||||
| -rw-r--r-- | messages_lib.php | 6 | ||||
| -rw-r--r-- | templates/contact.tpl | 2 | ||||
| -rw-r--r-- | templates/messages_mailbox.tpl | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/compose.php b/compose.php index 4208819..da882ef 100644 --- a/compose.php +++ b/compose.php @@ -3,7 +3,7 @@ * message package modules * * @author -* @version $Header: /cvsroot/bitweaver/_bit_messages/compose.php,v 1.6 2006/02/08 18:32:11 mej Exp $ +* @version $Header: /cvsroot/bitweaver/_bit_messages/compose.php,v 1.7 2006/03/01 20:16:15 spiderr Exp $ * @package messages * @subpackage functions */ @@ -29,7 +29,7 @@ $gBitSystem->isPackageActive( 'messages', TRUE ); $gBitSystem->verifyPermission( 'bit_p_messages' ); // Configure quicktags list -if ($gBitSystem->getPreference('package_quicktags','n') == 'y') { +if ($gBitSystem->getConfig('package_quicktags','n') == 'y') { include_once( QUICKTAGS_PKG_PATH.'quicktags_inc.php' ); } diff --git a/contact.php b/contact.php index c8a8e1c..bcebef0 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.7 2006/02/08 18:32:11 mej Exp $ +* @version $Header: /cvsroot/bitweaver/_bit_messages/contact.php,v 1.8 2006/03/01 20:16:15 spiderr Exp $ * @package messages * @subpackage functions */ @@ -23,7 +23,7 @@ if( !$gBitSystem->isFeatureActive( 'site_contact' ) ) { include_once( MESSAGES_PKG_PATH.'messages_lib.php' ); -$userInfo = $gBitUser->getUserInfo( array( 'login' => $gBitSystem->getPreference( 'contact_user' ) ) ); +$userInfo = $gBitUser->getUserInfo( array( 'login' => $gBitSystem->getConfig( '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/message_box.php b/message_box.php index 0595e3f..d57cd04 100644 --- a/message_box.php +++ b/message_box.php @@ -3,7 +3,7 @@ * message package modules * * @author -* @version $Header: /cvsroot/bitweaver/_bit_messages/message_box.php,v 1.11 2006/02/19 19:24:27 lsces Exp $ +* @version $Header: /cvsroot/bitweaver/_bit_messages/message_box.php,v 1.12 2006/03/01 20:16:15 spiderr Exp $ * @package messages * @subpackage functions */ @@ -27,7 +27,7 @@ if( !$gBitUser->isRegistered() ) { $gBitSystem->isPackageActive( 'messages', TRUE ); $gBitSystem->verifyPermission( 'bit_p_messages' ); -$max_records = $gBitSystem->getPreference( 'max_records', 20 ); +$max_records = $gBitSystem->getConfig( 'max_records', 20 ); // Mark messages if the mark button was pressed if (isset($_REQUEST["mark"]) && isset($_REQUEST["msg"])) { diff --git a/messages_lib.php b/messages_lib.php index 23ea823..16bbc22 100644 --- a/messages_lib.php +++ b/messages_lib.php @@ -3,7 +3,7 @@ * message package modules * * @author -* @version $Revision: 1.5 $ +* @version $Revision: 1.6 $ * @package messages */ @@ -51,7 +51,7 @@ class Messages extends BitBase { $machine = httpPrefix(). $foo["path"]; if ($gBitUser->getPreference( 'minPrio', 3 ) <= $priority && FALSE) { - $mailSite = $gBitSystem->getPreference( 'kernel_server_name', $_SERVER["SERVER_NAME"] ); + $mailSite = $gBitSystem->getConfig( 'kernel_server_name', $_SERVER["SERVER_NAME"] ); $gBitSmarty->assign( 'mail_site', $mailSite ); $gBitSmarty->assign( 'mail_machine', $machine); $gBitSmarty->assign( 'mail_date', $now); @@ -63,7 +63,7 @@ class Messages extends BitBase { if( !empty( $userInfo['email'] ) ) { @mail($userInfo['email'], tra('New message arrived from '). $mailSite, $mail_data, - "From: ".$gBitSystem->getPreference( 'sender_email' )."\r\nContent-type: text/plain;charset=utf-8\r\n"); + "From: ".$gBitSystem->getConfig( 'sender_email' )."\r\nContent-type: text/plain;charset=utf-8\r\n"); } } } diff --git a/templates/contact.tpl b/templates/contact.tpl index c5081e9..4516aa1 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="{$gBitSystemPrefs.contact_user|escape}" /> + <input type="hidden" name="to" value="{$gBitSystem->getConfig('contact_user')|escape}" /> <div class="row"> {formlabel label="Priority" for="priority"} diff --git a/templates/messages_mailbox.tpl b/templates/messages_mailbox.tpl index db0a7ad..cecd02f 100644 --- a/templates/messages_mailbox.tpl +++ b/templates/messages_mailbox.tpl @@ -18,7 +18,7 @@ <a href="{$smarty.const.MESSAGES_PKG_URL}compose.php">{biticon ipackage=messages iname=send_mail iexplain="Compose Message" iforce=icon_text}</a> - {assign var=displayName value=$gBitSystem->getPreference("display_name","real_name") } + {assign var=displayName value=$gBitSystem->getConfig("display_name","real_name") } <table class="data"> <caption>{tr}Messages{/tr}</caption> <tr> |