X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=5ef24f4944b7060ad5483211e468a3233f4a187f;hb=2947be66b6302590e8da79f37a6cc6bdc56b1445;hp=3a9e8c3e725678f1a82f6c102e479c1e2c05bb38;hpb=a9c8aed9b14552ef2b21f1a59c60bbeb5e25f29d;p=friendica.git
diff --git a/boot.php b/boot.php
index 3a9e8c3e72..5ef24f4944 100644
--- a/boot.php
+++ b/boot.php
@@ -12,9 +12,9 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
require_once('include/features.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '3.2.1748' );
+define ( 'FRIENDICA_VERSION', '3.2.1753' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
-define ( 'DB_UPDATE_VERSION', 1170 );
+define ( 'DB_UPDATE_VERSION', 1173 );
define ( 'EOL', "
\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
@@ -143,6 +143,7 @@ define ( 'NETWORK_PUMPIO', 'pump'); // pump.io
define ( 'NETWORK_TWITTER', 'twit'); // Twitter
define ( 'NETWORK_DIASPORA2', 'dspc'); // Diaspora connector
define ( 'NETWORK_STATUSNET', 'stac'); // Statusnet connector
+define ( 'NETWORK_APPNET', 'apdn'); // app.net
define ( 'NETWORK_PHANTOM', 'unkn'); // Place holder
@@ -169,6 +170,7 @@ $netgroup_ids = array(
NETWORK_TWITTER => (-14),
NETWORK_DIASPORA2 => (-15),
NETWORK_STATUSNET => (-16),
+ NETWORK_APPNET => (-17),
NETWORK_PHANTOM => (-127),
);
@@ -266,10 +268,13 @@ define ( 'ACTIVITY_FAVORITE', NAMESPACE_ACTIVITY_SCHEMA . 'favorite' );
define ( 'ACTIVITY_POKE', NAMESPACE_ZOT . '/activity/poke' );
define ( 'ACTIVITY_MOOD', NAMESPACE_ZOT . '/activity/mood' );
+define ( 'ACTIVITY_OBJ_BOOKMARK', NAMESPACE_ACTIVITY_SCHEMA . 'bookmark' );
define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' );
define ( 'ACTIVITY_OBJ_NOTE', NAMESPACE_ACTIVITY_SCHEMA . 'note' );
define ( 'ACTIVITY_OBJ_PERSON', NAMESPACE_ACTIVITY_SCHEMA . 'person' );
+define ( 'ACTIVITY_OBJ_IMAGE', NAMESPACE_ACTIVITY_SCHEMA . 'image' );
define ( 'ACTIVITY_OBJ_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'photo' );
+define ( 'ACTIVITY_OBJ_VIDEO', NAMESPACE_ACTIVITY_SCHEMA . 'video' );
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' );
@@ -428,6 +433,8 @@ if(! class_exists('App')) {
global $default_timezone, $argv, $argc;
+ $hostname = "";
+
if (file_exists(".htpreconfig.php"))
@include(".htpreconfig.php");
@@ -622,11 +629,16 @@ if(! class_exists('App')) {
if($parsed) {
$this->scheme = $parsed['scheme'];
- $this->hostname = $parsed['host'];
+ $hostname = $parsed['host'];
if(x($parsed,'port'))
- $this->hostname .= ':' . $parsed['port'];
+ $hostname .= ':' . $parsed['port'];
if(x($parsed,'path'))
$this->path = trim($parsed['path'],'\\/');
+
+ if (file_exists(".htpreconfig.php"))
+ @include(".htpreconfig.php");
+
+ $this->hostname = $hostname;
}
}
@@ -684,6 +696,14 @@ if(! class_exists('App')) {
else
$stylesheet = '$stylesheet';
+ $shortcut_icon = get_config("system", "shortcut_icon");
+ if ($shortcut_icon == "")
+ $shortcut_icon = $this->get_baseurl()."/images/friendica-32.png";
+
+ $touch_icon = get_config("system", "touch_icon");
+ if ($touch_icon == "")
+ $touch_icon = $this->get_baseurl()."/images/friendica-128.png";
+
$tpl = get_markup_template('head.tpl');
$this->page['htmlhead'] = replace_macros($tpl,array(
'$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
@@ -694,6 +714,8 @@ if(! class_exists('App')) {
'$showmore' => t('show more'),
'$showfewer' => t('show fewer'),
'$update_interval' => $interval,
+ '$shortcut_icon' => $shortcut_icon,
+ '$touch_icon' => $touch_icon,
'$stylesheet' => $stylesheet
)) . $this->page['htmlhead'];
}
@@ -746,8 +768,8 @@ if(! class_exists('App')) {
if(! count($r)){
$this->cached_profile_image[$avatar_image] = $avatar_image;
} else {
- $this->cached_profile_picdate[$common_filename] = "?rev=" . urlencode($r[0]['picdate']);
- $this->cached_profile_image[$avatar_image] = $avatar_image . $this->cached_profile_picdate[$common_filename];
+ $this->cached_profile_picdate[$common_filename] = "?rev=".urlencode($r[0]['picdate']);
+ $this->cached_profile_image[$avatar_image] = $avatar_image.$this->cached_profile_picdate[$common_filename];
}
}
return $this->cached_profile_image[$avatar_image];
@@ -993,6 +1015,37 @@ if(! function_exists('update_db')) {
if(DB_UPDATE_VERSION == UPDATE_VERSION) {
+ // Compare the current structure with the defined structure
+
+ $t = get_config('database','dbupdate_'.DB_UPDATE_VERSION);
+ if($t !== false)
+ break;
+ set_config('database','dbupdate_'.DB_UPDATE_VERSION, time());
+
+ require_once("include/dbstructure.php");
+ $retval = update_structure(false, true);
+ if($retval) {
+ //send the administrator an e-mail
+ $email_tpl = get_intltext_template("update_fail_eml.tpl");
+ $email_msg = replace_macros($email_tpl, array(
+ '$sitename' => $a->config['sitename'],
+ '$siteurl' => $a->get_baseurl(),
+ '$update' => DB_UPDATE_VERSION,
+ '$error' => sprintf(t('Update %s failed. See error logs.'), DB_UPDATE_VERSION)
+ ));
+ $subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
+ require_once('include/email.php');
+ $subject = email_header_encode($subject,'UTF-8');
+ mail($a->config['admin_email'], $subject, $email_msg,
+ 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME']."\n"
+ .'Content-type: text/plain; charset=UTF-8'."\n"
+ .'Content-transfer-encoding: 8bit');
+ //try the logger
+ logger("CRITICAL: Database structure update failed: ".$retval);
+ break;
+ } else
+ set_config('database','dbupdate_'.DB_UPDATE_VERSION, 'success');
+
for($x = $stored; $x < $current; $x ++) {
if(function_exists('update_' . $x)) {
@@ -1032,11 +1085,13 @@ if(! function_exists('update_db')) {
//try the logger
logger('CRITICAL: Update Failed: '. $x);
break;
- }
- else {
+ } else {
set_config('database','update_' . $x, 'success');
set_config('system','build', $x + 1);
}
+ } else {
+ set_config('database','update_' . $x, 'success');
+ set_config('system','build', $x + 1);
}
}
}
@@ -1107,8 +1162,24 @@ if(! function_exists('check_plugins')) {
}
}
-
function get_guid($size=16) {
+ $exists = true; // assume by default that we don't have a unique guid
+ do {
+ $prefix = "";
+ while (strlen($prefix) < ($size - 13))
+ $prefix .= mt_rand();
+
+ $s = substr(uniqid($prefix), -$size);
+
+ $r = q("select id from guid where guid = '%s' limit 1", dbesc($s));
+ if(! count($r))
+ $exists = false;
+ } while($exists);
+ q("insert into guid (guid) values ('%s') ", dbesc($s));
+ return $s;
+}
+
+/*function get_guid($size=16) {
$exists = true; // assume by default that we don't have a unique guid
do {
$s = random_string($size);
@@ -1118,7 +1189,7 @@ function get_guid($size=16) {
} while($exists);
q("insert into guid ( guid ) values ( '%s' ) ", dbesc($s));
return $s;
-}
+}*/
// wrapper for adding a login box. If $register == true provide a registration
@@ -1303,7 +1374,7 @@ if(! function_exists('get_max_import_size')) {
*/
if(! function_exists('profile_load')) {
- function profile_load(&$a, $nickname, $profile = 0) {
+ function profile_load(&$a, $nickname, $profile = 0, $profiledata = array()) {
$user = q("select uid from user where nickname = '%s' limit 1",
dbesc($nickname)
@@ -1368,10 +1439,13 @@ if(! function_exists('profile_load')) {
$a->profile = $r[0];
$a->profile['mobile-theme'] = get_pconfig($a->profile['profile_uid'], 'system', 'mobile_theme');
-
+ $a->profile['network'] = NETWORK_DFRN;
$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
- $_SESSION['theme'] = $a->profile['theme'];
+
+ if (!$profiledata)
+ $_SESSION['theme'] = $a->profile['theme'];
+
$_SESSION['mobile-theme'] = $a->profile['mobile-theme'];
/**
@@ -1388,7 +1462,7 @@ if(! function_exists('profile_load')) {
if(! (x($a->page,'aside')))
$a->page['aside'] = '';
- if(local_user() && local_user() == $a->profile['uid']) {
+ if(local_user() && local_user() == $a->profile['uid'] && $profiledata) {
$a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array(
'$editprofile' => t('Edit profile'),
'$profid' => $a->profile['id']
@@ -1397,7 +1471,14 @@ if(! function_exists('profile_load')) {
$block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
- $a->page['aside'] .= profile_sidebar($a->profile, $block);
+ // To-Do:
+ // By now, the contact block isn't shown, when a different profile is given
+ // But: When this profile was on the same server, then we could display the contacts
+ if ($profiledata)
+ $a->page['aside'] .= profile_sidebar($profiledata, true);
+ else
+ $a->page['aside'] .= profile_sidebar($a->profile, $block);
+
/*if(! $block)
$a->page['aside'] .= contact_block();*/
@@ -1425,7 +1506,6 @@ if(! function_exists('profile_load')) {
if(! function_exists('profile_sidebar')) {
function profile_sidebar($profile, $block = 0) {
-
$a = get_app();
$o = '';
@@ -1438,14 +1518,22 @@ if(! function_exists('profile_sidebar')) {
$profile['picdate'] = urlencode($profile['picdate']);
+ if (($profile['network'] != "") AND ($profile['network'] != NETWORK_DFRN)) {
+ require_once('include/contact_selectors.php');
+ if ($profile['url'] != "")
+ $profile['network_name'] = ''.network_to_name($profile['network'])."";
+ else
+ $profile['network_name'] = network_to_name($profile['network']);
+ } else
+ $profile['network_name'] = "";
+
call_hooks('profile_sidebar_enter', $profile);
-
+
// don't show connect link to yourself
$connect = (($profile['uid'] != local_user()) ? t('Connect') : False);
// don't show connect link to authenticated visitors either
-
if(remote_user() && count($_SESSION['remote'])) {
foreach($_SESSION['remote'] as $visitor) {
if($visitor['uid'] == $profile['uid']) {
@@ -1455,20 +1543,36 @@ if(! function_exists('profile_sidebar')) {
}
}
+ // Is the local user already connected to that user?
+ if ($connect AND local_user()) {
+ if (isset($profile["url"]))
+ $profile_url = normalise_link($profile["url"]);
+ else
+ $profile_url = normalise_link($a->get_baseurl()."/profile/".$profile["nickname"]);
+
+ $r = q("SELECT * FROM `contact` WHERE NOT `pending` AND `uid` = %d AND `nurl` = '%s'",
+ local_user(), $profile_url);
+ if (count($r))
+ $connect = false;
+ }
+
+ if ($connect AND ($profile['network'] != NETWORK_DFRN) AND !isset($profile['remoteconnect']))
+ $connect = false;
+
+ if (isset($profile['remoteconnect']))
+ $remoteconnect = $profile['remoteconnect'];
+
if( get_my_url() && $profile['unkmail'] && ($profile['uid'] != local_user()) )
$wallmessage = t('Message');
else
$wallmessage = false;
-
-
// show edit profile to yourself
if ($profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) {
$profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
-
$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
local_user());
-
+
$profile['menu'] = array(
'chg_photo' => t('Change profile photo'),
'cr_new' => t('Create New Profile'),
@@ -1493,18 +1597,15 @@ if(! function_exists('profile_sidebar')) {
}
}
- if ($profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) {
- $profile['edit'] = array($a->get_baseurl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile'));
- $profile['menu'] = array(
+ if ($profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) {
+ $profile['edit'] = array($a->get_baseurl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile'));
+ $profile['menu'] = array(
'chg_photo' => t('Change profile photo'),
'cr_new' => null,
'entries' => array(),
);
- }
-
-
+ }
-
if((x($profile,'address') == 1)
|| (x($profile,'locality') == 1)
|| (x($profile,'region') == 1)
@@ -1558,12 +1659,14 @@ if(! function_exists('profile_sidebar')) {
$o .= replace_macros($tpl, array(
'$profile' => $p,
'$connect' => $connect,
+ '$remoteconnect' => $remoteconnect,
'$wallmessage' => $wallmessage,
'$location' => $location,
'$gender' => $gender,
'$pdesc' => $pdesc,
'$marital' => $marital,
'$homepage' => $homepage,
+ '$network' => t('Network:'),
'$diaspora' => $diaspora,
'$contact_block' => $contact_block,
));
@@ -2137,7 +2240,7 @@ function random_digits($digits) {
}
function get_cachefile($file, $writemode = true) {
- $cache = get_config("system","itemcache");
+ $cache = get_itemcachepath();
if ((! $cache) || (! is_dir($cache)))
return("");
@@ -2158,7 +2261,7 @@ function get_cachefile($file, $writemode = true) {
function clear_cache($basepath = "", $path = "") {
if ($path == "") {
- $basepath = get_config('system','itemcache');
+ $basepath = get_itemcachepath();
$path = $basepath;
}
@@ -2186,6 +2289,63 @@ function clear_cache($basepath = "", $path = "") {
}
}
+function get_itemcachepath() {
+ // Checking, if the cache is deactivated
+ $cachetime = (int)get_config('system','itemcache_duration');
+ if ($cachetime < 0)
+ return "";
+
+ $itemcache = get_config('system','itemcache');
+ if (($itemcache != "") AND is_dir($itemcache) AND is_writable($itemcache))
+ return($itemcache);
+
+ $temppath = get_temppath();
+
+ if ($temppath != "") {
+ $itemcache = $temppath."/itemcache";
+ mkdir($itemcache);
+
+ if (is_dir($itemcache) AND is_writable($itemcache)) {
+ set_config("system", "itemcache", $itemcache);
+ return($itemcache);
+ }
+ }
+ return "";
+}
+
+function get_lockpath() {
+ $lockpath = get_config('system','lockpath');
+ if (($lockpath != "") AND is_dir($lockpath) AND is_writable($lockpath))
+ return($lockpath);
+
+ $temppath = get_temppath();
+
+ if ($temppath != "") {
+ $lockpath = $temppath."/lock";
+ mkdir($lockpath);
+
+ if (is_dir($lockpath) AND is_writable($lockpath)) {
+ set_config("system", "lockpath", $lockpath);
+ return($lockpath);
+ }
+ }
+ return "";
+}
+
+function get_temppath() {
+ $temppath = get_config("system","temppath");
+ if (($temppath != "") AND is_dir($temppath) AND is_writable($temppath))
+ return($temppath);
+
+ $temppath = sys_get_temp_dir();
+ if (($temppath != "") AND is_dir($temppath) AND is_writable($temppath)) {
+ set_config("system", "temppath", $temppath);
+ return($temppath);
+ }
+
+ return("");
+}
+
function set_template_engine(&$a, $engine = 'internal') {
// This function is no longer necessary, but keep it as a wrapper to the class method
// to avoid breaking themes again unnecessarily