aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-04-16 10:43:14 +0200
committerMario Vavti <mario@mariovavti.com>2015-04-16 10:43:14 +0200
commit86ac9c0d6b56651cb79c60a616f8340524d1573e (patch)
tree4f149a01b1c67a68e587c153e655461b95e14e4f /mod
parent32f79374b0e1a6d21204d8a51f2c3c60b28c95ca (diff)
downloadvolse-hubzilla-86ac9c0d6b56651cb79c60a616f8340524d1573e.tar.gz
volse-hubzilla-86ac9c0d6b56651cb79c60a616f8340524d1573e.tar.bz2
volse-hubzilla-86ac9c0d6b56651cb79c60a616f8340524d1573e.zip
move share webpage element from editwebpage to webpages and make it shareable with rpost
Diffstat (limited to 'mod')
-rw-r--r--mod/editwebpage.php15
-rw-r--r--mod/webpages.php19
2 files changed, 16 insertions, 18 deletions
diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index e30a33171..55cd3b4ef 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -221,21 +221,6 @@ logger('canwrite: ' . (perm_is_allowed($owner, get_observer_hash(), 'post_photos
if(($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash))
$o .= '<br /><br /><a class="page-delete-link" href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Webpage') . '</a><br />';
-
- $x = array(
- 'type' => 'webpage',
- 'title' => $itm[0]['title'],
- 'body' => $itm[0]['body'],
- 'term' => $itm[0]['term'],
- 'created' => $itm[0]['created'],
- 'edited' => $itm[0]['edited'],
- 'mimetype' => $itm[0]['mimetype'],
- 'pagetitle' => $page_title,
- 'mid' => $itm[0]['mid']
- );
-
- $o .= EOL . EOL . t('Share') . EOL . '<textarea onclick="this.select();" class="shareable_element_text" >[element]' . base64url_encode(json_encode($x)) . '[/element]</textarea>' . EOL . EOL;
-
return $o;
}
diff --git a/mod/webpages.php b/mod/webpages.php
index e2b5eb3a4..75803e908 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -124,7 +124,7 @@ function webpages_content(&$a) {
if($_REQUEST['pagetitle'])
$x['pagetitle'] = $_REQUEST['pagetitle'];
- $editor .= status_editor($a,$x);
+ $editor = status_editor($a,$x);
// Get a list of webpages. We can't display all them because endless scroll makes that unusable,
// so just list titles and an edit link.
@@ -141,12 +141,24 @@ function webpages_content(&$a) {
$pages = array();
foreach($r as $rr) {
unobscure($rr);
+ $element_arr = array(
+ 'type' => 'webpage',
+ 'title' => $rr['title'],
+ 'body' => $rr['body'],
+ 'term' => $rr['term'],
+ 'created' => $rr['created'],
+ 'edited' => $rr['edited'],
+ 'mimetype' => $rr['mimetype'],
+ 'pagetitle' => $rr['sid'],
+ 'mid' => $rr['mid']
+ );
$pages[$rr['iid']][] = array(
'url' => $rr['iid'],
'pagetitle' => $rr['sid'],
'title' => $rr['title'],
'created' => datetime_convert('UTC',date_default_timezone_get(),$rr['created']),
- 'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited'])
+ 'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited']),
+ 'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]'
);
}
}
@@ -158,8 +170,9 @@ function webpages_content(&$a) {
$o .= replace_macros(get_markup_template('webpagelist.tpl'), array(
'$listtitle' => t('Webpages'),
'$baseurl' => $url,
- '$create' => t('Create'),
+ '$create' => t('Create'),
'$edit' => t('Edit'),
+ '$share' => t('Share'),
'$delete' => t('Delete'),
'$pages' => $pages,
'$channel' => $which,