From a338a97d5bb947f462483de8a9d87dd52fa3b2eb Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sun, 10 Jul 2016 06:58:20 -0400 Subject: First draft of website import tools --- include/text.php | 24 ++++++++++++++++++++++++ include/widgets.php | 14 ++++++++++++++ view/pdl/mod_webpages.pdl | 1 + view/tpl/website_import_tools.tpl | 7 +++++++ 4 files changed, 46 insertions(+) create mode 100644 view/tpl/website_import_tools.tpl diff --git a/include/text.php b/include/text.php index 986e3b56c..57339e16d 100644 --- a/include/text.php +++ b/include/text.php @@ -2246,6 +2246,30 @@ function design_tools() { )); } +/** + * @brief Creates website import tools menu + * + * @return string + */ +function website_import_tools() { + + $channel = App::get_channel(); + $sys = false; + + if(App::$is_sys && is_site_admin()) { + require_once('include/channel.php'); + $channel = get_sys_channel(); + $sys = true; + } + + $who = $channel['channel_address']; + + return replace_macros(get_markup_template('design_tools.tpl'), array( + '$title' => t('Import'), + '$who' => $who, + )); +} + /* case insensitive in_array() */ function in_arrayi($needle, $haystack) { diff --git a/include/widgets.php b/include/widgets.php index a4a6fb55a..6bb53bdf9 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -770,6 +770,20 @@ function widget_design_tools($arr) { return design_tools(); } +function widget_website_import_tools($arr) { + + // mod menu doesn't load a profile. For any modules which load a profile, check it. + // otherwise local_channel() is sufficient for permissions. + + if(App::$profile['profile_uid']) + if((App::$profile['profile_uid'] != local_channel()) && (! App::$is_sys)) + return ''; + + if(! local_channel()) + return ''; + + return website_import_tools(); +} function widget_findpeople($arr) { return findpeople_widget(); diff --git a/view/pdl/mod_webpages.pdl b/view/pdl/mod_webpages.pdl index cef69f194..b62ec6e7c 100644 --- a/view/pdl/mod_webpages.pdl +++ b/view/pdl/mod_webpages.pdl @@ -1,3 +1,4 @@ [region=aside] [widget=design_tools][/widget] +[widget=website_import_tools][/widget] [/region] \ No newline at end of file diff --git a/view/tpl/website_import_tools.tpl b/view/tpl/website_import_tools.tpl new file mode 100644 index 000000000..2e319b61d --- /dev/null +++ b/view/tpl/website_import_tools.tpl @@ -0,0 +1,7 @@ +
+

{{$title}}

+

Import website from cloud files

+ +
-- cgit v1.2.3 From c5e534c0cb939b9730f289a844f24b1121e6e9cf Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sun, 10 Jul 2016 07:21:52 -0400 Subject: Clearer import control interface --- include/text.php | 8 ++++++-- view/tpl/website_import_tools.tpl | 28 ++++++++++++++++++++++------ 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/include/text.php b/include/text.php index 57339e16d..096c8a5aa 100644 --- a/include/text.php +++ b/include/text.php @@ -2264,9 +2264,13 @@ function website_import_tools() { $who = $channel['channel_address']; - return replace_macros(get_markup_template('design_tools.tpl'), array( + return replace_macros(get_markup_template('website_import_tools.tpl'), array( '$title' => t('Import'), - '$who' => $who, + //'$who' => $who, + '$import_label' => t('Import website...'), + '$import_placeholder' => t('Select folder to import'), + '$file_upload_text' => t('Import from a zipped folder:'), + '$file_import_text' => t('Import from cloud files:') )); } diff --git a/view/tpl/website_import_tools.tpl b/view/tpl/website_import_tools.tpl index 2e319b61d..09b100926 100644 --- a/view/tpl/website_import_tools.tpl +++ b/view/tpl/website_import_tools.tpl @@ -1,7 +1,23 @@ -
-

{{$title}}

-

Import website from cloud files

- +
+

{{$title}}

+
    +
  • + {{$import_label}} +
    • + +
-- cgit v1.2.3 From 1e4ef812445e4d8617223ce917d0eb2215e9c3b3 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Tue, 12 Jul 2016 21:41:37 -0400 Subject: Import blocks from zip file, but needs updates as detailed in https://gitlab.com/zot/hubsites/merge_requests/2 --- Zotlabs/Module/Webpages.php | 222 ++++++++++++++++++++++++++++++++++++++ view/tpl/website_import_tools.tpl | 4 +- 2 files changed, 224 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php index bb8d9c6ed..6419d608b 100644 --- a/Zotlabs/Module/Webpages.php +++ b/Zotlabs/Module/Webpages.php @@ -210,4 +210,226 @@ class Webpages extends \Zotlabs\Web\Controller { return $o; } + function post() { + + if(($_FILES) && array_key_exists('zip_file',$_FILES)) { + $source = $_FILES["zip_file"]["tmp_name"]; + $type = $_FILES["zip_file"]["type"]; + $okay = false; + $accepted_types = array('application/zip', 'application/x-zip-compressed', 'multipart/x-zip', 'application/x-compressed'); + foreach ($accepted_types as $mime_type) { + if ($mime_type == $type) { + $okay = true; + break; + } + } + if(!$okay) { + json_return_and_die(array('message' => 'Invalid file MIME type')); + } + $zip = new \ZipArchive(); + if ($zip->open($source) === true) { + $tmp_folder_name = random_string(5); + $website = dirname($source) . '/' . $tmp_folder_name; + $zip->extractTo($website); // change this to the correct site path + $zip->close(); + @unlink($source); + + $hubsites = $this->import_website($website); + rrmdir($website); + $channel = \App::get_channel(); + $blocks = $this->import_blocks($channel, $hubsites['blocks']); + logger('blocks imported: ' . json_encode($blocks)); + } + + + } + } + + private function import_website($path) { + $hubsites = []; + $pages = []; + $blocks = []; + $layouts = []; + // Import pages + $dirtoscan = $path . '/pages/'; + if (is_dir($dirtoscan)) { + $dirlist = scandir($dirtoscan); + if ($dirlist) { + foreach ($dirlist as $element) { + if ($element === '.' || $element === '..') { + continue; + } + $folder = $dirtoscan . '/' . $element; + if (is_dir($folder)) { + $jsonfilepath = $folder . '/page.json'; + if (is_file($jsonfilepath)) { + $pagejson = json_decode(file_get_contents($jsonfilepath), true); + $pagejson['path'] = $folder . '/' . $pagejson['contentfile']; + if ($pagejson['contentfile'] === '') { + logger('hubsites plugin: Invalid page content file'); + return false; + } + $pagecontent = file_get_contents($folder . '/' . $pagejson['contentfile']); + if (!$pagecontent) { + logger('hubsites plugin: Failed to get file content for ' . $pagejson['contentfile']); + return false; + } + $pages[] = $pagejson; + } + } + } + } + } + $hubsites['pages'] = $pages; + // Import layouts + $dirtoscan = $path . '/layouts/'; + if (is_dir($dirtoscan)) { + $dirlist = scandir($dirtoscan); + if ($dirlist) { + foreach ($dirlist as $element) { + if ($element === '.' || $element === '..') { + continue; + } + $folder = $dirtoscan . '/' . $element; + if (is_dir($folder)) { + $jsonfilepath = $folder . '/layout.json'; + if (is_file($jsonfilepath)) { + $layoutjson = json_decode(file_get_contents($jsonfilepath), true); + $layoutjson['path'] = $folder . '/' . $layoutjson['contentfile']; + if ($layoutjson['contentfile'] === '') { + logger('hubsites plugin: Invalid layout content file'); + return false; + } + $layoutcontent = file_get_contents($folder . '/' . $layoutjson['contentfile']); + if (!$layoutcontent) { + logger('hubsites plugin: Failed to get file content for ' . $layoutjson['contentfile']); + return false; + } + $layouts[] = $layoutjson; + } + } + } + } + } + $hubsites['layouts'] = $layouts; + // Import blocks + $dirtoscan = $path . '/blocks/'; + if (is_dir($dirtoscan)) { + $dirlist = scandir($dirtoscan); + if ($dirlist) { + foreach ($dirlist as $element) { + if ($element === '.' || $element === '..') { + continue; + } + $folder = $dirtoscan . '/' . $element; + if (is_dir($folder)) { + $jsonfilepath = $folder . '/block.json'; + if (is_file($jsonfilepath)) { + $block = json_decode(file_get_contents($jsonfilepath), true); + $block['path'] = $folder . '/' . $block['contentfile']; + if ($block['contentfile'] === '') { + logger('hubsites plugin: Invalid block content file'); + return false; + } + $blockcontent = file_get_contents($folder . '/' . $block['contentfile']); + if (!$blockcontent) { + logger('hubsites plugin: Failed to get file content for ' . $block['contentfile']); + return false; + } + $blocks[] = $block; + } + } + } + } + } + $hubsites['blocks'] = $blocks; + //logger('hubsites: ' . json_encode($hubsites)); + return $hubsites; + } + + private function import_blocks($channel, $blocks) { + foreach ($blocks as &$b) { + + $arr = array(); + $arr['item_type'] = ITEM_TYPE_BLOCK; + $namespace = 'BUILDBLOCK'; + $arr['uid'] = $channel['channel_id']; + $arr['aid'] = $channel['channel_account_id']; + + $iid = q("select iid from item_id where service = 'BUILDBLOCK' and sid = '%s' and uid = %d", + dbesc($b['name']), + intval($channel['channel_id']) + ); + if($iid) { + $iteminfo = q("select mid,created,edited from item where id = %d", + intval($iid[0]['iid']) + ); + $arr['mid'] = $arr['parent_mid'] = $iteminfo[0]['mid']; + $arr['created'] = $iteminfo[0]['created']; + $arr['edited'] = (($b['edited']) ? datetime_convert('UTC', 'UTC', $b['edited']) : datetime_convert()); + } else { + $arr['created'] = (($b['created']) ? datetime_convert('UTC', 'UTC', $b['created']) : datetime_convert()); + $arr['edited'] = datetime_convert('UTC', 'UTC', '0000-00-00 00:00:00'); + $arr['mid'] = $arr['parent_mid'] = item_message_id(); + } + $arr['title'] = $b['title']; + $arr['body'] = file_get_contents($b['path']); + $arr['owner_xchan'] = get_observer_hash(); + $arr['author_xchan'] = (($b['author_xchan']) ? $b['author_xchan'] : get_observer_hash()); + if(($b['mimetype'] === 'text/bbcode' || $b['mimetype'] === 'text/html' || + $b['mimetype'] === 'text/markdown' ||$b['mimetype'] === 'text/plain' || + $b['mimetype'] === 'application/x-pdl' ||$b['mimetype'] === 'application/x-php')) { + $arr['mimetype'] = $b['mimetype']; + } else { + $arr['mimetype'] = 'text/bbcode'; + } + + $pagetitle = $b['name']; + + // Verify ability to use html or php!!! + $execflag = false; + if ($arr['mimetype'] === 'application/x-php') { + $z = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id where channel_id = %d limit 1", intval(local_channel()) + ); + + if ($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) { + $execflag = true; + } + } + + $remote_id = 0; + + $z = q("select * from item_id where sid = '%s' and service = '%s' and uid = %d limit 1", dbesc($pagetitle), dbesc($namespace), intval(local_channel()) + ); + + $i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1", dbesc($arr['mid']), intval(local_channel()) + ); + if ($z && $i) { + $remote_id = $z[0]['id']; + $arr['id'] = $i[0]['id']; + // don't update if it has the same timestamp as the original + if ($arr['edited'] > $i[0]['edited']) + $x = item_store_update($arr, $execflag); + } else { + if (($i) && (intval($i[0]['item_deleted']))) { + // was partially deleted already, finish it off + q("delete from item where mid = '%s' and uid = %d", dbesc($arr['mid']), intval(local_channel()) + ); + } + $x = item_store($arr, $execflag); + } + if ($x['success']) { + $item_id = $x['item_id']; + update_remote_id($channel, $item_id, $arr['item_type'], $pagetitle, $namespace, $remote_id, $arr['mid']); + $b['import_success'] = 1; + } else { + $b['import_success'] = 0; + } + } + return $blocks; +} + + + + } diff --git a/view/tpl/website_import_tools.tpl b/view/tpl/website_import_tools.tpl index 09b100926..ca9cc8b33 100644 --- a/view/tpl/website_import_tools.tpl +++ b/view/tpl/website_import_tools.tpl @@ -15,9 +15,9 @@

{{$file_upload_text}}

- +
- +
-- cgit v1.2.3 From ba903e21edb14639a948fdccafa35b743691c7cc Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Wed, 13 Jul 2016 06:17:12 -0400 Subject: Updated import_blocks for database calls --- Zotlabs/Module/Webpages.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php index 9ece989a0..01a32bf24 100644 --- a/Zotlabs/Module/Webpages.php +++ b/Zotlabs/Module/Webpages.php @@ -355,9 +355,8 @@ class Webpages extends \Zotlabs\Web\Controller { $arr['uid'] = $channel['channel_id']; $arr['aid'] = $channel['channel_account_id']; - $iid = q("select iid from item_id where service = 'BUILDBLOCK' and sid = '%s' and uid = %d", - dbesc($b['name']), - intval($channel['channel_id']) + $iid = q("select iid from iconfig where k = 'BUILDBLOCK' and v = '%s' and cat = 'system'", + dbesc($b['name']) ); if($iid) { $iteminfo = q("select mid,created,edited from item where id = %d", @@ -398,8 +397,7 @@ class Webpages extends \Zotlabs\Web\Controller { $remote_id = 0; - $z = q("select * from item_id where sid = '%s' and service = '%s' and uid = %d limit 1", dbesc($pagetitle), dbesc($namespace), intval(local_channel()) - ); + $z = q("select * from iconfig where v = '%s' and k = '%s' and cat = 'service' limit 1", dbesc($pagetitle), dbesc($namespace)); $i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1", dbesc($arr['mid']), intval(local_channel()) ); -- cgit v1.2.3 From 960e9edff596c12dbd88a6ed92277fa51e962808 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Wed, 13 Jul 2016 21:46:59 -0400 Subject: Blocks, pages, and layouts import from zip file. Layouts are not applied to pages until imported twice though. --- Zotlabs/Module/Webpages.php | 199 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 190 insertions(+), 9 deletions(-) diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php index 01a32bf24..1c9586615 100644 --- a/Zotlabs/Module/Webpages.php +++ b/Zotlabs/Module/Webpages.php @@ -234,10 +234,13 @@ class Webpages extends \Zotlabs\Web\Controller { @unlink($source); $hubsites = $this->import_website($website); - rrmdir($website); $channel = \App::get_channel(); $blocks = $this->import_blocks($channel, $hubsites['blocks']); - logger('blocks imported: ' . json_encode($blocks)); + $pages = $this->import_pages($channel, $hubsites['pages']); + $layouts = $this->import_layouts($channel, $hubsites['layouts']); + if($blocks || $pages || $layouts) { // Without the if statement, the folder is deleted before the import_blocks function completes. + rrmdir($website); + } } @@ -265,12 +268,12 @@ class Webpages extends \Zotlabs\Web\Controller { $pagejson = json_decode(file_get_contents($jsonfilepath), true); $pagejson['path'] = $folder . '/' . $pagejson['contentfile']; if ($pagejson['contentfile'] === '') { - logger('hubsites plugin: Invalid page content file'); + logger('Invalid page content file'); return false; } $pagecontent = file_get_contents($folder . '/' . $pagejson['contentfile']); if (!$pagecontent) { - logger('hubsites plugin: Failed to get file content for ' . $pagejson['contentfile']); + logger('Failed to get file content for ' . $pagejson['contentfile']); return false; } $pages[] = $pagejson; @@ -296,12 +299,12 @@ class Webpages extends \Zotlabs\Web\Controller { $layoutjson = json_decode(file_get_contents($jsonfilepath), true); $layoutjson['path'] = $folder . '/' . $layoutjson['contentfile']; if ($layoutjson['contentfile'] === '') { - logger('hubsites plugin: Invalid layout content file'); + logger('Invalid layout content file'); return false; } $layoutcontent = file_get_contents($folder . '/' . $layoutjson['contentfile']); if (!$layoutcontent) { - logger('hubsites plugin: Failed to get file content for ' . $layoutjson['contentfile']); + logger('Failed to get file content for ' . $layoutjson['contentfile']); return false; } $layouts[] = $layoutjson; @@ -327,12 +330,12 @@ class Webpages extends \Zotlabs\Web\Controller { $block = json_decode(file_get_contents($jsonfilepath), true); $block['path'] = $folder . '/' . $block['contentfile']; if ($block['contentfile'] === '') { - logger('hubsites plugin: Invalid block content file'); + logger('Invalid block content file'); return false; } $blockcontent = file_get_contents($folder . '/' . $block['contentfile']); if (!$blockcontent) { - logger('hubsites plugin: Failed to get file content for ' . $block['contentfile']); + logger('Failed to get file content for ' . $block['contentfile']); return false; } $blocks[] = $block; @@ -342,7 +345,6 @@ class Webpages extends \Zotlabs\Web\Controller { } } $hubsites['blocks'] = $blocks; - //logger('hubsites: ' . json_encode($hubsites)); return $hubsites; } @@ -427,6 +429,185 @@ class Webpages extends \Zotlabs\Web\Controller { } +private function import_pages($channel, $pages) { + foreach ($pages as &$p) { + + $arr = array(); + $arr['item_type'] = ITEM_TYPE_WEBPAGE; + $namespace = 'WEBPAGE'; + $arr['uid'] = $channel['channel_id']; + $arr['aid'] = $channel['channel_account_id']; + + if($p['pagelink']) { + require_once('library/urlify/URLify.php'); + $pagetitle = strtolower(\URLify::transliterate($p['pagelink'])); + } + $arr['layout_mid'] = ''; // by default there is no layout associated with the page + // If a layout was specified, find it in the database and get its info. If + // it does not exist, leave layout_mid empty + logger('hubsites plugin: $p[layout] = ' . $p['layout']); + if($p['layout'] !== '') { + $liid = q("select iid from iconfig where k = 'PDL' and v = '%s' and cat = 'system'", + dbesc($p['layout']) + ); + if($liid) { + $linfo = q("select mid from item where id = %d", + intval($liid[0]['iid']) + ); + logger('hubsites plugin: $linfo= ' . json_encode($linfo,true)); + $arr['layout_mid'] = $linfo[0]['mid']; + } + } + // See if the page already exists + $iid = q("select iid from iconfig where k = 'WEBPAGE' and v = '%s' and cat = 'system'", + dbesc($pagetitle) + ); + if($iid) { + // Get the existing page info + $pageinfo = q("select mid,layout_mid,created,edited from item where id = %d", + intval($iid[0]['iid']) + ); + $arr['mid'] = $arr['parent_mid'] = $pageinfo[0]['mid']; + $arr['created'] = $pageinfo[0]['created']; + $arr['edited'] = (($p['edited']) ? datetime_convert('UTC', 'UTC', $p['edited']) : datetime_convert()); + } else { + $arr['created'] = (($p['created']) ? datetime_convert('UTC', 'UTC', $p['created']) : datetime_convert()); + $arr['edited'] = datetime_convert('UTC', 'UTC', '0000-00-00 00:00:00'); + $arr['mid'] = $arr['parent_mid'] = item_message_id(); + } + $arr['title'] = $p['title']; + $arr['body'] = file_get_contents($p['path']); + $arr['term'] = $p['term']; // Not sure what this is supposed to be + + $arr['owner_xchan'] = get_observer_hash(); + $arr['author_xchan'] = (($p['author_xchan']) ? $p['author_xchan'] : get_observer_hash()); + if(($p['mimetype'] === 'text/bbcode' || $p['mimetype'] === 'text/html' || + $p['mimetype'] === 'text/markdown' ||$p['mimetype'] === 'text/plain' || + $p['mimetype'] === 'application/x-pdl' ||$p['mimetype'] === 'application/x-php')) { + $arr['mimetype'] = $p['mimetype']; + } else { + $arr['mimetype'] = 'text/bbcode'; + } + + // Verify ability to use html or php!!! + $execflag = false; + if ($arr['mimetype'] === 'application/x-php') { + $z = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id where channel_id = %d limit 1", intval(local_channel()) + ); + + if ($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) { + $execflag = true; + } + } + + $remote_id = 0; + + $z = q("select * from iconfig where v = '%s' and k = '%s' and cat = 'system' limit 1", + dbesc($pagetitle), + dbesc($namespace) + ); + + $i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1", + dbesc($arr['mid']), + intval(local_channel()) + ); + if ($z && $i) { + $remote_id = $z[0]['id']; + $arr['id'] = $i[0]['id']; + // don't update if it has the same timestamp as the original + if ($arr['edited'] > $i[0]['edited']) + $x = item_store_update($arr, $execflag); + } else { + if (($i) && (intval($i[0]['item_deleted']))) { + // was partially deleted already, finish it off + q("delete from item where mid = '%s' and uid = %d", dbesc($arr['mid']), intval(local_channel()) + ); + } + logger('hubsites plugin: item_store= ' . json_encode($arr,true)); + $x = item_store($arr, $execflag); + } + if ($x['success']) { + $item_id = $x['item_id']; + update_remote_id($channel, $item_id, $arr['item_type'], $pagetitle, $namespace, $remote_id, $arr['mid']); + $p['import_success'] = 1; + } else { + $p['import_success'] = 0; + } + } + return $pages; + +} + +private function import_layouts($channel, $layouts) { + foreach ($layouts as &$p) { + + $arr = array(); + $arr['item_type'] = ITEM_TYPE_PDL; + $namespace = 'PDL'; + $arr['uid'] = $channel['channel_id']; + $arr['aid'] = $channel['channel_account_id']; + $pagetitle = $p['name']; + // See if the layout already exists + $iid = q("select iid from iconfig where k = 'PDL' and v = '%s' and cat = 'system'", + dbesc($pagetitle) + ); + if($iid) { + // Get the existing layout info + $info = q("select mid,layout_mid,created,edited from item where id = %d", + intval($iid[0]['iid']) + ); + $arr['mid'] = $arr['parent_mid'] = $info[0]['mid']; + $arr['created'] = $info[0]['created']; + $arr['edited'] = (($p['edited']) ? datetime_convert('UTC', 'UTC', $p['edited']) : datetime_convert()); + } else { + $arr['created'] = (($p['created']) ? datetime_convert('UTC', 'UTC', $p['created']) : datetime_convert()); + $arr['edited'] = datetime_convert('UTC', 'UTC', '0000-00-00 00:00:00'); + $arr['mid'] = $arr['parent_mid'] = item_message_id(); + } + $arr['title'] = $p['description']; + $arr['body'] = file_get_contents($p['path']); + $arr['term'] = $p['term']; // Not sure what this is supposed to be + + $arr['owner_xchan'] = get_observer_hash(); + $arr['author_xchan'] = (($p['author_xchan']) ? $p['author_xchan'] : get_observer_hash()); + $arr['mimetype'] = 'text/bbcode'; + + $remote_id = 0; + + $z = q("select * from iconfig where v = '%s' and k = '%s' and cat = 'system' limit 1", + dbesc($pagetitle), + dbesc($namespace) + ); + + $i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1", + dbesc($arr['mid']), + intval(local_channel()) + ); + if ($z && $i) { + $remote_id = $z[0]['id']; + $arr['id'] = $i[0]['id']; + // don't update if it has the same timestamp as the original + if ($arr['edited'] > $i[0]['edited']) + $x = item_store_update($arr, $execflag); + } else { + if (($i) && (intval($i[0]['item_deleted']))) { + // was partially deleted already, finish it off + q("delete from item where mid = '%s' and uid = %d", dbesc($arr['mid']), intval(local_channel()) + ); + } + $x = item_store($arr, $execflag); + } + if ($x['success']) { + $item_id = $x['item_id']; + update_remote_id($channel, $item_id, $arr['item_type'], $pagetitle, $namespace, $remote_id, $arr['mid']); + $p['import_success'] = 1; + } else { + $p['import_success'] = 0; + } + } + return $layouts; + +} } -- cgit v1.2.3 From 514ffb74aa8457d8dec5c0158550d93d1a18c072 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Thu, 14 Jul 2016 22:24:23 -0400 Subject: Refactored the scan and import functions to reduce redundant code and simplify logic. Import of pages, layouts, and blocks works. --- Zotlabs/Module/Webpages.php | 396 +++----------------------------------------- include/import.php | 200 ++++++++++++++++++++++ 2 files changed, 223 insertions(+), 373 deletions(-) diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php index 1c9586615..766b4fc09 100644 --- a/Zotlabs/Module/Webpages.php +++ b/Zotlabs/Module/Webpages.php @@ -231,383 +231,33 @@ class Webpages extends \Zotlabs\Web\Controller { $website = dirname($source) . '/' . $tmp_folder_name; $zip->extractTo($website); // change this to the correct site path $zip->close(); - @unlink($source); + @unlink($source); // delete the compressed file now that the content has been extracted - $hubsites = $this->import_website($website); + require_once('include/import.php'); + $elements = []; + $elements['pages'] = scan_webpage_elements($website, 'page'); + $elements['layouts'] = scan_webpage_elements($website, 'layout'); + $elements['blocks'] = scan_webpage_elements($website, 'block'); + $channel = \App::get_channel(); - $blocks = $this->import_blocks($channel, $hubsites['blocks']); - $pages = $this->import_pages($channel, $hubsites['pages']); - $layouts = $this->import_layouts($channel, $hubsites['layouts']); - if($blocks || $pages || $layouts) { // Without the if statement, the folder is deleted before the import_blocks function completes. - rrmdir($website); + // Import layout first so that pages that reference new layouts will find + // the mid of layout items in the database + foreach($elements['layouts'] as &$layout) { + $layout = import_webpage_element($layout, $channel, 'layout'); } - } - - + foreach($elements['pages'] as &$page) { + $page = import_webpage_element($page, $channel, 'page'); + } + foreach($elements['blocks'] as &$block) { + $block = import_webpage_element($block, $channel, 'block'); + } + + // Without the if statement below, the folder is deleted before the import completes. + if($elements) { + rrmdir($website); // Delete the temporary decompressed files + } + } } } - private function import_website($path) { - $hubsites = []; - $pages = []; - $blocks = []; - $layouts = []; - // Import pages - $dirtoscan = $path . '/pages/'; - if (is_dir($dirtoscan)) { - $dirlist = scandir($dirtoscan); - if ($dirlist) { - foreach ($dirlist as $element) { - if ($element === '.' || $element === '..') { - continue; - } - $folder = $dirtoscan . '/' . $element; - if (is_dir($folder)) { - $jsonfilepath = $folder . '/page.json'; - if (is_file($jsonfilepath)) { - $pagejson = json_decode(file_get_contents($jsonfilepath), true); - $pagejson['path'] = $folder . '/' . $pagejson['contentfile']; - if ($pagejson['contentfile'] === '') { - logger('Invalid page content file'); - return false; - } - $pagecontent = file_get_contents($folder . '/' . $pagejson['contentfile']); - if (!$pagecontent) { - logger('Failed to get file content for ' . $pagejson['contentfile']); - return false; - } - $pages[] = $pagejson; - } - } - } - } - } - $hubsites['pages'] = $pages; - // Import layouts - $dirtoscan = $path . '/layouts/'; - if (is_dir($dirtoscan)) { - $dirlist = scandir($dirtoscan); - if ($dirlist) { - foreach ($dirlist as $element) { - if ($element === '.' || $element === '..') { - continue; - } - $folder = $dirtoscan . '/' . $element; - if (is_dir($folder)) { - $jsonfilepath = $folder . '/layout.json'; - if (is_file($jsonfilepath)) { - $layoutjson = json_decode(file_get_contents($jsonfilepath), true); - $layoutjson['path'] = $folder . '/' . $layoutjson['contentfile']; - if ($layoutjson['contentfile'] === '') { - logger('Invalid layout content file'); - return false; - } - $layoutcontent = file_get_contents($folder . '/' . $layoutjson['contentfile']); - if (!$layoutcontent) { - logger('Failed to get file content for ' . $layoutjson['contentfile']); - return false; - } - $layouts[] = $layoutjson; - } - } - } - } - } - $hubsites['layouts'] = $layouts; - // Import blocks - $dirtoscan = $path . '/blocks/'; - if (is_dir($dirtoscan)) { - $dirlist = scandir($dirtoscan); - if ($dirlist) { - foreach ($dirlist as $element) { - if ($element === '.' || $element === '..') { - continue; - } - $folder = $dirtoscan . '/' . $element; - if (is_dir($folder)) { - $jsonfilepath = $folder . '/block.json'; - if (is_file($jsonfilepath)) { - $block = json_decode(file_get_contents($jsonfilepath), true); - $block['path'] = $folder . '/' . $block['contentfile']; - if ($block['contentfile'] === '') { - logger('Invalid block content file'); - return false; - } - $blockcontent = file_get_contents($folder . '/' . $block['contentfile']); - if (!$blockcontent) { - logger('Failed to get file content for ' . $block['contentfile']); - return false; - } - $blocks[] = $block; - } - } - } - } - } - $hubsites['blocks'] = $blocks; - return $hubsites; - } - - private function import_blocks($channel, $blocks) { - foreach ($blocks as &$b) { - - $arr = array(); - $arr['item_type'] = ITEM_TYPE_BLOCK; - $namespace = 'BUILDBLOCK'; - $arr['uid'] = $channel['channel_id']; - $arr['aid'] = $channel['channel_account_id']; - - $iid = q("select iid from iconfig where k = 'BUILDBLOCK' and v = '%s' and cat = 'system'", - dbesc($b['name']) - ); - if($iid) { - $iteminfo = q("select mid,created,edited from item where id = %d", - intval($iid[0]['iid']) - ); - $arr['mid'] = $arr['parent_mid'] = $iteminfo[0]['mid']; - $arr['created'] = $iteminfo[0]['created']; - $arr['edited'] = (($b['edited']) ? datetime_convert('UTC', 'UTC', $b['edited']) : datetime_convert()); - } else { - $arr['created'] = (($b['created']) ? datetime_convert('UTC', 'UTC', $b['created']) : datetime_convert()); - $arr['edited'] = datetime_convert('UTC', 'UTC', '0000-00-00 00:00:00'); - $arr['mid'] = $arr['parent_mid'] = item_message_id(); - } - $arr['title'] = $b['title']; - $arr['body'] = file_get_contents($b['path']); - $arr['owner_xchan'] = get_observer_hash(); - $arr['author_xchan'] = (($b['author_xchan']) ? $b['author_xchan'] : get_observer_hash()); - if(($b['mimetype'] === 'text/bbcode' || $b['mimetype'] === 'text/html' || - $b['mimetype'] === 'text/markdown' ||$b['mimetype'] === 'text/plain' || - $b['mimetype'] === 'application/x-pdl' ||$b['mimetype'] === 'application/x-php')) { - $arr['mimetype'] = $b['mimetype']; - } else { - $arr['mimetype'] = 'text/bbcode'; - } - - $pagetitle = $b['name']; - - // Verify ability to use html or php!!! - $execflag = false; - if ($arr['mimetype'] === 'application/x-php') { - $z = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id where channel_id = %d limit 1", intval(local_channel()) - ); - - if ($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) { - $execflag = true; - } - } - - $remote_id = 0; - - $z = q("select * from iconfig where v = '%s' and k = '%s' and cat = 'service' limit 1", dbesc($pagetitle), dbesc($namespace)); - - $i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1", dbesc($arr['mid']), intval(local_channel()) - ); - if ($z && $i) { - $remote_id = $z[0]['id']; - $arr['id'] = $i[0]['id']; - // don't update if it has the same timestamp as the original - if ($arr['edited'] > $i[0]['edited']) - $x = item_store_update($arr, $execflag); - } else { - if (($i) && (intval($i[0]['item_deleted']))) { - // was partially deleted already, finish it off - q("delete from item where mid = '%s' and uid = %d", dbesc($arr['mid']), intval(local_channel()) - ); - } - $x = item_store($arr, $execflag); - } - if ($x['success']) { - $item_id = $x['item_id']; - update_remote_id($channel, $item_id, $arr['item_type'], $pagetitle, $namespace, $remote_id, $arr['mid']); - $b['import_success'] = 1; - } else { - $b['import_success'] = 0; - } - } - return $blocks; -} - - -private function import_pages($channel, $pages) { - foreach ($pages as &$p) { - - $arr = array(); - $arr['item_type'] = ITEM_TYPE_WEBPAGE; - $namespace = 'WEBPAGE'; - $arr['uid'] = $channel['channel_id']; - $arr['aid'] = $channel['channel_account_id']; - - if($p['pagelink']) { - require_once('library/urlify/URLify.php'); - $pagetitle = strtolower(\URLify::transliterate($p['pagelink'])); - } - $arr['layout_mid'] = ''; // by default there is no layout associated with the page - // If a layout was specified, find it in the database and get its info. If - // it does not exist, leave layout_mid empty - logger('hubsites plugin: $p[layout] = ' . $p['layout']); - if($p['layout'] !== '') { - $liid = q("select iid from iconfig where k = 'PDL' and v = '%s' and cat = 'system'", - dbesc($p['layout']) - ); - if($liid) { - $linfo = q("select mid from item where id = %d", - intval($liid[0]['iid']) - ); - logger('hubsites plugin: $linfo= ' . json_encode($linfo,true)); - $arr['layout_mid'] = $linfo[0]['mid']; - } - } - // See if the page already exists - $iid = q("select iid from iconfig where k = 'WEBPAGE' and v = '%s' and cat = 'system'", - dbesc($pagetitle) - ); - if($iid) { - // Get the existing page info - $pageinfo = q("select mid,layout_mid,created,edited from item where id = %d", - intval($iid[0]['iid']) - ); - $arr['mid'] = $arr['parent_mid'] = $pageinfo[0]['mid']; - $arr['created'] = $pageinfo[0]['created']; - $arr['edited'] = (($p['edited']) ? datetime_convert('UTC', 'UTC', $p['edited']) : datetime_convert()); - } else { - $arr['created'] = (($p['created']) ? datetime_convert('UTC', 'UTC', $p['created']) : datetime_convert()); - $arr['edited'] = datetime_convert('UTC', 'UTC', '0000-00-00 00:00:00'); - $arr['mid'] = $arr['parent_mid'] = item_message_id(); - } - $arr['title'] = $p['title']; - $arr['body'] = file_get_contents($p['path']); - $arr['term'] = $p['term']; // Not sure what this is supposed to be - - $arr['owner_xchan'] = get_observer_hash(); - $arr['author_xchan'] = (($p['author_xchan']) ? $p['author_xchan'] : get_observer_hash()); - if(($p['mimetype'] === 'text/bbcode' || $p['mimetype'] === 'text/html' || - $p['mimetype'] === 'text/markdown' ||$p['mimetype'] === 'text/plain' || - $p['mimetype'] === 'application/x-pdl' ||$p['mimetype'] === 'application/x-php')) { - $arr['mimetype'] = $p['mimetype']; - } else { - $arr['mimetype'] = 'text/bbcode'; - } - - // Verify ability to use html or php!!! - $execflag = false; - if ($arr['mimetype'] === 'application/x-php') { - $z = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id where channel_id = %d limit 1", intval(local_channel()) - ); - - if ($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) { - $execflag = true; - } - } - - $remote_id = 0; - - $z = q("select * from iconfig where v = '%s' and k = '%s' and cat = 'system' limit 1", - dbesc($pagetitle), - dbesc($namespace) - ); - - $i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1", - dbesc($arr['mid']), - intval(local_channel()) - ); - if ($z && $i) { - $remote_id = $z[0]['id']; - $arr['id'] = $i[0]['id']; - // don't update if it has the same timestamp as the original - if ($arr['edited'] > $i[0]['edited']) - $x = item_store_update($arr, $execflag); - } else { - if (($i) && (intval($i[0]['item_deleted']))) { - // was partially deleted already, finish it off - q("delete from item where mid = '%s' and uid = %d", dbesc($arr['mid']), intval(local_channel()) - ); - } - logger('hubsites plugin: item_store= ' . json_encode($arr,true)); - $x = item_store($arr, $execflag); - } - if ($x['success']) { - $item_id = $x['item_id']; - update_remote_id($channel, $item_id, $arr['item_type'], $pagetitle, $namespace, $remote_id, $arr['mid']); - $p['import_success'] = 1; - } else { - $p['import_success'] = 0; - } - } - return $pages; - -} - -private function import_layouts($channel, $layouts) { - foreach ($layouts as &$p) { - - $arr = array(); - $arr['item_type'] = ITEM_TYPE_PDL; - $namespace = 'PDL'; - $arr['uid'] = $channel['channel_id']; - $arr['aid'] = $channel['channel_account_id']; - $pagetitle = $p['name']; - // See if the layout already exists - $iid = q("select iid from iconfig where k = 'PDL' and v = '%s' and cat = 'system'", - dbesc($pagetitle) - ); - if($iid) { - // Get the existing layout info - $info = q("select mid,layout_mid,created,edited from item where id = %d", - intval($iid[0]['iid']) - ); - $arr['mid'] = $arr['parent_mid'] = $info[0]['mid']; - $arr['created'] = $info[0]['created']; - $arr['edited'] = (($p['edited']) ? datetime_convert('UTC', 'UTC', $p['edited']) : datetime_convert()); - } else { - $arr['created'] = (($p['created']) ? datetime_convert('UTC', 'UTC', $p['created']) : datetime_convert()); - $arr['edited'] = datetime_convert('UTC', 'UTC', '0000-00-00 00:00:00'); - $arr['mid'] = $arr['parent_mid'] = item_message_id(); - } - $arr['title'] = $p['description']; - $arr['body'] = file_get_contents($p['path']); - $arr['term'] = $p['term']; // Not sure what this is supposed to be - - $arr['owner_xchan'] = get_observer_hash(); - $arr['author_xchan'] = (($p['author_xchan']) ? $p['author_xchan'] : get_observer_hash()); - $arr['mimetype'] = 'text/bbcode'; - - $remote_id = 0; - - $z = q("select * from iconfig where v = '%s' and k = '%s' and cat = 'system' limit 1", - dbesc($pagetitle), - dbesc($namespace) - ); - - $i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1", - dbesc($arr['mid']), - intval(local_channel()) - ); - if ($z && $i) { - $remote_id = $z[0]['id']; - $arr['id'] = $i[0]['id']; - // don't update if it has the same timestamp as the original - if ($arr['edited'] > $i[0]['edited']) - $x = item_store_update($arr, $execflag); - } else { - if (($i) && (intval($i[0]['item_deleted']))) { - // was partially deleted already, finish it off - q("delete from item where mid = '%s' and uid = %d", dbesc($arr['mid']), intval(local_channel()) - ); - } - $x = item_store($arr, $execflag); - } - if ($x['success']) { - $item_id = $x['item_id']; - update_remote_id($channel, $item_id, $arr['item_type'], $pagetitle, $namespace, $remote_id, $arr['mid']); - $p['import_success'] = 1; - } else { - $p['import_success'] = 0; - } - } - return $layouts; - -} - - } diff --git a/include/import.php b/include/import.php index 00ecef07d..3dfe9c7c9 100644 --- a/include/import.php +++ b/include/import.php @@ -1217,3 +1217,203 @@ function convert_oldfields(&$arr,$old,$new) { unset($arr[$old]); } } + +function scan_webpage_elements($path, $type) { + + $dirtoscan = $path; + switch ($type) { + case 'page': + $dirtoscan .= '/pages/'; + $json_filename = 'page.json'; + break; + case 'layout': + $dirtoscan .= '/layouts/'; + $json_filename = 'layout.json'; + break; + case 'block': + $dirtoscan .= '/blocks/'; + $json_filename = 'block.json'; + break; + default : + return array(); + } + $elements = []; + if (is_dir($dirtoscan)) { + $dirlist = scandir($dirtoscan); + if ($dirlist) { + foreach ($dirlist as $element) { + if ($element === '.' || $element === '..') { + continue; + } + $folder = $dirtoscan . '/' . $element; + if (is_dir($folder)) { + $jsonfilepath = $folder . '/' . $json_filename; + if (is_file($jsonfilepath)) { + $metadata = json_decode(file_get_contents($jsonfilepath), true); + $metadata['path'] = $folder . '/' . $metadata['contentfile']; + if ($metadata['contentfile'] === '') { + logger('Invalid ' . $type . ' content file'); + return false; + } + $content = file_get_contents($folder . '/' . $metadata['contentfile']); + if (!$content) { + logger('Failed to get file content for ' . $metadata['contentfile']); + return false; + } + $elements[] = $metadata; + } + } + } + } + } + return $elements; + } + + + function import_webpage_element($element, $channel, $type) { + + $arr = array(); // construct information for the webpage element item table record + + switch ($type) { + // + // PAGES + // + case 'page': + $arr['item_type'] = ITEM_TYPE_WEBPAGE; + $namespace = 'WEBPAGE'; + $name = $element['pagelink']; + if($name) { + require_once('library/urlify/URLify.php'); + $name = strtolower(\URLify::transliterate($name)); + } + $arr['title'] = $element['title']; + $arr['term'] = $element['term']; + $arr['layout_mid'] = ''; // by default there is no layout associated with the page + // If a layout was specified, find it in the database and get its info. If + // it does not exist, leave layout_mid empty + if($element['layout'] !== '') { + $liid = q("select iid from iconfig where k = 'PDL' and v = '%s' and cat = 'system'", + dbesc($element['layout']) + ); + if($liid) { + $linfo = q("select mid from item where id = %d", + intval($liid[0]['iid']) + ); + $arr['layout_mid'] = $linfo[0]['mid']; + } + } + break; + // + // LAYOUTS + // + case 'layout': + $arr['item_type'] = ITEM_TYPE_PDL; + $namespace = 'PDL'; + $name = $element['name']; + $arr['title'] = $element['description']; + $arr['term'] = $element['term']; + break; + // + // BLOCKS + // + case 'block': + $arr['item_type'] = ITEM_TYPE_BLOCK; + $namespace = 'BUILDBLOCK'; + $name = $element['name']; + $arr['title'] = $element['title']; + + break; + default : + return null; // return null if invalid element type + } + + $arr['uid'] = $channel['channel_id']; + $arr['aid'] = $channel['channel_account_id']; + + // Check if an item already exists based on the name + $iid = q("select iid from iconfig where k = '" . $namespace . "' and v = '%s' and cat = 'system'", + dbesc($name) + ); + if($iid) { // If the item does exist, get the item metadata + $iteminfo = q("select mid,created,edited from item where id = %d", + intval($iid[0]['iid']) + ); + $arr['mid'] = $arr['parent_mid'] = $iteminfo[0]['mid']; + $arr['created'] = $iteminfo[0]['created']; + $arr['edited'] = (($element['edited']) ? datetime_convert('UTC', 'UTC', $element['edited']) : datetime_convert()); + } else { // otherwise, generate the creation times and unique id + $arr['created'] = (($element['created']) ? datetime_convert('UTC', 'UTC', $element['created']) : datetime_convert()); + $arr['edited'] = datetime_convert('UTC', 'UTC', '0000-00-00 00:00:00'); + $arr['mid'] = $arr['parent_mid'] = item_message_id(); + } + // Import the actual element content + $arr['body'] = file_get_contents($element['path']); + // The element owner is the channel importing the elements + $arr['owner_xchan'] = get_observer_hash(); + // The author is either the owner or whomever was specified + $arr['author_xchan'] = (($element['author_xchan']) ? $element['author_xchan'] : get_observer_hash()); + // Import mimetype if it is a valid mimetype for the element + $mimetypes = [ 'text/bbcode', + 'text/html', + 'text/markdown', + 'text/plain', + 'application/x-pdl', + 'application/x-php' + ]; + // Blocks and pages can have any mimetype, but layouts must be text/bbcode + if((in_array($element['mimetype'], $mimetypes)) && ($type === 'page' || $type === 'block') ) { + $arr['mimetype'] = $element['mimetype']; + } else { + $arr['mimetype'] = 'text/bbcode'; + } + + // Verify ability to use html or php!!! + $execflag = false; + if ($arr['mimetype'] === 'application/x-php') { + $z = q("select account_id, account_roles, channel_pageflags from account " + . "left join channel on channel_account_id = account_id where channel_id = %d limit 1", + intval(local_channel()) + ); + + if ($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) { + $execflag = true; + } + } + + $z = q("select * from iconfig where v = '%s' and k = '%s' and cat = 'service' limit 1", + dbesc($name), + dbesc($namespace) + ); + + $i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1", + dbesc($arr['mid']), + intval(local_channel()) + ); + $remote_id = 0; + if ($z && $i) { + $remote_id = $z[0]['id']; + $arr['id'] = $i[0]['id']; + // don't update if it has the same timestamp as the original + if ($arr['edited'] > $i[0]['edited']) + $x = item_store_update($arr, $execflag); + } else { + if (($i) && (intval($i[0]['item_deleted']))) { + // was partially deleted already, finish it off + q("delete from item where mid = '%s' and uid = %d", + dbesc($arr['mid']), + intval(local_channel()) + ); + } + $x = item_store($arr, $execflag); + } + if ($x['success']) { + $item_id = $x['item_id']; + update_remote_id($channel, $item_id, $arr['item_type'], $name, $namespace, $remote_id, $arr['mid']); + $element['import_success'] = 1; + } else { + $element['import_success'] = 0; + } + + return $element; + +} -- cgit v1.2.3 From ff2f599142348162b6459a02aa014c7dbca84f76 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sat, 16 Jul 2016 19:25:44 -0400 Subject: Postpone remote folder import until filesystem mirroring matures. --- Zotlabs/Module/Webpages.php | 38 ++++++++++++++++++++++++++++++++++++-- include/text.php | 6 +++++- view/tpl/website_import_tools.tpl | 17 ++++++++++++++--- 3 files changed, 55 insertions(+), 6 deletions(-) diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php index 766b4fc09..16ecb5386 100644 --- a/Zotlabs/Module/Webpages.php +++ b/Zotlabs/Module/Webpages.php @@ -211,7 +211,7 @@ class Webpages extends \Zotlabs\Web\Controller { function post() { - if(($_FILES) && array_key_exists('zip_file',$_FILES)) { + if(($_FILES) && array_key_exists('zip_file',$_FILES) && isset($_POST['w_upload'])) { $source = $_FILES["zip_file"]["tmp_name"]; $type = $_FILES["zip_file"]["type"]; $okay = false; @@ -256,7 +256,41 @@ class Webpages extends \Zotlabs\Web\Controller { if($elements) { rrmdir($website); // Delete the temporary decompressed files } - } + } + + return null; + } + + if (($_POST) && array_key_exists('url',$_POST) && isset($_POST['remotesubmit'])) { + $ret = []; + // Warning: Do not edit the following line. The first symbol is UTF-8 ＠ + $url = str_replace('@','@',notags(trim($_REQUEST['url']))); + if(! allowed_url($url)) { + $ret['message'] = t('Channel is blocked on this site.'); + return null; + } + + $h = @parse_url($url); + + if(! $h || !x($h, 'host') || !x($h, 'path')) { + return null; + } + if(substr($h['path'],-1,1) === '/') { + $h['path'] = substr($h['path'],0,-1); + } + if(substr($h['path'],0,1) === '/') { + $h['path'] = substr($h['path'],1); + } + $folders = explode('/', $h['path']); + if(!(array_shift($folders) === 'cloud')) { + return null; + } + $nick = array_shift($folders); + if(!$nick) { + return null; + } + return null; + } } diff --git a/include/text.php b/include/text.php index 096c8a5aa..a0f0ed7ae 100644 --- a/include/text.php +++ b/include/text.php @@ -2270,7 +2270,11 @@ function website_import_tools() { '$import_label' => t('Import website...'), '$import_placeholder' => t('Select folder to import'), '$file_upload_text' => t('Import from a zipped folder:'), - '$file_import_text' => t('Import from cloud files:') + '$file_import_text' => t('Import from cloud files:'), + '$file_remote_text' => t('Import from another channel'), + '$desc' => t('https://example.com/cloud/peter/sharedfolder'), + '$hint' => t('https://example.com/cloud/peter/sharedfolder'), + '$follow' => t('Import'), )); } diff --git a/view/tpl/website_import_tools.tpl b/view/tpl/website_import_tools.tpl index ca9cc8b33..d4360f634 100644 --- a/view/tpl/website_import_tools.tpl +++ b/view/tpl/website_import_tools.tpl @@ -5,13 +5,24 @@ {{$import_label}}