From bf7e18063882d15289f01b0e9ee91482efa1f30f Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Thu, 28 Feb 2013 18:26:55 +0100
Subject: [PATCH] Replace echo with p

---
 templates/contacts.php       |  8 ++++----
 templates/part.cropphoto.php | 12 ++++++------
 templates/settings.php       |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/templates/contacts.php b/templates/contacts.php
index 6c38d7cf..ae3ec567 100644
--- a/templates/contacts.php
+++ b/templates/contacts.php
@@ -89,8 +89,8 @@
 		</div>
 	</div>
 	<div id="firstrun" class="hidden">
-		<?php echo $l->t('<h3>You have no contacts in your addressbook.</h3>'
-			. '<p>Add a new contact or import existing contacts from a VCF file.</p>') ?>
+		<?php print_unescaped($l->t('<h3>You have no contacts in your addressbook.</h3>'
+			. '<p>Add a new contact or import existing contacts from a VCF file.</p>')) ?>
 		<div id="selections">
 			<button class="addcontact icon-plus text"><?php p($l->t('Add contact')) ?></button>
 			<button class="import icon text"><?php p($l->t('Import')) ?></button>
@@ -103,7 +103,7 @@
 		method="post"
 		enctype="multipart/form-data"
 		target="crop_target"
-		action="<?php echo OCP\Util::linkToAbsolute('contacts', 'ajax/savecrop.php'); ?>">
+		action="<?php print_unescaped(OCP\Util::linkToAbsolute('contacts', 'ajax/savecrop.php')); ?>">
 		<input type="hidden" id="id" name="id" value="{id}" />
 		<input type="hidden" id="tmpkey" name="tmpkey" value="{tmpkey}" />
 		<fieldset id="coords">
@@ -128,7 +128,7 @@
 <script id="contactListItemTemplate" type="text/template">
 	<tr class="contact" data-id="{id}">
 		<td class="name"
-			style="background: url('<?php echo OC_Helper::linkToRemoteBase('contactthumbnail'); ?>?id={id}')">
+			style="background: url('<?php print_unescaped(OC_Helper::linkToRemoteBase('contactthumbnail')); ?>?id={id}')">
 			<input type="checkbox" name="id" value="{id}" /><span class="nametext">{name}</span>
 		</td>
 		<td class="email">
diff --git a/templates/part.cropphoto.php b/templates/part.cropphoto.php
index 88547599..0fde880a 100644
--- a/templates/part.cropphoto.php
+++ b/templates/part.cropphoto.php
@@ -4,17 +4,17 @@ $tmpkey = $_['tmpkey'];
 $requesttoken = $_['requesttoken'];
 ?>
 <?php if(OC_Cache::hasKey($tmpkey)) { ?>
-<img id="cropbox" src="<?php echo OCP\Util::linkToAbsolute('contacts', 'tmpphoto.php'); ?>?tmpkey=<?php echo $tmpkey; ?>" />
+<img id="cropbox" src="<?php print_unescaped(OCP\Util::linkToAbsolute('contacts', 'tmpphoto.php')); ?>?tmpkey=<?php p($tmpkey); ?>" />
 <form id="cropform"
 	class="coords"
 	method="post"
 	enctype="multipart/form-data"
 	target="crop_target"
-	action="<?php echo OCP\Util::linkToAbsolute('contacts', 'ajax/savecrop.php'); ?>">
+	action="<?php print_unescaped(OCP\Util::linkToAbsolute('contacts', 'ajax/savecrop.php')); ?>">
 
-	<input type="hidden" id="id" name="id" value="<?php echo $id; ?>" />
-	<input type="hidden" name="requesttoken" value="<?php echo $requesttoken; ?>">
-	<input type="hidden" id="tmpkey" name="tmpkey" value="<?php echo $tmpkey; ?>" />
+	<input type="hidden" id="id" name="id" value="<?php p($id); ?>" />
+	<input type="hidden" name="requesttoken" value="<?php p($requesttoken); ?>">
+	<input type="hidden" id="tmpkey" name="tmpkey" value="<?php p($tmpkey); ?>" />
 	<fieldset id="coords">
 	<input type="hidden" id="x1" name="x1" value="" />
 	<input type="hidden" id="y1" name="y1" value="" />
@@ -25,7 +25,7 @@ $requesttoken = $_['requesttoken'];
 	</fieldset>
 	<iframe name="crop_target" id='crop_target' src=""></iframe>
 </form>
-<script type="text/javascript" src="<?php echo OC_Helper::linkTo('contacts/js', 'jcrop.js');?>"></script>
+<script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkTo('contacts/js', 'jcrop.js'));?>"></script>
 <?php
 } else {
 	p($l->t('The temporary image has been removed from cache.'));
diff --git a/templates/settings.php b/templates/settings.php
index 3e695747..cce52d0e 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -3,9 +3,9 @@
 		<?php p($l->t('CardDAV syncing addresses')); ?> (<a href="http://owncloud.org/synchronisation/" target="_blank"><?php p($l->t('more info')); ?></a>)
 		<dl>
 		<dt><?php p($l->t('Primary address (Kontact et al)')); ?></dt>
-		<dd><code><?php echo OCP\Util::linkToRemote('carddav'); ?></code></dd>
+		<dd><code><?php print_unescaped(OCP\Util::linkToRemote('carddav')); ?></code></dd>
 		<dt><?php p($l->t('iOS/OS X')); ?></dt>
-		<dd><code><?php echo OCP\Util::linkToRemote('carddav'); ?>principals/<?php echo OCP\USER::getUser(); ?></code>/</dd>
+		<dd><code><?php print_unescaped(OCP\Util::linkToRemote('carddav')); ?>principals/<?php p(OCP\USER::getUser()); ?></code>/</dd>
 		</dl>
 		<div class="addressbooks-settings hidden">
 			<?php p($l->t('Addressbooks')); ?>
@@ -17,7 +17,7 @@
 				>
 				<td class="active">
 					<?php if($addressbook['permissions'] & OCP\PERMISSION_UPDATE) { ?>
-					<input type="checkbox" <?php echo (($addressbook['active']) == '1' ? ' checked="checked"' : ''); ?> />
+					<input type="checkbox" <?php print_unescaped((($addressbook['active']) == '1' ? ' checked="checked"' : '')); ?> />
 					<?php } ?>
 				</td>
 				<td class="name"><?php p($addressbook['displayname']) ?></td>
@@ -38,7 +38,7 @@
 				</td>
 				<td class="action">
 					<a class="svg action download" title="<?php p($l->t('Download')); ?>"
-						href="<?php echo OCP\Util::linkToAbsolute('contacts', 'export.php'); ?>?bookid=<?php p($addressbook['id']) ?>"></a>
+						href="<?php print_unescaped(OCP\Util::linkToAbsolute('contacts', 'export.php')); ?>?bookid=<?php p($addressbook['id']) ?>"></a>
 				</td>
 				<td class="action">
 					<?php if($addressbook['permissions'] & OCP\PERMISSION_UPDATE) { ?>