harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
Mike Macgirvin
2010-07-19 05:24:22 -07:00
parent 9b0584e593
commit bbe53699f2
10 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/auth.php
View File

@@ -23,12 +23,20 @@ if((x($_SESSION,'authenticated')) && (! ($_POST['auth-params'] == 'login'))) {
if(strlen($a->user['timezone'])) if(strlen($a->user['timezone']))
date_default_timezone_set($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", $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
intval($_SESSION['uid'])); intval($_SESSION['uid']));
if(count($r)) { if(count($r)) {
$a->contact = $r[0]; $a->contact = $r[0];
$a->cid = $r[0]['id']; $a->cid = $r[0]['id'];
$_SESSION['cid'] = $a->cid; $_SESSION['cid'] = $a->cid;
} }
} }
} }

8
include/notifier.php
View File

@@ -15,8 +15,8 @@ require_once("datetime.php");
if($argc < 3) if($argc < 3)
exit; exit;
dbg(3);
$baseurl = $argv[1]); $baseurl = $argv[1];
$a->set_baseurl($argv[1]); $a->set_baseurl($argv[1]);
$cmd = $argv[2]; $cmd = $argv[2];
@@ -224,7 +224,7 @@ if($argc < 3)
$url = $rr['notify'] . '?dfrn_id=' . $rr['dfrn-id']; $url = $rr['notify'] . '?dfrn_id=' . $rr['dfrn-id'];
$xml = fetch_url($url); $xml = fetch_url($url);
echo $xml;
if(! $xml) if(! $xml)
continue; continue;
@@ -246,7 +246,7 @@ if($argc < 3)
$postvars['data'] = $atom_nowrite; $postvars['data'] = $atom_nowrite;
$xml = post_url($rr['notify'],$postvars); $xml = post_url($rr['notify'],$postvars);
echo $xml;
} }
killme(); killme();

4
include/poller.php
View File

@@ -118,7 +118,7 @@ echo "Length:" . strlen($xml) . "\r\n";
$datarray = get_atom_elements($item); $datarray = get_atom_elements($item);
$datarray['parent-uri'] = $parent_uri; $datarray['parent-uri'] = $parent_uri;
$datarray['uid'] = $importer['uid']; $datarray['uid'] = $importer['uid'];
$datarray['contact-id'] = $importer['id']; $datarray['contact-id'] = $contact['id'];
$r = post_remote($a,$datarray); $r = post_remote($a,$datarray);
continue; continue;
} }
@@ -146,7 +146,7 @@ echo "Length:" . strlen($xml) . "\r\n";
$datarray = get_atom_elements($item); $datarray = get_atom_elements($item);
$datarray['parent-uri'] = $item_id; $datarray['parent-uri'] = $item_id;
$datarray['uid'] = $importer['uid']; $datarray['uid'] = $importer['uid'];
$datarray['contact-id'] = $importer['id']; $datarray['contact-id'] = $contact['id'];
$r = post_remote($a,$datarray); $r = post_remote($a,$datarray);
continue; continue;

12
mod/contacts.php
View File

@@ -184,7 +184,7 @@ function contacts_content(&$a) {
return $o; return $o;
} }
dbg(2);
if(($a->argc == 2) && ($a->argv[1] == 'all')) if(($a->argc == 2) && ($a->argv[1] == 'all'))
$sql_extra = ''; $sql_extra = '';
else else
@@ -198,21 +198,21 @@ function contacts_content(&$a) {
switch($sort_type) { switch($sort_type) {
case DIRECTION_BOTH : case DIRECTION_BOTH :
$sql_extra = " AND `dfrn-id` != '' AND `issued-id` != '' "; $sql_extra2 = " AND `dfrn-id` != '' AND `issued-id` != '' ";
break; break;
case DIRECTION_IN : case DIRECTION_IN :
$sql_extra = " AND `dfrn-id` = '' AND `issued-id` != '' "; $sql_extra2 = " AND `dfrn-id` = '' AND `issued-id` != '' ";
break; break;
case DIRECTION_OUT : case DIRECTION_OUT :
$sql_extra = " AND `dfrn-id` != '' AND `issued-id` = '' "; $sql_extra2 = " AND `dfrn-id` != '' AND `issued-id` = '' ";
break; break;
case DIRECTION_ANY : case DIRECTION_ANY :
default: default:
$sql_extra = ''; $sql_extra2 = '';
break; 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'])); intval($_SESSION['uid']));
if(count($r)) { if(count($r)) {

7
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, // to confirm the request. We've done so and clicked submit,
// which brings us here. // which brings us here.
$dfrn_url = notags(trim($_POST['dfrn_url'])); $dfrn_url = notags(trim($_POST['dfrn_url']));
$aes_allow = (((x($_POST,'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0); $aes_allow = (((x($_POST,'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0);
$confirm_key = ((x($_POST,'confirm_key')) ? $_POST['confirm_key'] : ""); $confirm_key = ((x($_POST,'confirm_key')) ? $_POST['confirm_key'] : "");
@@ -48,7 +47,7 @@ function dfrn_request_post(&$a) {
if(x($dfrn_url)) { 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']), intval($_SESSION['uid']),
dbesc($dfrn_url) dbesc($dfrn_url)
); );
@@ -88,7 +87,7 @@ function dfrn_request_post(&$a) {
if($invalid) { if($invalid) {
notice( $invalid . ' required DFRN parameter' notice( $invalid . ' required DFRN parameter'
. (($invalid == 1) ? " was " : "s were " ) . (($invalid == 1) ? " was " : "s were " )
. "not found at the given URL" . EOL ); . "not found at the given URL" . EOL . print_r($parms,true)) ;
return; return;
} }
} }
@@ -220,7 +219,7 @@ function dfrn_request_post(&$a) {
if($invalid) { if($invalid) {
notice( $invalid . ' required DFRN parameter' notice( $invalid . ' required DFRN parameter'
. (($invalid == 1) ? " was " : "s were " ) . (($invalid == 1) ? " was " : "s were " )
. "not found at the given URL" . EOL) ; . "not found at the given URL" . EOL . print_r($parms,true)) ;
return; return;
} }

2
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>"; $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 .= '<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; return $o;

4
mod/item.php
View File

@@ -5,7 +5,7 @@ function sanitise_acl(&$item) {
} }
function item_post(&$a) { function item_post(&$a) {
dbg(3);
if((! local_user()) && (! remote_user())) if((! local_user()) && (! remote_user()))
return; return;
@@ -170,6 +170,6 @@ function item_post(&$a) {
array(),$foo)); array(),$foo));
} }
goaway($a->get_baseurl() . "/" . $_POST['return'] ); // goaway($a->get_baseurl() . "/" . $_POST['return'] );
return; // NOTREACHED return; // NOTREACHED
} }

3
mod/login.php
View File

@@ -1,8 +1,5 @@
<?php <?php
function login_content(&$a) { function login_content(&$a) {
// return login($a->config['register_enabled']);
return login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true); return login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
} }

2
view/profile.php
View File

@@ -29,7 +29,7 @@
|| (strlen($profile['region'])) || (strlen($profile['region']))
|| (strlen($profile['postal-code'])) || (strlen($profile['postal-code']))
|| (strlen($profile['country-name']))) { ?> || (strlen($profile['country-name']))) { ?>
<span class="location">Location: <div class="location">Location:
<div class="adr"> <div class="adr">
<div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div> <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> <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>

5
view/profile_tabs.tpl
View File

@@ -1,4 +1,3 @@
<?php
<div id="profile-tabs-wrapper" > <div id="profile-tabs-wrapper" >
<div id="profile-tab-status-tab" class="profile-tabs" > <div id="profile-tab-status-tab" class="profile-tabs" >
@@ -6,11 +5,11 @@
</div> </div>
<div id="profile-tab-profile-tab" class="profile-tabs" > <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>
<div id="profile-tab-photos-tab" class="profile-tabs" > <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>
</div> </div>