From: Roland Häder Date: Wed, 19 Jan 2011 17:43:35 +0000 (+0000) Subject: Extensions bitcoins/yacy added, new API functions for handling proxy/non-proxy added: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9725980ca9c052e5c1a9edb8b815e8506b876448;p=mailer.git Extensions bitcoins/yacy added, new API functions for handling proxy/non-proxy added: - New extension ext-bitcoins ( http://www.bitcoin.org) added as an alternative payment method to direct cash (Euro, US Dollar, ...) - New extension ext-yacy ( http://yacy.net ) added to ease setup of a 'site search'. You still need a running YaCy instance somewhere (should be localhost for performance reasons). - The API can now provide the real IP address (even from bethind a proxy) and 'REMOTE_ADDR'. The real IP address can be "detected" with detectRealIpAddress() and 'REMOTE_ADDR' (which could be a proxy IP) with detectRemoteAddr(). - Wrapper function detectDomainName() introduced - TODOs.txt updated --- diff --git a/.gitattributes b/.gitattributes index d8bed52f4c..6f9071e46e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -148,6 +148,7 @@ inc/extensions/ext-autoreg.php -text svneol=unset#text/plain inc/extensions/ext-bank.php -text svneol=unset#text/plain inc/extensions/ext-beg.php -text svneol=unset#text/plain inc/extensions/ext-birthday.php -text svneol=unset#text/plain +inc/extensions/ext-bitcoins.php -text svneol=unset#text/plain inc/extensions/ext-bonus.php -text svneol=unset#text/plain inc/extensions/ext-booking.php -text svneol=unset#text/plain inc/extensions/ext-cache.php -text svneol=unset#text/plain @@ -211,6 +212,7 @@ inc/extensions/ext-usage.php -text svneol=unset#text/plain inc/extensions/ext-user.php -text svneol=unset#text/plain inc/extensions/ext-validator.php -text svneol=unset#text/plain inc/extensions/ext-wernis.php -text svneol=unset#text/plain +inc/extensions/ext-yacy.php -text svneol=unset#text/plain inc/extensions/ext-yoomedia.php -text svneol=unset#text/plain inc/filter-functions.php -text svneol=unset#text/plain inc/filters.php -text svneol=unset#text/plain @@ -1386,6 +1388,7 @@ templates/de/html/ext/ext_autoreg.tpl -text svneol=unset#text/plain templates/de/html/ext/ext_bank.tpl -text svneol=unset#text/plain templates/de/html/ext/ext_beg.tpl -text svneol=unset#text/plain templates/de/html/ext/ext_birthday.tpl -text svneol=unset#text/plain +templates/de/html/ext/ext_bitcoins.tpl -text svneol=unset#text/plain templates/de/html/ext/ext_bonus.tpl -text svneol=unset#text/plain templates/de/html/ext/ext_booking.tpl -text svneol=unset#text/plain templates/de/html/ext/ext_cache.tpl -text svneol=unset#text/plain @@ -1449,6 +1452,7 @@ templates/de/html/ext/ext_usage.tpl -text svneol=unset#text/plain templates/de/html/ext/ext_user.tpl -text svneol=unset#text/plain templates/de/html/ext/ext_validator.tpl -text svneol=unset#text/plain templates/de/html/ext/ext_wernis.tpl -text svneol=unset#text/plain +templates/de/html/ext/ext_yacy.tpl -text svneol=unset#text/plain templates/de/html/ext/ext_yoomedia.tpl -text svneol=unset#text/plain templates/de/html/fatal_errors.tpl -text svneol=unset#text/plain templates/de/html/guest/.htaccess -text svneol=unset#text/plain diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 04667bf5fb..0aa233a537 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -48,13 +48,13 @@ ./inc/functions.php:1596: // @TODO Are these convertions still required? ./inc/functions.php:1614:// @TODO Rewrite this function to use readFromFile() and writeToFile() ./inc/functions.php:181:// @TODO Rewrite this to an extension 'smtp' -./inc/functions.php:2275: // @TODO This is still very static, rewrite it somehow +./inc/functions.php:2277: // @TODO This is still very static, rewrite it somehow +./inc/functions.php:2454: // @TODO Rename column data_type to e.g. mail_status ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter ./inc/install-functions.php:57: // @TODO DEACTIVATED: changeDataInInclude(getCachePath() . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0); -./inc/language/de.php:1087:// @TODO Rewrite these two constants -./inc/language/de.php:1102:// @TODO Rewrite these three constants -./inc/language/de.php:280: // @TODO Following two are unused? -./inc/language/de.php:784:// @TODO Are these constants longer used? +./inc/language/de.php:1082: // @TODO Rewrite these two constants +./inc/language/de.php:1103: // @TODO Rewrite these three constants +./inc/language/de.php:779:// @TODO Are these constants longer used? ./inc/language-functions.php:243: // @TODO These are all valid languages, again hard-coded ./inc/language-functions.php:44:// @TODO Rewrite all language constants to this function. ./inc/language/newsletter_de.php:13: * @TODO This language file is completely out-dated, please do no * @@ -97,11 +97,11 @@ ./inc/loader/load-extension.php:13: * @TODO Rewrite this whole file * ./inc/module-functions.php:267: // @TODO Nothing helped??? ./inc/module-functions.php:308: // @TODO Rewrite this to a filter -./inc/modules/admin/admin-inc.php:170: // @TODO This and the next getCurrentAdminId() call might be moved into the templates? -./inc/modules/admin/admin-inc.php:241: // @TODO This can be rewritten into a filter -./inc/modules/admin/admin-inc.php:273: // @TODO Rewrite this to $content = SQL_FETCHARRAY() -./inc/modules/admin/admin-inc.php:338: // @TODO Rewrite this to $content = SQL_FETCHARRAY() -./inc/modules/admin/admin-inc.php:436:// @TODO Try to rewrite this to adminAddMenuSelectionBox() +./inc/modules/admin/admin-inc.php:171: // @TODO This and the next getCurrentAdminId() call might be moved into the templates? +./inc/modules/admin/admin-inc.php:242: // @TODO This can be rewritten into a filter +./inc/modules/admin/admin-inc.php:274: // @TODO Rewrite this to $content = SQL_FETCHARRAY() +./inc/modules/admin/admin-inc.php:339: // @TODO Rewrite this to $content = SQL_FETCHARRAY() +./inc/modules/admin/admin-inc.php:437:// @TODO Try to rewrite this to adminAddMenuSelectionBox() ./inc/modules/admin/overview-inc.php:162: // @TODO Rewrite this to a filter ./inc/modules/admin/overview-inc.php:275: // @TODO Rewrite this to something with include files and/or filter ./inc/modules/admin/overview-inc.php:309: // @TODO This may also be rewritten to include files @@ -196,7 +196,7 @@ ./inc/template-functions.php:602: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates ./inc/wrapper-functions.php:130:// @TODO Implement $compress ./inc/wrapper-functions.php:137:// @TODO Implement $decompress -./inc/wrapper-functions.php:452:// @TODO Do some more sanity check here +./inc/wrapper-functions.php:489:// @TODO Do some more sanity check here ./mailid.php:139: // @TODO Rewrite this to a filter ./mailid.php:96: // @TODO Rewrite this to a filter ./mailid_top.php:103: // @TODO Rewrite this to a filter @@ -242,7 +242,7 @@ ./inc/loader/load_cache-revision.php:2:// @DEPRECATED ./inc/loader/load_cache-them.php:2:// @DEPRECATED ./inc/loader/load-extensions.php:2:// @DEPRECATED -./inc/modules/admin/admin-inc.php:437:// @DEPRECATED +./inc/modules/admin/admin-inc.php:438:// @DEPRECATED ./inc/reset/reset_100_bonus.php:2:// @DEPRECATED ./inc/reset/reset_autopurge.php:2:// @DEPRECATED ./inc/reset/reset_beg.php:2:// @DEPRECATED diff --git a/inc/config-global.php b/inc/config-global.php index d67040bd1e..bc72a81926 100644 --- a/inc/config-global.php +++ b/inc/config-global.php @@ -77,6 +77,9 @@ initConfig(); // CFG: HOST-URL (without trailing '/' !) setConfigEntry('URL', $URL); +// CFG: DOMAIN-NAME (without trailing '/' !) +setConfigEntry('DOMAIN', detectDomainName()); + // CFG: SERVER-PATH setConfigEntry('PATH', $PATH); diff --git a/inc/extensions/ext- b/inc/extensions/ext- index ba8c9bb3b4..050973d689 100644 --- a/inc/extensions/ext- +++ b/inc/extensions/ext- @@ -85,7 +85,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-active.php b/inc/extensions/ext-active.php index 34b77afdb6..6d70d9b111 100644 --- a/inc/extensions/ext-active.php +++ b/inc/extensions/ext-active.php @@ -132,7 +132,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php index 5657dcff11..ae5943eb12 100644 --- a/inc/extensions/ext-admins.php +++ b/inc/extensions/ext-admins.php @@ -348,7 +348,7 @@ PRIMARY KEY (`id`) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-admintheme1.php b/inc/extensions/ext-admintheme1.php index c559c45f1e..738226819b 100644 --- a/inc/extensions/ext-admintheme1.php +++ b/inc/extensions/ext-admintheme1.php @@ -82,7 +82,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-admintheme_default.php b/inc/extensions/ext-admintheme_default.php index 0d3c5634bc..8cc3cabc7e 100644 --- a/inc/extensions/ext-admintheme_default.php +++ b/inc/extensions/ext-admintheme_default.php @@ -82,7 +82,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-announcement.php b/inc/extensions/ext-announcement.php index 26c72b1c92..b2e3a5eef7 100644 --- a/inc/extensions/ext-announcement.php +++ b/inc/extensions/ext-announcement.php @@ -81,7 +81,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php index 99f93fbcd4..349de0346f 100644 --- a/inc/extensions/ext-autopurge.php +++ b/inc/extensions/ext-autopurge.php @@ -254,7 +254,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-autoreg.php b/inc/extensions/ext-autoreg.php index 5f76389fb2..b1e1944ba5 100644 --- a/inc/extensions/ext-autoreg.php +++ b/inc/extensions/ext-autoreg.php @@ -80,7 +80,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-bank.php b/inc/extensions/ext-bank.php index 0ecb52524b..a6f05bb95c 100644 --- a/inc/extensions/ext-bank.php +++ b/inc/extensions/ext-bank.php @@ -188,7 +188,7 @@ UNIQUE (`account_id`, `tan`) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php index 2611b71810..c9f38be2ae 100644 --- a/inc/extensions/ext-beg.php +++ b/inc/extensions/ext-beg.php @@ -303,7 +303,7 @@ INDEX ( `userid` ) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // When extension is initialized diff --git a/inc/extensions/ext-birthday.php b/inc/extensions/ext-birthday.php index 70a5b90de6..e820a089fd 100644 --- a/inc/extensions/ext-birthday.php +++ b/inc/extensions/ext-birthday.php @@ -190,7 +190,7 @@ CHANGE `birth_year` `birth_year` SMALLINT(4) UNSIGNED ZEROFILL NOT NULL DEFAULT case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-bitcoins.php b/inc/extensions/ext-bitcoins.php new file mode 100644 index 0000000000..8d70c03de4 --- /dev/null +++ b/inc/extensions/ext-bitcoins.php @@ -0,0 +1,100 @@ + diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php index 8017c13871..256675914b 100644 --- a/inc/extensions/ext-bonus.php +++ b/inc/extensions/ext-bonus.php @@ -584,7 +584,7 @@ WHERE `last_online` < ".$mark." ORDER BY `userid` ASC"); case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-booking.php b/inc/extensions/ext-booking.php index f30ec02b00..431b844cd1 100644 --- a/inc/extensions/ext-booking.php +++ b/inc/extensions/ext-booking.php @@ -114,7 +114,7 @@ PRIMARY KEY (`id`) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php index da6b3216c8..9e8986c3af 100644 --- a/inc/extensions/ext-cache.php +++ b/inc/extensions/ext-cache.php @@ -255,7 +255,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-clickbanner.php b/inc/extensions/ext-clickbanner.php index 2479a3d150..424f9f2e5e 100644 --- a/inc/extensions/ext-clickbanner.php +++ b/inc/extensions/ext-clickbanner.php @@ -80,7 +80,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-country.php b/inc/extensions/ext-country.php index de1a107415..b6227f148d 100644 --- a/inc/extensions/ext-country.php +++ b/inc/extensions/ext-country.php @@ -115,7 +115,7 @@ PRIMARY KEY (`id`) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-debug.php b/inc/extensions/ext-debug.php index d4d0d52d16..a870a34125 100644 --- a/inc/extensions/ext-debug.php +++ b/inc/extensions/ext-debug.php @@ -172,7 +172,7 @@ PRIMARY KEY (`id`) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-demo.php b/inc/extensions/ext-demo.php index fb6ef10266..23d89452a9 100644 --- a/inc/extensions/ext-demo.php +++ b/inc/extensions/ext-demo.php @@ -82,7 +82,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php index 345f58868f..00d0676731 100644 --- a/inc/extensions/ext-doubler.php +++ b/inc/extensions/ext-doubler.php @@ -243,7 +243,7 @@ PRIMARY KEY (`id`) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-events.php b/inc/extensions/ext-events.php index 911762c991..47f72e0873 100644 --- a/inc/extensions/ext-events.php +++ b/inc/extensions/ext-events.php @@ -81,7 +81,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-forced.php b/inc/extensions/ext-forced.php index cf75af3b6d..8d4af26ab7 100644 --- a/inc/extensions/ext-forced.php +++ b/inc/extensions/ext-forced.php @@ -84,7 +84,7 @@ PRIMARY KEY ( `forced_ads_id` ) `forced_campaign_costs_api` FLOAT( 20 , 5 ) UNSIGNED NULL DEFAULT NULL, `forced_campaign_price_api` FLOAT( 20 , 5 ) UNSIGNED NULL DEFAULT NULL, `forced_costs_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL, -INDEX ( `forced_costs_id` ), +INDEX ( `forced_costs_id` ) , PRIMARY KEY ( `forced_campaign_id` ) ) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Forced Campaign Data'"); @@ -94,7 +94,7 @@ PRIMARY KEY ( `forced_campaign_id` ) `forced_campaign_ads_id` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT , `forced_campaign_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL , `forced_ads_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL , -UNIQUE `ads_campaign` ( `forced_campaign_id` , `forced_ads_id` ), +UNIQUE `ads_campaign` ( `forced_campaign_id` , `forced_ads_id` ) , PRIMARY KEY ( `forced_campaign_ads_id` ) ) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Forced Campaigns<->Ads'"); @@ -105,8 +105,8 @@ PRIMARY KEY ( `forced_campaign_ads_id` ) `forced_campaign_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL , `forced_user_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL , `forced_user_type` ENUM( 'MEMBER', 'SPONSOR', 'ADMIN', 'API' ) NULL DEFAULT NULL , -UNIQUE `forced_campaign_user` ( `forced_campaign_id` , `forced_user_id` , `forced_user_type` ), -INDEX ( `forced_user_id` ), +UNIQUE `forced_campaign_user` ( `forced_campaign_id` , `forced_user_id` , `forced_user_type` ) , +INDEX ( `forced_user_id` ) , PRIMARY KEY ( `forced_id` ) ) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Forced Campaigns<->User'"); @@ -119,6 +119,24 @@ PRIMARY KEY ( `forced_id` ) `forced_costs_visibility` ENUM( 'MEMBER', 'SPONSOR', 'ALL', 'NONE' ) NOT NULL DEFAULT 'NONE', PRIMARY KEY ( `forced_costs_id` ) ) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Forced Campaign Costs'"); + + // - Campaign Statistics + addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_forced_stats`'); + addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_forced_stats` ( +`forced_stats_id` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT , +`forced_stats_campaign_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL , +`forced_stats_user_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL , +`forced_stats_viewed` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , +`forced_stats_clicked` TIMESTAMP NULL DEFAULT NULL , +`forced_stats_real_ip` VARCHAR ( 15 ) NOT NULL DEFAULT '0.0.0.0' , +`forced_stats_remote_addr` VARCHAR ( 15 ) NOT NULL DEFAULT '0.0.0.0' , +`forced_stats_ua` VARCHAR ( 255 ) NULL DEFAULT NULL , +`forced_stats_is_proxy` ENUM ( 'Y', 'N' ) NOT NULL DEFAULT 'N' , +`forced_stats_session_id` VARCHAR ( 100 ) NULL DEFAULT NULL , +INDEX ( `forced_stats_campaign_id` ) , +INDEX ( `forced_stats_user_id` ) , +PRIMARY KEY ( `forced_stats_id` ) +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Forced Campaign Statistics'"); break; case 'remove': // Do stuff when removing extension @@ -128,6 +146,7 @@ PRIMARY KEY ( `forced_costs_id` ) addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_forced_campaigns_ads`'); addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_forced_campaigns_user`'); addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_forced_costs`'); + addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_forced_stats`'); break; case 'activate': // Do stuff when admin activates this extension @@ -152,7 +171,7 @@ PRIMARY KEY ( `forced_costs_id` ) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-funcoins.php b/inc/extensions/ext-funcoins.php index eecb798a64..bc9ff670b7 100644 --- a/inc/extensions/ext-funcoins.php +++ b/inc/extensions/ext-funcoins.php @@ -81,7 +81,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-grade.php b/inc/extensions/ext-grade.php index 036ed7934b..66cdb21fdc 100644 --- a/inc/extensions/ext-grade.php +++ b/inc/extensions/ext-grade.php @@ -80,7 +80,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php index 162c726554..08ff2e44a6 100644 --- a/inc/extensions/ext-holiday.php +++ b/inc/extensions/ext-holiday.php @@ -224,7 +224,7 @@ PRIMARY KEY (`id`) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-html_mail.php b/inc/extensions/ext-html_mail.php index 367a317f05..ae6b29ebd7 100644 --- a/inc/extensions/ext-html_mail.php +++ b/inc/extensions/ext-html_mail.php @@ -128,7 +128,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-imprint.php b/inc/extensions/ext-imprint.php index 4dcece06c0..9b9c1b1780 100644 --- a/inc/extensions/ext-imprint.php +++ b/inc/extensions/ext-imprint.php @@ -114,7 +114,7 @@ PRIMARY KEY (`imprint_id`) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-iso3166.php b/inc/extensions/ext-iso3166.php index 8cabd96335..c2a8462250 100644 --- a/inc/extensions/ext-iso3166.php +++ b/inc/extensions/ext-iso3166.php @@ -330,7 +330,7 @@ VALUES ('AD', 'Andorra', 'ext-iso3166'), case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-jackpot.php b/inc/extensions/ext-jackpot.php index 52a10ca02a..fb69993f66 100644 --- a/inc/extensions/ext-jackpot.php +++ b/inc/extensions/ext-jackpot.php @@ -80,7 +80,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-lead.php b/inc/extensions/ext-lead.php index a4b5322278..fd47510ff9 100644 --- a/inc/extensions/ext-lead.php +++ b/inc/extensions/ext-lead.php @@ -80,7 +80,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-logs.php b/inc/extensions/ext-logs.php index 45d06c6faf..caf200950b 100644 --- a/inc/extensions/ext-logs.php +++ b/inc/extensions/ext-logs.php @@ -80,7 +80,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-mailid.php b/inc/extensions/ext-mailid.php index 26712e203f..da9cc3897b 100644 --- a/inc/extensions/ext-mailid.php +++ b/inc/extensions/ext-mailid.php @@ -234,7 +234,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-maintenance.php b/inc/extensions/ext-maintenance.php index e07c7ef515..689b719721 100644 --- a/inc/extensions/ext-maintenance.php +++ b/inc/extensions/ext-maintenance.php @@ -109,7 +109,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-mediadata.php b/inc/extensions/ext-mediadata.php index 2ced8c6fcf..58aaf2c7a8 100644 --- a/inc/extensions/ext-mediadata.php +++ b/inc/extensions/ext-mediadata.php @@ -150,7 +150,7 @@ Bitte stellen Sie diesen derzeit manuell unter templates/".getLangu case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-refback.php b/inc/extensions/ext-refback.php index 92f27501c1..cbdb0bc400 100644 --- a/inc/extensions/ext-refback.php +++ b/inc/extensions/ext-refback.php @@ -104,7 +104,7 @@ KEY (`refid`) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-refsell.php b/inc/extensions/ext-refsell.php index 49c7c923fa..c35f40aa35 100644 --- a/inc/extensions/ext-refsell.php +++ b/inc/extensions/ext-refsell.php @@ -80,7 +80,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php index 874bc241b0..cc8752391e 100644 --- a/inc/extensions/ext-register.php +++ b/inc/extensions/ext-register.php @@ -350,7 +350,7 @@ PRIMARY KEY (`id`) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-removeip.php b/inc/extensions/ext-removeip.php index 4fb92baffb..06a62eee4a 100644 --- a/inc/extensions/ext-removeip.php +++ b/inc/extensions/ext-removeip.php @@ -96,7 +96,7 @@ switch (getExtensionMode()) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-repair.php b/inc/extensions/ext-repair.php index 4c50b62b0b..4f03e57e36 100644 --- a/inc/extensions/ext-repair.php +++ b/inc/extensions/ext-repair.php @@ -125,7 +125,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-report.php b/inc/extensions/ext-report.php index 50be8f1fa3..59a98924c0 100644 --- a/inc/extensions/ext-report.php +++ b/inc/extensions/ext-report.php @@ -80,7 +80,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php index 1ad7c94f2b..d8939998a7 100644 --- a/inc/extensions/ext-rewrite.php +++ b/inc/extensions/ext-rewrite.php @@ -159,7 +159,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-safe.php b/inc/extensions/ext-safe.php index 6edd2770ac..9d52052c7a 100644 --- a/inc/extensions/ext-safe.php +++ b/inc/extensions/ext-safe.php @@ -81,7 +81,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-seo.php b/inc/extensions/ext-seo.php index aa84922eb5..6bd3a1cd7b 100644 --- a/inc/extensions/ext-seo.php +++ b/inc/extensions/ext-seo.php @@ -80,7 +80,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php index 73b9d14870..d31bbffea4 100644 --- a/inc/extensions/ext-sponsor.php +++ b/inc/extensions/ext-sponsor.php @@ -436,7 +436,7 @@ PRIMARY KEY (`id`) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index a86a636d01..9fa654dfe3 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -767,7 +767,7 @@ INDEX (`ip`) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-support.php b/inc/extensions/ext-support.php index 1f84601cec..42757003be 100644 --- a/inc/extensions/ext-support.php +++ b/inc/extensions/ext-support.php @@ -137,7 +137,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php index d14488f302..2a1a4ec972 100644 --- a/inc/extensions/ext-surfbar.php +++ b/inc/extensions/ext-surfbar.php @@ -237,7 +237,7 @@ UNIQUE KEY `status_action` (`actions_status`,`actions_action`) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-task.php b/inc/extensions/ext-task.php index 7f3de33d89..2b43107b56 100644 --- a/inc/extensions/ext-task.php +++ b/inc/extensions/ext-task.php @@ -249,7 +249,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-terms.php b/inc/extensions/ext-terms.php index 493c57720a..928f6235d3 100644 --- a/inc/extensions/ext-terms.php +++ b/inc/extensions/ext-terms.php @@ -80,7 +80,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-theme.php b/inc/extensions/ext-theme.php index 6ec9fa3ab2..bc8f161755 100644 --- a/inc/extensions/ext-theme.php +++ b/inc/extensions/ext-theme.php @@ -190,7 +190,7 @@ INDEX (`theme_active`) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-timezone.php b/inc/extensions/ext-timezone.php index faee499007..db54b282bb 100644 --- a/inc/extensions/ext-timezone.php +++ b/inc/extensions/ext-timezone.php @@ -94,7 +94,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-top10.php b/inc/extensions/ext-top10.php index 89a1633d60..335801b1c6 100644 --- a/inc/extensions/ext-top10.php +++ b/inc/extensions/ext-top10.php @@ -137,7 +137,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php index 18837a39b1..1cba7f6b89 100644 --- a/inc/extensions/ext-transfer.php +++ b/inc/extensions/ext-transfer.php @@ -277,7 +277,7 @@ PRIMARY KEY (`id`) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // When extension is initialized diff --git a/inc/extensions/ext-uberwach.php b/inc/extensions/ext-uberwach.php index e1d6aaaa4f..81df8f7a94 100644 --- a/inc/extensions/ext-uberwach.php +++ b/inc/extensions/ext-uberwach.php @@ -86,7 +86,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-update.php b/inc/extensions/ext-update.php index 552d968055..360e79b609 100644 --- a/inc/extensions/ext-update.php +++ b/inc/extensions/ext-update.php @@ -81,7 +81,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-usage.php b/inc/extensions/ext-usage.php index afe8a3f56e..fefa70eed2 100644 --- a/inc/extensions/ext-usage.php +++ b/inc/extensions/ext-usage.php @@ -80,7 +80,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php index f67d3b37ac..2d795d2c0e 100644 --- a/inc/extensions/ext-user.php +++ b/inc/extensions/ext-user.php @@ -427,7 +427,7 @@ PRIMARY KEY (`id`) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-validator.php b/inc/extensions/ext-validator.php index 529d13359d..97acde1424 100644 --- a/inc/extensions/ext-validator.php +++ b/inc/extensions/ext-validator.php @@ -80,7 +80,7 @@ switch (getExtensionMode()) { case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-wernis.php b/inc/extensions/ext-wernis.php index 631e63d00b..4829e1119a 100644 --- a/inc/extensions/ext-wernis.php +++ b/inc/extensions/ext-wernis.php @@ -140,7 +140,7 @@ PRIMARY KEY (`id`) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/extensions/ext-yacy.php b/inc/extensions/ext-yacy.php new file mode 100644 index 0000000000..2092dfd709 --- /dev/null +++ b/inc/extensions/ext-yacy.php @@ -0,0 +1,100 @@ + diff --git a/inc/extensions/ext-yoomedia.php b/inc/extensions/ext-yoomedia.php index 07827a2555..10762ad145 100644 --- a/inc/extensions/ext-yoomedia.php +++ b/inc/extensions/ext-yoomedia.php @@ -113,7 +113,7 @@ UNIQUE `y_type` (`type`,`y_id`) case 'modify': // When the extension got modified break; - case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305. + case 'test': // For testing purposes break; case 'init': // Do stuff when extension is initialized diff --git a/inc/functions.php b/inc/functions.php index c00fee3cde..dbd0bc4261 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -656,7 +656,7 @@ function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums // function generateRandomCode ($length, $code, $userid, $DATA = '') { // Build server string - $server = $_SERVER['PHP_SELF'] . getEncryptSeperator() . detectUserAgent() . getEncryptSeperator() . getenv('SERVER_SOFTWARE') . getEncryptSeperator() . detectRemoteAddr(); + $server = $_SERVER['PHP_SELF'] . getEncryptSeperator() . detectUserAgent() . getEncryptSeperator() . getenv('SERVER_SOFTWARE') . getEncryptSeperator() . detectRealIpAddress() . getEncryptSeperator() . detectRemoteAddr(); // Build key string $keys = getConfig('SITE_KEY') . getEncryptSeperator() . getConfig('DATE_KEY'); @@ -1173,7 +1173,7 @@ function generateHash ($plainText, $salt = '', $hash = true) { // When the salt is empty build a new one, else use the first x configured characters as the salt if (empty($salt)) { // Build server string for more entropy - $server = $_SERVER['PHP_SELF'] . getEncryptSeperator() . detectUserAgent() . getEncryptSeperator() . getenv('SERVER_SOFTWARE') . getEncryptSeperator() . detectRemoteAddr(); + $server = $_SERVER['PHP_SELF'] . getEncryptSeperator() . detectUserAgent() . getEncryptSeperator() . getenv('SERVER_SOFTWARE') . getEncryptSeperator() . detectRealIpAddress() . getEncryptSeperator() . detectRemoteAddr(); // Build key string $keys = getConfig('SITE_KEY') . getEncryptSeperator() . getConfig('DATE_KEY') . getEncryptSeperator() . getSecretKey() . getEncryptSeperator() . getFileHash() . getEncryptSeperator() . getDateFromPatchTime() . getEncryptSeperator() . getMasterSalt(); @@ -1866,12 +1866,12 @@ function rebuildCache ($cache, $inc = '', $force = false) { } // Determines the real remote address -function determineRealRemoteAddress () { +function determineRealRemoteAddress ($remoteAddr = false) { // Is a proxy in use? - if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) { + if ((isset($_SERVER['HTTP_X_FORWARDED_FOR'])) && (!$remoteAddr)) { // Proxy was used $address = $_SERVER['HTTP_X_FORWARDED_FOR']; - } elseif (isset($_SERVER['HTTP_CLIENT_IP'])) { + } elseif ((isset($_SERVER['HTTP_CLIENT_IP'])) && (!$remoteAddr)) { // Yet, another proxy $address = $_SERVER['HTTP_CLIENT_IP']; } else { @@ -1891,9 +1891,11 @@ function determineRealRemoteAddress () { // Adds a bonus mail to the queue // This is a high-level function! -function addNewBonusMail ($data, $mode = '', $output=true) { +function addNewBonusMail ($data, $mode = '', $output = true) { // Use mode from data if not set and availble ;-) - if ((empty($mode)) && (isset($data['mode']))) $mode = $data['mode']; + if ((empty($mode)) && (isset($data['mode']))) { + $mode = $data['mode']; + } // END - if // Generate receiver list $receiver = generateReceiverList($data['cat'], $data['receiver'], $mode); diff --git a/inc/modules/guest/what-extensions.php b/inc/modules/guest/what-extensions.php index 2b34d36620..0bdcf4d306 100644 --- a/inc/modules/guest/what-extensions.php +++ b/inc/modules/guest/what-extensions.php @@ -4,11 +4,11 @@ * =================== Last change: 01/09/2005 * * * * -------------------------------------------------------------------- * - * File : what-beg.php * + * File : what-extensions.php * * -------------------------------------------------------------------- * - * Short description : Beg points with us! * + * Short description : Lists all extension's description texts * * -------------------------------------------------------------------- * - * Kurzbeschreibung : Mit uns Punkte erbetteln! * + * Kurzbeschreibung : Listet alle Beschreibungstexte aller Erw. auf * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * @@ -44,12 +44,21 @@ if (!defined('__SECURITY')) { addYouAreHereLink('guest', __FILE__); // Get all extension files -$extensions = getArrayFromDirectory('templates/' . getLanguage() . '/html/ext/', 'ext_', false, false, array(), '.tpl', '@(\.|\.\.)$@', false); +$extensions = getArrayFromDirectory( + 'templates/' . getLanguage() . '/html/ext/', + 'ext_', + false, + false, + array(), + '.tpl', + '@(\.|\.\.)$@', + false +); // Now iterate through all and load that template file $OUT = ''; foreach ($extensions as $ext_file) { - // We only need the filename! + // We only need the filename $template = substr(basename($ext_file), 0, -4); // Prepare data diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index 663654809f..8758f853d6 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -194,10 +194,25 @@ function isDirectory ($FQFN) { return $GLOBALS[__FUNCTION__][$FQFN]; } +// "Getter" for the real remote IP number +function detectRealIpAddress () { + // Get remote ip from environment + $remoteAddr = determineRealRemoteAddress(); + + // Is removeip installed? + if (isExtensionActive('removeip')) { + // Then anonymize it + $remoteAddr = getAnonymousRemoteAddress($remoteAddr); + } // END - if + + // Return it + return $remoteAddr; +} + // "Getter" for remote IP number function detectRemoteAddr () { // Get remote ip from environment - $remoteAddr = determineRealRemoteAddress(); + $remoteAddr = determineRealRemoteAddress(true); // Is removeip installed? if (isExtensionActive('removeip')) { @@ -271,6 +286,28 @@ function detectServerName () { return (getenv('SERVER_NAME')); } +// Removes any existing www. from SERVER_NAME. This is very silly but enough +// for our purpose here. +function detectDomainName () { + // Do we have cache? + if (!isset($GLOBALS[__FUNCTION__])) { + // Get server name + $domainName = detectServerName(); + + // Is there any www. ? + if (substr($domainName, 0, 4) == 'www.') { + // Remove it + $domainName = substr($domainName, 4); + } // END - if + + // Set cache + $GLOBALS[__FUNCTION__] = $domainName; + } // END - if + + // Return cache + return $GLOBALS[__FUNCTION__]; +} + // Check wether we are installing function isInstalling () { // Determine wether we are installing diff --git a/templates/de/emails/admin/admin_holiday_deactivated.tpl b/templates/de/emails/admin/admin_holiday_deactivated.tpl index a3d1fa99be..395798d6ba 100644 --- a/templates/de/emails/admin/admin_holiday_deactivated.tpl +++ b/templates/de/emails/admin/admin_holiday_deactivated.tpl @@ -9,7 +9,7 @@ E-Mail Adresse: {%user,email=$userid%} ------------------------------ Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%} ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Browser: {%server,user_agent%} ------------------------------ diff --git a/templates/de/emails/admin/admin_holiday_request.tpl b/templates/de/emails/admin/admin_holiday_request.tpl index cba76d91ff..cc6dbec45b 100644 --- a/templates/de/emails/admin/admin_holiday_request.tpl +++ b/templates/de/emails/admin/admin_holiday_request.tpl @@ -9,7 +9,7 @@ E-Mail Adresse: {%user,email=$userid%} ------------------------------ Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%} ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Browser: {%server,user_agent%} ------------------------------ @@ -27,4 +27,4 @@ Die Urlaubsschaltung ist aktiviert und wird nach der Urlaubszeit automatisch wie Mit freundlichen Grüßen, Ihr {?MAIN_TITLE?} Script -{?URL?}/admin.php \ No newline at end of file +{?URL?}/admin.php diff --git a/templates/de/emails/admin/admin_mydata_notify.tpl b/templates/de/emails/admin/admin_mydata_notify.tpl index 76a2b1764c..63c4d1108f 100644 --- a/templates/de/emails/admin/admin_mydata_notify.tpl +++ b/templates/de/emails/admin/admin_mydata_notify.tpl @@ -16,7 +16,7 @@ Hallo Administrator, ------------------------------------------ $content[message] ------------------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------------------ Browser: {%server,user_agent%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_newsletter_reset.tpl b/templates/de/emails/admin/admin_newsletter_reset.tpl index c8d5e791d3..cc1585ed84 100644 --- a/templates/de/emails/admin/admin_newsletter_reset.tpl +++ b/templates/de/emails/admin/admin_newsletter_reset.tpl @@ -9,7 +9,7 @@ E-Mail Adresse: {%user,email=$userid%} ------------------------------ Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%} ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Browser: {%server,user_agent%} ------------------------------ @@ -19,4 +19,4 @@ Das Mitglied wurde ebenfalls darüber in Kenntnis gesetzt! Die zugehoerige A Mit freundlichen Grüßen, Ihr {?MAIN_TITLE?} Script -{?URL?}/admin.php \ No newline at end of file +{?URL?}/admin.php diff --git a/templates/de/emails/admin/admin_payout_request.tpl b/templates/de/emails/admin/admin_payout_request.tpl index d9b3a7c54c..09bb77707e 100644 --- a/templates/de/emails/admin/admin_payout_request.tpl +++ b/templates/de/emails/admin/admin_payout_request.tpl @@ -10,7 +10,7 @@ Es hat dabei folgende Angaben gemacht: ------------------------------ Seine Mitglieder-Id ist: $userid ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Browser: {%server,user_agent%} ------------------------------ diff --git a/templates/de/emails/admin/admin_payout_request_banner.tpl b/templates/de/emails/admin/admin_payout_request_banner.tpl index f8c60d672c..b4a280f045 100644 --- a/templates/de/emails/admin/admin_payout_request_banner.tpl +++ b/templates/de/emails/admin/admin_payout_request_banner.tpl @@ -10,7 +10,7 @@ Es hat dabei folgende Angaben gemacht: ------------------------------ Seine Mitglieder-Id ist: $userid ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Browser: {%server,user_agent%} ------------------------------ diff --git a/templates/de/emails/admin/admin_report_bug.tpl b/templates/de/emails/admin/admin_report_bug.tpl index c35307fa5c..9fae3e2f8c 100644 --- a/templates/de/emails/admin/admin_report_bug.tpl +++ b/templates/de/emails/admin/admin_report_bug.tpl @@ -12,7 +12,7 @@ Abfrage-String: {%server,request_uri%} ------------------------------ Verwendeter Browser: {%server,user_agent%} ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ User-Id: {%user,userid%} ------------------------------ diff --git a/templates/de/emails/admin/admin_reset_password.tpl b/templates/de/emails/admin/admin_reset_password.tpl index fdf744f9a9..75786a7567 100644 --- a/templates/de/emails/admin/admin_reset_password.tpl +++ b/templates/de/emails/admin/admin_reset_password.tpl @@ -13,7 +13,7 @@ $content[login] Sollten Sie dies nicht gewesen sein, so ignorieren Sie einfach diese Mail. Hier sind die IP-Nummer und Browserbezeichnung: ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Browser: {%server,user_agent%} ------------------------------ @@ -21,4 +21,4 @@ Browser: {%server,user_agent%} Mit freundlichen Grüßen, Ihr {?MAIN_TITLE?} Script -{?URL?}/admin.php \ No newline at end of file +{?URL?}/admin.php diff --git a/templates/de/emails/admin/admin_sponsor_change_data.tpl b/templates/de/emails/admin/admin_sponsor_change_data.tpl index c67efa93a5..35325ece36 100644 --- a/templates/de/emails/admin/admin_sponsor_change_data.tpl +++ b/templates/de/emails/admin/admin_sponsor_change_data.tpl @@ -25,7 +25,7 @@ Hier sind alle neuen (und in Klammern alten) Daten: ------------------------------ Verwendeter Browser: {%server,user_agent%} ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Mit freundlichen Grüßen, diff --git a/templates/de/emails/admin/admin_sponsor_change_email.tpl b/templates/de/emails/admin/admin_sponsor_change_email.tpl index debe1564f8..324e71440c 100644 --- a/templates/de/emails/admin/admin_sponsor_change_email.tpl +++ b/templates/de/emails/admin/admin_sponsor_change_email.tpl @@ -25,7 +25,7 @@ Hier sind alle neuen (und in Klammern alten) Daten: ------------------------------ Verwendeter Browser: {%server,user_agent%} ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Mit freundlichen Grüßen, diff --git a/templates/de/emails/admin/admin_sponsor_pending.tpl b/templates/de/emails/admin/admin_sponsor_pending.tpl index ea4590ccfd..fb8d29d0b1 100644 --- a/templates/de/emails/admin/admin_sponsor_pending.tpl +++ b/templates/de/emails/admin/admin_sponsor_pending.tpl @@ -1,6 +1,6 @@ Hallo Administrator, -soeben hat ein neuer Sponsor seine EMail-Adresse bestätigt. Dies wurde von der IP-Nummer {%server,remote_addr%} aus durchgeführt. +soeben hat ein neuer Sponsor seine EMail-Adresse bestätigt. Dies wurde von der IP-Nummer {%server,remote_addr%} ({%server,real_ip_address%}) aus durchgeführt. Bitte setzen Sie sich mit ihm in Verbindung (die EMail-Adresse finden Sie weiter unten) und teilen Sie ihm Ihre Kontoverbindung mit! diff --git a/templates/de/emails/admin/admin_sponsor_reg.tpl b/templates/de/emails/admin/admin_sponsor_reg.tpl index 3dafd0605a..055c718f78 100644 --- a/templates/de/emails/admin/admin_sponsor_reg.tpl +++ b/templates/de/emails/admin/admin_sponsor_reg.tpl @@ -1,6 +1,6 @@ Hallo Administrator, -soeben hat sich ein neuer Sponsor zu unserem {?mt_word?} mit der IP-Nummer {%server,remote_addr%} angemeldet. Er wird als nächstes seine EMail-Adresse bestätigen. +soeben hat sich ein neuer Sponsor zu unserem {?mt_word?} mit der IP-Nummer {%server,remote_addr%} ({%server,real_ip_address%}) angemeldet. Er wird als nächstes seine EMail-Adresse bestätigen. Folgende Daten wurden dabei übermittelt: ------------------------------ @@ -18,7 +18,7 @@ Nachname: {%sponsor,family=$content[id]%} ------------------------------ Verwendeter Browser: {%server,user_agent%} ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Die restliche Daten können Sie im Admin-Bereich einsehen. diff --git a/templates/de/emails/admin/admin_sponsor_settings.tpl b/templates/de/emails/admin/admin_sponsor_settings.tpl index d59e6b0543..e0566fce3b 100644 --- a/templates/de/emails/admin/admin_sponsor_settings.tpl +++ b/templates/de/emails/admin/admin_sponsor_settings.tpl @@ -11,7 +11,7 @@ Hier sind alle neuen (und in Klammern alten) Daten: ------------------------------ Verwendeter Browser: {%server,user_agent%} ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Mit freundlichen Grüßen, diff --git a/templates/de/emails/admin/admin_support-ordr.tpl b/templates/de/emails/admin/admin_support-ordr.tpl index 7642286339..54d8a724c8 100644 --- a/templates/de/emails/admin/admin_support-ordr.tpl +++ b/templates/de/emails/admin/admin_support-ordr.tpl @@ -9,7 +9,7 @@ E-Mail Adresse: {%user,email=$userid%} ------------------------------ Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%} ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Browser: {%server,user_agent%} ------------------------------ diff --git a/templates/de/emails/admin/admin_support-reflink.tpl b/templates/de/emails/admin/admin_support-reflink.tpl index 835125023e..0873a31ffe 100644 --- a/templates/de/emails/admin/admin_support-reflink.tpl +++ b/templates/de/emails/admin/admin_support-reflink.tpl @@ -9,7 +9,7 @@ E-Mail Adresse: {%user,email=$userid%} ------------------------------ Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%} ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Browser: {%server,user_agent%} ------------------------------ diff --git a/templates/de/emails/admin/admin_support-unconfirmed.tpl b/templates/de/emails/admin/admin_support-unconfirmed.tpl index cc6a10c29b..ee84a2a6d6 100644 --- a/templates/de/emails/admin/admin_support-unconfirmed.tpl +++ b/templates/de/emails/admin/admin_support-unconfirmed.tpl @@ -9,7 +9,7 @@ E-Mail Adresse: {%user,email=$userid%} ------------------------------ Vor-, Nachname: {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%} ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Browser: {%server,user_agent%} ------------------------------ diff --git a/templates/de/emails/admin/admin_transfer_points.tpl b/templates/de/emails/admin/admin_transfer_points.tpl index 924a1af895..0529f02805 100644 --- a/templates/de/emails/admin/admin_transfer_points.tpl +++ b/templates/de/emails/admin/admin_transfer_points.tpl @@ -16,7 +16,7 @@ Mitglieder-Id: $content[sender][userid] Vollst. Name: {%pipe,translateGender=$content[sender][gender]%} $content[sender][surname] $content[sender][family] Email-Adresse: $content[sender][email] ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) Browser : {%server,user_agent%} ------------------------------ Verwendungszweck: $content[reason] diff --git a/templates/de/emails/admin/admin_wernis_request.tpl b/templates/de/emails/admin/admin_wernis_request.tpl index 0e31d69026..18c1daee3a 100644 --- a/templates/de/emails/admin/admin_wernis_request.tpl +++ b/templates/de/emails/admin/admin_wernis_request.tpl @@ -10,7 +10,7 @@ Es hat dabei folgende Angaben gemacht: ------------------------------ Seine Mitglieder-Id ist: $userid ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Browser: {%server,user_agent%} ------------------------------ diff --git a/templates/de/emails/admins/admins_mail_contct_admin.tpl b/templates/de/emails/admins/admins_mail_contct_admin.tpl index 5c0f4619d8..7d0aff2592 100644 --- a/templates/de/emails/admins/admins_mail_contct_admin.tpl +++ b/templates/de/emails/admins/admins_mail_contct_admin.tpl @@ -5,7 +5,7 @@ ein anderer Administrator hat Ihnen soeben eine Mail geschickt! ------------------------------------ $content ------------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------------ Browser: {%server,user_agent%} ------------------------------------ diff --git a/templates/de/emails/admins/admins_msg_contct_admin.tpl b/templates/de/emails/admins/admins_msg_contct_admin.tpl index 911a66a651..9e41d25393 100644 --- a/templates/de/emails/admins/admins_msg_contct_admin.tpl +++ b/templates/de/emails/admins/admins_msg_contct_admin.tpl @@ -5,7 +5,7 @@ ein anderer Administrator hat Ihnen soeben eine Nachricht in Ihren Account gesch ------------------------------------ $content ------------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------------ Browser: {%server,user_agent%} ------------------------------------ @@ -13,4 +13,4 @@ Browser: {%server,user_agent%} Mit freundlichen Grüßen, Ihr {?MAIN_TITLE?} Script -{?URL?}/admin.php \ No newline at end of file +{?URL?}/admin.php diff --git a/templates/de/emails/member/member_mydata_notify.tpl b/templates/de/emails/member/member_mydata_notify.tpl index c7df202ddd..2f5f854fad 100644 --- a/templates/de/emails/member/member_mydata_notify.tpl +++ b/templates/de/emails/member/member_mydata_notify.tpl @@ -14,7 +14,7 @@ Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,fa {--EMAIL--}: {%user,email=$userid%} {--PASS_1--}: $content[pass1] ------------------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------------------ Browser: {%server,user_agent%} ------------------------------------------ diff --git a/templates/de/emails/new-pass.tpl b/templates/de/emails/new-pass.tpl index 10492e0669..07708f76c6 100644 --- a/templates/de/emails/new-pass.tpl +++ b/templates/de/emails/new-pass.tpl @@ -7,7 +7,7 @@ Ihre Login-Id lautet: $userid / Nickname: $content[nickname] Neues Passwort: $content[new_pass] Sie können sich nun hier einloggen:: {?URL?}/login.php ------------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------------ Browser: {%server,user_agent%} ------------------------------------ diff --git a/templates/de/emails/order-admin.tpl b/templates/de/emails/order-admin.tpl index 0814503220..278c286efd 100644 --- a/templates/de/emails/order-admin.tpl +++ b/templates/de/emails/order-admin.tpl @@ -15,7 +15,7 @@ Gebuchter Payment-Typ: {%pipe,getPaymentTitlePrice=$content[payment_id]%} Betreffzeile in den Mails: $content[subject] Gebuchte URL: $content[url] ------------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------------ Browser: {%server,user_agent%} ------------------------------------------------ diff --git a/templates/de/emails/register-admin.tpl b/templates/de/emails/register-admin.tpl index 8bab9f4ac2..3deee10d75 100644 --- a/templates/de/emails/register-admin.tpl +++ b/templates/de/emails/register-admin.tpl @@ -14,7 +14,7 @@ Wohnort: {%user,city=$userid%} Email-Adresse: {%user,email=$userid%} Geburtsdatum: $content[birthday] ------------------------- -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------- Browser: {%server,user_agent%} ------------------------- diff --git a/templates/de/emails/sponsor/sponsor_activate.tpl b/templates/de/emails/sponsor/sponsor_activate.tpl index 1255ee69f5..c2023fd434 100644 --- a/templates/de/emails/sponsor/sponsor_activate.tpl +++ b/templates/de/emails/sponsor/sponsor_activate.tpl @@ -1,6 +1,6 @@ Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%}, -Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%}) haben soeben Ihren Bestätigungslink erneut angefordert. +Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%} ({%server,real_ip_address%})) haben soeben Ihren Bestätigungslink erneut angefordert. Hier ist Ihr Link: ------------------------------ @@ -16,7 +16,7 @@ Sollten Sie sich nicht angemeldet haben, bitten wir diese Unangenehmlichkeit zu ------------------------------ Verwendeter Browser: {%server,user_agent%} ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Angemeldet am: $content[sponsor_created] ------------------------------ diff --git a/templates/de/emails/sponsor/sponsor_change_data.tpl b/templates/de/emails/sponsor/sponsor_change_data.tpl index 4165978243..3dc4111c19 100644 --- a/templates/de/emails/sponsor/sponsor_change_data.tpl +++ b/templates/de/emails/sponsor/sponsor_change_data.tpl @@ -27,7 +27,7 @@ Das Passwort wurde Ihnen aus Sicherheitsgründen nicht mitgesendet. ------------------------------ Verwendeter Browser: {%server,user_agent%} ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Mit freundlichen Grüßen, diff --git a/templates/de/emails/sponsor/sponsor_change_email.tpl b/templates/de/emails/sponsor/sponsor_change_email.tpl index 39259ffd6a..8a6ac61d49 100644 --- a/templates/de/emails/sponsor/sponsor_change_email.tpl +++ b/templates/de/emails/sponsor/sponsor_change_email.tpl @@ -9,7 +9,7 @@ Sollten Sie diesen nicht anklicken können, kopieren Sie ihn bitte in die Ad ------------------------------ Verwendeter Browser: {%server,user_agent%} ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Mit freundlichen Grüßen, diff --git a/templates/de/emails/sponsor/sponsor_confirm.tpl b/templates/de/emails/sponsor/sponsor_confirm.tpl index 1d3938ecca..3d8cd5b6f5 100644 --- a/templates/de/emails/sponsor/sponsor_confirm.tpl +++ b/templates/de/emails/sponsor/sponsor_confirm.tpl @@ -1,6 +1,6 @@ Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%}, -Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%}) haben sich soeben als Sponsor zu unserem {?mt_word?} angemeldet. Sie haben somit den ersten Schritt zu uns getan wofür wir uns sehr bedanken. +Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%} ({%server,real_ip_address%})) haben sich soeben als Sponsor zu unserem {?mt_word?} angemeldet. Sie haben somit den ersten Schritt zu uns getan wofür wir uns sehr bedanken. Als nächstes müssen Sie Ihre EMail-Adresse bestätigen. Dieser Schritt ist erforderlich, um sicher zu gehen, dass auch kein anderer Sie angemeldet hat. @@ -20,7 +20,7 @@ Sollten Sie sich nicht angemeldet haben, bitten wir diese Unangenehmlichkeit zu ------------------------------ Verwendeter Browser: {%server,user_agent%} ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Angemeldet am: $content[timestamp] ------------------------------ diff --git a/templates/de/emails/sponsor/sponsor_email.tpl b/templates/de/emails/sponsor/sponsor_email.tpl index 90b15d069b..953ce8647e 100644 --- a/templates/de/emails/sponsor/sponsor_email.tpl +++ b/templates/de/emails/sponsor/sponsor_email.tpl @@ -14,7 +14,7 @@ Sollten Sie diesen nicht anklicken können, kopieren Sie ihn bitte in die Ad ------------------------------ Verwendeter Browser: {%server,user_agent%} ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Mit freundlichen Grüßen, diff --git a/templates/de/emails/sponsor/sponsor_lost.tpl b/templates/de/emails/sponsor/sponsor_lost.tpl index 84700abcad..e23ce08252 100644 --- a/templates/de/emails/sponsor/sponsor_lost.tpl +++ b/templates/de/emails/sponsor/sponsor_lost.tpl @@ -1,6 +1,6 @@ Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%}, -Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%}) haben soeben ein neues Passwort angefordert. +Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%} ({%server,real_ip_address%})) haben soeben ein neues Passwort angefordert. Hier sind Ihre neuen Zugangsdaten: ------------------------------ @@ -14,7 +14,7 @@ Sollten Sie dies nicht angefordert haben, bitten wir diese Unangenehmlichkeit zu ------------------------------ Verwendeter Browser: {%server,user_agent%} ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Angemeldet am: $content[sponsor_created] ------------------------------ diff --git a/templates/de/emails/sponsor/sponsor_pending.tpl b/templates/de/emails/sponsor/sponsor_pending.tpl index caeab1584c..855d30a74b 100644 --- a/templates/de/emails/sponsor/sponsor_pending.tpl +++ b/templates/de/emails/sponsor/sponsor_pending.tpl @@ -1,6 +1,6 @@ Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%}, -Sie haben soeben Ihre EMail-Adresse bestätigt. Dies wurde von der IP-Nummer {%server,remote_addr%} aus durchgeführt. +Sie haben soeben Ihre EMail-Adresse bestätigt. Dies wurde von der IP-Nummer {%server,remote_addr%} ({%server,real_ip_address%}) aus durchgeführt. Wir werden uns bald mit Ihnen in Verbindung setzen und Ihnen unsere Kontodaten mitteilen. Zu unserer Sicherheit haben wir diese hier nicht aufgelistet. Bitte notieren Sie sich vorab folgende Daten: diff --git a/templates/de/emails/sponsor/sponsor_settings.tpl b/templates/de/emails/sponsor/sponsor_settings.tpl index dcd951710c..c54c874294 100644 --- a/templates/de/emails/sponsor/sponsor_settings.tpl +++ b/templates/de/emails/sponsor/sponsor_settings.tpl @@ -13,7 +13,7 @@ Das Passwort wurde Ihnen aus Sicherheitsgründen nicht mitgesendet. ------------------------------ Verwendeter Browser: {%server,user_agent%} ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Mit freundlichen Grüßen, diff --git a/templates/de/emails/sponsor/sponsor_unlock.tpl b/templates/de/emails/sponsor/sponsor_unlock.tpl index 1255ee69f5..c2023fd434 100644 --- a/templates/de/emails/sponsor/sponsor_unlock.tpl +++ b/templates/de/emails/sponsor/sponsor_unlock.tpl @@ -1,6 +1,6 @@ Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%}, -Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%}) haben soeben Ihren Bestätigungslink erneut angefordert. +Sie (oder ein anderer mit der IP-Nummer {%server,remote_addr%} ({%server,real_ip_address%})) haben soeben Ihren Bestätigungslink erneut angefordert. Hier ist Ihr Link: ------------------------------ @@ -16,7 +16,7 @@ Sollten Sie sich nicht angemeldet haben, bitten wir diese Unangenehmlichkeit zu ------------------------------ Verwendeter Browser: {%server,user_agent%} ------------------------------ -IP-Nummer: {%server,remote_addr%} +IP-Nummer: {%server,remote_addr%} ({%server,real_ip_address%}) ------------------------------ Angemeldet am: $content[sponsor_created] ------------------------------ diff --git a/templates/de/html/ext/ext_bitcoins.tpl b/templates/de/html/ext/ext_bitcoins.tpl new file mode 100644 index 0000000000..b5f4591372 --- /dev/null +++ b/templates/de/html/ext/ext_bitcoins.tpl @@ -0,0 +1,28 @@ +
+ Bezahlungen mit BitCoins sind mit + dieser Erweiterung möglich. BitCoin ist eine virtuelle + Internetwährung mit der Ihre Sponsoren Werbung bei Ihrem {?MT_WORD?} + bezahlen können. Üblicherweise wird solch eine virtuelle + Währung (wie z.B. FunCoins, Wernis, Klammlose usw.) auf einem zentralen + Server oder auch Serverfarm (Cluster durchaus) gehostet, wo dann meistens + eine prohitähre Software installiert ist und der Anbieter die + Herrschaft über die Währung und alle Transaktionen hat. +
+ +
+ Bei der Währung BitCoin ist dies genau anders. Hier existiert eine + OpenSource-Software, die sich jeder runterladen kann und sie basiert auf + dem Peer-To-Peer-Prinzip, wo letztendlich jeder Teilnehmer die Herrschaft + über seine Transaktionen und Daten behält, solange er nicht + ausdrücklich der Überweisung zustimmt (z.B. durch Senden von + BitCoins an eine temporäre Zieladdresse). +
+ +
+ Für weitere Fragen und Support ausserhalb dieser Erweiterung lesen Sie + sich bitte in den Seiten von www.bitcoin.org ein bzw. fragen den + dortigen Support. +
diff --git a/templates/de/html/ext/ext_yacy.tpl b/templates/de/html/ext/ext_yacy.tpl new file mode 100644 index 0000000000..47e820839c --- /dev/null +++ b/templates/de/html/ext/ext_yacy.tpl @@ -0,0 +1,18 @@ +
+ YaCy ist eine auf dem + Peer-To-Peer-Prinzip aufbauende Suchmaschine. Diese Erweiterung hilft Ihnen + bei der Integration eines YaCy-Peers (z.B. auf Ihrem Server installiertem) + in Ihren {?MT_WORD?} als Webseitensuche. +
+ +
+ Sie können bei der Konfiguration nebst Hostnamen (bitte nicht mit dem + YaCy-internen Peer-Namen verwechseln) und Portnummer (meistens 8080) auch + weitere Einstellungen, wie z.B. ob global oder nur der lokale Peer + durchsucht werden soll und ob nur {?URL?} oder die gesamte Domain {?DOMAIN?} + durchsuchbar ist. Die gesamte Domain durchsuchbar zu machen, macht dann Sinn, + wenn Sie noch ein Forum, Bug-Tracker (meistens eher nicht der Fall) oder einen + Blog installiert haben und diese auch mit der selben Suchmaske durchsuchbar + machen möchten. +