Direct registration added, typo fixed, admin session on missing/failed login fixed...

diff --git a/.gitattributes b/.gitattributes
index a52ab12f9454ed843b438a52bc91af8c7f4ff216..08db658cbe82c6a966bc98eba78288c8b3666f6c 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1005,6 +1005,7 @@ templates/de/html/admin/admin_list_surfbar_actions.tpl -text
 templates/de/html/admin/admin_list_surfbar_actions_row.tpl -text
 templates/de/html/admin/admin_list_surfbar_urls.tpl -text
 templates/de/html/admin/admin_list_surfbar_urls_row.tpl -text
+templates/de/html/admin/admin_list_task_ext_rows.tpl -text
 templates/de/html/admin/admin_list_task_rows.tpl -text
 templates/de/html/admin/admin_list_transfer.tpl -text
 templates/de/html/admin/admin_list_transfer_row.tpl -text
@@ -1072,6 +1073,7 @@ templates/de/html/admin/admin_overview_footer_task.tpl -text
 templates/de/html/admin/admin_overview_header.tpl -text
 templates/de/html/admin/admin_overview_header_task.tpl -text
 templates/de/html/admin/admin_overview_list.tpl -text
+templates/de/html/admin/admin_overview_list_ext_rows.tpl -text
 templates/de/html/admin/admin_overview_list_rows.tpl -text
 templates/de/html/admin/admin_overview_row.tpl -text
 templates/de/html/admin/admin_overview_task.tpl -text

diff --git a/DOCS/de/THANK_YOU.txt b/DOCS/de/THANK_YOU.txt
index 39e93fa9cd8872475bea74ada41f8202b5372bbd..698264f3555d242e39765518b8b34b188e62a701 100644 (file)
--- a/DOCS/de/THANK_YOU.txt
+++ b/DOCS/de/THANK_YOU.txt
@@ -29,8 +29,8 @@ Personen:
   (http://www.simplemail.de)
 - AndreasJung aus dem MXChange-Community Forum wegen zahlreicher Bugmeldungen.
   (http://www.onlinewerbebombe.de)
-- Der User profi-concept aus meinem Forum hat mir Patches fuer die config.php
-  zugesandt, die Probleme unter Windows gefixt haben.
+- Der User profi-concept aus meinem Forum hat mir sehr viele gute Patches zur
+  Verfuegung gestellt (http://www.stelzi.net)
 
 Websites / Programmierer / etc.:
 - SF.net: Hosten meine Projektdateien (nur Archive)

diff --git a/inc/databases.php b/inc/databases.php
index 061185b08b3ba5e326354655b789197f9ae4084a..9435b220593eedb043c8725b18ace71b118559e8 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -114,7 +114,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
-define('CURR_SVN_REVISION', "531");
+define('CURR_SVN_REVISION', "532");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/doubler_send.php b/inc/doubler_send.php
index 0efe4f5bd436da73a090cfc6bcf31cf55b63a3ba..b6a7505e1d14aea7fee79adf323d558941bc1f54 100644 (file)
--- a/inc/doubler_send.php
+++ b/inc/doubler_send.php
@@ -90,7 +90,7 @@ if (((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == "Y"))
                                // Referal points found so add them and set line(s) to completed='Y'
                                $points += $ref;
                                $result_ref = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_doubler SET completed='Y' WHERE refid=%s AND completed='N' AND is_ref='Y'",
-                                array(bigintval($uid)), __FILE__, __LINE__);
+                                       array(bigintval($uid)), __FILE__, __LINE__);
                        } else {
                                // No referal points found
                                $ref = 0;
@@ -104,7 +104,7 @@ if (((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == "Y"))
 
                        // Set entry as "payed"
                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_doubler SET completed='Y' WHERE id=%s LIMIT 1",
-                        array(bigintval($id)), __FILE__, __LINE__);
+                               array(bigintval($id)), __FILE__, __LINE__);
 
                        $OK = false;
                        // Check for jackpot inclusion in doubling process

diff --git a/inc/functions.php b/inc/functions.php
index c32fbdc0fa0c27ebaa66483fa9847efee4bd3a23..8e533d35822ad210f7f3e9e8ad0883fcff96d914 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2782,6 +2782,18 @@ function DETERMINE_REFID () {
        } // END - if
 }
 
+// Destroys the admin session
+function DESTROY_ADMIN_SESSION () {
+       // Kill maybe existing session variables including array elements
+       set_session('admin_login'       , "");
+       set_session('admin_md5'         , "");
+       set_session('admin_last'        , "");
+       set_session('admin_to'          , "");
+
+       // Destroy session and return status
+       return @session_destroy();
+}
+
 //////////////////////////////////////////////////
 //                                              //
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //

diff --git a/inc/language/de.php b/inc/language/de.php
index aa39b4f61e6d903743fcf423a85dfeda2c8add06..84daad99b5ad1c1b58e1cbfa5ca2bb4a8180b233 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -768,6 +768,7 @@ define('ADMIN_NEW_EXT_SUBJ', "Neue Erweiterung gefunden");
 define('ADMIN_TASK_SUBJECT', "Aufgabenbetreff");
 define('ADMIN_TASK_TEXT', "Aufgabentext");
 define('ADMIN_REGISTER_EXTENSION', "Registrieren");
+define('ADMIN_REGISTER_EXTENSION_TITLE', "Erweiterung direkt registrieren");
 define('ADMIN_SELECTED_TASKS_ASSIGN', "Zum Bearbeiten ausgewählte Tasks");
 define('ADMIN_REG_FAILED_INVALID', "Registrierung fehlgeschlagen: Ungütige ID übermittelt!");
 define('ADMIN_REG_FAILED_ID_404', "Registrierung fehlgeschlagen: Erweiterung-ID nicht auffindbar!");
@@ -1192,6 +1193,7 @@ define('MAILS_CONFIRMED', "Emails bestätigt");
 define('RAND_CONFIRMED', "Bestätigt f. Zufalls-Ref");
 define('LOCK_REASON', "Sperrgrund");
 define('LOCK_TIMESTAMP', "Sperrzeitpunkt");
+define('EXTENSION', "Erweiterung");
 
 define('MEMBER_MAIL_BONUS_CONFIRMED_ON', "Sie haben diese Bonusmail <span class=\"data\">%s</span> best&auml;tigt.");
 define('MEMBER_MAIL_NORMAL_CONFIRMED_ON', "Sie haben diese Klickmail <span class=\"data\">%s</span> best&auml;tigt.");

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 515c745ee9fb0e8ffc28c647ac18bc9e0b2e8f2a..1017c5b164705944c20cd1611f67304cbe962214 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 if ((empty($GLOBALS['action'])) && ($check == "admin_only")) {
        // Redirect to right URL
        LOAD_URL("modules.php?module=admin&action=login");
-}
+} // END - if
 
 // Load include file
 require_once(PATH."inc/modules/admin/admin-inc.php");
@@ -228,11 +228,13 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                case "404": // Administrator login not found
                        $_POST['ok'] = $ret;
                        $ret = ADMIN_NOT_FOUND;
+                       DESTROY_ADMIN_SESSION();
                        break;
 
                case "pass": // Wrong password
                        $_POST['ok'] = $ret;
                        $ret = WRONG_PASS." [<A href=\"".URL."/modules.php?module=admin&amp;reset_pass=1\">".ADMIN_RESET_PASS."</A>]\n";
+                       DESTROY_ADMIN_SESSION();
                        break;
                }
        }
@@ -299,16 +301,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
        }
 } elseif (isset($_GET['logout'])) {
        // Only try to remove cookies
-       if (set_session("admin_login", "") && set_session("admin_md5", "") && set_session("admin_last", "") && set_session("admin_to", "")) {
-               // Also remove array elements
-               set_session('admin_login', "");
-               set_session('admin_md5'  , "");
-               set_session('admin_last' , "");
-               set_session('admin_to'   , "");
-
-               // Destroy session
-               @session_destroy();
-
+       if (DESTROY_ADMIN_SESSION()) {
                // Load logout template
                if (isset($_GET['register'])) {
                        // Secure input
@@ -387,11 +380,13 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 
        case "404": // Administrator login not found
                $_POST['ok'] = $ret;
+               DESTROY_ADMIN_SESSION();
                ADD_FATAL(ADMIN_NOT_FOUND);
                break;
 
        case "pass": // Wrong password
                $_POST['ok'] = $ret;
+               DESTROY_ADMIN_SESSION();
                ADD_FATAL(WRONG_PASS);
                break;
        }

diff --git a/inc/modules/admin/action- b/inc/modules/admin/action-
index 69b93d86a1b421a439174752623b59264c04c827..b376444c6890eb72e1e6e615d25832bffcf86bf0 100644 (file)
--- a/inc/modules/admin/action-
+++ b/inc/modules/admin/action-
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) { 
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-admins.php b/inc/modules/admin/action-admins.php
index 513906d1714ea2c8ee1a21fd9c69cfd7c4e6e0bb..57e0b82c7918e255689cc61e5da64e9568656f82 100644 (file)
--- a/inc/modules/admin/action-admins.php
+++ b/inc/modules/admin/action-admins.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-bank.php b/inc/modules/admin/action-bank.php
index f1504ea0442dfc8cf366d4f9610d4e1a7db85b54..fd7f3e0325d00223625268c22b19c13dbab8d4bd 100644 (file)
--- a/inc/modules/admin/action-bank.php
+++ b/inc/modules/admin/action-bank.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-country.php b/inc/modules/admin/action-country.php
index c2326203b58c475f4977a2ac2399b8f86a151819..4736252208de367343f8e2977d127ac70de3adc6 100644 (file)
--- a/inc/modules/admin/action-country.php
+++ b/inc/modules/admin/action-country.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-doubler.php b/inc/modules/admin/action-doubler.php
index 26c92b1837c9fe2a8f75c4cfa3a33f90f9c95f10..baa342f6129da0965e05a2e4e13ddffa87d4cc5d 100644 (file)
--- a/inc/modules/admin/action-doubler.php
+++ b/inc/modules/admin/action-doubler.php
@@ -41,11 +41,12 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf(."%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
+       // "what file" not found
        ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
 }
 

diff --git a/inc/modules/admin/action-email.php b/inc/modules/admin/action-email.php
index 2c4940c6466cad1f6c7a4b3439c3497be3d758be..806fc69daf85e1552c0f66265e9640152717c31e 100644 (file)
--- a/inc/modules/admin/action-email.php
+++ b/inc/modules/admin/action-email.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-holiday.php b/inc/modules/admin/action-holiday.php
index 11200f7bc1952d7c5710963def0eb569716565ae..79247485a31ff8b2d1a769e4b41fa6f57ce6e7ee 100644 (file)
--- a/inc/modules/admin/action-holiday.php
+++ b/inc/modules/admin/action-holiday.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-login.php b/inc/modules/admin/action-login.php
index 03d8459449db97cd73362299493586e12aaecbb9..5e51c7f267be84507c34f9442dbe693b5c060d1e 100644 (file)
--- a/inc/modules/admin/action-login.php
+++ b/inc/modules/admin/action-login.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) { 
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-menu.php b/inc/modules/admin/action-menu.php
index c11decc48151bf06ab43780d93cb32a1cca44bc6..2643a16251ec3c1da1fe396b2f3fdef0471e411a 100644 (file)
--- a/inc/modules/admin/action-menu.php
+++ b/inc/modules/admin/action-menu.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-misc.php b/inc/modules/admin/action-misc.php
index e25b996f4b973f575511c64d363a35b4138cc75f..0f33b8e6770ea94ccb45b157d32668f1d1bb8ac7 100644 (file)
--- a/inc/modules/admin/action-misc.php
+++ b/inc/modules/admin/action-misc.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-mods.php b/inc/modules/admin/action-mods.php
index 775d8cab987cad799b1c98c1df2db1e407db054a..e286fcab47614894b7dab3bd5d95a70a73efee49 100644 (file)
--- a/inc/modules/admin/action-mods.php
+++ b/inc/modules/admin/action-mods.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-newsletter.php b/inc/modules/admin/action-newsletter.php
index 2e22f370f9061b0385fff6200d9dcd6e80a706af..4114603ea45b4a10285e26ce26d048a04ff3dc14 100644 (file)
--- a/inc/modules/admin/action-newsletter.php
+++ b/inc/modules/admin/action-newsletter.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-payouts.php b/inc/modules/admin/action-payouts.php
index 1f588275e987cfb0a6ef89a2f430216bdd298400..8a44bf64507bba850736aa822e607107f9f5f471 100644 (file)
--- a/inc/modules/admin/action-payouts.php
+++ b/inc/modules/admin/action-payouts.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-primera.php b/inc/modules/admin/action-primera.php
index a4a407032492afd3a074f4d31151210bc7b69515..cc6d11dfa251601d33de9ff964a9e5e7c0600488 100644 (file)
--- a/inc/modules/admin/action-primera.php
+++ b/inc/modules/admin/action-primera.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-rallye.php b/inc/modules/admin/action-rallye.php
index aff9a0fe1eb71073d95deaa46bd4919898eb3330..7534627533a25733dc5951ad997fed759ac1f9ca 100644 (file)
--- a/inc/modules/admin/action-rallye.php
+++ b/inc/modules/admin/action-rallye.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-repair.php b/inc/modules/admin/action-repair.php
index 68f8cdddb886c38b4d67730c849bb90acdd9a18e..6073f068df867850284b77cdca64525ed51601a9 100644 (file)
--- a/inc/modules/admin/action-repair.php
+++ b/inc/modules/admin/action-repair.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-setup.php b/inc/modules/admin/action-setup.php
index 5f5b0c405899dd0d87230da4355365e87b8a7215..4cf61595b5a6582cac357b180ac0ba5def779068 100644 (file)
--- a/inc/modules/admin/action-setup.php
+++ b/inc/modules/admin/action-setup.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-sponsor.php b/inc/modules/admin/action-sponsor.php
index 7ff7d038e9068d9f49eb638d649a5cb6ea08bc6c..7effb6fb076b0c92f4d920f0382f8b76b1f4635f 100644 (file)
--- a/inc/modules/admin/action-sponsor.php
+++ b/inc/modules/admin/action-sponsor.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-stats.php b/inc/modules/admin/action-stats.php
index de96e3bd84ae784a218e53a8af9515971f38bb72..add4def3f209586a4713c16d9e3c31375884204b 100644 (file)
--- a/inc/modules/admin/action-stats.php
+++ b/inc/modules/admin/action-stats.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-surfbar.php b/inc/modules/admin/action-surfbar.php
index 3ddd896dd9e4994a68d48f6c450b06c41f8033d7..2a69435104eb23d63bbdf2a89dfe7792fbfeedef 100644 (file)
--- a/inc/modules/admin/action-surfbar.php
+++ b/inc/modules/admin/action-surfbar.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-task.php b/inc/modules/admin/action-task.php
index 5dd6f7b1cade9ec35eb77553c8191e742ffc5169..9f28d4622f88f7f28788c017183af7f31ea2f563 100644 (file)
--- a/inc/modules/admin/action-task.php
+++ b/inc/modules/admin/action-task.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-theme.php b/inc/modules/admin/action-theme.php
index fae7b8348122a393582745f6968ddf4bd3ad7de6..dbf518f62b9f7c0c24e6197ec9d6e321cd016f0f 100644 (file)
--- a/inc/modules/admin/action-theme.php
+++ b/inc/modules/admin/action-theme.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-transfer.php b/inc/modules/admin/action-transfer.php
index c4b1d1bb4b7a96684bf45f8c36705908334b5187..692128a1dd3c2faf556ca357d056c7d941496b2a 100644 (file)
--- a/inc/modules/admin/action-transfer.php
+++ b/inc/modules/admin/action-transfer.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-user.php b/inc/modules/admin/action-user.php
index 5ef4c8d18feea5b1b2c7f037d69345848391d46a..ba5a009c393fc3a06990754162fa282765d3bbfa 100644 (file)
--- a/inc/modules/admin/action-user.php
+++ b/inc/modules/admin/action-user.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/action-wernis.php b/inc/modules/admin/action-wernis.php
index d543b6b5fb9f5df9789ac65079657a4a8a4f75ec..65a75c8b6863968cbda210ed90ea6d1ce5280f03 100644 (file)
--- a/inc/modules/admin/action-wernis.php
+++ b/inc/modules/admin/action-wernis.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index f77e1e00fe14fc484e6fae7b92d0e22ff98ca4e8..9a81ae87955ba1428fbd2b75f9530fe95e8d6388 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -442,8 +442,14 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                'created' => MAKE_DATETIME($created, "2")
                        );
 
-                       // Load row template
-                       LOAD_TEMPLATE("admin_overview_list_rows", false, $content);
+                       // Do we have extension task?
+                       if ($type == "EXTENSION") {
+                               // Load extension row template
+                               LOAD_TEMPLATE("admin_overview_list_ext_rows", false, $content);
+                       } else {
+                               // Load default row template
+                               LOAD_TEMPLATE("admin_overview_list_rows", false, $content);
+                       }
 
                        // Switch color
                        $SW = 3 - $SW;

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index c00272e2870ccad4d9b9eadf41dd1edfca2d26b6..251cf29082cdd2a8956954a1060d033c03a34bf4 100644 (file)
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -161,15 +161,17 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
                                $infos = substr($subj, 1, strpos($subj, ":") - 1);
                                break;
                        }
-                       if ($uid > 0)
-                       {
+
+                       // Member assigned with task?
+                       if ($uid > 0) {
                                // Member found otherwise it's a system task
                                $uid = ADMIN_USER_PROFILE_LINK($uid);
-                       }
-                        else
-                       {
+                       } else {
+                               // Is a system task!
                                $uid = "<I>".ADMIN_IS_SYSTEM_TASK."</I>";
                        }
+
+                       // Prepare content
                        $content = array(
                                'sw'      => $SW,
                                'id'      => $id,
@@ -179,7 +181,17 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
                                'type'    => $type_out,
                                'created' => MAKE_DATETIME($created, "2")
                        );
-                       LOAD_TEMPLATE("admin_list_task_rows", false, $content);
+
+                       // Do we have an extension task?
+                       if ($type == "EXTENSION") {
+                               // Load extension row template
+                               LOAD_TEMPLATE("admin_list_task_ext_rows", false, $content);
+                       } else {
+                               // Load default row template
+                               LOAD_TEMPLATE("admin_list_task_rows", false, $content);
+                       }
+
+                       // Switch colors
                        $SW = 3 - $SW;
                }
 

diff --git a/inc/modules/guest/action-admin.php b/inc/modules/guest/action-admin.php
index 68567e02b2f5be23a2f333a728dc21ddd02910bc..17443554f4f59269f406dc7100297b9cd4a13742 100644 (file)
--- a/inc/modules/guest/action-admin.php
+++ b/inc/modules/guest/action-admin.php
@@ -39,7 +39,7 @@ if (!defined('__SECURITY')) {
 
 if (GET_ACTION("guest", $GLOBALS['what']) == "admin") {
        // Only when one admin link is clicked...
-       $INC = sprintf("%sinc/modules/guest/what-%s.php", PATH, $GLOBALS['what']);
+       $INC = sprintf("%sinc/modules/guest/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
        if (FILE_READABLE($INC)) {
                // Ok, we finally load the guest action module
                include($INC);

diff --git a/inc/modules/guest/action-main.php b/inc/modules/guest/action-main.php
index 1b17362a98488f0e3ac7268b3d1127d516130e71..a1c35d51cd6ba1471fae3f02f11a425ba79bb0c0 100644 (file)
--- a/inc/modules/guest/action-main.php
+++ b/inc/modules/guest/action-main.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("guest", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/guest/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/guest/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 $IS_VALID = WHAT_IS_VALID(GET_ACTION("guest", $GLOBALS['what']), $GLOBALS['what'], "guest");
 
 if ((FILE_READABLE($INC)) && ($IS_VALID)) {

diff --git a/inc/modules/guest/action-members.php b/inc/modules/guest/action-members.php
index 7675a00537e56da7a85a4bcdd881322e981a290a..d066e560368d8fe4a910cb3aeff8b79452664811 100644 (file)
--- a/inc/modules/guest/action-members.php
+++ b/inc/modules/guest/action-members.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("guest", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/guest/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/guest/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the guest action module
        include($INC);

diff --git a/inc/modules/guest/action-sponsor.php b/inc/modules/guest/action-sponsor.php
index 994c04959c95a03e978f82a4c7528fd43036d1a3..deeabb891b61f044879b04f8b179907d4b36d946 100644 (file)
--- a/inc/modules/guest/action-sponsor.php
+++ b/inc/modules/guest/action-sponsor.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("guest", __FILE__);
 
 // Load the include file
-$INC = sprintf("%sinc/modules/guest/what-%s.php", PATH, $GLOBALS['what']);
+$INC = sprintf("%sinc/modules/guest/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC)) {
        // Ok, we finally load the guest action module
        include($INC);

diff --git a/inc/modules/member/action- b/inc/modules/member/action-
index cb013024b6cbe7874d28f58230a1ba9b2bdc4555..67fc3812cbf2d2893e736dc1d5415a5699633b13 100644 (file)
--- a/inc/modules/member/action-
+++ b/inc/modules/member/action-
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Load the include file
-$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']);
+$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);

diff --git a/inc/modules/member/action-account.php b/inc/modules/member/action-account.php
index 7de43963674f983338612a4bec100b3531ef362f..91e746e0961879e7eb4d6438e50648dff1e005f5 100644 (file)
--- a/inc/modules/member/action-account.php
+++ b/inc/modules/member/action-account.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Load the include file
-$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']);
+$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);

diff --git a/inc/modules/member/action-bank.php b/inc/modules/member/action-bank.php
index ab4e84069a5cbe569042b0bd9d6ca3aec197774a..0e60f78b6b754c2479e2aa760f57c5ae80e51030 100644 (file)
--- a/inc/modules/member/action-bank.php
+++ b/inc/modules/member/action-bank.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Load the include file
-$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']);
+$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);

diff --git a/inc/modules/member/action-extras.php b/inc/modules/member/action-extras.php
index d98cbfebc90e1ad2e55077115165beac9deef703..89cdbb859c4ac591976649f5f9d1d7ed17d6cc68 100644 (file)
--- a/inc/modules/member/action-extras.php
+++ b/inc/modules/member/action-extras.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Load the include file
-$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']);
+$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);

diff --git a/inc/modules/member/action-logout.php b/inc/modules/member/action-logout.php
index d80fca3b99cceb22a146ab915177f05fa4a30af7..8c2867af95a4465887cfb56133fceb051a6df95c 100644 (file)
--- a/inc/modules/member/action-logout.php
+++ b/inc/modules/member/action-logout.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Load the include file
-$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']);
+$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);

diff --git a/inc/modules/member/action-main.php b/inc/modules/member/action-main.php
index 72e405d7ada3bf614c7945f92ea13b8475716e05..24359aa6fd70b4ce50aa7fc9d74dc22b235b63e8 100644 (file)
--- a/inc/modules/member/action-main.php
+++ b/inc/modules/member/action-main.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Load the include file
-$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']);
+$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);

diff --git a/inc/modules/member/action-order.php b/inc/modules/member/action-order.php
index 3277bcc4d346a4af907be647c28e7f4966be409d..3bb82fa2379c5e29f54b97ccd9bffa0ff1d6dc01 100644 (file)
--- a/inc/modules/member/action-order.php
+++ b/inc/modules/member/action-order.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Load the include file
-$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']);
+$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);

diff --git a/inc/modules/member/action-rals.php b/inc/modules/member/action-rals.php
index 9fc44c6357863b7978f80a22c40dccc3cc569230..07465dfbde6b5c5bb6a1b70b9b16d203b24cbb71 100644 (file)
--- a/inc/modules/member/action-rals.php
+++ b/inc/modules/member/action-rals.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Load the include file
-$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']);
+$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);

diff --git a/inc/modules/member/action-stats.php b/inc/modules/member/action-stats.php
index fdac22b762c0b5007ea19d423fda7288f4f26bb3..a60ad4ba0cf320c9e8b640077a581b66493af94d 100644 (file)
--- a/inc/modules/member/action-stats.php
+++ b/inc/modules/member/action-stats.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Load the include file
-$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']);
+$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);

diff --git a/inc/modules/member/action-surfbar.php b/inc/modules/member/action-surfbar.php
index 1388feec5cb11f50a9feca4ae6cf988951a47462..19b460abbe75d7f8a3c20817ee7ecd18f7e2e481 100644 (file)
--- a/inc/modules/member/action-surfbar.php
+++ b/inc/modules/member/action-surfbar.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Load the include file
-$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, $GLOBALS['what']);
+$INC_WHAT = sprintf("%sinc/modules/member/what-%s.php", PATH, SQL_ESCAPE($GLOBALS['what']));
 if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);

diff --git a/modules.php b/modules.php
index 9dcd410fea12a196fa88de4278d27a7f072f9174..3787101d996b47b7f8642cc51900be9dfb0efe20 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -110,7 +110,7 @@ if ((!empty($_CONFIG['maintenance'])) && ($_CONFIG['maintenance'] == "Y") && (!I
        case "mem_only":
        case "done":
                // Construct module name
-               define('__MODULE', sprintf("%sinc/modules/%s.php", PATH, $GLOBALS['module']));
+               define('__MODULE', sprintf("%sinc/modules/%s.php", PATH, SQL_ESCAPE($GLOBALS['module'])));
 
                // Does the module exists on local file system?
                if ((FILE_READABLE(__MODULE)) && (sizeof($FATAL) == 0)) {

diff --git a/templates/de/html/admin/admin_list_task_ext_rows.tpl b/templates/de/html/admin/admin_list_task_ext_rows.tpl
new file mode 100644 (file)
index 0000000..f5dca42
--- /dev/null
+++ b/templates/de/html/admin/admin_list_task_ext_rows.tpl
@@ -0,0 +1,11 @@
+<TR>
+       <TD class="switch_sw$content[sw] bottom2 right2 left2" align="center">
+               <INPUT type="checkbox" name="task[$content[id]]" value="1" class="admin_normal" />
+       </TD>
+       <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[admin]</TD>
+       <TD class="switch_sw$content[sw] bottom2 right2" align="center"><A title="{--ADMIN_REGISTER_EXTENSION_TITLE--}" href="{!URL!}/modules.php?module=admin&amp;what=extensions&amp;reg_ext=$content[id]">{--ADMIN_REGISTER_EXTENSION--}</A></TD>
+       <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[infos]</TD>
+       <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[uid]</TD>
+       <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[type]</TD>
+       <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[created]]</TD>
+</TR>

diff --git a/templates/de/html/admin/admin_list_task_rows.tpl b/templates/de/html/admin/admin_list_task_rows.tpl
index e3f384c4ab96a5847b3910f915fe56d90c9d8956..83dceaf70d730ec4122b8ed4c30e8c9591207c19 100644 (file)
--- a/templates/de/html/admin/admin_list_task_rows.tpl
+++ b/templates/de/html/admin/admin_list_task_rows.tpl
@@ -1,10 +1,11 @@
 <TR>
        <TD class="switch_sw$content[sw] bottom2 right2 left2" align="center">
-       <INPUT type="checkbox" name="task[$content[id]]" value="1"
-               class="admin_normal"></TD>
+               <INPUT type="checkbox" name="task[$content[id]]" value="1" class="admin_normal" />
+       </TD>
        <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[admin]</TD>
+       <TD class="switch_sw$content[sw] bottom2 right2" align="center">---</TD>
        <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[infos]</TD>
        <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[uid]</TD>
        <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[type]</TD>
        <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[created]]</TD>
-</TR>
\ No newline at end of file
+</TR>

diff --git a/templates/de/html/admin/admin_overview_footer.tpl b/templates/de/html/admin/admin_overview_footer.tpl
index 688faaf5131b1196c6afa64081edf0706a46f3de..afce7a591144bb617880b4b641fd9a3e4017d968 100644 (file)
--- a/templates/de/html/admin/admin_overview_footer.tpl
+++ b/templates/de/html/admin/admin_overview_footer.tpl
@@ -1,15 +1,12 @@
 <TR>
-       <TD colspan="6" align="center"
-               class="admin_footer bottom2 left2 right2"><INPUT type="reset"
-               value="{--ADMIN_UNSELECT_ALL--}" class="admin_reset" /> <INPUT
-               type="submit" name="assign" value="{--ADMIN_ASSIGN_TASKS--}"
-               class="admin_submit" /> <INPUT type="submit"
-               name="unassign" value="{--ADMIN_UNASSIGN_TASKS--}"
-               class="admin_submit" /> <INPUT type="submit" name="redir"
-               value="{--ADMIN_REDIRECT_TASKS--}" class="admin_submit" />
-       <INPUT type="submit" name="del" value="{--ADMIN_DELETE_ENTRIES--}"
-               class="admin_delete" /></TD>
+       <TD colspan="7" align="center" class="admin_footer bottom2 left2 right2">
+               <INPUT type="reset" value="{--ADMIN_UNSELECT_ALL--}" class="admin_reset" />
+               <INPUT type="submit" name="assign" value="{--ADMIN_ASSIGN_TASKS--}" class="admin_submit" />
+               <INPUT type="submit" name="unassign" value="{--ADMIN_UNASSIGN_TASKS--}" class="admin_submit" />
+               <INPUT type="submit" name="redir" value="{--ADMIN_REDIRECT_TASKS--}" class="admin_submit" />
+               <INPUT type="submit" name="del" value="{--ADMIN_DELETE_ENTRIES--}" class="admin_delete" />
+       </TD>
 </TR>
 </TABLE>
 </DIV>
-</FORM>
\ No newline at end of file
+</FORM>

diff --git a/templates/de/html/admin/admin_overview_footer_task.tpl b/templates/de/html/admin/admin_overview_footer_task.tpl
index 7dcb37994d14cfbd6b70f987c17fc67557da5d9c..f09ecb560db9dd2b04ed0068c11ecc9f72cc2a20 100644 (file)
--- a/templates/de/html/admin/admin_overview_footer_task.tpl
+++ b/templates/de/html/admin/admin_overview_footer_task.tpl
@@ -1,17 +1,15 @@
 <TR>
-       <TD colspan="6" align="center"
-               class="admin_footer bottom2 left2 right2"><INPUT type="reset"
-               value="{--ADMIN_UNSELECT_ALL--}" class="admin_reset" /> <INPUT
-               type="submit" name="assign" value="{--ADMIN_ASSIGN_TASKS--}"
-               class="admin_submit" /> <INPUT type="submit"
-               name="unassign" value="{--ADMIN_UNASSIGN_TASKS--}"
-               class="admin_submit" /> <INPUT type="submit" name="redir"
-               value="{--ADMIN_REDIRECT_TASKS--}" class="admin_submit" />
-       <INPUT type="submit" name="del" value="{--TASK_ADMIN_DELETE_ENTRIES--}"
-               class="admin_delete" /></TD>
+       <TD colspan="7" align="center" class="admin_footer bottom2 left2 right2">
+               <INPUT type="reset" value="{--ADMIN_UNSELECT_ALL--}" class="admin_reset" />
+               <INPUT type="submit" name="assign" value="{--ADMIN_ASSIGN_TASKS--}" class="admin_submit" />
+               <INPUT type="submit" name="unassign" value="{--ADMIN_UNASSIGN_TASKS--}" class="admin_submit" />
+               <INPUT type="submit" name="redir" value="{--ADMIN_REDIRECT_TASKS--}" class="admin_submit" />
+               <INPUT type="submit" name="del" value="{--TASK_ADMIN_DELETE_ENTRIES--}" class="admin_delete" />
+       </TD>
 </TR>
 </TABLE>
 </FORM>
 
-<DIV class="admin_note"><STRONG>{--TASK_DELETE_MODE_NOTE--}</STRONG>
+<DIV class="admin_note">
+       <STRONG>{--TASK_DELETE_MODE_NOTE--}</STRONG>
 </DIV>

diff --git a/templates/de/html/admin/admin_overview_header.tpl b/templates/de/html/admin/admin_overview_header.tpl
index 5326cb9edf31abe06f83b25b97c915a8b7036599..98a7295b635bc6a1b4fabe647979760c330f0fbf 100644 (file)
--- a/templates/de/html/admin/admin_overview_header.tpl
+++ b/templates/de/html/admin/admin_overview_header.tpl
@@ -1,17 +1,16 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;action=login"
-       method="POST" style="margin-bottom: 0px">
-<TABLE border="0" cellspacing="0" cellpadding="0" width="95%"
-       align="center" class="admin_table">
+<FORM action="{!URL!}/modules.php?module=admin&amp;action=login" method="POST" style="margin-bottom: 0px">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="95%" align="center" class="admin_table">
        <TR>
-               <TD colspan="6" align="center"
-                       class="admin_task_header top2 left2 right2"><STRONG
-                       class="admin_welcome">{--ADMIN_TASK_SYSTEM_WELCOME--}</STRONG></TD>
+               <TD colspan="7" align="center" class="admin_task_header top2 left2 right2">
+                       <STRONG class="admin_welcome">{--ADMIN_TASK_SYSTEM_WELCOME--}</STRONG>
+               </TD>
        </TR>
        <TR>
                <TD align="center" class="top2 bottom2 right2 left2 admin_header"><STRONG>{--ID_SELECT--}</STRONG></TD>
                <TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_ASSIGNED_ADMIN--}</STRONG></TD>
+               <TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_REGISTER_EXTENSION--}</STRONG></TD>
                <TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_TASK_INFOS--}</STRONG></TD>
                <TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_MEMBER_UID--}</STRONG></TD>
                <TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_TASK_TYPE--}</STRONG></TD>
                <TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_TASK_CREATED--}</STRONG></TD>
-       </TR>
\ No newline at end of file
+       </TR>

diff --git a/templates/de/html/admin/admin_overview_header_task.tpl b/templates/de/html/admin/admin_overview_header_task.tpl
index f045a68ae8afd4d52d0a1bca839f3e0ebd316bf7..87036f0e34d214d3867195e4b598d658dc9b4396 100644 (file)
--- a/templates/de/html/admin/admin_overview_header_task.tpl
+++ b/templates/de/html/admin/admin_overview_header_task.tpl
@@ -1,18 +1,16 @@
-<FORM
-       action="{!URL!}/modules.php?module=admin&amp;what=list_task&amp;type=$content[type]"
-       method="POST" style="margin-bottom: 0px">
-<TABLE border="0" cellspacing="0" cellpadding="0" width="95%"
-       align="center" class="admin_table">
+<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_task&amp;type=$content[type]" method="POST" style="margin-bottom: 0px">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="95%" align="center" class="admin_table">
        <TR>
-               <TD colspan="6" align="center"
-                       class="admin_task_header top2 left2 right2"><STRONG
-                       class="admin_welcome">$content[message]</STRONG></TD>
+               <TD colspan="7" align="center" class="admin_task_header top2 left2 right2">
+                       <STRONG class="admin_welcome">$content[message]</STRONG>
+               </TD>
        </TR>
        <TR>
                <TD align="center" class="top2 bottom2 right2 left2 admin_header"><STRONG>{--ID_SELECT--}</STRONG></TD>
                <TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_ASSIGNED_ADMIN--}</STRONG></TD>
+               <TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_REGISTER_EXTENSION--}</STRONG></TD>
                <TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_TASK_INFOS--}</STRONG></TD>
                <TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_MEMBER_UID--}</STRONG></TD>
                <TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_TASK_TYPE--}</STRONG></TD>
                <TD align="center" class="top2 bottom2 right2 admin_header"><STRONG>{--ADMIN_TASK_CREATED--}</STRONG></TD>
-       </TR>
\ No newline at end of file
+       </TR>

diff --git a/templates/de/html/admin/admin_overview_list_ext_rows.tpl b/templates/de/html/admin/admin_overview_list_ext_rows.tpl
new file mode 100644 (file)
index 0000000..f5dca42
--- /dev/null
+++ b/templates/de/html/admin/admin_overview_list_ext_rows.tpl
@@ -0,0 +1,11 @@
+<TR>
+       <TD class="switch_sw$content[sw] bottom2 right2 left2" align="center">
+               <INPUT type="checkbox" name="task[$content[id]]" value="1" class="admin_normal" />
+       </TD>
+       <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[admin]</TD>
+       <TD class="switch_sw$content[sw] bottom2 right2" align="center"><A title="{--ADMIN_REGISTER_EXTENSION_TITLE--}" href="{!URL!}/modules.php?module=admin&amp;what=extensions&amp;reg_ext=$content[id]">{--ADMIN_REGISTER_EXTENSION--}</A></TD>
+       <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[infos]</TD>
+       <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[uid]</TD>
+       <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[type]</TD>
+       <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[created]]</TD>
+</TR>

diff --git a/templates/de/html/admin/admin_overview_list_rows.tpl b/templates/de/html/admin/admin_overview_list_rows.tpl
index e3f384c4ab96a5847b3910f915fe56d90c9d8956..83dceaf70d730ec4122b8ed4c30e8c9591207c19 100644 (file)
--- a/templates/de/html/admin/admin_overview_list_rows.tpl
+++ b/templates/de/html/admin/admin_overview_list_rows.tpl
@@ -1,10 +1,11 @@
 <TR>
        <TD class="switch_sw$content[sw] bottom2 right2 left2" align="center">
-       <INPUT type="checkbox" name="task[$content[id]]" value="1"
-               class="admin_normal"></TD>
+               <INPUT type="checkbox" name="task[$content[id]]" value="1" class="admin_normal" />
+       </TD>
        <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[admin]</TD>
+       <TD class="switch_sw$content[sw] bottom2 right2" align="center">---</TD>
        <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[infos]</TD>
        <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[uid]</TD>
        <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[type]</TD>
        <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[created]]</TD>
-</TR>
\ No newline at end of file
+</TR>