Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.

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

diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php
index 8ecfe7373de5b24cc79bbf5ec5c23f05326b0b56..97ddc438a632055f2ebc0daaeb774a396be0c261 100644 (file)
--- a/inc/libs/newsletter_functions.php
+++ b/inc/libs/newsletter_functions.php
@@ -14,12 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -40,7 +38,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 //
 function insertNewsletterUrls ($text) {
@@ -52,11 +50,13 @@ function insertNewsletterUrls ($text) {
 
                // See ext-html.php if you want to add more URL ends...
                foreach ($GLOBALS['url_ends'] as $end) {
-                       if (isInString($end, $check)) $check = substr($check, 0, strpos($check, $end));
+                       if (isInString($end, $check)) {
+                               $check = substr($check, 0, strpos($check, $end));
+                       } // END - if
                } // END - foreach
 
                // Now replace the URL against anchor container and pray...
-               $text = substr($text, 0, strpos($text, $check2)) . generateDerefererUrl($check) . substr($text, strpos($text, $check2) + strlen($check));
+               $text = substr($text, 0, strpos($text, $check2)) . generateDereferrerUrl($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));
@@ -78,11 +78,10 @@ function insertNewsletterUrls ($text) {
                $idx = $pos - 1;
                while ($idx > 0) {
                        $check = substr($test2, $idx, 1);
-                       if (!in_array($check, $GLOBALS['valid_email_chars']))
-                       {
+                       if (!in_array($check, $GLOBALS['valid_email_chars'])) {
                                // Char found so we end here
                                break;
-                       }
+                       } // END - if
                        $idx--;
                }
 
@@ -90,45 +89,46 @@ function insertNewsletterUrls ($text) {
                        // Starting mark is found
                        $check2 = substr($test, 0, ($idx + 1));
                        $test = substr($test, ($idx + 1));
-               }
+               } // END - if
 
                // And now go forward...
-               $idx = '0';
+               $idx = 0;
                while ($idx < strlen($test)) {
                        $check = substr($test, $idx, 1);
                        if ((!in_array($check, $GLOBALS['valid_email_chars'])) && ($check != '@')) {
                                // Char found so end here again
                                break;
-                       }
+                       } // END - if
                        $idx++;
-               }
+               } // END - while
 
                if ($idx > 0) {
                        // Maybe this is the email address?
                        $check = substr($test, 0, $idx);
-               }
+               } // END - if
 
                // Now replace the email against anchor with mailto and pray...
-               $PARTS[] = $check2 . $check;
+               array_push($PARTS, $check2 . $check);
 
                // Remove email from testing string (see above why...)
                $test = substr($test, strlen($check));
-       }
+       } // END - while
 
        // Now put all parts together
-       $text = ''; $PARTS[] = $test;
+       $text = '';
+       array_push($PARTS, $test);
        foreach ($PARTS as $part) {
                $text .= $part;
-       }
+       } // END - foreach
 
-       // Compile possible own HTML tags out...
-       return compileCode($text);
+       // Pre-ompile possible own HTML tags out...
+       return preCompileCode($text);
 }
 
 // Wrapper for sending newsletter and wrapping URLs / HTML mail
 function sendNewsletter ($to, $subject, $message, $mode) {
        // Send mail away as HTML
-       if (postRequestParameter('auto_urls') == 'Y') {
+       if (postRequestElement('auto_urls') == 'Y') {
                // Automatically insert URLs into newsletter
                if ((isExtensionActive('html_mail')) && ($mode == 'html')) {
                        // Send HTML mail
@@ -147,5 +147,5 @@ function sendNewsletter ($to, $subject, $message, $mode) {
        }
 }
 
-//
+// [EOF]
 ?>