X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=b8b0dc05935c0a9980a95565d08395beba9480a8;hb=494288ab9f9370bdf4f7b4ab9990b64f05adbd9d;hp=6a5f6364a780b8a88d02f22b3cf95c75cb9eeed9;hpb=d2863d185997424584c34791ae5fa84db8dd352d;p=friendica.git

diff --git a/boot.php b/boot.php
index 6a5f6364a7..b8b0dc0593 100644
--- a/boot.php
+++ b/boot.php
@@ -4,9 +4,9 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1004' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1007' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
-define ( 'DB_UPDATE_VERSION',      1061      );
+define ( 'DB_UPDATE_VERSION',      1063      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -150,6 +150,7 @@ define ( 'ACTIVITY_OBJ_PERSON',  NAMESPACE_ACTIVITY_SCHEMA . 'person' );
 define ( 'ACTIVITY_OBJ_PHOTO',   NAMESPACE_ACTIVITY_SCHEMA . 'photo' );
 define ( 'ACTIVITY_OBJ_P_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'profile-photo' );
 define ( 'ACTIVITY_OBJ_ALBUM',   NAMESPACE_ACTIVITY_SCHEMA . 'photo-album' );
+define ( 'ACTIVITY_OBJ_EVENT',   NAMESPACE_ACTIVITY_SCHEMA . 'event' );
 
 /**
  * item weight for query ordering
@@ -527,20 +528,8 @@ function check_config(&$a) {
 	$plugins = get_config('system','addon');
 	$plugins_arr = array();
 
-	if($plugins) {
+	if($plugins)
 		$plugins_arr = explode(',',str_replace(' ', '',$plugins));
-		if(get_config('system','strict_privacy')) {
-			unset($a->config['system']['huburl']);
-			for($x = 0; $x < count($plugins_arr); $x ++) {
-				if(    $plugins_arr[$x] === 'facebook' 
-					|| $plugins_arr[$x] === 'twitter' 
-					|| $plugins_arr[$x] === 'statusnet') {
-					unset($plugins_arr[$x]);
-				}
-			}
-		}
-	}
-
 
 	$a->plugins = $plugins_arr;
 
@@ -2574,7 +2563,7 @@ function prepare_body($item,$attach = false) {
 		foreach($arr as $r) {
 			$matches = false;
 			$icon = '';
-			$cnt = preg_match('|\[attach\]href=\"(.+?)\" size=\"(.+?)\" type=\"(.+?)\" title=\"(.+?)\"\[\/attach\]|',$r,$matches);
+			$cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches);
 			if($cnt) {
 				$icontype = strtolower(substr($matches[3],0,strpos($matches[3],'/')));
 				switch($icontype) {
@@ -2799,16 +2788,23 @@ function lang_selector() {
 
 
 if(! function_exists('parse_xml_string')) {
-function parse_xml_string($s) {
-	if(! strstr($s,'<?xml'))
-		return false;
-	$s2 = substr($s,strpos($s,'<?xml'));
+function parse_xml_string($s,$strict = true) {
+	if($strict) {
+		if(! strstr($s,'<?xml'))
+			return false;
+		$s2 = substr($s,strpos($s,'<?xml'));
+	}
+	else
+		$s2 = $s;
 	libxml_use_internal_errors(true);
+
 	$x = @simplexml_load_string($s2);
-	if(count(libxml_get_errors()))
+	if(! $x) {
+		logger('libxml: parse: error: ' . $s2, LOGGER_DATA);
 		foreach(libxml_get_errors() as $err)
 			logger('libxml: parse: ' . $err->code." at ".$err->line.":".$err->column." : ".$err->message, LOGGER_DATA);
-	libxml_clear_errors();
+		libxml_clear_errors();
+	}
 	return $x;
 }}