Fixed: FS#636 - Fetchmail/Getmail configs do not delete

tbrehm

2009-03-16 b84b62a6a89ed0a9947a52dc2e093945c806599f

Fixed: FS#636 - Fetchmail/Getmail configs do not delete

 server/plugins-available/getmail_plugin.inc.php

@@ -140,12 +140,22 @@
    function delete($event_name,$data) {
        global $app, $conf;
        
        // load the server specific configuration options for getmail
        $app->uses("getconf");
        $getmail_config = $app->getconf->get_server_config($conf["server_id"], 'getmail');
        $this->getmail_config_dir = $getmail_config["getmail_config_dir"];
		
        $config_file_path = escapeshellcmd($this->getmail_config_dir.'/'.$data["old"]["source_server"].'_'.$data["old"]["source_username"].'.conf');
        if(stristr($config_file_path,"..") || stristr($config_file_path,"|") || stristr($config_file_path,";") || stristr($config_file_path,'$')) {
            $app->log("Possibly faked path for getmail config file: '$config_file_path'. File is not written.",LOGLEVEL_ERROR);
            return false;
        }
        if(is_file($config_file_path)) unlink($config_file_path);
        if(is_file($config_file_path)) {
            unlink($config_file_path);
            $app->log("Deleting file: '$config_file_path'.",LOGLEVEL_DEBUG);
        } else {
            $app->log("Nothing to delete: '$config_file_path'.",LOGLEVEL_DEBUG);
        }
    }