diff options
| -rw-r--r-- | BitMailer.php | 10 | ||||
| -rw-r--r-- | BitNewsletter.php | 12 | ||||
| -rw-r--r-- | admin/admin_newsletters_inc.php | 4 | ||||
| -rw-r--r-- | templates/admin_newsletter_subscriptions.tpl | 2 | ||||
| -rw-r--r-- | templates/edit_edition.tpl | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/BitMailer.php b/BitMailer.php index 1a45b5c..d15f4df 100644 --- a/BitMailer.php +++ b/BitMailer.php @@ -1,12 +1,12 @@ <?php /** - * $Header: /cvsroot/bitweaver/_bit_newsletters/Attic/BitMailer.php,v 1.18 2006/03/01 20:16:17 spiderr Exp $ + * $Header: /cvsroot/bitweaver/_bit_newsletters/Attic/BitMailer.php,v 1.19 2006/04/19 13:48:38 squareing Exp $ * * Copyright (c) 2004 bitweaver.org * 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: BitMailer.php,v 1.18 2006/03/01 20:16:17 spiderr Exp $ + * $Id: BitMailer.php,v 1.19 2006/04/19 13:48:38 squareing Exp $ * * Class that handles editions of newsletters * @package newsletters @@ -15,7 +15,7 @@ * * @author spiderr <spider@steelsun.com> * - * @version $Revision: 1.18 $ $Date: 2006/03/01 20:16:17 $ $Author: spiderr $ + * @version $Revision: 1.19 $ $Date: 2006/04/19 13:48:38 $ $Author: squareing $ */ /** @@ -34,7 +34,7 @@ class BitMailer extends phpmailer { function BitMailer () { global $gBitDb, $gBitSystem, $gBitLanguage; $this->mDb = $gBitDb; - $this->From = $gBitSystem->getConfig( 'bitmailer_sender_email', $gBitSystem->getConfig( 'sender_email', $_SERVER['SERVER_ADMIN'] ) ); + $this->From = $gBitSystem->getConfig( 'bitmailer_sender_email', $gBitSystem->getConfig( 'site_sender_email', $_SERVER['SERVER_ADMIN'] ) ); $this->FromName = $gBitSystem->getConfig( 'bitmailer_from', $gBitSystem->getConfig( 'siteTitle' ) ); $this->Host = $gBitSystem->getConfig( 'bitmailer_servers', $gBitSystem->getConfig( 'feature_server_name', '127.0.0.1' ) ); $this->Mailer = $gBitSystem->getConfig( 'bitmailer_protocol', 'smtp' ); // Alternative to IsSMTP() @@ -94,7 +94,7 @@ class BitMailer extends phpmailer { if( $content->load() ) { $body[$pick['content_id']]['body'] = $content->render(); $body[$pick['content_id']]['subject'] = $content->getTitle(); - $body[$pick['content_id']]['reply_to'] = $content->getField( 'reply_to', $gBitSystem->getConfig( 'sender_email', $_SERVER['SERVER_ADMIN'] ) ); + $body[$pick['content_id']]['reply_to'] = $content->getField( 'reply_to', $gBitSystem->getConfig( 'site_sender_email', $_SERVER['SERVER_ADMIN'] ) ); $body[$pick['content_id']]['object'] = $content; } // $content[$pick['content_id']] = LibertyBase::getLibertyObject(); diff --git a/BitNewsletter.php b/BitNewsletter.php index 09bfedc..e878481 100644 --- a/BitNewsletter.php +++ b/BitNewsletter.php @@ -1,12 +1,12 @@ <?php /** - * $Header: /cvsroot/bitweaver/_bit_newsletters/BitNewsletter.php,v 1.16 2006/02/08 23:24:28 spiderr Exp $ + * $Header: /cvsroot/bitweaver/_bit_newsletters/BitNewsletter.php,v 1.17 2006/04/19 13:48:38 squareing Exp $ * * Copyright (c) 2004 bitweaver.org * 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: BitNewsletter.php,v 1.16 2006/02/08 23:24:28 spiderr Exp $ + * $Id: BitNewsletter.php,v 1.17 2006/04/19 13:48:38 squareing Exp $ * * Virtual base class (as much as one can have such things in PHP) for all * derived tikiwiki classes that require database access. @@ -16,7 +16,7 @@ * * @author drewslater <andrew@andrewslater.com>, spiderr <spider@steelsun.com> * - * @version $Revision: 1.16 $ $Date: 2006/02/08 23:24:28 $ $Author: spiderr $ + * @version $Revision: 1.17 $ $Date: 2006/04/19 13:48:38 $ $Author: squareing $ */ /** @@ -136,7 +136,7 @@ class BitNewsletter extends LibertyContent { $gBitSmarty->assign( 'code', $code ); $mail_data = $gBitSmarty->fetch('bitpackage:newsletters/confirm_newsletter_subscription.tpl'); @mail($email, tra('Newsletter subscription information at '). $_SERVER["SERVER_NAME"], $mail_data, - "From: $sender_email\r\nContent-type: text/plain;charset=utf-8\r\n"); + "From: $site_sender_email\r\nContent-type: text/plain;charset=utf-8\r\n"); } else { $query = "delete from `".BIT_DB_PREFIX."mail_subscriptions` where `nl_id`=? and `email`=?"; $result = $this->mDb->query( $query, array( $this->mNewsletterId, $email ) ); @@ -152,7 +152,7 @@ class BitNewsletter extends LibertyContent { function confirmSubscription($code) { global $gBitSmarty; global $gBitUser; - global $sender_email; + global $site_sender_email; $query = "select * from `".BIT_DB_PREFIX."mail_subscriptions` where `code`=?"; $result = $this->mDb->query($query,array($code)); @@ -167,7 +167,7 @@ class BitNewsletter extends LibertyContent { $gBitSmarty->assign('code', $res["code"]); $mail_data = $gBitSmarty->fetch('bitpackage:newsletters/newsletter_welcome.tpl'); @mail($res["email"], tra('Welcome to '). $info["name"] . tra(' at '). $_SERVER["SERVER_NAME"], $mail_data, - "From: $sender_email\r\nContent-type: text/plain;charset=utf-8\r\n"); + "From: $site_sender_email\r\nContent-type: text/plain;charset=utf-8\r\n"); return $this->get_newsletter($res["nl_id"]); } /* diff --git a/admin/admin_newsletters_inc.php b/admin/admin_newsletters_inc.php index 3fff590..988b420 100644 --- a/admin/admin_newsletters_inc.php +++ b/admin/admin_newsletters_inc.php @@ -1,11 +1,11 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_newsletters/admin/admin_newsletters_inc.php,v 1.3 2006/03/01 20:16:18 spiderr Exp $ +// $Header: /cvsroot/bitweaver/_bit_newsletters/admin/admin_newsletters_inc.php,v 1.4 2006/04/19 13:48:39 squareing Exp $ $formNewsletterFeatures = array( "bitmailer_sender_email" => array( 'label' => 'From Email', 'note' => 'If empty, it will default to the site Sender Email', - 'default' => $gBitSystem->getConfig( 'sender_email', $_SERVER['SERVER_ADMIN'] ), + 'default' => $gBitSystem->getConfig( 'site_sender_email', $_SERVER['SERVER_ADMIN'] ), ), "bitmailer_from" => array( 'label' => 'From Name', diff --git a/templates/admin_newsletter_subscriptions.tpl b/templates/admin_newsletter_subscriptions.tpl index 19c3602..d8a7518 100644 --- a/templates/admin_newsletter_subscriptions.tpl +++ b/templates/admin_newsletter_subscriptions.tpl @@ -93,7 +93,7 @@ {if $next_offset >= 0} [<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nl_id}&find={$find}&offset={$next_offset}&sort_mode={$sort_mode}">{tr}next{/tr}</a>] {/if} -{if $direct_pagination eq 'y'} +{if $site_direct_pagination eq 'y'} <br /> {section loop=$cant_pages name=foo} {assign var=selector_offset value=$smarty.section.foo.index|times:$maxRecords} diff --git a/templates/edit_edition.tpl b/templates/edit_edition.tpl index cf37a08..0c77981 100644 --- a/templates/edit_edition.tpl +++ b/templates/edit_edition.tpl @@ -55,7 +55,7 @@ <div class="row"> {formlabel label="Reply-To" for="replyto"} {forminput} - <input type="text" maxlength="250" size="40" name="reply_to" id="replyto" value="{$pageInfo.reply_to|default:$gBitSystem->getConfig('sender_email',$smarty.server.SERVER_ADMIN)|escape:html}" /> + <input type="text" maxlength="250" size="40" name="reply_to" id="replyto" value="{$pageInfo.reply_to|default:$gBitSystem->getConfig('site_sender_email',$smarty.server.SERVER_ADMIN)|escape:html}" /> {formhelp note="This is the email address to which any replies will be sent."} {/forminput} </div> |