Added script template for cron jobs, fixed some checks on CSS/HTML mode

diff --git a/.gitattributes b/.gitattributes
index 4ce171147d102b307d2280b80c5d38001eac4f6b..757daa1c31acc78c6df537f811d236e66893363e 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -305,6 +305,8 @@ inc/install/install_page_5.php svneol=native#text/plain
 inc/install/install_page_finalize.php svneol=native#text/plain
 inc/install/install_page_finished.php svneol=native#text/plain
 inc/install/install_page_welcome.php svneol=native#text/plain
+inc/jobs/.htaccess svneol=native#text/plain
+inc/jobs/job_ svneol=native#text/plain
 inc/js/.htaccess svneol=native#text/plain
 inc/js/js- svneol=native#text/plain
 inc/js/js-admin_ajax.php svneol=native#text/plain

diff --git a/inc/daily/daily_ b/inc/daily/daily_
index ed360158a2266e9ae1223ad66055e5ba8562a0dc..9dc6242bd7ebc126f03c9cfe5fda8a044bed483f 100644 (file)
--- a/inc/daily/daily_
+++ b/inc/daily/daily_
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no daily reset
+       // Do not execute when script is in non-HTML mode or no daily reset
        return;
 } elseif (!isExtensionActive('')) {
        if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext- disabled.');

diff --git a/inc/daily/daily_100_bonus.php b/inc/daily/daily_100_bonus.php
index 622e598a90187534466f288531c965b440f62e50..e62ffbb9f057e861500a9b63f8c3c4db8cbfd0a9 100644 (file)
--- a/inc/daily/daily_100_bonus.php
+++ b/inc/daily/daily_100_bonus.php
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no daily reset
+       // Do not execute when script is in non-HTML mode or no daily reset
        return;
 } elseif (!isExtensionActive('bonus')) {
        if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-bonus disabled.');

diff --git a/inc/daily/daily_autopurge.php b/inc/daily/daily_autopurge.php
index 7d18667b26b16efe4c3a2839f661e786287f6552..61ef29aa0cdecb61dc5fd24a5f2f972aa9d1925b 100644 (file)
--- a/inc/daily/daily_autopurge.php
+++ b/inc/daily/daily_autopurge.php
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no daily reset
+       // Do not execute when script is in non-HTML mode or no daily reset
        return;
 } elseif (!isExtensionActive('autopurge')) {
        if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-autopurge disabled.');

diff --git a/inc/daily/daily_beg.php b/inc/daily/daily_beg.php
index 05321b1e814d1dada1e29265e44795bd6cbee987..5970927f954e54010146cf7c42ad69592a8c37a1 100644 (file)
--- a/inc/daily/daily_beg.php
+++ b/inc/daily/daily_beg.php
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no daily reset
+       // Do not execute when script is in non-HTML mode or no daily reset
        return;
 } elseif (!isExtensionActive('beg')) {
        if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-beg disabled.');

diff --git a/inc/daily/daily_birthday.php b/inc/daily/daily_birthday.php
index a724e2220bd51c3561cadfebf3e8900131a81db2..a4de24302ce2160e2166331c9558590a6d5bf78d 100644 (file)
--- a/inc/daily/daily_birthday.php
+++ b/inc/daily/daily_birthday.php
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode
+       // Do not execute when script is in non-HTML mode
        return;
 } elseif (!isExtensionActive('birthday')) {
        // Extension not active/installed

diff --git a/inc/daily/daily_bonus.php b/inc/daily/daily_bonus.php
index 47681aeb6070775cbbf11915ac6dd62eecffc62f..ac7c83c3ab63183a07b9adaddd77f41f8ec94b0d 100644 (file)
--- a/inc/daily/daily_bonus.php
+++ b/inc/daily/daily_bonus.php
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no daily reset
+       // Do not execute when script is in non-HTML mode or no daily reset
        return;
 } elseif (!isExtensionActive('bonus')) {
        if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-bonus disabled.');

diff --git a/inc/daily/daily_doubler.php b/inc/daily/daily_doubler.php
index b316f9c28a97dd2b8fa09a2d4e75cabea3dfd0cc..b6a81caa24d9c7a3ff9201d4f1b68b07e6768426 100644 (file)
--- a/inc/daily/daily_doubler.php
+++ b/inc/daily/daily_doubler.php
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no daily reset
+       // Do not execute when script is in non-HTML mode or no daily reset
        return;
 } elseif ((!isExtensionActive('doubler')) || (getDoublerSendMode() != 'RESET')) {
        if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-doubler disabled.');

diff --git a/inc/daily/daily_earning.php b/inc/daily/daily_earning.php
index f6c0c5d495210ac6f28ab1a7214063affc427fe6..ca7c19ef3cb01eddff1c97d4abd085b90ba741aa 100644 (file)
--- a/inc/daily/daily_earning.php
+++ b/inc/daily/daily_earning.php
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no daily reset
+       // Do not execute when script is in non-HTML mode or no daily reset
        return;
 } elseif (!isExtensionActive('earning')) {
        if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-earning disabled.');

diff --git a/inc/daily/daily_holiday.php b/inc/daily/daily_holiday.php
index dcf962f325913fe64fb9a0053151a8497816d50b..4f759d7710745af94a141b5ee7fbe5d3e42f6cac 100644 (file)
--- a/inc/daily/daily_holiday.php
+++ b/inc/daily/daily_holiday.php
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isHtmlOutputMode()) || ((!isResetModeEnabled()) && (getConfig('holiday_mode') == 'RESET'))) {
-       // Do not execute when script is in CSS mode or no daily reset
+       // Do not execute when script is in non-HTML mode or no daily reset
        return;
 } elseif (!isExtensionActive('holiday')) {
        if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-holiday disabled.');

diff --git a/inc/daily/daily_order.php b/inc/daily/daily_order.php
index d424e14c8cbd3ef29d10459263767d8ca518b0ae..2789b2b6ed8007c7f340ae3d2a1057c93f6a7768 100644 (file)
--- a/inc/daily/daily_order.php
+++ b/inc/daily/daily_order.php
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no daily reset
+       // Do not execute when script is in non-HTML mode or no daily reset
        return;
 } elseif (!isExtensionActive('order')) {
        if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-order disabled.');

diff --git a/inc/daily/daily_profile.php b/inc/daily/daily_profile.php
index 70b0eb96b5882a04e60810b13e90016a87f053a1..4fdda8ba0d6939334d5e05c4dc05546e176f07ca 100644 (file)
--- a/inc/daily/daily_profile.php
+++ b/inc/daily/daily_profile.php
@@ -40,7 +40,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no daily reset
+       // Do not execute when script is in non-HTML mode or no daily reset
        return;
 } elseif (!isExtensionActive('profile')) {
        logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-profile disabled.');

diff --git a/inc/daily/daily_surfbar.php b/inc/daily/daily_surfbar.php
index 44ad1881407db95aa806a53ff4a081d60779fcd3..9d9790a4eb103b4b1a83def629109451f30d2f70 100644 (file)
--- a/inc/daily/daily_surfbar.php
+++ b/inc/daily/daily_surfbar.php
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no daily reset
+       // Do not execute when script is in non-HTML mode or no daily reset
        return;
 } elseif (!isExtensionActive('surfbar')) {
        if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-surfbar disabled.');

diff --git a/inc/daily/daily_user.php b/inc/daily/daily_user.php
index 35483f6a7637e922424e7e665d2814d0f4e9fd12..ec4fc49acf6db0684ed9ec24dc8d08174905ff3a 100644 (file)
--- a/inc/daily/daily_user.php
+++ b/inc/daily/daily_user.php
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no daily reset
+       // Do not execute when script is in non-HTML mode or no daily reset
        return;
 } elseif ((!isExtensionActive('sql_patches')) || (!isExtensionActive('user'))) {
        if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension(s) ext-sql_patches/ext-user disabled.');

diff --git a/inc/daily/daily_user_subids.php b/inc/daily/daily_user_subids.php
index 449350faa90ca31a66d999b7c24d6a8853dd7333..84df36e3f0f05bc63853bb2ed916691dab96a895 100644 (file)
--- a/inc/daily/daily_user_subids.php
+++ b/inc/daily/daily_user_subids.php
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no daily reset
+       // Do not execute when script is in non-HTML mode or no daily reset
        return;
 } elseif (!isExtensionInstalledAndNewer('user', '0.5.8')) {
        if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-user disabled or out-dated.');

diff --git a/inc/daily/daily_yoomedia.php b/inc/daily/daily_yoomedia.php
index d1827deacefcefb192c32a0eef93c3ac9171389c..d2ecafdbcd33463fb9a1b093894c40429d46ac07 100644 (file)
--- a/inc/daily/daily_yoomedia.php
+++ b/inc/daily/daily_yoomedia.php
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no daily reset
+       // Do not execute when script is in non-HTML mode or no daily reset
        return;
 } elseif (!isExtensionActive('yoomedia')) {
        if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-yoomedia disabled.');

diff --git a/inc/hourly/hourly_ b/inc/hourly/hourly_
index 9d501114ab9f248f2891968ba785bf1704398a62..42c7659d111593bfce59f908f1f982e351af0e00 100644 (file)
--- a/inc/hourly/hourly_
+++ b/inc/hourly/hourly_
@@ -38,8 +38,8 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((isCssOutputMode()) || (isHourlyResetEnabled()) || (!isExtensionInstalledAndNewer('sql_patches', '0.7.5'))) {
-       // Do not execute when script is in CSS mode or no hourly reset
+} elseif ((!isHtmlOutputMode()) || (isHourlyResetEnabled()) || (!isExtensionInstalledAndNewer('sql_patches', '0.7.5'))) {
+       // Do not execute when script is in non-HTML mode or no hourly reset
        return;
 } elseif (!isExtensionActive('')) {
        if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext- disabled.');

diff --git a/inc/jobs/.htaccess b/inc/jobs/.htaccess
new file mode 100644 (file)
index 0000000..3a42882
--- /dev/null
+++ b/inc/jobs/.htaccess
@@ -0,0 +1 @@
+Deny from all

diff --git a/inc/jobs/job_ b/inc/jobs/job_
new file mode 100644 (file)
index 0000000..6433a01
--- /dev/null
+++ b/inc/jobs/job_
@@ -0,0 +1,56 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 01/12/2013 *
+ * ===================                          Last change: 01/12/2013 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : job_                                             *
+ * -------------------------------------------------------------------- *
+ * Short description : Cron jobs for ext-                               *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Cronjobs fuer ext-                               *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2012 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 *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+       die();
+} elseif (!isHtmlOutputMode()) {
+       // Do not execute when script is in non-HTML mode or no daily reset
+       return;
+} elseif (!isExtensionActive('')) {
+       if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext- disabled.');
+       return;
+}
+
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Cron job started.');
+
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Cron job ended.');
+
+// [EOF]
+?>

diff --git a/inc/monthly/monthly_ b/inc/monthly/monthly_
index ff113267fbe82ae6a637d5bab326df0fb9847af4..a6cd3a91d7a8619ab928a405957f90befb0fdc42 100644 (file)
--- a/inc/monthly/monthly_
+++ b/inc/monthly/monthly_
@@ -38,8 +38,8 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((isCssOutputMode()) || (isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no hourly reset
+} elseif ((!isHtmlOutputMode()) || (isResetModeEnabled())) {
+       // Do not execute when script is in non-HTML mode or no hourly reset
        return;
 } elseif (!isExtensionActive('')) {
        if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext- disabled.');

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 9c09db69859b77eebf5153832fd8dabc74328911..0d6dd424bdc0aa30dedc16992a6fa9ab826201de 100644 (file)
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -38,8 +38,8 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no hourly reset
+} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
+       // Do not execute when script is in non-HTML mode or no hourly reset
        return;
 } elseif ((!isExtensionActive('beg')) || (!isBegRallyeEnabled())) {
        if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-beg disabled.');

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index c663790830b35e5198ace5cb4a30c4350708f517..eb640a1bac8ae30cfbc5c5092b7702a69aa5c710 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -38,8 +38,8 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no hourly reset
+} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
+       // Do not execute when script is in non-HTML mode or no hourly reset
        return;
 } elseif (!isExtensionActive('bonus')) {
        if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-bonus disabled.');

diff --git a/inc/monthly/monthly_newsletter.php b/inc/monthly/monthly_newsletter.php
index 34927f259599b01736d65f0e07118c133c10d0bb..58a1aabd418310235984f1c3cd1cc37b3b3aeb87 100644 (file)
--- a/inc/monthly/monthly_newsletter.php
+++ b/inc/monthly/monthly_newsletter.php
@@ -38,8 +38,8 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no hourly reset
+} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
+       // Do not execute when script is in non-HTML mode or no hourly reset
        return;
 } elseif (!isExtensionActive('newsletter')) {
        logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-newsletter disabled.');

diff --git a/inc/monthly/monthly_surfbar.php b/inc/monthly/monthly_surfbar.php
index 9c73218b6c9bbe9c6e66fd496615c16287d2f975..ce88cf52041173b53489859e6c9a49b89f31bd67 100644 (file)
--- a/inc/monthly/monthly_surfbar.php
+++ b/inc/monthly/monthly_surfbar.php
@@ -38,8 +38,8 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no hourly reset
+} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
+       // Do not execute when script is in non-HTML mode or no hourly reset
        return;
 } elseif (!isExtensionActive('surfbar')) {
        logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-surfbar disabled.');

diff --git a/inc/weekly/weekly_ b/inc/weekly/weekly_
index fd2662f93a2d963957e6280ce424f692dc9bed22..b7b17bb69ade1725297b39da26f9e46f33cd5660 100644 (file)
--- a/inc/weekly/weekly_
+++ b/inc/weekly/weekly_
@@ -38,8 +38,8 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no daily reset
+} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
+       // Do not execute when script is in non-HTML mode or no daily reset
        return;
 } elseif (!isExtensionActive('')) {
        if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext- disabled.');

diff --git a/inc/weekly/weekly_surfbar.php b/inc/weekly/weekly_surfbar.php
index 8d7b7b95886fae2787dc514a74cc97df77d69334..07fe708c018dfc978df835ddb6f7801584adf3cd 100644 (file)
--- a/inc/weekly/weekly_surfbar.php
+++ b/inc/weekly/weekly_surfbar.php
@@ -38,8 +38,8 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no daily reset
+} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
+       // Do not execute when script is in non-HTML mode or no daily reset
        return;
 } elseif (!isExtensionActive('surfbar')) {
        logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-surfbar disabled.');