* fixed warning when trying to uninstall plugin that can't be uninstalled

This commit is contained in:
slawkens1 2017-10-19 21:02:36 +02:00
parent f9e6966687
commit cfb460c137

View File

@ -46,28 +46,33 @@ if(isset($_REQUEST['uninstall'])){
error('Plugin ' . $uninstall . ' does not exist.'); error('Plugin ' . $uninstall . ' does not exist.');
} }
else { else {
$string = file_get_contents($filename); if(!isset($plugin_info['uninstall'])) {
$plugin_info = json_decode($string, true); error("Plugin doesn't have uninstall options defined. Skipping...");
if($plugin_info == false) {
warning('Cannot load plugin info ' . $uninstall . '.json');
} }
else { else {
$success = true; $string = file_get_contents($filename);
foreach($plugin_info['uninstall'] as $file) { $plugin_info = json_decode($string, true);
$file = BASE . $file; if($plugin_info == false) {
if(!deleteDirectory($file)) { error('Cannot load plugin info ' . $uninstall . '.json');
$success = false;
}
}
if($success) {
if($cache->enabled()) {
$cache->delete('templates');
}
success('Successfully uninstalled plugin ' . $uninstall);
} }
else { else {
error('Error while uninstalling plugin ' . $uninstall . ': ' . error_get_last()); $success = true;
foreach($plugin_info['uninstall'] as $file) {
$file = BASE . $file;
if(!deleteDirectory($file)) {
$success = false;
}
}
if($success) {
if($cache->enabled()) {
$cache->delete('templates');
}
success('Successfully uninstalled plugin ' . $uninstall);
}
else {
error('Error while uninstalling plugin ' . $uninstall . ': ' . error_get_last());
}
} }
} }
} }