Merge remote-tracking branch 'upstream/master'

1 files changed, 144 insertions, 0 deletions

diff --git a/mod/filestorage.php b/mod/filestorage.php
new file mode 100644
index 000000000..6a7eac706
--- /dev/null
+++ b/mod/filestorage.php
@@ -0,0 +1,144 @@
+<?php
+
+require_once('include/attach.php');
+
+function filestorage_post(&$a) {
+
+	$channel_id = ((x($_POST,'uid')) ? intval($_POST['uid']) : 0);
+
+	if((! $channel_id) || (! local_user()) || ($channel_id != local_user())) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
+	$recurse = ((x($_POST,'recurse')) ? intval($_POST['recurse']) : 0);
+	$resource = ((x($_POST,'filehash')) ? notags($_POST['filehash']) : '');
+
+	if(! $resource) {
+		notice(t('Item not found.') . EOL);
+		return;
+	}
+
+	$str_group_allow   = perms2str($_REQUEST['group_allow']);
+	$str_contact_allow = perms2str($_REQUEST['contact_allow']);
+	$str_group_deny    = perms2str($_REQUEST['group_deny']);
+	$str_contact_deny  = perms2str($_REQUEST['contact_deny']);
+ 
+	attach_change_permissions($channel_id,$resource,$str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny,$recurse = false);
+
+	//Build directory tree and redirect
+	$channel = $a->get_channel();
+	$cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource) ;
+	goaway($cloudPath);
+}
+
+function filestorage_content(&$a) {
+
+	if(argc() > 1)
+		$which = argv(1);
+	else {
+		notice( t('Requested profile is not available.') . EOL );
+		$a->error = 404;
+		return;
+	}
+
+	$r = q("select * from channel where channel_address = '%s'",
+		dbesc($which)
+	);
+	if($r) {
+		$channel = $r[0];
+		$owner = intval($r[0]['channel_id']);
+	}
+
+	$observer = $a->get_observer();
+	$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+	$perms = get_all_perms($owner,$ob_hash);
+
+	if(! $perms['view_storage']) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
+	//	Since we have ACL'd files in the wild, but don't have ACL here yet, we 
+	//	need to return for anyone other than the owner, despite the perms check for now.
+
+	$is_owner = (((local_user()) && ($owner  == local_user())) ? true : false);
+	if(! $is_owner) {
+		info( t('Permission Denied.') . EOL );
+		return;
+	}
+
+
+	if(argc() > 3 && argv(3) === 'delete') {
+		if(! $perms['write_storage']) {
+			notice( t('Permission denied.') . EOL);
+			return;
+		}
+
+		$file = intval(argv(2));
+		$r = q("select hash from attach where id = %d and uid = %d limit 1",
+			dbesc($file),
+			intval($owner)
+		);
+		if(! $r) {
+			notice( t('File not found.') . EOL);
+			goaway(z_root() . '/cloud/' . $which);
+		}
+
+		attach_delete($owner,$r[0]['hash']);
+		
+		goaway(z_root() . '/cloud/' . $which);
+	}	
+
+
+	if(argc() > 3 && argv(3) === 'edit') {
+		require_once('include/acl_selectors.php');
+		if(! $perms['write_storage']) {
+			notice( t('Permission denied.') . EOL);
+			return;
+		}
+		$file = intval(argv(2));
+
+		$r = q("select id, uid, folder, filename, revision, flags, hash, allow_cid, allow_gid, deny_cid, deny_gid from attach where id = %d and uid = %d limit 1",
+			intval($file),
+			intval($owner)
+		);
+
+		$f = $r[0];
+
+		$channel = $a->get_channel();
+
+		$cloudpath = get_cloudpath($f) . (($f['flags'] & ATTACH_FLAG_DIR) ? '?f=&davguest=1' : '');
+
+		$aclselect_e = populate_acl($f,false);
+		$is_a_dir = (($f['flags'] & ATTACH_FLAG_DIR) ? true : false);
+
+		$lockstate = (($f['allow_cid'] || $f['allow_gid'] || $f['deny_cid'] || $f['deny_gid']) ? 'lock' : 'unlock'); 
+
+
+		$o = replace_macros(get_markup_template('attach_edit.tpl'), array(
+			'$header' => t('Edit file permissions'),
+			'$file' => $f,
+			'$cloudpath' => z_root() . '/' . $cloudpath,
+			'$uid' => $channel['channel_id'],
+			'$channelnick' => $channel['channel_address'],
+			'$permissions' => t('Permissions'),
+			'$aclselect' => $aclselect_e,
+			'$lockstate' => $lockstate,
+			'$permset' => t('Set/edit permissions'),
+			'$recurse' => t('Include all files and sub folders'),
+			'$backlink' => t('Return to file list'),
+			'$isadir' => $is_a_dir,
+			'$cpdesc' => t('Copy/paste this code to attach file to a post'),
+			'$cpldesc' => t('Copy/paste this URL to link file from a web page'),
+			'$submit' => t('Submit')
+
+		));
+
+		return $o;
+	}	
+
+	goaway(z_root() . '/cloud/' . $which);
+    
+}