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/editwebpage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/editwebpage.php')

diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index 840bda336..85bd9e918 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -164,7 +164,7 @@ function editwebpage_content(&$a) {
 		'$jotnets' => $jotnets,
 		'$mimeselect' => $mimeselect,
 		'$layoutselect' => $layoutselect,
-		'$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 aafc40069bf0955d935adb4632650c7c990063a7 Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Wed, 1 Jan 2014 16:18:39 +0100
Subject: Confirm webpage deletion prompt

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

(limited to 'mod/editwebpage.php')

diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index 85bd9e918..00659b4b7 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -112,7 +112,8 @@ function editwebpage_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 webpage?')
 	));
 
 	
@@ -185,7 +186,7 @@ function editwebpage_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 Webpage') . '</a><br />';
+		$o .= '<br /><br /><a class="page-delete-link" href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Webpage') . '</a><br />';
 
 	return $o;
 
-- 
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/editwebpage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/editwebpage.php')

diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index 00659b4b7..e1de09e37 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -136,7 +136,7 @@ function editwebpage_content(&$a) {
 
 	$o .= replace_macros($tpl,array(
 		'$return_path' => $rp,
-		'$webpage' => true,
+		'$webpage' => ITEM_WEBPAGE,
 		'$placeholdpagetitle' => t('Page link title'),
 		'$pagetitle' => $page_title,
 
-- 
cgit v1.2.3


From 5fd3ca36f8e7b34845e96c779279d64e98be84ed Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Sun, 12 Jan 2014 00:49:23 +0100
Subject: Fix page layout selector

---
 mod/editwebpage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mod/editwebpage.php')

diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index e1de09e37..f11210eea 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -99,8 +99,8 @@ function editwebpage_content(&$a) {
 	if($layout)
 		$layoutselect = '<input type="hidden" name="layout_mid" value="' . $layout . '" />'; 			
 	else
-		$layoutselect = layout_select($itm[0]['uid']);
-
+		$layoutselect = layout_select($itm[0]['uid'],$itm[0]['layout_mid']);
+		
 
 	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
 		'$title' => t('Edit Webpage')
-- 
cgit v1.2.3