Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[41668] branches/9.x
|
From: <xa...@us...> - 2012-05-31 16:28:34
|
Revision: 41668
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=41668&view=rev
Author: xavidp
Date: 2012-05-31 16:28:26 +0000 (Thu, 31 May 2012)
Log Message:
-----------
[FIX][bp/r41487] Daily Reports. Store $base_url in the database with other event data. It is used to construct links in the email when running tiki-user_reports_send.php from cron, because webserver environment variables are not available. thks lrrcenter
Revision Links:
--------------
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=41487&view=rev
Modified Paths:
--------------
branches/9.x/lib/core/Reports/Cache.php
branches/9.x/lib/core/Reports/Send/EmailBuilder/ArticleDeleted.php
branches/9.x/lib/core/Reports/Send/EmailBuilder/ArticleEdited.php
branches/9.x/lib/core/Reports/Send/EmailBuilder/ArticleSubmitted.php
branches/9.x/lib/core/Reports/Send/EmailBuilder/BlogPost.php
branches/9.x/lib/core/Reports/Send/EmailBuilder/CalendarChanged.php
branches/9.x/lib/core/Reports/Send/EmailBuilder/CategoryChanged.php
branches/9.x/lib/core/Reports/Send/EmailBuilder/FileGalleryChanged.php
branches/9.x/lib/core/Reports/Send/EmailBuilder/ForumPostThread.php
branches/9.x/lib/core/Reports/Send/EmailBuilder/ForumPostTopic.php
branches/9.x/lib/core/Reports/Send/EmailBuilder/ImageGalleryChanged.php
branches/9.x/lib/core/Reports/Send/EmailBuilder/TrackerItemComment.php
branches/9.x/lib/core/Reports/Send/EmailBuilder/TrackerItemModified.php
branches/9.x/lib/core/Reports/Send/EmailBuilder/WikiFileAttached.php
branches/9.x/lib/core/Reports/Send/EmailBuilder/WikiPageChanged.php
branches/9.x/lib/core/Reports/Send/EmailBuilder.php
branches/9.x/templates/tiki-user_watches.tpl
Modified: branches/9.x/lib/core/Reports/Cache.php
===================================================================
--- branches/9.x/lib/core/Reports/Cache.php 2012-05-31 16:16:17 UTC (rev 41667)
+++ branches/9.x/lib/core/Reports/Cache.php 2012-05-31 16:28:26 UTC (rev 41668)
@@ -79,6 +79,8 @@
*/
public function add(&$watches, $data, $users)
{
+ $data["base_url"] = TikiLib::tikiURL(); //Store $base_url in the database. Use it to construct links in the email.
+
foreach ($watches as $key => $watch) {
// if user in the watch has enabled periodic reports
if (in_array($watch['user'], $users)) {
Modified: branches/9.x/lib/core/Reports/Send/EmailBuilder/ArticleDeleted.php
===================================================================
--- branches/9.x/lib/core/Reports/Send/EmailBuilder/ArticleDeleted.php 2012-05-31 16:16:17 UTC (rev 41667)
+++ branches/9.x/lib/core/Reports/Send/EmailBuilder/ArticleDeleted.php 2012-05-31 16:28:26 UTC (rev 41668)
@@ -17,7 +17,7 @@
public function getOutput(array $change)
{
- global $base_url;
+ $base_url = $change['data']['base_url'];
$output = '<u>' . $change['data']['user'] . '</u> ' . tra('removed the article') .
" <a href=\"{$base_url}tiki-read_article.php?articleId=" . $change['data']['articleId'] . "\">" . $change['data']['articleTitle'] . '</a>.';
Modified: branches/9.x/lib/core/Reports/Send/EmailBuilder/ArticleEdited.php
===================================================================
--- branches/9.x/lib/core/Reports/Send/EmailBuilder/ArticleEdited.php 2012-05-31 16:16:17 UTC (rev 41667)
+++ branches/9.x/lib/core/Reports/Send/EmailBuilder/ArticleEdited.php 2012-05-31 16:28:26 UTC (rev 41668)
@@ -17,7 +17,7 @@
public function getOutput(array $change)
{
- global $base_url;
+ $base_url = $change['data']['base_url'];
$output = '<u>' . $change['data']['user'] . '</u> ' . tra('edited the article') .
" <a href=\"{$base_url}tiki-read_article.php?articleId=" . $change['data']['articleId'] . "\">" . $change['data']['articleTitle'] . "</a>.";
Modified: branches/9.x/lib/core/Reports/Send/EmailBuilder/ArticleSubmitted.php
===================================================================
--- branches/9.x/lib/core/Reports/Send/EmailBuilder/ArticleSubmitted.php 2012-05-31 16:16:17 UTC (rev 41667)
+++ branches/9.x/lib/core/Reports/Send/EmailBuilder/ArticleSubmitted.php 2012-05-31 16:28:26 UTC (rev 41668)
@@ -17,7 +17,7 @@
public function getOutput(array $change)
{
- global $base_url;
+ $base_url = $change['data']['base_url'];
$output = '<u>' . $change['data']['user'] . '</u> ' . tra('created the article') .
" <a href=\"{$base_url}tiki-read_article.php?articleId=" . $change['data']['articleId'] . "\">" . $change['data']['articleTitle'] . "</a>.";
Modified: branches/9.x/lib/core/Reports/Send/EmailBuilder/BlogPost.php
===================================================================
--- branches/9.x/lib/core/Reports/Send/EmailBuilder/BlogPost.php 2012-05-31 16:16:17 UTC (rev 41667)
+++ branches/9.x/lib/core/Reports/Send/EmailBuilder/BlogPost.php 2012-05-31 16:28:26 UTC (rev 41668)
@@ -17,7 +17,7 @@
public function getOutput(array $change)
{
- global $base_url;
+ $base_url = $change['data']['base_url'];
$output = '<u>' . $change['data']['user'] . '</u> ' .
tra('replied to the blog') .
Modified: branches/9.x/lib/core/Reports/Send/EmailBuilder/CalendarChanged.php
===================================================================
--- branches/9.x/lib/core/Reports/Send/EmailBuilder/CalendarChanged.php 2012-05-31 16:16:17 UTC (rev 41667)
+++ branches/9.x/lib/core/Reports/Send/EmailBuilder/CalendarChanged.php 2012-05-31 16:28:26 UTC (rev 41668)
@@ -17,7 +17,7 @@
public function getOutput(array $change)
{
- global $base_url;
+ $base_url = $change['data']['base_url'];
$calendarlib = TikiLib::lib('calendar');
Modified: branches/9.x/lib/core/Reports/Send/EmailBuilder/CategoryChanged.php
===================================================================
--- branches/9.x/lib/core/Reports/Send/EmailBuilder/CategoryChanged.php 2012-05-31 16:16:17 UTC (rev 41667)
+++ branches/9.x/lib/core/Reports/Send/EmailBuilder/CategoryChanged.php 2012-05-31 16:28:26 UTC (rev 41668)
@@ -17,8 +17,8 @@
public function getOutput(array $change)
{
- global $base_url;
-
+ $base_url = $change['data']['base_url'];
+
if ($change['data']['action'] == 'object entered category') {
$output = '<u>' . $change['data']['user'] . '</u> '.
Modified: branches/9.x/lib/core/Reports/Send/EmailBuilder/FileGalleryChanged.php
===================================================================
--- branches/9.x/lib/core/Reports/Send/EmailBuilder/FileGalleryChanged.php 2012-05-31 16:16:17 UTC (rev 41667)
+++ branches/9.x/lib/core/Reports/Send/EmailBuilder/FileGalleryChanged.php 2012-05-31 16:28:26 UTC (rev 41668)
@@ -17,7 +17,7 @@
public function getOutput(array $change)
{
- global $base_url;
+ $base_url = $change['data']['base_url'];
if (empty($change['data']['action'])) {
$output = tr(
Modified: branches/9.x/lib/core/Reports/Send/EmailBuilder/ForumPostThread.php
===================================================================
--- branches/9.x/lib/core/Reports/Send/EmailBuilder/ForumPostThread.php 2012-05-31 16:16:17 UTC (rev 41667)
+++ branches/9.x/lib/core/Reports/Send/EmailBuilder/ForumPostThread.php 2012-05-31 16:28:26 UTC (rev 41668)
@@ -17,7 +17,8 @@
public function getOutput(array $change)
{
- global $base_url, $dbTiki;
+ global $dbTiki;
+ $base_url = $change['data']['base_url'];
$commentslib = TikiLib::lib('comments');
$parent_topic = $commentslib->get_comment($change['data']['topicId']);
Modified: branches/9.x/lib/core/Reports/Send/EmailBuilder/ForumPostTopic.php
===================================================================
--- branches/9.x/lib/core/Reports/Send/EmailBuilder/ForumPostTopic.php 2012-05-31 16:16:17 UTC (rev 41667)
+++ branches/9.x/lib/core/Reports/Send/EmailBuilder/ForumPostTopic.php 2012-05-31 16:28:26 UTC (rev 41668)
@@ -17,7 +17,7 @@
public function getOutput(array $change)
{
- global $base_url;
+ $base_url = $change['data']['base_url'];
$output = tr(
'%0 created the topic %1 at forum %2',
Modified: branches/9.x/lib/core/Reports/Send/EmailBuilder/ImageGalleryChanged.php
===================================================================
--- branches/9.x/lib/core/Reports/Send/EmailBuilder/ImageGalleryChanged.php 2012-05-31 16:16:17 UTC (rev 41667)
+++ branches/9.x/lib/core/Reports/Send/EmailBuilder/ImageGalleryChanged.php 2012-05-31 16:28:26 UTC (rev 41668)
@@ -17,7 +17,7 @@
public function getOutput(array $change)
{
- global $base_url;
+ $base_url = $change['data']['base_url'];
if (empty($change['data']['action'])) {
Modified: branches/9.x/lib/core/Reports/Send/EmailBuilder/TrackerItemComment.php
===================================================================
--- branches/9.x/lib/core/Reports/Send/EmailBuilder/TrackerItemComment.php 2012-05-31 16:16:17 UTC (rev 41667)
+++ branches/9.x/lib/core/Reports/Send/EmailBuilder/TrackerItemComment.php 2012-05-31 16:28:26 UTC (rev 41668)
@@ -17,7 +17,7 @@
public function getOutput(array $change)
{
- global $base_url;
+ $base_url = $change['data']['base_url'];
$trackerId = $change['data']['trackerId'];
$itemId = $change['data']['itemId'];
Modified: branches/9.x/lib/core/Reports/Send/EmailBuilder/TrackerItemModified.php
===================================================================
--- branches/9.x/lib/core/Reports/Send/EmailBuilder/TrackerItemModified.php 2012-05-31 16:16:17 UTC (rev 41667)
+++ branches/9.x/lib/core/Reports/Send/EmailBuilder/TrackerItemModified.php 2012-05-31 16:28:26 UTC (rev 41668)
@@ -17,7 +17,7 @@
public function getOutput(array $change)
{
- global $base_url;
+ $base_url = $change['data']['base_url'];
$trackerId = $change['data']['trackerId'];
$itemId = $change['data']['itemId'];
Modified: branches/9.x/lib/core/Reports/Send/EmailBuilder/WikiFileAttached.php
===================================================================
--- branches/9.x/lib/core/Reports/Send/EmailBuilder/WikiFileAttached.php 2012-05-31 16:16:17 UTC (rev 41667)
+++ branches/9.x/lib/core/Reports/Send/EmailBuilder/WikiFileAttached.php 2012-05-31 16:28:26 UTC (rev 41668)
@@ -17,7 +17,7 @@
public function getOutput(array $change)
{
- global $base_url;
+ $base_url = $change['data']['base_url'];
$output = tr(
'%0 uploaded the file %1 onto %2',
Modified: branches/9.x/lib/core/Reports/Send/EmailBuilder/WikiPageChanged.php
===================================================================
--- branches/9.x/lib/core/Reports/Send/EmailBuilder/WikiPageChanged.php 2012-05-31 16:16:17 UTC (rev 41667)
+++ branches/9.x/lib/core/Reports/Send/EmailBuilder/WikiPageChanged.php 2012-05-31 16:28:26 UTC (rev 41668)
@@ -17,7 +17,7 @@
public function getOutput(array $change)
{
- global $base_url;
+ $base_url = $change['data']['base_url'];
$newVersion = $change['data']['oldVer'] + 1;
Modified: branches/9.x/lib/core/Reports/Send/EmailBuilder.php
===================================================================
--- branches/9.x/lib/core/Reports/Send/EmailBuilder.php 2012-05-31 16:16:17 UTC (rev 41667)
+++ branches/9.x/lib/core/Reports/Send/EmailBuilder.php 2012-05-31 16:28:26 UTC (rev 41668)
@@ -26,7 +26,7 @@
public function emailBody($user_data, $report_preferences, $report_cache)
{
- global $base_url;
+ $base_url = $report_cache[0]['data']['base_url'];
$smarty = TikiLib::lib('smarty');
@@ -46,7 +46,7 @@
$userWatchesUrl = $base_url . 'tiki-user_watches.php';
if ($report_preferences['type'] == 'html') {
- $userWatchesUrl = "<a href=$userWatchesUrl>$userWatchesUrl</a>";
+ $userWatchesUrl = "<a href=\"{$userWatchesUrl}\">{$userWatchesUrl}</a>";
}
$smarty->assign('userWatchesUrl', $userWatchesUrl);
@@ -97,15 +97,14 @@
*/
public function makeEmailBody(array $report_cache, array $report_preferences)
{
- global $userlib, $base_url;
+ global $userlib;
- $tikiUrl = rtrim($base_url, '/');
-
$change_array = $this->makeChangeArray($report_cache);
$body = '';
$morechanges = 0;
foreach ($change_array as $eventName => $changes) {
+
$eventObject = $this->factory->build($changes[0]['event']);
$body .= '<b>' . $eventObject->getTitle() . "</b><br />\n";
Modified: branches/9.x/templates/tiki-user_watches.tpl
===================================================================
--- branches/9.x/templates/tiki-user_watches.tpl 2012-05-31 16:16:17 UTC (rev 41667)
+++ branches/9.x/templates/tiki-user_watches.tpl 2012-05-31 16:28:26 UTC (rev 41668)
@@ -34,7 +34,7 @@
<div style="float:left; margin-right: 50px;">
<input type="radio" name="view" value="short"{if $report_preferences.view eq "short"} checked="checked"{/if} /> {tr}Short report{/tr}<br />
- <input type="radio" name="view" value="detailed"{if $report_preferences.view eq "detailed" OR $report_preferences eq false}checked="checked"{/if} /> {tr}Detailed report{/tr}<br />
+ <input type="radio" name="view" value="detailed"{if $report_preferences.view eq "detailed" OR $report_preferences eq false} checked="checked"{/if} /> {tr}Detailed report{/tr}<br />
</div>
<div style="float:left; margin-right: 50px;">
<input type="radio" name="type" value="html"{if $report_preferences.type eq "html" OR $report_preferences eq false} checked="checked"{/if} /> {tr}HTML-Email{/tr}<br />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|