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

minor stuff, some doco, auth cleanup, and make "unknown" more translateable by context.

Browse Source
This commit is contained in:
friendica 2014-02-22 14:58:12 -08:00
parent 5dc35bb7f0
commit 5b4e3f46bc
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/items.php
View File

@ -753,7 +753,7 @@ function import_author_rss($x) {
values ( '%s', '%s', '%s', '%s' )", values ( '%s', '%s', '%s', '%s' )",
dbesc($x['url']), dbesc($x['url']),
dbesc($x['url']), dbesc($x['url']),
dbesc(($name) ? $name : t('Unknown')), dbesc(($name) ? $name : t('(Unknown)')),
dbesc('rss') dbesc('rss')
); );
if($r) { if($r) {

4
include/zot.php
View File

@ -1370,8 +1370,6 @@ function process_delivery($sender,$arr,$deliveries,$relay) {
// remove_community_tag is a no-op if this isn't a community tag activity // remove_community_tag is a no-op if this isn't a community tag activity
remove_community_tag($sender,$arr,$channel['channel_id']); remove_community_tag($sender,$arr,$channel['channel_id']);
$item_id = delete_imported_item($sender,$arr,$channel['channel_id']); $item_id = delete_imported_item($sender,$arr,$channel['channel_id']);
$result[] = array($d['hash'],(($item_id) ? 'deleted' : 'delete_failed'),$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>'); $result[] = array($d['hash'],(($item_id) ? 'deleted' : 'delete_failed'),$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>');
@ -1414,8 +1412,6 @@ function process_delivery($sender,$arr,$deliveries,$relay) {
} }
} }
$r = q("select id, edited from item where mid = '%s' and uid = %d limit 1", $r = q("select id, edited from item where mid = '%s' and uid = %d limit 1",
dbesc($arr['mid']), dbesc($arr['mid']),
intval($channel['channel_id']) intval($channel['channel_id'])

1
mod/openid.php
View File

@ -42,6 +42,7 @@ function openid_content(&$a) {
if(($record['account_flags'] == ACCOUNT_OK) || ($record['account_flags'] == ACCOUNT_UNVERIFIED)) { if(($record['account_flags'] == ACCOUNT_OK) || ($record['account_flags'] == ACCOUNT_UNVERIFIED)) {
logger('mod_openid: openid success for ' . $x[0]['channel_name']); logger('mod_openid: openid success for ' . $x[0]['channel_name']);
$_SESSION['uid'] = $r[0]['channel_id']; $_SESSION['uid'] = $r[0]['channel_id'];
$_SESSION['account_id'] = $r[0]['channel_account_id'];
$_SESSION['authenticated'] = true; $_SESSION['authenticated'] = true;
authenticate_success($record,true,true,true,true); authenticate_success($record,true,true,true,true);
goaway(z_root()); goaway(z_root());