Browse Source

bug fixes

tags/2.1
Mike Macgirvin 10 years ago
parent
commit
bbe53699f2
10 changed files with 29 additions and 26 deletions
  1. +8
    -0
      include/auth.php
  2. +4
    -4
      include/notifier.php
  3. +2
    -2
      include/poller.php
  4. +6
    -6
      mod/contacts.php
  5. +3
    -4
      mod/dfrn_request.php
  6. +1
    -1
      mod/home.php
  7. +2
    -2
      mod/item.php
  8. +0
    -3
      mod/login.php
  9. +1
    -1
      view/profile.php
  10. +2
    -3
      view/profile_tabs.tpl

+ 8
- 0
include/auth.php View File

@@ -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;

}
}
}


+ 4
- 4
include/notifier.php View File

@@ -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();


+ 2
- 2
include/poller.php View File

@@ -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;



+ 6
- 6
mod/contacts.php View File

@@ -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)) {


+ 3
- 4
mod/dfrn_request.php View File

@@ -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;
}


+ 1
- 1
mod/home.php View File

@@ -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;


+ 2
- 2
mod/item.php View File

@@ -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
}

+ 0
- 3
mod/login.php View File

@@ -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);
}

+ 1
- 1
view/profile.php View File

@@ -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>


+ 2
- 3
view/profile_tabs.tpl View File

@@ -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>


Loading…
Cancel
Save