From: Roland Häder Date: Fri, 10 Oct 2008 23:52:54 +0000 (+0000) Subject: Extension 'yoomedia' now alpha status, some rewrites X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=357b2ca133fc1f89db74097955c366cb4bee6996 Extension 'yoomedia' now alpha status, some rewrites - The extension 'yoomedia' is now in alpha phase and allows the admin to sent text mails provided by the partner network "Yoo!Media Solutions" - Function ADD_DESCR() now calls basename() on parameter $file, so all action- and what-files needs to be rewritten - Mouse cursor re-styled on delete buttons - Typo fixed in extension files - Bonus-mail delivery rewritten in many script parts --- diff --git a/.gitattributes b/.gitattributes index 2949079f5d..f20f91370f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -196,6 +196,7 @@ inc/language/top10_de.php -text inc/language/transfer_de.php -text inc/language/user_de.php -text inc/language/wernis_de.php -text +inc/language/yoomedia_de.php -text inc/libs/.htaccess -text inc/libs/admins_functions.php -text inc/libs/autopurge_functions.php -text @@ -224,6 +225,7 @@ inc/libs/task_functions.php -text inc/libs/transfer_functions.php -text inc/libs/user_functions.php -text inc/libs/wernis_functions.php -text +inc/libs/yoomedia_functions.php -text inc/load_cache.php -text inc/load_extensions.php -text inc/loader/.htaccess -text @@ -327,6 +329,7 @@ inc/modules/admin/what-config_top10.php -text inc/modules/admin/what-config_transfer.php -text inc/modules/admin/what-config_user.php -text inc/modules/admin/what-config_wernis.php -text +inc/modules/admin/what-config_yoomedia.php -text inc/modules/admin/what-del_email.php -text inc/modules/admin/what-del_holiday.php -text inc/modules/admin/what-del_sponsor.php -text @@ -369,6 +372,7 @@ inc/modules/admin/what-list_transfer.php -text inc/modules/admin/what-list_unconfirmed.php -text inc/modules/admin/what-list_user.php -text inc/modules/admin/what-list_wernis.php -text +inc/modules/admin/what-list_yoomedia_tm.php -text inc/modules/admin/what-lock_sponsor.php -text inc/modules/admin/what-lock_user.php -text inc/modules/admin/what-logs.php -text @@ -572,6 +576,7 @@ inc/reset/reset_daily.php -text inc/reset/reset_engine.php -text inc/reset/reset_holiday.php -text inc/reset/reset_surfbar.php -text +inc/reset/reset_yoomedia.php -text inc/security.php -text inc/session.php -text inc/sql_error.php -text @@ -857,6 +862,7 @@ templates/de/html/admin/admin_config_top10.tpl -text templates/de/html/admin/admin_config_transfer.tpl -text templates/de/html/admin/admin_config_user.tpl -text templates/de/html/admin/admin_config_wernis.tpl -text +templates/de/html/admin/admin_config_yoomedia.tpl -text templates/de/html/admin/admin_contct_user_form.tpl -text templates/de/html/admin/admin_data_saved.tpl -text templates/de/html/admin/admin_del_admins.tpl -text @@ -999,6 +1005,9 @@ templates/de/html/admin/admin_list_user_sort.tpl -text templates/de/html/admin/admin_list_user_sort_form.tpl -text templates/de/html/admin/admin_list_wernis_main.tpl -text templates/de/html/admin/admin_list_wernis_row.tpl -text +templates/de/html/admin/admin_list_yoomedia_tm.tpl -text +templates/de/html/admin/admin_list_yoomedia_tm_already.tpl -text +templates/de/html/admin/admin_list_yoomedia_tm_row.tpl -text templates/de/html/admin/admin_lock_sponsor.tpl -text templates/de/html/admin/admin_lock_surfbar_urls.tpl -text templates/de/html/admin/admin_lock_surfbar_urls_row.tpl -text @@ -1081,6 +1090,7 @@ templates/de/html/admin/admin_reset_password_form.tpl -text templates/de/html/admin/admin_send_bonus_form.tpl -text templates/de/html/admin/admin_send_bonus_select.tpl -text templates/de/html/admin/admin_send_reset_link.tpl -text +templates/de/html/admin/admin_send_yoomedia.tpl -text templates/de/html/admin/admin_settings_saved.tpl -text templates/de/html/admin/admin_sponsor_paytypes.tpl -text templates/de/html/admin/admin_sub_points.tpl -text @@ -1107,6 +1117,7 @@ templates/de/html/admin/admin_user_details.tpl -text templates/de/html/admin/admin_validate_reset_hash_form.tpl -text templates/de/html/admin/admin_welcome.tpl -text templates/de/html/admin/admin_welcome_admins.tpl -text +templates/de/html/admin/admin_yoomedia_error.tpl -text templates/de/html/agb.tpl -text templates/de/html/beg/.htaccess -text templates/de/html/beg/beg_banner.tpl -text diff --git a/inc/databases.php b/inc/databases.php index 2ba324390a..f2a552eb8b 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -113,7 +113,7 @@ define('USAGE_BASE', "usage"); define('SERVER_URL', "http://www.mxchange.org"); // This current patch level -define('CURR_SVN_REVISION', "485"); +define('CURR_SVN_REVISION', "486"); // Take a prime number which is long (if you know a longer one please try it out!) define('_PRIME', 591623); diff --git a/inc/extensions/ext- b/inc/extensions/ext- index d5f3294ef3..a60ee01b4b 100644 --- a/inc/extensions/ext- +++ b/inc/extensions/ext- @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0"); switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run // Load CSS file? diff --git a/inc/extensions/ext-active.php b/inc/extensions/ext-active.php index d3d013a19f..7b3e4dafcc 100644 --- a/inc/extensions/ext-active.php +++ b/inc/extensions/ext-active.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','active','Heute Online', 10, 'N','Y')"; diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php index 8b389d011a..6746286960 100644 --- a/inc/extensions/ext-admins.php +++ b/inc/extensions/ext-admins.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.1", "0.2", "0.3", "0.3.1", "0.4.0", "0.4.1", switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE action='admins' LIMIT 1"; $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins', NULL, 'Admin-Management','Administratoren anlegen, löschen oder Passwort/E-Mail Adresse ändern.','1')"; diff --git a/inc/extensions/ext-admintheme1.php b/inc/extensions/ext-admintheme1.php index 4780f01029..516ebaf98b 100644 --- a/inc/extensions/ext-admintheme1.php +++ b/inc/extensions/ext-admintheme1.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0"); switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // Remove all other themes $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_extensions WHERE ext_name LIKE 'admintheme%'"; $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET action='stats' WHERE what='usr_online' LIMIT 1"; diff --git a/inc/extensions/ext-admintheme_default.php b/inc/extensions/ext-admintheme_default.php index 6e3c8befc0..189a43eb21 100644 --- a/inc/extensions/ext-admintheme_default.php +++ b/inc/extensions/ext-admintheme_default.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0"); switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // Remove all other menu themes $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_extensions WHERE ext_name LIKE 'admintheme%'"; $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET action='misc' WHERE what='usr_online' LIMIT 1"; diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php index b8205c2f06..192c9838a7 100644 --- a/inc/extensions/ext-autopurge.php +++ b/inc/extensions/ext-autopurge.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.1", "0.1.1", "0.1.2", "0.1.3", "0.1.4", "0.1. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_pool MODIFY data_type ENUM('TEMP','SEND','NEW','ADMIN','ACTIVE','DELETED') NOT NULL DEFAULT 'TEMP'"; if (EXT_IS_ACTIVE("bonus")) diff --git a/inc/extensions/ext-bank.php b/inc/extensions/ext-bank.php index 12f02fabf1..1f9d217f89 100644 --- a/inc/extensions/ext-bank.php +++ b/inc/extensions/ext-bank.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0"); switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_bank_accounts"; $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_bank_accounts ( diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php index 3b1daa75c8..75416b5512 100644 --- a/inc/extensions/ext-beg.php +++ b/inc/extensions/ext-beg.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','config_beg','Bettel-Link','IP-Sperre, {!POINTS!}-Vergütung usw. können Sie hier einstellen.', 10)"; $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','beg','{!POINTS!} erbetteln!',4,'Y','Y')"; diff --git a/inc/extensions/ext-birthday.php b/inc/extensions/ext-birthday.php index 17d538640a..05c8c0f409 100644 --- a/inc/extensions/ext-birthday.php +++ b/inc/extensions/ext-birthday.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.1", "0.2", "0.2.1", "0.2.2", "0.2.3", "0.2.4" switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD birthday_sent VARCHAR(10) NOT NULL DEFAULT '0'"; break; diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php index 6b20192940..223d4fe752 100644 --- a/inc/extensions/ext-bonus.php +++ b/inc/extensions/ext-bonus.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.1.6", "0.2.0", "0.2.1", "0.2.2", "0.2.3", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu VALUES (NULL,'email','send_bonus','Bonusmail senden',5,'Versenden Sie hier Bonus-Mails an alle Mitglieder oder nur an alle aus einer Kategorie. Es spielt keine Rolle, wie viele Mails bereits versendet worden, Sie können hier immer senden.')"; $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu VALUES (NULL,'main','bonus','Bonuspunkte',7,'Y','Y','', 0)"; diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php index f1db9c8cca..d4516d5575 100644 --- a/inc/extensions/ext-cache.php +++ b/inc/extensions/ext-cache.php @@ -49,7 +49,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_update BIGINT(20) UNSIGNED NOT NULL DEFAULT '3600'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD cache_path VARCHAR(255) NOT NULL DEFAULT 'cache/'"; diff --git a/inc/extensions/ext-country.php b/inc/extensions/ext-country.php index c1bfb2b7b1..85f5e932a2 100644 --- a/inc/extensions/ext-country.php +++ b/inc/extensions/ext-country.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4"); switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_countries"; $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_countries ( diff --git a/inc/extensions/ext-demo.php b/inc/extensions/ext-demo.php index 220a5e296e..cf3d37c6c0 100644 --- a/inc/extensions/ext-demo.php +++ b/inc/extensions/ext-demo.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1"); switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = ""; break; diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php index 98470a4e1b..05149fb04e 100644 --- a/inc/extensions/ext-doubler.php +++ b/inc/extensions/ext-doubler.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // Doubler table $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_doubler"; $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_doubler ( diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php index 1d6a3187ab..503e85e99e 100644 --- a/inc/extensions/ext-holiday.php +++ b/inc/extensions/ext-holiday.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // Create database $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_user_holidays"; $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_user_holidays ( diff --git a/inc/extensions/ext-html_mail.php b/inc/extensions/ext-html_mail.php index 9c223e3f49..e499eb5c9b 100644 --- a/inc/extensions/ext-html_mail.php +++ b/inc/extensions/ext-html_mail.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD html ENUM('Y','N') NOT NULL DEFAULT 'Y'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_bonus ADD html_msg ENUM('Y','N') NOT NULL DEFAULT 'N'"; diff --git a/inc/extensions/ext-mailid.php b/inc/extensions/ext-mailid.php index 5a0d8d4fb4..34bac1b734 100644 --- a/inc/extensions/ext-mailid.php +++ b/inc/extensions/ext-mailid.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = ""; break; diff --git a/inc/extensions/ext-maintenance.php b/inc/extensions/ext-maintenance.php index e3e299e2db..02204d499d 100644 --- a/inc/extensions/ext-maintenance.php +++ b/inc/extensions/ext-maintenance.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD maintenance ENUM('Y','N') NOT NULL DEFAULT 'N';"; $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','maintenance','Wartungsmodus','Schalten Sie den Wartungsmodus ein, nur wenn sehr schwerwiegende Fehler vorliegen, die Sie oder mxchange.org nicht schenll genug beheben können.','10')"; diff --git a/inc/extensions/ext-mediadata.php b/inc/extensions/ext-mediadata.php index 2b13616708..bdc66a1802 100644 --- a/inc/extensions/ext-mediadata.php +++ b/inc/extensions/ext-mediadata.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = ""; break; diff --git a/inc/extensions/ext-mods.php b/inc/extensions/ext-mods.php index 01f5954c3a..d22292a91a 100644 --- a/inc/extensions/ext-mods.php +++ b/inc/extensions/ext-mods.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('mods', NULL, 'Modul-Management','Verwalten Sie die Basis-Module index, login, admin usw.', 4)"; $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('mods','config_mods','Module ändern','Ändern Sie hier die Zugtiffsrechte auf die Module. Was dennoch nicht geht: Mitglied- oder Gastzugriffsrtechte auf Admin-Module bzw. Gastzugriffsrechte auf Mitglieder-Module. Diese sind extra abgesichert.', 1)"; diff --git a/inc/extensions/ext-mydata.php b/inc/extensions/ext-mydata.php index 32b1f1efa6..5324dbef13 100644 --- a/inc/extensions/ext-mydata.php +++ b/inc/extensions/ext-mydata.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = ""; break; diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php index 648cdb1cdd..3ad4f224e1 100644 --- a/inc/extensions/ext-newsletter.php +++ b/inc/extensions/ext-newsletter.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = ""; break; diff --git a/inc/extensions/ext-nickname.php b/inc/extensions/ext-nickname.php index 3ef849f832..642e8307cf 100644 --- a/inc/extensions/ext-nickname.php +++ b/inc/extensions/ext-nickname.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nickname VARCHAR(255) NOT NULL DEFAULT ''"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD nick_uid ENUM ('nick','uid') NOT NULL DEFAULT 'uid'"; diff --git a/inc/extensions/ext-online.php b/inc/extensions/ext-online.php index 6b1fa94f44..7e450d82d1 100644 --- a/inc/extensions/ext-online.php +++ b/inc/extensions/ext-online.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4"); switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_online"; $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_online ( diff --git a/inc/extensions/ext-optimize.php b/inc/extensions/ext-optimize.php index 695c60b100..b9e3053df0 100644 --- a/inc/extensions/ext-optimize.php +++ b/inc/extensions/ext-optimize.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_optimize_gain( id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, diff --git a/inc/extensions/ext-order.php b/inc/extensions/ext-order.php index 5a7d2a924f..969b05d5c7 100644 --- a/inc/extensions/ext-order.php +++ b/inc/extensions/ext-order.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.1", "0.1.1", "0.1.2", "0.1.3", "0.1.4", "0.1. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = ""; break; diff --git a/inc/extensions/ext-other.php b/inc/extensions/ext-other.php index c365f2cf55..0c84baa6ac 100644 --- a/inc/extensions/ext-other.php +++ b/inc/extensions/ext-other.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = ""; break; diff --git a/inc/extensions/ext-payout.php b/inc/extensions/ext-payout.php index be3ef40a8e..cb5b9bf1e6 100644 --- a/inc/extensions/ext-payout.php +++ b/inc/extensions/ext-payout.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.1", "0.1.1", "0.1.2", "0.1.3", "0.1.4", "0.1. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_user_payouts"; $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_user_payouts ( diff --git a/inc/extensions/ext-primera.php b/inc/extensions/ext-primera.php index 11ea3b372c..eb378ec7f0 100644 --- a/inc/extensions/ext-primera.php +++ b/inc/extensions/ext-primera.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0"); switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_user_primera"; $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_user_primera ( diff --git a/inc/extensions/ext-profile.php b/inc/extensions/ext-profile.php index c8da12066b..745eabfd02 100644 --- a/inc/extensions/ext-profile.php +++ b/inc/extensions/ext-profile.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = ""; break; diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php index 32dfcbf2e0..479f50667c 100644 --- a/inc/extensions/ext-rallye.php +++ b/inc/extensions/ext-rallye.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_rallye_data"; $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_rallye_prices"; diff --git a/inc/extensions/ext-refback.php b/inc/extensions/ext-refback.php index 42c7767fa0..092466ba65 100644 --- a/inc/extensions/ext-refback.php +++ b/inc/extensions/ext-refback.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0","0.0.1"); switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_user_refs`"; $SQLs[] = "CREATE TABLE `"._MYSQL_PREFIX."_user_refs` ( diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php index c087748a9a..a9a071a9b3 100644 --- a/inc/extensions/ext-register.php +++ b/inc/extensions/ext-register.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.1", "0.1.1", "0.1.2", "0.1.3", "0.1.4", "0.1. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = ""; diff --git a/inc/extensions/ext-removeip.php b/inc/extensions/ext-removeip.php index 977e676578..3e71c56f53 100644 --- a/inc/extensions/ext-removeip.php +++ b/inc/extensions/ext-removeip.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0"); switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD `removeip_anon_ip` ENUM('Y','N') NOT NULL DEFAULT 'Y'"; $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD `removeip_anon_host` ENUM('Y','N') NOT NULL DEFAULT 'Y'"; diff --git a/inc/extensions/ext-repair.php b/inc/extensions/ext-repair.php index 20e442d81c..c31611dc46 100644 --- a/inc/extensions/ext-repair.php +++ b/inc/extensions/ext-repair.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.1", "0.1.1", "0.1.2", "0.1.3", "0.1.4", "0.1. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('repair', NULL, 'Reperaturen','7','Repariert u.a. die Kategorie-Auswahlen der Mitglieder usw.')"; $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('repair','repair_cats','Kategorieauswahlen','1','Repariert die Kategorieauswahlen Ihrer Mitglieder.')"; diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php index d0741fd8ae..909080785a 100644 --- a/inc/extensions/ext-rewrite.php +++ b/inc/extensions/ext-rewrite.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = ""; break; diff --git a/inc/extensions/ext-safe.php b/inc/extensions/ext-safe.php index 690d6835ea..b747e64f2b 100644 --- a/inc/extensions/ext-safe.php +++ b/inc/extensions/ext-safe.php @@ -49,7 +49,7 @@ $EXT_VER_HISTORY = array("0.0"); switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run break; diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php index 3147b41835..d9126a87c7 100644 --- a/inc/extensions/ext-sponsor.php +++ b/inc/extensions/ext-sponsor.php @@ -47,7 +47,7 @@ $EXT_VER_HISTORY = array("0.0"); switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // // SQL commands to run // diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index 87300c92c2..fbc7a8067e 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = ""; break; diff --git a/inc/extensions/ext-support.php b/inc/extensions/ext-support.php index b8d6d89779..3737987e32 100644 --- a/inc/extensions/ext-support.php +++ b/inc/extensions/ext-support.php @@ -45,7 +45,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = ""; break; diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php index e67e15bb1d..7566b5a2ea 100644 --- a/inc/extensions/ext-surfbar.php +++ b/inc/extensions/ext-surfbar.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0"); switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run (surfbar URLs) $SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_surfbar_urls`"; $SQLs[] = "CREATE TABLE `"._MYSQL_PREFIX."_surfbar_urls` ( diff --git a/inc/extensions/ext-task.php b/inc/extensions/ext-task.php index f8c740bfb2..8143d0c3c8 100644 --- a/inc/extensions/ext-task.php +++ b/inc/extensions/ext-task.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('task', NULL, 'Aufgaben-Management','1','Erweitertes Aufgaben-Management zur leichten verwaltung der vom System erzeugten Aufgaben.')"; $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, sort, descr) VALUES ('task','list_task','Aufgaben auflisten','1','Alle Ihnen zugewiesenen Aufgaben auflisten (keine Updates).')"; diff --git a/inc/extensions/ext-theme.php b/inc/extensions/ext-theme.php index 84a4728350..59a38db105 100644 --- a/inc/extensions/ext-theme.php +++ b/inc/extensions/ext-theme.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('theme','theme_check','Prüfen','Nach neuen Themes suchen bzw. nach Updates zu den Themes suchen.', 3)"; break; diff --git a/inc/extensions/ext-top10.php b/inc/extensions/ext-top10.php index 358367b597..ae4028831a 100644 --- a/inc/extensions/ext-top10.php +++ b/inc/extensions/ext-top10.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_guest_menu (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','top10','TOP-10','Y','Y', 7)"; $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_top10','TOP-10 Listen','Stellen Sie hier ein, wie lang die TOP-Listen sein sollen, also wie viele Plätze angezeigt werden sollen.', 8)"; diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php index 77b6cad0c7..982efbecfb 100644 --- a/inc/extensions/ext-transfer.php +++ b/inc/extensions/ext-transfer.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running +case "register": // Do stuff when installation is running // SQL commands to run $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_user_transfers_in"; $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_user_transfers_out"; diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php index d62590ede9..9d3c4655b7 100644 --- a/inc/extensions/ext-user.php +++ b/inc/extensions/ext-user.php @@ -45,7 +45,7 @@ $EXT_VER_HISTORY = array("0.0", "0.1", "0.1.1", "0.1.2", "0.1.2", "0.1.3", "0.1. switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = ""; diff --git a/inc/extensions/ext-wernis.php b/inc/extensions/ext-wernis.php index 672ec5089d..097c7c879a 100644 --- a/inc/extensions/ext-wernis.php +++ b/inc/extensions/ext-wernis.php @@ -48,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.0.1"); switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_user_wernis"; $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_user_wernis ( diff --git a/inc/extensions/ext-yoomedia.php b/inc/extensions/ext-yoomedia.php index 99724405e3..a8951fdd16 100644 --- a/inc/extensions/ext-yoomedia.php +++ b/inc/extensions/ext-yoomedia.php @@ -49,13 +49,40 @@ $EXT_VER_HISTORY = array("0.0"); switch ($EXT_LOAD_MODE) { -case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called) +case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called) // SQL commands to run - $SQLs[] = ""; + $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `yoomedia_id` BIGINT(20) NOT NULL DEFAULT 0"; + $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `yoomedia_sid` BIGINT(20) NOT NULL DEFAULT 0"; + $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_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"; + $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD `yoomedia_requests_remain` SMALLINT(6) NOT NULL DEFAULT 200"; + + // Admin menu + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES('setup','config_yoomedia','Yoo!Media Interface 2.0','Einstellungen zum Yoo!Media Interface 2.0, wie User-ID, Interface-Passwort und vieles mehr.',17)"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES('email','list_yoomedia_tm','Yoo!Media Textmails','Listet Textmail-Buchungen über das Interface 2.0 von Yoo!Media nach Ihren eingestellten Kriterien auf. Vorsicht: Jede Aktualisierung dieser Liste kostet Ihnen eine Abfrage!',10)"; + + // Reload lock table + $SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_yoomedia_reload`"; + $SQLs[] = "CREATE TABLE `"._MYSQL_PREFIX."_yoomedia_reload` ( +`id` BIGINT(20) NOT NULL AUTO_INCREMENT, +`type` VARCHAR(255) NOT NULL DEFAULT 'general', +`y_id` BIGINT(20) NOT NULL DEFAULT 0, +`y_reload` SMALLINT(6) NOT NULL DEFAULT 0, +`inserted` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, +PRIMARY KEY (`id`), +UNIQUE `y_type` (`type`,`y_id`) +) TYPE=MyISAM COMMENT='Reload lock reminder for Yoo!Media campaigns'"; break; case "remove": // Do stuff when removing extension // SQL commands to run + $SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_admin_menu` WHERE `what` IN('config_yoomedia','list_yoomedia_tm') LIMIT 2"; + $SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_yoomedia_reload`"; break; case "activate": // Do stuff when admin activates this extension @@ -79,6 +106,29 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded + // The translation table + $yoomediaTranslationTable = array( + // Error messages + 'error_codes' => array( + 1 => 'wrong_pass', + 2 => 'wrong_sid', + 3 => 'website_locked', + 4 => 'api_data_error', + 5 => 'requests_depleted', + 6 => 'zero_result', + 10 => 'incomplete_request' + ), + // For text mails + 'textmail' => array( + 0 => 'id', + 1 => 'name', + 2 => 'reload', + 3 => 'wait', + 4 => 'remain', + 5 => 'pay', + 6 => 'text' + ) + ); break; } diff --git a/inc/functions.php b/inc/functions.php index ecd38c9ef4..70f99efe2b 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -227,21 +227,20 @@ function LOAD_TEMPLATE($template, $return=false, $content=array()) { $result = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__); - // @TODO Merge this data into $content - list($gender, $surname, $family, $email) = SQL_FETCHROW($result); + // Is content an array? + if (is_array($content)) { + // Merge data + $content = array_merge($content, SQL_FETCHARRAY($result)); - // Translate gender - $gender = TRANSLATE_GENDER($gender); + // Translate gender + $content['gender'] = TRANSLATE_GENDER($content['gender']); + } else { + // DEPRECATED: Load data in direct variables + list($gender, $surname, $family, $email) = SQL_FETCHROW($result); - // Insert data if content is an array - if (is_array($content)) { - // Please switch to $content[bla] in all your templates! Direct - // variables are deprecated as of 09/13/2008. - $content['gender'] = $gender; - $content['surname'] = $surname; - $content['family'] = $family; - $content['email'] = $email; - } // END - if + // Translate gender + $gender = TRANSLATE_GENDER($gender); + } // Free result SQL_FREERESULT($result); @@ -342,6 +341,10 @@ function LOAD_TEMPLATE($template, $return=false, $content=array()) {

"; } + // Remove content and data + unset($content); + unset($DATA); + // Do we have some content to output or return? if (!empty($ret)) { // Not empty so let's put it out! ;) @@ -419,6 +422,10 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = "N", $FROM = "") { $eval = "\$TO = \"".COMPILE_CODE(addslashes($TO))."\";"; eval($eval); + // Compile "MSG" + $eval = "\$MSG = \"".COMPILE_CODE(addslashes($MSG))."\";"; + eval($eval); + // Fix HTML parameter (default is no!) if (empty($HTML)) $HTML = "N"; if (isBooleanConstantAndTrue('DEBUG_MODE')) { @@ -437,10 +444,10 @@ Message : ".$MSG." SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM); } elseif (!empty($TO)) { // Send Mail away - SEND_RAW_EMAIL($TO, COMPILE_CODE($SUBJECT), COMPILE_CODE($MSG), $FROM); + SEND_RAW_EMAIL($TO, $SUBJECT, $MSG, $FROM); } elseif ($HTML == "N") { // Problem found! - SEND_RAW_EMAIL(WEBMASTER, COMPILE_CODE($SUBJECT), COMPILE_CODE($MSG), $FROM); + SEND_RAW_EMAIL(WEBMASTER, "[PROBLEM:]".$SUBJECT, $MSG, $FROM); } } @@ -858,6 +865,10 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") { if (function_exists('error_get_last')) $newContent .= "\n--------------------------------------\nDebug:\n".print_r(error_get_last(), true)."--------------------------------------\nPlease don't alter these informations!\nThanx."; } // END - if + // Remove content and data + unset($content); + unset($DATA); + // Return compiled content return COMPILE_CODE($newContent); } @@ -2672,7 +2683,42 @@ function GET_REFERER () { // Return it return $referer; } -// + +// Adds a bonus mail to the queue +// This is a high-level function! +function ADD_NEW_BONUS_MAIL ($data, $mode="", $output=true) { + // Use mode from data if not set and availble ;-) + if ((empty($mode)) && (isset($data['mode']))) $mode = $data['mode']; + + // Generate receiver list + $RECEIVER = GENERATE_RECEIVER_LIST($data['cat'], $data['receiver'], $mode); + + // Receivers added? + if (!empty($RECEIVER)) { + // Add bonus mail to queue + ADD_BONUS_MAIL_TO_QUEUE( + $data['subject'], + $data['text'], + $RECEIVER, + $data['points'], + $data['seconds'], + $data['url'], + $data['cat'], + $mode, + $data['receiver'] + ); + + // Mail inserted into bonus pool + if ($output) LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_SEND); + } elseif ($output) { + // More entered than can be reached! + LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_MORE_SELECTED); + } else { + // Debug log + DEBUG_LOG(__FUNCTION__."(".__LINE__."): cat={$data['cat']},receiver={$data['receiver']},data=".base64_encode(serialize($data))." More selected, than available!"); + } +} + ////////////////////////////////////////////////// // // // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS // diff --git a/inc/language/yoomedia_de.php b/inc/language/yoomedia_de.php new file mode 100644 index 0000000000..b913ba7908 --- /dev/null +++ b/inc/language/yoomedia_de.php @@ -0,0 +1,95 @@ +Hinweise: Sollten Sie Erotik in Ihrem {!MT_WORD!} anzeigen wollen, so sollten Sie einen Jugendschutzbeauftragten haben und diesen im Impressum nennen. Das gesamte MXChange-Team weisst darauf hin, dass niemand aus dem Team Ihnen hierzu rechtsberatende Hinweise geben kann. Auch im Community-Forum erfolgt keine Rechtsberatung! Etwaige Postings werden entweder kommentarlos gelöscht oder gesperrt."); +define('ADMIN_CONFIG_YOOMEDIA_TEST_FAILED', "Konfigurationsdaten stimmen nicht überein. Details entnehmen Sie bitte der Datei inc/cache/debug.log."); + +// Generic admin strings +define('ADMIN_YOOMEDIA_REQUESTS_DEPLETED', "Ihr Abfragekonto der API ist erschöpft. Bitte surfen Sie auf www.YooMedia.de und loggen Sie sich ein, um manuell Mails zu versenden."); +define('ADMIN_YOOMEDIA_INVALID_RESULT', "Ungültige Antwort von der API erhalten. Ist www.yoomedia.de erreichbar?"); +define('ADMIN_YOOMEDIA_PREPARE_MAIL', "Bonusmail vorbereiten"); +define('ADMIN_YOOMEDIA_REMOVE_MAIL', "Mail entfernen"); +define('ADMIN_YOOMEDIA_UNLIST_MAIL', "Aus Ausschlussliste nehmen"); +define('ADMIN_YOOMEDIA_TEXTMAIL_ALREADY_SENT', "Textmail wurde %s bereits versendet."); +define('ADMIN_YOOMEDIA_TEXTMAIL_SEND_AGAIN', "Textmail kann in %s erneut versendet werden."); +define('ADMIN_YOOMEDIA_TEXTMAIL_MANUALLY_LOCKED', "Textmail wurde manuell gesperrt."); +define('ADMIN_LIST_YOOMEDIA_TITLE', "Alle Textmails von der Yoo!Media API 2.0 anzeigen"); +define('ADMIN_LIST_YOOMEDIA_NOTE', "Hinweise: Mails mit 0 Sekunden Mindestaufenthalt sind meistens Framekiller-Mails. Sie können eine Mail nur erneut aussenden, wenn die Reload-Sperre abgelaufen ist!"); +define('ADMIN_YOOMEDIA_SEND_MAIL_TITLE', "Textmail aus Yoo!Media API 2.0 versenden"); +define('ADMIN_YOOMEDIA_RECEIVER_ARE_ALL_NOTE', "Es werden in der jeweiligen Kategorie alle verfügbaren Empfänger ausgewählt."); + +// Subject lines +define('ADMIN_YOOMEDIA_SUBJECT_PREFIX', "Paidmail:"); +define('ADMIN_YOOMEDIA_ENTER_URL_NOTE', "Die URL wird automatisch für Sie konstruiert!"); + +// Admin header lines +define('ADMIN_YOOMEDIA_TM_ID', "Id"); +define('ADMIN_YOOMEDIA_TM_NAME', "Betreff"); +define('ADMIN_YOOMEDIA_TM_RELOAD', "Reloadsperre"); +define('ADMIN_YOOMEDIA_TM_WAIT', "Mindestaufenthalt"); +define('ADMIN_YOOMEDIA_TM_REMAIN', "Klicks übrig"); +define('ADMIN_YOOMEDIA_TM_PAY', "Vergütung"); +define('ADMIN_YOOMEDIA_TM_ACTIONS', "Aktionen"); + +// Error messages for admin +define('ADMIN_YOOMEDIA_ERROR_FAILED', "Allgemeiner Fehler von API, nicht weiter spezifiziert."); +define('ADMIN_YOOMEDIA_ERROR_TITLE', "Fehler bei Abfrage der Yoo!Media API 2.0"); +define('ADMIN_YOOMEDIA_ERROR_WRONG_PASS', "Falsches Interfacepasswort angegeben."); +define('ADMIN_YOOMEDIA_ERROR_WRONG_SID', "Falsche Seiten-ID verwendet."); +define('ADMIN_YOOMEDIA_ERROR_WEBSITE_LOCKED', "Ihre Webseite (Werbefläche) wurde bei Yoo!Media gesperrt."); +define('ADMIN_YOOMEDIA_ERROR_API_DATA_ERROR', "Fehler in API-Daten erkannt."); +define('ADMIN_YOOMEDIA_ERROR_REQUESTS_DEPLETED', "Abfrageguthaben erschöpft."); +define('ADMIN_YOOMEDIA_ERROR_ZERO_RESULT', "Keine Buchungenz zur Auswahl gefunden."); +define('ADMIN_YOOMEDIA_ERROR_INCOMPLETE_REQUEST', "Abfragedaten sind nicht komplett."); + +// +?> diff --git a/inc/libs/cache_functions.php b/inc/libs/cache_functions.php index ba490d57c7..a3b1d0a15e 100644 --- a/inc/libs/cache_functions.php +++ b/inc/libs/cache_functions.php @@ -371,7 +371,7 @@ class mxchange_cache $line = ""; // String or non-string? ;-) - if (is_string($value)) { + if ((is_string($value)) || (is_null($value))) { // String... $line = "\$data['".$key."'][] = \"".$value."\";\n"; } else { diff --git a/inc/libs/optimize_functions.php b/inc/libs/optimize_functions.php index cefbd46fa4..26dcdbc718 100644 --- a/inc/libs/optimize_functions.php +++ b/inc/libs/optimize_functions.php @@ -42,15 +42,15 @@ if (!defined('__SECURITY')) { // function REPAIR_OPTIMIZE_DB() { - global $MySQL; $ret = array(); $tot_data = 0; $tabs = 0; $opts = 0; $tot_idx = 0; $total_gain = 0; $tot_all = 0; - $result = @SQL_QUERY("SHOW TABLE STATUS FROM ".$MySQL['dbase'], __FILE__, __LINE__); + $result = @SQL_QUERY("SHOW TABLE STATUS FROM ".__DB_NAME, __FILE__, __LINE__); $tabs = @SQL_NUMROWS($result); $ret['total_size'] = 0; $ret['total_tabs'] = $tabs; + $ret['tables'] = array(); if ($tabs > 0) { while ($row = SQL_FETCHARRAY($result)) diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php index f18f68df6e..7335584f74 100644 --- a/inc/libs/rallye_functions.php +++ b/inc/libs/rallye_functions.php @@ -388,9 +388,9 @@ LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__); } } - if (($TOTAL < $min_prices) || ($TOTAL == 0)) - { + if (($TOTAL < $min_prices) || ($TOTAL == 0)) { // Do not end this rallye! + unset($DATA); return; } @@ -459,6 +459,7 @@ LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__); } // Send mail to admin + die("OK!"); SEND_ADMIN_NOTIFICATION(RALLYE_ADMIN_EXPIRED.": ".$title, $templ, $cnt, 0); // Add task @@ -650,6 +651,7 @@ function RALLYE_LIST_WINNERS($rallye,$default=0) function RALLYE_DELETE_EXPIRED_RALLYES() { global $DATA, $_CONFIG; + // Check for expired rallyes $EXPIRE = $_CONFIG['one_day'] * 3; // @TODO The hard-coded value... $result_rallye = SQL_QUERY_ESC("SELECT id, title, start_time, end_time diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php new file mode 100644 index 0000000000..54bc990178 --- /dev/null +++ b/inc/libs/yoomedia_functions.php @@ -0,0 +1,369 @@ + 10); +} + +// Queries the given Yoo!Media API 2.0 script +function YOOMEDIA_QUERY_API ($script, $countQuery = true) { + global $_CONFIG; + + // Init response array + $response = array(); + + // Enougth queries left? + if (($_CONFIG['yoomedia_requests_remain'] > 0) || (!$countQuery)) { + // Prepare the low-level request + $requestString = sprintf("http://www.yoomedia.de/interface_2.0/%s?id=%s&sid=%s&pw=%s&reload=%s&ma=%s&uebrig=%s&verguetung=%s&erotik=%s", + $script, + bigintval($_CONFIG['yoomedia_id']), + bigintval($_CONFIG['yoomedia_sid']), + $_CONFIG['yoomedia_passwd'], + bigintval($_CONFIG['yoomedia_tm_max_reload']), + bigintval($_CONFIG['yoomedia_tm_min_wait']), + bigintval($_CONFIG['yoomedia_tm_clicks_remain']), + bigintval($_CONFIG['yoomedia_tm_min_pay']), + bigintval($_CONFIG['yoomedia_erotic_allowed']) + ); + + // Run the query + $response = GET_URL($requestString); + + // Shall we count the query as used? + if ($countQuery) { + // Then update the config! + UPDATE_CONFIG("yoomedia_requests_remain", 1, "-"); + } // END - if + } // END - if + + // Return the data + return $response; +} + +// "Getter" for a parsed result for all text mails. This means an array without +// the header lines will be returned +function YOOMEDIA_GET_PARSED_RESULT_TEXTMAILS () { + // Get the raw response + $response = YOOMEDIA_QUERY_API("out_textmail.php"); + + // Parse the response + $result = YOOMEDIA_PARSE_RESPONSE($response, "textmail"); + + // Return result + return $result; +} + +// Parser function for Yoo!Media API responses +function YOOMEDIA_PARSE_RESPONSE ($response, $type) { + // Init result + $result = array(); + + // Cut off the header + $dummy = $response; + foreach ($response as $line) { + // Remove line + array_shift($dummy); + + // Is this line empty? + if (empty($line)) { + // Then stop here + break; + } // END - if + } // END - foreach + + // The result is now still raw, so we must split it up and trim spaces away + $responseLine = trim(implode("\n", $dummy)); + + // Last line should never be a pipe! + if (substr($responseLine, -1, 1) == "|") $responseLine = substr($responseLine, 0, -1); + + // Now, explode all in one array + $dataArray = explode("|", $responseLine); + + // Now make the result array with two dimensions + $cnt = 0; $entry = 0; + foreach ($dataArray as $line) { + // Add the line + $result[$entry][YOOMEDIA_TRANSLATE_INDEX($type, $cnt)] = $line; + + // End of data of first entry reached? + if ($cnt == 6) { + // Then advance to next entry and reset counter + $entry++; + $cnt = 0; + } else { + // Count up + $cnt++; + } + } // END - foreach + + // Return it + return $result; +} + +// Prepares a bonus mail for delivery. Works only if extension "bonus" is active +function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) { + global $_CONFIG; + + // Is this an admin? + if (!IS_ADMIN()) { + // Abort here + return false; + } elseif (!EXT_IS_ACTIVE("bonus")) { + // Abort here + return false; + } + + // Is the waiting time below one second? Then fix it to one (zero seconds are not yet supported!) + if ($data['wait'] < 1) $data['wait'] = 1; + + // Half of waiting time is a good reward! + $data['reward'] = round($data['wait'] / 2 + 0.4); + + // Is the reward below one? + if ($data['reward'] < 1) $data['reward'] = 1; + + // Add website id + $data['sid'] = $_CONFIG['yoomedia_sid']; + + // Add total receivers + $data['all'] = TRANSLATE_COMMA(GET_TOTAL_RECEIVERS()); + + // Add categories + $data['categories'] = ADD_CATEGORY_OPTIONS("normal"); + + // Load template + LOAD_TEMPLATE("admin_send_yoomedia", false, $data); +} + +// Adds the mail to the bonus mail pool +function YOOMEDIA_SEND_BONUS_MAIL ($data, $mode) { + global $_CONFIG; + + // Is this an admin? + if (!IS_ADMIN()) { + // Abort here + return false; + } elseif (!EXT_IS_ACTIVE("bonus")) { + // Abort here + return false; + } + + // Add dummy receiver to avoid notice + $data['receiver'] = 0; + + // HTML or normal? (normal is default...) + $type = "t"; + if (($mode == "html") && (EXT_IS_ACTIVE("html"))) $type = "h"; + + // Auto-generate URL + $data['url'] = sprintf("http://www.yoomedia.de/code/%s-mail.php?id=%s&sid=%s", + $type, + $data['id'], + $data['sid'] + ); + + // Lock this mail for new delivery + YOOMEDIA_RELOAD_LOCK($data, $mode); + + // Call the lower function + ADD_NEW_BONUS_MAIL($data, $mode); +} + +// Lockdown given id +function YOOMEDIA_EXCLUDE_MAIL ($data, $mode) { + // Search for the entry + if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mode) === false) { + // Convert mode for mails + $mode = YOOMEDIA_CONVERT_MODE($mode); + + // Add the entry + $result = SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_yoomedia_reload` (`type`,`y_id`,`y_reload`,`inserted`) VALUES('%s',%s,%s,'0000-00-00 00:00')", + array($mode, bigintval($data['id']), bigintval($data['reload'])), __FILE__, __LINE__); + } // END - if +} + +// Remove lock of given mail +function YOOMEDIA_UNLIST_MAIL ($data, $mode) { + // Convert mode for mails + $mode = YOOMEDIA_CONVERT_MODE($mode); + + // Add the entry + $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1", + array($mode, bigintval($data['id'])), __FILE__, __LINE__); +} + +// "Translates" the index number into an assosiative value +function YOOMEDIA_TRANSLATE_INDEX ($type, $index) { + global $yoomediaTranslationTable; + + // Default is the index + $return = $index; + + // Is the element there? + if (isset($yoomediaTranslationTable[$type][$index])) { + // Use this element + $return = $yoomediaTranslationTable[$type][$index]; + } else { + // Not found! + DEBUG_LOG(__FUNCTION__."(".__LINE__."): type={$type},index={$index} not found."); + } + + // Return value + return $return; +} + +// "Translate" error code +function YOOMEDIA_TRANSLATE_ERROR ($errorCode) { + global $yoomediaTranslationTable; + + // Default is "failed" + $return = "failed"; + + // Is the entry there? + if (isset($yoomediaTranslationTable['error_codes'][$errorCode])) { + // Entry found! + $return = $yoomediaTranslationTable['error_codes'][$errorCode]; + } else { + // Log missing entries + DEBUG_LOG(__FUNCTION__."(".__LINE__."): errorCode={$errorCode}"); + } + + // Return value + return $return; +} + +// Checks if the mail id is in reload lock +function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) { + // Default is not in reload lock + $reloaded = false; + + // Query database + $result = SQL_QUERY_ESC("SELECT `id`, UNIX_TIMESTAMP(`inserted`) AS inserted FROM `"._MYSQL_PREFIX."_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1", + array($type, bigintval($id)), __FILE__, __LINE__); + + // Entry found? + if (SQL_NUMROWS($result) == 1) { + // Load time + list($id, $time) = SQL_FETCHROW($result); + + // Are we ready to sent again? + if (((time() - $time) >= ($reload * 60*60)) && ($time > 0)) { + // Remove entry + $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_yoomedia_reload WHERE id=%s LIMIT 1", + array($id), __FILE__, __LINE__); + } else { + // Dont' sent again this mail + $reloaded = $time; + } + } // END - if + + // Free result + SQL_FREERESULT($result); + + // Return result + return $reloaded; +} + +// Lock given mail down for reload lock +function YOOMEDIA_RELOAD_LOCK ($data, $mode) { + // Search for the entry + if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mode) === false) { + // Convert mode for mails + $mode = YOOMEDIA_CONVERT_MODE($mode); + + // Add the entry + $result = SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_yoomedia_reload` (`type`,`y_id`,`y_reload`) VALUES('%s',%s,%s)", + array($mode, bigintval($data['id']), bigintval($data['reload'])), __FILE__, __LINE__); + } // END - if +} + +// Convert mode for mails +function YOOMEDIA_CONVERT_MODE ($mode) { + // Convert mode for normal/html + switch ($mode) { + case "normal": + $mode = "textmail"; + break; + + case "html": + $mode = "htmlmail"; + break; + } // END - switch + + // Return result + return $mode; +} + +// +?> diff --git a/inc/modules/admin/action- b/inc/modules/admin/action- index 81a2fcad9a..69b93d86a1 100644 --- a/inc/modules/admin/action- +++ b/inc/modules/admin/action- @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-admins.php b/inc/modules/admin/action-admins.php index 41ddf38a15..513906d171 100644 --- a/inc/modules/admin/action-admins.php +++ b/inc/modules/admin/action-admins.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-bank.php b/inc/modules/admin/action-bank.php index 6bd915d001..f1504ea044 100644 --- a/inc/modules/admin/action-bank.php +++ b/inc/modules/admin/action-bank.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-country.php b/inc/modules/admin/action-country.php index b78e4783b0..c2326203b5 100644 --- a/inc/modules/admin/action-country.php +++ b/inc/modules/admin/action-country.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-doubler.php b/inc/modules/admin/action-doubler.php index 2906a36e18..26c92b1837 100644 --- a/inc/modules/admin/action-doubler.php +++ b/inc/modules/admin/action-doubler.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf(."%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-email.php b/inc/modules/admin/action-email.php index 3c2d83513e..2c4940c646 100644 --- a/inc/modules/admin/action-email.php +++ b/inc/modules/admin/action-email.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-holiday.php b/inc/modules/admin/action-holiday.php index 23a589444e..11200f7bc1 100644 --- a/inc/modules/admin/action-holiday.php +++ b/inc/modules/admin/action-holiday.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-login.php b/inc/modules/admin/action-login.php index 9e7aed0ab0..03d8459449 100644 --- a/inc/modules/admin/action-login.php +++ b/inc/modules/admin/action-login.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-logout.php b/inc/modules/admin/action-logout.php index 2658ae6291..5dbcecf292 100644 --- a/inc/modules/admin/action-logout.php +++ b/inc/modules/admin/action-logout.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (!empty($_POST['no'])) { // Do not logout now @@ -46,9 +46,10 @@ if (!empty($_POST['no'])) { } elseif ((!empty($_POST['yes'])) && ($GLOBALS['action'] == "logout")) { // Redirect to logout link LOAD_URL("modules.php?module=admin&logout=1"); -} else { - // Load logout form template - LOAD_TEMPLATE("admin_logout_form"); } + +// Load logout form template +LOAD_TEMPLATE("admin_logout_form"); + // ?> diff --git a/inc/modules/admin/action-menu.php b/inc/modules/admin/action-menu.php index 4eb92e2966..c11decc481 100644 --- a/inc/modules/admin/action-menu.php +++ b/inc/modules/admin/action-menu.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-misc.php b/inc/modules/admin/action-misc.php index e05467eb80..e25b996f4b 100644 --- a/inc/modules/admin/action-misc.php +++ b/inc/modules/admin/action-misc.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-mods.php b/inc/modules/admin/action-mods.php index 6ce43d0164..775d8cab98 100644 --- a/inc/modules/admin/action-mods.php +++ b/inc/modules/admin/action-mods.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-newsletter.php b/inc/modules/admin/action-newsletter.php index edfbc80e97..2e22f370f9 100644 --- a/inc/modules/admin/action-newsletter.php +++ b/inc/modules/admin/action-newsletter.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-payouts.php b/inc/modules/admin/action-payouts.php index 3f1c2aa47d..1f588275e9 100644 --- a/inc/modules/admin/action-payouts.php +++ b/inc/modules/admin/action-payouts.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-primera.php b/inc/modules/admin/action-primera.php index d310efdf4c..a4a4070324 100644 --- a/inc/modules/admin/action-primera.php +++ b/inc/modules/admin/action-primera.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-rallye.php b/inc/modules/admin/action-rallye.php index c09a5b9097..aff9a0fe1e 100644 --- a/inc/modules/admin/action-rallye.php +++ b/inc/modules/admin/action-rallye.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-repair.php b/inc/modules/admin/action-repair.php index cee773a524..68f8cdddb8 100644 --- a/inc/modules/admin/action-repair.php +++ b/inc/modules/admin/action-repair.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-setup.php b/inc/modules/admin/action-setup.php index df957341fe..5f5b0c4058 100644 --- a/inc/modules/admin/action-setup.php +++ b/inc/modules/admin/action-setup.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-sponsor.php b/inc/modules/admin/action-sponsor.php index 459607d7b7..7ff7d038e9 100644 --- a/inc/modules/admin/action-sponsor.php +++ b/inc/modules/admin/action-sponsor.php @@ -15,9 +15,10 @@ * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * * * - * This program is free software. You can redistribute it and/or modify * + * 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. * + * 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 * @@ -37,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-stats.php b/inc/modules/admin/action-stats.php index 76c3ddf5fd..de96e3bd84 100644 --- a/inc/modules/admin/action-stats.php +++ b/inc/modules/admin/action-stats.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-surfbar.php b/inc/modules/admin/action-surfbar.php index c9eff8b4c3..3ddd896dd9 100644 --- a/inc/modules/admin/action-surfbar.php +++ b/inc/modules/admin/action-surfbar.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-task.php b/inc/modules/admin/action-task.php index 5c61f44d8f..5dd6f7b1ca 100644 --- a/inc/modules/admin/action-task.php +++ b/inc/modules/admin/action-task.php @@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-theme.php b/inc/modules/admin/action-theme.php index f923105a5c..fae7b83481 100644 --- a/inc/modules/admin/action-theme.php +++ b/inc/modules/admin/action-theme.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-transfer.php b/inc/modules/admin/action-transfer.php index 2462908e26..c4b1d1bb4b 100644 --- a/inc/modules/admin/action-transfer.php +++ b/inc/modules/admin/action-transfer.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-user.php b/inc/modules/admin/action-user.php index 1cc7270823..5ef4c8d18f 100644 --- a/inc/modules/admin/action-user.php +++ b/inc/modules/admin/action-user.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/action-wernis.php b/inc/modules/admin/action-wernis.php index 18e55d0e90..d543b6b5fb 100644 --- a/inc/modules/admin/action-wernis.php +++ b/inc/modules/admin/action-wernis.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/admin/what- b/inc/modules/admin/what- index fb5dca692c..42e4521594 100644 --- a/inc/modules/admin/what- +++ b/inc/modules/admin/what- @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!is_admin())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // ?> diff --git a/inc/modules/admin/what-add_bank_package.php b/inc/modules/admin/what-add_bank_package.php index c24efeb2cc..ed4e351b2c 100644 --- a/inc/modules/admin/what-add_bank_package.php +++ b/inc/modules/admin/what-add_bank_package.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Is the formular sent? if (isset($_POST['ok'])) { diff --git a/inc/modules/admin/what-add_guestnl_cat.php b/inc/modules/admin/what-add_guestnl_cat.php index 18982007bb..c7fcc2b11a 100644 --- a/inc/modules/admin/what-add_guestnl_cat.php +++ b/inc/modules/admin/what-add_guestnl_cat.php @@ -32,12 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } + // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php index b161fd7f85..a193055a5a 100644 --- a/inc/modules/admin/what-add_points.php +++ b/inc/modules/admin/what-add_points.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Fix a notice if (!isset($_GET['u_id'])) $_GET['u_id'] = ""; diff --git a/inc/modules/admin/what-add_rallye.php b/inc/modules/admin/what-add_rallye.php index 1eb0f2f448..d22abccd5e 100644 --- a/inc/modules/admin/what-add_rallye.php +++ b/inc/modules/admin/what-add_rallye.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { diff --git a/inc/modules/admin/what-add_sponsor.php b/inc/modules/admin/what-add_sponsor.php index 45838247b0..1f736068ee 100644 --- a/inc/modules/admin/what-add_sponsor.php +++ b/inc/modules/admin/what-add_sponsor.php @@ -15,9 +15,10 @@ * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * * * - * This program is free software. You can redistribute it and/or modify * + * 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. * + * 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 * @@ -31,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Save sponsor in database diff --git a/inc/modules/admin/what-add_surfbar_url.php b/inc/modules/admin/what-add_surfbar_url.php index b3f5bf3175..cfa7b7b7f1 100644 --- a/inc/modules/admin/what-add_surfbar_url.php +++ b/inc/modules/admin/what-add_surfbar_url.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Was an URL added? if ((isset($_POST['add'])) && (!empty($_POST['url']))) { diff --git a/inc/modules/admin/what-admin_add.php b/inc/modules/admin/what-admin_add.php index fa44c2de38..b93cf05a0a 100644 --- a/inc/modules/admin/what-admin_add.php +++ b/inc/modules/admin/what-admin_add.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Check if the admin has entered title and what-php file name... if (((empty($_POST['title'])) || (empty($_POST['menu'])) || (empty($_POST['descr']))) && (isset($_POST['ok']))) { diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php index 88db098f49..f30250d1d5 100644 --- a/inc/modules/admin/what-adminedit.php +++ b/inc/modules/admin/what-adminedit.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Do we edit/delete/change main menus or sub menus? $AND = "(what = '' OR what IS NULL)"; $SUB = ""; diff --git a/inc/modules/admin/what-admins_add.php b/inc/modules/admin/what-admins_add.php index 667568fff6..fad779b17f 100644 --- a/inc/modules/admin/what-admins_add.php +++ b/inc/modules/admin/what-admins_add.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); global $cacheInstance; diff --git a/inc/modules/admin/what-admins_contct.php b/inc/modules/admin/what-admins_contct.php index f004def6c3..9b525cc5e5 100644 --- a/inc/modules/admin/what-admins_contct.php +++ b/inc/modules/admin/what-admins_contct.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if ((isset($_POST['ok'])) && (!empty($_GET['admin']))) { // Send mail or message diff --git a/inc/modules/admin/what-admins_edit.php b/inc/modules/admin/what-admins_edit.php index e4aaee886f..3831184cc6 100644 --- a/inc/modules/admin/what-admins_edit.php +++ b/inc/modules/admin/what-admins_edit.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Instance for the cache extension global $cacheInstance; diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php index 3d7e951eff..879ab6f3dc 100644 --- a/inc/modules/admin/what-admins_mails.php +++ b/inc/modules/admin/what-admins_mails.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['edit'])) { diff --git a/inc/modules/admin/what-autopurge.php b/inc/modules/admin/what-autopurge.php index cc27e516e5..da04ee23e4 100644 --- a/inc/modules/admin/what-autopurge.php +++ b/inc/modules/admin/what-autopurge.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Data was submitted so we store it diff --git a/inc/modules/admin/what-bonus.php b/inc/modules/admin/what-bonus.php index aa9c9858e3..1aa7231957 100644 --- a/inc/modules/admin/what-bonus.php +++ b/inc/modules/admin/what-bonus.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // ?> diff --git a/inc/modules/admin/what-cache_stats.php b/inc/modules/admin/what-cache_stats.php index ee2f431796..13e22537de 100644 --- a/inc/modules/admin/what-cache_stats.php +++ b/inc/modules/admin/what-cache_stats.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Calculate total hits $totalHits = ($_CONFIG['db_hits'] + $_CONFIG['cache_hits']); diff --git a/inc/modules/admin/what-config_active.php b/inc/modules/admin/what-config_active.php index 3a7e0d8445..2d244f8046 100644 --- a/inc/modules/admin/what-config_active.php +++ b/inc/modules/admin/what-config_active.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Save data diff --git a/inc/modules/admin/what-config_admin.php b/inc/modules/admin/what-config_admin.php index 8b78570c20..83084f6f6b 100644 --- a/inc/modules/admin/what-config_admin.php +++ b/inc/modules/admin/what-config_admin.php @@ -37,7 +37,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Save configuration diff --git a/inc/modules/admin/what-config_admins.php b/inc/modules/admin/what-config_admins.php index c1bf5539c5..5bd3d2cc85 100644 --- a/inc/modules/admin/what-config_admins.php +++ b/inc/modules/admin/what-config_admins.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); $SEL = 0; if (!empty($_POST['sel'])) $SEL = SELECTION_COUNT($_POST['sel']); diff --git a/inc/modules/admin/what-config_autopurge.php b/inc/modules/admin/what-config_autopurge.php index abbb29a589..56bf2c494e 100644 --- a/inc/modules/admin/what-config_autopurge.php +++ b/inc/modules/admin/what-config_autopurge.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Data was submitted so we store it diff --git a/inc/modules/admin/what-config_beg.php b/inc/modules/admin/what-config_beg.php index b9911aab76..6745c0ce95 100644 --- a/inc/modules/admin/what-config_beg.php +++ b/inc/modules/admin/what-config_beg.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Translate german decimal commas to computer decimal dots diff --git a/inc/modules/admin/what-config_birthday.php b/inc/modules/admin/what-config_birthday.php index 42a2b8ee75..6ecd32903f 100644 --- a/inc/modules/admin/what-config_birthday.php +++ b/inc/modules/admin/what-config_birthday.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Save configuration diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php index 53a6e3c884..3e3308027e 100644 --- a/inc/modules/admin/what-config_bonus.php +++ b/inc/modules/admin/what-config_bonus.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Replace german decimal commas to computer decimal dots diff --git a/inc/modules/admin/what-config_cache.php b/inc/modules/admin/what-config_cache.php index ddb518f55b..da06438288 100644 --- a/inc/modules/admin/what-config_cache.php +++ b/inc/modules/admin/what-config_cache.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Cache path has been not changed by default so don't test it again diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php index 3f9584d921..38e40127d2 100644 --- a/inc/modules/admin/what-config_cats.php +++ b/inc/modules/admin/what-config_cats.php @@ -39,7 +39,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Init variable to avoid a notice $CATS = ""; diff --git a/inc/modules/admin/what-config_doubler.php b/inc/modules/admin/what-config_doubler.php index 29ddc3a29f..2b3b5f54f2 100644 --- a/inc/modules/admin/what-config_doubler.php +++ b/inc/modules/admin/what-config_doubler.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Replace commata with decimal dot diff --git a/inc/modules/admin/what-config_email.php b/inc/modules/admin/what-config_email.php index c41ae6c5ce..f2190ae37e 100644 --- a/inc/modules/admin/what-config_email.php +++ b/inc/modules/admin/what-config_email.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Remove empty array index if (empty($_POST['max'])) unset($_POST['add_max']); diff --git a/inc/modules/admin/what-config_extensions.php b/inc/modules/admin/what-config_extensions.php index 4c09b2b393..d79ef2e740 100644 --- a/inc/modules/admin/what-config_extensions.php +++ b/inc/modules/admin/what-config_extensions.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Save configuration diff --git a/inc/modules/admin/what-config_holiday.php b/inc/modules/admin/what-config_holiday.php index ffb49497d7..58a557e14a 100644 --- a/inc/modules/admin/what-config_holiday.php +++ b/inc/modules/admin/what-config_holiday.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { diff --git a/inc/modules/admin/what-config_home.php b/inc/modules/admin/what-config_home.php index e4b640b21e..7c57c8882e 100644 --- a/inc/modules/admin/what-config_home.php +++ b/inc/modules/admin/what-config_home.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); $sub = ""; if (!empty($_GET['sub'])) $sub = $_GET['sub']; diff --git a/inc/modules/admin/what-config_mediadata.php b/inc/modules/admin/what-config_mediadata.php index 5af3aa5d29..428d0f1cb3 100644 --- a/inc/modules/admin/what-config_mediadata.php +++ b/inc/modules/admin/what-config_mediadata.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { diff --git a/inc/modules/admin/what-config_mods.php b/inc/modules/admin/what-config_mods.php index 9bc4c994fd..dceeebda8a 100644 --- a/inc/modules/admin/what-config_mods.php +++ b/inc/modules/admin/what-config_mods.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); $SEL = 0; if (isset($_POST['edit'])) diff --git a/inc/modules/admin/what-config_newsletter.php b/inc/modules/admin/what-config_newsletter.php index f3d42154b1..d5f22e249e 100644 --- a/inc/modules/admin/what-config_newsletter.php +++ b/inc/modules/admin/what-config_newsletter.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { diff --git a/inc/modules/admin/what-config_nickname.php b/inc/modules/admin/what-config_nickname.php index b08d423c81..c95b924b25 100644 --- a/inc/modules/admin/what-config_nickname.php +++ b/inc/modules/admin/what-config_nickname.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Save data diff --git a/inc/modules/admin/what-config_order.php b/inc/modules/admin/what-config_order.php index e048a10066..68489f219d 100644 --- a/inc/modules/admin/what-config_order.php +++ b/inc/modules/admin/what-config_order.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Save data diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php index c356122bd3..38de44bca0 100644 --- a/inc/modules/admin/what-config_other.php +++ b/inc/modules/admin/what-config_other.php @@ -42,7 +42,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Stop saving data if one input field is !isset if (isset($_POST['ok'])) { diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php index 9859235a08..da87317ea1 100644 --- a/inc/modules/admin/what-config_payouts.php +++ b/inc/modules/admin/what-config_payouts.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (!empty($_POST['rate'])) $_POST['rate'] = REVERT_COMMA($_POST['rate']); diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php index 57934960ac..af0d44c407 100644 --- a/inc/modules/admin/what-config_points.php +++ b/inc/modules/admin/what-config_points.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (!empty($_GET['sub'])) { switch ($_GET['sub']) diff --git a/inc/modules/admin/what-config_primera.php b/inc/modules/admin/what-config_primera.php index bd559c2e71..60c7d541d2 100644 --- a/inc/modules/admin/what-config_primera.php +++ b/inc/modules/admin/what-config_primera.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // First merge temporarily the new API data into the current config diff --git a/inc/modules/admin/what-config_proxy.php b/inc/modules/admin/what-config_proxy.php index df6e62b190..8eba046009 100644 --- a/inc/modules/admin/what-config_proxy.php +++ b/inc/modules/admin/what-config_proxy.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Test proxy settings diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php index 463e7ed90d..1c069121fd 100644 --- a/inc/modules/admin/what-config_rallye_prices.php +++ b/inc/modules/admin/what-config_rallye_prices.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (!empty($_GET['rallye'])) { diff --git a/inc/modules/admin/what-config_refid.php b/inc/modules/admin/what-config_refid.php index eb54222401..7d88acef89 100644 --- a/inc/modules/admin/what-config_refid.php +++ b/inc/modules/admin/what-config_refid.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Save data diff --git a/inc/modules/admin/what-config_reg.php b/inc/modules/admin/what-config_reg.php index 9c5922d27e..d64d2aa869 100644 --- a/inc/modules/admin/what-config_reg.php +++ b/inc/modules/admin/what-config_reg.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if ((isset($_POST['ok'])) && (function_exists('CREATE_TIME_SELECTIONS'))) { diff --git a/inc/modules/admin/what-config_register.php b/inc/modules/admin/what-config_register.php index 06b5cf4d38..f4b0a39b97 100644 --- a/inc/modules/admin/what-config_register.php +++ b/inc/modules/admin/what-config_register.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Do we want to save changes? if (isset($_POST['ok'])) { diff --git a/inc/modules/admin/what-config_register2.php b/inc/modules/admin/what-config_register2.php index 32a9a79df6..78e3506a1d 100644 --- a/inc/modules/admin/what-config_register2.php +++ b/inc/modules/admin/what-config_register2.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Calculate timestamp from selections... diff --git a/inc/modules/admin/what-config_removeip.php b/inc/modules/admin/what-config_removeip.php index 443d032ff8..bdd72a4888 100644 --- a/inc/modules/admin/what-config_removeip.php +++ b/inc/modules/admin/what-config_removeip.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Save configuration diff --git a/inc/modules/admin/what-config_rewrite.php b/inc/modules/admin/what-config_rewrite.php index a4761c9d27..f2f9ef8134 100644 --- a/inc/modules/admin/what-config_rewrite.php +++ b/inc/modules/admin/what-config_rewrite.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Generate string diff --git a/inc/modules/admin/what-config_secure.php b/inc/modules/admin/what-config_secure.php index 6b69b6df56..2f9e327ce6 100644 --- a/inc/modules/admin/what-config_secure.php +++ b/inc/modules/admin/what-config_secure.php @@ -37,7 +37,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { diff --git a/inc/modules/admin/what-config_session.php b/inc/modules/admin/what-config_session.php index 316b9de73b..1bd3b00661 100644 --- a/inc/modules/admin/what-config_session.php +++ b/inc/modules/admin/what-config_session.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Test Path diff --git a/inc/modules/admin/what-config_sponsor.php b/inc/modules/admin/what-config_sponsor.php index 59dd718f32..cdfaa8f280 100644 --- a/inc/modules/admin/what-config_sponsor.php +++ b/inc/modules/admin/what-config_sponsor.php @@ -15,9 +15,10 @@ * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * * * - * This program is free software. You can redistribute it and/or modify * + * 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. * + * 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 * @@ -31,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Allow only direct points (non-floating) diff --git a/inc/modules/admin/what-config_stats.php b/inc/modules/admin/what-config_stats.php index e550e2454e..50e87881bc 100644 --- a/inc/modules/admin/what-config_stats.php +++ b/inc/modules/admin/what-config_stats.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Was the form submitted? if (isset($_POST['ok'])) { diff --git a/inc/modules/admin/what-config_surfbar.php b/inc/modules/admin/what-config_surfbar.php index b615405e99..13ab3ce6b7 100644 --- a/inc/modules/admin/what-config_surfbar.php +++ b/inc/modules/admin/what-config_surfbar.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Was the form submitted? if (isset($_POST['ok'])) { diff --git a/inc/modules/admin/what-config_title.php b/inc/modules/admin/what-config_title.php index 9d1c0399a9..176cc48793 100644 --- a/inc/modules/admin/what-config_title.php +++ b/inc/modules/admin/what-config_title.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { diff --git a/inc/modules/admin/what-config_top10.php b/inc/modules/admin/what-config_top10.php index 9977a7f329..018db8f184 100644 --- a/inc/modules/admin/what-config_top10.php +++ b/inc/modules/admin/what-config_top10.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { diff --git a/inc/modules/admin/what-config_transfer.php b/inc/modules/admin/what-config_transfer.php index c4d3a673ba..2c6165ca32 100644 --- a/inc/modules/admin/what-config_transfer.php +++ b/inc/modules/admin/what-config_transfer.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // Save settings... diff --git a/inc/modules/admin/what-config_user.php b/inc/modules/admin/what-config_user.php index be7a72cb4e..c097c77dda 100644 --- a/inc/modules/admin/what-config_user.php +++ b/inc/modules/admin/what-config_user.php @@ -32,12 +32,12 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { diff --git a/inc/modules/admin/what-config_wernis.php b/inc/modules/admin/what-config_wernis.php index 313868b86a..6c4680a55d 100644 --- a/inc/modules/admin/what-config_wernis.php +++ b/inc/modules/admin/what-config_wernis.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { // First merge temporarily the new API data into the current config diff --git a/inc/modules/admin/what-config_yoomedia.php b/inc/modules/admin/what-config_yoomedia.php new file mode 100644 index 0000000000..1fb95978c4 --- /dev/null +++ b/inc/modules/admin/what-config_yoomedia.php @@ -0,0 +1,94 @@ + bigintval($_CONFIG['yoomedia_id']), + 'yoomedia_sid' => bigintval($_CONFIG['yoomedia_sid']), + 'yoomedia_passwd' => $_CONFIG['yoomedia_passwd'], + 'yoomedia_tm_max_reload' => bigintval($_CONFIG['yoomedia_tm_max_reload']), + 'yoomedia_tm_min_wait' => bigintval($_CONFIG['yoomedia_tm_min_wait']), + 'yoomedia_tm_clicks_remain' => bigintval($_CONFIG['yoomedia_tm_clicks_remain']), + 'yoomedia_tm_min_pay' => bigintval($_CONFIG['yoomedia_tm_min_pay']) + ); + + // Erotic? + switch ($_CONFIG['yoomedia_erotic_allowed']) { + case 0: // No erotic at all + define('__CFG_YOOMEDIA_EROTIC_NONE' , " selected=\"selected\""); + define('__CFG_YOOMEDIA_EROTIC_INCLUDE', ""); + define('__CFG_YOOMEDIA_EROTIC_ONLY' , ""); + break; + + case 1: // Include erotic + define('__CFG_YOOMEDIA_EROTIC_NONE' , ""); + define('__CFG_YOOMEDIA_EROTIC_INCLUDE', " selected=\"selected\""); + define('__CFG_YOOMEDIA_EROTIC_ONLY' , ""); + break; + + case 2: // Erotic only + define('__CFG_YOOMEDIA_EROTIC_NONE' , ""); + define('__CFG_YOOMEDIA_EROTIC_INCLUDE', ""); + define('__CFG_YOOMEDIA_EROTIC_ONLY' , " selected=\"selected\""); + break; + } + + // Load template + LOAD_TEMPLATE("admin_config_yoomedia", false, $content); +} + +// +?> diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php index 08b23b75ca..da714d623e 100644 --- a/inc/modules/admin/what-del_email.php +++ b/inc/modules/admin/what-del_email.php @@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (!empty($_GET['mid'])) { // Load email data diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php index 42d9c9e3a2..cf06406ba3 100644 --- a/inc/modules/admin/what-del_holiday.php +++ b/inc/modules/admin/what-del_holiday.php @@ -36,8 +36,9 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } + // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Check for selected holidays $SUM = 0; diff --git a/inc/modules/admin/what-del_sponsor.php b/inc/modules/admin/what-del_sponsor.php index ee6b104af7..920154324a 100644 --- a/inc/modules/admin/what-del_sponsor.php +++ b/inc/modules/admin/what-del_sponsor.php @@ -15,9 +15,10 @@ * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * * * - * This program is free software. You can redistribute it and/or modify * + * 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. * + * 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 * @@ -31,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (!empty($_GET['id']))) { // Check for selected sponsor diff --git a/inc/modules/admin/what-del_task.php b/inc/modules/admin/what-del_task.php index 9eaf84c8db..7212e1ecee 100644 --- a/inc/modules/admin/what-del_task.php +++ b/inc/modules/admin/what-del_task.php @@ -32,7 +32,7 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } elseif (!EXT_IS_ACTIVE("task")) { @@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!is_admin())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // ?> diff --git a/inc/modules/admin/what-del_transfer.php b/inc/modules/admin/what-del_transfer.php index 0f1b92788e..150fa39e6d 100644 --- a/inc/modules/admin/what-del_transfer.php +++ b/inc/modules/admin/what-del_transfer.php @@ -39,7 +39,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']) || (!IS_ADMIN())) } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['del'])) { diff --git a/inc/modules/admin/what-del_user.php b/inc/modules/admin/what-del_user.php index 37ecc5382a..9a0536f2e5 100644 --- a/inc/modules/admin/what-del_user.php +++ b/inc/modules/admin/what-del_user.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Display only title when no form was submitted -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // User exists.. if ((isset($_POST['ok'])) || ((isset($_POST['del'])) && (!empty($_POST['reason'])))) { diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php index 2921842372..907ceb2253 100644 --- a/inc/modules/admin/what-edit_emails.php +++ b/inc/modules/admin/what-edit_emails.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if ((isset($_POST['ok'])) && (empty($_POST['id']))) { unset($_POST['ok']); diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php index 8840a1a875..5ab5c8ec3a 100644 --- a/inc/modules/admin/what-edit_sponsor.php +++ b/inc/modules/admin/what-edit_sponsor.php @@ -15,9 +15,10 @@ * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * * * - * This program is free software. You can redistribute it and/or modify * + * 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. * + * 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 * @@ -31,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) { // Check for selected sponsor diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php index 882d71394a..410ac203a5 100644 --- a/inc/modules/admin/what-edit_user.php +++ b/inc/modules/admin/what-edit_user.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Fix a notice $result_main = false; diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php index fb6df1836f..2eb11fb039 100644 --- a/inc/modules/admin/what-email_archiv.php +++ b/inc/modules/admin/what-email_archiv.php @@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // 0 1 2 3 4 5 6 7 8 9 10 $SQL = "SELECT id, sender, subject, text, receivers, payment_id, data_type, timestamp, url, target_send, cat_id diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php index 7d1d652217..ee06841fda 100644 --- a/inc/modules/admin/what-email_details.php +++ b/inc/modules/admin/what-email_details.php @@ -48,7 +48,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Normal mails ordered by your members // 0 1 2 3 4 5 6 7 8 9 10 diff --git a/inc/modules/admin/what-email_stats.php b/inc/modules/admin/what-email_stats.php index 7adb7a30d1..3a3a1eaee6 100644 --- a/inc/modules/admin/what-email_stats.php +++ b/inc/modules/admin/what-email_stats.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // ?> diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php index 9f3a1896fd..516143a429 100644 --- a/inc/modules/admin/what-extensions.php +++ b/inc/modules/admin/what-extensions.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); global $cacheInstance, $cacheArray, $cacheMode; diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php index 1cd194de59..a156f88f77 100644 --- a/inc/modules/admin/what-guest_add.php +++ b/inc/modules/admin/what-guest_add.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Check if the admin has entered title and what-php file name... if (((empty($_POST['title'])) || (empty($_POST['menu']))) && (isset($_POST['ok']))) diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php index b7ee2ea99a..d2e72fc793 100644 --- a/inc/modules/admin/what-guestedit.php +++ b/inc/modules/admin/what-guestedit.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Do we edit/delete/change main menus or sub menus? $AND = "what = ''"; $SUB = ""; diff --git a/inc/modules/admin/what-holiday_list.php b/inc/modules/admin/what-holiday_list.php index 8682a2bbff..b8fe129b58 100644 --- a/inc/modules/admin/what-holiday_list.php +++ b/inc/modules/admin/what-holiday_list.php @@ -32,12 +32,12 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // ?> diff --git a/inc/modules/admin/what-holiday_remove.php b/inc/modules/admin/what-holiday_remove.php index 1fa8487333..df5d223dbe 100644 --- a/inc/modules/admin/what-holiday_remove.php +++ b/inc/modules/admin/what-holiday_remove.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // ?> diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php index 70ccbd5f82..569b20fb2f 100644 --- a/inc/modules/admin/what-list_autopurge.php +++ b/inc/modules/admin/what-list_autopurge.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Exclude default referal id if set $EXCLUDE_LIST = ""; diff --git a/inc/modules/admin/what-list_bank_package.php b/inc/modules/admin/what-list_bank_package.php index 8fc083f792..250ed17527 100644 --- a/inc/modules/admin/what-list_bank_package.php +++ b/inc/modules/admin/what-list_bank_package.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // END - if // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Check if there is enougth selected $show = true; diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php index cc3eba1700..5fb3f71b9f 100644 --- a/inc/modules/admin/what-list_beg.php +++ b/inc/modules/admin/what-list_beg.php @@ -32,12 +32,12 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if ($_CONFIG['beg_rallye'] == "Y") { diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php index 6cd69df1a2..d235486004 100644 --- a/inc/modules/admin/what-list_bonus.php +++ b/inc/modules/admin/what-list_bonus.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if ($_CONFIG['bonus_active'] == "Y") { // Shall I withdraw now? diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php index 863f1f6020..04d0ab94e5 100644 --- a/inc/modules/admin/what-list_cats.php +++ b/inc/modules/admin/what-list_cats.php @@ -39,7 +39,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (!empty($_GET['u_id'])) { // Check if the user already exists diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php index 5b227d84ce..d78fe0076b 100644 --- a/inc/modules/admin/what-list_country.php +++ b/inc/modules/admin/what-list_country.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Add new code? if ((isset($_POST['add'])) && (!empty($_POST['code'])) && (!empty($_POST['descr']))) diff --git a/inc/modules/admin/what-list_doubler.php b/inc/modules/admin/what-list_doubler.php index 0d420f501e..36d767fde3 100644 --- a/inc/modules/admin/what-list_doubler.php +++ b/inc/modules/admin/what-list_doubler.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (empty($_GET['mode'])) { // Chosse the overview page as default diff --git a/inc/modules/admin/what-list_holiday.php b/inc/modules/admin/what-list_holiday.php index 6ad367aac8..8f9fca1a31 100644 --- a/inc/modules/admin/what-list_holiday.php +++ b/inc/modules/admin/what-list_holiday.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Start listing holiday requests $result = SQL_QUERY("SELECT h.id, h.userid, h.holiday_start, h.holiday_end, h.comments, d.status, d.last_online FROM "._MYSQL_PREFIX."_user_holidays AS h, "._MYSQL_PREFIX."_user_data AS d WHERE h.userid=d.userid ORDER BY h.userid", __FILE__, __LINE__); diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php index 77e5571a20..2fd651fd1f 100644 --- a/inc/modules/admin/what-list_links.php +++ b/inc/modules/admin/what-list_links.php @@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (empty($_GET['del'])) $_GET['del'] = ""; diff --git a/inc/modules/admin/what-list_newsletter.php b/inc/modules/admin/what-list_newsletter.php index ae6054fcbc..8892c5ab44 100644 --- a/inc/modules/admin/what-list_newsletter.php +++ b/inc/modules/admin/what-list_newsletter.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if ((!empty($_POST['uid'])) && (!empty($_POST['id']))) { diff --git a/inc/modules/admin/what-list_norefs.php b/inc/modules/admin/what-list_norefs.php index c6fdcea7a8..a541084bac 100644 --- a/inc/modules/admin/what-list_norefs.php +++ b/inc/modules/admin/what-list_norefs.php @@ -42,7 +42,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); $MORE = ", userid"; $colspan = "4"; // 27 if (EXT_IS_ACTIVE("nickname")) { $MORE = ", nickname"; } diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php index 70abbbd6aa..c333c2d346 100644 --- a/inc/modules/admin/what-list_notifications.php +++ b/inc/modules/admin/what-list_notifications.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Init variables $WHO = _ALL; diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php index 0b29fda668..7054963825 100644 --- a/inc/modules/admin/what-list_payouts.php +++ b/inc/modules/admin/what-list_payouts.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (!empty($_GET['pid'])) { diff --git a/inc/modules/admin/what-list_primera.php b/inc/modules/admin/what-list_primera.php index 3f7af733a2..f500925d52 100644 --- a/inc/modules/admin/what-list_primera.php +++ b/inc/modules/admin/what-list_primera.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Check for entries $result = SQL_QUERY("SELECT id, userid, primera_account, primera_amount, primera_timestamp, primera_type, primera_api_message, primera_api_status FROM "._MYSQL_PREFIX."_user_primera ORDER BY primera_timestamp DESC, id DESC", diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php index 4be9e9562c..552acec06f 100644 --- a/inc/modules/admin/what-list_rallyes.php +++ b/inc/modules/admin/what-list_rallyes.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (empty($_GET['sub'])) $_GET['sub'] = ""; $MSG = ""; diff --git a/inc/modules/admin/what-list_refs.php b/inc/modules/admin/what-list_refs.php index 4559232921..f9fd9e142d 100644 --- a/inc/modules/admin/what-list_refs.php +++ b/inc/modules/admin/what-list_refs.php @@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (!empty($_GET['u_id'])) { // Secure userid diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php index af6c9c9ae3..3845af644a 100644 --- a/inc/modules/admin/what-list_sponsor.php +++ b/inc/modules/admin/what-list_sponsor.php @@ -15,9 +15,10 @@ * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * * * - * This program is free software. You can redistribute it and/or modify * + * 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. * + * 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 * @@ -31,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (!empty($_GET['id'])) { // Show detailed informations to a sponsor diff --git a/inc/modules/admin/what-list_sponsor_pay.php b/inc/modules/admin/what-list_sponsor_pay.php index 3e77ed7c0d..758b749703 100644 --- a/inc/modules/admin/what-list_sponsor_pay.php +++ b/inc/modules/admin/what-list_sponsor_pay.php @@ -15,9 +15,10 @@ * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * * * - * This program is free software. You can redistribute it and/or modify * + * 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. * + * 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 * @@ -31,13 +32,14 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); + $MSG = ""; if (isset($_POST['add'])) { diff --git a/inc/modules/admin/what-list_sponsor_pays.php b/inc/modules/admin/what-list_sponsor_pays.php index b696ee532a..146536da7a 100644 --- a/inc/modules/admin/what-list_sponsor_pays.php +++ b/inc/modules/admin/what-list_sponsor_pays.php @@ -15,9 +15,10 @@ * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * * * - * This program is free software. You can redistribute it and/or modify * + * 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. * + * 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 * @@ -31,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (!empty($_GET['id'])) { // Check for selected sponsor diff --git a/inc/modules/admin/what-list_surfbar_urls.php b/inc/modules/admin/what-list_surfbar_urls.php index b1c9f5a216..4221cf2fa0 100644 --- a/inc/modules/admin/what-list_surfbar_urls.php +++ b/inc/modules/admin/what-list_surfbar_urls.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // END - if // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // By default show the list... $show = true; diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php index 9eb983342f..65ed9bc004 100644 --- a/inc/modules/admin/what-list_task.php +++ b/inc/modules/admin/what-list_task.php @@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); $whereStatement = ""; if (empty($_GET['type'])) $_GET['type'] = "your"; diff --git a/inc/modules/admin/what-list_transfer.php b/inc/modules/admin/what-list_transfer.php index 64b6474750..6eba18c3aa 100644 --- a/inc/modules/admin/what-list_transfer.php +++ b/inc/modules/admin/what-list_transfer.php @@ -32,14 +32,13 @@ ************************************************************************/ // Some security stuff... -if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']) || (!IS_ADMIN())) -{ +if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // We only need outgoing transfers $result = SQL_QUERY("SELECT userid, to_uid, trans_id, points, reason, time_trans FROM "._MYSQL_PREFIX."_user_transfers_out ORDER BY trans_id", __FILE__, __LINE__); diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php index 5b7b11dcfe..605130d63d 100644 --- a/inc/modules/admin/what-list_unconfirmed.php +++ b/inc/modules/admin/what-list_unconfirmed.php @@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Don't load the admin_list_unconfirmed template by default $listed = false; diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index 6bf976a1c8..58c2147f0a 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -42,7 +42,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Init title with "all accounts" $listHeader = ADMIN_ALL_ACCOUNTS; diff --git a/inc/modules/admin/what-list_wernis.php b/inc/modules/admin/what-list_wernis.php index ac0f53bc9a..844813b17c 100644 --- a/inc/modules/admin/what-list_wernis.php +++ b/inc/modules/admin/what-list_wernis.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Check for entries $result = SQL_QUERY("SELECT id, userid, wernis_account, wernis_amount, wernis_timestamp, wernis_type, wernis_api_message, wernis_api_status FROM "._MYSQL_PREFIX."_user_wernis ORDER BY wernis_timestamp DESC, id DESC", diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php new file mode 100644 index 0000000000..d8e3fc09ce --- /dev/null +++ b/inc/modules/admin/what-list_yoomedia_tm.php @@ -0,0 +1,145 @@ +", $code); + $code = $code[0]; + + // Output message + LOAD_TEMPLATE("admin_yoomedia_error", false, sprintf("{--ADMIN_YOOMEDIA_ERROR_%s--}", strtoupper(YOOMEDIA_TRANSLATE_ERROR($code)))); + return false; +} + +// Temporary set max comma +$_CONFIG['max_comma'] = 5; + +// Prepare all entries +$OUT = ""; $SW = 2; +foreach ($result as $entry) { + // Translate some data + $entry['pay'] = TRANSLATE_COMMA($entry['pay']); + $entry['remain'] = TRANSLATE_COMMA($entry['remain']); + $entry['sw'] = $SW; + + // Check reload lock + $reload = YOOMEDIA_CHECK_RELOAD($entry['id'], $entry['reload'], "textmail"); + + // Is this mail already sent? + if ($reload !== false) { + // Init countdown + $countdown = 0; + + // Not manually locked? + if ($reload > 0) { + // Calculate countdown + $countdown = $reload + ($entry['reload'] * 60*60) - time(); + + // Countdown < 60 seconds and bigger zero? + if (($countdown < 60) && ($countdown > 0)) { + // Fix to one minute + $countdown = 60; + } // END - if + + // Add reload lock + $entry['already'] = sprintf(ADMIN_YOOMEDIA_TEXTMAIL_SEND_AGAIN, CREATE_FANCY_TIME($countdown)); + } else { + // Never resentable unless manual removal + $entry['already'] = ADMIN_YOOMEDIA_TEXTMAIL_MANUALLY_LOCKED; + } + + // Load row template for displaying + $OUT .= LOAD_TEMPLATE("admin_list_yoomedia_tm_already", true, $entry); + } else { + // Load row template with buttons + $OUT .= LOAD_TEMPLATE("admin_list_yoomedia_tm_row", true, $entry); + } + + // Switch color + $SW = 3 - $SW; +} // END - if + +// Load main template +LOAD_TEMPLATE("admin_list_yoomedia_tm", false, $OUT); + +// +?> diff --git a/inc/modules/admin/what-lock_sponsor.php b/inc/modules/admin/what-lock_sponsor.php index c1aa1cbadd..5c8fcfcf79 100644 --- a/inc/modules/admin/what-lock_sponsor.php +++ b/inc/modules/admin/what-lock_sponsor.php @@ -15,9 +15,10 @@ * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * * * - * This program is free software. You can redistribute it and/or modify * + * 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. * + * 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 * @@ -31,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); $MSG = ""; if (!empty($_GET['id'])) { diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php index 6ad2703534..d382ea2f68 100644 --- a/inc/modules/admin/what-lock_user.php +++ b/inc/modules/admin/what-lock_user.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (!empty($_GET['u_id'])) { diff --git a/inc/modules/admin/what-logs.php b/inc/modules/admin/what-logs.php index ff9c943614..14ab44f115 100644 --- a/inc/modules/admin/what-logs.php +++ b/inc/modules/admin/what-logs.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (!empty($_GET['access'])) { // Secure input and construct FQFN diff --git a/inc/modules/admin/what-maintenance.php b/inc/modules/admin/what-maintenance.php index 30477e2cd4..481b418cb1 100644 --- a/inc/modules/admin/what-maintenance.php +++ b/inc/modules/admin/what-maintenance.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php index 60ff92960f..eb89f34f77 100644 --- a/inc/modules/admin/what-mem_add.php +++ b/inc/modules/admin/what-mem_add.php @@ -39,7 +39,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add desciption as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Check if the admin has entered title and what-php file name... if ((empty($_POST['title'])) && (isset($_POST['ok']))) diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php index cfd4b3ba51..a0d80e44e4 100644 --- a/inc/modules/admin/what-memedit.php +++ b/inc/modules/admin/what-memedit.php @@ -36,8 +36,9 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } + // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Do we edit/delete/change main menus or sub menus? $AND = "what = ''"; $SUB = ""; diff --git a/inc/modules/admin/what-optimize.php b/inc/modules/admin/what-optimize.php index e11b68ba38..e225f6f298 100644 --- a/inc/modules/admin/what-optimize.php +++ b/inc/modules/admin/what-optimize.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Optimize and repair database and return the result as a multi-dimensional array $DATA = REPAIR_OPTIMIZE_DB(); diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php index 1efd917188..44f34e52ad 100644 --- a/inc/modules/admin/what-overview.php +++ b/inc/modules/admin/what-overview.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Otherwise load include file 'overview-inc' (old standard overview page) require_once(PATH."inc/modules/admin/overview-inc.php"); diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php index bec3d3b3ed..b78d8b9465 100644 --- a/inc/modules/admin/what-payments.php +++ b/inc/modules/admin/what-payments.php @@ -37,7 +37,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (empty($_GET['do'])) unset($_GET['do']); if (((empty($_POST['t_wait'])) || (empty($_POST['payment']))) && (!empty($_GET['do'])) && ($_GET['do'] == "add")) diff --git a/inc/modules/admin/what-refbanner.php b/inc/modules/admin/what-refbanner.php index 3d7e88f021..1ebd709101 100644 --- a/inc/modules/admin/what-refbanner.php +++ b/inc/modules/admin/what-refbanner.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); $SEL = 0; if ((empty($_POST['url'])) || (empty($_POST['alternate']))) diff --git a/inc/modules/admin/what-repair_amenu.php b/inc/modules/admin/what-repair_amenu.php index 3168bd4628..50f949fb7c 100644 --- a/inc/modules/admin/what-repair_amenu.php +++ b/inc/modules/admin/what-repair_amenu.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); $ACTIONS = array(); // First fix all main menus (what="")... diff --git a/inc/modules/admin/what-repair_cats.php b/inc/modules/admin/what-repair_cats.php index 5ad1350cc0..a46032f821 100644 --- a/inc/modules/admin/what-repair_cats.php +++ b/inc/modules/admin/what-repair_cats.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); $result = SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_cats ORDER BY userid", __FILE__, __LINE__); if (SQL_NUMROWS($result) > 0) diff --git a/inc/modules/admin/what-repair_gmenu.php b/inc/modules/admin/what-repair_gmenu.php index 3913491ba3..d35b26da08 100644 --- a/inc/modules/admin/what-repair_gmenu.php +++ b/inc/modules/admin/what-repair_gmenu.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); $ACTIONS = array(); // First fix all main menus (what="")... diff --git a/inc/modules/admin/what-repair_mmenu.php b/inc/modules/admin/what-repair_mmenu.php index 74ae23fdda..6f087b5bf8 100644 --- a/inc/modules/admin/what-repair_mmenu.php +++ b/inc/modules/admin/what-repair_mmenu.php @@ -36,8 +36,9 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } + // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); $ACTIONS = array(); // First fix all main menus (what="")... diff --git a/inc/modules/admin/what-send_bonus.php b/inc/modules/admin/what-send_bonus.php index a297af0e03..0d4a1f6058 100644 --- a/inc/modules/admin/what-send_bonus.php +++ b/inc/modules/admin/what-send_bonus.php @@ -41,185 +41,34 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); -$whereStatement = " WHERE visible='Y'"; -if (is_admin()) $whereStatement = ""; -$EXT_HTML = EXT_IS_ACTIVE("html_mail"); +// Set empty mode to "select" if (empty($_GET['mode'])) $_GET['mode'] = "select"; -if (isset($_POST['ok'])) -{ - // Check if category and number of receivers is okay - $CAT_TABS = "%s"; $CAT_WHERE = ""; $cat = ""; - if ($_POST['cat'] > 0) - { - // Select category - $CAT_TABS = "LEFT JOIN "._MYSQL_PREFIX."_user_cats AS c ON d.userid=c.userid"; - $cat = bigintval($_POST['cat']); - $CAT_WHERE = " AND c.cat_id=%s"; - } - if (GET_EXT_VERSION("holiday") >= "0.1.3") - { - // Add something for the holiday extension - $CAT_WHERE .= " AND d.holiday_active='N'"; - } - - if (($EXT_HTML) && ($_GET['mode'] == "html")) - { - // Only include HTML receivers - $result = SQL_QUERY_ESC("SELECT d.userid FROM "._MYSQL_PREFIX."_user_data AS d ".$CAT_TABS." WHERE d.status='CONFIRMED' AND d.html='Y'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s", - array($cat, $_CONFIG['order_select'], $_CONFIG['order_mode'], bigintval($_POST['receiver'])), __FILE__, __LINE__); - } - else - { - // Include all - $result = SQL_QUERY_ESC("SELECT d.userid FROM "._MYSQL_PREFIX."_user_data AS d ".$CAT_TABS." WHERE d.status='CONFIRMED'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s", - array($cat, $_CONFIG['order_select'], $_CONFIG['order_mode'], bigintval($_POST['receiver'])), __FILE__, __LINE__); - } - if ((SQL_NUMROWS($result) == $_POST['receiver']) && ($_POST['receiver'] > 0)) - { - $RECEIVER = ""; - while (list($REC) = SQL_FETCHROW($result)) - { - // Add receiver when not empty - if (!empty($REC)) $RECEIVER .= ";".$REC; - } - - // Free memory - SQL_FREERESULT($result); - $RECEIVER = substr($RECEIVER, 1); - - // Gettings points is oka, so we can add $USED later from - if ($EXT_HTML) - { - $HTML = "N"; - if ($_GET['mode'] == "html") $HTML = "Y"; - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus -(subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, html_msg) -VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s')", - array( - $_POST['subject'], - addslashes($_POST['text']), - $RECEIVER, - $_POST['points'], - $_POST['seconds'], - $_POST['url'], - $cat, - SELECTION_COUNT(explode(";", $RECEIVER)), - bigintval($_POST['receiver']), - $HTML -), __FILE__, __LINE__); - } - else - { - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus -(subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent) -VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')", - array( - $_POST['subject'], - addslashes($_POST['text']), - $RECEIVER, - $_POST['points'], - $_POST['seconds'], - $_POST['url'], - $cat, - SELECTION_COUNT(explode(";", $RECEIVER)), - bigintval($_POST['receiver']), -), __FILE__, __LINE__); - } - - // Mail inserted into bonus pool - LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_SEND); - } - else - { - // More entered than can be reached! - LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_MORE_SELECTED); - } - if (!empty($URL)) - { - // Redirect to requested URL - LOAD_URL($URL); - } +if (isset($_POST['ok'])) { + // Deliver bonus mail + ADD_NEW_BONUS_MAIL($_POST, $_GET['mode']); } else { - $result = SQL_QUERY("SELECT id, cat FROM "._MYSQL_PREFIX."_cats".$whereStatement." ORDER BY sort", __FILE__, __LINE__); - if (SQL_NUMROWS($result) > 0) - { - $MORE = ""; - if ($_GET['mode'] == "html") $MORE = " AND html='Y'"; - if (GET_EXT_VERSION("holiday") >= "0.1.3") - { - // Add something for the holiday extension - $MORE .= " AND holiday_active='N'"; - } - - $result_all = SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE status='CONFIRMED' AND receive_mails > 0".$MORE, __FILE__, __LINE__); - define('__ALL_VALUE', SQL_NUMROWS($result_all)); - // Initialize array... - $CATS = array( - 'id' => array(), - 'name' => array(), - 'uids' => array() - ); - // ... and begin loading stuff - while (list($id, $cat) = SQL_FETCHROW($result)) - { - $CATS['id'][] = $id; - $CATS['name'][] = $cat; - $result_uids = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_cats WHERE cat_id=%s", - array(bigintval($id)), __FILE__, __LINE__); - $uid_cnt = 0; - while (list($ucat) = SQL_FETCHROW($result_uids)) - { - $result_ver = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_data -WHERE userid=%s AND status='CONFIRMED' AND receive_mails > 0".$MORE." LIMIT 1", - array(bigintval($ucat)), __FILE__, __LINE__); - $uid_cnt += SQL_NUMROWS($result_ver); - - // Free memory - SQL_FREERESULT($result_ver); - } - - // Free memory - SQL_FREERESULT($result_uids); - $CATS['uids'][] = $uid_cnt; - } - - // Free memory - SQL_FREERESULT($result); + // Get all available users + define('__ALL_VALUE', TRANSLATE_COMMA(GET_TOTAL_RECEIVERS($_GET['mode']))); - if (!empty($MSG)) - { - // We got system message so we drop it out to the user - LOAD_TEMPLATE("admin_settings_saved", false, $MSG); - } - if ($EXT_HTML) - { - // If HTML extension is active - define('__HTML_SELECT', LOAD_TEMPLATE("admin_send_bonus_html", true)); - } - else - { - // And if not - define('__HTML_SELECT', ""); - } + // Prepare option lines + define('__OPTION_LINES', ADD_CATEGORY_OPTIONS($_GET['mode'])); - // Generate options - $OUT = ""; - foreach ($CATS['id'] as $key => $value) - { - if (strlen($CATS['name'][$key]) > 20) $CATS['name'][$key] = substr($CATS['name'][$key], 0, 17)."..."; - $OUT .= " \n"; - } - define('__OPTION_LINES', $OUT); + // Store send mode + define('__MODE', SQL_ESCAPE($_GET['mode'])); - // Store send mode - define('__MODE', $_GET['mode']); + if (EXT_IS_ACTIVE("html_mail")) { + // If HTML extension is active + define('__HTML_SELECT', LOAD_TEMPLATE("admin_send_bonus_html", true)); + } else { + // And if not + define('__HTML_SELECT', ""); + } - // Select template - switch($_GET['mode']) - { + // Select template + switch($_GET['mode']) { case "html": // HTML mails case "normal": // Normal mails $template = "admin_send_bonus_form"; @@ -228,16 +77,10 @@ WHERE userid=%s AND status='CONFIRMED' AND receive_mails > 0".$MORE." LIMIT 1", case "select": // Selection $template = "admin_send_bonus_select"; break; - } - - // Load template - LOAD_TEMPLATE($template); - } - else - { - // No cateogries are defined yet - OUTPUT_HTML("".MEMBER_NO_CATS.""); } + + // Load template + LOAD_TEMPLATE($template); } // diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php index 3b2a13d966..8e12bd96a1 100644 --- a/inc/modules/admin/what-send_newsletter.php +++ b/inc/modules/admin/what-send_newsletter.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (isset($_POST['ok'])) { diff --git a/inc/modules/admin/what-stats_mods.php b/inc/modules/admin/what-stats_mods.php index fc69db6d3e..4380734071 100644 --- a/inc/modules/admin/what-stats_mods.php +++ b/inc/modules/admin/what-stats_mods.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // If var is empty set it to empty if (empty($_GET['mod'])) $_GET['mod'] = ""; diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php index 3625940960..6ac305396f 100644 --- a/inc/modules/admin/what-sub_points.php +++ b/inc/modules/admin/what-sub_points.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Fix a notice if (!isset($_GET['u_id'])) $_GET['u_id'] = ""; diff --git a/inc/modules/admin/what-surfbar_stats.php b/inc/modules/admin/what-surfbar_stats.php index 0ed0f4dbd3..c758fdb18f 100644 --- a/inc/modules/admin/what-surfbar_stats.php +++ b/inc/modules/admin/what-surfbar_stats.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // ?> diff --git a/inc/modules/admin/what-theme_check.php b/inc/modules/admin/what-theme_check.php index 1c9d7f0684..53ef7809ca 100644 --- a/inc/modules/admin/what-theme_check.php +++ b/inc/modules/admin/what-theme_check.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); global $cacheInstance, $cacheArray, $cacheMode; diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php index 747957986a..b5a697ffcc 100644 --- a/inc/modules/admin/what-theme_edit.php +++ b/inc/modules/admin/what-theme_edit.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Check for selected themes $SEL = 0; diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php index d075327bfe..94f4551670 100644 --- a/inc/modules/admin/what-theme_import.php +++ b/inc/modules/admin/what-theme_import.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Switch to testing mode $THEME_MODE = "test"; diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php index d4283557d9..a89fab4d14 100644 --- a/inc/modules/admin/what-unlock_emails.php +++ b/inc/modules/admin/what-unlock_emails.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Define some variables global $DATA; diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php index 812dca9103..0aaba4551f 100644 --- a/inc/modules/admin/what-unlock_sponsor.php +++ b/inc/modules/admin/what-unlock_sponsor.php @@ -15,19 +15,30 @@ * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * * * - * This program is free software. You can redistribute it and/or modify * + * 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. * + * 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')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Check if admin has submitted form if (isset($_POST['ok'])) { diff --git a/inc/modules/admin/what-unlock_surfbar_urls.php b/inc/modules/admin/what-unlock_surfbar_urls.php index b11221535c..879e9ab93b 100644 --- a/inc/modules/admin/what-unlock_surfbar_urls.php +++ b/inc/modules/admin/what-unlock_surfbar_urls.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // END - if // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Is the form sent? if ((isset($_POST['unlock'])) && (is_array($_POST['id'])) && (count($_POST['id']) > 0)) { diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php index e6fd292ee9..28fb4d5a57 100644 --- a/inc/modules/admin/what-updates.php +++ b/inc/modules/admin/what-updates.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Init array $ONLINE['code'] = "???"; diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php index 9fcbcaaeb4..2b38b5b6b4 100644 --- a/inc/modules/admin/what-usage.php +++ b/inc/modules/admin/what-usage.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Base directory (should be moved to database) $usage = "usage/"; diff --git a/inc/modules/admin/what-user_contct.php b/inc/modules/admin/what-user_contct.php index 190d17c8d6..81a5b2e7f2 100644 --- a/inc/modules/admin/what-user_contct.php +++ b/inc/modules/admin/what-user_contct.php @@ -32,13 +32,13 @@ ************************************************************************/ // Some security stuff... -if ((!defined('__SECURITY')) || (!is_admin())) { +if ((!defined('__SECURITY')) || (!IS_ADMIN())) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Is a user id given? if ((isset($_GET['u_id'])) && (bigintval($_GET['u_id']) > 0)) { diff --git a/inc/modules/admin/what-user_online.php b/inc/modules/admin/what-user_online.php index f1f7727ea4..07582a9fea 100644 --- a/inc/modules/admin/what-user_online.php +++ b/inc/modules/admin/what-user_online.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); // Count guests, members and admins $result_guests = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_online WHERE is_admin='N' AND is_member='N'", __FILE__, __LINE__); diff --git a/inc/modules/admin/what-usr_online.php b/inc/modules/admin/what-usr_online.php index 6ec2f99a50..063fbb7612 100644 --- a/inc/modules/admin/what-usr_online.php +++ b/inc/modules/admin/what-usr_online.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { } // Add description as navigation point -ADD_DESCR("admin", basename(__FILE__)); +ADD_DESCR("admin", __FILE__); if (EXT_IS_ACTIVE("online", true)) { diff --git a/inc/modules/guest/action- b/inc/modules/guest/action- index 11943809dd..0814201b13 100644 --- a/inc/modules/guest/action- +++ b/inc/modules/guest/action- @@ -38,7 +38,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); // Load the include file $INC = sprintf(PATH."inc/modules/guest/what-%s.php", $GLOBALS['what']); diff --git a/inc/modules/guest/action-main.php b/inc/modules/guest/action-main.php index 854a7d896f..1b17362a98 100644 --- a/inc/modules/guest/action-main.php +++ b/inc/modules/guest/action-main.php @@ -38,7 +38,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/guest/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/guest/action-members.php b/inc/modules/guest/action-members.php index 32dd12b65d..7675a00537 100644 --- a/inc/modules/guest/action-members.php +++ b/inc/modules/guest/action-members.php @@ -38,7 +38,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/guest/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/guest/action-sponsor.php b/inc/modules/guest/action-sponsor.php index 4f7c9b526e..994c04959c 100644 --- a/inc/modules/guest/action-sponsor.php +++ b/inc/modules/guest/action-sponsor.php @@ -37,7 +37,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); // Load the include file $INC = sprintf("%sinc/modules/guest/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/guest/what- b/inc/modules/guest/what- index 0b024b4842..6cab344d56 100644 --- a/inc/modules/guest/what- +++ b/inc/modules/guest/what- @@ -12,12 +12,23 @@ * -------------------------------------------------------------------- * * * * -------------------------------------------------------------------- * - * Copyleft (c) 2003, 2004, 2005 by Roland Haeder * + * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * * * - * This program is free software. You can redistribute it and/or modify * + * 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. * + * 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... @@ -27,7 +38,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); // Load default template LOAD_TEMPLATE(substr(basename(__FILE__), 5, -4)); diff --git a/inc/modules/guest/what-active.php b/inc/modules/guest/what-active.php index 443593282f..2b0a50e368 100644 --- a/inc/modules/guest/what-active.php +++ b/inc/modules/guest/what-active.php @@ -41,7 +41,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); // The day normally starts on 00:00:00, so let's subtract current hours/minutes/seconds from current time stamp! $START = time() - date("H", time())*60*60 - date("m", time())*60 - date("s", time()); diff --git a/inc/modules/guest/what-beg.php b/inc/modules/guest/what-beg.php index f636cdb173..4d627db775 100644 --- a/inc/modules/guest/what-beg.php +++ b/inc/modules/guest/what-beg.php @@ -41,7 +41,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); // Prepare constants define('__BEG_POINTS' , TRANSLATE_COMMA($_CONFIG['beg_points'])); diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php index 582416028a..262629303c 100644 --- a/inc/modules/guest/what-confirm.php +++ b/inc/modules/guest/what-confirm.php @@ -38,7 +38,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); if (!empty($_GET['hash'])) { // Initialize the user ID diff --git a/inc/modules/guest/what-doubler.php b/inc/modules/guest/what-doubler.php index 6755913f1d..aea44a2132 100644 --- a/inc/modules/guest/what-doubler.php +++ b/inc/modules/guest/what-doubler.php @@ -41,7 +41,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); // Percent values etc. define('__CHARGE_VALUE', TRANSLATE_COMMA($_CONFIG['doubler_charge'] * 100)); diff --git a/inc/modules/guest/what-impressum.php b/inc/modules/guest/what-impressum.php index b0ae9cf886..893915d6c1 100644 --- a/inc/modules/guest/what-impressum.php +++ b/inc/modules/guest/what-impressum.php @@ -38,7 +38,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); // Load template template LOAD_TEMPLATE(substr(basename(__FILE__), 5, -4)); diff --git a/inc/modules/guest/what-infos.php b/inc/modules/guest/what-infos.php index ae5be50026..77f95d4ccb 100644 --- a/inc/modules/guest/what-infos.php +++ b/inc/modules/guest/what-infos.php @@ -38,7 +38,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); // Load default template LOAD_TEMPLATE(substr(basename(__FILE__), 5, -4)); diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php index 7a147e018f..731df6c688 100644 --- a/inc/modules/guest/what-login.php +++ b/inc/modules/guest/what-login.php @@ -39,7 +39,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); global $DATA, $FATAL; diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php index 157229c124..c6bdf9c4e1 100644 --- a/inc/modules/guest/what-mediadata.php +++ b/inc/modules/guest/what-mediadata.php @@ -44,7 +44,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); define('value', "value"); define('lang', "lang"); diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php index 49624af036..4c8acf31c0 100644 --- a/inc/modules/guest/what-rallyes.php +++ b/inc/modules/guest/what-rallyes.php @@ -41,7 +41,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); OUTPUT_HTML("
"); diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php index e23712f41d..873ca6750b 100644 --- a/inc/modules/guest/what-register.php +++ b/inc/modules/guest/what-register.php @@ -45,7 +45,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); global $_CONFIG, $DATA; diff --git a/inc/modules/guest/what-sponsor_agb.php b/inc/modules/guest/what-sponsor_agb.php index b85642c7c9..43a25fc861 100644 --- a/inc/modules/guest/what-sponsor_agb.php +++ b/inc/modules/guest/what-sponsor_agb.php @@ -37,7 +37,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); // ?> diff --git a/inc/modules/guest/what-sponsor_infos.php b/inc/modules/guest/what-sponsor_infos.php index 7e0f927854..5096a76e34 100644 --- a/inc/modules/guest/what-sponsor_infos.php +++ b/inc/modules/guest/what-sponsor_infos.php @@ -37,7 +37,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); // Remove result_act unset($result_act); diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php index c28f50026c..cf6f8bd7fd 100644 --- a/inc/modules/guest/what-sponsor_login.php +++ b/inc/modules/guest/what-sponsor_login.php @@ -37,7 +37,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); $MODE = ""; if (!empty($_GET['mode'])) diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php index 44f99a4ffb..d3af4b373c 100644 --- a/inc/modules/guest/what-sponsor_reg.php +++ b/inc/modules/guest/what-sponsor_reg.php @@ -37,7 +37,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); // Create array for form errors (= missing data) $FORM_ERRORS = array(); diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php index 73833a016b..8426cfde7e 100644 --- a/inc/modules/guest/what-stats.php +++ b/inc/modules/guest/what-stats.php @@ -38,7 +38,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); // Derterminate which stats we want and set mode and title for the link below stats block if (!isset($_GET['mode'])) $_GET['mode'] = strtolower($_CONFIG['guest_stats']); diff --git a/inc/modules/guest/what-top10.php b/inc/modules/guest/what-top10.php index 1376df22a0..f4e0c86e2f 100644 --- a/inc/modules/guest/what-top10.php +++ b/inc/modules/guest/what-top10.php @@ -41,7 +41,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); //// TOP logins $ADD = "userid"; diff --git a/inc/modules/guest/what-welcome.php b/inc/modules/guest/what-welcome.php index 51e3c47f4b..72e0f5b55f 100644 --- a/inc/modules/guest/what-welcome.php +++ b/inc/modules/guest/what-welcome.php @@ -38,7 +38,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); // Count referal levels $result = SQL_QUERY("SELECT COUNT(id) FROM "._MYSQL_PREFIX."_refdepths WHERE level>0", __FILE__, __LINE__); diff --git a/inc/modules/guest/what-wernis_portal.php b/inc/modules/guest/what-wernis_portal.php index c747674116..c7039a03a8 100644 --- a/inc/modules/guest/what-wernis_portal.php +++ b/inc/modules/guest/what-wernis_portal.php @@ -41,7 +41,7 @@ if (!defined('__SECURITY')) { require_once (PATH."inc/rdf.class.php"); // Add description as navigation point -ADD_DESCR("guest", basename(__FILE__)); +ADD_DESCR("guest", __FILE__); OUTPUT_HTML("
"); $rdf = new fase4_rdf; diff --git a/inc/modules/member/action- b/inc/modules/member/action- index 93cd7421a3..cb013024b6 100644 --- a/inc/modules/member/action- +++ b/inc/modules/member/action- @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Load the include file $INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/member/action-account.php b/inc/modules/member/action-account.php index 6924b13e81..7de4396367 100644 --- a/inc/modules/member/action-account.php +++ b/inc/modules/member/action-account.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Load the include file $INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/member/action-bank.php b/inc/modules/member/action-bank.php index c8496564fd..ab4e84069a 100644 --- a/inc/modules/member/action-bank.php +++ b/inc/modules/member/action-bank.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Load the include file $INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/member/action-extras.php b/inc/modules/member/action-extras.php index dfcacbc7f8..d98cbfebc9 100644 --- a/inc/modules/member/action-extras.php +++ b/inc/modules/member/action-extras.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Load the include file $INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/member/action-logout.php b/inc/modules/member/action-logout.php index 03e2bca2e6..d80fca3b99 100644 --- a/inc/modules/member/action-logout.php +++ b/inc/modules/member/action-logout.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Load the include file $INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/member/action-main.php b/inc/modules/member/action-main.php index 2538018531..72e405d7ad 100644 --- a/inc/modules/member/action-main.php +++ b/inc/modules/member/action-main.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Load the include file $INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/member/action-order.php b/inc/modules/member/action-order.php index 2a42cbfbff..3277bcc4d3 100644 --- a/inc/modules/member/action-order.php +++ b/inc/modules/member/action-order.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Load the include file $INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/member/action-rals.php b/inc/modules/member/action-rals.php index 8ae25e70d8..9fc44c6357 100644 --- a/inc/modules/member/action-rals.php +++ b/inc/modules/member/action-rals.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Load the include file $INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/member/action-stats.php b/inc/modules/member/action-stats.php index 93777ec447..fdac22b762 100644 --- a/inc/modules/member/action-stats.php +++ b/inc/modules/member/action-stats.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Load the include file $INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/member/action-surfbar.php b/inc/modules/member/action-surfbar.php index f76f261e41..1388feec5c 100644 --- a/inc/modules/member/action-surfbar.php +++ b/inc/modules/member/action-surfbar.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Load the include file $INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']); diff --git a/inc/modules/member/what- b/inc/modules/member/what- index 48f496db63..002a1053e1 100644 --- a/inc/modules/member/what- +++ b/inc/modules/member/what- @@ -40,7 +40,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Loads the name-matching template LOAD_TEMPLATE(substr(basename(__FILE__), 5, -4)); diff --git a/inc/modules/member/what-bank_create.php b/inc/modules/member/what-bank_create.php index ccae2649b9..c5cffb56af 100644 --- a/inc/modules/member/what-bank_create.php +++ b/inc/modules/member/what-bank_create.php @@ -40,7 +40,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Loads the name-matching template LOAD_TEMPLATE(substr(basename(__FILE__), 5, -4)); diff --git a/inc/modules/member/what-bank_deposit.php b/inc/modules/member/what-bank_deposit.php index ccae2649b9..c5cffb56af 100644 --- a/inc/modules/member/what-bank_deposit.php +++ b/inc/modules/member/what-bank_deposit.php @@ -40,7 +40,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Loads the name-matching template LOAD_TEMPLATE(substr(basename(__FILE__), 5, -4)); diff --git a/inc/modules/member/what-bank_infos.php b/inc/modules/member/what-bank_infos.php index ccae2649b9..c5cffb56af 100644 --- a/inc/modules/member/what-bank_infos.php +++ b/inc/modules/member/what-bank_infos.php @@ -40,7 +40,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Loads the name-matching template LOAD_TEMPLATE(substr(basename(__FILE__), 5, -4)); diff --git a/inc/modules/member/what-bank_output.php b/inc/modules/member/what-bank_output.php index ccae2649b9..c5cffb56af 100644 --- a/inc/modules/member/what-bank_output.php +++ b/inc/modules/member/what-bank_output.php @@ -40,7 +40,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Loads the name-matching template LOAD_TEMPLATE(substr(basename(__FILE__), 5, -4)); diff --git a/inc/modules/member/what-bank_withdraw.php b/inc/modules/member/what-bank_withdraw.php index ccae2649b9..c5cffb56af 100644 --- a/inc/modules/member/what-bank_withdraw.php +++ b/inc/modules/member/what-bank_withdraw.php @@ -40,7 +40,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Loads the name-matching template LOAD_TEMPLATE(substr(basename(__FILE__), 5, -4)); diff --git a/inc/modules/member/what-beg.php b/inc/modules/member/what-beg.php index 278d22747e..8cd19555c8 100644 --- a/inc/modules/member/what-beg.php +++ b/inc/modules/member/what-beg.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); $uid = $GLOBALS['userid']; if (EXT_IS_ACTIVE("nickname")) diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php index a7e131b107..d3ce12bbc0 100644 --- a/inc/modules/member/what-beg2.php +++ b/inc/modules/member/what-beg2.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Autopurge installed? $LAST = "%s"; $ONLINE = ""; diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php index ddd819bbae..bd2ee2fe93 100644 --- a/inc/modules/member/what-bonus.php +++ b/inc/modules/member/what-bonus.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); if (GET_EXT_VERSION("bonus") >= "0.6.9") { diff --git a/inc/modules/member/what-categories.php b/inc/modules/member/what-categories.php index c9e9d2fefe..3a7bbc9e04 100644 --- a/inc/modules/member/what-categories.php +++ b/inc/modules/member/what-categories.php @@ -40,7 +40,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); $UID = $GLOBALS['userid']; $whereStatement = " WHERE visible='Y'"; diff --git a/inc/modules/member/what-doubler.php b/inc/modules/member/what-doubler.php index 87756b67f0..e746259a2d 100644 --- a/inc/modules/member/what-doubler.php +++ b/inc/modules/member/what-doubler.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Percent values etc. define('__CHARGE_VALUE', TRANSLATE_COMMA($_CONFIG['doubler_charge'] * 100)); diff --git a/inc/modules/member/what-guest.php b/inc/modules/member/what-guest.php index e6876490bc..adbb1e5d3f 100644 --- a/inc/modules/member/what-guest.php +++ b/inc/modules/member/what-guest.php @@ -40,7 +40,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Simply redirect... LOAD_URL (URL."/modules.php?module=index"); diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php index 2d1d268568..11da0f70aa 100644 --- a/inc/modules/member/what-holiday.php +++ b/inc/modules/member/what-holiday.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Check for running mail orders in pool $result1 = SQL_QUERY_ESC("SELECT timestamp FROM "._MYSQL_PREFIX."_pool diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php index 757330928b..545aa1d375 100644 --- a/inc/modules/member/what-html_mail.php +++ b/inc/modules/member/what-html_mail.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Class was found and loaded if (isset($_POST['ok'])) diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php index efa643a7a6..37015ef26a 100644 --- a/inc/modules/member/what-mydata.php +++ b/inc/modules/member/what-mydata.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); define('UID_VALUE', $GLOBALS['userid']); $URL = ""; diff --git a/inc/modules/member/what-newsletter.php b/inc/modules/member/what-newsletter.php index 04cb457a21..a427d96a2f 100644 --- a/inc/modules/member/what-newsletter.php +++ b/inc/modules/member/what-newsletter.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Load status $result = SQL_QUERY_ESC("SELECT nl_receive, nl_until, nl_timespan FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php index 2ddb9a9624..aa62022e13 100644 --- a/inc/modules/member/what-nickname.php +++ b/inc/modules/member/what-nickname.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); $VALID = false; if (isset($_POST['ok'])) diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index 462f6bad3c..5f5422dc5e 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); $URL = ""; $id = 0; $whereStatement = " WHERE visible='Y'"; @@ -53,7 +53,7 @@ if (empty($_GET['msg'])) $_GET['msg'] = ""; if (empty($_POST['zip'])) $_POST['zip'] = ""; if (empty($_POST['html'])) $_POST['html'] = ""; if (empty($_POST['receiver'])) $_POST['receiver'] = ""; -if (is_admin()) $whereStatement = ""; +if (IS_ADMIN()) $whereStatement = ""; // Add slashes to every value foreach($_POST as $key => $value) diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php index 75125e0189..ad7cbd3ee9 100644 --- a/inc/modules/member/what-payout.php +++ b/inc/modules/member/what-payout.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); $result_depths = SQL_QUERY("SELECT level, percents FROM "._MYSQL_PREFIX."_refdepths ORDER BY level", __FILE__, __LINE__); $TPTS = 0; diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php index f3904443f0..fd27a49d64 100644 --- a/inc/modules/member/what-points.php +++ b/inc/modules/member/what-points.php @@ -40,7 +40,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); $result_depths = SQL_QUERY("SELECT level, percents FROM "._MYSQL_PREFIX."_refdepths ORDER BY level", __FILE__, __LINE__); $depths = SQL_NUMROWS($result_depths); diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php index 0dcc0efc0b..7b8343db0e 100644 --- a/inc/modules/member/what-primera.php +++ b/inc/modules/member/what-primera.php @@ -45,7 +45,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Check if the admin has entered the data if ((empty($_CONFIG['primera_api_name'])) || (empty($_CONFIG['primera_api_md5']))) { diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php index b86019f896..375699d181 100644 --- a/inc/modules/member/what-rallyes.php +++ b/inc/modules/member/what-rallyes.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); OUTPUT_HTML("
"); diff --git a/inc/modules/member/what-refback.php b/inc/modules/member/what-refback.php index 280aba6cf3..309e927efb 100644 --- a/inc/modules/member/what-refback.php +++ b/inc/modules/member/what-refback.php @@ -45,7 +45,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Was the form submitted? if ((isset($_POST['edit'])) && (isset($_POST['id']))) { diff --git a/inc/modules/member/what-reflinks.php b/inc/modules/member/what-reflinks.php index 51d31adf79..bae32d9f1d 100644 --- a/inc/modules/member/what-reflinks.php +++ b/inc/modules/member/what-reflinks.php @@ -40,7 +40,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Load current referal clicks $result = SQL_QUERY_ESC("SELECT ref_clicks FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", diff --git a/inc/modules/member/what-sponsor.php b/inc/modules/member/what-sponsor.php index 22cbc52e11..0360d6ecb0 100644 --- a/inc/modules/member/what-sponsor.php +++ b/inc/modules/member/what-sponsor.php @@ -39,7 +39,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Loads the name-matching template LOAD_TEMPLATE(substr(basename(__FILE__), 5, -4)); diff --git a/inc/modules/member/what-stats.php b/inc/modules/member/what-stats.php index 4816ad8e88..b78419c8df 100644 --- a/inc/modules/member/what-stats.php +++ b/inc/modules/member/what-stats.php @@ -40,7 +40,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Init output $main_content = array(); diff --git a/inc/modules/member/what-support.php b/inc/modules/member/what-support.php index bfed0020e4..9d8b8fa23c 100644 --- a/inc/modules/member/what-support.php +++ b/inc/modules/member/what-support.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); if ((!isset($_POST['ok'])) || (empty($_POST['qsummary']))) { diff --git a/inc/modules/member/what-surfbar_book.php b/inc/modules/member/what-surfbar_book.php index ec4d19b37b..97bc955c30 100644 --- a/inc/modules/member/what-surfbar_book.php +++ b/inc/modules/member/what-surfbar_book.php @@ -45,7 +45,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Still allowed to book more URLs? if (!SURFBAR_IF_USER_BOOK_MORE_URLS()) { diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php index 8879d19843..5b606d15b5 100644 --- a/inc/modules/member/what-surfbar_list.php +++ b/inc/modules/member/what-surfbar_list.php @@ -40,7 +40,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Load user URLs $URLs = SURFBAR_GET_USER_URLS(); diff --git a/inc/modules/member/what-surfbar_start.php b/inc/modules/member/what-surfbar_start.php index 5730b73b9c..465a5d8a9f 100644 --- a/inc/modules/member/what-surfbar_start.php +++ b/inc/modules/member/what-surfbar_start.php @@ -45,7 +45,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Prepare content for output $content = array( diff --git a/inc/modules/member/what-surfbar_stats.php b/inc/modules/member/what-surfbar_stats.php index 41110ed24b..7e7101b6f8 100644 --- a/inc/modules/member/what-surfbar_stats.php +++ b/inc/modules/member/what-surfbar_stats.php @@ -40,7 +40,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // ?> diff --git a/inc/modules/member/what-themes.php b/inc/modules/member/what-themes.php index 14c40c1440..ec009de394 100644 --- a/inc/modules/member/what-themes.php +++ b/inc/modules/member/what-themes.php @@ -40,7 +40,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); if (!empty($_POST['member_theme'])) { // Save theme to member's profile diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index 2b61e4b0a5..0a108622de 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Load data $result = SQL_QUERY_ESC("SELECT opt_in FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php index f6879b2ba8..68c90049a3 100644 --- a/inc/modules/member/what-unconfirmed.php +++ b/inc/modules/member/what-unconfirmed.php @@ -42,7 +42,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); if (EXT_IS_ACTIVE("bonus")) { // Load bonus ID diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php index a2d9e43ed4..b98befee08 100644 --- a/inc/modules/member/what-wernis.php +++ b/inc/modules/member/what-wernis.php @@ -45,7 +45,7 @@ if (!defined('__SECURITY')) { } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); // Check if the admin has entered the data if ((empty($_CONFIG['wernis_api_id'])) || (empty($_CONFIG['wernis_api_md5']))) { diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index 57230cfebb..2337fa7cca 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -111,6 +111,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT // Is it a valid resource? if ($db === true) { // Remove MySQL array from namespace + define('__DB_NAME', $MySQL['dbase']); unset($MySQL); // Load configuration stuff diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 923427e6aa..ecfa0a3c20 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -191,7 +191,12 @@ function CHECK_MODULE($mod) { // Add menu description pending on given file name (without path!) function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true) { global $DEPTH, $_CONFIG; + // Use only filename of the file ;) + $file = basename($file); + + // Init variables $LINK_ADD = ""; $OUT = ""; $AND = ""; + // First we have to do some analysis... if (ereg("action-", $file)) { // This is an action file! @@ -1920,5 +1925,227 @@ VALUES (%s,0,'NEW','EXTENSION','%s','%s',UNIX_TIMESTAMP())", // Free memory SQL_FREERESULT($result); } + +// Prepares an SQL statement part for HTML mail and/or holiday depency +function PREPARE_SQL_HTML_HOLIDAY ($mode) { + // Exclude no users by default + $MORE = ""; + + // HTML mail? + if ($mode == "html") $MORE = " AND html='Y'"; + if (GET_EXT_VERSION("holiday") >= "0.1.3") { + // Add something for the holiday extension + $MORE .= " AND holiday_active='N'"; + } // END - if + + // Return result + return $MORE; +} + +// "Getter" for total available receivers +function GET_TOTAL_RECEIVERS ($mode="normal") { + // Query database + $result_all = SQL_QUERY("SELECT userid +FROM "._MYSQL_PREFIX."_user_data +WHERE status='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML_HOLIDAY($mode), + __FILE__, __LINE__); + + // Get num rows + $numRows = SQL_NUMROWS($result_all); + + // Free result + SQL_FREERESULT($result_all); + + // Return value + return $numRows; +} + +// Returns HTML code with an "\n"; + } + } else { + // No cateogries are defined yet + $OUT = "\n"; + } + + // Return HTML code + return $OUT; +} + +// Add bonus mail to queue +function ADD_BONUS_MAIL_TO_QUEUE ($subject, $text, $receiverList, $points, $seconds, $url, $cat, $mode="normal", $receiver=0) { + // Is admin or bonus extension there? + if (!IS_ADMIN()) { + // Abort here + return false; + } elseif (!EXT_IS_ACTIVE("bonus")) { + // Abort here + return false; + } + + // Calculcate target sent + $target = SELECTION_COUNT(explode(";", $receiverList)); + + // Receiver is zero? + if ($receiver == 0) { + // Then auto-fix it + $receiver = $target; + } // END - if + + // HTML extension active? + if (EXT_IS_ACTIVE("html")) { + // No HTML by default + $HTML = "N"; + + // HTML mode? + if ($mode == "html") $HTML = "Y"; + + // Add HTML mail + $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus +(subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, html_msg) +VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s')", + array( + $subject, + addslashes($text), + $receiverList, + $points, + $seconds, + $url, + $cat, + $target, + bigintval($receiver), + $HTML +), __FILE__, __LINE__); + } else { + // Add regular mail + $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus +(subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent) +VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')", + array( + $subject, + addslashes($text), + $receiverList, + $points, + $seconds, + $url, + $cat, + $target, + bigintval($receiver), +), __FILE__, __LINE__); + } +} + +// Generate a receiver list for given category and maximum receivers +function GENERATE_RECEIVER_LIST ($cat, $receiver, $mode="") { + global $_CONFIG; + + // Init variables + $CAT_TABS = "%s"; + $CAT_WHERE = ""; + $receiverList = ""; + + // Secure data + $cat = bigintval($cat); + $receiver = bigintval($receiver); + + // Is the receiver zero and mode set? + if (($receiver == 0) && (!empty($mode))) { + // Auto-fix receiver maximum + $receiver = GET_TOTAL_RECEIVERS($mode); + } // END - if + + // Category given? + if ($cat > 0) { + // Select category + $CAT_TABS = "LEFT JOIN "._MYSQL_PREFIX."_user_cats AS c ON d.userid=c.userid"; + $CAT_WHERE = " AND c.cat_id=%s"; + } // END - if + + // Exclude users in holiday? + if (GET_EXT_VERSION("holiday") >= "0.1.3") { + // Add something for the holiday extension + $CAT_WHERE .= " AND d.holiday_active='N'"; + } // END - if + + if ((EXT_IS_ACTIVE("html_mail")) && ($_GET['mode'] == "html")) { + // Only include HTML receivers + $result = SQL_QUERY_ESC("SELECT d.userid FROM "._MYSQL_PREFIX."_user_data AS d ".$CAT_TABS." WHERE d.status='CONFIRMED' AND d.html='Y'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s", + array($cat, $_CONFIG['order_select'], $_CONFIG['order_mode'], $receiver), __FILE__, __LINE__); + } else { + // Include all + $result = SQL_QUERY_ESC("SELECT d.userid FROM "._MYSQL_PREFIX."_user_data AS d ".$CAT_TABS." WHERE d.status='CONFIRMED'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s", + array($cat, $_CONFIG['order_select'], $_CONFIG['order_mode'], $receiver), __FILE__, __LINE__); + } + + // Entries found? + if ((SQL_NUMROWS($result) >= $receiver) && ($receiver > 0)) { + // Load all entries + while (list($REC) = SQL_FETCHROW($result)) { + // Add receiver when not empty + if (!empty($REC)) $receiverList .= $REC.";"; + } // END - while + + // Free memory + SQL_FREERESULT($result); + + // Remove trailing semicolon + $receiverList = substr($receiverList, 0, -1); + } // END - if + + // Return list + return $receiverList; +} + // ?> diff --git a/inc/reset/reset_yoomedia.php b/inc/reset/reset_yoomedia.php new file mode 100644 index 0000000000..0d6e41266e --- /dev/null +++ b/inc/reset/reset_yoomedia.php @@ -0,0 +1,49 @@ + diff --git a/templates/de/html/admin/admin_config_yoomedia.tpl b/templates/de/html/admin/admin_config_yoomedia.tpl new file mode 100644 index 0000000000..cb567f4f08 --- /dev/null +++ b/templates/de/html/admin/admin_config_yoomedia.tpl @@ -0,0 +1,96 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {--ADMIN_CONFIG_YOOMEDIA_TITLE--} +
 
+ {--ADMIN_CONFIG_YOOMEDIA_ID--} + + +
 
+ {--ADMIN_CONFIG_YOOMEDIA_SID--} + + +
 
+ {--ADMIN_CONFIG_YOOMEDIA_PASSWD--} + + +
 
+ {--ADMIN_CONFIG_YOOMEDIA_TM_MAX_RELOAD--} + + +
 
+ {--ADMIN_CONFIG_YOOMEDIA_TM_MIN_WAIT--} + + +
 
+ {--ADMIN_CONFIG_YOOMEDIA_TM_CLICKS_REMAIN--} + + +
 
+ {--ADMIN_CONFIG_YOOMEDIA_TM_MIN_PAY--} + + +
 
+ {--ADMIN_CONFIG_YOOMEDIA_EROTIC_ALLOWED--} + + +
 
+  * + +
+
+ +
+ {--ADMIN_CONFIG_YOOMEDIA_EROTIC_NOTE--} +
diff --git a/templates/de/html/admin/admin_list_yoomedia_tm.tpl b/templates/de/html/admin/admin_list_yoomedia_tm.tpl new file mode 100644 index 0000000000..b37507249a --- /dev/null +++ b/templates/de/html/admin/admin_list_yoomedia_tm.tpl @@ -0,0 +1,22 @@ + + + + + + + + + + + + + +$content + + + +
+ {--ADMIN_LIST_YOOMEDIA_TITLE--} +
{--ADMIN_YOOMEDIA_TM_ID--}{--ADMIN_YOOMEDIA_TM_NAME--}{--ADMIN_YOOMEDIA_TM_RELOAD--}{--ADMIN_YOOMEDIA_TM_WAIT--}{--ADMIN_YOOMEDIA_TM_REMAIN--}{--ADMIN_YOOMEDIA_TM_PAY--}{--ADMIN_YOOMEDIA_TM_ACTIONS--}
+ {--ADMIN_LIST_YOOMEDIA_NOTE--} +
diff --git a/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl b/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl new file mode 100644 index 0000000000..eaa899028e --- /dev/null +++ b/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl @@ -0,0 +1,22 @@ + + $content[id] +  $content[name] + $content[reload] {--_HOURS--} + $content[wait] {--_SECONDS--} + $content[remain] + $content[pay] € + + + + + +
+ $content[already] +
+ + + +
+
+ + diff --git a/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl b/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl new file mode 100644 index 0000000000..e810304c37 --- /dev/null +++ b/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl @@ -0,0 +1,23 @@ + + $content[id] +  $content[name] + $content[reload] {--_HOURS--} + $content[wait] {--_SECONDS--} + $content[remain] + $content[pay] € + +
+ + + + + + + + + + +
+
+ + diff --git a/templates/de/html/admin/admin_send_yoomedia.tpl b/templates/de/html/admin/admin_send_yoomedia.tpl new file mode 100644 index 0000000000..d58798c630 --- /dev/null +++ b/templates/de/html/admin/admin_send_yoomedia.tpl @@ -0,0 +1,77 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {--ADMIN_YOOMEDIA_SEND_MAIL_TITLE--} +
 
{--SELECT_CATEGORY--}: + +
 
{--ENTER_RECEIVER--}: + {--ADMIN_YOOMEDIA_RECEIVER_ARE_ALL_NOTE--} +
 
{--ENTER_POINTS--}: + {!POINTS!} +
 
{--ENTER_SECONDS--}: + {--_SECONDS--} +
 
{--ENTER_SUBJECT--}: + +
 
{--ENTER_TEXT--}: + +
 
{--MEMBER_ENTER_URL--}: + http://www.yoomedia.de/code/t-mail.php?id=$content[id]&sid=$content[sid] + + + +
+ {--ADMIN_YOOMEDIA_ENTER_URL_NOTE--} +
 
+  * + +
+
diff --git a/templates/de/html/admin/admin_yoomedia_error.tpl b/templates/de/html/admin/admin_yoomedia_error.tpl new file mode 100644 index 0000000000..751883a632 --- /dev/null +++ b/templates/de/html/admin/admin_yoomedia_error.tpl @@ -0,0 +1,8 @@ + + + + + + + +
{--ADMIN_YOOMEDIA_ERROR_TITLE--}
$content
diff --git a/theme/business/css/general.css b/theme/business/css/general.css index cc728ec570..cd05e86d32 100644 --- a/theme/business/css/general.css +++ b/theme/business/css/general.css @@ -452,6 +452,7 @@ DIV.admin_note { border : solid 1px #000000; background-color : #000000; color : #FFFFFF; + cursor : pointer; } .guest_stats { diff --git a/theme/default/css/general.css b/theme/default/css/general.css index 8e146794e7..ed63db0f0f 100644 --- a/theme/default/css/general.css +++ b/theme/default/css/general.css @@ -457,6 +457,7 @@ DIV.admin_note { border : solid 1px #00AA00; background-color : #AA0044; color : #DDEEDD; + cursor : pointer; } .guest_stats { diff --git a/theme/desert/css/general.css b/theme/desert/css/general.css index df64581418..11624b6592 100644 --- a/theme/desert/css/general.css +++ b/theme/desert/css/general.css @@ -424,9 +424,10 @@ DIV.admin_note { .admin_delete, .admin_yes { border-style : groove; - border : solid 1px #880000; + border : solid 1px #880000; background-color : #880000; - color : #FFFFCC; + color : #FFFFCC; + cursor : pointer; } .guest_stats {