aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/auth.php8
-rw-r--r--include/notifier.php8
-rw-r--r--include/poller.php4
-rw-r--r--mod/contacts.php12
-rw-r--r--mod/dfrn_request.php7
-rw-r--r--mod/home.php2
-rw-r--r--mod/item.php4
-rw-r--r--mod/login.php3
-rw-r--r--view/profile.php2
-rw-r--r--view/profile_tabs.tpl5
10 files changed, 29 insertions, 26 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;
diff --git a/mod/contacts.php b/mod/contacts.php
index 999617aa1..585ac1423 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -184,7 +184,7 @@ function contacts_content(&$a) {
return $o;
}
-
+dbg(2);
if(($a->argc == 2) && ($a->argv[1] == 'all'))
$sql_extra = '';
else
@@ -198,21 +198,21 @@ function contacts_content(&$a) {
switch($sort_type) {
case DIRECTION_BOTH :
- $sql_extra = " AND `dfrn-id` != '' AND `issued-id` != '' ";
+ $sql_extra2 = " AND `dfrn-id` != '' AND `issued-id` != '' ";
break;
case DIRECTION_IN :
- $sql_extra = " AND `dfrn-id` = '' AND `issued-id` != '' ";
+ $sql_extra2 = " AND `dfrn-id` = '' AND `issued-id` != '' ";
break;
case DIRECTION_OUT :
- $sql_extra = " AND `dfrn-id` != '' AND `issued-id` = '' ";
+ $sql_extra2 = " AND `dfrn-id` != '' AND `issued-id` = '' ";
break;
case DIRECTION_ANY :
default:
- $sql_extra = '';
+ $sql_extra2 = '';
break;
}
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d $sql_extra",
+ $r = q("SELECT * FROM `contact` WHERE `uid` = %d $sql_extra $sql_extra2 ",
intval($_SESSION['uid']));
if(count($r)) {
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 7fb55c4bf..b0c7b36aa 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -39,7 +39,6 @@ function dfrn_request_post(&$a) {
// to confirm the request. We've done so and clicked submit,
// which brings us here.
-
$dfrn_url = notags(trim($_POST['dfrn_url']));
$aes_allow = (((x($_POST,'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0);
$confirm_key = ((x($_POST,'confirm_key')) ? $_POST['confirm_key'] : "");
@@ -48,7 +47,7 @@ function dfrn_request_post(&$a) {
if(x($dfrn_url)) {
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `dfrn-url` = '%s' LIMIT 1",
+ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
intval($_SESSION['uid']),
dbesc($dfrn_url)
);
@@ -88,7 +87,7 @@ function dfrn_request_post(&$a) {
if($invalid) {
notice( $invalid . ' required DFRN parameter'
. (($invalid == 1) ? " was " : "s were " )
- . "not found at the given URL" . EOL );
+ . "not found at the given URL" . EOL . print_r($parms,true)) ;
return;
}
}
@@ -220,7 +219,7 @@ function dfrn_request_post(&$a) {
if($invalid) {
notice( $invalid . ' required DFRN parameter'
. (($invalid == 1) ? " was " : "s were " )
- . "not found at the given URL" . EOL) ;
+ . "not found at the given URL" . EOL . print_r($parms,true)) ;
return;
}
diff --git a/mod/home.php b/mod/home.php
index d796052ad..07087bb2c 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -19,7 +19,7 @@ function home_content(&$a) {
$a->page['footer'] .= "<div class=\"powered\" >Powered by <a href=\"http://dfrn.org\" name=\"DFRN.org\" >DFRN</a></div>";
$o .= '<h1>Welcome' . ((x($a->config,'sitename')) ? " to {$a->config['sitename']}" : "" ) . '</h1>';
- $o .= login(($a->config['register_html'] == REGISTER_CLOSED) ? 0 : 1);
+ $o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
return $o;
diff --git a/mod/item.php b/mod/item.php
index e0497af7a..4de9dc59f 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -5,7 +5,7 @@ function sanitise_acl(&$item) {
}
function item_post(&$a) {
-
+dbg(3);
if((! local_user()) && (! remote_user()))
return;
@@ -170,6 +170,6 @@ function item_post(&$a) {
array(),$foo));
}
- goaway($a->get_baseurl() . "/" . $_POST['return'] );
+// goaway($a->get_baseurl() . "/" . $_POST['return'] );
return; // NOTREACHED
} \ No newline at end of file
diff --git a/mod/login.php b/mod/login.php
index ba232a943..6ee625966 100644
--- a/mod/login.php
+++ b/mod/login.php
@@ -1,8 +1,5 @@
<?php
-
-
function login_content(&$a) {
-// return login($a->config['register_enabled']);
return login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
} \ No newline at end of file
diff --git a/view/profile.php b/view/profile.php
index d1e53ad56..d95edb952 100644
--- a/view/profile.php
+++ b/view/profile.php
@@ -29,7 +29,7 @@
|| (strlen($profile['region']))
|| (strlen($profile['postal-code']))
|| (strlen($profile['country-name']))) { ?>
- <span class="location">Location:
+ <div class="location">Location:
<div class="adr">
<div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>
<span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></span>
diff --git a/view/profile_tabs.tpl b/view/profile_tabs.tpl
index 052b2405a..95c0ba1d2 100644
--- a/view/profile_tabs.tpl
+++ b/view/profile_tabs.tpl
@@ -1,4 +1,3 @@
-<?php
<div id="profile-tabs-wrapper" >
<div id="profile-tab-status-tab" class="profile-tabs" >
@@ -6,11 +5,11 @@
</div>
<div id="profile-tab-profile-tab" class="profile-tabs" >
-<a href="$url&tab=profile" id="profile-tab-profile-link" >Profile</a>
+<a href="$url?tab=profile" id="profile-tab-profile-link" >Profile</a>
</div>
<div id="profile-tab-photos-tab" class="profile-tabs" >
-<a href="$url&tab=photos" id="profile-tab-photos-link" >Photos</a>
+<a href="$url?tab=photos" id="profile-tab-photos-link" >Photos</a>
</div>
</div>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 06:56:46 +0000