X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=66d4bc124b40f7201e3b15367d720c62ea923793;hb=be67cf663bc645d9825c7d6c6059663fead06645;hp=d8abf06b04d736c9fbd0fb08bac51d0762686f14;hpb=079e63bba942e150ddd2baf91149936d1b880697;p=friendica.git

diff --git a/boot.php b/boot.php
index d8abf06b04..66d4bc124b 100644
--- a/boot.php
+++ b/boot.php
@@ -2,9 +2,9 @@
 
 set_time_limit(0);
 
-define ( 'BUILD_ID',               1039   );
-define ( 'FRIENDIKA_VERSION',      '2.10.0907' );
+define ( 'FRIENDIKA_VERSION',      '2.1.922' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.1'  );
+define ( 'DB_UPDATE_VERSION',      1043   );
 
 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);
@@ -157,6 +159,11 @@ if (get_magic_quotes_gpc()) {
     unset($process);
 }
 
+/*
+ * translation system
+ */
+require_once("include/pgettext.php");
+
 
 /**
  *
@@ -197,6 +204,7 @@ class App {
 	public  $interactive = true;
 	public  $plugins;
 	public  $apps;
+	public  $identities;
 
 	private $scheme;
 	private $hostname;
@@ -267,9 +275,11 @@ class App {
 		 * Just spit out the contents and exit.
 		 */
 
-		if($this->cmd === '.well-known/host-meta')
+		if($this->cmd === '.well-known/host-meta') {
 			require_once('include/hostxrd.php');
-
+			hostxrd($this->hostname);
+			// NOTREACHED
+		}
 
 		/**
 		 * See if there is any page number information, and initialise 
@@ -298,7 +308,7 @@ class App {
 	}
 
 	function set_baseurl($url) {
-		$parsed = parse_url($url);
+		$parsed = @parse_url($url);
 
 		$this->baseurl = $url;
 
@@ -410,6 +420,7 @@ function x($s,$k = NULL) {
 if(! function_exists('system_unavailable')) {
 function system_unavailable() {
 	include('system_unavailable.php');
+	system_down();
 	killme();
 }}
 
@@ -429,15 +440,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.
@@ -449,7 +460,7 @@ function check_config(&$a) {
 					$func($a);
 				}
 			}
-			set_config('system','build', BUILD_ID);
+			set_config('system','build', DB_UPDATE_VERSION);
 		}
 	}
 
@@ -506,22 +517,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.
@@ -547,28 +606,6 @@ function replace_macros($s,$r) {
 }}
 
 
-// load string translation table for alternate language
-
-if(! function_exists('load_translation_table')) {
-function load_translation_table($lang) {
-	global $a;
-
-	if(file_exists("view/$lang/strings.php"))
-		include("view/$lang/strings.php");
-}}
-
-// translate string if translation exists
-
-if(! function_exists('t')) {
-function t($s) {
-
-	$a = get_app();
-
-	if(x($a->strings,$s))
-		return $a->strings[$s];
-	return $s;
-}}
-
 // curl wrapper. If binary flag is true, return binary
 // results. 
 
@@ -623,7 +660,7 @@ function fetch_url($url,$binary = false, &$redirects = 0) {
         $matches = array();
         preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches);
         $url = trim(array_pop($matches));
-        $url_parsed = parse_url($url);
+        $url_parsed = @parse_url($url);
         if (isset($url_parsed)) {
             $redirects++;
             return fetch_url($url,$binary,$redirects);
@@ -695,7 +732,7 @@ function post_url($url,$params, $headers = null, &$redirects = 0) {
         $matches = array();
         preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches);
         $url = trim(array_pop($matches));
-        $url_parsed = parse_url($url);
+        $url_parsed = @parse_url($url);
         if (isset($url_parsed)) {
             $redirects++;
             return post_url($url,$binary,$headers,$redirects);
@@ -765,7 +802,12 @@ function escape_tags($string) {
 if(! function_exists('login')) {
 function login($register = false) {
 	$o = "";
-	$register_html = (($register) ? load_view_file("view/register-link.tpl") : "");
+	$register_tpl = (($register) ? load_view_file("view/register-link.tpl") : "");
+	
+	$register_html = replace_macros($register_tpl,array(
+		'$title' => t('Create a New Account'),
+		'$desc' => t('Register')
+	));
 
 	$noid = get_config('system','no_openid');
 	if($noid) {
@@ -792,6 +834,7 @@ function login($register = false) {
 	}
 	
 	$o = replace_macros($tpl,array(
+		'$logout'        => t('Logout'),
 		'$register_html' => $register_html, 
 		'$classname'     => $classname,
 		'$namelabel'     => $namelabel,
@@ -1414,7 +1457,7 @@ function lrdd($uri) {
 
 	// get the host meta file
 
-	$host = parse_url($uri);
+	$host = @parse_url($uri);
 
 	if($host) {
 		$url  = ((x($host,'scheme')) ? $host['scheme'] : 'http') . '://';
@@ -1560,9 +1603,15 @@ function lrdd($uri) {
 if(! function_exists('fetch_lrdd_template')) {
 function fetch_lrdd_template($host) {
 	$tpl = '';
-	$url = 'http://' . $host . '/.well-known/host-meta' ;
-	$links = fetch_xrd_links($url);
-logger('template: ' . print_r($links,true));
+
+	$url1 = 'https://' . $host . '/.well-known/host-meta' ;
+	$url2 = 'http://' . $host . '/.well-known/host-meta' ;
+	$links = fetch_xrd_links($url1);
+	logger('template (https): ' . print_r($links,true));
+	if(! count($links)) {
+		$links = fetch_xrd_links($url2);
+		logger('template (http): ' . print_r($links,true));
+	}
 	if(count($links)) {
 		foreach($links as $link)
 			if($link['@attributes']['rel'] && $link['@attributes']['rel'] === 'lrdd')
@@ -1675,7 +1724,7 @@ if(! function_exists('validate_url')) {
 function validate_url(&$url) {
 	if(substr($url,0,4) != 'http')
 		$url = 'http://' . $url;
-	$h = parse_url($url);
+	$h = @parse_url($url);
 
 	if(($h) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR))) {
 		return true;
@@ -1706,7 +1755,7 @@ function validate_email($addr) {
 if(! function_exists('allowed_url')) {
 function allowed_url($url) {
 
-	$h = parse_url($url);
+	$h = @parse_url($url);
 
 	if(! $h) {
 		return false;
@@ -1765,7 +1814,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;
 			}
@@ -1785,10 +1834,14 @@ if(! function_exists('format_like')) {
 function format_like($cnt,$arr,$type,$id) {
 	$o = '';
 	if($cnt == 1)
-		$o .= $arr[0] . (($type === 'like') ? t(' likes this.') : t(' doesn\'t like this.')) . EOL ;
+		$o .= (($type === 'like') ? sprintf( t('%s likes this.'), $arr[0]) : sprintf( t('%s doesn\'t like this.'), $arr[0])) . EOL ;
 	else {
-		$o .= '<span class="fakelink" onclick="openClose(\'' . $type . 'list-' . $id . '\');" >' 
-			. $cnt . ' ' . t('people') . '</span> ' . (($type === 'like') ? t('like this.') : t('don\'t like this.')) . EOL ;
+		$spanatts = 'class="fakelink" onclick="openClose(\'' . $type . 'list-' . $id . '\');"';
+		$o .= (($type === 'like') ? 
+					sprintf( t('<span  %1$s>%2$d people</span> like this.'), $spanatts, $cnt)
+					 : 
+					sprintf( t('<span  %1$s>%2$d people</span> don\'t like this.'), $spanatts, $cnt) ); 
+		$o .= EOL ;
 		$total = count($arr);
 		if($total >= MAX_LIKERS)
 			$arr = array_slice($arr, 0, MAX_LIKERS - 1);
@@ -1796,8 +1849,8 @@ function format_like($cnt,$arr,$type,$id) {
 			$arr[count($arr)-1] = t('and') . ' ' . $arr[count($arr)-1];
 		$str = implode(', ', $arr);
 		if($total >= MAX_LIKERS)
-			$str .= t(', and ') . $total - MAX_LIKERS . t(' other people');
-		$str .= (($type === 'like') ? t(' like this.') : t(' don\'t like this.'));
+			$str .= sprintf( t(', and %d other people'), $total - MAX_LIKERS );
+		$str = (($type === 'like') ? sprintf( t('%s like this.'), $str) : sprintf( t('%s don\'t like this.'), $str));
 		$o .= "\t" . '<div id="' . $type . 'list-' . $id . '" style="display: none;" >' . $str . '</div>';
 	}
 	return $o;
@@ -1932,8 +1985,10 @@ function get_mentions($item) {
 	$arr = explode(',',$item['tag']);
 	foreach($arr as $x) {
 		$matches = null;
-		if(preg_match('/@\[url=([^\]]*)\]/',$x,$matches))
+		if(preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) {
 			$o .= "\t\t" . '<link rel="mentioned" href="' . $matches[1] . '" />' . "\r\n";
+			$o .= "\t\t" . '<link rel="ostatus:attention" href="' . $matches[1] . '" />' . "\r\n";
+		}
 	}
 	return $o;
 }}
@@ -2361,11 +2416,19 @@ function get_birthdays() {
 	);
 
 	if($r && count($r)) {
-		$o .= '<div id="birthday-wrapper"><div id="birthday-title">' . t('Birthdays this week:') . '</div>'; 
+		$total = 0;
+		foreach($r as $rr)
+			if(strlen($rr['name']))
+				$total ++;
+
+		$o .= '<div id="birthday-notice" class="birthday-notice fakelink" onclick=openClose(\'birthday-wrapper\'); >' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '</div>'; 
+		$o .= '<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">' . t('Birthdays this week:') . '</div>'; 
 		$o .= '<div id="birthday-adjust">' . t("\x28Adjusted for local time\x29") . '</div>';
 		$o .= '<div id="birthday-title-end"></div>';
 
 		foreach($r as $rr) {
+			if(! strlen($rr['name']))
+				continue;
 			$now = strtotime('now');
 			$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); 
 
@@ -2375,7 +2438,7 @@ function get_birthdays() {
 			. '</div>' ;
 		}
 
-		$o .= '</div>';
+		$o .= '</div></div>';
 	}
 
   return $o;
@@ -2405,10 +2468,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;
 }}
@@ -2427,13 +2495,19 @@ function prepare_body($item) {
  * $cmd and string args are surrounded with ""
  */
 
-if(! function_exists('run_proc')) {
+if(! function_exists('proc_run')) {
 function proc_run($cmd){
+
+	$a = get_app();
+
 	$args = func_get_args();
 	call_hooks("proc_run", $args);
+
+	if(count($args) && $args[0] === 'php')
+        $args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 	
-	foreach ($args as &$arg){
-		if(is_string($arg)) $arg='"'.$arg.'"';
+	foreach ($args as $arg){
+		$arg = escapeshellarg($arg);
 	}
 	$cmdline = implode($args," ");
 	proc_close(proc_open($cmdline." &",array(),$foo));
@@ -2566,3 +2640,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