diff options
| -rwxr-xr-x[-rw-r--r--] | admin/admin_newsletters.php | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | admin/mail_queue.php | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | admin/send.php | 12 | ||||
| -rwxr-xr-x[-rw-r--r--] | edition.php | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | edition_edit.php | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | index.php | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | lookup_newsletter_edition_inc.php | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | lookup_newsletter_inc.php | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | newsletters.php | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | sub.php | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | templates/center_list_newsletters.php | 5 |
11 files changed, 20 insertions, 32 deletions
diff --git a/admin/admin_newsletters.php b/admin/admin_newsletters.php index 42885e9..05dbd9d 100644..100755 --- a/admin/admin_newsletters.php +++ b/admin/admin_newsletters.php @@ -39,8 +39,8 @@ if( isset( $_REQUEST["remove"] ) && $gContent->isValid() ) { $gContent->invokeServices( 'content_edit_function' ); $newsletters = $gContent->getList( $listHash ); -$gBitSmarty->assignByRef( 'newsletters', $newsletters ); -$gBitSmarty->assignByRef( 'listInfo', $listHash ); +$gBitSmarty->assign( 'newsletters', $newsletters ); +$gBitSmarty->assign( 'listInfo', $listHash ); // Fill array with possible number of questions per page /* @@ -64,4 +64,3 @@ include_once( CATEGORIES_PKG_INCLUDE_PATH.'categorize_list_inc.php' ); // Display the template $gBitSystem->display( 'bitpackage:newsletters/list_newsletters.tpl', NULL, array( 'display_mode' => 'admin' )); -?> diff --git a/admin/mail_queue.php b/admin/mail_queue.php index 7c1efee..0d79434 100644..100755 --- a/admin/mail_queue.php +++ b/admin/mail_queue.php @@ -28,8 +28,7 @@ if( !empty( $_REQUEST['batch_command'] ) && !empty( $_REQUEST['queue_id'] ) ) { if( empty( $_REQUEST['batch_command'] ) || $_REQUEST['batch_command'] != 'send' ) { $listHash = array(); $queue = $gBitNewsletterMailer->getQueue( $listHash ); - $gBitSmarty->assignByRef( 'queue', $queue ); + $gBitSmarty->assign( 'queue', $queue ); $gBitSystem->display( 'bitpackage:newsletters/mail_queue.tpl' , NULL, array( 'display_mode' => 'admin' )); } -?> diff --git a/admin/send.php b/admin/send.php index 93abbef..77f46ae 100644..100755 --- a/admin/send.php +++ b/admin/send.php @@ -33,7 +33,7 @@ $validated = !empty( $_REQUEST["validated"] ) ? TRUE : FALSE; if( $gContent->isValid() && isset( $_REQUEST['preview'] ) && isset( $_REQUEST['send_group'] ) ) { $recipients = $gContent->getRecipients( $_REQUEST['send_group'], $validated, !empty( $_REQUEST['test_mode'] ) ); - $gBitSmarty->assignByRef( 'recipientList', $recipients ); + $gBitSmarty->assign( 'recipientList', $recipients ); $gBitSmarty->assign( 'validated', $validated ); $gBitSmarty->assign( 'sending', TRUE ); } elseif( $gContent->isValid() && isset( $_REQUEST["send"] ) ) { @@ -52,21 +52,19 @@ if( $gContent->isValid() ) { $groupListHash = array(); $groups = $gBitUser->getAllGroups( $groupListHash ); $groups['send_subs']['group_name'] = 'Send to subscribers'; - $gBitSmarty->assignByRef( 'groupList', $groups ); + $gBitSmarty->assign( 'groupList', $groups ); } else { $listHash = array(); $editions = $gContent->getList( $listHash ); - $gBitSmarty->assignByRef( 'editionList', $editions ); + $gBitSmarty->assign( 'editionList', $editions ); /* if( $gBitSystem->isFeatureActive( 'bit_p_use_content_templates' ) ) { $templates = $bitlib->list_templates('newsletters', 0, -1, 'name_asc', ''); - $gBitSmarty->assignByRef('templates', $templates["data"]); + $gBitSmarty->assign('templates', $templates["data"]); }*/ } -$gBitSmarty->assignByRef( 'feedback', $feedback ); +$gBitSmarty->assign( 'feedback', $feedback ); // Display the template $gBitSystem->display( 'bitpackage:newsletters/send_newsletters.tpl' , tra( "Send Newsletter" ).': '.$gContent->getTitle() , array( 'display_mode' => 'admin' )); -?> - diff --git a/edition.php b/edition.php index df1a59a..b07c788 100644..100755 --- a/edition.php +++ b/edition.php @@ -48,7 +48,7 @@ if( $gContent->isValid() ) { } else { $listHash = array(); $editions = $gContent->getList( $listHash ); - $gBitSmarty->assignByRef( 'editionList', $editions ); + $gBitSmarty->assign( 'editionList', $editions ); $gBitSmarty->assign( 'listInfo', $listHash ); $title = tra("List Editions"); $mid = 'bitpackage:newsletters/list_editions.tpl'; @@ -57,4 +57,3 @@ if( $gContent->isValid() ) { // Display the template $gBitSystem->display( $mid, $title , array( 'display_mode' => 'edit' )); -?> diff --git a/edition_edit.php b/edition_edit.php index 2c72b95..2d87faf 100644..100755 --- a/edition_edit.php +++ b/edition_edit.php @@ -62,7 +62,7 @@ if (isset($_REQUEST["preview"])) { $gBitSmarty->assign( 'title',!empty( $_REQUEST["title"] ) ? $_REQUEST["title"] : $gContent->getTitle() ); $parsed = LibertyContent::parseDataHash( $formInfo['data'] ); - $gBitSmarty->assignByRef( 'parsed', $parsed ); + $gBitSmarty->assign( 'parsed', $parsed ); $gContent->invokeServices( 'content_preview_function' ); } elseif (isset($_REQUEST["save"])) { @@ -90,9 +90,8 @@ if( empty( $formInfo ) ) { $formInfo = &$gContent->mInfo; } -$gBitSmarty->assignByRef( 'pageInfo', $formInfo ); +$gBitSmarty->assign( 'pageInfo', $formInfo ); $gBitSmarty->assign( 'errors', $gContent->mErrors ); // Display the template $gBitSystem->display( 'bitpackage:newsletters/edit_edition.tpl', ($gContent->isValid() ? tra( 'Edit Edition' ).': '.$gContent->getTitle() : tra( 'Create New Edition' )) , array( 'display_mode' => 'edit' )); -?> diff --git a/index.php b/index.php index b334f4a..aaa385a 100644..100755 --- a/index.php +++ b/index.php @@ -10,10 +10,9 @@ require_once( '../kernel/includes/setup_inc.php' ); $feedback = array(); $gDefaultCenter = 'bitpackage:newsletters/center_list_newsletters.tpl'; -$gBitSmarty->assignByRef( 'gDefaultCenter', $gDefaultCenter ); +$gBitSmarty->assign( 'gDefaultCenter', $gDefaultCenter ); $gBitSmarty->assign( 'feedback', $feedback ); // Display the template $gBitSystem->display( 'bitpackage:kernel/dynamic.tpl', tra( 'Newsletters' ) , array( 'display_mode' => 'display' )); -?> diff --git a/lookup_newsletter_edition_inc.php b/lookup_newsletter_edition_inc.php index 1d9c1d7..69f2a34 100644..100755 --- a/lookup_newsletter_edition_inc.php +++ b/lookup_newsletter_edition_inc.php @@ -21,8 +21,7 @@ if( empty( $gContent ) || !is_object( $gContent ) || !$gContent->isValid() ) { $nlId = !empty( $_REQUEST['nl_id'] ) ? $_REQUEST['nl_id'] : NULL; $gContent = new BitNewsletterEdition( $editionId, $conId, $nlId ); $gContent->load(); - $gBitSmarty->assignByRef( 'gContent', $gContent ); + $gBitSmarty->assign( 'gContent', $gContent ); } -?> diff --git a/lookup_newsletter_inc.php b/lookup_newsletter_inc.php index d1de888..ca121e6 100644..100755 --- a/lookup_newsletter_inc.php +++ b/lookup_newsletter_inc.php @@ -20,7 +20,6 @@ if( empty( $gContent ) || !is_object( $gContent ) || !$gContent->isValid() ) { $conId = !empty( $_REQUEST['content_id'] ) ? $_REQUEST['content_id'] : !empty( $_REQUEST['nl_content_id'] ) && is_numeric( $_REQUEST['nl_content_id'] ) ? $_REQUEST['nl_content_id'] : NULL; $gContent = new BitNewsletter( $nlId, $conId ); $gContent->load(); - $gBitSmarty->assignByRef( 'gContent', $gContent ); + $gBitSmarty->assign( 'gContent', $gContent ); } -?> diff --git a/newsletters.php b/newsletters.php index 3165d68..419e861 100644..100755 --- a/newsletters.php +++ b/newsletters.php @@ -50,8 +50,8 @@ if( isset( $_REQUEST["remove"] ) && $gContent->isValid() ) { $gContent->invokeServices( 'content_edit_function' ); $newsletters = $gContent->getList( $listHash ); -$gBitSmarty->assignByRef( 'newsletters', $newsletters ); -$gBitSmarty->assignByRef( 'listInfo', $listHash ); +$gBitSmarty->assign( 'newsletters', $newsletters ); +$gBitSmarty->assign( 'listInfo', $listHash ); // Fill array with possible number of questions per page /* @@ -75,4 +75,3 @@ include_once( CATEGORIES_PKG_INCLUDE_PATH.'categorize_list_inc.php' ); // Display the template $gBitSystem->display( 'bitpackage:newsletters/list_newsletters.tpl', NULL, array( 'display_mode' => 'display' )); -?> @@ -30,8 +30,8 @@ $feedback = array(); /* List newsletters */ $listHash = array(); $newsletters = $gContent->getList( $listHash ); -$gBitSmarty->assignByRef( 'subs', BitNewsletter::getUserSubscriptions( $gBitUser->getField( 'user_id' ), $gBitUser->getField( 'email' ) ) ); -$gBitSmarty->assignByRef('newsletters', $newsletters ); +$gBitSmarty->assign( 'subs', BitNewsletter::getUserSubscriptions( $gBitUser->getField( 'user_id' ), $gBitUser->getField( 'email' ) ) ); +$gBitSmarty->assign('newsletters', $newsletters ); $foo = parse_url($_SERVER["REQUEST_URI"]); $gBitSmarty->assign('url_subscribe', httpPrefix(). $foo["path"]); @@ -108,4 +108,3 @@ $gBitSmarty->assign( 'feedback', $feedback ); // Display the template $gBitSystem->display( $mid, $title , array( 'display_mode' => 'display' )); -?> diff --git a/templates/center_list_newsletters.php b/templates/center_list_newsletters.php index 985e371..f6a8a50 100644..100755 --- a/templates/center_list_newsletters.php +++ b/templates/center_list_newsletters.php @@ -18,9 +18,8 @@ if( !$gBitUser->isRegistered() && !$gBitUser->hasPermission( 'p_newsletters_subs $newsletters[$contentId]['editions'] = BitNewsletterEdition::getList( $listHash ); } - $gBitSmarty->assignByRef( 'subs', BitNewsletter::getUserSubscriptions( $gBitUser->getField( 'user_id' ), $gBitUser->getField( 'email' ) ) ); - $gBitSmarty->assignByRef('newsletters', $newsletters ); + $gBitSmarty->assign( 'subs', BitNewsletter::getUserSubscriptions( $gBitUser->getField( 'user_id' ), $gBitUser->getField( 'email' ) ) ); + $gBitSmarty->assign('newsletters', $newsletters ); } -?> |
