From dd5023e494d2b5d80494026cb82d490e2dfbd27b Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sat, 15 Aug 2015 12:49:56 -0400
Subject: [PATCH 01/12] Updating logo icon in Readme file and change markup
 heading for universality.

---
 README.md                        |   6 +++---
 images/hubzilla_house_arrows.png | Bin 0 -> 22076 bytes
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 images/hubzilla_house_arrows.png

diff --git a/README.md b/README.md
index ac62f721a..44357eb3c 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,10 @@
 Hubzilla
 ========
 
-###Websites. Redefined.
+Websites. Redefined.
+--------------------
 
-
-![Hubzilla](images/ghash-32.png)
+![Hubzilla](images/hubzilla_house_arrows.png)
 
 **What are Hubs?**
 
diff --git a/images/hubzilla_house_arrows.png b/images/hubzilla_house_arrows.png
new file mode 100644
index 0000000000000000000000000000000000000000..56402a96bdbf24c36ba4dbbbfdaceb967b9713d3
GIT binary patch
literal 22076
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

literal 0
HcmV?d00001


From fc804751a2967db0d46385bb89248228b2b5d8bf Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Fri, 4 Sep 2015 12:39:47 +0200
Subject: [PATCH 02/12] Fix for PHP Fatal error:  Function name must be a
 string in /var/www/hubzilla/include/items.php on line 3325

Please review if this is correct?
---
 include/items.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/items.php b/include/items.php
index 9807831e3..91afad0e6 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3322,7 +3322,7 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
 		dbesc($title),
 		dbesc($body),
 		intval($item_wall),
-		$intval($item_origin),
+		intval($item_origin),
 		intval($item_id)
 	);
 

From 3f6d6745def41da7ab2abc04eb0554f2a27a085d Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Sat, 5 Sep 2015 15:33:09 -0700
Subject: [PATCH 03/12] syntax

---
 mod/photos.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/photos.php b/mod/photos.php
index d06a8e69c..f48603d71 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -85,7 +85,7 @@ function photos_post(&$a) {
 
 	$owner_record = $s[0];	
 
-	$acl = AccessList($a->data['channel']);
+	$acl = new AccessList($a->data['channel']);
 
 	if((argc() > 3) && (argv(2) === 'album')) {
 

From 55ab968edf93c4c903e2a88e0eed94741cc80fb6 Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Sat, 5 Sep 2015 17:35:00 -0700
Subject: [PATCH 04/12] make js_upload work with hubzilla. It still needs a
 rewrite.

---
 include/attach.php | 46 +++++++++++++++++++++++++++++++++++-----------
 include/photos.php |  4 ++--
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/include/attach.php b/include/attach.php
index 620c7620c..513486bfc 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -405,6 +405,9 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 
 	require_once('include/photos.php');
 
+
+	call_hooks('photo_upload_begin',$arr);
+
 	$ret = array('success' => false);
 	$channel_id = $channel['channel_id'];
 	$sql_options = '';
@@ -451,15 +454,28 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 		$hash     = $arr['resource_id'];
 	}
 	elseif($options !== 'update') {
-		if(! x($_FILES,'userfile')) {
-			$ret['message'] = t('No source file.');
-			return $ret;
+		$f = array('src' => '', 'filename' => '', 'filesize' => 0, 'type' => '');
+
+        call_hooks('photo_upload_file',$f);
+		call_hooks('attach_upload_file',$f);
+
+        if (x($f,'src') && x($f,'filesize')) {
+            $src      = $f['src'];
+            $filename = $f['filename'];
+            $filesize = $f['filesize'];
+            $type     = $f['type'];
+
+        } else {
+
+			if(! x($_FILES,'userfile')) {
+				$ret['message'] = t('No source file.');
+				return $ret;
+			}
+
+			$src      = $_FILES['userfile']['tmp_name'];
+			$filename = basename($_FILES['userfile']['name']);
+			$filesize = intval($_FILES['userfile']['size']);
 		}
-
-		$src      = $_FILES['userfile']['tmp_name'];
-		$filename = basename($_FILES['userfile']['name']);
-		$filesize = intval($_FILES['userfile']['size']);
-
 	}
 
 	$existing_size = 0;
@@ -615,6 +631,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 		if(($maxfilesize) && ($filesize > $maxfilesize)) {
 			$ret['message'] = sprintf( t('File exceeds size limit of %d'), $maxfilesize);
 			@unlink($src);
+			call_hooks('photo_upload_end',$ret);
 			return $ret;
 		}
 
@@ -627,10 +644,11 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 			if(($r) &&  (($r[0]['total'] + $filesize) > ($limit - $existing_size))) {
 				$ret['message'] = upgrade_message(true) . sprintf(t("You have reached your limit of %1$.0f Mbytes attachment storage."), $limit / 1024000);
 				@unlink($src);
+				call_hooks('photo_upload_end',$ret);
 				return $ret;
 			}
 		}
-		$mimetype = z_mime_content_type($filename);
+		$mimetype = ((isset($type) && $type) ? $type : z_mime_content_type($filename));
 	}
 
 	$os_basepath = 'store/' . $channel['channel_address'] . '/' ;
@@ -658,7 +676,6 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 	else
 		$edited = $created;
 
-
 	if($options === 'replace') {
 		$r = q("update attach set filename = '%s', filetype = '%s', folder = '%s', filesize = %d, os_storage = %d, is_photo = %d, data = '%s', edited = '%s' where id = %d and uid = %d",
 			dbesc($filename),
@@ -714,6 +731,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 		);
 	}
 	else {
+
 		$r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, filetype, folder, filesize, revision, os_storage, is_photo, data, created, edited, allow_cid, allow_gid,deny_cid, deny_gid )
 			VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
 			intval($channel['channel_account_id']),
@@ -738,6 +756,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 	}
 
 	if($is_photo) {
+
 		$args = array( 'source' => $source, 'visible' => 0, 'resource_id' => $hash, 'album' => basename($pathname), 'os_path' => $os_basepath . $os_relpath, 'filename' => $filename, 'getimagesize' => $gis, 'directory' => $direct);
 		if($arr['contact_allow'])
 			$args['contact_allow'] = $arr['contact_allow'];
@@ -772,6 +791,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 
 	if(! $r) {
 		$ret['message'] = t('File upload failed. Possible system limit or action terminated.');
+		call_hooks('photo_upload_end',$ret);
 		return $ret;
 	}
 
@@ -784,13 +804,17 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 
 	if(! $r) {
 		$ret['message'] = t('Stored file could not be verified. Upload failed.');
+		call_hooks('photo_upload_end',$ret);
 		return $ret;
 	}
 
 
 	$ret['success'] = true;
 	$ret['data'] = $r[0];
-
+	if(! $is_photo) {
+		// This would've been called already with a success result in photos_upload() if it was a photo.
+		call_hooks('photo_upload_end',$ret);
+	}
 	return $ret;
 }
 
diff --git a/include/photos.php b/include/photos.php
index b4129fbf1..25818124a 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -27,7 +27,7 @@ function photo_upload($channel, $observer, $args) {
 		return $ret;
 	}
 
-	call_hooks('photo_upload_begin', $args);
+//	call_hooks('photo_upload_begin', $args);
 
 	/*
 	 * Determine the album to use
@@ -84,7 +84,7 @@ function photo_upload($channel, $observer, $args) {
 	} else {
 		$f = array('src' => '', 'filename' => '', 'filesize' => 0, 'type' => '');
 
-		call_hooks('photo_upload_file',$f);
+//		call_hooks('photo_upload_file',$f);
 
 		if (x($f,'src') && x($f,'filesize')) {
 			$src      = $f['src'];

From ebb07def7e8f64776aad64be9a04a0ca8da363b6 Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Sun, 6 Sep 2015 23:26:28 +0200
Subject: [PATCH 05/12] Update dav_nautilus.bb

---
 doc/dav_nautilus.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/dav_nautilus.bb b/doc/dav_nautilus.bb
index 51663b6de..c8911cda8 100644
--- a/doc/dav_nautilus.bb
+++ b/doc/dav_nautilus.bb
@@ -2,8 +2,8 @@
 
 1. Open a File browsing window (that's Nautilus)
 2. Select File &gt; Connect to server from the menu
-3. Type davs://&lt;domain_name&gt;/cloud/&lt;your_username&gt; and click Connect
-4. You will be prompted for your username (same as above) and password
+3. Type davs://&lt;domain_name&gt;/dav/&lt;your_channelname&gt; and click Connect
+4. You will be prompted for your channel name (same as above) and password
 5. Your personal DAV directory will be shown in the window
 
 #include doc/macros/cloud_footer.bb;

From 20f211b70af874e04a004a6e6a8c127c02062e13 Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Sun, 6 Sep 2015 23:27:55 +0200
Subject: [PATCH 06/12] Update dav_dolphin.bb

---
 doc/dav_dolphin.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/dav_dolphin.bb b/doc/dav_dolphin.bb
index a1ebba394..ae60a6d52 100644
--- a/doc/dav_dolphin.bb
+++ b/doc/dav_dolphin.bb
@@ -1,8 +1,8 @@
 [b]Using The Cloud - Dolphin[/b]
 
-Visit webdavs://example.com/cloud where &quot;example.com&quot; is the URL of your hub.
+Visit webdavs://example.com/dav where &quot;example.com&quot; is the URL of your hub.
 
-When prompted for a username and password, enter your username (the first part of your webbie - no @ or domain name) and password for your normal account.
+When prompted for a username and password, enter your channel name (the first part of your webbie - no @ or domain name) and password for your normal account.
 
 Note, if you are already logged in to the web interface via Konqueror, you will not be prompted for further authentication.
 

From 67ed7e40be69e82fdff674aee71cfa5dc789f4d3 Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Sun, 6 Sep 2015 23:30:25 +0200
Subject: [PATCH 07/12] Update dav_mount.bb

---
 doc/dav_mount.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/dav_mount.bb b/doc/dav_mount.bb
index d8cb2e08e..663251a9d 100644
--- a/doc/dav_mount.bb
+++ b/doc/dav_mount.bb
@@ -25,7 +25,7 @@ Edit /etc/fstab
  to include your cloud directory by adding
 
 [code]
-[baseurl]/cloud/ /mount/point davfs user,noauto,uid=&lt;DesktopUser&gt;,file_mode=600,dir_mode=700 0 1
+[baseurl]/dav/ /mount/point davfs user,noauto,uid=&lt;DesktopUser&gt;,file_mode=600,dir_mode=700 0 1
 [/code]
 
 Where [baseurl] is the URL of your hub, /mount/point is the location you want to mount the cloud, and &lt;DesktopUser&gt; is the user you log in to one your computer.  Note that if you are mounting as a normal user (not root) the mount point must be in your home directory.

From 38ea8d1d86a1a10473f6999133e92be78a1fa179 Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Sun, 6 Sep 2015 23:32:14 +0200
Subject: [PATCH 08/12] Update dav_mount.bb

---
 doc/dav_mount.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/dav_mount.bb b/doc/dav_mount.bb
index 663251a9d..0fd3d4691 100644
--- a/doc/dav_mount.bb
+++ b/doc/dav_mount.bb
@@ -32,7 +32,7 @@ Where [baseurl] is the URL of your hub, /mount/point is the location you want to
 
 For example, if I wanted to mount my cloud to a directory called 'cloud' in my home directory, and my username was bob, my fstab would be 
 
-[code][baseurl]/cloud/ /home/bob/cloud davfs user,noauto,uid=bob,file_mode=600,dir_mode=700 0 1[/code]
+[code][baseurl]/dav/ /home/bob/cloud davfs user,noauto,uid=bob,file_mode=600,dir_mode=700 0 1[/code]
 
 Now, create the mount point.
 
@@ -49,7 +49,7 @@ Create a file called 'secrets'
 and add your cloud login credentials
 
 [code]
-[baseurl]/cloud &lt;username&gt; &lt;password&gt;
+[baseurl]/dav &lt;username&gt; &lt;password&gt;
 [/code]
 
 Where &lt;username&gt; and &lt;password&gt; are the username and password [i]for your hub[/i].
@@ -60,7 +60,7 @@ Don't let this file be writeable by anyone who doesn't need it with
 
 Finally, mount the drive.
 
-[code]mount [baseurl]/cloud[/code]
+[code]mount [baseurl]/dav[/code]
 
 You can now find your cloud at /home/bob/cloud and use it as though it were part of your local filesystem - even if the applications you are using have no dav support themselves.
 

From 302fe94705c95183ce309fa27a1354d4b7037b55 Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Sun, 6 Sep 2015 23:35:35 +0200
Subject: [PATCH 09/12] Update dav_nemo.bb

---
 doc/dav_nemo.bb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/dav_nemo.bb b/doc/dav_nemo.bb
index 2c88b0782..f2d994fbb 100644
--- a/doc/dav_nemo.bb
+++ b/doc/dav_nemo.bb
@@ -3,16 +3,16 @@
 For (file browser) Nemo 1.8.2 under Linux Mint 15, Cinnamon 1.8.8. Nemo ist the standard file browser there.
 
 1st way
-type &quot;davs://yourusername@friendicared.net/cloud&quot; in the address bar
+type &quot;davs://&lt;domain_name&gt;/dav/&lt;your_channelname&gt;&quot; in the address bar.
 
 2nd way
 Menu &gt; file &gt; connect to server
 Fill the dialog
-- Server: friendicared.net
+- Server: hubzilla_domain_name
 - Type: Secure WebDAV (https)
-- Folder: /cloud
-- Username: yourusername
-- Passwort: yourpasswort
+- Folder: /dav
+- Username: yourchannelname
+- Password: yourpassword
 
 Once open you can set a bookmark.
 

From 6ea1cf71b513701777cb0992a4a37bd9819ade3a Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Sun, 6 Sep 2015 23:36:26 +0200
Subject: [PATCH 10/12] Update dav_windows.bb

---
 doc/dav_windows.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/dav_windows.bb b/doc/dav_windows.bb
index 0eaffd4d0..96862e2b5 100644
--- a/doc/dav_windows.bb
+++ b/doc/dav_windows.bb
@@ -4,8 +4,8 @@ RedDav using Windows 7 graphical user interface wizard:
 1. Left-click the Start-button to open the start menu.
 2. Right-click the My computer icon to access its menu.
 3. Left-click Map network drive... to open the connection dialog wizard.
-4. Type #^[url=https://example.net/cloud/your_user_name]https://example.net/cloud/your_user_name[/url] in the textbox and click the Complete button where &quot;example.net&quot; is the URL of your hub.
-5. Type your Red account's user name. IMPORTANT - NO at-sign or domain name.
-6. Type your Red password
+4. Type #^[url=https://example.net/dav/your_channel_name]https://example.net/dav/your_channel_name[/url] in the textbox and click the Complete button where &quot;example.net&quot; is the URL of your hub.
+5. Type your Hubzilla account's user name. IMPORTANT - NO at-sign or domain name.
+6. Type your Hubzilla password
 
 #include doc/macros/cloud_footer.bb;

From 1d09e4b6201a75e830c303746291ba75d94f937d Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Sun, 6 Sep 2015 16:42:50 -0700
Subject: [PATCH 11/12] use conversation defaults for /public page instead of
 collapsed list mode, but allow over-ride

---
 mod/public.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mod/public.php b/mod/public.php
index 2106be7a6..45edda6c0 100644
--- a/mod/public.php
+++ b/mod/public.php
@@ -22,7 +22,7 @@ function public_content(&$a, $update = 0, $load = false) {
 
 		$maxheight = get_config('system','home_divmore_height');
 		if(! $maxheight)
-			$maxheight = 75;
+			$maxheight = 400;
 
 		$o .= '<div id="live-public"></div>' . "\r\n";
 		$o .= "<script> var profile_uid = " . ((intval(local_channel())) ? local_channel() : (-1)) 
@@ -80,10 +80,12 @@ function public_content(&$a, $update = 0, $load = false) {
 		$a->data['firehose'] = intval($sys['channel_id']);
 	}
 
+	if(get_config('system','public_list_mode'))
+		$page_mode = 'list';
+	else
+		$page_mode = 'client';
 
 
-	$page_mode = 'list';
-
 	$simple_update = (($update) ? " and item.item_unseen = 1 " : '');
 
 	if($update && $_SESSION['loadtime'])

From 2312f03eacd973c18342e26087d279ea2bebd4a8 Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Sun, 6 Sep 2015 20:50:31 -0700
Subject: [PATCH 12/12] Always open rpost editor on document ready

---
 mod/rpost.php        | 15 ++++++---------
 view/js/mod_rpost.js |  1 +
 2 files changed, 7 insertions(+), 9 deletions(-)
 create mode 100644 view/js/mod_rpost.js

diff --git a/mod/rpost.php b/mod/rpost.php
index 4a6b87cc6..d519a996b 100644
--- a/mod/rpost.php
+++ b/mod/rpost.php
@@ -94,15 +94,13 @@ function rpost_content(&$a) {
 
 	$channel = $a->get_channel();
 
-	$channel_acl = array(
-		'allow_cid' => $channel['channel_allow_cid'],
-		'allow_gid' => $channel['channel_allow_gid'],
-		'deny_cid'  => $channel['channel_deny_cid'],
-		'deny_gid'  => $channel['channel_deny_gid']
-	);
+
+	$acl = new AccessList($channel);
+
+	$channel_acl = $acl->get();
 
 	if($_REQUEST['url']) {
-		$x = z_fetch_url(z_root() . '/urlinfo?f=&url=' . urlencode($_REQUEST['url']));
+		$x = z_fetch_url(z_root() . '/linkinfo?f=&url=' . urlencode($_REQUEST['url']));
 		if($x['success'])
 			$_REQUEST['body'] = $_REQUEST['body'] . $x['body'];
 	}
@@ -112,8 +110,7 @@ function rpost_content(&$a) {
 		'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''),
 		'default_location' => $channel['channel_location'],
 		'nickname' => $channel['channel_address'],
-		'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] 
-			|| $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
+		'lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'),
 		'acl' => populate_acl($channel_acl),
 		'bang' => '',
 		'visitor' => true,
diff --git a/view/js/mod_rpost.js b/view/js/mod_rpost.js
new file mode 100644
index 000000000..06b67136b
--- /dev/null
+++ b/view/js/mod_rpost.js
@@ -0,0 +1 @@
+$(document).ready(function() { initEditor(); });