ability to only expire contacts, not self

diff --git a/include/items.php b/include/items.php
index 4b79003f6a26af75c51478308da1c2aa86025eb2..3fe977b6f77fb9230ef6a42c5dbda0866ca0b347 100644 (file)
--- 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 64cc17a653bca4f1ff1cd726a5bc8458303f9437..703c898e6e36dce0f3b82276f755a7177ab4050a 100644 (file)
--- 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 5d85b0c2c6c2078c11947da2956cb0467f63877a..b5214e917b3027d54ee7fd834e9621d6fc17ca01 100644 (file)
--- 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 556cd3ba373c127512f6acc5d5825394ef559699..d61af072f70bca195cb70b556226086336851233 100644 (file)
--- 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>