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

Merge pull request #671 from anaqreon/webimport

Browse Source 
Fix webpage element import tool
This commit is contained in:
zotlabs 2017-02-12 18:10:09 +11:00 committed by GitHub
commit 5cc1c30d7f
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/import.php
View File

@ -1315,7 +1315,7 @@ function import_webpage_element($element, $channel, $type) {
return null; // return null if invalid element type
}
$arr['uid'] = $channel['channel_id'];
$arr['uid'] = local_channel();
$arr['aid'] = $channel['channel_account_id'];
// Check if an item already exists based on the name
@ -1376,18 +1376,20 @@ function import_webpage_element($element, $channel, $type) {
}
}
$z = q("select * from iconfig where v = '%s' and k = '%s' and cat = 'system' limit 1",
dbesc($name),
dbesc($namespace)
);
// $z = q("select * from iconfig where v = '%s' and k = '%s' and cat = 'system' limit 1",
// dbesc($name),
// dbesc($namespace)
// );
$i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1",
dbesc($arr['mid']),
intval(local_channel())
);
$remote_id = 0;
if($z && $i) {
$remote_id = $z[0]['id'];
\Zotlabs\Lib\IConfig::Set($arr,'system',$namespace,(($name) ? $name : substr($arr['mid'],0,16)),true);
if($i) {
$arr['id'] = $i[0]['id'];
// don't update if it has the same timestamp as the original
if($arr['edited'] > $i[0]['edited'])
@ -1401,11 +1403,13 @@ function import_webpage_element($element, $channel, $type) {
intval(local_channel())
);
}
else
$x = item_store($arr,$execflag);
}
if($x['success']) {
if($x && $x['success']) {
$item_id = $x['item_id'];
update_remote_id($channel, $item_id, $arr['item_type'], $name, $namespace, $remote_id, $arr['mid']);
//update_remote_id($channel, $item_id, $arr['item_type'], $name, $namespace, $remote_id, $arr['mid']);
$element['import_success'] = 1;
}
else {