define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.2.1753' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
-define ( 'DB_UPDATE_VERSION', 1170 );
+define ( 'DB_UPDATE_VERSION', 1173 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
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];
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");
- update_structure(false, true);
+ $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)) {
//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);
}
}
}
*/
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)
$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'];
/**
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']
$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();*/
if(! function_exists('profile_sidebar')) {
function profile_sidebar($profile, $block = 0) {
-
$a = get_app();
$o = '';
$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'] = '<a href="'.$profile['url'].'">'.network_to_name($profile['network'])."</a>";
+ else
+ $profile['network_name'] = network_to_name($profile['network']);
+ } else
+ $profile['network_name'] = "";
+
call_hooks('profile_sidebar_enter', $profile);
// Is the local user already connected to that user?
if ($connect AND local_user()) {
- $profile_url = normalise_link($a->get_baseurl()."/profile/".$profile["nickname"]);
+ 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);
$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
// 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());
$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,
));
projects / friendica.git / blobdiff