X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=67e3d65ae170e4d2f9a90681b847c1a024ccb430;hb=6348e4e47b492d31a20a91917963126a4d6dc30b;hp=b11c9031256acafc8fdcffef77e467496134339b;hpb=b52fd6c2db3f40156ae3a05c175ca4c092b39dfa;p=friendica.git
diff --git a/boot.php b/boot.php
index b11c903125..67e3d65ae1 100644
--- a/boot.php
+++ b/boot.php
@@ -1,15 +1,26 @@
\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
define ( 'DOWN_ARROW', '⇩' );
-
+
+/**
+ *
+ * Image storage quality. Lower numbers save space at cost of image detail.
+ * For ease of upgrade, please do not change here. Change jpeg quality with
+ * set_config('system','jpeg_quality',n) in .htconfig.php
+ * where n is netween 1 and 100, and with very poor results below about 50
+ *
+ */
+
+define ( 'JPEG_QUALITY', 100 );
/**
* SSL redirection policies
@@ -290,7 +301,7 @@ class App {
if($this->cmd === '.well-known/host-meta') {
require_once('include/hostxrd.php');
- hostxrd($this->hostname);
+ hostxrd($this->get_baseurl());
// NOTREACHED
}
@@ -608,19 +619,14 @@ function reload_plugins() {
// For instance if 'test' => "foo" and 'testing' => "bar", testing could become either bar or fooing,
// depending on the order in which they were declared in the array.
+require_once("include/template_processor.php");
+
if(! function_exists('replace_macros')) {
function replace_macros($s,$r) {
+ global $t;
+
+ return $t->replace($s,$r);
- $search = array();
- $replace = array();
-
- if(is_array($r) && count($r)) {
- foreach ($r as $k => $v ) {
- $search[] = $k;
- $replace[] = $v;
- }
- }
- return str_replace($search,$replace,$s);
}}
@@ -850,8 +856,10 @@ function login($register = false) {
$tpl = load_view_file("view/login.tpl");
}
-
- $o = replace_macros($tpl,array(
+
+ $o = '';
+
+ $o .= replace_macros($tpl,array(
'$logout' => t('Logout'),
'$register_html' => $register_html,
'$classname' => $classname,
@@ -1223,6 +1231,7 @@ function set_config($family,$key,$value) {
global $a;
if(get_config($family,$key,true) === false) {
+ $a->config[$family][$key] = $value;
$ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
dbesc($family),
dbesc($key),
@@ -1317,6 +1326,7 @@ function set_pconfig($uid,$family,$key,$value) {
global $a;
if(get_pconfig($uid,$family,$key,true) === false) {
+ $a->config[$uid][$family][$key] = $value;
$ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ",
intval($uid),
dbesc($family),
@@ -1847,38 +1857,6 @@ function allowed_email($email) {
return $found;
}}
-// Format the like/dislike text for a profile item
-// $cnt = number of people who like/dislike the item
-// $arr = array of pre-linked names of likers/dislikers
-// $type = one of 'like, 'dislike'
-// $id = item id
-// returns formatted text
-
-if(! function_exists('format_like')) {
-function format_like($cnt,$arr,$type,$id) {
- $o = '';
- if($cnt == 1)
- $o .= (($type === 'like') ? sprintf( t('%s likes this.'), $arr[0]) : sprintf( t('%s doesn\'t like this.'), $arr[0])) . EOL ;
- else {
- $spanatts = 'class="fakelink" onclick="openClose(\'' . $type . 'list-' . $id . '\');"';
- $o .= (($type === 'like') ?
- sprintf( t('%2$d people like this.'), $spanatts, $cnt)
- :
- sprintf( t('%2$d people don\'t like this.'), $spanatts, $cnt) );
- $o .= EOL ;
- $total = count($arr);
- if($total >= MAX_LIKERS)
- $arr = array_slice($arr, 0, MAX_LIKERS - 1);
- if($total < MAX_LIKERS)
- $arr[count($arr)-1] = t('and') . ' ' . $arr[count($arr)-1];
- $str = implode(', ', $arr);
- if($total >= MAX_LIKERS)
- $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" . '
' . $str . '
';
- }
- return $o;
-}}
// wrapper to load a view template, checking for alternate
@@ -1886,13 +1864,19 @@ function format_like($cnt,$arr,$type,$id) {
if(! function_exists('load_view_file')) {
function load_view_file($s) {
- global $lang;
+ global $lang, $a;
if(! isset($lang))
$lang = 'en';
$b = basename($s);
$d = dirname($s);
if(file_exists("$d/$lang/$b"))
return file_get_contents("$d/$lang/$b");
+
+ $theme = current_theme();
+
+ if(file_exists("$d/theme/$theme/$b"))
+ return file_get_contents("$d/theme/$theme/$b");
+
return file_get_contents($s);
}}
@@ -1976,29 +1960,6 @@ return str_replace ("%","=",rawurlencode($s));
}}
-if(! function_exists('like_puller')) {
-function like_puller($a,$item,&$arr,$mode) {
-
- $url = '';
- $sparkle = '';
- $verb = (($mode === 'like') ? ACTIVITY_LIKE : ACTIVITY_DISLIKE);
-
- if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) {
- $url = $item['author-link'];
- 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" ';
- }
- if(! ((isset($arr[$item['parent'] . '-l'])) && (is_array($arr[$item['parent'] . '-l']))))
- $arr[$item['parent'] . '-l'] = array();
- if(! isset($arr[$item['parent']]))
- $arr[$item['parent']] = 1;
- else
- $arr[$item['parent']] ++;
- $arr[$item['parent'] . '-l'][] = '' . $item['author-name'] . '';
- }
- return;
-}}
if(! function_exists('get_mentions')) {
function get_mentions($item) {
@@ -2081,7 +2042,7 @@ function micropro($contact, $redirect = false, $class = '') {
$url = '';
return '' . "\r\n";
}}
@@ -2179,7 +2140,7 @@ function smilies($s) {
$a = get_app();
return str_replace(
- array( '<3', '</3', '<\\3', ':-)', ';-)', ':-(', ':(', ':-P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'),
+ array( '<3', '</3', '<\\3', ':-)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'),
array(
'
',
'
',
@@ -2189,6 +2150,7 @@ function smilies($s) {
'
',
'
',
'
',
+ '
',
'
',
'
',
'
',
@@ -2306,8 +2268,15 @@ function profile_sidebar($profile) {
$photo = '';
+ // don't show connect link to yourself
+
$connect = (($profile['uid'] != local_user()) ? '' . t('Connect') . '' : '');
-
+
+ // don't show connect link to authenticated visitors either
+
+ if((remote_user()) && ($_SESSION['visitor_visiting'] == $profile['uid']))
+ $connect = '';
+
if((x($profile,'address') == 1)
|| (x($profile,'locality') == 1)
|| (x($profile,'region') == 1)
@@ -2553,34 +2522,38 @@ function proc_run($cmd){
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() {
-
+if(! function_exists('current_theme')) {
+function current_theme(){
$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);
-
+ $theme_name = ((is_array($_SESSION) && 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');
-
+ return($theme_name);
+
foreach($app_base_themes as $t) {
if(file_exists('view/theme/' . $t . '/style.css'))
- return($a->get_baseurl() . '/view/theme/' . $t . '/style.css');
- }
-
+ return($t);
+ }
+
$fallback = glob('view/theme/*/style.css');
if(count($fallback))
- return($a->get_baseurl() . $fallback[0]);
+ return (str_replace('view/theme/','', str_replace("/style.css","",$fallback[0])));
-
+}}
+
+/*
+* 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() {
+ global $a;
+ $t = current_theme();
+ return($a->get_baseurl() . '/view/theme/' . $t . '/style.css');
}}
if(! function_exists('feed_birthday')) {
@@ -2671,7 +2644,7 @@ if(! function_exists('get_plink')) {
function get_plink($item) {
$a = get_app();
$plink = (((x($item,'plink')) && (! $item['private'])) ? '' : '');
+ . $item['plink'] . '" title="' . t('link to source') . '" target="external-link" class="icon remote-link">' : '');
return $plink;
}}
@@ -2680,106 +2653,6 @@ 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`,`network`,`url` FROM `contact` WHERE `uid` = %d AND `url` IN ( %s ) AND `self` = 0 AND `blocked` = 0 ",
- intval($uid),
- implode(',',$urls)
- );
- if(count($r)) {
- $ret = array();
- $authors = array();
- foreach($r as $rr){
- if ($rr['network']=='dfrn')
- $ret[$rr['url']] = $rr['id'];
- $authors[$r['url']]= $rr;
- }
- $a->authors = $authors;
- return $ret;
- }
- }
- return array();
-}}
-
-if(! function_exists('item_photo_menu')){
-function item_photo_menu($item){
- $a = get_app();
-
- if (!isset($a->authors)){
- $rr = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `uid`=%d AND `self`=0 AND `blocked`=0 ", intval(local_user()));
- $authors = array();
- foreach($rr as $r) $authors[$r['url']]= $r;
- $a->authors = $authors;
- }
-
- $contact_url="";
- $pm_url="";
-
- $status_link="";
- $photo_link="";
- $profile_link = ((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
- $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
-
- // $item['contact-uid'] is only set on profile page and indicates the uid of the user who owns the profile.
-
- $profile_owner = ((x($item,'contact-uid')) && intval($item['contact-uid']) ? intval($item['contact-uid']) : 0);
-
- // So we are checking that this is a logged in user on some page that *isn't* a profile page
- // OR a profile page where the viewer owns the profile.
- // Then check if we can use a sparkle (redirect) link to the profile by virtue of it being our contact
- // or a friend's contact that we both have a connection to.
-
- if((local_user() && ($profile_owner == 0))
- || ($profile_owner && $profile_owner == local_user())) {
-
- if(strlen($item['author-link']) && link_compare($item['author-link'],$item['url']))
- $redir = $redirect_url;
- elseif(isset($a->authors[$item['author-link']])) {
- $redir = $a->get_baseurl() . '/redir/' . $a->authors[$item['author-link']]['id'];
- $cid = $a->authors[$item['author-link']]['id'];
- }
-
- if($item['network'] === 'dfrn' && (! $item['self'])) {
- $status_link = $redir . "?url=status";
- $profile_link = $redir . "?url=profile";
- $photos_link = $redir . "?url=photos";
- $pm_url = $a->get_baseurl() . '/message/new/' . $cid;
- }
-
- $contact_url = $item['self']?"":$a->get_baseurl() . '/contacts/' . (($item['cid']) ? $item['cid'] : $cid);
- }
-
-
- $menu = Array(
- t("View status") => $status_link,
- t("View profile") => $profile_link,
- t("View photos") => $photos_link,
- t("Edit contact") => $contact_url,
- t("Send PM") => $pm_url,
- );
-
-
- $args = array($item, &$menu);
-
- call_hooks('item_photo_menu', $args);
-
- $o = "";
- foreach($menu as $k=>$v){
- if ($v!="") $o .= "$k\n";
- }
- return $o;
-}}
if(! function_exists('lang_selector')) {
function lang_selector() {
@@ -2811,7 +2684,7 @@ function parse_xml_string($s) {
$x = @simplexml_load_string($s2);
if(count(libxml_get_errors()))
foreach(libxml_get_errors() as $err)
- logger('libxml: parse: ' . $err, LOGGER_DATA);
+ logger('libxml: parse: ' . $err->code." at ".$err->line.":".$err->column." : ".$err->message, LOGGER_DATA);
libxml_clear_errors();
return $x;
}}