From e2148142f8b1a8f40fd6e7ca32185569c5a9083e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 12 Nov 2009 11:09:52 +0000 Subject: [PATCH] Comments fixed, ext-network continued, fix for mod stats: - A lot comments fixed (underline for project title) - ext-network continued: Networks are now deleteable - Fix for admin module 'what-stats_mods.php' --- .gitattributes | 1 + inc/extensions/ext- | 2 +- inc/extensions/ext-active.php | 2 +- inc/extensions/ext-admins.php | 2 +- inc/extensions/ext-admintheme1.php | 2 +- inc/extensions/ext-admintheme_default.php | 2 +- inc/extensions/ext-autopurge.php | 2 +- inc/extensions/ext-autoreg.php | 2 +- inc/extensions/ext-bank.php | 2 +- inc/extensions/ext-beg.php | 2 +- inc/extensions/ext-birthday.php | 2 +- inc/extensions/ext-bonus.php | 2 +- inc/extensions/ext-booking.php | 2 +- inc/extensions/ext-cache.php | 2 +- inc/extensions/ext-country.php | 2 +- inc/extensions/ext-debug.php | 2 +- inc/extensions/ext-demo.php | 2 +- inc/extensions/ext-doubler.php | 2 +- inc/extensions/ext-events.php | 2 +- inc/extensions/ext-holiday.php | 2 +- inc/extensions/ext-html_mail.php | 2 +- inc/extensions/ext-imprint.php | 2 +- inc/extensions/ext-iso3166.php | 2 +- inc/extensions/ext-jackpot.php | 2 +- inc/extensions/ext-lead.php | 2 +- inc/extensions/ext-logs.php | 2 +- inc/extensions/ext-mailid.php | 2 +- inc/extensions/ext-maintenance.php | 2 +- inc/extensions/ext-mediadata.php | 2 +- inc/extensions/ext-menu.php | 2 +- inc/extensions/ext-mods.php | 2 +- inc/extensions/ext-mydata.php | 2 +- inc/extensions/ext-network.php | 2 +- inc/extensions/ext-newsletter.php | 2 +- inc/extensions/ext-nickname.php | 2 +- inc/extensions/ext-online.php | 2 +- inc/extensions/ext-optimize.php | 2 +- inc/extensions/ext-order.php | 2 +- inc/extensions/ext-other.php | 2 +- inc/extensions/ext-payout.php | 2 +- inc/extensions/ext-politician-stop.php | 2 +- inc/extensions/ext-primera.php | 2 +- inc/extensions/ext-profile.php | 2 +- inc/extensions/ext-rallye.php | 2 +- inc/extensions/ext-refback.php | 2 +- inc/extensions/ext-refsell.php | 2 +- inc/extensions/ext-register.php | 2 +- inc/extensions/ext-removeip.php | 2 +- inc/extensions/ext-repair.php | 2 +- inc/extensions/ext-rewrite.php | 2 +- inc/extensions/ext-safe.php | 2 +- inc/extensions/ext-seo.php | 2 +- inc/extensions/ext-sql_patches.php | 2 +- inc/extensions/ext-support.php | 2 +- inc/extensions/ext-surfbar.php | 2 +- inc/extensions/ext-task.php | 2 +- inc/extensions/ext-theme.php | 2 +- inc/extensions/ext-top10.php | 2 +- inc/extensions/ext-transfer.php | 2 +- inc/extensions/ext-uberwach.php | 2 +- inc/extensions/ext-update.php | 2 +- inc/extensions/ext-usage.php | 2 +- inc/extensions/ext-user.php | 2 +- inc/extensions/ext-wernis.php | 2 +- inc/extensions/ext-yoomedia.php | 2 +- inc/language/network_de.php | 2 + inc/libs/html_mail_functions.php | 2 +- inc/libs/network_functions.php | 37 ++++++++++++++ inc/libs/newsletter_functions.php | 4 +- inc/libs/nickname_functions.php | 2 +- inc/libs/online_functions.php | 2 +- inc/libs/optimize_functions.php | 2 +- inc/libs/task_functions.php | 2 +- inc/modules/admin/what- | 2 +- inc/modules/admin/what-add_bank_package.php | 2 +- inc/modules/admin/what-add_guestnl_cat.php | 2 +- inc/modules/admin/what-add_rallye.php | 2 +- inc/modules/admin/what-add_surfbar_url.php | 2 +- inc/modules/admin/what-admins_add.php | 2 +- inc/modules/admin/what-admins_contct.php | 2 +- inc/modules/admin/what-admins_edit.php | 2 +- inc/modules/admin/what-admins_mails.php | 2 +- inc/modules/admin/what-bonus.php | 2 +- inc/modules/admin/what-cache_stats.php | 2 +- inc/modules/admin/what-config_ | 2 +- inc/modules/admin/what-config_active.php | 2 +- inc/modules/admin/what-config_admin.php | 2 +- inc/modules/admin/what-config_admins.php | 2 +- inc/modules/admin/what-config_autopurge.php | 2 +- inc/modules/admin/what-config_beg.php | 2 +- inc/modules/admin/what-config_birthday.php | 2 +- inc/modules/admin/what-config_bonus.php | 2 +- inc/modules/admin/what-config_doubler.php | 2 +- inc/modules/admin/what-config_extensions.php | 2 +- inc/modules/admin/what-config_holiday.php | 2 +- inc/modules/admin/what-config_home.php | 2 +- inc/modules/admin/what-config_imprint.php | 2 +- inc/modules/admin/what-config_mediadata.php | 2 +- inc/modules/admin/what-config_menu.php | 2 +- inc/modules/admin/what-config_mods.php | 2 +- inc/modules/admin/what-config_newsletter.php | 2 +- inc/modules/admin/what-config_nickname.php | 2 +- inc/modules/admin/what-config_order.php | 2 +- inc/modules/admin/what-config_payouts.php | 2 +- inc/modules/admin/what-config_primera.php | 2 +- inc/modules/admin/what-config_proxy.php | 2 +- .../admin/what-config_rallye_prices.php | 2 +- inc/modules/admin/what-config_refback.php | 2 +- inc/modules/admin/what-config_refid.php | 2 +- inc/modules/admin/what-config_removeip.php | 2 +- inc/modules/admin/what-config_rewrite.php | 2 +- inc/modules/admin/what-config_session.php | 2 +- inc/modules/admin/what-config_stats.php | 2 +- inc/modules/admin/what-config_surfbar.php | 2 +- inc/modules/admin/what-config_title.php | 2 +- inc/modules/admin/what-config_top10.php | 2 +- inc/modules/admin/what-config_transfer.php | 2 +- inc/modules/admin/what-config_user.php | 2 +- inc/modules/admin/what-config_wernis.php | 2 +- inc/modules/admin/what-config_yoomedia.php | 2 +- inc/modules/admin/what-del_email.php | 2 +- inc/modules/admin/what-del_holiday.php | 2 +- inc/modules/admin/what-del_transfer.php | 2 +- inc/modules/admin/what-extensions.php | 2 +- inc/modules/admin/what-holiday_list.php | 2 +- inc/modules/admin/what-holiday_remove.php | 2 +- inc/modules/admin/what-list_autopurge.php | 2 +- inc/modules/admin/what-list_bank_package.php | 2 +- inc/modules/admin/what-list_beg.php | 2 +- inc/modules/admin/what-list_bonus.php | 2 +- inc/modules/admin/what-list_cats.php | 2 +- inc/modules/admin/what-list_country.php | 2 +- inc/modules/admin/what-list_doubler.php | 2 +- inc/modules/admin/what-list_holiday.php | 2 +- inc/modules/admin/what-list_links.php | 2 +- inc/modules/admin/what-list_network_types.php | 48 +++++++++++++++++++ inc/modules/admin/what-list_networks.php | 2 +- inc/modules/admin/what-list_payouts.php | 2 +- inc/modules/admin/what-list_primera.php | 2 +- inc/modules/admin/what-list_rallyes.php | 2 +- inc/modules/admin/what-list_refs.php | 2 +- .../admin/what-list_surfbar_actions.php | 2 +- inc/modules/admin/what-list_surfbar_urls.php | 2 +- inc/modules/admin/what-list_task.php | 2 +- inc/modules/admin/what-list_transfer.php | 2 +- inc/modules/admin/what-list_unconfirmed.php | 2 +- inc/modules/admin/what-list_wernis.php | 2 +- inc/modules/admin/what-maintenance.php | 2 +- inc/modules/admin/what-optimize.php | 2 +- inc/modules/admin/what-repair_amnu.php | 2 +- inc/modules/admin/what-repair_cats.php | 2 +- inc/modules/admin/what-repair_gmnu.php | 2 +- inc/modules/admin/what-repair_mmnu.php | 2 +- inc/modules/admin/what-stats_mods.php | 9 ++-- inc/modules/admin/what-surfbar_stats.php | 2 +- inc/modules/admin/what-theme_check.php | 2 +- inc/modules/admin/what-theme_edit.php | 2 +- inc/modules/admin/what-theme_import.php | 2 +- .../admin/what-unlock_surfbar_urls.php | 2 +- inc/modules/admin/what-updates.php | 2 +- inc/modules/admin/what-user_contct.php | 2 +- inc/modules/admin/what-usr_online.php | 2 +- inc/modules/guest/action- | 2 +- inc/modules/guest/action-admin.php | 2 +- inc/modules/guest/action-online.php | 2 +- inc/modules/guest/action-themes.php | 2 +- inc/modules/guest/what- | 2 +- inc/modules/guest/what-active.php | 2 +- inc/modules/guest/what-admin.php | 2 +- inc/modules/guest/what-beg.php | 2 +- inc/modules/guest/what-doubler.php | 2 +- inc/modules/guest/what-rallyes.php | 2 +- inc/modules/guest/what-stats.php | 2 +- inc/modules/guest/what-top10.php | 2 +- inc/modules/guest/what-wernis_portal.php | 2 +- inc/modules/member/action- | 2 +- inc/modules/member/action-account.php | 2 +- inc/modules/member/action-bank.php | 2 +- inc/modules/member/action-extras.php | 2 +- inc/modules/member/action-order.php | 2 +- inc/modules/member/action-rals.php | 2 +- inc/modules/member/action-stats.php | 2 +- inc/modules/member/action-surfbar.php | 2 +- inc/modules/member/action-themes.php | 2 +- inc/modules/member/what- | 2 +- inc/modules/member/what-bank_create.php | 2 +- inc/modules/member/what-bank_deposit.php | 2 +- inc/modules/member/what-bank_infos.php | 2 +- inc/modules/member/what-bank_output.php | 2 +- inc/modules/member/what-bank_withdraw.php | 2 +- inc/modules/member/what-beg.php | 2 +- inc/modules/member/what-doubler.php | 2 +- inc/modules/member/what-guest.php | 2 +- inc/modules/member/what-holiday.php | 2 +- inc/modules/member/what-html_mail.php | 2 +- inc/modules/member/what-newsletter.php | 2 +- inc/modules/member/what-nickname.php | 2 +- inc/modules/member/what-payout.php | 2 +- inc/modules/member/what-primera.php | 2 +- inc/modules/member/what-rallyes.php | 2 +- inc/modules/member/what-refback.php | 2 +- inc/modules/member/what-reflist.php | 2 +- inc/modules/member/what-support.php | 2 +- inc/modules/member/what-surfbar_book.php | 2 +- inc/modules/member/what-surfbar_list.php | 2 +- inc/modules/member/what-surfbar_start.php | 2 +- inc/modules/member/what-surfbar_stats.php | 2 +- inc/modules/member/what-themes.php | 2 +- inc/modules/member/what-transfer.php | 2 +- inc/modules/member/what-wernis.php | 2 +- 210 files changed, 298 insertions(+), 211 deletions(-) create mode 100644 inc/modules/admin/what-list_network_types.php diff --git a/.gitattributes b/.gitattributes index 1f2d2a92cb..5c459e0ef7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -432,6 +432,7 @@ inc/modules/admin/what-list_country.php -text inc/modules/admin/what-list_doubler.php -text inc/modules/admin/what-list_holiday.php -text inc/modules/admin/what-list_links.php -text +inc/modules/admin/what-list_network_types.php -text inc/modules/admin/what-list_networks.php -text inc/modules/admin/what-list_notifications.php -text inc/modules/admin/what-list_payouts.php -text diff --git a/inc/extensions/ext- b/inc/extensions/ext- index baae98b47e..de91370a82 100644 --- a/inc/extensions/ext- +++ b/inc/extensions/ext- @@ -1,7 +1,7 @@ "Es wurde kein bekanntes Formular versendet.", 'ADMIN_NETWORK_NOTHING_FOUND' => "Es wurden keine Daten zum Editieren oder Löschen gefunden.", 'ADMIN_NETWORK_NOTHING_CHANGED' => "Es wurden keine Änderungen an den allgemeinen Daten ausgeführt.", + 'ADMIN_NETWORK_NOTHING_REMOVED' => "Es wurden keine allgemeinen Daten gelöscht.", // - Form titles 'ADMIN_NETWORK_ADD_TITLE' => "Neues Werbenetzwerk hinzufügen - Allgemeine Daten", 'ADMIN_NETWORK_EDIT_TITLE' => "Werbenetzwerk editieren - Allgemeine Daten", @@ -66,6 +67,7 @@ addMessages(array( 'ADMIN_NETWORK_REMOVE' => "Daten entfernen", // - Success nots 'ADMIN_NETWORK_UPDATED' => "Es wurden %s Einträge in den allgemeinen Daten aktualisiert.", + 'ADMIN_NETWORK_REMOVED' => "Es wurden %s Einträge aus den allgemeinen Dateen gelöscht.", // - Sponsor networks 'ADMIN_NETWORK_NONE_SUPPORTED' => "Es sind noch keine Werbenetzwerke eingerichtet.", 'ADMIN_NETWORK_SHORT_NAME' => "Kurzname", diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php index 29f49585d1..f7a34e0298 100644 --- a/inc/libs/html_mail_functions.php +++ b/inc/libs/html_mail_functions.php @@ -1,7 +1,7 @@ 0) { + // By default nothing is removed + $removed = 0; + + // Something has been selected, so start updating them + foreach (postRequestElement('sel') as $id => $sel) { + // Update this entry? + if ($sel == 1) { + // Remove this entry + $removed += doAdminRemoveNetworkEntry('data', 'network_id', $id); + } // END - if + } // END - foreach + + // Do we have removes? + if ($removed > 0) { + // Removals done + loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_NETWORK_REMOVED'), $removed)); + } else { + // Nothing removed + loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_NOTHING_REMOVED')); + } + } // END - if +} + // [EOF] ?> diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php index ec20b363ad..0de1fe33cc 100644 --- a/inc/libs/newsletter_functions.php +++ b/inc/libs/newsletter_functions.php @@ -1,10 +1,10 @@ diff --git a/inc/modules/admin/what-list_networks.php b/inc/modules/admin/what-list_networks.php index 04e3653775..de637747b8 100644 --- a/inc/modules/admin/what-list_networks.php +++ b/inc/modules/admin/what-list_networks.php @@ -1,7 +1,7 @@