[TikiWiki-commits] [Git][tikiwiki/tiki][28.x] [BP][FIX] Calendar: Use SEFURL for event links in the calendar RSS feed

MAGENE Sem Joel pushed to branch 28.x at Tiki Wiki CMS Groupware / Tiki


Commits:
789fd026 by MAGENE Sem Joel at 2025-11-04T14:51:35+00:00
[BP][FIX] Calendar: Use SEFURL for event links in the calendar RSS feed
---
* [BP][FIX] Calendar: Use SEFURL for event links in the calendar RSS feed
---
* [FIX] Calendar: Use SEFURL for event links in the calendar RSS feed
---
* [FIX] Calendar: Use SEFURL for event links in the calendar RSS feed

See merge request tikiwiki/tiki!8795

(cherry picked from commit 7fd1568be56691da1a4c0297c18a2f807d9841f8)

See merge request tikiwiki/tiki!8951

(cherry picked from commit a57be4dfb7fa6a63c79ea3cf4c05079d6ae6dd5f)

See merge request tikiwiki/tiki!8956

- - - - -


2 changed files:

- lib/smarty_tiki/Modifier/Sefurl.php
- tiki-calendars_rss.php


Changes:

=====================================
lib/smarty_tiki/Modifier/Sefurl.php
=====================================
@@ -56,7 +56,7 @@ class Sefurl
                 break;
 
             case 'calendaritem':
-                $href = "tiki-ajax_services.php?controller=calendar&action=view_item&calitemId=$source";
+                $href = $sefurl ? "tiki-calendar-view_item?calitemId=$source" : "tiki-ajax_services.php?controller=calendar&action=view_item&calitemId=$source";
                 break;
 
             case 'calendar event':


=====================================
tiki-calendars_rss.php
=====================================
@@ -5,6 +5,7 @@
 // All Rights Reserved. See copyright.txt for details and a complete list of authors.
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 require_once('tiki-setup.php');
+require_once('tiki-sefurl.php');
 $rsslib = TikiLib::lib('rss');
 $calendarlib = TikiLib::lib('calendar');
 
@@ -45,7 +46,6 @@ if ($output["data"] == "EMPTY") {
     $descId = "body";
     $dateId = "start";
     $authorId = "user";
-    $readrepl = "tiki-ajax_services.php?controller=calendar&action=view_item&calitemId=%s";
 
     $rawcals = $calendarlib->list_calendars();
     $rawcals['data'] = Perms::filter([ 'type' => 'calendar' ], 'object', $rawcals['data'], [ 'object' => 'calendarId' ], 'view_calendar');
@@ -73,13 +73,14 @@ if ($output["data"] == "EMPTY") {
          $item["body"] .= "<abbr class=\"dtstart\" title=\"" . $start_d . "\">" . tra("Start:") . " " . smarty_modifier_tiki_long_datetime($item["start"]) . "</abbr>" . "<br />\n";
         $item["body"] .= "<abbr class=\"dtend\" title=\"" . $end_d . "\">" . tra("End:") . " " . smarty_modifier_tiki_long_datetime($item["end"]) . "</abbr>" . "<br />\n";
         $item["body"] .= "<span class=\"description\">" . ($item["description"]) . "</span>" . "</div>";
+        $item["sefurl"] = smarty_modifier_sefurl($item["calitemId"], 'calendaritem');
     }
     unset($item);
 
     $changes = ['data' => $items];
     unset($items);
 
-    $output = $rsslib->generate_feed($feed, $uniqueid, '', $changes, $readrepl, '', $id, $title, $titleId, $desc, $descId, $dateId, $authorId);
+    $output = $rsslib->generate_feed($feed, $uniqueid, '', $changes, '', '', $id, $title, $titleId, $desc, $descId, $dateId, $authorId);
 }
 header("Content-type: " . $output["content-type"]);
 print $output["data"];



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/789fd026cd28e913c8f313cd90bb89f91a39fa54

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/789fd026cd28e913c8f313cd90bb89f91a39fa54
You're receiving this email because of your account on gitlab.com.

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs