From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).
---
server/plugins-available/getmail_plugin.inc.php | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/server/plugins-available/getmail_plugin.inc.php b/server/plugins-available/getmail_plugin.inc.php
index c6daf42..6b8a7ee 100644
--- a/server/plugins-available/getmail_plugin.inc.php
+++ b/server/plugins-available/getmail_plugin.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007 - 2009, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -108,12 +108,22 @@
} else {
$tpl = str_replace('{DELETE}','0',$tpl);
}
-
+
+ if($data["new"]["read_all"] == 'y') {
+ $tpl = str_replace('{READ_ALL}', '1', $tpl);
+ } else {
+ $tpl = str_replace('{READ_ALL}', '0', $tpl);
+ }
+
// Set the data retriever
if($data["new"]["type"] == 'pop3') {
$tpl = str_replace('{TYPE}','SimplePOP3Retriever',$tpl);
} elseif ($data["new"]["type"] == 'imap') {
$tpl = str_replace('{TYPE}','SimpleIMAPRetriever',$tpl);
+ } elseif ($data["new"]["type"] == 'pop3ssl') {
+ $tpl = str_replace('{TYPE}','SimplePOP3SSLRetriever',$tpl);
+ } elseif ($data["new"]["type"] == 'imapssl') {
+ $tpl = str_replace('{TYPE}','SimpleIMAPSSLRetriever',$tpl);
}
// Set server, username, password and destination.
@@ -125,8 +135,8 @@
// Write the config file.
file_put_contents($config_file_path,$tpl);
$app->log("Writing Getmail config file: $config_file_path",LOGLEVEL_DEBUG);
- exec("chmod 400 $config_file_path");
- exec("chown getmail $config_file_path");
+ chmod($config_file_path, 0400);
+ chown($config_file_path, 'getmail');
unset($tpl);
unset($config_file_path);
@@ -140,6 +150,11 @@
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);
@@ -151,4 +166,4 @@
} // end class
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1