Merge branch 'release-2.2' into develop

* release-2.2: Remove debugging code (Loud Sigh) Bump version for 2.2.8-pl Fix pass var by ref error in modX::getInstance() [modxcms#9450] Prevent non-existent Context initialization Fixed offline problem described in http://tracker.modx.com/issues/6138 [modxcms#9859] Fix a near infinite recursion loop on TV ouptut filtering [modxcms#9896] Reduces time to process TVs Conflicts: _build/build.sample.properties _build/build.xml core/docs/changelog.txt core/docs/version.inc.php
sebastian-marinescu · Jun 4, 2013 · 84f3012 · 84f3012
2 parents fa82f33 + 3161ed1
commit 84f3012
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 23 deletions.
diff --git a/connectors/index.php b/connectors/index.php
@@ -34,7 +34,7 @@
 $modx->initialize($ctx);
 
 if (defined('MODX_REQP') && MODX_REQP === false) {
-} else if (!$modx->context->checkPolicy('load')) {
+} else if (!is_object($modx->context) || !$modx->context->checkPolicy('load')) {
     header("Content-Type: application/json; charset=UTF-8");
     header('HTTP/1.1 401 Not Authorized');
     echo $modx->toJSON(array(

diff --git a/core/docs/changelog.txt b/core/docs/changelog.txt
@@ -7,6 +7,12 @@ development release, and is only shown to give an idea of what's currently in th
 - Allow Namespace-based loading of custom TV files
 - Deprecate usage of modAction objects in favor of modNamespace base controller path
 
+MODX Revolution 2.2.8-pl (June 4, 2013)
+====================================
+- [#9450] Prevent non-existent Context initialization
+- [#9896] Improve performance of modTemplateVar::getRenderDirectories()
+- [#9859] Prevent conditional output filter recursion
+- [#6138] Handle offline errors in RSS feeds
 - Refresh file tree after removing file
 - [#9946] Do not cache modResource::$_isForward
 - Force browser to root on Media Source change

diff --git a/core/model/modx/filters/modoutputfilter.class.php b/core/model/modx/filters/modoutputfilter.class.php
@@ -49,7 +49,7 @@ function __construct(modX &$modx) {
     /**
      * Filters the output
      * 
-     * @param mixed $element The element to filter
+     * @param modElement $element The element to filter
      */
     public function filter(&$element) {
         $usemb = function_exists('mb_strlen') && (boolean)$this->modx->getOption('use_multibyte',null,false);
@@ -633,6 +633,8 @@ public function filter(&$element) {
                     $this->modx->log(modX::LOG_LEVEL_ERROR,$e->getMessage());
                 }
             }
+            // convert $output to string if there were any processing
+            $output = (string)$output;
         }
     }
 

diff --git a/core/model/modx/modcachemanager.class.php b/core/model/modx/modcachemanager.class.php
@@ -148,6 +148,8 @@ public function generateContext($key, array $options = array()) {
 
                 /* cache the Context ACL policies */
                 $results['policies'] = $obj->findPolicy($contextKey);
+            } else {
+                $results = false;
             }
         } else {
             $results = $this->getOption("{$key}_results", $options, array());

diff --git a/core/model/modx/modtemplatevar.class.php b/core/model/modx/modtemplatevar.class.php
@@ -19,7 +19,7 @@
  * @property string $properties An array of default properties for this TV
  * @property string $input_properties An array of input properties related to the rendering of the input of this TV
  * @property string $output_properties An array of output properties related to the rendering of the output of this TV
- * 
+ *
  * @todo Refactor this to allow user-defined and configured input and output
  * widgets.
  * @see modTemplateVarResource
@@ -46,6 +46,13 @@ class modTemplateVar extends modElement {
     /** @var modX $xpdo */
     public $xpdo;
 
+    /**
+     * A cache for modTemplateVar::getRenderDirectories()
+     * @see getRenderDirectories()
+     * @var array $_renderPaths
+     */
+    private static $_renderPaths = array();
+
     /**
      * Creates a modTemplateVar instance, and sets the token of the class to *
      *
@@ -488,14 +495,21 @@ public function registerRenderMethod($type,$method,$className) {
      * @return array The found render directories
      */
     public function getRenderDirectories($event,$subdir) {
-        $renderPath = $this->xpdo->getOption('processors_path').'element/tv/renders/'.$this->xpdo->context->get('key').'/'.$subdir.'/';
+        $context = $this->xpdo->context->get('key');
+        $renderPath = $this->xpdo->getOption('processors_path').'element/tv/renders/'.$context.'/'.$subdir.'/';
         $renderDirectories = array(
             $renderPath,
             $this->xpdo->getOption('processors_path').'element/tv/renders/'.($subdir == 'input' ? 'mgr' : 'web').'/'.$subdir.'/',
         );
         $pluginResult = $this->xpdo->invokeEvent($event,array(
-            'context' => $this->xpdo->context->get('key'),
+            'context' => $context,
         ));
+        $pathsKey = serialize($pluginResult).$context.$event.$subdir;
+        /* return cached value if exists */
+        if (isset(self::$_renderPaths[$pathsKey])) {
+            return self::$_renderPaths[$pathsKey];
+        }
+        /* process if there is no cached value */
         if (!is_array($pluginResult) && !empty($pluginResult)) { $pluginResult = array($pluginResult); }
         if (!empty($pluginResult)) {
             foreach ($pluginResult as $result) {
@@ -505,7 +519,6 @@ public function getRenderDirectories($event,$subdir) {
         }
 
         /* search directories */
-        $types = array();
         $renderPaths = array();
         foreach ($renderDirectories as $renderDirectory) {
             if (empty($renderDirectory) || !is_dir($renderDirectory)) continue;
@@ -517,8 +530,8 @@ public function getRenderDirectories($event,$subdir) {
                 }
             } catch (UnexpectedValueException $e) {}
         }
-        $renderPaths = array_unique($renderPaths);
-        return $renderPaths;
+        self::$_renderPaths[$pathsKey] = array_unique($renderPaths);
+        return self::$_renderPaths[$pathsKey];
     }
 
     /**

diff --git a/core/model/modx/modx.class.php b/core/model/modx/modx.class.php
@@ -392,7 +392,8 @@ public static function getInstance($id = null, $config = null, $forceNew = false
             if (!is_null($config) || $forceNew || empty(self::$instances)) {
                 $id = uniqid($class);
             } else {
-                $id = key(self::$instances);
+                $instances =& self::$instances;
+                $id = key($instances);
             }
         }
         if ($forceNew || !array_key_exists($id, self::$instances) || !(self::$instances[$id] instanceof $class)) {
@@ -1834,7 +1835,7 @@ public function hasPermission($pm) {
 
     /**
      * Logs a manager action.
-     * 
+     *
      * @param string $action The action to pull from the lexicon module.
      * @param string $class_key The class key that the action is being performed on.
      * @param mixed $item The primary key id or array of keys to grab the object with.
@@ -2099,7 +2100,7 @@ public function checkSiteStatus() {
 
     /**
      * Add an extension package to MODX
-     * 
+     *
      * @param string $name
      * @param string $path
      * @param array $options
@@ -2153,7 +2154,7 @@ public function addExtensionPackage($name,$path,array $options = array()) {
 
     /**
      * Remove an extension package from MODX
-     * 
+     *
      * @param string $name
      * @return boolean
      */
@@ -2239,6 +2240,7 @@ protected function _initContext($contextKey, $regenerate = false, $options = nul
         }
         if ($this->context) {
             if (!$this->context->prepare((boolean) $regenerate, is_array($options) ? $options : array())) {
+                $this->context= null;
                 $this->log(modX::LOG_LEVEL_ERROR, 'Could not prepare context: ' . $contextKey);
             } else {
                 //This fixes error with multiple contexts

diff --git a/core/model/modx/xmlrss/rssfetch.class.php b/core/model/modx/xmlrss/rssfetch.class.php
@@ -161,7 +161,7 @@ function fetch_rss ($url) {
 
         $resp = _fetch_remote_file( $url, $request_headers );
 
-        if (isset($resp) and $resp) {
+        if ($resp) {
           if ($resp->status == '304' ) {
                 // we have the most current copy
                 if ( MAGPIE_DEBUG > 1) {
@@ -187,6 +187,10 @@ function fetch_rss ($url) {
                 if ( $resp->status == '-100' ) {
                     $errormsg .= "(Request timed out after " . MAGPIE_FETCH_TIME_OUT . " seconds)";
                 }
+                elseif ( $resp->status == '0' ) {
+                    // you sir, are offline
+                    return false;
+                }
                 elseif ( $resp->error ) {
                     # compensate for Snoopy's annoying habbit to tacking
                     # on '\n'

diff --git a/manager/controllers/default/dashboard/widget.modx-news.php b/manager/controllers/default/dashboard/widget.modx-news.php
@@ -25,13 +25,15 @@ public function render() {
         $newsEnabled = $this->modx->getOption('feed_modx_news_enabled',null,true);
         if (!empty($url) && !empty($newsEnabled)) {
             $rss = $this->rss->parse($url);
-            foreach (array_keys($rss->items) as $key) {
-                $item= &$rss->items[$key];
-                $item['pubdate'] = strftime('%c',$item['date_timestamp']);
-                $o[] = $this->getFileChunk('dashboard/rssitem.tpl',$item);
+            if (is_object($rss)) {
+                foreach (array_keys($rss->items) as $key) {
+                    $item= &$rss->items[$key];
+                    $item['pubdate'] = strftime('%c',$item['date_timestamp']);
+                    $o[] = $this->getFileChunk('dashboard/rssitem.tpl',$item);
+                }
             }
         }
         return implode("\n",$o);
     }
 }
-return 'modDashboardWidgetNewsFeed';
+return 'modDashboardWidgetNewsFeed';
diff --git a/manager/controllers/default/dashboard/widget.modx-security.php b/manager/controllers/default/dashboard/widget.modx-security.php
@@ -22,13 +22,15 @@ public function render() {
         $newsEnabled = $this->modx->getOption('feed_modx_security_enabled',null,true);
         if (!empty($url) && !empty($newsEnabled)) {
             $rss = $this->rss->parse($url);
-            foreach (array_keys($rss->items) as $key) {
-                $item= &$rss->items[$key];
-                $item['pubdate'] = strftime('%c',$item['date_timestamp']);
-                $o[] = $this->getFileChunk('dashboard/rssitem.tpl',$item);
+            if (is_object($rss)) {
+                foreach (array_keys($rss->items) as $key) {
+                    $item= &$rss->items[$key];
+                    $item['pubdate'] = strftime('%c',$item['date_timestamp']);
+                    $o[] = $this->getFileChunk('dashboard/rssitem.tpl',$item);
+                }
             }
         }
         return implode("\n",$o);
     }
 }
-return 'modDashboardWidgetSecurityFeed';
+return 'modDashboardWidgetSecurityFeed';