aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Zotlabs/Module/Webpages.php106
-rw-r--r--Zotlabs/Storage/Directory.php1
-rw-r--r--include/attach.php67
-rw-r--r--include/import.php213
-rw-r--r--include/text.php31
-rw-r--r--include/widgets.php14
-rw-r--r--view/pdl/mod_webpages.pdl1
-rw-r--r--view/theme/redbasic/css/style.css17
-rw-r--r--view/tpl/webpage_import.tpl76
-rw-r--r--view/tpl/website_import_tools.tpl29
10 files changed, 554 insertions, 1 deletions
diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php
index cc0a01cce..ab03b0a37 100644
--- a/Zotlabs/Module/Webpages.php
+++ b/Zotlabs/Module/Webpages.php
@@ -209,4 +209,110 @@ class Webpages extends \Zotlabs\Web\Controller {
return $o;
}
+ function post() {
+
+ $action = $_REQUEST['action'];
+ if( $action ){
+ switch ($action) {
+ case 'scan':
+
+ // the state of this variable tracks whether website files have been scanned (null, true, false)
+ $cloud = null;
+
+ // Website files are to be imported from an uploaded zip file
+ 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;
+ $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); // delete the compressed file now that the content has been extracted
+
+ $cloud = false;
+ } else {
+ notice( t('Error opening zip file') . EOL);
+ return null;
+ }
+ }
+
+ // Website files are to be imported from the channel cloud files
+ if (($_POST) && array_key_exists('path',$_POST) && isset($_POST['cloudsubmit'])) {
+
+ $channel = \App::get_channel();
+ $dirpath = get_dirpath_by_cloudpath($channel, $_POST['path']);
+ if(!$dirpath) {
+ notice( t('Invalid folder path.') . EOL);
+ return null;
+ }
+ $cloud = true;
+
+ }
+
+ // If the website files were uploaded or specified in the cloud files, then $cloud
+ // should be either true or false
+ if ($cloud !== null) {
+ require_once('include/import.php');
+ $elements = [];
+ $elements['pages'] = scan_webpage_elements($_POST['path'], 'page', $cloud);
+ $elements['layouts'] = scan_webpage_elements($_POST['path'], 'layout', $cloud);
+ $elements['blocks'] = scan_webpage_elements($_POST['path'], 'block', $cloud);
+
+ if(!(empty($elements['pages']) && empty($elements['blocks']) && empty($elements['layouts']))) {
+ info( t('Webpages elements detected.') . EOL);
+
+ $o .= replace_macros(get_markup_template('webpage_import.tpl'), array(
+ '$title' => t('Import Webpage Elements'),
+ ));
+
+ return $o;
+
+ } else {
+ notice( t('No webpage elements detected.') . EOL);
+ }
+ // 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');
+ }
+
+ }
+
+ // If the website elements were imported from a zip file, delete the temporary decompressed files
+ if ($cloud === false && $website) {
+ rrmdir($website); // Delete the temporary decompressed files
+ }
+
+ break;
+ case 'import':
+ break;
+ default :
+ break;
+ }
+ }
+
+
+
+
+ }
+
}
diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php
index 6242d5274..f9ddb4e24 100644
--- a/Zotlabs/Storage/Directory.php
+++ b/Zotlabs/Storage/Directory.php
@@ -370,6 +370,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
);
if ($r) {
+ require_once('include/attach.php');
$result = attach_mkdir($r[0], $this->auth->observer, array('filename' => $name, 'folder' => $this->folder_hash));
if($result['success']) {
diff --git a/include/attach.php b/include/attach.php
index b3ddfee88..40410d41e 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -1910,3 +1910,70 @@ function get_attach_binname($s) {
}
return $p;
}
+
+
+function get_dirpath_by_cloudpath($channel, $path) {
+
+ // Warning: Do not edit the following line. The first symbol is UTF-8 @
+ $path = str_replace('@','@',notags(trim($path)));
+
+ $h = @parse_url($path);
+
+ if(! $h || !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']);
+ $f = array_shift($folders);
+
+ $nick = $channel['channel_address'];
+ //check to see if the absolute path was provided (/cloud/channelname/path/to/folder)
+ if($f === 'cloud' ) {
+ $g = array_shift($folders);
+ if( $g !== $nick) {
+ // if nick does not follow "cloud", then the top level folder must be called "cloud"
+ // and the given path must be relative to "/cloud/channelname/".
+ $folders = array_unshift(array_unshift($folders, $g), $f);
+ }
+ } else {
+ array_unshift($folders, $f);
+ }
+ $clouddir = 'store/' . $nick . '/' ;
+ $subdir = '/';
+ $valid = true;
+ while($folders && $valid && is_dir($clouddir . $subdir) && is_readable($clouddir . $subdir)) {
+ $valid = false;
+ $f = array_shift($folders);
+ $items = array_diff(scandir($clouddir . $subdir), array('.', '..')); // hashed names
+ foreach($items as $item) {
+ $filename = find_filename_by_hash($channel['channel_id'], $item);
+ if($filename === $f) {
+ $subdir .= $item . '/';
+ $valid = true;
+ }
+ }
+ }
+ if(!$valid) {
+ return null;
+ } else {
+ return $clouddir . $subdir;
+ }
+
+
+}
+
+function get_filename_by_cloudname($cloudname, $channel, $storepath) {
+ $items = array_diff(scandir($storepath), array('.', '..')); // hashed names
+ foreach($items as $item) {
+ $filename = find_filename_by_hash($channel['channel_id'], $item);
+ if($filename === $cloudname) {
+ return $item;
+ }
+ }
+ return null;
+} \ No newline at end of file
diff --git a/include/import.php b/include/import.php
index 42c902a0a..c69f2eadd 100644
--- a/include/import.php
+++ b/include/import.php
@@ -1246,3 +1246,216 @@ function convert_oldfields(&$arr,$old,$new) {
unset($arr[$old]);
}
}
+
+function scan_webpage_elements($path, $type, $cloud = false) {
+ $channel = \App::get_channel();
+ $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();
+ }
+ if($cloud) {
+ $dirtoscan = get_dirpath_by_cloudpath($channel, $dirtoscan);
+ }
+ $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)) {
+ if($cloud) {
+ $jsonfilepath = $folder . '/' . get_filename_by_cloudname($json_filename, $channel, $folder);
+ } else {
+ $jsonfilepath = $folder . '/' . $json_filename;
+ }
+ if (is_file($jsonfilepath)) {
+ $metadata = json_decode(file_get_contents($jsonfilepath), true);
+ if($cloud) {
+ $contentfilename = get_filename_by_cloudname($metadata['contentfile'], $channel, $folder);
+ $metadata['path'] = $folder . '/' . $contentfilename;
+ } else {
+ $contentfilename = $metadata['contentfile'];
+ $metadata['path'] = $folder . '/' . $contentfilename;
+ }
+ if ($metadata['contentfile'] === '') {
+ logger('Invalid ' . $type . ' content file');
+ return false;
+ }
+ $content = file_get_contents($folder . '/' . $contentfilename);
+ 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;
+
+}
diff --git a/include/text.php b/include/text.php
index dd7d9eaa8..a9bde8374 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2242,6 +2242,37 @@ 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('website_import_tools.tpl'), array(
+ '$title' => t('Import'),
+ //'$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:'),
+ '$desc' => t('/path/to/folder'),
+ '$hint' => t('/path/to/folder'),
+ '$select' => t('Select folder'),
+ ));
+}
+
/* case insensitive in_array() */
function in_arrayi($needle, $haystack) {
diff --git a/include/widgets.php b/include/widgets.php
index 3516e82da..5477dc1e4 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -779,6 +779,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/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 6cc3e2f10..982f32ce7 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2040,4 +2040,19 @@ dl.bb-dl > dd > li {
#wiki-preview img {
max-width: 100%;
-} \ No newline at end of file
+.atoken-list {
+ margin-right: 5px;
+ list-style-type: none;
+}
+.atoken-list li {
+ margin-bottom: 10px;
+}
+.atoken-text {
+ margin: 5px 10px 5px 10px;
+}
+.atoken-example {
+ margin-left: 20px;
+}
+.zat-example {
+ color: red;
+}
diff --git a/view/tpl/webpage_import.tpl b/view/tpl/webpage_import.tpl
new file mode 100644
index 000000000..524460408
--- /dev/null
+++ b/view/tpl/webpage_import.tpl
@@ -0,0 +1,76 @@
+<div class="generic-content-wrapper">
+ <div class="section-title-wrapper">
+ {{if $editor}}
+ <div class="pull-right">
+ <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('webpage-editor');"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</button>
+ </div>
+ {{/if}}
+ <h2>{{$listtitle}}</h2>
+ <div class="clear"></div>
+ </div>
+ {{if $editor}}
+ <div id="webpage-editor" class="section-content-tools-wrapper">
+ {{$editor}}
+ </div>
+ {{/if}}
+ {{if $pages}}
+ <div id="pagelist-content-wrapper" class="section-content-wrapper-np">
+ <table id="webpage-list-table">
+ <tr>
+ <th width="1%">{{$pagelink_txt}}</th>
+ <th width="95%">{{$title_txt}}</th>
+ <th width="1%"></th>
+ <th width="1%"></th>
+ <th width="1%"></th>
+ <th width="1%"></th>
+ <th width="1%" class="hidden-xs">{{$created_txt}}</th>
+ <th width="1%" class="hidden-xs">{{$edited_txt}}</th>
+ </tr>
+ {{foreach $pages as $key => $items}}
+ {{foreach $items as $item}}
+ <tr id="webpage-list-item-{{$item.url}}">
+ <td>
+ {{if $view}}
+ <a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a>
+ {{else}}
+ {{$item.pagetitle}}
+ {{/if}}
+ </td>
+ <td>
+ {{$item.title}}
+ </td>
+ <td class="webpage-list-tool dropdown">
+ {{if $item.lockstate=='lock'}}
+ <i class="fa fa-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i>
+ <ul id="panel-{{$item.url}}" class="lockview-panel dropdown-menu"></ul>
+ {{/if}}
+ </td>
+ <td class="webpage-list-tool">
+ {{if $edit}}
+ <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="fa fa-pencil"></i></a>
+ {{/if}}
+ </td>
+ <td class="webpage-list-tool">
+ {{if $item.bb_element}}
+ <a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a>
+ {{/if}}
+ </td>
+ <td class="webpage-list-tool">
+ {{if $edit}}
+ <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#webpage-list-item-{{$item.url}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+ {{/if}}
+ </td>
+ <td class="hidden-xs">
+ {{$item.created}}
+ </td>
+ <td class="hidden-xs">
+ {{$item.edited}}
+ </td>
+ </tr>
+ {{/foreach}}
+ {{/foreach}}
+ </table>
+ </div>
+ {{/if}}
+ <div class="clear"></div>
+</div>
diff --git a/view/tpl/website_import_tools.tpl b/view/tpl/website_import_tools.tpl
new file mode 100644
index 000000000..133d6268e
--- /dev/null
+++ b/view/tpl/website_import_tools.tpl
@@ -0,0 +1,29 @@
+<div id="website-import-tools" class="widget">
+ <h3>{{$title}}</h3>
+ <ul class="nav nav-pills nav-stacked">
+ <li>
+ <a href="#" onclick="openClose('import-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
+ </li>
+ <form id="import-form" enctype="multipart/form-data" method="post" action="" style="display: none;" class="sub-menu">
+
+ <input type="hidden" name="action" value="scan">
+
+ <p class="descriptive-text">{{$file_import_text}}</p>
+ <div class="form-group">
+ <div class="input-group">
+ <input class="widget-input" type="text" name="path" title="{{$hint}}" placeholder="{{$desc}}" />
+ <div class="input-group-btn">
+ <button class="btn btn-default btn-sm" type="submit" name="cloudsubmit" value="{{$select}}"><i class="fa fa-folder-open generic-icons"></i></button>
+ </div>
+ </div>
+ </div>
+
+ <!-- Or upload a zipped file containing the website -->
+ <p class="descriptive-text">{{$file_upload_text}}</p>
+ <div class="form-group">
+ <input id="website-upload-choose" type="file" name="zip_file" />
+ </div>
+ <button class="btn btn-primary btn-sm" type="submit" name="w_upload" value="w_upload">Upload</button>
+ </form>
+ </ul>
+</div>