From: <flo...@us...> - 2009-07-14 12:16:58
|
Revision: 20116 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=20116&view=rev Author: floh1111 Date: 2009-07-14 12:16:54 +0000 (Tue, 14 Jul 2009) Log Message: ----------- Added ability to send the emails, some bugfixing an butifying Modified Paths: -------------- trunk/lang/de/language.php trunk/lib/reportslib.php trunk/templates/mail/report.tpl trunk/tiki-user_reports_send.php Modified: trunk/lang/de/language.php =================================================================== --- trunk/lang/de/language.php 2009-07-14 12:07:29 UTC (rev 20115) +++ trunk/lang/de/language.php 2009-07-14 12:16:54 UTC (rev 20116) @@ -9420,30 +9420,30 @@ "Tiki RSS feed for the wiki pages" => "Tiki RSS Wiki Feed", "Last modifications to the Wiki." => "Zuletzt geänderte Wikiseiten.", //Report-Translations (Email) -"changes" => "Änderungen", -"change" => "Änderung", -"No changes" => "Keine Änderungen", -"Daily report from" => "Tägliche Zusammenfassung vom", +"changes" => "Aenderungen", +"change" => "Aenderung", +"No changes" => "Keine Aenderungen", +"Daily report from" => "Taegliche Zusammenfassung vom", "Monthly report from" => "Monatliche Zusammenfassung vom", -"Weekly report from" => "Wöchentliche Zusammenfassung vom", -"Report for" => "Zusammenfassung für", +"Weekly report from" => "Woechentliche Zusammenfassung vom", +"Report for" => "Zusammenfassung fuer", "Last Report sent on" => "Letzter Report am", -"Changes in detail:" => "Änderungen im Detail:", -"changed the picture gallery" => "Änderte die Bildergalerie", +"Changes in detail:" => "Aenderungen im Detail:", +"changed the picture gallery" => "aenderte die Bildergalerie", "uploaded the picture" => "lud das Bild", "onto" => "nach", "removed the picture" => "entfernte das Bild", -"edited the wikipage" => "Änderte die Seite", -"this history" => "diese Änderung", -"all history" => "alle Änderungen", -"edited the file gallery" => "änderte das Dateiarchiv", +"edited the wikipage" => "aenderte die Seite", +"this history" => "diese Aenderung", +"all history" => "alle Aenderungen", +"edited the file gallery" => "aenderte das Dateiarchiv", "Last Report sent on" => "Letzter Report am", "Last Report sent on" => "Letzter Report am", "uploaded the file" => "lud die Datei", -"added the file" => "fügte die Datei", -"added the image" => "fügte das Bild", -"added the article" => "fügte den Artikel", -"added the wiki page" => "fügte die Wikiseite", +"added the file" => "fuegte die Datei", +"added the image" => "fuegte das Bild", +"added the article" => "fuegte den Artikel", +"added the wiki page" => "fuegte die Wikiseite", "to the category" => "zur folgenden Kategorie hinzu:", "removed the file" => "entfernte die Datei", "removed the image" => "entfernte das Bild", @@ -9452,17 +9452,17 @@ "from the category" => "von der Kategorie", "created the subcategory" => "erstellte die Unterkategorie", "removed the subcategory" => "entfernte die Unterkategorie", -"edited the category" => "änderte die Kategorie", -"removed the article" => "löschte den Artikel", +"edited the category" => "aenderte die Kategorie", +"removed the article" => "loeschte den Artikel", "created the article" => "erstellte den Artikel", -"edited the article" => "Änderte den Artikel", +"edited the article" => "aenderte den Artikel", "replied to the blog" => "antwortete auf den Blog", "created the topic" => "erstellte das Thema", "at forum" => "im Forum", "replied" => "antwortete", "to the topic" => "auf das Thema", -"Nothing has happened." => "Es wurde nichts g\xE4ndert", -"more changes of the same type..." => "weitere Änderungen der selben Art...", +"Nothing has happened." => "Es wurde nichts gaendert", +"more changes of the same type..." => "weitere Aenderungen der selben Art...", "Use reports to summarise notifications about objects you are watching." => "Nutze Reports um Notifikations in einer Email zusammenzufassen.", "Interval in witch you want to get the reports" => "Intervall in dem dir Reports gesendet werden sollen", "Use reports" => "Reports benutzen", @@ -9471,7 +9471,7 @@ "HTML-Email" => "HTML-Email", "Plain text" => "Nur Text", "Send me an email also if nothing happened" => "Schicke mir eine Email, auch wenn nichts passiert ist", -"Reports are disabled, only standard reporting is available" => "Reports sind ausgeschaltet, nur Standart-Reporting ist verf\xFCgbar", +"Reports are disabled, only standard reporting is available" => "Reports sind ausgeschaltet, nur Standart-Reporting ist verfuegbar", Modified: trunk/lib/reportslib.php =================================================================== --- trunk/lib/reportslib.php 2009-07-14 12:07:29 UTC (rev 20115) +++ trunk/lib/reportslib.php 2009-07-14 12:16:54 UTC (rev 20116) @@ -1,10 +1,10 @@ <?php class reportsLib extends TikiLib{ - + //Sends the Email public function sendEmail($user_data, $report_preferences, $report_cache) { - global $prefs, $smarty; + global $prefs, $smarty, $tikilib; include_once('lib/webmail/tikimaillib.php'); $mail = new TikiMail(); @@ -36,30 +36,19 @@ $subject = tra(ucfirst($report_preferences['interval'])." report from")." ".date("d.m.Y", time())." (".$changes.")"; $mail->setSubject($subject); - $mail_data = $smarty->fetchLang('de', "mail/report.tpl"); - $mail->setText($mail_data); - echo "<pre>"; - echo "Going to ".$user_data['email']."<br>"; - echo "Subject: ".$subject."<br>"; - echo "Message template:<br>".$mail_data; - echo "</pre>"; - - $mail->buildMessage(); - $mail->send(array($user_data['email'])); + $userlang = $tikilib->get_user_preference($user_data['login'], "language", $prefs['site_language']); - $email_test_headers .= 'From: no...@ti...' . "\n"; // needs a valid sender - $email_test_headers .= 'Reply-to: '. $email_test_to . "\n"; + $mail_data = $smarty->fetchLang($userlang, "mail/report.tpl"); if($report_preferences['type']=='plain') - $email_test_headers .= "Content-type: text/plain; charset=utf-8\n"; + $mail->setText($mail_data); else - $email_test_headers .= "Content-type: text/html; charset=utf-8\n"; - - $email_test_headers .= 'X-Mailer: Tiki/'.$TWV->version.' - PHP/' . phpversion() . "\n"; - - $sentmail = mail($user_data['email'], $subject, $mail_data, $email_test_headers); + $mail->setHtml($mail_data); + $mail->buildMessage(); + $mail->send(array($user_data['email'])); + return true; } @@ -84,16 +73,13 @@ } public function makeHtmlEmailBody($report_cache, $report_preferences) { - + //Complete URL to your Tikiwiki installation without ending slash! + $tikiUrl = "http://localhost/trunktest"; + + global $tikilib; $change_array = $this->makeChangeArray($report_cache); - $somethingHasHappened = false; - //URL Prefix - global $tikilib; - $foo = parse_url($_SERVER["REQUEST_URI"]); - $machine = $tikilib->httpPrefix() . dirname( $foo["path"] ); - $morechanges = 0; foreach ($change_array as $somethingHasHappened=>$array) { @@ -112,59 +98,64 @@ $body .= "\r\n"; } - if($key>0) - $body .= " "; - else + if($key>0) { + if($report_preferences['type']=='plain') { + $body .= " "; + } else { + $body .= " "; + } + } else { $body .= "<b>"; + } $body .= $this->makeTime(strtotime($change['time'])).": "; if ($change['event']=='image_gallery_changed' && empty($change['data']['action'])) { - $body .= $change['data']['user']." ".tra("changed the picture gallery")." <a href=\"$machine/tiki-browse_gallery.php?galleryId=".$change['data']['galleryId']."&offset=0&sort_mode=created_desc\">".$change['data']['galleryName']."</a>."; + $body .= $change['data']['user']." ".tra("changed the picture gallery")." <a href=\"$tikiUrl/tiki-browse_gallery.php?galleryId=".$change['data']['galleryId']."&offset=0&sort_mode=created_desc\">".$change['data']['galleryName']."</a>."; } elseif ($change['event']=='image_gallery_changed' && $change['data']['action']=="upload image") { - $body .= "<u>".$change['data']['user']."</u> ".tra("uploaded the picture")." <a href=\"$machine/tiki-browse_image.php?imageId=".$change['data']['imageId']."\">".$change['data']['imageName']."</a> ".tra("onto")." <a href=\"$machine/tiki-browse_gallery.php?galleryId=".$change['data']['galleryId']."&offset=0&sort_mode=created_desc\">".$change['data']['galleryName']."</a>."; + $body .= "<u>".$change['data']['user']."</u> ".tra("uploaded the picture")." <a href=\"$tikiUrl/tiki-browse_image.php?imageId=".$change['data']['imageId']."\">".$change['data']['imageName']."</a> ".tra("onto")." <a href=\"$tikiUrl/tiki-browse_gallery.php?galleryId=".$change['data']['galleryId']."&offset=0&sort_mode=created_desc\">".$change['data']['galleryName']."</a>."; } elseif ($change['event']=='image_gallery_changed' && $change['data']['action']=="remove image") { - $body .= "<u>".$change['data']['user']."</u> ".tra("removed the picture")." <a href=\"$machine/tiki-browse_image.php?imageId=".$change['data']['imageId']."\">".$change['data']['imageName']."</a> ".tra("from")." <a href=\"$machine/tiki-browse_gallery.php?galleryId=".$change['data']['galleryId']."&offset=0&sort_mode=created_desc\">".$change['data']['galleryName']."</a>."; + $body .= "<u>".$change['data']['user']."</u> ".tra("removed the picture")." <a href=\"$tikiUrl/tiki-browse_image.php?imageId=".$change['data']['imageId']."\">".$change['data']['imageName']."</a> ".tra("from")." <a href=\"$tikiUrl/tiki-browse_gallery.php?galleryId=".$change['data']['galleryId']."&offset=0&sort_mode=created_desc\">".$change['data']['galleryName']."</a>."; } elseif ($change['event']=="wiki_page_changed") { - $body .= "<u>".$change['data']['editUser']."</u> ".tra("edited the wikipage")." <a href=\"$machine/tiki-index.php?page=".$change['data']['pageName']."\">".$change['data']['pageName']."</a> (<a href=\"$machine/tiki-pagehistory.php?page=".$change['data']['pageName']."&diff_style=sidediff&compare=Compare&newver=".($change['data']['oldVer']+1)."&oldver=".$change['data']['oldVer']."\">".tra("this history")."</a>, <a href=\"$machine/tiki-pagehistory.php?page=".$change['data']['pageName']."&diff_style=sidediff&compare=Compare&newver=0&oldver=".$change['data']['oldVer']."\">".tra("all history")."</a>)"; + $body .= "<u>".$change['data']['editUser']."</u> ".tra("edited the wikipage")." <a href=\"$tikiUrl/tiki-index.php?page=".$change['data']['pageName']."\">".$change['data']['pageName']."</a> (<a href=\"$tikiUrl/tiki-pagehistory.php?page=".$change['data']['pageName']."&diff_style=sidediff&compare=Compare&newver=".($change['data']['oldVer']+1)."&oldver=".$change['data']['oldVer']."\">".tra("this history")."</a>, <a href=\"$tikiUrl/tiki-pagehistory.php?page=".$change['data']['pageName']."&diff_style=sidediff&compare=Compare&newver=0&oldver=".$change['data']['oldVer']."\">".tra("all history")."</a>)"; } elseif ($change['event']=="file_gallery_changed" && empty($change['data']['action'])) { - $body .= "<u>".$change['data']['user']."</u> ".tra("edited the file gallery")." <a href=\"$machine/tiki-list_file_gallery.php?galleryId=".$change['data']['galleryId']."\">".$change['data']['galleryName']."</a>"; + $body .= "<u>".$change['data']['user']."</u> ".tra("edited the file gallery")." <a href=\"$tikiUrl/tiki-list_file_gallery.php?galleryId=".$change['data']['galleryId']."\">".$change['data']['galleryName']."</a>"; } elseif ($change['event']=="file_gallery_changed" && $change['data']['action']=="upload file") { - $body .= "<u>".$change['data']['user']."</u> ".tra("uploaded the file")." <a href=\"$machine/tiki-download_file.php?fileId=".$change['data']['fileId']."\">".$change['data']['fileName']."</a> ".tra("onto")." <a href=\"$machine/tiki-list_file_gallery.php?galleryId=".$change['data']['galleryId']."\">".$change['data']['galleryName']."</a>."; + $body .= "<u>".$change['data']['user']."</u> ".tra("uploaded the file")." <a href=\"$tikiUrl/tiki-download_file.php?fileId=".$change['data']['fileId']."\">".$change['data']['fileName']."</a> ".tra("onto")." <a href=\"$tikiUrl/tiki-list_file_gallery.php?galleryId=".$change['data']['galleryId']."\">".$change['data']['galleryName']."</a>."; } elseif ($change['event']=="file_gallery_changed" && $change['data']['action']=="remove file") { - $body .= "<u>".$change['data']['user']."</u> ".tra("removed the file")." <a href=\"$machine/tiki-download_file.php?fileId=".$change['data']['fileId']."\">".$change['data']['fileName']."</a> ".tra("from")." <a href=\"$machine/tiki-list_file_gallery.php?galleryId=".$change['data']['galleryId']."\">".$change['data']['galleryName']."</a>."; + $body .= "<u>".$change['data']['user']."</u> ".tra("removed the file")." <a href=\"$tikiUrl/tiki-download_file.php?fileId=".$change['data']['fileId']."\">".$change['data']['fileName']."</a> ".tra("from")." <a href=\"$tikiUrl/tiki-list_file_gallery.php?galleryId=".$change['data']['galleryId']."\">".$change['data']['galleryName']."</a>."; } elseif ($change['event']=="category_changed") { if ($change['data']['action']=="object entered category") { - $body .= "<u>".$change['data']['user']."</u> ".tra("added the ".$change['data']['objectType'])." <a href=\"$machine/".$change['data']['objectUrl']."\">".$change['data']['objectName']."</a> ".tra("to the category")." <a href=\"$machine/tiki-browse_categories.php?parentId=".$change['data']['categoryId']."&deep=off\">".$change['data']['categoryName']."</a>."; + $body .= "<u>".$change['data']['user']."</u> ".tra("added the ".$change['data']['objectType'])." <a href=\"$tikiUrl/".$change['data']['objectUrl']."\">".$change['data']['objectName']."</a> ".tra("to the category")." <a href=\"$tikiUrl/tiki-browse_categories.php?parentId=".$change['data']['categoryId']."&deep=off\">".$change['data']['categoryName']."</a>."; } elseif ($change['data']['action']=="object leaved category") { - $body .= "<u>".$change['data']['user']."</u> ".tra("removed the ".$change['data']['objectType'])." <a href=\"$machine/".$change['data']['objectUrl']."\">".$change['data']['objectName']."</a> ".tra("from the category")." <a href=\"$machine/tiki-browse_categories.php?parentId=".$change['data']['categoryId']."&deep=off\">".$change['data']['categoryName']."</a>."; + $body .= "<u>".$change['data']['user']."</u> ".tra("removed the ".$change['data']['objectType'])." <a href=\"$tikiUrl/".$change['data']['objectUrl']."\">".$change['data']['objectName']."</a> ".tra("from the category")." <a href=\"$tikiUrl/tiki-browse_categories.php?parentId=".$change['data']['categoryId']."&deep=off\">".$change['data']['categoryName']."</a>."; } elseif ($change['data']['action']=="category created") { - $body .= "<u>".$change['data']['user']."</u> ".tra("created the subcategory")." <a href=\"$machine/tiki-browse_categories.php?parentId=".$change['data']['categoryId']."&deep=off\">".$change['data']['categoryName']."</a> ".tra("in")." <a href=\"$machine/tiki-browse_categories.php?parentId=".$change['data']['parentId']."&deep=off\">".$change['data']['parentName']."</a>."; + $body .= "<u>".$change['data']['user']."</u> ".tra("created the subcategory")." <a href=\"$tikiUrl/tiki-browse_categories.php?parentId=".$change['data']['categoryId']."&deep=off\">".$change['data']['categoryName']."</a> ".tra("in")." <a href=\"$tikiUrl/tiki-browse_categories.php?parentId=".$change['data']['parentId']."&deep=off\">".$change['data']['parentName']."</a>."; } elseif ($change['data']['action']=="category removed") { - $body .= "<u>".$change['data']['user']."</u> ".tra("removed the subcategory")." <a href=\"$machine/tiki-browse_categories.php?parentId=".$change['data']['categoryId']."&deep=off\">".$change['data']['categoryName']."</a> ".tra("from")." <a href=\"$machine/tiki-browse_categories.php?parentId=".$change['data']['parentId']."&deep=off\">".$change['data']['parentName']."</a>."; + $body .= "<u>".$change['data']['user']."</u> ".tra("removed the subcategory")." <a href=\"$tikiUrl/tiki-browse_categories.php?parentId=".$change['data']['categoryId']."&deep=off\">".$change['data']['categoryName']."</a> ".tra("from")." <a href=\"$tikiUrl/tiki-browse_categories.php?parentId=".$change['data']['parentId']."&deep=off\">".$change['data']['parentName']."</a>."; } elseif ($change['data']['action']=="category updated") { - $body .= "<u>".$change['data']['user']."</u> ".tra("edited the category")." <a href=\"$machine/tiki-browse_categories.php?parentId=".$change['data']['categoryId']."&deep=off\">".$change['data']['categoryName']."</a>"; + $body .= "<u>".$change['data']['user']."</u> ".tra("edited the category")." <a href=\"$tikiUrl/tiki-browse_categories.php?parentId=".$change['data']['categoryId']."&deep=off\">".$change['data']['categoryName']."</a>"; } } elseif ($change['event']=="article_deleted") { - $body .= "<u>".$change['data']['user']."</u> ".tra("removed the article")." <a href=\"$machine/tiki-read_article.php?articleId=".$change['data']['articleId']."\">".$change['data']['articleTitle']."</a>."; + $body .= "<u>".$change['data']['user']."</u> ".tra("removed the article")." <a href=\"$tikiUrl/tiki-read_article.php?articleId=".$change['data']['articleId']."\">".$change['data']['articleTitle']."</a>."; } elseif ($change['event']=="article_submitted") { - $body .= "<u>".$change['data']['user']."</u> ".tra("created the article")." <a href=\"$machine/tiki-read_article.php?articleId=".$change['data']['articleId']."\">".$change['data']['articleTitle']."</a>."; + $body .= "<u>".$change['data']['user']."</u> ".tra("created the article")." <a href=\"$tikiUrl/tiki-read_article.php?articleId=".$change['data']['articleId']."\">".$change['data']['articleTitle']."</a>."; } elseif ($change['event']=="article_edited") { - $body .= "<u>".$change['data']['user']."</u> ".tra("edited the article")." <a href=\"$machine/tiki-read_article.php?articleId=".$change['data']['articleId']."\">".$change['data']['articleTitle']."</a>."; + $body .= "<u>".$change['data']['user']."</u> ".tra("edited the article")." <a href=\"$tikiUrl/tiki-read_article.php?articleId=".$change['data']['articleId']."\">".$change['data']['articleTitle']."</a>."; } elseif ($change['event']=="blog_post") { - $body .= "<u>".$change['data']['user']."</u> ".tra("replied to the blog")." <a href=\"$machine/tiki-view_blog.php?blogId=".$change['data']['blogId']."\">".$change['data']['blogTitle']."</a> <a href=\"$machine/tiki-view_blog_post.php?postId=\"".$change['data']['postId']."></a>."; + $body .= "<u>".$change['data']['user']."</u> ".tra("replied to the blog")." <a href=\"$tikiUrl/tiki-view_blog.php?blogId=".$change['data']['blogId']."\">".$change['data']['blogTitle']."</a> <a href=\"$tikiUrl/tiki-view_blog_post.php?postId=\"".$change['data']['postId']."></a>."; } elseif ($change['event']=="forum_post_topic") { - $body .= "<u>".$change['data']['user']."</u> ".tra("created the topic")." <a href=\"$machine/tiki-view_forum_thread.php?comments_parentId=".$change['data']['topicId']."&forumId=".$change['data']['forumId']."\">".$change['data']['threadName']."</a> ".tra("at forum")." <a href=\"$machine/tiki-view_forum.php?forumId=".$change['data']['forumId']."\">".$change['data']['forumName']."</a>."; + $body .= "<u>".$change['data']['user']."</u> ".tra("created the topic")." <a href=\"$tikiUrl/tiki-view_forum_thread.php?comments_parentId=".$change['data']['topicId']."&forumId=".$change['data']['forumId']."\">".$change['data']['threadName']."</a> ".tra("at forum")." <a href=\"$tikiUrl/tiki-view_forum.php?forumId=".$change['data']['forumId']."\">".$change['data']['forumName']."</a>."; } elseif ($change['event']=="forum_post_thread") { global $dbTiki; include_once ("lib/commentslib.php"); $commentslib = new Comments($dbTiki); $parent_topic = $commentslib->get_comment($change['data']['topicId']); - $body .= "<u>".$change['data']['user']."</u> <a href=\"$machine/tiki-view_forum_thread.php?forumId=".$change['data']['forumId']."&comments_parentId=".$change['data']['topicId']."#threadId".$change['data']['threadId']."\">".tra("replied")."</a> ".tra("to the topic")." <a href=\"$machine/tiki-view_forum_thread.php?comments_parentId=".$change['data']['topicId']."&forumId=".$change['data']['forumId']."\">".$parent_topic['title']."</a>."; + $body .= "<u>".$change['data']['user']."</u> <a href=\"$tikiUrl/tiki-view_forum_thread.php?forumId=".$change['data']['forumId']."&comments_parentId=".$change['data']['topicId']."#threadId".$change['data']['threadId']."\">".tra("replied")."</a> ".tra("to the topic")." <a href=\"$tikiUrl/tiki-view_forum_thread.php?comments_parentId=".$change['data']['topicId']."&forumId=".$change['data']['forumId']."\">".$parent_topic['title']."</a>."; } if ($key==0) $body .= "</b>"; @@ -186,8 +177,6 @@ } } - //-------------------------------------------------------------------- - function add_user_report($user, $interval, $view, $type, $always_email) { if(!isset($always_email)) $always_email = 0; @@ -300,9 +289,6 @@ $this->query($query,array($user)); return true; } - - //----------------------------- - } global $reportslib; Modified: trunk/templates/mail/report.tpl =================================================================== --- trunk/templates/mail/report.tpl 2009-07-14 12:07:29 UTC (rev 20115) +++ trunk/templates/mail/report.tpl 2009-07-14 12:16:54 UTC (rev 20116) @@ -5,7 +5,7 @@ {else}<br><br>{/if} -{if $report_preferences.type eq 'html'}<u>{/if}{tr}Changes in detail:{/tr}{if $report_preferences.type eq 'html'}<u><br>{else} +{if $report_preferences.type eq 'html'}<u>{/if}{tr}Changes in detail:{/tr}{if $report_preferences.type eq 'html'}</u><br>{else} ----------------------- Modified: trunk/tiki-user_reports_send.php =================================================================== --- trunk/tiki-user_reports_send.php 2009-07-14 12:07:29 UTC (rev 20115) +++ trunk/tiki-user_reports_send.php 2009-07-14 12:16:54 UTC (rev 20116) @@ -9,11 +9,11 @@ if ($prefs['feature_daily_report_watches'] != 'y') { die("This feature is disabled"); } -include_once ('lib/tikilib.php'); include_once ('lib/reportslib.php'); foreach($reportslib->getUsersForSendingReport() as $key => $user) { $report_preferences = $reportslib->get_report_preferences_by_user($user); $user_data = $userlib->get_user_info($user); + //If Emailadress isn´t set, do nothing but clear the cache if (!empty($user_data['email'])) { //Fetch cache This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |