aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/item.php13
-rw-r--r--mod/network.php138
-rw-r--r--mod/profile.php15
3 files changed, 159 insertions, 7 deletions
diff --git a/mod/item.php b/mod/item.php
index c7b5b4885..3340183b0 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -73,10 +73,12 @@ function item_post(&$a) {
if((x($_SESSION,'visitor_id')) && (intval($_SESSION['visitor_id'])))
$contact_id = $_SESSION['visitor_id'];
else {
- $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
intval($_SESSION['uid']));
- if(count($r))
+ if(count($r)) {
+ $contact_record = $r[0];
$contact_id = $r[0]['id'];
+ }
}
$notify_type = (($parent) ? 'comment-new' : 'wall-new' );
@@ -93,12 +95,15 @@ function item_post(&$a) {
} while($dups == true);
- $r = q("INSERT INTO `item` (`uid`,`type`,`contact-id`,`created`,`edited`,`hash`,`body`,
+ $r = q("INSERT INTO `item` (`uid`,`type`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, `created`,`edited`,`hash`,`body`,
`allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`)
- VALUES( %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
+ VALUES( %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
intval($profile_uid),
"jot",
intval($contact_id),
+ dbesc($contact_record['name']),
+ dbesc($contact_record['url']),
+ dbesc($contact_record['thumb']),
datetime_convert(),
datetime_convert(),
dbesc($hash),
diff --git a/mod/network.php b/mod/network.php
new file mode 100644
index 000000000..0dc743533
--- /dev/null
+++ b/mod/network.php
@@ -0,0 +1,138 @@
+<?php
+
+
+function network_init(&$a) {
+
+}
+
+
+function network_content(&$a) {
+
+ if(! local_user())
+ return;
+
+ require_once("include/bbcode.php");
+
+
+ $contact_id = $a->cid;
+
+
+ $tpl = file_get_contents('view/jot-header.tpl');
+
+ $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+ require_once('view/acl_selectors.php');
+
+ $tpl = file_get_contents("view/jot.tpl");
+
+ $o .= replace_macros($tpl,array(
+ '$baseurl' => $a->get_baseurl(),
+ '$visitor' => 'block',
+ '$lockstate' => 'unlock',
+ '$acl' => populate_acl(),
+ '$profile_uid' => $_SESSION['uid']
+ ));
+
+
+ // TODO
+ // Alter registration and settings
+ // and profile to update contact table when names and photos change.
+ // work on item_display and can_write_wall
+
+ // Add comments.
+
+
+ $sql_extra = '';
+
+
+ $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`.`deleted` = 0
+ AND `contact`.`blocked` = 0
+ $sql_extra ",
+ intval($_SESSION['uid'])
+
+ );
+
+ if(count($r))
+ $a->set_pager_total($r[0]['total']);
+dbg(2);
+
+ $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
+ `contact`.`name`, `contact`.`photo`, `contact`.`url`,
+ `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+ `contact`.`id` AS `cid`, `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 `contact`.`blocked` = 0
+ $sql_extra
+ ORDER BY `parent` DESC, `id` ASC LIMIT %d ,%d ",
+ intval($_SESSION['uid']),
+ intval($a->pager['start']),
+ intval($a->pager['itemspage'])
+
+ );
+
+
+ $cmnt_tpl = file_get_contents('view/comment_item.tpl');
+
+
+ $tpl = file_get_contents('view/wall_item.tpl');
+ $wallwall = file_get_contents('view/wallwall_item.tpl');
+
+ if(count($r)) {
+ foreach($r as $rr) {
+ $comment = '';
+
+ if($rr['last-child']) {
+ $comment = replace_macros($cmnt_tpl,array(
+ '$id' => $rr['item_id'],
+ '$parent' => $rr['parent'],
+ '$profile_uid' => $_SESSION['uid']
+ ));
+ }
+
+ $item = $rr;
+ $template = $tpl;
+
+ $profile_url = $item['url'];
+
+ if(($item['contact-uid'] == $_SESSION['uid']) && (strlen($item['dfrn-id'])) && (! $item['self'] ))
+ $profile_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+
+ $photo = $item['photo'];
+ $thumb = $item['thumb'];
+
+ $profile_name = ((strlen($item['remote-name'])) ? $item['remote-name'] : $item['name']);
+ $profile_link = ((strlen($item['remote-link'])) ? $item['remote-link'] : $profile_url);
+ $profile_avatar = ((strlen($item['remote-avatar'])) ? $item['remote-avatar'] : $thumb);
+
+ if(($item['parent'] == $item['item_id']) && (! $item['self'])) {
+ $template = $wallwall; // FIXME also if remote owner
+ $owner_url = $a->contact['url'];
+ $owner_photo = $a->contact['thumb'];
+ $owner_name = $a->contact['name'];
+ }
+
+ $o .= replace_macros($template,array(
+ '$id' => $item['item_id'],
+ '$profile_url' => $profile_link,
+ '$name' => $profile_name,
+ '$thumb' => $profile_avatar,
+ '$body' => bbcode($item['body']),
+ '$ago' => relative_date($item['created']),
+ '$indent' => (($item['parent'] != $item['item_id']) ? 'comment-' : ''),
+ '$owner_url' => $owner_url,
+ '$owner_photo' => $owner_photo,
+ '$owner_name' => $owner_name,
+ '$comment' => $comment
+ ));
+
+ }
+ }
+
+ $o .= paginate($a);
+
+ return $o;
+
+
+} \ No newline at end of file
diff --git a/mod/profile.php b/mod/profile.php
index 6bd265562..76ebe7d84 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -79,12 +79,21 @@ function item_display(&$a, $item,$template,$comment) {
$photo = (($item['self']) ? $a->profile['photo'] : $item['photo']);
$thumb = (($item['self']) ? $a->profile['thumb'] : $item['thumb']);
+
+ $profile_name = ((strlen($item['remote-name'])) ? $item['remote-name'] : $item['name']);
+ $profile_link = ((strlen($item['remote-link'])) ? $item['remote-link'] : $profile_url);
+ $profile_avatar = ((strlen($item['remote-avatar'])) ? $item['remote-avatar'] : $thumb);
+
+// if(! $item['owner-link']) {
+// $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1".
+
+
$o .= replace_macros($template,array(
'$id' => $item['item_id'],
- '$profile_url' => ((strlen($item['remote-link'])) ? $item['remote-link'] : $profile_url),
- '$name' => ((strlen($item['remote-name'])) ? $item['remote-name'] : $item['name']),
- '$thumb' => ((strlen($item['remote-avatar'])) ? $item['remote-avatar'] : $thumb),
+ '$profile_url' => $profile_link,
+ '$name' => $profile_name,
+ '$thumb' => $profile_avatar,
'$body' => bbcode($item['body']),
'$ago' => relative_date($item['created']),
'$indent' => (($item['parent'] != $item['item_id']) ? 'comment-' : ''),
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 20:35:43 +0000