X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=4c3a923dcea2e52644dea55e826aface43047192;hb=4a14e51e25c58d5a81b68798f2340c6196dec8ea;hp=3cf01b4a0d6b7ed56f5e3ffb0efcbb86ac50cb43;hpb=377f991ac5b1e8c3c679fbbc5e138256bc24715b;p=friendica.git

diff --git a/boot.php b/boot.php
index 3cf01b4a0d..4c3a923dce 100644
--- a/boot.php
+++ b/boot.php
@@ -2,9 +2,9 @@
 
 set_time_limit(0);
 
-define ( 'BUILD_ID',               1039   );
-define ( 'FRIENDIKA_VERSION',      '2.10.0908' );
+define ( 'FRIENDIKA_VERSION',      '2.1.913' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.1'  );
+define ( 'DB_UPDATE_VERSION',      1040   );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -40,6 +40,8 @@ define ( 'REGISTER_OPEN',          2 );
 
 /**
  * relationship types
+ * When used in contact records, this indicates that 'uid' has 
+ * this relationship with contact['name']
  */
 
 define ( 'REL_VIP',        1);
@@ -433,15 +435,15 @@ function check_config(&$a) {
 
 	$build = get_config('system','build');
 	if(! x($build))
-		$build = set_config('system','build',BUILD_ID);
+		$build = set_config('system','build',DB_UPDATE_VERSION);
 
 	$url = get_config('system','url');
 	if(! x($url))
 		$url = set_config('system','url',$a->get_baseurl());
 
-	if($build != BUILD_ID) {
+	if($build != DB_UPDATE_VERSION) {
 		$stored = intval($build);
-		$current = intval(BUILD_ID);
+		$current = intval(DB_UPDATE_VERSION);
 		if(($stored < $current) && file_exists('update.php')) {
 			// We're reporting a different version than what is currently installed.
 			// Run any existing update scripts to bring the database up to current.
@@ -453,7 +455,7 @@ function check_config(&$a) {
 					$func($a);
 				}
 			}
-			set_config('system','build', BUILD_ID);
+			set_config('system','build', DB_UPDATE_VERSION);
 		}
 	}
 
@@ -510,22 +512,70 @@ function check_config(&$a) {
 		foreach($plugins_arr as $p) {
 			if(! in_array($p,$installed_arr)) {
 				logger("Addons: installing " . $p);
+				$t = filemtime('addon/' . $p . '/' . $p . '.php');
 				@include_once('addon/' . $p . '/' . $p . '.php');
 				if(function_exists($p . '_install')) {
 					$func = $p . '_install';
 					$func();
-					$r = q("INSERT INTO `addon` (`name`, `installed`) VALUES ( '%s', 1 ) ",
-						dbesc($p)
+					$r = q("INSERT INTO `addon` (`name`, `installed`, `timestamp`) VALUES ( '%s', 1, %d ) ",
+						dbesc($p),
+						intval($t)
 					);
 				}
 			}
 		}
 	}
+
+
 	load_hooks();
 
 	return;
 }}
 
+// reload all updated plugins
+
+if(! function_exists('reload_plugins')) {
+function reload_plugins() {
+	$plugins = get_config('system','addon');
+	if(strlen($plugins)) {
+
+		$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
+		if(count($r))
+			$installed = $r;
+		else
+			$installed = array();
+
+		$parr = explode(',',$plugins);
+		if(count($parr)) {
+			foreach($parr as $pl) {
+				$pl = trim($pl);
+				
+				$t = filemtime('addon/' . $pl . '/' . $pl . '.php');
+				foreach($installed as $i) {
+					if(($i['name'] == $pl) && ($i['timestamp'] != $t)) {	
+						logger('Reloading plugin: ' . $i['name']);
+						@include_once('addon/' . $pl . '/' . $pl . '.php');
+
+						if(function_exists($pl . '_uninstall')) {
+							$func = $pl . '_uninstall';
+							$func();
+						}
+						if(function_exists($pl . '_install')) {
+							$func = $pl . '_install';
+							$func();
+						}
+						q("UPDATE `addon` SET `timestamp` = %d WHERE `id` = %d LIMIT 1",
+							intval($t),
+							intval($i['id'])
+						);
+					}
+				}
+			}
+		}
+	}
+}}
+				
+
 
 // This is our template processor.
 // $s is the string requiring macro substitution.
@@ -1775,7 +1825,7 @@ function allowed_email($email) {
 	if(count($allowed)) {
 		foreach($allowed as $a) {
 			$pat = strtolower(trim($a));
-			if(($fnmatch && fnmatch($pat,$host)) || ($pat == $host)) {
+			if(($fnmatch && fnmatch($pat,$domain)) || ($pat == $domain)) {
 				$found = true; 
 				break;
 			}
@@ -2417,10 +2467,15 @@ function link_compare($a,$b) {
 
 if(! function_exists('prepare_body')) {
 function prepare_body($item) {
+	return prepare_text($item['body']);
+}}
+
+if(! function_exists('prepare_text')) {
+function prepare_text($text) {
 
 	require_once('include/bbcode.php');
 
-	$s = smilies(bbcode($item['body']));
+	$s = smilies(bbcode($text));
 
 	return $s;
 }}
@@ -2584,3 +2639,29 @@ function unamp($s) {
 	return str_replace('&amp;', '&', $s);
 }}
 
+if(! function_exists('extract_item_authors')) {
+function extract_item_authors($arr,$uid) {
+
+	if((! $uid) || (! is_array($arr)) || (! count($arr)))
+		return array();
+	$urls = array();
+	foreach($arr as $rr) {
+		if(! in_array("'" . dbesc($rr['author-link']) . "'",$urls))
+			$urls[] = "'" . dbesc($rr['author-link']) . "'";
+	}
+
+	// pre-quoted, don't put quotes on %s
+	if(count($urls)) {
+		$r = q("SELECT `id`,`url` FROM `contact` WHERE `uid` = %d AND `url` IN ( %s ) AND `network` = 'dfrn' AND `self` = 0 AND `blocked` = 0 ",
+			intval($uid),
+			implode(',',$urls)
+		);
+		if(count($r)) {
+			$ret = array();
+			foreach($r as $rr)
+				$ret[$rr['url']] = $rr['id'];
+			return $ret;
+		}
+	}
+	return array();		
+}}
\ No newline at end of file