Complete rewrite of and , wrapper functions added, see bug #101

[mailer.git] / inc / modules / admin / what-extensions.php

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index 548d708ade487c736f8f455754c57c095270db3f..7bab8cf7d26a7867a20f1df33db9feab39675d19 100644 (file)
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -43,15 +43,15 @@ ADD_DESCR("admin", __FILE__);
 // Normally we want the overview of all registered extensions
 $do = "overview";
 $SEL = 0;
 // Normally we want the overview of all registered extensions
 $do = "overview";
 $SEL = 0;

-if (!empty($_POST['sel'])) $SEL = SELECTION_COUNT($_POST['sel']);
+if (REQUEST_ISSET_POST(('sel'))) $SEL = SELECTION_COUNT(REQUEST_POST('sel'));

 
 

-if (!empty($_GET['reg_ext'])) {
+if (REQUEST_ISSET_GET(('reg_ext'))) {

        // We are about to register a new extension
        // We are about to register a new extension

-       $do = "register"; $ext_id = bigintval($_GET['reg_ext']);
+       $do = "register"; $ext_id = bigintval(REQUEST_GET('reg_ext'));

        // The ID comes from task management and it is - of course - *not* the extension's name!
        // The ID comes from task management and it is - of course - *not* the extension's name!

-} elseif ((isset($_POST['change'])) && ($SEL > 0) && (!IS_DEMO())) {
+} elseif ((REQUEST_ISSET_POST(('change'))) && ($SEL > 0) && (!IS_DEMO())) {

        // De-/activate extensions
        // De-/activate extensions

-       foreach ($_POST['sel'] as $ext_id => $active) {
+       foreach (REQUEST_POST('sel') as $ext_id => $active) {

                // Shall we keep the extension always active?
                if ((isset($GLOBALS['cache_array']['active_extensions'][GET_EXT_NAME($ext_id)])) && ($GLOBALS['cache_array']['active_extensions'][GET_EXT_NAME($ext_id)] == "Y") && ($active == "N")) {
                        // Keep this extension active!
                // Shall we keep the extension always active?
                if ((isset($GLOBALS['cache_array']['active_extensions'][GET_EXT_NAME($ext_id)])) && ($GLOBALS['cache_array']['active_extensions'][GET_EXT_NAME($ext_id)] == "Y") && ($active == "N")) {
                        // Keep this extension active!


@@ -66,23 +66,23 @@ if (!empty($_GET['reg_ext'])) {
                        EXTENSION_RUN_SQLS($ext_id, $EXT_LOAD_MODE);
                }
        }
                        EXTENSION_RUN_SQLS($ext_id, $EXT_LOAD_MODE);
                }
        }

-} elseif (((isset($_POST['edit'])) || (isset($_POST['modify']))) && ($SEL > 0) && (!IS_DEMO())) {
+} elseif (((REQUEST_ISSET_POST(('edit'))) || (REQUEST_ISSET_POST(('modify')))) && ($SEL > 0) && (!IS_DEMO())) {

        // Change settings like CSS file load
        // Change settings like CSS file load

-       if (isset($_POST['modify'])) {
+       if (REQUEST_ISSET_POST(('modify'))) {

                // Change entries
                $cache_update = 0;
                // Change entries
                $cache_update = 0;

-               foreach ($_POST['sel'] as $ext_id => $sel) {
+               foreach (REQUEST_POST('sel') as $ext_id => $sel) {

                        // Secure ID
                        $ext_id = bigintval($ext_id);
 
                        // Change this extension?
                        if ($sel == 1) {
                                // Update extension's record
                        // Secure ID
                        $ext_id = bigintval($ext_id);
 
                        // Change this extension?
                        if ($sel == 1) {
                                // Update extension's record

-                               $active = $_POST['active'][$ext_id];
+                               $active = REQUEST_POST('active', $ext_id);

                                if (GET_EXT_VERSION("sql_patches") >= "0.0.6")  {
                                        // Update also CSS column when extensions sql_patches is newer or exact v0.0.6
                                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_has_css='%s', ext_active='%s' WHERE id=%s LIMIT 1",
                                if (GET_EXT_VERSION("sql_patches") >= "0.0.6")  {
                                        // Update also CSS column when extensions sql_patches is newer or exact v0.0.6
                                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_has_css='%s', ext_active='%s' WHERE id=%s LIMIT 1",

-                                               array($_POST['css'][$ext_id], $active, $ext_id), __FILE__, __LINE__);
+                                               array(REQUEST_POST('css', $ext_id), $active, $ext_id), __FILE__, __LINE__);

                                } else {
                                        // When extension is older than v0.0.6 there is no column for the CSS information
                                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='%s' WHERE id=%s LIMIT 1",
                                } else {
                                        // When extension is older than v0.0.6 there is no column for the CSS information
                                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='%s' WHERE id=%s LIMIT 1",


@@ -105,7 +105,7 @@ if (!empty($_GET['reg_ext'])) {
        } else {
                // Edit selected entries
                $SW = "2"; $OUT = "";
        } else {
                // Edit selected entries
                $SW = "2"; $OUT = "";

-               foreach ($_POST['sel'] as $ext_id => $sel) {
+               foreach (REQUEST_POST('sel') as $ext_id => $sel) {

                        // Edit this extension?
                        if (($sel == "Y") || ($sel == "N")) {
                                // Load required data
                        // Edit this extension?
                        if (($sel == "Y") || ($sel == "N")) {
                                // Load required data


@@ -146,10 +146,10 @@ if (!empty($_GET['reg_ext'])) {
                LOAD_TEMPLATE("admin_extensions_edit");
                $do = "edit";
        }
                LOAD_TEMPLATE("admin_extensions_edit");
                $do = "edit";
        }

-} elseif ((isset($_POST['delete'])) && ($SEL > 0) && (!IS_DEMO())) {
+} elseif ((REQUEST_ISSET_POST(('delete'))) && ($SEL > 0) && (!IS_DEMO())) {

        // List extensions and when verbose is enabled SQL statements which will be executed
        $SW = 2; $OUT = "";
        // List extensions and when verbose is enabled SQL statements which will be executed
        $SW = 2; $OUT = "";

-       foreach ($_POST['sel'] as $ext_id => $sel) {
+       foreach (REQUEST_POST('sel') as $ext_id => $sel) {

                // Init variables
                $VERBOSE_OUT = ""; $SQLs = array();
 
                // Init variables
                $VERBOSE_OUT = ""; $SQLs = array();
 


@@ -185,10 +185,10 @@ if (!empty($_GET['reg_ext'])) {
        // Load template
        LOAD_TEMPLATE("admin_extensions_delete");
        $do = "delete";
        // Load template
        LOAD_TEMPLATE("admin_extensions_delete");
        $do = "delete";

-} elseif ((isset($_POST['remove'])) && ($SEL > 0) && (!IS_DEMO())) {
+} elseif ((REQUEST_ISSET_POST(('remove'))) && ($SEL > 0) && (!IS_DEMO())) {

        // Remove extensions from DB (you have to delete all files manually!)
        $cache_update = 0;
        // Remove extensions from DB (you have to delete all files manually!)
        $cache_update = 0;

-       foreach ($_POST['sel'] as $ext_id => $active) {
+       foreach (REQUEST_POST('sel') as $ext_id => $active) {

                // Secure ID number
                $ext_id = bigintval($ext_id);
 
                // Secure ID number
                $ext_id = bigintval($ext_id);
 


@@ -201,18 +201,18 @@ if (!empty($_GET['reg_ext'])) {
                        EXTENSION_RUN_SQLS($ext_id, "remove");
                } // END - if
        } // END - foreach
                        EXTENSION_RUN_SQLS($ext_id, "remove");
                } // END - if
        } // END - foreach

-} elseif (!empty($_GET['do']) && (!IS_DEMO())) {
+} elseif (REQUEST_ISSET_GET(('do')) && (!IS_DEMO())) {

        // Other things to do
        // Other things to do

-       $do = SQL_ESCAPE(strip_tags($_GET['do']));
-} elseif (!empty($_GET['do'])) {
+       $do = SQL_ESCAPE(strip_tags(REQUEST_GET('do')));
+} elseif (REQUEST_ISSET_GET(('do'))) {

        // Demo mode active!
        $do = "demo";
 }
 
 // Shall we display active/inactive extensions?
 $where = "";
        // Demo mode active!
        $do = "demo";
 }
 
 // Shall we display active/inactive extensions?
 $where = "";

-if (!empty($_GET['active'])) {
-       $where = sprintf("WHERE ext_active = '%s'", SQL_ESCAPE(strip_tags($_GET['active'])));
+if (REQUEST_ISSET_GET(('active'))) {
+       $where = sprintf("WHERE ext_active = '%s'", SQL_ESCAPE(strip_tags(REQUEST_GET('active'))));

 } // END - if
 
 // Case selection
 } // END - if
 
 // Case selection