From 371f3e450e1cdc5bcd92d7adb0107d83e87ae2d6 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 21 Apr 2012 19:28:45 -0700 Subject: rev update --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index bbcc9d9a6..16d772b68 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1318' ); +define ( 'FRIENDICA_VERSION', '2.3.1319' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1138 ); -- cgit v1.2.3 From 00cb7f9efb4826a6ad5c0791f26bc5e8db644f77 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 22 Apr 2012 16:24:29 -0700 Subject: don't allow non-existent themes as choices --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 16d772b68..1dd52fe7f 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1319' ); +define ( 'FRIENDICA_VERSION', '2.3.1320' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1138 ); -- cgit v1.2.3 From f265863435b15ab08e3312343672ef8d43aea76e Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 23 Apr 2012 18:28:33 -0700 Subject: more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 1dd52fe7f..d2758c643 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1320' ); +define ( 'FRIENDICA_VERSION', '2.3.1321' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1138 ); -- cgit v1.2.3 From fc61616c53181a0484d773a08f9b0411896a5064 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Tue, 24 Apr 2012 08:12:30 +0200 Subject: events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id]) --- boot.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index d2758c643..f024d64ce 100644 --- a/boot.php +++ b/boot.php @@ -1249,11 +1249,11 @@ if(! function_exists('get_events')) { $o .= '
'; foreach($r as $rr) { - if($rr['adjust']) - $md = datetime_convert('UTC',$a->timezone,$rr['start'],'Y/m\#\l\i\n\k\-j'); + $md = datetime_convert('UTC',$a->timezone,$rr['start'],'Y/m'); else - $md = datetime_convert('UTC','UTC',$rr['start'],'Y/m\#\l\i\n\k\-j'); + $md = datetime_convert('UTC','UTC',$rr['start'],'Y/m'); + $md .= "/#link-".$rr['id']; $title = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... '; if(! $title) @@ -1262,7 +1262,7 @@ if(! function_exists('get_events')) { $strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']); $today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false); - $o .= '
' . $title . '' + $o .= '
' . $title . '' . day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ? ' ' . t('[today]') : '') . '
' ; } -- cgit v1.2.3 From 62ad5043d639c839ce4ae85f80f9cc5aed880d39 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Tue, 24 Apr 2012 09:50:10 +0200 Subject: remove html from get_birthdays() and get_events() --- boot.php | 56 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 23 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index f024d64ce..7584c1c5b 100644 --- a/boot.php +++ b/boot.php @@ -1174,11 +1174,7 @@ if(! function_exists('get_birthdays')) { } $classtoday = $istoday ? ' birthday-today ' : ''; if($total) { - $o .= '
' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '
'; - $o .= '
'; } } - return $o; + $tpl = get_markup_template("birthdays_reminder.tpl"); + return replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(), + '$classtoday' => $classtoday, + '$count' => $total, + '$event_reminders' => t('Birthday Reminders'), + '$event_title' => t('Birthdays this week:'), + '$events' => $r, + )); } } @@ -1215,7 +1220,6 @@ if(! function_exists('get_events')) { require_once('include/bbcode.php'); $a = get_app(); - $o = ''; if(! local_user()) return $o; @@ -1242,13 +1246,10 @@ if(! function_exists('get_events')) { if($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) $istoday = true; } - $classtoday = (($istoday) ? ' event-today ' : ''); + $classtoday = (($istoday) ? 'event-today' : ''); - $o .= '
' . t('Event Reminders') . ' ' . '(' . count($r) . ')' . '
'; - $o .= ''; } - return $o; + $tpl = get_markup_template("events_reminder.tpl"); + return replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(), + '$classtoday' => $classtoday, + '$count' => count($r), + '$event_reminders' => t('Event Reminders'), + '$event_title' => t('Events this week:'), + '$events' => $r, + )); } } -- cgit v1.2.3 From a5f9e67c9f17d65c9958ba55c3aa5d2f0b9d52fa Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 24 Apr 2012 17:55:35 -0700 Subject: rev update --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index d2758c643..3f821ec55 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1321' ); +define ( 'FRIENDICA_VERSION', '2.3.1322' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1138 ); -- cgit v1.2.3 From 78579627ce76178d430a9a81db393c1c0eeb3445 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 26 Apr 2012 01:33:41 -0700 Subject: rev update, fix autoname test "random" failure --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 8b25dff46..4ff84a803 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1322' ); +define ( 'FRIENDICA_VERSION', '2.3.1323' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1138 ); -- cgit v1.2.3 From f8e7f28f403336dc288ab53eba1834de26790598 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 26 Apr 2012 15:35:00 -0700 Subject: rev update --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 4ff84a803..b8a61c796 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1323' ); +define ( 'FRIENDICA_VERSION', '2.3.1324' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1138 ); -- cgit v1.2.3 From c7cbff6fbb036ec37cb4c62a89c8c8c413ecb3d8 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 27 Apr 2012 15:55:56 -0700 Subject: rev update --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index b8a61c796..03edef663 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1324' ); +define ( 'FRIENDICA_VERSION', '2.3.1325' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1138 ); -- cgit v1.2.3 From 0ab6b60a52fc27d8a37917b3b3e25de37c8fd372 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 27 Apr 2012 16:46:28 -0700 Subject: archive contact flag --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 03edef663..02550deb1 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_VERSION', '2.3.1325' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1138 ); +define ( 'DB_UPDATE_VERSION', 1139 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); -- cgit v1.2.3 From 4ff2e9a10358e68f7af90ebf6d50d75d3a6ed284 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 28 Apr 2012 16:54:33 -0700 Subject: a few more continues that should be returns --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 02550deb1..105180c23 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1325' ); +define ( 'FRIENDICA_VERSION', '2.3.1326' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1139 ); -- cgit v1.2.3 From 7919d00399e199c34a50f87fd10101d0d8f6f021 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 28 Apr 2012 17:50:28 -0700 Subject: bring back the email and logging of update failures, but without the transactions --- boot.php | 44 +++++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 25 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 105180c23..7564615a5 100644 --- a/boot.php +++ b/boot.php @@ -658,32 +658,26 @@ if(! function_exists('check_config')) { // call the specific update -// global $db; -// $db->excep(TRUE); -// try { -// $db->beginTransaction(); - $func = 'update_' . $x; - $func($a); -// $db->commit(); -// } catch(Exception $ex) { -// $db->rollback(); -// //send the administrator an e-mail -// $email_tpl = get_intltext_template("update_fail_eml.tpl"); -// $email_tpl = replace_macros($email_tpl, array( -// '$sitename' => $a->config['sitename'], -// '$siteurl' => $a->get_baseurl(), -// '$update' => $x, -// '$error' => $ex->getMessage())); -// $subject=sprintf(t('Update Error at %s'), $a->get_baseurl()); + $func = 'update_' . $x; + $retval = $func($a); + if($retval) { + //send the administrator an e-mail + $email_tpl = get_intltext_template("update_fail_eml.tpl"); + $email_tpl = replace_macros($email_tpl, array( + '$sitename' => $a->config['sitename'], + '$siteurl' => $a->get_baseurl(), + '$update' => $x, + '$error' => sprintf( t('Update %s failed. See error logs.'), $x) + )); + $subject=sprintf(t('Update Error at %s'), $a->get_baseurl()); -// mail($a->config['admin_email'], $subject, $text, -// 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" -// . 'Content-type: text/plain; charset=UTF-8' . "\n" -// . 'Content-transfer-encoding: 8bit' ); -// //try the logger -// logger('update failed: '.$ex->getMessage().EOL); -// } -// $db->excep(FALSE); + mail($a->config['admin_email'], $subject, $text, + 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" + . 'Content-type: text/plain; charset=UTF-8' . "\n" + . 'Content-transfer-encoding: 8bit' ); + //try the logger + logger('CRITICAL: Update Failed: '. $x); + } } } set_config('system','build', DB_UPDATE_VERSION); -- cgit v1.2.3 From 356bd9b04ad5378b19d4aa8b25ccab178491df34 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 28 Apr 2012 17:53:19 -0700 Subject: some constants for the db update failure possibilities --- boot.php | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 7564615a5..cfdadcd19 100644 --- a/boot.php +++ b/boot.php @@ -73,6 +73,14 @@ define ( 'HOOK_HOOK', 0); define ( 'HOOK_FILE', 1); define ( 'HOOK_FUNCTION', 2); +/** + * DB update return values + */ + +define ( 'UPDATE_SUCCESS', 0); +define ( 'UPDATE_FAILED', 1); + + /** * * page/profile types -- cgit v1.2.3 From b3a71e4327bbe618dbdd15428a4614f58b4e848c Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 28 Apr 2012 21:35:14 -0700 Subject: indicate successful updates --- boot.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index cfdadcd19..616e152f9 100644 --- a/boot.php +++ b/boot.php @@ -671,7 +671,7 @@ if(! function_exists('check_config')) { if($retval) { //send the administrator an e-mail $email_tpl = get_intltext_template("update_fail_eml.tpl"); - $email_tpl = replace_macros($email_tpl, array( + $email_msg = replace_macros($email_tpl, array( '$sitename' => $a->config['sitename'], '$siteurl' => $a->get_baseurl(), '$update' => $x, @@ -679,13 +679,16 @@ if(! function_exists('check_config')) { )); $subject=sprintf(t('Update Error at %s'), $a->get_baseurl()); - mail($a->config['admin_email'], $subject, $text, + mail($a->config['admin_email'], $subject, $email_msg, 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-transfer-encoding: 8bit' ); //try the logger logger('CRITICAL: Update Failed: '. $x); } + else + set_config('database','update_' . $x, 'success'); + } } set_config('system','build', DB_UPDATE_VERSION); @@ -727,9 +730,10 @@ if(! function_exists('check_config')) { foreach($installed as $i) { if(! in_array($i['name'],$plugins_arr)) { uninstall_plugin($i['name']); - } - else + } + else { $installed_arr[] = $i['name']; + } } } -- cgit v1.2.3 From 249a6814cd777e8eb9d4feb788058ec4683e9522 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 29 Apr 2012 01:08:28 -0700 Subject: add db field for removed account, which will also be the first test of update error checking --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 616e152f9..100662a8f 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_VERSION', '2.3.1326' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1139 ); +define ( 'DB_UPDATE_VERSION', 1140 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); -- cgit v1.2.3 From e3fecb2557ad0ac2f156f9583683f7c9d998e212 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 29 Apr 2012 17:34:54 -0700 Subject: improved db error logging --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 100662a8f..aefc694e6 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1326' ); +define ( 'FRIENDICA_VERSION', '2.3.1327' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1140 ); -- cgit v1.2.3 From 0153d86b7f4e2913b1eb985a905f7eb94822b589 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 29 Apr 2012 19:10:07 -0700 Subject: admin page to manage failed updates --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index aefc694e6..733d94b1e 100644 --- a/boot.php +++ b/boot.php @@ -667,7 +667,7 @@ if(! function_exists('check_config')) { // call the specific update $func = 'update_' . $x; - $retval = $func($a); + $retval = $func(); if($retval) { //send the administrator an e-mail $email_tpl = get_intltext_template("update_fail_eml.tpl"); -- cgit v1.2.3 From 0639f645d2333d775ef671806c319f9566afbe7b Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 29 Apr 2012 23:15:12 -0700 Subject: activitystreams schema constants for "join group" --- boot.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 733d94b1e..d9bbfc136 100644 --- a/boot.php +++ b/boot.php @@ -201,6 +201,8 @@ define ( 'ACTIVITY_REQ_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'request-friend' ); define ( 'ACTIVITY_UNFRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'remove-friend' ); define ( 'ACTIVITY_FOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'follow' ); define ( 'ACTIVITY_UNFOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'stop-following' ); +define ( 'ACTIVITY_JOIN', NAMESPACE_ACTIVITY_SCHEMA . 'join' ); + define ( 'ACTIVITY_POST', NAMESPACE_ACTIVITY_SCHEMA . 'post' ); define ( 'ACTIVITY_UPDATE', NAMESPACE_ACTIVITY_SCHEMA . 'update' ); define ( 'ACTIVITY_TAG', NAMESPACE_ACTIVITY_SCHEMA . 'tag' ); @@ -213,6 +215,7 @@ define ( 'ACTIVITY_OBJ_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'photo' ); 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' ); +define ( 'ACTIVITY_OBJ_GROUP', NAMESPACE_ACTIVITY_SCHEMA . 'group' ); define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_DFRN . '/tagterm' ); define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_DFRN . '/profile' ); -- cgit v1.2.3 From 05df5337dd19827b1b6482e4d38db90a614101a3 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 30 Apr 2012 05:15:29 -0700 Subject: start adding tooltips to tab menus --- boot.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'boot.php') diff --git a/boot.php b/boot.php index d9bbfc136..016adfd44 100644 --- a/boot.php +++ b/boot.php @@ -1472,16 +1472,19 @@ if(! function_exists('profile_tabs')){ 'label'=>t('Status'), 'url' => $url, 'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''), + 'title' => t('Status Messages and Posts'), ), array( 'label' => t('Profile'), 'url' => $url.'/?tab=profile', 'sel' => ((isset($tab) && $tab=='profile')?'active':''), + 'title' => t('Profile Details'), ), array( 'label' => t('Photos'), 'url' => $a->get_baseurl() . '/photos/' . $nickname, 'sel' => ((!isset($tab)&&$a->argv[0]=='photos')?'active':''), + 'title' => t('Photo Albums'), ), ); @@ -1490,11 +1493,13 @@ if(! function_exists('profile_tabs')){ 'label' => t('Events'), 'url' => $a->get_baseurl() . '/events', 'sel' =>((!isset($tab)&&$a->argv[0]=='events')?'active':''), + 'title' => t('Events and Calendar'), ); $tabs[] = array( 'label' => t('Personal Notes'), 'url' => $a->get_baseurl() . '/notes', 'sel' =>((!isset($tab)&&$a->argv[0]=='notes')?'active':''), + 'title' => t('Only You Can See This'), ); } -- cgit v1.2.3 From 88c77083e679ad06c58721df6d5766b1492f4c43 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 30 Apr 2012 17:17:19 -0700 Subject: rev update --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 016adfd44..55cac73ac 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1327' ); +define ( 'FRIENDICA_VERSION', '2.3.1328' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1140 ); -- cgit v1.2.3 From d48cd0f9a3210c14bb98a502188358982261d9df Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 30 Apr 2012 23:07:52 -0700 Subject: hidden plugins (add .hidden file to dir) --- boot.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 55cac73ac..44a8d8c32 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_VERSION', '2.3.1328' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1140 ); +define ( 'DB_UPDATE_VERSION', 1141 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -1519,6 +1519,12 @@ function get_my_url() { return false; } +function zrl_init(&$a) { + proc_run('php','include/gprobe.php',bin2hex(get_my_url())); + $arr = array('zrl' => get_my_url(), 'url' => $a->cmd); + call_hooks('zrl_init',$arr); +} + function zrl($s,$force = false) { if(! strlen($s)) return $s; -- cgit v1.2.3 From 584ac68ae4a230c7a61b2720be8bac3de34d68da Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 May 2012 01:16:47 -0700 Subject: adding zrl support to social graphs --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 44a8d8c32..125dda224 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_VERSION', '2.3.1328' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1141 ); +define ( 'DB_UPDATE_VERSION', 1142 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); -- cgit v1.2.3 From 38ccd2e6554bac4f0f1bb927eec7f228f21e74bf Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 May 2012 15:49:22 -0700 Subject: convert html entities to utf-8 before email header encoding --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 125dda224..e1687030d 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1328' ); +define ( 'FRIENDICA_VERSION', '2.3.1329' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1142 ); -- cgit v1.2.3 From dd273283900409da66ecc4e9ae5a188d5c2db605 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 May 2012 23:15:39 -0700 Subject: perform basic validation --- boot.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index e1687030d..ed083d617 100644 --- a/boot.php +++ b/boot.php @@ -1520,9 +1520,12 @@ function get_my_url() { } function zrl_init(&$a) { - proc_run('php','include/gprobe.php',bin2hex(get_my_url())); - $arr = array('zrl' => get_my_url(), 'url' => $a->cmd); - call_hooks('zrl_init',$arr); + $tmp_str = get_my_url(); + if(validate_url($tmp_str)) { + proc_run('php','include/gprobe.php',bin2hex($tmp_str)); + $arr = array('zrl' => $tmp_str, 'url' => $a->cmd); + call_hooks('zrl_init',$arr); + } } function zrl($s,$force = false) { -- cgit v1.2.3 From dc31b93941c2412ad3d61bf7d67d25a3a4153af3 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 2 May 2012 01:45:57 -0700 Subject: provide "service_class" identifier which will let us provide service_class limits such as number of FB friends, etc. --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index ed083d617..f357487b9 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_VERSION', '2.3.1329' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1142 ); +define ( 'DB_UPDATE_VERSION', 1143 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); -- cgit v1.2.3 From 3be9cddfd75c006a1d93bb100942579749806d72 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 2 May 2012 15:26:57 -0700 Subject: rev update --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index f357487b9..ca954a90c 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1329' ); +define ( 'FRIENDICA_VERSION', '2.3.1330' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1143 ); -- cgit v1.2.3 From f3e18df55dc259e70e9acdfd6e851b97ec062f46 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 3 May 2012 16:55:03 -0700 Subject: string update --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index ca954a90c..03d5b0b2c 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1330' ); +define ( 'FRIENDICA_VERSION', '2.3.1331' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1143 ); -- cgit v1.2.3 From 7c6e8b30b28a3656f536ba338c3b124533fdadb7 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 4 May 2012 16:45:10 -0700 Subject: only show remove category to item owner --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 03d5b0b2c..5fb309820 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1331' ); +define ( 'FRIENDICA_VERSION', '2.3.1332' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1143 ); -- cgit v1.2.3 From 49ccefd6c7add622ba84c72769a68d08ef043ef5 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 5 May 2012 17:53:23 -0700 Subject: bad sql left after the mailbox in/out merge --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 5fb309820..4583c7fb0 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1332' ); +define ( 'FRIENDICA_VERSION', '2.3.1333' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1143 ); -- cgit v1.2.3 From 8e46c43ee1307c8c1454e9e8a775343e84e92141 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 6 May 2012 19:52:22 -0700 Subject: rev update --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 4583c7fb0..1c656b3da 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1333' ); +define ( 'FRIENDICA_VERSION', '2.3.1334' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1143 ); -- cgit v1.2.3 From 189a31e6287781e03a874b13e27dedefe2beedf3 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 7 May 2012 15:54:49 -0700 Subject: If a contact has had delivery issues in the last 15 minutes, send new posts straight to the queue and don't even try to connect. Also defer polling for stuck contacts. Should reduce the number of stuck processes trying to connect with dead or dying servers significantly. --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 1c656b3da..15e2d5c06 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1334' ); +define ( 'FRIENDICA_VERSION', '2.3.1335' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1143 ); -- cgit v1.2.3 From 10812e0c19b9a8db3620c40656ba8bb480e04da0 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 8 May 2012 15:33:01 -0700 Subject: make it optional to optimize the item table after expire --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 15e2d5c06..d44d2bddc 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1335' ); +define ( 'FRIENDICA_VERSION', '2.3.1336' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1143 ); -- cgit v1.2.3 From 70a07086ad186e3f0cd978dd3f52e78fb92494cf Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 8 May 2012 22:46:40 -0700 Subject: slight improvement in a couple of queries --- boot.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'boot.php') diff --git a/boot.php b/boot.php index d44d2bddc..e98bfea9d 100644 --- a/boot.php +++ b/boot.php @@ -29,6 +29,12 @@ define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); define ( 'JPEG_QUALITY', 100 ); +/** + * Not yet used + */ + +define ( 'DEFAULT_DB_ENGINE', 'MyISAM' ); + /** * SSL redirection policies */ -- cgit v1.2.3