Continued a bit:

- some improvements on autoreg_test.php
- removed deprecated script
- updated TODOs.txt

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 1d82b0ed9362d320d71e785d7ccae55c05f2ad1e..0137eca427dc70555398cc3e1b586646b2716900 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -22,6 +22,11 @@
 ./inc/email-functions.php:204:// @TODO $rawUserId is currently unused
 ./inc/expression-functions.php:168:// @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again
 ./inc/expression-functions.php:41:     // @TODO is escapeQuotes() enough for strings with single/double quotes?
+./inc/extensions-functions.php:2234:                   // @TODO Is this really neccessary?
+./inc/extensions-functions.php:2291:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
+./inc/extensions-functions.php:434:    // @TODO This redirect is still needed to register sql_patches! Please try to avoid it
+./inc/extensions-functions.php:450:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
+./inc/extensions-functions.php:590:            // @TODO Extension is loaded, what next?
 ./inc/extensions/admins/mode-update.php:38:// @TODO Remove double tabs from all lines
 ./inc/extensions/autopurge/mode-update.php:38:// @TODO Remove double tabs from all lines
 ./inc/extensions/beg/mode-update.php:38:// @TODO Remove double tabs from all lines
@@ -38,11 +43,6 @@
 ./inc/extensions/ext-yoomedia.php:120:         // @TODO Can this be moved into a database table?
 ./inc/extensions/ext-yoomedia.php:54:// @TODO Only deprecated when 'ext-network' is ready: setExtensionDeprecated('Y');
 ./inc/extensions/forced/mode-setup.php:38:// @TODO Remove double tabs from all lines
-./inc/extensions-functions.php:2234:                   // @TODO Is this really neccessary?
-./inc/extensions-functions.php:2291:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
-./inc/extensions-functions.php:434:    // @TODO This redirect is still needed to register sql_patches! Please try to avoid it
-./inc/extensions-functions.php:450:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
-./inc/extensions-functions.php:590:            // @TODO Extension is loaded, what next?
 ./inc/extensions/grade/mode-setup.php:38:// @TODO Remove double tabs from all lines
 ./inc/extensions/html_mail/mode-update.php:38:// @TODO Remove double tabs from all lines
 ./inc/extensions/network/mode-setup.php:13: * @TODO ADCocktail: All request parameters, BIDausKAS, WIDausKAS???    *
@@ -91,14 +91,13 @@
 ./inc/extensions/transfer/mode-update.php:38:// @TODO Remove double tabs from all lines
 ./inc/extensions/user/mode-update.php:38:// @TODO Remove double tabs from all lines
 ./inc/extensions/user/mode-update.php:548:                             // @TODO Make configurable through web interface
+./inc/filter-functions.php:115:        // @TODO Remove this forced removal after a year or so
 ./inc/filter/blacklist_filter.php:105: // @TODO Insert log entry
 ./inc/filter/blacklist_filter.php:116: // @TODO Insert log entry
 ./inc/filter/blacklist_filter.php:127: // @TODO Insert log entry
 ./inc/filter/bonus_filter.php:56:              // @TODO This query isn't right, it will only update if the user was for a longer time away!
 ./inc/filter/forced_filter.php:75:             // @TODO This part is unfinished
-./inc/filter-functions.php:115:        // @TODO Remove this forced removal after a year or so
 ./inc/filter/order_filter.php:132:             // @TODO 200 is hard-coded here, swap it out to config + admin_config_order.tpl
-./inc/filters.php:1379:                // @TODO No banner found, output some default banner
 ./inc/filter/user_filter.php:279:// @TODO 0% done
 ./inc/filter/user_filter.php:289:// @TODO 0% done
 ./inc/filter/wernis_filter.php:137:// @TODO 0% done
@@ -106,21 +105,22 @@
 ./inc/filter/wernis_filter.php:62:// @TODO 10% done
 ./inc/filter/wernis_filter.php:80:// @TODO 10% done
 ./inc/filter/wernis_filter.php:98:// @TODO 10% done
-./inc/general-functions.php:1354:                      // @TODO Are these convertions still required?
-./inc/general-functions.php:1375:// @TODO Rewrite this function to use readFromFile() and writeToFile()
-./inc/general-functions.php:1679:              // @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal.
-./inc/general-functions.php:2055:      // @TODO Find a way to cache this
-./inc/general-functions.php:2159:      // @TODO This is still very static, rewrite it somehow
-./inc/general-functions.php:2338:      // @TODO Rename column data_type to e.g. mail_status
-./inc/general-functions.php:2688:// @TODO cacheFiles is not yet supported
-./inc/general-functions.php:552:// @TODO $allowSpider is unused
+./inc/filters.php:1379:                // @TODO No banner found, output some default banner
 ./inc/gen_sql_patches.php:93:// @TODO Rewrite this to a filter
+./inc/general-functions.php:1351:                      // @TODO Are these convertions still required?
+./inc/general-functions.php:1372:// @TODO Rewrite this function to use readFromFile() and writeToFile()
+./inc/general-functions.php:1676:              // @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal.
+./inc/general-functions.php:2052:      // @TODO Find a way to cache this
+./inc/general-functions.php:2156:      // @TODO This is still very static, rewrite it somehow
+./inc/general-functions.php:2335:      // @TODO Rename column data_type to e.g. mail_status
+./inc/general-functions.php:2685:// @TODO cacheFiles is not yet supported
+./inc/general-functions.php:549:// @TODO $allowSpider is unused
 ./inc/install-functions.php:166:       // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0);
 ./inc/install-functions.php:561:       // @TODO Comparing with DEFAULT_MAIN_TITLE doesn't work
+./inc/language-functions.php:249:      // @TODO These are all valid languages, again hard-coded
 ./inc/language/de.php:1150:    // @TODO Rewrite these two constants
 ./inc/language/de.php:1166:    // @TODO Rewrite these three constants
 ./inc/language/de.php:46:      // @TODO Please sort these language elements
-./inc/language-functions.php:249:      // @TODO These are all valid languages, again hard-coded
 ./inc/language/install_de.php:155:     // @TODO Move this to e.g. ext-smtp
 ./inc/language/newsletter_de.php:13: * @TODO This language file is completely out-dated, please do no       *
 ./inc/language/order_de.php:71:        // @TODO Find better text
@@ -199,12 +199,12 @@
 ./inc/modules/admin/what-list_rallye_prices.php:222:                   // @TODO Rewrite these two constants
 ./inc/modules/admin/what-list_refs.php:101:                                                    // @TODO Try to rewrite some to EL
 ./inc/modules/admin/what-list_unconfirmed.php:115:     // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
-./inc/modules/admin/what-list_user_cats.php:54:                // @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
-./inc/modules/admin/what-list_user_cats.php:74:                                // @TODO Rewrite this to countSum.....() function
 ./inc/modules/admin/what-list_user.php:104:            // @TODO Refacture these old link generation to functions
 ./inc/modules/admin/what-list_user.php:121:            // @TODO Refacture birth_foo to avoid uni* timetstamps as older members cannot be greeded correctly
 ./inc/modules/admin/what-list_user.php:288:            // @TODO Rewrite this into a filter
 ./inc/modules/admin/what-list_user.php:350:                    // @TODO Rewrite this into a filter
+./inc/modules/admin/what-list_user_cats.php:54:                // @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
+./inc/modules/admin/what-list_user_cats.php:74:                                // @TODO Rewrite this to countSum.....() function
 ./inc/modules/admin/what-logs.php:64:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-logs.php:70:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-mem_add.php:124:                              // @TODO This can be somehow rewritten to a function
@@ -274,20 +274,19 @@
 ./templates/de/html/guest/guest_nickname_login.tpl:21: @TODO Deactivated feature, try to find a solution for this or remove it.
 ./templates/de/html/guest/guest_stats_member.tpl:21:   @TODO We have to fix these counters.
 ./templates/de/html/member/member_list_unconfirmed_nopoints.tpl:20:            <!-- @TODO Nothing to say here? //-->
-./templates/de/html/surfbar/surfbar_frameset.tpl:4:    // @TODO This redirect kills our own frameset
 ./templates/de/html/surfbar/surfbar_frame_textlinks.tpl:5:             <!-- @TODO These are static lines and should be replaced by a filter (see ext-network/ext-sponsor) //-->
+./templates/de/html/surfbar/surfbar_frameset.tpl:4:    // @TODO This redirect kills our own frameset
 ./js/admin-network-query-api.js:67:// @TODO Add support for checkboxes
 ./js/admin-network-query-api.js:68:// @TODO Make progress window working
 ./js/ajax-common.js:245:                               // @TODO Need this be secured?
 ./js/ajax-common.js:283:                               // @TODO Need this be secured?
 ./js/install-common.js:114:    // @TODO Progress bar is out-of-order: + '<div id="progressbar"></div>'
-./.htaccess:10:        # @TODO When ext-imprint is finished RewriteRule ^modules.php?module=index&what=impressum$ modules.php?module=index&what=imprint [L]
-./.htaccess:11:        # @TODO When ext-terms is finished RewriteRule ^cms/index/wht/agb$                 modules.php?module=index&what=terms [L]
-./.htaccess:12:        # @TODO When ext-terms is finished RewriteRule ^modules.php?module=index&what=agb$ modules.php?module=index&what=terms [L]
-./.htaccess:13:        # @TODO When ext-terms is finished RewriteRule ^agb.php$ modules.php?module=index&what=terms [L]
-./.htaccess:9: # @TODO When ext-imprint is finished RewriteRule ^cms/index/wht/impressum$                 modules.php?module=index&what=imprint [L]
+./.htaccess:14:        # @TODO When ext-imprint is finished RewriteRule ^cms/index/wht/impressum$                 modules.php?module=index&what=imprint [L]
+./.htaccess:15:        # @TODO When ext-imprint is finished RewriteRule ^modules.php?module=index&what=impressum$ modules.php?module=index&what=imprint [L]
+./.htaccess:16:        # @TODO When ext-terms is finished RewriteRule ^cms/index/wht/agb$                 modules.php?module=index&what=terms [L]
+./.htaccess:17:        # @TODO When ext-terms is finished RewriteRule ^modules.php?module=index&what=agb$ modules.php?module=index&what=terms [L]
+./.htaccess:18:        # @TODO When ext-terms is finished RewriteRule ^agb.php$ modules.php?module=index&what=terms [L]
 ### ### DEPRECATION FOLLOWS: ### ###
-./contrib/install_svn.php:2:// @DEPRECATED
 ./inc/modules/admin/admin-inc.php:539:// @DEPRECATED
 ./inc/mysql-connect.php:2:// @DEPRECATED
 ./inc/stylesheet.php:2:// @DEPRECATED

diff --git a/contrib/autoreg_output.php b/contrib/autoreg_output.php
index d2d13bebae7322cd4bc687adc45840d4a156c169..afdc475757212bfbb788ed313f4bc4ddf170d13d 100644 (file)
--- a/contrib/autoreg_output.php
+++ b/contrib/autoreg_output.php
@@ -1,28 +1,32 @@
 <?php
-// Auto-registration module, decoded
-/* Dateiname */
+
+// Some test for ext-autoreg - entirely unsupported
+//
+// File name
 $dateiname = '/registrieren_send.php';
-/* Badword */
+
+// Don't fill this out
 $badword = 'Achtung:';
-/* HTTP-POST-Query zusammenbauen */
-$register .= 'formular_username='.$data['nickname'];
-$register .= '&formular_kennwort='.$data['kennwort'];
-$register .= '&anrede='.$data['anrede'];
-$register .= '&vorname='.$data['vorname'];
-$register .= '&nachname='.$data['nachname'];
-$register .= '&gtag='.$data['gtag'];
-$register .= '&gmonat='.$data['gmonat'];
-$register .= '&gjahr='.$data['gjahr'];
-$register .= '&strasse='.$data['strasse'];
-$register .= '&plz='.$data['plz'];
-$register .= '&stadt='.$data['ort'];
-$register .= '&land='.$data['land'];
-$register .= '&email='.$data['email'];
+
+// Construct POST request
+$register .= 'formular_username=' . $data['nickname'];
+$register .= '&formular_kennwort=' . $data['kennwort'];
+$register .= '&anrede=' . $data['anrede'];
+$register .= '&vorname=' . $data['vorname'];
+$register .= '&nachname=' . $data['nachname'];
+$register .= '&gtag=' . $data['gtag'];
+$register .= '&gmonat=' . $data['gmonat'];
+$register .= '&gjahr=' . $data['gjahr'];
+$register .= '&strasse=' . $data['strasse'];
+$register .= '&plz=' . $data['plz'];
+$register .= '&stadt=' . $data['ort'];
+$register .= '&land=' . $data['land'];
+$register .= '&email=' . $data['email'];
 $register .= '&art=Text';
-$register .= '&land='.$data['land'];
+$register .= '&land=' . $data['land'];
 $register .= '&newsletter=Ja';
-$register .= '&ref='.$anbieter['refid'];
-$register .= '&land='.$data['land'];
+$register .= '&ref=' . $anbieter['refid'];
+$register .= '&land=' . $data['land'];
 $register .= '&k1=1';
 $register .= '&k2=1';
 $register .= '&k3=1';
@@ -46,10 +50,15 @@ $register .= '&k20=1';
 $register .= '&k21=1';
 $register .= '&k22=1';
 $register .= '&agb=on';
-/* Die Registrierung abschicken */
+
+// Send registration
 $url = parse_url($anbieter['reflink']);
-$reg = reg($url['host'],$dateiname,$register);
-/* Fehlercheck anhand des Badwords */
-if (stripos($reg,$badword) !== FALSE) $erfolg = FALSE;
-       else $erfolg = TRUE;
+$reg = reg($url['host'], $dateiname, $register);
+
+// Check on errors
+if (stripos($reg, $badword) !== FALSE) {
+       $erfolg = FALSE;
+} else {
+       $erfolg = TRUE;
+}
 ?>

diff --git a/contrib/install_svn.php b/contrib/install_svn.php
deleted file mode 100644 (file)
index f551ef4..0000000
--- a/contrib/install_svn.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-// @DEPRECATED
-?>