From 96bcaf4331153d911dff6d8c7265f1a8f3f01255 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 17 Aug 2011 18:43:17 -0700 Subject: poormancron - proc_run executing twice, once as function; once as commandline --- boot.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 39bb6a9da..158054884 100644 --- a/boot.php +++ b/boot.php @@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1074' ); +define ( 'FRIENDIKA_VERSION', '2.2.1075' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1079 ); @@ -1033,11 +1033,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); } -- cgit v1.2.3 From c30f523c6200ef84c506940b5f86b49ff2c7cf6e Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 17 Aug 2011 20:52:18 -0700 Subject: more d* infrastructure for relaying signed messages and storing non-connected people details --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 158054884..09d9f4ef8 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once("include/pgettext.php"); define ( 'FRIENDIKA_VERSION', '2.2.1075' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); -define ( 'DB_UPDATE_VERSION', 1079 ); +define ( 'DB_UPDATE_VERSION', 1080 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); -- cgit v1.2.3 From 96342878398e394173ba1a2dd825afbcb19e7199 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 17 Aug 2011 23:01:44 -0700 Subject: fix several probe related issues --- boot.php | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 09d9f4ef8..050cf10ce 100644 --- a/boot.php +++ b/boot.php @@ -803,8 +803,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 +831,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 +850,9 @@ function profile_sidebar($profile) { $tabs = ''; - $photo = '
' . $profile['name'] . '
'; + $photo = '
' . $profile['name'] . '
'; // 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 +880,7 @@ function profile_sidebar($profile) { } + $gender = ((x($profile,'gender') == 1) ? '
    ' . t('Gender:') . ' ' . $profile['gender'] . '
    ' : ''); $pubkey = ((x($profile,'pubkey') == 1) ? '' : ''); @@ -885,13 +889,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 +906,19 @@ function profile_sidebar($profile) {
    Nickname
    -$nickname +$nickname +
    +
    +
    +
    Full name
    +
    +$fullname
    URL
    -$podloc +$podloc/
    -- cgit v1.2.3 From 78e1f86110f430d6ec997d1d0008e7fd1383eeaf Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 18 Aug 2011 01:15:48 -0700 Subject: consistent quotes in vcard --- boot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 050cf10ce..38ebd1f67 100644 --- a/boot.php +++ b/boot.php @@ -939,10 +939,10 @@ function profile_sidebar($profile, $block = 0) {
    -
    +
    Searchable
    -$searchable +$searchable
    -- cgit v1.2.3 From c534dd2969484625adda9cc82ad9d92664a96789 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 18 Aug 2011 04:20:30 -0700 Subject: fill and expire fcontact cache --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 38ebd1f67..af99ed070 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once("include/pgettext.php"); define ( 'FRIENDIKA_VERSION', '2.2.1075' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); -define ( 'DB_UPDATE_VERSION', 1080 ); +define ( 'DB_UPDATE_VERSION', 1081 ); define ( 'EOL', "
    \r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); -- cgit v1.2.3 From bc5935061b674a5503a1a82a458dfaf3317e4c70 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 18 Aug 2011 16:47:45 -0700 Subject: dfrn friendship issue --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index af99ed070..821e74672 100644 --- a/boot.php +++ b/boot.php @@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1075' ); +define ( 'FRIENDIKA_VERSION', '2.2.1076' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1081 ); -- cgit v1.2.3 From 8e24db3ef5c0bd15aba50aa48fd4745fe7191dbb Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 19 Aug 2011 14:34:28 -0700 Subject: incorrect iv length for blocksize --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 821e74672..0992f6b53 100644 --- a/boot.php +++ b/boot.php @@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1076' ); +define ( 'FRIENDIKA_VERSION', '2.2.1077' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1081 ); -- cgit v1.2.3 From 8fa6f492420f830b4c9c06f2f391853e82285825 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 20 Aug 2011 15:09:09 -0700 Subject: until algorithm is sorted, ignore D* verification failures so we can debug the rest --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 0992f6b53..302844f57 100644 --- a/boot.php +++ b/boot.php @@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1077' ); +define ( 'FRIENDIKA_VERSION', '2.2.1078' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1081 ); -- cgit v1.2.3 From 213f832443944a8e3555ecf6b5951b71596fea6f Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 21 Aug 2011 17:24:50 -0700 Subject: add trailing slash to diaspora notify url on send --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 302844f57..ae3c04b77 100644 --- a/boot.php +++ b/boot.php @@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1078' ); +define ( 'FRIENDIKA_VERSION', '2.2.1079' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1081 ); -- cgit v1.2.3