diff options
| author | Mike Macgirvin <mike@macgirvin.com> | 2010-07-19 05:24:22 -0700 |
|---|---|---|
| committer | Mike Macgirvin <mike@macgirvin.com> | 2010-07-19 05:24:22 -0700 |
| commit | bbe53699f26bfa4e4d17da097fd8f2fc14da47dd (patch) | |
| tree | 70888d850bc8f839532b087584eb41f0a9bbf0a8 /include | |
| parent | 9b0584e59338f0b75c6b8a9a1b5def33da5de5f6 (diff) | |
| download | volse-hubzilla-bbe53699f26bfa4e4d17da097fd8f2fc14da47dd.tar.gz volse-hubzilla-bbe53699f26bfa4e4d17da097fd8f2fc14da47dd.tar.bz2 volse-hubzilla-bbe53699f26bfa4e4d17da097fd8f2fc14da47dd.zip | |
bug fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/auth.php | 8 | ||||
| -rw-r--r-- | include/notifier.php | 8 | ||||
| -rw-r--r-- | include/poller.php | 4 |
3 files changed, 14 insertions, 6 deletions
diff --git a/include/auth.php b/include/auth.php index ef5c6f0b4..bbbe8eb0d 100644 --- a/include/auth.php +++ b/include/auth.php @@ -23,12 +23,20 @@ if((x($_SESSION,'authenticated')) && (! ($_POST['auth-params'] == 'login'))) { if(strlen($a->user['timezone'])) date_default_timezone_set($a->user['timezone']); + if(x($a->user,'nickname')) + $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname']; + else + $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['uid']; + + + $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1", intval($_SESSION['uid'])); if(count($r)) { $a->contact = $r[0]; $a->cid = $r[0]['id']; $_SESSION['cid'] = $a->cid; + } } } diff --git a/include/notifier.php b/include/notifier.php index 76694f4ae..b8eef3971 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -15,8 +15,8 @@ require_once("datetime.php"); if($argc < 3) exit; - - $baseurl = $argv[1]); +dbg(3); + $baseurl = $argv[1]; $a->set_baseurl($argv[1]); $cmd = $argv[2]; @@ -224,7 +224,7 @@ if($argc < 3) $url = $rr['notify'] . '?dfrn_id=' . $rr['dfrn-id']; $xml = fetch_url($url); - +echo $xml; if(! $xml) continue; @@ -246,7 +246,7 @@ if($argc < 3) $postvars['data'] = $atom_nowrite; $xml = post_url($rr['notify'],$postvars); - +echo $xml; } killme(); diff --git a/include/poller.php b/include/poller.php index 08028cdee..ab030a709 100644 --- a/include/poller.php +++ b/include/poller.php @@ -118,7 +118,7 @@ echo "Length:" . strlen($xml) . "\r\n"; $datarray = get_atom_elements($item); $datarray['parent-uri'] = $parent_uri; $datarray['uid'] = $importer['uid']; - $datarray['contact-id'] = $importer['id']; + $datarray['contact-id'] = $contact['id']; $r = post_remote($a,$datarray); continue; } @@ -146,7 +146,7 @@ echo "Length:" . strlen($xml) . "\r\n"; $datarray = get_atom_elements($item); $datarray['parent-uri'] = $item_id; $datarray['uid'] = $importer['uid']; - $datarray['contact-id'] = $importer['id']; + $datarray['contact-id'] = $contact['id']; $r = post_remote($a,$datarray); continue; |