Changeset 16588

Timestamp:

06/13/08 08:18:45 (1 year ago)

Author:

rambo

Message:

prevent the feed registrations from hijacking the url-space in straight-mode, fixed can_handle_dispatcher

Files:

• branches/MidCOM_2_8/org.routamc.photostream/handler/feed.php (modified) (1 diff)
• branches/MidCOM_2_8/org.routamc.photostream/viewer.php (modified) (4 diffs)

branches/MidCOM_2_8/org.routamc.photostream/handler/feed.php

@@ -63 +63 @@
-    function _can_handle_dispatcher($handler_id, $args)
-    {
-
-
+
+
+
+
+
+
+
+
+
+
-            return false;
-        }

branches/MidCOM_2_8/org.routamc.photostream/viewer.php

@@ -361 +361 @@
-            'variable_args' => 0,
-        );
-
-        $this->_request_switch['api-email'] = Array
-        (
-            'handler' => Array('org_routamc_photostream_handler_api_email', 'import'),
-            'fixed_args' => Array('api', 'email'),
-        );
-        
-        // Handle /sort/<property>/
@@ -382 +376 @@
-            'fixed_args' => array('sort'),
-            'variable_args' => 2,
+        );
+
+        // Handle /api/email
+        $this->_request_switch['api-email'] = Array
+        (
+            'handler' => Array('org_routamc_photostream_handler_api_email', 'import'),
+            'fixed_args' => Array('api', 'email'),
-        );
-
@@ -504 +505 @@
-            unset($new_id, $new_switch);
-        }
+        /*
+        debug_push_class(__CLASS__, __FUNCTION__);
+        debug_print_r('new $this->_request_switch: ', $this->_request_switch);
+        debug_pop();
+        */
-    }
-
@@ -509 +515 @@
-    {
-        debug_push_class(__CLASS__, __FUNCTION__);
+        debug_print_r('Checking $new_switch: ', $new_switch);
+        if (   (   !isset($new_switch['fixed_args'])
+                || empty($new_switch['fixed_args'])
+            && $new_switch['variable_args'] == 1)
+            )
+        {
+            // Since we do not want to make hugely elaborate can_handle we just disallow feed handler that would trap the /<feedtype> (preventing subfolders etc)
+            debug_add('$new_switch would trap /<anything>, which is bad, rewriting to /feed/index/<anything>', MIDCOM_LOG_INFO);
+            array_unshift($new_switch['fixed_args'], 'feed', 'index');
+            debug_print_r('$new_switch after rewrite: ', $new_switch);
+            debug_pop();
+            return true;
+        }
-        foreach ($this->_request_switch as $handler_id => $switch_data)
-        {