X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=boot.php;h=28467006da4c03f538511a33cb0bf688eb3559d9;hb=5ec4a4e6deb5d28cbfab54093f8b4180912738d4;hp=39bb6a9dac875e4f77f3e36bb6cdd738e169a2ec;hpb=b28b468b2182493b958afecb388501fd66de230f;p=friendica.git
diff --git a/boot.php b/boot.php
index 39bb6a9dac..28467006da 100644
--- a/boot.php
+++ b/boot.php
@@ -5,11 +5,12 @@ require_once('include/network.php');
require_once('include/plugin.php');
require_once('include/text.php');
require_once("include/pgettext.php");
+require_once('include/nav.php');
-define ( 'FRIENDIKA_VERSION', '2.2.1074' );
+define ( 'FRIENDIKA_VERSION', '2.2.1083' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
-define ( 'DB_UPDATE_VERSION', 1079 );
+define ( 'DB_UPDATE_VERSION', 1082 );
define ( 'EOL', "
\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
@@ -803,8 +804,12 @@ function profile_load(&$a, $nickname, $profile = 0) {
if(! (x($a->page,'aside')))
$a->page['aside'] = '';
- $a->page['aside'] .= profile_sidebar($a->profile);
- $a->page['aside'] .= contact_block();
+ $block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
+
+ $a->page['aside'] .= profile_sidebar($a->profile, $block);
+
+ if(! $block)
+ $a->page['aside'] .= contact_block();
return;
}}
@@ -827,7 +832,7 @@ function profile_load(&$a, $nickname, $profile = 0) {
if(! function_exists('profile_sidebar')) {
-function profile_sidebar($profile) {
+function profile_sidebar($profile, $block = 0) {
$a = get_app();
@@ -846,10 +851,9 @@ function profile_sidebar($profile) {
$tabs = '';
- $photo = '
![' . $profile['name'] . '](' . $profile['photo'] . ')
';
+ $photo = '![' . $profile['name'] . '](' . $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
@@ -877,6 +881,7 @@ function profile_sidebar($profile) {
}
+
$gender = ((x($profile,'gender') == 1) ? '' . t('Gender:') . ' ' . $profile['gender'] . '
' : '');
$pubkey = ((x($profile,'pubkey') == 1) ? '' . $profile['pubkey'] . '
' : '');
@@ -885,13 +890,13 @@ function profile_sidebar($profile) {
$homepage = ((x($profile,'homepage') == 1) ? '' . t('Homepage:') . ' ' . linkify($profile['homepage']) . '
' : '');
- if($profile['hidewall'] && (! local_user()) && (! remote_user())) {
- $location = $gender = $marital = $homepage = '';
+ if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
+ $location = $pdesc = $connect = $gender = $marital = $homepage = '';
}
$podloc = $a->get_baseurl();
$searchable = (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' );
- $nickname = $profile['nick'];
+ $nickname = $profile['nickname'];
$photo300 = $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg';
$photo100 = $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg';
$photo50 = $a->get_baseurl() . '/photo/custom/50/' . $profile['uid'] . '.jpg';
@@ -902,13 +907,19 @@ function profile_sidebar($profile) {
- Nickname
-
-$nickname
+$nickname
+
+
+
+- Full name
+-
+$fullname
- URL
-
-$podloc
+$podloc/
@@ -929,10 +940,10 @@ function profile_sidebar($profile) {
-
+
- Searchable
-
-$searchable
+$searchable
@@ -1033,11 +1044,14 @@ function proc_run($cmd){
$a = get_app();
$args = func_get_args();
- call_hooks("proc_run", $args);
+ $arr = array('args' => $args, 'run_cmd' => true);
+
+ call_hooks("proc_run", $arr);
+ if(! $arr['run_cmd'])
+ return;
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){
$arg = escapeshellarg($arg);
}
@@ -1156,3 +1170,4 @@ function load_contact_links($uid) {
$a->contacts = $ret;
return;
}}
+