';
@@ -139,19 +190,29 @@ function _og_mailinglist_send_digest_emails() {
// For each person, send out an email.
$result = db_query("SELECT uid
FROM {og_mailinglist_subscription}
- WHERE nid = %d
- AND subscription_type = \"digest email\"", $gid);
+ WHERE nid = :nid
+ AND subscription_type = :subscription_type email\"", array(':nid' => : nid, ':subscription_type' => : subscription_type, '' => array(
+ ':nid' => : nid,
+ ':subscription_type' => : subscription_type,
+ '' => array(':nid' => $gid ':subscription_type' =>),
+ )));
$uids = array();
while ($data = db_fetch_array($result)) {
- $email = db_result(db_query("SELECT mail
+ $email = db_query("SELECT mail
FROM {users}
- WHERE uid = %d", $data['uid']));
+ WHERE uid = :uid", array(':uid' => : uid, '' => array(
+ ':uid' => : uid,
+ '' => array(':uid' => $data['uid']),
+ )))->fetchField();
$uids[$data['uid']] = $email;
}
// Add a test user if any.
if ($uid = variable_get('og_mailinglist_test_email_address', '')) {
- $email = db_result(db_query("SELECT mail FROM {users} WHERE uid = %d", $uid));
+ $email = db_query("SELECT mail FROM {users} WHERE uid = :uid", array(':uid' => : uid, '' => array(
+ ':uid' => : uid,
+ '' => array(':uid' => $uid),
+ )))->fetchField();
$uids[$uid] = $email;
}
@@ -171,14 +232,18 @@ function _og_mailinglist_send_digest_emails() {
$mailer->Body = $body;
$mailer->isHTML(TRUE);
$mailer->Send();
- watchdog('og_mailinglist', 'Sent digest email to @email for group @group',
+ watchdog('og_mailinglist', 'Sent digest email to @email for group @group',
array('@email' => $email, '@group' => $group->title), WATCHDOG_INFO);
}
}
}
+/**
+ * @todo Please document this function.
+ * @see http://drupal.org/node/1354
+ */
function og_mailinglist_style_node_message($node) {
- $user = user_load(array('uid' => $node->uid));
+ $user = user_load($node->uid);
$body .= "
" .
l((isset($user->realname) ? $user->realname : $user->name), "user/" . $user->uid, array('absolute' => TRUE))
. " " . $user->mail . " " .
@@ -188,12 +253,19 @@ function og_mailinglist_style_node_message($node) {
$node = og_mailinglist_render_node_body($node);
$body .= og_mailinglist_prepare_web_content($node->body);
$body .= "
\n";
-
+
return $body;
}
+/**
+ * @todo Please document this function.
+ * @see http://drupal.org/node/1354
+ */
function og_mailinglist_style_comment_message($comment) {
- $user = user_load(array('uid' => $comment->uid));
+ // TODO Convert "user_load" to "user_load_multiple" if "$comment->uid" is other than a uid.
+ // To return a single user object, wrap "user_load_multiple" with "array_shift" or equivalent.
+ // Example: array_shift(user_load_multiple(array(), $comment->uid))
+ $user = user_load($comment->uid);
$body = "
" .
l((isset($user->realname) ? $user->realname : $user->name), "user/" . $user->uid, array('absolute' => TRUE))
. " " . $user->mail . " " .
@@ -203,16 +275,20 @@ function og_mailinglist_style_comment_message($comment) {
$comment->comment = _og_mailinglist_remove_quotes($comment->comment);
$body .= og_mailinglist_prepare_web_content($comment->comment);
$body .= "
\n";
-
+
return $body;
}
+/**
+ * @todo Please document this function.
+ * @see http://drupal.org/node/1354
+ */
function og_mailinglist_count_new_messages($message) {
- $count = 0;
- if ($message['status'] === "new") {
- $count++;
- }
- $count += count(array_keys($message)) - 2;
-
- return $count;
+ $count = 0;
+ if ($message['status'] === "new") {
+ $count++;
+ }
+ $count += count(array_keys($message)) - 2;
+
+ return $count;
}
diff --git a/og_mailinglist_filter.inc b/og_mailinglist_filter.inc
index 85c0100..50a7106 100644
--- a/og_mailinglist_filter.inc
+++ b/og_mailinglist_filter.inc
@@ -8,10 +8,10 @@
// of people do that.
// Making the switch would vastly simplify the code.
// We could then hold the regex for each email client in an array and just pass
-// that and the text into a function.
+// that and the text into a function.
function _og_mailinglist_find_quoted_sections($text) {
$quotes = array();
-
+
// Some email clients are "special". They don't like to place ">" in front of
// quotes. We need to give them their own special functions.
$quotes[] = array();
@@ -27,11 +27,11 @@ function _og_mailinglist_find_quoted_sections($text) {
$quotes[] = _og_mailinglist_filter_unknown_client4b_quotes($text);
$quotes[] = _og_mailinglist_filter_unknown_client5_quotes($text);
$quotes[] = _og_mailinglist_filter_quotes($text);
-
+
// Identify the longest quoted section of all possible matches and only
// remove that one.
$quotes = _og_mailinglist_longest_string($quotes);
-
+
return $quotes;
}
@@ -39,14 +39,14 @@ function _og_mailinglist_find_quoted_sections($text) {
* Identify the longest quoted section as that should contain all the others
* that are possibly within it.
*/
-function _og_mailinglist_longest_string ($quotes) {
+function _og_mailinglist_longest_string($quotes) {
$longest = array();
- foreach($quotes as $quote) {
+ foreach ($quotes as $quote) {
if (key($longest) < strlen(implode("", $quote))) {
$longest = array(strlen(implode("", $quote)) => $quote);
}
}
-
+
return end($longest);
}
@@ -64,19 +64,19 @@ function _og_mailinglist_filter_quotes($text) {
foreach ($lines as $line) {
if (preg_match("/On\s\w{3},\s\w{3}\s\d{1,2},\s\d{4}\sat\s\d{1,2}:\d{2}\s[PM|AM]/s", #Gmail
$line, $matches)
- || preg_match("/On\s\w{3}\s\d{1,2},\s\d{4},\sat\s\d{1,2}:\d{2}\s(AM|PM),\s/s", #Apple mail
- $line, $matches)
- || preg_match("/On\s\w{3}\s\d{2},\s\d{4},\sat\s[0-9:]{4,5}\s(PM|AM),\s[a-zA-Z\s]+wrote:/s", #unknown as of yet
+ || preg_match("/On\s\w{3}\s\d{1,2},\s\d{4},\sat\s\d{1,2}:\d{2}\s(AM|PM),\s/s", #Apple mail
$line, $matches)
- || preg_match("/On\s\d{1,2}\/\d{1,2}\/\d{1,2},\s.+?<[a-zA-Z0-9_\-\.\+\^!#\$%&*+\/\=\?\`\|\{\}~\']+@(?:(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.?)+>\swrote:/s", # Some mobile email client, blackberry maybe?
+ || preg_match("/On\s\w{3}\s\d{2},\s\d{4},\sat\s[0-9:]{4,5}\s(PM|AM),\s[a-zA-Z\s]+wrote:/s", #unknown as of yet
$line, $matches)
- || preg_match("/On\s\w{3,10},\s\w{3}\s\d{1,2},\s\d{4},\s.+?wrote:/s", #unknown as of yet "On Saturday, May 22, 2010, Joe Smith wrote:"
+ || preg_match("/On\s\d{1,2}\/\d{1,2}\/\d{1,2},\s.+?<[a-zA-Z0-9_\-\.\+\^!#\$%&*+\/\=\?\`\|\{\}~\']+@(?:(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.?)+>\swrote:/s", # Some mobile email client, blackberry maybe?
$line, $matches)
- || preg_match("/On.\d{1,2}\/\d{1,2}\/\d{1,2}.\d{1,2}:\d{1,2}\s(PM|AM),.+?wrote:/s", #unknown as of yet "On 5/21/10 8:43 PM, Joe Smith wrote:"
+ || preg_match("/On\s\w{3,10},\s\w{3}\s\d{1,2},\s\d{4},\s.+?wrote:/s", #unknown as of yet "On Saturday, May 22, 2010, Joe Smith wrote:"
$line, $matches)
- && !$in_quote) {
+ || preg_match("/On.\d{1,2}\/\d{1,2}\/\d{1,2}.\d{1,2}:\d{1,2}\s(PM|AM),.+?wrote:/s", #unknown as of yet "On 5/21/10 8:43 PM, Joe Smith wrote:"
+ $line, $matches)
+ && !$in_quote) {
+
-
$quotes[$count][] = $line;
$in_quote = TRUE;
}
@@ -84,7 +84,7 @@ function _og_mailinglist_filter_quotes($text) {
// or the previous line ended w/ a "<" Long emails addresses
// (e.g. ) sometimes get truncated
// leaving the second part of the line on the next line.
- || substr(trim(array_pop(end($quotes))), -1) === "<"
+ || substr(trim(array_pop(end($quotes))), -1) === "<"
// Same situation as above. But here the is
// brought down to the next line so the < is at the start of the line.
|| substr(trim($line), 0, 1) === "<"
@@ -101,7 +101,7 @@ function _og_mailinglist_filter_quotes($text) {
foreach ($quotes as $quote) {
$quotes_imploded[] = implode($quote, "\n");
}
-
+
return $quotes_imploded;
}
@@ -134,7 +134,7 @@ function _og_mailinglist_filter_outlook_quotes($text) {
}
else {
return array();
- }
+ }
}
/**
@@ -148,7 +148,7 @@ function _og_mailinglist_filter_android_gmail_quotes($text) {
}
else {
return array();
- }
+ }
}
/**
@@ -162,7 +162,7 @@ function _og_mailinglist_filter_unknown_client_quotes($text) {
}
else {
return array();
- }
+ }
}
/**
@@ -176,7 +176,7 @@ function _og_mailinglist_filter_unknown_client2_quotes($text) {
}
else {
return array();
- }
+ }
}
/**
@@ -186,7 +186,7 @@ function _og_mailinglist_filter_unknown_client2_quotes($text) {
* Sent: Monday, April 05, 2010 5:30 PM
* To: A group
* Subject: [a-group] SQL Server Express
- *
+ *
*/
function _og_mailinglist_filter_unknown_client3_quotes($text) {
$regex = "/From:\s.*?\[.*?@.*?\].*?Sent:\s\w*?,\s\w*?\s\d{1,2},\s\d{4}\s\d{1,2}:\d{2}\s(PM|AM).*?To:\s.*?Subject:.*/s";
@@ -206,7 +206,7 @@ function _og_mailinglist_filter_unknown_client3_quotes($text) {
* Sent: Thursday, 23 September 2010 9:55 AM // Diff from above is in date format.
* To: test-two@lists.somewhere.com
* Subject: [test-two] Thursday morning: Forum start via email
- *
+ *
*/
function _og_mailinglist_filter_unknown_client3a_quotes($text) {
$regex = "/From:\s.*?\[.*?@.*?\].*?Sent:\s\w*?,\s\d{1,2}\s\w*?\s\d{4}\s\d{1,2}:\d{2}\s(PM|AM).*?To:\s.*?Subject:.*/s";
@@ -224,10 +224,10 @@ function _og_mailinglist_filter_unknown_client3a_quotes($text) {
*
* -----Original Message-----
* From: Someone
- * Date: Sat, 10 Apr 2110 12:25:28
+ * Date: Sat, 10 Apr 2110 12:25:28
* To: Entrepreneurship
- * Subject: Re: [entrepreneurship] Need Tech Guys to Form
- *
+ * Subject: Re: [entrepreneurship] Need Tech Guys to Form
+ *
*/
function _og_mailinglist_filter_unknown_client4_quotes($text) {
$regex = "/-----Original\sMessage-----.*?From:\s.*?@.*?Date:\s\w{3},\s\d{1,2}\s.*?:.*?:.*?To:.*?@.*?Subject:.*/s";
@@ -248,7 +248,7 @@ function _og_mailinglist_filter_unknown_client4_quotes($text) {
* Sent: Friday, 24 September 2010 10:54 AM
* To: test-one@lists.somewhere.com
* Subject: Re: [test-one] Test to Group 1 From Email
- *
+ *
*/
function _og_mailinglist_filter_unknown_client4a_quotes($text) {
$regex = "/-----Original\sMessage-----.*?From:\s.*?@.*?Sent:\s\w{3,9},\s\d{1,2}\s.*?:.*?:.*?To:.*?@.*?Subject:.*/s";
@@ -269,7 +269,7 @@ function _og_mailinglist_filter_unknown_client4a_quotes($text) {
* To: test-one@lists.somewhere.com
* Subject: [test-one] Test to Group 1 From Email
* Date: Fri, 24 Sep 2010 09:36:57 +1000
- *
+ *
*/
function _og_mailinglist_filter_unknown_client4b_quotes($text) {
$regex = "/-----\sOriginal\sMessage\s-----.*?From:\s.*?\<.*?@.*?\>.*?To:\s.*?Subject:\s.*?Date:\s\w*?,\s\d{1,2}\s\w*?\s\d{4}\s\d{1,2}:\d{2}:\d{2}\s.*/s";
@@ -286,7 +286,7 @@ function _og_mailinglist_filter_unknown_client4b_quotes($text) {
* Filter quotes out of emails from yet another email client.
*
* On 15 April 2010 21:57, someone someone@example.com wrote:
- *
+ *
*/
function _og_mailinglist_filter_unknown_client5_quotes($text) {
$regex = "/On\s\d{1,2}\s\w.*?\s\d{4}\s\d{2}:\d{2},\s.*?@.*?\s.*?wrote:.*/s";
diff --git a/og_mailinglist_phpmailer.inc b/og_mailinglist_phpmailer.inc
index 276bdb1..51221ce 100644
--- a/og_mailinglist_phpmailer.inc
+++ b/og_mailinglist_phpmailer.inc
@@ -1,62 +1,75 @@
nid, $comment->cid)) {
return;
}
-
+
$group_node = _og_mailinglist_load_group($node);
$mailer = og_mailinglist_create_mailer();
-
+
// Add custom headers.
$parent_message_id = _og_mailinglist_get_messageid_from_nid($node->nid);
// If the comment is in reply to another comment, set the in-reply-to header
// to that comment's message-id, else to the parent post's message-id.
- $comment_pid = db_result(db_query("SELECT pid
+ $comment_pid = db_query("SELECT pid
FROM {comments}
- WHERE cid = %d", $comment->cid));
+ WHERE cid = :cid", array(':cid' => : cid, '' => array(
+ ':cid' => : cid,
+ '' => array(':cid' => $comment->cid),
+ )))->fetchField();
if ($comment_pid != 0) {
- $in_reply_to = db_result(db_query("SELECT message_id
+ $in_reply_to = db_query("SELECT message_id
FROM {og_mailinglist_source}
- WHERE cid = %d", $comment_pid));
- $references = db_result(db_query("SELECT references_header
+ WHERE cid = :cid", array(':cid' => : cid, '' => array(
+ ':cid' => : cid,
+ '' => array(':cid' => $comment_pid),
+ )))->fetchField();
+ $references = db_query("SELECT references_header
FROM {og_mailinglist_source}
- WHERE cid = %d", $comment_pid)) . " " . $in_reply_to;
+ WHERE cid = :cid", array(':cid' => : cid, '' => array(
+ ':cid' => : cid,
+ '' => array(':cid' => $comment_pid),
+ )))->fetchField() . " " . $in_reply_to;
}
else {
$in_reply_to = $parent_message_id;
$references = $parent_message_id; // TODO, this should really also reference each message-id that came before it in order. Easy enough to do w/ a query.
}
-
+
$mailer = og_mailinglist_add_web_headers($mailer, $node, $comment, $in_reply_to, $references);
-
+
// Decorate subject.
$mailer->Subject = "Re: [" . $group_node->ogm_email . "] " . $node->title;
// Decorate body.
$body = og_mailinglist_prepare_web_content($comment->comment);
$body = og_mailinglist_build_web_footer($node, $body);
-
+
$mailer->Body = $body;
$mailer->isHTML = TRUE;
$mailer->AltBody = drupal_html_to_text($body);
//// Add attachments if any.
- //foreach ($email['attachments'] as $info) {
+ //foreach ($email['attachments'] as $info) {
// $mailer->AddStringAttachment($info['data'], $info['filename']);
//}
-
+
$mailer = _og_mailinglist_add_addresses($mailer, $node, FALSE,
$comment);
-
+
$success = $mailer->Send();
-
+
if ($success) {
og_mailinglist_log_email_sent('web', $node->nid, $comment->cid, $mailer->MessageID, $in_reply_to, $references, $parent_message_id);
}
@@ -64,36 +77,40 @@ function og_mailinglist_send_comment_email($comment, $node) {
watchdog('og_mailinglist', "OG_Mailinglist couldn't send a new node email.", NULL,
WATCHDOG_ERROR);
}
-
+
return;
}
+/**
+ * @todo Please document this function.
+ * @see http://drupal.org/node/1354
+ */
function og_mailinglist_send_node_email($node) {
// Check if node arrived via email so already sent.
if (_og_mailinglist_email_already_sent($node->nid)) {
return;
}
-
+
$group_node = _og_mailinglist_load_group($node);
-
-
+
+
// If not a group post, return. We only send out emails for group posts.
if (empty($group_node)) {
return;
}
-
+
$mailer = og_mailinglist_create_mailer();
-
+
// Add custom headers.
$mailer = og_mailinglist_add_web_headers($mailer, $node);
// Decorate subject.
$subject = "[" . $group_node->ogm_email . "] " . $node->title;
-
+
// Prepare node body for viewing.
$node = og_mailinglist_render_node_body($node);
-
+
// Decorate body.
$body = og_mailinglist_prepare_web_content($node->body);
$body = og_mailinglist_build_web_footer($node, $body, 0, TRUE);
@@ -115,8 +132,8 @@ function og_mailinglist_send_node_email($node) {
$mailer->Subject = $subject;
$mailer->Body = $body;
$mailer->isHTML = TRUE;
- $mailer->AltBody = drupal_html_to_text($body);
-
+ $mailer->AltBody = drupal_html_to_text($body);
+
// Add attachments if any.
if (isset($node->files)) {
foreach ($node->files as $file) {
@@ -128,9 +145,9 @@ function og_mailinglist_send_node_email($node) {
$mailer = _og_mailinglist_add_addresses($mailer, $node, TRUE);
-
+
$success = $mailer->Send();
-
+
if ($success) {
og_mailinglist_log_email_sent('web', $node->nid, 0, $mailer->MessageID, 0, 0, $mailer->MessageID);
}
@@ -153,8 +170,12 @@ function og_mailinglist_send_node_email($node) {
* @return
* Node with rendered body.
*/
+/**
+ * @todo Please document this function.
+ * @see http://drupal.org/node/1354
+ */
function og_mailinglist_render_node_body($node) {
- $node = (object)$node;
+ $node = (object) $node;
$node->build_mode = OG_MAILINGLIST_BUILD_FULL;
$node = node_build_content($node, FALSE, TRUE);
@@ -165,11 +186,15 @@ function og_mailinglist_render_node_body($node) {
unset($node->teaser);
// Allow modules to modify the fully-built node.
- node_invoke_nodeapi($node, 'alter');
-
+ module_invoke_all('node_build_alter', $node);
+
return $node;
}
+/**
+ * @todo Please document this function.
+ * @see http://drupal.org/node/1354
+ */
function og_mailinglist_add_web_headers($mailer, $node, $comment = 0, $in_reply_to = 0, $references = 0) {
$group_node = _og_mailinglist_load_group($node);
global $base_url;
@@ -212,10 +237,10 @@ function _og_mailinglist_add_addresses($mailer, $node, $new_node = FALSE,
$subscribers = _og_mailinglist_get_subscribers($node, $new_node);
if (!empty($comment)) {
- $author = user_load(array('uid' => $comment->uid));
+ $author = user_load($comment->uid);
}
else {
- $author = user_load(array('uid' => $node->uid));
+ $author = user_load($node->uid);
}
if (isset($author->realname)) {
@@ -239,10 +264,12 @@ function _og_mailinglist_add_addresses($mailer, $node, $new_node = FALSE,
foreach ($subscribers as $subscriber) {
$mailer->AddBCC($subscriber);
}
- } catch (phpmailerException $e) {
- watchdog('og_mailinglist', t('PHPMailer error: !error', array('!error' => $e->errorMessage())), NULL, WATCHDOG_ERROR);
- } catch (Exception $e) {
- watchdog('og_mailinglist', $e->getMessage(), NULL, WATCHDOG_ERROR);
+ }
+ catch (phpmailerException $e) {
+ watchdog('og_mailinglist', t('PHPMailer error: !error', array('!error' => $e->errorMessage())), NULL, WATCHDOG_ERROR);
+ }
+ catch (Exception $e) {
+ watchdog('og_mailinglist', $e->getMessage(), NULL, WATCHDOG_ERROR);
}
return $mailer;
diff --git a/og_mailinglist_transport.inc b/og_mailinglist_transport.inc
index 9e2958e..0ead538 100755
--- a/og_mailinglist_transport.inc
+++ b/og_mailinglist_transport.inc
@@ -1,8 +1,8 @@
$max_size * 1024 && $max_size != 0) {
throw new Exception(t("Discussion items sent via email must be less than !max_size Kb. For security reasons, please post larger messages through the web interface.", array("!max_size" => $max_size)));
}
-
+
// This regex worries me... do *all* email clients place email addresses between <>?
// Get the user id.
$mailfrom = $email['headers']['from'];
- if (preg_match("/<(.*?)>/", $email['headers']['from'], $matches)) {
+ if (preg_match("/<(.*?)>/", $email['headers']['from'], $matches)) {
$mailfrom = $matches[1];
}
- if (!$email['userid'] = db_result(db_query("SELECT uid
- FROM {users}
- WHERE mail='%s'", $mailfrom))) {
+ if (! $email['userid'] = db_query("SELECT uid
+ FROM {users}
+ WHERE mail = :mail", array(':mail' => : mail, '' => array(
+ ':mail' => : mail,
+ '' => array(':mail' => $mailfrom),
+ )))->fetchField()) {
+
// If not posting from their normal email account, let's try their mail alias.
- $email['userid'] = db_result(db_query("SELECT uid
- FROM {users}
- WHERE data LIKE '%%%s%%'", $mailfrom));
+ $email['userid'] = db_query('users')
+ ->fields('uid')
+ ->condition('data', '%' . $mailfrom . '%', 'LIKE')
+ ->execute()->fetchField();
}
if (!$email['userid']) {
$exception = t("Could not locate the user account for !mailfrom. For security reasons, please post from the email account you are registered with.", array('!mailfrom' => $mailfrom));
@@ -101,45 +106,64 @@ function _og_mailinglist_process_email($raw_email, $group_name) {
}
// Check how many posts have been made by this user (for security).
if (variable_get('og_mailinglist_max_posts_per_hour', 20) > 0) {
- $one_hour_ago = time() - (60 * 60);
- $num_recent_posts = db_result(db_query("SELECT count(*)
+ $one_hour_ago = REQUEST_TIME - (60 * 60);
+ $num_recent_posts = db_query("SELECT count(*)
FROM {node}
- WHERE uid=%d AND
- created > %d",
- $email['userid'], $one_hour_ago));
+ WHERE uid = :uid AND
+ created > :created", array(':uid' => : uid, ':created' => : created, '' => array(
+ ':uid' => : uid,
+ ':created' => : created,
+ '' => array(
+ ':uid' => $email['userid'],
+ ':created' => $one_hour_ago,
+ ),
+ )))->fetchField();
if ($num_recent_posts > variable_get('og_mailinglist_max_posts_per_hour', 20)) {
- throw new Exception(t("You have posted via email too many times in the last hour. For security reasons, please wait a while or post through the regular web interface."));
+ throw new Exception(t("You have posted via email too many times in the last hour. For security reasons, please wait a while or post through the regular web interface."));
}
}
-
+
// Get the group id.
- $email['groupid'] = db_result(db_query("SELECT nid
+ $email['groupid'] = db_query("SELECT nid
FROM {og_mailinglist}
- WHERE LOWER(group_email)='%s'", $group_name));
- if (!$email['groupid']) {
+ WHERE LOWER(group_email) = :LOWER(group_email)", array(':LOWER(group_email)' => : LOWER(group_email), '' => array(
+ ':LOWER(group_email)' => : LOWER(group_email),
+ '' => array(':LOWER(group_email)' => $group_name),
+ )))->fetchField();
+ if (!$email['groupid']) {
throw new Exception(t("Could not locate group named !group_name", array('!group_name' => $group_name)));
}
-
+
// Check the this user is a member of this group (for security).
$results = db_query("SELECT og.nid, n.title
FROM {og_uid} og JOIN {node} n
JOIN {og} o
- WHERE og.uid=%d AND
- og.nid=%d AND
- og.nid=n.nid AND
- o.nid=og.nid", $email['userid'], $email['groupid']);
- if (!db_result($results)) { // TODO also check if person is subscribed to this thread -- if they are, let them comment by email.
+ WHERE og.uid = :og.uid AND
+ og.nid = :og.nid AND
+ og.nid = :og.nid AND
+ o.nid = :o.nid", array(':og.uid' => : og . uid, ':og.nid' => : og . nid, ':og.nid' => : og . nid, ':o.nid' => : o . nid, '' => array(
+ ':og.uid' => : og . uid,
+ ':og.nid' => : og . nid,
+ ':og.nid' => : og . nid,
+ ':o.nid' => : o . nid,
+ '' => array(
+ ':og.uid' => $email['userid'],
+ ':og.nid' => $email['groupid'],
+ ':og.nid' => n . nid,
+ ':o.nid' => og . nid,
+ ),
+ )));
+ if (!$results->fetchField()) { // TODO also check if person is subscribed to this thread -- if they are, let them comment by email.
throw new Exception(t("You (email: !mailfrom, account page: !account_page) are not a member of this group. Please join the group via the web site before posting.",
array('!mailfrom' => $mailfrom, '!account_page' => url("user/" . $email['userid'], array('absolute' => TRUE)))));
}
-
- // See if the email is a comment to an existing node or a new node.
+
+ // See if the email is a comment to an existing node or a new node.
// If the email is a comment to a node, we should be able to get the Node ID of the original node.
$email['nid'] = og_mailinglist_parse_nid($email['text_plain'], $email['structure']->headers);
-
+
// Create the new content in Drupal.
if (!empty($email['nid'])) { // a new comment
-
/* Two checks first before creating the comment.
* There are at least two reasons why an email could have a nid but not be
* intended as a new comment.
@@ -149,10 +173,13 @@ function _og_mailinglist_process_email($raw_email, $group_name) {
*/
// Does the detected nid belong to the same group as the email was forwarded to?
- $nid_groupid = db_result(db_query("SELECT group_nid
+ $nid_groupid = db_query("SELECT group_nid
FROM {og_ancestry}
- WHERE nid = %d", $email['nid']));
-
+ WHERE nid = :nid", array(':nid' => : nid, '' => array(
+ ':nid' => : nid,
+ '' => array(':nid' => $email['nid']),
+ )))->fetchField();
+
if ($nid_groupid != $email['groupid']) {
og_mailinglist_save_node($email);
exit(0); // So we don't save a comment as well
@@ -177,22 +204,23 @@ function _og_mailinglist_process_email($raw_email, $group_name) {
og_mailinglist_save_node($email);
exit(0); // So we don't save a comment as well.
}
-
+
// If we got this far, the email is definitely intended as a new comment.
og_mailinglist_save_comment($email);
-
+
}
- else { // A new node.
+ else { // A new node.
og_mailinglist_save_node($email);
}
-
+
// Tell Exim4 we had success!
- exit(0);
-
- }catch (Exception $e) {
+ exit(0);
+
+ }
+ catch (Exception $e) {
try {
// Compose an email back to the sender informing them of the problem.
- $head = Array();
+ $head = array();
$head[] = 'From: ' . variable_get("og_mailinglist_noreply_email", t("no-reply@" . variable_get("og_mailinglist_server_string", $_SERVER['SERVER_NAME'])));
$head[] = 'References: ' . $email['headers']['message-id'];
$head[] = 'In-Reply-To: ' . $email['headers']['message-id'];
@@ -202,24 +230,25 @@ function _og_mailinglist_process_email($raw_email, $group_name) {
$msgfrom = $email['headers']['from'];
$commentedbody = str_replace("\n", "\n> ", $mailbody);
$body = "An error occurred while processing your submission:
-
+
$errormsg
-
+
Please correct this error and try again, or contact the system administrator. Thank you.
-
+
On $msgdate, $msgfrom wrote:
> $commentedbody";
-
+
// send it off
if (!mail($email['headers']['from'], "Error processing message", $body, implode("\n", $head))) {
throw new Exception("Mail error");
}
-
+
// print error message to log, then quit
echo t("Error: !message\n", array('!message' => $e->getMessage()));
exit(0);
-
- }catch (Exception $e2) {
+
+ }
+ catch (Exception $e2) {
// if we get here, we couldn't even send an email back to sender, so just have Exim compose an error message and send back
echo t("Error: !e2 ::: Embedded Error: !e\n", array('!e2' => $e2->getMessage(), '!e' => $e->getMessage()));
exit(1);
@@ -227,10 +256,14 @@ function _og_mailinglist_process_email($raw_email, $group_name) {
}
}
+/**
+ * @todo Please document this function.
+ * @see http://drupal.org/node/1354
+ */
function og_mailinglist_save_comment($email) {
$nid = $email['nid'];
- $email['node'] = $node = node_load(array('nid' => $nid));
-
+ $email['node'] = $node = node_load($nid);
+
// Let other modules alter the new comment or delay posting for another time
// (e.g. a moderation module might want to delay posting for a time).
drupal_alter('og_mailinglist_new_email_comment', $email);
@@ -249,7 +282,7 @@ function og_mailinglist_save_comment($email) {
if (!user_access('post comments')) {
throw new Exception(t("You do not have rights to post comments in the system."));
}
-
+
// check that this post has comments enabled
if (node_comment_mode($nid) != COMMENT_NODE_READ_WRITE) {
throw new Exception(t("Comments have been disabled for this post."));
@@ -261,21 +294,23 @@ function og_mailinglist_save_comment($email) {
$comment = array();
$comment['uid'] = $email['userid'];
$comment['nid'] = $nid;
-
+
if (preg_match("/re:\s*\[.*?\]\s*(.*)/i", $email['headers']['subject'], $matches)) {
$comment['subject'] = $matches[1];
- }elseif (preg_match("/re: +(.*)/i", $email['headers']['subject'], $matches)) {
+ }
+ elseif (preg_match("/re: +(.*)/i", $email['headers']['subject'], $matches)) {
$comment['subject'] = $matches[1];
- }else{
+ }
+ else {
$comment['subject'] = $email['headers']['subject'];
}
$comment['comment'] = $mailbody;
-
+
// Get the cid that'll be used. Yes, this isn't a very pretty way to do this.
// If someone else creates a comment between now and when the comment is
// actually created, two emails will be sent out for this comment.
- $cid = 1 + db_result(db_query("SELECT cid FROM {comments} ORDER BY cid DESC LIMIT 1"));
-
+ $cid = 1 + db_query("SELECT cid FROM {comments} ORDER BY cid DESC LIMIT 1")->fetchField();
+
// Log that comment came from email so og_mailinglist_phpmailer doesn't send an email as well.
$parent_message_id = _og_mailinglist_get_thread_parent_messageid($email['headers']['in-reply-to'], $email['headers']['references']);
og_mailinglist_log_email_sent('email', $nid, $cid, $email['headers']['message-id'], $email['headers']['in-reply-to'], $email['headers']['references'], $parent_message_id);
@@ -284,12 +319,12 @@ function og_mailinglist_save_comment($email) {
drupal_alter('og_mailinglist_save_commment', $comment);
// Save the new comment.
- $cid = comment_save($comment);
-
+ $cid = comment_save($comment);
+
if (!$cid) {
throw new Exception(t("An unknown error occurred while saving your comment."));
- }
-
+ }
+
$comment['cid'] = $cid; // Not sure why this isn't added automatically.
_og_mailinglist_email_comment_email($email, $node, $comment);
@@ -297,10 +332,18 @@ function og_mailinglist_save_comment($email) {
$group_node = node_load($email['groupid']);
// Report activity to watchdog.
watchdog('og_mailinglist', t("Posted comment for @mailfrom to group @group_name for nid=@nid with cid=@cid",
- array('@mailfrom' => $sender->name, '@group_name' => $group_node->title,
- '@nid' => $node->nid, '@cid' => $cid)));
-}
-
+ array(
+ '@mailfrom' => $sender->name,
+ '@group_name' => $group_node->title,
+ '@nid' => $node->nid,
+ '@cid' => $cid,
+ )));
+}
+
+/**
+ * @todo Please document this function.
+ * @see http://drupal.org/node/1354
+ */
function og_mailinglist_save_node($email) {
// Let other modules alter the new node or delay posting for another time (e.g. a moderation module might want to delay posting for a time).
@@ -317,27 +360,30 @@ function og_mailinglist_save_node($email) {
// Get the nid that'll be used. Yes, this isn't a very pretty way to do this.
// If someone else creates a node between now and when the node is
// actually created, two emails will be sent out for this node.
- $nid = 1 + db_result(db_query("SELECT nid FROM {node} ORDER BY nid DESC LIMIT 1"));
-
+ $nid = 1 + db_query("SELECT nid FROM {node} ORDER BY nid DESC LIMIT 1")->fetchField();
+
// Log that comment came from email so og_mailinglist_phpmailer doesn't send an email as well.
og_mailinglist_log_email_sent('email', $nid, $cid, $email['headers']['message-id'], 0, 0, $email['headers']['message-id']);
-
+
// Is the group public? If not, we need to set the node as private.
- $is_private = db_result(db_query("SELECT og_private
+ $is_private = db_query("SELECT og_private
FROM {og}
- WHERE nid = %d", $email['groupid']));
-
+ WHERE nid = :nid", array(':nid' => : nid, '' => array(
+ ':nid' => : nid,
+ '' => array(':nid' => $email['groupid']),
+ )))->fetchField();
+
// The og_private table stores a 1 if the group is private and 0 if it's public.
// node_save() expects the opposite so we'll invert the value of $is_private.
$is_public = TRUE;
if ($is_private) {
$is_public = FALSE;
}
-
+
// Create the new node
$node->title = $email['headers']['subject'];
$node->uid = $email['userid'];
- $node->created = time();
+ $node->created = REQUEST_TIME;
$node->status = 1; // published
$node->promote = 0;
$node->sticky = 0;
@@ -347,7 +393,7 @@ function og_mailinglist_save_node($email) {
$node->og_public = $is_public;
$node->og_groups[$email['groupid']] = $email['groupid'];
$node->comment = variable_get("comment_$node_type", COMMENT_NODE_READ_WRITE);
-
+
//// Add attachments if any.TODO fix this someday. Best idea -- save mail objects w/ attachments. On cron scoop them up and add them to nodes/comments
//if (isset($email['attachments'])) {
// $nodeattachments = _og_mailinglist_save_attachments_temp_dir($email['attachments']);
@@ -359,7 +405,7 @@ function og_mailinglist_save_node($email) {
drupal_alter('og_mailinglist_save_node', $node);
node_save($node);
-
+
// Send off email.
_og_mailinglist_email_node_email($email, $node);
@@ -367,8 +413,11 @@ function og_mailinglist_save_node($email) {
$group_node = node_load($email['groupid']);
// Report activity to watchdog.
watchdog('og_mailinglist', t("Posted node for @mailfrom to group @group_name with nid=@nid.",
- array('@mailfrom' => $sender->name, '@group_name' => $group_node->title,
- '@nid' => $node->nid)));
+ array(
+ '@mailfrom' => $sender->name,
+ '@group_name' => $group_node->title,
+ '@nid' => $node->nid,
+ )));
}
function _og_mailinglist_email_node_email($email, $node) {
@@ -377,7 +426,7 @@ function _og_mailinglist_email_node_email($email, $node) {
$footer = _og_mailinglist_build_footer($node);
$email = _og_mailinglist_add_footer($email, $footer);
$email['new_email_text'] = _og_mailinglist_encode_email(array($email['structure']));
-
+
// Send it off.
_og_mailinglist_send_raw_email($email['new_email_text']);
@@ -393,17 +442,17 @@ function _og_mailinglist_email_comment_email($email, $node, $comment) {
$footer = _og_mailinglist_build_footer($node);
$email = _og_mailinglist_add_footer($email, $footer);
$email['new_email_text'] = _og_mailinglist_encode_email(array($email['structure']));
-
+
// Send it off.
_og_mailinglist_send_raw_email($email['new_email_text']);
}
function _og_mailinglist_parse_email($email) {
- $params['include_bodies'] = true;
- $params['decode_bodies'] = true;
- $params['decode_headers'] = true;
+ $params['include_bodies'] = true;
+ $params['decode_bodies'] = true;
+ $params['decode_headers'] = true;
$params['input'] = $email['original_email_text'];
-
+
// do the decode
$email['structure'] = clone $structure = Mail_mimeDecode::decode($params);
@@ -416,7 +465,7 @@ function _og_mailinglist_parse_email($email) {
$subPart = $part->parts;
foreach ($subPart as $j => $subPartPart) {
- if (isset($subPartPart->disposition) and ($subPartPart->disposition==='attachment')) {
+ if (isset($subPartPart->disposition) and ($subPartPart->disposition === 'attachment')) {
$email['attachments'][] = _og_mailinglist_parse_attachment($subPartPart);
}
elseif ($subPartPart->ctype_secondary == 'plain') {
@@ -428,7 +477,7 @@ function _og_mailinglist_parse_email($email) {
}
}
- if (isset($part->disposition) and ($part->disposition==='attachment')) {
+ if (isset($part->disposition) and ($part->disposition === 'attachment')) {
$email['attachments'][] = _og_mailinglist_parse_attachment($part);
}
elseif (($part->ctype_secondary == 'plain') && empty($email['text'])) {
@@ -453,7 +502,8 @@ function _og_mailinglist_parse_email($email) {
// Try to convert character set to UTF-8.
if (!empty($structure->ctype_parameters['charset'])) {
$email['text'] = drupal_convert_to_utf8($structure->body, $structure->ctype_parameters['charset']);
- } else {
+ }
+ else {
$email['text'] = $structure->body;
}
$email['html'] = check_markup($email['text']);
@@ -467,11 +517,11 @@ function _og_mailinglist_parse_email($email) {
// TODO figure out how to pull out sane HTML w/o funky css or other oddities.
$email['mailbody'] = $email['text'];
$email['isHTML'] = false;
-
+
// Save copy of the original mailbody
- $email['orig_mailbody'] = $email['mailbody'];
-
- return $email;
+ $email['orig_mailbody'] = $email['mailbody'];
+
+ return $email;
}
// TODO fix attachments for filefield
@@ -496,8 +546,8 @@ function _og_mailinglist_parse_content($part) {
function _og_mailinglist_save_files(&$node) {
global $user;
- $user = user_load(array('uid' => $node->uid));
-
+ $user = user_load($node->uid);
+
// If $node->og_mailinglist_attachments is empty or upload not installed just return
if (!$node->og_mailinglist_attachments || !module_exists('upload')) {
return;
@@ -509,17 +559,17 @@ function _og_mailinglist_save_files(&$node) {
//echo "didn't have permissions?\n\n";
return;
}
-
+
// Convert $node->og_mailinglist_attachments to $node->files ready for upload to use
foreach ($node->og_mailinglist_attachments as $filekey => $attachment) {
-
+
$limits = _upload_file_limits($user);
$validators = array(
'file_validate_extensions' => array($limits['extensions']),
'file_validate_image_resolution' => array($limits['resolution']),
'file_validate_size' => array($limits['file_size'], $limits['user_size']),
);
-
+
if ($file = _og_mailinglist_save_file($attachment, $validators)) {
// Create the $node->files elements
$file->list = variable_get('upload_list_default', 1);
@@ -552,15 +602,15 @@ function _og_mailinglist_save_file($attachment, $validators = array()) {
// @todo: this should not be here. we need to figure out the right place.
$extensions = '';
foreach ($user->roles as $rid => $name) {
- $extensions .= ' '. variable_get("upload_extensions_$rid",
+ $extensions .= ' ' . variable_get("upload_extensions_$rid",
variable_get('upload_extensions_default', 'jpg jpeg gif png txt html doc xls pdf ppt pps odt ods odp'));
}
-
+
// Begin building file object.
$file = new stdClass();
$file->filename = file_munge_filename(trim(basename($attachment['filename']), '.'), $extensions);
$file->filepath = $attachment['filepath'];
- $file->filemime = file_get_mimetype($file->filename);;
+ $file->filemime = file_get_mimetype($file->filename);
// Rename potentially executable files, to help prevent exploits.
if (preg_match('/\.(php|pl|py|cgi|asp|js)$/i', $file->filename) && (substr($file->filename, -4) != '.txt')) {
@@ -571,12 +621,12 @@ function _og_mailinglist_save_file($attachment, $validators = array()) {
// Create temporary name/path for newly uploaded files.
//if (!$dest) {
- $dest = file_destination(file_create_path($file->filename), FILE_EXISTS_RENAME);
+ $dest = file_destination(file_create_path($file->filename), FILE_EXISTS_RENAME);
//}
//$file->source = $source;
$file->destination = $dest;
$file->filesize = $attachment['filesize'];
-
+
// Call the validation functions.
$errors = array();
foreach ($validators as $function => $args) {
@@ -603,10 +653,10 @@ function _og_mailinglist_save_file($attachment, $validators = array()) {
// If we made it this far it's safe to record this file in the database.
$file->uid = $user->uid;
- $file->status = FILE_STATUS_TEMPORARY;
- $file->timestamp = time();
+ $file->status = ~FILE_STATUS_PERMANENT;
+ $file->timestamp = REQUEST_TIME;
drupal_write_record('files', $file);
-
+
// Return the results of the save operation
return $file;
@@ -618,7 +668,7 @@ function _og_mailinglist_save_attachments_temp_dir($attachments) {
// Save the data to temporary file
$temp_file = tempnam(file_directory_temp(), 'mail');
$filepath = file_save_data($info['data'], $temp_file);
-
+
// Add the item to the attachments array, and sanitise filename
$node_attachments[] = array(
'filename' => _og_mailinglist_sanitise_filename($info['filename']),
@@ -628,7 +678,7 @@ function _og_mailinglist_save_attachments_temp_dir($attachments) {
);
}
file_save_data("hello world", file_directory_path() . "/temp");
-
+
// Return the attachments
return $node_attachments;
@@ -660,13 +710,13 @@ function _og_mailinglist_create_new_email($email) {
$structure = _og_mailinglist_rewrite_headers($structure, $email);
$structure = _og_mailinglist_add_footer($structure, $email);
$email['new_email_text'] = _og_mailinglist_encode_email(array($structure));
-
+
return $email;
}
// Turn structure back into a plain text email using recursion.
function _og_mailinglist_encode_email($structure, $boundary = "", $email = "") {
- foreach($structure as $part) {
+ foreach ($structure as $part) {
if (empty($boundary)) {
$boundary = $part->ctype_parameters['boundary'];
}
@@ -681,10 +731,10 @@ function _og_mailinglist_encode_email($structure, $boundary = "", $email = "") {
if ($boundary) {
$last_line = array_pop(explode("\n", trim($email)));
if (strcmp(trim($last_line), trim("--" . $boundary)) != 0) {
- $email .= "--" . $boundary . "\n";
- }
+ $email .= "--" . $boundary . "\n";
+ }
}
-
+
$email .= _og_mailinglist_encode_email_headers($part->headers) . "\n";
// Encode the body as base64 if necessary
if ($part->headers['content-transfer-encoding'] == "base64") {
@@ -705,11 +755,11 @@ function _og_mailinglist_encode_email_headers($array) {
// We remove quoted-printable as content-transfer-encoding
// because mime_decode decodes that and PHP doesn't have a function
// AFAIK to reencode the text as quoted-printable.
- if ($value && $value !== "quoted-printable") {
- $header .= capitalize_headers($key, " -") . ": " . $value . "\n";
+ if ($value && $value !== "quoted-printable") {
+ $header .= capitalize_headers($key, " -") . ": " . $value . "\n";
}
}
-
+
return $header;
}
@@ -721,12 +771,12 @@ function _og_mailinglist_rewrite_headers($email, $node, $new_node = FALSE, $comm
$new_headers['mime-version'] = $headers['mime-version'];
$new_headers['date'] = $headers['date'];
if ($new_node) {
- $new_headers['subject'] = "[" . $group_node->ogm_email . "] " . $node->title;
+ $new_headers['subject'] = "[" . $group_node->ogm_email . "] " . $node->title;
}
else {
$new_headers['subject'] = $headers['subject'];
}
-
+
$new_headers['from'] = $headers['from'];
$new_headers['to'] = $group_node->ogm_email . "@" . variable_get('og_mailinglist_server_string', $_SERVER['SERVER_NAME']);
$new_headers['bcc'] =
@@ -734,7 +784,7 @@ function _og_mailinglist_rewrite_headers($email, $node, $new_node = FALSE, $comm
_og_mailinglist_get_subscribers($node, $new_node));
$new_headers['content-type'] = $headers['content-type'];
$new_headers['content-transfer-encoding'] = $headers['content-transfer-encoding'];
-
+
// Add a reply-to header directed to the group if enabled.
if (variable_get('og_mailinglist_reply_to_group', FALSE)) {
$new_headers['reply-to'] = $group_node->ogm_email . "@" . variable_get('og_mailinglist_server_string', $_SERVER['SERVER_NAME']);
@@ -746,98 +796,96 @@ function _og_mailinglist_rewrite_headers($email, $node, $new_node = FALSE, $comm
$new_headers['List-Post'] = "ogm_email . "@" .
variable_get('og_mailinglist_server_string', $_SERVER['SERVER_NAME']) . ">";
$new_headers['List-Archive'] = url("node/" . $group_node->nid, array('absolute' => TRUE));
-
+
// Thread-URL header.
global $base_url;
$new_headers['X-Thread-Url'] = $base_url . "/node/" . $node->nid;
-
+
// Set x-BeenThere header
$new_headers['X-BeenThere'] = $group_node->ogm_email . "@" .
variable_get('og_mailinglist_server_string', $_SERVER['SERVER_NAME']);
// Set Message-Id
$new_headers['Message-ID'] = $email['headers']['message-id'];
-
+
// Set References
$new_headers['References'] = $email['headers']['references'];
// Set In-Reply-To.
$new_headers['in-reply-to'] = $email['headers']['in-reply-to'];
-
+
$email['structure']->headers = $new_headers;
-
+
return $email;
}
function _og_mailinglist_add_footer($email, $footer) {
$headers = $email['structure']->headers;
$structure = $email['structure'];
-
- // If message is 7/8bit text/plain and uses us-ascii charecter set, just
+
+ // If message is 7/8bit text/plain and uses us-ascii charecter set, just
// append the footer.
if (preg_match('/^text\/plain/i', $headers['content-type']) &&
isset($structure->body)) {
- $structure->body .= "\n" . $footer;
+ $structure->body .= "\n" . $footer;
}
// If message is already multipart, just append new part with footer to end
// /^multipart\/(mixed|related)/i
- elseif (preg_match('/^multipart\/(mixed|related)/i', $headers['content-type'])
- && isset($structure->parts)) {
+ elseif (preg_match('/^multipart\/(mixed|related)/i', $headers['content-type'])
+ && isset($structure->parts)) {
$structure->parts[] = (object) array(
- "headers" => array(
- "content-type" => 'text/plain; charset="us-ascii"',
- "mime-version" => '1.0',
- "content-transfer-encoding" => '7bit',
- "content-disposition" => 'inline',
- ),
+ "headers" => array(
+ "content-type" => 'text/plain; charset="us-ascii"',
+ "mime-version" => '1.0',
+ "content-transfer-encoding" => '7bit',
+ "content-disposition" => 'inline',
+ ),
"ctype_primary" => 'text',
"ctype_secondary" => 'plain',
"ctype_parameters" => array(
"charset" => 'us-ascii',
),
-
- "disposition" => 'inline',
- "body" => $footer,
+ "disposition" => 'inline',
+ "body" => $footer,
);
}
- else {
+ else {
// Else, move existing fields into new MIME entity surrounded by new multipart
// and append footer field to end.
$structure->headers['mime-version'] = "1.0";
$boundary = "Drupal-OG-Mailing-List--" . rand(100000000, 9999999999999);
-
+
// Copy email, remove headers from copy, rewrite the content-type, add
// email copy as parts.
$content_type = $structure->headers['content-type'];
$str_clone = clone $structure;
$str_clone->headers = array('content-type' => $content_type);
-
+
$structure->headers['content-type'] = "multipart/mixed; boundary=\"" .
$boundary . "\"";
$structure->ctype_primary = "multipart";
$structure->ctype_secondary = "mixed";
$structure->ctype_parameters = array('boundary' => $boundary);
$structure->parts = array($str_clone);
- $structure->parts[] = (object) array(
+ $structure->parts[] = (object) array(
"headers" => array(
"content-type" => 'text/plain; charset="us-ascii"',
"mime-version" => '1.0',
"content-transfer-encoding" => '7bit',
"content-disposition" => 'inline',
- ),
- "ctype_primary" => 'text',
- "ctype_secondary" => 'plain',
- "ctype_parameters" => array(
- "charset" => 'us-ascii',
- ),
-
+ ),
+ "ctype_primary" => 'text',
+ "ctype_secondary" => 'plain',
+ "ctype_parameters" => array(
+ "charset" => 'us-ascii',
+ ),
"disposition" => 'inline',
"body" => $footer,
- );
+ );
}
-
+
$email['structure'] = $structure;
-
+
return $email;
}
@@ -850,6 +898,10 @@ function _og_mailinglist_send_raw_email($raw_email) {
/*
* Try to parse nid from the email.
*/
+/**
+ * @todo Please document this function.
+ * @see http://drupal.org/node/1354
+ */
function og_mailinglist_parse_nid($email, $headers) {
$nid = "";
// Check the in-reply-to header.
@@ -873,11 +925,12 @@ function _og_mailinglist_nid_of_subject($subject) {
preg_match("/[Rr][Ee]:\s\[.*?\]\s(.+)/s", $subject, $matches);
$title = $matches[1];
if ($title) {
- $nid = db_result(db_query("SELECT nid
- FROM {node}
- WHERE title like '%%s%'
- ORDER BY created desc
- LIMIT 1", $title));
+ $nid = db_query('node')
+ ->fields('nid')
+ ->condition('title', "%$title%", 'LIKE')
+ ->orderBy('created', 'desc')
+ ->range(0, 1)
+ ->execute()->fetchField();
}
return $nid;
}
diff --git a/og_mailinglist_utilities.inc b/og_mailinglist_utilities.inc
index faa032d..f839fde 100644
--- a/og_mailinglist_utilities.inc
+++ b/og_mailinglist_utilities.inc
@@ -12,13 +12,16 @@ function _og_mailinglist_get_subscribers($node, $new_node = FALSE) {
else { // this is a new comment.
$subscribers = og_mailinglist_get_thread_subscriptions($node->nid);
}
-
+
if (is_numeric(variable_get('og_mailinglist_test_email_address', ''))) {
$uid = variable_get('og_mailinglist_test_email_address', '');
- $email = db_result(db_query("SELECT mail FROM {users} WHERE uid = %d", $uid));
+ $email = db_query("SELECT mail FROM {users} WHERE uid = :uid", array(':uid' => : uid, '' => array(
+ ':uid' => : uid,
+ '' => array(':uid' => $uid),
+ )))->fetchField();
$uids[$uid] = $email;
}
-
+
return $subscribers;
}
@@ -31,26 +34,41 @@ function array_to_comma_delimited_string($array) {
}
function _og_mailinglist_build_footer($node) {
- $footer = "--
+ $footer = "--
Full post: " . url("node/" . $node->nid, array('absolute' => TRUE)) . "
Manage my subscriptions: " . url("og_mailinglist/subscriptions", array('absolute' => TRUE)) . "
Stop emails for this post: " . url("og_mailinglist/unsubscribe/" . $node->nid, array("absolute" => TRUE));
-
+
return $footer;
}
+/**
+ * @todo Please document this function.
+ * @see http://drupal.org/node/1354
+ */
function og_mailinglist_prepare_web_content($text) {
return check_markup($text);
}
- function _og_mailinglist_email_already_sent($nid, $cid = 0) {
- return (db_result(db_query("SELECT nid
+function _og_mailinglist_email_already_sent($nid, $cid = 0) {
+ return (db_query("SELECT nid
FROM {og_mailinglist_source}
- WHERE nid = %d
- AND cid = %d", $nid, $cid)));
+ WHERE nid = :nid
+ AND cid = :cid", array(':nid' => : nid, ':cid' => : cid, '' => array(
+ ':nid' => : nid,
+ ':cid' => : cid,
+ '' => array(
+ ':nid' => $nid,
+ ':cid' => $cid,
+ ),
+ )))->fetchField());
}
+/**
+ * @todo Please document this function.
+ * @see http://drupal.org/node/1354
+ */
function og_mailinglist_build_web_footer($node, $body, $cid = 0) {
$footer = _og_mailinglist_build_footer($node);
$footer = og_mailinglist_prepare_web_content($footer);
@@ -62,26 +80,26 @@ function og_mailinglist_build_web_footer($node, $body, $cid = 0) {
function dd_log($data, $label = "") {
$my_file = "/tmp/drupal_log";
- $fh = fopen($my_file, 'a') or die("can't open file");
+ $fh = fopen($my_file, 'a') or ("can't open file");
ob_start();
print_r($data);
$string_data = ob_get_clean();
-
+
if (!empty($label)) {
$string_data = $label . ": " . $string_data;
}
-
+
fwrite($fh, $string_data . "\n");
fclose($fh);
}
function write_string_to_file($data, $name = "lsjdf") {
$myFile = "/tmp/" . $name;
- $fh = fopen($myFile, 'w') or die("can't open file");
+ $fh = fopen($myFile, 'w') or ("can't open file");
ob_start();
print_r($data);
$stringData = ob_get_clean();
-
+
fwrite($fh, $stringData . "\n");
fclose($fh);
}
@@ -92,44 +110,49 @@ function write_string_to_file($data, $name = "lsjdf") {
* @param array $aSource
* @return array copy of source array
*/
-function array_copy ($aSource) {
- // check if input is really an array
- if (!is_array($aSource)) {
- throw new Exception("Input is not an Array");
+function array_copy($aSource) {
+ // check if input is really an array
+ if (!is_array($aSource)) {
+ throw new Exception("Input is not an Array");
+ }
+
+ // initialize return array
+ $aRetAr = array();
+
+ // get array keys
+ $aKeys = array_keys($aSource);
+ // get array values
+ $aVals = array_values($aSource);
+
+ // loop through array and assign keys+values to new return array
+ for ($x = 0; $x < count($aKeys); $x++) {
+ // clone if object
+ if (is_object($aVals[$x])) {
+ $aRetAr[$aKeys[$x]] = clone $aVals[$x];
+ // recursively add array
}
-
- // initialize return array
- $aRetAr = array();
-
- // get array keys
- $aKeys = array_keys($aSource);
- // get array values
- $aVals = array_values($aSource);
-
- // loop through array and assign keys+values to new return array
- for ($x=0;$x db_result(db_query("SELECT group_nid
+ $group_node = node_load(db_query("SELECT group_nid
FROM {og_ancestry}
- WHERE nid = %d", $node->nid))));
+ WHERE nid = :nid", array(':nid' => : nid, '' => array(
+ ':nid' => : nid,
+ '' => array(':nid' => $node->nid),
+ )))->fetchField());
if (!empty($group_node)) {
return $group_node;
}
@@ -146,24 +169,25 @@ function _og_mailinglist_load_group($node) {
* Function taken from http://www.php.net/manual/en/function.ucwords.php#95325
*/
function capitalize_headers($words, $charList = null) {
- // Use ucwords if no delimiters are given
- if (!isset($charList)) {
- return ucwords($words);
- }
+ // Use ucwords if no delimiters are given
+ if (!isset($charList)) {
+ return ucwords($words);
+ }
- // Go through all characters
- $capitalizeNext = true;
+ // Go through all characters
+ $capitalizeNext = true;
- for ($i = 0, $max = strlen($words); $i < $max; $i++) {
- if (strpos($charList, $words[$i]) !== false) {
- $capitalizeNext = true;
- } else if ($capitalizeNext) {
- $capitalizeNext = false;
- $words[$i] = strtoupper($words[$i]);
- }
+ for ($i = 0, $max = strlen($words); $i < $max; $i++) {
+ if (strpos($charList, $words[$i]) !== false) {
+ $capitalizeNext = true;
+ }
+ else if ($capitalizeNext) {
+ $capitalizeNext = false;
+ $words[$i] = strtoupper($words[$i]);
}
+ }
- return $words;
+ return $words;
}
/**
@@ -177,16 +201,16 @@ function og_mailinglist_phpmailer_load_library() {
// First, try using libraries module.
if (module_exists('libraries')) {
// Let's see if PHPMailer is really available from libraries.
- $phpmailer_library = './'. libraries_get_path('phpmailer') .'/class.phpmailer.php';
+ $phpmailer_library = './' . libraries_get_path('phpmailer') . '/class.phpmailer.php';
if (file_exists($phpmailer_library)) {
- include_once $phpmailer_library;
+ include_once DRUPAL_ROOT . '/' . $phpmailer_library;
}
}
// If PHPMailer is not already loaded, then try from module subdirectory.
if (!class_exists('PHPMailer')) {
- $phpmailer_library = './'. drupal_get_path('module', 'og_mailinglist') .'/phpmailer/class.phpmailer.php';
+ $phpmailer_library = './' . drupal_get_path('module', 'og_mailinglist') . '/phpmailer/class.phpmailer.php';
if (file_exists($phpmailer_library)) {
- include_once $phpmailer_library;
+ include_once DRUPAL_ROOT . '/' . $phpmailer_library;
}
}
}
@@ -194,37 +218,41 @@ function og_mailinglist_phpmailer_load_library() {
return class_exists('PHPMailer');
}
+/**
+ * @todo Please document this function.
+ * @see http://drupal.org/node/1354
+ */
function og_mailinglist_mimeDecode_load_library() {
if (!class_exists('Mail_mimeDecode')) {
// First we'll try grabbing the file from a few default pear install locations.
if (file_exists('Mail/mimeDecode.php')) {
- include_once('Mail/mimeDecode.php');
+ include_once DRUPAL_ROOT . '/' . 'Mail/mimeDecode.php';
}
if (!class_exists('Mail_mimeDecode')) {
if (file_exists('/usr/share/php/Mail/mimeDecode.php')) {
- include_once('/usr/share/php/Mail/mimeDecode.php');
+ include_once DRUPAL_ROOT . '/' . '/usr/share/php/Mail/mimeDecode.php';
}
}
if (!class_exists('Mail_mimeDecode')) {
if (file_exists('/usr/share/pear/Mail/mimeDecode.php')) {
- include_once('/usr/share/pear/Mail/mimeDecode.php');
+ include_once DRUPAL_ROOT . '/' . '/usr/share/pear/Mail/mimeDecode.php';
}
}
// If that didn't work, let's try using the libraries module.
if (!class_exists('Mail_mimeDecode')) {
if (module_exists('libraries')) {
// Let's see if PHPMailer is really available from libraries.
- $Mail_mimeDecode_library = './'. libraries_get_path('mimeDecode') .'/mimeDecode.php';
+ $Mail_mimeDecode_library = './' . libraries_get_path('mimeDecode') . '/mimeDecode.php';
if (file_exists($Mail_mimeDecode_library)) {
- include_once $Mail_mimeDecode_library;
+ include_once DRUPAL_ROOT . '/' . $Mail_mimeDecode_library;
}
}
}
// If Mail_mimeDecode is still not loaded, then try from module subdirectory.
if (!class_exists('Mail_mimeDecode')) {
- $Mail_mimeDecode_library = './'. drupal_get_path('module', 'og_mailinglist') .'/mimeDecode/mimeDecode.php';
+ $Mail_mimeDecode_library = './' . drupal_get_path('module', 'og_mailinglist') . '/mimeDecode/mimeDecode.php';
if (file_exists($Mail_mimeDecode_library)) {
- include_once $Mail_mimeDecode_library;
+ include_once DRUPAL_ROOT . '/' . $Mail_mimeDecode_library;
}
}