From 9b3131861f8ab6485791c667e4d514a53a34bb80 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 3 Feb 2011 17:20:40 +0100 Subject: [PATCH 1/9] Extend lockview to show info on items, photos and events --- mod/lockview.php | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/mod/lockview.php b/mod/lockview.php index a886effeb..a99628b6e 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -2,12 +2,23 @@ function lockview_content(&$a) { - - $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); + + $type = (($a->argc > 1) ? $a->argv[1] : 0); + if (is_numeric($type)) { + $item_id = intval($type); + $type='item'; + } else { + $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0); + } + if(! $item_id) killme(); - $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", + if (!in_array($type, array('item','photo','event'))) + killme(); + + $r = q("SELECT * FROM `%s` WHERE `id` = %d LIMIT 1", + dbesc($type), intval($item_id) ); if(! count($r)) @@ -37,6 +48,7 @@ function lockview_content(&$a) { dbesc(implode(', ', $allowed_groups)) ); if(count($r)) + if($item['uid'] != local_user()) foreach($r as $rr) $l[] = '' . $rr['name'] . ''; } @@ -68,7 +80,11 @@ function lockview_content(&$a) { } - echo $o . implode(', ', $l); + if (count($l)>0) { + echo $o . implode(', ', $l); + } else { + echo $o . t('nobody'); + } killme(); } From bed0391e6fb058c9f1165e40cdac552f2819808b Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 3 Feb 2011 17:24:58 +0100 Subject: [PATCH 2/9] Show lock info on photos --- mod/photos.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mod/photos.php b/mod/photos.php index 82060378e..c80a82e66 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -907,7 +907,15 @@ function photos_content(&$a) { $o .= '

' . '' . $ph[0]['album'] . '

'; if($can_post && ($ph[0]['uid'] == $owner_uid)) { - $o .= ''; + $o .= ''; } From c15c550a065add37cde0096dd495dd6c2731eb1b Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 3 Feb 2011 17:25:10 +0100 Subject: [PATCH 3/9] Fix tabs --- mod/lockview.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/mod/lockview.php b/mod/lockview.php index a99628b6e..93baede9d 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -4,21 +4,21 @@ function lockview_content(&$a) { $type = (($a->argc > 1) ? $a->argv[1] : 0); - if (is_numeric($type)) { - $item_id = intval($type); - $type='item'; - } else { - $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0); - } + if (is_numeric($type)) { + $item_id = intval($type); + $type='item'; + } else { + $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0); + } if(! $item_id) killme(); - if (!in_array($type, array('item','photo','event'))) - killme(); + if (!in_array($type, array('item','photo','event'))) + killme(); $r = q("SELECT * FROM `%s` WHERE `id` = %d LIMIT 1", - dbesc($type), + dbesc($type), intval($item_id) ); if(! count($r)) @@ -80,11 +80,11 @@ function lockview_content(&$a) { } - if (count($l)>0) { - echo $o . implode(', ', $l); - } else { - echo $o . t('nobody'); - } + if (count($l)>0) { + echo $o . implode(', ', $l); + } else { + echo $o . t('nobody'); + } killme(); } From b5c3fb1545b67b2cce501e916483606300fe82a9 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Thu, 3 Feb 2011 19:42:32 +0100 Subject: [PATCH 4/9] remove an erroneously pasted line --- mod/lockview.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mod/lockview.php b/mod/lockview.php index 93baede9d..9e64e2608 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -48,7 +48,6 @@ function lockview_content(&$a) { dbesc(implode(', ', $allowed_groups)) ); if(count($r)) - if($item['uid'] != local_user()) foreach($r as $rr) $l[] = '' . $rr['name'] . ''; } @@ -80,11 +79,7 @@ function lockview_content(&$a) { } - if (count($l)>0) { - echo $o . implode(', ', $l); - } else { - echo $o . t('nobody'); - } + echo $o . implode(', ', $l); killme(); } From 9cf04b61106d27f1f641dda39de737386f7b8c99 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Fri, 4 Feb 2011 07:36:57 +0100 Subject: [PATCH 5/9] small fix to IT strings --- view/it/strings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/it/strings.php b/view/it/strings.php index 6ae9285ad..2c429cc8a 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -270,7 +270,7 @@ $a->strings['Edit photo'] = 'Modifica foto'; $a->strings['View Full Size'] = 'Vedi dimensione intera'; $a->strings['Tags: '] = 'Tag: '; $a->strings['[Remove any tag]'] = '[Rimuovi tutti i tag]'; -$a->strings['New album name'] = 'Nome nuovo album'; +$a->strings['New album name'] = 'Nuovo nome album'; $a->strings['Caption'] = 'Didascalia'; $a->strings['Add a Tag'] = 'Aggiungi un tag'; $a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'] = 'Esempio: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'; From ebbdb7b301d8ab5a1eb249a68888d1dd772a06c3 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Fri, 4 Feb 2011 10:32:29 +0100 Subject: [PATCH 6/9] Upload profile photo page it title --- view/it/profile_photo.tpl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/view/it/profile_photo.tpl b/view/it/profile_photo.tpl index d941743d4..4d77e87cf 100644 --- a/view/it/profile_photo.tpl +++ b/view/it/profile_photo.tpl @@ -1,4 +1,4 @@ -

Upload Profile Photo

+

Carica foto del profilo

@@ -12,3 +12,7 @@
+ + \ No newline at end of file From 2a9bfae2b7341ebe4d420c627867160c7e1427d9 Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 4 Feb 2011 04:25:53 -0800 Subject: [PATCH 7/9] prevent runaway notifications when parent=0 due to race condition --- include/items.php | 14 ++++---- include/notifier.php | 43 +++++++++++++++--------- mod/dfrn_notify.php | 80 +++++++++++++++++++++++--------------------- 3 files changed, 78 insertions(+), 59 deletions(-) diff --git a/include/items.php b/include/items.php index 45d8b62c0..0c9d4cfc2 100644 --- a/include/items.php +++ b/include/items.php @@ -688,11 +688,12 @@ function item_store($arr,$force_parent = false) { $arr['parent-uri'] = $r[0]['parent-uri']; } - $parent_id = $r[0]['id']; - $allow_cid = $r[0]['allow_cid']; - $allow_gid = $r[0]['allow_gid']; - $deny_cid = $r[0]['deny_cid']; - $deny_gid = $r[0]['deny_gid']; + $parent_id = $r[0]['id']; + $parent_deleted = $r[0]['deleted']; + $allow_cid = $r[0]['allow_cid']; + $allow_gid = $r[0]['allow_gid']; + $deny_cid = $r[0]['deny_cid']; + $deny_gid = $r[0]['deny_gid']; } else { @@ -750,13 +751,14 @@ function item_store($arr,$force_parent = false) { // Set parent id - and also make sure to inherit the parent's ACL's. $r = q("UPDATE `item` SET `parent` = %d, `allow_cid` = '%s', `allow_gid` = '%s', - `deny_cid` = '%s', `deny_gid` = '%s', `private` = %d WHERE `id` = %d LIMIT 1", + `deny_cid` = '%s', `deny_gid` = '%s', `private` = %d, `deleted` = $d WHERE `id` = %d LIMIT 1", intval($parent_id), dbesc($allow_cid), dbesc($allow_gid), dbesc($deny_cid), dbesc($deny_gid), intval($private), + intval($parent_deleted), intval($current_post) ); diff --git a/include/notifier.php b/include/notifier.php index 8442349cf..a71da853d 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -2,18 +2,18 @@ require_once("boot.php"); function notifier_run($argv, $argc){ - global $a, $db; + global $a, $db; - if(is_null($a)){ - $a = new App; - } + if(is_null($a)){ + $a = new App; + } - if(is_null($db)){ - @include(".htconfig.php"); - require_once("dba.php"); - $db = new dba($db_host, $db_user, $db_pass, $db_data); - unset($db_host, $db_user, $db_pass, $db_data); - }; + if(is_null($db)) { + @include(".htconfig.php"); + require_once("dba.php"); + $db = new dba($db_host, $db_user, $db_pass, $db_data); + unset($db_host, $db_user, $db_pass, $db_data); + } require_once("session.php"); require_once("datetime.php"); @@ -62,11 +62,12 @@ function notifier_run($argv, $argc){ $r = q("SELECT `parent`, `uid`, `edited` FROM `item` WHERE `id` = %d LIMIT 1", intval($item_id) ); - if(! count($r)){ + + if((! count($r)) || (! intval($r[0]['parent']))) { return; } - - $parent_id = $r[0]['parent']; + + $parent_id = intval($r[0]['parent']); $uid = $r[0]['uid']; $updated = $r[0]['edited']; @@ -77,6 +78,13 @@ function notifier_run($argv, $argc){ if(! count($items)){ return; } + + // avoid race condition with deleting entries + + if($items[0]['deleted']) { + foreach($items as $item) + $item['deleted'] = 1; + } $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags` @@ -122,8 +130,8 @@ function notifier_run($argv, $argc){ $allow_people = expand_acl($parent['allow_cid']); $allow_groups = expand_groups(expand_acl($parent['allow_gid'])); - $deny_people = expand_acl($parent['deny_cid']); - $deny_groups = expand_groups(expand_acl($parent['deny_gid'])); + $deny_people = expand_acl($parent['deny_cid']); + $deny_groups = expand_groups(expand_acl($parent['deny_gid'])); $conversants = array(); @@ -220,6 +228,8 @@ function notifier_run($argv, $argc){ else { if($followup) { foreach($items as $item) { // there is only one item + if(! $item['parent']) + continue; if($item['id'] == $item_id) { logger('notifier: followup: item: ' . print_r($item,true), LOGGER_DATA); $slap = atom_entry($item,'html',$owner,$owner,false); @@ -229,6 +239,9 @@ function notifier_run($argv, $argc){ } else { foreach($items as $item) { + if(! $item['parent']) + continue; + $contact = get_item_contact($item,$contacts); if(! $contact) continue; diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 7f023ef22..142d13284 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -289,54 +289,58 @@ function dfrn_notify_post(&$a) { $datarray['last-child'] = 0; } $posted_id = item_store($datarray); + $parent = 0; if($posted_id) { + $r = q("SELECT `parent` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", + intval($posted_id), + intval($importer['importer_uid']) + ); + if(count($r)) + $parent = $r[0]['parent']; + if(! $is_like) { - $r = q("SELECT `parent` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($posted_id), - intval($importer['importer_uid']) + $r1 = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d", + dbesc(datetime_convert()), + intval($importer['importer_uid']), + intval($r[0]['parent']) ); - if(count($r)) { - $r1 = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d", - dbesc(datetime_convert()), - intval($importer['importer_uid']), - intval($r[0]['parent']) - ); - } + $r2 = q("UPDATE `item` SET `last-child` = 1, `changed` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1", - dbesc(datetime_convert()), - intval($importer['importer_uid']), - intval($posted_id) + dbesc(datetime_convert()), + intval($importer['importer_uid']), + intval($posted_id) ); } - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); + if($posted_id && $parent) { + + $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"comment-import\" \"$posted_id\" &", array(),$foo)); - proc_run($php_path,"include/notifier.php","comment-import","$posted_id"); + proc_run($php_path,"include/notifier.php","comment-import","$posted_id"); - if((! $is_like) && ($importer['notify-flags'] & NOTIFY_COMMENT) && (! $importer['self'])) { - require_once('bbcode.php'); - $from = stripslashes($datarray['author-name']); - $tpl = load_view_file('view/cmnt_received_eml.tpl'); - $email_tpl = replace_macros($tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $importer['username'], - '$email' => $importer['email'], - '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id, - '$from' => $from, - '$body' => strip_tags(bbcode(stripslashes($datarray['body']))) - )); - - $res = mail($importer['email'], $from . t(' commented on an item at ') . $a->config['sitename'], - $email_tpl, "From: " . t('Administrator') . '@' . $a->get_hostname() ); + if((! $is_like) && ($importer['notify-flags'] & NOTIFY_COMMENT) && (! $importer['self'])) { + require_once('bbcode.php'); + $from = stripslashes($datarray['author-name']); + $tpl = load_view_file('view/cmnt_received_eml.tpl'); + $email_tpl = replace_macros($tpl, array( + '$sitename' => $a->config['sitename'], + '$siteurl' => $a->get_baseurl(), + '$username' => $importer['username'], + '$email' => $importer['email'], + '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id, + '$from' => $from, + '$body' => strip_tags(bbcode(stripslashes($datarray['body']))) + )); + + $res = mail($importer['email'], $from . t(' commented on an item at ') . $a->config['sitename'], + $email_tpl, "From: " . t('Administrator') . '@' . $a->get_hostname() ); + } } + + xml_status(0); + // NOTREACHED } - - xml_status(0); - // NOTREACHED - } else { // regular comment that is part of this total conversation. Have we seen it? If not, import it. @@ -375,13 +379,13 @@ function dfrn_notify_post(&$a) { if(($datarray['type'] != 'activity') && ($importer['notify-flags'] & NOTIFY_COMMENT)) { - $myconv = q("SELECT `author-link` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d", + $myconv = q("SELECT `author-link` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ", dbesc($parent_uri), intval($importer['importer_uid']) ); if(count($myconv)) { foreach($myconv as $conv) { - if($conv['author-link'] != $importer['url']) + if(! link_compare($conv['author-link'],$importer['url'])) continue; require_once('bbcode.php'); $from = stripslashes($datarray['author-name']); From 1d0d765344e155086a65b8b56c1c0ec70d9a8a15 Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 4 Feb 2011 13:37:04 -0800 Subject: [PATCH 8/9] more error checking on posts --- include/items.php | 6 +++--- mod/item.php | 30 ++++++++++++++++++++---------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/include/items.php b/include/items.php index 0c9d4cfc2..bbd9fbb7c 100644 --- a/include/items.php +++ b/include/items.php @@ -740,10 +740,10 @@ function item_store($arr,$force_parent = false) { return 0; } - if($arr['parent-uri'] === $arr['uri']) + if((! $parent_id) || ($arr['parent-uri'] === $arr['uri'])) $parent_id = $current_post; - - if(strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid)) + + if(strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid)) $private = 1; else $private = $arr['private']; diff --git a/mod/item.php b/mod/item.php index 7125ae1f4..38ef580af 100644 --- a/mod/item.php +++ b/mod/item.php @@ -1,11 +1,17 @@ get_baseurl() . "/" . $_POST['return'] ); + // NOTREACHED + } $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); @@ -454,10 +466,8 @@ function item_post(&$a) { } } - - goaway($a->get_baseurl() . "/" . $_POST['return'] ); - return; // NOTREACHED + // NOTREACHED } @@ -551,7 +561,7 @@ function item_content(&$a) { proc_run($php_path,"include/notifier.php","drop","$drop_id"); goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); - return; //NOTREACHED + //NOTREACHED } else { notice( t('Permission denied.') . EOL); From 8cced061bba8d5ef18e2fa5ead0edcdc90d06e73 Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 4 Feb 2011 13:40:51 -0800 Subject: [PATCH 9/9] found it - typo --- include/items.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index bbd9fbb7c..359378ff7 100644 --- a/include/items.php +++ b/include/items.php @@ -751,7 +751,7 @@ function item_store($arr,$force_parent = false) { // Set parent id - and also make sure to inherit the parent's ACL's. $r = q("UPDATE `item` SET `parent` = %d, `allow_cid` = '%s', `allow_gid` = '%s', - `deny_cid` = '%s', `deny_gid` = '%s', `private` = %d, `deleted` = $d WHERE `id` = %d LIMIT 1", + `deny_cid` = '%s', `deny_gid` = '%s', `private` = %d, `deleted` = %d WHERE `id` = %d LIMIT 1", intval($parent_id), dbesc($allow_cid), dbesc($allow_gid),