]> git.mxchange.org Git - mailer.git/blobdiff - inc/modules/admin/what-extensions.php
Rewrites/fixes in extension registration
[mailer.git] / inc / modules / admin / what-extensions.php
index c25ef8fe423ef792f06722c74ab76bddff663ed6..aad057e0f9e8776e69fa1f703092b0f14d9795e1 100644 (file)
@@ -50,24 +50,24 @@ $do = 'overview';
 
 if (isGetRequestParameterSet('reg_ext')) {
        // We are about to register a new extension
-       $do = 'register'; $ext_id = bigintval(getRequestParameter('reg_ext'));
+       $do = 'register'; $taskId = bigintval(getRequestParameter('reg_ext'));
        // The id comes from task management and it is - of course - *not* the extension's name!
 } elseif ((isFormSent('change')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // De-/activate extensions
-       foreach (postRequestParameter('sel') as $ext_id => $active) {
+       foreach (postRequestParameter('sel') as $taskId => $active) {
                // Shall we keep the extension always active?
-               if ((isset($GLOBALS['cache_array']['always_active'][getExtensionName($ext_id)])) && ($GLOBALS['cache_array']['always_active'][getExtensionName($ext_id)] == 'Y') && ($active == 'Y')) {
+               if ((isset($GLOBALS['cache_array']['always_active'][getExtensionName($taskId)])) && ($GLOBALS['cache_array']['always_active'][getExtensionName($taskId)] == 'Y') && ($active == 'Y')) {
                        // Keep this extension active!
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_ALWAYS_ACTIVE', getExtensionName($ext_id)));
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_ALWAYS_ACTIVE', getExtensionName($taskId)));
                } else {
                        // De/activate extension
                        $ACT = 'N'; setExtensionMode('deactivate');
                        if ($active != 'Y') { $ACT = 'Y'; setExtensionMode('activate'); }
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='%s' WHERE `id`=%s AND `ext_active`='%s' LIMIT 1",
-                               array($ACT, bigintval($ext_id), $active), __FILE__, __LINE__);
+                               array($ACT, bigintval($taskId), $active), __FILE__, __LINE__);
 
                        // Run embeded SQL commands
-                       doExtensionSqls($ext_id, getExtensionMode());
+                       doExtensionSqls($taskId, getExtensionMode());
                }
        } // END - foreach
 
@@ -78,9 +78,9 @@ if (isGetRequestParameterSet('reg_ext')) {
        if (isPostRequestParameterSet('modify')) {
                // Change entries
                $cache_update = '0';
-               foreach (postRequestParameter('sel') as $ext_id => $sel) {
+               foreach (postRequestParameter('sel') as $taskId => $sel) {
                        // Secure id
-                       $ext_id = bigintval($ext_id);
+                       $taskId = bigintval($taskId);
 
                        // Change this extension?
                        if ($sel == 1) {
@@ -88,17 +88,17 @@ if (isGetRequestParameterSet('reg_ext')) {
                                setExtensionMode('modify');
 
                                // Get entry for 'active'
-                               $active = postRequestParameter('active', $ext_id);
+                               $active = postRequestParameter('active', $taskId);
 
                                // Update extension's record
                                if (isExtensionInstalledAndNewer('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(postRequestParameter('css', $ext_id), $active, $ext_id), __FILE__, __LINE__);
+                                               array(postRequestParameter('css', $taskId), $active, $taskId), __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",
-                                               array($active, $ext_id), __FILE__, __LINE__);
+                                               array($active, $taskId), __FILE__, __LINE__);
                                }
 
                                // Run SQLs on activation / deactivation
@@ -108,7 +108,7 @@ if (isGetRequestParameterSet('reg_ext')) {
                                } // END - if
 
                                // Run embeded SQL commands
-                               doExtensionSqls($ext_id, getExtensionMode());
+                               doExtensionSqls($taskId, getExtensionMode());
                        }
                }
 
@@ -117,7 +117,7 @@ if (isGetRequestParameterSet('reg_ext')) {
        } else {
                // Edit selected entries
                $OUT = '';
-               foreach (postRequestParameter('sel') as $ext_id => $sel) {
+               foreach (postRequestParameter('sel') as $taskId => $sel) {
                        // Edit this extension?
                        if (($sel == 'Y') || ($sel != 'Y')) {
                                // Default is no CSS for non-updated mailers
@@ -126,12 +126,12 @@ if (isGetRequestParameterSet('reg_ext')) {
                                // Load required data
                                if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) {
                                        $result = SQL_QUERY_ESC("SELECT ext_has_css, ext_active FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `id`=%s LIMIT 1",
-                                               array(bigintval($ext_id)), __FILE__, __LINE__);
+                                               array(bigintval($taskId)), __FILE__, __LINE__);
                                        list($css, $active) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
                                } else {
                                        $result = SQL_QUERY_ESC("SELECT ext_active FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `id`=%s LIMIT 1",
-                                               array(bigintval($ext_id)), __FILE__, __LINE__);
+                                               array(bigintval($taskId)), __FILE__, __LINE__);
                                        list($active) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
                                        $css = 'X';
@@ -140,14 +140,14 @@ if (isGetRequestParameterSet('reg_ext')) {
                                // Prepare CSS column
                                $cssSelection = '---';
                                if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) {
-                                       $cssSelection = addSelectionBox('yn', $css, 'css', $ext_id);
+                                       $cssSelection = addSelectionBox('yn', $css, 'css', $taskId);
                                } // END - if
 
                                // Prepare data for the row template
                                $content = array(
-                                       'id'     => $ext_id,
-                                       'name'   => getExtensionName($ext_id),
-                                       'active' => addSelectionBox('yn', $active, 'active', $ext_id),
+                                       'id'     => $taskId,
+                                       'name'   => getExtensionName($taskId),
+                                       'active' => addSelectionBox('yn', $active, 'active', $taskId),
                                        'css'    => $cssSelection,
                                );
 
@@ -163,18 +163,18 @@ if (isGetRequestParameterSet('reg_ext')) {
 } elseif ((isPostRequestParameterSet('delete')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // List extensions and when verbose is enabled SQL statements which will be executed
        $OUT = '';
-       foreach (postRequestParameter('sel') as $ext_id => $sel) {
+       foreach (postRequestParameter('sel') as $taskId => $sel) {
                // Init variables
                $VERBOSE_OUT = '';
                initSqls();
 
                // Secure id number
-               $ext_id = bigintval($ext_id);
+               $taskId = bigintval($taskId);
 
                // Is the id valid?
-               if (isExtensionIdValid($ext_id)) {
+               if (isExtensionIdValid($taskId)) {
                        // Get extension name
-                       $ext_name = getExtensionName($ext_id);
+                       $ext_name = getExtensionName($taskId);
 
                        if (getConfig('verbose_sql') == 'Y') {
                                // Load SQL commands in remove mode
@@ -186,7 +186,7 @@ if (isGetRequestParameterSet('reg_ext')) {
 
                        // Prepare data for the row template
                        $content = array(
-                               'id'       => $ext_id,
+                               'id'       => $taskId,
                                'ext_name' => $ext_name,
                                'ext_ver'  => getExtensionVersion($ext_name),
                                'verbose'  => $VERBOSE_OUT
@@ -197,7 +197,7 @@ if (isGetRequestParameterSet('reg_ext')) {
                } else {
                        // Prepare data for the row template
                        $content = array(
-                               'id'       => $ext_id
+                               'id'       => $taskId
                        );
 
                        // Not valid!
@@ -211,14 +211,14 @@ if (isGetRequestParameterSet('reg_ext')) {
 } elseif ((isFormSent('remove')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // Remove extensions from DB (you have to delete all files manually!)
        $cache_update = '0';
-       foreach (postRequestParameter('sel') as $ext_id => $active) {
+       foreach (postRequestParameter('sel') as $taskId => $active) {
                // Secure id number
-               $ext_id = bigintval($ext_id);
+               $taskId = bigintval($taskId);
 
                // Is this extension selected and id valid?
-               if (($active == 1) && (isExtensionIdValid($ext_id))) {
+               if (($active == 1) && (isExtensionIdValid($taskId))) {
                        // Run embeded SQL commands
-                       doExtensionSqls($ext_id, 'remove');
+                       doExtensionSqls($taskId, 'remove');
                } // END - if
        } // END - foreach
 
@@ -230,6 +230,22 @@ if (isGetRequestParameterSet('reg_ext')) {
 } elseif (isGetRequestParameterSet('do')) {
        // Demo mode active!
        $do = 'demo';
+} elseif (isGetRequestParameterSet('registered')) {
+       // Extensions changed
+       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_REGISTERED', getExtensionName(getRequestParameter('registered'))));
+
+       // Show next link
+       if (isExtensionActive('task')) {
+               loadTemplate('admin_next_link', false, array(
+                       'url'   => 'modules.php?module=admin&what=list_task',
+                       'title' => '{--ADMIN_EXTENSION_REGISTER_NEXT_LINK--}'
+               ));
+       } else {
+               loadTemplate('admin_next_link', false, array(
+                       'url'   => 'modules.php?module=admin',
+                       'title' => '{--ADMIN_EXTENSION_REGISTER_NEXT_LINK--}'
+               ));
+       }
 } elseif (isGetRequestParameterSet('changed')) {
        // Extensions changed
        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_CHANGED', bigintval(getRequestParameter('changed'))));
@@ -306,10 +322,10 @@ ORDER BY
                SQL_FREERESULT($result);
 
                // Is the id number valid and the task was found?
-               if (($ext_id > 0) && ($task_found == 1)) {
+               if (($taskId > 0) && ($task_found == 1)) {
                        // id is valid so begin with registration, we first want to it's real name from task management (subject column)
                        $result = SQL_QUERY_ESC("SELECT `subject` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s LIMIT 1",
-                               array(bigintval($ext_id)), __FILE__, __LINE__);
+                               array(bigintval($taskId)), __FILE__, __LINE__);
                        list($subject) = SQL_FETCHROW($result);
 
                        // Free result
@@ -327,24 +343,11 @@ ORDER BY
                                // Is the extension deprecated?
                                if (!isExtensionDeprecated()) {
                                        // ... so we can finally register and load it in registration mode
-                                       if (registerExtension($ext_name, $ext_id)) {
+                                       if (registerExtension($ext_name, $taskId)) {
                                                // Errors?
                                                if (!ifFatalErrorsDetected()) {
                                                        // Extension was found and successfully registered
-                                                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_REGISTERED', $ext_name));
-
-                                                       // Show next link
-                                                       if (isExtensionActive('task')) {
-                                                               loadTemplate('admin_next_link', false, array(
-                                                                       'url'   => 'modules.php?module=admin&what=list_task',
-                                                                       'title' => '{--ADMIN_EXTENSION_REGISTER_NEXT_LINK--}'
-                                                               ));
-                                                       } else {
-                                                               loadTemplate('admin_next_link', false, array(
-                                                                       'url'   => 'modules.php?module=admin',
-                                                                       'title' => '{--ADMIN_EXTENSION_REGISTER_NEXT_LINK--}'
-                                                               ));
-                                                       }
+                                                       redirectToUrl('modules.php?module=admin&what=extensions&registered=' . getExtensionId($ext_name));
                                                } else {
                                                        // Errors detected!
                                                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_EXTENSION_NOT_REGISTERED', $ext_name));