From: Roland Häder Date: Sat, 11 Oct 2008 14:39:26 +0000 (+0000) Subject: Default wait time now 60 seconds, some fixes X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=a4fc56f660a422a080ff241bd86b772a5b5d0c53 Default wait time now 60 seconds, some fixes --- diff --git a/inc/extensions/ext-yoomedia.php b/inc/extensions/ext-yoomedia.php index 8aeccec957..f6d1876e65 100644 --- a/inc/extensions/ext-yoomedia.php +++ b/inc/extensions/ext-yoomedia.php @@ -56,7 +56,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `yoomedia_passwd` VARCHAR(255) NOT NULL DEFAULT ''"; $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `yoomedia_erotic_allowed` TINYINT(2) NOT NULL DEFAULT 0"; $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `yoomedia_tm_max_reload` SMALLINT(6) NOT NULL DEFAULT ".(24 * 8).""; - $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `yoomedia_tm_min_wait` SMALLINT(6) NOT NULL DEFAULT 0"; + $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `yoomedia_tm_min_wait` SMALLINT(6) NOT NULL DEFAULT 60"; $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `yoomedia_tm_clicks_remain` INT(7) NOT NULL DEFAULT 1000"; $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `yoomedia_tm_min_pay` FLOAT(20,5) NOT NULL DEFAULT 0.00000"; $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `yoomedia_requests_total` SMALLINT(6) NOT NULL DEFAULT 200"; diff --git a/inc/functions.php b/inc/functions.php index 70f99efe2b..e9eb668102 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -196,13 +196,18 @@ function OUTPUT_RAW ($HTML) { // Add a fatal error message to the queue array function ADD_FATAL ($message, $extra="") { global $FATAL; + if (empty($extra)) { // Regular text message to add to $FATAL $FATAL[] = $message; } else { // $message is text with a mask plus extras to insert into the text - $FATAL[] = sprintf($message, $extra); + $message = sprintf($message, $extra); + $FATAL[] = $message; } + + // Log fatal messages away + DEBUG_LOG(__FUNCTION__."(".__LINE__."): message={$message}"); } // Load a template file and return it's content (only it's name; do not use ' or ") diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php index d02865c36c..2b34fa214c 100644 --- a/inc/libs/task_functions.php +++ b/inc/libs/task_functions.php @@ -336,6 +336,14 @@ ORDER BY d.userid"; $TITLEs[] = TASK_ADMIN_LIST_HOLIDAYS_TITLE; } + if (GET_EXT_VERSION("bonus") >= "0.8.7") { + // List all notifications + $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_bonus WHERE is_notify='Y' ORDER BY timestamp DESC"; + $WHATs[] = "list_notifications"; + $DESCRs[] = TASK_ADMIN_LIST_NOTIFICATIONS; + $TITLEs[] = TASK_ADMIN_LIST_NOTIFICATIONS_TITLE; + } // END - if + if (GET_EXT_VERSION("bonus") >= "0.2.3") { // Active rallye if (GET_EXT_VERSION("bonus") >= "0.6.9") { @@ -366,14 +374,6 @@ ORDER BY active_bonus DESC, userid"; $WHATs[] = "list_bonus"; $DESCRs[] = TASK_ADMIN_LIST_BONUS; $TITLEs[] = TASK_ADMIN_LIST_BONUS_TITLE; - - if (GET_EXT_VERSION("bonus") >= "0.8.7") { - // List all notifications - $SQLs[] = "SELECT id FROM "._MYSQL_PREFIX."_bonus WHERE is_notify='Y' ORDER BY timestamp DESC"; - $WHATs[] = "list_notifications"; - $DESCRs[] = TASK_ADMIN_LIST_NOTIFICATIONS; - $TITLEs[] = TASK_ADMIN_LIST_NOTIFICATIONS_TITLE; - } } if (GET_EXT_VERSION("beg") >= "0.1.2") {