summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BitNewsletter.php4
-rw-r--r--BitNewsletterEdition.php4
-rw-r--r--BitNewsletterMailer.php4
-rw-r--r--admin/admin_newsletter_subscriptions.php4
-rw-r--r--admin/admin_newsletters.php4
-rw-r--r--admin/send.php2
-rw-r--r--edition.php2
-rw-r--r--edition_edit.php2
-rw-r--r--newsletters.php4
-rw-r--r--sub.php2
-rw-r--r--templates/center_list_newsletters.php2
11 files changed, 17 insertions, 17 deletions
diff --git a/BitNewsletter.php b/BitNewsletter.php
index 1beb7e3..b08d6d2 100644
--- a/BitNewsletter.php
+++ b/BitNewsletter.php
@@ -22,8 +22,8 @@
/**
* required setup
*/
-require_once( LIBERTY_PKG_PATH.'LibertyContent.php' );
-require_once( NEWSLETTERS_PKG_PATH.'BitNewsletterEdition.php' );
+require_once( LIBERTY_PKG_CLASS_PATH.'LibertyContent.php' );
+require_once( NEWSLETTERS_PKG_CLASS_PATH.'BitNewsletterEdition.php' );
define( 'BITNEWSLETTER_CONTENT_TYPE_GUID', 'bitnewsletter' );
diff --git a/BitNewsletterEdition.php b/BitNewsletterEdition.php
index 9309c0b..37b418b 100644
--- a/BitNewsletterEdition.php
+++ b/BitNewsletterEdition.php
@@ -21,8 +21,8 @@
/**
* required setup
*/
-require_once( NEWSLETTERS_PKG_PATH.'BitNewsletter.php' );
-require_once( LIBERTY_PKG_PATH.'LibertyMime.php' );
+require_once( NEWSLETTERS_PKG_CLASS_PATH.'BitNewsletter.php' );
+require_once( LIBERTY_PKG_CLASS_PATH.'LibertyMime.php' );
define( 'BITNEWSLETTEREDITION_CONTENT_TYPE_GUID', 'bitnewsletteredn' );
diff --git a/BitNewsletterMailer.php b/BitNewsletterMailer.php
index 1362bd7..3759451 100644
--- a/BitNewsletterMailer.php
+++ b/BitNewsletterMailer.php
@@ -22,7 +22,7 @@
* required setup
*/
require_once( NEWSLETTERS_PKG_PATH.'BitNewsletter.php' );
-require_once( UTIL_PKG_INC.'phpmailer/class.phpmailer.php' );
+require_once( UTIL_PKG_INCLUDE_PATH.'phpmailer/class.phpmailer.php' );
/**
* @package newsletters
@@ -180,7 +180,7 @@ class BitNewsletterMailer {
$mailer->Password = $gBitSystem->getConfig( 'bitmailer_smtp_password' );
}
$mailer->WordWrap = $gBitSystem->getConfig( 'bitmailer_word_wrap', 75 );
- if( !$mailer->SetLanguage( $gBitLanguage->getLanguage(), UTIL_PKG_INC.'phpmailer/language/' ) ) {
+ if( !$mailer->SetLanguage( $gBitLanguage->getLanguage(), UTIL_PKG_INCLUDE_PATH.'phpmailer/language/' ) ) {
$mailer->SetLanguage( 'en' );
}
$mailer->ClearReplyTos();
diff --git a/admin/admin_newsletter_subscriptions.php b/admin/admin_newsletter_subscriptions.php
index e9cd96c..fdf1ddd 100644
--- a/admin/admin_newsletter_subscriptions.php
+++ b/admin/admin_newsletter_subscriptions.php
@@ -11,7 +11,7 @@ require_once( '../../kernel/setup_inc.php' );
$gBitSystem->verifyPackage( 'newsletters' );
$gBitSystem->verifyPermission( 'p_admin_newsletters' );
-require_once( NEWSLETTERS_PKG_PATH.'lookup_newsletter_inc.php' );
+require_once( NEWSLETTERS_PKG_INCLUDE_PATH.'lookup_newsletter_inc.php' );
if( $gContent->isValid() ) {
$nl_id = $_REQUEST['nl_id'];
@@ -104,7 +104,7 @@ if( $gContent->isValid() ) {
/*
$cat_type='newsletter';
$cat_objid = $_REQUEST["nl_id"];
-include_once( CATEGORIES_PKG_PATH.'categorize_list_inc.php' );
+include_once( CATEGORIES_PKG_INCLUDE_PATH.'categorize_list_inc.php' );
*/
// Display the template
diff --git a/admin/admin_newsletters.php b/admin/admin_newsletters.php
index 26376b4..51812e6 100644
--- a/admin/admin_newsletters.php
+++ b/admin/admin_newsletters.php
@@ -11,7 +11,7 @@ require_once( '../../kernel/setup_inc.php' );
$gBitSystem->verifyPackage( 'newsletters' );
$gBitSystem->verifyPermission( 'p_newsletters_create' );
-require_once( NEWSLETTERS_PKG_PATH.'lookup_newsletter_inc.php' );
+require_once( NEWSLETTERS_PKG_INCLUDE_PATH.'lookup_newsletter_inc.php' );
if( isset( $_REQUEST["remove"] ) && $gContent->isValid() ) {
if( !empty( $_REQUEST['cancel'] ) ) {
@@ -58,7 +58,7 @@ $gBitSmarty->assign('freqs', $freqs);
/*
$cat_type='newsletter';
$cat_objid = $_REQUEST["nl_id"];
-include_once( CATEGORIES_PKG_PATH.'categorize_list_inc.php' );
+include_once( CATEGORIES_PKG_INCLUDE_PATH.'categorize_list_inc.php' );
*/
// Display the template
diff --git a/admin/send.php b/admin/send.php
index bd34a5c..9b152be 100644
--- a/admin/send.php
+++ b/admin/send.php
@@ -14,7 +14,7 @@ include_once( NEWSLETTERS_PKG_PATH.'BitNewsletterEdition.php' );
$gBitSystem->verifyPackage( 'newsletters' );
$gBitSystem->verifyPermission( 'p_send_newsletters' );
-require_once( NEWSLETTERS_PKG_PATH.'lookup_newsletter_edition_inc.php' );
+require_once( NEWSLETTERS_PKG_INCLUDE_PATH.'lookup_newsletter_edition_inc.php' );
$feedback = array();
diff --git a/edition.php b/edition.php
index 2436177..66d9d50 100644
--- a/edition.php
+++ b/edition.php
@@ -17,7 +17,7 @@ require_once( '../kernel/setup_inc.php' );
$gBitSystem->verifyPackage( 'newsletters' );
-require_once( NEWSLETTERS_PKG_PATH.'lookup_newsletter_edition_inc.php' );
+require_once( NEWSLETTERS_PKG_INCLUDE_PATH.'lookup_newsletter_edition_inc.php' );
$listHash = array();
$newsletters = $gContent->mNewsletter->getList( $listHash );
diff --git a/edition_edit.php b/edition_edit.php
index f1edfaf..611aaf8 100644
--- a/edition_edit.php
+++ b/edition_edit.php
@@ -18,7 +18,7 @@ require_once( '../kernel/setup_inc.php' );
$gBitSystem->verifyPackage( 'newsletters' );
$gBitSystem->verifyPermission( 'p_newsletters_create_editions' );
-require_once( NEWSLETTERS_PKG_PATH.'lookup_newsletter_edition_inc.php' );
+require_once( NEWSLETTERS_PKG_INCLUDE_PATH.'lookup_newsletter_edition_inc.php' );
$listHash = array();
$newsletters = $gContent->mNewsletter->getList( $listHash );
diff --git a/newsletters.php b/newsletters.php
index 2ee7fd7..d594fbb 100644
--- a/newsletters.php
+++ b/newsletters.php
@@ -19,7 +19,7 @@
$gBitSystem->verifyPackage( 'newsletters' );
$gBitSystem->verifyPermission( 'p_newsletters_create' );
-require_once( NEWSLETTERS_PKG_PATH.'lookup_newsletter_inc.php' );
+require_once( NEWSLETTERS_PKG_INCLUDE_PATH.'lookup_newsletter_inc.php' );
if( isset( $_REQUEST["remove"] ) && $gContent->isValid() ) {
if( !empty( $_REQUEST['cancel'] ) ) {
@@ -69,7 +69,7 @@ $gBitSmarty->assign('freqs', $freqs);
/*
$cat_type='newsletter';
$cat_objid = $_REQUEST["nl_id"];
-include_once( CATEGORIES_PKG_PATH.'categorize_list_inc.php' );
+include_once( CATEGORIES_PKG_INCLUDE_PATH.'categorize_list_inc.php' );
*/
// Display the template
diff --git a/sub.php b/sub.php
index 19dd1f3..8cc3b2c 100644
--- a/sub.php
+++ b/sub.php
@@ -23,7 +23,7 @@ if( !$gBitUser->isRegistered() && !$gBitUser->hasPermission( 'p_newsletters_subs
$gBitSystem->fatalError( tra("You must be logged in to subscribe to newsletters"));
}
-require_once( NEWSLETTERS_PKG_PATH.'lookup_newsletter_inc.php' );
+require_once( NEWSLETTERS_PKG_INCLUDE_PATH.'lookup_newsletter_inc.php' );
$feedback = array();
diff --git a/templates/center_list_newsletters.php b/templates/center_list_newsletters.php
index fa43cd6..e273fd9 100644
--- a/templates/center_list_newsletters.php
+++ b/templates/center_list_newsletters.php
@@ -7,7 +7,7 @@ $gBitSystem->verifyPackage( 'newsletters' );
if( !$gBitUser->isRegistered() && !$gBitUser->hasPermission( 'p_newsletters_subscribe' ) && empty( $_REQUEST["sub"] ) ) {
- require_once( NEWSLETTERS_PKG_PATH.'lookup_newsletter_inc.php' );
+ require_once( NEWSLETTERS_PKG_INCLUDE_PATH.'lookup_newsletter_inc.php' );
/* List newsletters */
$listHash = array();