Queries for de-/activation and removal of extensions fixed

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

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 9b42362a0f5336f7dfcd4e764992e4bdb85114d1..c9b5b320c19610731c1f96c21181ca1d3d8c0eea 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -274,6 +274,7 @@ function SQL_ESCAPE($str, $secureString = true) {
 
        if (function_exists('mysql_real_escape_string')) {
                // The new and improved version
+               //* DEBUG: */ echo __FUNCTION__.":str={$str}<br />\n";
                return mysql_real_escape_string($str, $link);
        } elseif (function_exists('mysql_escape_string')) {
                // The obsulete function

diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php
index 8acd0f78c5eb5e4e495ed1b8fcdf8a4668a79e3f..1d9c2b17830655a7bbb12900a36f6cc8d98c8138 100644 (file)
--- a/inc/extensions/ext-autopurge.php
+++ b/inc/extensions/ext-autopurge.php
@@ -64,8 +64,7 @@ case "remove": // Do stuff when removing extension
        {
                $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_bonus MODIFY data_type ENUM('NEW','QUEUE','SEND') NOT NULL DEFAULT 'NEW'";
        }
-       $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE action='setup' AND what='config_autopurge' LIMIT 1";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE action='user' AND what='list_autopurge' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE what IN('config_autopurge','list_autopurge') LIMIT 2";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data DROP ap_notified";
        break;
 

diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php
index d93b02a857a689a10484fae2c16a2a29760065fa..33704b410131559cd23b84ebd1558f4c78d66dda 100644 (file)
--- a/inc/extensions/ext-bonus.php
+++ b/inc/extensions/ext-bonus.php
@@ -93,14 +93,14 @@ case "remove": // Do stuff when removing extension
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
-       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='N' WHERE action='main' AND what='bonus' LIMIT 1";
+       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='N' WHERE what='bonus' LIMIT 1";
        $SQLs[] = "UPDATE "._MYSQL_PREFIX."_guest_menu SET visible='Y', locked='N' WHERE action='bonus' LIMIT 1";
        $SQLs[] = "UPDATE "._MYSQL_PREFIX."_mod_reg SET locked='N', hidden='N', admin_only='N', mem_only='N' WHERE module='show_bonus' LIMIT 1";
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
-       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='Y' WHERE action='main' AND what='bonus' LIMIT 1";
+       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='Y' WHERE what='bonus' LIMIT 1";
        $SQLs[] = "UPDATE "._MYSQL_PREFIX."_guest_menu SET visible='Y', locked='Y' WHERE action='bonus' LIMIT 1";
        $SQLs[] = "UPDATE "._MYSQL_PREFIX."_mod_reg SET locked='Y' WHERE module='show_bonus' LIMIT 1";
        break;
@@ -159,7 +159,7 @@ KEY userid (userid)
                break;
 
        case "0.2.3": // SQL queries for v0.2.3
-               $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_member_menu WHERE action='main' AND what='bonus' LIMIT 1";
+               $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_member_menu WHERE what='bonus' LIMIT 1";
                $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_member_menu VALUES (NULL,'main','bonus','Aktiv-Rallye',7,'Y','Y','', 0)";
 
                // Update notes (these will be set as task text!)

diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php
index 645aa6f29502abd1409d3cc82c946a0868e0f6ff..43c5459af375516c40215da5657b23406eb9c287 100644 (file)
--- a/inc/extensions/ext-holiday.php
+++ b/inc/extensions/ext-holiday.php
@@ -88,12 +88,12 @@ case "remove": // Do stuff when removing extension
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
-       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='N' WHERE action='main' AND what='holiday' LIMIT 1";
+       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='N' WHERE what='holiday' LIMIT 1";
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
-       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='Y' WHERE action='main' AND what='holiday' LIMIT 1";
+       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='Y' WHERE what='holiday' LIMIT 1";
        break;
 
 case "update": // Update an extension

diff --git a/inc/extensions/ext-html_mail.php b/inc/extensions/ext-html_mail.php
index 346f7429d0b3086dc9f2130a86685eeca76973fb..01a98f8bc2f0a3fdfa6e487b4287ad2d83a46a87 100644 (file)
--- a/inc/extensions/ext-html_mail.php
+++ b/inc/extensions/ext-html_mail.php
@@ -61,17 +61,17 @@ case "remove": // Do stuff when removing extension
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data DROP html";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_bonus DROP html_msg";
        $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_pool DROP html_msg";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_member_menu WHERE action='main' AND what='html_mail' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_member_menu WHERE what='html_mail' LIMIT 1";
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
-       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='N' WHERE action='main' AND what='html_mail' LIMIT 1";
+       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='N' WHERE what='html_mail' LIMIT 1";
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
-       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='Y' WHERE action='main' AND what='html_mail' LIMIT 1";
+       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='Y' WHERE what='html_mail' LIMIT 1";
        break;
 
 case "update": // Update an extension

diff --git a/inc/extensions/ext-nickname.php b/inc/extensions/ext-nickname.php
index de36467c6df17fb786b05ecb5437ddb27fbd1dc4..76a5f625a4c1d4b002fd1c6bf92a4a6b23ed492c 100644 (file)
--- a/inc/extensions/ext-nickname.php
+++ b/inc/extensions/ext-nickname.php
@@ -67,12 +67,12 @@ case "remove": // Do stuff when removing extension
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
-       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='N' WHERE action='main' AND what='nickname' LIMIT 1";
+       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='N' WHERE what='nickname' LIMIT 1";
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
-       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='Y' WHERE action='main' AND what='nickname' LIMIT 1";
+       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='Y' WHERE what='nickname' LIMIT 1";
        break;
 
 case "update": // Update an extension

diff --git a/inc/extensions/ext-online.php b/inc/extensions/ext-online.php
index 92e91571e64d0023b1af78eb30b5c4d3a4db468c..eea20c913c98aca54118e3edfbbaf91a8d7fc33f 100644 (file)
--- a/inc/extensions/ext-online.php
+++ b/inc/extensions/ext-online.php
@@ -73,7 +73,7 @@ KEY(refid)
 case "remove": // Do stuff when removing extension
        // SQL commands to run
        $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_online";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE action='misc', what='usr_online' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE what='usr_online' LIMIT 1";
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-order.php b/inc/extensions/ext-order.php
index e23f1402a1ca0674606e0db3e93205cc90806bc0..a7d0b9c2606714430a0933bf2b9cf37abb8988ba 100644 (file)
--- a/inc/extensions/ext-order.php
+++ b/inc/extensions/ext-order.php
@@ -285,7 +285,7 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us
                break;
 
        case "0.4.8": // SQL queries for v0.4.8
-               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET title='Mailbuchung' WHERE action='setup' AND what='config_order' LIMIT 1";
+               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET title='Mailbuchung' WHERE what='config_order' LIMIT 1";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Menüpunkt "Mailbuchungsseite" nach "Mailbuchung" umbenannt und weitere Einstellungen aus Sonstige Einstellungen verschoben.";

diff --git a/inc/extensions/ext-payout.php b/inc/extensions/ext-payout.php
index 2951770584a269f994c91699daf82c1cee939553..029dcd91354d59daaa5dd06189560ead00b0a9ff 100644 (file)
--- a/inc/extensions/ext-payout.php
+++ b/inc/extensions/ext-payout.php
@@ -82,17 +82,17 @@ case "remove": // Do stuff when removing extension
        $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_user_payouts";
        $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_payout_types";
        $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE action='payouts'";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_member_menu WHERE action='main' AND what='payout' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_member_menu WHERE what='payout' LIMIT 1";
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
-       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='N' WHERE action='main' AND what='payout' LIMIT 1";
+       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='N' WHERE what='payout' LIMIT 1";
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
-       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='Y' WHERE action='main' AND what='payout' LIMIT 1";
+       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='Y' WHERE what='payout' LIMIT 1";
        break;
 
 case "update": // Update an extension

diff --git a/inc/extensions/ext-primera.php b/inc/extensions/ext-primera.php
index 77638b908e0306b4cafe28f724d3e48d7e40a937..4ea33b11c2cfa2f9954e883ddc0b50bbee842ad5 100644 (file)
--- a/inc/extensions/ext-primera.php
+++ b/inc/extensions/ext-primera.php
@@ -86,17 +86,17 @@ case "remove": // Do stuff when removing extension
        // SQL commands to run
        $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_user_primera";
        $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE action='primera'";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_member_menu WHERE action='main' AND what='primera' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_member_menu WHERE what='primera' LIMIT 1";
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
-       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='N' WHERE action='main' AND what='primera' LIMIT 1";
+       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='N' WHERE what='primera' LIMIT 1";
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
-       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='Y' WHERE action='main' AND what='primera' LIMIT 1";
+       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='Y' WHERE what='primera' LIMIT 1";
        break;
 
 case "update": // Update an extension

diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php
index f1c7adc7a063d3ea13a3fc02ce2cabda5a113011..68a632d88b5ed30c0f47b6c17f9c20accb6344da 100644 (file)
--- a/inc/extensions/ext-register.php
+++ b/inc/extensions/ext-register.php
@@ -58,7 +58,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE action='setup' AND what='config_register' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE what='config_register' LIMIT 1";
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php
index 95ab6a8f3c60e752dd89c6b79f4f31809b918c3d..d759cf7ff6ef8f7c6a5345c17acc46b0e59d5897 100644 (file)
--- a/inc/extensions/ext-surfbar.php
+++ b/inc/extensions/ext-surfbar.php
@@ -146,7 +146,7 @@ case "remove": // Do stuff when removing extension
        $SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_surfbar_salts`";
        $SQLs[] = "DROP TABLE IF EXISTS `"._MYSQL_PREFIX."_surfbar_stats`";
        $SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_member_menu` WHERE `action`='surfbar' LIMIT 5";
-       $SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_admin_menu` WHERE action='surfbar' LIMIT 6";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_admin_menu` WHERE `action`='surfbar' LIMIT 6";
        break;
 
 case "activate": // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-wernis.php b/inc/extensions/ext-wernis.php
index 1e774e0287a7a3523420ada1ab2b5764ab369667..c88c31d6c87e609e59ac2e0c69c794109bd259ec 100644 (file)
--- a/inc/extensions/ext-wernis.php
+++ b/inc/extensions/ext-wernis.php
@@ -97,12 +97,12 @@ case "remove": // Do stuff when removing extension
 
 case "activate": // Do stuff when admin activates this extension
        // SQL commands to run
-       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='N' WHERE action='main' AND what='wernis' LIMIT 1";
+       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='N' WHERE what='wernis' LIMIT 1";
        break;
 
 case "deactivate": // Do stuff when admin deactivates this extension
        // SQL commands to run
-       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='Y' WHERE action='main' AND what='wernis' LIMIT 1";
+       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='Y' WHERE what='wernis' LIMIT 1";
        break;
 
 case "update": // Update an extension

diff --git a/inc/functions.php b/inc/functions.php
index 0e6812343dd13ad168e9a40de97110632a002f35..61d6763fdb8cd5f2551166e1d0d508b044265c3e 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -133,9 +133,10 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) {
                // Clear output buffer for later output
                ob_end_clean();
 
+               // Extension "rewrite" installed?
                if ((EXT_IS_ACTIVE("rewrite", true)) && (function_exists('REWRITE_LINKS')) && ($CSS != "1") && ($CSS != "-1")) {
                        $OUTPUT = REWRITE_LINKS($OUTPUT);
-               }
+               } // END - if
 
                // Compile and run finished rendered HTML code
                while (strpos($OUTPUT, '{!') > 0) {
@@ -144,12 +145,13 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) {
                        $eval = "\$newContent = \"".COMPILE_CODE(addslashes($OUTPUT))."\";";
                        @eval($eval);
 
+                       // Was that eval okay?
                        if (empty($newContent)) {
                                // Something went wrong!
                                die("Evaluation error:<pre>".htmlentities($eval)."</pre>");
-                       }
+                       } // END - if
                        $OUTPUT = $newContent;
-               }
+               } // END - while
 
                // Output code here, DO NOT REMOVE! ;-)
                OUTPUT_RAW($OUTPUT);
@@ -157,13 +159,13 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) {
                // Rewrite links when rewrite extension is active
                if ((EXT_IS_ACTIVE("rewrite", true)) && (function_exists('REWRITE_LINKS')) && ($CSS != "1") && ($CSS != "-1")) {
                        $OUTPUT = REWRITE_LINKS($OUTPUT);
-               }
+               } // END - if
 
                // Compile and run finished rendered HTML code
                while (strpos($OUTPUT, '{!') > 0) {
                        $eval = "\$OUTPUT = \"".COMPILE_CODE(addslashes($OUTPUT))."\";";
                        eval($eval);
-               }
+               } // END - while
 
                // Output code here, DO NOT REMOVE! ;-)
                OUTPUT_RAW($OUTPUT);
@@ -173,13 +175,13 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) {
 // Output the raw HTML code
 function OUTPUT_RAW ($HTML) {
        // Output stripped HTML code to avoid broken JavaScript code, etc.
-       echo stripslashes($HTML);
+       echo stripslashes(stripslashes($HTML));
 
        // Flush the output if only _OB_CACHING is not "on"
        if (_OB_CACHING != "on") {
                // Flush it
                flush();
-       }
+       } // END - if
 }
 
 // Add a fatal error message to the queue array

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index ac63b929b2d49c5435e4e524829d1c94107b4bdd..3e7b2b8ec0c638872fa3908188bd5f819f6e04c4 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -299,7 +299,7 @@ array(
        $DATA = array(
                'hash'    => $hash,
                'uid'     => $userid,
-               'gender'   => $gender,
+               'gender'  => $gender,
                'surname' => SQL_ESCAPE($_POST['surname']),
                'family'  => SQL_ESCAPE($_POST['family_name']),
                'email'   => SQL_ESCAPE($_POST['addy']),
@@ -424,10 +424,10 @@ array(
        // Shall I display the refid or shall I make it editable?
        if ($_CONFIG['display_refid'] == "Y") {
                // Load template to enter it
-               define('REFID_CONTENT', LOAD_TEMPLATE("guest_register_refid", true, $GLOBALS['refid']));
+               define('REFID_CONTENT', LOAD_TEMPLATE("guest_register_refid_hide", true, $GLOBALS['refid']));
        } else {
                // Load "hide" form template
-               define('REFID_CONTENT', LOAD_TEMPLATE("guest_register_refid_hide", true, $GLOBALS['refid']));
+               define('REFID_CONTENT', LOAD_TEMPLATE("guest_register_refid", true, $GLOBALS['refid']));
        }
 
        // You may want to modify the register_header.tpl.xx file and not this script when you add your scripts etc. :-)