Direct registration added, typo fixed, admin session on missing/failed login fixed...
authorRoland Häder <roland@mxchange.org>
Mon, 10 Nov 2008 21:41:13 +0000 (21:41 +0000)
committerRoland Häder <roland@mxchange.org>
Mon, 10 Nov 2008 21:41:13 +0000 (21:41 +0000)
57 files changed:
.gitattributes
DOCS/de/THANK_YOU.txt
inc/databases.php
inc/doubler_send.php
inc/functions.php
inc/language/de.php
inc/modules/admin.php
inc/modules/admin/action-
inc/modules/admin/action-admins.php
inc/modules/admin/action-bank.php
inc/modules/admin/action-country.php
inc/modules/admin/action-doubler.php
inc/modules/admin/action-email.php
inc/modules/admin/action-holiday.php
inc/modules/admin/action-login.php
inc/modules/admin/action-menu.php
inc/modules/admin/action-misc.php
inc/modules/admin/action-mods.php
inc/modules/admin/action-newsletter.php
inc/modules/admin/action-payouts.php
inc/modules/admin/action-primera.php
inc/modules/admin/action-rallye.php
inc/modules/admin/action-repair.php
inc/modules/admin/action-setup.php
inc/modules/admin/action-sponsor.php
inc/modules/admin/action-stats.php
inc/modules/admin/action-surfbar.php
inc/modules/admin/action-task.php
inc/modules/admin/action-theme.php
inc/modules/admin/action-transfer.php
inc/modules/admin/action-user.php
inc/modules/admin/action-wernis.php
inc/modules/admin/overview-inc.php
inc/modules/admin/what-list_task.php
inc/modules/guest/action-admin.php
inc/modules/guest/action-main.php
inc/modules/guest/action-members.php
inc/modules/guest/action-sponsor.php
inc/modules/member/action-
inc/modules/member/action-account.php
inc/modules/member/action-bank.php
inc/modules/member/action-extras.php
inc/modules/member/action-logout.php
inc/modules/member/action-main.php
inc/modules/member/action-order.php
inc/modules/member/action-rals.php
inc/modules/member/action-stats.php
inc/modules/member/action-surfbar.php
modules.php
templates/de/html/admin/admin_list_task_ext_rows.tpl [new file with mode: 0644]
templates/de/html/admin/admin_list_task_rows.tpl
templates/de/html/admin/admin_overview_footer.tpl
templates/de/html/admin/admin_overview_footer_task.tpl
templates/de/html/admin/admin_overview_header.tpl
templates/de/html/admin/admin_overview_header_task.tpl
templates/de/html/admin/admin_overview_list_ext_rows.tpl [new file with mode: 0644]
templates/de/html/admin/admin_overview_list_rows.tpl

index a52ab12..08db658 100644 (file)
@@ -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
index 39e93fa..698264f 100644 (file)
@@ -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)
index 061185b..9435b22 100644 (file)
@@ -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);
index 0efe4f5..b6a7505 100644 (file)
@@ -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
index c32fbdc..8e533d3 100644 (file)
@@ -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 //
index aa39b4f..84daad9 100644 (file)
@@ -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&auml;hlte Tasks");
 define('ADMIN_REG_FAILED_INVALID', "Registrierung fehlgeschlagen: Ung&uuml;tige ID &uuml;bermittelt!");
 define('ADMIN_REG_FAILED_ID_404', "Registrierung fehlgeschlagen: Erweiterung-ID nicht auffindbar!");
@@ -1192,6 +1193,7 @@ define('MAILS_CONFIRMED', "Emails best&auml;tigt");
 define('RAND_CONFIRMED', "Best&auml;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.");
index 515c745..1017c5b 100644 (file)
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 if ((empty($GLOBALS['action'])) && ($check == "admin_only")) {
        // Redirect to right URL
        LOAD_URL("modules.php?module=admin&amp;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;
        }
index 69b93d8..b376444 100644 (file)
@@ -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);
index 513906d..57e0b82 100644 (file)
@@ -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);
index f1504ea..fd7f3e0 100644 (file)
@@ -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);
index c232620..4736252 100644 (file)
@@ -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);
index 26c92b1..baa342f 100644 (file)
@@ -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);
 }
 
index 2c4940c..806fc69 100644 (file)
@@ -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);
index 11200f7..7924748 100644 (file)
@@ -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);
index 03d8459..5e51c7f 100644 (file)
@@ -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);
index c11decc..2643a16 100644 (file)
@@ -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);
index e25b996..0f33b8e 100644 (file)
@@ -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);
index 775d8ca..e286fca 100644 (file)
@@ -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);
index 2e22f37..4114603 100644 (file)
@@ -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);
index 1f58827..8a44bf6 100644 (file)
@@ -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);
index a4a4070..cc6d11d 100644 (file)
@@ -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);
index aff9a0f..7534627 100644 (file)
@@ -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);
index 68f8cdd..6073f06 100644 (file)
@@ -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);
index 5f5b0c4..4cf6159 100644 (file)
@@ -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);
index 7ff7d03..7effb6f 100644 (file)
@@ -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);
index de96e3b..add4def 100644 (file)
@@ -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);
index 3ddd896..2a69435 100644 (file)
@@ -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);
index 5dd6f7b..9f28d46 100644 (file)
@@ -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);
index fae7b83..dbf518f 100644 (file)
@@ -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);
index c4b1d1b..692128a 100644 (file)
@@ -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);
index 5ef4c8d..ba5a009 100644 (file)
@@ -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);
index d543b6b..65a75c8 100644 (file)
@@ -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);
index f77e1e0..9a81ae8 100644 (file)
@@ -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;
index c00272e..251cf29 100644 (file)
@@ -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;
                }
 
index 68567e0..1744355 100644 (file)
@@ -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);
index 1b17362..a1c35d5 100644 (file)
@@ -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)) {
index 7675a00..d066e56 100644 (file)
@@ -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);
index 994c049..deeabb8 100644 (file)
@@ -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);
index cb01302..67fc381 100644 (file)
@@ -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);
index 7de4396..91e746e 100644 (file)
@@ -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);
index ab4e840..0e60f78 100644 (file)
@@ -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);
index d98cbfe..89cdbb8 100644 (file)
@@ -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);
index d80fca3..8c2867a 100644 (file)
@@ -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);
index 72e405d..24359aa 100644 (file)
@@ -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);
index 3277bcc..3bb82fa 100644 (file)
@@ -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);
index 9fc44c6..07465df 100644 (file)
@@ -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);
index fdac22b..a60ad4b 100644 (file)
@@ -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);
index 1388fee..19b460a 100644 (file)
@@ -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);
index 9dcd410..3787101 100644 (file)
@@ -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
@@ -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>
index e3f384c..83dceaf 100644 (file)
@@ -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>
index 688faaf..afce7a5 100644 (file)
@@ -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>
index 7dcb379..f09ecb5 100644 (file)
@@ -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>
index 5326cb9..98a7295 100644 (file)
@@ -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>
index f045a68..87036f0 100644 (file)
@@ -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
@@ -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>
index e3f384c..83dceaf 100644 (file)
@@ -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>