Update config.js.php processor to be class based

core/model/modx/processors/system/config.js.class.php

@@ -0,0 +1,174 @@
+<?php
+/*
+ * This file is part of MODX Revolution.
+ *
+ * Copyright (c) MODX, LLC. All Rights Reserved.
+ *
+ * For complete copyright and license information, see the COPYRIGHT and LICENSE
+ * files found in the top-level directory of this distribution.
+ */
+
+/**
+ * Outputs the $modx->config to JSON
+ *
+ * @param string $action If set with context, will output the context info for a
+ * custom context by the action
+ * @param string $context If set with action, will output the context info for a
+ * custom context by its action
+ *
+ * @var modX $modx
+ * @var array $scriptProperties
+ * @package modx
+ * @subpackage processors.system
+ */
+class modConfigJsProcessor extends modProcessor
+{
+
+    public function process()
+    {
+        if (!$this->modx->user->isAuthenticated('mgr')) {
+            return '';
+        }
+        $this->modx->getVersionData();
+
+        $wctx = isset($scriptProperties['wctx']) && !empty($scriptProperties['wctx']) ? $scriptProperties['wctx'] : '';
+        if (!empty($wctx)) {
+            $workingContext = $this->modx->getContext($wctx);
+            if (!$workingContext) {
+                return $this->modx->error->failure($this->modx->error->failure($this->modx->lexicon('permission_denied')));
+            }
+        } else {
+            $workingContext =& $this->modx->context;
+        }
+
+        /* calculate custom resource classes */
+        $this->modx->lexicon->load('resource');
+        $resourceClasses = array();
+        $resourceClassesDrop = array();
+        $resourceClassNames = $this->modx->getDescendants('modResource');
+        $resourceClassNames = array_diff($resourceClassNames, array('modResource'));
+        foreach ($resourceClassNames as $resourceClassName) {
+            /** @var modResource $obj */
+            $obj = $this->modx->newObject($resourceClassName);
+            if ($obj->showInContextMenu) {
+                $lex = $obj->getContextMenuText();
+                $resourceClasses[$resourceClassName] = $lex;
+            }
+
+            if ($obj->allowDrop != -1) {
+                $resourceClassesDrop[$resourceClassName] = $obj->allowDrop;
+            }
+        }
+
+        $template_url = $workingContext->getOption('manager_url', MODX_MANAGER_URL, $this->modx->_userConfig) . 'templates/' . $workingContext->getOption('manager_theme', 'default', $this->modx->_userConfig) . '/';
+        $c = array(
+            'base_url' => $workingContext->getOption('base_url', MODX_BASE_URL, $this->modx->_userConfig),
+            'connectors_url' => $workingContext->getOption('connectors_url', MODX_CONNECTORS_URL, $this->modx->_userConfig),
+            'icons_url' => $template_url . 'images/ext/modext/',
+            'manager_url' => $workingContext->getOption('manager_url', MODX_MANAGER_URL, $this->modx->_userConfig),
+            'template_url' => $template_url,
+            'http_host' => $workingContext->getOption('http_host', MODX_HTTP_HOST, $this->modx->_userConfig),
+            'site_url' => $workingContext->getOption('site_url', MODX_SITE_URL, $this->modx->_userConfig),
+            'http_host_remote' => MODX_URL_SCHEME . $workingContext->getOption('http_host', MODX_HTTP_HOST, $this->modx->_userConfig),
+            'user' => $this->modx->user->get('id'),
+            'version' => $this->modx->version['full_version'],
+            'resource_classes' => $resourceClasses,
+            'resource_classes_drop' => $resourceClassesDrop,
+        );
+
+        // Handle default context
+        $ctx = $this->modx->getContext($this->modx->getOption('default_context', null, 'web'));
+        if ($ctx instanceof modContext && $ctx->prepare()) {
+            $c['default_site_url'] = $ctx->makeUrl($ctx->getOption('site_start'));
+        }
+
+        /* if custom context, load into MODx.config */
+        if (isset($scriptProperties['action']) && $scriptProperties['action'] != '' && isset($this->modx->actionMap[$scriptProperties['action']])) {
+
+            /* pre-2.3 actions */
+            if (intval($scriptProperties['action']) > 0) {
+                $action = $this->modx->actionMap[$scriptProperties['action']];
+                $c['namespace'] = $action['namespace'];
+                $c['namespace_path'] = $action['namespace_path'];
+                $c['namespace_assets_path'] = $action['namespace_assets_path'];
+                $c['help_url'] = ltrim($action['help_url'], '/');
+            } else {
+                $namespace = $this->modx->getOption('namespace', $scriptProperties, 'core');
+                /** @var modNamespace $namespace */
+                $namespace = $this->modx->getObject('modNamespace', $namespace);
+                if ($namespace) {
+                    $c['namespace'] = $namespace->get('name');
+                    $c['namespace_path'] = $namespace->get('path');
+                    $c['namespace_assets_path'] = $namespace->get('assets_url');
+                }
+            }
+        }
+
+        $c = array_merge($this->modx->config, $workingContext->config, $this->modx->_userConfig, $c);
+
+        unset($c['password'], $c['username'], $c['mail_smtp_pass'], $c['mail_smtp_user'], $c['proxy_password'], $c['proxy_username'], $c['connections'], $c['connection_init'], $c['connection_mutable'], $c['dbname'], $c['database'], $c['table_prefix'], $c['driverOptions'], $c['dsn'], $c['session_name'], $c['assets_path'], $c['base_path'], $c['cache_path'], $c['connectors_path'], $c['core_path'], $c['friendly_alias_translit_class_path'], $c['manager_path'], $c['processors_path']);
+
+        $o = "Ext.namespace('MODx'); MODx.config = ";
+        $o .= $this->modx->toJSON($c);
+        $o .= '; MODx.perm = {};';
+
+        // Load actions for backwards compatibility (DEPRECATED)
+        $actions = $this->modx->request->getAllActionIDs();
+        $o .= 'MODx.action = ' . $this->modx->toJSON($actions) . ';';
+
+        if ($this->modx->user) {
+            if ($this->modx->hasPermission('directory_create')) {
+                $o .= 'MODx.perm.directory_create = true;';
+            }
+            if ($this->modx->hasPermission('resource_tree')) {
+                $o .= 'MODx.perm.resource_tree = true;';
+            }
+            if ($this->modx->hasPermission('element_tree')) {
+                $o .= 'MODx.perm.element_tree = true;';
+            }
+            if ($this->modx->hasPermission('file_tree')) {
+                $o .= 'MODx.perm.file_tree = true;';
+            }
+            if ($this->modx->hasPermission('file_upload')) {
+                $o .= 'MODx.perm.file_upload = true;';
+            }
+            if ($this->modx->hasPermission('file_create')) {
+                $o .= 'MODx.perm.file_create = true;';
+            }
+            if ($this->modx->hasPermission('file_manager')) {
+                $o .= 'MODx.perm.file_manager = true;';
+            }
+            if ($this->modx->hasPermission('new_chunk')) {
+                $o .= 'MODx.perm.new_chunk  = true;';
+            }
+            if ($this->modx->hasPermission('new_plugin')) {
+                $o .= 'MODx.perm.new_plugin = true;';
+            }
+            if ($this->modx->hasPermission('new_snippet')) {
+                $o .= 'MODx.perm.new_snippet = true;';
+            }
+            if ($this->modx->hasPermission('new_template')) {
+                $o .= 'MODx.perm.new_template = true;';
+            }
+            if ($this->modx->hasPermission('new_tv')) {
+                $o .= 'MODx.perm.new_tv = true;';
+            }
+            if ($this->modx->hasPermission('new_category')) {
+                $o .= 'MODx.perm.new_category = true;';
+            }
+            if ($this->modx->hasPermission('resourcegroup_resource_edit')) {
+                $o .= 'MODx.perm.resourcegroup_resource_edit = true;';
+            }
+            if ($this->modx->hasPermission('resourcegroup_resource_list')) {
+                $o .= 'MODx.perm.resourcegroup_resource_list = true;';
+            }
+
+            $o .= 'MODx.user = {id:"' . $this->modx->user->get('id') . '",username:"' . $this->modx->user->get('username') . '"}';
+        }
+        @session_write_close();
+        header('Content-Type: application/x-javascript');
+        return $o;
+    }
+}
+
+return 'modConfigJsProcessor';

setup/includes/upgrades/common/2.7.1-cleanup-script.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * Common upgrade script for 2.7.1 to clean up legacy files for download distributions.
+ *
+ * @var modX
+ *
+ * @package setup
+ */
+$paths = array(
+    'assets' => $modx->getOption('assets_path', null, MODX_ASSETS_PATH),
+    'base' => $modx->getOption('base_path', null, MODX_BASE_PATH),
+    'connectors' => $modx->getOption('connectors_path', null, MODX_CONNECTORS_PATH),
+    'core' => $modx->getOption('core_path', null, MODX_CORE_PATH),
+    'manager' => $modx->getOption('manager_path', null, MODX_MANAGER_PATH),
+    'processors' => $modx->getOption('processors_path', null, MODX_PROCESSORS_PATH),
+);
+
+$cleanup = array(
+    'assets' => array(),
+    'base' => array(),
+    'connectors' => array(),
+    'core' => array(),
+    'manager' => array(),
+    'processors' => array(
+        'system/config.js.php',
+    ),
+);
+
+$removedFiles = 0;
+$removedDirs = 0;
+
+if (!function_exists('recursiveRemoveDir')) {
+    function recursiveRemoveDir($dir)
+    {
+        $files = array_diff(scandir($dir), array('.', '..'));
+        foreach ($files as $file) {
+            (is_dir("$dir/$file")) ? recursiveRemoveDir("$dir/$file") : unlink("$dir/$file");
+        }
+
+        return rmdir($dir);
+    }
+}
+
+// Loop through legacy files/folders to clean up
+foreach ($cleanup as $folder => $files) {
+    foreach ($files as $file) {
+        $legacyFile = $paths[$folder].$file;
+        if (file_exists($legacyFile) === true) {
+            if (is_dir($legacyFile) === true) {
+                // Remove legacy directory
+                recursiveRemoveDir($legacyFile);
+                ++$removedDirs;
+            } else {
+                // Remove legacy file
+                unlink($legacyFile);
+                ++$removedFiles;
+            }
+        }
+    }
+}
+
+$this->runner->addResult(
+    modInstallRunner::RESULT_SUCCESS,
+    '<p class="ok">'.$this->install->lexicon('legacy_cleanup_complete').
+    '<br /><small>'.$this->install->lexicon('legacy_cleanup_count', array('files' => $removedFiles, 'folders' => $removedDirs)).'</small></p>'
+);

setup/includes/upgrades/mysql/2.7.1-pl.php

@@ -0,0 +1,3 @@
+<?php
+/* run upgrades common to all db platforms */
+include dirname(dirname(__FILE__)) . '/common/2.7.1-cleanup-script.php';

setup/includes/upgrades/sqlsrv/2.7.1-pl.php

@@ -0,0 +1,3 @@
+<?php
+/* run upgrades common to all db platforms */
+include dirname(dirname(__FILE__)) . '/common/2.7.1-cleanup-script.php';