Merge remote-tracking branch 'upstream/master'

boot.php

@@ -50,7 +50,7 @@ define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'H');
 define ( 'ZOT_REVISION',            1     );
 
-define ( 'DB_UPDATE_VERSION',       1154  );
+define ( 'DB_UPDATE_VERSION',       1155  );
 
 /**
  * @brief Constant with a HTML line break.

include/event.php

@@ -526,13 +526,17 @@ function event_import_ical($ical, $uid) {
 
 //	logger('dtstart: ' . var_export($dtstart,true));
 
-	if(($dtstart->timezone_type == 2) || (($dtstart->timezone_type == 3) && ($dtstart->timezone === 'UTC'))) {
-		$ev['adjust'] = 1;
+
+	switch($dtstart->timezone_type) {
+		case VObject\Property\DateTime::UTC :
+			$ev['adjust'] = 0;
+			break;
+		case VObject\Property\DateTime::LOCALTZ :
+		default:
+			$ev['adjust'] = 1;
+			break;
 	}
-	else {
-		$ev['adjust'] = 0;
-	}
-	
+
 	$ev['start'] = datetime_convert((($ev['adjust']) ? 'UTC' : date_default_timezone_get()),'UTC',
 		$dtstart->format(\DateTime::W3C));
 

include/identity.php

@@ -616,6 +616,10 @@ function identity_basic_export($channel_id, $items = false) {
 		}
 	}
 
+	$addon = array('channel_id' => $channel_id,'data' => $ret);
+	call_hooks('identity_basic_export',$addon);
+	$ret = $addon['data'];
+
 
 	if(! $items)
 		return $ret;

include/zot.php

@@ -3319,6 +3319,8 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 		if(array_key_exists('item_id',$arr) && $arr['item_id'])
 			sync_items($channel,$arr['item_id']);
 
+		$addon = array('channel' => $channel,'data' => $arr);
+		call_hooks('process_channel_sync_delivery',$addon);
 
 		// we should probably do this for all items, but usually we only send one.
 

install/schema_mysql.sql

@@ -396,6 +396,7 @@ CREATE TABLE IF NOT EXISTS `event` (
   `event_repeat` text NOT NULL,
   `event_sequence` smallint(6) NOT NULL DEFAULT '0',
   `event_priority` smallint(6) NOT NULL DEFAULT '0',
+  `event_vdata` text NOT NULL,
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
   KEY `type` (`type`),

install/schema_postgres.sql

@@ -392,6 +392,7 @@ CREATE TABLE "event" (
   "event_repeat" text NOT NULL,
   "event_sequence" smallint NOT NULL DEFAULT '0',
   "event_priority" smallint NOT NULL DEFAULT '0',
+  "event_vdata" text NOT NULL,
   PRIMARY KEY ("id")
 );
 create index "event_uid_idx" on event ("uid");

install/update.php

@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1154 );
+define( 'UPDATE_VERSION' , 1155 );
 
 /**
  *
@@ -1865,3 +1865,13 @@ function update_r1153() {
 
 
 }
+
+function update_r1154() {
+
+	$r = q("ALTER TABLE event ADD event_vdata text NOT NULL ");
+    if($r)
+        return UPDATE_SUCCESS;
+    return UPDATE_FAILED;
+
+}
+

mod/import.php

@@ -450,6 +450,8 @@ function import_post(&$a) {
 	if(is_array($data['menu']))
 		import_menus($channel,$data['menu']);
 	
+	$addon = array('channel' => $channel,'data' => $data);
+	call_hooks('import_channel',$addon);
 
 	$saved_notification_flags = notifications_off($channel['channel_id']);
 

version.inc

@@ -1 +1 @@
-2015-09-22.1163
+2015-09-23.1164