From bc46f70a90a25cc3f4395c1badfec6aad351589f Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 21 Jul 2016 20:04:30 -0700 Subject: zat URL auth updated to match changes to the atoken_login interface --- include/auth.php | 12 ++++++++++-- include/channel.php | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/include/auth.php b/include/auth.php index f8120981a..f3592cee3 100644 --- a/include/auth.php +++ b/include/auth.php @@ -16,16 +16,24 @@ require_once('include/security.php'); /** * @brief Verify login credentials. * - * If system authlog is set a log entry will be added for failed login + * If system.authlog is set a log entry will be added for failed login * attempts. * - * @param string $email + * @param string $login * The login to verify (channel address, account email or guest login token). * @param string $pass * The provided password to verify. * @return array|null * Returns account record on success, null on failure. + * The return array is dependent on the login mechanism. + * $ret['account'] will be set if either an email or channel address validation was successful (local login). + * $ret['channel'] will be set if a channel address validation was successful. + * $ret['xchan'] will be set if a guest access token validation was successful. + * Keys will exist for invalid return arrays but will be set to null. + * This function does not perform a login. It merely validates systems passwords and tokens. + * */ + function account_verify_password($login, $pass) { $ret = [ 'account' => null, 'channel' => null, 'xchan' => null ]; diff --git a/include/channel.php b/include/channel.php index 708e70b1c..a5233743d 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1371,7 +1371,8 @@ function zat_init() { dbesc($_REQUEST['zat']) ); if($r) { - atoken_login($r[0]); + $xchan = atoken_xchan($r[0]); + atoken_login($xchan); } } -- cgit v1.2.3 From 0c3d5e99a299fb51a63f51d2e8b9117590b717f7 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 21 Jul 2016 20:50:39 -0700 Subject: PConfig : Check for is_null($uid) as well as false. We actually allow $uid = 0 though it shouldn't normally happen. --- Zotlabs/Lib/PConfig.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Zotlabs/Lib/PConfig.php b/Zotlabs/Lib/PConfig.php index 195321375..319b8f203 100644 --- a/Zotlabs/Lib/PConfig.php +++ b/Zotlabs/Lib/PConfig.php @@ -17,7 +17,7 @@ class PConfig { */ static public function Load($uid) { - if($uid === false) + if(is_null($uid) || $uid === false) return false; if(! array_key_exists($uid, \App::$config)) @@ -61,7 +61,7 @@ class PConfig { static public function Get($uid,$family,$key,$instore = false) { - if($uid === false) + if(is_null($uid) || $uid === false) return false; if(! array_key_exists($uid, \App::$config)) @@ -102,7 +102,7 @@ class PConfig { // we provide a function backtrace in the logs so that we can find // and fix the calling function. - if($uid === false) { + if(is_null($uid) || $uid === false) { btlogger('UID is FALSE!', LOGGER_NORMAL, LOG_ERR); return; } @@ -172,6 +172,9 @@ class PConfig { static public function Delete($uid, $family, $key) { + if(is_null($uid) || $uid === false) + return false; + $ret = false; if(array_key_exists($key, \App::$config[$uid][$family])) -- cgit v1.2.3 From 2c1b4326132e5387d50fbe32096daf21bf520b69 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 21 Jul 2016 21:35:26 -0700 Subject: fix birthday addtocal --- include/datetime.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/datetime.php b/include/datetime.php index 600ad6ec4..76bd6b8d6 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -556,13 +556,13 @@ function update_birthdays() { $ev['uid'] = $rr['abook_channel']; $ev['account'] = $rr['abook_account']; $ev['event_xchan'] = $rr['xchan_hash']; - $ev['start'] = datetime_convert('UTC', 'UTC', $rr['abook_dob']); - $ev['finish'] = datetime_convert('UTC', 'UTC', $rr['abook_dob'] . ' + 1 day '); + $ev['dtstart'] = datetime_convert('UTC', 'UTC', $rr['abook_dob']); + $ev['dtend'] = datetime_convert('UTC', 'UTC', $rr['abook_dob'] . ' + 1 day '); $ev['adjust'] = intval(feature_enabled($rr['abook_channel'],'smart_birthdays')); $ev['summary'] = sprintf( t('%1$s\'s birthday'), $rr['xchan_name']); $ev['description'] = sprintf( t('Happy Birthday %1$s'), '[zrl=' . $rr['xchan_url'] . ']' . $rr['xchan_name'] . '[/zrl]') ; - $ev['type'] = 'birthday'; + $ev['etype'] = 'birthday'; $z = event_store_event($ev); if ($z) { -- cgit v1.2.3 From 7d897a3f03bd57ed556433eb84a41963ba44e02e Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 21 Jul 2016 23:06:55 -0700 Subject: more work on #453 --- Zotlabs/Module/Like.php | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php index 1ca37d646..170349509 100644 --- a/Zotlabs/Module/Like.php +++ b/Zotlabs/Module/Like.php @@ -264,23 +264,22 @@ class Like extends \Zotlabs\Web\Controller { logger('like: no item ' . $item_id); killme(); } - - + + + xchan_query($r,true,(($r[0]['uid'] == local_channel()) ? 0 : local_channel())); + $item = $r[0]; - $owner_uid = $item['uid']; - $owner_aid = $item['aid']; - - - $sys = get_sys_channel(); - - - // if this is a "discover" item, (item['uid'] is the sys channel), - // fallback to the item comment policy, which should've been - // respected when generating the conversation thread. - // Even if the activity is rejected by the item owner, it should still get attached - // to the local discover conversation on this site. - - if(($owner_uid != $sys['channel_id']) && (! perm_is_allowed($owner_uid,$observer['xchan_hash'],'post_comments'))) { + + $owner_uid = $r[0]['uid']; + $owner_aid = $r[0]['aid']; + + $can_comment = false; + if((array_key_exists('owner',$item)) && intval($item['owner']['abook_self'])) + $can_comment = perm_is_allowed($item['uid'],$observer['xchan_hash'],'post_comments'); + else + $can_comment = can_comment_on_post($observer['xchan_hash'],$item); + + if(! $can_comment) { notice( t('Permission denied') . EOL); killme(); } -- cgit v1.2.3 From 38e46fff548729ba459d0a83a46fbfa0d844e85d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 22 Jul 2016 14:03:14 +0200 Subject: upgrade readmore.js and improve collapsing a little --- library/readmore.js/README.md | 22 +++++++++++++++++----- library/readmore.js/readmore.js | 30 +++++++++++++++++++++--------- view/js/main.js | 4 ++-- 3 files changed, 40 insertions(+), 16 deletions(-) diff --git a/library/readmore.js/README.md b/library/readmore.js/README.md index 0116fbe8b..24649f32d 100644 --- a/library/readmore.js/README.md +++ b/library/readmore.js/README.md @@ -9,16 +9,22 @@ Readmore.js is tested with—and supported on—all versions of jQuery greater t ## Install -Install Readmore.js with Bower: +Install Readmore.js with npm: ``` -$ bower install readmore +$ npm install readmore-js ``` Then include it in your HTML: ```html - + +``` + +Or, using Webpack or Browserify: + +```javascript +require('readmore-js'); ``` @@ -49,17 +55,23 @@ $('article').readmore({ * `startOpen: false` do not immediately truncate, start in the fully opened position * `beforeToggle: function() {}` called after a more or less link is clicked, but *before* the block is collapsed or expanded * `afterToggle: function() {}` called *after* the block is collapsed or expanded +* `blockProcessed: function() {}` called once per block during initilization after Readmore.js has processed the block. If the element has a `max-height` CSS property, Readmore.js will use that value rather than the value of the `collapsedHeight` option. ### The callbacks: -The callback functions, `beforeToggle` and `afterToggle`, both receive the same arguments: `trigger`, `element`, and `expanded`. +The `beforeToggle` and `afterToggle` callbacks both receive the same arguments: `trigger`, `element`, and `expanded`. * `trigger`: the "Read more" or "Close" element that was clicked * `element`: the block that is being collapsed or expanded * `expanded`: Boolean; `true` means the block is expanded +The `blockProcessed` callback receives `element` and `collapsable`. + +* `element`: the block that has just been processed +* `collapsable`: Boolean; `false` means the block was shorter than the specified minimum `collapsedHeight`--the block will not have a "Read more" link + #### Callback example: Here's an example of how you could use the `afterToggle` callback to scroll back to the top of a block when the "Close" link is clicked. @@ -166,6 +178,6 @@ $ npm install Which will install the necessary development dependencies. Then, to build the minified script: ``` -$ gulp compress +$ npm run build ``` diff --git a/library/readmore.js/readmore.js b/library/readmore.js/readmore.js index fb5a0e0f9..34a624eb9 100644 --- a/library/readmore.js/readmore.js +++ b/library/readmore.js/readmore.js @@ -37,8 +37,9 @@ startOpen: false, // callbacks - beforeToggle: function(){}, - afterToggle: function(){} + blockProcessed: function() {}, + beforeToggle: function() {}, + afterToggle: function() {} }, cssEmbedded = {}, uniqueIdCounter = 0; @@ -187,6 +188,9 @@ if (current.outerHeight(true) <= collapsedHeight + heightMargin) { // The block is shorter than the limit, so there's no need to truncate it. + if (this.options.blockProcessed && typeof this.options.blockProcessed === 'function') { + this.options.blockProcessed(current, false); + } return true; } else { @@ -206,7 +210,7 @@ }; })(this)) .attr({ - 'data-readmore-toggle': '', + 'data-readmore-toggle': id, 'aria-controls': id })); @@ -215,6 +219,10 @@ height: collapsedHeight }); } + + if (this.options.blockProcessed && typeof this.options.blockProcessed === 'function') { + this.options.blockProcessed(current, true); + } } }, @@ -224,11 +232,11 @@ } if (! trigger) { - trigger = $('[aria-controls="' + _this.element.id + '"]')[0]; + trigger = $('[aria-controls="' + this.element.id + '"]')[0]; } if (! element) { - element = _this.element; + element = this.element; } var $element = $(element), @@ -238,7 +246,7 @@ collapsedHeight = $element.data('collapsedHeight'); if ($element.height() <= collapsedHeight) { - newHeight = 100 + '%'; + newHeight = $element.data('expandedHeight') + 'px'; newLink = 'lessLink'; expanded = true; } @@ -250,14 +258,18 @@ // Fire beforeToggle callback // Since we determined the new "expanded" state above we're now out of sync // with our true current state, so we need to flip the value of `expanded` - this.options.beforeToggle(trigger, $element, ! expanded); + if (this.options.beforeToggle && typeof this.options.beforeToggle === 'function') { + this.options.beforeToggle(trigger, $element, ! expanded); + } $element.css({'height': newHeight}); // Fire afterToggle callback $element.on('transitionend', (function(_this) { return function() { - _this.options.afterToggle(trigger, $element, expanded); + if (_this.options.afterToggle && typeof _this.options.afterToggle === 'function') { + _this.options.afterToggle(trigger, $element, expanded); + } $(this).attr({ 'aria-expanded': expanded @@ -272,7 +284,7 @@ }; })(this)) .attr({ - 'data-readmore-toggle': '', + 'data-readmore-toggle': $element.attr('id'), 'aria-controls': $element.attr('id') })); }, diff --git a/view/js/main.js b/view/js/main.js index a288f98f5..a3fade0ea 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -659,7 +659,7 @@ function collapseHeight() { var position = $(window).scrollTop(); $(".wall-item-content, .directory-collapse").each(function() { - var orgHeight = parseInt($(this).css('height')); + var orgHeight = $(this).outerHeight(true); if(orgHeight > divmore_height) { if(! $(this).hasClass('divmore')) { @@ -679,7 +679,7 @@ function collapseHeight() { beforeToggle: function(trigger, element, expanded) { if(expanded) { if((($(element).offset().top + divmore_height) - $(window).scrollTop()) < 65 ) { - $(window).scrollTop($(window).scrollTop() - (orgHeight - divmore_height)); + $(window).scrollTop($(window).scrollTop() - ($(element).outerHeight(true) - divmore_height)); } } } -- cgit v1.2.3 From 52db6490222be3ee7d3872b1af989c9430d4b892 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 22 Jul 2016 14:14:20 +0200 Subject: apply our custom patch to readmore.js --- library/readmore.js/hubzilla-custom.patch | 13 +++++++++++++ library/readmore.js/readmore.js | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 library/readmore.js/hubzilla-custom.patch diff --git a/library/readmore.js/hubzilla-custom.patch b/library/readmore.js/hubzilla-custom.patch new file mode 100644 index 000000000..fd3146152 --- /dev/null +++ b/library/readmore.js/hubzilla-custom.patch @@ -0,0 +1,13 @@ +diff --git a/library/readmore.js/readmore.js b/library/readmore.js/readmore.js +index 34a624e..51222ce 100644 +--- a/library/readmore.js/readmore.js ++++ b/library/readmore.js/readmore.js +@@ -246,7 +246,7 @@ + collapsedHeight = $element.data('collapsedHeight'); + + if ($element.height() <= collapsedHeight) { +- newHeight = $element.data('expandedHeight') + 'px'; ++ newHeight = 100 + '%'; + newLink = 'lessLink'; + expanded = true; + } diff --git a/library/readmore.js/readmore.js b/library/readmore.js/readmore.js index 34a624eb9..51222ced0 100644 --- a/library/readmore.js/readmore.js +++ b/library/readmore.js/readmore.js @@ -246,7 +246,7 @@ collapsedHeight = $element.data('collapsedHeight'); if ($element.height() <= collapsedHeight) { - newHeight = $element.data('expandedHeight') + 'px'; + newHeight = 100 + '%'; newLink = 'lessLink'; expanded = true; } -- cgit v1.2.3 From 4ffc4ee70aa38c24cee2a7ae0b35c9203515acef Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 22 Jul 2016 14:29:16 +0200 Subject: rename the patch so that it explains what it does --- .../readmore.js/hubzilla-custom-fix-webkit-browsers.patch | 13 +++++++++++++ library/readmore.js/hubzilla-custom.patch | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 library/readmore.js/hubzilla-custom-fix-webkit-browsers.patch delete mode 100644 library/readmore.js/hubzilla-custom.patch diff --git a/library/readmore.js/hubzilla-custom-fix-webkit-browsers.patch b/library/readmore.js/hubzilla-custom-fix-webkit-browsers.patch new file mode 100644 index 000000000..fd3146152 --- /dev/null +++ b/library/readmore.js/hubzilla-custom-fix-webkit-browsers.patch @@ -0,0 +1,13 @@ +diff --git a/library/readmore.js/readmore.js b/library/readmore.js/readmore.js +index 34a624e..51222ce 100644 +--- a/library/readmore.js/readmore.js ++++ b/library/readmore.js/readmore.js +@@ -246,7 +246,7 @@ + collapsedHeight = $element.data('collapsedHeight'); + + if ($element.height() <= collapsedHeight) { +- newHeight = $element.data('expandedHeight') + 'px'; ++ newHeight = 100 + '%'; + newLink = 'lessLink'; + expanded = true; + } diff --git a/library/readmore.js/hubzilla-custom.patch b/library/readmore.js/hubzilla-custom.patch deleted file mode 100644 index fd3146152..000000000 --- a/library/readmore.js/hubzilla-custom.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/library/readmore.js/readmore.js b/library/readmore.js/readmore.js -index 34a624e..51222ce 100644 ---- a/library/readmore.js/readmore.js -+++ b/library/readmore.js/readmore.js -@@ -246,7 +246,7 @@ - collapsedHeight = $element.data('collapsedHeight'); - - if ($element.height() <= collapsedHeight) { -- newHeight = $element.data('expandedHeight') + 'px'; -+ newHeight = 100 + '%'; - newLink = 'lessLink'; - expanded = true; - } -- cgit v1.2.3 From 3c5598407eb327c056d803b3afc4364fd6e107ab Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Fri, 22 Jul 2016 21:27:32 -0400 Subject: Drag and drop file information display in cloud files upload form. No actual upload implemented yet. --- view/tpl/cloud_actionspanel.tpl | 112 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index 81a586e75..d4e187619 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -17,4 +17,116 @@
+ +
+ +
+ + + +
+ + +
or drop files here
+
+ +
+ +
+ +
+
+ +
+
+ + + + \ No newline at end of file -- cgit v1.2.3 From eb1eb38c0174b542e388b32039589c0030ebd073 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sat, 23 Jul 2016 07:59:28 -0400 Subject: AJAX single upload might be working, but permissions problems seem to cause failure. --- vendor/sabre/dav/lib/DAV/Browser/Plugin.php | 7 ++- view/tpl/cloud_actionspanel.tpl | 88 +++++++++++++++++++++++++---- 2 files changed, 81 insertions(+), 14 deletions(-) diff --git a/vendor/sabre/dav/lib/DAV/Browser/Plugin.php b/vendor/sabre/dav/lib/DAV/Browser/Plugin.php index 49359a045..72b04065a 100644 --- a/vendor/sabre/dav/lib/DAV/Browser/Plugin.php +++ b/vendor/sabre/dav/lib/DAV/Browser/Plugin.php @@ -163,7 +163,7 @@ class Plugin extends DAV\ServerPlugin { * @return bool */ function httpPOST(RequestInterface $request, ResponseInterface $response) { - + $contentType = $request->getHeader('Content-Type'); list($contentType) = explode(';', $contentType); if ($contentType !== 'application/x-www-form-urlencoded' && @@ -179,7 +179,7 @@ class Plugin extends DAV\ServerPlugin { if ($this->server->emit('onBrowserPostAction', [$uri, $postVars['sabreAction'], $postVars])) { - switch ($postVars['sabreAction']) { + switch ($postVars['sabreAction']) { case 'mkcol' : if (isset($postVars['name']) && trim($postVars['name'])) { @@ -221,7 +221,8 @@ class Plugin extends DAV\ServerPlugin { if ($_FILES) $file = current($_FILES); else break; - + logger('$_FILES: ' . json_encode($_FILES)); + logger('$file: ' . json_encode($file)); list(, $newName) = URLUtil::splitPath(trim($file['name'])); if (isset($postVars['name']) && trim($postVars['name'])) $newName = trim($postVars['name']); diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index d4e187619..688b8f33d 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -9,24 +9,25 @@
{{if $quota.limit || $quota.used}}
{{if $quota.warning}}{{$quota.warning}} {{/if}}{{$quota.desc}}
{{/if}} - +
- -
+ --> + +
-
- + +
or drop files here
@@ -36,7 +37,10 @@
- + +
+
+
@@ -68,10 +72,24 @@ \ No newline at end of file -- cgit v1.2.3 From 3a60bef2b6cd8288c6be50915687ef7c0df89878 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sat, 23 Jul 2016 08:39:23 -0400 Subject: Include credentials for session cookie in xhr --- view/tpl/cloud_actionspanel.tpl | 1 + 1 file changed, 1 insertion(+) diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index 688b8f33d..86fda883c 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -167,6 +167,7 @@ function DragDropUploadFile(file) { // var xhr = new XMLHttpRequest(); + xhr.withCredentials = true; (xhr.upload || xhr).addEventListener('progress', function(e) { var done = e.position || e.loaded var total = e.totalSize || e.total; -- cgit v1.2.3 From 6998bb1f23b63c3439f34d9b3f53c42a6922a58e Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sun, 24 Jul 2016 07:41:53 -0400 Subject: Multiple file upload by drag and drop with progress indicators and auto page reload --- Zotlabs/Storage/Browser.php | 3 +- view/js/mod_cloud.js | 98 ++++++++++++++++++ view/theme/redbasic/css/style.css | 23 +++- view/tpl/cloud_actionspanel.tpl | 213 ++++---------------------------------- 4 files changed, 142 insertions(+), 195 deletions(-) create mode 100644 view/js/mod_cloud.js diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 713d75108..e719530b5 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -306,7 +306,8 @@ class Browser extends DAV\Browser\Plugin { '$folder_submit' => t('Create'), '$upload_header' => t('Upload file'), '$upload_submit' => t('Upload'), - '$quota' => $quota + '$quota' => $quota, + '$dragdroptext' => t('Drop files here to immediately upload') )); } diff --git a/view/js/mod_cloud.js b/view/js/mod_cloud.js new file mode 100644 index 000000000..71e916446 --- /dev/null +++ b/view/js/mod_cloud.js @@ -0,0 +1,98 @@ +/** + * JavaScript for mod/cloud + */ + +$(document).ready(function () { + // call initialization file + if (window.File && window.FileList && window.FileReader) { + DragDropUploadInit(); + } +}); + +// +// initialize +function DragDropUploadInit() { + + var fileselect = $("#fileselect"), + filedrag = $("#filedrag"); + + // file select + fileselect.on("change", DragDropUploadFileSelectHandler); + + // is XHR2 available? + var xhr = new XMLHttpRequest(); + if (xhr.upload) { + + // file drop + filedrag.on("dragover", DragDropUploadFileHover); + filedrag.on("dragleave", DragDropUploadFileHover); + filedrag.on("drop", DragDropUploadFileSelectHandler); + filedrag.show(); + + } + + window.filesToUpload = 0; + window.fileUploadsCompleted = 0; + + +} + +// file drag hover +function DragDropUploadFileHover(e) { + e.stopPropagation(); + e.preventDefault(); + e.target.className = (e.type == "dragover" ? "hover" : ""); +} + +// file selection +function DragDropUploadFileSelectHandler(e) { + + // cancel event and hover styling + DragDropUploadFileHover(e); + + // fetch FileList object + var files = e.target.files || e.originalEvent.dataTransfer.files; + $("#file-upload-list").empty(); + // process all File objects + for (var i = 0, f; f = files[i]; i++) { + $("#file-upload-list").append( + "

" + " -> File: " + f.name + + " type: " + f.type + + " size: " + f.size + + " bytes

" + ); + DragDropUploadFile(f, i); + } + +} + +// upload files +function DragDropUploadFile(file, idx) { + + window.filesToUpload = window.filesToUpload + 1; + + var xhr = new XMLHttpRequest(); + xhr.withCredentials = true; // Include the SESSION cookie info for authentication + (xhr.upload || xhr).addEventListener('progress', function (e) { + var done = e.position || e.loaded; + var total = e.totalSize || e.total; + // Dynamically update the percentage complete displayed in the file upload list + $('#upload-progress-' + idx).html(Math.round(done / total * 100) + '%'); + }); + xhr.addEventListener('load', function (e) { + //console.log('xhr upload complete', e); + window.fileUploadsCompleted = window.fileUploadsCompleted + 1; + // When all the uploads have completed, refresh the page + if (window.filesToUpload > 0 && window.fileUploadsCompleted === window.filesToUpload) { + window.fileUploadsCompleted = window.filesToUpload = 0; + // After uploads complete, refresh browser window to display new files + window.location.href = window.location.href; + } + }); + // POST to the entire cloud path + xhr.open('post', window.location.pathname, true); + + var data = new FormData(document.getElementById("ajax-upload-files")); + data.append('file', file); + xhr.send(data); +} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 6cc3e2f10..6fde5e39e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2040,4 +2040,25 @@ dl.bb-dl > dd > li { #wiki-preview img { max-width: 100%; -} \ No newline at end of file +} + +#filedrag +{ + display: none; + font-weight: bold; + text-align: center; + padding: 1em 0; + margin: 1em 0; + color: #555; + border: 2px dashed #555; + border-radius: 7px; + cursor: default; +} + +#filedrag.hover +{ + color: #f00; + border-color: #f00; + border-style: solid; + box-shadow: inset 0 3px 4px #888; +} diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index 86fda883c..fba457fdc 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -1,199 +1,26 @@
- -
- - - -
-
+ +
+ + + +
+
- {{if $quota.limit || $quota.used}}
{{if $quota.warning}}{{$quota.warning}} {{/if}}{{$quota.desc}}
{{/if}} - -
- - -
- - -
- - - -
or drop files here
-
- -
- -
- -
-
- -
-
+ {{if $quota.limit || $quota.used}}
{{if $quota.warning}}{{$quota.warning}} {{/if}}{{$quota.desc}}
{{/if}} + + +
+

{{$dragdroptext}}
- +
+
+
+ + + +
+
- - - - \ No newline at end of file -- cgit v1.2.3 From 4c4d185937687a2a806a8d2b144eaf2dff17acb5 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sun, 24 Jul 2016 08:35:21 -0400 Subject: Remove logger calls --- vendor/sabre/dav/lib/DAV/Browser/Plugin.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vendor/sabre/dav/lib/DAV/Browser/Plugin.php b/vendor/sabre/dav/lib/DAV/Browser/Plugin.php index 72b04065a..4959193ea 100644 --- a/vendor/sabre/dav/lib/DAV/Browser/Plugin.php +++ b/vendor/sabre/dav/lib/DAV/Browser/Plugin.php @@ -221,8 +221,7 @@ class Plugin extends DAV\ServerPlugin { if ($_FILES) $file = current($_FILES); else break; - logger('$_FILES: ' . json_encode($_FILES)); - logger('$file: ' . json_encode($file)); + list(, $newName) = URLUtil::splitPath(trim($file['name'])); if (isset($postVars['name']) && trim($postVars['name'])) $newName = trim($postVars['name']); -- cgit v1.2.3 From 1b1170bcf6a0275ff3afa8c92cffb8da2f9f0686 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sun, 24 Jul 2016 17:33:34 -0400 Subject: Drag and drop one image file at a time into the post editor will upload it. --- view/css/conversation.css | 9 ++++++ view/tpl/jot-header.tpl | 82 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 90 insertions(+), 1 deletion(-) diff --git a/view/css/conversation.css b/view/css/conversation.css index 68aa8bfbe..87965b2b8 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -40,6 +40,15 @@ resize: vertical; } +#profile-jot-text.hover { + color: #f00; + background-color: #43488A; + opacity: 0.5; + border-color: #f00; + border-style: solid; + box-shadow: inset 0 3px 4px #888; +} + .jot-attachment { border: 0px; padding: 10px; diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 9953875ef..904b333d6 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -164,6 +164,12 @@ function enableOnUser(){ }); } catch(e) { } + + + // call initialization file + if (window.File && window.FileList && window.FileReader) { + DragDropUploadInit(); + } }); function deleteCheckedItems() { @@ -446,7 +452,81 @@ function enableOnUser(){ }, 'json'); }; - + + // + // initialize + function DragDropUploadInit() { + + var filedrag = $("#profile-jot-text"); + + // is XHR2 available? + var xhr = new XMLHttpRequest(); + if (xhr.upload) { + + // file drop + filedrag.on("dragover", DragDropUploadFileHover); + filedrag.on("dragleave", DragDropUploadFileHover); + filedrag.on("drop", DragDropUploadFileSelectHandler); + + } + + window.filesToUpload = 0; + window.fileUploadsCompleted = 0; + + + } + + // file drag hover + function DragDropUploadFileHover(e) { + e.stopPropagation(); + e.preventDefault(); + e.target.className = (e.type == "dragover" ? "hover" : ""); + } + + // file selection + function DragDropUploadFileSelectHandler(e) { + + // cancel event and hover styling + DragDropUploadFileHover(e); + + // fetch FileList object + var files = e.target.files || e.originalEvent.dataTransfer.files; + // process all File objects + for (var i = 0, f; f = files[i]; i++) { + DragDropUploadFile(f, i); + } + + } + + // upload files + function DragDropUploadFile(file, idx) { + + window.filesToUpload = window.filesToUpload + 1; + + var xhr = new XMLHttpRequest(); + xhr.withCredentials = true; // Include the SESSION cookie info for authentication + (xhr.upload || xhr).addEventListener('progress', function (e) { + $('#profile-rotator').spin('tiny'); + }); + xhr.addEventListener('load', function (e) { + //console.log('xhr upload complete', e); + window.fileUploadsCompleted = window.fileUploadsCompleted + 1; + // When all the uploads have completed, refresh the page + if (window.filesToUpload > 0 && window.fileUploadsCompleted === window.filesToUpload) { + addeditortext(xhr.responseText); + $('#jot-media').val($('#jot-media').val() + xhr.responseText); + $('#profile-rotator').spin(false); + window.fileUploadsCompleted = window.filesToUpload = 0; + } + }); + // POST to the wall_upload endpoint + xhr.open('post', '{{$baseurl}}/wall_upload/{{$nickname}}', true); + + var data = new FormData(); + data.append('userfile', file); + xhr.send(data); + } +