From 31eedce2363661fe7405060e8c0fb1fef582bc29 Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 18 Mar 2011 13:20:11 -0700 Subject: revup --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 3636288b2..aa40c1711 100644 --- a/boot.php +++ b/boot.php @@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.921' ); +define ( 'FRIENDIKA_VERSION', '2.1.922' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'DB_UPDATE_VERSION', 1043 ); -- cgit v1.2.3 From 7e33c1072a4a948941e2522afe0123899b0abddd Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 19 Mar 2011 01:19:11 -0700 Subject: stuff to make connecting to diaspora profiles easier --- boot.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index aa40c1711..66d4bc124 100644 --- a/boot.php +++ b/boot.php @@ -1603,9 +1603,15 @@ function lrdd($uri) { if(! function_exists('fetch_lrdd_template')) { function fetch_lrdd_template($host) { $tpl = ''; - $url = 'http://' . $host . '/.well-known/host-meta' ; - $links = fetch_xrd_links($url); -logger('template: ' . print_r($links,true)); + + $url1 = 'https://' . $host . '/.well-known/host-meta' ; + $url2 = 'http://' . $host . '/.well-known/host-meta' ; + $links = fetch_xrd_links($url1); + logger('template (https): ' . print_r($links,true)); + if(! count($links)) { + $links = fetch_xrd_links($url2); + logger('template (http): ' . print_r($links,true)); + } if(count($links)) { foreach($links as $link) if($link['@attributes']['rel'] && $link['@attributes']['rel'] === 'lrdd') -- cgit v1.2.3 From 6a56ac2add9b96b97a66cdc63722f30234f4cb6b Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 19 Mar 2011 15:12:04 -0700 Subject: language file security --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 66d4bc124..c10b1ea6f 100644 --- a/boot.php +++ b/boot.php @@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.922' ); +define ( 'FRIENDIKA_VERSION', '2.1.923' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'DB_UPDATE_VERSION', 1043 ); -- cgit v1.2.3 From 2b0af1456ceebb6be24768d14702742e73125588 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 20 Mar 2011 15:51:09 -0700 Subject: editor consistency on profile edit page --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index c10b1ea6f..e28d00946 100644 --- a/boot.php +++ b/boot.php @@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.923' ); +define ( 'FRIENDIKA_VERSION', '2.1.924' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'DB_UPDATE_VERSION', 1043 ); -- cgit v1.2.3 From b7292bc673bc7983b1fd933070bc9d6a0a155dbb Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 20 Mar 2011 17:54:50 -0700 Subject: user pref -> block remote wall posting --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index e28d00946..81794af91 100644 --- a/boot.php +++ b/boot.php @@ -4,7 +4,7 @@ set_time_limit(0); define ( 'FRIENDIKA_VERSION', '2.1.924' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); -define ( 'DB_UPDATE_VERSION', 1043 ); +define ( 'DB_UPDATE_VERSION', 1044 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); -- cgit v1.2.3 From 82bd1ce3cb0097ad6be9650e4a1414e819cf8b0c Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 21 Mar 2011 03:33:58 -0700 Subject: installation issues --- boot.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 81794af91..6c8fb9d15 100644 --- a/boot.php +++ b/boot.php @@ -1862,11 +1862,11 @@ function format_like($cnt,$arr,$type,$id) { if(! function_exists('load_view_file')) { function load_view_file($s) { + global $lang; + if(! isset($lang)) + $lang = 'en'; $b = basename($s); $d = dirname($s); - $lang = get_config('system','language'); - if($lang === false) - $lang = 'en'; if(file_exists("$d/$lang/$b")) return file_get_contents("$d/$lang/$b"); return file_get_contents($s); -- cgit v1.2.3 From c3ccd19274d6cd06f116209795351be9d2785698 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 21 Mar 2011 15:08:04 -0700 Subject: revup --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 6c8fb9d15..50b4fd887 100644 --- a/boot.php +++ b/boot.php @@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.924' ); +define ( 'FRIENDIKA_VERSION', '2.1.925' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'DB_UPDATE_VERSION', 1044 ); -- cgit v1.2.3