Moderators: jmacgreg, michael, jheckman, barbarah, btbell, bdgregg, asmecher
if (!$result && $journal->getSetting('subscriptionExpiryPartial')) {
if (isset($articleId)) {
if (isset($publishedArticle)) {
import('subscription.SubscriptionDAO');
$result = $subscriptionDao->isValidSubscription(null, null, $user->getUserId(), $journal->getJournalId(), SUBSCRIPTION_DATE_END, $publishedArticle->getDatePublished());
}
} else if (isset($issueId)) {
$issueDao = &DAORegistry::getDAO('IssueDAO');
$issue = &$issueDao->getIssueById($issueId);
if (isset($issue) && $issue->getPublished()) {
import('subscription.SubscriptionDAO');
$result = $subscriptionDao->isValidSubscription(null, null, $user->getUserId(), $journal->getJournalId(), SUBSCRIPTION_DATE_END, $issue->getDatePublished());
}
}
}--- classes/issue/IssueAction.orig.inc.php 2009-09-04 11:57:41.000000000 -0700
+++ classes/issue/IssueAction.inc.php 2009-09-04 12:00:13.000000000 -0700
@@ -117,14 +117,7 @@
// If no valid subscription, check if there is an expired subscription
// that was valid during publication date of requested content
if (!$result && $journal->getSetting('subscriptionExpiryPartial')) {
- if (isset($articleId)) {
- $publishedArticleDao = &DAORegistry::getDAO('PublishedArticleDAO');
- $publishedArticle = &$publishedArticleDao->getPublishedArticleByArticleId($articleId);
- if (isset($publishedArticle)) {
- import('subscription.SubscriptionDAO');
- $result = $subscriptionDao->isValidSubscription(null, null, $user->getUserId(), $journal->getJournalId(), SUBSCRIPTION_DATE_END, $publishedArticle->getDatePublished());
- }
- } else if (isset($issueId)) {
+ if (isset($issueId)) {
$issueDao = &DAORegistry::getDAO('IssueDAO');
$issue = &$issueDao->getIssueById($issueId);
if (isset($issue) && $issue->getPublished()) {
@@ -151,14 +144,7 @@
// If no valid subscription, check if there is an expired subscription
// that was valid during publication date of requested content
if (!$result && $journal->getSetting('subscriptionExpiryPartial')) {
- if (isset($articleId)) {
- $publishedArticleDao = &DAORegistry::getDAO('PublishedArticleDAO');
- $publishedArticle = &$publishedArticleDao->getPublishedArticleByArticleId($articleId);
- if (isset($publishedArticle)) {
- import('subscription.SubscriptionDAO');
- $result = $subscriptionDao->isValidSubscription(Request::getRemoteDomain(), Request::getRemoteAddr(), null, $journal->getJournalId(), SUBSCRIPTION_DATE_END, $publishedArticle->getDatePublished());
- }
- } else if (isset($issueId)) {
+ if (isset($issueId)) {
$issueDao = &DAORegistry::getDAO('IssueDAO');
$issue = &$issueDao->getIssueById($issueId);
if (isset($issue) && $issue->getPublished()) {
Return to OJS Technical Support
Users browsing this forum: Google [Bot], gustavotonini and 7 guests