From 941f81eb300074b203dd480924f9cf8b9d41a08d Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 12 Dec 2013 02:01:42 -0800
Subject: check that every invocation of htmlspecialchars has the right arg
 list

---
 mod/editlayout.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/editlayout.php')

diff --git a/mod/editlayout.php b/mod/editlayout.php
index f8906d981..542bb8357 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -117,7 +117,7 @@ function editlayout_content(&$a) {
 		'$pvisit' => 'none',
 		'$public' => t('Public post'),
 		'$jotnets' => $jotnets,
-		'$title' => htmlspecialchars($itm[0]['title']),
+		'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
 		'$placeholdertitle' => t('Set title'),
 		'$category' => '',
 		'$placeholdercategory' => t('Categories (comma-separated list)'),
-- 
cgit v1.2.3


From 587c5d3e463548974157ab49c20f9c4246c4a825 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 4 Jan 2014 13:44:43 -0800
Subject: a few fixes to webpage editing

---
 mod/editlayout.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'mod/editlayout.php')

diff --git a/mod/editlayout.php b/mod/editlayout.php
index 542bb8357..e6be1056f 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -97,6 +97,7 @@ function editlayout_content(&$a) {
 	$o .= replace_macros($tpl,array(
 		'$return_path' => $rp,
 		'$action' => 'item',
+		'$webpage' => ITEM_PDL,
 		'$share' => t('Edit'),
 		'$upload' => t('Upload photo'),
 		'$attach' => t('Attach file'),
-- 
cgit v1.2.3


From 7a9ea83382f1e54b183246aebc062f5ad2e16f23 Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Sun, 12 Jan 2014 01:51:30 +0100
Subject: Fix webpage layout title editing

---
 mod/editlayout.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'mod/editlayout.php')

diff --git a/mod/editlayout.php b/mod/editlayout.php
index e6be1056f..86de0e676 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -57,7 +57,11 @@ function editlayout_content(&$a) {
                 intval($owner)
         );
 
-
+	$item_id = q("select * from item_id where service = 'PDL' and iid = %d limit 1",
+		$itm[0]['id']
+	);
+	if($item_id)
+		$layout_title = $item_id[0]['sid'];
 
 	$plaintext = true;
 // You may or may not be a local user.  This won't work,
@@ -120,6 +124,7 @@ function editlayout_content(&$a) {
 		'$jotnets' => $jotnets,
 		'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
 		'$placeholdertitle' => t('Set title'),
+		'$pagetitle' => $layout_title,
 		'$category' => '',
 		'$placeholdercategory' => t('Categories (comma-separated list)'),
 		'$emtitle' => t('Example: bob@example.com, mary@example.com'),
@@ -134,7 +139,7 @@ function editlayout_content(&$a) {
 		'$feature_expire' => 'none',
 		'$expires' => t('Set expiration date'),
 	));
-
+	
 	$ob = get_observer_hash();
 
 	if(($itm[0]['author_xchan'] === $ob) || ($itm[0]['owner_xchan'] === $ob))
-- 
cgit v1.2.3


From 325c5e4e7650329a42f61e9180fe986ef63671b5 Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Sun, 12 Jan 2014 02:29:03 +0100
Subject: delete confirmation popup for blocks and layouts

---
 mod/editlayout.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'mod/editlayout.php')

diff --git a/mod/editlayout.php b/mod/editlayout.php
index 86de0e676..838a219c9 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -78,7 +78,8 @@ function editlayout_content(&$a) {
 		'$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 		'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
 		'$geotag' => $geotag,
-		'$nickname' => $a->user['nickname']
+		'$nickname' => $a->user['nickname'],
+	    '$confirmdelete' => t('Delete layout?')
 	));
 
 
@@ -143,7 +144,7 @@ function editlayout_content(&$a) {
 	$ob = get_observer_hash();
 
 	if(($itm[0]['author_xchan'] === $ob) || ($itm[0]['owner_xchan'] === $ob))
-		$o .= '<br /><br /><a href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Layout') . '</a><br />';
+		$o .= '<br /><br /><a class="layout-delete-link" href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Layout') . '</a><br />';
 
 	return $o;
 
-- 
cgit v1.2.3