]> git.mxchange.org Git - mailer.git/commitdiff
Extension 'yoomedia' now alpha status, some rewrites
authorRoland Häder <roland@mxchange.org>
Fri, 10 Oct 2008 23:52:54 +0000 (23:52 +0000)
committerRoland Häder <roland@mxchange.org>
Fri, 10 Oct 2008 23:52:54 +0000 (23:52 +0000)
- 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

293 files changed:
.gitattributes
inc/databases.php
inc/extensions/ext-
inc/extensions/ext-active.php
inc/extensions/ext-admins.php
inc/extensions/ext-admintheme1.php
inc/extensions/ext-admintheme_default.php
inc/extensions/ext-autopurge.php
inc/extensions/ext-bank.php
inc/extensions/ext-beg.php
inc/extensions/ext-birthday.php
inc/extensions/ext-bonus.php
inc/extensions/ext-cache.php
inc/extensions/ext-country.php
inc/extensions/ext-demo.php
inc/extensions/ext-doubler.php
inc/extensions/ext-holiday.php
inc/extensions/ext-html_mail.php
inc/extensions/ext-mailid.php
inc/extensions/ext-maintenance.php
inc/extensions/ext-mediadata.php
inc/extensions/ext-mods.php
inc/extensions/ext-mydata.php
inc/extensions/ext-newsletter.php
inc/extensions/ext-nickname.php
inc/extensions/ext-online.php
inc/extensions/ext-optimize.php
inc/extensions/ext-order.php
inc/extensions/ext-other.php
inc/extensions/ext-payout.php
inc/extensions/ext-primera.php
inc/extensions/ext-profile.php
inc/extensions/ext-rallye.php
inc/extensions/ext-refback.php
inc/extensions/ext-register.php
inc/extensions/ext-removeip.php
inc/extensions/ext-repair.php
inc/extensions/ext-rewrite.php
inc/extensions/ext-safe.php
inc/extensions/ext-sponsor.php
inc/extensions/ext-sql_patches.php
inc/extensions/ext-support.php
inc/extensions/ext-surfbar.php
inc/extensions/ext-task.php
inc/extensions/ext-theme.php
inc/extensions/ext-top10.php
inc/extensions/ext-transfer.php
inc/extensions/ext-user.php
inc/extensions/ext-wernis.php
inc/extensions/ext-yoomedia.php
inc/functions.php
inc/language/yoomedia_de.php [new file with mode: 0644]
inc/libs/cache_functions.php
inc/libs/optimize_functions.php
inc/libs/rallye_functions.php
inc/libs/yoomedia_functions.php [new file with mode: 0644]
inc/modules/admin/action-
inc/modules/admin/action-admins.php
inc/modules/admin/action-bank.php
inc/modules/admin/action-country.php
inc/modules/admin/action-doubler.php
inc/modules/admin/action-email.php
inc/modules/admin/action-holiday.php
inc/modules/admin/action-login.php
inc/modules/admin/action-logout.php
inc/modules/admin/action-menu.php
inc/modules/admin/action-misc.php
inc/modules/admin/action-mods.php
inc/modules/admin/action-newsletter.php
inc/modules/admin/action-payouts.php
inc/modules/admin/action-primera.php
inc/modules/admin/action-rallye.php
inc/modules/admin/action-repair.php
inc/modules/admin/action-setup.php
inc/modules/admin/action-sponsor.php
inc/modules/admin/action-stats.php
inc/modules/admin/action-surfbar.php
inc/modules/admin/action-task.php
inc/modules/admin/action-theme.php
inc/modules/admin/action-transfer.php
inc/modules/admin/action-user.php
inc/modules/admin/action-wernis.php
inc/modules/admin/what-
inc/modules/admin/what-add_bank_package.php
inc/modules/admin/what-add_guestnl_cat.php
inc/modules/admin/what-add_points.php
inc/modules/admin/what-add_rallye.php
inc/modules/admin/what-add_sponsor.php
inc/modules/admin/what-add_surfbar_url.php
inc/modules/admin/what-admin_add.php
inc/modules/admin/what-adminedit.php
inc/modules/admin/what-admins_add.php
inc/modules/admin/what-admins_contct.php
inc/modules/admin/what-admins_edit.php
inc/modules/admin/what-admins_mails.php
inc/modules/admin/what-autopurge.php
inc/modules/admin/what-bonus.php
inc/modules/admin/what-cache_stats.php
inc/modules/admin/what-config_active.php
inc/modules/admin/what-config_admin.php
inc/modules/admin/what-config_admins.php
inc/modules/admin/what-config_autopurge.php
inc/modules/admin/what-config_beg.php
inc/modules/admin/what-config_birthday.php
inc/modules/admin/what-config_bonus.php
inc/modules/admin/what-config_cache.php
inc/modules/admin/what-config_cats.php
inc/modules/admin/what-config_doubler.php
inc/modules/admin/what-config_email.php
inc/modules/admin/what-config_extensions.php
inc/modules/admin/what-config_holiday.php
inc/modules/admin/what-config_home.php
inc/modules/admin/what-config_mediadata.php
inc/modules/admin/what-config_mods.php
inc/modules/admin/what-config_newsletter.php
inc/modules/admin/what-config_nickname.php
inc/modules/admin/what-config_order.php
inc/modules/admin/what-config_other.php
inc/modules/admin/what-config_payouts.php
inc/modules/admin/what-config_points.php
inc/modules/admin/what-config_primera.php
inc/modules/admin/what-config_proxy.php
inc/modules/admin/what-config_rallye_prices.php
inc/modules/admin/what-config_refid.php
inc/modules/admin/what-config_reg.php
inc/modules/admin/what-config_register.php
inc/modules/admin/what-config_register2.php
inc/modules/admin/what-config_removeip.php
inc/modules/admin/what-config_rewrite.php
inc/modules/admin/what-config_secure.php
inc/modules/admin/what-config_session.php
inc/modules/admin/what-config_sponsor.php
inc/modules/admin/what-config_stats.php
inc/modules/admin/what-config_surfbar.php
inc/modules/admin/what-config_title.php
inc/modules/admin/what-config_top10.php
inc/modules/admin/what-config_transfer.php
inc/modules/admin/what-config_user.php
inc/modules/admin/what-config_wernis.php
inc/modules/admin/what-config_yoomedia.php [new file with mode: 0644]
inc/modules/admin/what-del_email.php
inc/modules/admin/what-del_holiday.php
inc/modules/admin/what-del_sponsor.php
inc/modules/admin/what-del_task.php
inc/modules/admin/what-del_transfer.php
inc/modules/admin/what-del_user.php
inc/modules/admin/what-edit_emails.php
inc/modules/admin/what-edit_sponsor.php
inc/modules/admin/what-edit_user.php
inc/modules/admin/what-email_archiv.php
inc/modules/admin/what-email_details.php
inc/modules/admin/what-email_stats.php
inc/modules/admin/what-extensions.php
inc/modules/admin/what-guest_add.php
inc/modules/admin/what-guestedit.php
inc/modules/admin/what-holiday_list.php
inc/modules/admin/what-holiday_remove.php
inc/modules/admin/what-list_autopurge.php
inc/modules/admin/what-list_bank_package.php
inc/modules/admin/what-list_beg.php
inc/modules/admin/what-list_bonus.php
inc/modules/admin/what-list_cats.php
inc/modules/admin/what-list_country.php
inc/modules/admin/what-list_doubler.php
inc/modules/admin/what-list_holiday.php
inc/modules/admin/what-list_links.php
inc/modules/admin/what-list_newsletter.php
inc/modules/admin/what-list_norefs.php
inc/modules/admin/what-list_notifications.php
inc/modules/admin/what-list_payouts.php
inc/modules/admin/what-list_primera.php
inc/modules/admin/what-list_rallyes.php
inc/modules/admin/what-list_refs.php
inc/modules/admin/what-list_sponsor.php
inc/modules/admin/what-list_sponsor_pay.php
inc/modules/admin/what-list_sponsor_pays.php
inc/modules/admin/what-list_surfbar_urls.php
inc/modules/admin/what-list_task.php
inc/modules/admin/what-list_transfer.php
inc/modules/admin/what-list_unconfirmed.php
inc/modules/admin/what-list_user.php
inc/modules/admin/what-list_wernis.php
inc/modules/admin/what-list_yoomedia_tm.php [new file with mode: 0644]
inc/modules/admin/what-lock_sponsor.php
inc/modules/admin/what-lock_user.php
inc/modules/admin/what-logs.php
inc/modules/admin/what-maintenance.php
inc/modules/admin/what-mem_add.php
inc/modules/admin/what-memedit.php
inc/modules/admin/what-optimize.php
inc/modules/admin/what-overview.php
inc/modules/admin/what-payments.php
inc/modules/admin/what-refbanner.php
inc/modules/admin/what-repair_amenu.php
inc/modules/admin/what-repair_cats.php
inc/modules/admin/what-repair_gmenu.php
inc/modules/admin/what-repair_mmenu.php
inc/modules/admin/what-send_bonus.php
inc/modules/admin/what-send_newsletter.php
inc/modules/admin/what-stats_mods.php
inc/modules/admin/what-sub_points.php
inc/modules/admin/what-surfbar_stats.php
inc/modules/admin/what-theme_check.php
inc/modules/admin/what-theme_edit.php
inc/modules/admin/what-theme_import.php
inc/modules/admin/what-unlock_emails.php
inc/modules/admin/what-unlock_sponsor.php
inc/modules/admin/what-unlock_surfbar_urls.php
inc/modules/admin/what-updates.php
inc/modules/admin/what-usage.php
inc/modules/admin/what-user_contct.php
inc/modules/admin/what-user_online.php
inc/modules/admin/what-usr_online.php
inc/modules/guest/action-
inc/modules/guest/action-main.php
inc/modules/guest/action-members.php
inc/modules/guest/action-sponsor.php
inc/modules/guest/what-
inc/modules/guest/what-active.php
inc/modules/guest/what-beg.php
inc/modules/guest/what-confirm.php
inc/modules/guest/what-doubler.php
inc/modules/guest/what-impressum.php
inc/modules/guest/what-infos.php
inc/modules/guest/what-login.php
inc/modules/guest/what-mediadata.php
inc/modules/guest/what-rallyes.php
inc/modules/guest/what-register.php
inc/modules/guest/what-sponsor_agb.php
inc/modules/guest/what-sponsor_infos.php
inc/modules/guest/what-sponsor_login.php
inc/modules/guest/what-sponsor_reg.php
inc/modules/guest/what-stats.php
inc/modules/guest/what-top10.php
inc/modules/guest/what-welcome.php
inc/modules/guest/what-wernis_portal.php
inc/modules/member/action-
inc/modules/member/action-account.php
inc/modules/member/action-bank.php
inc/modules/member/action-extras.php
inc/modules/member/action-logout.php
inc/modules/member/action-main.php
inc/modules/member/action-order.php
inc/modules/member/action-rals.php
inc/modules/member/action-stats.php
inc/modules/member/action-surfbar.php
inc/modules/member/what-
inc/modules/member/what-bank_create.php
inc/modules/member/what-bank_deposit.php
inc/modules/member/what-bank_infos.php
inc/modules/member/what-bank_output.php
inc/modules/member/what-bank_withdraw.php
inc/modules/member/what-beg.php
inc/modules/member/what-beg2.php
inc/modules/member/what-bonus.php
inc/modules/member/what-categories.php
inc/modules/member/what-doubler.php
inc/modules/member/what-guest.php
inc/modules/member/what-holiday.php
inc/modules/member/what-html_mail.php
inc/modules/member/what-mydata.php
inc/modules/member/what-newsletter.php
inc/modules/member/what-nickname.php
inc/modules/member/what-order.php
inc/modules/member/what-payout.php
inc/modules/member/what-points.php
inc/modules/member/what-primera.php
inc/modules/member/what-rallyes.php
inc/modules/member/what-refback.php
inc/modules/member/what-reflinks.php
inc/modules/member/what-sponsor.php
inc/modules/member/what-stats.php
inc/modules/member/what-support.php
inc/modules/member/what-surfbar_book.php
inc/modules/member/what-surfbar_list.php
inc/modules/member/what-surfbar_start.php
inc/modules/member/what-surfbar_stats.php
inc/modules/member/what-themes.php
inc/modules/member/what-transfer.php
inc/modules/member/what-unconfirmed.php
inc/modules/member/what-wernis.php
inc/mysql-connect.php
inc/mysql-manager.php
inc/reset/reset_yoomedia.php [new file with mode: 0644]
templates/de/html/admin/admin_config_yoomedia.tpl [new file with mode: 0644]
templates/de/html/admin/admin_list_yoomedia_tm.tpl [new file with mode: 0644]
templates/de/html/admin/admin_list_yoomedia_tm_already.tpl [new file with mode: 0644]
templates/de/html/admin/admin_list_yoomedia_tm_row.tpl [new file with mode: 0644]
templates/de/html/admin/admin_send_yoomedia.tpl [new file with mode: 0644]
templates/de/html/admin/admin_yoomedia_error.tpl [new file with mode: 0644]
theme/business/css/general.css
theme/default/css/general.css
theme/desert/css/general.css

index 2949079f5d9e82c7a8848159bbb60100bf8a5f55..f20f91370fd97e395086ce6c0c58c95b1beeb4e9 100644 (file)
@@ -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
index 2ba324390a69ca0d8a2205bc382ee12f0701bede..f2a552eb8bbd4d0578849b2327ff950afa9d5c95 100644 (file)
@@ -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);
index d5f3294ef34e151a62711f2128cab034d306e554..a60ee01b4b23cb305dfc2086cfb79526a977cd08 100644 (file)
@@ -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?
index d3d013a19feb9359586d0ebab3830ecdbf0ec7b4..7b3e4dafccf1ed435607171e45dba360cdb8a5a2 100644 (file)
@@ -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')";
 
index 8b389d011a00b41f418308a0aaf2dca5e855553f..6746286960877044137165f2c0e9187295e1249e 100644 (file)
@@ -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&ouml;schen oder Passwort/E-Mail Adresse &auml;ndern.','1')";
index 4780f0102982ac03d2e4029217a6a0b6b31f9b52..516ebaf98bc0c7892343e161112a1f496d2abb1d 100644 (file)
@@ -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";
index 6e3c8befc09e877e1888ec46031c22dc7b2cedc0..189a43eb21e8e0f34b0a2ac7054c2da3c697248d 100644 (file)
@@ -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";
index b8205c2f066e8ac6f7e37b0388c04484f9838dea..192c9838a725a2314f15dd2ed59a03656bd85c59 100644 (file)
@@ -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"))
index 12f02fabf141663f37c3f9029959d787d9537c60..1f9d217f89d4759492bd838427551d4d653ea589 100644 (file)
@@ -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 (
index 3b1daa75c8e035f9455fbc5ad8e2d4c0b04fb0ac..75416b5512eddef6c1cb90a54d3aa95314f57dc1 100644 (file)
@@ -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&uuml;tung usw. k&ouml;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')";
index 17d538640a5ba8fe86bcd574fe22b94eda6bdd9b..05c8c0f409b8ef1d4a2e4a705342185d0d4c474c 100644 (file)
@@ -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;
index 6b20192940fb0dc327544f6e6e2db580df74bea6..223d4fe7528f080afa68db197b715f9bd07b067f 100644 (file)
@@ -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&ouml;nnen hier immer senden.')";
        $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu VALUES (NULL,'main','bonus','Bonuspunkte',7,'Y','Y','', 0)";
index f1db9c8cca3aefca91f180975ccc70758e89938e..d4516d557585cd975df768dee2506d8cdc6652fa 100644 (file)
@@ -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/'";
index c1bfb2b7b18e2d43078b2dc2d19e79b03f04d0f1..85f5e932a232985b597a91b66db8799e9f2f045a 100644 (file)
@@ -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 (
index 220a5e296e179a909e5223e0d62fb09dd37c5b1c..cf3d37c6c0393428f6392297c4e4d8728e3d8aa2 100644 (file)
@@ -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;
index 98470a4e1b9ee31c23bf892c3a9d8b9aa5758584..05149fb04efd424702f033efe5f8718acf8b9c87 100644 (file)
@@ -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 (
index 1d6a3187abd2fa43338a36a191ddaaf200de3330..503e85e99e424e55fac8ba71ab77d8cdaba6a6fe 100644 (file)
@@ -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 (
index 9c223e3f499fed51a0fc7d409f9c288fcdff591c..e499eb5c9bc39b80f612b1e9e803739412ed7e74 100644 (file)
@@ -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'";
index 5a0d8d4fb44592903013c81519f964d88901c336..34bac1b73416631516dcf2fd23cd1bc912cd24c0 100644 (file)
@@ -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;
index e3e299e2db2840b7469c7e1afd01de4f32781554..02204d499d51d33efef13c1259313f05c39aef4b 100644 (file)
@@ -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&ouml;nnen.','10')";
index 2b13616708c6c568ca9bae8d94f1f7003de38d1f..bdc66a18027a5642efe8893c50c0fcdaf2320208 100644 (file)
@@ -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;
index 01f5954c3a256fd9836a59f578a9b81e42d0137e..d22292a91a1ab30c77251ef883372bbce20d028f 100644 (file)
@@ -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 &auml;ndern','&Auml;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)";
index 32b1f1efa668d6df50173336c5d9ecca10559c4d..5324dbef138f76cf030fc3c421a9341f1ffe187f 100644 (file)
@@ -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;
index 648cdb1cdd8e1cd34a16fb370455b2a6c7dd5c15..3ad4f224e1d90e06a3512cc02455f62318c7574d 100644 (file)
@@ -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;
index 3ef849f832f8449410f76349f281a557784bbb82..642e8307cf98fd68a0434ba1fc32036fd9253c88 100644 (file)
@@ -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'";
index 6b1fa94f443b65fdcd7003834a538ebd0337264c..7e450d82d1a6b45a9ee69e385163c9d529d8c0b1 100644 (file)
@@ -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 (
index 695c60b100bed6fe363aa6ed44cf87f6f0f6a623..b9e3053df0462f9bfb25299df0079dfff06bc9da 100644 (file)
@@ -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,
index 5a7d2a924f28bc6bbe5a1350d4967bf20a061cba..969b05d5c7afdc368840d577483f913b9f8e565e 100644 (file)
@@ -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;
index c365f2cf5569c9568efd634a040d187b0bcadb30..0c84baa6ac1ebd722dae275afe79069d15b8c06a 100644 (file)
@@ -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;
index be3ef40a8e2d95a7a009632938ca3433dce67a63..cb5b9bf1e6644a8c669ecc95b2d30a1f3fb328fb 100644 (file)
@@ -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 (
index 11ea3b372c2380d07d225710cf1ebfdac609cd21..eb378ec7f0de21374eee5787fa8279ad8a9b3aed 100644 (file)
@@ -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 (
index c8da12066b511161234fdd72a55a64cb1fbf3265..745eabfd02a8ffd512a96bd5c68610b5fb1091e1 100644 (file)
@@ -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;
index 32dfcbf2e0ce5a95a99d9e0f30985a9cbd11bda5..479f50667c652f76f4177537193baf6e218c0b41 100644 (file)
@@ -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";
index 42c7767fa082bd802a58d1ebc9d3029a1aa26fc6..092466ba65f11ab5e1240f8dd64eabeb4ddddf36 100644 (file)
@@ -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` (
index c087748a9aa83b165945ccfe4b8dbfa1dd048d1e..a9a071a9b3e2f4b68bc6e3ad343b90c23544d6da 100644 (file)
@@ -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[] = "";
 
index 977e6765788c70c4e2d25a1a831e566c80eb7d9e..3e71c56f537195f8bc82b5c3a2e7ab621750c457 100644 (file)
@@ -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'";
index 20e442d81caddf37642488b327290ad52924e91b..c31611dc46fa7dd8275a22ae2b4174f699db0c2e 100644 (file)
@@ -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.')";
index d0741fd8aead1b8c93c7193c16f79343677add2b..909080785a79ef917277881e77cd104e28b59ea6 100644 (file)
@@ -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;
index 690d6835ea2678306788565b874c7de58db30c68..b747e64f2b6059c4942e2fe7ea80fa6a45135101 100644 (file)
@@ -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;
 
index 3147b41835e065884ad3e011ed0501396b55caae..d9126a87c7ccfa337052951c2ce92a24c632dcdf 100644 (file)
@@ -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
        //
index 87300c92c2a8413ad32ef324424f654e89aa40e8..fbc7a8067ee6b749755b4cf40ee22d02ef5b9107 100644 (file)
@@ -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;
index b8d6d897798c8180355d486193a12b8bb26bf028..3737987e321f2e1902ebda0cc970722f8b3ee51e 100644 (file)
@@ -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;
index e67e15bb1d35283e59031bb0e00ba15a8d2f5e68..7566b5a2ea296bb59e7349732559a2daf4473cf5 100644 (file)
@@ -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` (
index f8c740bfb23d4d6533876590cac7ff31f4528742..8143d0c3c8437d6035542b44ccb9e16e4f83bd74 100644 (file)
@@ -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).')";
index 84a47283507bd926d5935e2b3dadbb42b1e0815a..59a38db105a90c1f7dadc2939c3ef7064e2cbbd7 100644 (file)
@@ -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&uuml;fen','Nach neuen Themes suchen bzw. nach Updates zu den Themes suchen.', 3)";
        break;
index 358367b59729921d558a53fc1086e9a5e3155e26..ae4028831ad3f17383026b180576c57da92727de 100644 (file)
@@ -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&auml;tze angezeigt werden sollen.', 8)";
index 77b6cad0c7ee91f8221e4274f645a2d16b92873d..982efbecfb8b042f786563632c78d592a592fe42 100644 (file)
@@ -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";
index d62590ede9c0fa942366da8b57b29a8797c0c38c..9d3c4655b7463b4f934edf992fb4b5694a99b789 100644 (file)
@@ -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[] = "";
 
index 672ec5089d6f4a5ca010df8ded1fcbc3578c7d57..097c7c879a9ecd137378ff210323d5b03a5c3650 100644 (file)
@@ -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 (
index 99724405e3e64d7ac5b523ed16c78a39e1899ec2..a8951fdd167bb95f2e840aef2fe853ede6244e58 100644 (file)
@@ -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 &uuml;ber das Interface 2.0 von Yoo!Media nach Ihren eingestellten Kriterien auf. <strong>Vorsicht:</strong> 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;
 }
 
index ecd38c9ef4b2491412c8a4201cfeb651e68cda20..70f99efe2b29638f09fbc9411fc54ef64241df92 100644 (file)
@@ -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()) {
 <br /><br />";
        }
 
+       // 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 (file)
index 0000000..b913ba7
--- /dev/null
@@ -0,0 +1,95 @@
+<?php
+/************************************************************************
+ * MXChange v0.2.1                                    Start: 10/10/2008 *
+ * ===============                              Last change: 10/10/2008 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : yoomedia_de.php                                  *
+ * -------------------------------------------------------------------- *
+ * Short description : German langugage support                         *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Deutsche Sprachunterstuetzung                    *
+ * -------------------------------------------------------------------- *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * 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 *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       require($INC);
+}
+
+// Admin config strings
+define('ADMIN_CONFIG_YOOMEDIA_TITLE', "Einstellungen f&uuml;r Yoo!Media Interface 2.0");
+define('ADMIN_CONFIG_YOOMEDIA_ID', "Ihre User-ID:");
+define('ADMIN_CONFIG_YOOMEDIA_SID', "Seiten-ID:");
+define('ADMIN_CONFIG_YOOMEDIA_PASSWD', "Interface-Passwort:");
+define('ADMIN_CONFIG_YOOMEDIA_TM_MAX_RELOAD', "Maximale Reloadsperre der Kampagnen in Stunden:");
+define('ADMIN_CONFIG_YOOMEDIA_TM_MIN_WAIT', "Mindestaufenthalt in Sekunden:");
+define('ADMIN_CONFIG_YOOMEDIA_TM_CLICKS_REMAIN', "Mindestanzahl der restlichen Klicks:");
+define('ADMIN_CONFIG_YOOMEDIA_TM_MIN_PAY', "Mindestverg&uuml;tung der Kampagne:");
+define('ADMIN_CONFIG_YOOMEDIA_EROTIC_ALLOWED', "Kampagnen mit erotischen Inhalt anzeigen?");
+define('ADMIN_CONFIG_YOOMEDIA_EROTIC_NONE', "Keine Erotik anzeigen");
+define('ADMIN_CONFIG_YOOMEDIA_EROTIC_INCLUDE', "Auch Erotik anzeigen");
+define('ADMIN_CONFIG_YOOMEDIA_EROTIC_ONLY', "Nur Erotik anzeigen");
+define('ADMIN_CONFIG_YOOMEDIA_EROTIC_NOTE', "<strong>Hinweise:</strong> 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&ouml;scht oder gesperrt.");
+define('ADMIN_CONFIG_YOOMEDIA_TEST_FAILED', "Konfigurationsdaten stimmen nicht &uuml;berein. Details entnehmen Sie bitte der Datei <u>inc/cache/debug.log</u>.");
+
+// Generic admin strings
+define('ADMIN_YOOMEDIA_REQUESTS_DEPLETED', "Ihr Abfragekonto der API ist ersch&ouml;pft. Bitte surfen Sie auf <a href=\"http://www.yoomedia.de\" target=\"_blank\">www.YooMedia.de</a> und loggen Sie sich ein, um manuell Mails zu versenden.");
+define('ADMIN_YOOMEDIA_INVALID_RESULT', "Ung&uuml;ltige Antwort von der API erhalten. Ist <a href=\"http://www.yoomedia.de\" target=\"_blank\">www.yoomedia.de</a> 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 <strong>%s</strong> bereits versendet.");
+define('ADMIN_YOOMEDIA_TEXTMAIL_SEND_AGAIN', "Textmail kann in <strong>%s</strong> 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', "<strong>Hinweise:</strong> Mails mit 0 Sekunden Mindestaufenthalt sind meistens Framekiller-Mails. Sie k&ouml;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&uuml;gbaren Empf&auml;nger ausgew&auml;hlt.");
+
+// Subject lines
+define('ADMIN_YOOMEDIA_SUBJECT_PREFIX', "Paidmail:");
+define('ADMIN_YOOMEDIA_ENTER_URL_NOTE', "Die URL wird automatisch f&uuml;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 &uuml;brig");
+define('ADMIN_YOOMEDIA_TM_PAY', "Verg&uuml;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&auml;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&ouml;pft.");
+define('ADMIN_YOOMEDIA_ERROR_ZERO_RESULT', "Keine Buchungenz zur Auswahl gefunden.");
+define('ADMIN_YOOMEDIA_ERROR_INCOMPLETE_REQUEST', "Abfragedaten sind nicht komplett.");
+
+//
+?>
index ba490d57c7a0f22f4cac0937606ae10c3c6e0c80..a3b1d0a15e77831db0bf6c1d430869a2d2f426d6 100644 (file)
@@ -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 {
index cefbd46fa43f3eb5bac8f5f662cce87ab056b11d..26dcdbc71896603513aa377f0c996589afc83208 100644 (file)
@@ -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))
index f18f68df6eefa90d93c7450db85cc5ff8b641164..7335584f74508405d4306d263de3e3db7fb24a14 100644 (file)
@@ -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 (file)
index 0000000..54bc990
--- /dev/null
@@ -0,0 +1,369 @@
+<?php
+/************************************************************************
+ * MXChange v0.2.1                                    Start: 10/10/2008 *
+ * ===============                              Last change: 10/10/2008 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : yoomedia_functions.php                           *
+ * -------------------------------------------------------------------- *
+ * Short description : Special functions for yoomedia extension         *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Spezielle Funktion fuer Yoo!Media-Erweiterung    *
+ * -------------------------------------------------------------------- *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * 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 *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       require($INC);
+}
+
+// Test if the extension settings did work
+function YOOMEDIDA_TEST_CONFIG ($data) {
+       global $_CONFIG;
+
+       // Is this admin?
+       if (!IS_ADMIN()) {
+               // No admin!
+               return false;
+       } // END - if
+
+       // Transfer config data
+       $_CONFIG = array_merge($_CONFIG, $data);
+
+       // Temporary allow maximum
+       $_CONFIG['yoomedia_tm_max_reload']    = 1000;
+       $_CONFIG['yoomedia_tm_min_wait']      = 0;
+       $_CONFIG['yoomedia_tm_clicks_remain'] = 10;
+       $_CONFIG['yoomedia_tm_min_pay']       = 0;
+       $_CONFIG['yoomedia_erotic_allowed']   = 1;
+
+       // Query the API with a test request without couting it
+       // If zero reply comes back the data is invalid!
+       $response = YOOMEDIA_QUERY_API("out_textmail.php", true); // TODO Ask Yoo!Media for test script
+
+       // Log the response if failed
+       if (count($response) == 0) {
+               // Queries depleted (as we count here!)
+               DEBUG_LOG(__FUNCTION__."(".__LINE__."): Requested depleted. Maxmimum was: ".$_CONFIG['yoomedia_requests_total']);
+       } elseif (count($response) <= 10) {
+               // Log serialized raw response
+               DEBUG_LOG(__FUNCTION__."(".__LINE__."): Raw response=".base64_encode(serialize($response)));
+       } // END - if
+
+       // Do we have some data there?
+       return (count($response) > 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;
+}
+
+//
+?>
index 81a2fcad9ad99dd440c9b892a5eb4e7822fd1dd9..69b93d86a1b421a439174752623b59264c04c827 100644 (file)
@@ -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']);
index 41ddf38a15ca41e2c0022e7ac0b8c798fc1592d7..513906d1714ea2c8ee1a21fd9c69cfd7c4e6e0bb 100644 (file)
@@ -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']);
index 6bd915d001b5c7ea5e60bd5721f71921977606d4..f1504ea0442dfc8cf366d4f9610d4e1a7db85b54 100644 (file)
@@ -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']);
index b78e4783b0d26c6118c433c99747239533a6bad6..c2326203b58c475f4977a2ac2399b8f86a151819 100644 (file)
@@ -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']);
index 2906a36e182d50dc116852d52561a2a9bfacbdc0..26c92b1837c9fe2a8f75c4cfa3a33f90f9c95f10 100644 (file)
@@ -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']);
index 3c2d83513ec2e59efa5080bbb39a8f2b1490733e..2c4940c6466cad1f6c7a4b3439c3497be3d758be 100644 (file)
@@ -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']);
index 23a589444e17f80fddd300456317352b9de9e34d..11200f7bc1952d7c5710963def0eb569716565ae 100644 (file)
@@ -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']);
index 9e7aed0ab00bb8100f83dee9e97cf320b91c10f1..03d8459449db97cd73362299493586e12aaecbb9 100644 (file)
@@ -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']);
index 2658ae6291455408a8c7b07397965b5020fc5016..5dbcecf292eaa9579adbe6ac4a1a18c2c608069e 100644 (file)
@@ -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&amp;logout=1");
-} else {
-       // Load logout form template
-       LOAD_TEMPLATE("admin_logout_form");
 }
+
+// Load logout form template
+LOAD_TEMPLATE("admin_logout_form");
+
 //
 ?>
index 4eb92e296645917ec9e7ae6e484674bb049c8b24..c11decc48151bf06ab43780d93cb32a1cca44bc6 100644 (file)
@@ -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']);
index e05467eb801e2f37aee612f1153cba9f61b718a5..e25b996f4b973f575511c64d363a35b4138cc75f 100644 (file)
@@ -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']);
index 6ce43d01648e4dcfb7da5ebabdd28779f86739c6..775d8cab987cad799b1c98c1df2db1e407db054a 100644 (file)
@@ -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']);
index edfbc80e97853e818bbc2986be74bf6684fb3dd5..2e22f370f9061b0385fff6200d9dcd6e80a706af 100644 (file)
@@ -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']);
index 3f1c2aa47d6769a0da521a3b6d4013d557283ce3..1f588275e987cfb0a6ef89a2f430216bdd298400 100644 (file)
@@ -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']);
index d310efdf4c493bc419e5d2032d69956653d5601c..a4a407032492afd3a074f4d31151210bc7b69515 100644 (file)
@@ -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']);
index c09a5b9097476bbc88744831c4b0c1905557d046..aff9a0fe1eb71073d95deaa46bd4919898eb3330 100644 (file)
@@ -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']);
index cee773a524074c41fbc760a5d7577b7859ecd5e8..68f8cdddb886c38b4d67730c849bb90acdd9a18e 100644 (file)
@@ -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']);
index df957341fe140557bea1662cf9c45b02ab394195..5f5b0c405899dd0d87230da4355365e87b8a7215 100644 (file)
@@ -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']);
index 459607d7b7b66964dce95899ecff1069d0fd0cf9..7ff7d038e9068d9f49eb638d649a5cb6ea08bc6c 100644 (file)
  * 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']);
index 76c3ddf5fd7dfd491e5c78f9b3ef73be7a1f85b2..de96e3bd84ae784a218e53a8af9515971f38bb72 100644 (file)
@@ -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']);
index c9eff8b4c3212973842f6078fc2b3426c9c5917e..3ddd896dd9e4994a68d48f6c450b06c41f8033d7 100644 (file)
@@ -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']);
index 5c61f44d8ff743f152cd842f899b1367497e56ff..5dd6f7b1cade9ec35eb77553c8191e742ffc5169 100644 (file)
@@ -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']);
index f923105a5c33f0e8c83657302b41a077e866f212..fae7b8348122a393582745f6968ddf4bd3ad7de6 100644 (file)
@@ -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']);
index 2462908e268f1d2532ef25334758dbba32b808db..c4b1d1bb4b7a96684bf45f8c36705908334b5187 100644 (file)
@@ -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']);
index 1cc7270823b8a34b65b5495eaabc2225baeada78..5ef4c8d18feea5b1b2c7f037d69345848391d46a 100644 (file)
@@ -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']);
index 18e55d0e908eb3cb9d8cb090950c8bbceef4e13b..d543b6b5fb9f5df9789ac65079657a4a8a4f75ec 100644 (file)
@@ -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']);
index fb5dca692c0d13525edb0688727136b6a477fc5f..42e452159434419652223aa94998ed7c930c1e66 100644 (file)
@@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!is_admin())) {
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 //
 ?>
index c24efeb2cc8b395ab7ccd19e250b43e4b6ed2b1f..ed4e351b2c606035eef898677677501a7a89460e 100644 (file)
  ************************************************************************/
 
 // 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'])) {
index 18982007bbb4424b0822a73b9c655f009e9135ba..c7fcc2b11a5d68e09338950b0917bbee4b2ebb02 100644 (file)
  ************************************************************************/
 
 // 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']))
 {
index b161fd7f854f21e3c0d80a5c10513eed9445bb5b..a193055a5aca5ed84144132cbfcde50c0d18c011 100644 (file)
@@ -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'] = "";
index 1eb0f2f44879818f9c17b18d817311e0f6497414..d22abccd5eda15dfb24caebfaee7abd84ce5382b 100644 (file)
@@ -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']))
 {
index 45838247b0027d089e26ea7df1f4c77a6b2c6ce1..1f736068ee145ec0c44142d1f91e4af3bad44deb 100644 (file)
  * 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       *
  ************************************************************************/
 
 // 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
index b3f5bf317580515ba2574a2fbfc4302ed032ab09..cfa7b7b7f17eddb7f7a26399de0e10b4db8693be 100644 (file)
  ************************************************************************/
 
 // 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']))) {
index fa44c2de380af8a0ece0ccf0876240d565493d43..b93cf05a0a80cb031ec943b304c883ad3c957581 100644 (file)
@@ -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']))) {
index 88db098f49578b9b0fe627dc913e1a5388c1ae5b..f30250d1d5db7699ce50169397b63af76f72605f 100644 (file)
@@ -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 = "";
index 667568fff6564d9ede5f40941bc8508333e953f9..fad779b17f607d531364162542f3429bf377dfe7 100644 (file)
@@ -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;
 
index f004def6c3b6fa626401292792f1382d2a9718fe..9b525cc5e52357f5661451ff49f542f183122799 100644 (file)
@@ -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
index e4aaee886fb1e0c1709d4daa152aa50ae7ae65da..3831184cc64ca3494b6099dc4551aaae76171091 100644 (file)
@@ -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;
index 3d7e951eff67f322159bee5e7b81e51c58785613..879ab6f3dc05ea08815338cac8fe8d218ca0e41d 100644 (file)
@@ -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']))
 {
index cc27e516e5a25da5902072241206ebab09a35b02..da04ee23e4a28ce2a19d6584d248cb120d34e1d3 100644 (file)
@@ -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
index aa9c9858e34a48a9233f59e9963628e4e9663863..1aa723195789c672ecb54cad80c777211c14b26c 100644 (file)
@@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 //
 ?>
index ee2f431796d17bb0712488357a9339f915b6e650..13e22537de0e39cdab958c38ca6e5ad669d1de43 100644 (file)
  ************************************************************************/
 
 // 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']);
index 3a7e0d8445b27638fc65b749f75cb06f1381b64c..2d244f804645ae79dcdd6dfdde5a0ed047d11d3d 100644 (file)
@@ -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
index 8b78570c20dd73c35d28535a5801df9336544d51..83084f6f6bbe9dcd9fc3d5b0c33de90b6f6d81d8 100644 (file)
@@ -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
index c1bf5539c5d020a7c53d21ff90070b06b4b10fa9..5bd3d2cc85005848fb24d42485b2178ce26282c6 100644 (file)
@@ -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']);
index abbb29a58955ced46686d82897c7f7cc19f4e013..56bf2c494e3301ed9c65dfb504a447b75fd6e45b 100644 (file)
@@ -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
index b9911aab76fae93cfc6975df3316a0268092af56..6745c0ce95f943a0137b30b0dfabb528b42fe7f6 100644 (file)
  ************************************************************************/
 
 // 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
index 42a2b8ee7560573d9fa179e78bf284f4e1c1eabc..6ecd32903fac404b4ff84217e2d7d7c91ff7cf4a 100644 (file)
@@ -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
index 53a6e3c884fa390354b07c31c3d2173929734d29..3e3308027ebd003bc1b62607ace2210a9edf408f 100644 (file)
@@ -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
index ddb518f55bf6ee9a2bc81acb7b0cc37392ee417b..da06438288c2c58fa892072ac46f8339c80f94b4 100644 (file)
@@ -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
index 3f9584d921b7ff3fa2a0c21d7b4979cfa98d3743..38e40127d28d0ca42d9c7ffd1b1b4ffc4f179a12 100644 (file)
@@ -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 = "";
index 29ddc3a29f44352f194ec9ccbaf7368036fa6652..2b3b5f54f29fdcb4ac43d46e0aa07ad43f1b9111 100644 (file)
  ************************************************************************/
 
 // 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
index c41ae6c5ce837da0eff35238bff20e9c12bda3c1..f2190ae37e9c1d3512c1ab45e8f8fe0852ac6527 100644 (file)
@@ -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']);
index 4c09b2b39321e228779adacbd77f868c17364ade..d79ef2e740a5c4dc6f811a64625569069b3823a5 100644 (file)
@@ -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
index ffb49497d7733fda098c08c2dc82c30c5039b786..58a557e14a52e2f5fd64600c74d4995de6091501 100644 (file)
@@ -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']))
 {
index e4b640b21e42708d522847d5b8dca851b0e28365..7c57c8882ea214f9cd93f079d2ecf17c8add2e65 100644 (file)
@@ -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'];
index 5af3aa5d29ac3cda617828bbde31cad6f63cffd9..428d0f1cb3435903936ab027039d64f45c544231 100644 (file)
  ************************************************************************/
 
 // 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']))
 {
index 9bc4c994fd2b4aecd1451db09f9a7b1df3c82e2f..dceeebda8a83cdd53375405d37069a1c9f2c29ad 100644 (file)
@@ -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']))
index f3d42154b113f87a75bf2f0f4c0c720f9514e1d7..d5f22e249ed5fef765403dfa23f1249eea68e8b2 100644 (file)
@@ -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']))
 {
index b08d423c81a36c5366324273bf8f3d6259f3b5ac..c95b924b25180f07bdbe9cc44f67515bf54580e0 100644 (file)
  ************************************************************************/
 
 // 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
index e048a100663dc492747381143b0aa92126a51b25..68489f219d0e2fb3ae5e1a39d472c1d6746ccc46 100644 (file)
@@ -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
index c356122bd37fa39a119ab446215991d45e90f979..38de44bca0b9716d4342937c7080dbd91e4bdf1c 100644 (file)
@@ -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'])) {
index 9859235a083c16f95f64c15a7a0784bf93a05eac..da87317ea191ff5021bf0fde925ec67a27897a72 100644 (file)
@@ -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']);
 
index 57934960ac73c77dd2c88bf06f021a7598ff1123..af0d44c4072be54e371cb76d52cea16c5f4157cf 100644 (file)
@@ -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'])
index bd559c2e71157fa2b0004608a36008745d0396e7..60c7d541d2917ca603a775878bbe484501f0c730 100644 (file)
@@ -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
index df6e62b19005011dd0210b58b7ed9fc88536e3f5..8eba046009305e3625f2ab7c159db694c7c8cba6 100644 (file)
@@ -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
index 463e7ed90d1b423a6216adbf6eb96999ecd3d40e..1c069121fd262db859c6c138279a461bf67af94a 100644 (file)
@@ -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']))
 {
index eb54222401c8f357e3b36d44f36795725196fb80..7d88acef890b8c57f84a31a3e875a5177b166dd6 100644 (file)
@@ -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
index 9c5922d27e3cb0d6eaa6995a98ee23243f7a7de6..d64d2aa869db4b6ad0cab3904f08686728ab3965 100644 (file)
@@ -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')))
 {
index 06b5cf4d383170b05014bce0893fabfafc683e48..f4b0a39b97d39ecb3687fabf074559101fe6190f 100644 (file)
@@ -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'])) {
index 32a9a79df6484f0df83404fd0b6b35980de2d637..78e3506a1d1f03c8ebc58322490457c1cace427f 100644 (file)
@@ -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...
index 443d032ff8e37f1396937464be26d642ba2ebb87..bdd72a4888acc3bf6e5637de053dc83a6a9ef646 100644 (file)
@@ -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
index a4761c9d2779ed319d7438b7c86ffc203a575fbf..f2f9ef81347db50c71c37401965629b467370900 100644 (file)
  ************************************************************************/
 
 // 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
index 6b69b6df564968330dfb52451c48216cdd34441c..2f9e327ce6157f5fbb84e21ff3c845b762fba180 100644 (file)
@@ -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']))
 {
index 316b9de73bc2e33eed92507ed3979be7fdeafc3a..1bd3b00661a2f127be8beb4351e15cff6392f98b 100644 (file)
@@ -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
index 59dd718f32ccd7cf20ce1583859cb40be84d2d53..cdfaa8f280293e6b29471b21c296ada498812ab1 100644 (file)
  * 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       *
  ************************************************************************/
 
 // 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)
index e550e2454e9b4299f4f53f4e6368aa8670924ae1..50e87881bcc839e74372d1e12fa8606fbb297cc1 100644 (file)
@@ -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'])) {
index b615405e99f89ef273cb63fe4bbc844b39c61fdf..13ab3ce6b77336d78e7c0b63964f602eec50cec6 100644 (file)
  ************************************************************************/
 
 // 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'])) {
index 9d1c0399a9a34d7d5c35df5a00edf395b40cc168..176cc487931587684c67d48caeca08a40c560fa6 100644 (file)
  ************************************************************************/
 
 // 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']))
 {
index 9977a7f3292caccbb9f6310f6e29a8862dfca539..018db8f184fc0dc66f5670cd84b0ee424ea161e9 100644 (file)
@@ -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']))
 {
index c4d3a673ba2d12e6a0f9a2586fcc2a8cda81c96d..2c6165ca32251a1ffd760c0524ff0725c7834f5a 100644 (file)
@@ -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...
index be7a72cb4e30635c847f5418b3023471dc66efec..c097c77ddaa388c0b3684475c9d0ec85556254ba 100644 (file)
  ************************************************************************/
 
 // 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']))
 {
index 313868b86a6263d30a46957c3a690de5386bd230..6c4680a55d47ac9e250fc9c869c070e17c7d01f0 100644 (file)
@@ -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 (file)
index 0000000..1fb9597
--- /dev/null
@@ -0,0 +1,94 @@
+<?php
+/************************************************************************
+ * MXChange v0.2.1                                    Start: 10/10/2008 *
+ * ================                             Last change: 10/10/2008 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : what-yoomedia.php                                *
+ * -------------------------------------------------------------------- *
+ * Short description : Setup default statistics mode                    *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Standart Modus der Statistiken einstellen        *
+ * -------------------------------------------------------------------- *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * 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 *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       require($INC);
+} elseif ((!EXT_IS_ACTIVE("yoomedia")) && (!IS_ADMIN())) {
+       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "yoomedia");
+       return;
+}
+
+// Add description as navigation point
+ADD_DESCR("admin", __FILE__);
+
+// Was the form submitted?
+if (isset($_POST['ok'])) {
+       // Test Yoo!Media config
+       if (YOOMEDIDA_TEST_CONFIG($_POST)) {
+               // Save settings
+               ADMIN_SAVE_SETTINGS($_POST);
+       } else {
+               // Config not saved
+               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_CONFIG_YOOMEDIA_TEST_FAILED);
+       }
+} else {
+       // Prepare content
+       $content = array(
+               'yoomedia_id'               => 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);
+}
+
+//
+?>
index 08b23b75ca077b1a68f2e8c697441d8a949190f8..da714d623e8863213720bb1ac92d7ea91686a3a2 100644 (file)
@@ -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
index 42d9c9e3a2770add69d5fa9b8514eefe84a05bca..cf06406ba3227f1d0962eea2df8a1872e05f0978 100644 (file)
@@ -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;
index ee6b104af7cd957149fc0d3ebbdf34ea5a81f622..920154324a3b51e0f031656d63e0e701da42b78e 100644 (file)
  * 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       *
  ************************************************************************/
 
 // 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
index 9eaf84c8db44505f002743a6e9f67ba3112f6eb9..7212e1ecee27ede55e33fde086ca2a6499446925 100644 (file)
@@ -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__);
 
 //
 ?>
index 0f1b92788eda977fccf5ced8472938535f1bf3c0..150fa39e6dcbe823dc4ace5556f24a7d15a961b9 100644 (file)
@@ -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']))
 {
index 37ecc5382a99e5c22f3b7f495a4dcfd237ffb975..9a0536f2e5f8c80787b027dc7b58320ea9f19602 100644 (file)
@@ -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'])))) {
index 29218423723ccbc1aad027b001f5d41a3bd0aaf6..907ceb22533a9ba3f78b8fea58de5b6e0b4e0fda 100644 (file)
@@ -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']);
index 8840a1a8759f2a26b0bf600e3084e9c533ddf07e..5ab5c8ec3a957fbba76527f6de23b94351c8d553 100644 (file)
  * 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       *
  ************************************************************************/
 
 // 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
index 882d71394adc27388c3b6b6d10a415aaea4eeda9..410ac203a535a574f45b449eac9031f082e3e763 100644 (file)
@@ -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;
index fb6df1836f02d349a66806578542b676c948dbf1..2eb11fb039d2312dfd82a3ae1daf3d282481d86d 100644 (file)
@@ -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
index 7d1d6522171eb8a3d785b53802dbf08b1ae013cd..ee06841fda1967d30946f77d8b384d03b107f9fd 100644 (file)
@@ -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
index 7adb7a30d1290beeb0162b993bc12f5838ea6335..3a3a1eaee6e24941d438ad0deec9a9603cf87f67 100644 (file)
@@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 //
 ?>
index 9f3a1896fd1f1f37f1d9dfa7cb0ca76a7b674a57..516143a4290d0f30210e7486eb26e2b85cc6a645 100644 (file)
@@ -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;
 
index 1cd194de59affa11e7077d17cc032b3c7b13f023..a156f88f775e4b10392592cc92bae35c30180f48 100644 (file)
@@ -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'])))
index b7ee2ea99a71f0ecc50dbd00f3c40558318889cf..d2e72fc793dc432ee7498d88ce8fc74f9edc2cfe 100644 (file)
@@ -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 = "";
index 8682a2bbff3f62bda6971c9009135ea82f5504b8..b8fe129b582d4c9d285c9ce121228168c7690b2d 100644 (file)
  ************************************************************************/
 
 // 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__);
 
 //
 ?>
index 1fa8487333bcff6d14b75e59541421d8c06ca965..df5d223dbec2a607bbbd7313f156123ec4e18291 100644 (file)
  ************************************************************************/
 
 // 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__);
 
 //
 ?>
index 70ccbd5f826bdbef3189d91645e43d8dd6940daf..569b20fb2f85eacd7be63195945e0034d0c886ad 100644 (file)
@@ -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 = "";
index 8fc083f7924c9e0afa5a64669451514e7be27343..250ed1752775b66fee7ec35b0e9fb712c5d87742 100644 (file)
  ************************************************************************/
 
 // 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;
index cc3eba1700290d80e7f6a5bac12a76faf0f20309..5fb3f71b9f6e6a1a7e84493773b77fe4afb6da21 100644 (file)
  ************************************************************************/
 
 // 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")
 {
index 6cd69df1a27e5c0a5d6ab2c1c3fb78a6b14c4dfb..d2354860045d7f7030b094275ea4b7cfe511e72a 100644 (file)
  ************************************************************************/
 
 // 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?
index 863f1f602016a5e7ca45e1ff7eeec80927d72899..04d0ab94e51d895dcceb18aec036cb59df712584 100644 (file)
@@ -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
index 5b227d84ce893aa7defa5e7460467be24e2e7ed5..d78fe0076b48d33bdd26f6e1d51e54dc66552577 100644 (file)
  ************************************************************************/
 
 // 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'])))
index 0d420f501e995e7aee690f0914ce7fd4cde81250..36d767fde3a374479c9188fee45a8df2b8ecd7cd 100644 (file)
  ************************************************************************/
 
 // 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
index 6ad367aac8d33a5e19161628b1752938c3b71172..8f9fca1a31474cc61a1c90eeb03bf50e7d406e9c 100644 (file)
@@ -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__);
index 77e5571a2060632d647e1f56e8ff4839edea8c25..2fd651fd1fd67007b80b73d27ea0f3e18fb16432 100644 (file)
@@ -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'] = "";
 
index ae6054fcbcae3234e88406fc9d92bcadab8eb754..8892c5ab443fe399508e7775c591c525898b614f 100644 (file)
@@ -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'])))
 {
index c6fdcea7a8b25a825398837c3fd918eb6e7dc3d1..a541084bacefccf7e0653f1571cce42d00bdf993 100644 (file)
@@ -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"; }
index 70abbbd6aa95dd71fdaa74fe2d28209739cae62c..c333c2d34625b1d7980ad4b56b9b39b9d36988b8 100644 (file)
@@ -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;
index 0b29fda66857e2077dd9ef44ea7dc9b2d8c85041..7054963825dc6c172699d79620d17fa42339a57a 100644 (file)
@@ -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']))
 {
index 3f7af733a2f989c6188de8d7377ca2247de95478..f500925d529dc098ca8e8eb7e2b931de92e95063 100644 (file)
@@ -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",
index 4be9e9562c42a02afdf80673106236037e738863..552acec06f6866bc241511456538897b543e6632 100644 (file)
@@ -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 = "";
index 45592329213e47a49f2f8af891b2abae565ffb8e..f9fd9e142dda1365a93da9569c632fcedb46144f 100644 (file)
@@ -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
index af6c9c9ae3062e5f780ac42c922c56e55f95a5f3..3845af644afd4d06ef92b522b6614cc97e57af9c 100644 (file)
  * 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       *
  ************************************************************************/
 
 // 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
index 3e77ed7c0d83d9f6a82da0148c4a8bc2d72fb4a8..758b749703ba9f97bfd673b271b9f0a8f52c9849 100644 (file)
  * 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       *
  ************************************************************************/
 
 // 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'])) {
index b696ee532a49b9185cffef751d1f91da2f87d2d9..146536da7aa627289bc69fcab2a7fa483e6ec058 100644 (file)
  * 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       *
  ************************************************************************/
 
 // 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
index b1c9f5a216dbf71cf5b9bcdf999ce21309f11115..4221cf2fa08f2917681e3deeff158b4b2abce15d 100644 (file)
  ************************************************************************/
 
 // 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;
index 9eb983342fd9caccdd8022ae9ca2e38ff2d09b03..65ed9bc00466e1117d0f82b1aefac9e969241a0a 100644 (file)
@@ -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";
index 64b64747506fbfc7a3beb65118dcd5390448cd7b..6eba18c3aaabba0bbbc4a409acb94d60d1d4a9a0 100644 (file)
  ************************************************************************/
 
 // 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__);
index 5b7b11dcfee94a70e61683b51d8673250e41d999..605130d63debc995f090fb2187ebf41694338363 100644 (file)
@@ -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;
index 6bf976a1c8a930a64459240c507054ebb3944fb1..58c2147f0a350ff7b0be4ece9e78cb104ae42d9c 100644 (file)
@@ -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;
index ac0f53bc9a3421f78418ce9d3c73dc02206e46e5..844813b17c2f9963ebb5dc9e42ef122a2fa46ac2 100644 (file)
@@ -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 (file)
index 0000000..d8e3fc0
--- /dev/null
@@ -0,0 +1,145 @@
+<?php
+/************************************************************************
+ * M-XChange v0.2.1                                   Start: 10/10/2008 *
+ * ================                             Last change: 10/10/2008 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : what-list_yoomedia_tm.php                        *
+ * -------------------------------------------------------------------- *
+ * Short description : List Yoo!Media text mails                        *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Auflisten von Yoo!Media Textmails                *
+ * -------------------------------------------------------------------- *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * 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 *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License.       *
+ *                                                                      *
+ * 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())) {
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
+       require($INC);
+} elseif (!EXT_IS_ACTIVE("yoomedia")) {
+       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "yoomedia");
+       return;
+} elseif (!EXT_IS_ACTIVE("bonus")) {
+       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bonus");
+       return;
+}
+
+// Add description as navigation point
+ADD_DESCR("admin", __FILE__);
+
+// Do actions here
+if (isset($_POST['ok'])) {
+       // Prepare mail for delivery
+       YOOMEDIA_PREPARE_MAIL_DELIVERY($_POST);
+       return;
+} elseif (isset($_POST['sent'])) {
+       // Sent mail
+       YOOMEDIA_SEND_BONUS_MAIL($_POST, "normal");
+} elseif (isset($_POST['remove'])) {
+       // Add mail to exclude list
+       YOOMEDIA_EXCLUDE_MAIL($_POST, "normal");
+} elseif (isset($_POST['unlist'])) {
+       // Remove mail from exclude list
+       YOOMEDIA_UNLIST_MAIL($_POST, "normal");
+}
+
+// Enougth queries left?
+if ($_CONFIG['yoomedia_requests_remain'] == 0) {
+       // Output message
+       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_YOOMEDIA_REQUESTS_DEPLETED);
+
+       // Abort here!
+       //return false;
+} // END - if
+
+// Get parsed array back
+$result = YOOMEDIA_GET_PARSED_RESULT_TEXTMAILS();
+
+// Sanity-check on result array
+if ((!is_array($result)) || (count($result) == 0) || (!isset($result[0]['id']))) {
+       // Invalid result
+       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_YOOMEDIA_INVALID_RESULT);
+       return false;
+} elseif (count($result[0]) < 7) {
+       // Error received so prepare error code
+       $code = explode(" ", $result[0]['id']);
+       $code = $code[0];
+       $code = explode("<br>", $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);
+
+//
+?>
index c1aa1cbadd211d8d1ec5dee6efc4f5cb329b91b1..5c8fcfcf79cd25323a5c520321d672b70292213c 100644 (file)
  * 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       *
  ************************************************************************/
 
 // 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'])) {
index 6ad2703534029f04f9a762be74906b8a99edd03b..d382ea2f68b91125517ee251dbcbbcc24aed16b3 100644 (file)
@@ -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']))
 {
index ff9c943614e9da6caefb5e5cfbb93dbe193f5920..14ab44f1151343e44e64cff93e56d3b5ebbec1e0 100644 (file)
@@ -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
index 30477e2cd47c92e980d17f439c0a6f2412109304..481b418cb11bd0a4fca3ce99f49199def4df7354 100644 (file)
@@ -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']))
 {
index 60ff92960f2326af97efbd9943c1b949fb433bbf..eb89f34f778bb5ed98eca4ea2fbd337f6ecf4d9e 100644 (file)
@@ -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'])))
index cfd4b3ba519e4ce67751d808963cbb7984abe9f3..a0d80e44e4471ede673ee47b30b480b22d585019 100644 (file)
@@ -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 = "";
index e11b68ba38e2c16f15b51d401c8922e3f768d39c..e225f6f298d3854a7542b8c8a62ac9bb71fe4a7d 100644 (file)
@@ -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();
index 1efd9171889bb96076a9caabcf4b37884b8f2a73..44f34e52ad6f0f680fb48d19c7eedc712f0126cd 100644 (file)
@@ -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");
index bec3d3b3ed1d76bb563815733816b5a44947af51..b78d8b9465996193b526358887fa7ab19d31109f 100644 (file)
@@ -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"))
index 3d7e88f021f6d954ad27c53bf2cbaca98694f7df..1ebd70910161e73d3d6337f9b42c26642d92e575 100644 (file)
@@ -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'])))
index 3168bd4628d72dfe96cc09d2d67e293f82211483..50f949fb7cbd1213b122e951282fe6ab4ffe0afa 100644 (file)
@@ -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="")...
index 5ad1350cc01ea13af122b67e85b8192e2f778134..a46032f8213b4989d1abcfc2013f8aff33ff4422 100644 (file)
@@ -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)
index 3913491ba387ecd94c1ec126b8e1c95c1cc6dbfc..d35b26da08b991b38c172184cd2563dafa6fbebc 100644 (file)
@@ -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="")...
index 74ae23fdda7bed6e90482cd09fa2c517005c4a62..6f087b5bf8aac5d90493e8722ea0f71c63d1708a 100644 (file)
@@ -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="")...
index a297af0e032e468d49407cfb1ed9b62f972c2fb9..0d4a1f6058e16173ed5cbeceaf7e5fc117946aef 100644 (file)
@@ -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 .= "      <OPTION value=\"".$value."\">".$CATS['name'][$key]." (".$CATS['uids'][$key]." ".USER_IN_CAT.")</OPTION>\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("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_CATS."</SPAN></STRONG>");
        }
+
+       // Load template
+       LOAD_TEMPLATE($template);
 }
 
 //
index 3b2a13d966335ebdf3783e7bb8e0b99170a20519..8e12bd96a15a3711247f6ce8b2e5e0923fb6828a 100644 (file)
@@ -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']))
 {
index fc69db6d3e89a7710d8a5315ce00a9ba55602876..4380734071d81ccf8731f3b6b6f751d71f749c7f 100644 (file)
@@ -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'] = "";
index 3625940960ac71cedabaab809f8cf4b41c790307..6ac305396f32c467db5fe2f63911d4e2ef034bfe 100644 (file)
@@ -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'] = "";
index 0ed0f4dbd32a5386c845255e42d4ffdcef7b6cba..c758fdb18fc857f28467125e65406754d782aab3 100644 (file)
  ************************************************************************/
 
 // 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__);
 
 //
 ?>
index 1c9d7f0684ecc8eef85fb387a9a29380c1913a5f..53ef7809ca23f50bc7c6e975c54b043d3ef47c1a 100644 (file)
@@ -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;
 
index 747957986a5f889936e1fc46ad411ece53820a8c..b5a697ffcc3f34e5d018a38491e23c9cb49dd116 100644 (file)
  ************************************************************************/
 
 // 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;
index d075327bfec9d4ec9a051f00afbc4add61b7ed84..94f4551670e0ba437200547d961221fee9990f5b 100644 (file)
  ************************************************************************/
 
 // 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";
index d4283557d927b09af584930d96d7cafb26d2b58e..a89fab4d145394edce1192b1b3e87bcbedc55b15 100644 (file)
@@ -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;
index 812dca9103f1d49df253896cc51e4a229e4012a1..0aaba4551f2699f43b469ed3efe16bacfb73b9a8 100644 (file)
  * 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'])) {
index b11221535c49a12087423224b6688fd8b701fcae..879e9ab93b21c3f70c86b340799b73ec489e440d 100644 (file)
  ************************************************************************/
 
 // 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)) {
index e6fd292ee9039ee4bde973f18e74c8577a9d404d..28fb4d5a57e9c85cf734947b1b480ecfd1b287c0 100644 (file)
@@ -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'] = "???";
index 9fcbcaaeb49b1841b10778ecc294397862d41271..2b38b5b6b41ba266eef32215731b3a3b826578c1 100644 (file)
@@ -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/";
index 190d17c8d6356c749df74d06d26a008689f4719c..81a5b2e7f25acd43a268ba531f3ecc9c1ff87f36 100644 (file)
  ************************************************************************/
 
 // 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)) {
index f1f7727ea4aed80fefd7152b34ad4f00c1fd2aa3..07582a9fea9d804ebe9ff8972bb0f6c5cff3f2f7 100644 (file)
@@ -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__);
index 6ec2f99a507802ae3f489a710fd4b86f47d65224..063fbb761238fe1771bec44e20253e9d04fa2849 100644 (file)
@@ -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))
 {
index 11943809dd953766078ae877a00b5bcfae3b76e0..0814201b13866fd3b218e232a161e54706ac3886 100644 (file)
@@ -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']);
index 854a7d896f7e3e6a812e73f0ffb181b431bd88cb..1b17362a98488f0e3ac7268b3d1127d516130e71 100644 (file)
@@ -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']);
index 32dd12b65d83ec500da0d69d51010050831c1f79..7675a00537e56da7a85a4bcdd881322e981a290a 100644 (file)
@@ -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']);
index 4f7c9b526e5f10ab4d5cd3f8da1e39132d598652..994c04959c95a03e978f82a4c7528fd43036d1a3 100644 (file)
@@ -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']);
index 0b024b4842d27fade12ab56b38809e0d897ed4a3..6cab344d5699d8455e025d97109356e16c6aa80f 100644 (file)
  * -------------------------------------------------------------------- *
  *                                                                      *
  * -------------------------------------------------------------------- *
- * 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));
index 443593282fd7162808049e08dc459e43d09a5964..2b0a50e368dd0eb51bc57cd10fe6feffaf69da7b 100644 (file)
@@ -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());
index f636cdb1739b8f906e32b6a5f1a7e5db00842d42..4d627db7758c4f4f8692cbb4b02b6673a08c27c1 100644 (file)
@@ -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']));
index 582416028a881c65e8544d657cbadb419b76611f..262629303cb8f4149a1868ee209a9f05fc9fe4c4 100644 (file)
@@ -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
index 6755913f1defc4d0b10eee6c0628a64091b32842..aea44a21329d9e60487c6cd9e650fdf7d762fa40 100644 (file)
@@ -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));
index b0ae9cf886575df5aa67f7746a04df420a270536..893915d6c1bd958fc939dcd4a72e9a538b407fd9 100644 (file)
@@ -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));
index ae5be500264769c324b3229c389b65237e1c627b..77f95d4ccba86fbbd6b84baca735a6d8c6afe22a 100644 (file)
@@ -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));
index 7a147e018faba53c1e08a9c50009120f11b0e2ce..731df6c688f7c1f856b0188600d9fe4cdbef2eeb 100644 (file)
@@ -39,7 +39,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-ADD_DESCR("guest", basename(__FILE__));
+ADD_DESCR("guest", __FILE__);
 
 global $DATA, $FATAL;
 
index 157229c1246e7edad737971298cc31200ee80303..c6bdf9c4e1f8a24e477fc06dc30132f09496b446 100644 (file)
@@ -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");
index 49624af0363d52acf404a5895dad08f8256d2dfe..4c8acf31c06196cff08ccb9ecc676b065bc673ad 100644 (file)
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-ADD_DESCR("guest", basename(__FILE__));
+ADD_DESCR("guest", __FILE__);
 
 OUTPUT_HTML("<DIV align=\"center\">");
 
index e23712f41d5bef1cf4e0d3e822afc8eef44fac87..873ca6750b3d1bf904efe20b739977b579ddd0a7 100644 (file)
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-ADD_DESCR("guest", basename(__FILE__));
+ADD_DESCR("guest", __FILE__);
 
 global $_CONFIG, $DATA;
 
index b85642c7c97180863e447ffc74cfa3f53ad58952..43a25fc86180cb3131dff6c97c6cea5078457139 100644 (file)
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-ADD_DESCR("guest", basename(__FILE__));
+ADD_DESCR("guest", __FILE__);
 
 //
 ?>
index 7e0f927854210b40610960d95463890275755a23..5096a76e34759673493c2660f1851bf63c3eccc7 100644 (file)
@@ -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);
index c28f50026c671cc270aff0b7c2e7192a9e0b88d9..cf6f8bd7fd63e9521fde8b0f5d7a60a7087a043c 100644 (file)
@@ -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']))
index 44f99a4ffb02cf4bbf179a49d932561d214fbf95..d3af4b373c8a05ea408c3ce996f588cd476d057c 100644 (file)
@@ -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();
index 73833a016b1bccff95fbf828c7c1b3e9d271a9fa..8426cfde7e9e7014b460a55c090b5dcbbd9d9477 100644 (file)
@@ -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']);
index 1376df22a087926a0005330aa6a0b15fc49b6f80..f4e0c86e2f03dfc9fb7232356002055bc227e56f 100644 (file)
@@ -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";
index 51e3c47f4bfcf75f7c1a259bf7102bb31acdc867..72e0f5b55f2f8943309d3377ad8081d0b8ca673b 100644 (file)
@@ -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__);
index c747674116abbb1b0f7ed60e54a37751ef1cb25b..c7039a03a8cefabe1c30d9959a96ce5296cfee3c 100644 (file)
@@ -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("<DIV style=\"padding-left: 10px; padding-right: 10px\">");
 $rdf = new fase4_rdf;
index 93cd7421a3206a8487efe679ca7d1cfa146d6444..cb013024b6cbe7874d28f58230a1ba9b2bdc4555 100644 (file)
@@ -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']);
index 6924b13e8171e19552494149963e136ef6ecb681..7de43963674f983338612a4bec100b3531ef362f 100644 (file)
@@ -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']);
index c8496564fd5505181f7247156414b7de5901d002..ab4e84069a5cbe569042b0bd9d6ca3aec197774a 100644 (file)
@@ -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']);
index dfcacbc7f871abf1a41dddb854da98a3b09af94b..d98cbfebc90e1ad2e55077115165beac9deef703 100644 (file)
@@ -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']);
index 03e2bca2e63a066d2f3a5bfdd3d6a074bfae69f1..d80fca3b99cceb22a146ab915177f05fa4a30af7 100644 (file)
@@ -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']);
index 2538018531c54e8143633ae8a86565f1ace85b94..72e405d7ada3bf614c7945f92ea13b8475716e05 100644 (file)
@@ -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']);
index 2a42cbfbffe237e2e9fd4f0b3a10abee43e7f941..3277bcc4d346a4af907be647c28e7f4966be409d 100644 (file)
@@ -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']);
index 8ae25e70d836b6a605e4997b0e31c9926660dfac..9fc44c6357863b7978f80a22c40dccc3cc569230 100644 (file)
@@ -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']);
index 93777ec44759e436ef1e99fd271dd4ef9f53e6b6..fdac22b762c0b5007ea19d423fda7288f4f26bb3 100644 (file)
@@ -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']);
index f76f261e41070635da87c5358eeed0309fa33a18..1388feec5cb11f50a9feca4ae6cf988951a47462 100644 (file)
@@ -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']);
index 48f496db630260da558f10afafab9aa817a06880..002a1053e1e2f6cde65405852ed859a0b416d78a 100644 (file)
@@ -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));
index ccae2649b9e0b09d82e0eddf96ab4a78ff867707..c5cffb56afb77b39cf6d75db602e82cb14743a5e 100644 (file)
@@ -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));
index ccae2649b9e0b09d82e0eddf96ab4a78ff867707..c5cffb56afb77b39cf6d75db602e82cb14743a5e 100644 (file)
@@ -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));
index ccae2649b9e0b09d82e0eddf96ab4a78ff867707..c5cffb56afb77b39cf6d75db602e82cb14743a5e 100644 (file)
@@ -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));
index ccae2649b9e0b09d82e0eddf96ab4a78ff867707..c5cffb56afb77b39cf6d75db602e82cb14743a5e 100644 (file)
@@ -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));
index ccae2649b9e0b09d82e0eddf96ab4a78ff867707..c5cffb56afb77b39cf6d75db602e82cb14743a5e 100644 (file)
@@ -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));
index 278d22747ef769b86f0c46635ef9ccaac7525cc9..8cd19555c8351f3d490d927ff1d7a1469d310998 100644 (file)
@@ -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"))
index a7e131b107f495377f2163cdf76fdbd08e6e4e0e..d3ce12bbc0794456bc5b08352f8fec96ef01e264 100644 (file)
@@ -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 = "";
index ddd819bbaec902cb13ef4cb003dbf0d8572664fd..bd2ee2fe93ce27fc07336a3b7d2dcaa7fdce5fd7 100644 (file)
@@ -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")
 {
index c9e9d2fefea7db2bc5e8be17255ebcaf3d491989..3a7bbc9e04e4bdb43af54342170cbc0bc0b7ed27 100644 (file)
@@ -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'";
index 87756b67f0a52549c41d418d93d25f9fe875ab88..e746259a2da353691fd5c9a1f4a2d73ede3574b3 100644 (file)
@@ -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));
index e6876490bca5dd1ac5f3cf1fe9a9e88c5d18de93..adbb1e5d3fff3c0a2339b6fc2045c9e6c2a4c3dc 100644 (file)
@@ -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");
index 2d1d2685680fa57fbfcc8cfcc0768298869ce907..11da0f70aac02ad2e1b61f10c7b35792a9785eb5 100644 (file)
@@ -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
index 757330928b81ad9d50c8510c7c84b35b2ee5bad6..545aa1d375cc7837c3de3078a33f48e2a687e686 100644 (file)
@@ -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']))
index efa643a7a62225c1b54a0f3975b61e288965ce4f..37015ef26a2e695cd7923a0a8cba3a40dacb97a9 100644 (file)
@@ -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 = "";
 
index 04cb457a21cb3f5f166d9c6990d68738e5ee147d..a427d96a2fb8c7d15d3ff3207913223eb50fc0c2 100644 (file)
@@ -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",
index 2ddb9a9624e8b7b6987b5bde1b2bc82dc400a504..aa62022e13c780ac3caedbabcd6e4667aceb0bef 100644 (file)
@@ -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']))
index 462f6bad3ca594836d96eb94ba61ee24a80a61b8..5f5422dc5eb1d9092658829e54310a1ba4880edc 100644 (file)
@@ -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)
index 75125e018964b7247ed87d06834cbae5e7388853..ad7cbd3ee9f88cb66d94825e58ee47647d7ad483 100644 (file)
@@ -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;
index f3904443f0916b15a4109ee0356e89161accbc1d..fd27a49d64fa15ff0fd266d48945b3ae81db6de2 100644 (file)
@@ -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);
index 0dcc0efc0ba00e5344290df90291724c2f986574..7b8343db0e954bf572c48f43b37bf78cf2949f0c 100644 (file)
@@ -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']))) {
index b86019f896ea887aff907ccb7f3a9856b41228a0..375699d1818e613ee5bfb8385dee38ed2980ac15 100644 (file)
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-ADD_DESCR("member", basename(__FILE__));
+ADD_DESCR("member", __FILE__);
 
 OUTPUT_HTML("<DIV align=\"center\">");
 
index 280aba6cf377ab65ef82ea9c96304803ab4977f1..309e927efbdec11c5750ec45f2c49d432c429847 100644 (file)
@@ -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']))) {
index 51d31adf799dc8c40e492dc1208c3443d46a5604..bae32d9f1df047d6e983b80bc2db88bbe25dcd77 100644 (file)
@@ -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",
index 22cbc52e11377d497700e5b3409aec8f16117911..0360d6ecb0f701d4f763a2d8777d6d614e6e2f18 100644 (file)
@@ -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));
index 4816ad8e88947905c9a4b2d8d8c38e08a7a5d598..b78419c8dfaeacc4791a30a5ee4b331dfe94bfb1 100644 (file)
@@ -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();
index bfed0020e41288a9da19523dad35e01bbf6766ab..9d8b8fa23c25cfc0f4f869ca564ffcbf7fa88459 100644 (file)
@@ -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'])))
 {
index ec4d19b37bde38309fb0e2c89106993d3ddde4bd..97bc955c30e4b6f093c80d9b141920e0f3e98739 100644 (file)
@@ -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()) {
index 8879d19843799e931b173cab8ac2b1522f823d29..5b606d15b58dbcdfa5840c5f954f625bee812d47 100644 (file)
@@ -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();
index 5730b73b9c9e45b8a4eb20a8e4d35eb1c4fe1288..465a5d8a9f3a607bc30a9ab247da6355e794aa08 100644 (file)
@@ -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(
index 41110ed24bf6a854b3064fc683900d9cb591b9b0..7e7101b6f8bb0a9c5bc3f06ea69119d2186ba859 100644 (file)
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-ADD_DESCR("member", basename(__FILE__));
+ADD_DESCR("member", __FILE__);
 
 //
 ?>
index 14c40c14407c9fd3c25af811398058ecb69f11b3..ec009de3948b5ae795fcf0f3fe311ba55466fd82 100644 (file)
@@ -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
index 2b61e4b0a5440536f6a87f7fb0d7ca303dea281f..0a108622de869f7075540e24e8504ec657d1f407 100644 (file)
@@ -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",
index f6879b2ba8be1df6800fb08728e45f032b60e495..68c90049a3cbc6c936fe5f1a571674f7d5397039 100644 (file)
@@ -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
index a2d9e43ed464e888102deee4e8cc6fa335c60059..b98befee083176f47befd82fe5314712e89525aa 100644 (file)
@@ -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']))) {
index 57230cfebb5ab3bd3a0febaff3d3b200c45c73b4..2337fa7ccab316722e8702be568000d7a0bd3018 100644 (file)
@@ -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
index 923427e6aaa4adb902f248eef7816a7ff6a04a02..ecfa0a3c20fe176334a05977af59c94ddaa78676 100644 (file)
@@ -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 "<option> list" of all categories
+function ADD_CATEGORY_OPTIONS ($mode) {
+       // Prepare WHERE statement
+       $whereStatement = " WHERE visible='Y'";
+       if (IS_ADMIN()) $whereStatement = "";
+
+       // Initialize array...
+       $CATS = array(
+               'id'   => array(),
+               'name' => array(),
+               'uids' => array()
+       );
+
+       // Get categories
+       $result = SQL_QUERY("SELECT id, cat FROM "._MYSQL_PREFIX."_cats".$whereStatement." ORDER BY sort", __FILE__, __LINE__);
+       if (SQL_NUMROWS($result) > 0) {
+               // ... and begin loading stuff
+               while (list($id, $cat) = SQL_FETCHROW($result)) {
+                       // Transfer some data
+                       $CATS['id'][]   = $id;
+                       $CATS['name'][] = $cat;
+
+                       // Check which users are in this category
+                       $result_uids = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_cats WHERE cat_id=%s",
+                        array(bigintval($id)), __FILE__, __LINE__);
+
+                       // Start adding all
+                       $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".PREPARE_SQL_HTML_HOLIDAY($mode)." LIMIT 1",
+ array(bigintval($ucat)), __FILE__, __LINE__);
+                               $uid_cnt += SQL_NUMROWS($result_ver);
+
+                               // Free memory
+                               SQL_FREERESULT($result_ver);
+                       } // END - while
+
+                       // Free memory
+                       SQL_FREERESULT($result_uids);
+
+                       // Add counter
+                       $CATS['uids'][] = $uid_cnt;
+               }
+
+               // Free memory
+               SQL_FREERESULT($result);
+
+               // 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 .= "      <OPTION value=\"".$value."\">".$CATS['name'][$key]." (".$CATS['uids'][$key]." ".USER_IN_CAT.")</OPTION>\n";
+               }
+       } else {
+               // No cateogries are defined yet
+               $OUT = "<option class=\"member_failed\">".MEMBER_NO_CATS."</option>\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 (file)
index 0000000..0d6e412
--- /dev/null
@@ -0,0 +1,49 @@
+<?php
+/************************************************************************
+ * MXChange v0.2.1                                    Start: 10/10/2008 *
+ * ===============                              Last change: 10/10/2008 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : reset_yoomedia.php                               *
+ * -------------------------------------------------------------------- *
+ * Short description : Things to be done on daily reset                 *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Dinge, die beim taeglichen Reset erledigt werden *
+ * -------------------------------------------------------------------- *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * 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 *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       require($INC);
+} elseif (!EXT_IS_ACTIVE("yoomedia")) {
+       return;
+}
+
+// Do not execute when script is in CSS mode or no daily reset
+if (($CSS == 1) || (!defined('__DAILY_RESET'))) return;
+
+// Simply reset the requests here
+UPDATE_CONFIG("yoomedia_requests_remain", $_CONFIG['yoomedia_requests_total']);
+
+//
+?>
diff --git a/templates/de/html/admin/admin_config_yoomedia.tpl b/templates/de/html/admin/admin_config_yoomedia.tpl
new file mode 100644 (file)
index 0000000..cb567f4
--- /dev/null
@@ -0,0 +1,96 @@
+<form action="{!URL!}/modules.php?module=admin&amp;what=config_yoomedia" method="POST">
+<table border="0" cellspacing="0" cellpadding="0" align="center" class="admin_table dashed" width="500">
+<tr>
+       <td colspan="2" align="center" class="admin_title bottom2" height="30">
+               <strong>{--ADMIN_CONFIG_YOOMEDIA_TITLE--}</strong>
+       </td>
+</tr>
+<tr><td colspan="2" class="seperator" height="5">&nbsp;</td></tr>
+<tr>
+       <td align="right" width="300" height="30">
+               {--ADMIN_CONFIG_YOOMEDIA_ID--}
+       </td>
+       <td width="200" style="padding-left: 10px">
+               <input type="text" class="admin_normal" size="5" maxlength="20" name="yoomedia_id" value="$content[yoomedia_id]" />
+       </td>
+</tr>
+<tr><td colspan="2" class="seperator" height="5">&nbsp;</td></tr>
+<tr>
+       <td align="right" width="300" height="30">
+               {--ADMIN_CONFIG_YOOMEDIA_SID--}
+       </td>
+       <td width="200" style="padding-left: 10px">
+               <input type="text" class="admin_normal" size="5" maxlength="20" name="yoomedia_sid" value="$content[yoomedia_sid]" />
+       </td>
+</tr>
+<tr><td colspan="2" class="seperator" height="5">&nbsp;</td></tr>
+<tr>
+       <td align="right" width="300" height="30">
+               {--ADMIN_CONFIG_YOOMEDIA_PASSWD--}
+       </td>
+       <td width="200" style="padding-left: 10px">
+               <input type="text" class="admin_normal" size="20" maxlength="255" name="yoomedia_passwd" value="$content[yoomedia_passwd]" />
+       </td>
+</tr>
+<tr><td colspan="2" class="seperator" height="5">&nbsp;</td></tr>
+<tr>
+       <td align="right" width="300" height="30">
+               {--ADMIN_CONFIG_YOOMEDIA_TM_MAX_RELOAD--}
+       </td>
+       <td width="200" style="padding-left: 10px">
+               <input type="text" class="admin_normal" size="3" maxlength="6" name="yoomedia_tm_max_reload" value="$content[yoomedia_tm_max_reload]" />
+       </td>
+</tr>
+<tr><td colspan="2" class="seperator" height="5">&nbsp;</td></tr>
+<tr>
+       <td align="right" width="300" height="30">
+               {--ADMIN_CONFIG_YOOMEDIA_TM_MIN_WAIT--}
+       </td>
+       <td width="200" style="padding-left: 10px">
+               <input type="text" class="admin_normal" size="3" maxlength="6" name="yoomedia_tm_min_wait" value="$content[yoomedia_tm_min_wait]" />
+       </td>
+</tr>
+<tr><td colspan="2" class="seperator" height="5">&nbsp;</td></tr>
+<tr>
+       <td align="right" width="300" height="30">
+               {--ADMIN_CONFIG_YOOMEDIA_TM_CLICKS_REMAIN--}
+       </td>
+       <td width="200" style="padding-left: 10px">
+               <input type="text" class="admin_normal" size="5" maxlength="20" name="yoomedia_tm_clicks_remain" value="$content[yoomedia_tm_clicks_remain]" />
+       </td>
+</tr>
+<tr><td colspan="2" class="seperator" height="5">&nbsp;</td></tr>
+<tr>
+       <td align="right" width="300" height="30">
+               {--ADMIN_CONFIG_YOOMEDIA_TM_MIN_PAY--}
+       </td>
+       <td width="200" style="padding-left: 10px">
+               <input type="text" class="admin_normal" size="3" maxlength="6" name="yoomedia_tm_min_pay" value="$content[yoomedia_tm_min_pay]" />
+       </td>
+</tr>
+<tr><td colspan="2" class="seperator" height="5">&nbsp;</td></tr>
+<tr>
+       <td align="right" width="300" height="30">
+               {--ADMIN_CONFIG_YOOMEDIA_EROTIC_ALLOWED--}
+       </td>
+       <td width="200" style="padding-left: 10px">
+               <select name="yoomedia_erotic_allowed" class="admin_select" size="1">
+                       <option value="0"{!__CFG_YOOMEDIA_EROTIC_NONE!}>{--ADMIN_CONFIG_YOOMEDIA_EROTIC_NONE--}</option>
+                       <option value="1"{!__CFG_YOOMEDIA_EROTIC_INCLUDE!}>{--ADMIN_CONFIG_YOOMEDIA_EROTIC_INCLUDE--}</option>
+                       <option value="2"{!__CFG_YOOMEDIA_EROTIC_ONLY!}>{--ADMIN_CONFIG_YOOMEDIA_EROTIC_ONLY--}</option>
+               </select>
+       </td>
+</tr>
+<tr><td colspan="2" class="bottom2 seperator" height="5">&nbsp;</td></tr>
+<tr>
+       <td colspan="2" class="admin_footer">
+               <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+               <input type="submit" name="ok" class="admin_submit" value="{--SAVE_SETTINGS--}" />
+       </td>
+</tr>
+</table>
+</form>
+
+<div class="admin_note">
+       {--ADMIN_CONFIG_YOOMEDIA_EROTIC_NOTE--}
+</div>
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 (file)
index 0000000..b375072
--- /dev/null
@@ -0,0 +1,22 @@
+<table border="0" cellspacing="0" cellpadding="0" width="99%" class="admin_table dashed">
+<tr>
+       <td colspan="7" class="admin_title" height="30">
+               <strong>{--ADMIN_LIST_YOOMEDIA_TITLE--}</strong>
+       </td>
+</tr>
+<tr>
+       <td class="admin_title bottom2 right2"><strong>{--ADMIN_YOOMEDIA_TM_ID--}</strong></td>
+       <td class="admin_title bottom2 right2"><strong>{--ADMIN_YOOMEDIA_TM_NAME--}</strong></td>
+       <td class="admin_title bottom2 right2"><strong>{--ADMIN_YOOMEDIA_TM_RELOAD--}</strong></td>
+       <td class="admin_title bottom2 right2"><strong>{--ADMIN_YOOMEDIA_TM_WAIT--}</strong></td>
+       <td class="admin_title bottom2 right2"><strong>{--ADMIN_YOOMEDIA_TM_REMAIN--}</strong></td>
+       <td class="admin_title bottom2 right2"><strong>{--ADMIN_YOOMEDIA_TM_PAY--}</strong></td>
+       <td class="admin_title bottom2" width="280"><strong>{--ADMIN_YOOMEDIA_TM_ACTIONS--}</strong></td>
+</tr>
+$content
+<tr>
+       <td colspan="7" class="admin_footer">
+               <span class="admin_note">{--ADMIN_LIST_YOOMEDIA_NOTE--}</span>
+       </td>
+</tr>
+</table>
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 (file)
index 0000000..eaa8990
--- /dev/null
@@ -0,0 +1,22 @@
+<tr>
+       <td class="switch_sw$content[sw] bottom2 right2" align="center">$content[id]</td>
+       <td class="switch_sw$content[sw] bottom2 right2">&nbsp;$content[name]</td>
+       <td class="switch_sw$content[sw] bottom2 right2" align="center">$content[reload] {--_HOURS--}</td>
+       <td class="switch_sw$content[sw] bottom2 right2" align="center">$content[wait] {--_SECONDS--}</td>
+       <td class="switch_sw$content[sw] bottom2 right2" align="center">$content[remain]</td>
+       <td class="switch_sw$content[sw] bottom2 right2" align="center">$content[pay] &euro;</td>
+       <td class="switch_sw$content[sw] bottom2" style="padding:2px">
+               <table border="0" cellspacing="0" cellpadding="0" width="100%">
+               <tr>
+                       <td align="center">
+                               $content[already]
+                               <form action="{!URL!}/modules.php?module=admin&amp;what=list_yoomedia_tm" method="post" style="padding-bottom:0px">
+                               <input type="hidden" name="id" value="$content[id]" />
+                               <input type="hidden" name="reload" value="$content[reload]" />
+                               <input type="submit" class="admin_delete" name="unlist" value="{--ADMIN_YOOMEDIA_UNLIST_MAIL--}" />
+                               </form>
+                       </td>
+               </tr>
+               </table>
+       </td>
+</tr>
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 (file)
index 0000000..e810304
--- /dev/null
@@ -0,0 +1,23 @@
+<tr>
+       <td class="switch_sw$content[sw] bottom2 right2" align="center">$content[id]</td>
+       <td class="switch_sw$content[sw] bottom2 right2">&nbsp;$content[name]</td>
+       <td class="switch_sw$content[sw] bottom2 right2" align="center">$content[reload] {--_HOURS--}</td>
+       <td class="switch_sw$content[sw] bottom2 right2" align="center">$content[wait] {--_SECONDS--}</td>
+       <td class="switch_sw$content[sw] bottom2 right2" align="center">$content[remain]</td>
+       <td class="switch_sw$content[sw] bottom2 right2" align="center">$content[pay] &euro;</td>
+       <td class="switch_sw$content[sw] bottom2" align="center" style="padding-left:1px;padding-right:1px;padding-top:2px;padding-bottom:2px">
+               <form action="{!URL!}/modules.php?module=admin&amp;what=list_yoomedia_tm" method="post" style="padding-bottom:0px">
+                       <input type="hidden" name="id" value="$content[id]" />
+                       <input type="hidden" name="name" value="$content[name]" />
+                       <input type="hidden" name="wait" value="$content[wait]" />
+                       <input type="hidden" name="text" value="$content[text]" />
+                       <input type="hidden" name="reload" value="$content[reload]" />
+                       <table border="0" cellspacing="0" cellpadding="1" width="100%">
+                       <tr>
+                               <td><input type="submit" class="admin_submit" name="ok" value="{--ADMIN_YOOMEDIA_PREPARE_MAIL--}" /></td>
+                               <td><input type="submit" class="admin_delete" name="remove" value="{--ADMIN_YOOMEDIA_REMOVE_MAIL--}" /></td>
+                       </tr>
+                       </table>
+               </form>
+       </td>
+</tr>
diff --git a/templates/de/html/admin/admin_send_yoomedia.tpl b/templates/de/html/admin/admin_send_yoomedia.tpl
new file mode 100644 (file)
index 0000000..d58798c
--- /dev/null
@@ -0,0 +1,77 @@
+<form action="{!URL!}/modules.php?module=admin&amp;what=list_yoomedia_tm" method="POST">
+<table border="0" cellspacing="0" cellpadding="0" width="680" class="admin_table dashed" align="center">
+<tr>
+       <td colspan="2" class="admin_title bottom2" height="30">
+               <strong>{--ADMIN_YOOMEDIA_SEND_MAIL_TITLE--}</strong>
+       </td>
+</tr>
+<tr><td colspan="2" class="seperator" height="10">&nbsp;</td></tr>
+<tr>
+       <td align="right" style="padding-right:5px">{--SELECT_CATEGORY--}:</td>
+       <td>
+               <select name="cat" size="1" class="admin_select">
+                       <option value="" disabled>{--PLEASE_SELECT--}</option>
+                       <option value="0">{--ALL_MEMBERS--} ($content[all])</option>
+                       $content[categories]
+               </select>
+       </td>
+</tr>
+<tr><td colspan="2" class="seperator" height="5">&nbsp;</td></tr>
+<tr>
+       <td width="150" align="right" style="padding-right:5px" valign="top">{--ENTER_RECEIVER--}:</td>
+       <td width="530">
+               <span class="admin_note"><em>{--ADMIN_YOOMEDIA_RECEIVER_ARE_ALL_NOTE--}</em></span>
+       </td>
+</tr>
+<tr><td colspan="2" class="seperator" height="5">&nbsp;</td></tr>
+<tr>
+       <td align="right" style="padding-right:5px">{--ENTER_POINTS--}:</td>
+       <td>
+               <input type="text" name="points" class="admin_normal" size="4" maxlength="5" value="$content[reward]" /> {!POINTS!}
+       </td>
+</tr>
+<tr><td colspan="2" class="seperator" height="5">&nbsp;</td></tr>
+<tr>
+       <td align="right" style="padding-right:5px">{--ENTER_SECONDS--}:</td>
+       <td>
+               <input type="text" name="seconds" class="admin_normal" size="4" maxlength="5" value="$content[wait]" /> {--_SECONDS--}
+       </td>
+</tr>
+<tr><td colspan="2" class="seperator" height="5">&nbsp;</td></tr>
+<tr>
+       <td align="right" style="padding-right:5px">{--ENTER_SUBJECT--}:</td>
+       <td>
+               <input type="text" name="subject" class="admin_normal" size="30" maxlength="150" value="{--ADMIN_YOOMEDIA_SUBJECT_PREFIX--} $content[name]" />
+       </td>
+</tr>
+<tr><td colspan="2" class="seperator" height="5">&nbsp;</td></tr>
+<tr>
+       <td align="right" style="padding-right:5px" valign="top">{--ENTER_TEXT--}:</td>
+       <td>
+               <textarea name="text" class="admin_normal" rows="8" cols="60">$content[text]</textarea>
+       </td>
+</tr>
+<tr><td colspan="2" class="seperator" height="10">&nbsp;</td></tr>
+<tr>
+       <td align="right" style="padding-right:5px">{--MEMBER_ENTER_URL--}:</td>
+       <td>
+               http://www.yoomedia.de/code/t-mail.php?id=$content[id]&amp;sid=$content[sid]
+               <input type="hidden" name="id" value="$content[id]" />
+               <input type="hidden" name="sid" value="$content[sid]" />
+               <input type="hidden" name="reload" value="$content[reload]" />
+       </td>
+</tr>
+<tr>
+       <td colspan="2" align="center">
+               <span class="admin_note"><em>{--ADMIN_YOOMEDIA_ENTER_URL_NOTE--}</em></span>
+       </td>
+</tr>
+<tr><td colspan="2" class="seperator bottom2" height="10">&nbsp;</td></tr>
+<tr>
+       <td colspan="2" align="center" class="admin_footer">
+               <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />&nbsp;*
+               <input type="submit" name="sent" class="admin_submit" value="{--ADMIN_SEND_MAIL--}" />
+       </td>
+</tr>
+</table>
+</form>
diff --git a/templates/de/html/admin/admin_yoomedia_error.tpl b/templates/de/html/admin/admin_yoomedia_error.tpl
new file mode 100644 (file)
index 0000000..751883a
--- /dev/null
@@ -0,0 +1,8 @@
+<TABLE border="0" cellspacing="0" cellpadding="0" align="center" class="admin_table dashed" width="400">
+       <TR>
+               <TD class="admin_title bottom2">{--ADMIN_YOOMEDIA_ERROR_TITLE--}</TD>
+       </TR>
+       <TR>
+               <TD align="center"><STRONG>$content</STRONG></TD>
+       </TR>
+</TABLE>
index cc728ec570f1102c29d7d5775b5c1274366e8a4f..cd05e86d32a7dc8cdca03defc4d41f5b8ccb3f5e 100644 (file)
@@ -452,6 +452,7 @@ DIV.admin_note {
        border                          : solid 1px #000000;
        background-color        : #000000;
        color                           : #FFFFFF;
+       cursor                          : pointer;
 }
 
 .guest_stats {
index 8e146794e75c0bc9d6b9b75b9500e67ad6ebba73..ed63db0f0f02e0603ea6f639763b0645a199e1d8 100644 (file)
@@ -457,6 +457,7 @@ DIV.admin_note {
        border                          : solid 1px #00AA00;
        background-color        : #AA0044;
        color                           : #DDEEDD;
+       cursor                          : pointer;
 }
 
 .guest_stats {
index df64581418917f8d683b3f72472ceaeccb41f6f2..11624b659274a30d31c7662b419453adf84b845d 100644 (file)
@@ -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 {