Fixes and cleanups

[mailer.git] / inc / filter / surfbar_filter.php

diff --git a/inc/filter/surfbar_filter.php b/inc/filter/surfbar_filter.php
index 0039754f2f7291af35dbca92003f45a219d2d96a..85c220a289fd947a93385449ce084132c37a91fc 100644 (file)
--- a/inc/filter/surfbar_filter.php
+++ b/inc/filter/surfbar_filter.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * 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 *
@@ -43,6 +43,7 @@ if (!defined('__SECURITY')) {
 // Filter for changing URL status
 function FILTER_SURFBAR_CHANGE_URL_STATUS ($filterData) {
        // Prepare content for notification routines
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
        $filterData['data'][$filterData['url_id']]['url_userid']  = $filterData['data'][$filterData['url_id']]['url_userid'];
        $filterData['data'][$filterData['url_id']]['frametester'] = '{%pipe,generateFrametesterUrl=' . $filterData['data'][$filterData['url_id']]['url'] . '%}';
        $filterData['data'][$filterData['url_id']]['reward']      = '{%config,translateComma=surfbar_static_reward%}';
@@ -61,6 +62,26 @@ function FILTER_SURFBAR_CHANGE_URL_STATUS ($filterData) {
        SURFBAR_NOTIFY_USER('url_' . strtolower($filterData['data'][$filterData['url_id']]['url_status']) . '_' . $filterData['new_status'], $filterData['data'][$filterData['url_id']]);
 
        // Return filter data
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
+       return $filterData;
+}
+
+// Filter for validating status
+function FILTER_SURFBAR_CHANGE_URL_VALIDATE_DATA ($filterData) {
+       // Is the new status set?
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
+       if ((!is_string($filterData['new_status'])) || (empty($filterData['new_status']))) {
+               // Abort here, but fine!
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'newStatus[' . gettype($filterData['new_status']) . ']=' . $filterData['new_status'] . ' - EXIT!');
+               $filterData['abort'] = true;
+       } elseif ($filterData['data'][$filterData['url_id']]['url_status'] != $filterData['prev_status']) {
+               // Status is not like prevStatus
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $filterData['data'][$filterData['url_id']]['url_status'] . '!=' . $filterData['prev_status'] . ' - EXIT!');
+               $filterData['abort'] = false;
+       } // END - if
+
+       // Return filter data
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
        return $filterData;
 }