X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=d3380a395b6815e73ed826d6c7152d2c79bb4e07;hb=041f3ca774b07e404c5a9eea6e42c9875d444387;hp=6cbb4f07c7200da51d3305c42e4d85e10cf427c6;hpb=1151124feed13ebe1bf87bdcebf9692a5ce6233e;p=friendica.git
diff --git a/boot.php b/boot.php
index 6cbb4f07c7..d3380a395b 100644
--- a/boot.php
+++ b/boot.php
@@ -2,9 +2,9 @@
set_time_limit(0);
-define ( 'BUILD_ID', 1033 );
-define ( 'FRIENDIKA_VERSION', '2.10.0902' );
-define ( 'DFRN_PROTOCOL_VERSION', '2.0' );
+define ( 'BUILD_ID', 1039 );
+define ( 'FRIENDIKA_VERSION', '2.10.0910' );
+define ( 'DFRN_PROTOCOL_VERSION', '2.1' );
define ( 'EOL', "
\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);
@@ -195,7 +197,9 @@ class App {
public $hooks;
public $timezone;
public $interactive = true;
-
+ public $plugins;
+ public $apps;
+ public $identities;
private $scheme;
private $hostname;
@@ -215,9 +219,19 @@ class App {
$this->scheme = ((isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'])) ? 'https' : 'http' );
- if(x($_SERVER,'SERVER_NAME'))
+ if(x($_SERVER,'SERVER_NAME')) {
$this->hostname = $_SERVER['SERVER_NAME'];
+ /**
+ * Figure out if we are running at the top of a domain
+ * or in a sub-directory and adjust accordingly
+ */
+
+ $path = trim(dirname($_SERVER['SCRIPT_NAME']),'/\\');
+ if(isset($path) && strlen($path) && ($path != $this->path))
+ $this->path = $path;
+ }
+
set_include_path("include/$this->hostname" . PATH_SEPARATOR . 'include' . PATH_SEPARATOR . '.' );
if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=")
@@ -225,14 +239,6 @@ class App {
if(x($_GET,'q'))
$this->cmd = trim($_GET['q'],'/\\');
- /**
- * Figure out if we are running at the top of a domain
- * or in a sub-directory and adjust accordingly
- */
-
- $path = trim(dirname($_SERVER['SCRIPT_NAME']),'/\\');
- if(isset($path) && strlen($path) && ($path != $this->path))
- $this->path = $path;
/**
@@ -264,9 +270,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
@@ -295,8 +303,20 @@ class App {
}
function set_baseurl($url) {
+ $parsed = @parse_url($url);
+
$this->baseurl = $url;
- $this->hostname = basename($url);
+
+ if($parsed) {
+ $this->scheme = $parsed['scheme'];
+
+ $this->hostname = $parsed['host'];
+ if(x($parsed,'port'))
+ $this->hostname .= ':' . $parsed['port'];
+ if(x($parsed,'path'))
+ $this->path = trim($parsed['path'],'\\/');
+ }
+
}
function get_hostname() {
@@ -395,6 +415,7 @@ function x($s,$k = NULL) {
if(! function_exists('system_unavailable')) {
function system_unavailable() {
include('system_unavailable.php');
+ system_down();
killme();
}}
@@ -406,8 +427,12 @@ function system_unavailable() {
if(! function_exists('check_config')) {
function check_config(&$a) {
+
load_config('system');
+ if(! x($_SERVER,'SERVER_NAME'))
+ return;
+
$build = get_config('system','build');
if(! x($build))
$build = set_config('system','build',BUILD_ID);
@@ -460,6 +485,8 @@ function check_config(&$a) {
if($plugins)
$plugins_arr = explode(',',str_replace(' ', '',$plugins));
+ $a->plugins = $plugins_arr;
+
$installed_arr = array();
if(count($installed)) {
@@ -496,6 +523,7 @@ function check_config(&$a) {
}
}
}
+ load_hooks();
return;
}}
@@ -601,14 +629,23 @@ 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);
}
}
$a->set_curl_code($http_code);
+
$body = substr($s,strlen($header)+4);
+
+ /* one more try to make sure there are no more headers */
+
+ if(strpos($body,'HTTP/') === 0) {
+ $header = substr($body,0,strpos($body,"\r\n\r\n"));
+ $body = substr($body,strlen($header)+4);
+ }
+
$a->set_curl_headers($header);
curl_close($ch);
@@ -664,7 +701,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);
@@ -672,6 +709,14 @@ function post_url($url,$params, $headers = null, &$redirects = 0) {
}
$a->set_curl_code($http_code);
$body = substr($s,strlen($header)+4);
+
+ /* one more try to make sure there are no more headers */
+
+ if(strpos($body,'HTTP/') === 0) {
+ $header = substr($body,0,strpos($body,"\r\n\r\n"));
+ $body = substr($body,strlen($header)+4);
+ }
+
$a->set_curl_headers($header);
curl_close($ch);
@@ -726,7 +771,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) {
@@ -744,7 +794,7 @@ function login($register = false) {
$lostpass = t('Forgot your password?');
$lostlink = t('Password Reset');
- if(x($_SESSION,'authenticated')) {
+ if(local_user()) {
$tpl = load_view_file("view/logout.tpl");
}
else {
@@ -753,13 +803,14 @@ function login($register = false) {
}
$o = replace_macros($tpl,array(
+ '$logout' => t('Logout'),
'$register_html' => $register_html,
- '$classname' => $classname,
- '$namelabel' => $namelabel,
- '$passlabel' => $passlabel,
- '$login' => $login,
- '$lostpass' => $lostpass,
- '$lostlink' => $lostlink
+ '$classname' => $classname,
+ '$namelabel' => $namelabel,
+ '$passlabel' => $passlabel,
+ '$login' => $login,
+ '$lostpass' => $lostpass,
+ '$lostlink' => $lostlink
));
return $o;
@@ -1248,7 +1299,7 @@ function del_pconfig($uid,$family,$key) {
unset($a->config[$uid][$family][$key]);
$ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
intval($uid),
- dbesc($cat),
+ dbesc($family),
dbesc($key)
);
return $ret;
@@ -1342,11 +1393,13 @@ function webfinger($s) {
$tpl = fetch_lrdd_template($host);
logger('webfinger: lrdd template: ' . $tpl);
if(strlen($tpl)) {
- $pxrd = str_replace('{uri}', urlencode('acct:'.$s), $tpl);
+ $pxrd = str_replace('{uri}', urlencode('acct:' . $s), $tpl);
+ logger('webfinger: pxrd: ' . $pxrd);
$links = fetch_xrd_links($pxrd);
if(! count($links)) {
// try with double slashes
- $pxrd = str_replace('{uri}', urlencode('acct://'.$s), $tpl);
+ $pxrd = str_replace('{uri}', urlencode('acct://' . $s), $tpl);
+ logger('webfinger: pxrd: ' . $pxrd);
$links = fetch_xrd_links($pxrd);
}
return $links;
@@ -1360,45 +1413,154 @@ function lrdd($uri) {
$a = get_app();
+ // default priority is host priority, host-meta first
+
+ $priority = 'host';
+
+ // All we have is an email address. Resource-priority is irrelevant
+ // because our URI isn't directly resolvable.
+
if(strstr($uri,'@')) {
return(webfinger($uri));
}
- else {
- $html = fetch_url($uri);
- $headers = $a->get_curl_headers();
+
+ // get the host meta file
+
+ $host = @parse_url($uri);
+
+ if($host) {
+ $url = ((x($host,'scheme')) ? $host['scheme'] : 'http') . '://';
+ $url .= $host['host'] . '/.well-known/host-meta' ;
+ }
+ else
+ return array();
+
+ logger('lrdd: constructed url: ' . $url);
+
+ $xml = fetch_url($url);
+ $headers = $a->get_curl_headers();
+
+ if (! $xml)
+ return array();
+
+ logger('lrdd: host_meta: ' . $xml, LOGGER_DATA);
+ $h = simplexml_load_string($xml);
+ $arr = convert_xml_element_to_array($h);
+
+ if(isset($arr['xrd']['property'])) {
+ $property = $arr['crd']['property'];
+ if(! isset($property[0]))
+ $properties = array($property);
+ else
+ $properties = $property;
+ foreach($properties as $prop)
+ if((string) $prop['@attributes'] === 'http://lrdd.net/priority/resource')
+ $priority = 'resource';
+ }
+
+ // save the links in case we need them
+
+ $links = array();
+
+ if(isset($arr['xrd']['link'])) {
+ $link = $arr['xrd']['link'];
+ if(! isset($link[0]))
+ $links = array($link);
+ else
+ $links = $link;
+ }
+
+ // do we have a template or href?
+
+ if(count($links)) {
+ foreach($links as $link) {
+ if($link['@attributes']['rel'] && attribute_contains($link['@attributes']['rel'],'lrdd')) {
+ if(x($link['@attributes'],'template'))
+ $tpl = $link['@attributes']['template'];
+ elseif(x($link['@attributes'],'href'))
+ $href = $link['@attributes']['href'];
+ }
+ }
+ }
+
+ if((! isset($tpl)) || (! strpos($tpl,'{uri}')))
+ $tpl = '';
+
+ if($priority === 'host') {
+ if(strlen($tpl))
+ $pxrd = str_replace('{uri}', urlencode($uri), $tpl);
+ elseif(isset($href))
+ $pxrd = $href;
+ if(isset($pxrd)) {
+ logger('lrdd: (host priority) pxrd: ' . $pxrd);
+ $links = fetch_xrd_links($pxrd);
+ return $links;
+ }
+
$lines = explode("\n",$headers);
if(count($lines)) {
foreach($lines as $line) {
- // TODO alter the following regex to support multiple relations (space separated)
if((stristr($line,'link:')) && preg_match('/<([^>].*)>.*rel\=[\'\"]lrdd[\'\"]/',$line,$matches)) {
- $link = $matches[1];
+ return(fetch_xrd_links($matches[1]));
break;
}
}
}
- if(! isset($link)) {
- // parse the page of the supplied URL looking for rel links
+ }
- require_once('library/HTML5/Parser.php');
- $dom = HTML5_Parser::parse($html);
- if($dom) {
- $items = $dom->getElementsByTagName('link');
+ // priority 'resource'
- foreach($items as $item) {
- $x = $item->getAttribute('rel');
- if($x == "lrdd") {
- $link = $item->getAttribute('href');
- break;
- }
- }
+
+ $html = fetch_url($uri);
+ $headers = $a->get_curl_headers();
+ logger('lrdd: headers=' . $headers, LOGGER_DEBUG);
+
+ require_once('library/HTML5/Parser.php');
+ $dom = @HTML5_Parser::parse($html);
+
+ if($dom) {
+ $items = $dom->getElementsByTagName('link');
+ foreach($items as $item) {
+ $x = $item->getAttribute('rel');
+ if($x == "lrdd") {
+ $pagelink = $item->getAttribute('href');
+ break;
}
}
+ }
+
+ if(isset($pagelink))
+ return(fetch_xrd_links($pagelink));
- if(isset($link))
- return(fetch_xrd_links($link));
+ // next look in HTTP headers
+
+ $lines = explode("\n",$headers);
+ if(count($lines)) {
+ foreach($lines as $line) {
+ // TODO alter the following regex to support multiple relations (space separated)
+ if((stristr($line,'link:')) && preg_match('/<([^>].*)>.*rel\=[\'\"]lrdd[\'\"]/',$line,$matches)) {
+ $pagelink = $matches[1];
+ break;
+ }
+ // don't try and run feeds through the html5 parser
+ if(stristr($line,'content-type:') && ((stristr($line,'application/atom+xml')) || (stristr($line,'application/rss+xml'))))
+ return array();
+ if(stristr($html,' 'alias' , 'href' => $alias);
+ }
+ }
+
+ logger('fetch_xrd_links: ' . print_r($links,true), LOGGER_DATA);
+
+ return $links;
+
}}
// Convert an ACL array to a storable string
@@ -1509,7 +1687,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;
@@ -1540,7 +1718,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;
@@ -1742,7 +1920,7 @@ function like_puller($a,$item,&$arr,$mode) {
if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) {
$url = $item['author-link'];
- if(($item['network'] === 'dfrn') && (! $item['self']) && ($item['author-link'] == $item['url'])) {
+ if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === 'dfrn') && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) {
$url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
$sparkle = ' class="sparkle" ';
}
@@ -1766,8 +1944,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" . '' . "\r\n";
+ $o .= "\t\t" . '' . "\r\n";
+ }
}
return $o;
}}
@@ -1894,7 +2074,7 @@ function aes_encrypt($val,$ky)
if(! function_exists('linkify')) {
function linkify($s) {
- $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]*)/", ' $1', $s);
+ $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%\$\!\+]*)/", ' $1', $s);
return($s);
}}
@@ -1916,8 +2096,11 @@ function smilies($s) {
$a = get_app();
return str_replace(
- array( ':-)', ';-)', ':-(', ':(', ':-P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'),
+ array( '<3', '</3', '<\\3', ':-)', ';-)', ':-(', ':(', ':-P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'),
array(
+ '
',
+ '
',
+ '
',
'
',
'
',
'
',
@@ -2038,7 +2221,7 @@ function profile_sidebar($profile) {
$tabs = '';
- $photo = '';
+ $photo = '';
$connect = (($profile['uid'] != local_user()) ? '' . t('Connect') . '' : '');
@@ -2128,6 +2311,7 @@ function unregister_hook($hook,$file,$function) {
if(! function_exists('load_hooks')) {
function load_hooks() {
$a = get_app();
+ $a->hooks = array();
$r = q("SELECT * FROM `hook` WHERE 1");
if(count($r)) {
foreach($r as $rr) {
@@ -2235,10 +2419,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;
}}
@@ -2257,15 +2446,174 @@ 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));
}}
+/*
+ * Return full URL to theme which is currently in effect.
+ * Provide a sane default if nothing is chosen or the specified theme does not exist.
+ */
+
+if(! function_exists('current_theme_url')) {
+function current_theme_url() {
+
+ $app_base_themes = array('duepuntozero', 'loozah');
+
+ $a = get_app();
+
+ $system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
+ $theme_name = ((x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
+
+ if($theme_name && file_exists('view/theme/' . $theme_name . '/style.css'))
+ return($a->get_baseurl() . '/view/theme/' . $theme_name . '/style.css');
+
+ foreach($app_base_themes as $t) {
+ if(file_exists('view/theme/' . $t . '/style.css'))
+ return($a->get_baseurl() . '/view/theme/' . $t . '/style.css');
+ }
+
+ $fallback = glob('view/theme/*/style.css');
+ if(count($fallback))
+ return($a->get_baseurl() . $fallback[0]);
+
+
+}}
+
+if(! function_exists('feed_birthday')) {
+function feed_birthday($uid,$tz) {
+
+ /**
+ *
+ * Determine the next birthday, but only if the birthday is published
+ * in the default profile. We _could_ also look for a private profile that the
+ * recipient can see, but somebody could get mad at us if they start getting
+ * public birthday greetings when they haven't made this info public.
+ *
+ * Assuming we are able to publish this info, we are then going to convert
+ * the start time from the owner's timezone to UTC.
+ *
+ * This will potentially solve the problem found with some social networks
+ * where birthdays are converted to the viewer's timezone and salutations from
+ * elsewhere in the world show up on the wrong day. We will convert it to the
+ * viewer's timezone also, but first we are going to convert it from the birthday
+ * person's timezone to GMT - so the viewer may find the birthday starting at
+ * 6:00PM the day before, but that will correspond to midnight to the birthday person.
+ *
+ */
+
+ $birthday = '';
+
+ $p = q("SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
+ intval($uid)
+ );
+
+ if($p && count($p)) {
+ $tmp_dob = substr($p[0]['dob'],5);
+ if(intval($tmp_dob)) {
+ $y = datetime_convert($tz,$tz,'now','Y');
+ $bd = $y . '-' . $tmp_dob . ' 00:00';
+ $t_dob = strtotime($bd);
+ $now = strtotime(datetime_convert($tz,$tz,'now'));
+ if($t_dob < $now)
+ $bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
+ $birthday = datetime_convert($tz,'UTC',$bd,ATOM_TIME);
+ }
+ }
+
+ return $birthday;
+}}
+
+/**
+ * return atom link elements for all of our hubs
+ */
+
+if(! function_exists('feed_hublinks')) {
+function feed_hublinks() {
+
+ $hub = get_config('system','huburl');
+
+ $hubxml = '';
+ if(strlen($hub)) {
+ $hubs = explode(',', $hub);
+ if(count($hubs)) {
+ foreach($hubs as $h) {
+ $h = trim($h);
+ if(! strlen($h))
+ continue;
+ $hubxml .= '' . "\n" ;
+ }
+ }
+ }
+ return $hubxml;
+}}
+
+/* return atom link elements for salmon endpoints */
+
+if(! function_exists('feed_salmonlinks')) {
+function feed_salmonlinks($nick) {
+
+ $a = get_app();
+
+ $salmon = '' . "\n" ;
+
+ // old style links that status.net still needed as of 12/2010
+
+ $salmon .= ' ' . "\n" ;
+ $salmon .= ' ' . "\n" ;
+ return $salmon;
+}}
+
+if(! function_exists('get_plink')) {
+function get_plink($item) {
+ $a = get_app();
+ $plink = (((x($item,'plink')) && (! $item['private'])) ? '' : '');
+ return $plink;
+}}
+
+if(! function_exists('unamp')) {
+function unamp($s) {
+ return str_replace('&', '&', $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