aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-08-28 01:08:42 -0700
committerfriendica <info@friendica.com>2014-08-28 01:08:42 -0700
commited4896def1f90d903919311312fee974384540d7 (patch)
treeeecbd6f92877ee922005ab7b8f30a4f962ea630f
parenta4f734e37c2092b91d3915b5f4bb90eba6a4b605 (diff)
downloadvolse-hubzilla-ed4896def1f90d903919311312fee974384540d7.tar.gz
volse-hubzilla-ed4896def1f90d903919311312fee974384540d7.tar.bz2
volse-hubzilla-ed4896def1f90d903919311312fee974384540d7.zip
make blocks, webpages, and layouts postable (pre-filled forms if supplied from elsewhere). The only serious issue is with ordering - you have to process and save a named layout before you can save a webpage that uses that layout name. Otherwise it will get unset during the save.
-rw-r--r--mod/blocks.php17
-rw-r--r--mod/layouts.php11
-rw-r--r--mod/webpages.php11
-rw-r--r--version.inc2
4 files changed, 31 insertions, 10 deletions
diff --git a/mod/blocks.php b/mod/blocks.php
index 74a980c25..3f2bef116 100644
--- a/mod/blocks.php
+++ b/mod/blocks.php
@@ -45,14 +45,10 @@ function blocks_content(&$a) {
return;
}
-// if(local_user() && local_user() == $owner) {
- // $a->set_widget('design',design_tools());
- // }
-
-
// Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages
-// Nickname is set to the observers xchan, and profile_uid to the owners. This lets you post pages at other people's channels.
+// Nickname is set to the observers xchan, and profile_uid to the owners.
+// This lets you post pages at other people's channels.
require_once ('include/conversation.php');
$x = array(
'webpage' => ITEM_BUILDBLOCK,
@@ -67,6 +63,15 @@ require_once ('include/conversation.php');
'profile_uid' => intval($owner),
);
+ if($_REQUEST['title'])
+ $x['title'] = $_REQUEST['title'];
+ if($_REQUEST['body'])
+ $x['body'] = $_REQUEST['body'];
+ if($_REQUEST['pagetitle'])
+ $x['pagetitle'] = $_REQUEST['pagetitle'];
+
+
+
$o .= status_editor($a,$x);
//Get a list of blocks. We can't display all them because endless scroll makes that unusable, so just list titles and an edit link.
diff --git a/mod/layouts.php b/mod/layouts.php
index 318e6e29f..2d14212cf 100644
--- a/mod/layouts.php
+++ b/mod/layouts.php
@@ -68,7 +68,8 @@ function layouts_content(&$a) {
// Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages
- // Nickname is set to the observers xchan, and profile_uid to the owners. This lets you post pages at other people's channels.
+ // Nickname is set to the observers xchan, and profile_uid to the owners.
+ // This lets you post pages at other people's channels.
require_once ('include/conversation.php');
@@ -85,6 +86,14 @@ function layouts_content(&$a) {
'profile_uid' => intval($owner),
);
+ if($_REQUEST['title'])
+ $x['title'] = $_REQUEST['title'];
+ if($_REQUEST['body'])
+ $x['body'] = $_REQUEST['body'];
+ if($_REQUEST['pagetitle'])
+ $x['pagetitle'] = $_REQUEST['pagetitle'];
+
+
$o .= status_editor($a,$x);
// Get a list of blocks. We can't display all them because endless scroll makes that unusable, so just list titles and an edit link.
diff --git a/mod/webpages.php b/mod/webpages.php
index 431caa628..bfa2ebd7d 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -46,11 +46,11 @@ function webpages_content(&$a) {
// }
- $mimetype = get_config('system','page_mimetype');
+ $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_config('system','page_mimetype'));
if(! $mimetype)
$mimetype = 'choose';
- $layout = get_config('system','page_layout');
+ $layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_config('system','page_layout'));
if(! $layout)
$layout = 'choose';
@@ -91,6 +91,13 @@ function webpages_content(&$a) {
'layout' => $layout,
);
+ if($_REQUEST['title'])
+ $x['title'] = $_REQUEST['title'];
+ if($_REQUEST['body'])
+ $x['body'] = $_REQUEST['body'];
+ if($_REQUEST['pagetitle'])
+ $x['pagetitle'] = $_REQUEST['pagetitle'];
+
$o .= status_editor($a,$x);
diff --git a/version.inc b/version.inc
index dccb62428..6f8fc6806 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-08-27.780
+2014-08-28.781