ext-validator introduces, several HTML cleanups, fixes for e.g. user email link,...
authorRoland Häder <roland@mxchange.org>
Sun, 14 Feb 2010 02:18:06 +0000 (02:18 +0000)
committerRoland Häder <roland@mxchange.org>
Sun, 14 Feb 2010 02:18:06 +0000 (02:18 +0000)
39 files changed:
.gitattributes
DOCS/TODOs.txt
inc/expression-functions.php
inc/extensions/ext-validator.php [new file with mode: 0644]
inc/language/bonus_de.php
inc/language/order_de.php
inc/language/validator_de.php [new file with mode: 0644]
inc/modules/admin/what-config_bonus.php
inc/modules/admin/what-config_validator.php [new file with mode: 0644]
inc/modules/admin/what-del_email.php
inc/modules/admin/what-list_user.php
templates/de/html/admin/admin_add_bank_package.tpl
templates/de/html/admin/admin_add_cat.tpl
templates/de/html/admin/admin_config_admin.tpl
templates/de/html/admin/admin_config_autopurge.tpl
templates/de/html/admin/admin_config_beg.tpl
templates/de/html/admin/admin_config_birthday.tpl
templates/de/html/admin/admin_config_bonus.tpl
templates/de/html/admin/admin_config_doubler.tpl
templates/de/html/admin/admin_config_extensions.tpl
templates/de/html/admin/admin_config_menu.tpl
templates/de/html/admin/admin_config_order.tpl
templates/de/html/admin/admin_config_other.tpl
templates/de/html/admin/admin_config_refback.tpl
templates/de/html/admin/admin_config_removeip.tpl
templates/de/html/admin/admin_config_secure.tpl
templates/de/html/admin/admin_config_surfbar.tpl
templates/de/html/admin/admin_config_validator.tpl [new file with mode: 0644]
templates/de/html/admin/admin_config_wernis.tpl
templates/de/html/admin/admin_list_networks_row.tpl
templates/de/html/admin/admin_list_sponsor.tpl
templates/de/html/ext/ext_validator.tpl [new file with mode: 0644]
templates/de/html/guest/guest_register.tpl
templates/de/html/index.tpl
templates/de/html/member/member_html_mail_settings.tpl
templates/de/html/member/member_transfer_settings.tpl
templates/de/html/page_footer.tpl
templates/de/html/validator/.htaccess [new file with mode: 0644]
templates/de/html/validator/validator_links.tpl [new file with mode: 0644]

index 8befaa2..d88c5ee 100644 (file)
@@ -183,6 +183,7 @@ inc/extensions/ext-uberwach.php -text
 inc/extensions/ext-update.php -text
 inc/extensions/ext-usage.php -text
 inc/extensions/ext-user.php -text
+inc/extensions/ext-validator.php -text
 inc/extensions/ext-wernis.php -text
 inc/extensions/ext-yoomedia.php -text
 inc/filter-functions.php -text
@@ -259,6 +260,7 @@ inc/language/top10_de.php -text
 inc/language/transfer_de.php -text
 inc/language/usage_de.php -text
 inc/language/user_de.php -text
+inc/language/validator_de.php -text
 inc/language/wernis_de.php -text
 inc/language/yoomedia_de.php -text
 inc/libs/.htaccess -text
@@ -411,6 +413,7 @@ inc/modules/admin/what-config_title.php -text
 inc/modules/admin/what-config_top10.php -text
 inc/modules/admin/what-config_transfer.php -text
 inc/modules/admin/what-config_user.php -text
+inc/modules/admin/what-config_validator.php -text
 inc/modules/admin/what-config_wernis.php -text
 inc/modules/admin/what-config_yoomedia.php -text
 inc/modules/admin/what-del_email.php -text
@@ -977,6 +980,7 @@ templates/de/html/admin/admin_config_title.tpl -text
 templates/de/html/admin/admin_config_top10.tpl -text
 templates/de/html/admin/admin_config_transfer.tpl -text
 templates/de/html/admin/admin_config_user.tpl -text
+templates/de/html/admin/admin_config_validator.tpl -text
 templates/de/html/admin/admin_config_wernis.tpl -text
 templates/de/html/admin/admin_config_yoomedia.tpl -text
 templates/de/html/admin/admin_contct_user_form.tpl -text
@@ -1361,6 +1365,7 @@ templates/de/html/ext/ext_uberwach.tpl -text
 templates/de/html/ext/ext_update.tpl -text
 templates/de/html/ext/ext_usage.tpl -text
 templates/de/html/ext/ext_user.tpl -text
+templates/de/html/ext/ext_validator.tpl -text
 templates/de/html/ext/ext_wernis.tpl -text
 templates/de/html/ext/ext_yoomedia.tpl -text
 templates/de/html/fatal_errors.tpl -text
@@ -1657,6 +1662,8 @@ templates/de/html/theme/theme_select_box.tpl -text
 templates/de/html/theme/theme_select_form.tpl -text
 templates/de/html/uberwach/.htaccess -text
 templates/de/html/uberwach/uberwach_snippet.tpl -text
+templates/de/html/validator/.htaccess -text
+templates/de/html/validator/validator_links.tpl -text
 templates/de/html/welcome.tpl -text
 templates/en/.htaccess -text
 templates/en/emails/.htaccess -text
index 74d16df..e2b612f 100644 (file)
 ./inc/functions.php:1046:      // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
 ./inc/functions.php:2489:              // @TODO Add a little more infos here
 ./inc/functions.php:256:       // @TODO Remove this sanity-check if all is fine
-./inc/functions.php:2571:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
-./inc/functions.php:2594:                      // @TODO Rewrite this old lost code to a template
+./inc/functions.php:2572:                      // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
+./inc/functions.php:2595:                      // @TODO Rewrite this old lost code to a template
 ./inc/functions.php:259:       // @TODO Try to rewrite all $DATA to $content
-./inc/functions.php:2683:                      // @TODO Are these convertions still required?
-./inc/functions.php:2701:// @TODO Rewrite this function to use readFromFile() and writeToFile()
-./inc/functions.php:3580:// @TODO Lame description for this function
-./inc/functions.php:3602:                      // @TODO Move this in a filter
-./inc/functions.php:3726:      // @TODO This is still very static, rewrite it somehow
+./inc/functions.php:2684:                      // @TODO Are these convertions still required?
+./inc/functions.php:2702:// @TODO Rewrite this function to use readFromFile() and writeToFile()
+./inc/functions.php:3581:// @TODO Lame description for this function
+./inc/functions.php:3603:                      // @TODO Move this in a filter
+./inc/functions.php:3727:      // @TODO This is still very static, rewrite it somehow
 ./inc/functions.php:474:       // @TODO Do only use $content, not $DATA or raw variables
 ./inc/functions.php:544:               // @TODO Extension 'msg' does not exist
 ./inc/functions.php:613:// @TODO Rewrite this to an extension 'smtp'
@@ -75,9 +75,9 @@
 ./inc/libs/task_functions.php:53:// @TODO Move all extension-dependent queries into filters
 ./inc/libs/user_functions.php:138:     // @TODO These two constants are no longer used, maybe we reactivate this code?
 ./inc/libs/user_functions.php:225:// @TODO Double-check configuration entry here
-./inc/libs/user_functions.php:314:                     // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
-./inc/libs/user_functions.php:334:                     // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
-./inc/libs/user_functions.php:410:     // @TODO We should try to rewrite this to fetchUserData() somehow
+./inc/libs/user_functions.php:317:                     // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
+./inc/libs/user_functions.php:337:                     // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
+./inc/libs/user_functions.php:413:     // @TODO We should try to rewrite this to fetchUserData() somehow
 ./inc/libs/yoomedia_functions.php:116: $response = YOOMEDIA_QUERY_API('out_textmail.php', true); // @TODO Ask Yoo!Media for test script
 ./inc/load_config.php:77:      // @TODO Rewrite them to avoid this else block
 ./inc/loader/load_cache-extension.php:13: * @TODO Rewrite this whole file to load_cache-extensions.php           *
 ./inc/modules/member/what-bonus.php:57:        // @TODO Rewrite this to a filter
 ./inc/modules/member/what-categories.php:129:          // @TODO Rewrite this to use $OUT .= ...
 ./inc/modules/member/what-doubler.php:56:// @TODO The '*100' is in the way to get moved into the template
-./inc/modules/member/what-order.php:450:                       // @TODO Rewrite this to a filter
+./inc/modules/member/what-order.php:453:                       // @TODO Rewrite this to a filter
 ./inc/modules/member/what-order.php:65:// @TODO Rewrite this to a filter
 ./inc/modules/member/what-payout.php:221:                                      // @TODO Rewrite this to a filter
 ./inc/modules/member/what-points.php:55:// @TODO Should we rewrite this to a filter?
index 65b6984..b1e95c2 100644 (file)
@@ -163,5 +163,26 @@ function doExpressionFilter ($data) {
        return $code;
 }
 
+// Expression call-back function for validator links
+function doExpressionValidatorLinks ($data) {
+       // Default is nothing
+       $replacer = '';
+
+       // Get the code from data array for replacement/pipe-through
+       $code = $data['code'];
+
+       // Should we generally include validator links?
+       if ((isExtensionInstalled('validator')) && (getConfig('enable_validator') == 'Y') && (!in_array(getModule(), array('admin', 'login')))) {
+               // Load the validator template
+               $replacer = escapeQuotes(loadTemplate('validator_links', true));
+       } // END - if
+
+       // Replace the code
+       $code = str_replace($data['matches'][0][$data['key']], $replacer, $code);
+
+       // Return the (maybe) replaced code
+       return $code;
+}
+
 // [EOF]
 ?>
diff --git a/inc/extensions/ext-validator.php b/inc/extensions/ext-validator.php
new file mode 100644 (file)
index 0000000..14de835
--- /dev/null
@@ -0,0 +1,97 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 02/13/2010 *
+ * ===================                          Last change: 02/13/2010 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : ext-validator.php                                *
+ * -------------------------------------------------------------------- *
+ * Short description :                                                  *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  :                                                  *
+ * -------------------------------------------------------------------- *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009)             $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+       die();
+} // END - if
+
+// Version number
+setThisExtensionVersion('0.0');
+
+// Version history array (add more with , '0.1.0' and so on)
+setExtensionVersionHistory(array('0.0'));
+
+switch (getExtensionMode()) {
+       case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
+               // SQL commands to run
+               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `enable_validator` ENUM('Y','N') NOT NULL DEFAULT 'Y'");
+               addAdminMenuSql('setup','config_validator','Validierer','Schalten Sie die Validierer-Links ein, um die G&uuml;ltigkeit Ihres HTML- oder CSS-Codes zu &uuml;berpr&uuml;fen.', 10);
+               break;
+
+       case 'remove': // Do stuff when removing extension
+               // SQL commands to run
+               addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='config_validator' LIMIT 1");
+               break;
+
+       case 'activate': // Do stuff when admin activates this extension
+               // SQL commands to run
+               break;
+
+       case 'deactivate': // Do stuff when admin deactivates this extension
+               // SQL commands to run
+               break;
+
+       case 'update': // Update an extension
+               switch (getCurrentExtensionVersion()) {
+                       case '0.0.1': // SQL queries for v0.0.1
+                               addExtensionSql('');
+
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes('');
+                               break;
+               } // END - switch
+               break;
+
+       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.
+               break;
+
+       case 'init': // Do stuff when extension is initialized
+               break;
+
+       default: // Unknown extension mode
+               logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
+               break;
+} // END - switch
+
+// [EOF]
+?>
index 9033f26..8b45c1b 100644 (file)
@@ -115,7 +115,7 @@ addMessages(array(
        'ADMIN_BONUS_RALLYE_NOTIFTICATIONS' => "Benachrichtigungen per Mail &uuml;ber Bonus-Rallye",
        'ADMIN_BONUS_RALLYE_EN_NOTIFY' => "Sollen die Mitglieder bei Aktivierung benachtichtigt werden?",
        'ADMIN_BONUS_RALLYE_DI_NOTIFY' => "Sollen die Mitglieder bei Deaktivierung benachtichtigt werden?",
-       'ADMIN_BONUS_RALLYE_NOTIFY_POINTS' => "Bonus-Mail mit Anzahl {?POINTS?} aussenden, wenn Bonus-Rallye aktiviert wurde. <div class=\"admin_note\">(0 = Unverg&uuml;tete Benachrichtigung aussenden)</div>",
+       'ADMIN_BONUS_RALLYE_NOTIFY_POINTS' => "Bonus-Mail mit Anzahl {?POINTS?} aussenden, wenn Bonus-Rallye aktiviert wurde. <div class=\"tiny\">(0 = Unverg&uuml;tete Benachrichtigung aussenden)</div>",
        'ADMIN_BONUS_RALLYE_NEW_MEMBER_NOTIFY' => "Sollen neue Mitglieder mit selber Mail &uuml;ber eine laufende Bonus-Rallye benachrichtigt werden?",
        'ADMIN_BONUS_RALLYE_NOTIFY_WAIT' => "Wie lange soll die Wartezeit der Bonus-Mail sein?",
        'ADMIN_BONUS_INCLUDE_OWN' => "Soll Ihre Mitglieder-Id an der Aktiv-Rallye dran teilnehmen?",
index a257194..bb7eb09 100644 (file)
@@ -85,10 +85,10 @@ addMessages(array(
        'MEMBER_AUTOSEND_ACTIVE' => "Der Auto-Versand ist in unserem {?mt_word?} derzeit aktiviert. Ihr Mailbuchung wurde aktiviert und wird bald automatisch versant.",
 
 // Repay deleted mails constants
-       'ADMIN_CFG_REPAY_POINTS_REPAY' => "Dem Mitglied gutschreiben",
+       'ADMIN_CFG_REPAY_POINTS_REPAY' => "Dem Mitglied wieder gutschreiben",
        'ADMIN_CFG_REPAY_POINTS_JACKPOT' => "In den Jackpot legen",
        'ADMIN_CFG_REPAY_POINTS_SHRED' => "Nicht gutschreiben (verf&auml;llt dann)",
-       'ADMIN_REPAY_ON_DELETE_MODE' => "Wie sollen {?POINTS?} von gel&ouml;schten Mails verbucht werden?",
+       'ADMIN_REPAY_ON_DELETE_MODE' => "Wenn Sie eine Mailbuchung l&ouml;schen, wie sollen die ausgegebenen {?POINTS?} gehandhabt werden?",
 
        'ADMIN_TASK_IS_MEMBER_ORDER' => "Mailbuchung vom Mitglied",
        'ADMIN_UNLOCK_EMAIL_LINK' => "Mailbuchung ansehen",
diff --git a/inc/language/validator_de.php b/inc/language/validator_de.php
new file mode 100644 (file)
index 0000000..0705b47
--- /dev/null
@@ -0,0 +1,52 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 02/14/2010 *
+ * ===================                          Last change: 02/14/2010 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : validator_de.php                                 *
+ * -------------------------------------------------------------------- *
+ * Short description : German langugage support                         *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Deutsche Sprachunterstuetzung                    *
+ * -------------------------------------------------------------------- *
+ * $Revision:: 1690                                                   $ *
+ * $Date:: 2010-01-01 17:04:52 +0100 (Fri, 01 Jan 2010)               $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: quix0r                                                   $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+       die();
+} // END - if
+
+// Language definitions
+addMessages(array(
+       'ADMIN_CONFIG_VALIDATOR_TITLE' => "Validierer-Einstellungen",
+       'ADMIN_CONFIG_VALIDATOR_ENABLED' => "Sind unten im Footer die Validierer-Buttons zum direkten Validieren der Seiten eingeblendet?"
+));
+
+//
+?>
index b57ebfa..c05283c 100644 (file)
@@ -98,7 +98,7 @@ if (isFormSent()) {
        foreach ($RANKS as $k => $rate) {
                if (!empty($rate))      {
                        // Print only when something is in
-                       $OUT .= "  <li><input type=\"text\" name=\"rate[".($k + 2)."]\" class=\"admin_normal\" size=\"4\" maxlength=\"7\" value=\"".$rate."\" /> <div class=\"admin_notes\">({?POINTS?})</div?</li>\n";
+                       $OUT .= "  <li><input type=\"text\" name=\"rate[".($k + 2)."]\" class=\"admin_normal\" size=\"4\" maxlength=\"7\" value=\"".$rate."\" /> <div class=\"admin_note\">({?POINTS?})</div></li>\n";
                } // END - if
                $cnt++;
        } // END - foreach
@@ -109,7 +109,7 @@ if (isFormSent()) {
 
        // Add more empty fields
        for ($i = $cnt; $i < $max; $i++) {
-               $OUT .= "  <li><input type=\"text\" name=\"rate[".($i+2)."]\" class=\"admin_normal\" size=\"4\" maxlength=\"7\" /> <div class=\"admin_notes\">({?POINTS?})</div></li>\n";
+               $OUT .= "  <li><input type=\"text\" name=\"rate[".($i+2)."]\" class=\"admin_normal\" size=\"4\" maxlength=\"7\" /> <div class=\"admin_note\">({?POINTS?})</div></li>\n";
        } // END - for
        $OUT .= "</ol>\n";
        $content['trates_list'] = $OUT;
diff --git a/inc/modules/admin/what-config_validator.php b/inc/modules/admin/what-config_validator.php
new file mode 100644 (file)
index 0000000..19c59dc
--- /dev/null
@@ -0,0 +1,68 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 02/14/2010 *
+ * ===================                          Last change: 02/14/2010 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : what-config_validator.php                        *
+ * -------------------------------------------------------------------- *
+ * Short description : Configuration for ext-validator                  *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Konfiguration der Erweiterung ext-validator      *
+ * -------------------------------------------------------------------- *
+ * $Revision:: 1047                                                   $ *
+ * $Date:: 2009-06-08 19:32:34 +0200 (Mon, 08 Jun 2009)               $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: quix0r                                                   $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
+} // END - if
+
+// Add description as navigation point
+addMenuDescription('admin', __FILE__);
+
+if (isFormSent()) {
+       // Save data
+       adminSaveSettingsFromPostData();
+} else {
+       // Prepare content (default)
+       $content['enable_validator_yes'] = ' checked="checked"';
+       $content['enable_validator_no']  = '';
+
+       // Is the configuration is "N"?
+       if (getConfig('enable_validator') == 'N') {
+               // Set them again
+               $content['enable_validator_yes'] = '';
+               $content['enable_validator_no']  = ' checked="checked"';
+       } // END - if
+
+       // Load template
+       loadTemplate('admin_config_validator', false, $content);
+}
+
+// [EOF]
+?>
index 6015adb..e3e3146 100644 (file)
@@ -102,34 +102,32 @@ LIMIT 1",
                        $totalPoints = $links * $price;
 
                        // Shall we pay the points back to the user?
-                       if (getConfig('repay_deleted_mails') != 'SHRED') {
+                       if ($totalPoints == 0) {
+                               // No points repayed!
+                               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_POINTS_REPAYED'));
+                       } elseif (getConfig('repay_deleted_mails') != 'SHRED') {
                                //* DEBUG: */ outputHtml($stats_id.':'.$totalPoints.'/'.$links.'/'.$price."<br />");
-                               if ($totalPoints > 0) {
-                                       // Shall we payback to user or jackpot?
-                                       if (getConfig('repay_deleted_mails') == 'JACKPOT') {
-                                               // Set jackpot
-                                               $sender = '0';
-                                       } // END - if
-
-                                       // Pay back points
-                                       //* DEBUG: */ outputHtml("PAYBACK:".$sender."<br />");
-                                       addPointsThroughReferalSystem('mail_deleted', $sender, $totalPoints, true, 0, false,'direct');
-
-                                       // Output message
-                                       if (getConfig('repay_deleted_mails') == 'REPAY') {
-                                               // Repayed
-                                               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_REPAYED',
-                                                       translateComma($totalPoints)
-                                               ));
-                                       } else {
-                                               // To jackpot
-                                               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_TO_JACKPOT',
-                                                       translateComma($totalPoints)
-                                               ));
-                                       }
+                               // Shall we payback to user or jackpot?
+                               if (getConfig('repay_deleted_mails') == 'JACKPOT') {
+                                       // Set jackpot
+                                       $sender = '0';
+                               } // END - if
+
+                               // Pay back points
+                               //* DEBUG: */ outputHtml("PAYBACK:".$sender."<br />");
+                               addPointsThroughReferalSystem('mail_deleted', $sender, $totalPoints, true, 0, false,'direct');
+
+                               // Output message
+                               if (getConfig('repay_deleted_mails') == 'REPAY') {
+                                       // Repayed
+                                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_REPAYED',
+                                               translateComma($totalPoints)
+                                       ));
                                } else {
-                                       // No points repayed!
-                                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_POINTS_REPAYED'));
+                                       // To jackpot
+                                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_TO_JACKPOT',
+                                               translateComma($totalPoints)
+                                       ));
                                }
                        } else {
                                // Points shredded!
@@ -138,7 +136,7 @@ LIMIT 1",
 
                        // Remove links from DB
                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s",
-                       array(bigintval($stats_id)), __FILE__, __LINE__);
+                               array(bigintval($stats_id)), __FILE__, __LINE__);
                        $cnt += SQL_AFFECTEDROWS();
 
                        // Load template for link
index 80b92fa..4fa3748 100644 (file)
@@ -322,7 +322,7 @@ LIMIT 1",
                        $content['sw']             = $SW;
                        $content['userid_link']    = generateUserProfileLink($content['userid']);
                        $content['gender']         = translateGender($content['gender']);
-                       $content['email']          = '[<a href="' . generateEmailLink($content['email'], 'user_data') . '%}">' . $content['email'] . '</a>]';
+                       $content['email']          = '[<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['email'] . '</a>]';
                        $content['alinks']         = generateMemberAdminActionLinks($content['userid'], $content['status']);
                        $content['points']         = translateComma($content['points']);
                        $content['rate']           = translateComma($content['rate']);
index 07bb718..0324f8f 100644 (file)
@@ -97,8 +97,8 @@
                        {--ADMIN_BANK_PACKAGE_ACTIVE--}
                </td>
                <td class="bottom">
-                       <input type="radio" class="admin_normal" name="package_active" value="Y" checked="checked" /> {--YES--}<br />
-                       <input type="radio" class="admin_normal" name="package_active" value="N" /> {--NO--}
+                       {--YES--}:<input type="radio" class="admin_normal" name="package_active" value="Y" checked="checked" /><br />
+                       {--NO--}:<input type="radio" class="admin_normal" name="package_active" value="N" />
                </td>
        </tr>
        <tr>
index 4281b2c..269476a 100644 (file)
@@ -33,8 +33,8 @@
                        <strong>{--CAT_IS_VISIBLE--}</strong>
                </td>
                <td class="bottom">
-                       {--YES--}: <input type="radio" class="admin_normal" name="visible" value="Y" checked="checked" />
-                       {--NO--}: <input type="radio" class="admin_normal" name="visible" value="N" />
+                       {--YES--}:<input type="radio" class="admin_normal" name="visible" value="Y" checked="checked" />
+                       {--NO--}:<input type="radio" class="admin_normal" name="visible" value="N" />
                </td>
        </tr>
 
index cf91ae5..7ede8d9 100644 (file)
                <td align="right" valign="top" style="padding-top: 3px; padding-right: 20px">
                        {--ADMIN_SELECT_MENU_TYPE--}:
                </td>
-               <td align="center" valign="top" style="padding-top: 3px">
+               <td align="right" valign="top" style="padding-top: 3px">
                        <input type="radio" name="admin_menu" class="admin_normal" value="NEW"$content[admin_menu_new] />
                </td>
                <td>{--ADMIN_MENU_NEW--}</td>
        </tr>
        <tr>
-               <td class="bottom" colspan="2" align="center" valign="top" style="padding-top: 3px">
+               <td class="bottom" colspan="2" align="right" valign="top" style="padding-top: 3px">
                        <input type="radio" name="admin_menu" class="admin_normal" value="OLD"$content[admin_menu_old] />
                </td>
                <td class="bottom">{--ADMIN_MENU_OLD--}</td>
index 1f2d2cc..c6ea0c5 100644 (file)
@@ -57,8 +57,8 @@
        <tr>
                <td align="right">{--ADMIN_OPTION_AUTOPURGE_ACTIVE--}:</td>
                <td>
-                       {--YES--}:&nbsp;<input type="radio" name="auto_purge_active" value="Y"$content[auto_purge_active_y] />
-                       {--NO--}:&nbsp;<input type="radio" name="auto_purge_active" value="N"$content[auto_purge_active_n] />
+                       {--YES--}:<input type="radio" name="auto_purge_active" value="Y"$content[auto_purge_active_y] />
+                       {--NO--}:<input type="radio" name="auto_purge_active" value="N"$content[auto_purge_active_n] />
                </td>
        </tr>
        <tr>
index 2693a34..eba059e 100644 (file)
                </td>
        </tr>
        <tr>
-               <td align="right" height="20">{--ADMIN_BEG_RALLYE_ACTIVE--}</td>
+               <td align="right" height="20">
+                       {--ADMIN_BEG_RALLYE_ACTIVE--}
+               </td>
                <td align="center">
-                       <input type="radio" name="beg_rallye" class="admin_normal" value="Y"$content[rallye_y] /> {--YES--}<br />
-                       <input type="radio" name="beg_rallye" class="admin_normal" value="N"$content[rallye_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="beg_rallye" class="admin_normal" value="Y"$content[rallye_y] /><br />
+                       {--NO--}:<input type="radio" name="beg_rallye" class="admin_normal" value="N"$content[rallye_n] />
                </td>
        </tr>
        <tr>
-               <td align="right" height="20">{--ADMIN_BEG_INCLUDE_OWN--}</td>
+               <td align="right" height="20">
+                       {--ADMIN_BEG_INCLUDE_OWN--}
+               </td>
                <td align="center">
-                       <input type="radio" name="beg_include_own" class="admin_normal" value="Y"$content[include_own_y] /> {--YES--}<br />
-                       <input type="radio" name="beg_include_own" class="admin_normal" value="N"$content[include_own_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="beg_include_own" class="admin_normal" value="Y"$content[include_own_y] /><br />
+                       {--NO--}:<input type="radio" name="beg_include_own" class="admin_normal" value="N"$content[include_own_n] />
                </td>
        </tr>
        <tr>
-               <td align="right" height="20">{--ADMIN_BEG_RANKS--}</td>
+               <td align="right" height="20">
+                       {--ADMIN_BEG_RANKS--}
+               </td>
                <td align="center">
                        <input type="text" name="beg_ranks" class="admin_normal" size="3" maxlength="7" value="{?beg_ranks?}" />
                </td>
                        {--ADMIN_BEG_RALLYE_ONLY_ACTIVE--}
                </td>
                <td align="center">
-                       <input type="radio" name="beg_active" class="admin_normal" value="Y"$content[active_y] /> {--YES--}<br />
-                       <input type="radio" name="beg_active" class="admin_normal" value="N"$content[active_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="beg_active" class="admin_normal" value="Y"$content[active_y] /><br />
+                       {--NO--}:<input type="radio" name="beg_active" class="admin_normal" value="N"$content[active_n] />
                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>
-               <td align="right" height="20">{--ADMIN_BEG_RAL_EN_NOTIFY--}</td>
+               <td align="right" height="20">
+                       {--ADMIN_BEG_RAL_EN_NOTIFY--}
+               </td>
                <td align="center">
-                       <input type="radio" name="beg_ral_en_notify" class="admin_normal" value="Y"$content[ral_enable_notify_y] /> {--YES--}<br />
-                       <input type="radio" name="beg_ral_en_notify" class="admin_normal" value="N"$content[ral_enable_notify_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="beg_ral_en_notify" class="admin_normal" value="Y"$content[ral_enable_notify_y] /><br />
+                       {--NO--}:<input type="radio" name="beg_ral_en_notify" class="admin_normal" value="N"$content[ral_enable_notify_n] />
                </td>
        </tr>
        <tr>
-               <td align="right" height="20">{--ADMIN_BEG_RAL_DI_NOTIFY--}</td>
+               <td align="right" height="20">
+                       {--ADMIN_BEG_RAL_DI_NOTIFY--}
+               </td>
                <td align="center">
-                       <input type="radio" name="beg_ral_di_notify" class="admin_normal" value="Y"$content[ral_disable_notify_y] /> {--YES--}<br />
-                       <input type="radio" name="beg_ral_di_notify" class="admin_normal" value="N"$content[ral_disable_notify_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="beg_ral_di_notify" class="admin_normal" value="Y"$content[ral_disable_notify_y] /><br />
+                       {--NO--}:<input type="radio" name="beg_ral_di_notify" class="admin_normal" value="N"$content[ral_disable_notify_n] />
                </td>
        </tr>
        <tr>
-               <td align="right" height="20">{--ADMIN_BEG_NEW_MEMBER_NOTIFY--}</td>
+               <td align="right" height="20">
+                       {--ADMIN_BEG_NEW_MEMBER_NOTIFY--}
+               </td>
                <td align="center">
-                       <input type="radio" name="beg_new_mem_notify" class="admin_normal" value="Y"$content[new_member_notify_y] /> {--YES--}<br />
-                       <input type="radio" name="beg_new_mem_notify" class="admin_normal" value="N"$content[new_member_notify_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="beg_new_mem_notify" class="admin_normal" value="Y"$content[new_member_notify_y] /><br />
+                       {--NO--}:<input type="radio" name="beg_new_mem_notify" class="admin_normal" value="N"$content[new_member_notify_n] />
                </td>
        </tr>
        <tr>
-               <td align="right" height="20">{--ADMIN_BEG_NOTIFY_BONUS--}</td>
+               <td align="right" height="20">
+                       {--ADMIN_BEG_NOTIFY_BONUS--}
+               </td>
                <td align="center">
                        <input type="text" name="beg_notify_bonus" class="admin_normal" size="3" maxlength="7" value="$content[notify_bonus]" />
                </td>
        </tr>
        <tr>
-               <td align="right" height="20">{--ADMIN_BEG_NOTIFY_WAIT--}</td>
-               <td align="center">$content[wait_selection]</td>
+               <td align="right" height="20">
+                       {--ADMIN_BEG_NOTIFY_WAIT--}
+               </td>
+               <td align="center">
+                       $content[wait_selection]
+               </td>
        </tr>
        <tr>
                <td colspan="2" class="admin_footer">
index ab84934..03d08c2 100644 (file)
@@ -19,8 +19,8 @@
        <tr>
                <td align="right">{--ADMIN_BIRTHDAY_ONLY_ACTIVE--}</td>
                <td align="center">
-                       <input type="radio" name="birthday_active" class="admin_normal" value="Y"$content[active_y] /> {--YES--}<br />
-                       <input type="radio" name="birthday_active" class="admin_normal" value="N"$content[active_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="birthday_active" class="admin_normal" value="Y"$content[active_y] /><br />
+                       {--NO--}:<input type="radio" name="birthday_active" class="admin_normal" value="N"$content[active_n] />
                </td>
        </tr>
        <tr>
index b894354..a47ad92 100644 (file)
@@ -7,12 +7,12 @@
                </td>
        </tr>
        <tr>
-               <td align="right">
+               <td class="bottom" align="right">
                        {--ADMIN_BONUS_RALLYE_IS_ACTIVE--}
                </td>
-               <td align="center">
-                       <input type="radio" name="bonus_active" class="admin_normal" value="Y"$content[active_y] /> {--YES--}<br />
-                       <input type="radio" name="bonus_active" class="admin_normal" value="N"$content[active_n] /> {--NO--}
+               <td class="bottom" align="center">
+                       {--YES--}:<input type="radio" name="bonus_active" class="admin_normal" value="Y"$content[active_y] /><br />
+                       {--NO--}:<input type="radio" name="bonus_active" class="admin_normal" value="N"$content[active_n] />
                </td>
        </tr>
        <tr>
@@ -20,8 +20,8 @@
                        {--ADMIN_BONUS_INCLUDE_OWN--}
                </td>
                <td class="bottom" align="center">
-                       <input type="radio" name="bonus_include_own" class="admin_normal" value="Y"$content[include_own_y] /> {--YES--}<br />
-                       <input type="radio" name="bonus_include_own" class="admin_normal" value="N"$content[include_own_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="bonus_include_own" class="admin_normal" value="Y"$content[include_own_y] /><br />
+                       {--NO--}:<input type="radio" name="bonus_include_own" class="admin_normal" value="N"$content[include_own_n] />
                </td>
        </tr>
        <tr>
@@ -29,8 +29,8 @@
                        {--ADMIN_BONUS_RALLYE_CLICK_INCLUDE--}
                </td>
                <td class="bottom" align="center">
-                       <input type="radio" name="bonus_click_yn" class="admin_normal" value="Y"$content[click_yn_y] /> {--YES--}<br />
-                       <input type="radio" name="bonus_click_yn" class="admin_normal" value="N"$content[click_yn_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="bonus_click_yn" class="admin_normal" value="Y"$content[click_yn_y] /><br />
+                       {--NO--}:<input type="radio" name="bonus_click_yn" class="admin_normal" value="N"$content[click_yn_n] />
                </td>
        </tr>
        <tr>
@@ -38,8 +38,8 @@
                        {--ADMIN_BONUS_RALLYE_LOGIN_INCLUDE--}
                </td>
                <td class="bottom" align="center">
-                       <input type="radio" name="bonus_login_yn" class="admin_normal" value="Y"$content[login_yn_y] /> {--YES--}<br />
-                       <input type="radio" name="bonus_login_yn" class="admin_normal" value="N"$content[login_yn_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="bonus_login_yn" class="admin_normal" value="Y"$content[login_yn_y] /><br />
+                       {--NO--}:<input type="radio" name="bonus_login_yn" class="admin_normal" value="N"$content[login_yn_n] />
                </td>
        </tr>
        <tr>
@@ -47,8 +47,8 @@
                        {--ADMIN_BONUS_RALLYE_ORDER_INCLUDE--}
                </td>
                <td class="bottom" align="center">
-                       <input type="radio" name="bonus_order_yn" class="admin_normal" value="Y"$content[order_yn_y] /> {--YES--}<br />
-                       <input type="radio" name="bonus_order_yn" class="admin_normal" value="N"$content[order_yn_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="bonus_order_yn" class="admin_normal" value="Y"$content[order_yn_y] /><br />
+                       {--NO--}:<input type="radio" name="bonus_order_yn" class="admin_normal" value="N"$content[order_yn_n] />
                </td>
        </tr>
        <tr>
@@ -56,8 +56,8 @@
                        {--ADMIN_BONUS_RALLYE_STATS_INCLUDE--}
                </td>
                <td class="bottom" align="center">
-                       <input type="radio" name="bonus_stats_yn" class="admin_normal" value="Y"$content[stats_yn_y] /> {--YES--}<br />
-                       <input type="radio" name="bonus_stats_yn" class="admin_normal" value="N"$content[stats_yn_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="bonus_stats_yn" class="admin_normal" value="Y"$content[stats_yn_y] /><br />
+                       {--NO--}:<input type="radio" name="bonus_stats_yn" class="admin_normal" value="N"$content[stats_yn_n] />
                </td>
        </tr>
        <tr>
@@ -65,8 +65,8 @@
                        {--ADMIN_BONUS_RALLYE_REF_INCLUDE--}
                </td>
                <td class="bottom" align="center">
-                       <input type="radio" name="bonus_ref_yn" class="admin_normal" value="Y"$content[ref_yn_y] /> {--YES--}<br />
-                       <input type="radio" name="bonus_ref_yn" class="admin_normal" value="N"$content[ref_yn_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="bonus_ref_yn" class="admin_normal" value="Y"$content[ref_yn_y] /><br />
+                       {--NO--}:<input type="radio" name="bonus_ref_yn" class="admin_normal" value="N"$content[ref_yn_n] />
                </td>
        </tr>
        <tr>
                        {--ADMIN_BONUS_RALLYE_EN_NOTIFY--}
                </td>
                <td align="center">
-                       <input type="radio" name="bonus_en_notify" class="admin_normal" value="Y"$content[en_notify_y] /> {--YES--}<br />
-                       <input type="radio" name="bonus_en_notify" class="admin_normal" value="N"$content[en_notify_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="bonus_en_notify" class="admin_normal" value="Y"$content[en_notify_y] /><br />
+                       {--NO--}:<input type="radio" name="bonus_en_notify" class="admin_normal" value="N"$content[en_notify_n] />
                </td>
        </tr>
        <tr>
                        {--ADMIN_BONUS_RALLYE_DI_NOTIFY--}
                </td>
                <td align="center">
-                       <input type="radio" name="bonus_di_notify" class="admin_normal" value="Y"$content[di_notify_y] /> {--YES--}<br />
-                       <input type="radio" name="bonus_di_notify" class="admin_normal" value="N"$content[di_notify_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="bonus_di_notify" class="admin_normal" value="Y"$content[di_notify_y] /><br />
+                       {--NO--}:<input type="radio" name="bonus_di_notify" class="admin_normal" value="N"$content[di_notify_n] />
                </td>
        </tr>
        <tr>
                        {--ADMIN_BONUS_RALLYE_NEW_MEMBER_NOTIFY--}
                </td>
                <td align="center">
-                       <input type="radio" name="bonus_new_mem_notify" class="admin_normal" value="Y"$content[new_mem_notify_y] /> {--YES--}<br />
-                       <input type="radio" name="bonus_new_mem_notify" class="admin_normal" value="N"$content[new_mem_notify_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="bonus_new_mem_notify" class="admin_normal" value="Y"$content[new_mem_notify_y] /><br />
+                       {--NO--}:<input type="radio" name="bonus_new_mem_notify" class="admin_normal" value="N"$content[new_mem_notify_n] />
                </td>
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_BONUS_RALLYE_NOTIFY_POINTS--}:
+                       {--ADMIN_BONUS_RALLYE_NOTIFY_POINTS--}
                </td>
                <td align="center">
                        <input type="text" name="bonus_notify_points" class="admin_normal" size="8" maxlength="20" value="$content[notify]" />
        </tr>
        <tr>
                <td class="bottom" align="right">
-                       {--ADMIN_BONUS_RALLYE_NOTIFY_WAIT--}:
+                       {--ADMIN_BONUS_RALLYE_NOTIFY_WAIT--}
                </td>
                <td class="bottom" align="center">
                        $content[wait_selection]
index 476736e..b202720 100644 (file)
        <tr>
                <td align="right" height="20">{--ADMIN_DOUBLER_SENT_ALL--}:</td>
                <td style="padding-left: 5px">
-                       <input type="radio" name="doubler_sent_all" class="admin_normal" value="Y"$content[sent_all_y] /> {--YES--}<br />
-                       <input type="radio" name="doubler_sent_all" class="admin_normal" value="N"$content[sent_all_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="doubler_sent_all" class="admin_normal" value="Y"$content[sent_all_y] /><br />
+                       {--NO--}:<input type="radio" name="doubler_sent_all" class="admin_normal" value="N"$content[sent_all_n] />
                </td>
        </tr>
        <tr>
-               <td align="right" height="20">{--ADMIN_DOUBLER_JACKPOT--}:</td>
+               <td align="right" height="20">
+                       {--ADMIN_DOUBLER_JACKPOT--}:
+               </td>
                <td style="padding-left: 5px">
-                       <input type="radio" name="doubler_jackpot" class="admin_normal" value="Y"$content[jackpot_y] /> {--YES--}<br />
-                       <input type="radio" name="doubler_jackpot" class="admin_normal" value="N"$content[jackpot_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="doubler_jackpot" class="admin_normal" value="Y"$content[jackpot_y] /><br />
+                       {--NO--}:<input type="radio" name="doubler_jackpot" class="admin_normal" value="N"$content[jackpot_n] />
                </td>
        </tr>
        <tr>
-               <td align="right" height="20">{--ADMIN_DOUBLER_OWN--}:</td>
+               <td align="right" height="20">
+                       {--ADMIN_DOUBLER_OWN--}:
+               </td>
                <td style="padding-left: 5px">
-                       <input type="radio" name="doubler_own" class="admin_normal" value="Y"$content[own_y] /> {--YES--}<br />
-                       <input type="radio" name="doubler_own" class="admin_normal" value="N"$content[own_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="doubler_own" class="admin_normal" value="Y"$content[own_y] /><br />
+                       {--NO--}:<input type="radio" name="doubler_own" class="admin_normal" value="N"$content[own_n] />
                </td>
        </tr>
        <tr>
-               <td align="right" height="20">{--ADMIN_DOUBLER_TIMEOUT--}:</td>
+               <td align="right" height="20">
+                       {--ADMIN_DOUBLER_TIMEOUT--}:
+               </td>
                <td style="padding-left: 5px" align="left">
                        $content[timeout_selection]
                </td>
        </tr>
        <tr>
-               <td align="right" height="20">{--ADMIN_DOUBLER_USERID--}:</td>
+               <td align="right" height="20">
+                       {--ADMIN_DOUBLER_USERID--}:
+               </td>
                <td style="padding-left: 5px">
                        $content[member_selection]
                </td>
                <td align="center" height="20" valign="top">
                        {--ADMIN_DOUBLER_SEND_DIRECT--}
                </td>
-               <td align="center" valign="top">{--ADMIN_DOUBLER_SEND_RESET--}</td>
+               <td align="center" valign="top">
+                       {--ADMIN_DOUBLER_SEND_RESET--}
+               </td>
        </tr>
        <tr>
                <td align="center" height="20">
index e340434..7f4bbb0 100644 (file)
@@ -11,8 +11,8 @@
                        {--ADMIN_VERBOSE_SQL--}:
                </td>
                <td class="bottom" width="150" align="right">
-                       <input type="radio" name="verbose_sql" value="Y" class="admin_normal"$content[verbose_y] /> {--YES--}
-                       <input type="radio" name="verbose_sql" value="N" class="admin_normal"$content[verbose_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="verbose_sql" value="Y" class="admin_normal"$content[verbose_y] /><br />
+                       {--NO--}:<input type="radio" name="verbose_sql" value="N" class="admin_normal"$content[verbose_n] />
                </td>
        </tr>
        <tr>
index 76f8212..5efd8c9 100644 (file)
@@ -11,8 +11,8 @@
                        {--ADMIN_CONFIG_GUEST_MENU_ADVERT_ENABLED--}
                </td>
                <td width="20%">
-                       <input type="radio" name="guest_menu_advert_enabled" value="Y"$content[guest_menu_advert_enabled_y] /> {--YES--}<br />
-                       <input type="radio" name="guest_menu_advert_enabled" value="N"$content[guest_menu_advert_enabled_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="guest_menu_advert_enabled" value="Y"$content[guest_menu_advert_enabled_y] /><br />
+                       {--NO--}:<input type="radio" name="guest_menu_advert_enabled" value="N"$content[guest_menu_advert_enabled_n] />
                </td>
        </tr>
        <tr>
@@ -20,8 +20,8 @@
                        {--ADMIN_CONFIG_MEMBER_MENU_ADVERT_ENABLED--}
                </td>
                <td class="bottom" width="20%">
-                       <input type="radio" name="member_menu_advert_enabled" value="Y"$content[member_menu_advert_enabled_y] /> {--YES--}<br />
-                       <input type="radio" name="member_menu_advert_enabled" value="N"$content[member_menu_advert_enabled_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="member_menu_advert_enabled" value="Y"$content[member_menu_advert_enabled_y] /><br />
+                       {--NO--}:<input type="radio" name="member_menu_advert_enabled" value="N"$content[member_menu_advert_enabled_n] />
                </td>
        </tr>
        <tr>
index 5875a02..368c309 100644 (file)
 
        <tr>
                <td class="bottom" align="center">
-                       {--ADMIN_ORDER_MAX--}: <input type="radio" name="order_max_full" class="admin_normal" value="MAX"$content[order_max_full_max] />
+                       {--ADMIN_ORDER_MAX--}<br />
+                       <input type="radio" name="order_max_full" class="admin_normal" value="MAX"$content[order_max_full_max] />
                </td>
                <td class="bottom" align="center">
-                       {--ADMIN_ORDER_ORDER--}: <input type="radio" name="order_max_full" class="admin_normal" value="ORDER"$content[order_max_full_order] />
+                       {--ADMIN_ORDER_ORDER--}<br />
+                       <input type="radio" name="order_max_full" class="admin_normal" value="ORDER"$content[order_max_full_order] />
                </td>
        </tr>
 
        <tr>
-               <td align="right" width="340">{--ADMIN_OPTION_MAX_UNCONFIRMED_MAILS--}:</td>
+               <td align="right" width="340">
+                       {--ADMIN_OPTION_MAX_UNCONFIRMED_MAILS--}:
+               </td>
                <td width="160">
                        <input type="text" name="unconfirmed" class="admin_normal" size="10" maxlength="10" value="{?unconfirmed?}" />
                </td>
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_MAX_TEXT_LENGTH--}:</td>
+               <td align="right">
+                       {--ADMIN_OPTION_MAX_TEXT_LENGTH--}:
+               </td>
                <td>
                        <input type="text" name="max_tlength" class="admin_normal" size="10" maxlength="100" value="{?max_tlength?}" />
                </td>
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_CHECK_EMAIL_TEXT--}:</td>
+               <td align="right">
+                       {--ADMIN_OPTION_CHECK_EMAIL_TEXT--}
+               </td>
                <td>
-                       {--YES--}: <input type="radio" name="allow_url_in_text" value="Y"$content[allow_url_in_text_y] />
-                       {--NO--}: <input type="radio" name="allow_url_in_text" value="N"$content[allow_url_in_text_n] />
+                       {--YES--}:<input type="radio" name="allow_url_in_text" value="Y"$content[allow_url_in_text_y] />
+                       {--NO--}:<input type="radio" name="allow_url_in_text" value="N"$content[allow_url_in_text_n] />
                </td>
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_CHECK_EMAIL_SUBJ--}:</td>
+               <td align="right">
+                       {--ADMIN_OPTION_CHECK_EMAIL_SUBJ--}
+               </td>
                <td>
-                       {--YES--}: <input type="radio" name="allow_url_in_subject" value="Y"$content[allow_url_in_subject_y] />
-                       {--NO--}: <input type="radio" name="allow_url_in_subject" value="N"$content[allow_url_in_subject_n] />
+                       {--YES--}:<input type="radio" name="allow_url_in_subject" value="Y"$content[allow_url_in_subject_y] />
+                       {--NO--}:<input type="radio" name="allow_url_in_subject" value="N"$content[allow_url_in_subject_n] />
                </td>
        </tr>
 
        <tr>
-               <td align="right">{--ADMIN_OPTION_URL_BLACKLIST--}:</td>
+               <td align="right">
+                       {--ADMIN_OPTION_URL_BLACKLIST--}
+               </td>
                <td>
-                       {--YES--}: <input type="radio" name="url_blacklist" value="Y"$content[url_blacklist_y] />
-                       {--NO--}: <input type="radio" name="url_blacklist" value="N"$content[url_blacklist_n] />
+                       {--YES--}:<input type="radio" name="url_blacklist" value="Y"$content[url_blacklist_y] />
+                       {--NO--}:<input type="radio" name="url_blacklist" value="N"$content[url_blacklist_n] />
                </td>
        </tr>
 
index 18d76a7..3901907 100644 (file)
        <tr>
                <td align="right">{--ADMIN_OPTION_SHOW_TIMINGS--}:</td>
                <td>
-                       <input type="radio" name="show_timings" value="Y"$content[show_timings_y] /> {--YES--}<br />
-                       <input type="radio" name="show_timings" value="N"$content[show_timings_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="show_timings" value="Y"$content[show_timings_y] /><br />
+                       {--NO--}:<input type="radio" name="show_timings" value="N"$content[show_timings_n] />
                </td>
        </tr>
 
        <tr>
                <td align="right">{--ADMIN_OPTION_SHOW_POINTS_UNCONFIRMED--}:</td>
                <td>
-                       <input type="radio" name="show_points_unconfirmed" value="Y"$content[show_points_unconfirmed_y] /> {--YES--}<br />
-                       <input type="radio" name="show_points_unconfirmed" value="N"$content[show_points_unconfirmed_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="show_points_unconfirmed" value="Y"$content[show_points_unconfirmed_y] /><br />
+                       {--NO--}:<input type="radio" name="show_points_unconfirmed" value="N"$content[show_points_unconfirmed_n] />
                </td>
        </tr>
 
        <tr>
                <td align="right">{--ADMIN_OPTION_ZIPCODE_ACTIVE--}:</td>
                <td align="center">
-                       {--YES--}:&nbsp;<input type="radio" name="order_multi_page" value="Y"$content[order_multi_page_y] />
-                       {--NO--}:&nbsp;<input type="radio" name="order_multi_page" value="N"$content[order_multi_page_n] />
+                       {--YES--}:<input type="radio" name="order_multi_page" value="Y"$content[order_multi_page_y] />
+                       {--NO--}:<input type="radio" name="order_multi_page" value="N"$content[order_multi_page_n] />
                </td>
        </tr>
 
        <tr>
                <td class="bottom" align="right">{--ADMIN_OPTION_AUTOSEND_ACTIVE--}:</td>
                <td class="bottom" align="center">
-                       {--YES--}: <input type="radio" name="autosend_active" value="Y"$content[autosend_active_y] />
-                       {--NO--}: <input type="radio" name="autosend_active" value="N"$content[autosend_active_n] />
+                       {--YES--}:<input type="radio" name="autosend_active" value="Y"$content[autosend_active_y] />
+                       {--NO--}:<input type="radio" name="autosend_active" value="N"$content[autosend_active_n] />
                </td>
        </tr>
 
        <tr>
                <td align="right">{--ADMIN_OPTION_SEND_UPDATE--}:</td>
                <td align="center">
-                       {--YES--}: <input type="radio" name="send_prof_update" value="Y"$content[send_prof_update_y] />
-                       {--NO--}: <input type="radio" name="send_prof_update" value="N"$content[send_prof_update_n] />
+                       {--YES--}:<input type="radio" name="send_prof_update" value="Y"$content[send_prof_update_y] />
+                       {--NO--}:<input type="radio" name="send_prof_update" value="N"$content[send_prof_update_n] />
                </td>
        </tr>
 
        <tr>
                <td class="bottom" align="right">{--ADMIN_OPTION_NOTIFY_ADMIN--}:</td>
                <td class="bottom" align="center">
-                       {--YES--}: <input type="radio" name="admin_notify" value="Y"$content[admin_notify_y] />
-                       {--NO--}: <input type="radio" name="admin_notify" value="N"$content[admin_notify_n] />
+                       {--YES--}:<input type="radio" name="admin_notify" value="Y"$content[admin_notify_y] />
+                       {--NO--}:<input type="radio" name="admin_notify" value="N"$content[admin_notify_n] />
                </td>
        </tr>
 
        <tr>
                <td class="bottom" align="right">{--ADMIN_DISPLAY_DEBUG_SQLS--}:</td>
                <td class="bottom" align="center">
-                       {--YES--}:&nbsp;<input type="radio" name="display_debug_sqls" value="Y"$content[display_debug_sqls_y] />
-                       {--NO--}:&nbsp;<input type="radio" name="display_debug_sqls" value="N"$content[display_debug_sqls_n] />
+                       {--YES--}:<input type="radio" name="display_debug_sqls" value="Y"$content[display_debug_sqls_y] />
+                       {--NO--}:<input type="radio" name="display_debug_sqls" value="N"$content[display_debug_sqls_n] />
                </td>
        </tr>
 
index a2babb9..ad30e49 100644 (file)
@@ -11,8 +11,8 @@
                        {--ADMIN_CONFIG_REFBACK_ENABLED--}
                </td>
                <td>
-                       <input type="radio" name="refback_enabled" value="Y"$content[refback_enabled_y] /> {--YES--}<br />
-                       <input type="radio" name="refback_enabled" value="N"$content[refback_enabled_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="refback_enabled" value="Y"$content[refback_enabled_y] /><br />
+                       {--NO--}:<input type="radio" name="refback_enabled" value="N"$content[refback_enabled_n] />
                </td>
        </tr>
        <tr>
index 833b260..937a5bb 100644 (file)
@@ -11,8 +11,8 @@
                {--ADMIN_CONFIG_REMOVEIP_ANON_IP--}
        </td>
        <td width="150" style="padding-left: 10px">
-               <input type="radio" name="removeip_anon_ip" value="Y" class="admin_normal"$content[removeip_anon_ip_y] /> {--YES--}&nbsp;
-               <input type="radio" name="removeip_anon_ip" value="N" class="admin_normal"$content[removeip_anon_ip_n] /> {--NO--}
+               {--YES--}:<input type="radio" name="removeip_anon_ip" value="Y" class="admin_normal"$content[removeip_anon_ip_y] /><br />
+               {--NO--}:<input type="radio" name="removeip_anon_ip" value="N" class="admin_normal"$content[removeip_anon_ip_n] />
        </td>
 </tr>
 <tr>
@@ -20,8 +20,8 @@
                {--ADMIN_CONFIG_REMOVEIP_ANON_HOST--}
        </td>
        <td width="150" style="padding-left: 10px">
-               <input type="radio" name="removeip_anon_host" value="Y" class="admin_normal"$content[removeip_anon_host_y] /> {--YES--}&nbsp;
-               <input type="radio" name="removeip_anon_host" value="N" class="admin_normal"$content[removeip_anon_host_n] /> {--NO--}
+               {--YES--}:<input type="radio" name="removeip_anon_host" value="Y" class="admin_normal"$content[removeip_anon_host_y] />
+               {--NO--}:<input type="radio" name="removeip_anon_host" value="N" class="admin_normal"$content[removeip_anon_host_n] />
        </td>
 </tr>
 <tr>
@@ -29,8 +29,8 @@
                {--ADMIN_CONFIG_REMOVEIP_ANON_UA--}
        </td>
        <td width="150" style="padding-left: 10px">
-               <input type="radio" name="removeip_anon_ua" value="Y" class="admin_normal"$content[removeip_anon_ua_y] /> {--YES--}&nbsp;
-               <input type="radio" name="removeip_anon_ua" value="N" class="admin_normal"$content[removeip_anon_ua_n] /> {--NO--}
+               {--YES--}:<input type="radio" name="removeip_anon_ua" value="Y" class="admin_normal"$content[removeip_anon_ua_y] />
+               {--NO--}:<input type="radio" name="removeip_anon_ua" value="N" class="admin_normal"$content[removeip_anon_ua_n] />
        </td>
 </tr>
 <tr>
@@ -38,8 +38,8 @@
                {--ADMIN_CONFIG_REMOVEIP_ANON_REF--}
        </td>
        <td width="150" style="padding-left: 10px">
-               <input type="radio" name="removeip_anon_ref" value="Y" class="admin_normal"$content[removeip_anon_ref_y] /> {--YES--}&nbsp;
-               <input type="radio" name="removeip_anon_ref" value="N" class="admin_normal"$content[removeip_anon_ref_n] /> {--NO--}
+               {--YES--}:<input type="radio" name="removeip_anon_ref" value="Y" class="admin_normal"$content[removeip_anon_ref_y] />
+               {--NO--}:<input type="radio" name="removeip_anon_ref" value="N" class="admin_normal"$content[removeip_anon_ref_n] />
        </td>
 </tr>
 <tr>
@@ -59,8 +59,8 @@
                {--ADMIN_CONFIG_REMOVEIP_ADMIN_SHOW--}
        </td>
        <td width="150" style="padding-left: 10px">
-               <input type="radio" name="removeip_admin_show" value="Y" class="admin_normal"$content[removeip_admin_show_y] /> {--YES--}&nbsp;
-               <input type="radio" name="removeip_admin_show" value="N" class="admin_normal"$content[removeip_admin_show_n] /> {--NO--}
+               {--YES--}:<input type="radio" name="removeip_admin_show" value="Y" class="admin_normal"$content[removeip_admin_show_y] /><br />
+               {--NO--}:<input type="radio" name="removeip_admin_show" value="N" class="admin_normal"$content[removeip_admin_show_n] />
        </td>
 </tr>
 <tr>
@@ -68,8 +68,8 @@
                {--ADMIN_CONFIG_REMOVEIP_GUEST_SHOW--}
        </td>
        <td width="150" style="padding-left: 10px">
-               <input type="radio" name="removeip_guest_show" value="Y" class="admin_normal"$content[removeip_guest_show_y] /> {--YES--}&nbsp;
-               <input type="radio" name="removeip_guest_show" value="N" class="admin_normal"$content[removeip_guest_show_n] /> {--NO--}
+               {--YES--}:<input type="radio" name="removeip_guest_show" value="Y" class="admin_normal"$content[removeip_guest_show_y] /><br />
+               {--NO--}:<input type="radio" name="removeip_guest_show" value="N" class="admin_normal"$content[removeip_guest_show_n] />
        </td>
 </tr>
 <tr>
@@ -77,8 +77,8 @@
                {--ADMIN_CONFIG_REMOVEIP_MEMBER_SHOW--}
        </td>
        <td width="150" style="padding-left: 10px">
-               <input type="radio" name="removeip_member_show" value="Y" class="admin_normal"$content[removeip_member_show_y] /> {--YES--}&nbsp;
-               <input type="radio" name="removeip_member_show" value="N" class="admin_normal"$content[removeip_member_show_n] /> {--NO--}
+               {--YES--}:<input type="radio" name="removeip_member_show" value="Y" class="admin_normal"$content[removeip_member_show_y] /><br />
+               {--NO--}:<input type="radio" name="removeip_member_show" value="N" class="admin_normal"$content[removeip_member_show_n] />
        </td>
 </tr>
 <tr>
@@ -86,8 +86,8 @@
                {--ADMIN_CONFIG_REMOVEIP_SPONSOR_SHOW--}
        </td>
        <td class="bottom" width="150" style="padding-left: 10px">
-               <input type="radio" name="removeip_sponsor_show" value="Y" class="admin_normal"$content[removeip_sponsor_show_y] /> {--YES--}&nbsp;
-               <input type="radio" name="removeip_sponsor_show" value="N" class="admin_normal"$content[removeip_sponsor_show_n] /> {--NO--}
+               {--YES--}:<input type="radio" name="removeip_sponsor_show" value="Y" class="admin_normal"$content[removeip_sponsor_show_y] /><br />
+               {--NO--}:<input type="radio" name="removeip_sponsor_show" value="N" class="admin_normal"$content[removeip_sponsor_show_n] />
        </td>
 </tr>
 <tr>
index 93a6f0d..b65d25d 100644 (file)
@@ -7,13 +7,17 @@
                </td>
        </tr>
        <tr>
-               <td align="right" width="280">{--MIN_PASS_LENGTH--}:</td>
+               <td align="right" width="380">
+                       {--MIN_PASS_LENGTH--}:
+               </td>
                <td>
                        <input type="text" name="pass_len" class="admin_normal" size="3" maxlength="3" value="{?pass_len?}" />
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right" width="280">{--ADMIN_SALT_LENGTH--}:</td>
+               <td class="bottom" align="right" width="380">
+                       {--ADMIN_SALT_LENGTH--}:
+               </td>
                <td class="bottom">
                        <input type="text" name="salt_length" class="admin_normal" size="3" maxlength="3" value="{?salt_length?}" />
                </td>
index d36fffb..bf115b1 100644 (file)
                        {--ADMIN_CONFIG_SURFBAR_AUTOSTART--}
                </td>
                <td class="bottom" align="center">
-                       <input type="radio" name="surfbar_autostart" value="Y"$content[surfbar_autostart_y] /> {--YES--}
-                       <input type="radio" name="surfbar_autostart" value="N"$content[surfbar_autostart_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="surfbar_autostart" value="Y"$content[surfbar_autostart_y] /><br />
+                       {--NO--}:<input type="radio" name="surfbar_autostart" value="N"$content[surfbar_autostart_n] />
                </td>
        </tr>
        <tr>
                        {--ADMIN_CONFIG_SURFBAR_NOTIFY_LIMITS--}
                </td>
                <td class="bottom" align="center">
-                       <input type="radio" name="surfbar_notify_limits" value="Y"$content[surfbar_notify_limits_y] /> {--YES--}
-                       <input type="radio" name="surfbar_notify_limits" value="N"$content[surfbar_notify_limits_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="surfbar_notify_limits" value="Y"$content[surfbar_notify_limits_y] /><br />
+                       {--NO--}:<input type="radio" name="surfbar_notify_limits" value="N"$content[surfbar_notify_limits_n] />
                </td>
        </tr>
        <tr>
                        {--ADMIN_CONFIG_SURFBAR_NOTIFY_ADMIN_UNLOCK--}
                </td>
                <td class="bottom" align="center">
-                       <input type="radio" name="surfbar_notify_admin_unlock" value="Y"$content[surfbar_notify_admin_unlock_y] /> {--YES--}
-                       <input type="radio" name="surfbar_notify_admin_unlock" value="N"$content[surfbar_notify_admin_unlock_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="surfbar_notify_admin_unlock" value="Y"$content[surfbar_notify_admin_unlock_y] /><br />
+                       {--NO--}:<input type="radio" name="surfbar_notify_admin_unlock" value="N"$content[surfbar_notify_admin_unlock_n] />
                </td>
        </tr>
        <tr>
                        {--ADMIN_CONFIG_SURFBAR_MIGRATE_ORDER--}
                </td>
                <td class="bottom" align="center">
-                       <input type="radio" name="surfbar_migrate_order" value="Y"$content[surfbar_migrate_order_y] /> {--YES--}
-                       <input type="radio" name="surfbar_migrate_order" value="N"$content[surfbar_migrate_order_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="surfbar_migrate_order" value="Y"$content[surfbar_migrate_order_y] /><br />
+                       {--NO--}:<input type="radio" name="surfbar_migrate_order" value="N"$content[surfbar_migrate_order_n] />
                </td>
        </tr>
        <tr>
diff --git a/templates/de/html/admin/admin_config_validator.tpl b/templates/de/html/admin/admin_config_validator.tpl
new file mode 100644 (file)
index 0000000..4b546e7
--- /dev/null
@@ -0,0 +1,26 @@
+<div align="center">
+<form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=config_validator%}" method="post">
+<table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
+       <tr>
+               <td colspan="2" align="center" class="admin_title bottom">
+                       <strong>{--ADMIN_CONFIG_VALIDATOR_TITLE--}</strong>
+               </td>
+       </tr>
+       <tr>
+               <td align="center" class="bottom">
+                       {--ADMIN_CONFIG_VALIDATOR_ENABLED--}
+               </td>
+               <td width="60" align="right" class="bottom">
+                       {--YES--}:<input type="radio" name="enable_validator" class="admin_normal" value="Y"$content[enable_validator_yes] /><br />
+                       {--NO--}:<input type="radio" name="enable_validator" class="admin_normal" value="N"$content[enable_validator_no] />
+               </td>
+       </tr>
+       <tr>
+               <td colspan="2" class="admin_footer">
+                       <input type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
+                       <input type="submit" name="ok" class="admin_submit" value="{--SAVE_SETTINGS--}" />
+               </td>
+       </tr>
+</table>
+</form>
+</div>
index 478986c..d9a61ff 100644 (file)
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_WERNIS_API_ID--}:</td>
+               <td align="right">
+                       {--ADMIN_WERNIS_API_ID--}:
+               </td>
                <td>
                        <input type="text" name="wernis_api_id" class="admin_normal" value="{?wernis_api_id?}" size="2" maxlength="20" />
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_WERNIS_API_MD5--}:</td>
+               <td align="right">
+                       {--ADMIN_WERNIS_API_MD5--}:
+               </td>
                <td>
                        <input type="text" name="wernis_api_md5" class="admin_normal" value="{?wernis_api_md5?}" size="32" maxlength="32" />
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_WERNIS_API_URL--}:</td>
+               <td align="right">
+                       {--ADMIN_WERNIS_API_URL--}:
+               </td>
                <td>
                        <input type="text" name="wernis_api_url" class="admin_normal" value="{?wernis_api_url?}" size="25" maxlength="255" />
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_WERNIS_REFID--}:</td>
+               <td align="right">
+                       {--ADMIN_WERNIS_REFID--}:
+               </td>
                <td>
                        <input type="text" name="wernis_refid" class="admin_normal" value="{?wernis_refid?}" size="5" maxlength="20" />
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_WERNIS_WPASS--}:</td>
+               <td align="right">
+                       {--ADMIN_WERNIS_WPASS--}:
+               </td>
                <td>
                        <input type="password" name="wernis_pass" class="admin_normal" size="5" maxlength="20" />
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_WERNIS_MIN_PAYOUT--}:</td>
+               <td align="right">
+                       {--ADMIN_WERNIS_MIN_PAYOUT--}:
+               </td>
                <td>
                        <input type="text" name="wernis_min_payout" class="admin_normal" value="{?wernis_min_payout?}" size="5" maxlength="20" /> Wernis
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_WERNIS_MIN_WITHDRAW--}:</td>
+               <td align="right">
+                       {--ADMIN_WERNIS_MIN_WITHDRAW--}:
+               </td>
                <td>
                        <input type="text" name="wernis_min_withdraw" class="admin_normal" value="{?wernis_min_withdraw?}" size="5" maxlength="20" /> Wernis
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_WERNIS_PAYOUT_FACTOR--}:</td>
+               <td align="right">
+                       {--ADMIN_WERNIS_PAYOUT_FACTOR--}:
+               </td>
                <td>
                        <input type="text" name="wernis_payout_factor" class="admin_normal" value="{?wernis_payout_factor?}" size="5" maxlength="20" />
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_WERNIS_WITHDRAW_FACTOR--}:</td>
+               <td align="right">
+                       {--ADMIN_WERNIS_WITHDRAW_FACTOR--}:
+               </td>
                <td>
                        <input type="text" name="wernis_withdraw_factor" class="admin_normal" value="{?wernis_withdraw_factor?}" size="5" maxlength="20" />
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_WERNIS_PAYOUT_FEE_PERCENT--}:</td>
+               <td align="right">
+                       {--ADMIN_WERNIS_PAYOUT_FEE_PERCENT--}:
+               </td>
                <td>
                        <input type="text" name="wernis_payout_fee_percent" class="admin_normal" value="{?wernis_payout_fee_percent?}" size="5" maxlength="20" />
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_WERNIS_WITHDRAW_FEE_PERCENT--}:</td>
+               <td align="right">
+                       {--ADMIN_WERNIS_WITHDRAW_FEE_PERCENT--}:
+               </td>
                <td>
                        <input type="text" name="wernis_withdraw_fee_percent" class="admin_normal" value="{?wernis_withdraw_fee_percent?}" size="5" maxlength="20" />&#37;
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_WERNIS_PAYOUT_FEE_FIX--}:</td>
+               <td align="right">
+                       {--ADMIN_WERNIS_PAYOUT_FEE_FIX--}:
+               </td>
                <td>
                        <input type="text" name="wernis_payout_fee_fix" class="admin_normal" value="{?wernis_payout_fee_fix?}" size="5" maxlength="20" />
                        <span class="tiny">({?POINTS?})</span>
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_WERNIS_WITHDRAW_FEE_FIX--}:</td>
+               <td align="right">
+                       {--ADMIN_WERNIS_WITHDRAW_FEE_FIX--}:
+               </td>
                <td>
                        <input type="text" name="wernis_withdraw_fee_fix" class="admin_normal" value="{?wernis_withdraw_fee_fix?}" size="5" maxlength="20" />
                        <span class="tiny">({?POINTS?})</span>
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_WERNIS_PAYOUT_ACTIVE--}:</td>
+               <td align="right">
+                       {--ADMIN_WERNIS_PAYOUT_ACTIVE--}:
+               </td>
                <td>
-                       <input type="radio" name="wernis_payout_active" value="Y"$content[wernis_payout_active_y] /> {--YES--}
-                       <input type="radio" name="wernis_payout_active" value="N"$content[wernis_payout_active_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="wernis_payout_active" value="Y"$content[wernis_payout_active_y] /><br />
+                       {--NO--}:<input type="radio" name="wernis_payout_active" value="N"$content[wernis_payout_active_n] />
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right">{--ADMIN_WERNIS_WITHDRAW_ACTIVE--}:</td>
+               <td class="bottom" align="right">
+                       {--ADMIN_WERNIS_WITHDRAW_ACTIVE--}:
+               </td>
                <td class="bottom">
-                       <input type="radio" name="wernis_withdraw_active" value="Y"$content[wernis_withdraw_active_y] /> {--YES--}
-                       <input type="radio" name="wernis_withdraw_active" value="N"$content[wernis_withdraw_active_n] /> {--NO--}
+                       {--YES--}:<input type="radio" name="wernis_withdraw_active" value="Y"$content[wernis_withdraw_active_y] /><br />
+                       {--NO--}:<input type="radio" name="wernis_withdraw_active" value="N"$content[wernis_withdraw_active_n] />
                </td>
        </tr>
        <tr>
index 7774502..00c6041 100644 (file)
@@ -3,7 +3,7 @@
                <input type="checkbox" title="{--ID_SELECT--} $content[network_id]" class="admin_normal" name="sel[$content[network_id]]" value="1" />
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
-               $content[network_short_name]:
+               $content[network_short_name]:<br />
                [<a
                 href="{%url=modules.php?module=admin&amp;what=list_network_types&amp;network=$content[network_id]%}" title="{--ADMIN_NETWORK_LIST_TYPES_LINK_TITLE--}">T</a>|<a
                 href="{%url=modules.php?module=admin&amp;what=list_network_params&amp;network=$content[network_id]%}" title="{--ADMIN_NETWORK_LIST_PARAMS_LINK_TITLE--}">P</a>|<a
index cf21a54..bc2f9e2 100644 (file)
@@ -8,7 +8,7 @@
 $content
 <tr>
        <td colspan="4" class="admin_footer">
-               <span class="admin_notes tiny">{--ADMIN_LIST_SPONSOR_NOTES--}</span>
+               <span class="admin_note tiny">{--ADMIN_LIST_SPONSOR_NOTES--}</span>
        </td>
 </tr>
 </table>
diff --git a/templates/de/html/ext/ext_validator.tpl b/templates/de/html/ext/ext_validator.tpl
new file mode 100644 (file)
index 0000000..4574676
--- /dev/null
@@ -0,0 +1,14 @@
+<div class="para">
+       Binden Sie z.B. den Validator zum Validieren von XHTML-Seiten oder
+       CSS-Angaben Ihres {?mt_word2} ein, oder zeigen Sie Ihren Mitgliedern, dass
+       Ihr Webdesign den <a href="http://w3tableless.com/" rel="external"
+        target="_blank" title="Verify table-less layout - w3tableless.com">Table-less</a>
+       Vorgaben des W3-Konsortiums entspricht.
+</div>
+
+<div class="para">
+       <strong>Wichtig:</strong> Die Validierung erfolgt &uuml;ber die direkte URL
+       Ihres Angebots. Sollte dies lokal installiert sein, so kann der von w3.org
+       betriebene Validator Ihre Seite nicht validieren, da private IP-Adressen im
+       Internet nicht geroutet werden.
+</div>
index 6606f35..9c9a00d 100644 (file)
                        {--AGREE_TO_THIS--}:
                </td>
                <td class="bottom register_right">
-                       {--YES--}: <input type="radio" name="agree" class="guest_normal" value="Y" />
-                       {--NO--}: <input type="radio" name="agree" class="guest_normal" value="N" checked="checked" />
+                       {--YES--}:<input type="radio" name="agree" class="guest_normal" value="Y" />
+                       {--NO--}:<input type="radio" name="agree" class="guest_normal" value="N" checked="checked" />
                </td>
        </tr>
        <tr>
index d675c33..d495205 100644 (file)
@@ -1,12 +1,12 @@
 <div align="center">
 <a name="TOP"></a>
-<table border="0" cellspacing="0" cellpadding="0" width="100%" class="guest_table" height="100%">
+<table border="0" cellspacing="0" cellpadding="0" width="100%" class="guest_table">
        <tr>
                <td align="center" height="65%">
                <table border="0" cellspacing="0" cellpadding="0" width="100%">
                        <tr>
                                <td align="center">
-                                       <a target="_parent" href="{%url=modules.php?module=index&amp;what=welcome%}"><div class="big">{?MAIN_TITLE?}</div></a>
+                                       <div class="big"><a target="_parent" href="{%url=modules.php?module=index%}">{?MAIN_TITLE?}</a></div>
                                </td>
                        </tr>
                        <tr>
        <tr>
                <td align="center" height="26%">
                        <div class="big">
-                               [&nbsp;<a target="_parent" href="{%url=modules.php?module=index&amp;what=welcome%}">Weiter...</a>&nbsp;]
+                               [&nbsp;<a target="_parent" href="{%url=modules.php?module=index%}">Weiter...</a>&nbsp;]
                        </div>
                </td>
        </tr>
        <tr>
                <td align="center" valign="bottom" height="9%"><div class="tiny">
-               <strong><u>Impressum:</u></strong><br />
-               <div>Ihr Name hier, Ihre Stra&szlig;e, X-12345 Demo-Stadt<br />
-               Tel.: 01234-56789-0, Email: <a
-                       href="mailto:mail_NO_SPAM_@_NO_SPAM_provider.de">Webmaster</a></div>
-               <div>Weitere Angaben? ...</div>
-               <div>Gelinkte Seiten, die sich ausserhalb von {?URL?} befinden,
-               mache ich mich nicht mit verantwortlich und distanziere mich hiermit
-               ausdr&uuml;cklich von diesen und deren Inhalten! Bitte beachte den <a
-                       href="#" target="_blank">Disclaimer</a>!<br />
+                       <strong><u>Impressum:</u></strong><br />
+                       <div>
+                               Ihr Name hier, Ihre Stra&szlig;e, X-12345 Demo-Stadt<br />
+                               Tel.: 01234-56789-0, Email: <a
+                               href="mailto:mail_NO_SPAM_@_NO_SPAM_provider.de">Webmaster</a>
+                       </div>
+                       <div>Weitere Angaben? ...</div>
+                       <div>
+                               Gelinkte Seiten, die sich ausserhalb von {?URL?} befinden,
+                               mache ich mich nicht mit verantwortlich und distanziere mich hiermit
+                               ausdr&uuml;cklich von diesen und deren Inhalten! Bitte beachte den <a
+                               href="#" target="_blank">Disclaimer</a>!
+                       </div>
                </div></td>
        </tr>
 </table>
index b65a6eb..627a9f4 100644 (file)
@@ -7,14 +7,12 @@
                </td>
        </tr>
        <tr>
-               <td align="center" colspan="2">{--MEMBER_HTML_TEXT--}</td>
-       </tr>
-       <tr>
                <td class="bottom" align="right">
-                       {--YES--}:&nbsp;<input type="radio" name="html" class="member_normal" value="Y"$content[html_y] />
+                       {--MEMBER_HTML_TEXT--}
                </td>
                <td class="bottom" align="left">
-                       {--NO--}:&nbsp;<input type="radio" name="html" class="member_normal" value="N"$content[html_n] />
+                       {--YES--}:<input type="radio" name="html" class="member_normal" value="Y"$content[html_y] /><br />
+                       {--NO--}:<input type="radio" name="html" class="member_normal" value="N"$content[html_n] />
                </td>
        </tr>
        <tr>
index dd1df96..3fc62b7 100644 (file)
@@ -5,8 +5,8 @@
                        {--TRANSFER_ALLOW_OPT_IN--}
                </td>
                <td align="center" width="160" class="bottom" height="50">
-                       {--YES--}:&nbsp;<input type="radio" name="opt_in" class="member_normal" value="Y"$content[allow_y] />
-                       {--NO--}:&nbsp;<input type="radio" name="opt_in" class="member_normal" value="N"$content[allow_n] />
+                       {--YES--}:<input type="radio" name="opt_in" class="member_normal" value="Y"$content[allow_y] />
+                       {--NO--}:<input type="radio" name="opt_in" class="member_normal" value="N"$content[allow_n] />
                </td>
        </tr>
        <tr>
index 9943ff0..7340733 100644 (file)
@@ -1,3 +1,4 @@
 </div>
+{%validatorLinks%}
 </body>
 </html>
diff --git a/templates/de/html/validator/.htaccess b/templates/de/html/validator/.htaccess
new file mode 100644 (file)
index 0000000..3a42882
--- /dev/null
@@ -0,0 +1 @@
+Deny from all
diff --git a/templates/de/html/validator/validator_links.tpl b/templates/de/html/validator/validator_links.tpl
new file mode 100644 (file)
index 0000000..f4cc410
--- /dev/null
@@ -0,0 +1,11 @@
+<div class="validator_links">
+       <a href="http://validator.w3.org/check?uri=http://{%server,server_name%}{%server,request_uri%}"
+        rel="external" target="_blank"><img style="border:0;width:88px;height:31px"
+        src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Transitional" /></a>
+       <a href="http://jigsaw.w3.org/css-validator/validator?uri=http://{%server,server_name%}{%server,request_uri%}"
+        rel="external" target="_blank"><img style="border:0;width:88px;height:31px"
+        src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" /></a>
+       <a title="tableless" href="http://w3tableless.com?uri=http://{%server,server_name%}{%server,request_uri%}"
+        rel="external" target="_blank"><img style="border:0px;width:80px;height:15px"
+        src="http://w3tableless.com/images/w3tableless1.gif" alt="tableless" /></a>
+</div>