Merge remote-tracking branch 'upstream/dev' into dev

Zotlabs/Lib/PConfig.php

@@ -23,6 +23,14 @@ class PConfig {
 		if(! array_key_exists($uid, \App::$config))
 			\App::$config[$uid] = array();
 
+		if(! is_array(\App::$config)) {
+			btlogger('App::$config not an array: ' . $uid);
+		}
+
+		if(! is_array(\App::$config[$uid])) {
+			btlogger('App::$config[$uid] not an array: ' . $uid);
+		}
+
 		$r = q("SELECT * FROM pconfig WHERE uid = %d",
 			intval($uid)
 		);

Zotlabs/Module/File_upload.php

@@ -0,0 +1,40 @@
+<?php
+namespace Zotlabs\Module;
+
+require_once('include/attach.php');
+require_once('include/channel.php');
+require_once('include/photos.php');
+
+
+class File_upload extends \Zotlabs\Web\Controller {
+
+	function post() {
+
+		// logger('file upload: ' . print_r($_REQUEST,true));
+	
+		$channel = (($_REQUEST['channick']) ? get_channel_by_nick($_REQUEST['channick']) : null);
+	
+		if(! $channel) {
+			logger('channel not found');
+			killme();
+		}
+	
+		$_REQUEST['source'] = 'file_upload';
+
+        if($channel['channel_id'] != local_channel()) {
+            $_REQUEST['contact_allow'] = expand_acl($channel['channel_allow_cid']);
+            $_REQUEST['group_allow']   = expand_acl($channel['channel_allow_gid']);
+            $_REQUEST['contact_deny']  = expand_acl($channel['channel_deny_cid']);
+            $_REQUEST['group_deny']    = expand_acl($channel['channel_deny_gid']);
+        }
+
+		if($_REQUEST['directory_name'])
+			$r = attach_mkdir($channel,get_observer_hash(),$_REQUEST);
+		else
+			$r = attach_store($channel,get_observer_hash(), '', $_REQUEST);
+
+		goaway(z_root() . '/' . $_REQUEST['return_url']);
+	
+	}
+	
+}

Zotlabs/Module/Openid.php

@@ -82,8 +82,8 @@ class Openid extends \Zotlabs\Web\Controller {
 	
 				// no xchan...
 				// create one.
-				// We should probably probe the openid url and figure out if they have any kind of social presence we might be able to 
+				// We should probably probe the openid url and figure out if they have any kind of
-				// scrape some identifying info from. 
+				// social presence we might be able to scrape some identifying info from. 
 	
 				$name = $authid;
 				$url = trim($_REQUEST['openid_identity'],'/');

Zotlabs/Storage/Browser.php

@@ -274,6 +274,22 @@ class Browser extends DAV\Browser\Plugin {
 		// SimpleCollection, we won't need to show the panel either.
 		if (get_class($node) === 'Sabre\\DAV\\SimpleCollection')
 			return;
+		require_once('include/acl_selectors.php');
+
+		$aclselect = null;
+		$lockstate = '';
+
+		if($this->auth-owner_id) {
+			$channel = channelx_by_n($this->auth->owner_id);
+			if($channel) {
+				$acl = new \Zotlabs\Access\AccessList($channel);
+				$channel_acl = $acl->get();
+				$lockstate = (($acl->is_private()) ? 'lock' : 'unlock');
+
+				$aclselect = ((local_channel() == $this->auth->owner_id) ? populate_acl($channel_acl,false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage')) : '');
+
+			}
+		}
 
 		// Storage and quota for the account (all channels of the owner of this directory)!
 		$limit = engr_units_to_bytes(service_class_fetch($owner, 'attach_upload_limit'));
@@ -293,7 +309,6 @@ class Browser extends DAV\Browser\Plugin {
 				userReadableSize($limit),
 				round($used / $limit, 1) * 100);
 		}
-
 		// prepare quota for template
 		$quota = array();
 		$quota['used'] = $used;
@@ -306,7 +321,12 @@ class Browser extends DAV\Browser\Plugin {
 				'$folder_submit' => t('Create'),
 				'$upload_header' => t('Upload file'),
 				'$upload_submit' => t('Upload'),
-				'$quota' => $quota
+				'$quota' => $quota,
+				'$channick' => $this->auth->owner_nick,
+				'$aclselect' => $aclselect,
+				'$lockstate' => $lockstate,
+				'$return_url' => \App::$cmd,
+				'$dragdroptext' => t('Drop files here to immediately upload')
 			));
 	}
 

boot.php

@@ -765,6 +765,7 @@ class App {
 	public  static $pdl        = null;            // Comanche page description
 	private static $perms      = null;            // observer permissions
 	private static $widgets    = array();         // widgets for this page
+	public  static $config     = array();         // config cache
 
 	public static  $session    = null;
 	public static  $groups;
@@ -774,7 +775,6 @@ class App {
 	public static  $plugins_admin;
 	public static  $module_loaded = false;
 	public static  $query_string;
-	public static  $config;                       // config cache
 	public static  $page;
 	public static  $profile;
 	public static  $user;

include/api.php

@@ -2040,6 +2040,7 @@ require_once('include/api_auth.php');
 			return false;
 		}
 		
+// @fixme - update for hubzilla extensible perms using abconfig or find a better way to do it
 		// For Red, the closest thing we can do to figure out if you're friends is if both of you are sending each other your streams.
 		// This won't work if either of you send your stream to everybody on the network
 		if($qtype == 'friends')

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;

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(
+            "<p>" + "<span id='upload-progress-" + i + "'></span> -> File: <strong>" + f.name +
+            "</strong> type: <strong>" + f.type +
+            "</strong> size: <strong>" + f.size +
+            "</strong> bytes</p>"
+            );
+    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);
+}

view/theme/redbasic/css/style.css

@@ -106,6 +106,7 @@ input[type="submit"] {
 
 input, optgroup, select, textarea {
 	color: #333;
+	resize: vertical;
 }
 
 pre code {
@@ -2041,3 +2042,24 @@ dl.bb-dl > dd > li {
 #wiki-preview img {
     max-width: 100%;
 }
+
+#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;
+}

view/tpl/cloud_actionspanel.tpl

@@ -9,12 +9,18 @@
 </div>
 <div id="files-upload-tools" class="section-content-tools-wrapper">
   {{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{$quota.desc}}</div>{{/if}}
-	<label for="files-upload">{{$upload_header}}</label>
+  <form id="ajax-upload-files" method="post" action="" enctype="multipart/form-data">
-	<form method="post" action="" enctype="multipart/form-data">
     <input type="hidden" name="sabreAction" value="put">
-		<input class="form-group" id="files-upload" type="file" name="file">
+    <div>
+      <div id="filedrag" style="height: 7em;"><br>{{$dragdroptext}}</div>
+    </div>
+    <div id="file-upload-list"></div>
+    <div class="clear"></div>
+    <label for="files-upload">{{$upload_header}}</label>
+    <div class="clear"></div>
+    <input class="form-group pull-left" id="files-upload" type="file" name="file">
     <button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
-		<!-- Name (optional): <input type="text" name="name"> we should rather provide a rename action in edit form-->
   </form>
   <div class="clear"></div>
+  <hr/>
 </div>

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() {
@@ -447,6 +453,80 @@ 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_attach/{{$nickname}}', true);
+
+      var data = new FormData();
+      data.append('userfile', file);
+      xhr.send(data);
+    }
+
 </script>
 
 <script>