Merge branch 'dev' into sabre32

25 files changed, 189 insertions, 196 deletions

diff --git a/Zotlabs/Daemon/Cron_daily.php b/Zotlabs/Daemon/Cron_daily.php
index fbc255d2f..a16d49853 100644
--- a/Zotlabs/Daemon/Cron_daily.php
+++ b/Zotlabs/Daemon/Cron_daily.php
@@ -34,7 +34,7 @@ class Cron_daily {
 
 		// expire any read notifications over a month old
 
-		q("delete from notify where seen = 1 and date < %s - INTERVAL %s",
+		q("delete from notify where seen = 1 and created < %s - INTERVAL %s",
 			db_utcnow(), db_quoteinterval('30 DAY')
 		);
 
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index ccb538ef5..56c717468 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -348,7 +348,7 @@ class Enotify {
 		$hash = random_string();
 		$r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1",
 			dbesc($hash));
-		if (count($r))
+		if ($r)
 			$dups = true;
 	} while ($dups === true);
 
@@ -356,16 +356,16 @@ class Enotify {
 	$datarray = array();
 	$datarray['hash']   = $hash;
 	$datarray['sender_hash'] = $sender['xchan_hash'];
-	$datarray['name']   = $sender['xchan_name'];
+	$datarray['xname']   = $sender['xchan_name'];
 	$datarray['url']    = $sender['xchan_url'];
 	$datarray['photo']  = $sender['xchan_photo_s'];
-	$datarray['date']   = datetime_convert();
+	$datarray['created']   = datetime_convert();
 	$datarray['aid']    = $recip['channel_account_id'];
 	$datarray['uid']    = $recip['channel_id'];
 	$datarray['link']   = $itemlink;
 	$datarray['parent'] = $parent_mid;
 	$datarray['parent_item'] = $parent_item;
-	$datarray['type']   = $params['type'];
+	$datarray['ntype']   = $params['type'];
 	$datarray['verb']   = $params['verb'];
 	$datarray['otype']  = $params['otype'];
  	$datarray['abort']  = false;
@@ -394,19 +394,19 @@ class Enotify {
 		}
 	}
 
-	$r = q("insert into notify (hash,name,url,photo,date,aid,uid,link,parent,seen,type,verb,otype)
+	$r = q("insert into notify (hash,xname,url,photo,created,aid,uid,link,parent,seen,ntype,verb,otype)
 		values('%s','%s','%s','%s','%s',%d,%d,'%s','%s',%d,%d,'%s','%s')",
 		dbesc($datarray['hash']),
-		dbesc($datarray['name']),
+		dbesc($datarray['xname']),
 		dbesc($datarray['url']),
 		dbesc($datarray['photo']),
-		dbesc($datarray['date']),
+		dbesc($datarray['created']),
 		intval($datarray['aid']),
 		intval($datarray['uid']),
 		dbesc($datarray['link']),
 		dbesc($datarray['parent']),
 		intval($seen),
-		intval($datarray['type']),
+		intval($datarray['ntype']),
 		dbesc($datarray['verb']),
 		dbesc($datarray['otype'])
 	);
diff --git a/Zotlabs/Module/Attach.php b/Zotlabs/Module/Attach.php
index 8948b66d7..de941d52c 100644
--- a/Zotlabs/Module/Attach.php
+++ b/Zotlabs/Module/Attach.php
@@ -40,7 +40,7 @@ class Attach extends \Zotlabs\Web\Controller {
 	
 		header('Content-disposition: attachment; filename="' . $r['data']['filename'] . '"');
 		if(intval($r['data']['os_storage'])) {
-			$fname = dbunescbin($r['data']['data']);
+			$fname = dbunescbin($r['data']['content']);
 			if(strpos($fname,'store') !== false)
 				$istream = fopen($fname,'rb');
 			else
@@ -53,7 +53,7 @@ class Attach extends \Zotlabs\Web\Controller {
 			}
 		}
 		else
-			echo dbunescbin($r['data']['data']);
+			echo dbunescbin($r['data']['content']);
 		killme();
 	
 	}
diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php
index a1adb30e5..1da42684d 100644
--- a/Zotlabs/Module/Cal.php
+++ b/Zotlabs/Module/Cal.php
@@ -91,7 +91,7 @@ class Cal extends \Zotlabs\Web\Controller {
 		$mode = 'view';
 		$y = 0;
 		$m = 0;
-		$ignored = ((x($_REQUEST,'ignored')) ? " and ignored = " . intval($_REQUEST['ignored']) . " "  : '');
+		$ignored = ((x($_REQUEST,'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " "  : '');
 	
 		// logger('args: ' . print_r(\App::$argv,true));
 	
@@ -146,7 +146,7 @@ class Cal extends \Zotlabs\Web\Controller {
 			$ftext = datetime_convert('UTC',$tz,$fdt);
 			$ftext = substr($ftext,0,14) . "00:00";
 	
-			$type = ((x($orig_event)) ? $orig_event['type'] : 'event');
+			$type = ((x($orig_event)) ? $orig_event['etype'] : 'event');
 	
 			$f = get_config('system','event_input_format');
 			if(! $f)
@@ -157,7 +157,7 @@ class Cal extends \Zotlabs\Web\Controller {
 	
 			$show_bd = perm_is_allowed($channel['channel_id'], get_observer_hash(), 'view_contacts');
 			if(! $show_bd) {
-				$sql_extra .= " and event.type != 'birthday' ";
+				$sql_extra .= " and event.etype != 'birthday' ";
 			}
 	
 	
@@ -225,8 +225,8 @@ class Cal extends \Zotlabs\Web\Controller {
 				$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
 	                              from event left join item on event_hash = resource_id 
 					where resource_type = 'event' and event.uid = %d $ignored 
-					AND (( adjust = 0 AND ( finish >= '%s' or nofinish = 1 ) AND start <= '%s' ) 
-					OR  (  adjust = 1 AND ( finish >= '%s' or nofinish = 1 ) AND start <= '%s' )) $sql_extra ",
+					AND (( adjust = 0 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' ) 
+					OR  (  adjust = 1 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )) $sql_extra ",
 					intval($channel['channel_id']),
 					dbesc($start),
 					dbesc($finish),
@@ -247,7 +247,7 @@ class Cal extends \Zotlabs\Web\Controller {
 	
 			if($r) {
 				foreach($r as $rr) {
-					$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
+					$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j'));
 					if(! x($links,$j)) 
 						$links[$j] = z_root() . '/' . \App::$cmd . '#link-' . $j;
 				}
@@ -262,15 +262,15 @@ class Cal extends \Zotlabs\Web\Controller {
 	
 				foreach($r as $rr) {
 					
-					$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
-					$d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], $fmt) : datetime_convert('UTC','UTC',$rr['start'],$fmt));
+					$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j'));
+					$d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], $fmt) : datetime_convert('UTC','UTC',$rr['dtstart'],$fmt));
 					$d = day_translate($d);
 					
-					$start = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'c') : datetime_convert('UTC','UTC',$rr['start'],'c'));
+					$start = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'c') : datetime_convert('UTC','UTC',$rr['dtstart'],'c'));
 					if ($rr['nofinish']){
 						$end = null;
 					} else {
-						$end = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['finish'], 'c') : datetime_convert('UTC','UTC',$rr['finish'],'c'));
+						$end = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtend'], 'c') : datetime_convert('UTC','UTC',$rr['dtend'],'c'));
 					}
 					
 					
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index c5c38b96a..33deac4c8 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -270,7 +270,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 						array('rel' => 'photo', 'type' => \App::$poi['xchan_photo_mimetype'], 'href' => \App::$poi['xchan_photo_l'])
 	       			),
 	   			);
-				$xarr['object'] = json_encode($obj);
+				$xarr['obj'] = json_encode($obj);
 				$xarr['obj_type'] = ACTIVITY_OBJ_PERSON;
 	
 				$xarr['body'] = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]' . ' ' . t('is now connected to') . ' ' . '[zrl=' . \App::$poi['xchan_url'] . ']' . \App::$poi['xchan_name'] . '[/zrl]';
diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php
index 371713c8d..a72c3389f 100644
--- a/Zotlabs/Module/Cover_photo.php
+++ b/Zotlabs/Module/Cover_photo.php
@@ -80,7 +80,7 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 				$profile = $r[0];
 			}
 	
-			$r = q("SELECT * FROM photo WHERE resource_id = '%s' AND uid = %d AND scale = 0 LIMIT 1",
+			$r = q("SELECT * FROM photo WHERE resource_id = '%s' AND uid = %d AND imgscale = 0 LIMIT 1",
 				dbesc($image_id),
 				intval(local_channel())
 			);
@@ -88,9 +88,9 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 			if($r) {
 	
 				$base_image = $r[0];
-				$base_image['data'] = (($r[0]['os_storage']) ? @file_get_contents($base_image['data']) : dbunescbin($base_image['data']));
+				$base_image['content'] = (($r[0]['os_storage']) ? @file_get_contents($base_image['content']) : dbunescbin($base_image['content']));
 			
-				$im = photo_factory($base_image['data'], $base_image['type']);
+				$im = photo_factory($base_image['content'], $base_image['mimetype']);
 				if($im->is_valid()) {
 	
 					// We are scaling and cropping the relative pixel locations to the original photo instead of the 
@@ -99,7 +99,7 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 					// First load the scaled photo to check its size. (Should probably pass this in the post form and save
 					// a query.)
 	
-					$g = q("select width, height from photo where resource_id = '%s' and uid = %d and scale = 3",
+					$g = q("select width, height from photo where resource_id = '%s' and uid = %d and imgscale = 3",
 						dbesc($image_id),
 						intval(local_channel())
 					);
@@ -133,26 +133,26 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 					$p = array('aid' => $aid, 'uid' => local_channel(), 'resource_id' => $base_image['resource_id'],
 						'filename' => $base_image['filename'], 'album' => t('Cover Photos'));
 	
-					$p['scale'] = 7;
+					$p['imgscale'] = 7;
 					$p['photo_usage'] = PHOTO_COVER;
 	
 					$r1 = $im->save($p);
 	
 					$im->doScaleImage(850,310);
-					$p['scale'] = 8;
+					$p['imgscale'] = 8;
 	
 					$r2 = $im->save($p);
 	
 	
 					$im->doScaleImage(425,160);
-					$p['scale'] = 9;
+					$p['imgscale'] = 9;
 	
 					$r3 = $im->save($p);
 				
 					if($r1 === false || $r2 === false || $r3 === false) {
 						// if one failed, delete them all so we can start over.
 						notice( t('Image resize failed.') . EOL );
-						$x = q("delete from photo where resource_id = '%s' and uid = %d and scale >= 7 ",
+						$x = q("delete from photo where resource_id = '%s' and uid = %d and imgscale >= 7 ",
 							dbesc($base_image['resource_id']),
 							local_channel()
 						);
@@ -183,7 +183,7 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 		logger('attach_store: ' . print_r($res,true));
 	
 		if($res && intval($res['data']['is_photo'])) {
-			$i = q("select * from photo where resource_id = '%s' and uid = %d and scale = 0",
+			$i = q("select * from photo where resource_id = '%s' and uid = %d and imgscale = 0",
 				dbesc($hash),
 				intval(local_channel())
 			);
@@ -195,10 +195,10 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 			$os_storage = false;
 	
 			foreach($i as $ii) {
-				$smallest = intval($ii['scale']);
+				$smallest = intval($ii['imgscale']);
 				$os_storage = intval($ii['os_storage']);
-				$imagedata = $ii['data'];
-				$filetype = $ii['type'];
+				$imagedata = $ii['content'];
+				$filetype = $ii['mimetype'];
 	
 			}
 		}
@@ -224,10 +224,10 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 		$arr['obj_type'] = ACTIVITY_OBJ_PHOTO;
 		$arr['verb'] = ACTIVITY_UPDATE;
 	
-		$arr['object'] = json_encode(array(
+		$arr['obj'] = json_encode(array(
 			'type' => $arr['obj_type'],
 			'id' => z_root() . '/photo/' . $photo['resource_id'] . '-7',
-			'link' => array('rel' => 'photo', 'type' => $photo['type'], 'href' => z_root() . '/photo/' . $photo['resource_id'] . '-7')
+			'link' => array('rel' => 'photo', 'type' => $photo['mimetype'], 'href' => z_root() . '/photo/' . $photo['resource_id'] . '-7')
 		));
 	
 		if($profile && stripos($profile['gender'],t('female')) !== false)
@@ -295,7 +295,7 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 	        
 			$resource_id = argv(2);
 	
-			$r = q("SELECT id, album, scale FROM photo WHERE uid = %d AND resource_id = '%s' ORDER BY scale ASC",
+			$r = q("SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' ORDER BY imgscale ASC",
 				intval(local_channel()),
 				dbesc($resource_id)
 			);
@@ -305,11 +305,11 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 			}
 			$havescale = false;
 			foreach($r as $rr) {
-				if($rr['scale'] == 7)
+				if($rr['imgscale'] == 7)
 					$havescale = true;
 			}
 	
-			$r = q("SELECT `data`, `type`, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1",
+			$r = q("SELECT `content`, `mimetype`, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1",
 				intval($r[0]['id']),
 				intval(local_channel())
 	
@@ -320,15 +320,15 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 			}
 	
 			if(intval($r[0]['os_storage']))
-				$data = @file_get_contents($r[0]['data']);
+				$data = @file_get_contents($r[0]['content']);
 			else
-				$data = dbunescbin($r[0]['data']); 
+				$data = dbunescbin($r[0]['content']); 
 	
-			$ph = photo_factory($data, $r[0]['type']);
+			$ph = photo_factory($data, $r[0]['mimetype']);
 			$smallest = 0;
 			if($ph->is_valid()) {
 				// go ahead as if we have just uploaded a new photo to crop
-				$i = q("select resource_id, scale from photo where resource_id = '%s' and uid = %d and scale = 0",
+				$i = q("select resource_id, imgscale from photo where resource_id = '%s' and uid = %d and imgscale = 0",
 					dbesc($r[0]['resource_id']),
 					intval(local_channel())
 				);
@@ -336,7 +336,7 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 				if($i) {
 					$hash = $i[0]['resource_id'];
 					foreach($i as $ii) {
-						$smallest = intval($ii['scale']);
+						$smallest = intval($ii['imgscale']);
 					}
 	            }
 	        }
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php
index 3996473b7..3f3f9fb4c 100644
--- a/Zotlabs/Module/Events.php
+++ b/Zotlabs/Module/Events.php
@@ -180,12 +180,12 @@ class Events extends \Zotlabs\Web\Controller {
 		}
 	
 		$datarray = array();
-		$datarray['start'] = $start;
-		$datarray['finish'] = $finish;
+		$datarray['dtstart'] = $start;
+		$datarray['dtend'] = $finish;
 		$datarray['summary'] = $summary;
 		$datarray['description'] = $desc;
 		$datarray['location'] = $location;
-		$datarray['type'] = $type;
+		$datarray['etype'] = $type;
 		$datarray['adjust'] = $adjust;
 		$datarray['nofinish'] = $nofinish;
 		$datarray['uid'] = local_channel();
@@ -269,14 +269,14 @@ class Events extends \Zotlabs\Web\Controller {
 		nav_set_selected('all_events');
 	
 		if((argc() > 2) && (argv(1) === 'ignore') && intval(argv(2))) {
-			$r = q("update event set ignore = 1 where id = %d and uid = %d",
+			$r = q("update event set dismissed = 1 where id = %d and uid = %d",
 				intval(argv(2)),
 				intval(local_channel())
 			);
 		}
 	
 		if((argc() > 2) && (argv(1) === 'unignore') && intval(argv(2))) {
-			$r = q("update event set ignore = 0 where id = %d and uid = %d",
+			$r = q("update event set dismissed = 0 where id = %d and uid = %d",
 				intval(argv(2)),
 				intval(local_channel())
 			);
@@ -301,7 +301,7 @@ class Events extends \Zotlabs\Web\Controller {
 		$mode = 'view';
 		$y = 0;
 		$m = 0;
-		$ignored = ((x($_REQUEST,'ignored')) ? " and ignored = " . intval($_REQUEST['ignored']) . " "  : '');
+		$ignored = ((x($_REQUEST,'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " "  : '');
 	
 	
 		// logger('args: ' . print_r(\App::$argv,true));
@@ -358,9 +358,9 @@ class Events extends \Zotlabs\Web\Controller {
 			if(x($_REQUEST,'summary')) $orig_event['summary'] = $_REQUEST['summary'];
 			if(x($_REQUEST,'description')) $orig_event['description'] = $_REQUEST['description'];
 			if(x($_REQUEST,'location')) $orig_event['location'] = $_REQUEST['location'];
-			if(x($_REQUEST,'start')) $orig_event['start'] = $_REQUEST['start'];
-			if(x($_REQUEST,'finish')) $orig_event['finish'] = $_REQUEST['finish'];
-			if(x($_REQUEST,'type')) $orig_event['type'] = $_REQUEST['type'];
+			if(x($_REQUEST,'start')) $orig_event['dtstart'] = $_REQUEST['start'];
+			if(x($_REQUEST,'finish')) $orig_event['dtend'] = $_REQUEST['finish'];
+			if(x($_REQUEST,'type')) $orig_event['etype'] = $_REQUEST['type'];
 			*/
 	
 			$n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : '');
@@ -380,9 +380,9 @@ class Events extends \Zotlabs\Web\Controller {
 			if($orig_event['event_xchan'])
 				$sh_checked .= ' disabled="disabled" ';
 	
-			$sdt = ((x($orig_event)) ? $orig_event['start'] : 'now');
+			$sdt = ((x($orig_event)) ? $orig_event['dtstart'] : 'now');
 	
-			$fdt = ((x($orig_event)) ? $orig_event['finish'] : '+1 hour');
+			$fdt = ((x($orig_event)) ? $orig_event['dtend'] : '+1 hour');
 	
 			$tz = date_default_timezone_get();
 			if(x($orig_event))
@@ -406,7 +406,7 @@ class Events extends \Zotlabs\Web\Controller {
 			$ftext = datetime_convert('UTC',$tz,$fdt);
 			$ftext = substr($ftext,0,14) . "00:00";
 	
-			$type = ((x($orig_event)) ? $orig_event['type'] : 'event');
+			$type = ((x($orig_event)) ? $orig_event['etype'] : 'event');
 	
 			$f = get_config('system','event_input_format');
 			if(! $f)
@@ -536,8 +536,8 @@ class Events extends \Zotlabs\Web\Controller {
 				);
 			} elseif($export) {
 				$r = q("SELECT * from event where uid = %d
-					AND (( `adjust` = 0 AND ( `finish` >= '%s' or nofinish = 1 ) AND `start` <= '%s' ) 
-					OR  (  `adjust` = 1 AND ( `finish` >= '%s' or nofinish = 1 ) AND `start` <= '%s' )) ",
+					AND (( `adjust` = 0 AND ( `dtend` >= '%s' or nofinish = 1 ) AND `dtstart` <= '%s' ) 
+					OR  (  `adjust` = 1 AND ( `dtend` >= '%s' or nofinish = 1 ) AND `dtstart` <= '%s' )) ",
 					intval(local_channel()),
 					dbesc($start),
 					dbesc($finish),
@@ -554,8 +554,8 @@ class Events extends \Zotlabs\Web\Controller {
 				$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
 	                              from event left join item on event_hash = resource_id 
 					where resource_type = 'event' and event.uid = %d $ignored 
-					AND (( adjust = 0 AND ( finish >= '%s' or nofinish = 1 ) AND start <= '%s' ) 
-					OR  (  adjust = 1 AND ( finish >= '%s' or nofinish = 1 ) AND start <= '%s' )) ",
+					AND (( adjust = 0 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' ) 
+					OR  (  adjust = 1 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )) ",
 					intval(local_channel()),
 					dbesc($start),
 					dbesc($finish),
@@ -576,7 +576,7 @@ class Events extends \Zotlabs\Web\Controller {
 	
 			if($r) {
 				foreach($r as $rr) {
-					$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
+					$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j'));
 					if(! x($links,$j)) 
 						$links[$j] = z_root() . '/' . \App::$cmd . '#link-' . $j;
 				}
@@ -591,15 +591,15 @@ class Events extends \Zotlabs\Web\Controller {
 	
 				foreach($r as $rr) {
 					
-					$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
-					$d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], $fmt) : datetime_convert('UTC','UTC',$rr['start'],$fmt));
+					$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j'));
+					$d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], $fmt) : datetime_convert('UTC','UTC',$rr['dtstart'],$fmt));
 					$d = day_translate($d);
 					
-					$start = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'c') : datetime_convert('UTC','UTC',$rr['start'],'c'));
+					$start = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'c') : datetime_convert('UTC','UTC',$rr['dtstart'],'c'));
 					if ($rr['nofinish']){
 						$end = null;
 					} else {
-						$end = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['finish'], 'c') : datetime_convert('UTC','UTC',$rr['finish'],'c'));
+						$end = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtend'], 'c') : datetime_convert('UTC','UTC',$rr['dtend'],'c'));
 					}
 					
 					
diff --git a/Zotlabs/Module/Fbrowser.php b/Zotlabs/Module/Fbrowser.php
index eef3cb67d..c534e8f72 100644
--- a/Zotlabs/Module/Fbrowser.php
+++ b/Zotlabs/Module/Fbrowser.php
@@ -45,10 +45,10 @@ class Fbrowser extends \Zotlabs\Web\Controller {
 					$album = hex2bin(\App::$argv[2]);
 					$sql_extra = sprintf("AND `album` = '%s' ",dbesc($album));
 					$sql_extra2 = "";
-					$path[]=array(z_root()."/fbrowser/image/".\App::$argv[2]."/", $album);
+					$path[]=array(z_root() . "/fbrowser/image/" . \App::$argv[2] . "/", $album);
 				}
 					
-				$r = q("SELECT `resource_id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `description`  
+				$r = q("SELECT `resource_id`, `id`, `filename`, type, min(`imgscale`) AS `hiq`,max(`imgscale`) AS `loq`, `description`  
 						FROM `photo` WHERE `uid` = %d $sql_extra
 						GROUP BY `resource_id` $sql_extra2",
 					intval(local_channel())					
diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php
index 3ef67ddcc..1ca37d646 100644
--- a/Zotlabs/Module/Like.php
+++ b/Zotlabs/Module/Like.php
@@ -483,7 +483,7 @@ class Like extends \Zotlabs\Web\Controller {
 	
 		$arr['verb']          = $activity;
 		$arr['obj_type']      = $objtype;
-		$arr['object']        = $object;
+		$arr['obj']           = $object;
 	
 		if($target) {
 			$arr['tgt_type']  = $tgttype;
diff --git a/Zotlabs/Module/Notifications.php b/Zotlabs/Module/Notifications.php
index d51d2861c..9da28a360 100644
--- a/Zotlabs/Module/Notifications.php
+++ b/Zotlabs/Module/Notifications.php
@@ -80,18 +80,18 @@ class Notifications extends \Zotlabs\Web\Controller {
 			$not_tpl = get_markup_template('notify.tpl');
 			require_once('include/bbcode.php');
 	
-			$r = q("SELECT * from notify where uid = %d and seen = 0 order by date desc",
+			$r = q("SELECT * from notify where uid = %d and seen = 0 order by created desc",
 				intval(local_channel())
 			);
 			
-			if (count($r) > 0) {
+			if ($r > 0) {
 				$notifications_available =1;
 				foreach ($r as $it) {
 					$notif_content .= replace_macros($not_tpl,array(
 						'$item_link' => z_root().'/notify/view/'. $it['id'],
 						'$item_image' => $it['photo'],
 						'$item_text' => strip_tags(bbcode($it['msg'])),
-						'$item_when' => relative_date($it['date'])
+						'$item_when' => relative_date($it['created'])
 					));
 				}
 			} else {
diff --git a/Zotlabs/Module/Notify.php b/Zotlabs/Module/Notify.php
index 227491145..f592f6f37 100644
--- a/Zotlabs/Module/Notify.php
+++ b/Zotlabs/Module/Notify.php
@@ -39,7 +39,7 @@ class Notify extends \Zotlabs\Web\Controller {
 		$not_tpl = get_markup_template('notify.tpl');
 		require_once('include/bbcode.php');
 	
-		$r = q("SELECT * from notify where uid = %d and seen = 0 order by date desc",
+		$r = q("SELECT * from notify where uid = %d and seen = 0 order by created desc",
 			intval(local_channel())
 		);
 			
@@ -49,7 +49,7 @@ class Notify extends \Zotlabs\Web\Controller {
 					'$item_link' => z_root().'/notify/view/'. $it['id'],
 					'$item_image' => $it['photo'],
 					'$item_text' => strip_tags(bbcode($it['msg'])),
-					'$item_when' => relative_date($it['date'])
+					'$item_when' => relative_date($it['created'])
 				));
 			}
 		} 
diff --git a/Zotlabs/Module/Oep.php b/Zotlabs/Module/Oep.php
index 89824fc7e..dc0547a42 100644
--- a/Zotlabs/Module/Oep.php
+++ b/Zotlabs/Module/Oep.php
@@ -249,7 +249,7 @@ class Oep extends \Zotlabs\Web\Controller {
 	
 		$sql_extra = permissions_sql($c[0]['channel_id']);
 	
-		$p = q("select resource_id from photo where album = '%s' and uid = %d and scale = 0 $sql_extra order by created desc limit 1",
+		$p = q("select resource_id from photo where album = '%s' and uid = %d and imgscale = 0 $sql_extra order by created desc limit 1",
 	  		dbesc($res),
 			intval($c[0]['channel_id'])
 		);
@@ -258,7 +258,7 @@ class Oep extends \Zotlabs\Web\Controller {
 	
 		$res = $p[0]['resource_id'];
 	
-		$r = q("select height, width, scale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by scale asc",
+		$r = q("select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc",
 			intval($c[0]['channel_id']),
 			dbesc($res)
 		);
@@ -276,7 +276,7 @@ class Oep extends \Zotlabs\Web\Controller {
 	
 			if($foundres) {
 				$ret['type'] = 'link';
-				$ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['scale'];
+				$ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale'];
 				$ret['thumbnail_width'] = $rr['width'];
 				$ret['thumbnail_height'] = $rr['height'];
 			}
@@ -310,7 +310,7 @@ class Oep extends \Zotlabs\Web\Controller {
 	
 		$sql_extra = permissions_sql($c[0]['channel_id']);
 	
-		$p = q("select resource_id from photo where uid = %d and scale = 0 $sql_extra order by created desc limit 1",
+		$p = q("select resource_id from photo where uid = %d and imgscale = 0 $sql_extra order by created desc limit 1",
 			intval($c[0]['channel_id'])
 		);
 		if(! $p)
@@ -318,7 +318,7 @@ class Oep extends \Zotlabs\Web\Controller {
 	
 		$res = $p[0]['resource_id'];
 	
-		$r = q("select height, width, scale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by scale asc",
+		$r = q("select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc",
 			intval($c[0]['channel_id']),
 			dbesc($res)
 		);
@@ -336,7 +336,7 @@ class Oep extends \Zotlabs\Web\Controller {
 	
 			if($foundres) {
 				$ret['type'] = 'link';
-				$ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['scale'];
+				$ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale'];
 				$ret['thumbnail_width'] = $rr['width'];
 				$ret['thumbnail_height'] = $rr['height'];
 			}
@@ -372,7 +372,7 @@ class Oep extends \Zotlabs\Web\Controller {
 		$sql_extra = permissions_sql($c[0]['channel_id']);
 	
 	
-		$r = q("select height, width, scale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by scale asc",
+		$r = q("select height, width, imgscale, resource_id from photo where uid = %d and resource_id = '%s' $sql_extra order by imgscale asc",
 			intval($c[0]['channel_id']),
 			dbesc($res)
 		);
@@ -390,7 +390,7 @@ class Oep extends \Zotlabs\Web\Controller {
 	
 			if($foundres) {
 				$ret['type'] = 'link';
-				$ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['scale'];
+				$ret['thumbnail_url'] = z_root() . '/photo/' . '/' . $rr['resource_id'] . '-' . $rr['imgscale'];
 				$ret['thumbnail_width'] = $rr['width'];
 				$ret['thumbnail_height'] = $rr['height'];
 			}
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index 408688886..92c9ac3c0 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -57,14 +57,14 @@ class Photo extends \Zotlabs\Web\Controller {
 	
 			$uid = $person;
 	
-			$r = q("SELECT * FROM photo WHERE scale = %d AND uid = %d AND photo_usage = %d LIMIT 1",
+			$r = q("SELECT * FROM photo WHERE imgscale = %d AND uid = %d AND photo_usage = %d LIMIT 1",
 				intval($resolution),
 				intval($uid),
 				intval(PHOTO_PROFILE)
 			);
 			if(count($r)) {
-				$data = dbunescbin($r[0]['data']);
-				$mimetype = $r[0]['type'];
+				$data = dbunescbin($r[0]['content']);
+				$mimetype = $r[0]['mimetype'];
 			}
 			if(intval($r[0]['os_storage']))
 				$data = file_get_contents($data);
@@ -113,7 +113,7 @@ class Photo extends \Zotlabs\Web\Controller {
 			// If using resolution 1, make sure it exists before proceeding:
 			if ($resolution == 1)
 			  {
-			    $r = q("SELECT uid FROM photo WHERE resource_id = '%s' AND scale = %d LIMIT 1",
+			    $r = q("SELECT uid FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
 				   dbesc($photo),
 				   intval($resolution)
 				   );
@@ -121,7 +121,7 @@ class Photo extends \Zotlabs\Web\Controller {
 			      $resolution = 2;
 			  }
 	
-			$r = q("SELECT uid FROM photo WHERE resource_id = '%s' AND scale = %d LIMIT 1",
+			$r = q("SELECT uid FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
 				dbesc($photo),
 				intval($resolution)
 			);
@@ -133,14 +133,14 @@ class Photo extends \Zotlabs\Web\Controller {
 	
 				// Now we'll see if we can access the photo
 	
-				$r = q("SELECT * FROM photo WHERE resource_id = '%s' AND scale = %d $sql_extra LIMIT 1",
+				$r = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d $sql_extra LIMIT 1",
 					dbesc($photo),
 					intval($resolution)
 				);
 	
 				if($r && $allowed) {
-					$data = dbunescbin($r[0]['data']);
-					$mimetype = $r[0]['type'];
+					$data = dbunescbin($r[0]['content']);
+					$mimetype = $r[0]['mimetype'];
 					if(intval($r[0]['os_storage']))
 						$data = file_get_contents($data);
 				}
@@ -154,7 +154,7 @@ class Photo extends \Zotlabs\Web\Controller {
 					// they won't have the photo link, so there's a reasonable chance that the person
 					// might be able to obtain permission to view it.
 	
-					$r = q("SELECT * FROM `photo` WHERE `resource_id` = '%s' AND `scale` = %d LIMIT 1",
+					$r = q("SELECT * FROM `photo` WHERE `resource_id` = '%s' AND `imgscale` = %d LIMIT 1",
 						dbesc($photo),
 						intval($resolution)
 					);
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index ecf966032..ada7b4ef1 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -255,13 +255,13 @@ class Photos extends \Zotlabs\Web\Controller {
 			   ( (intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2) )) {
 				logger('rotate');
 	
-				$r = q("select * from photo where `resource_id` = '%s' and uid = %d and scale = 0 limit 1",
+				$r = q("select * from photo where `resource_id` = '%s' and uid = %d and imgscale = 0 limit 1",
 					dbesc($resource_id),
 					intval($page_owner_uid)
 				);
 				if(count($r)) {
-					$d = (($r[0]['os_storage']) ? @file_get_contents($r[0]['data']) : dbunescbin($r[0]['data']));
-					$ph = photo_factory($d, $r[0]['type']);
+					$d = (($r[0]['os_storage']) ? @file_get_contents($r[0]['content']) : dbunescbin($r[0]['content']));
+					$ph = photo_factory($d, $r[0]['mimetype']);
 					if($ph->is_valid()) {
 						$rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
 						$ph->rotate($rotate_deg);
@@ -270,9 +270,9 @@ class Photos extends \Zotlabs\Web\Controller {
 						$height = $ph->getHeight();
 						
 						if(intval($r[0]['os_storage'])) {
-							@file_put_contents($r[0]['data'],$ph->imageString());
-							$data = $r[0]['data'];
-							$fsize = @filesize($r[0]['data']);
+							@file_put_contents($r[0]['content'],$ph->imageString());
+							$data = $r[0]['content'];
+							$fsize = @filesize($r[0]['content']);
 							q("update attach set filesize = %d where hash = '%s' and uid = %d limit 1",
 								intval($fsize),
 								dbesc($resource_id),
@@ -284,7 +284,7 @@ class Photos extends \Zotlabs\Web\Controller {
 							$fsize = strlen($data);
 						}
 	
-						$x = q("update photo set data = '%s', `size` = %d, height = %d, width = %d where `resource_id` = '%s' and uid = %d and scale = 0",
+						$x = q("update photo set content = '%s', filesize = %d, height = %d, width = %d where `resource_id` = '%s' and uid = %d and imgscale = 0",
 							dbescbin($data),
 							intval($fsize),
 							intval($height),
@@ -299,7 +299,7 @@ class Photos extends \Zotlabs\Web\Controller {
 						$width  = $ph->getWidth();
 						$height = $ph->getHeight();
 	
-						$x = q("update photo set data = '%s', height = %d, width = %d where `resource_id` = '%s' and uid = %d and scale = 1",
+						$x = q("update photo set content = '%s', height = %d, width = %d where `resource_id` = '%s' and uid = %d and imgscale = 1",
 							dbescbin($ph->imageString()),
 							intval($height),
 							intval($width),
@@ -314,7 +314,7 @@ class Photos extends \Zotlabs\Web\Controller {
 						$width  = $ph->getWidth();
 						$height = $ph->getHeight();
 	
-						$x = q("update photo set data = '%s', height = %d, width = %d where `resource_id` = '%s' and uid = %d and scale = 2",
+						$x = q("update photo set content = '%s', height = %d, width = %d where `resource_id` = '%s' and uid = %d and imgscale = 2",
 							dbescbin($ph->imageString()),
 							intval($height),
 							intval($width),
@@ -329,7 +329,7 @@ class Photos extends \Zotlabs\Web\Controller {
 						$width  = $ph->getWidth();
 						$height = $ph->getHeight();
 	
-						$x = q("update photo set data = '%s', height = %d, width = %d where `resource_id` = '%s' and uid = %d and scale = 3",
+						$x = q("update photo set content = '%s', height = %d, width = %d where `resource_id` = '%s' and uid = %d and imgscale = 3",
 							dbescbin($ph->imageString()),
 							intval($height),
 							intval($width),
@@ -340,12 +340,12 @@ class Photos extends \Zotlabs\Web\Controller {
 				}
 			}
 	
-			$p = q("SELECT type, is_nsfw, description, resource_id, scale, allow_cid, allow_gid, deny_cid, deny_gid FROM photo WHERE resource_id = '%s' AND uid = %d ORDER BY scale DESC",
+			$p = q("SELECT mimetype, is_nsfw, description, resource_id, imgscale, allow_cid, allow_gid, deny_cid, deny_gid FROM photo WHERE resource_id = '%s' AND uid = %d ORDER BY imgscale DESC",
 				dbesc($resource_id),
 				intval($page_owner_uid)
 			);
 			if($p) {
-				$ext = $phototypes[$p[0]['type']];
+				$ext = $phototypes[$p[0]['mimetype']];
 	
 				$r = q("UPDATE `photo` SET `description` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource_id` = '%s' AND `uid` = %d",
 					dbesc($desc),
@@ -611,7 +611,7 @@ class Photos extends \Zotlabs\Web\Controller {
 	
 			/* Show space usage */
 	
-			$r = q("select sum(size) as total from photo where aid = %d and scale = 0 ",
+			$r = q("select sum(filesize) as total from photo where aid = %d and imgscale = 0 ",
 				intval(\App::$data['channel']['channel_account_id'])
 			);
 	
@@ -704,8 +704,8 @@ class Photos extends \Zotlabs\Web\Controller {
 			\App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$cmd) . '" title="oembed" />' . "\r\n";
 	
 	
-			$r = q("SELECT `resource_id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' 
-				AND `scale` <= 4 and photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY `resource_id`",
+			$r = q("SELECT `resource_id`, max(`imgscale`) AS `imgscale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' 
+				AND `imgscale` <= 4 and photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY `resource_id`",
 				intval($owner_uid),
 				dbesc($album),
 				intval(PHOTO_NORMAL),
@@ -725,9 +725,9 @@ class Photos extends \Zotlabs\Web\Controller {
 				$order = 'DESC';
 	
 				
-			$r = q("SELECT p.resource_id, p.id, p.filename, p.type, p.scale, p.description, p.created FROM photo p INNER JOIN
-					(SELECT resource_id, max(scale) scale FROM photo WHERE uid = %d AND album = '%s' AND scale <= 4 AND photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY resource_id) ph 
-					ON (p.resource_id = ph.resource_id AND p.scale = ph.scale)
+			$r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN
+					(SELECT resource_id, max(imgscale) imgscale FROM photo WHERE uid = %d AND album = '%s' AND imgscale <= 4 AND photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY resource_id) ph 
+					ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale)
 				ORDER BY created $order LIMIT %d OFFSET %d",
 				intval($owner_uid),
 				dbesc($album),
@@ -777,7 +777,7 @@ class Photos extends \Zotlabs\Web\Controller {
 					else
 						$twist = 'rotright';
 					
-					$ext = $phototypes[$rr['type']];
+					$ext = $phototypes[$rr['mimetype']];
 	
 					$imgalt_e = $rr['filename'];
 					$desc_e = $rr['description'];
@@ -790,7 +790,7 @@ class Photos extends \Zotlabs\Web\Controller {
 						'twist' => ' ' . $twist . rand(2,4),
 						'link' => $imagelink,
 						'title' => t('View Photo'),
-						'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['scale'] . '.' .$ext,
+						'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' .$ext,
 						'alt' => $imgalt_e,
 						'desc'=> $desc_e,
 						'ext' => $ext,
@@ -852,8 +852,8 @@ class Photos extends \Zotlabs\Web\Controller {
 	
 			// fetch image, item containing image, then comments
 	
-			$ph = q("SELECT id,aid,uid,xchan,resource_id,created,edited,title,`description`,album,filename,`type`,height,width,`size`,scale,photo_usage,is_nsfw,allow_cid,allow_gid,deny_cid,deny_gid FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s' 
-				$sql_extra ORDER BY `scale` ASC ",
+			$ph = q("SELECT id,aid,uid,xchan,resource_id,created,edited,title,`description`,album,filename,mimetype,height,width,filesize,imgscale,photo_usage,is_nsfw,allow_cid,allow_gid,deny_cid,deny_gid FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s' 
+				$sql_extra ORDER BY `imgscale` ASC ",
 				intval($owner_uid),
 				dbesc($datum)
 			);
@@ -884,7 +884,7 @@ class Photos extends \Zotlabs\Web\Controller {
 				$order = 'DESC';
 	
 	
-			$prvnxt = q("SELECT `resource_id` FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `scale` = 0 
+			$prvnxt = q("SELECT `resource_id` FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `imgscale` = 0 
 				$sql_extra ORDER BY `created` $order ",
 				dbesc($ph[0]['album']),
 				intval($owner_uid)
@@ -911,7 +911,7 @@ class Photos extends \Zotlabs\Web\Controller {
 			if(count($ph) == 1)
 				$hires = $lores = $ph[0];
 			if(count($ph) > 1) {
-				if($ph[1]['scale'] == 2) {
+				if($ph[1]['imgscale'] == 2) {
 					// original is 640 or less, we can display it directly
 					$hires = $lores = $ph[0];
 				}
@@ -949,9 +949,9 @@ class Photos extends \Zotlabs\Web\Controller {
 				$prevlink = array($prevlink, t('Previous'));
 	
 			$photo = array(
-				'href' => z_root() . '/photo/' . $hires['resource_id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']],
+				'href' => z_root() . '/photo/' . $hires['resource_id'] . '-' . $hires['imgscale'] . '.' . $phototypes[$hires['mimetype']],
 				'title'=> t('View Full Size'),
-				'src'  => z_root() . '/photo/' . $lores['resource_id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?f=&_u=' . datetime_convert('','','','ymdhis')
+				'src'  => z_root() . '/photo/' . $lores['resource_id'] . '-' . $lores['imgscale'] . '.' . $phototypes[$lores['mimetype']] . '?f=&_u=' . datetime_convert('','','','ymdhis')
 			);
 	
 			if($nextlink)
@@ -1277,7 +1277,7 @@ class Photos extends \Zotlabs\Web\Controller {
 			\App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$cmd) . '" title="oembed" />' . "\r\n";
 	
 	
-		$r = q("SELECT `resource_id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' 
+		$r = q("SELECT `resource_id`, max(`imgscale`) AS `imgscale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' 
 			and photo_usage in ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY `resource_id`",
 			intval(\App::$data['channel']['channel_id']),
 			dbesc('Contact Photos'),
@@ -1286,16 +1286,17 @@ class Photos extends \Zotlabs\Web\Controller {
 			intval(PHOTO_PROFILE),
 			intval($unsafe)
 		);
-		if(count($r)) {
+		if($r) {
 			\App::set_pager_total(count($r));
 			\App::set_pager_itemspage(60);
 		}
 		
-		$r = q("SELECT p.resource_id, p.id, p.filename, p.type, p.album, p.scale, p.created FROM photo p INNER JOIN 
-			(SELECT resource_id, max(scale) scale FROM photo 
-				WHERE uid=%d AND album != '%s' AND album != '%s' 
-				AND photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra group by resource_id) ph 
-			ON (p.resource_id = ph.resource_id and p.scale = ph.scale) ORDER by p.created DESC LIMIT %d OFFSET %d",
+		$r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.album, p.imgscale, p.created FROM photo as p 
+			INNER JOIN ( SELECT resource_id, max(imgscale) as imgscale FROM photo 
+				WHERE uid = %d AND photo_usage IN ( %d, %d ) 
+				AND is_nsfw = %d $sql_extra group by resource_id ) as ph 
+			ON (p.resource_id = ph.resource_id and p.imgscale = ph.imgscale) 
+			ORDER by p.created DESC LIMIT %d OFFSET %d",
 			intval(\App::$data['channel']['channel_id']),
 			dbesc('Contact Photos'),
 			dbesc( t('Contact Photos')),
@@ -1309,14 +1310,14 @@ class Photos extends \Zotlabs\Web\Controller {
 	
 	
 		$photos = array();
-		if(count($r)) {
+		if($r) {
 			$twist = 'rotright';
 			foreach($r as $rr) {
 				if($twist == 'rotright')
 					$twist = 'rotleft';
 				else
 					$twist = 'rotright';
-				$ext = $phototypes[$rr['type']];
+				$ext = $phototypes[$rr['mimetype']];
 				
 				if(\App::get_template_engine() === 'internal') {
 					$alt_e = template_escape($rr['filename']);
@@ -1332,7 +1333,7 @@ class Photos extends \Zotlabs\Web\Controller {
 					'twist'    => ' ' . $twist . rand(2,4),
 					'link'  	=> z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $rr['resource_id'],
 					'title' 	=> t('View Photo'),
-					'src'     	=> z_root() . '/photo/' . $rr['resource_id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,
+					'src'     	=> z_root() . '/photo/' . $rr['resource_id'] . '-' . ((($rr['imgscale']) == 6) ? 4 : $rr['imgscale']) . '.' . $ext,
 					'alt'     	=> $alt_e,
 					'album'	=> array(
 						'link'  => z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . bin2hex($rr['album']),
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
index 32427b06f..5cbf45daa 100644
--- a/Zotlabs/Module/Ping.php
+++ b/Zotlabs/Module/Ping.php
@@ -173,7 +173,7 @@ class Ping extends \Zotlabs\Web\Controller {
 					);
 					break;
 				case 'all_events':
-					$r = q("update event set `ignore` = 1 where `ignore` = 0 and uid = %d AND start < '%s' AND start > '%s' ",
+					$r = q("update event set `dimissed` = 1 where `dismissed` = 0 and uid = %d AND dtstart < '%s' AND dtstart > '%s' ",
 						intval(local_channel()),
 						dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
 						dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
@@ -209,17 +209,17 @@ class Ping extends \Zotlabs\Web\Controller {
 			);
 			if($t && intval($t[0]['total']) > 49) {
 				$z = q("select * from notify where uid = %d
-					and seen = 0 order by date desc limit 50",
+					and seen = 0 order by created desc limit 50",
 					intval(local_channel())
 				);
 			}
 			else {
 				$z1 = q("select * from notify where uid = %d
-					and seen = 0 order by date desc limit 50",
+					and seen = 0 order by created desc limit 50",
 					intval(local_channel())
 				);
 				$z2 = q("select * from notify where uid = %d
-					and seen = 1 order by date desc limit %d",
+					and seen = 1 order by created desc limit %d",
 					intval(local_channel()),
 					intval(50 - intval($t[0]['total']))
 				);
@@ -230,10 +230,10 @@ class Ping extends \Zotlabs\Web\Controller {
 				foreach($z as $zz) {
 					$notifs[] = array(
 						'notify_link' => z_root() . '/notify/view/' . $zz['id'], 
-						'name' => $zz['name'],
+						'name' => $zz['xname'],
 						'url' => $zz['url'],
 						'photo' => $zz['photo'],
-						'when' => relative_date($zz['date']), 
+						'when' => relative_date($zz['created']), 
 						'hclass' => (($zz['seen']) ? 'notify-seen' : 'notify-unseen'), 
 						'message' => strip_tags(bbcode($zz['msg']))
 					);
@@ -325,9 +325,9 @@ class Ping extends \Zotlabs\Web\Controller {
 			$result = array();
 	
 			$r = q("SELECT * FROM event left join xchan on event_xchan = xchan_hash
-				WHERE `event`.`uid` = %d AND start < '%s' AND start > '%s' and `ignore` = 0
-				and type in ( 'event', 'birthday' )
-				ORDER BY `start` DESC LIMIT 1000",
+				WHERE `event`.`uid` = %d AND dtstart < '%s' AND dtstart > '%s' and `dismissed` = 0
+				and etype in ( 'event', 'birthday' )
+				ORDER BY `dtstart` DESC LIMIT 1000",
 				intval(local_channel()),
 				dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
 				dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
@@ -336,14 +336,14 @@ class Ping extends \Zotlabs\Web\Controller {
 			if($r) {
 				foreach($r as $rr) {
 					if($rr['adjust'])
-						$md = datetime_convert('UTC', date_default_timezone_get(), $rr['start'], 'Y/m');
+						$md = datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'Y/m');
 					else
-						$md = datetime_convert('UTC', 'UTC', $rr['start'], 'Y/m');
+						$md = datetime_convert('UTC', 'UTC', $rr['dtstart'], 'Y/m');
 	
-					$strt = datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['start']);
+					$strt = datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart']);
 					$today = ((substr($strt, 0, 10) === datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d')) ? true : false);
 					
-					$when = day_translate(datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '');
+					$when = day_translate(datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '');
 	
 					$result[] = array(
 						'notify_link' => z_root() . '/events', // FIXME this takes you to an edit page and it may not be yours, we really want to just view the single event  --> '/events/event/' . $rr['event_hash'],
@@ -443,10 +443,10 @@ class Ping extends \Zotlabs\Web\Controller {
 		$t5 = dba_timer();
 	
 		if($vnotify & (VNOTIFY_EVENT|VNOTIFY_EVENTTODAY|VNOTIFY_BIRTHDAY)) {
-			$events = q("SELECT type, start, adjust FROM `event`
-				WHERE `event`.`uid` = %d AND start < '%s' AND start > '%s' and `ignore` = 0
-				and type in ( 'event', 'birthday' )
-				ORDER BY `start` ASC ",
+			$events = q("SELECT etype, dtstart, adjust FROM `event`
+				WHERE `event`.`uid` = %d AND dtstart < '%s' AND dtstart > '%s' and `dismissed` = 0
+				and etype in ( 'event', 'birthday' )
+				ORDER BY `dtstart` ASC ",
 					intval(local_channel()),
 					dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
 					dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
@@ -459,14 +459,14 @@ class Ping extends \Zotlabs\Web\Controller {
 					$str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d');
 					foreach($events as $x) {
 						$bd = false;
-						if($x['type'] === 'birthday') {
+						if($x['etype'] === 'birthday') {
 							$result['birthdays'] ++;
 							$bd = true;
 						}
 						else {
 							$result['events'] ++;
 						}
-						if(datetime_convert('UTC', ((intval($x['adjust'])) ? date_default_timezone_get() : 'UTC'), $x['start'], 'Y-m-d') === $str_now) {
+						if(datetime_convert('UTC', ((intval($x['adjust'])) ? date_default_timezone_get() : 'UTC'), $x['dtstart'], 'Y-m-d') === $str_now) {
 							$result['all_events_today'] ++;
 							if($bd)
 								$result['birthdays_today'] ++;
diff --git a/Zotlabs/Module/Poke.php b/Zotlabs/Module/Poke.php
index 123ecbc7b..cf8d83023 100644
--- a/Zotlabs/Module/Poke.php
+++ b/Zotlabs/Module/Poke.php
@@ -115,7 +115,7 @@ class Poke extends \Zotlabs\Web\Controller {
 			),
 		);
 	
-		$arr['object'] = json_encode($obj);
+		$arr['obj'] = json_encode($obj);
 	
 		$arr['item_origin']   = 1;
 		$arr['item_wall']     = 1;
diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php
index a8cf3cbee..6129a7492 100644
--- a/Zotlabs/Module/Profile_photo.php
+++ b/Zotlabs/Module/Profile_photo.php
@@ -93,7 +93,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 			$srcW = $_POST['xfinal'] - $srcX;
 			$srcH = $_POST['yfinal'] - $srcY;
 	
-			$r = q("SELECT * FROM photo WHERE resource_id = '%s' AND uid = %d AND scale = %d LIMIT 1",
+			$r = q("SELECT * FROM photo WHERE resource_id = '%s' AND uid = %d AND imgscale = %d LIMIT 1",
 				dbesc($image_id),
 				dbesc(local_channel()),
 				intval($scale));
@@ -101,9 +101,9 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 			if($r) {
 	
 				$base_image = $r[0];
-				$base_image['data'] = (($r[0]['os_storage']) ? @file_get_contents($base_image['data']) : dbunescbin($base_image['data']));
+				$base_image['content'] = (($r[0]['os_storage']) ? @file_get_contents($base_image['content']) : dbunescbin($base_image['content']));
 			
-				$im = photo_factory($base_image['data'], $base_image['type']);
+				$im = photo_factory($base_image['content'], $base_image['mimetype']);
 				if($im->is_valid()) {
 	
 					$im->cropImage(300,$srcX,$srcY,$srcW,$srcH);
@@ -113,25 +113,25 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 					$p = array('aid' => $aid, 'uid' => local_channel(), 'resource_id' => $base_image['resource_id'],
 						'filename' => $base_image['filename'], 'album' => t('Profile Photos'));
 	
-					$p['scale'] = 4;
+					$p['imgscale'] = 4;
 					$p['photo_usage'] = (($is_default_profile) ? PHOTO_PROFILE : PHOTO_NORMAL);
 	
 					$r1 = $im->save($p);
 	
 					$im->scaleImage(80);
-					$p['scale'] = 5;
+					$p['imgscale'] = 5;
 	
 					$r2 = $im->save($p);
 				
 					$im->scaleImage(48);
-					$p['scale'] = 6;
+					$p['imgscale'] = 6;
 	
 					$r3 = $im->save($p);
 				
 					if($r1 === false || $r2 === false || $r3 === false) {
 						// if one failed, delete them all so we can start over.
 						notice( t('Image resize failed.') . EOL );
-						$x = q("delete from photo where resource_id = '%s' and uid = %d and scale >= 4 ",
+						$x = q("delete from photo where resource_id = '%s' and uid = %d and imgscale >= 4 ",
 							dbesc($base_image['resource_id']),
 							local_channel()
 						);
@@ -208,7 +208,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 		logger('attach_store: ' . print_r($res,true));
 	
 		if($res && intval($res['data']['is_photo'])) {
-			$i = q("select * from photo where resource_id = '%s' and uid = %d order by scale",
+			$i = q("select * from photo where resource_id = '%s' and uid = %d order by imgscale",
 				dbesc($hash),
 				intval(local_channel())
 			);
@@ -220,11 +220,11 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 			$os_storage = false;
 	
 			foreach($i as $ii) {
-				if(intval($ii['scale']) < 2) {
-					$smallest = intval($ii['scale']);
+				if(intval($ii['imgscale']) < 2) {
+					$smallest = intval($ii['imgscale']);
 					$os_storage = intval($ii['os_storage']);
-					$imagedata = $ii['data'];
-					$filetype = $ii['type'];
+					$imagedata = $ii['content'];
+					$filetype = $ii['mimetype'];
 				}
 			}
 		}
@@ -250,7 +250,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 	 */
 	
 	
-		function get() {
+	function get() {
 	
 		if(! local_channel()) {
 			notice( t('Permission denied.') . EOL );
@@ -275,7 +275,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 			$resource_id = argv(2);
 	
 	
-			$r = q("SELECT id, album, scale FROM photo WHERE uid = %d AND resource_id = '%s' ORDER BY scale ASC",
+			$r = q("SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' ORDER BY imgscale ASC",
 				intval(local_channel()),
 				dbesc($resource_id)
 			);
@@ -285,7 +285,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 			}
 			$havescale = false;
 			foreach($r as $rr) {
-				if($rr['scale'] == 5)
+				if($rr['imgscale'] == 5)
 					$havescale = true;
 			}
 	
@@ -315,7 +315,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 				goaway(z_root() . '/profiles');
 			}
 	
-			$r = q("SELECT `data`, `type`, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1",
+			$r = q("SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1",
 				intval($r[0]['id']),
 				intval(local_channel())
 	
@@ -326,15 +326,15 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 			}
 	
 			if(intval($r[0]['os_storage']))
-				$data = @file_get_contents($r[0]['data']);
+				$data = @file_get_contents($r[0]['content']);
 			else
-				$data = dbunescbin($r[0]['data']); 
+				$data = dbunescbin($r[0]['content']); 
 	
-			$ph = photo_factory($data, $r[0]['type']);
+			$ph = photo_factory($data, $r[0]['mimetype']);
 			$smallest = 0;
 			if($ph->is_valid()) {
 				// go ahead as if we have just uploaded a new photo to crop
-				$i = q("select resource_id, scale from photo where resource_id = '%s' and uid = %d order by scale",
+				$i = q("select resource_id, imgscale from photo where resource_id = '%s' and uid = %d order by imgscale",
 					dbesc($r[0]['resource_id']),
 					intval(local_channel())
 				);
@@ -342,8 +342,8 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 				if($i) {
 					$hash = $i[0]['resource_id'];
 					foreach($i as $ii) {
-						if(intval($ii['scale']) < 2) {
-							$smallest = intval($ii['scale']);
+						if(intval($ii['imgscale']) < 2) {
+							$smallest = intval($ii['imgscale']);
 						}
 					}
 	            }
diff --git a/Zotlabs/Module/Share.php b/Zotlabs/Module/Share.php
index 73db01657..fcc2486ba 100644
--- a/Zotlabs/Module/Share.php
+++ b/Zotlabs/Module/Share.php
@@ -48,7 +48,7 @@ class Share extends \Zotlabs\Web\Controller {
 	
 		$is_photo = (($r[0]['obj_type'] === ACTIVITY_OBJ_PHOTO) ? true : false);
 		if($is_photo) {
-			$object = json_decode($r[0]['object'],true);
+			$object = json_decode($r[0]['obj'],true);
 			$photo_bb = $object['body'];
 		}
 	
diff --git a/Zotlabs/Module/Sharedwithme.php b/Zotlabs/Module/Sharedwithme.php
index 8eaa47dba..25bc7dba3 100644
--- a/Zotlabs/Module/Sharedwithme.php
+++ b/Zotlabs/Module/Sharedwithme.php
@@ -46,7 +46,7 @@ class Sharedwithme extends \Zotlabs\Web\Controller {
 		}
 	
 		//list files
-		$r = q("SELECT id, uid, object, item_unseen FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d AND owner_xchan != '%s'",
+		$r = q("SELECT id, uid, obj, item_unseen FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d AND owner_xchan != '%s'",
 			dbesc(ACTIVITY_POST),
 			dbesc(ACTIVITY_OBJ_FILE),
 			intval(local_channel()),
@@ -59,7 +59,7 @@ class Sharedwithme extends \Zotlabs\Web\Controller {
 		if($r) {
 	
 			foreach($r as $rr) {
-				$object = json_decode($rr['object'],true);
+				$object = json_decode($rr['obj'],true);
 	
 				$item = array();
 				$item['id'] = $rr['id'];
diff --git a/Zotlabs/Module/Subthread.php b/Zotlabs/Module/Subthread.php
index 16a011a40..0226664d7 100644
--- a/Zotlabs/Module/Subthread.php
+++ b/Zotlabs/Module/Subthread.php
@@ -144,7 +144,7 @@ class Subthread extends \Zotlabs\Web\Controller {
 	
 		$arr['verb']          = $activity;
 		$arr['obj_type']      = $objtype;
-		$arr['object']        = $obj;
+		$arr['obj']           = $obj;
 	
 		$arr['allow_cid']     = $item['allow_cid'];
 		$arr['allow_gid']     = $item['allow_gid'];
diff --git a/Zotlabs/Module/Tagger.php b/Zotlabs/Module/Tagger.php
index 26d1c58ea..0a46cf56d 100644
--- a/Zotlabs/Module/Tagger.php
+++ b/Zotlabs/Module/Tagger.php
@@ -124,7 +124,7 @@ class Tagger extends \Zotlabs\Web\Controller {
 		$arr['tgt_type'] = $targettype;
 		$arr['target'] = $target;
 		$arr['obj_type'] = $objtype;
-		$arr['object'] = $obj;
+		$arr['obj'] = $obj;
 		$arr['parent_mid'] = $item['mid'];
 		
 		store_item_tag($item['uid'],$item['id'],TERM_OBJ_POST,TERM_COMMUNITYTAG,$term,$tagid);
diff --git a/Zotlabs/Module/Tasks.php b/Zotlabs/Module/Tasks.php
index ab05f8be9..6d0a92d91 100644
--- a/Zotlabs/Module/Tasks.php
+++ b/Zotlabs/Module/Tasks.php
@@ -45,7 +45,7 @@ class Tasks extends \Zotlabs\Web\Controller {
 	
 		if((argc() > 2) && (argv(1) === 'complete') && intval(argv(2))) {
 			$ret = array('success' => false);
-			$r = q("select * from event where `type` = 'task' and uid = %d and id = %d limit 1",
+			$r = q("select * from event where `etype` = 'task' and uid = %d and id = %d limit 1",
 				intval(local_channel()),
 				intval(argv(2))
 			);
@@ -80,9 +80,9 @@ class Tasks extends \Zotlabs\Web\Controller {
 			$event['account'] = $channel['channel_account_id'];
 			$event['uid'] = $channel['channel_id'];
 			$event['event_xchan'] = $channel['channel_hash'];
-			$event['type'] = 'task';
+			$event['etype'] = 'task';
 			$event['nofinish'] = true;
-			$event['created'] = $event['edited'] = $event['start'] = datetime_convert();
+			$event['created'] = $event['edited'] = $event['dtstart'] = datetime_convert();
 			$event['adjust'] = 1;
 			$event['allow_cid'] = '<' . $channel['channel_hash'] . '>';
 			$event['summary'] = escape_tags($_REQUEST['summary']);
@@ -92,21 +92,13 @@ class Tasks extends \Zotlabs\Web\Controller {
 			else
 				$x = array('success' => false);
 			json_return_and_die($x);
-		}
-	
-		
+		}	
 	}
 	
-	
-	
-	
-	
-		function get() {
-	
+	function get() {
 		if(! local_channel())
 			return;
-	
-	
+
 		return '';
 	}
 }
diff --git a/Zotlabs/Module/Thing.php b/Zotlabs/Module/Thing.php
index 6fc5219d8..e23cce565 100644
--- a/Zotlabs/Module/Thing.php
+++ b/Zotlabs/Module/Thing.php
@@ -212,7 +212,7 @@ class Thing extends \Zotlabs\Web\Controller {
 	
 			$arr['verb'] = $verb;
 			$arr['obj_type'] = $objtype;
-			$arr['object'] = $obj;
+			$arr['obj'] = $obj;
 	
 			if(! $profile['is_default']) {
 				$arr['item_private'] = true;
diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php
index 84368d07e..06ae90a5f 100644
--- a/Zotlabs/Storage/Directory.php
+++ b/Zotlabs/Storage/Directory.php
@@ -246,7 +246,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 			$deny_gid = $c[0]['channel_deny_gid'];
 		}
 
-		$r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, folder, os_storage, filetype, filesize, revision, is_photo, data, created, edited, allow_cid, allow_gid, deny_cid, deny_gid )
+		$r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, folder, os_storage, filetype, filesize, revision, is_photo, content, created, edited, allow_cid, allow_gid, deny_cid, deny_gid )
 			VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
 			intval($c[0]['channel_account_id']),
 			intval($c[0]['channel_id']),
diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php
index d40fee0ea..ecd15cc55 100644
--- a/Zotlabs/Storage/File.php
+++ b/Zotlabs/Storage/File.php
@@ -124,7 +124,7 @@ class File extends DAV\Node implements DAV\IFile {
 		);
 		if ($r) {
 			if (intval($r[0]['os_storage'])) {
-				$d = q("select folder, data from attach where hash = '%s' and uid = %d limit 1",
+				$d = q("select folder, content from attach where hash = '%s' and uid = %d limit 1",
 					dbesc($this->data['hash']),
 					intval($c[0]['channel_id'])
 				);
@@ -139,7 +139,7 @@ class File extends DAV\Node implements DAV\IFile {
 							$direct = $f1[0];
 						}
 					}	
-					$fname = dbunescbin($d[0]['data']);
+					$fname = dbunescbin($d[0]['content']);
 					if(strpos($fname,'store') === false)
 						$f = 'store/' . $this->auth->owner_nick . '/' . $fname ;
 					else
@@ -158,12 +158,12 @@ class File extends DAV\Node implements DAV\IFile {
 			} 
 			else {
 				// this shouldn't happen any more
-				$r = q("UPDATE attach SET data = '%s' WHERE hash = '%s' AND uid = %d",
+				$r = q("UPDATE attach SET content = '%s' WHERE hash = '%s' AND uid = %d",
 					dbescbin(stream_get_contents($data)),
 					dbesc($this->data['hash']),
 					intval($this->data['uid'])
 				);
-				$r = q("SELECT length(data) AS fsize FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1",
+				$r = q("SELECT length(content) AS fsize FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1",
 					dbesc($this->data['hash']),
 					intval($this->data['uid'])
 				);
@@ -236,7 +236,7 @@ class File extends DAV\Node implements DAV\IFile {
 		logger('get file ' . basename($this->name), LOGGER_DEBUG);
 		logger('os_path: ' . $this->os_path, LOGGER_DATA);
 
-		$r = q("SELECT data, flags, os_storage, filename, filetype FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1",
+		$r = q("SELECT content, flags, os_storage, filename, filetype FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1",
 			dbesc($this->data['hash']),
 			intval($this->data['uid'])
 		);
@@ -250,14 +250,14 @@ class File extends DAV\Node implements DAV\IFile {
 			}
 
 			if (intval($r[0]['os_storage'])) {
-				$x = dbunescbin($r[0]['data']);
+				$x = dbunescbin($r[0]['content']);
 				if(strpos($x,'store') === false)
 					$f = 'store/' . $this->auth->owner_nick . '/' . (($this->os_path) ? $this->os_path . '/' : '') . $x;
 				else
 					$f = $x;
 				return fopen($f, 'rb');
 			}
-			return dbunescbin($r[0]['data']);
+			return dbunescbin($r[0]['content']);
 		}
 	}