Huge script change, see http://forum.mxchange.org/topic-458.html for details:

[mailer.git] / inc / libs / newsletter_functions.php

diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php
index 2c77e3a802cb06159ceccc11ae9673143c4549ab..e2f9b722709802685e3a10ed108d4497463e91e1 100644 (file)
--- a/inc/libs/newsletter_functions.php
+++ b/inc/libs/newsletter_functions.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,39 +38,11 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
+       die();
 }
 
 //
-function NL_ADD_VALID_TAGS () {
-       $OUT = '';
-       if (!is_array($GLOBALS['html_tags'])) return "";
-       foreach ($GLOBALS['html_tags'] as $tag) {
-               $OUT .= ", ".strtoupper($tag);
-       }
-       $OUT = substr($OUT, 2);
-       return $OUT;
-}
-
-//
-function NL_CHECK_TAGS ($html) {
-       $test = stripslashes($html);
-       while (ereg('<', $test) && ereg('>', $test)) {
-               $check = strtolower(substr($test, strpos($test, '<') + 1, strpos($test, '>') - strpos($test, '<') - 1));
-               $check = str_replace('/', '', $check);
-               if (!in_array($check, $GLOBALS['html_tags'])) {
-                       // Invalid tag found!
-                       return "";
-               }
-               $test = substr($test, strpos($test, '>') + 1);
-       }
-       // Return tested code
-       return $html;
-}
-
-//
-function NL_INSERT_URLS ($text) {
+function insertNewsletterUrls ($text) {
        $test = $text;
 
        // First replace URLs...
@@ -83,7 +55,7 @@ function NL_INSERT_URLS ($text) {
                } // END - foreach
 
                // Now replace the URL against anchor container and pray...
-               $text = substr($text, 0, strpos($text, $check2)) . DEREFERER($check) . substr($text, strpos($text, $check2) + strlen($check));
+               $text = substr($text, 0, strpos($text, $check2)) . generateDerefererUrl($check) . substr($text, strpos($text, $check2) + strlen($check));
 
                // Finally remove the url from testing string (or we have a loop and maybe server overload!)
                $test = substr($test, strpos($test, $check) + strlen($check));
@@ -149,24 +121,24 @@ function NL_INSERT_URLS ($text) {
        }
 
        // Compile possible own HTML tags out...
-       return COMPILE_CODE($text);
+       return compileCode($text);
 }
 
-//
-function SEND_NEWSLETTER ($to, $subject, $message, $mode) {
+// Wrapper for sending newsletter and wrapping URLs / HTML mail
+function sendNewsletter ($to, $subject, $message, $mode) {
        // Send mail away as HTML
-       if (REQUEST_POST('auto_urls') == 'Y') {
+       if (postRequestElement('auto_urls') == 'Y') {
                // Automatically insert URLs into newsletter
-               if ((EXT_IS_ACTIVE('html_mail')) && ($mode == 'html')) {
+               if ((isExtensionActive('html_mail')) && ($mode == 'html')) {
                        // Send HTML mail
-                       sendEmail($to, $subject, HTML_INSERT_URLS($message), 'Y');
+                       sendEmail($to, $subject, insertUrlsIntoHtml($message), 'Y');
                } else {
                        // Send normal mail
-                       sendEmail($to, $subject, NL_INSERT_URLS($message), 'N');
+                       sendEmail($to, $subject, insertNewsletterUrls($message), 'N');
                }
        } else {
                // Regular send-out
-               if ((EXT_IS_ACTIVE('html_mail')) && ($mode == 'html')) {
+               if ((isExtensionActive('html_mail')) && ($mode == 'html')) {
                        sendEmail($to, $subject, $message, 'Y');
                } else {
                        sendEmail($to, $subject, $message, 'N');