From d934dfda17564153b68ab78ccbd04828b95f2546 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 27 Jul 2010 02:11:56 -0600
Subject: [PATCH] Consistently use Horde_Url::setAnchor()

---
 ansel/lib/Ansel.php                         | 6 ++----
 framework/Url/test/Horde/Url/AddTest.php    | 6 +++---
 framework/Url/test/Horde/Url/RemoveTest.php | 4 ++--
 horde/admin/datatree.php                    | 3 +--
 horde/login.php                             | 2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/ansel/lib/Ansel.php b/ansel/lib/Ansel.php
index da244aab9..5f4a955a7 100644
--- a/ansel/lib/Ansel.php
+++ b/ansel/lib/Ansel.php
@@ -259,8 +259,7 @@ class Ansel
                     if ($data['view'] == 'Image' &&
                         !empty($data['gallery_view']) &&
                         $data['gallery_view'] == 'GalleryLightbox') {
-
-                        $url->anchor = $data['image'];
+                        $url->setAnchor($data['image']);
                     }
 
                 } elseif ($data['view'] == 'Results')  {
@@ -298,9 +297,8 @@ class Ansel
                 if ($data['view'] == 'Image' &&
                     !empty($data['gallery_view']) &&
                     $data['gallery_view'] == 'GalleryLightbox') {
-
                     $data['view'] = 'Gallery';
-                    $url->anchor = $data['image'];
+                    $url->setAnchor($data['image']);
                 }
 
                 return $url->add($data)->setRaw(true);
diff --git a/framework/Url/test/Horde/Url/AddTest.php b/framework/Url/test/Horde/Url/AddTest.php
index 42a6f116e..95246ce3e 100644
--- a/framework/Url/test/Horde/Url/AddTest.php
+++ b/framework/Url/test/Horde/Url/AddTest.php
@@ -21,7 +21,7 @@ class Horde_Url_AddTest extends PHPUnit_Framework_TestCase
         $url->add('fez');
         $this->assertEquals('test?foo=1&amp;bar=2&amp;baz=3&amp;fez', (string)$url);
 
-        $url->anchor = 'boo';
+        $url->setAnchor('boo');
         $this->assertEquals('test?foo=1&amp;bar=2&amp;baz=3&amp;fez#boo', (string)$url);
         $url->addAnchor('bee');
         $this->assertEquals('test?foo=1&amp;bar=2&amp;baz=3&amp;fez#bee', (string)$url);
@@ -102,14 +102,14 @@ class Horde_Url_AddTest extends PHPUnit_Framework_TestCase
     public function testParseUrlAnchor()
     {
         $url = new Horde_Url('test?foo=1#bar');
-        $url->anchor = 'baz';
+        $url->setAnchor('baz');
         $this->assertEquals('test?foo=1#baz', (string)$url);
     }
 
     public function testEncodeAnchor()
     {
         $url = new Horde_Url('test');
-        $url->anchor = 'a@b.com';
+        $url->setAnchor('a@b.com');
         $this->assertEquals('test#a%40b.com', (string)$url);
     }
 
diff --git a/framework/Url/test/Horde/Url/RemoveTest.php b/framework/Url/test/Horde/Url/RemoveTest.php
index 6fa4cc08f..0bfddba91 100644
--- a/framework/Url/test/Horde/Url/RemoveTest.php
+++ b/framework/Url/test/Horde/Url/RemoveTest.php
@@ -24,7 +24,7 @@ class Horde_Url_RemoveTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('test?bar=2&baz=3', (string)$url->remove('foo'));
 
         $url = new Horde_Url('test?foo=1#baz');
-        $url->anchor = '';
+        $url->setAnchor('');
         $this->assertEquals('test?foo=1', (string)$url);
     }
 
@@ -43,7 +43,7 @@ class Horde_Url_RemoveTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('test?bar=2&amp;baz=3', (string)$url->remove('foo'));
 
         $url = new Horde_Url('test?foo=1&amp;bar=2#baz');
-        $url->anchor = '';
+        $url->setAnchor('');
         $this->assertEquals('test?foo=1&amp;bar=2', (string)$url);
     }
 
diff --git a/horde/admin/datatree.php b/horde/admin/datatree.php
index 8d3812f43..ff1130e25 100644
--- a/horde/admin/datatree.php
+++ b/horde/admin/datatree.php
@@ -18,8 +18,7 @@ function _addTree($parent, $parent_id, $datatree, $tree, $indent = 1)
 
     foreach ($nodes as $id => $node) {
         if ($id != $parent_id) {
-            $node_url = $url->copy()->add('show', $datatree->getParam('group') . ':' . $id);
-            $node_url->anchor = 'show';
+            $node_url = $url->copy()->add('show', $datatree->getParam('group') . ':' . $id)->setAnchor('show');
 
             $tree->addNode($parent . ':' . $id, $parent, $datatree->getShortName($node), $indent, false, array('url' => strval($node_url)));
             _addTree($parent . ':' . $id, $id, $datatree, $tree, $indent + 1);
diff --git a/horde/login.php b/horde/login.php
index 6580176e0..128dafeb5 100644
--- a/horde/login.php
+++ b/horde/login.php
@@ -36,7 +36,7 @@ function _addAnchor($url, $type, $vars, $url_anchor = null)
     case 'url':
         $anchor = $vars->anchor_string;
         if (!empty($anchor)) {
-            $url->anchor = $anchor;
+            $url->addAnchor($anchor);
         } else {
             return _addAnchor($url, 'param', $vars, $url_anchor);
         }
-- 
2.11.0