remove etomite "compatibility"

Deesen · Aug 2, 2017 · 7f3a73f · 7f3a73f
1 parent 9b2b89f
commit 7f3a73f
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 17 deletions.
diff --git a/index.php b/index.php
@@ -82,7 +82,6 @@
  *	Function: This file loads and executes the parser. *
  */
 
-define("IN_ETOMITE_PARSER", "true"); // provides compatibility with etomite 0.6 and maybe later versions
 define("IN_PARSER_MODE", "true");
 if (!defined('IN_MANAGER_MODE')) {
 	define("IN_MANAGER_MODE", "false");
@@ -107,7 +106,6 @@
 // initiate a new document parser
 include_once(MODX_MANAGER_PATH.'includes/document.parser.class.inc.php');
 $modx = new DocumentParser;
-$etomite = &$modx; // for backward compatibility
 
 // set some parser options
 $modx->minParserPasses = 1; // min number of parser recursive loops or passes

diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php
@@ -320,9 +320,6 @@ function getSettings() {
             }
         }
 
-        // added for backwards compatibility - garry FS#104
-        $this->config['etomite_charset'] = & $this->config['modx_charset'];
-
         // setup default site id - new installation should generate a unique id for the site.
         if(!isset($this->config['site_id'])) $this->config['site_id'] = "MzGeQ2faT4Dw06+U49x3";
 
@@ -1357,7 +1354,6 @@ function detectError($error) {
      * @param array $params
      */
     function evalPlugin($pluginCode, $params) {
-        $etomite = $modx = & $this;
         $modx->event->params = & $params; // store params inside event object
         if (is_array($params)) {
             extract($params, EXTR_SKIP);
@@ -1401,7 +1397,6 @@ function evalPlugin($pluginCode, $params) {
      * @return string
      */
     function evalSnippet($phpcode, $params) {
-        $etomite = $modx = & $this;
         /*
         if(isset($params) && is_array($params)) {
             foreach($params as $k=>$v) {
@@ -1447,8 +1442,6 @@ function evalSnippets($content)
     {
         if(strpos($content,'[[')===false) return $content;
 
-        $etomite= & $this;
-
         $matches = $this->getTagsFromContent($content,'[[',']]');
 
         if(!$matches) return $content;

diff --git a/manager/includes/settings.inc.php b/manager/includes/settings.inc.php
@@ -12,8 +12,6 @@
 }
 
 extract($settings, EXTR_OVERWRITE);
-// add for backwards compatibility - garryn FS#104
-$etomite_charset = & $modx_manager_charset;
 
 // setup default site id - new installation should generate a unique id for the site.
 if(!isset($site_id)) $site_id = "MzGeQ2faT4Dw06+U49x3";

diff --git a/manager/includes/tmplvars.commands.inc.php b/manager/includes/tmplvars.commands.inc.php
@@ -16,7 +16,6 @@
 
 function ProcessTVCommand($value, $name = '', $docid = '', $src='docform', $tvsArray = array()) {
     global $modx;
-    $etomite = & $modx;
     $docid = intval($docid) ? intval($docid) : $modx->documentIdentifier;
     $nvalue = trim($value);
     if (substr($nvalue, 0, 1) != '@')

diff --git a/manager/index.php b/manager/index.php
@@ -127,8 +127,6 @@
 	$_SERVER["DOCUMENT_ROOT"] = str_replace($_SERVER["PATH_INFO"], "", preg_replace("/\\\\/", "/", $_SERVER["PATH_TRANSLATED"]))."/";
 }
 
-define("IN_ETOMITE_SYSTEM", "true"); // for backward compatibility with 0.6
-
 // include_once config file
 $config_filename = "./includes/config.inc.php";
 if (!file_exists($config_filename)) {
@@ -145,7 +143,6 @@
 $modx = new DocumentParser;
 $modx->loadExtension("ManagerAPI");
 $modx->getSettings();
-$etomite = &$modx; // for backward compatibility
 $modx->tstart = $tstart;
 $modx->mstart = $mstart;
 

diff --git a/manager/processors/execute_module.processor.php b/manager/processors/execute_module.processor.php
@@ -64,7 +64,6 @@
 // evalModule
 function evalModule($moduleCode,$params){
 	global $modx;
-	$etomite = &$modx;
 	$modx->event->params = &$params; // store params inside event object
 	if(is_array($params)) {
 		extract($params, EXTR_SKIP);

diff --git a/manager/processors/login.processor.php b/manager/processors/login.processor.php
@@ -23,7 +23,6 @@
 $modx->loadExtension('ManagerAPI');
 $modx->loadExtension('phpass');
 $modx->getSettings();
-$etomite = &$modx;
 
 // include_once the language file
 $_lang = array();