Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[36401] trunk
|
From: <jon...@us...> - 2011-08-23 11:22:46
|
Revision: 36401
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=36401&view=rev
Author: jonnybradley
Date: 2011-08-23 11:22:39 +0000 (Tue, 23 Aug 2011)
Log Message:
-----------
[FIX] calendars: Add temporary pref to cope with calendar items from before Tiki 7 containing HTML (as in Tiki < 7 articles were parsed as is_html=true).
Modified Paths:
--------------
trunk/lib/calendar/calendarlib.php
trunk/lib/prefs/calendar.php
trunk/templates/admin/include_calendar.tpl
trunk/templates/tiki-calendar_edit_item.tpl
trunk/tiki-calendar.php
trunk/tiki-calendar_edit_item.php
trunk/tiki-calendar_json.php
Modified: trunk/lib/calendar/calendarlib.php
===================================================================
--- trunk/lib/calendar/calendarlib.php 2011-08-23 11:09:26 UTC (rev 36400)
+++ trunk/lib/calendar/calendarlib.php 2011-08-23 11:22:39 UTC (rev 36401)
@@ -255,7 +255,7 @@
"category" => $res["categoryName"],
"name" => $res["name"],
"head" => $head,
- "parsedDescription" => $this->parse_data($res["description"]),
+ "parsedDescription" => $this->parse_data($res["description"], array('is_html' => $prefs['calendar_description_is_html'] === 'y')),
"description" => str_replace("\n|\r", "", $res["description"]),
"calendarId" => $res['calendarId'],
"status" => $res['status']
@@ -296,7 +296,7 @@
$ret[$i][$j] = $res;
$ret[$i][$j]['head'] = $head;
- $ret[$i][$j]['parsedDescription'] = $this->parse_data($res["description"]);
+ $ret[$i][$j]['parsedDescription'] = $this->parse_data($res["description"], array('is_html' => $prefs['calendar_description_is_html'] === 'y'));
$ret[$i][$j]['description'] = str_replace("\n|\r", "", $res["description"]);
$ret[$i][$j]['visible'] = 'y';
$ret[$i][$j]['where'] = $res['locationName'];
@@ -312,7 +312,7 @@
}
function get_item($calitemId, $customs=array()) {
- global $user;
+ global $user, $prefs;
$query = "select i.`calitemId` as `calitemId`, i.`calendarId` as `calendarId`, i.`user` as `user`, i.`start` as `start`, i.`end` as `end`, t.`name` as `calname`, ";
$query.= "i.`locationId` as `locationId`, l.`name` as `locationName`, i.`categoryId` as `categoryId`, c.`name` as `categoryName`, i.`priority` as `priority`, i.`nlId` as `nlId`, ";
@@ -348,7 +348,7 @@
$res['date_end'] = (int)$res['end'];
$res['duration'] = $res['end'] - $res['start'];
- $res['parsed'] = $this->parse_data($res['description']);
+ $res['parsed'] = $this->parse_data($res['description'], array('is_html' => $prefs['calendar_description_is_html'] === 'y'));
$res['parsedName'] = $this->parse_data($res['name']);
return $res;
}
@@ -664,7 +664,7 @@
$ret = $this->fetchAll($query,$bindvars,$maxrows,0);
foreach ( $ret as &$res ) {
- $res['parsed'] = $this->parse_data($res['description']);
+ $res['parsed'] = $this->parse_data($res['description'], array('is_html' => $prefs['calendar_description_is_html'] === 'y'));
}
return $ret;
Modified: trunk/lib/prefs/calendar.php
===================================================================
--- trunk/lib/prefs/calendar.php 2011-08-23 11:09:26 UTC (rev 36400)
+++ trunk/lib/prefs/calendar.php 2011-08-23 11:22:39 UTC (rev 36401)
@@ -106,5 +106,11 @@
),
'default' => 'n',
),
+ 'calendar_description_is_html' => array(
+ 'name' => tra('Treat calendar item descriptions as HTML'),
+ 'description' => tra('Use this if you use the WYSIWYG editor for calendars. This is to handle legacy data from Tiki pre 7.0.'),
+ 'type' => 'flag',
+ 'default' => 'y',
+ ),
);
}
Modified: trunk/templates/admin/include_calendar.tpl
===================================================================
--- trunk/templates/admin/include_calendar.tpl 2011-08-23 11:09:26 UTC (rev 36400)
+++ trunk/templates/admin/include_calendar.tpl 2011-08-23 11:22:39 UTC (rev 36401)
@@ -79,6 +79,7 @@
{preference name=feature_action_calendar}
{preference name=calendar_view_tab}
{preference type='multicheckbox' name='calendar_view_days'}
+ {preference name=calendar_description_is_html}
</fieldset>
<div class="input_submit_container clear" style="text-align: center;">
<input type="submit" name="calprefs" value="{tr}Change settings{/tr}" />
Modified: trunk/templates/tiki-calendar_edit_item.tpl
===================================================================
--- trunk/templates/tiki-calendar_edit_item.tpl 2011-08-23 11:09:26 UTC (rev 36400)
+++ trunk/templates/tiki-calendar_edit_item.tpl 2011-08-23 11:22:39 UTC (rev 36401)
@@ -842,7 +842,7 @@
{$calitem.description}
{/textarea}
{else}
- <span class="description">
+ <span{if $prefs.calendar_description_is_html neq "y"} class="description"{/if}>
{$calitem.parsed|default:"<i>{tr}No description{/tr}</i>"}
</span>
{/if}
Modified: trunk/tiki-calendar.php
===================================================================
--- trunk/tiki-calendar.php 2011-08-23 11:09:26 UTC (rev 36400)
+++ trunk/tiki-calendar.php 2011-08-23 11:22:39 UTC (rev 36401)
@@ -280,7 +280,7 @@
$smarty->assign('cellname', $le["name"]);
$smarty->assign('cellurl', $le["web"]);
$smarty->assign('cellid', $le["calitemId"]);
- $smarty->assign('celldescription', $tikilib->parse_data($le["description"]));
+ $smarty->assign('celldescription', $tikilib->parse_data($le["description"], array('is_html' => $prefs['calendar_description_is_html'] === 'y')));
$smarty->assign('cellmodif', $le['modifiable']);
$smarty->assign('cellvisible', $le['visible']);
$smarty->assign('cellstatus', $le['status']);
Modified: trunk/tiki-calendar_edit_item.php
===================================================================
--- trunk/tiki-calendar_edit_item.php 2011-08-23 11:09:26 UTC (rev 36400)
+++ trunk/tiki-calendar_edit_item.php 2011-08-23 11:22:39 UTC (rev 36401)
@@ -357,7 +357,7 @@
$smarty->assign('edit',true);
$hour_minmax = abs(ceil(($calendar['startday']-1)/(60*60))) . '-' . ceil(($calendar['endday'])/(60*60));
} elseif (isset($_REQUEST['preview']) || $impossibleDates) {
- $save['parsed'] = $tikilib->parse_data($save['description']);
+ $save['parsed'] = $tikilib->parse_data($save['description'], array('is_html' => $prefs['calendar_description_is_html'] === 'y'));
$save['parsedName'] = $tikilib->parse_data($save['name']);
$id = $save['calitemId'];
$calitem = $save;
Modified: trunk/tiki-calendar_json.php
===================================================================
--- trunk/tiki-calendar_json.php 2011-08-23 11:09:26 UTC (rev 36400)
+++ trunk/tiki-calendar_json.php 2011-08-23 11:22:39 UTC (rev 36401)
@@ -183,7 +183,7 @@
foreach($listevents as $event) {
$events[] = array ( 'id' => $event['calitemId'],
'title' => $event['name'],
- 'description' => $tikilib->parse_data($event["description"]),
+ 'description' => $tikilib->parse_data($event["description"], array('is_html' => $prefs['calendar_description_is_html'] === 'y')),
'url' => 'tiki-calendar_edit_item.php?viewcalitemId='.$event['calitemId'],
'allDay' => $event['allday'] != 0 ,
'start' => $event['date_start'],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|