Changeset 64093 for modules/sapphire

Timestamp:

12/10/08 00:16:03 (8 weeks ago)

Author:

ajshort

Message:

ENHANCEMENT: Updated SSViewer to allow any character except ) inside the arguments of a function within a control block
API CHANGE: Refactored ContentController::ChildrenOf?() and ContentController::Page() to use SiteTree::get_by_link()
MINOR: Added slightly more documentation to SSViewer

Location:

modules/sapphire/branches/nestedurls/core

Files:

• control/ContentController.php (modified) (2 diffs)
• SSViewer.php (modified) (1 diff)

modules/sapphire/branches/nestedurls/core/control/ContentController.php

@@ -34 +34 @@
         //----------------------------------------------------------------------------------//
         // These flexible data methods remove the need for custom code to do simple stuff
-
-        /*
+        
+        /**
          * Return the children of the given page.
-         * $parentRef can be a page number or a URLSegment
+         *
+         * @param string|int $parentRef a page link or a page ID
+         * @return SiteTree
          */
         public function ChildrenOf($parentRef) {
-                $SQL_parentRef = Convert::raw2sql($parentRef);
-                $parent = DataObject::get_one('SiteTree', "URLSegment = '$SQL_parentRef'");
-
+                $parent = SiteTree::get_by_link($parentRef);
                 if(!$parent && is_numeric($parentRef)) $parent = DataObject::get_by_id('SiteTree', $SQL_parentRef);
+                
                 if($parent) {
                         return $parent->Children();
@@ -49 +50 @@
                         user_error("Error running <% control ChildrenOf($parentRef) %>: page '$parentRef' couldn't be found", E_USER_WARNING);
                 }
-
-        }
-
+                
+        }
+        
+        /**
+         * Get a page by its link
+         *
+         * @param string $url
+         * @return SiteTree
+         */
         public function Page($url) {
-                $SQL_url = Convert::raw2sql($url);
-                return DataObject::get_one('SiteTree', "URLSegment = '$SQL_url'");
-        }
-
+                return SiteTree::get_by_link($url);
+        }
+        
         public function init() {
                 parent::init();

modules/sapphire/branches/nestedurls/core/SSViewer.php

@@ -376 +376 @@
                 $content = ereg_replace('<!-- +pc +([A-Za-z0-9_(),]+) +-->', '<' . '% control \\1 %' . '>', $content);
                 $content = ereg_replace('<!-- +pc_end +-->', '<' . '% end_control %' . '>', $content);
-
+                
+                // <% control Foo %>
                 $content = ereg_replace('<' . '% +control +([A-Za-z0-9_]+) +%' . '>', '<? array_push($itemStack, $item); if($loop = $item->obj("\\1")) foreach($loop as $key => $item) { ?>', $content);
+                // <% control Foo.Bar %>
                 $content = ereg_replace('<' . '% +control +([A-Za-z0-9_]+)\\.([A-Za-z0-9_]+) +%' . '>', '<? array_push($itemStack, $item); if(($loop = $item->obj("\\1")) && ($loop = $loop->obj("\\2"))) foreach($loop as $key => $item) { ?>', $content);
-
-                $content = ereg_replace('<' . '% +control +([A-Za-z0-9_]+)\\.([A-Za-z0-9_]+)\\(([A-Za-z0-9_-]+)\\) +%' . '>', '<? array_push($itemStack, $item); if(($loop = $item->obj("\\1")) && ($loop = $loop->obj("\\2", array("\\3")))) foreach($loop as $key => $item) { ?>', $content);
-
-                $content = ereg_replace('<' . '% +control +([A-Za-z0-9_]+)\\(([A-Za-z0-9_-]+)\\) +%' . '>', '<? array_push($itemStack, $item); if($loop = $item->obj("\\1", array("\\2"))) foreach($loop as $key => $item) { ?>', $content);
-                $content = ereg_replace('<' . '% +control +([A-Za-z0-9_]+)\\(([A-Za-z0-9_-]+), *([A-Za-z0-9_-]+)\\) +%' . '>', '<? array_push($itemStack, $item); if($loop = $item->obj("\\1", array("\\2","\\3"))) foreach($loop as $key => $item) { ?>', $content);
-                $content = ereg_replace('<' . '% +control +([A-Za-z0-9_]+)\\(([A-Za-z0-9_-]+), *([A-Za-z0-9_-]+), *([A-Za-z0-9_-]+)\\) +%' . '>', '<? array_push($itemStack, $item); if($loop = $item->obj("\\1", array("\\2", "\\3", "\\4"))) foreach($loop as $key => $item) { ?>', $content);
+                // <% control Foo.Bar(Baz) %>
+                $content = ereg_replace('<' . '% +control +([A-Za-z0-9_]+)\\.([A-Za-z0-9_]+)\\(([^)]+)\\) +%' . '>', '<? array_push($itemStack, $item); if(($loop = $item->obj("\\1")) && ($loop = $loop->obj("\\2", array("\\3")))) foreach($loop as $key => $item) { ?>', $content);
+                // <% control Foo(Bar) %>
+                $content = ereg_replace('<' . '% +control +([A-Za-z0-9_]+)\\(([^)]+)\\) +%' . '>', '<? array_push($itemStack, $item); if($loop = $item->obj("\\1", array("\\2"))) foreach($loop as $key => $item) { ?>', $content);
+                // <% control Foo(Bar, Baz) %>
+                $content = ereg_replace('<' . '% +control +([A-Za-z0-9_]+)\\(([^)]+), *([^)]+)\\) +%' . '>', '<? array_push($itemStack, $item); if($loop = $item->obj("\\1", array("\\2","\\3"))) foreach($loop as $key => $item) { ?>', $content);
+                // <% control Foo(Bar, Baz, Buz) %>
+                $content = ereg_replace('<' . '% +control +([A-Za-z0-9_]+)\\(([^)]+), *([^)]+), *([^)]+)\\) +%' . '>', '<? array_push($itemStack, $item); if($loop = $item->obj("\\1", array("\\2", "\\3", "\\4"))) foreach($loop as $key => $item) { ?>', $content);
                 $content = ereg_replace('<' . '% +end_control +%' . '>', '<? } $item = array_pop($itemStack); ?>', $content);
                 $content = ereg_replace('<' . '% +debug +%' . '>', '<? Debug::show($item) ?>', $content);