diff options
| -rw-r--r-- | admin/admin_newsletter_subscriptions.php | 4 | ||||
| -rw-r--r-- | admin/schema_inc.php | 6 | ||||
| -rw-r--r-- | admin/send.php | 4 | ||||
| -rw-r--r-- | edition_edit.php | 8 | ||||
| -rw-r--r-- | index.php | 16 | ||||
| -rw-r--r-- | templates/admin_newsletter_subscriptions.tpl | 2 |
6 files changed, 20 insertions, 20 deletions
diff --git a/admin/admin_newsletter_subscriptions.php b/admin/admin_newsletter_subscriptions.php index 17114e1..e9058aa 100644 --- a/admin/admin_newsletter_subscriptions.php +++ b/admin/admin_newsletter_subscriptions.php @@ -1,6 +1,6 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_newsletters/admin/admin_newsletter_subscriptions.php,v 1.3 2005/12/29 15:31:32 spiderr Exp $ +// $Header: /cvsroot/bitweaver/_bit_newsletters/admin/admin_newsletter_subscriptions.php,v 1.4 2006/04/20 16:24:47 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. @@ -9,7 +9,7 @@ // Initialization require_once( '../../bit_setup_inc.php' ); $gBitSystem->verifyPackage( 'newsletters' ); -$gBitSystem->verifyPermission( 'tiki_p_admin_newsletters' ); +$gBitSystem->verifyPermission( 'p_admin_newsletters' ); require_once( NEWSLETTERS_PKG_PATH.'lookup_newsletter_inc.php' ); diff --git a/admin/schema_inc.php b/admin/schema_inc.php index 548c8d3..86d970c 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -11,7 +11,7 @@ $tables = array( unsub_msg C(1) default 'y', validate_addr C(1) default 'y', frequency I8 - CONSTRAINT ', CONSTRAINT `tiki_nl_con_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content`( `content_id` )' + CONSTRAINT ', CONSTRAINT `nl_con_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content`( `content_id` )' ", 'newsletters_editions' => " @@ -20,8 +20,8 @@ $tables = array( is_draft C(1), reply_to C(160), content_id I4 NOTNULL - CONSTRAINT ', CONSTRAINT `tiki_nl_ed_nl_con_ref` FOREIGN KEY (`nl_content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content`( `content_id` ) - , CONSTRAINT `tiki_nl_ed_con_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content`( `content_id` )' + CONSTRAINT ', CONSTRAINT `nl_ed_nl_con_ref` FOREIGN KEY (`nl_content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content`( `content_id` ) + , CONSTRAINT `nl_ed_con_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content`( `content_id` )' ", 'mail_subscriptions' => " diff --git a/admin/send.php b/admin/send.php index d7a1bc9..bb1b50e 100644 --- a/admin/send.php +++ b/admin/send.php @@ -1,6 +1,6 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_newsletters/admin/send.php,v 1.12 2006/03/23 16:40:40 squareing Exp $ +// $Header: /cvsroot/bitweaver/_bit_newsletters/admin/send.php,v 1.13 2006/04/20 16:24:47 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. @@ -11,7 +11,7 @@ require_once( '../../bit_setup_inc.php' ); include_once( NEWSLETTERS_PKG_PATH.'BitMailer.php' ); $gBitSystem->verifyPackage( 'newsletters' ); -$gBitSystem->verifyPermission( 'tiki_p_admin_newsletters' ); +$gBitSystem->verifyPermission( 'p_admin_newsletters' ); require_once( NEWSLETTERS_PKG_PATH.'lookup_newsletter_edition_inc.php' ); diff --git a/edition_edit.php b/edition_edit.php index c5b057c..b457508 100644 --- a/edition_edit.php +++ b/edition_edit.php @@ -65,10 +65,10 @@ if (isset($_REQUEST["preview"])) { } elseif (isset($_REQUEST["save"])) { if( $gContent->store( $_REQUEST ) ) { // Add the content to the search index - if( $gBitSystem->isPackageActive( 'search' ) and $gBitSystem->isFeatureActive("search_index_on_submit")) { - require_once( SEARCH_PKG_PATH.'refresh_functions.php'); - refresh_index_tiki_content($gContent->mContentId); - } +// if( $gBitSystem->isPackageActive( 'search' ) and $gBitSystem->isFeatureActive("search_index_on_submit")) { +// require_once( SEARCH_PKG_PATH.'refresh_functions.php'); +// refresh_index_tiki_content($gContent->mContentId); +// } header( 'Location: '.$gContent->getDisplayUrl() ); die; } else { @@ -1,5 +1,5 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_newsletters/index.php,v 1.17 2006/04/11 13:06:51 squareing Exp $ +// $Header: /cvsroot/bitweaver/_bit_newsletters/index.php,v 1.18 2006/04/20 16:24:47 squareing Exp $ // Copyright (c) 2006 - bitweaver.org - Christian Fowler, Max Kremmel, et. al // All Rights Reserved. See copyright.txt for details and a complete list of authors. @@ -83,7 +83,7 @@ if( isset( $_REQUEST["subscribe"] ) ) { $gBitSystem->verifyPermission( 'p_newsletters_subscribe' ); $feedback['success'] = tra( "Thanks for your subscription. You will receive an email soon to confirm your subscription. No newsletters will be sent to you until the subscription is confirmed." ); - if( !$gBitUser->hasPermission( 'tiki_p_subscribe_email' ) ) { + if( !$gBitUser->hasPermission( 'p_subscribe_email' ) ) { $_REQUEST["email"] = $gBitUser->mInfo['email']; } @@ -102,15 +102,15 @@ if( $gContent->isValid() ) { if ($userlib->object_has_one_permission($newsletters["data"][$i]["nl_id"], 'newsletters')) { $newsletters["data"][$i]["individual"] = 'y'; - if ($userlib->object_has_permission($user, $newsletters["data"][$i]["nl_id"], 'newsletter', 'tiki_p_subscribe_newsletters')) { - $newsletters["data"][$i]["individual_tiki_p_subscribe_newsletters"] = 'y'; + if ($userlib->object_has_permission($user, $newsletters["data"][$i]["nl_id"], 'newsletter', 'p_subscribe_newsletters')) { + $newsletters["data"][$i]["individual_p_subscribe_newsletters"] = 'y'; } else { - $newsletters["data"][$i]["individual_tiki_p_subscribe_newsletters"] = 'n'; + $newsletters["data"][$i]["individual_p_subscribe_newsletters"] = 'n'; } - if ($tiki_p_admin == 'y' - || $userlib->object_has_permission($user, $newsletters["data"][$i]["nl_id"], 'newsletter', 'tiki_p_admin_newsletters')) { - $newsletters["data"][$i]["individual_tiki_p_subscribe_newsletters"] = 'y'; + if ($p_admin == 'y' + || $userlib->object_has_permission($user, $newsletters["data"][$i]["nl_id"], 'newsletter', 'p_admin_newsletters')) { + $newsletters["data"][$i]["individual_p_subscribe_newsletters"] = 'y'; } } else { $newsletters["data"][$i]["individual"] = 'n'; diff --git a/templates/admin_newsletter_subscriptions.tpl b/templates/admin_newsletter_subscriptions.tpl index d8a7518..67c5b80 100644 --- a/templates/admin_newsletter_subscriptions.tpl +++ b/templates/admin_newsletter_subscriptions.tpl @@ -75,7 +75,7 @@ <tr class="{cycle}"> <td>{$channels[user].email}</td> <td>{$channels[user].valid}</td> -<td>{$channels[user].subscribed|tiki_short_datetime}</td> +<td>{$channels[user].subscribed|bit_short_datetime}</td> <td> <a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nl_id}&offset={$offset}&sort_mode={$sort_mode}&remove={$channels[user].nl_id}&email={$channels[user].email}">{tr}remove{/tr}</a> </td> |