diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/EmailNotification.php | 61 | ||||
| -rw-r--r-- | include/bbcode.php | 2 | ||||
| -rw-r--r-- | include/main.js | 9 | ||||
| -rw-r--r-- | include/nav.php | 4 |
4 files changed, 74 insertions, 2 deletions
diff --git a/include/EmailNotification.php b/include/EmailNotification.php new file mode 100644 index 000000000..209d5476a --- /dev/null +++ b/include/EmailNotification.php @@ -0,0 +1,61 @@ +<?php +class EmailNotification { + /** + * Send a multipart/alternative message with Text and HTML versions + * + * @param fromName name of the sender + * @param fromEmail email fo the sender + * @param replyTo replyTo address to direct responses + * @param toEmail destination email address + * @param messageSubject subject of the message + * @param htmlVersion html version of the message + * @param textVersion text only version of the message + */ + static public function sendTextHtmlEmail($fromName,$fromEmail,$replyTo,$toEmail,$messageSubject,$htmlVersion,$textVersion) { + logger("sendTextHtmlEmail: BEGIN"); + logger("fromName: " . $fromName); + logger("fromEmail: " . $fromEmail); + logger("replyTo: " . $replyTo); + logger("toEmail: " . $toEmail); + logger("messageSubject: " . $messageSubject); + //logger("htmlVersion: " . $htmlVersion); + //logger("textVersion: " . $textVersion); + + // generate a mime boundary + $mimeBoundary =rand(0,9)."-" + .rand(10000000000,9999999999)."-" + .rand(10000000000,9999999999)."=:" + .rand(10000,99999); + + // generate a multipart/alternative message header + $messageHeader = + "From: {$fromName} <{$fromEmail}>\n" . + "Reply-To: {$replyTo}\n" . + "MIME-Version: 1.0\n" . + "Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\""; + + // assemble the final multipart message body with the text and html types included + $textBody = chunk_split(base64_encode($textVersion)); + $htmlBody = chunk_split(base64_encode($htmlVersion)); + $multipartMessageBody = + "--" . $mimeBoundary . "\n" . // plain text section + "Content-Type: text/plain; charset=UTF-8\n" . + "Content-Transfer-Encoding: base64\n\n" . + $textBody . "\n" . + "--" . $mimeBoundary . "\n" . // text/html section + "Content-Type: text/html; charset=UTF-8\n" . + "Content-Transfer-Encoding: base64\n\n" . + $htmlBody . "\n" . + "--" . $mimeBoundary . "--\n"; // message ending + + // send the message + $res = mail( + $toEmail, // send to address + $messageSubject, // subject + $multipartMessageBody, // message body + $messageHeader // message headers + ); + logger("sendTextHtmlEmail: END"); + } +} +?>
\ No newline at end of file diff --git a/include/bbcode.php b/include/bbcode.php index c55ebab00..978b4af69 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -22,7 +22,7 @@ function bbcode($Text) { // Perform URL Search - $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%\$\!]+)/", ' <a href="$2" target="external-link">$2</a>', $Text); + $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%\$\!\+]+)/", ' <a href="$2" target="external-link">$2</a>', $Text); $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '<a href="$1" target="external-link">$1</a>', $Text); $Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '<a href="$1" target="external-link">$2</a>', $Text); diff --git a/include/main.js b/include/main.js index abd097e54..824f2dfdf 100644 --- a/include/main.js +++ b/include/main.js @@ -108,7 +108,10 @@ prev = 'live-' + src; in_progress = true; - $.get('update_' + src + '?p=' + profile_uid + '&msie=' + ((msie) ? 1 : 0),function(data) { + var udargs = ((netargs.length) ? '/' + netargs : ''); + var update_url = 'update_' + src + udargs + '?p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0); + + $.get(update_url,function(data) { in_progress = false; $('.wall-item-outside-wrapper',data).each(function() { var ident = $(this).attr('id'); @@ -225,6 +228,10 @@ if(timer) clearTimeout(timer); timer = setTimeout(NavUpdate,10); } + if(data.reload) { + window.location.href=data.reload; + } + }, "json" ); diff --git a/include/nav.php b/include/nav.php index 94a71d227..228774d95 100644 --- a/include/nav.php +++ b/include/nav.php @@ -56,6 +56,10 @@ $a->page['nav'] .= '<a id="nav-register-link" class="nav-commlink" href="register" >' . t('Register') . "</a>\r\n"; + if(strlen($a->apps)) { + $a->page['nav'] .= '<a id="nav-apps-link" class="nav-link" href="apps">' . t('Apps') . "</a>\r\n"; + } + $a->page['nav'] .= '<a id="nav-search-link" class="nav-link" href="search">' . t('Search') . "</a>\r\n"; $a->page['nav'] .= '<a id="nav-directory-link" class="nav-link" href="directory">' . t('Directory') . "</a>\r\n"; |