diff --git a/boot.php b/boot.php index 773422637..6050e6b05 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDIKA_PLATFORM', 'Friendica'); -define ( 'FRIENDIKA_VERSION', '2.3.1170' ); +define ( 'FRIENDIKA_VERSION', '2.3.1172' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1105 ); diff --git a/doc/Pages.md b/doc/Pages.md index bce45bac8..037e7c438 100644 --- a/doc/Pages.md +++ b/doc/Pages.md @@ -25,4 +25,10 @@ The "Automatic Friend Account" is typically used for personal profile pages wher We recommend that you create group pages with the same email address and password as your normal account. If you do this, you will find a new "Manage" tab on the menu bar which lets you toggle identities easily and manage your pages. You are not required to do this, but the alternative is to logout and log back into the other account to manage alternate pages - and this could get cumbersome if you manage several different pages/identities. +**Posting to Community Pages** +If you are a member of a community page/forum, you may post to the page by including an @-tag in the post mentioning the forum. For example @bicycle would send my post to all members of the group "bicycle" in addition to the normal recipients. If your post is private you must also explicitly include the group in the post permissions (to allow the forum "contact" to see the post) **and** mention it in a tag (which redistributes the post to the forum members). + +You may also post to a community page/forum by posting a "wall-to-wall" post using secure cross-site authentication. + +Comments which are relayed to community pages will be relayed back to the original post creator. Mentioning the forum/group with an @-tag in a comment does not relay the message, as distribution is controlled entirely by the original post creator. \ No newline at end of file diff --git a/include/items.php b/include/items.php index fd36dcadb..5ccf76b25 100644 --- a/include/items.php +++ b/include/items.php @@ -2820,11 +2820,14 @@ function item_expire($uid,$days) { $expire_notes = get_pconfig($uid, 'expire','notes'); $expire_notes = (($expire_notes===false)?1:intval($expire_notes)); // default if not set: 1 + + $expire_starred = get_pconfig($uid, 'expire','starred'); + $expire_starred = (($expire_starred===false)?1:intval($expire_starred)); // default if not set: 1 $expire_photos = get_pconfig($uid, 'expire','photos'); $expire_photos = (($expire_photos===false)?0:intval($expire_photos)); // default if not set: 0 - logger('expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire photos: $expire_photos"); + logger('expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos"); foreach($r as $item) { @@ -2832,6 +2835,8 @@ function item_expire($uid,$days) { if($expire_photos==0 && strlen($item['resource-id'])) continue; + if($expire_starred==0 && intval($item['starred'])) + continue; if($expire_notes==0 && $item['type']=='note') continue; if($expire_items==0 && $item['type']!='note') diff --git a/mod/settings.php b/mod/settings.php index f51a484c8..163588f4a 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -219,6 +219,7 @@ function settings_post(&$a) { $expire_items = ((x($_POST,'expire_items')) ? intval($_POST['expire_items']) : 0); $expire_notes = ((x($_POST,'expire_notes')) ? intval($_POST['expire_notes']) : 0); + $expire_starred = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0); $expire_photos = ((x($_POST,'expire_photos'))? intval($_POST['expire_photos']) : 0); @@ -305,6 +306,7 @@ function settings_post(&$a) { set_pconfig(local_user(),'expire','items', $expire_items); set_pconfig(local_user(),'expire','notes', $expire_notes); + set_pconfig(local_user(),'expire','starred', $expire_starred); set_pconfig(local_user(),'expire','photos', $expire_photos); $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `blockwall` = %d, `hidewall` = %d, `blocktags` = %d WHERE `uid` = %d LIMIT 1", @@ -601,6 +603,9 @@ function settings_content(&$a) { $expire_notes = get_pconfig(local_user(), 'expire','notes'); $expire_notes = (($expire_notes===false)?1:$expire_notes); // default if not set: 1 + + $expire_starred = get_pconfig(local_user(), 'expire','starred'); + $expire_starred = (($expire_starred===false)?1:$expire_starred); // default if not set: 1 $expire_photos = get_pconfig(local_user(), 'expire','photos'); $expire_photos = (($expire_photos===false)?0:$expire_photos); // default if not set: 0 @@ -719,9 +724,11 @@ function settings_content(&$a) { $expire_arr = array( 'days' => array('expire', t("Automatically expire posts after days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')), - 'advanced' => t('Advanced expire settings'), + 'advanced' => t('Advanced expiration settings'), + 'label' => t('Advanced Expiration'), 'items' => array('expire_items', t("Expire posts:"), $expire_items, '', array(t('No'),t('Yes'))), 'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'),t('Yes'))), + 'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'),t('Yes'))), 'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'),t('Yes'))), ); diff --git a/view/en/cmnt_received_html_body_eml.tpl b/view/en/cmnt_received_html_body_eml.tpl index 5fdc5513f..95f56a4d5 100644 --- a/view/en/cmnt_received_html_body_eml.tpl +++ b/view/en/cmnt_received_html_body_eml.tpl @@ -1,13 +1,13 @@ - Friendika Message + Friendica Message - + diff --git a/view/en/mail_received_html_body_eml.tpl b/view/en/mail_received_html_body_eml.tpl index 622baf6c8..23d9ac4c2 100644 --- a/view/en/mail_received_html_body_eml.tpl +++ b/view/en/mail_received_html_body_eml.tpl @@ -1,13 +1,13 @@ - Friendika Message + Friendica Message
Friendika
Friendica
$from commented on an item/conversation which you have been following.
- + @@ -23,4 +23,4 @@
Friendika
Friendica
$from sent you a new private message at $siteName.
- \ No newline at end of file + diff --git a/view/en/wall_received_html_body_eml.tpl b/view/en/wall_received_html_body_eml.tpl index c955a88a6..91ef61e29 100644 --- a/view/en/wall_received_html_body_eml.tpl +++ b/view/en/wall_received_html_body_eml.tpl @@ -1,13 +1,13 @@ - Friendika Message + Friendica Message - + @@ -21,4 +21,4 @@
Friendika
Friendica
$from posted something to your profile wall.
- \ No newline at end of file + diff --git a/view/settings.tpl b/view/settings.tpl index cd9d53963..1a8d73828 100644 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -57,12 +57,13 @@ $blocktags {{inc field_input.tpl with $field=$expire.days }}{{endinc}}
- Advanced + $expire.label

$expire.advanced

{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}} {{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}} + {{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
diff --git a/view/theme/duepuntozero/conversation.tpl b/view/theme/duepuntozero/conversation.tpl new file mode 100644 index 000000000..1a0fb33a8 --- /dev/null +++ b/view/theme/duepuntozero/conversation.tpl @@ -0,0 +1,13 @@ +{{ for $threads as $thread }} +
+ $thread +
+{{ endfor }} + +{{ if $dropping }} + +
+{{ endif }} diff --git a/view/theme/loozah/conversation.tpl b/view/theme/loozah/conversation.tpl new file mode 100644 index 000000000..1a0fb33a8 --- /dev/null +++ b/view/theme/loozah/conversation.tpl @@ -0,0 +1,13 @@ +{{ for $threads as $thread }} +
+ $thread +
+{{ endfor }} + +{{ if $dropping }} + +
+{{ endif }} diff --git a/view/theme/testbubble/conversation.tpl b/view/theme/testbubble/conversation.tpl new file mode 100644 index 000000000..1a0fb33a8 --- /dev/null +++ b/view/theme/testbubble/conversation.tpl @@ -0,0 +1,13 @@ +{{ for $threads as $thread }} +
+ $thread +
+{{ endfor }} + +{{ if $dropping }} + +
+{{ endif }}