TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

more app sync fixes

Browse Source
This commit is contained in:
Mario Vavti
2021-10-04 13:41:54 +02:00
parent 2e26a13f81
commit 7430989212
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
include/import.php
View File

@@ -541,7 +541,7 @@ function import_sysapps($channel, $apps) {
if ($channel && $apps) {
$sysapps = Apps::get_system_apps(false);
$sysapps = Apps::get_system_apps(false, true);
foreach ($apps as $app) {
@@ -549,32 +549,34 @@ function import_sysapps($channel, $apps) {
continue;
}
if (array_key_exists('app_deleted',$app) && (intval($app['app_deleted']))) {
continue;
}
$term = ((array_key_exists('term',$app) && is_array($app['term'])) ? $app['term'] : null);
foreach ($sysapps as $sysapp) {
if ($app['app_id'] === hash('whirlpool',$sysapp['app_name'])) {
if (array_key_exists('app_deleted',$app) && $app['app_deleted'] && $app['app_id']) {
q("update app set app_deleted = 1 where app_id = '%s' and app_channel = %d",
dbesc($app['app_id']),
intval($channel['channel_id'])
);
}
else {
// install this app on this server
$newapp = $sysapp;
$newapp['uid'] = $channel['channel_id'];
$newapp['guid'] = hash('whirlpool',$newapp['name']);
$newapp['guid'] = hash('whirlpool', $newapp['name']);
$installed = q("select id from app where app_id = '%s' and app_channel = %d limit 1",
dbesc($newapp['guid']),
intval($channel['channel_id'])
);
if ($installed) {
break;
continue;
}
$newapp['system'] = 1;
if ($term) {
$newapp['categories'] = array_elm_to_str($term,'term');
$newapp['categories'] = array_elm_to_str($term, 'term');
}
Apps::app_install($channel['channel_id'],$newapp);
Apps::app_install($channel['channel_id'], $newapp);
}
}
}
@@ -606,7 +608,6 @@ function sync_sysapps($channel, $apps) {
}
foreach ($sysapps as $sysapp) {
if ($app['app_id'] === hash('whirlpool', $sysapp['name'])) {
if (array_key_exists('app_deleted',$app) && $app['app_deleted'] && $app['app_id']) {
q("update app set app_deleted = 1 where app_id = '%s' and app_channel = %d",
@@ -619,6 +620,15 @@ function sync_sysapps($channel, $apps) {
$newapp = $sysapp;
$newapp['uid'] = $channel['channel_id'];
$newapp['guid'] = hash('whirlpool', $newapp['name']);
$installed = q("select id from app where app_id = '%s' and app_channel = %d limit 1",
dbesc($newapp['guid']),
intval($channel['channel_id'])
);
if ($installed) {
continue;
}
$newapp['system'] = 1;
if ($term) {
$newapp['categories'] = array_elm_to_str($term, 'term');
@@ -632,8 +642,6 @@ function sync_sysapps($channel, $apps) {
}
/**
* @brief Import chatrooms.
*