From 9935eb9244aeb7fda6230837c1f720dc92b63120 Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Tue, 23 Mar 2010 06:55:54 +0100
Subject: [PATCH] "private" -> "personal"

---
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php |  2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php    | 14 +++++++-------
 .../lib/Horde/Kolab/Storage/Namespace/Element.php          |  2 +-
 .../lib/Horde/Kolab/Storage/Namespace/Element/Other.php    |  2 +-
 .../Namespace/Element/{Private.php => Personal.php}        |  8 ++++----
 .../lib/Horde/Kolab/Storage/Namespace/Element/Shared.php   |  2 +-
 .../lib/Horde/Kolab/Storage/Namespace/Fixed.php            | 10 +++++-----
 framework/Kolab_Storage/package.xml                        |  4 ++--
 .../test/Horde/Kolab/Storage/NamespaceTest.php             | 12 ++++++------
 9 files changed, 28 insertions(+), 28 deletions(-)
 rename framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/{Private.php => Personal.php} (60%)

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
index d3ed639cf..235e6486c 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
@@ -486,7 +486,7 @@ class Horde_Kolab_Storage_Folder
              * rather than in a module nearer to the applications.
              */
             switch ($owner) {
-            case Horde_Kolab_Storage_Namespace::PRIV:
+            case Horde_Kolab_Storage_Namespace::PERSONAL:
                 $this->_owner = Horde_Auth::getAuth();
                 break;
             case Horde_Kolab_Storage_Namespace::SHARED:
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php
index 4908a8905..639c71a1f 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace.php
@@ -30,9 +30,9 @@
 abstract class Horde_Kolab_Storage_Namespace
 {
     /** The possible namespace types (RFC 2342 [5]) */
-    const PRIV   = 'private';
-    const OTHER  = 'other';
-    const SHARED = 'shared';
+    const PERSONAL = 'personal';
+    const OTHER    = 'other';
+    const SHARED   = 'shared';
 
     /**
      * The namespaces.
@@ -78,18 +78,18 @@ abstract class Horde_Kolab_Storage_Namespace
     {
         $this->_charset = Horde_Nls::getCharset();
         if (empty($this->_primaryPersonalNamespace)) {
-            $priv = null;
+            $personal = null;
             foreach ($this->_namespaces as $namespace) {
                 if ($namespace->getName() == 'INBOX') {
                     $this->_primaryPersonalNamespace = $namespace;
                     break;
                 }
-                if (empty($priv) && $namespace->getType() == self::PRIV) {
-                    $priv = $namespace;
+                if (empty($personal) && $namespace->getType() == self::PERSONAL) {
+                    $personal = $namespace;
                 }
             }
             if (empty($this->_primaryPersonalNamespace)) {
-                $this->_primaryPersonalNamespace = $priv;
+                $this->_primaryPersonalNamespace = $personal;
             }
         }
     }
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element.php
index 6f717bc7b..1bbba5ab2 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element.php
@@ -29,7 +29,7 @@ abstract class Horde_Kolab_Storage_Namespace_Element
     }
 
     /**
-     * Return the type of this namespace (private, other, or shared).
+     * Return the type of this namespace (personal, other, or shared).
      *
      * @return string The type.
      */
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Other.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Other.php
index 583e53473..5aa932d5c 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Other.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Other.php
@@ -4,7 +4,7 @@ class Horde_Kolab_Storage_Namespace_Element_Other
 extends Horde_Kolab_Storage_Namespace_Element
 {
     /**
-     * Return the type of this namespace (private, other, or shared).
+     * Return the type of this namespace (personal, other, or shared).
      *
      * @return string The type.
      */
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Private.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Personal.php
similarity index 60%
rename from framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Private.php
rename to framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Personal.php
index cae23d68b..a0f368691 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Private.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Personal.php
@@ -1,16 +1,16 @@
 <?php
 
-class Horde_Kolab_Storage_Namespace_Element_Private
+class Horde_Kolab_Storage_Namespace_Element_Personal
 extends Horde_Kolab_Storage_Namespace_Element
 {
     /**
-     * Return the type of this namespace (private, other, or shared).
+     * Return the type of this namespace (personal, other, or shared).
      *
      * @return string The type.
      */
     public function getType()
     {
-        return Horde_Kolab_Storage_Namespace::PRIV;
+        return Horde_Kolab_Storage_Namespace::PERSONAL;
     }
 
     /**
@@ -22,6 +22,6 @@ extends Horde_Kolab_Storage_Namespace_Element
      */
     public function getOwner($name)
     {
-        return Horde_Kolab_Storage_Namespace::PRIV;
+        return Horde_Kolab_Storage_Namespace::PERSONAL;
     }
 }
\ No newline at end of file
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Shared.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Shared.php
index 9d766aab3..8e63f2183 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Shared.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Element/Shared.php
@@ -4,7 +4,7 @@ class Horde_Kolab_Storage_Namespace_Element_Shared
 extends Horde_Kolab_Storage_Namespace_Element
 {
     /**
-     * Return the type of this namespace (private, other, or shared).
+     * Return the type of this namespace (personal, other, or shared).
      *
      * @return string The type.
      */
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Fixed.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Fixed.php
index ce9558bf5..6867d87b5 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Fixed.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Namespace/Fixed.php
@@ -45,13 +45,13 @@ extends  Horde_Kolab_Storage_Namespace
     {
         parent::__construct();
 
-        $priv = new Horde_Kolab_Storage_Namespace_Element_Private('INBOX', '/');
-        $other = new Horde_Kolab_Storage_Namespace_Element_Other('user', '/');
-        $shared = new Horde_Kolab_Storage_Namespace_Element_SharedWithPrefix('', '/', 'shared.');
+        $personal = new Horde_Kolab_Storage_Namespace_Element_Personal('INBOX', '/');
+        $other    = new Horde_Kolab_Storage_Namespace_Element_Other('user', '/');
+        $shared   = new Horde_Kolab_Storage_Namespace_Element_SharedWithPrefix('', '/', 'shared.');
 
-        $this->_namespaces = array($priv, $other);
+        $this->_namespaces = array($personal, $other);
         $this->_any = $shared;
-        $this->_primaryPersonalNamespace = $priv;
+        $this->_primaryPersonalNamespace = $personal;
         $this->_sharedPrefix = 'shared.';
     }
 }
\ No newline at end of file
diff --git a/framework/Kolab_Storage/package.xml b/framework/Kolab_Storage/package.xml
index 3d71c9a99..2710aaa1f 100644
--- a/framework/Kolab_Storage/package.xml
+++ b/framework/Kolab_Storage/package.xml
@@ -85,7 +85,7 @@
         <file name="Element.php" role="php" />
         <dir name="Element">
          <file name="Other.php" role="php" />
-         <file name="Private.php" role="php" />
+         <file name="Personal.php" role="php" />
          <file name="Shared.php" role="php" />
          <file name="SharedWithPrefix.php" role="php" />
         </dir> <!-- /lib/Horde/Kolab/Storage/Element -->
@@ -204,7 +204,7 @@
    <install as="Horde/Kolab/Storage/Namespace/Config.php" name="lib/Horde/Kolab/Storage/Namespace/Config.php" />
    <install as="Horde/Kolab/Storage/Namespace/Element.php" name="lib/Horde/Kolab/Storage/Namespace/Element.php" />
    <install as="Horde/Kolab/Storage/Namespace/Element/Other.php" name="lib/Horde/Kolab/Storage/Namespace/Element/Other.php" />
-   <install as="Horde/Kolab/Storage/Namespace/Element/Private.php" name="lib/Horde/Kolab/Storage/Namespace/Element/Private.php" />
+   <install as="Horde/Kolab/Storage/Namespace/Element/Personal.php" name="lib/Horde/Kolab/Storage/Namespace/Element/Personal.php" />
    <install as="Horde/Kolab/Storage/Namespace/Element/Shared.php" name="lib/Horde/Kolab/Storage/Namespace/Element/Shared.php" />
    <install as="Horde/Kolab/Storage/Namespace/Element/SharedWithPrefix.php" name="lib/Horde/Kolab/Storage/Namespace/Element/SharedWithPrefix.php" />
    <install as="Horde/Kolab/Storage/Namespace/Fixed.php" name="lib/Horde/Kolab/Storage/Namespace/Fixed.php" />
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php
index 921321efa..c3b23ed1a 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/NamespaceTest.php
@@ -38,7 +38,7 @@ class Horde_Kolab_Storage_NamespaceTest extends PHPUnit_Framework_TestCase
         $this->_connection = $this->getMock('Horde_Kolab_Storage_Driver');
     }
 
-    public function testFolderTitleIsEmptyForPrivateNamespace()
+    public function testFolderTitleIsEmptyForPersonalNamespace()
     {
         foreach ($this->_getNamespaces() as $namespace) {
             $folder = new Horde_Kolab_Storage_Folder('INBOX');
@@ -47,7 +47,7 @@ class Horde_Kolab_Storage_NamespaceTest extends PHPUnit_Framework_TestCase
         }
     }
 
-    public function testFolderTitleDoesNotContainPrivateNamespace()
+    public function testFolderTitleDoesNotContainPersonalNamespace()
     {
         foreach ($this->_getNamespaces() as $namespace) {
             $folder = new Horde_Kolab_Storage_Folder('INBOX/test');
@@ -96,7 +96,7 @@ class Horde_Kolab_Storage_NamespaceTest extends PHPUnit_Framework_TestCase
         }
     }
 
-    public function testFolderOwnerIsCurrentUserIfPrefixMatchesPrivateNamespace()
+    public function testFolderOwnerIsCurrentUserIfPrefixMatchesPersonalNamespace()
     {
         foreach ($this->_getNamespaces() as $namespace) {
             $_SESSION['horde_auth']['userId'] = 'test';
@@ -106,7 +106,7 @@ class Horde_Kolab_Storage_NamespaceTest extends PHPUnit_Framework_TestCase
         }
     }
 
-    public function testFolderOwnerIsCurrentUserIfPrefixContainsPrivateNamespace()
+    public function testFolderOwnerIsCurrentUserIfPrefixContainsPersonalNamespace()
     {
         foreach ($this->_getNamespaces() as $namespace) {
             $_SESSION['horde_auth']['userId'] = 'test';
@@ -271,7 +271,7 @@ class Horde_Kolab_Storage_NamespaceTest extends PHPUnit_Framework_TestCase
             new Horde_Kolab_Storage_Namespace_Config(
                 array(
                     array(
-                        'type' => Horde_Kolab_Storage_Namespace::PRIV,
+                        'type' => Horde_Kolab_Storage_Namespace::PERSONAL,
                         'name' => 'INBOX',
                         'delimiter' => '/',
                         'add' => true,
@@ -293,7 +293,7 @@ class Horde_Kolab_Storage_NamespaceTest extends PHPUnit_Framework_TestCase
                 array(
                     array(
                         'name'      => 'INBOX',
-                        'type'      =>  Horde_Kolab_Storage_Namespace::PRIV,
+                        'type'      =>  Horde_Kolab_Storage_Namespace::PERSONAL,
                         'delimiter' => '/',
                     ),
                     array(
-- 
2.11.0