version 3.8.5

Patch 20181118a - fix delayed publication of posts

See merge request hubzilla/core!1398

(cherry picked from commit f34af496ec)

3787c490 Fix: delayed items propagate before publication on cloned channels

CHANGELOG

@@ -1,3 +1,74 @@
+Hubzilla 3.8.5 (2018-11-19)
+	- Fix pconfig for new installs
+	- Fix delayed publication of posts in combination with channel clones
+	- Fix issue where photo filesize was not updated in the DB when a photo was edited
+	- Fix issue where the original photo size was not set correct in the DB
+	- Fix delivery issue in zot_fetch()
+	- Fix typo in channel reputation addon
+
+
+Hubzilla 3.8.4 (2018-11-14)
+	- Fix xss issue (thanks to Eduardo)
+	- Implement hook in enotify to be used by superblock
+	- Various css fixes
+	- Improve photo cache handling
+	- Provide a function hz_syslog() to log to syslog
+	- Fix request_target in z_post_url()
+	- Fix plural handling for various languages
+	- Some preparatory work for zot6
+	- Fix warning in gallery addon
+	- Fix date issue on xchan photo update in diaspora and pubcrawl addons
+	- Fix typos in startpage addon
+	- Improve activitypub addressing
+	- Fix taxonomy in activitypub direct messages
+	- Fix syntax error in diaspora addon
+	- New e-learning addon flashcards
+	- Remove DNS check for database connection during installation
+	- Implement timestamps for pconfig
+
+
+Hubzilla 3.8.3 (2018-11-05)
+	- Do not count likes in forum notifications if likes notifications are disabled
+	- Fix typo in spanish translation which broke javascript
+	- Improve linkinfo charset handling and image detection
+	- Fix wrong image resize for some external images
+	- Move blueimp upload lib to composer and update to version 9.25
+	- Remove primary/clone counts from admin summary until we have a mechanism to update the fixed counts
+	- Fix html2markdown() and re-enable previously failing tests
+	- Improve look of oembed content for Hubzilla links
+	- Fix forum notifications count not correct
+	- Fix gallery addon which broke mod apps in some situations
+	- Fix wiki_list widget not working on every page respectively level
+	
+
+Hubzilla 3.8.2 (2018-10-29)
+	- Merge unmerged changes from dev into master
+	- Fix issues with forum handling in mod network and ping
+	- Fix delivery chain linkage messed up if original post was edited
+	- Fix issues with the experimental queue worker
+	- Fix call to image source {1} from html template
+	- Group stream filters by threaded and unthreaded default view
+	- Show only unseen forum messages when clicking on forum notification
+	- Improve editor contact autocomplete performance
+	- Convert non UTF-8 content on link embeding
+	- Make textcomplete return up to 100 items
+	- Look for for matches in the entire string when suggesting emojis
+	- Add [summary] bbcode to autocomplete list
+	- Update blueimp_upload to version 9.23
+	- Update spanish strings 
+
+	Addons
+	- Cart: don't allow items to be added unless user is logged into the Grid.
+	- Pubcrawl: simplify asencode_activity() addressing to reflect upcoming changes in mastodon 2.6
+	- Rendezvous: Update rendezvous_group.tpl to fix broken Bootstrap library reference
+
+
+Hubzilla 3.8.1 (2018-10-21)
+	- Fix issue with too long navbar banners
+	- Fix menu item edit link
+	- Fix issue with jquery file upload
+
+
 Hubzilla 3.8 (2018-10-19)
 	- Re-implement basic build test via gitlab-ci
 	- Rework wiki encoding/decoding

Zotlabs/Access/PermissionLimits.php

@@ -88,4 +88,4 @@ class PermissionLimits {
 
 		return false;
 	}
-}
+}

Zotlabs/Daemon/Master.php

@@ -60,7 +60,8 @@ class Master {
 					$k = explode('_',$worker['k']);
 					q("delete from config where cat='queueworkers' and k='%s'",
 						'workerstarted_'.$k[1]);
-					q("update config set k='workitem' where cat='queuework' and k='%s'",
+					q("update config set k='%s' where cat='queuework' and k='%s'",
+						dbesc(uniqid('workitem:',true)),
 						'workitem_'.$k[1]);
 					unset($workers[$idx]);
 				}
@@ -69,7 +70,7 @@ class Master {
 				return false;
 			}
 		}
-		return uniqid();
+		return uniqid('',true);
 
 	}
 

Zotlabs/Lib/Enotify.php

@@ -825,7 +825,7 @@ class Enotify {
 
 		// convert this logic into a json array just like the system notifications
 
-		return array(
+		$x = array(
 			'notify_link' => $item['llink'],
 			'name' => $item['author']['xchan_name'],
 			'url' => $item['author']['xchan_url'],
@@ -835,9 +835,19 @@ class Enotify {
 			'b64mid' => ((in_array($item['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) ? 'b64.' . base64url_encode($item['thr_parent']) : 'b64.' . base64url_encode($item['mid'])),
 			'notify_id' => 'undefined',
 			'thread_top' => (($item['item_thread_top']) ? true : false),
-			'message' => strip_tags(bbcode($itemem_text))
+			'message' => strip_tags(bbcode($itemem_text)),
+			// these are for the superblock addon
+			'hash' => $item['author']['xchan_hash'],
+			'uid' => local_channel(),
+			'display' => true
 		);
 
+		call_hooks('enotify_format',$x);
+		if(! $x['display']) {
+			return [];
+		}
+
+		return $x;
 	}
 
 }

Zotlabs/Lib/Libzot.php

@@ -7,16 +7,10 @@ namespace Zotlabs\Lib;
  *
  */
 
-use Zotlabs\Lib\DReport;
-use Zotlabs\Lib\Enotify;
-use Zotlabs\Lib\Group;
-use Zotlabs\Lib\Libsync;
-use Zotlabs\Lib\Libzotdir;
-use Zotlabs\Lib\System;
-use Zotlabs\Lib\MessageFilter;
-use Zotlabs\Lib\Queue;
-use Zotlabs\Lib\Zotfinger;
-use Zotlabs\Web\HTTPSig;
+use Zotlabs\Zot6\HTTPSig;
+use Zotlabs\Access\Permissions;
+use Zotlabs\Access\PermissionLimits;
+use Zotlabs\Daemon\Master;
 
 require_once('include/crypto.php');
 
@@ -211,9 +205,10 @@ class Libzot {
 
 		if($channel) {
 			$headers = [ 
-				'X-Zot-Token'  => random_string(), 
-				'Digest'       => HTTPSig::generate_digest_header($data), 
-				'Content-type' => 'application/x-zot+json'
+				'X-Zot-Token'      => random_string(), 
+				'Digest'           => HTTPSig::generate_digest_header($data), 
+				'Content-type'     => 'application/x-zot+json',
+				'(request-target)' => 'post ' . get_request_string($url)
 			];
 
 			$h = HTTPSig::create_sig($headers,$channel['channel_prvkey'],channel_url($channel),false,'sha512', 
@@ -378,13 +373,13 @@ class Libzot {
 				else {
 					// if we were just granted read stream permission and didn't have it before, try to pull in some posts
 					if((! $old_read_stream_perm) && (intval($permissions['view_stream'])))
-						\Zotlabs\Daemon\Master::Summon(array('Onepoll',$r[0]['abook_id']));
+						Master::Summon([ 'Onepoll', $r[0]['abook_id'] ]);
 				}
 			}
 			else {
 
-				$p = \Zotlabs\Access\Permissions::connect_perms($channel['channel_id']);
-				$my_perms = \Zotlabs\Access\Permissions::serialise($p['perms']);
+				$p = Permissions::connect_perms($channel['channel_id']);
+				$my_perms = Permissions::serialise($p['perms']);
 
 				$automatic = $p['automatic'];
 
@@ -424,8 +419,8 @@ class Libzot {
 					);
 
 					if($new_connection) {
-						if(! \Zotlabs\Access\Permissions::PermsCompare($new_perms,$previous_perms))
-							\Zotlabs\Daemon\Master::Summon(array('Notifier','permissions_create',$new_connection[0]['abook_id']));
+						if(! Permissions::PermsCompare($new_perms,$previous_perms))
+							Master::Summon([ 'Notifier', 'permissions_create', $new_connection[0]['abook_id'] ]);
 						Enotify::submit(
 							[
 							'type'       => NOTIFY_INTRO,
@@ -438,7 +433,7 @@ class Libzot {
 						if(intval($permissions['view_stream'])) {
 							if(intval(get_pconfig($channel['channel_id'],'perm_limits','send_stream') & PERMS_PENDING)
 								|| (! intval($new_connection[0]['abook_pending'])))
-								\Zotlabs\Daemon\Master::Summon(array('Onepoll',$new_connection[0]['abook_id']));
+								Master::Summon([ 'Onepoll', $new_connection[0]['abook_id'] ]);
 						}
 
 
@@ -975,39 +970,45 @@ class Libzot {
 			$x = json_decode($x,true);
 		}
 
-		if(! $x['success']) {
-
-			// handle remote validation issues
-
-			$b = q("update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'",
-				dbesc(($x['message']) ? $x['message'] : 'unknown delivery error'),
-				dbesc(datetime_convert()),
-				dbesc($outq['outq_hash'])
-			);
+		if(! is_array($x)) {
+			btlogger('failed communication - no response');
 		}
 
-		if(array_key_exists('delivery_report',$x) && is_array($x['delivery_report'])) { 
-			foreach($x['delivery_report'] as $xx) {
-				if(is_array($xx) && array_key_exists('message_id',$xx) && DReport::is_storable($xx)) {
-					q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_name, dreport_result, dreport_time, dreport_xchan ) values ( '%s', '%s', '%s','%s','%s','%s','%s' ) ",
-						dbesc($xx['message_id']),
-						dbesc($xx['location']),
-						dbesc($xx['recipient']),
-						dbesc($xx['name']),
-						dbesc($xx['status']),
-						dbesc(datetime_convert($xx['date'])),
-						dbesc($xx['sender'])
-					);
-				}
+		if($x) {
+			if(! $x['success']) {
+
+				// handle remote validation issues
+	
+				$b = q("update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'",
+					dbesc(($x['message']) ? $x['message'] : 'unknown delivery error'),
+					dbesc(datetime_convert()),
+					dbesc($outq['outq_hash'])
+				);
 			}
 
-			// we have a more descriptive delivery report, so discard the per hub 'queue' report.
+			if(is_array($x) && array_key_exists('delivery_report',$x) && is_array($x['delivery_report'])) { 
+				foreach($x['delivery_report'] as $xx) {
+					call_hooks('dreport_process',$xx);
+					if(is_array($xx) && array_key_exists('message_id',$xx) && DReport::is_storable($xx)) {
+						q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_name, dreport_result, dreport_time, dreport_xchan ) values ( '%s', '%s', '%s','%s','%s','%s','%s' ) ",
+							dbesc($xx['message_id']),
+							dbesc($xx['location']),
+							dbesc($xx['recipient']),
+							dbesc($xx['name']),
+							dbesc($xx['status']),
+							dbesc(datetime_convert($xx['date'])),
+							dbesc($xx['sender'])
+						);
+					}
+				}
 
-			q("delete from dreport where dreport_queue = '%s' ",
-				dbesc($outq['outq_hash'])
-			);
+				// we have a more descriptive delivery report, so discard the per hub 'queue' report.
+
+				q("delete from dreport where dreport_queue = '%s' ",
+					dbesc($outq['outq_hash'])
+				);
+			}
 		}
-
 		// update the timestamp for this site
 
 		q("update site set site_dead = 0, site_update = '%s' where site_url = '%s'",
@@ -1092,13 +1093,27 @@ class Libzot {
 			return;
 		}
 
-		$message_request = ((array_key_exists('message_id',$env)) ? true : false);
-		if($message_request)
-			logger('processing message request');
+		$message_request = false;
+
 
 		$has_data = array_key_exists('data',$env) && $env['data'];
 		$data = (($has_data) ? $env['data'] : false);
-		
+
+		$AS = null;		
+
+		if($env['encoding'] === 'activitystreams') {
+
+				$AS = new ActivityStreams($data);
+				if(! $AS->is_valid()) {
+					logger('Activity rejected: ' . print_r($data,true));
+					return;
+				}
+				$arr = Activity::decode_note($AS);
+
+				logger($AS->debug());
+		}
+
+
 		$deliveries = null;
 
 		if(array_key_exists('recipients',$env) && count($env['recipients'])) {
@@ -1140,7 +1155,7 @@ class Libzot {
 			// and who are allowed to see them based on the sender's permissions
 			// @fixme;
 
-			$deliveries = self::public_recips($env);
+			$deliveries = self::public_recips($env,$AS);
 
 
 		}
@@ -1157,49 +1172,43 @@ class Libzot {
 
 			if(in_array($env['type'],['activity','response'])) {
 
-				if($env['encoding'] === 'zot') {
-					$arr = get_item_elements($data);
-	
-					$v = validate_item_elements($data,$arr);
-					
-					if(! $v['success']) {
-						logger('Activity rejected: ' . $v['message'] . ' ' . print_r($data,true));
-						return;
-					}
+				$arr = Activity::decode_note($AS);
+
+				//logger($AS->debug());
+
+				$r = q("select hubloc_hash from hubloc where hubloc_id_url = '%s' limit 1",
+					dbesc($AS->actor['id'])
+				); 
+
+				if($r) {
+					$arr['author_xchan'] = $r[0]['hubloc_hash'];
 				}
-				elseif($env['encoding'] === 'activitystreams') {
 
-					$AS = new \Zotlabs\Lib\ActivityStreams($data);
-					if(! $AS->is_valid()) {
-						logger('Activity rejected: ' . print_r($data,true));
-						return;
-					}
-					$arr = \Zotlabs\Lib\Activity::decode_note($AS);
 
-					logger($AS->debug());
+				$s = q("select hubloc_hash from hubloc where hubloc_id_url = '%s' limit 1",
+					dbesc($env['sender'])
+				); 
 
-					$r = q("select hubloc_hash from hubloc where hubloc_id_url = '%s' limit 1",
-						dbesc($AS->actor['id'])
-					); 
-
-					if($r) {
-						$arr['author_xchan'] = $r[0]['hubloc_hash'];
-					}
-					// @fixme (in individual delivery, change owner if needed)
+				// in individual delivery, change owner if needed
+				if($s) {
+					$arr['owner_xchan'] = $s[0]['hubloc_hash'];
+				}
+				else {
 					$arr['owner_xchan'] = $env['sender'];						
-					if($private) {
-						$arr['item_private'] = true;
-					}
-					// @fixme - spoofable
-					if($AS->data['hubloc']) {
-						$arr['item_verified'] = true;
-					}
-					if($AS->data['signed_data']) {
-						IConfig::Set($arr,'activitystreams','signed_data',$AS->data['signed_data'],false);
-					}
-
 				}
 
+				if($private) {
+					$arr['item_private'] = true;
+				}
+				// @fixme - spoofable
+				if($AS->data['hubloc']) {
+					$arr['item_verified'] = true;
+				}
+				if($AS->data['signed_data']) {
+					IConfig::Set($arr,'activitystreams','signed_data',$AS->data['signed_data'],false);
+				}
+
+
 				logger('Activity received: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
 				logger('Activity recipients: ' . print_r($deliveries,true), LOGGER_DATA, LOG_DEBUG);
 
@@ -1225,15 +1234,31 @@ class Libzot {
 	}
 
 
-	static function is_top_level($env) {
+	static function is_top_level($env,$act) {
 		if($env['encoding'] === 'zot' && array_key_exists('flags',$env) && in_array('thread_parent', $env['flags'])) {
 			return true;
 		}
-		if($env['encoding'] === 'activitystreams') {
-			if(array_key_exists('inReplyTo',$env['data']) && $env['data']['inReplyTo']) {
+		if($act) {
+			if(in_array($act->type, ['Like','Dislike'])) {
 				return false;
 			}
-			return true;
+			$x = self::find_parent($env,$act);
+			if($x === $act->id || $x === $act->obj['id']) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	static function find_parent($env,$act) {
+		if($act) {
+			if(in_array($act->type, ['Like','Dislike'])) {
+				return $act->obj['id'];
+			}
+			if($act->parent_id) {
+				return $act->parent_id;
+			}
 		}
 		return false;
 	}
@@ -1255,7 +1280,7 @@ class Libzot {
 	 * @return NULL|array
 	 */
 
-	static function public_recips($msg) {
+	static function public_recips($msg, $act) {
 
 		require_once('include/channel.php');
 
@@ -1269,7 +1294,7 @@ class Libzot {
 
 			$perm = 'send_stream';
 
-			if(self::is_top_level($msg)) {
+			if(self::is_top_level($msg,$act)) {
 				$check_mentions = true;
 			}
 		}
@@ -1301,9 +1326,9 @@ class Libzot {
 
 		if($check_mentions) {
 			// It's a top level post. Look at the tags. See if any of them are mentions and are on this hub.
-			if(array_path_exists('data/object/tag',$msg)) {
-				if(is_array($msg['data']['object']['tag']) && $msg['data']['object']['tag']) {
-					foreach($msg['data']['object']['tag'] as $tag) {
+			if($act && $act->obj) {
+				if(is_array($act->obj['tag']) && $act->obj['tag']) {
+					foreach($act->obj['tag'] as $tag) {
 						if($tag['type'] === 'Mention' && (strpos($tag['href'],z_root()) !== false)) {
 							$address = basename($tag['href']);
 							if($address) {
@@ -1325,9 +1350,12 @@ class Libzot {
 			// everybody that stored a copy of the parent. This way we know we're covered. We'll check the
 			// comment permissions when we deliver them.
 
-			if(array_path_exists('data/inReplyTo',$msg)) {
-				$z = q("select owner_xchan as hash from item where parent_mid = '%s' ",
-					dbesc($msg['data']['inReplyTo'])
+			$thread_parent = self::find_parent($msg,$act);
+
+			if($thread_parent) {
+				$z = q("select channel_hash as hash from channel left join item on channel.channel_id = item.uid where ( item.thr_parent = '%s' OR item.parent_mid = '%s' ) ",
+					dbesc($thread_parent),
+					dbesc($thread_parent)
 				);
 				if($z) {
 					foreach($z as $zv) {
@@ -1341,7 +1369,7 @@ class Libzot {
 		// It's a bit of work since it's a multi-dimensional array
 
 		if($r) {
-			$r = array_unique($r);
+			$r = array_values(array_unique($r));
 		}
 
 		logger('public_recips: ' . print_r($r,true), LOGGER_DATA, LOG_DEBUG);
@@ -1378,7 +1406,7 @@ class Libzot {
 
 			$local_public = $public;
 
-			$DR = new \Zotlabs\Lib\DReport(z_root(),$sender,$d,$arr['mid']);
+			$DR = new DReport(z_root(),$sender,$d,$arr['mid']);
 
 			$channel = channelx_by_hash($d);
 
@@ -1413,7 +1441,7 @@ class Libzot {
 				$local_public = true;
 
 				$r = q("select xchan_selfcensored from xchan where xchan_hash = '%s' limit 1",
-					dbesc($sender['hash'])
+					dbesc($sender)
 				);
 				// don't import sys channel posts from selfcensored authors
 				if($r && (intval($r[0]['xchan_selfcensored']))) {
@@ -1441,11 +1469,30 @@ class Libzot {
 				$arr['item_wall'] = 0;
 			}
 
-			if((! perm_is_allowed($channel['channel_id'],$sender,$perm)) && (! $tag_delivery) && (! $local_public)) {
-				logger("permission denied for delivery to channel {$channel['channel_id']} {$channel['channel_address']}");
-				$DR->update('permission denied');
-				$result[] = $DR->get();
-				continue;
+			$friendofriend = false;
+
+			if ((! $tag_delivery) && (! $local_public)) {
+				$allowed = (perm_is_allowed($channel['channel_id'],$sender,$perm));
+				if((! $allowed) && $perm === 'post_comments') {
+					$parent = q("select * from item where mid = '%s' and uid = %d limit 1",
+						dbesc($arr['parent_mid']),
+						intval($channel['channel_id'])
+					);
+					if ($parent) {
+						$allowed = can_comment_on_post($d,$parent[0]);
+					}
+				}
+				if($request) {
+					$allowed = true;
+					$friendofriend = true;
+				}
+        
+				if (! $allowed) {
+					logger("permission denied for delivery to channel {$channel['channel_id']} {$channel['channel_address']}");
+					$DR->update('permission denied');
+					$result[] = $DR->get();
+					continue;
+				}
 			}
 
 			if($arr['mid'] != $arr['parent_mid']) {
@@ -1456,7 +1503,7 @@ class Libzot {
 				// As a side effect we will also do a preliminary check that we have the top-level-post, otherwise
 				// processing it is pointless.
 	
-				$r = q("select route, id from item where mid = '%s' and uid = %d limit 1",
+				$r = q("select route, id, owner_xchan, item_private from item where mid = '%s' and uid = %d limit 1",
 					dbesc($arr['parent_mid']),
 					intval($channel['channel_id'])
 				);
@@ -1480,15 +1527,21 @@ class Libzot {
 
 					if((! $relay) && (! $request) && (! $local_public)
 						&& perm_is_allowed($channel['channel_id'],$sender,'send_stream')) {
-						\Zotlabs\Daemon\Master::Summon(array('Notifier', 'request', $channel['channel_id'], $sender, $arr['parent_mid']));
+						self::fetch_conversation($channel,$arr['parent_mid']);
 					}
 					continue;
 				}
-				if($relay) {
+				
+				if($relay || $friendofriend || (intval($r[0]['item_private']) === 0 && intval($arr['item_private']) === 0)) {
 					// reset the route in case it travelled a great distance upstream
 					// use our parent's route so when we go back downstream we'll match
 					// with whatever route our parent has.
+					// Also friend-of-friend conversations may have been imported without a route,
+					// but we are now getting comments via listener delivery
+					// and if there is no privacy on this or the parent, we don't care about the route, 
+					// so just set the owner and route accordingly.
 					$arr['route'] = $r[0]['route'];
+					$arr['owner_xchan'] = $r[0]['owner_xchan'];
 				}
 				else {
 
@@ -1546,13 +1599,13 @@ class Libzot {
 				$arr['aid'] = $channel['channel_account_id'];
 				$arr['uid'] = $channel['channel_id'];
 	
-				$item_id = delete_imported_item($sender,$arr,$channel['channel_id'],$relay);
+				$item_id = self::delete_imported_item($sender,$arr,$channel['channel_id'],$relay);
 				$DR->update(($item_id) ? 'deleted' : 'delete_failed');
 				$result[] = $DR->get();
 
 				if($relay && $item_id) {
 					logger('process_delivery: invoking relay');
-					\Zotlabs\Daemon\Master::Summon(array('Notifier','relay',intval($item_id)));
+					Master::Summon([ 'Notifier', 'relay', intval($item_id) ]);
 					$DR->update('relayed');
 					$result[] = $DR->get();
 				}
@@ -1662,7 +1715,7 @@ class Libzot {
 
 			if($relay && $item_id) {
 				logger('Invoking relay');
-				\Zotlabs\Daemon\Master::Summon(array('Notifier','relay',intval($item_id)));
+				Master::Summon([ 'Notifier', 'relay', intval($item_id) ]);
 				$DR->addto_update('relayed');
 				$result[] = $DR->get();
 			}
@@ -1676,6 +1729,98 @@ class Libzot {
 		return $result;
 	}
 
+	static public function fetch_conversation($channel,$mid) {
+
+		// Use Zotfinger to create a signed request
+
+		$a = Zotfinger::exec($mid,$channel);
+
+		logger('received conversation: ' . print_r($a,true), LOGGER_DATA);
+
+		if($a['data']['type'] !== 'OrderedCollection') {
+			return;
+		}
+
+		if(! intval($a['data']['totalItems'])) {
+			return;
+		}
+
+		$ret = [];
+
+		foreach($a['data']['orderedItems'] as $activity) {
+
+			$AS = new ActivityStreams($activity);
+			if(! $AS->is_valid()) {
+				logger('FOF Activity rejected: ' . print_r($activity,true));
+				continue;
+			}
+			$arr = Activity::decode_note($AS);
+
+			logger($AS->debug());
+
+
+			$r = q("select hubloc_hash from hubloc where hubloc_id_url = '%s' limit 1",
+				dbesc($AS->actor['id'])
+			); 
+
+			if(! $r) {
+				$y = import_author_xchan([ 'url' => $AS->actor['id'] ]);
+				if($y) {
+					$r = q("select hubloc_hash from hubloc where hubloc_id_url = '%s' limit 1",
+						dbesc($AS->actor['id'])
+					);
+				} 
+				if(! $r) {
+					logger('FOF Activity: no actor');
+					continue;
+				}
+			}
+
+			if($AS->obj['actor'] && $AS->obj['actor']['id'] && $AS->obj['actor']['id'] !== $AS->actor['id']) {
+				$y = import_author_xchan([ 'url' => $AS->obj['actor']['id'] ]);
+				if(! $y) {
+					logger('FOF Activity: no object actor');
+					continue;
+				}
+			}
+
+
+			if($r) {
+				$arr['author_xchan'] = $r[0]['hubloc_hash'];
+			}
+
+			$s = q("select hubloc_hash from hubloc where hubloc_id_url = '%s' limit 1",
+				dbesc($a['signature']['signer'])
+			); 
+
+			if($s) {
+				$arr['owner_xchan'] = $s[0]['hubloc_hash'];
+			}
+			else {
+				$arr['owner_xchan'] = $a['signature']['signer'];
+			}
+
+			// @fixme - spoofable
+			if($AS->data['hubloc']) {
+				$arr['item_verified'] = true;
+			}
+			if($AS->data['signed_data']) {
+				IConfig::Set($arr,'activitystreams','signed_data',$AS->data['signed_data'],false);
+			}
+
+			logger('FOF Activity received: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
+			logger('FOF Activity recipient: ' . $channel['channel_hash'], LOGGER_DATA, LOG_DEBUG);
+
+			$result = self::process_delivery($arr['owner_xchan'],$arr, [ $channel['channel_hash'] ],false,false,true);
+			if ($result) {
+				$ret = array_merge($ret, $result);
+			}		
+		}
+
+		return $ret;
+	}
+
+
 	/**
 	 * @brief Remove community tag.
 	 *
@@ -1900,7 +2045,7 @@ class Libzot {
 
 		foreach($deliveries as $d) {
 	
-			$DR = new \Zotlabs\Lib\DReport(z_root(),$sender,$d,$arr['mid']);
+			$DR = new DReport(z_root(),$sender,$d,$arr['mid']);
 
 			$r = q("select * from channel where channel_hash = '%s' limit 1",
 				dbesc($d['hash'])
@@ -2112,7 +2257,8 @@ class Libzot {
 				if(intval($channel['channel_removed']) && $hub['hubloc_url'] === z_root())
 					$hub['hubloc_deleted'] = 1;
 
-				$ret[] = [
+
+				$z = [
 					'host'     => $hub['hubloc_host'],
 					'address'  => $hub['hubloc_addr'],
 					'id_url'   => $hub['hubloc_id_url'],
@@ -2120,10 +2266,25 @@ class Libzot {
 					'url'      => $hub['hubloc_url'],
 					'url_sig'  => $hub['hubloc_url_sig'],
 					'site_id'  => $hub['hubloc_site_id'],
-					'callback' => $hub['hubloc_callback'],
+					'callback' => $hub['hubloc_url'] . '/zot',
 					'sitekey'  => $hub['hubloc_sitekey'],
 					'deleted'  => (intval($hub['hubloc_deleted']) ? true : false)
 				];
+
+				// version compatibility tweaks
+
+				if(! strpos($z['url_sig'],'.')) {
+					$z['url_sig'] = 'sha256.' . $z['url_sig'];
+				}
+
+				if(! $z['id_url']) {
+					$z['id_url'] = $z['url'] . '/channel/' . substr($z['address'],0,strpos($z['address'],'@'));
+				}
+				if(! $z['site_id']) {
+					$z['site_id'] = Libzot::make_xchan_hash($z['url'],$z['sitekey']);
+				}
+					 
+				$ret[] = $z;
 			}
 		}
 
@@ -2331,6 +2492,10 @@ class Libzot {
 		// we may only end up with one; which results in posts with no author name or photo and are a bit
 		// of a hassle to repair. If either or both are missing, do a full discovery probe.
 
+		if(! array_key_exists('id',$x)) {
+			return import_author_activitypub($x);
+		}
+
 		$hash = self::make_xchan_hash($x['id'],$x['key']);
 
 		$desturl = $x['url'];
@@ -2502,7 +2667,7 @@ class Libzot {
 		}
 		else {
 			// check if it has characteristics of a public forum based on custom permissions.
-			$m = \Zotlabs\Access\Permissions::FilledAutoperms($e['channel_id']);
+			$m = Permissions::FilledAutoperms($e['channel_id']);
 			if($m) {
 				foreach($m as $k => $v) {
 					if($k == 'tag_deliver' && intval($v) == 1)
@@ -2584,13 +2749,13 @@ class Libzot {
 		];
 
 		$ret['channel_role'] = get_pconfig($e['channel_id'],'system','permissions_role','custom');
-
+		$ret['protocols']    = [ 'zot6' ];
 		$ret['searchable']     = $searchable;
 		$ret['adult_content']  = $adult_channel;
 		$ret['public_forum']   = $public_forum;
 		
-		$ret['comments']       = map_scope(\Zotlabs\Access\PermissionLimits::Get($e['channel_id'],'post_comments'));
-		$ret['mail']           = map_scope(\Zotlabs\Access\PermissionLimits::Get($e['channel_id'],'post_mail'));
+		$ret['comments']       = map_scope(PermissionLimits::Get($e['channel_id'],'post_comments'));
+		$ret['mail']           = map_scope(PermissionLimits::Get($e['channel_id'],'post_mail'));
 
 		if($deleted)
 			$ret['deleted']        = $deleted;

Zotlabs/Lib/PConfig.php

@@ -57,6 +57,7 @@ class PConfig {
 					\App::$config[$uid][$c]['config_loaded'] = true;
 				}
 				\App::$config[$uid][$c][$k] = $rr['v'];
+				\App::$config[$uid][$c]['pcfgud:'.$k] = $rr['updated'];
 			}
 		}
 	}
@@ -113,7 +114,7 @@ class PConfig {
 	 *  The value to store
 	 * @return mixed Stored $value or false
 	 */
-	static public function Set($uid, $family, $key, $value) {
+	static public function Set($uid, $family, $key, $value, $updated=NULL) {
 
 		// this catches subtle errors where this function has been called
 		// with local_channel() when not logged in (which returns false)
@@ -130,29 +131,74 @@ class PConfig {
 		$dbvalue = ((is_array($value))  ? serialize($value) : $value);
 		$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
 
+		if (! $updated) {
+			$updated = datetime_convert();
+		}
+
+		$hash = hash('sha256',$family.':'.$key);
+
+		if (self::Get($uid, 'hz_delpconfig', $hash) !== false) {
+			if (Get($uid, 'hz_delpconfig', $hash) > $updated) {
+				logger('Refusing to update pconfig with outdated info (Item deleted more recently).', LOGGER_NORMAL, LOG_ERR);
+				return self::Get($uid,$family,$key);
+			} else {
+				self::Delete($uid,'hz_delpconfig',$hash);
+			}
+		}
+
 		if(self::Get($uid, $family, $key) === false) {
 			if(! array_key_exists($uid, \App::$config))
 				\App::$config[$uid] = array();
 			if(! array_key_exists($family, \App::$config[$uid]))
 				\App::$config[$uid][$family] = array();
 
-			$ret = q("INSERT INTO pconfig ( uid, cat, k, v ) VALUES ( %d, '%s', '%s', '%s' ) ",
+
+			$ret = q("INSERT INTO pconfig ( uid, cat, k, v, updated ) VALUES ( %d, '%s', '%s', '%s', '%s' ) ",
 				intval($uid),
 				dbesc($family),
 				dbesc($key),
-				dbesc($dbvalue)
+				dbesc($dbvalue),
+				dbesc($updated)
 			);
+
+			// There is a possible race condition if another process happens
+			// to insert something after this thread has Loaded and now.  We should
+			// at least make a note of it if it happens.
+
+			if (!$ret) {
+				logger("Error: Insert to pconfig failed.",LOGGER_NORMAL, LOG_ERR);
+			}
+
+			\App::$config[$uid][$family]['pcfgud:'.$key] = $updated;
+
 		}
 		else {
+			$new = (\App::$config[$uid][$family]['pcfgud:'.$key] < $updated);
 
-			$ret = q("UPDATE pconfig SET v = '%s' WHERE uid = %d and cat = '%s' AND k = '%s'",
-				dbesc($dbvalue),
-				intval($uid),
-				dbesc($family),
-				dbesc($key)
-			);
+			if ($new) {
+
+				// @NOTE There is still a possible race condition under limited circumstances
+				// where a value will be updated by another thread with more current data than
+				// we have.  At this point there is no easy way to test for it, so we update
+				// and hope for the best.
+
+				$ret = q("UPDATE pconfig SET v = '%s', updated = '%s' WHERE uid = %d and cat = '%s' AND k = '%s' ",
+					dbesc($dbvalue),
+					dbesc($updated),
+					intval($uid),
+					dbesc($family),
+					dbesc($key)
+				);
+
+				\App::$config[$uid][$family]['pcfgud:'.$key] = $updated;
+
+			} else {
+				logger('Refusing to update pconfig with outdated info.', LOGGER_NORMAL, LOG_ERR);
+				return self::Get($uid, $family, $key);
+			}
 		}
 
+
 		// keep a separate copy for all variables which were
 		// set in the life of this page. We need this to
 		// synchronise channel clones.
@@ -163,7 +209,11 @@ class PConfig {
 			\App::$config[$uid]['transient'][$family] = array();
 
 		\App::$config[$uid][$family][$key] = $value;
-		\App::$config[$uid]['transient'][$family][$key] = $value;
+
+		if ($new) {
+			\App::$config[$uid]['transient'][$family][$key] = $value;
+			\App::$config[$uid]['transient'][$family]['pcfgud:'.$key] = $updated;
+		}
 
 		if($ret)
 			return $value;
@@ -186,18 +236,29 @@ class PConfig {
 	 *  The configuration key to delete
 	 * @return mixed
 	 */
-	static public function Delete($uid, $family, $key) {
+	static public function Delete($uid, $family, $key, $updated = NULL) {
 
 		if(is_null($uid) || $uid === false)
 			return false;
 
+		$updated = ($updated) ? $updated : datetime_convert();
+
+		$newer = (\App::$config[$uid][$family]['pcfgud:'.$key] < $updated);
+
+		if (! $newer) {
+			logger('Refusing to delete pconfig with outdated delete request.', LOGGER_NORMAL, LOG_ERR);
+			return false;
+		}
+
 		$ret = false;
 
-		if(array_key_exists($uid,\App::$config)
-			&& is_array(\App::$config['uid'])
-			&& array_key_exists($family,\App::$config['uid'])
-			&& array_key_exists($key, \App::$config[$uid][$family]))
+		if (isset(\App::$config[$uid][$family][$key])) {
 			unset(\App::$config[$uid][$family][$key]);
+		}
+
+		if (isset(\App::$config[$uid][$family]['pcfgud:'.$key])) {
+			unset(\App::$config[$uid][$family]['pcfgud:'.$key]);
+		}
 
 		$ret = q("DELETE FROM pconfig WHERE uid = %d AND cat = '%s' AND k = '%s'",
 			intval($uid),
@@ -205,6 +266,22 @@ class PConfig {
 			dbesc($key)
 		);
 
+		if ($family != 'hz_delpconfig') {
+			$hash = hash('sha256',$family.':'.$key);
+			set_pconfig($uid,'hz_delpconfig',$hash,$updated);
+		}
+
+		// Synchronize delete with clones.
+
+		if(! array_key_exists('transient', \App::$config[$uid]))
+			\App::$config[$uid]['transient'] = array();
+		if(! array_key_exists($family, \App::$config[$uid]['transient']))
+			\App::$config[$uid]['transient'][$family] = array();
+
+		if ($new) {
+			\App::$config[$uid]['transient'][$family]['pcfgdel:'.$key] = $updated;
+		}
+
 		return $ret;
 	}
 

Zotlabs/Module/Acl.php

@@ -83,7 +83,8 @@ class Acl extends \Zotlabs\Web\Controller {
 		if($search) {
 			$sql_extra = " AND pgrp.gname LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " ";
 			$sql_extra2 = "AND ( xchan_name LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " OR xchan_addr LIKE " . protect_sprintf( "'%" . dbesc(punify($search)) . ((strpos($search,'@') === false) ? "%@%'"  : "%'")) . ") ";
-	
+			$sql_extra2_xchan = "AND ( xchan_name LIKE " . protect_sprintf( "'" . dbesc($search) . "%'" ) . " OR xchan_addr LIKE " . protect_sprintf( "'" . dbesc(punify($search)) . ((strpos($search,'@') === false) ? "%@%'"  : "%'")) . ") ";
+
 			// This horrible mess is needed because position also returns 0 if nothing is found. 
 			// Would be MUCH easier if it instead returned a very large value
 			// Otherwise we could just 
@@ -226,7 +227,7 @@ class Acl extends \Zotlabs\Web\Controller {
 			else { // Visitors
 				$r = q("SELECT xchan_hash as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_their_perms, 0 as abook_flags, 0 as abook_self
 					FROM xchan left join xlink on xlink_link = xchan_hash
-					WHERE xlink_xchan  = '%s' AND xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
+					WHERE xlink_xchan  = '%s' AND xchan_deleted = 0 $sql_extra2_xchan order by $order_extra2 xchan_name asc" ,
 					dbesc(get_observer_hash())
 				);
 	
@@ -270,7 +271,7 @@ class Acl extends \Zotlabs\Web\Controller {
 			if((count($r) < 100) && $type == 'c') {
 				$r2 = q("SELECT substr(xchan_hash,1,18) as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_their_perms, 0 as abook_flags, 0 as abook_self 
 					FROM xchan 
-					WHERE xchan_deleted = 0 and not xchan_network  in ('rss','anon','unknown') $sql_extra2 order by $order_extra2 xchan_name asc" 
+					WHERE xchan_deleted = 0 and not xchan_network  in ('rss','anon','unknown') $sql_extra2_xchan order by $order_extra2 xchan_name asc"
 				);
 				if($r2) {
 					$r = array_merge($r,$r2);

Zotlabs/Module/Admin.php

@@ -109,11 +109,9 @@ class Admin extends \Zotlabs\Web\Controller {
 
 		// available channels, primary and clones
 		$channels = array();
-		$r = q("SELECT COUNT(*) AS total, COUNT(CASE WHEN channel_primary = 1 THEN 1 ELSE NULL END) AS main, COUNT(CASE WHEN channel_primary = 0 THEN 1 ELSE NULL END) AS clones FROM channel WHERE channel_removed = 0 and channel_system = 0");
+		$r = q("SELECT COUNT(*) AS total FROM channel WHERE channel_removed = 0 and channel_system = 0");
 		if ($r) {
 			$channels['total']  = array('label' => t('Channels'), 'val' => $r[0]['total']);
-			$channels['main']   = array('label' => t('Primary'), 'val' => $r[0]['main']);
-			$channels['clones'] = array('label' => t('Clones'), 'val' => $r[0]['clones']);
 		}
 
 		// We can do better, but this is a quick queue status

Zotlabs/Module/Linkinfo.php

@@ -228,8 +228,13 @@ class Linkinfo extends \Zotlabs\Web\Controller {
 	
 		$header = $result['header'];
 		$body   = $result['body'];
-	
-		$body   = mb_convert_encoding($body, 'UTF-8', 'UTF-8');
+		
+		// Check codepage in HTTP headers or HTML if not exist
+		$cp = (preg_match('/Content-Type: text\/html; charset=(.+)\r\n/i', $header, $o) ? $o[1] : '');
+		if(empty($cp))
+		    $cp = (preg_match('/meta.+content=["|\']text\/html; charset=([^"|\']+)/i', $body, $o) ? $o[1] : 'AUTO');
+
+		$body   = mb_convert_encoding($body, 'UTF-8', $cp);
 		$body   = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8");
 	
 		$doc    = new \DOMDocument();
@@ -265,20 +270,43 @@ class Linkinfo extends \Zotlabs\Web\Controller {
 			$attr["content"] = html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8");
 	
 			switch (strtolower($attr["name"])) {
-				case 'generator':
-					$siteinfo['generator'] = $attr['content'];
-					break;
 				case "fulltitle":
-					$siteinfo["title"] = $attr["content"];
+					$siteinfo["title"] = trim($attr["content"]);
 					break;
 				case "description":
-					$siteinfo["text"] = $attr["content"];
+					$siteinfo["text"] = trim($attr["content"]);
+					break;
+				case "thumbnail":
+					$siteinfo["image"] = $attr["content"];
+					break;
+				case "twitter:image":
+					$siteinfo["image"] = $attr["content"];
+					break;
+				case "twitter:image:src":
+					$siteinfo["image"] = $attr["content"];
+					break;
+				case "twitter:card":
+					if (($siteinfo["type"] == "") || ($attr["content"] == "photo")) {
+						$siteinfo["type"] = $attr["content"];
+					}
+					break;
+				case "twitter:description":
+					$siteinfo["text"] = trim($attr["content"]);
+					break;
+				case "twitter:title":
+					$siteinfo["title"] = trim($attr["content"]);
 					break;
 				case "dc.title":
-					$siteinfo["title"] = $attr["content"];
+					$siteinfo["title"] = trim($attr["content"]);
 					break;
 				case "dc.description":
-					$siteinfo["text"] = $attr["content"];
+					$siteinfo["text"] = trim($attr["content"]);
+					break;
+				case "keywords":
+					$keywords = explode(",", $attr["content"]);
+					break;
+				case "news_keywords":
+					$keywords = explode(",", $attr["content"]);
 					break;
 			}
 		}

Zotlabs/Module/Menu.php

@@ -213,7 +213,7 @@ class Menu extends \Zotlabs\Web\Controller {
 					'$header' => t('Edit Menu'),
 					'$sys' => \App::$is_sys,
 					'$menu_id' => intval(argv(2)),
-					'$menu_edit_link' => 'mitem/' . $which . '/' . intval(argv(1)) . ((\App::$is_sys) ? '?f=&sys=1' : ''),
+					'$menu_edit_link' => 'mitem/' . $which . '/' . intval(argv(2)) . ((\App::$is_sys) ? '?f=&sys=1' : ''),
 					'$hintedit' => t('Add or remove entries to this menu'),
 					'$editcontents' => t('Edit menu contents'),
 					'$menu_name' => array('menu_name', t('Menu name'), $m['menu_name'], t('Must be unique, only seen by you'), '*'),

Zotlabs/Module/Network.php

@@ -128,11 +128,12 @@ class Network extends \Zotlabs\Web\Controller {
 		$xchan    = ((x($_GET,'xchan')) ? $_GET['xchan']         : '');
 		$net      = ((x($_GET,'net'))   ? $_GET['net']           : '');
 		$pf       = ((x($_GET,'pf'))    ? $_GET['pf']            : '');
+		$unseen   = ((x($_GET,'unseen'))    ? $_GET['unseen']            : '');
 		
 		$deftag = '';
 	
 
-		if(x($_GET,'search') || $file || (!$pf && $cid) || $hashtags || $verb || $category)
+		if(x($_GET,'search') || $file || (!$pf && $cid) || $hashtags || $verb || $category || $conv || $unseen)
 			$nouveau = true;
 
 		if($cid) {
@@ -220,6 +221,7 @@ class Network extends \Zotlabs\Web\Controller {
 		$sql_extra = '';
 	
 		if($group) {
+
 			$contact_str = '';
 			$contacts = group_get_members($group);
 			if($contacts) {
@@ -232,7 +234,6 @@ class Network extends \Zotlabs\Web\Controller {
 				}
 			}
 			$item_thread_top = '';
-
 			$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str )) or allow_gid like '" . protect_sprintf('%<' . dbesc($group_hash) . '>%') . "' ) and id = parent $item_normal ) ";
 	
 			$x = group_rec_byhash(local_channel(), $group_hash);
@@ -252,15 +253,39 @@ class Network extends \Zotlabs\Web\Controller {
 
 			if($load || $update) {
 				if(!$pf && $nouveau) {
+					// This is for nouveau view cid queries (not a public forum)
 					$sql_extra = " AND author_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' ";
 				}
+				elseif($pf && $unseen && $nouveau) {
+
+					$vnotify = get_pconfig(local_channel(), 'system', 'vnotify');
+					if(! ($vnotify & VNOTIFY_LIKE))
+						$likes_sql = " AND verb NOT IN ('" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') ";
+
+					// This is for nouveau view public forum cid queries (if a forum notification is clicked)
+					$p = q("SELECT oid AS parent FROM term WHERE uid = %d AND ttype = %d AND term = '%s'",
+						intval(local_channel()),
+						intval(TERM_FORUM),
+						dbesc($cid_r[0]['xchan_name'])
+					);
+
+					$p_str = ids_to_querystr($p, 'parent');
+					if($p_str)
+						$p_sql = " OR item.parent IN ( $p_str ) ";
+
+					$sql_extra = " AND ( owner_xchan = '" . protect_sprintf(dbesc($cid_r[0]['abook_xchan'])) . "' OR owner_xchan = '" . protect_sprintf(dbesc($cid_r[0]['abook_xchan'])) . "' $p_sql ) AND item_unseen = 1 $likes_sql ";
+				}
 				else {
+					// This is for threaded view cid queries (e.g. if a forum is selected from the forum filter)
 					$ttype = (($pf) ? TERM_FORUM : TERM_MENTION);
 
 					$p1 = q("SELECT DISTINCT parent FROM item WHERE uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' OR owner_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' ) $item_normal ");
 					$p2 = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($cid_r[0]['xchan_name']) . "'");
 
 					$p_str = ids_to_querystr(array_merge($p1,$p2),'parent');
+					if(! $p_str)
+						killme();
+
 					$sql_extra = " AND item.parent IN ( $p_str ) ";
 				}
 			}
@@ -345,7 +370,8 @@ class Network extends \Zotlabs\Web\Controller {
 				'$verb'    => $verb,
 				'$net'     => $net,
 				'$dbegin'  => $datequery2,
-				'$pf'     => (($pf) ? $pf : '0'),
+				'$pf'      => (($pf) ? $pf : '0'),
+				'$unseen'  => $unseen
 			));
 		}
 	
@@ -386,15 +412,7 @@ class Network extends \Zotlabs\Web\Controller {
 	
 		if($conv) {
 			$item_thread_top = '';
-
-			if($nouveau) {
-				$sql_extra .= " AND author_xchan = '" . dbesc($channel['channel_hash']) . "' ";
-			}
-			else {
-				$sql_extra .= sprintf(" AND parent IN (SELECT distinct(parent) from item where ( author_xchan = '%s' or item_mentionsme = 1 )) ",
-					dbesc(protect_sprintf($channel['channel_hash']))
-				);
-			}
+			$sql_extra .= " AND ( author_xchan = '" . dbesc($channel['channel_hash']) . "' OR item_mentionsme = 1 ) ";
 		}
 	
 		if($update && ! $load) {
@@ -441,9 +459,11 @@ class Network extends \Zotlabs\Web\Controller {
 			$page_mode = 'list';
 		else
 			$page_mode = 'client';
-	
-		$simple_update = (($update) ? " and item_unseen = 1 " : '');
 
+		$parents_str = '';
+		$update_unseen = '';
+
+		$simple_update = (($update) ? " and item_unseen = 1 " : '');
 
 		// This fixes a very subtle bug so I'd better explain it. You wake up in the morning or return after a day
 		// or three and look at your matrix page - after opening up your browser. The first page loads just as it
@@ -459,15 +479,15 @@ class Network extends \Zotlabs\Web\Controller {
 	
 		if($update && $_SESSION['loadtime'])
 			$simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' )  OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) ";
-		if($load)
-			$simple_update = '';
+
+               if($load)
+                       $simple_update = '';
 
 		if($static && $simple_update)
 			$simple_update .= " and item_thread_top = 0 and author_xchan = '" . protect_sprintf(get_observer_hash()) . "' ";	
 	
 		if($nouveau && $load) {
 			// "New Item View" - show all items unthreaded in reverse created date order
-	
 			$items = q("SELECT item.*, item.id AS item_id, created FROM item 
 				left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
 				$net_query
@@ -478,7 +498,12 @@ class Network extends \Zotlabs\Web\Controller {
 				$net_query2
 				ORDER BY item.created DESC $pager_sql "
 			);
-	
+
+			$parents_str = ids_to_querystr($items,'item_id');
+			if($parents_str) {
+				$update_unseen = " AND id IN ( " . dbesc($parents_str) . " )";
+			}
+
 			require_once('include/items.php');
 	
 			xchan_query($items);
@@ -521,8 +546,6 @@ class Network extends \Zotlabs\Web\Controller {
 			}
 
 			// Then fetch all the children of the parents that are on this page
-			$parents_str = '';
-			$update_unseen = '';
 	
 			if($r) {
 	

Zotlabs/Module/Owa.php

@@ -31,15 +31,17 @@ class Owa extends \Zotlabs\Web\Controller {
 
 					if($keyId) {
 						$r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash 
-							where hubloc_addr = '%s' ",
-							dbesc(str_replace('acct:','',$keyId))
+							where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) ",
+							dbesc(str_replace('acct:','',$keyId)),
+							dbesc($keyId)
 						);
 						if(! $r) {
 							$found = discover_by_webbie(str_replace('acct:','',$keyId));
 							if($found) {
 								$r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash 
-									where hubloc_addr = '%s' ",
-									dbesc(str_replace('acct:','',$keyId))
+									where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) ",
+									dbesc(str_replace('acct:','',$keyId)),
+									dbesc($keyId)
 								);
 							}
 						}

Zotlabs/Module/Photo.php

@@ -4,13 +4,12 @@ namespace Zotlabs\Module;
 require_once('include/security.php');
 require_once('include/attach.php');
 require_once('include/photo/photo_driver.php');
-require_once('include/photos.php');
 
 
 class Photo extends \Zotlabs\Web\Controller {
 
 	function init() {
-	
+
 		$prvcachecontrol = false;
 		$streaming = null;
 		$channel = null;
@@ -32,26 +31,26 @@ class Photo extends \Zotlabs\Web\Controller {
 		}
 	
 		$observer_xchan = get_observer_hash();
+		$ismodified = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
 
-		$default = z_root() . '/' . get_default_profile_photo();
-	
 		if(isset($type)) {
 	
 			/**
 			 * Profile photos - Access controls on default profile photos are not honoured since they need to be exchanged with remote sites.
 			 * 
 			 */
-	
+			 
+			$default = get_default_profile_photo();
+			 
 			if($type === 'profile') {
 				switch($res) {
-	
 					case 'm':
 						$resolution = 5;
-						$default = z_root() . '/' . get_default_profile_photo(80);
+						$default = get_default_profile_photo(80);
 						break;
 					case 's':
 						$resolution = 6;
-						$default = z_root() . '/' . get_default_profile_photo(48);
+						$default = get_default_profile_photo(48);
 						break;
 					case 'l':
 					default:
@@ -60,6 +59,8 @@ class Photo extends \Zotlabs\Web\Controller {
 				}
 			}
 	
+			$modified = filemtime($default);
+			$default = z_root() . '/' . $default;
 			$uid = $person;
 
 			$d = [ 'imgscale' => $resolution, 'channel_id' => $uid, 'default' => $default, 'data'  => '', 'mimetype' => '' ];
@@ -78,17 +79,18 @@ class Photo extends \Zotlabs\Web\Controller {
 					intval(PHOTO_PROFILE)
 				);
 				if($r) {
+					$modified = strtotime($r[0]['edited'] . "Z");
 					$data = dbunescbin($r[0]['content']);
 					$mimetype = $r[0]['mimetype'];
 				}
 				if(intval($r[0]['os_storage']))
 					$data = file_get_contents($data);
 			}
+
 			if(! $data) {
-				$data = fetch_image_from_url($default,$mimetype);
-			}
-			if(! $mimetype) {
-				$mimetype = 'image/png';
+			    $x = z_fetch_url($default,true,0,[ 'novalidate' => true ]);
+			    $data = ($x['success'] ? $x['body'] : EMPTY_STR);
+			    $mimetype = 'image/png';
 			}
 		}
 		else {
@@ -124,9 +126,7 @@ class Photo extends \Zotlabs\Web\Controller {
 				$photo = substr($photo,0,-2);
 				// If viewing on a high-res screen, attempt to serve a higher resolution image:
 				if ($resolution == 2 && ($cookie_value > 1))
-				  {
 				    $resolution = 1;
-				  }
 			}
 			
 			$r = q("SELECT uid, photo_usage FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
@@ -151,18 +151,6 @@ class Photo extends \Zotlabs\Web\Controller {
 					$allowed = attach_can_view($r[0]['uid'],$observer_xchan,$photo);
 				}
 
-				if(intval($r[0]['photo_usage'])) {
-					$allowed = 1;
-					if(intval($r[0]['photo_usage']) === PHOTO_COVER) 
-						if($resolution < PHOTO_RES_COVER_1200)
-							$allowed = (-1);
-					if(intval($r[0]['photo_usage']) === PHOTO_PROFILE)
-						if(! in_array($resolution,[4,5,6]))
-							$allowed = (-1);
-				}
-				if($allowed === (-1))
-					$allowed = attach_can_view($r[0]['uid'],$observer_xchan,$photo);
-				
 				$channel = channelx_by_n($r[0]['uid']);
 
 				// Now we'll see if we can access the photo
@@ -175,10 +163,13 @@ class Photo extends \Zotlabs\Web\Controller {
 
 				if($exists && $allowed) {
 					$data = dbunescbin($e[0]['content']);
+					$filesize = $e[0]['filesize'];
 					$mimetype = $e[0]['mimetype'];
-					if(intval($e[0]['os_storage'])) {
+					$modified = strtotime($e[0]['edited'] . 'Z');
+					if(intval($e[0]['os_storage']))
 						$streaming = $data;
-					}
+					if($e[0]['allow_cid'] != '' || $e[0]['allow_gid'] != '' || $e[0]['deny_gid'] != '' || $e[0]['deny_gid'] != '')
+						$prvcachecontrol = true;
 				}
 				else {
 					if(! $allowed) {
@@ -189,27 +180,40 @@ class Photo extends \Zotlabs\Web\Controller {
 					}
 
 				}
+			} else {
+				http_status_exit(404,'not found');
 			}
 		}
-	
+
+		header_remove('Pragma');
+
+        if($ismodified === gmdate("D, d M Y H:i:s", $modified) . " GMT") {
+			header_remove('Expires');
+			header_remove('Cache-Control');
+			header_remove('Set-Cookie');
+			http_status_exit(304,'not modified');
+        }
+
 		if(! isset($data)) {
 			if(isset($resolution)) {
 				switch($resolution) {
-	
 					case 4:
-						$data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(),$mimetype);
+						$default = get_default_profile_photo();
 						break;
 					case 5:
-						$data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(80),$mimetype);
+						$default = get_default_profile_photo(80);
 						break;
 					case 6:
-						$data = fetch_image_from_url(z_root() . '/' . get_default_profile_photo(48),$mimetype);
+						$default = get_default_profile_photo(48);
 						break;
 					default:
 						killme();
 						// NOTREACHED
 						break;
 				}
+				$x = z_fetch_url(z_root() . '/' . $default,true,0,[ 'novalidate' => true ]);
+				$data = ($x['success'] ? $x['body'] : EMPTY_STR);
+				$mimetype = 'image/png';
 			}
 		}
 	
@@ -222,15 +226,14 @@ class Photo extends \Zotlabs\Web\Controller {
 			}
 		}
 	
+		// @FIXME Seems never invoked
 		// Writing in cachefile
-		if (isset($cachefile) && $cachefile != '')
+		if (isset($cachefile) && $cachefile != '') {
 			file_put_contents($cachefile, $data);
-	
-		if(function_exists('header_remove')) {
-			header_remove('Pragma');
-			header_remove('pragma');
+			$modified = filemtime($cachefile);
 		}
-	
+
+
 		header("Content-type: " . $mimetype);
 	
 		if($prvcachecontrol) {
@@ -252,15 +255,16 @@ class Photo extends \Zotlabs\Web\Controller {
 			// This has performance considerations but we highly recommend you 
 			// leave it alone. 
 	
-			$cache = get_config('system','photo_cache_time');
-			if(! $cache)
-				$cache = (3600 * 24); // 1 day
-	
+			$cache = get_config('system','photo_cache_time', 86400);    // 1 day by default
+
 		 	header("Expires: " . gmdate("D, d M Y H:i:s", time() + $cache) . " GMT");
 			header("Cache-Control: max-age=" . $cache);
 	
 		}
 
+		header("Last-Modified: " . gmdate("D, d M Y H:i:s", $modified) . " GMT");
+		header("Content-Length: " . (isset($filesize) ? $filesize : strlen($data)));
+
 		// If it's a file resource, stream it. 
 
 		if($streaming && $channel) {

Zotlabs/Module/Photos.php

@@ -263,7 +263,8 @@ class Photos extends \Zotlabs\Web\Controller {
 							$fsize = strlen($data);
 						}
 	
-						$x = q("update photo set content = '%s', filesize = %d, height = %d, width = %d where resource_id = '%s' and uid = %d and imgscale = 0",
+						$x = q("update photo set edited = '%s', content = '%s', filesize = %d, height = %d, width = %d where resource_id = '%s' and uid = %d and imgscale = 0",
+							dbesc(datetime_convert()),
 							dbescbin($data),
 							intval($fsize),
 							intval($height),
@@ -277,9 +278,13 @@ class Photos extends \Zotlabs\Web\Controller {
 	
 						$width  = $ph->getWidth();
 						$height = $ph->getHeight();
+						$data = $ph->imageString();
+						$fsize = strlen($data);
 	
-						$x = q("update photo set content = '%s', height = %d, width = %d where resource_id = '%s' and uid = %d and imgscale = 1",
-							dbescbin($ph->imageString()),
+						$x = q("update photo set edited = '%s', content = '%s', filesize = %d, height = %d, width = %d where resource_id = '%s' and uid = %d and imgscale = 1",
+							dbesc(datetime_convert()),
+							dbescbin($data),
+							intval($fsize),
 							intval($height),
 							intval($width),
 							dbesc($resource_id),
@@ -292,9 +297,13 @@ class Photos extends \Zotlabs\Web\Controller {
 	
 						$width  = $ph->getWidth();
 						$height = $ph->getHeight();
+						$data = $ph->imageString();
+						$fsize = strlen($data);
 	
-						$x = q("update photo set content = '%s', height = %d, width = %d where resource_id = '%s' and uid = %d and imgscale = 2",
-							dbescbin($ph->imageString()),
+						$x = q("update photo set edited = '%s', content = '%s', filesize = %d, height = %d, width = %d where resource_id = '%s' and uid = %d and imgscale = 2",
+							dbesc(datetime_convert()),
+							dbescbin($data),
+							intval($fsize),
 							intval($height),
 							intval($width),
 							dbesc($resource_id),
@@ -307,9 +316,13 @@ class Photos extends \Zotlabs\Web\Controller {
 	
 						$width  = $ph->getWidth();
 						$height = $ph->getHeight();
+						$data = $ph->imageString();
+						$fsize = strlen($data);
 	
-						$x = q("update photo set content = '%s', height = %d, width = %d where resource_id = '%s' and uid = %d and imgscale = 3",
-							dbescbin($ph->imageString()),
+						$x = q("update photo set edited = '%s', content = '%s', filesize = %d, height = %d, width = %d where resource_id = '%s' and uid = %d and imgscale = 3",
+							dbesc(datetime_convert()),
+							dbescbin($data),
+							intval($fsize),
 							intval($height),
 							intval($width),
 							dbesc($resource_id),
@@ -612,9 +625,9 @@ class Photos extends \Zotlabs\Web\Controller {
 
 		nav_set_selected('Photos');
 	
-		$o = '<script src="library/blueimp_upload/js/vendor/jquery.ui.widget.js"></script>
-			<script src="library/blueimp_upload/js/jquery.iframe-transport.js"></script>
-			<script src="library/blueimp_upload/js/jquery.fileupload.js"></script>';
+		$o = '<script src="vendor/blueimp/jquery-file-upload/js/vendor/jquery.ui.widget.js"></script>
+			<script src="vendor/blueimp/jquery-file-upload/js/jquery.iframe-transport.js"></script>
+			<script src="vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js"></script>';
 
 
 		$o .= "<script> var profile_uid = " . \App::$profile['profile_uid'] 

Zotlabs/Module/Ping.php

@@ -634,23 +634,29 @@ class Ping extends \Zotlabs\Web\Controller {
 		if($vnotify & VNOTIFY_FORUMS) {
 			$forums = get_forum_channels(local_channel());
 
-			if(! $forums) {
-				$result['forums'] = 0;
-			}
-			else {
-
-				$perms_sql = item_permissions_sql(local_channel()) . item_normal();
+			if($forums) {
+				$item_normal = item_normal();
 				$fcount = count($forums);
 				$forums['total'] = 0;
 
 				for($x = 0; $x < $fcount; $x ++) {
-					$r = q("select sum(item_unseen) as unseen from item 
-						where uid = %d and owner_xchan = '%s' and item_unseen = 1 $perms_sql ",
+					$p = q("SELECT oid AS parent FROM term WHERE uid = %d AND ttype = %d AND term = '%s'",
 						intval(local_channel()),
+						intval(TERM_FORUM),
+						dbesc($forums[$x]['xchan_name'])
+					);
+
+					$p_str = ids_to_querystr($p, 'parent');
+					$p_sql = (($p_str) ? "OR parent IN ( $p_str )" : '');
+
+					$r = q("select count(id) as unseen from item 
+						where uid = %d and ( owner_xchan = '%s' OR author_xchan = '%s' $p_sql ) and item_unseen = 1 $item_normal $sql_extra",
+						intval(local_channel()),
+						dbesc($forums[$x]['xchan_hash']),
 						dbesc($forums[$x]['xchan_hash'])
 					);
 					if($r[0]['unseen']) {
-						$forums[$x]['notify_link'] = (($forums[$x]['private_forum']) ? $forums[$x]['xchan_url'] : z_root() . '/network/?f=&pf=1&cid=' . $forums[$x]['abook_id']);
+						$forums[$x]['notify_link'] = (($forums[$x]['private_forum']) ? $forums[$x]['xchan_url'] : z_root() . '/network/?f=&pf=1&unseen=1&cid=' . $forums[$x]['abook_id']);
 						$forums[$x]['name'] = $forums[$x]['xchan_name'];
 						$forums[$x]['url'] = $forums[$x]['xchan_url'];
 						$forums[$x]['photo'] = $forums[$x]['xchan_photo_s'];

Zotlabs/Module/Search.php

@@ -6,7 +6,7 @@ class Search extends \Zotlabs\Web\Controller {
 
 	function init() {
 		if(x($_REQUEST,'search'))
-			\App::$data['search'] = $_REQUEST['search'];
+			\App::$data['search'] = escape_tags($_REQUEST['search']);
 	}
 	
 	
@@ -46,12 +46,12 @@ class Search extends \Zotlabs\Web\Controller {
 		if(x(\App::$data,'search'))
 			$search = trim(\App::$data['search']);
 		else
-			$search = ((x($_GET,'search')) ? trim(rawurldecode($_GET['search'])) : '');
+			$search = ((x($_GET,'search')) ? trim(escape_tags(rawurldecode($_GET['search']))) : '');
 	
 		$tag = false;
 		if(x($_GET,'tag')) {
 			$tag = true;
-			$search = ((x($_GET,'tag')) ? trim(rawurldecode($_GET['tag'])) : '');
+			$search = ((x($_GET,'tag')) ? trim(escape_tags(rawurldecode($_GET['tag']))) : '');
 		}
 
 		$static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0);
@@ -227,9 +227,9 @@ class Search extends \Zotlabs\Web\Controller {
 		}
 	
 		if($tag) 
-			$o .= '<h2>' . sprintf( t('Items tagged with: %s'),htmlspecialchars($search, ENT_COMPAT,'UTF-8')) . '</h2>';
+			$o .= '<h2>' . sprintf( t('Items tagged with: %s'),$search) . '</h2>';
 		else
-			$o .= '<h2>' . sprintf( t('Search results for: %s'),htmlspecialchars($search, ENT_COMPAT,'UTF-8')) . '</h2>';
+			$o .= '<h2>' . sprintf( t('Search results for: %s'),$search) . '</h2>';
 	
 		$o .= conversation($items,'search',$update,'client');
 	

Zotlabs/Update/_1225.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1225 {
+
+	function run() {
+
+		if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+			$r1 = q("ALTER TABLE pconfig ADD updated timestamp NOT NULL DEFAULT '0001-01-01 00:00:00' ");
+ 			$r2 = q("create index \"pconfig_updated_idx\" on pconfig (\"updated\")");
+
+			$r = ($r1 && $r2);
+		}
+		else {
+			$r = q("ALTER TABLE `pconfig` ADD `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' , 
+				ADD INDEX `pconfig_updated` (`updated`)");
+		}
+
+		if($r)
+			return UPDATE_SUCCESS;
+		return UPDATE_FAILED;
+
+	}
+
+}

Zotlabs/Widget/Activity_filter.php

@@ -16,35 +16,6 @@ class Activity_filter {
 
 		$tabs = [];
 
-		if(feature_enabled(local_channel(),'personal_tab')) {
-			if(x($_GET,'conv')) {
-				$conv_active = (($_GET['conv'] == 1) ? 'active' : '');
-				$filter_active = 'personal';
-			}
-
-			$tabs[] = [
-				'label' => t('Personal Posts'),
-				'icon' => 'user-circle',
-				'url' => z_root() . '/' . $cmd . '/?f=&conv=1',
-				'sel' => $conv_active,
-				'title' => t('Show posts that mention or involve me')
-			];
-		}
-
-		if(feature_enabled(local_channel(),'star_posts')) {
-			if(x($_GET,'star')) {
-				$starred_active = (($_GET['star'] == 1) ? 'active' : '');
-				$filter_active = 'star';
-			}
-
-			$tabs[] = [
-				'label' => t('Starred Posts'),
-				'icon' => 'star',
-				'url'=>z_root() . '/' . $cmd . '/?f=&star=1',
-				'sel'=>$starred_active,
-				'title' => t('Show posts that I have starred')
-			];
-		}
 
 		if(Apps::system_app_installed(local_channel(), 'Privacy Groups')) {
 			$groups = q("SELECT * FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC",
@@ -110,6 +81,36 @@ class Activity_filter {
 			}
 		}
 
+		if(feature_enabled(local_channel(),'star_posts')) {
+			if(x($_GET,'star')) {
+				$starred_active = (($_GET['star'] == 1) ? 'active' : '');
+				$filter_active = 'star';
+			}
+
+			$tabs[] = [
+				'label' => t('Starred Posts'),
+				'icon' => 'star',
+				'url'=>z_root() . '/' . $cmd . '/?f=&star=1',
+				'sel'=>$starred_active,
+				'title' => t('Show posts that I have starred')
+			];
+		}
+
+		if(feature_enabled(local_channel(),'personal_tab')) {
+			if(x($_GET,'conv')) {
+				$conv_active = (($_GET['conv'] == 1) ? 'active' : '');
+				$filter_active = 'personal';
+			}
+
+			$tabs[] = [
+				'label' => t('Personal Posts'),
+				'icon' => 'user-circle',
+				'url' => z_root() . '/' . $cmd . '/?f=&conv=1',
+				'sel' => $conv_active,
+				'title' => t('Show posts that mention or involve me')
+			];
+		}
+
 		if(feature_enabled(local_channel(),'filing')) {
 			$terms = q("select distinct term from term where uid = %d and ttype = %d order by term asc",
 				intval(local_channel()),

Zotlabs/Widget/Activity_order.php

@@ -54,8 +54,8 @@ class Activity_order {
 			}
 		}
 
-		// override order for search, filer and cid results
-		if(x($_GET,'search') || x($_GET,'file') || (! x($_GET,'pf') && x($_GET,'cid')) || x($_GET,'verb') || x($_GET,'tag') || x($_GET,'cat')) {
+		// override order for some filter results
+		if(x($_GET,'search') || x($_GET,'file') || (! x($_GET,'pf') && x($_GET,'cid')) || x($_GET,'verb') || x($_GET,'tag') || x($_GET,'cat')  || x($_GET,'conv') || x($_GET,'unseen')) {
 			$unthreaded_active = 'active';
 			$commentord_active = $postord_active = 'disabled';
 		}

Zotlabs/Widget/Wiki_list.php

@@ -6,10 +6,6 @@ class Wiki_list {
 
 	function widget($arr) {
 
-		if(argc() < 3) {
-			return;
-		}
-
 		$channel = channelx_by_n(\App::$profile_uid);
 
 		$wikis = \Zotlabs\Lib\NativeWiki::listwikis($channel,get_observer_hash());

Zotlabs/Widget/Wiki_pages.php

@@ -61,8 +61,6 @@ class Wiki_pages {
 
 		$wikiname = '';
 
-		$wikiname = '';
-
 		$pages = array();
 
 		$p = \Zotlabs\Lib\NativeWikiPage::page_list($arr['channel_id'],get_observer_hash(),$arr['resource_id']);

boot.php

@@ -50,11 +50,10 @@ require_once('include/attach.php');
 require_once('include/bbcode.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '3.8' );
+define ( 'STD_VERSION',             '3.8.5' );
 define ( 'ZOT_REVISION',            '6.0a' );
 
-
-define ( 'DB_UPDATE_VERSION',       1224 );
+define ( 'DB_UPDATE_VERSION',       1225 );
 
 define ( 'PROJECT_BASE',   __DIR__ );
 

composer.json

@@ -39,7 +39,8 @@
 		"lukasreschke/id3parser": "^0.0.1",
 		"smarty/smarty": "~3.1",
 		"ramsey/uuid": "^3.8",
-		"twbs/bootstrap": "4.1.3"
+		"twbs/bootstrap": "4.1.3",
+		"blueimp/jquery-file-upload": "^9.25"
 	},
 	"require-dev" : {
 		"phpunit/phpunit" : "@stable",

composer.lock

@@ -4,8 +4,63 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b7862124a9afe837c7eef8ee66f02ff4",
+    "content-hash": "63d0e52cc07f8113059ec30d3637b850",
     "packages": [
+        {
+            "name": "blueimp/jquery-file-upload",
+            "version": "v9.25.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/vkhramtsov/jQuery-File-Upload.git",
+                "reference": "28891f9b2bc339bcc1ca8d548e5401e8563bf04b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/vkhramtsov/jQuery-File-Upload/zipball/28891f9b2bc339bcc1ca8d548e5401e8563bf04b",
+                "reference": "28891f9b2bc339bcc1ca8d548e5401e8563bf04b",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "server/php/UploadHandler.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Tschan",
+                    "homepage": "https://blueimp.net"
+                }
+            ],
+            "description": "File Upload widget for jQuery.",
+            "homepage": "https://github.com/blueimp/jQuery-File-Upload",
+            "keywords": [
+                "bootstrap",
+                "chunk",
+                "cross-domain",
+                "cross-site",
+                "drag",
+                "drop",
+                "file",
+                "gae",
+                "go",
+                "jquery",
+                "multiple",
+                "php",
+                "preview",
+                "progress",
+                "python",
+                "resume",
+                "selection",
+                "upload",
+                "widget"
+            ],
+            "time": "2018-10-26T07:21:48+00:00"
+        },
         {
             "name": "bshaffer/oauth2-server-php",
             "version": "v1.10.0",
@@ -157,16 +212,16 @@
         },
         {
             "name": "league/html-to-markdown",
-            "version": "4.7.0",
+            "version": "4.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/html-to-markdown.git",
-                "reference": "76c076483cef89860d32a3fd25312f5a42848a8c"
+                "reference": "f9a879a068c68ff47b722de63f58bec79e448f9d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/76c076483cef89860d32a3fd25312f5a42848a8c",
-                "reference": "76c076483cef89860d32a3fd25312f5a42848a8c",
+                "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/f9a879a068c68ff47b722de63f58bec79e448f9d",
+                "reference": "f9a879a068c68ff47b722de63f58bec79e448f9d",
                 "shasum": ""
             },
             "require": {
@@ -185,7 +240,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.8-dev"
+                    "dev-master": "4.9-dev"
                 }
             },
             "autoload": {
@@ -198,17 +253,17 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Colin O'Dell",
-                    "email": "colinodell@gmail.com",
-                    "homepage": "http://www.colinodell.com",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Nick Cernis",
                     "email": "nick@cern.is",
                     "homepage": "http://modernnerd.net",
                     "role": "Original Author"
+                },
+                {
+                    "name": "Colin O'Dell",
+                    "email": "colinodell@gmail.com",
+                    "homepage": "https://www.colinodell.com",
+                    "role": "Lead Developer"
                 }
             ],
             "description": "An HTML-to-markdown conversion helper for PHP",
@@ -217,7 +272,7 @@
                 "html",
                 "markdown"
             ],
-            "time": "2018-05-19T23:47:12+00:00"
+            "time": "2018-09-18T12:18:08+00:00"
         },
         {
             "name": "lukasreschke/id3parser",
@@ -520,16 +575,16 @@
         },
         {
             "name": "sabre/dav",
-            "version": "3.2.2",
+            "version": "3.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabre-io/dav.git",
-                "reference": "e987775e619728f12205606c9cc3ee565ffb1516"
+                "reference": "a9780ce4f35560ecbd0af524ad32d9d2c8954b80"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabre-io/dav/zipball/e987775e619728f12205606c9cc3ee565ffb1516",
-                "reference": "e987775e619728f12205606c9cc3ee565ffb1516",
+                "url": "https://api.github.com/repos/sabre-io/dav/zipball/a9780ce4f35560ecbd0af524ad32d9d2c8954b80",
+                "reference": "a9780ce4f35560ecbd0af524ad32d9d2c8954b80",
                 "shasum": ""
             },
             "require": {
@@ -599,7 +654,7 @@
                 "framework",
                 "iCalendar"
             ],
-            "time": "2017-02-15T03:06:08+00:00"
+            "time": "2018-10-19T09:58:27+00:00"
         },
         {
             "name": "sabre/event",
@@ -1002,16 +1057,16 @@
         },
         {
             "name": "smarty/smarty",
-            "version": "v3.1.32",
+            "version": "v3.1.33",
             "source": {
                 "type": "git",
                 "url": "https://github.com/smarty-php/smarty.git",
-                "reference": "ac9d4b587e5bf53381e21881820a9830765cb459"
+                "reference": "dd55b23121e55a3b4f1af90a707a6c4e5969530f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/ac9d4b587e5bf53381e21881820a9830765cb459",
-                "reference": "ac9d4b587e5bf53381e21881820a9830765cb459",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/dd55b23121e55a3b4f1af90a707a6c4e5969530f",
+                "reference": "dd55b23121e55a3b4f1af90a707a6c4e5969530f",
                 "shasum": ""
             },
             "require": {
@@ -1051,7 +1106,7 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2018-04-24T14:53:33+00:00"
+            "time": "2018-09-12T20:54:16+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -2160,16 +2215,16 @@
         },
         {
             "name": "php-mock/php-mock-phpunit",
-            "version": "2.1.1",
+            "version": "2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-mock/php-mock-phpunit.git",
-                "reference": "ff1cc1d4e7478ce74221e05742588619bee84f69"
+                "reference": "57b92e621f14c2c07a4567cd29ed4e87de0d2912"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-mock/php-mock-phpunit/zipball/ff1cc1d4e7478ce74221e05742588619bee84f69",
-                "reference": "ff1cc1d4e7478ce74221e05742588619bee84f69",
+                "url": "https://api.github.com/repos/php-mock/php-mock-phpunit/zipball/57b92e621f14c2c07a4567cd29ed4e87de0d2912",
+                "reference": "57b92e621f14c2c07a4567cd29ed4e87de0d2912",
                 "shasum": ""
             },
             "require": {
@@ -2210,7 +2265,7 @@
                 "test",
                 "test double"
             ],
-            "time": "2018-04-06T13:54:43+00:00"
+            "time": "2018-10-07T14:38:37+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -2481,16 +2536,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "6.0.7",
+            "version": "6.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "865662550c384bc1db7e51d29aeda1c2c161d69a"
+                "reference": "4d3ae9b21a7d7e440bd0cf65565533117976859f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/865662550c384bc1db7e51d29aeda1c2c161d69a",
-                "reference": "865662550c384bc1db7e51d29aeda1c2c161d69a",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4d3ae9b21a7d7e440bd0cf65565533117976859f",
+                "reference": "4d3ae9b21a7d7e440bd0cf65565533117976859f",
                 "shasum": ""
             },
             "require": {
@@ -2501,7 +2556,7 @@
                 "phpunit/php-text-template": "^1.2.1",
                 "phpunit/php-token-stream": "^3.0",
                 "sebastian/code-unit-reverse-lookup": "^1.0.1",
-                "sebastian/environment": "^3.1",
+                "sebastian/environment": "^3.1 || ^4.0",
                 "sebastian/version": "^2.0.1",
                 "theseer/tokenizer": "^1.1"
             },
@@ -2514,7 +2569,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.0-dev"
+                    "dev-master": "6.1-dev"
                 }
             },
             "autoload": {
@@ -2540,25 +2595,28 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2018-06-01T07:51:50+00:00"
+            "time": "2018-10-23T05:59:32+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "2.0.1",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "cecbc684605bb0cc288828eb5d65d93d5c676d3c"
+                "reference": "050bedf145a257b1ff02746c31894800e5122946"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cecbc684605bb0cc288828eb5d65d93d5c676d3c",
-                "reference": "cecbc684605bb0cc288828eb5d65d93d5c676d3c",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946",
+                "reference": "050bedf145a257b1ff02746c31894800e5122946",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1"
             },
+            "require-dev": {
+                "phpunit/phpunit": "^7.1"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -2587,7 +2645,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2018-06-11T11:44:00+00:00"
+            "time": "2018-09-13T20:33:42+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -2681,16 +2739,16 @@
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "3.0.0",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace"
+                "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/21ad88bbba7c3d93530d93994e0a33cd45f02ace",
-                "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c99e3be9d3e85f60646f152f9002d46ed7770d18",
+                "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18",
                 "shasum": ""
             },
             "require": {
@@ -2726,20 +2784,20 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2018-02-01T13:16:43+00:00"
+            "time": "2018-10-30T05:52:18+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "7.3.2",
+            "version": "7.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "34705f81bddc3f505b9599a2ef96e2b4315ba9b8"
+                "reference": "c151651fb6ed264038d486ea262e243af72e5e64"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/34705f81bddc3f505b9599a2ef96e2b4315ba9b8",
-                "reference": "34705f81bddc3f505b9599a2ef96e2b4315ba9b8",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c151651fb6ed264038d486ea262e243af72e5e64",
+                "reference": "c151651fb6ed264038d486ea262e243af72e5e64",
                 "shasum": ""
             },
             "require": {
@@ -2760,11 +2818,11 @@
                 "phpunit/php-timer": "^2.0",
                 "sebastian/comparator": "^3.0",
                 "sebastian/diff": "^3.0",
-                "sebastian/environment": "^3.1",
+                "sebastian/environment": "^3.1 || ^4.0",
                 "sebastian/exporter": "^3.1",
                 "sebastian/global-state": "^2.0",
                 "sebastian/object-enumerator": "^3.0.3",
-                "sebastian/resource-operations": "^1.0",
+                "sebastian/resource-operations": "^2.0",
                 "sebastian/version": "^2.0.1"
             },
             "conflict": {
@@ -2784,7 +2842,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "7.3-dev"
+                    "dev-master": "7.4-dev"
                 }
             },
             "autoload": {
@@ -2810,7 +2868,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2018-08-22T06:39:21+00:00"
+            "time": "2018-10-23T05:57:41+00:00"
         },
         {
             "name": "psr/container",
@@ -3391,25 +3449,25 @@
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "1.0.0",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
+                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6.0"
+                "php": "^7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -3429,7 +3487,7 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2015-07-28T20:34:47+00:00"
+            "time": "2018-10-04T04:07:39+00:00"
         },
         {
             "name": "sebastian/version",
@@ -3476,7 +3534,7 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v4.1.4",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
@@ -3533,16 +3591,16 @@
         },
         {
             "name": "symfony/class-loader",
-            "version": "v3.4.15",
+            "version": "v3.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/class-loader.git",
-                "reference": "31db283fc86d3143e7ff87e922177b457d909c30"
+                "reference": "f31333bdff54c7595f834d510a6d2325573ddb36"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/class-loader/zipball/31db283fc86d3143e7ff87e922177b457d909c30",
-                "reference": "31db283fc86d3143e7ff87e922177b457d909c30",
+                "url": "https://api.github.com/repos/symfony/class-loader/zipball/f31333bdff54c7595f834d510a6d2325573ddb36",
+                "reference": "f31333bdff54c7595f834d510a6d2325573ddb36",
                 "shasum": ""
             },
             "require": {
@@ -3585,20 +3643,20 @@
             ],
             "description": "Symfony ClassLoader Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T11:19:56+00:00"
+            "time": "2018-10-02T12:28:39+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v4.1.4",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "76015a3cc372b14d00040ff58e18e29f69eba717"
+                "reference": "b3d4d7b567d7a49e6dfafb6d4760abc921177c96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/76015a3cc372b14d00040ff58e18e29f69eba717",
-                "reference": "76015a3cc372b14d00040ff58e18e29f69eba717",
+                "url": "https://api.github.com/repos/symfony/config/zipball/b3d4d7b567d7a49e6dfafb6d4760abc921177c96",
+                "reference": "b3d4d7b567d7a49e6dfafb6d4760abc921177c96",
                 "shasum": ""
             },
             "require": {
@@ -3648,20 +3706,20 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2018-08-08T06:37:38+00:00"
+            "time": "2018-09-08T13:24:10+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v4.1.4",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "ca80b8ced97cf07390078b29773dc384c39eee1f"
+                "reference": "dc7122fe5f6113cfaba3b3de575d31112c9aa60b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/ca80b8ced97cf07390078b29773dc384c39eee1f",
-                "reference": "ca80b8ced97cf07390078b29773dc384c39eee1f",
+                "url": "https://api.github.com/repos/symfony/console/zipball/dc7122fe5f6113cfaba3b3de575d31112c9aa60b",
+                "reference": "dc7122fe5f6113cfaba3b3de575d31112c9aa60b",
                 "shasum": ""
             },
             "require": {
@@ -3716,20 +3774,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T11:24:31+00:00"
+            "time": "2018-10-03T08:15:46+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v3.4.15",
+            "version": "v3.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "edda5a6155000ff8c3a3f85ee5c421af93cca416"
+                "reference": "3503415d4aafabc31cd08c3a4ebac7f43fde8feb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/edda5a6155000ff8c3a3f85ee5c421af93cca416",
-                "reference": "edda5a6155000ff8c3a3f85ee5c421af93cca416",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/3503415d4aafabc31cd08c3a4ebac7f43fde8feb",
+                "reference": "3503415d4aafabc31cd08c3a4ebac7f43fde8feb",
                 "shasum": ""
             },
             "require": {
@@ -3769,20 +3827,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T09:06:28+00:00"
+            "time": "2018-10-02T16:33:53+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v4.1.4",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "bae4983003c9d451e278504d7d9b9d7fc1846873"
+                "reference": "f6b9d893ad28aefd8942dc0469c8397e2216fe30"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/bae4983003c9d451e278504d7d9b9d7fc1846873",
-                "reference": "bae4983003c9d451e278504d7d9b9d7fc1846873",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f6b9d893ad28aefd8942dc0469c8397e2216fe30",
+                "reference": "f6b9d893ad28aefd8942dc0469c8397e2216fe30",
                 "shasum": ""
             },
             "require": {
@@ -3840,20 +3898,20 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2018-08-08T11:48:58+00:00"
+            "time": "2018-10-02T12:40:59+00:00"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v4.1.4",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "1c4519d257e652404c3aa550207ccd8ada66b38e"
+                "reference": "80e60271bb288de2a2259662cff125cff4f93f95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/1c4519d257e652404c3aa550207ccd8ada66b38e",
-                "reference": "1c4519d257e652404c3aa550207ccd8ada66b38e",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/80e60271bb288de2a2259662cff125cff4f93f95",
+                "reference": "80e60271bb288de2a2259662cff125cff4f93f95",
                 "shasum": ""
             },
             "require": {
@@ -3897,11 +3955,11 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T11:00:49+00:00"
+            "time": "2018-10-02T12:40:59+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.1.4",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
@@ -3964,16 +4022,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v4.1.4",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e"
+                "reference": "596d12b40624055c300c8b619755b748ca5cf0b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e",
-                "reference": "c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/596d12b40624055c300c8b619755b748ca5cf0b5",
+                "reference": "596d12b40624055c300c8b619755b748ca5cf0b5",
                 "shasum": ""
             },
             "require": {
@@ -4010,7 +4068,7 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2018-08-18T16:52:46+00:00"
+            "time": "2018-10-02T12:40:59+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -4073,16 +4131,16 @@
         },
         {
             "name": "symfony/translation",
-            "version": "v4.1.4",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "fa2182669f7983b7aa5f1a770d053f79f0ef144f"
+                "reference": "9f0b61e339160a466ebcde167a6c5521c810e304"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/fa2182669f7983b7aa5f1a770d053f79f0ef144f",
-                "reference": "fa2182669f7983b7aa5f1a770d053f79f0ef144f",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/9f0b61e339160a466ebcde167a6c5521c810e304",
+                "reference": "9f0b61e339160a466ebcde167a6c5521c810e304",
                 "shasum": ""
             },
             "require": {
@@ -4138,20 +4196,20 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2018-08-07T12:45:11+00:00"
+            "time": "2018-10-02T16:36:10+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v4.1.4",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "b832cc289608b6d305f62149df91529a2ab3c314"
+                "reference": "367e689b2fdc19965be435337b50bc8adf2746c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/b832cc289608b6d305f62149df91529a2ab3c314",
-                "reference": "b832cc289608b6d305f62149df91529a2ab3c314",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/367e689b2fdc19965be435337b50bc8adf2746c9",
+                "reference": "367e689b2fdc19965be435337b50bc8adf2746c9",
                 "shasum": ""
             },
             "require": {
@@ -4197,7 +4255,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2018-08-18T16:52:46+00:00"
+            "time": "2018-10-02T16:36:10+00:00"
         },
         {
             "name": "theseer/tokenizer",

include/bbcode.php

@@ -1198,24 +1198,24 @@ function bbcode($Text, $options = []) {
 	// Images
 	// [img]pathtoimage[/img]
 	if (strpos($Text,'[/img]') !== false) {
-		$Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img style="max-width=100%;" src="$1" alt="' . t('Image/photo') . '" />', $Text);
+		$Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img style="max-width: 100%;" src="$1" alt="' . t('Image/photo') . '" />', $Text);
 	}
 	if (strpos($Text,'[/zmg]') !== false) {
-		$Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '<img class="zrl" style="max-width=100%;" src="$1" alt="' . t('Image/photo') . '" />', $Text);
+		$Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '<img class="zrl" style="max-width: 100%;" src="$1" alt="' . t('Image/photo') . '" />', $Text);
 	}
 
 	// [img float={left, right}]pathtoimage[/img]
 	if (strpos($Text,'[/img]') !== false) {
-		$Text = preg_replace("/\[img float=left\](.*?)\[\/img\]/ism", '<img style="max-width=100%;" src="$1" style="float: left;" alt="' . t('Image/photo') . '" />', $Text);
+		$Text = preg_replace("/\[img float=left\](.*?)\[\/img\]/ism", '<img src="$1" style="max-width: 100%; float: left;" alt="' . t('Image/photo') . '" />', $Text);
 	}
 	if (strpos($Text,'[/img]') !== false) {
-		$Text = preg_replace("/\[img float=right\](.*?)\[\/img\]/ism", '<img style="max-width=100%;" src="$1" style="float: right;" alt="' . t('Image/photo') . '" />', $Text);
+		$Text = preg_replace("/\[img float=right\](.*?)\[\/img\]/ism", '<img src="$1" style="max-width: 100%; float: right;" alt="' . t('Image/photo') . '" />', $Text);
 	}
 	if (strpos($Text,'[/zmg]') !== false) {
-		$Text = preg_replace("/\[zmg float=left\](.*?)\[\/zmg\]/ism", '<img style="max-width=100%;" class="zrl" src="$1" style="float: left;" alt="' . t('Image/photo') . '" />', $Text);
+		$Text = preg_replace("/\[zmg float=left\](.*?)\[\/zmg\]/ism", '<img class="zrl" src="$1" style="max-width: 100%; float: left;" alt="' . t('Image/photo') . '" />', $Text);
 	}
 	if (strpos($Text,'[/zmg]') !== false) {
-		$Text = preg_replace("/\[zmg float=right\](.*?)\[\/zmg\]/ism", '<img style="max-width=100%;" class="zrl" src="$1" style="float: right;" alt="' . t('Image/photo') . '" />', $Text);
+		$Text = preg_replace("/\[zmg float=right\](.*?)\[\/zmg\]/ism", '<img class="zrl" src="$1" style="max-width: 100%; float: right;" alt="' . t('Image/photo') . '" />', $Text);
 	}
 
 	// [img=widthxheight]pathtoimage[/img]

include/config.php

@@ -59,8 +59,8 @@ function set_pconfig($uid, $family, $key, $value) {
 	return Zlib\PConfig::Set($uid,$family,$key,$value);
 }
 
-function del_pconfig($uid, $family, $key) {
-	return Zlib\PConfig::Delete($uid,$family,$key);
+function del_pconfig($uid, $family, $key, $updated = NULL) {
+	return Zlib\PConfig::Delete($uid,$family,$key,$updated);
 }
 
 function load_xconfig($xchan) {

include/connections.php

@@ -379,8 +379,6 @@ function contact_remove($channel_id, $abook_id) {
 		intval($channel_id)
 	);
 	if($r) {
-		$r = fetch_post_tags($r,true);
-
 		foreach($r as $rr) {
 			$x = q("select uid from term where otype = %d and oid = %d and ttype = %d limit 1",
 				intval(TERM_OBJ_POST),

include/dba/dba_driver.php

@@ -173,14 +173,14 @@ abstract class dba_driver {
 			return false;
 		}
 
-		if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1') && (! strpbrk($server,':;'))) {
-			if(! z_dns_check($server)) {
-				$this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server);
-				$this->connected = false;
-				$this->db = null;
-				return false;
-			}
-		}
+		// if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1') && (! strpbrk($server,':;'))) {
+		// 	if(! z_dns_check($server)) {
+		// 		$this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server);
+		// 		$this->connected = false;
+		// 		$this->db = null;
+		// 		return false;
+		// 	}
+		// }
 
 		return true;
 	}
@@ -468,7 +468,7 @@ function db_columns($table) {
 		if(ACTIVE_DBTYPE === DBTYPE_POSTGRES) {
 			$r = q("SELECT column_name as field FROM information_schema.columns WHERE table_schema = 'public' AND table_name = '%s'",
 				dbesc($table)
-			); 
+			);
 			if($r) {
 				return ids_to_array($r,'field');
 			}
@@ -484,4 +484,4 @@ function db_columns($table) {
 	}
 
 	return [];
-}
+}

include/hubloc.php

@@ -186,31 +186,30 @@ function hubloc_change_primary($hubloc) {
 		logger('no hubloc');
 		return false;
 	}
+
+	logger('setting primary: ' . $hubloc['hubloc_url'] . ((intval($hubloc['hubloc_primary'])) ? '  true' : ' false'));
+
+	// See if this is a local hubloc and if so update the primary for the corresponding channel record. 
+
+	if($hubloc['hubloc_url'] === z_root()) {
+		$r = q("select channel_id from channel where channel_hash = '%s' limit 1",
+			dbesc($hubloc['hubloc_hash'])
+		);
+		if($r) {
+			q("update channel set channel_primary = %d where channel_id = %d",
+				intval($hubloc['hubloc_primary']),
+				intval($r[0]['channel_id'])
+			);
+		}
+	}
+
+	// we only need to proceed further if this particular hubloc is now primary 
+
 	if(! (intval($hubloc['hubloc_primary']))) {
 		logger('not primary: ' . $hubloc['hubloc_url']);
 		return false;
 	}
 
-	logger('setting primary: ' . $hubloc['hubloc_url']);
-
-	// See if there's a local channel
-
-	$r = q("select channel_id, channel_primary from channel where channel_hash = '%s' limit 1",
-		dbesc($hubloc['hubloc_hash'])
-	);
-	if($r) {
-		if(! $r[0]['channel_primary']) {
-			q("update channel set channel_primary = 1 where channel_id = %d",
-				intval($r[0]['channel_id'])
-			);
-		}
-		else {
-			q("update channel set channel_primary = 0 where channel_id = %d",
-				intval($r[0]['channel_id'])
-			);
-		}
-	}
-
 	// do we even have an xchan for this hubloc and if so is it already set as primary?
 
 	$r = q("select * from xchan where xchan_hash = '%s' limit 1",

include/import.php

@@ -93,8 +93,7 @@ function import_channel($channel, $account_id, $seize, $newname = '') {
 		'channel_w_comment',  'channel_w_mail',      'channel_w_like',    'channel_w_tagwall',
 		'channel_w_chat',     'channel_w_storage',   'channel_w_pages',   'channel_a_republish',
 		'channel_a_delegate', 'perm_limits',         'channel_password',  'channel_salt',
-		'channel_moved',      'channel_primary',     'channel_removed',   'channel_deleted',
-		'channel_system'
+		'channel_moved',      'channel_removed',     'channel_deleted',   'channel_system'
 	];
 
 	$clean = array();
@@ -168,7 +167,6 @@ function import_profiles($channel, $profiles) {
 			unset($profile['id']);
 			$profile['aid'] = get_account_id();
 			$profile['uid'] = $channel['channel_id'];
-			unset($profile['profile_vcard']);
 
 			convert_oldfields($profile,'name','fullname');
 			convert_oldfields($profile,'with','partner');

include/items.php

@@ -608,8 +608,6 @@ function get_item_elements($x,$allow_code = false) {
 	$arr['created']      = datetime_convert('UTC','UTC',$x['created']);
 	$arr['edited']       = datetime_convert('UTC','UTC',$x['edited']);
 
-	if($arr['created'] > datetime_convert())
-		$arr['created']  = datetime_convert();
 	if($arr['edited'] > datetime_convert())
 		$arr['edited']   = datetime_convert();
 
@@ -2150,6 +2148,7 @@ function item_store_update($arr, $allow_exec = false, $deliver = true) {
 	unset($arr['created']);
 	unset($arr['author_xchan']);
 	unset($arr['owner_xchan']);
+	unset($arr['source_xchan']);
 	unset($arr['thr_parent']);
 	unset($arr['llink']);
 
@@ -2514,7 +2513,7 @@ function tag_deliver($uid, $item_id) {
 		// Just start the second delivery chain to deliver the updated post
 		// after resetting ownership and permission bits
 		logger('updating edited tag_deliver post for ' . $u[0]['channel_address']);
-		start_delivery_chain($u[0], $item, $item_id, 0);
+		start_delivery_chain($u[0], $item, $item_id, 0, true);
 		return;
 	}
 
@@ -2941,7 +2940,7 @@ function tgroup_check($uid, $item) {
  * @param int $item_id
  * @param boolean $parent
  */
-function start_delivery_chain($channel, $item, $item_id, $parent) {
+function start_delivery_chain($channel, $item, $item_id, $parent, $edit = false) {
 
 	$sourced = check_item_source($channel['channel_id'],$item);
 
@@ -2950,7 +2949,7 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
 			intval($channel['channel_id']),
 			dbesc(($item['source_xchan']) ?  $item['source_xchan'] : $item['owner_xchan'])
 		);
-		if($r) {
+		if($r && ! $edit) {
 			$t = trim($r[0]['src_tag']);
 			if($t) {
 				$tags = explode(',',$t);
@@ -3017,9 +3016,17 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
 	}
 	else {
 		$item_uplink = 1;
-		$r = q("update item set source_xchan = owner_xchan where id = %d",
-			intval($item_id)
-		);
+
+		// if this is an edit, item_store_update() will have already updated the item
+		// with the correct value for source_xchan (by ignoring it). We cannot set to owner_xchan
+		// in this case because owner_xchan will point to the parent of this chain
+		// and not the original sender.
+
+		if(! $edit) {
+			$r = q("update item set source_xchan = owner_xchan where id = %d",
+				intval($item_id)
+			);
+		}
 	}
 
 	$title = $item['title'];

include/markdown.php

@@ -248,20 +248,12 @@ function bb_to_markdown($Text, $options = []) {
 	// Convert it to HTML - don't try oembed
 	$Text = bbcode($Text, [ 'tryoembed' => false ]);
 
-	// Markdownify does not preserve previously escaped html entities such as <> and &.
-	//$Text = str_replace(array('&lt;','&gt;','&amp;'),array('&_lt_;','&_gt_;','&_amp_;'),$Text);
-
 	// Now convert HTML to Markdown
-
 	$Text = html2markdown($Text);
 
 	//html2markdown adds backslashes infront of hashes after a new line. remove them
 	$Text = str_replace("\n\#", "\n#", $Text);
 
-	// It also adds backslashes to our attempt at getting around the html entity preservation for some weird reason.
-
-	//$Text = str_replace(array('&\\_lt\\_;','&\\_gt\\_;','&\\_amp\\_;'),array('&lt;','&gt;','&amp;'),$Text);
-
 	// If the text going into bbcode() has a plain URL in it, i.e.
 	// with no [url] tags around it, it will come out of parseString()
 	// looking like: <http://url.com>, which gets removed by strip_tags().
@@ -291,12 +283,24 @@ function bb_to_markdown($Text, $options = []) {
  * If the HTML text can not get parsed it will return an empty string.
  *
  * @param string $html The HTML code to convert
+ * @param array $options an array of options to pass to the environment
  * @return string Markdown representation of the given HTML text, empty on error
  */
-function html2markdown($html,$options = []) {
+function html2markdown($html, $options = []) {
 	$markdown = '';
 
-	$internal_errors = libxml_use_internal_errors(true);
+	if(! $options) {
+		$options = [
+			'header_style' => 'setext', // Set to 'atx' to output H1 and H2 headers as # Header1 and ## Header2
+			'suppress_errors' => true, // Set to false to show warnings when loading malformed HTML
+			'strip_tags' => false, // Set to true to strip tags that don't have markdown equivalents. N.B. Strips tags, not their content. Useful to clean MS Word HTML output.
+			'bold_style' => '**', // DEPRECATED: Set to '__' if you prefer the underlined style
+			'italic_style' => '*', // DEPRECATED: Set to '_' if you prefer the underlined style
+			'remove_nodes' => '', // space-separated list of dom nodes that should be removed. example: 'meta style script'
+			'hard_break' => false, // Set to true to turn <br> into `\n` instead of `  \n`
+			'list_item_style' => '-', // Set the default character for each <li> in a <ul>. Can be '-', '*', or '+'
+		];
+	}
 
 	$environment = Environment::createDefaultEnvironment($options);
 	$environment->addConverter(new TableConverter());
@@ -308,8 +312,6 @@ function html2markdown($html,$options = []) {
 		logger("Invalid HTML. HTMLToMarkdown library threw an exception.");
 	}
 
-	libxml_use_internal_errors($internal_errors);
-
 	return $markdown;
 }
 

include/nav.php

@@ -224,7 +224,6 @@ function nav($template = 'default') {
 
 	//app bin
 	if($is_owner) {
-		//daily system apps import
 		if(get_pconfig(local_channel(), 'system','import_system_apps') !== datetime_convert('UTC','UTC','now','Y-m-d')) {
 			Apps::import_system_apps();
 			set_pconfig(local_channel(), 'system','import_system_apps', datetime_convert('UTC','UTC','now','Y-m-d'));

include/network.php

@@ -233,7 +233,7 @@ function z_post_url($url, $params, $redirects = 0, $opts = array()) {
 		return $ret;
 
 	if(! array_key_exists('request_target',$opts)) {
-		$opts['request_target'] = 'get ' . get_request_string($url);
+		$opts['request_target'] = 'post ' . get_request_string($url);
 	}
 
 	@curl_setopt($ch, CURLOPT_HEADER, true);
@@ -711,9 +711,9 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
 		foreach($matches as $mtch) {
 			logger('data: ' . $mtch[2] . ' ' . $mtch[3]);
 
-			if(substr($mtch[1],0,1) == '=') {
+			if(substr($mtch[2],0,1) == '=') {
 				$owidth = intval(substr($mtch[2],1));
-				if(intval($owidth) > 0 && intval($owidth) < 1024)
+				if($owidth > 0 && $owidth < 1024)
 					continue;
 			}
 

include/oembed.php

@@ -272,6 +272,7 @@ function oembed_fetch_url($embedurl){
 	}
 
 	$j['embedurl'] = $embedurl;
+	$j['zrl'] = $is_matrix;
 
 	// logger('fetch return: ' . print_r($j,true));
 
@@ -335,7 +336,11 @@ function oembed_format_object($j){
 
 		case "rich": {
 			// not so safe.. 
-			$ret.= $jhtml;
+			if($j['zrl']) {
+			    $ret = ((preg_match('/^<div[^>]+>(.*?)<\/div>$/is',$j['html'],$o)) ? $o[1] : $j['html']);
+			} else {
+			    $ret.= $jhtml;
+			};
 		}; break;
 	}
 

include/photo/photo_driver.php

@@ -350,8 +350,7 @@ abstract class photo_driver {
 		$p['allow_gid'] = (($arr['allow_gid']) ? $arr['allow_gid'] : '');
 		$p['deny_cid'] = (($arr['deny_cid']) ? $arr['deny_cid'] : '');
 		$p['deny_gid'] = (($arr['deny_gid']) ? $arr['deny_gid'] : '');
-		$p['created'] = (($arr['created']) ? $arr['created'] : datetime_convert());
-		$p['edited'] = (($arr['edited']) ? $arr['edited'] : $p['created']);
+		$p['edited'] = (($arr['edited']) ? $arr['edited'] : datetime_convert()); 
 		$p['title'] = (($arr['title']) ? $arr['title'] : '');
 		$p['description'] = (($arr['description']) ? $arr['description'] : '');
 		$p['photo_usage'] = intval($arr['photo_usage']);
@@ -365,13 +364,15 @@ abstract class photo_driver {
 		if(! intval($p['imgscale']))
 			logger('save: ' . print_r($arr,true), LOGGER_DATA);
 
-		$x = q("select id from photo where resource_id = '%s' and uid = %d and xchan = '%s' and imgscale = %d limit 1",
+		$x = q("select id, created from photo where resource_id = '%s' and uid = %d and xchan = '%s' and imgscale = %d limit 1",
 				dbesc($p['resource_id']),
 				intval($p['uid']),
 				dbesc($p['xchan']),
 				intval($p['imgscale'])
 		);
+		
 		if($x) {
+			$p['created'] = (($x['created']) ? $x['created'] : $p['edited']);
 			$r = q("UPDATE photo set
 				aid = %d,
 				uid = %d,
@@ -412,7 +413,7 @@ abstract class photo_driver {
 				intval($p['width']),
 				(intval($p['os_storage']) ? dbescbin($p['os_syspath']) : dbescbin($this->imageString())),
 				intval($p['os_storage']),
-				intval(strlen($this->imageString())),
+				(intval($p['os_storage']) ? @filesize($p['os_syspath']) : strlen($this->imageString())),
 				intval($p['imgscale']),
 				intval($p['photo_usage']),
 				dbesc($p['title']),
@@ -427,6 +428,7 @@ abstract class photo_driver {
 			);
 		}
 		else {
+			$p['created'] = (($arr['created']) ? $arr['created'] : $p['edited']);
 			$r = q("INSERT INTO photo
 				( aid, uid, xchan, resource_id, created, edited, filename, mimetype, album, height, width, content, os_storage, filesize, imgscale, photo_usage, title, description, os_path, display_path, allow_cid, allow_gid, deny_cid, deny_gid )
 				VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
@@ -443,7 +445,7 @@ abstract class photo_driver {
 				intval($p['width']),
 				(intval($p['os_storage']) ? dbescbin($p['os_syspath']) : dbescbin($this->imageString())),
 				intval($p['os_storage']),
-				intval(strlen($this->imageString())),
+				(intval($p['os_storage']) ? @filesize($p['os_syspath']) : strlen($this->imageString())),
 				intval($p['imgscale']),
 				intval($p['photo_usage']),
 				dbesc($p['title']),
@@ -464,11 +466,6 @@ abstract class photo_driver {
 
 
 
-
-
-
-
-
 /**
  * Guess image mimetype from filename or from Content-Type header
  *
@@ -485,11 +482,11 @@ function guess_image_type($filename, $headers = '') {
 		$h = explode("\n",$headers);
 		foreach ($h as $l) {
 			list($k,$v) = array_map("trim", explode(":", trim($l), 2));
-			$hdrs[$k] = $v;
+			$hdrs[strtolower($k)] = $v;
 		}
 		logger('Curl headers: '.var_export($hdrs, true), LOGGER_DEBUG);
-		if (array_key_exists('Content-Type', $hdrs))
-			$type = $hdrs['Content-Type'];
+		if (array_key_exists('content-type', $hdrs))
+			$type = $hdrs['content-type'];
 	}
 	if (is_null($type)){
 
@@ -570,122 +567,166 @@ function delete_thing_photo($url,$ob_hash) {
 
 
 
-function import_xchan_photo($photo,$xchan,$thing = false) {
+/**
+ * @brief fetches an photo from external site and prepares its miniatures.
+ *
+ * @param string $photo
+ *    external URL to fetch base image
+ * @param string $xchan
+ *    channel unique hash
+ * @param boolean $thing
+ *    TRUE if this is a thing URL
+ * @param boolean $force
+ *    TRUE if ignore image modification date check (force fetch)
+ *
+ * @return array of results
+ * * \e string \b 0 => local URL to full image
+ * * \e string \b 1 => local URL to standard thumbnail
+ * * \e string \b 2 => local URL to micro thumbnail
+ * * \e string \b 3 => image type
+ * * \e boolean \b 4 => TRUE if fetch failure
+ * * \e string \b 5 => modification date
+ */
 
-	$flags = (($thing) ? PHOTO_THING : PHOTO_XCHAN);
-	$album = (($thing) ? 'Things' : 'Contact Photos');
+function import_xchan_photo($photo,$xchan,$thing = false,$force = false) {
 
-	logger('import_xchan_photo: updating channel photo from ' . $photo . ' for ' . $xchan, LOGGER_DEBUG);
+        $modified = '';
 
-	if($thing)
-		$hash = photo_new_resource();
-	else {
-		$r = q("select resource_id from photo where xchan = '%s' and photo_usage = %d and imgscale = 4 limit 1",
-			dbesc($xchan),
-			intval(PHOTO_XCHAN)
-		);
-		if($r) {
-			$hash = $r[0]['resource_id'];
-		}
-		else {
-			$hash = photo_new_resource();
-		}
-	}
+        $flags = (($thing) ? PHOTO_THING : PHOTO_XCHAN);
+        $album = (($thing) ? 'Things' : 'Contact Photos');
 
-	$photo_failure = false;
-	$img_str = '';
+        logger('import_xchan_photo: updating channel photo from ' . $photo . ' for ' . $xchan, LOGGER_DEBUG);
 
-	if($photo) {
-		$filename = basename($photo);
+        if($thing) {
+                $hash = photo_new_resource();
+        }
+        else {
+                $r = q("select resource_id, edited, mimetype from photo where xchan = '%s' and photo_usage = %d and imgscale = 4 limit 1",
+                        dbesc($xchan),
+                        intval(PHOTO_XCHAN)
+                );
+                if($r) {
+                        $hash = $r[0]['resource_id'];
+                        $modified = $r[0]['edited'];
+                        $type = $r[0]['mimetype'];
+                }
+                else {
+                        $hash = photo_new_resource();
+                }
+        }
 
-		$result = z_fetch_url($photo,true);
+        $photo_failure = false;
+        $img_str = '';
 
-		if($result['success']) {
-			$img_str = $result['body'];
-			$type = guess_image_type($photo, $result['header']);
+        if($photo) {
+                $filename = basename($photo);
 
-			$h = explode("\n",$result['header']);
-			if($h) {
-				foreach($h as $hl) {
-					if(stristr($hl,'content-type:')) {
-						if(! stristr($hl,'image/')) {
-							$photo_failure = true;
-						}
-					}
-				}
-			}
-		}
-	}
-	else {
-		$photo_failure = true;
-	}
+                if($force || $modified == '') {
+                        $result = z_fetch_url($photo,true);
+                }
+                else {
+                        $h = array('headers' => array("If-Modified-Since: " . gmdate("D, d M Y H:i:s", strtotime($modified . "Z")) . " GMT"));
+                        $result = z_fetch_url($photo,true,0,$h);
+                }
 
-	if(! $photo_failure) {
-		$img = photo_factory($img_str, $type);
-		if($img->is_valid()) {
-			$width = $img->getWidth();
-			$height = $img->getHeight();
-	
-			if($width && $height) {
-				if(($width / $height) > 1.2) {
-					// crop out the sides
-					$margin = $width - $height;
-					$img->cropImage(300,($margin / 2),0,$height,$height);
-				}
-				elseif(($height / $width) > 1.2) {
-					// crop out the bottom
-					$margin = $height - $width;
-					$img->cropImage(300,0,0,$width,$width);
+                if($result['success']) {
+                        $img_str = $result['body'];
+                        $type = guess_image_type($photo, $result['header']);
+                        $modified = gmdate('Y-m-d H:i:s', (preg_match('/last-modified: (.+) \S+/i', $result['header'], $o) ? strtotime($o[1] . 'Z') : time()));
 
-				}
-				else {
-					$img->scaleImageSquare(300);
-				}
+                        if(is_null($type))
+                                $photo_failure = true;
+                }
+                elseif($result['return_code'] == 304) {
+                        $photo = z_root() . '/photo/' . $hash . '-4';
+                        $thumb = z_root() . '/photo/' . $hash . '-5';
+                        $micro = z_root() . '/photo/' . $hash . '-6';
+                }
+                else {
+                        $photo_failure = true;
+                }
 
-			}
-			else 
-				$photo_failure = true;
+        }
+        else
+                $photo_failure = true;
 
-			$p = array('xchan' => $xchan,'resource_id' => $hash, 'filename' => basename($photo), 'album' => $album, 'photo_usage' => $flags, 'imgscale' => 4);
+        if(! $photo_failure && $result['return_code'] != 304) {
+                $img = photo_factory($img_str, $type);
+                if($img->is_valid()) {
+                        $width = $img->getWidth();
+                        $height = $img->getHeight();
 
-			$r = $img->save($p);
+                        if($width && $height) {
+                                if(($width / $height) > 1.2) {
+                                        // crop out the sides
+                                        $margin = $width - $height;
+                                        $img->cropImage(300,($margin / 2),0,$height,$height);
+                                }
+                                elseif(($height / $width) > 1.2) {
+                                        // crop out the bottom
+                                        $margin = $height - $width;
+                                        $img->cropImage(300,0,0,$width,$width);
 
-			if($r === false)
-				$photo_failure = true;
+                                }
+                                else {
+                                        $img->scaleImageSquare(300);
+                                }
 
-			$img->scaleImage(80);
-			$p['imgscale'] = 5;
-	
-			$r = $img->save($p);
+                        }
+                        else
+                                $photo_failure = true;
 
-			if($r === false)
-				$photo_failure = true;
-	
-			$img->scaleImage(48);
-			$p['imgscale'] = 6;
-	
-			$r = $img->save($p);
+                        $p = array(
+							'xchan' => $xchan,
+							'resource_id' => $hash,
+							'filename' => basename($photo),
+							'album' => $album,
+							'photo_usage' => $flags,
+							'imgscale' => 4,
+							'edited' => $modified
+						);
 
-			if($r === false)
-				$photo_failure = true;
+                        $r = $img->save($p);
 
-			$photo = z_root() . '/photo/' . $hash . '-4';
-			$thumb = z_root() . '/photo/' . $hash . '-5';
-			$micro = z_root() . '/photo/' . $hash . '-6';
-		}
-		else {
-			logger('import_xchan_photo: invalid image from ' . $photo);	
-			$photo_failure = true;
-		}
-	}
-	if($photo_failure) {
-		$photo = z_root() . '/' . get_default_profile_photo();
-		$thumb = z_root() . '/' . get_default_profile_photo(80);
-		$micro = z_root() . '/' . get_default_profile_photo(48);
-		$type = 'image/png';
-	}
+                        if($r === false)
+                                $photo_failure = true;
 
-	return(array($photo,$thumb,$micro,$type,$photo_failure));
+                        $img->scaleImage(80);
+                        $p['imgscale'] = 5;
+
+                        $r = $img->save($p);
+
+                        if($r === false)
+                                $photo_failure = true;
+
+                        $img->scaleImage(48);
+                        $p['imgscale'] = 6;
+
+                        $r = $img->save($p);
+
+                        if($r === false)
+                                $photo_failure = true;
+
+                        $photo = z_root() . '/photo/' . $hash . '-4';
+                        $thumb = z_root() . '/photo/' . $hash . '-5';
+                        $micro = z_root() . '/photo/' . $hash . '-6';
+                }
+                else {
+                        logger('import_xchan_photo: invalid image from ' . $photo);
+                        $photo_failure = true;
+                }
+        }
+        if($photo_failure) {
+                $default = get_default_profile_photo();
+                $photo = z_root() . '/' . $default;
+                $thumb = z_root() . '/' . get_default_profile_photo(80);
+                $micro = z_root() . '/' . get_default_profile_photo(48);
+                $type = 'image/png';
+                $modified = gmdate('Y-m-d H:i:s', filemtime($default));
+        }
+
+		logger('HTTP code: ' . $result['return_code'] . '; modified: ' . $modified . '; failure: ' . ($photo_failure ? 'yes' : 'no') . '; URL: ' . $photo, LOGGER_DEBUG);
+        return(array($photo,$thumb,$micro,$type,$photo_failure,$modified));
 
 }
 
@@ -700,16 +741,8 @@ function import_channel_photo_from_url($photo,$aid,$uid) {
 			$img_str = $result['body'];
 			$type = guess_image_type($photo, $result['header']);
 
-			$h = explode("\n",$result['header']);
-			if($h) {
-				foreach($h as $hl) {
-					if(stristr($hl,'content-type:')) {
-						if(! stristr($hl,'image/')) {
-							$photo_failure = true;
-						}
-					}
-				}
-			}
+            if(is_null($type))
+                    $photo_failure = true;
 		}
 	}
 	else {

include/photos.php

@@ -1011,23 +1011,3 @@ function profile_photo_set_profile_perms($uid, $profileid = 0) {
 		}
 	}
 }
-
-function fetch_image_from_url($url,&$mimetype) {
-
-	$redirects = 0;
-	$x = z_fetch_url($url,true,$redirects,[ 'novalidate' => true ]);
-	if($x['success']) {
-		$hdrs = [];
-		$h = explode("\n",$x['header']);
-		foreach ($h as $l) {
-			list($k,$v) = array_map("trim", explode(":", trim($l), 2));
-			$hdrs[strtolower($k)] = $v;
-		}
-		if (array_key_exists('content-type', $hdrs))
-			$mimetype = $hdrs['content-type'];
-
-		return $x['body'];
-	}
-
-	return EMPTY_STR;
-}

include/text.php

@@ -633,6 +633,19 @@ function attribute_contains($attr, $s) {
 	return false;
 }
 
+/**
+ * @brief Log to syslog
+ *
+ * @param string $msg Message to log
+ * @param int $priority - compatible with syslog
+ */
+function hz_syslog($msg, $priority = LOG_INFO) {
+	openlog("hz-log", LOG_PID | LOG_PERROR, LOG_LOCAL0);
+	syslog($priority, $msg);
+	closelog();
+}
+
+
 /**
  * @brief Logging function for Hubzilla.
  *
@@ -3219,8 +3232,16 @@ function create_table_from_array($table, $arr, $binary_fields = []) {
 	if(! ($arr && $table))
 		return false;
 
+	$columns = db_columns($table);
+
 	$clean = [];
 	foreach($arr as $k => $v) {
+
+		if(! in_array($k,$columns)) {
+			continue;
+		}
+
+
 		$matches = false;
 		if(preg_match('/([^a-zA-Z0-9\-\_\.])/',$k,$matches)) {
 			return false;

include/xchan.php

@@ -1,5 +1,7 @@
 <?php
 
+use Zotlabs\Zot6\HTTPSig;
+
 
 function xchan_store_lowlevel($arr) {
 
@@ -39,6 +41,13 @@ function xchan_store_lowlevel($arr) {
 
 function xchan_store($arr) {
 
+	$update_photo = false;
+	$update_name = false;
+
+	if(! ($arr['guid'] || $arr['hash'])) {
+		$arr = json_decode(file_get_contents('php://input'),true);
+	}
+
 	logger('xchan_store: ' . print_r($arr,true));
 
 	if(! $arr['hash'])
@@ -49,57 +58,90 @@ function xchan_store($arr) {
 	$r = q("select * from xchan where xchan_hash = '%s' limit 1",
 		dbesc($arr['hash'])
 	);
-	if($r)
-		return true;
+	if(! $r) {
 
-	if(! $arr['network'])
-		$arr['network'] = 'unknown';
-	if(! $arr['name'])
-		$arr['name'] = 'unknown';
-	if(! $arr['url'])
-		$arr['url'] = z_root();
-	if(! $arr['photo'])
-		$arr['photo'] = z_root() . '/' . get_default_profile_photo();
+		$update_photo = true;
 
+		if(! $arr['network'])
+			$arr['network'] = 'unknown';
+		if(! $arr['name'])
+			$arr['name'] = 'unknown';
+		if(! $arr['url'])
+			$arr['url'] = z_root();
+		if(! $arr['photo'])
+			$arr['photo'] = z_root() . '/' . get_default_profile_photo();
 
-	if($arr['network'] === 'zot') {
-		if((! $arr['key']) || (! rsa_verify($arr['guid'],base64url_decode($arr['guid_sig']),$arr['key']))) {
-			logger('Unable to verify signature for ' . $arr['hash']);
-			return false;
+		if($arr['network'] === 'zot6') {
+			if((! $arr['key']) || (! Libzot::verify($arr['id'],$arr['id_sig'],$arr['key']))) {
+				logger('Unable to verify signature for ' . $arr['hash']);
+				return false;
+			}
 		}
-	}
 
-	$x = [];
-	foreach($arr as $k => $v) {
-		if($k === 'key') {
-			$x['xchan_pubkey'] = $v;
-			continue;
-		}
-		if($k === 'photo') {
-			continue;
+		if($arr['network'] === 'zot') {
+			if((! $arr['key']) || (! rsa_verify($arr['guid'],base64url_decode($arr['guid_sig']),$arr['key']))) {	
+				logger('Unable to verify signature for ' . $arr['hash']);
+				return false;
+			}
 		}
+
+		$columns = db_columns('xchan');
+
+		$x = [];
+		foreach($arr as $k => $v) {
+			if($k === 'key') {
+				$x['xchan_pubkey'] = HTTPSig::convertKey(escape_tags($v));;
+				continue;
+			}
+			if($k === 'photo') {
+				continue;
+			}
 		
-		$x['xchan_' . $k] = $v;
+			if(in_array($columns,'xchan_' . $k))
+				$x['xchan_' . $k] = escape_tags($v);
+		}
+
+		$x['xchan_name_date'] = datetime_convert();
+		$x['xchan_photo_date'] = datetime_convert();
+		$x['xchan_system']     = false;
+
+		$result = xchan_store_lowlevel($x);
+	
+		if(! $result)
+			return $result;
+	}
+	else {
+		if($r[0]['network'] === 'zot6') {
+			return true;
+		}
+		if($r[0]['xchan_photo_date'] < datetime_convert('UTC','UTC',$arr['photo_date'])) {
+			$update_photo = true;
+		}
+		if($r[0]['xchan_name_date'] < datetime_convert('UTC','UTC',$arr['name_date'])) {
+			$update_name = true;
+		}
+    }
+
+	if($update_photo && $arr['photo']) {
+		$photos = import_xchan_photo($arr['photo'],$arr['hash']);
+		$r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s'",
+			dbesc(datetime_convert()),
+			dbesc($photos[0]),
+			dbesc($photos[1]),
+			dbesc($photos[2]),
+			dbesc($photos[3]),
+			dbesc($arr['hash'])
+		);
+	}
+	if($update_name && $arr['name']) {
+		$x = q("update xchan set xchan_name = '%s', xchan_name_date = '%s' where xchan_hash = '%s'",
+			dbesc(escape_tags($arr['name'])),
+			dbesc(datetime_convert()),
+			dbesc($arr['hash'])
+		);
 	}
 
-	$x['xchan_name_date'] = datetime_convert();
-
-	$r = xchan_store_lowlevel($x);
-
-	if(! $r)
-		return $r;
-
-	$photos = import_xchan_photo($arr['photo'],$arr['hash']);
-	$r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s'",
-		dbesc(datetime_convert()),
-		dbesc($photos[0]),
-		dbesc($photos[1]),
-		dbesc($photos[2]),
-		dbesc($photos[3]),
-		dbesc($arr['hash'])
-	);
-	return $r;
-
+	return true;
 }
 
 

include/zot.php

@@ -1187,13 +1187,13 @@ function zot_fetch($arr) {
 
 	$zret = zot6_check_sig();
 
-	if($zret['success'] && $zret['hubloc'] && $zret['hubloc']['hubloc_guid'] === $data['sender']['guid'] && $data['msg']) {
+	if($zret['success'] && $zret['hubloc'] && $zret['hubloc']['hubloc_guid'] === $arr['sender']['guid'] && $arr['msg']) {
 		logger('zot6_delivery',LOGGER_DEBUG);
-		logger('zot6_data: ' . print_r($data,true),LOGGER_DATA);
+		logger('zot6_data: ' . print_r($arr,true),LOGGER_DATA);
 
 		$ret['collected'] = true;
 
-		$import = [ 'success' => true, 'body' => json_encode( [ 'success' => true, 'pickup' => [ [ 'notify' => $data, 'message' => json_decode($data['msg'],true) ] ] ] ) ];
+		$import = [ 'success' => true, 'body' => json_encode( [ 'success' => true, 'pickup' => [ [ 'notify' => $arr, 'message' => json_decode($arr['msg'],true) ] ] ] ) ];
 		$hubs = [ $zret['hubloc'] ] ;
 	}
 
@@ -3507,8 +3507,41 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 
 		if(array_key_exists('config',$arr) && is_array($arr['config']) && count($arr['config'])) {
 			foreach($arr['config'] as $cat => $k) {
-				foreach($arr['config'][$cat] as $k => $v)
-					set_pconfig($channel['channel_id'],$cat,$k,$v);
+
+				$pconfig_updated = [];
+				$pconfig_del = [];
+
+				foreach($arr['config'][$cat] as $k => $v) {
+
+					if (strpos($k,'pcfgud:')===0) {
+
+						$realk = substr($k,7);
+						$pconfig_updated[$realk] = $v;
+						unset($arr['config'][$cat][$k]);
+
+					}
+
+					if (strpos($k,'pcfgdel:')===0) {
+						$realk = substr($k,8);
+						$pconfig_del[$realk] = datetime_convert();
+						unset($arr['config'][$cat][$k]);
+					}
+				}
+
+				foreach($arr['config'][$cat] as $k => $v) {
+
+					if (!isset($pconfig_updated[$k])) {
+						$pconfig_updated[$k] = NULL;
+					}
+
+					set_pconfig($channel['channel_id'],$cat,$k,$v,$pconfig_updated[$k]);
+
+				}
+
+				foreach($pconfig_del as $k => $updated) {
+					del_pconfig($channel['channel_id'],$cat,$k,$updated);
+				}
+
 			}
 		}
 
@@ -4327,7 +4360,7 @@ function zotinfo($arr) {
 	if($role === 'forum' || $role === 'repository') {
 		$public_forum = true;
 	}
-	elseif($ztarget_hash) {
+	else {
 		// check if it has characteristics of a public forum based on custom permissions.
 		$m = \Zotlabs\Access\Permissions::FilledAutoperms($e['channel_id']);
 		if($m) {

install/schema_mysql.sql

@@ -910,7 +910,6 @@ CREATE TABLE IF NOT EXISTS `outq` (
   KEY `outq_priority` (`outq_priority`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
-
 CREATE TABLE IF NOT EXISTS pchan (
   `pchan_id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
   `pchan_guid` char(191) NOT NULL DEFAULT '',
@@ -922,15 +921,16 @@ CREATE TABLE IF NOT EXISTS pchan (
   KEY `pchan_hash` (`pchan_hash`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
-
 CREATE TABLE IF NOT EXISTS `pconfig` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `uid` int(11) NOT NULL DEFAULT 0 ,
   `cat` char(191) NOT NULL DEFAULT '',
   `k` char(191) NOT NULL DEFAULT '',
   `v` mediumtext NOT NULL,
+  `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY (`id`),
-  UNIQUE KEY `access` (`uid`,`cat`,`k`)
+  UNIQUE KEY `access` (`uid`,`cat`,`k`),
+  KEY `pconfig_updated` (`updated`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `photo` (

install/schema_postgres.sql

@@ -1,6 +1,6 @@
 CREATE TABLE "abconfig" (
   "id" serial  NOT NULL,
-  "chan" bigint NOT NULL DEFAULT 0,
+  "chan" bigint NOT NULL DEFAULT '0',
   "xchan" text NOT NULL,
   "cat" text NOT NULL,
   "k" text NOT NULL,
@@ -73,13 +73,13 @@ CREATE TABLE "account" (
   "account_language" varchar(16) NOT NULL DEFAULT 'en',
   "account_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "account_lastlog" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "account_flags" bigint  NOT NULL DEFAULT 0 ,
-  "account_roles" bigint  NOT NULL DEFAULT 0 ,
+  "account_flags" bigint  NOT NULL DEFAULT '0',
+  "account_roles" bigint  NOT NULL DEFAULT '0',
   "account_reset" text NOT NULL DEFAULT '',
   "account_expires" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "account_expire_notified" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "account_service_class" varchar(32) NOT NULL DEFAULT '',
-  "account_level" bigint  NOT NULL DEFAULT 0 ,
+  "account_level" bigint  NOT NULL DEFAULT '0',
   "account_password_changed" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY ("account_id")
 );
@@ -97,11 +97,11 @@ create index "account_password_changed"  on account ("account_password_changed")
 CREATE TABLE "addon" (
   "id" serial NOT NULL,
   "aname" text NOT NULL,
-  "version" text NOT NULL DEFAULT 0 ,
-  "installed" numeric(1) NOT NULL DEFAULT 0 ,
-  "hidden" numeric(1) NOT NULL DEFAULT 0 ,
-  "tstamp" numeric(20) NOT NULL DEFAULT 0 ,
-  "plugin_admin" numeric(1) NOT NULL DEFAULT 0 ,
+  "version" text NOT NULL DEFAULT '0',
+  "installed" numeric(1) NOT NULL DEFAULT '0',
+  "hidden" numeric(1) NOT NULL DEFAULT '0',
+  "tstamp" numeric(20) NOT NULL DEFAULT '0',
+  "plugin_admin" numeric(1) NOT NULL DEFAULT '0',
   PRIMARY KEY ("id")
 );
 create index "addon_hidden_idx" on addon ("hidden");
@@ -117,13 +117,13 @@ CREATE TABLE "app" (
   "app_url" text NOT NULL DEFAULT '',
   "app_photo" text NOT NULL DEFAULT '',
   "app_version" text NOT NULL DEFAULT '',
-  "app_channel" bigint NOT NULL DEFAULT 0 ,
+  "app_channel" bigint NOT NULL DEFAULT '0',
   "app_addr" text NOT NULL DEFAULT '',
   "app_price" text NOT NULL DEFAULT '',
   "app_page" text NOT NULL DEFAULT '',
   "app_requires" text NOT NULL DEFAULT '',
-  "app_deleted" smallint NOT NULL DEFAULT 0 ,
-  "app_system" smallint NOT NULL DEFAULT 0 ,
+  "app_deleted" smallint NOT NULL DEFAULT '0',
+  "app_system" smallint NOT NULL DEFAULT '0',
   "app_plugin" text NOT NULL DEFAULT '',
   "app_options" smallint NOT NULL DEFAULT '0',
   "app_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -159,19 +159,19 @@ create index atoken_expires on atoken (atoken_expires);
 
 CREATE TABLE "attach" (
   "id" serial  NOT NULL,
-  "aid" bigint  NOT NULL DEFAULT 0 ,
-  "uid" bigint  NOT NULL DEFAULT 0 ,
+  "aid" bigint  NOT NULL DEFAULT '0',
+  "uid" bigint  NOT NULL DEFAULT '0',
   "hash" varchar(64) NOT NULL DEFAULT '',
   "creator" varchar(128) NOT NULL DEFAULT '',
   "filename" text NOT NULL DEFAULT '',
   "filetype" varchar(64) NOT NULL DEFAULT '',
-  "filesize" bigint  NOT NULL DEFAULT 0 ,
-  "revision" bigint  NOT NULL DEFAULT 0 ,
+  "filesize" bigint  NOT NULL DEFAULT '0',
+  "revision" bigint  NOT NULL DEFAULT '0',
   "folder" varchar(64) NOT NULL DEFAULT '',
-  "flags" bigint  NOT NULL DEFAULT 0 ,
-  "is_dir" smallint NOT NULL DEFAULT 0 ,
-  "is_photo" smallint NOT NULL DEFAULT 0 ,
-  "os_storage" smallint NOT NULL DEFAULT 0 ,
+  "flags" bigint  NOT NULL DEFAULT '0',
+  "is_dir" smallint NOT NULL DEFAULT '0',
+  "is_photo" smallint NOT NULL DEFAULT '0',
+  "os_storage" smallint NOT NULL DEFAULT '0',
   "os_path" text NOT NULL,
   "display_path" text NOT NULL,
   "content" bytea NOT NULL,
@@ -215,8 +215,8 @@ CREATE TABLE "cache" (
 );
 CREATE TABLE "cal" (
   "cal_id" serial  NOT NULL,
-  "cal_aid" bigint NOT NULL DEFAULT 0 ,
-  "cal_uid" bigint NOT NULL DEFAULT 0 ,
+  "cal_aid" bigint NOT NULL DEFAULT '0',
+  "cal_uid" bigint NOT NULL DEFAULT '0',
   "cal_hash" text NOT NULL,
   "cal_name" text NOT NULL,
   "uri" text NOT NULL,
@@ -224,7 +224,7 @@ CREATE TABLE "cal" (
   "pass" text NOT NULL,
   "ctag" text NOT NULL,
   "synctoken" text NOT NULL,
-  "cal_types" text NOT NULL DEFAULT 0 ,
+  "cal_types" text NOT NULL DEFAULT '0',
   PRIMARY KEY ("cal_id")
 );
 create index "cal_hash_idx" on cal ("cal_hash");
@@ -235,8 +235,8 @@ create index "cal_uid_idx" on cal ("cal_uid");
 
 CREATE TABLE "channel" (
   "channel_id" serial  NOT NULL,
-  "channel_account_id" bigint  NOT NULL DEFAULT 0 ,
-  "channel_primary" numeric(1)  NOT NULL DEFAULT 0 ,
+  "channel_account_id" bigint  NOT NULL DEFAULT '0',
+  "channel_primary" numeric(1)  NOT NULL DEFAULT '0',
   "channel_name" text NOT NULL DEFAULT '',
   "channel_address" text NOT NULL DEFAULT '',
   "channel_guid" text NOT NULL DEFAULT '',
@@ -248,8 +248,8 @@ CREATE TABLE "channel" (
   "channel_startpage" text NOT NULL DEFAULT '',
   "channel_pubkey" text NOT NULL,
   "channel_prvkey" text NOT NULL,
-  "channel_notifyflags" bigint  NOT NULL DEFAULT 65535,
-  "channel_pageflags" bigint  NOT NULL DEFAULT 0 ,
+  "channel_notifyflags" bigint  NOT NULL DEFAULT '65535',
+  "channel_pageflags" bigint  NOT NULL DEFAULT '0',
   "channel_dirdate" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "channel_lastpost" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "channel_deleted" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -294,7 +294,7 @@ create index "channel_system" on channel ("channel_system");
 create index "channel_moved" on channel ("channel_moved");
 CREATE TABLE "chat" (
   "chat_id" serial  NOT NULL,
-  "chat_room" bigint  NOT NULL DEFAULT 0 ,
+  "chat_room" bigint  NOT NULL DEFAULT '0',
   "chat_xchan" text NOT NULL DEFAULT '',
   "chat_text" text NOT NULL,
   "created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -305,7 +305,7 @@ create index "chat_xchan_idx" on chat ("chat_xchan");
 create index "chat_created_idx" on chat ("created");
 CREATE TABLE "chatpresence" (
   "cp_id" serial  NOT NULL,
-  "cp_room" bigint  NOT NULL DEFAULT 0 ,
+  "cp_room" bigint  NOT NULL DEFAULT '0',
   "cp_xchan" text NOT NULL DEFAULT '',
   "cp_last" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "cp_status" text NOT NULL,
@@ -319,12 +319,12 @@ create index "cp_status" on chatpresence ("cp_status");
 
 CREATE TABLE "chatroom" (
   "cr_id" serial  NOT NULL,
-  "cr_aid" bigint  NOT NULL DEFAULT 0 ,
-  "cr_uid" bigint  NOT NULL DEFAULT 0 ,
+  "cr_aid" bigint  NOT NULL DEFAULT '0',
+  "cr_uid" bigint  NOT NULL DEFAULT '0',
   "cr_name" text NOT NULL DEFAULT '',
   "cr_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "cr_edited" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "cr_expire" bigint  NOT NULL DEFAULT 0 ,
+  "cr_expire" bigint  NOT NULL DEFAULT '0',
   "allow_cid" text NOT NULL,
   "allow_gid" text NOT NULL,
   "deny_cid" text NOT NULL,
@@ -343,7 +343,7 @@ CREATE TABLE "clients" (
   "redirect_uri" varchar(200) NOT NULL,
   "clname" text,
   "icon" text,
-  "uid" bigint NOT NULL DEFAULT 0 ,
+  "uid" bigint NOT NULL DEFAULT '0',
   PRIMARY KEY ("client_id")
 );
 CREATE TABLE "config" (
@@ -390,9 +390,9 @@ create index "dreport_channel" on dreport ("dreport_channel");
 
 CREATE TABLE "event" (
   "id" serial NOT NULL,
-  "aid" bigint  NOT NULL DEFAULT 0 ,
+  "aid" bigint  NOT NULL DEFAULT '0',
   "uid" bigint NOT NULL,
-  "cal_id" bigint NOT NULL DEFAULT 0 ,
+  "cal_id" bigint NOT NULL DEFAULT '0',
   "event_xchan" text NOT NULL DEFAULT '',
   "event_hash" text NOT NULL DEFAULT '',
   "created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -403,19 +403,19 @@ CREATE TABLE "event" (
   "description" text NOT NULL,
   "location" text NOT NULL,
   "etype" text NOT NULL,
-  "nofinish" numeric(1) NOT NULL DEFAULT 0 ,
-  "adjust" numeric(1) NOT NULL DEFAULT 1,
-  "dismissed" numeric(1) NOT NULL DEFAULT 0 ,
+  "nofinish" numeric(1) NOT NULL DEFAULT '0',
+  "adjust" numeric(1) NOT NULL DEFAULT '1',
+  "dismissed" numeric(1) NOT NULL DEFAULT '0',
   "allow_cid" text NOT NULL,
   "allow_gid" text NOT NULL,
   "deny_cid" text NOT NULL,
   "deny_gid" text NOT NULL,
   "event_status" varchar(255) NOT NULL DEFAULT '',
   "event_status_date" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "event_percent" smallint NOT NULL DEFAULT 0 ,
+  "event_percent" smallint NOT NULL DEFAULT '0',
   "event_repeat" text NOT NULL,
-  "event_sequence" smallint NOT NULL DEFAULT 0 ,
-  "event_priority" smallint NOT NULL DEFAULT 0 ,
+  "event_sequence" smallint NOT NULL DEFAULT '0',
+  "event_priority" smallint NOT NULL DEFAULT '0',
   "event_vdata" text NOT NULL,
   PRIMARY KEY ("id")
 );
@@ -449,8 +449,8 @@ CREATE TABLE "pgrp" (
   "id" serial  NOT NULL,
   "hash" text NOT NULL DEFAULT '',
   "uid" bigint  NOT NULL,
-  "visible" numeric(1) NOT NULL DEFAULT 0 ,
-  "deleted" numeric(1) NOT NULL DEFAULT 0 ,
+  "visible" numeric(1) NOT NULL DEFAULT '0',
+  "deleted" numeric(1) NOT NULL DEFAULT '0',
   "gname" text NOT NULL,
   PRIMARY KEY ("id")
 
@@ -465,8 +465,8 @@ CREATE TABLE "hook" (
   "hook" text NOT NULL,
   "file" text NOT NULL,
   "fn" text NOT NULL,
-  "priority" smallint  NOT NULL DEFAULT 0 ,
-  "hook_version" smallint NOT NULL DEFAULT 0 ,
+  "priority" smallint  NOT NULL DEFAULT '0',
+  "hook_version" smallint NOT NULL DEFAULT '0',
   PRIMARY KEY ("id")
 
 );
@@ -483,8 +483,8 @@ CREATE TABLE "hubloc" (
   "hubloc_hash" text NOT NULL,
   "hubloc_addr" text NOT NULL DEFAULT '',
   "hubloc_network" text NOT NULL DEFAULT '',
-  "hubloc_flags" bigint  NOT NULL DEFAULT 0 ,
-  "hubloc_status" bigint  NOT NULL DEFAULT 0 ,
+  "hubloc_flags" bigint  NOT NULL DEFAULT '0',
+  "hubloc_status" bigint  NOT NULL DEFAULT '0',
   "hubloc_url" text NOT NULL DEFAULT '',
   "hubloc_url_sig" text NOT NULL DEFAULT '',
   "hubloc_site_id" text NOT NULL DEFAULT '',
@@ -494,10 +494,10 @@ CREATE TABLE "hubloc" (
   "hubloc_sitekey" text NOT NULL DEFAULT '',
   "hubloc_updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "hubloc_connected" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "hubloc_primary" smallint NOT NULL DEFAULT 0 ,
-  "hubloc_orphancheck" smallint NOT NULL DEFAULT 0 ,
-  "hubloc_error" smallint NOT NULL DEFAULT 0 ,
-  "hubloc_deleted" smallint NOT NULL DEFAULT 0 ,
+  "hubloc_primary" smallint NOT NULL DEFAULT '0',
+  "hubloc_orphancheck" smallint NOT NULL DEFAULT '0',
+  "hubloc_error" smallint NOT NULL DEFAULT '0',
+  "hubloc_deleted" smallint NOT NULL DEFAULT '0',
   PRIMARY KEY ("hubloc_id")
 );
 create index "hubloc_url" on hubloc ("hubloc_url");
@@ -518,11 +518,11 @@ create index "hubloc_error" on hubloc ("hubloc_error");
 create index "hubloc_deleted" on hubloc ("hubloc_deleted");
 CREATE TABLE "iconfig" (
   "id" serial NOT NULL,
-  "iid" bigint NOT NULL DEFAULT 0 ,
+  "iid" bigint NOT NULL DEFAULT '0',
   "cat" text NOT NULL DEFAULT '',
   "k" text NOT NULL DEFAULT '',
   "v" text NOT NULL DEFAULT '',
-  "sharing" int NOT NULL DEFAULT 0 ,
+  "sharing" int NOT NULL DEFAULT '0',
   PRIMARY KEY("id")
 );
 create index "iconfig_iid" on iconfig ("iid");
@@ -549,9 +549,9 @@ create index "issue_component" on issue ("issue_component");
 CREATE TABLE "item" (
   "id" serial  NOT NULL,
   "mid" text  NOT NULL DEFAULT '',
-  "aid" bigint  NOT NULL DEFAULT 0 ,
-  "uid" bigint  NOT NULL DEFAULT 0 ,
-  "parent" bigint  NOT NULL DEFAULT 0 ,
+  "aid" bigint  NOT NULL DEFAULT '0',
+  "uid" bigint  NOT NULL DEFAULT '0',
+  "parent" bigint  NOT NULL DEFAULT '0',
   "parent_mid" text  NOT NULL DEFAULT '',
   "thr_parent" text NOT NULL DEFAULT '',
   "created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -570,7 +570,7 @@ CREATE TABLE "item" (
   "html" text NOT NULL,
   "app" text NOT NULL DEFAULT '',
   "lang" varchar(64) NOT NULL DEFAULT '',
-  "revision" bigint  NOT NULL DEFAULT 0 ,
+  "revision" bigint  NOT NULL DEFAULT '0',
   "verb" text NOT NULL DEFAULT '',
   "obj_type" text NOT NULL DEFAULT '',
   "obj" text NOT NULL,
@@ -593,32 +593,32 @@ CREATE TABLE "item" (
   "allow_gid" text NOT NULL,
   "deny_cid" text NOT NULL,
   "deny_gid" text NOT NULL,
-  "item_restrict" bigint NOT NULL DEFAULT 0 ,
-  "item_flags" bigint NOT NULL DEFAULT 0 ,
-  "item_private" numeric(4) NOT NULL DEFAULT 0 ,
-  "item_unseen" smallint NOT NULL DEFAULT 0 ,
-  "item_wall" smallint NOT NULL DEFAULT 0 ,
-  "item_origin" smallint NOT NULL DEFAULT 0 ,
-  "item_starred" smallint NOT NULL DEFAULT 0 ,
-  "item_uplink" smallint NOT NULL DEFAULT 0 ,
-  "item_consensus" smallint NOT NULL DEFAULT 0 ,
-  "item_thread_top" smallint NOT NULL DEFAULT 0 ,
-  "item_notshown" smallint NOT NULL DEFAULT 0 ,
-  "item_nsfw" smallint NOT NULL DEFAULT 0 ,
-  "item_relay" smallint NOT NULL DEFAULT 0 ,
-  "item_mentionsme" smallint NOT NULL DEFAULT 0 ,
-  "item_nocomment" smallint NOT NULL DEFAULT 0 ,
-  "item_obscured" smallint NOT NULL DEFAULT 0 ,
-  "item_verified" smallint NOT NULL DEFAULT 0 ,
-  "item_retained" smallint NOT NULL DEFAULT 0 ,
-  "item_rss" smallint NOT NULL DEFAULT 0 ,
-  "item_deleted" smallint NOT NULL DEFAULT 0 ,
-  "item_type" int NOT NULL DEFAULT 0 ,
-  "item_hidden" smallint NOT NULL DEFAULT 0 ,
-  "item_unpublished" smallint NOT NULL DEFAULT 0 ,
-  "item_delayed" smallint NOT NULL DEFAULT 0 ,
-  "item_pending_remove" smallint NOT NULL DEFAULT 0 ,
-  "item_blocked" smallint NOT NULL DEFAULT 0 ,
+  "item_restrict" bigint NOT NULL DEFAULT '0',
+  "item_flags" bigint NOT NULL DEFAULT '0',
+  "item_private" numeric(4) NOT NULL DEFAULT '0',
+  "item_unseen" smallint NOT NULL DEFAULT '0',
+  "item_wall" smallint NOT NULL DEFAULT '0',
+  "item_origin" smallint NOT NULL DEFAULT '0',
+  "item_starred" smallint NOT NULL DEFAULT '0',
+  "item_uplink" smallint NOT NULL DEFAULT '0',
+  "item_consensus" smallint NOT NULL DEFAULT '0',
+  "item_thread_top" smallint NOT NULL DEFAULT '0',
+  "item_notshown" smallint NOT NULL DEFAULT '0',
+  "item_nsfw" smallint NOT NULL DEFAULT '0',
+  "item_relay" smallint NOT NULL DEFAULT '0',
+  "item_mentionsme" smallint NOT NULL DEFAULT '0',
+  "item_nocomment" smallint NOT NULL DEFAULT '0',
+  "item_obscured" smallint NOT NULL DEFAULT '0',
+  "item_verified" smallint NOT NULL DEFAULT '0',
+  "item_retained" smallint NOT NULL DEFAULT '0',
+  "item_rss" smallint NOT NULL DEFAULT '0',
+  "item_deleted" smallint NOT NULL DEFAULT '0',
+  "item_type" int NOT NULL DEFAULT '0',
+  "item_hidden" smallint NOT NULL DEFAULT '0',
+  "item_unpublished" smallint NOT NULL DEFAULT '0',
+  "item_delayed" smallint NOT NULL DEFAULT '0',
+  "item_pending_remove" smallint NOT NULL DEFAULT '0',
+  "item_blocked" smallint NOT NULL DEFAULT '0',
   "item_search_vector" tsvector,
   PRIMARY KEY ("id")
 );
@@ -731,9 +731,9 @@ create index "ltype_idx" on listeners ("ltype");
 
 CREATE TABLE "mail" (
   "id" serial  NOT NULL,
-  "convid" bigint  NOT NULL DEFAULT 0 ,
+  "convid" bigint  NOT NULL DEFAULT '0',
   "conv_guid" text NOT NULL,
-  "mail_flags" bigint  NOT NULL DEFAULT 0 ,
+  "mail_flags" bigint  NOT NULL DEFAULT '0',
   "from_xchan" text NOT NULL DEFAULT '',
   "to_xchan" text NOT NULL DEFAULT '',
   "account_id" bigint  NOT NULL DEFAULT '0',
@@ -745,13 +745,13 @@ CREATE TABLE "mail" (
   "attach" text NOT NULL DEFAULT '',
   "mid" text NOT NULL,
   "parent_mid" text NOT NULL,
-  "mail_deleted" smallint NOT NULL DEFAULT 0 ,
-  "mail_replied" smallint NOT NULL DEFAULT 0 ,
-  "mail_isreply" smallint NOT NULL DEFAULT 0 ,
-  "mail_seen" smallint NOT NULL DEFAULT 0 ,
-  "mail_recalled" smallint NOT NULL DEFAULT 0 ,
-  "mail_obscured" smallint NOT NULL DEFAULT 0 ,
-  "mail_raw" smallint NOT NULL DEFAULT 0 ,
+  "mail_deleted" smallint NOT NULL DEFAULT '0',
+  "mail_replied" smallint NOT NULL DEFAULT '0',
+  "mail_isreply" smallint NOT NULL DEFAULT '0',
+  "mail_seen" smallint NOT NULL DEFAULT '0',
+  "mail_recalled" smallint NOT NULL DEFAULT '0',
+  "mail_obscured" smallint NOT NULL DEFAULT '0',
+  "mail_raw" smallint NOT NULL DEFAULT '0',
   "created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "expires" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY ("id")
@@ -775,10 +775,10 @@ create index "mail_recalled" on mail ("mail_recalled");
 create index "mail_obscured" on mail ("mail_obscured");
 CREATE TABLE "menu" (
   "menu_id" serial  NOT NULL,
-  "menu_channel_id" bigint  NOT NULL DEFAULT 0 ,
+  "menu_channel_id" bigint  NOT NULL DEFAULT '0',
   "menu_name" text NOT NULL DEFAULT '',
   "menu_desc" text NOT NULL DEFAULT '',
-  "menu_flags" bigint NOT NULL DEFAULT 0 ,
+  "menu_flags" bigint NOT NULL DEFAULT '0',
   "menu_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "menu_edited" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY ("menu_id")
@@ -792,14 +792,14 @@ CREATE TABLE "menu_item" (
   "mitem_id" serial  NOT NULL,
   "mitem_link" text NOT NULL DEFAULT '',
   "mitem_desc" text NOT NULL DEFAULT '',
-  "mitem_flags" bigint NOT NULL DEFAULT 0 ,
+  "mitem_flags" bigint NOT NULL DEFAULT '0',
   "allow_cid" text NOT NULL,
   "allow_gid" text NOT NULL,
   "deny_cid" text NOT NULL,
   "deny_gid" text NOT NULL,
   "mitem_channel_id" bigint  NOT NULL,
-  "mitem_menu_id" bigint  NOT NULL DEFAULT 0 ,
-  "mitem_order" bigint NOT NULL DEFAULT 0 ,
+  "mitem_menu_id" bigint  NOT NULL DEFAULT '0',
+  "mitem_order" bigint NOT NULL DEFAULT '0',
   PRIMARY KEY ("mitem_id")
 
 );
@@ -818,7 +818,7 @@ CREATE TABLE "notify" (
   "uid" bigint NOT NULL,
   "link" text NOT NULL,
   "parent" text NOT NULL DEFAULT '',
-  "seen" numeric(1) NOT NULL DEFAULT 0 ,
+  "seen" numeric(1) NOT NULL DEFAULT '0',
   "ntype" bigint NOT NULL,
   "verb" text NOT NULL,
   "otype" varchar(16) NOT NULL,
@@ -867,18 +867,18 @@ create index "obj_quantity" on obj ("obj_quantity");
 
 CREATE TABLE "outq" (
   "outq_hash" text NOT NULL,
-  "outq_account" bigint  NOT NULL DEFAULT 0 ,
-  "outq_channel" bigint  NOT NULL DEFAULT 0 ,
+  "outq_account" bigint  NOT NULL DEFAULT '0',
+  "outq_channel" bigint  NOT NULL DEFAULT '0',
   "outq_driver" varchar(32) NOT NULL DEFAULT '',
   "outq_posturl" text NOT NULL DEFAULT '',
-  "outq_async" numeric(1) NOT NULL DEFAULT 0 ,
-  "outq_delivered" numeric(1) NOT NULL DEFAULT 0 ,
+  "outq_async" numeric(1) NOT NULL DEFAULT '0',
+  "outq_delivered" numeric(1) NOT NULL DEFAULT '0',
   "outq_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "outq_updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "outq_scheduled" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "outq_notify" text NOT NULL,
   "outq_msg" text NOT NULL,
-  "outq_priority" smallint NOT NULL DEFAULT 0 ,
+  "outq_priority" smallint NOT NULL DEFAULT '0',
   PRIMARY KEY ("outq_hash")
 );
 create index "outq_account" on outq ("outq_account");
@@ -891,7 +891,6 @@ create index "outq_async" on outq ("outq_async");
 create index "outq_delivered" on outq ("outq_delivered");
 create index "outq_priority" on outq ("outq_priority");
 
-
 CREATE TABLE "pchan" (
   "pchan_id" serial NOT NULL,
   "pchan_guid" text NOT NULL,
@@ -900,23 +899,24 @@ CREATE TABLE "pchan" (
   "pchan_prvkey" text NOT NULL,
   PRIMARY KEY ("pchan_id")
 );
-
 create index "pchan_guid" on pchan ("pchan_guid");
 create index "pchan_hash" on pchan ("pchan_hash");
 
 CREATE TABLE "pconfig" (
   "id" serial NOT NULL,
-  "uid" bigint NOT NULL DEFAULT 0 ,
+  "uid" bigint NOT NULL DEFAULT '0',
   "cat" text  NOT NULL,
   "k" text  NOT NULL,
   "v" text NOT NULL,
+  "updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY ("id"),
   UNIQUE ("uid","cat","k")
 );
+create index "pconfig_updated_idx" on pconfig ("updated");
 
 CREATE TABLE "photo" (
   "id" serial  NOT NULL,
-  "aid" bigint  NOT NULL DEFAULT 0 ,
+  "aid" bigint  NOT NULL DEFAULT '0',
   "uid" bigint  NOT NULL,
   "xchan" text NOT NULL DEFAULT '',
   "resource_id" text NOT NULL,
@@ -929,16 +929,16 @@ CREATE TABLE "photo" (
   "mimetype" varchar(128) NOT NULL DEFAULT 'image/jpeg',
   "height" numeric(6) NOT NULL,
   "width" numeric(6) NOT NULL,
-  "filesize" bigint  NOT NULL DEFAULT 0 ,
+  "filesize" bigint  NOT NULL DEFAULT '0',
   "content" bytea NOT NULL,
-  "imgscale" numeric(3) NOT NULL DEFAULT 0 ,
-  "profile" numeric(1) NOT NULL DEFAULT 0 ,
-  "photo_usage" smallint NOT NULL DEFAULT 0 ,
-  "is_nsfw" smallint NOT NULL DEFAULT 0 ,
-  "os_storage" smallint NOT NULL DEFAULT 0 ,
+  "imgscale" numeric(3) NOT NULL DEFAULT '0',
+  "profile" numeric(1) NOT NULL DEFAULT '0',
+  "photo_usage" smallint NOT NULL DEFAULT '0',
+  "is_nsfw" smallint NOT NULL DEFAULT '0',
+  "os_storage" smallint NOT NULL DEFAULT '0',
   "os_path" text NOT NULL,
   "display_path" text NOT NULL,
-  "photo_flags" bigint  NOT NULL DEFAULT 0 ,
+  "photo_flags" bigint  NOT NULL DEFAULT '0',
   "allow_cid" text NOT NULL,
   "allow_gid" text NOT NULL,
   "deny_cid" text NOT NULL,
@@ -965,8 +965,8 @@ CREATE TABLE "poll" (
   "poll_channel" bigint  NOT NULL DEFAULT '0',
   "poll_author" text NOT NULL,
   "poll_desc" text NOT NULL,
-  "poll_flags" bigint NOT NULL DEFAULT 0 ,
-  "poll_votes" bigint NOT NULL DEFAULT 0 ,
+  "poll_flags" bigint NOT NULL DEFAULT '0',
+  "poll_votes" bigint NOT NULL DEFAULT '0',
   PRIMARY KEY ("poll_id")
 
 );
@@ -1002,7 +1002,7 @@ CREATE TABLE "profdef" (
 create index "profdef_field_name" on profdef ("field_name");
 CREATE TABLE "profext" (
   "id" serial  NOT NULL,
-  "channel_id" bigint  NOT NULL DEFAULT 0 ,
+  "channel_id" bigint  NOT NULL DEFAULT '0',
   "hash" text NOT NULL DEFAULT '',
   "k" text NOT NULL DEFAULT '',
   "v" text NOT NULL,
@@ -1018,8 +1018,8 @@ CREATE TABLE "profile" (
   "aid" bigint  NOT NULL DEFAULT '0',
   "uid" bigint NOT NULL,
   "profile_name" text NOT NULL,
-  "is_default" numeric(1) NOT NULL DEFAULT 0 ,
-  "hide_friends" numeric(1) NOT NULL DEFAULT 0 ,
+  "is_default" numeric(1) NOT NULL DEFAULT '0',
+  "hide_friends" numeric(1) NOT NULL DEFAULT '0',
   "fullname" text NOT NULL,
   "pdesc" text NOT NULL DEFAULT '',
   "chandesc" text NOT NULL DEFAULT '',
@@ -1056,7 +1056,7 @@ CREATE TABLE "profile" (
   "homepage" text NOT NULL DEFAULT '',
   "photo" text NOT NULL,
   "thumb" text NOT NULL,
-  "publish" numeric(1) NOT NULL DEFAULT 0 ,
+  "publish" numeric(1) NOT NULL DEFAULT '0',
   "profile_vcard" text NOT NULL DEFAULT '',
   PRIMARY KEY ("id"),
   UNIQUE ("profile_guid","uid")
@@ -1078,7 +1078,7 @@ create index "profile_guid" on profile ("profile_guid");
 CREATE TABLE "profile_check" (
   "id" serial  NOT NULL,
   "uid" bigint  NOT NULL,
-  "cid" bigint  NOT NULL DEFAULT 0 ,
+  "cid" bigint  NOT NULL DEFAULT '0',
   "dfrn_id" text NOT NULL,
   "sec" text NOT NULL,
   "expire" bigint NOT NULL,
@@ -1113,8 +1113,8 @@ create index "session_sid" on session ("sid");
 create index "session_expire" on session ("expire");
 CREATE TABLE "shares" (
   "share_id" serial  NOT NULL,
-  "share_type" bigint NOT NULL DEFAULT 0 ,
-  "share_target" bigint  NOT NULL DEFAULT 0 ,
+  "share_type" bigint NOT NULL DEFAULT '0',
+  "share_target" bigint  NOT NULL DEFAULT '0',
   "share_xchan" text NOT NULL DEFAULT '',
   PRIMARY KEY ("share_id")
 );
@@ -1124,8 +1124,8 @@ create index "share_xchan" on shares ("share_xchan");
 
 CREATE TABLE "sign" (
   "id" serial  NOT NULL,
-  "iid" bigint  NOT NULL DEFAULT 0 ,
-  "retract_iid" bigint  NOT NULL DEFAULT 0 ,
+  "iid" bigint  NOT NULL DEFAULT '0',
+  "retract_iid" bigint  NOT NULL DEFAULT '0',
   "signed_text" text NOT NULL,
   "signature" text NOT NULL,
   "signer" text NOT NULL,
@@ -1136,19 +1136,19 @@ create index "sign_retract_iid" on "sign" ("retract_iid");
 
 CREATE TABLE "site" (
   "site_url" text NOT NULL,
-  "site_access" bigint NOT NULL DEFAULT 0 ,
-  "site_flags" bigint NOT NULL DEFAULT 0 ,
+  "site_access" bigint NOT NULL DEFAULT '0',
+  "site_flags" bigint NOT NULL DEFAULT '0',
   "site_update" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "site_pull" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "site_sync" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "site_directory" text NOT NULL DEFAULT '',
-  "site_register" bigint NOT NULL DEFAULT 0 ,
+  "site_register" bigint NOT NULL DEFAULT '0',
   "site_sellpage" text NOT NULL DEFAULT '',
   "site_location" text NOT NULL DEFAULT '',
   "site_realm" text NOT NULL DEFAULT '',
-  "site_valid" smallint NOT NULL DEFAULT 0 ,
-  "site_dead" smallint NOT NULL DEFAULT 0 ,
-  "site_type" smallint NOT NULL DEFAULT 0 ,
+  "site_valid" smallint NOT NULL DEFAULT '0',
+  "site_dead" smallint NOT NULL DEFAULT '0',
+  "site_type" smallint NOT NULL DEFAULT '0',
   "site_project" text NOT NULL DEFAULT '',
   "site_version" text NOT NULL DEFAULT '',
   "site_crypto" text NOT NULL DEFAULT '',
@@ -1168,7 +1168,7 @@ create index "site_project" on site ("site_project");
 
 CREATE TABLE "source" (
   "src_id" serial  NOT NULL,
-  "src_channel_id" bigint  NOT NULL DEFAULT 0 ,
+  "src_channel_id" bigint  NOT NULL DEFAULT '0',
   "src_channel_xchan" text NOT NULL DEFAULT '',
   "src_xchan" text NOT NULL DEFAULT '',
   "src_patt" text NOT NULL DEFAULT '',
@@ -1188,8 +1188,8 @@ CREATE TABLE "sys_perms" (
 );
 CREATE TABLE "term" (
   "tid" serial  NOT NULL,
-  "aid" bigint  NOT NULL DEFAULT 0 ,
-  "uid" bigint  NOT NULL DEFAULT 0 ,
+  "aid" bigint  NOT NULL DEFAULT '0',
+  "uid" bigint  NOT NULL DEFAULT '0',
   "oid" bigint  NOT NULL,
   "otype" numeric(3)  NOT NULL,
   "ttype" numeric(3)  NOT NULL,
@@ -1228,7 +1228,7 @@ CREATE TABLE "updates" (
   "ud_guid" text NOT NULL DEFAULT '',
   "ud_date" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "ud_last" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "ud_flags" bigint NOT NULL DEFAULT 0 ,
+  "ud_flags" bigint NOT NULL DEFAULT '0',
   "ud_addr" text NOT NULL DEFAULT '',
   PRIMARY KEY ("ud_id")
 );
@@ -1240,7 +1240,7 @@ create index "ud_addr" on updates ("ud_addr");
 create index "ud_last" on updates ("ud_last");
 CREATE TABLE "verify" (
   "id" serial  NOT NULL,
-  "channel" bigint  NOT NULL DEFAULT 0 ,
+  "channel" bigint  NOT NULL DEFAULT '0',
   "vtype" varchar(32) NOT NULL DEFAULT '',
   "token" text NOT NULL DEFAULT '',
   "meta" text NOT NULL DEFAULT '',
@@ -1282,16 +1282,16 @@ CREATE TABLE "xchan" (
   "xchan_name" text NOT NULL DEFAULT '',
   "xchan_network" text NOT NULL DEFAULT '',
   "xchan_instance_url" text NOT NULL DEFAULT '',
-  "xchan_flags" bigint  NOT NULL DEFAULT 0 ,
+  "xchan_flags" bigint  NOT NULL DEFAULT '0',
   "xchan_photo_date" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "xchan_name_date" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "xchan_hidden" smallint NOT NULL DEFAULT 0 ,
-  "xchan_orphan" smallint NOT NULL DEFAULT 0 ,
-  "xchan_censored" smallint NOT NULL DEFAULT 0 ,
-  "xchan_selfcensored" smallint NOT NULL DEFAULT 0 ,
-  "xchan_system" smallint NOT NULL DEFAULT 0 ,
-  "xchan_pubforum" smallint NOT NULL DEFAULT 0 ,
-  "xchan_deleted" smallint NOT NULL DEFAULT 0 ,
+  "xchan_hidden" smallint NOT NULL DEFAULT '0',
+  "xchan_orphan" smallint NOT NULL DEFAULT '0',
+  "xchan_censored" smallint NOT NULL DEFAULT '0',
+  "xchan_selfcensored" smallint NOT NULL DEFAULT '0',
+  "xchan_system" smallint NOT NULL DEFAULT '0',
+  "xchan_pubforum" smallint NOT NULL DEFAULT '0',
+  "xchan_deleted" smallint NOT NULL DEFAULT '0',
   PRIMARY KEY ("xchan_hash")
 );
 create index "xchan_guid" on xchan ("xchan_guid");
@@ -1336,7 +1336,7 @@ create index "xconfig_cat" on xconfig ("cat");
 create index "xconfig_k" on xconfig ("k");
 CREATE TABLE "xign" (
   "id" serial  NOT NULL,
-  "uid" bigint NOT NULL DEFAULT 0 ,
+  "uid" bigint NOT NULL DEFAULT '0',
   "xchan" text NOT NULL DEFAULT '',
   PRIMARY KEY ("id")
 );
@@ -1346,10 +1346,10 @@ CREATE TABLE "xlink" (
   "xlink_id" serial  NOT NULL,
   "xlink_xchan" text NOT NULL DEFAULT '',
   "xlink_link" text NOT NULL DEFAULT '',
-  "xlink_rating" bigint NOT NULL DEFAULT 0 ,
+  "xlink_rating" bigint NOT NULL DEFAULT '0',
   "xlink_rating_text" TEXT NOT NULL DEFAULT '',
   "xlink_updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "xlink_static" numeric(1) NOT NULL DEFAULT 0 ,
+  "xlink_static" numeric(1) NOT NULL DEFAULT '0',
   "xlink_sig" text NOT NULL DEFAULT '',
   PRIMARY KEY ("xlink_id")
 );
@@ -1361,7 +1361,7 @@ create index "xlink_static" on xlink ("xlink_static");
 CREATE TABLE "xperm" (
   "xp_id" serial NOT NULL,
   "xp_client" varchar( 20 ) NOT NULL DEFAULT '',
-  "xp_channel" bigint NOT NULL DEFAULT 0 ,
+  "xp_channel" bigint NOT NULL DEFAULT '0',
   "xp_perm" varchar( 64 ) NOT NULL DEFAULT '',
   PRIMARY KEY ("xp_id")
 );
@@ -1370,7 +1370,7 @@ create index "xp_channel" on xperm ("xp_channel");
 create index "xp_perm" on xperm ("xp_perm");
 CREATE TABLE "xprof" (
   "xprof_hash" text NOT NULL,
-  "xprof_age" numeric(3)  NOT NULL DEFAULT 0 ,
+  "xprof_age" numeric(3)  NOT NULL DEFAULT '0',
   "xprof_desc" text NOT NULL DEFAULT '',
   "xprof_dob" varchar(12) NOT NULL DEFAULT '',
   "xprof_gender" text NOT NULL DEFAULT '',
@@ -1401,7 +1401,7 @@ CREATE TABLE "xtag" (
   "xtag_id" serial  NOT NULL,
   "xtag_hash" text NOT NULL,
   "xtag_term" text NOT NULL DEFAULT '',
-  "xtag_flags" bigint NOT NULL DEFAULT 0 ,
+  "xtag_flags" bigint NOT NULL DEFAULT '0',
   PRIMARY KEY ("xtag_id")
 );
 create index "xtag_term" on xtag ("xtag_term");

library/blueimp_upload/LICENSE

@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2017 jQuery-File-Upload Authors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

library/blueimp_upload/js/vendor/jquery.ui.widget.js

@@ -1,572 +0,0 @@
-/*! jQuery UI - v1.11.4+CommonJS - 2015-08-28
-* http://jqueryui.com
-* Includes: widget.js
-* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
-
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([ "jquery" ], factory );
-
-	} else if ( typeof exports === "object" ) {
-
-		// Node/CommonJS
-		factory( require( "jquery" ) );
-
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-/*!
- * jQuery UI Widget 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/jQuery.widget/
- */
-
-
-var widget_uuid = 0,
-	widget_slice = Array.prototype.slice;
-
-$.cleanData = (function( orig ) {
-	return function( elems ) {
-		var events, elem, i;
-		for ( i = 0; (elem = elems[i]) != null; i++ ) {
-			try {
-
-				// Only trigger remove when necessary to save time
-				events = $._data( elem, "events" );
-				if ( events && events.remove ) {
-					$( elem ).triggerHandler( "remove" );
-				}
-
-			// http://bugs.jquery.com/ticket/8235
-			} catch ( e ) {}
-		}
-		orig( elems );
-	};
-})( $.cleanData );
-
-$.widget = function( name, base, prototype ) {
-	var fullName, existingConstructor, constructor, basePrototype,
-		// proxiedPrototype allows the provided prototype to remain unmodified
-		// so that it can be used as a mixin for multiple widgets (#8876)
-		proxiedPrototype = {},
-		namespace = name.split( "." )[ 0 ];
-
-	name = name.split( "." )[ 1 ];
-	fullName = namespace + "-" + name;
-
-	if ( !prototype ) {
-		prototype = base;
-		base = $.Widget;
-	}
-
-	// create selector for plugin
-	$.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
-		return !!$.data( elem, fullName );
-	};
-
-	$[ namespace ] = $[ namespace ] || {};
-	existingConstructor = $[ namespace ][ name ];
-	constructor = $[ namespace ][ name ] = function( options, element ) {
-		// allow instantiation without "new" keyword
-		if ( !this._createWidget ) {
-			return new constructor( options, element );
-		}
-
-		// allow instantiation without initializing for simple inheritance
-		// must use "new" keyword (the code above always passes args)
-		if ( arguments.length ) {
-			this._createWidget( options, element );
-		}
-	};
-	// extend with the existing constructor to carry over any static properties
-	$.extend( constructor, existingConstructor, {
-		version: prototype.version,
-		// copy the object used to create the prototype in case we need to
-		// redefine the widget later
-		_proto: $.extend( {}, prototype ),
-		// track widgets that inherit from this widget in case this widget is
-		// redefined after a widget inherits from it
-		_childConstructors: []
-	});
-
-	basePrototype = new base();
-	// we need to make the options hash a property directly on the new instance
-	// otherwise we'll modify the options hash on the prototype that we're
-	// inheriting from
-	basePrototype.options = $.widget.extend( {}, basePrototype.options );
-	$.each( prototype, function( prop, value ) {
-		if ( !$.isFunction( value ) ) {
-			proxiedPrototype[ prop ] = value;
-			return;
-		}
-		proxiedPrototype[ prop ] = (function() {
-			var _super = function() {
-					return base.prototype[ prop ].apply( this, arguments );
-				},
-				_superApply = function( args ) {
-					return base.prototype[ prop ].apply( this, args );
-				};
-			return function() {
-				var __super = this._super,
-					__superApply = this._superApply,
-					returnValue;
-
-				this._super = _super;
-				this._superApply = _superApply;
-
-				returnValue = value.apply( this, arguments );
-
-				this._super = __super;
-				this._superApply = __superApply;
-
-				return returnValue;
-			};
-		})();
-	});
-	constructor.prototype = $.widget.extend( basePrototype, {
-		// TODO: remove support for widgetEventPrefix
-		// always use the name + a colon as the prefix, e.g., draggable:start
-		// don't prefix for widgets that aren't DOM-based
-		widgetEventPrefix: existingConstructor ? (basePrototype.widgetEventPrefix || name) : name
-	}, proxiedPrototype, {
-		constructor: constructor,
-		namespace: namespace,
-		widgetName: name,
-		widgetFullName: fullName
-	});
-
-	// If this widget is being redefined then we need to find all widgets that
-	// are inheriting from it and redefine all of them so that they inherit from
-	// the new version of this widget. We're essentially trying to replace one
-	// level in the prototype chain.
-	if ( existingConstructor ) {
-		$.each( existingConstructor._childConstructors, function( i, child ) {
-			var childPrototype = child.prototype;
-
-			// redefine the child widget using the same prototype that was
-			// originally used, but inherit from the new version of the base
-			$.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto );
-		});
-		// remove the list of existing child constructors from the old constructor
-		// so the old child constructors can be garbage collected
-		delete existingConstructor._childConstructors;
-	} else {
-		base._childConstructors.push( constructor );
-	}
-
-	$.widget.bridge( name, constructor );
-
-	return constructor;
-};
-
-$.widget.extend = function( target ) {
-	var input = widget_slice.call( arguments, 1 ),
-		inputIndex = 0,
-		inputLength = input.length,
-		key,
-		value;
-	for ( ; inputIndex < inputLength; inputIndex++ ) {
-		for ( key in input[ inputIndex ] ) {
-			value = input[ inputIndex ][ key ];
-			if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
-				// Clone objects
-				if ( $.isPlainObject( value ) ) {
-					target[ key ] = $.isPlainObject( target[ key ] ) ?
-						$.widget.extend( {}, target[ key ], value ) :
-						// Don't extend strings, arrays, etc. with objects
-						$.widget.extend( {}, value );
-				// Copy everything else by reference
-				} else {
-					target[ key ] = value;
-				}
-			}
-		}
-	}
-	return target;
-};
-
-$.widget.bridge = function( name, object ) {
-	var fullName = object.prototype.widgetFullName || name;
-	$.fn[ name ] = function( options ) {
-		var isMethodCall = typeof options === "string",
-			args = widget_slice.call( arguments, 1 ),
-			returnValue = this;
-
-		if ( isMethodCall ) {
-			this.each(function() {
-				var methodValue,
-					instance = $.data( this, fullName );
-				if ( options === "instance" ) {
-					returnValue = instance;
-					return false;
-				}
-				if ( !instance ) {
-					return $.error( "cannot call methods on " + name + " prior to initialization; " +
-						"attempted to call method '" + options + "'" );
-				}
-				if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) {
-					return $.error( "no such method '" + options + "' for " + name + " widget instance" );
-				}
-				methodValue = instance[ options ].apply( instance, args );
-				if ( methodValue !== instance && methodValue !== undefined ) {
-					returnValue = methodValue && methodValue.jquery ?
-						returnValue.pushStack( methodValue.get() ) :
-						methodValue;
-					return false;
-				}
-			});
-		} else {
-
-			// Allow multiple hashes to be passed on init
-			if ( args.length ) {
-				options = $.widget.extend.apply( null, [ options ].concat(args) );
-			}
-
-			this.each(function() {
-				var instance = $.data( this, fullName );
-				if ( instance ) {
-					instance.option( options || {} );
-					if ( instance._init ) {
-						instance._init();
-					}
-				} else {
-					$.data( this, fullName, new object( options, this ) );
-				}
-			});
-		}
-
-		return returnValue;
-	};
-};
-
-$.Widget = function( /* options, element */ ) {};
-$.Widget._childConstructors = [];
-
-$.Widget.prototype = {
-	widgetName: "widget",
-	widgetEventPrefix: "",
-	defaultElement: "<div>",
-	options: {
-		disabled: false,
-
-		// callbacks
-		create: null
-	},
-	_createWidget: function( options, element ) {
-		element = $( element || this.defaultElement || this )[ 0 ];
-		this.element = $( element );
-		this.uuid = widget_uuid++;
-		this.eventNamespace = "." + this.widgetName + this.uuid;
-
-		this.bindings = $();
-		this.hoverable = $();
-		this.focusable = $();
-
-		if ( element !== this ) {
-			$.data( element, this.widgetFullName, this );
-			this._on( true, this.element, {
-				remove: function( event ) {
-					if ( event.target === element ) {
-						this.destroy();
-					}
-				}
-			});
-			this.document = $( element.style ?
-				// element within the document
-				element.ownerDocument :
-				// element is window or document
-				element.document || element );
-			this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
-		}
-
-		this.options = $.widget.extend( {},
-			this.options,
-			this._getCreateOptions(),
-			options );
-
-		this._create();
-		this._trigger( "create", null, this._getCreateEventData() );
-		this._init();
-	},
-	_getCreateOptions: $.noop,
-	_getCreateEventData: $.noop,
-	_create: $.noop,
-	_init: $.noop,
-
-	destroy: function() {
-		this._destroy();
-		// we can probably remove the unbind calls in 2.0
-		// all event bindings should go through this._on()
-		this.element
-			.unbind( this.eventNamespace )
-			.removeData( this.widgetFullName )
-			// support: jquery <1.6.3
-			// http://bugs.jquery.com/ticket/9413
-			.removeData( $.camelCase( this.widgetFullName ) );
-		this.widget()
-			.unbind( this.eventNamespace )
-			.removeAttr( "aria-disabled" )
-			.removeClass(
-				this.widgetFullName + "-disabled " +
-				"ui-state-disabled" );
-
-		// clean up events and states
-		this.bindings.unbind( this.eventNamespace );
-		this.hoverable.removeClass( "ui-state-hover" );
-		this.focusable.removeClass( "ui-state-focus" );
-	},
-	_destroy: $.noop,
-
-	widget: function() {
-		return this.element;
-	},
-
-	option: function( key, value ) {
-		var options = key,
-			parts,
-			curOption,
-			i;
-
-		if ( arguments.length === 0 ) {
-			// don't return a reference to the internal hash
-			return $.widget.extend( {}, this.options );
-		}
-
-		if ( typeof key === "string" ) {
-			// handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
-			options = {};
-			parts = key.split( "." );
-			key = parts.shift();
-			if ( parts.length ) {
-				curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
-				for ( i = 0; i < parts.length - 1; i++ ) {
-					curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
-					curOption = curOption[ parts[ i ] ];
-				}
-				key = parts.pop();
-				if ( arguments.length === 1 ) {
-					return curOption[ key ] === undefined ? null : curOption[ key ];
-				}
-				curOption[ key ] = value;
-			} else {
-				if ( arguments.length === 1 ) {
-					return this.options[ key ] === undefined ? null : this.options[ key ];
-				}
-				options[ key ] = value;
-			}
-		}
-
-		this._setOptions( options );
-
-		return this;
-	},
-	_setOptions: function( options ) {
-		var key;
-
-		for ( key in options ) {
-			this._setOption( key, options[ key ] );
-		}
-
-		return this;
-	},
-	_setOption: function( key, value ) {
-		this.options[ key ] = value;
-
-		if ( key === "disabled" ) {
-			this.widget()
-				.toggleClass( this.widgetFullName + "-disabled", !!value );
-
-			// If the widget is becoming disabled, then nothing is interactive
-			if ( value ) {
-				this.hoverable.removeClass( "ui-state-hover" );
-				this.focusable.removeClass( "ui-state-focus" );
-			}
-		}
-
-		return this;
-	},
-
-	enable: function() {
-		return this._setOptions({ disabled: false });
-	},
-	disable: function() {
-		return this._setOptions({ disabled: true });
-	},
-
-	_on: function( suppressDisabledCheck, element, handlers ) {
-		var delegateElement,
-			instance = this;
-
-		// no suppressDisabledCheck flag, shuffle arguments
-		if ( typeof suppressDisabledCheck !== "boolean" ) {
-			handlers = element;
-			element = suppressDisabledCheck;
-			suppressDisabledCheck = false;
-		}
-
-		// no element argument, shuffle and use this.element
-		if ( !handlers ) {
-			handlers = element;
-			element = this.element;
-			delegateElement = this.widget();
-		} else {
-			element = delegateElement = $( element );
-			this.bindings = this.bindings.add( element );
-		}
-
-		$.each( handlers, function( event, handler ) {
-			function handlerProxy() {
-				// allow widgets to customize the disabled handling
-				// - disabled as an array instead of boolean
-				// - disabled class as method for disabling individual parts
-				if ( !suppressDisabledCheck &&
-						( instance.options.disabled === true ||
-							$( this ).hasClass( "ui-state-disabled" ) ) ) {
-					return;
-				}
-				return ( typeof handler === "string" ? instance[ handler ] : handler )
-					.apply( instance, arguments );
-			}
-
-			// copy the guid so direct unbinding works
-			if ( typeof handler !== "string" ) {
-				handlerProxy.guid = handler.guid =
-					handler.guid || handlerProxy.guid || $.guid++;
-			}
-
-			var match = event.match( /^([\w:-]*)\s*(.*)$/ ),
-				eventName = match[1] + instance.eventNamespace,
-				selector = match[2];
-			if ( selector ) {
-				delegateElement.delegate( selector, eventName, handlerProxy );
-			} else {
-				element.bind( eventName, handlerProxy );
-			}
-		});
-	},
-
-	_off: function( element, eventName ) {
-		eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) +
-			this.eventNamespace;
-		element.unbind( eventName ).undelegate( eventName );
-
-		// Clear the stack to avoid memory leaks (#10056)
-		this.bindings = $( this.bindings.not( element ).get() );
-		this.focusable = $( this.focusable.not( element ).get() );
-		this.hoverable = $( this.hoverable.not( element ).get() );
-	},
-
-	_delay: function( handler, delay ) {
-		function handlerProxy() {
-			return ( typeof handler === "string" ? instance[ handler ] : handler )
-				.apply( instance, arguments );
-		}
-		var instance = this;
-		return setTimeout( handlerProxy, delay || 0 );
-	},
-
-	_hoverable: function( element ) {
-		this.hoverable = this.hoverable.add( element );
-		this._on( element, {
-			mouseenter: function( event ) {
-				$( event.currentTarget ).addClass( "ui-state-hover" );
-			},
-			mouseleave: function( event ) {
-				$( event.currentTarget ).removeClass( "ui-state-hover" );
-			}
-		});
-	},
-
-	_focusable: function( element ) {
-		this.focusable = this.focusable.add( element );
-		this._on( element, {
-			focusin: function( event ) {
-				$( event.currentTarget ).addClass( "ui-state-focus" );
-			},
-			focusout: function( event ) {
-				$( event.currentTarget ).removeClass( "ui-state-focus" );
-			}
-		});
-	},
-
-	_trigger: function( type, event, data ) {
-		var prop, orig,
-			callback = this.options[ type ];
-
-		data = data || {};
-		event = $.Event( event );
-		event.type = ( type === this.widgetEventPrefix ?
-			type :
-			this.widgetEventPrefix + type ).toLowerCase();
-		// the original event may come from any element
-		// so we need to reset the target on the new event
-		event.target = this.element[ 0 ];
-
-		// copy original event properties over to the new event
-		orig = event.originalEvent;
-		if ( orig ) {
-			for ( prop in orig ) {
-				if ( !( prop in event ) ) {
-					event[ prop ] = orig[ prop ];
-				}
-			}
-		}
-
-		this.element.trigger( event, data );
-		return !( $.isFunction( callback ) &&
-			callback.apply( this.element[0], [ event ].concat( data ) ) === false ||
-			event.isDefaultPrevented() );
-	}
-};
-
-$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
-	$.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
-		if ( typeof options === "string" ) {
-			options = { effect: options };
-		}
-		var hasOptions,
-			effectName = !options ?
-				method :
-				options === true || typeof options === "number" ?
-					defaultEffect :
-					options.effect || defaultEffect;
-		options = options || {};
-		if ( typeof options === "number" ) {
-			options = { duration: options };
-		}
-		hasOptions = !$.isEmptyObject( options );
-		options.complete = callback;
-		if ( options.delay ) {
-			element.delay( options.delay );
-		}
-		if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
-			element[ method ]( options );
-		} else if ( effectName !== method && element[ effectName ] ) {
-			element[ effectName ]( options.duration, options.easing, callback );
-		} else {
-			element.queue(function( next ) {
-				$( this )[ method ]();
-				if ( callback ) {
-					callback.call( element[ 0 ] );
-				}
-				next();
-			});
-		}
-	};
-});
-
-var widget = $.widget;
-
-
-
-}));

library/blueimp_upload/server/php/docker-compose.yml

@@ -1,6 +0,0 @@
-apache:
-  build: ./
-  ports:
-    - "80:80"
-  volumes:
-    - "../../:/var/www/html"

library/jqupload/CONTRIBUTING.md

@@ -1,42 +0,0 @@
-# Issue Guidelines
-
-The issues tracker should only be used for **bugs** or **feature requests**.
-
-Please post **support requests** and **general discussions** about this project to the [support forum](https://groups.google.com/d/forum/jquery-fileupload).
-
-## Bugs
-
-Please follow these guidelines before reporting a bug:
-
-1. **Update to the latest version** — Check if you can reproduce the issue with the latest version from the `master` branch.
-
-2. **Use the GitHub issue search** — check if the issue has already been reported. If it has been, please comment on the existing issue.
-
-3. **Isolate the demonstrable problem** — Try to reproduce the problem with the [Demo](http://blueimp.github.io/jQuery-File-Upload/) or with a reduced test case that includes the least amount of code necessary to reproduce the problem.
-
-4. **Provide a means to reproduce the problem** — Please provide as much details as possible, e.g. server information, browser and operating system versions, steps to reproduce the problem. If possible, provide a link to your reduced test case, e.g. via [JSFiddle](http://jsfiddle.net/). 
-
-
-## Feature requests
-
-Please follow the bug guidelines above for feature requests, i.e. update to the latest version and search for exising issues before posting a new request.
-
-Generally, feature requests might be accepted if the implementation would benefit a broader use case or the project could be considered incomplete without that feature.
-
-If you need help integrating this project into another framework, please post your request to the [support forum](https://groups.google.com/d/forum/jquery-fileupload).
-
-## Pull requests
-
-[Pull requests](https://help.github.com/articles/using-pull-requests) are welcome and the preferred way of accepting code contributions.
-
-However, if you add a server-side upload handler implementation for another framework, please continue to maintain this version in your own fork without sending a pull request. You are welcome to add a link and possibly documentation about your implementation to the [Wiki](https://github.com/blueimp/jQuery-File-Upload/wiki).
-
-Please follow these guidelines before sending a pull request:
-
-1. Update your fork to the latest upstream version.
-
-2. Follow the coding conventions of the original repository. Changes to one of the JavaScript source files are required to pass the [JSLint](http://jslint.com/) validation tool.
-
-3. Keep your commits as atomar as possible, i.e. create a new commit for every single bug fix or feature added.
-
-4. Always add meaningfull commit messages.

library/jqupload/Gruntfile.js

@@ -1,37 +0,0 @@
-/*
- * jQuery File Upload Gruntfile
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/*global module */
-
-module.exports = function (grunt) {
-    'use strict';
-
-    grunt.initConfig({
-        jshint: {
-            options: {
-                jshintrc: '.jshintrc'
-            },
-            all: [
-                'Gruntfile.js',
-                'js/cors/*.js',
-                'js/*.js',
-                'server/node/server.js',
-                'test/test.js'
-            ]
-        }
-    });
-
-    grunt.loadNpmTasks('grunt-contrib-jshint');
-    grunt.loadNpmTasks('grunt-bump-build-git');
-    grunt.registerTask('test', ['jshint']);
-    grunt.registerTask('default', ['test']);
-
-};

library/jqupload/README.md

@@ -1,123 +0,0 @@
-# jQuery File Upload Plugin
-
-## Demo
-[Demo File Upload](http://blueimp.github.io/jQuery-File-Upload/)
-
-## Description
-File Upload widget with multiple file selection, drag&drop support, progress bars, validation and preview images, audio and video for jQuery.  
-Supports cross-domain, chunked and resumable file uploads and client-side image resizing. Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.
-
-## Setup
-* [How to setup the plugin on your website](https://github.com/blueimp/jQuery-File-Upload/wiki/Setup)
-* [How to use only the basic plugin (minimal setup guide).](https://github.com/blueimp/jQuery-File-Upload/wiki/Basic-plugin)
-
-## Support
-
-* **[Support Forum](https://groups.google.com/d/forum/jquery-fileupload)**  
-**Support requests** and **general discussions** about the File Upload plugin can be posted to the official
-[Support Forum](https://groups.google.com/d/forum/jquery-fileupload).  
-If your question is not directly related to the File Upload plugin, you might have a better chance to get a reply by posting to [Stack Overflow](http://stackoverflow.com/questions/tagged/blueimp+jquery+file-upload).
-
-* Bugs and Feature requests  
-**Bugs** and **Feature requests** can be reported using the [issues tracker](https://github.com/blueimp/jQuery-File-Upload/issues).  
-Please read the [issue guidelines](https://github.com/blueimp/jQuery-File-Upload/blob/master/CONTRIBUTING.md) before posting.
-
-## Features
-* **Multiple file upload:**  
-  Allows to select multiple files at once and upload them simultaneously.
-* **Drag & Drop support:**  
-  Allows to upload files by dragging them from your desktop or filemanager and dropping them on your browser window.
-* **Upload progress bar:**  
-  Shows a progress bar indicating the upload progress for individual files and for all uploads combined.
-* **Cancelable uploads:**  
-  Individual file uploads can be canceled to stop the upload progress.
-* **Resumable uploads:**  
-  Aborted uploads can be resumed with browsers supporting the Blob API.
-* **Chunked uploads:**  
-  Large files can be uploaded in smaller chunks with browsers supporting the Blob API.
-* **Client-side image resizing:**  
-  Images can be automatically resized on client-side with browsers supporting the required JS APIs.
-* **Preview images, audio and video:**  
-  A preview of image, audio and video files can be displayed before uploading with browsers supporting the required APIs.
-* **No browser plugins (e.g. Adobe Flash) required:**  
-  The implementation is based on open standards like HTML5 and JavaScript and requires no additional browser plugins.
-* **Graceful fallback for legacy browsers:**  
-  Uploads files via XMLHttpRequests if supported and uses iframes as fallback for legacy browsers.
-* **HTML file upload form fallback:**  
-  Allows progressive enhancement by using a standard HTML file upload form as widget element.
-* **Cross-site file uploads:**  
-  Supports uploading files to a different domain with cross-site XMLHttpRequests or iframe redirects.
-* **Multiple plugin instances:**  
-  Allows to use multiple plugin instances on the same webpage.
-* **Customizable and extensible:**  
-  Provides an API to set individual options and define callBack methods for various upload events.
-* **Multipart and file contents stream uploads:**  
-  Files can be uploaded as standard "multipart/form-data" or file contents stream (HTTP PUT file upload).
-* **Compatible with any server-side application platform:**  
-  Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.
-
-## Requirements
-
-### Mandatory requirements
-* [jQuery](http://jquery.com/) v. 1.6+
-* [jQuery UI widget factory](http://api.jqueryui.com/jQuery.widget/) v. 1.9+ (included)
-* [jQuery Iframe Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/jquery.iframe-transport.js) (included)
-
-The jQuery UI widget factory is a requirement for the basic File Upload plugin, but very lightweight without any other dependencies from the jQuery UI suite.
-
-The jQuery Iframe Transport is required for [browsers without XHR file upload support](https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support).
-
-### Optional requirements
-* [JavaScript Templates engine](https://github.com/blueimp/JavaScript-Templates) v. 2.5.3+
-* [JavaScript Load Image library](https://github.com/blueimp/JavaScript-Load-Image) v. 1.11.0+
-* [JavaScript Canvas to Blob polyfill](https://github.com/blueimp/JavaScript-Canvas-to-Blob) v. 2.1.0+
-* [blueimp Gallery](https://github.com/blueimp/Gallery) v. 2.12.0+
-* [Bootstrap CSS framework](http://getbootstrap.com/) v. 3.0.0+
-* [Glyphicons](http://glyphicons.com/)
-
-The JavaScript Templates engine is used to render the selected and uploaded files for the Basic Plus UI and jQuery UI versions.
-
-The JavaScript Load Image library and JavaScript Canvas to Blob polyfill are required for the image previews and resizing functionality.
-
-The blueimp Gallery is used to display the uploaded images in a lightbox.
-
-The user interface of all versions except the jQuery UI version is built with Twitter's [Bootstrap](http://getbootstrap.com/) framework and icons from [Glyphicons](http://glyphicons.com/).
-
-### Cross-domain requirements
-[Cross-domain File Uploads](https://github.com/blueimp/jQuery-File-Upload/wiki/Cross-domain-uploads) using the [Iframe Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/jquery.iframe-transport.js) require a redirect back to the origin server to retrieve the upload results. The [example implementation](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/main.js) makes use of [result.html](https://github.com/blueimp/jQuery-File-Upload/blob/master/cors/result.html) as a static redirect page for the origin server.
-
-The repository also includes the [jQuery XDomainRequest Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/cors/jquery.xdr-transport.js), which enables limited cross-domain AJAX requests in Microsoft Internet Explorer 8 and 9 (IE 10 supports cross-domain XHR requests).  
-The XDomainRequest object allows GET and POST requests only and doesn't support file uploads. It is used on the [Demo](http://blueimp.github.io/jQuery-File-Upload/) to delete uploaded files from the cross-domain demo file upload service.
-
-## Browsers
-
-### Desktop browsers
-The File Upload plugin is regularly tested with the latest browser versions and supports the following minimal versions:
-
-* Google Chrome
-* Apple Safari 4.0+
-* Mozilla Firefox 3.0+
-* Opera 11.0+
-* Microsoft Internet Explorer 6.0+
-
-### Mobile browsers
-The File Upload plugin has been tested with and supports the following mobile browsers:
-
-* Apple Safari on iOS 6.0+
-* Google Chrome on iOS 6.0+
-* Google Chrome on Android 4.0+
-* Default Browser on Android 2.3+
-* Opera Mobile 12.0+
-
-### Supported features
-For a detailed overview of the features supported by each browser version please have a look at the [Extended browser support information](https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support).
-
-## License
-Released under the [MIT license](http://www.opensource.org/licenses/MIT).
-
-## Donations
-jQuery File Upload is free software, but you can donate to support the developer, Sebastian Tschan:
-
-Flattr: [![Flattr](https://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/thing/286433/jQuery-File-Upload-Plugin)
-
-PayPal: [![PayPal](https://www.paypalobjects.com/WEBSCR-640-20110429-1/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=PYWYSYP77KL54)

library/jqupload/angularjs.html

@@ -1,211 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/*
- * jQuery File Upload Plugin AngularJS Demo 2.1.2
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
--->
-<html lang="en">
-<head>
-<!-- Force latest IE rendering engine or ChromeFrame if installed -->
-<!--[if IE]>
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<![endif]-->
-<meta charset="utf-8">
-<title>jQuery File Upload Demo - AngularJS version</title>
-<meta name="description" content="File Upload widget with multiple file selection, drag&amp;drop support, progress bars, validation and preview images, audio and video for AngularJS. Supports cross-domain, chunked and resumable file uploads and client-side image resizing. Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<!-- Bootstrap styles -->
-<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css">
-<!-- Generic page styles -->
-<link rel="stylesheet" href="css/style.css">
-<!-- blueimp Gallery styles -->
-<link rel="stylesheet" href="http://blueimp.github.io/Gallery/css/blueimp-gallery.min.css">
-<!-- CSS to style the file input field as button and adjust the Bootstrap progress bars -->
-<link rel="stylesheet" href="css/jquery.fileupload.css">
-<link rel="stylesheet" href="css/jquery.fileupload-ui.css">
-<!-- CSS adjustments for browsers with JavaScript disabled -->
-<noscript><link rel="stylesheet" href="css/jquery.fileupload-noscript.css"></noscript>
-<noscript><link rel="stylesheet" href="css/jquery.fileupload-ui-noscript.css"></noscript>
-<style>
-/* Hide Angular JS elements before initializing */
-.ng-cloak {
-    display: none;
-}
-</style>
-</head>
-<body>
-<div class="navbar navbar-default navbar-fixed-top">
-    <div class="container">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-fixed-top .navbar-collapse">
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="https://github.com/blueimp/jQuery-File-Upload">jQuery File Upload</a>
-        </div>
-        <div class="navbar-collapse collapse">
-            <ul class="nav navbar-nav">
-                <li><a href="https://github.com/blueimp/jQuery-File-Upload/tags">Download</a></li>
-                <li><a href="https://github.com/blueimp/jQuery-File-Upload">Source Code</a></li>
-                <li><a href="https://github.com/blueimp/jQuery-File-Upload/wiki">Documentation</a></li>
-                <li><a href="https://blueimp.net">&copy; Sebastian Tschan</a></li>
-            </ul>
-        </div>
-    </div>
-</div>
-<div class="container">
-    <h1>jQuery File Upload Demo</h1>
-    <h2 class="lead">AngularJS version</h2>
-    <ul class="nav nav-tabs">
-        <li><a href="basic.html">Basic</a></li>
-        <li><a href="basic-plus.html">Basic Plus</a></li>
-        <li><a href="index.html">Basic Plus UI</a></li>
-        <li class="active"><a href="angularjs.html">AngularJS</a></li>
-        <li><a href="jquery-ui.html">jQuery UI</a></li>
-    </ul>
-    <br>
-    <blockquote>
-        <p>File Upload widget with multiple file selection, drag&amp;drop support, progress bars, validation and preview images, audio and video for AngularJS.<br>
-        Supports cross-domain, chunked and resumable file uploads and client-side image resizing.<br>
-        Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.</p>
-    </blockquote>
-    <br>
-    <!-- The file upload form used as target for the file upload widget -->
-    <form id="fileupload" action="//jquery-file-upload.appspot.com/" method="POST" enctype="multipart/form-data" data-ng-app="demo" data-ng-controller="DemoFileUploadController" data-file-upload="options" data-ng-class="{'fileupload-processing': processing() || loadingFiles}">
-        <!-- Redirect browsers with JavaScript disabled to the origin page -->
-        <noscript><input type="hidden" name="redirect" value="http://blueimp.github.io/jQuery-File-Upload/"></noscript>
-        <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
-        <div class="row fileupload-buttonbar">
-            <div class="col-lg-7">
-                <!-- The fileinput-button span is used to style the file input field as button -->
-                <span class="btn btn-success fileinput-button" ng-class="{disabled: disabled}">
-                    <i class="glyphicon glyphicon-plus"></i>
-                    <span>Add files...</span>
-                    <input type="file" name="files[]" multiple ng-disabled="disabled">
-                </span>
-                <button type="button" class="btn btn-primary start" data-ng-click="submit()">
-                    <i class="glyphicon glyphicon-upload"></i>
-                    <span>Start upload</span>
-                </button>
-                <button type="button" class="btn btn-warning cancel" data-ng-click="cancel()">
-                    <i class="glyphicon glyphicon-ban-circle"></i>
-                    <span>Cancel upload</span>
-                </button>
-                <!-- The global file processing state -->
-                <span class="fileupload-process"></span>
-            </div>
-            <!-- The global progress state -->
-            <div class="col-lg-5 fade" data-ng-class="{in: active()}">
-                <!-- The global progress bar -->
-                <div class="progress progress-striped active" data-file-upload-progress="progress()"><div class="progress-bar progress-bar-success" data-ng-style="{width: num + '%'}"></div></div>
-                <!-- The extended global progress state -->
-                <div class="progress-extended">&nbsp;</div>
-            </div>
-        </div>
-        <!-- The table listing the files available for upload/download -->
-        <table class="table table-striped files ng-cloak">
-            <tr data-ng-repeat="file in queue" data-ng-class="{'processing': file.$processing()}">
-                <td data-ng-switch data-on="!!file.thumbnailUrl">
-                    <div class="preview" data-ng-switch-when="true">
-                        <a data-ng-href="{{file.url}}" title="{{file.name}}" download="{{file.name}}" data-gallery><img data-ng-src="{{file.thumbnailUrl}}" alt=""></a>
-                    </div>
-                    <div class="preview" data-ng-switch-default data-file-upload-preview="file"></div>
-                </td>
-                <td>
-                    <p class="name" data-ng-switch data-on="!!file.url">
-                        <span data-ng-switch-when="true" data-ng-switch data-on="!!file.thumbnailUrl">
-                            <a data-ng-switch-when="true" data-ng-href="{{file.url}}" title="{{file.name}}" download="{{file.name}}" data-gallery>{{file.name}}</a>
-                            <a data-ng-switch-default data-ng-href="{{file.url}}" title="{{file.name}}" download="{{file.name}}">{{file.name}}</a>
-                        </span>
-                        <span data-ng-switch-default>{{file.name}}</span>
-                    </p>
-                    <strong data-ng-show="file.error" class="error text-danger">{{file.error}}</strong>
-                </td>
-                <td>
-                    <p class="size">{{file.size | formatFileSize}}</p>
-                    <div class="progress progress-striped active fade" data-ng-class="{pending: 'in'}[file.$state()]" data-file-upload-progress="file.$progress()"><div class="progress-bar progress-bar-success" data-ng-style="{width: num + '%'}"></div></div>
-                </td>
-                <td>
-                    <button type="button" class="btn btn-primary start" data-ng-click="file.$submit()" data-ng-hide="!file.$submit || options.autoUpload" data-ng-disabled="file.$state() == 'pending' || file.$state() == 'rejected'">
-                        <i class="glyphicon glyphicon-upload"></i>
-                        <span>Start</span>
-                    </button>
-                    <button type="button" class="btn btn-warning cancel" data-ng-click="file.$cancel()" data-ng-hide="!file.$cancel">
-                        <i class="glyphicon glyphicon-ban-circle"></i>
-                        <span>Cancel</span>
-                    </button>
-                    <button data-ng-controller="FileDestroyController" type="button" class="btn btn-danger destroy" data-ng-click="file.$destroy()" data-ng-hide="!file.$destroy">
-                        <i class="glyphicon glyphicon-trash"></i>
-                        <span>Delete</span>
-                    </button>
-                </td>
-            </tr>
-        </table>
-    </form>
-    <br>
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h3 class="panel-title">Demo Notes</h3>
-        </div>
-        <div class="panel-body">
-            <ul>
-                <li>The maximum file size for uploads in this demo is <strong>5 MB</strong> (default file size is unlimited).</li>
-                <li>Only image files (<strong>JPG, GIF, PNG</strong>) are allowed in this demo (by default there is no file type restriction).</li>
-                <li>Uploaded files will be deleted automatically after <strong>5 minutes</strong> (demo setting).</li>
-                <li>You can <strong>drag &amp; drop</strong> files from your desktop on this webpage (see <a href="https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support">Browser support</a>).</li>
-                <li>Please refer to the <a href="https://github.com/blueimp/jQuery-File-Upload">project website</a> and <a href="https://github.com/blueimp/jQuery-File-Upload/wiki">documentation</a> for more information.</li>
-                <li>Built with Twitter's <a href="http://twitter.github.com/bootstrap/">Bootstrap</a> CSS framework and Icons from <a href="http://glyphicons.com/">Glyphicons</a>.</li>
-            </ul>
-        </div>
-    </div>
-</div>
-<!-- The blueimp Gallery widget -->
-<div id="blueimp-gallery" class="blueimp-gallery blueimp-gallery-controls" data-filter=":even">
-    <div class="slides"></div>
-    <h3 class="title"></h3>
-    <a class="prev">‹</a>
-    <a class="next">›</a>
-    <a class="close">×</a>
-    <a class="play-pause"></a>
-    <ol class="indicator"></ol>
-</div>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.6/angular.min.js"></script>
-<!-- The jQuery UI widget factory, can be omitted if jQuery UI is already included -->
-<script src="js/vendor/jquery.ui.widget.js"></script>
-<!-- The Load Image plugin is included for the preview images and image resizing functionality -->
-<script src="http://blueimp.github.io/JavaScript-Load-Image/js/load-image.min.js"></script>
-<!-- The Canvas to Blob plugin is included for image resizing functionality -->
-<script src="http://blueimp.github.io/JavaScript-Canvas-to-Blob/js/canvas-to-blob.min.js"></script>
-<!-- Bootstrap JS is not required, but included for the responsive demo navigation -->
-<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
-<!-- blueimp Gallery script -->
-<script src="http://blueimp.github.io/Gallery/js/jquery.blueimp-gallery.min.js"></script>
-<!-- The Iframe Transport is required for browsers without support for XHR file uploads -->
-<script src="js/jquery.iframe-transport.js"></script>
-<!-- The basic File Upload plugin -->
-<script src="js/jquery.fileupload.js"></script>
-<!-- The File Upload processing plugin -->
-<script src="js/jquery.fileupload-process.js"></script>
-<!-- The File Upload image preview & resize plugin -->
-<script src="js/jquery.fileupload-image.js"></script>
-<!-- The File Upload audio preview plugin -->
-<script src="js/jquery.fileupload-audio.js"></script>
-<!-- The File Upload video preview plugin -->
-<script src="js/jquery.fileupload-video.js"></script>
-<!-- The File Upload validation plugin -->
-<script src="js/jquery.fileupload-validate.js"></script>
-<!-- The File Upload Angular JS module -->
-<script src="js/jquery.fileupload-angular.js"></script>
-<!-- The main application script -->
-<script src="js/app.js"></script>
-</body> 
-</html>

library/jqupload/basic-plus.html

@@ -1,226 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/*
- * jQuery File Upload Plugin Basic Plus Demo 1.3.5
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
--->
-<html lang="en">
-<head>
-<!-- Force latest IE rendering engine or ChromeFrame if installed -->
-<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><![endif]-->
-<meta charset="utf-8">
-<title>jQuery File Upload Demo - Basic Plus version</title>
-<meta name="description" content="File Upload widget with multiple file selection, drag&amp;drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<!-- Bootstrap styles -->
-<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css">
-<!-- Generic page styles -->
-<link rel="stylesheet" href="css/style.css">
-<!-- CSS to style the file input field as button and adjust the Bootstrap progress bars -->
-<link rel="stylesheet" href="css/jquery.fileupload.css">
-</head>
-<body>
-<div class="navbar navbar-default navbar-fixed-top">
-    <div class="container">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-fixed-top .navbar-collapse">
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="https://github.com/blueimp/jQuery-File-Upload">jQuery File Upload</a>
-        </div>
-        <div class="navbar-collapse collapse">
-            <ul class="nav navbar-nav">
-                <li><a href="https://github.com/blueimp/jQuery-File-Upload/tags">Download</a></li>
-                <li><a href="https://github.com/blueimp/jQuery-File-Upload">Source Code</a></li>
-                <li><a href="https://github.com/blueimp/jQuery-File-Upload/wiki">Documentation</a></li>
-                <li><a href="https://blueimp.net">&copy; Sebastian Tschan</a></li>
-            </ul>
-        </div>
-    </div>
-</div>
-<div class="container">
-    <h1>jQuery File Upload Demo</h1>
-    <h2 class="lead">Basic Plus version</h2>
-    <ul class="nav nav-tabs">
-        <li><a href="basic.html">Basic</a></li>
-        <li class="active"><a href="basic-plus.html">Basic Plus</a></li>
-        <li><a href="index.html">Basic Plus UI</a></li>
-        <li><a href="angularjs.html">AngularJS</a></li>
-        <li><a href="jquery-ui.html">jQuery UI</a></li>
-    </ul>
-    <br>
-    <blockquote>
-        <p>File Upload widget with multiple file selection, drag&amp;drop support, progress bar, validation and preview images, audio and video for jQuery.<br>
-        Supports cross-domain, chunked and resumable file uploads and client-side image resizing.<br>
-        Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.</p>
-    </blockquote>
-    <br>
-    <!-- The fileinput-button span is used to style the file input field as button -->
-    <span class="btn btn-success fileinput-button">
-        <i class="glyphicon glyphicon-plus"></i>
-        <span>Add files...</span>
-        <!-- The file input field used as target for the file upload widget -->
-        <input id="fileupload" type="file" name="files[]" multiple>
-    </span>
-    <br>
-    <br>
-    <!-- The global progress bar -->
-    <div id="progress" class="progress">
-        <div class="progress-bar progress-bar-success"></div>
-    </div>
-    <!-- The container for the uploaded files -->
-    <div id="files" class="files"></div>
-    <br>
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h3 class="panel-title">Demo Notes</h3>
-        </div>
-        <div class="panel-body">
-            <ul>
-                <li>The maximum file size for uploads in this demo is <strong>5 MB</strong> (default file size is unlimited).</li>
-                <li>Only image files (<strong>JPG, GIF, PNG</strong>) are allowed in this demo (by default there is no file type restriction).</li>
-                <li>Uploaded files will be deleted automatically after <strong>5 minutes</strong> (demo setting).</li>
-                <li>You can <strong>drag &amp; drop</strong> files from your desktop on this webpage (see <a href="https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support">Browser support</a>).</li>
-                <li>Please refer to the <a href="https://github.com/blueimp/jQuery-File-Upload">project website</a> and <a href="https://github.com/blueimp/jQuery-File-Upload/wiki">documentation</a> for more information.</li>
-                <li>Built with Twitter's <a href="http://twitter.github.com/bootstrap/">Bootstrap</a> CSS framework and Icons from <a href="http://glyphicons.com/">Glyphicons</a>.</li>
-            </ul>
-        </div>
-    </div>
-</div>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-<!-- The jQuery UI widget factory, can be omitted if jQuery UI is already included -->
-<script src="js/vendor/jquery.ui.widget.js"></script>
-<!-- The Load Image plugin is included for the preview images and image resizing functionality -->
-<script src="http://blueimp.github.io/JavaScript-Load-Image/js/load-image.min.js"></script>
-<!-- The Canvas to Blob plugin is included for image resizing functionality -->
-<script src="http://blueimp.github.io/JavaScript-Canvas-to-Blob/js/canvas-to-blob.min.js"></script>
-<!-- Bootstrap JS is not required, but included for the responsive demo navigation -->
-<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
-<!-- The Iframe Transport is required for browsers without support for XHR file uploads -->
-<script src="js/jquery.iframe-transport.js"></script>
-<!-- The basic File Upload plugin -->
-<script src="js/jquery.fileupload.js"></script>
-<!-- The File Upload processing plugin -->
-<script src="js/jquery.fileupload-process.js"></script>
-<!-- The File Upload image preview & resize plugin -->
-<script src="js/jquery.fileupload-image.js"></script>
-<!-- The File Upload audio preview plugin -->
-<script src="js/jquery.fileupload-audio.js"></script>
-<!-- The File Upload video preview plugin -->
-<script src="js/jquery.fileupload-video.js"></script>
-<!-- The File Upload validation plugin -->
-<script src="js/jquery.fileupload-validate.js"></script>
-<script>
-/*jslint unparam: true, regexp: true */
-/*global window, $ */
-$(function () {
-    'use strict';
-    // Change this to the location of your server-side upload handler:
-    var url = window.location.hostname === 'blueimp.github.io' ?
-                '//jquery-file-upload.appspot.com/' : 'server/php/',
-        uploadButton = $('<button/>')
-            .addClass('btn btn-primary')
-            .prop('disabled', true)
-            .text('Processing...')
-            .on('click', function () {
-                var $this = $(this),
-                    data = $this.data();
-                $this
-                    .off('click')
-                    .text('Abort')
-                    .on('click', function () {
-                        $this.remove();
-                        data.abort();
-                    });
-                data.submit().always(function () {
-                    $this.remove();
-                });
-            });
-    $('#fileupload').fileupload({
-        url: url,
-        dataType: 'json',
-        autoUpload: false,
-        acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
-        maxFileSize: 5000000, // 5 MB
-        // Enable image resizing, except for Android and Opera,
-        // which actually support image resizing, but fail to
-        // send Blob objects via XHR requests:
-        disableImageResize: /Android(?!.*Chrome)|Opera/
-            .test(window.navigator.userAgent),
-        previewMaxWidth: 100,
-        previewMaxHeight: 100,
-        previewCrop: true
-    }).on('fileuploadadd', function (e, data) {
-        data.context = $('<div/>').appendTo('#files');
-        $.each(data.files, function (index, file) {
-            var node = $('<p/>')
-                    .append($('<span/>').text(file.name));
-            if (!index) {
-                node
-                    .append('<br>')
-                    .append(uploadButton.clone(true).data(data));
-            }
-            node.appendTo(data.context);
-        });
-    }).on('fileuploadprocessalways', function (e, data) {
-        var index = data.index,
-            file = data.files[index],
-            node = $(data.context.children()[index]);
-        if (file.preview) {
-            node
-                .prepend('<br>')
-                .prepend(file.preview);
-        }
-        if (file.error) {
-            node
-                .append('<br>')
-                .append($('<span class="text-danger"/>').text(file.error));
-        }
-        if (index + 1 === data.files.length) {
-            data.context.find('button')
-                .text('Upload')
-                .prop('disabled', !!data.files.error);
-        }
-    }).on('fileuploadprogressall', function (e, data) {
-        var progress = parseInt(data.loaded / data.total * 100, 10);
-        $('#progress .progress-bar').css(
-            'width',
-            progress + '%'
-        );
-    }).on('fileuploaddone', function (e, data) {
-        $.each(data.result.files, function (index, file) {
-            if (file.url) {
-                var link = $('<a>')
-                    .attr('target', '_blank')
-                    .prop('href', file.url);
-                $(data.context.children()[index])
-                    .wrap(link);
-            } else if (file.error) {
-                var error = $('<span class="text-danger"/>').text(file.error);
-                $(data.context.children()[index])
-                    .append('<br>')
-                    .append(error);
-            }
-        });
-    }).on('fileuploadfail', function (e, data) {
-        $.each(data.files, function (index, file) {
-            var error = $('<span class="text-danger"/>').text('File upload failed.');
-            $(data.context.children()[index])
-                .append('<br>')
-                .append(error);
-        });
-    }).prop('disabled', !$.support.fileInput)
-        .parent().addClass($.support.fileInput ? undefined : 'disabled');
-});
-</script>
-</body> 
-</html>

library/jqupload/basic.html

@@ -1,136 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/*
- * jQuery File Upload Plugin Basic Demo 1.2.4
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
--->
-<html lang="en">
-<head>
-<!-- Force latest IE rendering engine or ChromeFrame if installed -->
-<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><![endif]-->
-<meta charset="utf-8">
-<title>jQuery File Upload Demo - Basic version</title>
-<meta name="description" content="File Upload widget with multiple file selection, drag&amp;drop support and progress bar for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<!-- Bootstrap styles -->
-<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css">
-<!-- Generic page styles -->
-<link rel="stylesheet" href="css/style.css">
-<!-- CSS to style the file input field as button and adjust the Bootstrap progress bars -->
-<link rel="stylesheet" href="css/jquery.fileupload.css">
-</head>
-<body>
-<div class="navbar navbar-default navbar-fixed-top">
-    <div class="container">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-fixed-top .navbar-collapse">
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="https://github.com/blueimp/jQuery-File-Upload">jQuery File Upload</a>
-        </div>
-        <div class="navbar-collapse collapse">
-            <ul class="nav navbar-nav">
-                <li><a href="https://github.com/blueimp/jQuery-File-Upload/tags">Download</a></li>
-                <li><a href="https://github.com/blueimp/jQuery-File-Upload">Source Code</a></li>
-                <li><a href="https://github.com/blueimp/jQuery-File-Upload/wiki">Documentation</a></li>
-                <li><a href="https://blueimp.net">&copy; Sebastian Tschan</a></li>
-            </ul>
-        </div>
-    </div>
-</div>
-<div class="container">
-    <h1>jQuery File Upload Demo</h1>
-    <h2 class="lead">Basic version</h2>
-    <ul class="nav nav-tabs">
-        <li class="active"><a href="basic.html">Basic</a></li>
-        <li><a href="basic-plus.html">Basic Plus</a></li>
-        <li><a href="index.html">Basic Plus UI</a></li>
-        <li><a href="angularjs.html">AngularJS</a></li>
-        <li><a href="jquery-ui.html">jQuery UI</a></li>
-    </ul>
-    <br>
-    <blockquote>
-        <p>File Upload widget with multiple file selection, drag&amp;drop support and progress bar for jQuery.<br>
-        Supports cross-domain, chunked and resumable file uploads.<br>
-        Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.</p>
-    </blockquote>
-    <br>
-    <!-- The fileinput-button span is used to style the file input field as button -->
-    <span class="btn btn-success fileinput-button">
-        <i class="glyphicon glyphicon-plus"></i>
-        <span>Select files...</span>
-        <!-- The file input field used as target for the file upload widget -->
-        <input id="fileupload" type="file" name="files[]" multiple>
-    </span>
-    <br>
-    <br>
-    <!-- The global progress bar -->
-    <div id="progress" class="progress">
-        <div class="progress-bar progress-bar-success"></div>
-    </div>
-    <!-- The container for the uploaded files -->
-    <div id="files" class="files"></div>
-    <br>
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h3 class="panel-title">Demo Notes</h3>
-        </div>
-        <div class="panel-body">
-            <ul>
-                <li>The maximum file size for uploads in this demo is <strong>5 MB</strong> (default file size is unlimited).</li>
-                <li>Only image files (<strong>JPG, GIF, PNG</strong>) are allowed in this demo (by default there is no file type restriction).</li>
-                <li>Uploaded files will be deleted automatically after <strong>5 minutes</strong> (demo setting).</li>
-                <li>You can <strong>drag &amp; drop</strong> files from your desktop on this webpage (see <a href="https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support">Browser support</a>).</li>
-                <li>Please refer to the <a href="https://github.com/blueimp/jQuery-File-Upload">project website</a> and <a href="https://github.com/blueimp/jQuery-File-Upload/wiki">documentation</a> for more information.</li>
-                <li>Built with Twitter's <a href="http://twitter.github.com/bootstrap/">Bootstrap</a> CSS framework and Icons from <a href="http://glyphicons.com/">Glyphicons</a>.</li>
-            </ul>
-        </div>
-    </div>
-</div>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-<!-- The jQuery UI widget factory, can be omitted if jQuery UI is already included -->
-<script src="js/vendor/jquery.ui.widget.js"></script>
-<!-- The Iframe Transport is required for browsers without support for XHR file uploads -->
-<script src="js/jquery.iframe-transport.js"></script>
-<!-- The basic File Upload plugin -->
-<script src="js/jquery.fileupload.js"></script>
-<!-- Bootstrap JS is not required, but included for the responsive demo navigation -->
-<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
-<script>
-/*jslint unparam: true */
-/*global window, $ */
-$(function () {
-    'use strict';
-    // Change this to the location of your server-side upload handler:
-    var url = window.location.hostname === 'blueimp.github.io' ?
-                '//jquery-file-upload.appspot.com/' : 'server/php/';
-    $('#fileupload').fileupload({
-        url: url,
-        dataType: 'json',
-        done: function (e, data) {
-            $.each(data.result.files, function (index, file) {
-                $('<p/>').text(file.name).appendTo('#files');
-            });
-        },
-        progressall: function (e, data) {
-            var progress = parseInt(data.loaded / data.total * 100, 10);
-            $('#progress .progress-bar').css(
-                'width',
-                progress + '%'
-            );
-        }
-    }).prop('disabled', !$.support.fileInput)
-        .parent().addClass($.support.fileInput ? undefined : 'disabled');
-});
-</script>
-</body> 
-</html>

library/jqupload/blueimp-file-upload.jquery.json

@@ -1,50 +0,0 @@
-{
-  "name": "blueimp-file-upload",
-  "version": "9.5.2",
-  "title": "jQuery File Upload",
-  "author": {
-    "name": "Sebastian Tschan",
-    "url": "https://blueimp.net"
-  },
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "http://www.opensource.org/licenses/MIT"
-    }
-  ],
-  "dependencies": {
-    "jquery": ">=1.6"
-  },
-  "description": "File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.",
-  "keywords": [
-    "jquery",
-    "file",
-    "upload",
-    "widget",
-    "multiple",
-    "selection",
-    "drag",
-    "drop",
-    "progress",
-    "preview",
-    "cross-domain",
-    "cross-site",
-    "chunk",
-    "resume",
-    "gae",
-    "go",
-    "python",
-    "php",
-    "bootstrap"
-  ],
-  "homepage": "https://github.com/blueimp/jQuery-File-Upload",
-  "docs": "https://github.com/blueimp/jQuery-File-Upload/wiki",
-  "demo": "http://blueimp.github.io/jQuery-File-Upload/",
-  "bugs": "https://github.com/blueimp/jQuery-File-Upload/issues",
-  "maintainers": [
-    {
-      "name": "Sebastian Tschan",
-      "url": "https://blueimp.net"
-    }
-  ]
-}

library/jqupload/bower.json

@@ -1,85 +0,0 @@
-{
-  "name": "blueimp-file-upload",
-  "version": "9.5.2",
-  "title": "jQuery File Upload",
-  "description": "File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.",
-  "keywords": [
-    "jquery",
-    "file",
-    "upload",
-    "widget",
-    "multiple",
-    "selection",
-    "drag",
-    "drop",
-    "progress",
-    "preview",
-    "cross-domain",
-    "cross-site",
-    "chunk",
-    "resume",
-    "gae",
-    "go",
-    "python",
-    "php",
-    "bootstrap"
-  ],
-  "homepage": "https://github.com/blueimp/jQuery-File-Upload",
-  "author": {
-    "name": "Sebastian Tschan",
-    "url": "https://blueimp.net"
-  },
-  "maintainers": [
-    {
-      "name": "Sebastian Tschan",
-      "url": "https://blueimp.net"
-    }
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/blueimp/jQuery-File-Upload.git"
-  },
-  "bugs": "https://github.com/blueimp/jQuery-File-Upload/issues",
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "http://www.opensource.org/licenses/MIT"
-    }
-  ],
-  "dependencies": {
-    "jquery": ">=1.6",
-    "blueimp-tmpl": ">=2.5.3",
-    "blueimp-load-image": ">=1.11.0",
-    "blueimp-canvas-to-blob": ">=2.1.0"
-  },
-  "main": [
-    "css/jquery.fileupload.css",
-    "css/jquery.fileupload-ui.css",
-    "css/jquery.fileupload-noscript.css",
-    "css/jquery.fileupload-ui-noscript.css",
-    "js/cors/jquery.postmessage-transport.js",
-    "js/cors/jquery.xdr-transport.js",
-    "js/vendor/jquery.ui.widget.js",
-    "js/jquery.fileupload.js",
-    "js/jquery.fileupload-process.js",
-    "js/jquery.fileupload-validate.js",
-    "js/jquery.fileupload-image.js",
-    "js/jquery.fileupload-audio.js",
-    "js/jquery.fileupload-video.js",
-    "js/jquery.fileupload-ui.js",
-    "js/jquery.fileupload-jquery-ui.js",
-    "js/jquery.fileupload-angular.js",
-    "js/jquery.iframe-transport.js"
-  ],
-  "ignore": [
-    "/*.*",
-    "/cors",
-    "css/demo-ie8.css",
-    "css/demo.css",
-    "css/style.css",
-    "js/app.js",
-    "js/main.js",
-    "server",
-    "test"
-  ]
-}

library/jqupload/cors/postmessage.html

@@ -1,75 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/*
- * jQuery File Upload Plugin postMessage API 1.2.1
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2011, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
--->
-<html lang="en">
-<head>
-<meta charset="utf-8">
-<title>jQuery File Upload Plugin postMessage API</title>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
-</head>
-<body>
-<script>
-/*jslint unparam: true, regexp: true */
-/*global $, Blob, FormData, location */
-'use strict';
-var origin = /^http:\/\/example.org/,
-    target = new RegExp('^(http(s)?:)?\\/\\/' + location.host + '\\/');
-$(window).on('message', function (e) {
-    e = e.originalEvent;
-    var s = e.data,
-        xhr = $.ajaxSettings.xhr(),
-        f;
-    if (!origin.test(e.origin)) {
-        throw new Error('Origin "' + e.origin + '" does not match ' + origin);
-    }
-    if (!target.test(e.data.url)) {
-        throw new Error('Target "' + e.data.url + '" does not match ' + target);
-    }
-    $(xhr.upload).on('progress', function (ev) {
-        ev = ev.originalEvent;
-        e.source.postMessage({
-            id: s.id,
-            type: ev.type,
-            timeStamp: ev.timeStamp,
-            lengthComputable: ev.lengthComputable,
-            loaded: ev.loaded,
-            total: ev.total
-        }, e.origin);
-    });
-    s.xhr = function () {
-        return xhr;
-    };
-    if (!(s.data instanceof Blob)) {
-        f = new FormData();
-        $.each(s.data, function (i, v) {
-            f.append(v.name, v.value);
-        });
-        s.data = f;
-    }
-    $.ajax(s).always(function (result, statusText, jqXHR) {
-        if (!jqXHR.done) {
-            jqXHR = result;
-            result = null;
-        }
-        e.source.postMessage({
-            id: s.id,
-            status: jqXHR.status,
-            statusText: statusText,
-            result: result,
-            headers: jqXHR.getAllResponseHeaders()
-        }, e.origin);
-    });
-});
-</script>
-</body>
-</html>

library/jqupload/cors/result.html

@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/*
- * jQuery Iframe Transport Plugin Redirect Page 2.0.1
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2010, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
--->
-<html lang="en">
-<head>
-<meta charset="utf-8">
-<title>jQuery Iframe Transport Plugin Redirect Page</title>
-</head>
-<body>
-<script>
-document.body.innerText=document.body.textContent=decodeURIComponent(window.location.search.slice(1));
-</script>
-</body>
-</html>

library/jqupload/css/demo-ie8.css

@@ -1,21 +0,0 @@
-@charset "UTF-8";
-/*
- * jQuery File Upload Demo CSS Fixes for IE<9 1.0.0
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-.navigation {
-  list-style: none;
-  padding: 0;
-  margin: 1em 0;
-}
-.navigation li {
-  display: inline;
-  margin-right: 10px;
-}

library/jqupload/css/demo.css

@@ -1,67 +0,0 @@
-@charset "UTF-8";
-/*
- * jQuery File Upload Demo CSS 1.1.0
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-body {
-  max-width: 750px;
-  margin: 0 auto;
-  padding: 1em;
-  font-family: "Lucida Grande", "Lucida Sans Unicode", Arial, sans-serif;
-  font-size: 1em;
-  line-height: 1.4em;
-  background: #222;
-  color: #fff;
-  -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-}
-a {
-  color: orange;
-  text-decoration: none;
-}
-img {
-  border: 0;
-  vertical-align: middle;
-}
-h1 {
-  line-height: 1em;
-}
-blockquote {
-  padding: 0 0 0 15px;
-  margin: 0 0 20px;
-  border-left: 5px solid #eee;
-}
-table {
-  width: 100%;
-  margin: 10px 0;
-}
-
-.fileupload-progress {
-	margin: 10px 0;
-}
-.fileupload-progress .progress-extended {
-	margin-top: 5px;
-}
-.error {
-  color: red;
-}
-
-@media (min-width: 481px) {
-  .navigation {
-    list-style: none;
-    padding: 0;
-  }
-  .navigation li {
-    display: inline-block;
-  }
-  .navigation li:not(:first-child):before {
-    content: "| ";
-  }
-}

library/jqupload/css/jquery.fileupload-noscript.css

@@ -1,22 +0,0 @@
-@charset "UTF-8";
-/*
- * jQuery File Upload Plugin NoScript CSS 1.2.0
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-.fileinput-button input {
-  position: static;
-  opacity: 1;
-  filter: none;
-  font-size: inherit;
-  direction: inherit;
-}
-.fileinput-button span {
-  display: none;
-}

library/jqupload/css/jquery.fileupload-ui-noscript.css

@@ -1,17 +0,0 @@
-@charset "UTF-8";
-/*
- * jQuery File Upload UI Plugin NoScript CSS 8.8.5
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2012, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-.fileinput-button i,
-.fileupload-buttonbar .delete,
-.fileupload-buttonbar .toggle {
-  display: none;
-}

library/jqupload/css/jquery.fileupload-ui.css

@@ -1,57 +0,0 @@
-@charset "UTF-8";
-/*
- * jQuery File Upload UI Plugin CSS 9.0.0
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2010, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-.fileupload-buttonbar .btn,
-.fileupload-buttonbar .toggle {
-  margin-bottom: 5px;
-}
-.progress-animated .progress-bar,
-.progress-animated .bar {
-  background: url("../img/progressbar.gif") !important;
-  filter: none;
-}
-.fileupload-process {
-  float: right;
-  display: none;
-}
-.fileupload-processing .fileupload-process,
-.files .processing .preview {
-  display: block;
-  width: 32px;
-  height: 32px;
-  background: url("../img/loading.gif") center no-repeat;
-  background-size: contain;
-}
-.files audio,
-.files video {
-  max-width: 300px;
-}
-
-@media (max-width: 767px) {
-  .fileupload-buttonbar .toggle,
-  .files .toggle,
-  .files .btn span {
-    display: none;
-  }
-  .files .name {
-    width: 80px;
-    word-wrap: break-word;
-  }
-  .files audio,
-  .files video {
-    max-width: 80px;
-  }
-  .files img,
-  .files canvas {
-    max-width: 100%;
-  }
-}

library/jqupload/css/jquery.fileupload.css

@@ -1,36 +0,0 @@
-@charset "UTF-8";
-/*
- * jQuery File Upload Plugin CSS 1.3.0
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-.fileinput-button {
-  position: relative;
-  overflow: hidden;
-}
-.fileinput-button input {
-  position: absolute;
-  top: 0;
-  right: 0;
-  margin: 0;
-  opacity: 0;
-  -ms-filter: 'alpha(opacity=0)';
-  font-size: 200px;
-  direction: ltr;
-  cursor: pointer;
-}
-
-/* Fixes for IE < 8 */
-@media screen\9 {
-  .fileinput-button input {
-    filter: alpha(opacity=0);
-    font-size: 100%;
-    height: 100%;
-  }
-}

library/jqupload/css/style.css

@@ -1,15 +0,0 @@
-@charset "UTF-8";
-/*
- * jQuery File Upload Plugin CSS Example 8.8.2
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-body {
-  padding-top: 60px;
-}

library/jqupload/index.html

@@ -1,255 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/*
- * jQuery File Upload Plugin Demo 9.0.1
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2010, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
--->
-<html lang="en">
-<head>
-<!-- Force latest IE rendering engine or ChromeFrame if installed -->
-<!--[if IE]>
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<![endif]-->
-<meta charset="utf-8">
-<title>jQuery File Upload Demo</title>
-<meta name="description" content="File Upload widget with multiple file selection, drag&amp;drop support, progress bars, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads and client-side image resizing. Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<!-- Bootstrap styles -->
-<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css">
-<!-- Generic page styles -->
-<link rel="stylesheet" href="css/style.css">
-<!-- blueimp Gallery styles -->
-<link rel="stylesheet" href="http://blueimp.github.io/Gallery/css/blueimp-gallery.min.css">
-<!-- CSS to style the file input field as button and adjust the Bootstrap progress bars -->
-<link rel="stylesheet" href="css/jquery.fileupload.css">
-<link rel="stylesheet" href="css/jquery.fileupload-ui.css">
-<!-- CSS adjustments for browsers with JavaScript disabled -->
-<noscript><link rel="stylesheet" href="css/jquery.fileupload-noscript.css"></noscript>
-<noscript><link rel="stylesheet" href="css/jquery.fileupload-ui-noscript.css"></noscript>
-</head>
-<body>
-<div class="navbar navbar-default navbar-fixed-top">
-    <div class="container">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-fixed-top .navbar-collapse">
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="https://github.com/blueimp/jQuery-File-Upload">jQuery File Upload</a>
-        </div>
-        <div class="navbar-collapse collapse">
-            <ul class="nav navbar-nav">
-                <li><a href="https://github.com/blueimp/jQuery-File-Upload/tags">Download</a></li>
-                <li><a href="https://github.com/blueimp/jQuery-File-Upload">Source Code</a></li>
-                <li><a href="https://github.com/blueimp/jQuery-File-Upload/wiki">Documentation</a></li>
-                <li><a href="https://blueimp.net">&copy; Sebastian Tschan</a></li>
-            </ul>
-        </div>
-    </div>
-</div>
-<div class="container">
-    <h1>jQuery File Upload Demo</h1>
-    <h2 class="lead">Basic Plus UI version</h2>
-    <ul class="nav nav-tabs">
-        <li><a href="basic.html">Basic</a></li>
-        <li><a href="basic-plus.html">Basic Plus</a></li>
-        <li class="active"><a href="index.html">Basic Plus UI</a></li>
-        <li><a href="angularjs.html">AngularJS</a></li>
-        <li><a href="jquery-ui.html">jQuery UI</a></li>
-    </ul>
-    <br>
-    <blockquote>
-        <p>File Upload widget with multiple file selection, drag&amp;drop support, progress bars, validation and preview images, audio and video for jQuery.<br>
-        Supports cross-domain, chunked and resumable file uploads and client-side image resizing.<br>
-        Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.</p>
-    </blockquote>
-    <br>
-    <!-- The file upload form used as target for the file upload widget -->
-    <form id="fileupload" action="//jquery-file-upload.appspot.com/" method="POST" enctype="multipart/form-data">
-        <!-- Redirect browsers with JavaScript disabled to the origin page -->
-        <noscript><input type="hidden" name="redirect" value="http://blueimp.github.io/jQuery-File-Upload/"></noscript>
-        <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
-        <div class="row fileupload-buttonbar">
-            <div class="col-lg-7">
-                <!-- The fileinput-button span is used to style the file input field as button -->
-                <span class="btn btn-success fileinput-button">
-                    <i class="glyphicon glyphicon-plus"></i>
-                    <span>Add files...</span>
-                    <input type="file" name="files[]" multiple>
-                </span>
-                <button type="submit" class="btn btn-primary start">
-                    <i class="glyphicon glyphicon-upload"></i>
-                    <span>Start upload</span>
-                </button>
-                <button type="reset" class="btn btn-warning cancel">
-                    <i class="glyphicon glyphicon-ban-circle"></i>
-                    <span>Cancel upload</span>
-                </button>
-                <button type="button" class="btn btn-danger delete">
-                    <i class="glyphicon glyphicon-trash"></i>
-                    <span>Delete</span>
-                </button>
-                <input type="checkbox" class="toggle">
-                <!-- The global file processing state -->
-                <span class="fileupload-process"></span>
-            </div>
-            <!-- The global progress state -->
-            <div class="col-lg-5 fileupload-progress fade">
-                <!-- The global progress bar -->
-                <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100">
-                    <div class="progress-bar progress-bar-success" style="width:0%;"></div>
-                </div>
-                <!-- The extended global progress state -->
-                <div class="progress-extended">&nbsp;</div>
-            </div>
-        </div>
-        <!-- The table listing the files available for upload/download -->
-        <table role="presentation" class="table table-striped"><tbody class="files"></tbody></table>
-    </form>
-    <br>
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h3 class="panel-title">Demo Notes</h3>
-        </div>
-        <div class="panel-body">
-            <ul>
-                <li>The maximum file size for uploads in this demo is <strong>5 MB</strong> (default file size is unlimited).</li>
-                <li>Only image files (<strong>JPG, GIF, PNG</strong>) are allowed in this demo (by default there is no file type restriction).</li>
-                <li>Uploaded files will be deleted automatically after <strong>5 minutes</strong> (demo setting).</li>
-                <li>You can <strong>drag &amp; drop</strong> files from your desktop on this webpage (see <a href="https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support">Browser support</a>).</li>
-                <li>Please refer to the <a href="https://github.com/blueimp/jQuery-File-Upload">project website</a> and <a href="https://github.com/blueimp/jQuery-File-Upload/wiki">documentation</a> for more information.</li>
-                <li>Built with Twitter's <a href="http://twitter.github.com/bootstrap/">Bootstrap</a> CSS framework and Icons from <a href="http://glyphicons.com/">Glyphicons</a>.</li>
-            </ul>
-        </div>
-    </div>
-</div>
-<!-- The blueimp Gallery widget -->
-<div id="blueimp-gallery" class="blueimp-gallery blueimp-gallery-controls" data-filter=":even">
-    <div class="slides"></div>
-    <h3 class="title"></h3>
-    <a class="prev">‹</a>
-    <a class="next">›</a>
-    <a class="close">×</a>
-    <a class="play-pause"></a>
-    <ol class="indicator"></ol>
-</div>
-<!-- The template to display files available for upload -->
-<script id="template-upload" type="text/x-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-upload fade">
-        <td>
-            <span class="preview"></span>
-        </td>
-        <td>
-            <p class="name">{%=file.name%}</p>
-            <strong class="error text-danger"></strong>
-        </td>
-        <td>
-            <p class="size">Processing...</p>
-            <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-success" style="width:0%;"></div></div>
-        </td>
-        <td>
-            {% if (!i && !o.options.autoUpload) { %}
-                <button class="btn btn-primary start" disabled>
-                    <i class="glyphicon glyphicon-upload"></i>
-                    <span>Start</span>
-                </button>
-            {% } %}
-            {% if (!i) { %}
-                <button class="btn btn-warning cancel">
-                    <i class="glyphicon glyphicon-ban-circle"></i>
-                    <span>Cancel</span>
-                </button>
-            {% } %}
-        </td>
-    </tr>
-{% } %}
-</script>
-<!-- The template to display files available for download -->
-<script id="template-download" type="text/x-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-download fade">
-        <td>
-            <span class="preview">
-                {% if (file.thumbnailUrl) { %}
-                    <a href="{%=file.url%}" title="{%=file.name%}" download="{%=file.name%}" data-gallery><img src="{%=file.thumbnailUrl%}"></a>
-                {% } %}
-            </span>
-        </td>
-        <td>
-            <p class="name">
-                {% if (file.url) { %}
-                    <a href="{%=file.url%}" title="{%=file.name%}" download="{%=file.name%}" {%=file.thumbnailUrl?'data-gallery':''%}>{%=file.name%}</a>
-                {% } else { %}
-                    <span>{%=file.name%}</span>
-                {% } %}
-            </p>
-            {% if (file.error) { %}
-                <div><span class="label label-danger">Error</span> {%=file.error%}</div>
-            {% } %}
-        </td>
-        <td>
-            <span class="size">{%=o.formatFileSize(file.size)%}</span>
-        </td>
-        <td>
-            {% if (file.deleteUrl) { %}
-                <button class="btn btn-danger delete" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                    <i class="glyphicon glyphicon-trash"></i>
-                    <span>Delete</span>
-                </button>
-                <input type="checkbox" name="delete" value="1" class="toggle">
-            {% } else { %}
-                <button class="btn btn-warning cancel">
-                    <i class="glyphicon glyphicon-ban-circle"></i>
-                    <span>Cancel</span>
-                </button>
-            {% } %}
-        </td>
-    </tr>
-{% } %}
-</script>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-<!-- The jQuery UI widget factory, can be omitted if jQuery UI is already included -->
-<script src="js/vendor/jquery.ui.widget.js"></script>
-<!-- The Templates plugin is included to render the upload/download listings -->
-<script src="http://blueimp.github.io/JavaScript-Templates/js/tmpl.min.js"></script>
-<!-- The Load Image plugin is included for the preview images and image resizing functionality -->
-<script src="http://blueimp.github.io/JavaScript-Load-Image/js/load-image.min.js"></script>
-<!-- The Canvas to Blob plugin is included for image resizing functionality -->
-<script src="http://blueimp.github.io/JavaScript-Canvas-to-Blob/js/canvas-to-blob.min.js"></script>
-<!-- Bootstrap JS is not required, but included for the responsive demo navigation -->
-<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
-<!-- blueimp Gallery script -->
-<script src="http://blueimp.github.io/Gallery/js/jquery.blueimp-gallery.min.js"></script>
-<!-- The Iframe Transport is required for browsers without support for XHR file uploads -->
-<script src="js/jquery.iframe-transport.js"></script>
-<!-- The basic File Upload plugin -->
-<script src="js/jquery.fileupload.js"></script>
-<!-- The File Upload processing plugin -->
-<script src="js/jquery.fileupload-process.js"></script>
-<!-- The File Upload image preview & resize plugin -->
-<script src="js/jquery.fileupload-image.js"></script>
-<!-- The File Upload audio preview plugin -->
-<script src="js/jquery.fileupload-audio.js"></script>
-<!-- The File Upload video preview plugin -->
-<script src="js/jquery.fileupload-video.js"></script>
-<!-- The File Upload validation plugin -->
-<script src="js/jquery.fileupload-validate.js"></script>
-<!-- The File Upload user interface plugin -->
-<script src="js/jquery.fileupload-ui.js"></script>
-<!-- The main application script -->
-<script src="js/main.js"></script>
-<!-- The XDomainRequest Transport is included for cross-domain file deletion for IE 8 and IE 9 -->
-<!--[if (gte IE 8)&(lt IE 10)]>
-<script src="js/cors/jquery.xdr-transport.js"></script>
-<![endif]-->
-</body> 
-</html>

library/jqupload/jquery-ui.html

@@ -1,250 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/*
- * jQuery File Upload Plugin jQuery UI Demo 9.0.0
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
--->
-<html lang="en">
-<head>
-<!-- Force latest IE rendering engine or ChromeFrame if installed -->
-<!--[if IE]>
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<![endif]-->
-<meta charset="utf-8">
-<title>jQuery File Upload Demo - jQuery UI version</title>
-<meta name="description" content="File Upload widget with multiple file selection, drag&amp;drop support, progress bars, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads and client-side image resizing. Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<!-- jQuery UI styles -->
-<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/themes/dark-hive/jquery-ui.css" id="theme">
-<!-- Demo styles -->
-<link rel="stylesheet" href="css/demo.css">
-<!--[if lte IE 8]>
-<link rel="stylesheet" href="css/demo-ie8.css">
-<![endif]-->
-<style>
-/* Adjust the jQuery UI widget font-size: */
-.ui-widget {
-    font-size: 0.95em;
-}
-</style>
-<!-- blueimp Gallery styles -->
-<link rel="stylesheet" href="http://blueimp.github.io/Gallery/css/blueimp-gallery.min.css">
-<!-- CSS to style the file input field as button and adjust the Bootstrap progress bars -->
-<link rel="stylesheet" href="css/jquery.fileupload.css">
-<link rel="stylesheet" href="css/jquery.fileupload-ui.css">
-<!-- CSS adjustments for browsers with JavaScript disabled -->
-<noscript><link rel="stylesheet" href="css/jquery.fileupload-noscript.css"></noscript>
-<noscript><link rel="stylesheet" href="css/jquery.fileupload-ui-noscript.css"></noscript>
-</head>
-<body>
-<ul class="navigation">
-    <li><h3><a href="https://github.com/blueimp/jQuery-File-Upload">jQuery File Upload</a></h3></li>
-    <li><a href="https://github.com/blueimp/jQuery-File-Upload/tags">Download</a></li>
-    <li><a href="https://github.com/blueimp/jQuery-File-Upload">Source Code</a></li>
-    <li><a href="https://github.com/blueimp/jQuery-File-Upload/wiki">Documentation</a></li>
-    <li><a href="https://blueimp.net">&copy; blueimp.net</a></li>
-</ul>
-<h1>jQuery File Upload Demo</h1>
-<h2>jQuery UI version</h2>
-<form>
-    <label for="theme-switcher">Theme:</label>
-    <select id="theme-switcher" class="pull-right">
-        <option value="black-tie">Black Tie</option>
-        <option value="blitzer">Blitzer</option>
-        <option value="cupertino">Cupertino</option>
-        <option value="dark-hive" selected>Dark Hive</option>
-        <option value="dot-luv">Dot Luv</option>
-        <option value="eggplant">Eggplant</option>
-        <option value="excite-bike">Excite Bike</option>
-        <option value="flick">Flick</option>
-        <option value="hot-sneaks">Hot sneaks</option>
-        <option value="humanity">Humanity</option>
-        <option value="le-frog">Le Frog</option>
-        <option value="mint-choc">Mint Choc</option>
-        <option value="overcast">Overcast</option>
-        <option value="pepper-grinder">Pepper Grinder</option>
-        <option value="redmond">Redmond</option>
-        <option value="smoothness">Smoothness</option>
-        <option value="south-street">South Street</option>
-        <option value="start">Start</option>
-        <option value="sunny">Sunny</option>
-        <option value="swanky-purse">Swanky Purse</option>
-        <option value="trontastic">Trontastic</option>
-        <option value="ui-darkness">UI Darkness</option>
-        <option value="ui-lightness">UI Lightness</option>
-        <option value="vader">Vader</option>
-    </select>
-</form>
-<ul class="navigation">
-    <li><a href="basic.html">Basic</a></li>
-    <li><a href="basic-plus.html">Basic Plus</a></li>
-    <li><a href="index.html">Basic Plus UI</a></li>
-    <li><a href="angularjs.html">AngularJS</a></li>
-    <li class="active"><a href="jquery-ui.html">jQuery UI</a></li>
-</ul>
-<blockquote>
-    <p>File Upload widget with multiple file selection, drag&amp;drop support, progress bars, validation and preview images, audio and video for jQuery UI.<br>
-    Supports cross-domain, chunked and resumable file uploads and client-side image resizing.<br>
-    Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.</p>
-</blockquote>
-<!-- The file upload form used as target for the file upload widget -->
-<form id="fileupload" action="//jquery-file-upload.appspot.com/" method="POST" enctype="multipart/form-data">
-    <!-- Redirect browsers with JavaScript disabled to the origin page -->
-    <noscript><input type="hidden" name="redirect" value="http://blueimp.github.io/jQuery-File-Upload/"></noscript>
-    <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
-    <div class="fileupload-buttonbar">
-        <div class="fileupload-buttons">
-            <!-- The fileinput-button span is used to style the file input field as button -->
-            <span class="fileinput-button">
-                <span>Add files...</span>
-                <input type="file" name="files[]" multiple>
-            </span>
-            <button type="submit" class="start">Start upload</button>
-            <button type="reset" class="cancel">Cancel upload</button>
-            <button type="button" class="delete">Delete</button>
-            <input type="checkbox" class="toggle">
-            <!-- The global file processing state -->
-            <span class="fileupload-process"></span>
-        </div>
-        <!-- The global progress state -->
-        <div class="fileupload-progress fade" style="display:none">
-            <!-- The global progress bar -->
-            <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100"></div>
-            <!-- The extended global progress state -->
-            <div class="progress-extended">&nbsp;</div>
-        </div>
-    </div>
-    <!-- The table listing the files available for upload/download -->
-    <table role="presentation"><tbody class="files"></tbody></table>
-</form>
-<br>
-<h3>Demo Notes</h3>
-<ul>
-    <li>The maximum file size for uploads in this demo is <strong>5 MB</strong> (default file size is unlimited).</li>
-    <li>Only image files (<strong>JPG, GIF, PNG</strong>) are allowed in this demo (by default there is no file type restriction).</li>
-    <li>Uploaded files will be deleted automatically after <strong>5 minutes</strong> (demo setting).</li>
-    <li>You can <strong>drag &amp; drop</strong> files from your desktop on this webpage (see <a href="https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support">Browser support</a>).</li>
-    <li>Please refer to the <a href="https://github.com/blueimp/jQuery-File-Upload">project website</a> and <a href="https://github.com/blueimp/jQuery-File-Upload/wiki">documentation</a> for more information.</li>
-    <li>Built with <a href="http://jqueryui.com">jQuery UI</a>.</li>
-</ul>
-<!-- The blueimp Gallery widget -->
-<div id="blueimp-gallery" class="blueimp-gallery blueimp-gallery-controls" data-filter=":even">
-    <div class="slides"></div>
-    <h3 class="title"></h3>
-    <a class="prev">‹</a>
-    <a class="next">›</a>
-    <a class="close">×</a>
-    <a class="play-pause"></a>
-    <ol class="indicator"></ol>
-</div>
-<!-- The template to display files available for upload -->
-<script id="template-upload" type="text/x-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-upload fade">
-        <td>
-            <span class="preview"></span>
-        </td>
-        <td>
-            <p class="name">{%=file.name%}</p>
-            <strong class="error"></strong>
-        </td>
-        <td>
-            <p class="size">Processing...</p>
-            <div class="progress"></div>
-        </td>
-        <td>
-            {% if (!i && !o.options.autoUpload) { %}
-                <button class="start">Start</button>
-            {% } %}
-            {% if (!i) { %}
-                <button class="cancel">Cancel</button>
-            {% } %}
-        </td>
-    </tr>
-{% } %}
-</script>
-<!-- The template to display files available for download -->
-<script id="template-download" type="text/x-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-download fade">
-        <td>
-            <span class="preview">
-                {% if (file.thumbnailUrl) { %}
-                    <a href="{%=file.url%}" title="{%=file.name%}" download="{%=file.name%}" data-gallery><img src="{%=file.thumbnailUrl%}"></a>
-                {% } %}
-            </span>
-        </td>
-        <td>
-            <p class="name">
-                <a href="{%=file.url%}" title="{%=file.name%}" download="{%=file.name%}" {%=file.thumbnailUrl?'data-gallery':''%}>{%=file.name%}</a>
-            </p>
-            {% if (file.error) { %}
-                <div><span class="error">Error</span> {%=file.error%}</div>
-            {% } %}
-        </td>
-        <td>
-            <span class="size">{%=o.formatFileSize(file.size)%}</span>
-        </td>
-        <td>
-            <button class="delete" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>Delete</button>
-            <input type="checkbox" name="delete" value="1" class="toggle">
-        </td>
-    </tr>
-{% } %}
-</script>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
-<!-- The Templates plugin is included to render the upload/download listings -->
-<script src="http://blueimp.github.io/JavaScript-Templates/js/tmpl.min.js"></script>
-<!-- The Load Image plugin is included for the preview images and image resizing functionality -->
-<script src="http://blueimp.github.io/JavaScript-Load-Image/js/load-image.min.js"></script>
-<!-- The Canvas to Blob plugin is included for image resizing functionality -->
-<script src="http://blueimp.github.io/JavaScript-Canvas-to-Blob/js/canvas-to-blob.min.js"></script>
-<!-- blueimp Gallery script -->
-<script src="http://blueimp.github.io/Gallery/js/jquery.blueimp-gallery.min.js"></script>
-<!-- The Iframe Transport is required for browsers without support for XHR file uploads -->
-<script src="js/jquery.iframe-transport.js"></script>
-<!-- The basic File Upload plugin -->
-<script src="js/jquery.fileupload.js"></script>
-<!-- The File Upload processing plugin -->
-<script src="js/jquery.fileupload-process.js"></script>
-<!-- The File Upload image preview & resize plugin -->
-<script src="js/jquery.fileupload-image.js"></script>
-<!-- The File Upload audio preview plugin -->
-<script src="js/jquery.fileupload-audio.js"></script>
-<!-- The File Upload video preview plugin -->
-<script src="js/jquery.fileupload-video.js"></script>
-<!-- The File Upload validation plugin -->
-<script src="js/jquery.fileupload-validate.js"></script>
-<!-- The File Upload user interface plugin -->
-<script src="js/jquery.fileupload-ui.js"></script>
-<!-- The File Upload jQuery UI plugin -->
-<script src="js/jquery.fileupload-jquery-ui.js"></script>
-<!-- The main application script -->
-<script src="js/main.js"></script>
-<script>
-// Initialize the jQuery UI theme switcher:
-$('#theme-switcher').change(function () {
-    var theme = $('#theme');
-    theme.prop(
-        'href',
-        theme.prop('href').replace(
-            /[\w\-]+\/jquery-ui.css/,
-            $(this).val() + '/jquery-ui.css'
-        )
-    );
-});
-</script>
-<!-- The XDomainRequest Transport is included for cross-domain file deletion for IE 8 and IE 9 -->
-<!--[if (gte IE 8)&(lt IE 10)]>
-<script src="js/cors/jquery.xdr-transport.js"></script>
-<![endif]-->
-</body> 
-</html>

library/jqupload/js/app.js

@@ -1,101 +0,0 @@
-/*
- * jQuery File Upload Plugin Angular JS Example 1.2.1
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/* jshint nomen:false */
-/* global window, angular */
-
-(function () {
-    'use strict';
-
-    var isOnGitHub = window.location.hostname === 'blueimp.github.io',
-        url = isOnGitHub ? '//jquery-file-upload.appspot.com/' : 'server/php/';
-
-    angular.module('demo', [
-        'blueimp.fileupload'
-    ])
-        .config([
-            '$httpProvider', 'fileUploadProvider',
-            function ($httpProvider, fileUploadProvider) {
-                delete $httpProvider.defaults.headers.common['X-Requested-With'];
-                fileUploadProvider.defaults.redirect = window.location.href.replace(
-                    /\/[^\/]*$/,
-                    '/cors/result.html?%s'
-                );
-                if (isOnGitHub) {
-                    // Demo settings:
-                    angular.extend(fileUploadProvider.defaults, {
-                        // Enable image resizing, except for Android and Opera,
-                        // which actually support image resizing, but fail to
-                        // send Blob objects via XHR requests:
-                        disableImageResize: /Android(?!.*Chrome)|Opera/
-                            .test(window.navigator.userAgent),
-                        maxFileSize: 5000000,
-                        acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i
-                    });
-                }
-            }
-        ])
-
-        .controller('DemoFileUploadController', [
-            '$scope', '$http', '$filter', '$window',
-            function ($scope, $http) {
-                $scope.options = {
-                    url: url
-                };
-                if (!isOnGitHub) {
-                    $scope.loadingFiles = true;
-                    $http.get(url)
-                        .then(
-                            function (response) {
-                                $scope.loadingFiles = false;
-                                $scope.queue = response.data.files || [];
-                            },
-                            function () {
-                                $scope.loadingFiles = false;
-                            }
-                        );
-                }
-            }
-        ])
-
-        .controller('FileDestroyController', [
-            '$scope', '$http',
-            function ($scope, $http) {
-                var file = $scope.file,
-                    state;
-                if (file.url) {
-                    file.$state = function () {
-                        return state;
-                    };
-                    file.$destroy = function () {
-                        state = 'pending';
-                        return $http({
-                            url: file.deleteUrl,
-                            method: file.deleteType
-                        }).then(
-                            function () {
-                                state = 'resolved';
-                                $scope.clear(file);
-                            },
-                            function () {
-                                state = 'rejected';
-                            }
-                        );
-                    };
-                } else if (!file.$cancel && !file._index) {
-                    file.$cancel = function () {
-                        $scope.clear(file);
-                    };
-                }
-            }
-        ]);
-
-}());

library/jqupload/js/cors/jquery.postmessage-transport.js

@@ -1,117 +0,0 @@
-/*
- * jQuery postMessage Transport Plugin 1.1.1
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2011, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/* global define, window, document */
-
-(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define(['jquery'], factory);
-    } else {
-        // Browser globals:
-        factory(window.jQuery);
-    }
-}(function ($) {
-    'use strict';
-
-    var counter = 0,
-        names = [
-            'accepts',
-            'cache',
-            'contents',
-            'contentType',
-            'crossDomain',
-            'data',
-            'dataType',
-            'headers',
-            'ifModified',
-            'mimeType',
-            'password',
-            'processData',
-            'timeout',
-            'traditional',
-            'type',
-            'url',
-            'username'
-        ],
-        convert = function (p) {
-            return p;
-        };
-
-    $.ajaxSetup({
-        converters: {
-            'postmessage text': convert,
-            'postmessage json': convert,
-            'postmessage html': convert
-        }
-    });
-
-    $.ajaxTransport('postmessage', function (options) {
-        if (options.postMessage && window.postMessage) {
-            var iframe,
-                loc = $('<a>').prop('href', options.postMessage)[0],
-                target = loc.protocol + '//' + loc.host,
-                xhrUpload = options.xhr().upload;
-            return {
-                send: function (_, completeCallback) {
-                    counter += 1;
-                    var message = {
-                            id: 'postmessage-transport-' + counter
-                        },
-                        eventName = 'message.' + message.id;
-                    iframe = $(
-                        '<iframe style="display:none;" src="' +
-                            options.postMessage + '" name="' +
-                            message.id + '"></iframe>'
-                    ).bind('load', function () {
-                        $.each(names, function (i, name) {
-                            message[name] = options[name];
-                        });
-                        message.dataType = message.dataType.replace('postmessage ', '');
-                        $(window).bind(eventName, function (e) {
-                            e = e.originalEvent;
-                            var data = e.data,
-                                ev;
-                            if (e.origin === target && data.id === message.id) {
-                                if (data.type === 'progress') {
-                                    ev = document.createEvent('Event');
-                                    ev.initEvent(data.type, false, true);
-                                    $.extend(ev, data);
-                                    xhrUpload.dispatchEvent(ev);
-                                } else {
-                                    completeCallback(
-                                        data.status,
-                                        data.statusText,
-                                        {postmessage: data.result},
-                                        data.headers
-                                    );
-                                    iframe.remove();
-                                    $(window).unbind(eventName);
-                                }
-                            }
-                        });
-                        iframe[0].contentWindow.postMessage(
-                            message,
-                            target
-                        );
-                    }).appendTo(document.body);
-                },
-                abort: function () {
-                    if (iframe) {
-                        iframe.remove();
-                    }
-                }
-            };
-        }
-    });
-
-}));

library/jqupload/js/cors/jquery.xdr-transport.js

@@ -1,86 +0,0 @@
-/*
- * jQuery XDomainRequest Transport Plugin 1.1.3
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2011, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- *
- * Based on Julian Aubourg's ajaxHooks xdr.js:
- * https://github.com/jaubourg/ajaxHooks/
- */
-
-/* global define, window, XDomainRequest */
-
-(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define(['jquery'], factory);
-    } else {
-        // Browser globals:
-        factory(window.jQuery);
-    }
-}(function ($) {
-    'use strict';
-    if (window.XDomainRequest && !$.support.cors) {
-        $.ajaxTransport(function (s) {
-            if (s.crossDomain && s.async) {
-                if (s.timeout) {
-                    s.xdrTimeout = s.timeout;
-                    delete s.timeout;
-                }
-                var xdr;
-                return {
-                    send: function (headers, completeCallback) {
-                        var addParamChar = /\?/.test(s.url) ? '&' : '?';
-                        function callback(status, statusText, responses, responseHeaders) {
-                            xdr.onload = xdr.onerror = xdr.ontimeout = $.noop;
-                            xdr = null;
-                            completeCallback(status, statusText, responses, responseHeaders);
-                        }
-                        xdr = new XDomainRequest();
-                        // XDomainRequest only supports GET and POST:
-                        if (s.type === 'DELETE') {
-                            s.url = s.url + addParamChar + '_method=DELETE';
-                            s.type = 'POST';
-                        } else if (s.type === 'PUT') {
-                            s.url = s.url + addParamChar + '_method=PUT';
-                            s.type = 'POST';
-                        } else if (s.type === 'PATCH') {
-                            s.url = s.url + addParamChar + '_method=PATCH';
-                            s.type = 'POST';
-                        }
-                        xdr.open(s.type, s.url);
-                        xdr.onload = function () {
-                            callback(
-                                200,
-                                'OK',
-                                {text: xdr.responseText},
-                                'Content-Type: ' + xdr.contentType
-                            );
-                        };
-                        xdr.onerror = function () {
-                            callback(404, 'Not Found');
-                        };
-                        if (s.xdrTimeout) {
-                            xdr.ontimeout = function () {
-                                callback(0, 'timeout');
-                            };
-                            xdr.timeout = s.xdrTimeout;
-                        }
-                        xdr.send((s.hasContent && s.data) || null);
-                    },
-                    abort: function () {
-                        if (xdr) {
-                            xdr.onerror = $.noop();
-                            xdr.abort();
-                        }
-                    }
-                };
-            }
-        });
-    }
-}));

library/jqupload/js/jquery.fileupload-angular.js

@@ -1,428 +0,0 @@
-/*
- * jQuery File Upload AngularJS Plugin 2.1.3
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/* jshint nomen:false */
-/* global define, angular */
-
-(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define([
-            'jquery',
-            'angular',
-            './jquery.fileupload-image',
-            './jquery.fileupload-audio',
-            './jquery.fileupload-video',
-            './jquery.fileupload-validate'
-        ], factory);
-    } else {
-        factory();
-    }
-}(function () {
-    'use strict';
-
-    angular.module('blueimp.fileupload', [])
-
-        // The fileUpload service provides configuration options
-        // for the fileUpload directive and default handlers for
-        // File Upload events:
-        .provider('fileUpload', function () {
-            var scopeEvalAsync = function (expression) {
-                    var scope = angular.element(this)
-                            .fileupload('option', 'scope')();
-                    // Schedule a new $digest cycle if not already inside of one
-                    // and evaluate the given expression:
-                    scope.$evalAsync(expression);
-                },
-                addFileMethods = function (scope, data) {
-                    var files = data.files,
-                        file = files[0];
-                    angular.forEach(files, function (file, index) {
-                        file._index = index;
-                        file.$state = function () {
-                            return data.state();
-                        };
-                        file.$processing = function () {
-                            return data.processing();
-                        };
-                        file.$progress = function () {
-                            return data.progress();
-                        };
-                        file.$response = function () {
-                            return data.response();
-                        };
-                    });
-                    file.$submit = function () {
-                        if (!file.error) {
-                            return data.submit();
-                        }
-                    };
-                    file.$cancel = function () {
-                        return data.abort();
-                    };
-                },
-                $config;
-            $config = this.defaults = {
-                handleResponse: function (e, data) {
-                    var files = data.result && data.result.files;
-                    if (files) {
-                        data.scope().replace(data.files, files);
-                    } else if (data.errorThrown ||
-                            data.textStatus === 'error') {
-                        data.files[0].error = data.errorThrown ||
-                            data.textStatus;
-                    }
-                },
-                add: function (e, data) {
-                    if (e.isDefaultPrevented()) {
-                        return false;
-                    }
-                    var scope = data.scope(),
-                        filesCopy = [];
-                    angular.forEach(data.files, function (file) {
-                        filesCopy.push(file);
-                    });
-                    scope.$apply(function () {
-                        addFileMethods(scope, data);
-                        var method = scope.option('prependFiles') ?
-                                'unshift' : 'push';
-                        Array.prototype[method].apply(scope.queue, data.files);
-                    });
-                    data.process(function () {
-                        return scope.process(data);
-                    }).always(function () {
-                        scope.$apply(function () {
-                            addFileMethods(scope, data);
-                            scope.replace(filesCopy, data.files);
-                        });
-                    }).then(function () {
-                        if ((scope.option('autoUpload') ||
-                                data.autoUpload) &&
-                                data.autoUpload !== false) {
-                            data.submit();
-                        }
-                    });
-                },
-                progress: function (e, data) {
-                    if (e.isDefaultPrevented()) {
-                        return false;
-                    }
-                    data.scope().$apply();
-                },
-                done: function (e, data) {
-                    if (e.isDefaultPrevented()) {
-                        return false;
-                    }
-                    var that = this;
-                    data.scope().$apply(function () {
-                        data.handleResponse.call(that, e, data);
-                    });
-                },
-                fail: function (e, data) {
-                    if (e.isDefaultPrevented()) {
-                        return false;
-                    }
-                    var that = this,
-                        scope = data.scope();
-                    if (data.errorThrown === 'abort') {
-                        scope.clear(data.files);
-                        return;
-                    }
-                    scope.$apply(function () {
-                        data.handleResponse.call(that, e, data);
-                    });
-                },
-                stop: scopeEvalAsync,
-                processstart: scopeEvalAsync,
-                processstop: scopeEvalAsync,
-                getNumberOfFiles: function () {
-                    var scope = this.scope();
-                    return scope.queue.length - scope.processing();
-                },
-                dataType: 'json',
-                autoUpload: false
-            };
-            this.$get = [
-                function () {
-                    return {
-                        defaults: $config
-                    };
-                }
-            ];
-        })
-
-        // Format byte numbers to readable presentations:
-        .provider('formatFileSizeFilter', function () {
-            var $config = {
-                // Byte units following the IEC format
-                // http://en.wikipedia.org/wiki/Kilobyte
-                units: [
-                    {size: 1000000000, suffix: ' GB'},
-                    {size: 1000000, suffix: ' MB'},
-                    {size: 1000, suffix: ' KB'}
-                ]
-            };
-            this.defaults = $config;
-            this.$get = function () {
-                return function (bytes) {
-                    if (!angular.isNumber(bytes)) {
-                        return '';
-                    }
-                    var unit = true,
-                        i = 0,
-                        prefix,
-                        suffix;
-                    while (unit) {
-                        unit = $config.units[i];
-                        prefix = unit.prefix || '';
-                        suffix = unit.suffix || '';
-                        if (i === $config.units.length - 1 || bytes >= unit.size) {
-                            return prefix + (bytes / unit.size).toFixed(2) + suffix;
-                        }
-                        i += 1;
-                    }
-                };
-            };
-        })
-
-        // The FileUploadController initializes the fileupload widget and
-        // provides scope methods to control the File Upload functionality:
-        .controller('FileUploadController', [
-            '$scope', '$element', '$attrs', '$window', 'fileUpload',
-            function ($scope, $element, $attrs, $window, fileUpload) {
-                var uploadMethods = {
-                    progress: function () {
-                        return $element.fileupload('progress');
-                    },
-                    active: function () {
-                        return $element.fileupload('active');
-                    },
-                    option: function (option, data) {
-                        return $element.fileupload('option', option, data);
-                    },
-                    add: function (data) {
-                        return $element.fileupload('add', data);
-                    },
-                    send: function (data) {
-                        return $element.fileupload('send', data);
-                    },
-                    process: function (data) {
-                        return $element.fileupload('process', data);
-                    },
-                    processing: function (data) {
-                        return $element.fileupload('processing', data);
-                    }
-                };
-                $scope.disabled = !$window.jQuery.support.fileInput;
-                $scope.queue = $scope.queue || [];
-                $scope.clear = function (files) {
-                    var queue = this.queue,
-                        i = queue.length,
-                        file = files,
-                        length = 1;
-                    if (angular.isArray(files)) {
-                        file = files[0];
-                        length = files.length;
-                    }
-                    while (i) {
-                        i -= 1;
-                        if (queue[i] === file) {
-                            return queue.splice(i, length);
-                        }
-                    }
-                };
-                $scope.replace = function (oldFiles, newFiles) {
-                    var queue = this.queue,
-                        file = oldFiles[0],
-                        i,
-                        j;
-                    for (i = 0; i < queue.length; i += 1) {
-                        if (queue[i] === file) {
-                            for (j = 0; j < newFiles.length; j += 1) {
-                                queue[i + j] = newFiles[j];
-                            }
-                            return;
-                        }
-                    }
-                };
-                $scope.applyOnQueue = function (method) {
-                    var list = this.queue.slice(0),
-                        i,
-                        file;
-                    for (i = 0; i < list.length; i += 1) {
-                        file = list[i];
-                        if (file[method]) {
-                            file[method]();
-                        }
-                    }
-                };
-                $scope.submit = function () {
-                    this.applyOnQueue('$submit');
-                };
-                $scope.cancel = function () {
-                    this.applyOnQueue('$cancel');
-                };
-                // Add upload methods to the scope:
-                angular.extend($scope, uploadMethods);
-                // The fileupload widget will initialize with
-                // the options provided via "data-"-parameters,
-                // as well as those given via options object:
-                $element.fileupload(angular.extend(
-                    {scope: function () {
-                        return $scope;
-                    }},
-                    fileUpload.defaults
-                )).on('fileuploadadd', function (e, data) {
-                    data.scope = $scope.option('scope');
-                }).on('fileuploadfail', function (e, data) {
-                    if (data.errorThrown === 'abort') {
-                        return;
-                    }
-                    if (data.dataType &&
-                            data.dataType.indexOf('json') === data.dataType.length - 4) {
-                        try {
-                            data.result = angular.fromJson(data.jqXHR.responseText);
-                        } catch (ignore) {}
-                    }
-                }).on([
-                    'fileuploadadd',
-                    'fileuploadsubmit',
-                    'fileuploadsend',
-                    'fileuploaddone',
-                    'fileuploadfail',
-                    'fileuploadalways',
-                    'fileuploadprogress',
-                    'fileuploadprogressall',
-                    'fileuploadstart',
-                    'fileuploadstop',
-                    'fileuploadchange',
-                    'fileuploadpaste',
-                    'fileuploaddrop',
-                    'fileuploaddragover',
-                    'fileuploadchunksend',
-                    'fileuploadchunkdone',
-                    'fileuploadchunkfail',
-                    'fileuploadchunkalways',
-                    'fileuploadprocessstart',
-                    'fileuploadprocess',
-                    'fileuploadprocessdone',
-                    'fileuploadprocessfail',
-                    'fileuploadprocessalways',
-                    'fileuploadprocessstop'
-                ].join(' '), function (e, data) {
-                    if ($scope.$emit(e.type, data).defaultPrevented) {
-                        e.preventDefault();
-                    }
-                }).on('remove', function () {
-                    // Remove upload methods from the scope,
-                    // when the widget is removed:
-                    var method;
-                    for (method in uploadMethods) {
-                        if (uploadMethods.hasOwnProperty(method)) {
-                            delete $scope[method];
-                        }
-                    }
-                });
-                // Observe option changes:
-                $scope.$watch(
-                    $attrs.fileUpload,
-                    function (newOptions) {
-                        if (newOptions) {
-                            $element.fileupload('option', newOptions);
-                        }
-                    }
-                );
-            }
-        ])
-
-        // Provide File Upload progress feedback:
-        .controller('FileUploadProgressController', [
-            '$scope', '$attrs', '$parse',
-            function ($scope, $attrs, $parse) {
-                var fn = $parse($attrs.fileUploadProgress),
-                    update = function () {
-                        var progress = fn($scope);
-                        if (!progress || !progress.total) {
-                            return;
-                        }
-                        $scope.num = Math.floor(
-                            progress.loaded / progress.total * 100
-                        );
-                    };
-                update();
-                $scope.$watch(
-                    $attrs.fileUploadProgress + '.loaded',
-                    function (newValue, oldValue) {
-                        if (newValue !== oldValue) {
-                            update();
-                        }
-                    }
-                );
-            }
-        ])
-
-        // Display File Upload previews:
-        .controller('FileUploadPreviewController', [
-            '$scope', '$element', '$attrs',
-            function ($scope, $element, $attrs) {
-                $scope.$watch(
-                    $attrs.fileUploadPreview + '.preview',
-                    function (preview) {
-                        $element.empty();
-                        if (preview) {
-                            $element.append(preview);
-                        }
-                    }
-                );
-            }
-        ])
-
-        .directive('fileUpload', function () {
-            return {
-                controller: 'FileUploadController',
-                scope: true
-            };
-        })
-
-        .directive('fileUploadProgress', function () {
-            return {
-                controller: 'FileUploadProgressController',
-                scope: true
-            };
-        })
-
-        .directive('fileUploadPreview', function () {
-            return {
-                controller: 'FileUploadPreviewController'
-            };
-        })
-
-        // Enhance the HTML5 download attribute to
-        // allow drag&drop of files to the desktop:
-        .directive('download', function () {
-            return function (scope, elm) {
-                elm.on('dragstart', function (e) {
-                    try {
-                        e.originalEvent.dataTransfer.setData(
-                            'DownloadURL',
-                            [
-                                'application/octet-stream',
-                                elm.prop('download'),
-                                elm.prop('href')
-                            ].join(':')
-                        );
-                    } catch (ignore) {}
-                });
-            };
-        });
-
-}));

library/jqupload/js/jquery.fileupload-audio.js

@@ -1,106 +0,0 @@
-/*
- * jQuery File Upload Audio Preview Plugin 1.0.3
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/* jshint nomen:false */
-/* global define, window, document */
-
-(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define([
-            'jquery',
-            'load-image',
-            './jquery.fileupload-process'
-        ], factory);
-    } else {
-        // Browser globals:
-        factory(
-            window.jQuery,
-            window.loadImage
-        );
-    }
-}(function ($, loadImage) {
-    'use strict';
-
-    // Prepend to the default processQueue:
-    $.blueimp.fileupload.prototype.options.processQueue.unshift(
-        {
-            action: 'loadAudio',
-            // Use the action as prefix for the "@" options:
-            prefix: true,
-            fileTypes: '@',
-            maxFileSize: '@',
-            disabled: '@disableAudioPreview'
-        },
-        {
-            action: 'setAudio',
-            name: '@audioPreviewName',
-            disabled: '@disableAudioPreview'
-        }
-    );
-
-    // The File Upload Audio Preview plugin extends the fileupload widget
-    // with audio preview functionality:
-    $.widget('blueimp.fileupload', $.blueimp.fileupload, {
-
-        options: {
-            // The regular expression for the types of audio files to load,
-            // matched against the file type:
-            loadAudioFileTypes: /^audio\/.*$/
-        },
-
-        _audioElement: document.createElement('audio'),
-
-        processActions: {
-
-            // Loads the audio file given via data.files and data.index
-            // as audio element if the browser supports playing it.
-            // Accepts the options fileTypes (regular expression)
-            // and maxFileSize (integer) to limit the files to load:
-            loadAudio: function (data, options) {
-                if (options.disabled) {
-                    return data;
-                }
-                var file = data.files[data.index],
-                    url,
-                    audio;
-                if (this._audioElement.canPlayType &&
-                        this._audioElement.canPlayType(file.type) &&
-                        ($.type(options.maxFileSize) !== 'number' ||
-                            file.size <= options.maxFileSize) &&
-                        (!options.fileTypes ||
-                            options.fileTypes.test(file.type))) {
-                    url = loadImage.createObjectURL(file);
-                    if (url) {
-                        audio = this._audioElement.cloneNode(false);
-                        audio.src = url;
-                        audio.controls = true;
-                        data.audio = audio;
-                        return data;
-                    }
-                }
-                return data;
-            },
-
-            // Sets the audio element as a property of the file object:
-            setAudio: function (data, options) {
-                if (data.audio && !options.disabled) {
-                    data.files[data.index][options.name || 'preview'] = data.audio;
-                }
-                return data;
-            }
-
-        }
-
-    });
-
-}));

library/jqupload/js/jquery.fileupload-image.js

@@ -1,309 +0,0 @@
-/*
- * jQuery File Upload Image Preview & Resize Plugin 1.7.0
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/* jshint nomen:false */
-/* global define, window, Blob */
-
-(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define([
-            'jquery',
-            'load-image',
-            'load-image-meta',
-            'load-image-exif',
-            'load-image-ios',
-            'canvas-to-blob',
-            './jquery.fileupload-process'
-        ], factory);
-    } else {
-        // Browser globals:
-        factory(
-            window.jQuery,
-            window.loadImage
-        );
-    }
-}(function ($, loadImage) {
-    'use strict';
-
-    // Prepend to the default processQueue:
-    $.blueimp.fileupload.prototype.options.processQueue.unshift(
-        {
-            action: 'loadImageMetaData',
-            disableImageHead: '@',
-            disableExif: '@',
-            disableExifThumbnail: '@',
-            disableExifSub: '@',
-            disableExifGps: '@',
-            disabled: '@disableImageMetaDataLoad'
-        },
-        {
-            action: 'loadImage',
-            // Use the action as prefix for the "@" options:
-            prefix: true,
-            fileTypes: '@',
-            maxFileSize: '@',
-            noRevoke: '@',
-            disabled: '@disableImageLoad'
-        },
-        {
-            action: 'resizeImage',
-            // Use "image" as prefix for the "@" options:
-            prefix: 'image',
-            maxWidth: '@',
-            maxHeight: '@',
-            minWidth: '@',
-            minHeight: '@',
-            crop: '@',
-            orientation: '@',
-            forceResize: '@',
-            disabled: '@disableImageResize'
-        },
-        {
-            action: 'saveImage',
-            quality: '@imageQuality',
-            type: '@imageType',
-            disabled: '@disableImageResize'
-        },
-        {
-            action: 'saveImageMetaData',
-            disabled: '@disableImageMetaDataSave'
-        },
-        {
-            action: 'resizeImage',
-            // Use "preview" as prefix for the "@" options:
-            prefix: 'preview',
-            maxWidth: '@',
-            maxHeight: '@',
-            minWidth: '@',
-            minHeight: '@',
-            crop: '@',
-            orientation: '@',
-            thumbnail: '@',
-            canvas: '@',
-            disabled: '@disableImagePreview'
-        },
-        {
-            action: 'setImage',
-            name: '@imagePreviewName',
-            disabled: '@disableImagePreview'
-        },
-        {
-            action: 'deleteImageReferences',
-            disabled: '@disableImageReferencesDeletion'
-        }
-    );
-
-    // The File Upload Resize plugin extends the fileupload widget
-    // with image resize functionality:
-    $.widget('blueimp.fileupload', $.blueimp.fileupload, {
-
-        options: {
-            // The regular expression for the types of images to load:
-            // matched against the file type:
-            loadImageFileTypes: /^image\/(gif|jpeg|png)$/,
-            // The maximum file size of images to load:
-            loadImageMaxFileSize: 10000000, // 10MB
-            // The maximum width of resized images:
-            imageMaxWidth: 1920,
-            // The maximum height of resized images:
-            imageMaxHeight: 1080,
-            // Defines the image orientation (1-8) or takes the orientation
-            // value from Exif data if set to true:
-            imageOrientation: false,
-            // Define if resized images should be cropped or only scaled:
-            imageCrop: false,
-            // Disable the resize image functionality by default:
-            disableImageResize: true,
-            // The maximum width of the preview images:
-            previewMaxWidth: 80,
-            // The maximum height of the preview images:
-            previewMaxHeight: 80,
-            // Defines the preview orientation (1-8) or takes the orientation
-            // value from Exif data if set to true:
-            previewOrientation: true,
-            // Create the preview using the Exif data thumbnail:
-            previewThumbnail: true,
-            // Define if preview images should be cropped or only scaled:
-            previewCrop: false,
-            // Define if preview images should be resized as canvas elements:
-            previewCanvas: true
-        },
-
-        processActions: {
-
-            // Loads the image given via data.files and data.index
-            // as img element, if the browser supports the File API.
-            // Accepts the options fileTypes (regular expression)
-            // and maxFileSize (integer) to limit the files to load:
-            loadImage: function (data, options) {
-                if (options.disabled) {
-                    return data;
-                }
-                var that = this,
-                    file = data.files[data.index],
-                    dfd = $.Deferred();
-                if (($.type(options.maxFileSize) === 'number' &&
-                            file.size > options.maxFileSize) ||
-                        (options.fileTypes &&
-                            !options.fileTypes.test(file.type)) ||
-                        !loadImage(
-                            file,
-                            function (img) {
-                                if (img.src) {
-                                    data.img = img;
-                                }
-                                dfd.resolveWith(that, [data]);
-                            },
-                            options
-                        )) {
-                    return data;
-                }
-                return dfd.promise();
-            },
-
-            // Resizes the image given as data.canvas or data.img
-            // and updates data.canvas or data.img with the resized image.
-            // Also stores the resized image as preview property.
-            // Accepts the options maxWidth, maxHeight, minWidth,
-            // minHeight, canvas and crop:
-            resizeImage: function (data, options) {
-                if (options.disabled || !(data.canvas || data.img)) {
-                    return data;
-                }
-                options = $.extend({canvas: true}, options);
-                var that = this,
-                    dfd = $.Deferred(),
-                    img = (options.canvas && data.canvas) || data.img,
-                    resolve = function (newImg) {
-                        if (newImg && (newImg.width !== img.width ||
-                                newImg.height !== img.height ||
-                                options.forceResize)) {
-                            data[newImg.getContext ? 'canvas' : 'img'] = newImg;
-                        }
-                        data.preview = newImg;
-                        dfd.resolveWith(that, [data]);
-                    },
-                    thumbnail;
-                if (data.exif) {
-                    if (options.orientation === true) {
-                        options.orientation = data.exif.get('Orientation');
-                    }
-                    if (options.thumbnail) {
-                        thumbnail = data.exif.get('Thumbnail');
-                        if (thumbnail) {
-                            loadImage(thumbnail, resolve, options);
-                            return dfd.promise();
-                        }
-                    }
-                }
-                if (img) {
-                    resolve(loadImage.scale(img, options));
-                    return dfd.promise();
-                }
-                return data;
-            },
-
-            // Saves the processed image given as data.canvas
-            // inplace at data.index of data.files:
-            saveImage: function (data, options) {
-                if (!data.canvas || options.disabled) {
-                    return data;
-                }
-                var that = this,
-                    file = data.files[data.index],
-                    dfd = $.Deferred();
-                if (data.canvas.toBlob) {
-                    data.canvas.toBlob(
-                        function (blob) {
-                            if (!blob.name) {
-                                if (file.type === blob.type) {
-                                    blob.name = file.name;
-                                } else if (file.name) {
-                                    blob.name = file.name.replace(
-                                        /\..+$/,
-                                        '.' + blob.type.substr(6)
-                                    );
-                                }
-                            }
-                            // Don't restore invalid meta data:
-                            if (file.type !== blob.type) {
-                                delete data.imageHead;
-                            }
-                            // Store the created blob at the position
-                            // of the original file in the files list:
-                            data.files[data.index] = blob;
-                            dfd.resolveWith(that, [data]);
-                        },
-                        options.type || file.type,
-                        options.quality
-                    );
-                } else {
-                    return data;
-                }
-                return dfd.promise();
-            },
-
-            loadImageMetaData: function (data, options) {
-                if (options.disabled) {
-                    return data;
-                }
-                var that = this,
-                    dfd = $.Deferred();
-                loadImage.parseMetaData(data.files[data.index], function (result) {
-                    $.extend(data, result);
-                    dfd.resolveWith(that, [data]);
-                }, options);
-                return dfd.promise();
-            },
-
-            saveImageMetaData: function (data, options) {
-                if (!(data.imageHead && data.canvas &&
-                        data.canvas.toBlob && !options.disabled)) {
-                    return data;
-                }
-                var file = data.files[data.index],
-                    blob = new Blob([
-                        data.imageHead,
-                        // Resized images always have a head size of 20 bytes,
-                        // including the JPEG marker and a minimal JFIF header:
-                        this._blobSlice.call(file, 20)
-                    ], {type: file.type});
-                blob.name = file.name;
-                data.files[data.index] = blob;
-                return data;
-            },
-
-            // Sets the resized version of the image as a property of the
-            // file object, must be called after "saveImage":
-            setImage: function (data, options) {
-                if (data.preview && !options.disabled) {
-                    data.files[data.index][options.name || 'preview'] = data.preview;
-                }
-                return data;
-            },
-
-            deleteImageReferences: function (data, options) {
-                if (!options.disabled) {
-                    delete data.img;
-                    delete data.canvas;
-                    delete data.preview;
-                    delete data.imageHead;
-                }
-                return data;
-            }
-
-        }
-
-    });
-
-}));

library/jqupload/js/jquery.fileupload-jquery-ui.js

@@ -1,144 +0,0 @@
-/*
- * jQuery File Upload jQuery UI Plugin 8.7.0
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/* jshint nomen:false */
-/* global define, window */
-
-(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define(['jquery', './jquery.fileupload-ui'], factory);
-    } else {
-        // Browser globals:
-        factory(window.jQuery);
-    }
-}(function ($) {
-    'use strict';
-
-    $.widget('blueimp.fileupload', $.blueimp.fileupload, {
-
-        options: {
-            progress: function (e, data) {
-                if (data.context) {
-                    data.context.find('.progress').progressbar(
-                        'option',
-                        'value',
-                        parseInt(data.loaded / data.total * 100, 10)
-                    );
-                }
-            },
-            progressall: function (e, data) {
-                var $this = $(this);
-                $this.find('.fileupload-progress')
-                    .find('.progress').progressbar(
-                        'option',
-                        'value',
-                        parseInt(data.loaded / data.total * 100, 10)
-                    ).end()
-                    .find('.progress-extended').each(function () {
-                        $(this).html(
-                            ($this.data('blueimp-fileupload') ||
-                                    $this.data('fileupload'))
-                                ._renderExtendedProgress(data)
-                        );
-                    });
-            }
-        },
-
-        _renderUpload: function (func, files) {
-            var node = this._super(func, files),
-                showIconText = $(window).width() > 480;
-            node.find('.progress').empty().progressbar();
-            node.find('.start').button({
-                icons: {primary: 'ui-icon-circle-arrow-e'},
-                text: showIconText
-            });
-            node.find('.cancel').button({
-                icons: {primary: 'ui-icon-cancel'},
-                text: showIconText
-            });
-            if (node.hasClass('fade')) {
-                node.hide();
-            }
-            return node;
-        },
-
-        _renderDownload: function (func, files) {
-            var node = this._super(func, files),
-                showIconText = $(window).width() > 480;
-            node.find('.delete').button({
-                icons: {primary: 'ui-icon-trash'},
-                text: showIconText
-            });
-            if (node.hasClass('fade')) {
-                node.hide();
-            }
-            return node;
-        },
-
-        _transition: function (node) {
-            var deferred = $.Deferred();
-            if (node.hasClass('fade')) {
-                node.fadeToggle(
-                    this.options.transitionDuration,
-                    this.options.transitionEasing,
-                    function () {
-                        deferred.resolveWith(node);
-                    }
-                );
-            } else {
-                deferred.resolveWith(node);
-            }
-            return deferred;
-        },
-
-        _create: function () {
-            this._super();
-            this.element
-                .find('.fileupload-buttonbar')
-                .find('.fileinput-button').each(function () {
-                    var input = $(this).find('input:file').detach();
-                    $(this)
-                        .button({icons: {primary: 'ui-icon-plusthick'}})
-                        .append(input);
-                })
-                .end().find('.start')
-                .button({icons: {primary: 'ui-icon-circle-arrow-e'}})
-                .end().find('.cancel')
-                .button({icons: {primary: 'ui-icon-cancel'}})
-                .end().find('.delete')
-                .button({icons: {primary: 'ui-icon-trash'}})
-                .end().find('.progress').progressbar();
-        },
-
-        _destroy: function () {
-            this.element
-                .find('.fileupload-buttonbar')
-                .find('.fileinput-button').each(function () {
-                    var input = $(this).find('input:file').detach();
-                    $(this)
-                        .button('destroy')
-                        .append(input);
-                })
-                .end().find('.start')
-                .button('destroy')
-                .end().find('.cancel')
-                .button('destroy')
-                .end().find('.delete')
-                .button('destroy')
-                .end().find('.progress').progressbar('destroy');
-            this._super();
-        }
-
-    });
-
-}));

library/jqupload/js/jquery.fileupload-process.js

@@ -1,172 +0,0 @@
-/*
- * jQuery File Upload Processing Plugin 1.3.0
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2012, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/* jshint nomen:false */
-/* global define, window */
-
-(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define([
-            'jquery',
-            './jquery.fileupload'
-        ], factory);
-    } else {
-        // Browser globals:
-        factory(
-            window.jQuery
-        );
-    }
-}(function ($) {
-    'use strict';
-
-    var originalAdd = $.blueimp.fileupload.prototype.options.add;
-
-    // The File Upload Processing plugin extends the fileupload widget
-    // with file processing functionality:
-    $.widget('blueimp.fileupload', $.blueimp.fileupload, {
-
-        options: {
-            // The list of processing actions:
-            processQueue: [
-                /*
-                {
-                    action: 'log',
-                    type: 'debug'
-                }
-                */
-            ],
-            add: function (e, data) {
-                var $this = $(this);
-                data.process(function () {
-                    return $this.fileupload('process', data);
-                });
-                originalAdd.call(this, e, data);
-            }
-        },
-
-        processActions: {
-            /*
-            log: function (data, options) {
-                console[options.type](
-                    'Processing "' + data.files[data.index].name + '"'
-                );
-            }
-            */
-        },
-
-        _processFile: function (data, originalData) {
-            var that = this,
-                dfd = $.Deferred().resolveWith(that, [data]),
-                chain = dfd.promise();
-            this._trigger('process', null, data);
-            $.each(data.processQueue, function (i, settings) {
-                var func = function (data) {
-                    if (originalData.errorThrown) {
-                        return $.Deferred()
-                                .rejectWith(that, [originalData]).promise();
-                    }
-                    return that.processActions[settings.action].call(
-                        that,
-                        data,
-                        settings
-                    );
-                };
-                chain = chain.pipe(func, settings.always && func);
-            });
-            chain
-                .done(function () {
-                    that._trigger('processdone', null, data);
-                    that._trigger('processalways', null, data);
-                })
-                .fail(function () {
-                    that._trigger('processfail', null, data);
-                    that._trigger('processalways', null, data);
-                });
-            return chain;
-        },
-
-        // Replaces the settings of each processQueue item that
-        // are strings starting with an "@", using the remaining
-        // substring as key for the option map,
-        // e.g. "@autoUpload" is replaced with options.autoUpload:
-        _transformProcessQueue: function (options) {
-            var processQueue = [];
-            $.each(options.processQueue, function () {
-                var settings = {},
-                    action = this.action,
-                    prefix = this.prefix === true ? action : this.prefix;
-                $.each(this, function (key, value) {
-                    if ($.type(value) === 'string' &&
-                            value.charAt(0) === '@') {
-                        settings[key] = options[
-                            value.slice(1) || (prefix ? prefix +
-                                key.charAt(0).toUpperCase() + key.slice(1) : key)
-                        ];
-                    } else {
-                        settings[key] = value;
-                    }
-
-                });
-                processQueue.push(settings);
-            });
-            options.processQueue = processQueue;
-        },
-
-        // Returns the number of files currently in the processsing queue:
-        processing: function () {
-            return this._processing;
-        },
-
-        // Processes the files given as files property of the data parameter,
-        // returns a Promise object that allows to bind callbacks:
-        process: function (data) {
-            var that = this,
-                options = $.extend({}, this.options, data);
-            if (options.processQueue && options.processQueue.length) {
-                this._transformProcessQueue(options);
-                if (this._processing === 0) {
-                    this._trigger('processstart');
-                }
-                $.each(data.files, function (index) {
-                    var opts = index ? $.extend({}, options) : options,
-                        func = function () {
-                            if (data.errorThrown) {
-                                return $.Deferred()
-                                        .rejectWith(that, [data]).promise();
-                            }
-                            return that._processFile(opts, data);
-                        };
-                    opts.index = index;
-                    that._processing += 1;
-                    that._processingQueue = that._processingQueue.pipe(func, func)
-                        .always(function () {
-                            that._processing -= 1;
-                            if (that._processing === 0) {
-                                that._trigger('processstop');
-                            }
-                        });
-                });
-            }
-            return this._processingQueue;
-        },
-
-        _create: function () {
-            this._super();
-            this._processing = 0;
-            this._processingQueue = $.Deferred().resolveWith(this)
-                .promise();
-        }
-
-    });
-
-}));

library/jqupload/js/jquery.fileupload-ui.js

@@ -1,701 +0,0 @@
-/*
- * jQuery File Upload User Interface Plugin 9.5.1
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2010, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/* jshint nomen:false */
-/* global define, window */
-
-(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define([
-            'jquery',
-            'tmpl',
-            './jquery.fileupload-image',
-            './jquery.fileupload-audio',
-            './jquery.fileupload-video',
-            './jquery.fileupload-validate'
-        ], factory);
-    } else {
-        // Browser globals:
-        factory(
-            window.jQuery,
-            window.tmpl
-        );
-    }
-}(function ($, tmpl) {
-    'use strict';
-
-    $.blueimp.fileupload.prototype._specialOptions.push(
-        'filesContainer',
-        'uploadTemplateId',
-        'downloadTemplateId'
-    );
-
-    // The UI version extends the file upload widget
-    // and adds complete user interface interaction:
-    $.widget('blueimp.fileupload', $.blueimp.fileupload, {
-
-        options: {
-            // By default, files added to the widget are uploaded as soon
-            // as the user clicks on the start buttons. To enable automatic
-            // uploads, set the following option to true:
-            autoUpload: false,
-            // The ID of the upload template:
-            uploadTemplateId: 'template-upload',
-            // The ID of the download template:
-            downloadTemplateId: 'template-download',
-            // The container for the list of files. If undefined, it is set to
-            // an element with class "files" inside of the widget element:
-            filesContainer: undefined,
-            // By default, files are appended to the files container.
-            // Set the following option to true, to prepend files instead:
-            prependFiles: false,
-            // The expected data type of the upload response, sets the dataType
-            // option of the $.ajax upload requests:
-            dataType: 'json',
-
-            // Function returning the current number of files,
-            // used by the maxNumberOfFiles validation:
-            getNumberOfFiles: function () {
-                return this.filesContainer.children()
-                    .not('.processing').length;
-            },
-
-            // Callback to retrieve the list of files from the server response:
-            getFilesFromResponse: function (data) {
-                if (data.result && $.isArray(data.result.files)) {
-                    return data.result.files;
-                }
-                return [];
-            },
-
-            // The add callback is invoked as soon as files are added to the fileupload
-            // widget (via file input selection, drag & drop or add API call).
-            // See the basic file upload widget for more information:
-            add: function (e, data) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                var $this = $(this),
-                    that = $this.data('blueimp-fileupload') ||
-                        $this.data('fileupload'),
-                    options = that.options;
-                data.context = that._renderUpload(data.files)
-                    .data('data', data)
-                    .addClass('processing');
-                options.filesContainer[
-                    options.prependFiles ? 'prepend' : 'append'
-                ](data.context);
-                that._forceReflow(data.context);
-                $.when(
-                    that._transition(data.context),
-                    data.process(function () {
-                        return $this.fileupload('process', data);
-                    })
-                ).always(function () {
-                    data.context.each(function (index) {
-                        $(this).find('.size').text(
-                            that._formatFileSize(data.files[index].size)
-                        );
-                    }).removeClass('processing');
-                    that._renderPreviews(data);
-                }).done(function () {
-                    data.context.find('.start').prop('disabled', false);
-                    if ((that._trigger('added', e, data) !== false) &&
-                            (options.autoUpload || data.autoUpload) &&
-                            data.autoUpload !== false) {
-                        data.submit();
-                    }
-                }).fail(function () {
-                    if (data.files.error) {
-                        data.context.each(function (index) {
-                            var error = data.files[index].error;
-                            if (error) {
-                                $(this).find('.error').text(error);
-                            }
-                        });
-                    }
-                });
-            },
-            // Callback for the start of each file upload request:
-            send: function (e, data) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                var that = $(this).data('blueimp-fileupload') ||
-                        $(this).data('fileupload');
-                if (data.context && data.dataType &&
-                        data.dataType.substr(0, 6) === 'iframe') {
-                    // Iframe Transport does not support progress events.
-                    // In lack of an indeterminate progress bar, we set
-                    // the progress to 100%, showing the full animated bar:
-                    data.context
-                        .find('.progress').addClass(
-                            !$.support.transition && 'progress-animated'
-                        )
-                        .attr('aria-valuenow', 100)
-                        .children().first().css(
-                            'width',
-                            '100%'
-                        );
-                }
-                return that._trigger('sent', e, data);
-            },
-            // Callback for successful uploads:
-            done: function (e, data) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                var that = $(this).data('blueimp-fileupload') ||
-                        $(this).data('fileupload'),
-                    getFilesFromResponse = data.getFilesFromResponse ||
-                        that.options.getFilesFromResponse,
-                    files = getFilesFromResponse(data),
-                    template,
-                    deferred;
-                if (data.context) {
-                    data.context.each(function (index) {
-                        var file = files[index] ||
-                                {error: 'Empty file upload result'};
-                        deferred = that._addFinishedDeferreds();
-                        that._transition($(this)).done(
-                            function () {
-                                var node = $(this);
-                                template = that._renderDownload([file])
-                                    .replaceAll(node);
-                                that._forceReflow(template);
-                                that._transition(template).done(
-                                    function () {
-                                        data.context = $(this);
-                                        that._trigger('completed', e, data);
-                                        that._trigger('finished', e, data);
-                                        deferred.resolve();
-                                    }
-                                );
-                            }
-                        );
-                    });
-                } else {
-                    template = that._renderDownload(files)[
-                        that.options.prependFiles ? 'prependTo' : 'appendTo'
-                    ](that.options.filesContainer);
-                    that._forceReflow(template);
-                    deferred = that._addFinishedDeferreds();
-                    that._transition(template).done(
-                        function () {
-                            data.context = $(this);
-                            that._trigger('completed', e, data);
-                            that._trigger('finished', e, data);
-                            deferred.resolve();
-                        }
-                    );
-                }
-            },
-            // Callback for failed (abort or error) uploads:
-            fail: function (e, data) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                var that = $(this).data('blueimp-fileupload') ||
-                        $(this).data('fileupload'),
-                    template,
-                    deferred;
-                if (data.context) {
-                    data.context.each(function (index) {
-                        if (data.errorThrown !== 'abort') {
-                            var file = data.files[index];
-                            file.error = file.error || data.errorThrown ||
-                                true;
-                            deferred = that._addFinishedDeferreds();
-                            that._transition($(this)).done(
-                                function () {
-                                    var node = $(this);
-                                    template = that._renderDownload([file])
-                                        .replaceAll(node);
-                                    that._forceReflow(template);
-                                    that._transition(template).done(
-                                        function () {
-                                            data.context = $(this);
-                                            that._trigger('failed', e, data);
-                                            that._trigger('finished', e, data);
-                                            deferred.resolve();
-                                        }
-                                    );
-                                }
-                            );
-                        } else {
-                            deferred = that._addFinishedDeferreds();
-                            that._transition($(this)).done(
-                                function () {
-                                    $(this).remove();
-                                    that._trigger('failed', e, data);
-                                    that._trigger('finished', e, data);
-                                    deferred.resolve();
-                                }
-                            );
-                        }
-                    });
-                } else if (data.errorThrown !== 'abort') {
-                    data.context = that._renderUpload(data.files)[
-                        that.options.prependFiles ? 'prependTo' : 'appendTo'
-                    ](that.options.filesContainer)
-                        .data('data', data);
-                    that._forceReflow(data.context);
-                    deferred = that._addFinishedDeferreds();
-                    that._transition(data.context).done(
-                        function () {
-                            data.context = $(this);
-                            that._trigger('failed', e, data);
-                            that._trigger('finished', e, data);
-                            deferred.resolve();
-                        }
-                    );
-                } else {
-                    that._trigger('failed', e, data);
-                    that._trigger('finished', e, data);
-                    that._addFinishedDeferreds().resolve();
-                }
-            },
-            // Callback for upload progress events:
-            progress: function (e, data) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                var progress = Math.floor(data.loaded / data.total * 100);
-                if (data.context) {
-                    data.context.each(function () {
-                        $(this).find('.progress')
-                            .attr('aria-valuenow', progress)
-                            .children().first().css(
-                                'width',
-                                progress + '%'
-                            );
-                    });
-                }
-            },
-            // Callback for global upload progress events:
-            progressall: function (e, data) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                var $this = $(this),
-                    progress = Math.floor(data.loaded / data.total * 100),
-                    globalProgressNode = $this.find('.fileupload-progress'),
-                    extendedProgressNode = globalProgressNode
-                        .find('.progress-extended');
-                if (extendedProgressNode.length) {
-                    extendedProgressNode.html(
-                        ($this.data('blueimp-fileupload') || $this.data('fileupload'))
-                            ._renderExtendedProgress(data)
-                    );
-                }
-                globalProgressNode
-                    .find('.progress')
-                    .attr('aria-valuenow', progress)
-                    .children().first().css(
-                        'width',
-                        progress + '%'
-                    );
-            },
-            // Callback for uploads start, equivalent to the global ajaxStart event:
-            start: function (e) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                var that = $(this).data('blueimp-fileupload') ||
-                        $(this).data('fileupload');
-                that._resetFinishedDeferreds();
-                that._transition($(this).find('.fileupload-progress')).done(
-                    function () {
-                        that._trigger('started', e);
-                    }
-                );
-            },
-            // Callback for uploads stop, equivalent to the global ajaxStop event:
-            stop: function (e) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                var that = $(this).data('blueimp-fileupload') ||
-                        $(this).data('fileupload'),
-                    deferred = that._addFinishedDeferreds();
-                $.when.apply($, that._getFinishedDeferreds())
-                    .done(function () {
-                        that._trigger('stopped', e);
-                    });
-                that._transition($(this).find('.fileupload-progress')).done(
-                    function () {
-                        $(this).find('.progress')
-                            .attr('aria-valuenow', '0')
-                            .children().first().css('width', '0%');
-                        $(this).find('.progress-extended').html(' ');
-                        deferred.resolve();
-                    }
-                );
-            },
-            processstart: function (e) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                $(this).addClass('fileupload-processing');
-            },
-            processstop: function (e) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                $(this).removeClass('fileupload-processing');
-            },
-            // Callback for file deletion:
-            destroy: function (e, data) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                var that = $(this).data('blueimp-fileupload') ||
-                        $(this).data('fileupload'),
-                    removeNode = function () {
-                        that._transition(data.context).done(
-                            function () {
-                                $(this).remove();
-                                that._trigger('destroyed', e, data);
-                            }
-                        );
-                    };
-                if (data.url) {
-                    data.dataType = data.dataType || that.options.dataType;
-                    $.ajax(data).done(removeNode).fail(function () {
-                        that._trigger('destroyfailed', e, data);
-                    });
-                } else {
-                    removeNode();
-                }
-            }
-        },
-
-        _resetFinishedDeferreds: function () {
-            this._finishedUploads = [];
-        },
-
-        _addFinishedDeferreds: function (deferred) {
-            if (!deferred) {
-                deferred = $.Deferred();
-            }
-            this._finishedUploads.push(deferred);
-            return deferred;
-        },
-
-        _getFinishedDeferreds: function () {
-            return this._finishedUploads;
-        },
-
-        // Link handler, that allows to download files
-        // by drag & drop of the links to the desktop:
-        _enableDragToDesktop: function () {
-            var link = $(this),
-                url = link.prop('href'),
-                name = link.prop('download'),
-                type = 'application/octet-stream';
-            link.bind('dragstart', function (e) {
-                try {
-                    e.originalEvent.dataTransfer.setData(
-                        'DownloadURL',
-                        [type, name, url].join(':')
-                    );
-                } catch (ignore) {}
-            });
-        },
-
-        _formatFileSize: function (bytes) {
-            if (typeof bytes !== 'number') {
-                return '';
-            }
-            if (bytes >= 1000000000) {
-                return (bytes / 1000000000).toFixed(2) + ' GB';
-            }
-            if (bytes >= 1000000) {
-                return (bytes / 1000000).toFixed(2) + ' MB';
-            }
-            return (bytes / 1000).toFixed(2) + ' KB';
-        },
-
-        _formatBitrate: function (bits) {
-            if (typeof bits !== 'number') {
-                return '';
-            }
-            if (bits >= 1000000000) {
-                return (bits / 1000000000).toFixed(2) + ' Gbit/s';
-            }
-            if (bits >= 1000000) {
-                return (bits / 1000000).toFixed(2) + ' Mbit/s';
-            }
-            if (bits >= 1000) {
-                return (bits / 1000).toFixed(2) + ' kbit/s';
-            }
-            return bits.toFixed(2) + ' bit/s';
-        },
-
-        _formatTime: function (seconds) {
-            var date = new Date(seconds * 1000),
-                days = Math.floor(seconds / 86400);
-            days = days ? days + 'd ' : '';
-            return days +
-                ('0' + date.getUTCHours()).slice(-2) + ':' +
-                ('0' + date.getUTCMinutes()).slice(-2) + ':' +
-                ('0' + date.getUTCSeconds()).slice(-2);
-        },
-
-        _formatPercentage: function (floatValue) {
-            return (floatValue * 100).toFixed(2) + ' %';
-        },
-
-        _renderExtendedProgress: function (data) {
-            return this._formatBitrate(data.bitrate) + ' | ' +
-                this._formatTime(
-                    (data.total - data.loaded) * 8 / data.bitrate
-                ) + ' | ' +
-                this._formatPercentage(
-                    data.loaded / data.total
-                ) + ' | ' +
-                this._formatFileSize(data.loaded) + ' / ' +
-                this._formatFileSize(data.total);
-        },
-
-        _renderTemplate: function (func, files) {
-            if (!func) {
-                return $();
-            }
-            var result = func({
-                files: files,
-                formatFileSize: this._formatFileSize,
-                options: this.options
-            });
-            if (result instanceof $) {
-                return result;
-            }
-            return $(this.options.templatesContainer).html(result).children();
-        },
-
-        _renderPreviews: function (data) {
-            data.context.find('.preview').each(function (index, elm) {
-                $(elm).append(data.files[index].preview);
-            });
-        },
-
-        _renderUpload: function (files) {
-            return this._renderTemplate(
-                this.options.uploadTemplate,
-                files
-            );
-        },
-
-        _renderDownload: function (files) {
-            return this._renderTemplate(
-                this.options.downloadTemplate,
-                files
-            ).find('a[download]').each(this._enableDragToDesktop).end();
-        },
-
-        _startHandler: function (e) {
-            e.preventDefault();
-            var button = $(e.currentTarget),
-                template = button.closest('.template-upload'),
-                data = template.data('data');
-            button.prop('disabled', true);
-            if (data && data.submit) {
-                data.submit();
-            }
-        },
-
-        _cancelHandler: function (e) {
-            e.preventDefault();
-            var template = $(e.currentTarget)
-                    .closest('.template-upload,.template-download'),
-                data = template.data('data') || {};
-            data.context = data.context || template;
-            if (data.abort) {
-                data.abort();
-            } else {
-                data.errorThrown = 'abort';
-                this._trigger('fail', e, data);
-            }
-        },
-
-        _deleteHandler: function (e) {
-            e.preventDefault();
-            var button = $(e.currentTarget);
-            this._trigger('destroy', e, $.extend({
-                context: button.closest('.template-download'),
-                type: 'DELETE'
-            }, button.data()));
-        },
-
-        _forceReflow: function (node) {
-            return $.support.transition && node.length &&
-                node[0].offsetWidth;
-        },
-
-        _transition: function (node) {
-            var dfd = $.Deferred();
-            if ($.support.transition && node.hasClass('fade') && node.is(':visible')) {
-                node.bind(
-                    $.support.transition.end,
-                    function (e) {
-                        // Make sure we don't respond to other transitions events
-                        // in the container element, e.g. from button elements:
-                        if (e.target === node[0]) {
-                            node.unbind($.support.transition.end);
-                            dfd.resolveWith(node);
-                        }
-                    }
-                ).toggleClass('in');
-            } else {
-                node.toggleClass('in');
-                dfd.resolveWith(node);
-            }
-            return dfd;
-        },
-
-        _initButtonBarEventHandlers: function () {
-            var fileUploadButtonBar = this.element.find('.fileupload-buttonbar'),
-                filesList = this.options.filesContainer;
-            this._on(fileUploadButtonBar.find('.start'), {
-                click: function (e) {
-                    e.preventDefault();
-                    filesList.find('.start').click();
-                }
-            });
-            this._on(fileUploadButtonBar.find('.cancel'), {
-                click: function (e) {
-                    e.preventDefault();
-                    filesList.find('.cancel').click();
-                }
-            });
-            this._on(fileUploadButtonBar.find('.delete'), {
-                click: function (e) {
-                    e.preventDefault();
-                    filesList.find('.toggle:checked')
-                        .closest('.template-download')
-                        .find('.delete').click();
-                    fileUploadButtonBar.find('.toggle')
-                        .prop('checked', false);
-                }
-            });
-            this._on(fileUploadButtonBar.find('.toggle'), {
-                change: function (e) {
-                    filesList.find('.toggle').prop(
-                        'checked',
-                        $(e.currentTarget).is(':checked')
-                    );
-                }
-            });
-        },
-
-        _destroyButtonBarEventHandlers: function () {
-            this._off(
-                this.element.find('.fileupload-buttonbar')
-                    .find('.start, .cancel, .delete'),
-                'click'
-            );
-            this._off(
-                this.element.find('.fileupload-buttonbar .toggle'),
-                'change.'
-            );
-        },
-
-        _initEventHandlers: function () {
-            this._super();
-            this._on(this.options.filesContainer, {
-                'click .start': this._startHandler,
-                'click .cancel': this._cancelHandler,
-                'click .delete': this._deleteHandler
-            });
-            this._initButtonBarEventHandlers();
-        },
-
-        _destroyEventHandlers: function () {
-            this._destroyButtonBarEventHandlers();
-            this._off(this.options.filesContainer, 'click');
-            this._super();
-        },
-
-        _enableFileInputButton: function () {
-            this.element.find('.fileinput-button input')
-                .prop('disabled', false)
-                .parent().removeClass('disabled');
-        },
-
-        _disableFileInputButton: function () {
-            this.element.find('.fileinput-button input')
-                .prop('disabled', true)
-                .parent().addClass('disabled');
-        },
-
-        _initTemplates: function () {
-            var options = this.options;
-            options.templatesContainer = this.document[0].createElement(
-                options.filesContainer.prop('nodeName')
-            );
-            if (tmpl) {
-                if (options.uploadTemplateId) {
-                    options.uploadTemplate = tmpl(options.uploadTemplateId);
-                }
-                if (options.downloadTemplateId) {
-                    options.downloadTemplate = tmpl(options.downloadTemplateId);
-                }
-            }
-        },
-
-        _initFilesContainer: function () {
-            var options = this.options;
-            if (options.filesContainer === undefined) {
-                options.filesContainer = this.element.find('.files');
-            } else if (!(options.filesContainer instanceof $)) {
-                options.filesContainer = $(options.filesContainer);
-            }
-        },
-
-        _initSpecialOptions: function () {
-            this._super();
-            this._initFilesContainer();
-            this._initTemplates();
-        },
-
-        _create: function () {
-            this._super();
-            this._resetFinishedDeferreds();
-            if (!$.support.fileInput) {
-                this._disableFileInputButton();
-            }
-        },
-
-        enable: function () {
-            var wasDisabled = false;
-            if (this.options.disabled) {
-                wasDisabled = true;
-            }
-            this._super();
-            if (wasDisabled) {
-                this.element.find('input, button').prop('disabled', false);
-                this._enableFileInputButton();
-            }
-        },
-
-        disable: function () {
-            if (!this.options.disabled) {
-                this.element.find('input, button').prop('disabled', true);
-                this._disableFileInputButton();
-            }
-            this._super();
-        }
-
-    });
-
-}));

library/jqupload/js/jquery.fileupload-validate.js

@@ -1,119 +0,0 @@
-/*
- * jQuery File Upload Validation Plugin 1.1.2
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/* global define, window */
-
-(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define([
-            'jquery',
-            './jquery.fileupload-process'
-        ], factory);
-    } else {
-        // Browser globals:
-        factory(
-            window.jQuery
-        );
-    }
-}(function ($) {
-    'use strict';
-
-    // Append to the default processQueue:
-    $.blueimp.fileupload.prototype.options.processQueue.push(
-        {
-            action: 'validate',
-            // Always trigger this action,
-            // even if the previous action was rejected: 
-            always: true,
-            // Options taken from the global options map:
-            acceptFileTypes: '@',
-            maxFileSize: '@',
-            minFileSize: '@',
-            maxNumberOfFiles: '@',
-            disabled: '@disableValidation'
-        }
-    );
-
-    // The File Upload Validation plugin extends the fileupload widget
-    // with file validation functionality:
-    $.widget('blueimp.fileupload', $.blueimp.fileupload, {
-
-        options: {
-            /*
-            // The regular expression for allowed file types, matches
-            // against either file type or file name:
-            acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
-            // The maximum allowed file size in bytes:
-            maxFileSize: 10000000, // 10 MB
-            // The minimum allowed file size in bytes:
-            minFileSize: undefined, // No minimal file size
-            // The limit of files to be uploaded:
-            maxNumberOfFiles: 10,
-            */
-
-            // Function returning the current number of files,
-            // has to be overriden for maxNumberOfFiles validation:
-            getNumberOfFiles: $.noop,
-
-            // Error and info messages:
-            messages: {
-                maxNumberOfFiles: 'Maximum number of files exceeded',
-                acceptFileTypes: 'File type not allowed',
-                maxFileSize: 'File is too large',
-                minFileSize: 'File is too small'
-            }
-        },
-
-        processActions: {
-
-            validate: function (data, options) {
-                if (options.disabled) {
-                    return data;
-                }
-                var dfd = $.Deferred(),
-                    settings = this.options,
-                    file = data.files[data.index],
-                    fileSize;
-                if (options.minFileSize || options.maxFileSize) {
-                    fileSize = file.size;
-                }
-                if ($.type(options.maxNumberOfFiles) === 'number' &&
-                        (settings.getNumberOfFiles() || 0) + data.files.length >
-                            options.maxNumberOfFiles) {
-                    file.error = settings.i18n('maxNumberOfFiles');
-                } else if (options.acceptFileTypes &&
-                        !(options.acceptFileTypes.test(file.type) ||
-                        options.acceptFileTypes.test(file.name))) {
-                    file.error = settings.i18n('acceptFileTypes');
-                } else if (fileSize > options.maxFileSize) {
-                    file.error = settings.i18n('maxFileSize');
-                } else if ($.type(fileSize) === 'number' &&
-                        fileSize < options.minFileSize) {
-                    file.error = settings.i18n('minFileSize');
-                } else {
-                    delete file.error;
-                }
-                if (file.error || data.files.error) {
-                    data.files.error = true;
-                    dfd.rejectWith(this, [data]);
-                } else {
-                    dfd.resolveWith(this, [data]);
-                }
-                return dfd.promise();
-            }
-
-        }
-
-    });
-
-}));

library/jqupload/js/jquery.fileupload-video.js

@@ -1,106 +0,0 @@
-/*
- * jQuery File Upload Video Preview Plugin 1.0.3
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/* jshint nomen:false */
-/* global define, window, document */
-
-(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define([
-            'jquery',
-            'load-image',
-            './jquery.fileupload-process'
-        ], factory);
-    } else {
-        // Browser globals:
-        factory(
-            window.jQuery,
-            window.loadImage
-        );
-    }
-}(function ($, loadImage) {
-    'use strict';
-
-    // Prepend to the default processQueue:
-    $.blueimp.fileupload.prototype.options.processQueue.unshift(
-        {
-            action: 'loadVideo',
-            // Use the action as prefix for the "@" options:
-            prefix: true,
-            fileTypes: '@',
-            maxFileSize: '@',
-            disabled: '@disableVideoPreview'
-        },
-        {
-            action: 'setVideo',
-            name: '@videoPreviewName',
-            disabled: '@disableVideoPreview'
-        }
-    );
-
-    // The File Upload Video Preview plugin extends the fileupload widget
-    // with video preview functionality:
-    $.widget('blueimp.fileupload', $.blueimp.fileupload, {
-
-        options: {
-            // The regular expression for the types of video files to load,
-            // matched against the file type:
-            loadVideoFileTypes: /^video\/.*$/
-        },
-
-        _videoElement: document.createElement('video'),
-
-        processActions: {
-
-            // Loads the video file given via data.files and data.index
-            // as video element if the browser supports playing it.
-            // Accepts the options fileTypes (regular expression)
-            // and maxFileSize (integer) to limit the files to load:
-            loadVideo: function (data, options) {
-                if (options.disabled) {
-                    return data;
-                }
-                var file = data.files[data.index],
-                    url,
-                    video;
-                if (this._videoElement.canPlayType &&
-                        this._videoElement.canPlayType(file.type) &&
-                        ($.type(options.maxFileSize) !== 'number' ||
-                            file.size <= options.maxFileSize) &&
-                        (!options.fileTypes ||
-                            options.fileTypes.test(file.type))) {
-                    url = loadImage.createObjectURL(file);
-                    if (url) {
-                        video = this._videoElement.cloneNode(false);
-                        video.src = url;
-                        video.controls = true;
-                        data.video = video;
-                        return data;
-                    }
-                }
-                return data;
-            },
-
-            // Sets the video element as a property of the file object:
-            setVideo: function (data, options) {
-                if (data.video && !options.disabled) {
-                    data.files[data.index][options.name || 'preview'] = data.video;
-                }
-                return data;
-            }
-
-        }
-
-    });
-
-}));

library/jqupload/js/jquery.iframe-transport.js

@@ -1,214 +0,0 @@
-/*
- * jQuery Iframe Transport Plugin 1.8.2
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2011, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/* global define, window, document */
-
-(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define(['jquery'], factory);
-    } else {
-        // Browser globals:
-        factory(window.jQuery);
-    }
-}(function ($) {
-    'use strict';
-
-    // Helper variable to create unique names for the transport iframes:
-    var counter = 0;
-
-    // The iframe transport accepts four additional options:
-    // options.fileInput: a jQuery collection of file input fields
-    // options.paramName: the parameter name for the file form data,
-    //  overrides the name property of the file input field(s),
-    //  can be a string or an array of strings.
-    // options.formData: an array of objects with name and value properties,
-    //  equivalent to the return data of .serializeArray(), e.g.:
-    //  [{name: 'a', value: 1}, {name: 'b', value: 2}]
-    // options.initialIframeSrc: the URL of the initial iframe src,
-    //  by default set to "javascript:false;"
-    $.ajaxTransport('iframe', function (options) {
-        if (options.async) {
-            // javascript:false as initial iframe src
-            // prevents warning popups on HTTPS in IE6:
-            /*jshint scripturl: true */
-            var initialIframeSrc = options.initialIframeSrc || 'javascript:false;',
-            /*jshint scripturl: false */
-                form,
-                iframe,
-                addParamChar;
-            return {
-                send: function (_, completeCallback) {
-                    form = $('<form style="display:none;"></form>');
-                    form.attr('accept-charset', options.formAcceptCharset);
-                    addParamChar = /\?/.test(options.url) ? '&' : '?';
-                    // XDomainRequest only supports GET and POST:
-                    if (options.type === 'DELETE') {
-                        options.url = options.url + addParamChar + '_method=DELETE';
-                        options.type = 'POST';
-                    } else if (options.type === 'PUT') {
-                        options.url = options.url + addParamChar + '_method=PUT';
-                        options.type = 'POST';
-                    } else if (options.type === 'PATCH') {
-                        options.url = options.url + addParamChar + '_method=PATCH';
-                        options.type = 'POST';
-                    }
-                    // IE versions below IE8 cannot set the name property of
-                    // elements that have already been added to the DOM,
-                    // so we set the name along with the iframe HTML markup:
-                    counter += 1;
-                    iframe = $(
-                        '<iframe src="' + initialIframeSrc +
-                            '" name="iframe-transport-' + counter + '"></iframe>'
-                    ).bind('load', function () {
-                        var fileInputClones,
-                            paramNames = $.isArray(options.paramName) ?
-                                    options.paramName : [options.paramName];
-                        iframe
-                            .unbind('load')
-                            .bind('load', function () {
-                                var response;
-                                // Wrap in a try/catch block to catch exceptions thrown
-                                // when trying to access cross-domain iframe contents:
-                                try {
-                                    response = iframe.contents();
-                                    // Google Chrome and Firefox do not throw an
-                                    // exception when calling iframe.contents() on
-                                    // cross-domain requests, so we unify the response:
-                                    if (!response.length || !response[0].firstChild) {
-                                        throw new Error();
-                                    }
-                                } catch (e) {
-                                    response = undefined;
-                                }
-                                // The complete callback returns the
-                                // iframe content document as response object:
-                                completeCallback(
-                                    200,
-                                    'success',
-                                    {'iframe': response}
-                                );
-                                // Fix for IE endless progress bar activity bug
-                                // (happens on form submits to iframe targets):
-                                $('<iframe src="' + initialIframeSrc + '"></iframe>')
-                                    .appendTo(form);
-                                window.setTimeout(function () {
-                                    // Removing the form in a setTimeout call
-                                    // allows Chrome's developer tools to display
-                                    // the response result
-                                    form.remove();
-                                }, 0);
-                            });
-                        form
-                            .prop('target', iframe.prop('name'))
-                            .prop('action', options.url)
-                            .prop('method', options.type);
-                        if (options.formData) {
-                            $.each(options.formData, function (index, field) {
-                                $('<input type="hidden"/>')
-                                    .prop('name', field.name)
-                                    .val(field.value)
-                                    .appendTo(form);
-                            });
-                        }
-                        if (options.fileInput && options.fileInput.length &&
-                                options.type === 'POST') {
-                            fileInputClones = options.fileInput.clone();
-                            // Insert a clone for each file input field:
-                            options.fileInput.after(function (index) {
-                                return fileInputClones[index];
-                            });
-                            if (options.paramName) {
-                                options.fileInput.each(function (index) {
-                                    $(this).prop(
-                                        'name',
-                                        paramNames[index] || options.paramName
-                                    );
-                                });
-                            }
-                            // Appending the file input fields to the hidden form
-                            // removes them from their original location:
-                            form
-                                .append(options.fileInput)
-                                .prop('enctype', 'multipart/form-data')
-                                // enctype must be set as encoding for IE:
-                                .prop('encoding', 'multipart/form-data');
-                            // Remove the HTML5 form attribute from the input(s):
-                            options.fileInput.removeAttr('form');
-                        }
-                        form.submit();
-                        // Insert the file input fields at their original location
-                        // by replacing the clones with the originals:
-                        if (fileInputClones && fileInputClones.length) {
-                            options.fileInput.each(function (index, input) {
-                                var clone = $(fileInputClones[index]);
-                                // Restore the original name and form properties:
-                                $(input)
-                                    .prop('name', clone.prop('name'))
-                                    .attr('form', clone.attr('form'));
-                                clone.replaceWith(input);
-                            });
-                        }
-                    });
-                    form.append(iframe).appendTo(document.body);
-                },
-                abort: function () {
-                    if (iframe) {
-                        // javascript:false as iframe src aborts the request
-                        // and prevents warning popups on HTTPS in IE6.
-                        // concat is used to avoid the "Script URL" JSLint error:
-                        iframe
-                            .unbind('load')
-                            .prop('src', initialIframeSrc);
-                    }
-                    if (form) {
-                        form.remove();
-                    }
-                }
-            };
-        }
-    });
-
-    // The iframe transport returns the iframe content document as response.
-    // The following adds converters from iframe to text, json, html, xml
-    // and script.
-    // Please note that the Content-Type for JSON responses has to be text/plain
-    // or text/html, if the browser doesn't include application/json in the
-    // Accept header, else IE will show a download dialog.
-    // The Content-Type for XML responses on the other hand has to be always
-    // application/xml or text/xml, so IE properly parses the XML response.
-    // See also
-    // https://github.com/blueimp/jQuery-File-Upload/wiki/Setup#content-type-negotiation
-    $.ajaxSetup({
-        converters: {
-            'iframe text': function (iframe) {
-                return iframe && $(iframe[0].body).text();
-            },
-            'iframe json': function (iframe) {
-                return iframe && $.parseJSON($(iframe[0].body).text());
-            },
-            'iframe html': function (iframe) {
-                return iframe && $(iframe[0].body).html();
-            },
-            'iframe xml': function (iframe) {
-                var xmlDoc = iframe && iframe[0];
-                return xmlDoc && $.isXMLDoc(xmlDoc) ? xmlDoc :
-                        $.parseXML((xmlDoc.XMLDocument && xmlDoc.XMLDocument.xml) ||
-                            $(xmlDoc.body).html());
-            },
-            'iframe script': function (iframe) {
-                return iframe && $.globalEval($(iframe[0].body).text());
-            }
-        }
-    });
-
-}));

library/jqupload/js/main.js

@@ -1,75 +0,0 @@
-/*
- * jQuery File Upload Plugin JS Example 8.9.1
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2010, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/* global $, window */
-
-$(function () {
-    'use strict';
-
-    // Initialize the jQuery File Upload widget:
-    $('#fileupload').fileupload({
-        // Uncomment the following to send cross-domain cookies:
-        //xhrFields: {withCredentials: true},
-        url: 'server/php/'
-    });
-
-    // Enable iframe cross-domain access via redirect option:
-    $('#fileupload').fileupload(
-        'option',
-        'redirect',
-        window.location.href.replace(
-            /\/[^\/]*$/,
-            '/cors/result.html?%s'
-        )
-    );
-
-    if (window.location.hostname === 'blueimp.github.io') {
-        // Demo settings:
-        $('#fileupload').fileupload('option', {
-            url: '//jquery-file-upload.appspot.com/',
-            // Enable image resizing, except for Android and Opera,
-            // which actually support image resizing, but fail to
-            // send Blob objects via XHR requests:
-            disableImageResize: /Android(?!.*Chrome)|Opera/
-                .test(window.navigator.userAgent),
-            maxFileSize: 5000000,
-            acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i
-        });
-        // Upload server status check for browsers with CORS support:
-        if ($.support.cors) {
-            $.ajax({
-                url: '//jquery-file-upload.appspot.com/',
-                type: 'HEAD'
-            }).fail(function () {
-                $('<div class="alert alert-danger"/>')
-                    .text('Upload server currently unavailable - ' +
-                            new Date())
-                    .appendTo('#fileupload');
-            });
-        }
-    } else {
-        // Load existing files:
-        $('#fileupload').addClass('fileupload-processing');
-        $.ajax({
-            // Uncomment the following to send cross-domain cookies:
-            //xhrFields: {withCredentials: true},
-            url: $('#fileupload').fileupload('option', 'url'),
-            dataType: 'json',
-            context: $('#fileupload')[0]
-        }).always(function () {
-            $(this).removeClass('fileupload-processing');
-        }).done(function (result) {
-            $(this).fileupload('option', 'done')
-                .call(this, $.Event('done'), {result: result});
-        });
-    }
-
-});

library/jqupload/js/vendor/jquery.ui.widget.js

@@ -1,530 +0,0 @@
-/*
- * jQuery UI Widget 1.10.3+amd
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/jQuery.widget/
- */
-
-(function (factory) {
-    if (typeof define === "function" && define.amd) {
-        // Register as an anonymous AMD module:
-        define(["jquery"], factory);
-    } else {
-        // Browser globals:
-        factory(jQuery);
-    }
-}(function( $, undefined ) {
-
-var uuid = 0,
-	slice = Array.prototype.slice,
-	_cleanData = $.cleanData;
-$.cleanData = function( elems ) {
-	for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-		try {
-			$( elem ).triggerHandler( "remove" );
-		// http://bugs.jquery.com/ticket/8235
-		} catch( e ) {}
-	}
-	_cleanData( elems );
-};
-
-$.widget = function( name, base, prototype ) {
-	var fullName, existingConstructor, constructor, basePrototype,
-		// proxiedPrototype allows the provided prototype to remain unmodified
-		// so that it can be used as a mixin for multiple widgets (#8876)
-		proxiedPrototype = {},
-		namespace = name.split( "." )[ 0 ];
-
-	name = name.split( "." )[ 1 ];
-	fullName = namespace + "-" + name;
-
-	if ( !prototype ) {
-		prototype = base;
-		base = $.Widget;
-	}
-
-	// create selector for plugin
-	$.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
-		return !!$.data( elem, fullName );
-	};
-
-	$[ namespace ] = $[ namespace ] || {};
-	existingConstructor = $[ namespace ][ name ];
-	constructor = $[ namespace ][ name ] = function( options, element ) {
-		// allow instantiation without "new" keyword
-		if ( !this._createWidget ) {
-			return new constructor( options, element );
-		}
-
-		// allow instantiation without initializing for simple inheritance
-		// must use "new" keyword (the code above always passes args)
-		if ( arguments.length ) {
-			this._createWidget( options, element );
-		}
-	};
-	// extend with the existing constructor to carry over any static properties
-	$.extend( constructor, existingConstructor, {
-		version: prototype.version,
-		// copy the object used to create the prototype in case we need to
-		// redefine the widget later
-		_proto: $.extend( {}, prototype ),
-		// track widgets that inherit from this widget in case this widget is
-		// redefined after a widget inherits from it
-		_childConstructors: []
-	});
-
-	basePrototype = new base();
-	// we need to make the options hash a property directly on the new instance
-	// otherwise we'll modify the options hash on the prototype that we're
-	// inheriting from
-	basePrototype.options = $.widget.extend( {}, basePrototype.options );
-	$.each( prototype, function( prop, value ) {
-		if ( !$.isFunction( value ) ) {
-			proxiedPrototype[ prop ] = value;
-			return;
-		}
-		proxiedPrototype[ prop ] = (function() {
-			var _super = function() {
-					return base.prototype[ prop ].apply( this, arguments );
-				},
-				_superApply = function( args ) {
-					return base.prototype[ prop ].apply( this, args );
-				};
-			return function() {
-				var __super = this._super,
-					__superApply = this._superApply,
-					returnValue;
-
-				this._super = _super;
-				this._superApply = _superApply;
-
-				returnValue = value.apply( this, arguments );
-
-				this._super = __super;
-				this._superApply = __superApply;
-
-				return returnValue;
-			};
-		})();
-	});
-	constructor.prototype = $.widget.extend( basePrototype, {
-		// TODO: remove support for widgetEventPrefix
-		// always use the name + a colon as the prefix, e.g., draggable:start
-		// don't prefix for widgets that aren't DOM-based
-		widgetEventPrefix: existingConstructor ? basePrototype.widgetEventPrefix : name
-	}, proxiedPrototype, {
-		constructor: constructor,
-		namespace: namespace,
-		widgetName: name,
-		widgetFullName: fullName
-	});
-
-	// If this widget is being redefined then we need to find all widgets that
-	// are inheriting from it and redefine all of them so that they inherit from
-	// the new version of this widget. We're essentially trying to replace one
-	// level in the prototype chain.
-	if ( existingConstructor ) {
-		$.each( existingConstructor._childConstructors, function( i, child ) {
-			var childPrototype = child.prototype;
-
-			// redefine the child widget using the same prototype that was
-			// originally used, but inherit from the new version of the base
-			$.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto );
-		});
-		// remove the list of existing child constructors from the old constructor
-		// so the old child constructors can be garbage collected
-		delete existingConstructor._childConstructors;
-	} else {
-		base._childConstructors.push( constructor );
-	}
-
-	$.widget.bridge( name, constructor );
-};
-
-$.widget.extend = function( target ) {
-	var input = slice.call( arguments, 1 ),
-		inputIndex = 0,
-		inputLength = input.length,
-		key,
-		value;
-	for ( ; inputIndex < inputLength; inputIndex++ ) {
-		for ( key in input[ inputIndex ] ) {
-			value = input[ inputIndex ][ key ];
-			if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
-				// Clone objects
-				if ( $.isPlainObject( value ) ) {
-					target[ key ] = $.isPlainObject( target[ key ] ) ?
-						$.widget.extend( {}, target[ key ], value ) :
-						// Don't extend strings, arrays, etc. with objects
-						$.widget.extend( {}, value );
-				// Copy everything else by reference
-				} else {
-					target[ key ] = value;
-				}
-			}
-		}
-	}
-	return target;
-};
-
-$.widget.bridge = function( name, object ) {
-	var fullName = object.prototype.widgetFullName || name;
-	$.fn[ name ] = function( options ) {
-		var isMethodCall = typeof options === "string",
-			args = slice.call( arguments, 1 ),
-			returnValue = this;
-
-		// allow multiple hashes to be passed on init
-		options = !isMethodCall && args.length ?
-			$.widget.extend.apply( null, [ options ].concat(args) ) :
-			options;
-
-		if ( isMethodCall ) {
-			this.each(function() {
-				var methodValue,
-					instance = $.data( this, fullName );
-				if ( !instance ) {
-					return $.error( "cannot call methods on " + name + " prior to initialization; " +
-						"attempted to call method '" + options + "'" );
-				}
-				if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) {
-					return $.error( "no such method '" + options + "' for " + name + " widget instance" );
-				}
-				methodValue = instance[ options ].apply( instance, args );
-				if ( methodValue !== instance && methodValue !== undefined ) {
-					returnValue = methodValue && methodValue.jquery ?
-						returnValue.pushStack( methodValue.get() ) :
-						methodValue;
-					return false;
-				}
-			});
-		} else {
-			this.each(function() {
-				var instance = $.data( this, fullName );
-				if ( instance ) {
-					instance.option( options || {} )._init();
-				} else {
-					$.data( this, fullName, new object( options, this ) );
-				}
-			});
-		}
-
-		return returnValue;
-	};
-};
-
-$.Widget = function( /* options, element */ ) {};
-$.Widget._childConstructors = [];
-
-$.Widget.prototype = {
-	widgetName: "widget",
-	widgetEventPrefix: "",
-	defaultElement: "<div>",
-	options: {
-		disabled: false,
-
-		// callbacks
-		create: null
-	},
-	_createWidget: function( options, element ) {
-		element = $( element || this.defaultElement || this )[ 0 ];
-		this.element = $( element );
-		this.uuid = uuid++;
-		this.eventNamespace = "." + this.widgetName + this.uuid;
-		this.options = $.widget.extend( {},
-			this.options,
-			this._getCreateOptions(),
-			options );
-
-		this.bindings = $();
-		this.hoverable = $();
-		this.focusable = $();
-
-		if ( element !== this ) {
-			$.data( element, this.widgetFullName, this );
-			this._on( true, this.element, {
-				remove: function( event ) {
-					if ( event.target === element ) {
-						this.destroy();
-					}
-				}
-			});
-			this.document = $( element.style ?
-				// element within the document
-				element.ownerDocument :
-				// element is window or document
-				element.document || element );
-			this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
-		}
-
-		this._create();
-		this._trigger( "create", null, this._getCreateEventData() );
-		this._init();
-	},
-	_getCreateOptions: $.noop,
-	_getCreateEventData: $.noop,
-	_create: $.noop,
-	_init: $.noop,
-
-	destroy: function() {
-		this._destroy();
-		// we can probably remove the unbind calls in 2.0
-		// all event bindings should go through this._on()
-		this.element
-			.unbind( this.eventNamespace )
-			// 1.9 BC for #7810
-			// TODO remove dual storage
-			.removeData( this.widgetName )
-			.removeData( this.widgetFullName )
-			// support: jquery <1.6.3
-			// http://bugs.jquery.com/ticket/9413
-			.removeData( $.camelCase( this.widgetFullName ) );
-		this.widget()
-			.unbind( this.eventNamespace )
-			.removeAttr( "aria-disabled" )
-			.removeClass(
-				this.widgetFullName + "-disabled " +
-				"ui-state-disabled" );
-
-		// clean up events and states
-		this.bindings.unbind( this.eventNamespace );
-		this.hoverable.removeClass( "ui-state-hover" );
-		this.focusable.removeClass( "ui-state-focus" );
-	},
-	_destroy: $.noop,
-
-	widget: function() {
-		return this.element;
-	},
-
-	option: function( key, value ) {
-		var options = key,
-			parts,
-			curOption,
-			i;
-
-		if ( arguments.length === 0 ) {
-			// don't return a reference to the internal hash
-			return $.widget.extend( {}, this.options );
-		}
-
-		if ( typeof key === "string" ) {
-			// handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
-			options = {};
-			parts = key.split( "." );
-			key = parts.shift();
-			if ( parts.length ) {
-				curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
-				for ( i = 0; i < parts.length - 1; i++ ) {
-					curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
-					curOption = curOption[ parts[ i ] ];
-				}
-				key = parts.pop();
-				if ( value === undefined ) {
-					return curOption[ key ] === undefined ? null : curOption[ key ];
-				}
-				curOption[ key ] = value;
-			} else {
-				if ( value === undefined ) {
-					return this.options[ key ] === undefined ? null : this.options[ key ];
-				}
-				options[ key ] = value;
-			}
-		}
-
-		this._setOptions( options );
-
-		return this;
-	},
-	_setOptions: function( options ) {
-		var key;
-
-		for ( key in options ) {
-			this._setOption( key, options[ key ] );
-		}
-
-		return this;
-	},
-	_setOption: function( key, value ) {
-		this.options[ key ] = value;
-
-		if ( key === "disabled" ) {
-			this.widget()
-				.toggleClass( this.widgetFullName + "-disabled ui-state-disabled", !!value )
-				.attr( "aria-disabled", value );
-			this.hoverable.removeClass( "ui-state-hover" );
-			this.focusable.removeClass( "ui-state-focus" );
-		}
-
-		return this;
-	},
-
-	enable: function() {
-		return this._setOption( "disabled", false );
-	},
-	disable: function() {
-		return this._setOption( "disabled", true );
-	},
-
-	_on: function( suppressDisabledCheck, element, handlers ) {
-		var delegateElement,
-			instance = this;
-
-		// no suppressDisabledCheck flag, shuffle arguments
-		if ( typeof suppressDisabledCheck !== "boolean" ) {
-			handlers = element;
-			element = suppressDisabledCheck;
-			suppressDisabledCheck = false;
-		}
-
-		// no element argument, shuffle and use this.element
-		if ( !handlers ) {
-			handlers = element;
-			element = this.element;
-			delegateElement = this.widget();
-		} else {
-			// accept selectors, DOM elements
-			element = delegateElement = $( element );
-			this.bindings = this.bindings.add( element );
-		}
-
-		$.each( handlers, function( event, handler ) {
-			function handlerProxy() {
-				// allow widgets to customize the disabled handling
-				// - disabled as an array instead of boolean
-				// - disabled class as method for disabling individual parts
-				if ( !suppressDisabledCheck &&
-						( instance.options.disabled === true ||
-							$( this ).hasClass( "ui-state-disabled" ) ) ) {
-					return;
-				}
-				return ( typeof handler === "string" ? instance[ handler ] : handler )
-					.apply( instance, arguments );
-			}
-
-			// copy the guid so direct unbinding works
-			if ( typeof handler !== "string" ) {
-				handlerProxy.guid = handler.guid =
-					handler.guid || handlerProxy.guid || $.guid++;
-			}
-
-			var match = event.match( /^(\w+)\s*(.*)$/ ),
-				eventName = match[1] + instance.eventNamespace,
-				selector = match[2];
-			if ( selector ) {
-				delegateElement.delegate( selector, eventName, handlerProxy );
-			} else {
-				element.bind( eventName, handlerProxy );
-			}
-		});
-	},
-
-	_off: function( element, eventName ) {
-		eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace;
-		element.unbind( eventName ).undelegate( eventName );
-	},
-
-	_delay: function( handler, delay ) {
-		function handlerProxy() {
-			return ( typeof handler === "string" ? instance[ handler ] : handler )
-				.apply( instance, arguments );
-		}
-		var instance = this;
-		return setTimeout( handlerProxy, delay || 0 );
-	},
-
-	_hoverable: function( element ) {
-		this.hoverable = this.hoverable.add( element );
-		this._on( element, {
-			mouseenter: function( event ) {
-				$( event.currentTarget ).addClass( "ui-state-hover" );
-			},
-			mouseleave: function( event ) {
-				$( event.currentTarget ).removeClass( "ui-state-hover" );
-			}
-		});
-	},
-
-	_focusable: function( element ) {
-		this.focusable = this.focusable.add( element );
-		this._on( element, {
-			focusin: function( event ) {
-				$( event.currentTarget ).addClass( "ui-state-focus" );
-			},
-			focusout: function( event ) {
-				$( event.currentTarget ).removeClass( "ui-state-focus" );
-			}
-		});
-	},
-
-	_trigger: function( type, event, data ) {
-		var prop, orig,
-			callback = this.options[ type ];
-
-		data = data || {};
-		event = $.Event( event );
-		event.type = ( type === this.widgetEventPrefix ?
-			type :
-			this.widgetEventPrefix + type ).toLowerCase();
-		// the original event may come from any element
-		// so we need to reset the target on the new event
-		event.target = this.element[ 0 ];
-
-		// copy original event properties over to the new event
-		orig = event.originalEvent;
-		if ( orig ) {
-			for ( prop in orig ) {
-				if ( !( prop in event ) ) {
-					event[ prop ] = orig[ prop ];
-				}
-			}
-		}
-
-		this.element.trigger( event, data );
-		return !( $.isFunction( callback ) &&
-			callback.apply( this.element[0], [ event ].concat( data ) ) === false ||
-			event.isDefaultPrevented() );
-	}
-};
-
-$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
-	$.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
-		if ( typeof options === "string" ) {
-			options = { effect: options };
-		}
-		var hasOptions,
-			effectName = !options ?
-				method :
-				options === true || typeof options === "number" ?
-					defaultEffect :
-					options.effect || defaultEffect;
-		options = options || {};
-		if ( typeof options === "number" ) {
-			options = { duration: options };
-		}
-		hasOptions = !$.isEmptyObject( options );
-		options.complete = callback;
-		if ( options.delay ) {
-			element.delay( options.delay );
-		}
-		if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
-			element[ method ]( options );
-		} else if ( effectName !== method && element[ effectName ] ) {
-			element[ effectName ]( options.duration, options.easing, callback );
-		} else {
-			element.queue(function( next ) {
-				$( this )[ method ]();
-				if ( callback ) {
-					callback.call( element[ 0 ] );
-				}
-				next();
-			});
-		}
-	};
-});
-
-}));

library/jqupload/package.json

@@ -1,54 +0,0 @@
-{
-  "name": "blueimp-file-upload",
-  "version": "9.5.2",
-  "title": "jQuery File Upload",
-  "description": "File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.",
-  "keywords": [
-    "jquery",
-    "file",
-    "upload",
-    "widget",
-    "multiple",
-    "selection",
-    "drag",
-    "drop",
-    "progress",
-    "preview",
-    "cross-domain",
-    "cross-site",
-    "chunk",
-    "resume",
-    "gae",
-    "go",
-    "python",
-    "php",
-    "bootstrap"
-  ],
-  "homepage": "https://github.com/blueimp/jQuery-File-Upload",
-  "author": {
-    "name": "Sebastian Tschan",
-    "url": "https://blueimp.net"
-  },
-  "maintainers": [
-    {
-      "name": "Sebastian Tschan",
-      "url": "https://blueimp.net"
-    }
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/blueimp/jQuery-File-Upload.git"
-  },
-  "bugs": "https://github.com/blueimp/jQuery-File-Upload/issues",
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "http://www.opensource.org/licenses/MIT"
-    }
-  ],
-  "devDependencies": {
-    "grunt": "~0.4.2",
-    "grunt-bump-build-git": "~1.1.1",
-    "grunt-contrib-jshint": "~0.8.0"
-  }
-}

library/jqupload/server/gae-go/app.yaml

@@ -1,12 +0,0 @@
-application: jquery-file-upload
-version: 2
-runtime: go
-api_version: go1
-
-handlers:
-- url: /(favicon\.ico|robots\.txt)
-  static_files: static/\1
-  upload: static/(.*)
-  expiration: '1d'
-- url: /.*
-  script: _go_app

library/jqupload/server/gae-go/app/main.go

@@ -1,296 +0,0 @@
-/*
- * jQuery File Upload Plugin GAE Go Example 3.1.1
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2011, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-package app
-
-import (
-	"appengine"
-	"appengine/blobstore"
-	"appengine/image"
-	"appengine/taskqueue"
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"log"
-	"mime/multipart"
-	"net/http"
-	"net/url"
-	"regexp"
-	"strings"
-	"time"
-)
-
-const (
-	WEBSITE           = "http://blueimp.github.io/jQuery-File-Upload/"
-	MIN_FILE_SIZE     = 1       // bytes
-	MAX_FILE_SIZE     = 5000000 // bytes
-	IMAGE_TYPES       = "image/(gif|p?jpeg|(x-)?png)"
-	ACCEPT_FILE_TYPES = IMAGE_TYPES
-	EXPIRATION_TIME   = 300 // seconds
-	THUMBNAIL_PARAM   = "=s80"
-)
-
-var (
-	imageTypes      = regexp.MustCompile(IMAGE_TYPES)
-	acceptFileTypes = regexp.MustCompile(ACCEPT_FILE_TYPES)
-)
-
-type FileInfo struct {
-	Key          appengine.BlobKey `json:"-"`
-	Url          string            `json:"url,omitempty"`
-	ThumbnailUrl string            `json:"thumbnailUrl,omitempty"`
-	Name         string            `json:"name"`
-	Type         string            `json:"type"`
-	Size         int64             `json:"size"`
-	Error        string            `json:"error,omitempty"`
-	DeleteUrl    string            `json:"deleteUrl,omitempty"`
-	DeleteType   string            `json:"deleteType,omitempty"`
-}
-
-func (fi *FileInfo) ValidateType() (valid bool) {
-	if acceptFileTypes.MatchString(fi.Type) {
-		return true
-	}
-	fi.Error = "Filetype not allowed"
-	return false
-}
-
-func (fi *FileInfo) ValidateSize() (valid bool) {
-	if fi.Size < MIN_FILE_SIZE {
-		fi.Error = "File is too small"
-	} else if fi.Size > MAX_FILE_SIZE {
-		fi.Error = "File is too big"
-	} else {
-		return true
-	}
-	return false
-}
-
-func (fi *FileInfo) CreateUrls(r *http.Request, c appengine.Context) {
-	u := &url.URL{
-		Scheme: r.URL.Scheme,
-		Host:   appengine.DefaultVersionHostname(c),
-		Path:   "/",
-	}
-	uString := u.String()
-	fi.Url = uString + escape(string(fi.Key)) + "/" +
-		escape(string(fi.Name))
-	fi.DeleteUrl = fi.Url + "?delete=true"
-	fi.DeleteType = "DELETE"
-	if imageTypes.MatchString(fi.Type) {
-		servingUrl, err := image.ServingURL(
-			c,
-			fi.Key,
-			&image.ServingURLOptions{
-				Secure: strings.HasSuffix(u.Scheme, "s"),
-				Size:   0,
-				Crop:   false,
-			},
-		)
-		check(err)
-		fi.ThumbnailUrl = servingUrl.String() + THUMBNAIL_PARAM
-	}
-}
-
-func check(err error) {
-	if err != nil {
-		panic(err)
-	}
-}
-
-func escape(s string) string {
-	return strings.Replace(url.QueryEscape(s), "+", "%20", -1)
-}
-
-func delayedDelete(c appengine.Context, fi *FileInfo) {
-	if key := string(fi.Key); key != "" {
-		task := &taskqueue.Task{
-			Path:   "/" + escape(key) + "/-",
-			Method: "DELETE",
-			Delay:  time.Duration(EXPIRATION_TIME) * time.Second,
-		}
-		taskqueue.Add(c, task, "")
-	}
-}
-
-func handleUpload(r *http.Request, p *multipart.Part) (fi *FileInfo) {
-	fi = &FileInfo{
-		Name: p.FileName(),
-		Type: p.Header.Get("Content-Type"),
-	}
-	if !fi.ValidateType() {
-		return
-	}
-	defer func() {
-		if rec := recover(); rec != nil {
-			log.Println(rec)
-			fi.Error = rec.(error).Error()
-		}
-	}()
-	lr := &io.LimitedReader{R: p, N: MAX_FILE_SIZE + 1}
-	context := appengine.NewContext(r)
-	w, err := blobstore.Create(context, fi.Type)
-	defer func() {
-		w.Close()
-		fi.Size = MAX_FILE_SIZE + 1 - lr.N
-		fi.Key, err = w.Key()
-		check(err)
-		if !fi.ValidateSize() {
-			err := blobstore.Delete(context, fi.Key)
-			check(err)
-			return
-		}
-		delayedDelete(context, fi)
-		fi.CreateUrls(r, context)
-	}()
-	check(err)
-	_, err = io.Copy(w, lr)
-	return
-}
-
-func getFormValue(p *multipart.Part) string {
-	var b bytes.Buffer
-	io.CopyN(&b, p, int64(1<<20)) // Copy max: 1 MiB
-	return b.String()
-}
-
-func handleUploads(r *http.Request) (fileInfos []*FileInfo) {
-	fileInfos = make([]*FileInfo, 0)
-	mr, err := r.MultipartReader()
-	check(err)
-	r.Form, err = url.ParseQuery(r.URL.RawQuery)
-	check(err)
-	part, err := mr.NextPart()
-	for err == nil {
-		if name := part.FormName(); name != "" {
-			if part.FileName() != "" {
-				fileInfos = append(fileInfos, handleUpload(r, part))
-			} else {
-				r.Form[name] = append(r.Form[name], getFormValue(part))
-			}
-		}
-		part, err = mr.NextPart()
-	}
-	return
-}
-
-func get(w http.ResponseWriter, r *http.Request) {
-	if r.URL.Path == "/" {
-		http.Redirect(w, r, WEBSITE, http.StatusFound)
-		return
-	}
-	parts := strings.Split(r.URL.Path, "/")
-	if len(parts) == 3 {
-		if key := parts[1]; key != "" {
-			blobKey := appengine.BlobKey(key)
-			bi, err := blobstore.Stat(appengine.NewContext(r), blobKey)
-			if err == nil {
-				w.Header().Add("X-Content-Type-Options", "nosniff")
-				if !imageTypes.MatchString(bi.ContentType) {
-					w.Header().Add("Content-Type", "application/octet-stream")
-					w.Header().Add(
-						"Content-Disposition",
-						fmt.Sprintf("attachment; filename=\"%s\"", parts[2]),
-					)
-				}
-				w.Header().Add(
-					"Cache-Control",
-					fmt.Sprintf("public,max-age=%d", EXPIRATION_TIME),
-				)
-				blobstore.Send(w, blobKey)
-				return
-			}
-		}
-	}
-	http.Error(w, "404 Not Found", http.StatusNotFound)
-}
-
-func post(w http.ResponseWriter, r *http.Request) {
-    result := make(map[string][]*FileInfo, 1)
-    result["files"] = handleUploads(r)
-	b, err := json.Marshal(result)
-	check(err)
-	if redirect := r.FormValue("redirect"); redirect != "" {
-	    if strings.Contains(redirect, "%s") {
-	        redirect = fmt.Sprintf(
-    			redirect,
-    			escape(string(b)),
-    		)
-	    }
-		http.Redirect(w, r, redirect, http.StatusFound)
-		return
-	}
-	w.Header().Set("Cache-Control", "no-cache")
-	jsonType := "application/json"
-	if strings.Index(r.Header.Get("Accept"), jsonType) != -1 {
-		w.Header().Set("Content-Type", jsonType)
-	}
-	fmt.Fprintln(w, string(b))
-}
-
-func delete(w http.ResponseWriter, r *http.Request) {
-	parts := strings.Split(r.URL.Path, "/")
-	if len(parts) != 3 {
-		return
-	}
-	result := make(map[string]bool, 1)
-	if key := parts[1]; key != "" {
-		c := appengine.NewContext(r)
-		blobKey := appengine.BlobKey(key)
-		err := blobstore.Delete(c, blobKey)
-		check(err)
-		err = image.DeleteServingURL(c, blobKey)
-		check(err)
-		result[key] = true
-	}
-	jsonType := "application/json"
-	if strings.Index(r.Header.Get("Accept"), jsonType) != -1 {
-		w.Header().Set("Content-Type", jsonType)
-	}
-	b, err := json.Marshal(result)
-	check(err)
-	fmt.Fprintln(w, string(b))
-}
-
-func handle(w http.ResponseWriter, r *http.Request) {
-	params, err := url.ParseQuery(r.URL.RawQuery)
-	check(err)
-	w.Header().Add("Access-Control-Allow-Origin", "*")
-	w.Header().Add(
-		"Access-Control-Allow-Methods",
-		"OPTIONS, HEAD, GET, POST, PUT, DELETE",
-	)
-	w.Header().Add(
-		"Access-Control-Allow-Headers",
-		"Content-Type, Content-Range, Content-Disposition",
-	)
-	switch r.Method {
-	case "OPTIONS":
-	case "HEAD":
-	case "GET":
-		get(w, r)
-	case "POST":
-		if len(params["_method"]) > 0 && params["_method"][0] == "DELETE" {
-			delete(w, r)
-		} else {
-			post(w, r)
-		}
-	case "DELETE":
-		delete(w, r)
-	default:
-		http.Error(w, "501 Not Implemented", http.StatusNotImplemented)
-	}
-}
-
-func init() {
-	http.HandleFunc("/", handle)
-}

library/jqupload/server/gae-go/static/robots.txt

@@ -1,2 +0,0 @@
-User-agent: *
-Disallow:

library/jqupload/server/gae-python/app.yaml

@@ -1,16 +0,0 @@
-application: jquery-file-upload
-version: 1
-runtime: python27
-api_version: 1
-threadsafe: true
-
-builtins:
-- deferred: on
-
-handlers:
-- url: /(favicon\.ico|robots\.txt)
-  static_files: static/\1
-  upload: static/(.*)
-  expiration: '1d'
-- url: /.*
-  script: main.app

library/jqupload/server/gae-python/main.py

@@ -1,170 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# jQuery File Upload Plugin GAE Python Example 2.1.1
-# https://github.com/blueimp/jQuery-File-Upload
-#
-# Copyright 2011, Sebastian Tschan
-# https://blueimp.net
-#
-# Licensed under the MIT license:
-# http://www.opensource.org/licenses/MIT
-#
-
-from __future__ import with_statement
-from google.appengine.api import files, images
-from google.appengine.ext import blobstore, deferred
-from google.appengine.ext.webapp import blobstore_handlers
-import json
-import re
-import urllib
-import webapp2
-
-WEBSITE = 'http://blueimp.github.io/jQuery-File-Upload/'
-MIN_FILE_SIZE = 1  # bytes
-MAX_FILE_SIZE = 5000000  # bytes
-IMAGE_TYPES = re.compile('image/(gif|p?jpeg|(x-)?png)')
-ACCEPT_FILE_TYPES = IMAGE_TYPES
-THUMBNAIL_MODIFICATOR = '=s80'  # max width / height
-EXPIRATION_TIME = 300  # seconds
-
-
-def cleanup(blob_keys):
-    blobstore.delete(blob_keys)
-
-
-class UploadHandler(webapp2.RequestHandler):
-
-    def initialize(self, request, response):
-        super(UploadHandler, self).initialize(request, response)
-        self.response.headers['Access-Control-Allow-Origin'] = '*'
-        self.response.headers[
-            'Access-Control-Allow-Methods'
-        ] = 'OPTIONS, HEAD, GET, POST, PUT, DELETE'
-        self.response.headers[
-            'Access-Control-Allow-Headers'
-        ] = 'Content-Type, Content-Range, Content-Disposition'
-
-    def validate(self, file):
-        if file['size'] < MIN_FILE_SIZE:
-            file['error'] = 'File is too small'
-        elif file['size'] > MAX_FILE_SIZE:
-            file['error'] = 'File is too big'
-        elif not ACCEPT_FILE_TYPES.match(file['type']):
-            file['error'] = 'Filetype not allowed'
-        else:
-            return True
-        return False
-
-    def get_file_size(self, file):
-        file.seek(0, 2)  # Seek to the end of the file
-        size = file.tell()  # Get the position of EOF
-        file.seek(0)  # Reset the file position to the beginning
-        return size
-
-    def write_blob(self, data, info):
-        blob = files.blobstore.create(
-            mime_type=info['type'],
-            _blobinfo_uploaded_filename=info['name']
-        )
-        with files.open(blob, 'a') as f:
-            f.write(data)
-        files.finalize(blob)
-        return files.blobstore.get_blob_key(blob)
-
-    def handle_upload(self):
-        results = []
-        blob_keys = []
-        for name, fieldStorage in self.request.POST.items():
-            if type(fieldStorage) is unicode:
-                continue
-            result = {}
-            result['name'] = re.sub(
-                r'^.*\\',
-                '',
-                fieldStorage.filename
-            )
-            result['type'] = fieldStorage.type
-            result['size'] = self.get_file_size(fieldStorage.file)
-            if self.validate(result):
-                blob_key = str(
-                    self.write_blob(fieldStorage.value, result)
-                )
-                blob_keys.append(blob_key)
-                result['deleteType'] = 'DELETE'
-                result['deleteUrl'] = self.request.host_url +\
-                    '/?key=' + urllib.quote(blob_key, '')
-                if (IMAGE_TYPES.match(result['type'])):
-                    try:
-                        result['url'] = images.get_serving_url(
-                            blob_key,
-                            secure_url=self.request.host_url.startswith(
-                                'https'
-                            )
-                        )
-                        result['thumbnailUrl'] = result['url'] +\
-                            THUMBNAIL_MODIFICATOR
-                    except:  # Could not get an image serving url
-                        pass
-                if not 'url' in result:
-                    result['url'] = self.request.host_url +\
-                        '/' + blob_key + '/' + urllib.quote(
-                            result['name'].encode('utf-8'), '')
-            results.append(result)
-        deferred.defer(
-            cleanup,
-            blob_keys,
-            _countdown=EXPIRATION_TIME
-        )
-        return results
-
-    def options(self):
-        pass
-
-    def head(self):
-        pass
-
-    def get(self):
-        self.redirect(WEBSITE)
-
-    def post(self):
-        if (self.request.get('_method') == 'DELETE'):
-            return self.delete()
-        result = {'files': self.handle_upload()}
-        s = json.dumps(result, separators=(',', ':'))
-        redirect = self.request.get('redirect')
-        if redirect:
-            return self.redirect(str(
-                redirect.replace('%s', urllib.quote(s, ''), 1)
-            ))
-        if 'application/json' in self.request.headers.get('Accept'):
-            self.response.headers['Content-Type'] = 'application/json'
-        self.response.write(s)
-
-    def delete(self):
-        key = self.request.get('key') or ''
-        blobstore.delete(key)
-        s = json.dumps({key: True}, separators=(',', ':'))
-        if 'application/json' in self.request.headers.get('Accept'):
-            self.response.headers['Content-Type'] = 'application/json'
-        self.response.write(s)
-
-
-class DownloadHandler(blobstore_handlers.BlobstoreDownloadHandler):
-    def get(self, key, filename):
-        if not blobstore.get(key):
-            self.error(404)
-        else:
-            # Prevent browsers from MIME-sniffing the content-type:
-            self.response.headers['X-Content-Type-Options'] = 'nosniff'
-            # Cache for the expiration time:
-            self.response.headers['Cache-Control'] = 'public,max-age=%d' % EXPIRATION_TIME
-            # Send the file forcing a download dialog:
-            self.send_blob(key, save_as=filename, content_type='application/octet-stream')
-
-app = webapp2.WSGIApplication(
-    [
-        ('/', UploadHandler),
-        ('/([^/]+)/([^/]+)', DownloadHandler)
-    ],
-    debug=True
-)

library/jqupload/server/gae-python/static/robots.txt

@@ -1,2 +0,0 @@
-User-agent: *
-Disallow:

library/jqupload/server/node/.gitignore

@@ -1,2 +0,0 @@
-.DS_Store
-node_modules

library/jqupload/server/node/package.json

@@ -1,41 +0,0 @@
-{
-    "name": "blueimp-file-upload-node",
-    "version": "2.1.0",
-    "title": "jQuery File Upload Node.js example",
-    "description": "Node.js implementation example of a file upload handler for jQuery File Upload.",
-    "keywords": [
-        "file",
-        "upload",
-        "cross-domain",
-        "cross-site",
-        "node"
-    ],
-    "homepage": "https://github.com/blueimp/jQuery-File-Upload",
-    "author": {
-        "name": "Sebastian Tschan",
-        "url": "https://blueimp.net"
-    },
-    "maintainers": [
-        {
-            "name": "Sebastian Tschan",
-            "url": "https://blueimp.net"
-        }
-    ],
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/blueimp/jQuery-File-Upload.git"
-    },
-    "bugs": "https://github.com/blueimp/jQuery-File-Upload/issues",
-    "licenses": [
-        {
-            "type": "MIT",
-            "url": "http://www.opensource.org/licenses/MIT"
-        }
-    ],
-    "dependencies": {
-        "formidable": ">=1.0.11",
-        "node-static": ">=0.6.5",
-        "imagemagick": ">=0.1.3"
-    },
-    "main": "server.js"
-}

library/jqupload/server/node/public/files/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

library/jqupload/server/node/server.js

@@ -1,292 +0,0 @@
-#!/usr/bin/nodejs
-/*
- * jQuery File Upload Plugin Node.js Example 2.1.1
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2012, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/* jshint nomen:false */
-/* global require, __dirname, unescape, console */
-
-(function (port) {
-    'use strict';
-    var path = require('path'),
-        fs = require('fs'),
-        // Since Node 0.8, .existsSync() moved from path to fs:
-        _existsSync = fs.existsSync || path.existsSync,
-        formidable = require('formidable'),
-        nodeStatic = require('node-static'),
-        imageMagick = require('imagemagick'),
-        options = {
-            tmpDir: __dirname + '/tmp',
-            publicDir: __dirname + '/public',
-            uploadDir: __dirname + '/public/files',
-            uploadUrl: '/files/',
-            maxPostSize: 11000000000, // 11 GB
-            minFileSize: 1,
-            maxFileSize: 10000000000, // 10 GB
-            acceptFileTypes: /.+/i,
-            // Files not matched by this regular expression force a download dialog,
-            // to prevent executing any scripts in the context of the service domain:
-            inlineFileTypes: /\.(gif|jpe?g|png)$/i,
-            imageTypes: /\.(gif|jpe?g|png)$/i,
-            imageVersions: {
-                'thumbnail': {
-                    width: 80,
-                    height: 80
-                }
-            },
-            accessControl: {
-                allowOrigin: '*',
-                allowMethods: 'OPTIONS, HEAD, GET, POST, PUT, DELETE',
-                allowHeaders: 'Content-Type, Content-Range, Content-Disposition'
-            },
-            /* Uncomment and edit this section to provide the service via HTTPS:
-            ssl: {
-                key: fs.readFileSync('/Applications/XAMPP/etc/ssl.key/server.key'),
-                cert: fs.readFileSync('/Applications/XAMPP/etc/ssl.crt/server.crt')
-            },
-            */
-            nodeStatic: {
-                cache: 3600 // seconds to cache served files
-            }
-        },
-        utf8encode = function (str) {
-            return unescape(encodeURIComponent(str));
-        },
-        fileServer = new nodeStatic.Server(options.publicDir, options.nodeStatic),
-        nameCountRegexp = /(?:(?: \(([\d]+)\))?(\.[^.]+))?$/,
-        nameCountFunc = function (s, index, ext) {
-            return ' (' + ((parseInt(index, 10) || 0) + 1) + ')' + (ext || '');
-        },
-        FileInfo = function (file) {
-            this.name = file.name;
-            this.size = file.size;
-            this.type = file.type;
-            this.deleteType = 'DELETE';
-        },
-        UploadHandler = function (req, res, callback) {
-            this.req = req;
-            this.res = res;
-            this.callback = callback;
-        },
-        serve = function (req, res) {
-            res.setHeader(
-                'Access-Control-Allow-Origin',
-                options.accessControl.allowOrigin
-            );
-            res.setHeader(
-                'Access-Control-Allow-Methods',
-                options.accessControl.allowMethods
-            );
-            res.setHeader(
-                'Access-Control-Allow-Headers',
-                options.accessControl.allowHeaders
-            );
-            var handleResult = function (result, redirect) {
-                    if (redirect) {
-                        res.writeHead(302, {
-                            'Location': redirect.replace(
-                                /%s/,
-                                encodeURIComponent(JSON.stringify(result))
-                            )
-                        });
-                        res.end();
-                    } else {
-                        res.writeHead(200, {
-                            'Content-Type': req.headers.accept
-                                .indexOf('application/json') !== -1 ?
-                                        'application/json' : 'text/plain'
-                        });
-                        res.end(JSON.stringify(result));
-                    }
-                },
-                setNoCacheHeaders = function () {
-                    res.setHeader('Pragma', 'no-cache');
-                    res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate');
-                    res.setHeader('Content-Disposition', 'inline; filename="files.json"');
-                },
-                handler = new UploadHandler(req, res, handleResult);
-            switch (req.method) {
-            case 'OPTIONS':
-                res.end();
-                break;
-            case 'HEAD':
-            case 'GET':
-                if (req.url === '/') {
-                    setNoCacheHeaders();
-                    if (req.method === 'GET') {
-                        handler.get();
-                    } else {
-                        res.end();
-                    }
-                } else {
-                    fileServer.serve(req, res);
-                }
-                break;
-            case 'POST':
-                setNoCacheHeaders();
-                handler.post();
-                break;
-            case 'DELETE':
-                handler.destroy();
-                break;
-            default:
-                res.statusCode = 405;
-                res.end();
-            }
-        };
-    fileServer.respond = function (pathname, status, _headers, files, stat, req, res, finish) {
-        // Prevent browsers from MIME-sniffing the content-type:
-        _headers['X-Content-Type-Options'] = 'nosniff';
-        if (!options.inlineFileTypes.test(files[0])) {
-            // Force a download dialog for unsafe file extensions:
-            _headers['Content-Type'] = 'application/octet-stream';
-            _headers['Content-Disposition'] = 'attachment; filename="' +
-                utf8encode(path.basename(files[0])) + '"';
-        }
-        nodeStatic.Server.prototype.respond
-            .call(this, pathname, status, _headers, files, stat, req, res, finish);
-    };
-    FileInfo.prototype.validate = function () {
-        if (options.minFileSize && options.minFileSize > this.size) {
-            this.error = 'File is too small';
-        } else if (options.maxFileSize && options.maxFileSize < this.size) {
-            this.error = 'File is too big';
-        } else if (!options.acceptFileTypes.test(this.name)) {
-            this.error = 'Filetype not allowed';
-        }
-        return !this.error;
-    };
-    FileInfo.prototype.safeName = function () {
-        // Prevent directory traversal and creating hidden system files:
-        this.name = path.basename(this.name).replace(/^\.+/, '');
-        // Prevent overwriting existing files:
-        while (_existsSync(options.uploadDir + '/' + this.name)) {
-            this.name = this.name.replace(nameCountRegexp, nameCountFunc);
-        }
-    };
-    FileInfo.prototype.initUrls = function (req) {
-        if (!this.error) {
-            var that = this,
-                baseUrl = (options.ssl ? 'https:' : 'http:') +
-                    '//' + req.headers.host + options.uploadUrl;
-            this.url = this.deleteUrl = baseUrl + encodeURIComponent(this.name);
-            Object.keys(options.imageVersions).forEach(function (version) {
-                if (_existsSync(
-                        options.uploadDir + '/' + version + '/' + that.name
-                    )) {
-                    that[version + 'Url'] = baseUrl + version + '/' +
-                        encodeURIComponent(that.name);
-                }
-            });
-        }
-    };
-    UploadHandler.prototype.get = function () {
-        var handler = this,
-            files = [];
-        fs.readdir(options.uploadDir, function (err, list) {
-            list.forEach(function (name) {
-                var stats = fs.statSync(options.uploadDir + '/' + name),
-                    fileInfo;
-                if (stats.isFile() && name[0] !== '.') {
-                    fileInfo = new FileInfo({
-                        name: name,
-                        size: stats.size
-                    });
-                    fileInfo.initUrls(handler.req);
-                    files.push(fileInfo);
-                }
-            });
-            handler.callback({files: files});
-        });
-    };
-    UploadHandler.prototype.post = function () {
-        var handler = this,
-            form = new formidable.IncomingForm(),
-            tmpFiles = [],
-            files = [],
-            map = {},
-            counter = 1,
-            redirect,
-            finish = function () {
-                counter -= 1;
-                if (!counter) {
-                    files.forEach(function (fileInfo) {
-                        fileInfo.initUrls(handler.req);
-                    });
-                    handler.callback({files: files}, redirect);
-                }
-            };
-        form.uploadDir = options.tmpDir;
-        form.on('fileBegin', function (name, file) {
-            tmpFiles.push(file.path);
-            var fileInfo = new FileInfo(file, handler.req, true);
-            fileInfo.safeName();
-            map[path.basename(file.path)] = fileInfo;
-            files.push(fileInfo);
-        }).on('field', function (name, value) {
-            if (name === 'redirect') {
-                redirect = value;
-            }
-        }).on('file', function (name, file) {
-            var fileInfo = map[path.basename(file.path)];
-            fileInfo.size = file.size;
-            if (!fileInfo.validate()) {
-                fs.unlink(file.path);
-                return;
-            }
-            fs.renameSync(file.path, options.uploadDir + '/' + fileInfo.name);
-            if (options.imageTypes.test(fileInfo.name)) {
-                Object.keys(options.imageVersions).forEach(function (version) {
-                    counter += 1;
-                    var opts = options.imageVersions[version];
-                    imageMagick.resize({
-                        width: opts.width,
-                        height: opts.height,
-                        srcPath: options.uploadDir + '/' + fileInfo.name,
-                        dstPath: options.uploadDir + '/' + version + '/' +
-                            fileInfo.name
-                    }, finish);
-                });
-            }
-        }).on('aborted', function () {
-            tmpFiles.forEach(function (file) {
-                fs.unlink(file);
-            });
-        }).on('error', function (e) {
-            console.log(e);
-        }).on('progress', function (bytesReceived) {
-            if (bytesReceived > options.maxPostSize) {
-                handler.req.connection.destroy();
-            }
-        }).on('end', finish).parse(handler.req);
-    };
-    UploadHandler.prototype.destroy = function () {
-        var handler = this,
-            fileName;
-        if (handler.req.url.slice(0, options.uploadUrl.length) === options.uploadUrl) {
-            fileName = path.basename(decodeURIComponent(handler.req.url));
-            if (fileName[0] !== '.') {
-                fs.unlink(options.uploadDir + '/' + fileName, function (ex) {
-                    Object.keys(options.imageVersions).forEach(function (version) {
-                        fs.unlink(options.uploadDir + '/' + version + '/' + fileName);
-                    });
-                    handler.callback({success: !ex});
-                });
-                return;
-            }
-        }
-        handler.callback({success: false});
-    };
-    if (options.ssl) {
-        require('https').createServer(options.ssl, serve).listen(port);
-    } else {
-        require('http').createServer(serve).listen(port);
-    }
-}(8888));

library/jqupload/server/php/files/.gitignore

@@ -1,3 +0,0 @@
-*
-!.gitignore
-!.htaccess

library/jqupload/server/php/files/.htaccess

@@ -1,18 +0,0 @@
-# The following directives force the content-type application/octet-stream
-# and force browsers to display a download dialog for non-image files.
-# This prevents the execution of script files in the context of the website:
-ForceType application/octet-stream
-Header set Content-Disposition attachment
-<FilesMatch "(?i)\.(gif|jpe?g|png)$">
-	ForceType none
-	Header unset Content-Disposition
-</FilesMatch>
-
-# The following directive prevents browsers from MIME-sniffing the content-type.
-# This is an important complement to the ForceType directive above:
-Header set X-Content-Type-Options nosniff
-
-# Uncomment the following lines to prevent unauthorized download of files:
-#AuthName "Authorization required"
-#AuthType Basic
-#require valid-user

library/jqupload/server/php/index.php

@@ -1,19 +0,0 @@
-<?php
-/*
- * jQuery File Upload Plugin PHP Example 5.14
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2010, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-// Don't allow files to be stored from the demo server 
-
-exit;
-
-error_reporting(E_ALL | E_STRICT);
-require('UploadHandler.php');
-$upload_handler = new UploadHandler();

library/jqupload/test/index.html

@@ -1,166 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/*
- * jQuery File Upload Plugin Test 9.0.0
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2010, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
--->
-<html lang="en">
-<head>
-<!-- Force latest IE rendering engine or ChromeFrame if installed -->
-<!--[if IE]>
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<![endif]-->
-<meta charset="utf-8">
-<title>jQuery File Upload Plugin Test</title>
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="stylesheet" href="http://codeorigin.jquery.com/qunit/qunit-1.12.0.css">
-</head>
-<body>
-<h1 id="qunit-header">jQuery File Upload Plugin Test</h1>
-<h2 id="qunit-banner"></h2>
-<div id="qunit-testrunner-toolbar"></div>
-<h2 id="qunit-userAgent"></h2>
-<ol id="qunit-tests"></ol>
-<div id="qunit-fixture">
-    <!-- The file upload form used as target for the file upload widget -->
-    <form id="fileupload" action="../server/php/" method="POST" enctype="multipart/form-data">
-        <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
-       <div class="row fileupload-buttonbar">
-            <div class="col-lg-7">
-                <!-- The fileinput-button span is used to style the file input field as button -->
-                <span class="btn btn-success fileinput-button">
-                    <i class="fa-plus fa fa-inverse"></i>
-                    <span>Add files...</span>
-                    <input type="file" name="files[]" multiple>
-                </span>
-                <button type="submit" class="btn btn-primary start">
-                    <i class="fa-arrow-circle-o-up fa fa-inverse"></i>
-                    <span>Start upload</span>
-                </button>
-                <button type="reset" class="btn btn-warning cancel">
-                    <i class="fa-ban fa fa-inverse"></i>
-                    <span>Cancel upload</span>
-                </button>
-                <button type="button" class="btn btn-danger delete">
-                    <i class="fa-trash-o fa fa-inverse"></i>
-                    <span>Delete</span>
-                </button>
-                <input type="checkbox" class="toggle">
-                <!-- The global file processing state -->
-                <span class="fileupload-process"></span>
-            </div>
-            <!-- The global progress state -->
-            <div class="col-lg-5 fileupload-progress">
-                <!-- The global progress bar -->
-                <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100">
-                    <div class="progress-bar progress-bar-success" style="width:0%;"></div>
-                </div>
-                <!-- The extended global progress state -->
-                <div class="progress-extended">&nbsp;</div>
-            </div>
-        </div>
-        <!-- The table listing the files available for upload/download -->
-        <table role="presentation" class="table table-striped"><tbody class="files"></tbody></table>
-    </form>
-</div>
-<!-- The template to display files available for upload -->
-<script id="template-upload" type="text/x-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-upload">
-        <td>
-            <span class="preview"></span>
-        </td>
-        <td>
-            <p class="name">{%=file.name%}</p>
-            <strong class="error text-danger"></strong>
-        </td>
-        <td>
-            <p class="size">Processing...</p>
-            <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-success" style="width:0%;"></div></div>
-        </td>
-        <td>
-            {% if (!i && !o.options.autoUpload) { %}
-                <button class="btn btn-primary start" disabled>
-                    <i class="glyphicon glyphicon-upload"></i>
-                    <span>Start</span>
-                </button>
-            {% } %}
-            {% if (!i) { %}
-                <button class="btn btn-warning cancel">
-                    <i class="glyphicon glyphicon-ban-circle"></i>
-                    <span>Cancel</span>
-                </button>
-            {% } %}
-        </td>
-    </tr>
-{% } %}
-</script>
-<!-- The template to display files available for download -->
-<script id="template-download" type="text/x-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-download">
-        <td>
-            <span class="preview">
-                {% if (file.thumbnailUrl) { %}
-                    <a href="{%=file.url%}" title="{%=file.name%}" download="{%=file.name%}" data-gallery><img src="{%=file.thumbnailUrl%}"></a>
-                {% } %}
-            </span>
-        </td>
-        <td>
-            <p class="name">
-                {% if (file.url) { %}
-                    <a href="{%=file.url%}" title="{%=file.name%}" download="{%=file.name%}" {%=file.thumbnailUrl?'data-gallery':''%}>{%=file.name%}</a>
-                {% } else { %}
-                    <span>{%=file.name%}</span>
-                {% } %}
-            </p>
-            {% if (file.error) { %}
-                <div><span class="label label-danger">Error</span> {%=file.error%}</div>
-            {% } %}
-        </td>
-        <td>
-            <span class="size">{%=o.formatFileSize(file.size)%}</span>
-        </td>
-        <td>
-            {% if (file.deleteUrl) { %}
-                <button class="btn btn-danger delete" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                    <i class="glyphicon glyphicon-trash"></i>
-                    <span>Delete</span>
-                </button>
-                <input type="checkbox" name="delete" value="1" class="toggle">
-            {% } else { %}
-                <button class="btn btn-warning cancel">
-                    <i class="glyphicon glyphicon-ban-circle"></i>
-                    <span>Cancel</span>
-                </button>
-            {% } %}
-        </td>
-    </tr>
-{% } %}
-</script>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-<script src="../js/vendor/jquery.ui.widget.js"></script>
-<script src="http://blueimp.github.io/JavaScript-Templates/js/tmpl.min.js"></script>
-<script src="http://blueimp.github.io/JavaScript-Load-Image/js/load-image.min.js"></script>
-<script src="http://blueimp.github.io/JavaScript-Canvas-to-Blob/js/canvas-to-blob.min.js"></script>
-<script src="../js/jquery.iframe-transport.js"></script>
-<script src="../js/jquery.fileupload.js"></script>
-<script>window.testBasicWidget = $.blueimp.fileupload;</script>
-<script src="../js/jquery.fileupload-process.js"></script>
-<script src="../js/jquery.fileupload-image.js"></script>
-<script src="../js/jquery.fileupload-audio.js"></script>
-<script src="../js/jquery.fileupload-video.js"></script>
-<script src="../js/jquery.fileupload-validate.js"></script>
-<script src="../js/jquery.fileupload-ui.js"></script>
-<script>window.testUIWidget = $.blueimp.fileupload;</script>
-<script src="http://codeorigin.jquery.com/qunit/qunit-1.12.0.js"></script>
-<script src="test.js"></script>
-</body> 
-</html>

tests/unit/includes/MarkdownTest.php

@@ -52,12 +52,12 @@ class MarkdownTest extends UnitTestCase {
 						'  ',
 						''
 				],
-/* it is not clear why this test fails
+
 				'strong, b, em, i, bib' => [
 						'<strong>strong</strong> <b>bold</b> <em>em</em> <i>italic</i>  <b>bo<i>italic</i>ld</b>',
-						'**strong** **bold** _em_ _italic_ **bo_italic_ld**'
+						'**strong** **bold** *em* *italic* **bo*italic*ld**'
 				],
-*/
+
 				'empty tags' => [
 						'text1 <b></b> text2 <i></i>',
 						'text1  text2'
@@ -70,10 +70,6 @@ class MarkdownTest extends UnitTestCase {
 						'&amp; lt &lt; gt &gt;',
 						'& lt < gt >'
 				],
-				'our escaped HTML entities' => [
-						'&_lt_; &_gt_; &_amp_;',
-						'&\_lt\_; &\_gt\_; &\_amp\_;'
-				],
 				'linebreak' => [
 						"line1<br>line2\nline3",
 						"line1  \nline2 line3"
@@ -84,15 +80,15 @@ class MarkdownTest extends UnitTestCase {
 				],
 				'unordered list' => [
 						'<ul><li>Item 1</li><li>Item 2</li><li>Item <b>3</b></li></ul>',
-						"- Item 1\n- Item 2\n- Item 3"
+						"- Item 1\n- Item 2\n- Item **3**"
 				],
 				'ordered list' => [
 						'<ol><li>Item 1</li><li>Item 2</li><li>Item <b>3</b></li></ol>',
-						"1. Item 1\n2. Item 2\n3. Item 3"
+						"1. Item 1\n2. Item 2\n3. Item **3**"
 				],
 				'nested lists' => [
 						'<ul><li>Item 1<ol><li>Item 1a</li><li>Item <b>1b</b></ol></li><li>Item 2</li></ul>',
-						"- Item 1\n  1. Item 1a\n  2. Item 1b\n- Item 2"
+						"- Item 1\n  1. Item 1a\n  2. Item **1b**\n- Item 2"
 				],
 				'img' => [
 						'<img src="/path/to/img.png" alt="alt text" title="title text">',
@@ -118,12 +114,10 @@ class MarkdownTest extends UnitTestCase {
 						'<code>&lt;p&gt;HTML text&lt;/p&gt;</code>',
 						'`<p>HTML text</p>`'
 				],
-/* it is not clear why this test fails
 				'pre' => [
-						'<pre>   line with  spaces   </pre>',
-						'`   line with  spaces   `'
+						'<pre>  one line with spaces  </pre>',
+						"```\n  one line with spaces  \n```"
 				],
-*/
 				'div p' => [
 						'<div>div</div><div><p>p</p></div>',
 						"<div>div</div><div>p\n\n</div>"