warnings when no plugins installed

This commit is contained in:
Friendika 2010-12-22 17:25:58 -08:00
parent b302012581
commit f2242826d8
1 changed files with 17 additions and 12 deletions

View File

@ -430,6 +430,8 @@ function check_config(&$a) {
$r = q("SELECT * FROM `addon` WHERE `installed` = 1"); $r = q("SELECT * FROM `addon` WHERE `installed` = 1");
if(count($r)) if(count($r))
$installed = $r; $installed = $r;
else
$installed = array();
$plugins = get_config('system','addon'); $plugins = get_config('system','addon');
$plugins_arr = array(); $plugins_arr = array();
@ -438,21 +440,24 @@ function check_config(&$a) {
$plugins_arr = explode(',',str_replace(' ', '',$plugins)); $plugins_arr = explode(',',str_replace(' ', '',$plugins));
$installed_arr = array(); $installed_arr = array();
foreach($installed as $i) {
if(! in_array($i['name'],$plugins_arr)) {
logger("Addons: uninstalling " . $i['name']);
q("DELETE FROM `addon` WHERE `id` = %d LIMIT 1",
intval($i['id'])
);
@include_once('addon/' . $i['name'] . '/' . $i['name'] . '.php'); if(count($installed)) {
if(function_exists($i['name'] . '_uninstall')) { foreach($installed as $i) {
$func = $i['name'] . '_uninstall'; if(! in_array($i['name'],$plugins_arr)) {
$func(); logger("Addons: uninstalling " . $i['name']);
q("DELETE FROM `addon` WHERE `id` = %d LIMIT 1",
intval($i['id'])
);
@include_once('addon/' . $i['name'] . '/' . $i['name'] . '.php');
if(function_exists($i['name'] . '_uninstall')) {
$func = $i['name'] . '_uninstall';
$func();
}
} }
else
$installed_arr[] = $i['name'];
} }
else
$installed_arr[] = $i['name'];
} }
if(count($plugins_arr)) { if(count($plugins_arr)) {