aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-05-29 01:14:53 -0700
committerfriendica <info@friendica.com>2012-05-29 01:14:53 -0700
commit2eafa9a47519f9f35c5eb568cf4235c092c1dcce (patch)
treeb0b1656b9b7c46f003e6910933d0f86b7a1fb6e3
parent0241bd1fbf28e15daeb939bc14976cd2fd6d3251 (diff)
downloadvolse-hubzilla-2eafa9a47519f9f35c5eb568cf4235c092c1dcce.tar.gz
volse-hubzilla-2eafa9a47519f9f35c5eb568cf4235c092c1dcce.tar.bz2
volse-hubzilla-2eafa9a47519f9f35c5eb568cf4235c092c1dcce.zip
ability to only expire contacts, not self
-rw-r--r--include/items.php2
-rw-r--r--mod/notes.php4
-rw-r--r--mod/settings.php8
-rw-r--r--view/settings.tpl1
4 files changed, 10 insertions, 5 deletions
diff --git a/include/items.php b/include/items.php
index 4b79003f6..3fe977b6f 100644
--- a/include/items.php
+++ b/include/items.php
@@ -3082,7 +3082,7 @@ function item_expire($uid,$days) {
// $expire_network_only = save your own wall posts
// and just expire conversations started by others
- $expire_network_only = get_pconfig($uid,'expire','expire_network_only');
+ $expire_network_only = get_pconfig($uid,'expire','network_only');
$sql_extra = ((intval($expire_network_only)) ? " AND wall = 0 " : "");
$r = q("SELECT * FROM `item`
diff --git a/mod/notes.php b/mod/notes.php
index 64cc17a65..703c898e6 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -81,7 +81,7 @@ function notes_content(&$a,$update = false) {
$r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0
- AND `item`.`deleted` = 0 AND `item`.`origin` = 1
+ AND `item`.`deleted` = 0 AND `item`.`type` = 'note'
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
$sql_extra ",
@@ -97,7 +97,7 @@ function notes_content(&$a,$update = false) {
$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact-uid`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
- and `item`.`moderated` = 0 AND `item`.`origin` = 1
+ and `item`.`moderated` = 0 AND `item`.`type` = 'note'
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
$sql_extra
diff --git a/mod/settings.php b/mod/settings.php
index 5d85b0c2c..b5214e917 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -339,8 +339,7 @@ function settings_post(&$a) {
$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);
-
-
+ $expire_network_only = ((x($_POST,'expire_network_only'))? intval($_POST['expire_network_only']) : 0);
$allow_location = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
$publish = (((x($_POST,'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
@@ -436,6 +435,7 @@ function settings_post(&$a) {
set_pconfig(local_user(),'expire','notes', $expire_notes);
set_pconfig(local_user(),'expire','starred', $expire_starred);
set_pconfig(local_user(),'expire','photos', $expire_photos);
+ set_pconfig(local_user(),'expire','network_only', $expire_network_only);
set_pconfig(local_user(),'system','suggestme', $suggestme);
set_pconfig(local_user(),'system','post_newfriend', $post_newfriend);
@@ -813,6 +813,9 @@ function settings_content(&$a) {
$expire_photos = get_pconfig(local_user(), 'expire','photos');
$expire_photos = (($expire_photos===false)? '0' : $expire_photos); // default if not set: 0
+ $expire_network_only = get_pconfig(local_user(), 'expire','network_only');
+ $expire_network_only = (($expire_network_only===false)? '0' : $expire_network_only); // default if not set: 0
+
$suggestme = get_pconfig(local_user(), 'system','suggestme');
$suggestme = (($suggestme===false)? '0': $suggestme); // default if not set: 0
@@ -955,6 +958,7 @@ function settings_content(&$a) {
'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'))),
+ 'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', array(t('No'),t('Yes'))),
);
require_once('include/group.php');
diff --git a/view/settings.tpl b/view/settings.tpl
index 556cd3ba3..d61af072f 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -70,6 +70,7 @@ $unkmail
{{ 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}}
+ {{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
</div>
</div>