clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

This merge brings back dbm::is_result() where I could find it.

Browse Source 
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Haeder
2016-09-18 23:21:18 +02:00
parent 432f96b646 8e6f9abedb
commit c825cc8d0d
691 changed files with 128914 additions and 43052 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mod/dfrn_poll.php
View File

@@ -25,6 +25,8 @@ function dfrn_poll_init(&$a) {
$dfrn_id = substr($dfrn_id,2);
}
$hidewall = false;
if(($dfrn_id === '') && (! x($_POST,'dfrn_id'))) {
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
http_status_exit(403);
@@ -35,16 +37,17 @@ function dfrn_poll_init(&$a) {
$r = q("SELECT `hidewall`,`nickname` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
dbesc($a->argv[1])
);
if(! $r)
if (!$r)
http_status_exit(404);
if(($r[0]['hidewall']) && (! local_user()))
http_status_exit(403);
$hidewall = ($r[0]['hidewall'] && !local_user());
$user = $r[0]['nickname'];
}
logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user);
header("Content-type: application/atom+xml");
echo dfrn::feed('', $user,$last_update);
echo dfrn::feed('', $user,$last_update, 0, $hidewall);
killme();
}
@@ -76,7 +79,7 @@ function dfrn_poll_init(&$a) {
dbesc($a->argv[1])
);
if(dba::is_result($r)) {
if(dbm::is_result($r)) {
$s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
@@ -187,7 +190,7 @@ function dfrn_poll_init(&$a) {
q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time()));
$r = q("SELECT * FROM `profile_check` WHERE `dfrn_id` = '%s' ORDER BY `expire` DESC",
dbesc($dfrn_id));
if(dba::is_result($r)) {
if(dbm::is_result($r)) {
xml_status(1);
return; // NOTREACHED
}
@@ -332,7 +335,7 @@ function dfrn_poll_post(&$a) {
$reputation = 0;
$text = '';
if(dba::is_result($r)) {
if(dbm::is_result($r)) {
$reputation = $r[0]['rating'];
$text = $r[0]['reason'];
@@ -445,7 +448,7 @@ function dfrn_poll_content(&$a) {
dbesc($nickname)
);
if(dba::is_result($r)) {
if(dbm::is_result($r)) {
$challenge = '';
$encrypted_id = '';
@@ -492,7 +495,7 @@ function dfrn_poll_content(&$a) {
));
}
$profile = ((dba::is_result($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
$profile = ((dbm::is_result($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
switch($destination_url) {
case 'profile':