Removed double sanitization

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 2cd28c0f782ba536c41c73f62fa1e13addf4ecff..ff7ad1cb9375d2f382b41740d4bd0e1605e42e2c 100644 (file)
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -377,8 +377,8 @@ class OC_Calendar_App{
                $lastmodified = ($last_modified)?$last_modified->getDateTime()->format('U'):0;
                
                $output = array('id'=>(int)$event['id'],
-                                               'title' => htmlspecialchars(($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed')),
-                                               'description' => isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'',
+                                               'title' => ($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed'),
+                                               'description' => isset($vevent->DESCRIPTION)?$vevent->DESCRIPTION->value:'',
                                                'lastmodified'=>$lastmodified);
                
                $dtstart = $vevent->DTSTART;

diff --git a/apps/calendar/templates/part.choosecalendar.rowfields.shared.php b/apps/calendar/templates/part.choosecalendar.rowfields.shared.php
index 6a212858a219eb83fc999bceb5c637b725ed86f6..a23266da0c39a908d7c2e830b97d63111a36a161 100644 (file)
--- a/apps/calendar/templates/part.choosecalendar.rowfields.shared.php
+++ b/apps/calendar/templates/part.choosecalendar.rowfields.shared.php
@@ -1,4 +1,4 @@
 <?php
 echo '<td width="20px"><input id="active_' . $_['share']['owner'] . '_' . $_['share']['calendar']['id'] . '" type="checkbox" onClick="Calendar.UI.Share.activation(this,\'' . $_['share']['owner'] . '\',' . $_['share']['calendar']['id'] . ')"' . ($_['share']['active'] ? ' checked="checked"' : '') . '></td>';
-echo '<td><label for="active_' . $_['share']['owner'] . '_' . $_['share']['calendar']['id'] . '">' . htmlspecialchars($_['share']['calendar']['displayname']) . '</label></td>';
+echo '<td><label for="active_' . $_['share']['owner'] . '_' . $_['share']['calendar']['id'] . '">' . $_['share']['calendar']['displayname'] . '</label></td>';
 echo '<td style="font-style: italic;">' .  $l->t('shared with you by') . ' ' . $_['share']['owner'] . '</td>';
\ No newline at end of file

diff --git a/apps/calendar/templates/part.eventform.php b/apps/calendar/templates/part.eventform.php
index 2d86ce4d3182426cbba4efda1f8c7ee57fcda29e..95eecf26223354968907b6aef343b90e09368fb0 100644 (file)
--- a/apps/calendar/templates/part.eventform.php
+++ b/apps/calendar/templates/part.eventform.php
@@ -18,7 +18,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid
                <tr>
                        <th width="75px"><?php echo $l->t("Title");?>:</th>
                        <td>
-                               <input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Title of the Event");?>" value="<?php echo isset($_['title']) ? htmlspecialchars($_['title']) : '' ?>" maxlength="100" name="title"/>
+                               <input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Title of the Event");?>" value="<?php echo isset($_['title']) ? $_['title'] : '' ?>" maxlength="100" name="title"/>
                        </td>
                </tr>
        </table>
@@ -26,7 +26,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid
                <tr>
                        <th width="75px"><?php echo $l->t("Category");?>:</th>
                        <td>
-                               <input id="category" name="categories" type="text" placeholder="<?php echo $l->t('Separate categories with commas'); ?>" value="<?php echo isset($_['categories']) ? htmlspecialchars($_['categories']) : '' ?>">
+                               <input id="category" name="categories" type="text" placeholder="<?php echo $l->t('Separate categories with commas'); ?>" value="<?php echo isset($_['categories']) ? $_['categories'] : '' ?>">
                                <a class="action edit" onclick="$(this).tipsy('hide');OCCategories.edit();" title="<?php echo $l->t('Edit categories'); ?>"><img alt="<?php echo $l->t('Edit categories'); ?>" src="<?php echo OCP\image_path('core','actions/rename.svg')?>" class="svg action" style="width: 16px; height: 16px;"></a>
                        </td>
                        <?php if(count($_['calendar_options']) > 1) { ?>
@@ -80,7 +80,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid
                        <tr>
                                <th width="85px"><?php echo $l->t("Location");?>:</th>
                                <td>
-                                       <input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Location of the Event");?>" value="<?php echo isset($_['location']) ? htmlspecialchars($_['location']) : '' ?>" maxlength="100"  name="location" />
+                                       <input type="text" style="width:350px;" size="100" placeholder="<?php echo $l->t("Location of the Event");?>" value="<?php echo isset($_['location']) ? $_['location'] : '' ?>" maxlength="100"  name="location" />
                                </td>
                        </tr>
                </table>
@@ -88,7 +88,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid
                        <tr>
                                <th width="85px" style="vertical-align: top;"><?php echo $l->t("Description");?>:</th>
                                <td>
-                                       <textarea style="width:350px;height: 150px;" placeholder="<?php echo $l->t("Description of the Event");?>" name="description"><?php echo isset($_['description']) ? htmlspecialchars($_['description']) : '' ?></textarea>
+                                       <textarea style="width:350px;height: 150px;" placeholder="<?php echo $l->t("Description of the Event");?>" name="description"><?php echo isset($_['description']) ? $_['description'] : '' ?></textarea>
                                </td>
                        </tr>
                </table>

diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php
index b966100cc113c6a8e25eac85fbece983d5b8f1e2..70ff9612157f41757e9966b3cf9d5ebdaa8732e3 100644 (file)
--- a/apps/calendar/templates/part.import.php
+++ b/apps/calendar/templates/part.import.php
@@ -9,7 +9,7 @@
 $calendar_options = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
 $calendar_options[] = array('id'=>'newcal', 'displayname'=>$l->t('create a new calendar'));
 for($i = 0;$i<count($calendar_options);$i++){
-       $calendar_options[$i]['displayname'] = htmlspecialchars($calendar_options[$i]['displayname']);
+       $calendar_options[$i]['displayname'] = $calendar_options[$i]['displayname'];
 }
 echo OCP\html_select_options($calendar_options, $calendar_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
 ?>

diff --git a/apps/calendar/templates/part.showevent.php b/apps/calendar/templates/part.showevent.php
index 3646baf5bb775048028d4b938da73f48dcd88935..a5bbfd5b8f532858289ee3c0d1b421c3f59f4b64 100644 (file)
--- a/apps/calendar/templates/part.showevent.php
+++ b/apps/calendar/templates/part.showevent.php
@@ -10,7 +10,7 @@
                <tr>
                        <th width="75px"><?php echo $l->t("Title");?>:</th>
                        <td>
-                               <?php echo isset($_['title']) ? htmlspecialchars($_['title']) : '' ?>
+                               <?php echo isset($_['title']) ? $_['title'] : '' ?>
                        </td>
                </tr>
        </table>
@@ -79,7 +79,7 @@
                        <tr>
                                <th width="85px"><?php echo $l->t("Location");?>:</th>
                                <td>
-                                       <?php echo isset($_['location']) ? htmlspecialchars($_['location']) : '' ?>
+                                       <?php echo isset($_['location']) ? $_['location'] : '' ?>
                                </td>
                        </tr>
                </table>
@@ -87,7 +87,7 @@
                        <tr>
                                <th width="85px" style="vertical-align: top;"><?php echo $l->t("Description");?>:</th>
                                <td>
-                                       <?php echo isset($_['description']) ? htmlspecialchars($_['description']) : '' ?></textarea>
+                                       <?php echo isset($_['description']) ? $_['description'] : '' ?></textarea>
                        </tr>
                </table>
        </div>