From 21652c9db84ac02e489ebaded3ed9a955ace1fc5 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 15 Oct 2010 16:45:47 -0600
Subject: [PATCH] Removed 'shared' feature of Horde_Prefs.

Defeats the whole purpose of decoupling the various applications.
Additionally, doesn't make much sense to declare horde
prefs 'shared' since they are always used as a fallback if the prefname
doesn't exist in the local scope.

Preference values from other applications should be accessed via an
application's API instead.  This is already what we do, for example, to
get the search_sources pref in IMP/Turba.

Not really sure how this was supposed to work anyway, since shared prefs
were totally dependent on the order in which the app was loaded. Simply
put, global prefs need to live in horde.
---
 beatnik/config/prefs.php.dist          |  3 --
 folks/config/prefs.php.dist            |  9 ------
 folks/lib/Friends/prefs.php            |  2 --
 framework/Prefs/lib/Horde/Prefs.php    | 54 +++++-----------------------------
 hermes/config/prefs.php.dist           |  2 --
 horde/config/prefs.php.dist            | 53 +++++++--------------------------
 hylax/config/prefs.php.dist            |  1 -
 imp/config/prefs.php.dist              |  3 --
 ingo/config/prefs.php.dist             |  9 ------
 koward/www/horde/config/prefs.php.dist | 45 +---------------------------
 kronolith/config/prefs.php.dist        |  1 -
 nag/config/prefs.php.dist              |  1 -
 operator/config/prefs.php.dist         |  2 --
 pastie/config/prefs.php.dist           |  1 -
 skeleton/config/prefs.php.dist         |  1 -
 trean/config/prefs.php.dist            |  5 ----
 vilma/config/prefs.php.dist            |  1 -
 wicked/config/prefs.php.dist           |  1 -
 18 files changed, 18 insertions(+), 176 deletions(-)

diff --git a/beatnik/config/prefs.php.dist b/beatnik/config/prefs.php.dist
index 3d37781e9..2d6243ccd 100644
--- a/beatnik/config/prefs.php.dist
+++ b/beatnik/config/prefs.php.dist
@@ -21,7 +21,6 @@ $prefGroups['defaults'] = array(
 $_prefs['domain_groups'] = array(
     'value' => '',
     'locked' => false,
-    'shared' => false,
     'type' => 'implicit'
 );
 
@@ -29,7 +28,6 @@ $_prefs['domain_groups'] = array(
 $_prefs['domains_perpage'] = array(
     'value' => 20,
     'locked' => false,
-    'shared' => false,
     'type' => 'number',
     'desc' => _("How many domain to display per page.")
 );
@@ -37,7 +35,6 @@ $_prefs['domains_perpage'] = array(
 $_prefs['default_ttl'] = array(
     'value' => '86400',
     'locked' => false,
-    'shared' => false,
     'type' => 'number',
     'desc' => _("Default Time-To-Live for new records.")
 );
diff --git a/folks/config/prefs.php.dist b/folks/config/prefs.php.dist
index edea664a4..33d0e1506 100644
--- a/folks/config/prefs.php.dist
+++ b/folks/config/prefs.php.dist
@@ -35,7 +35,6 @@ $prefGroups['Activities'] = array(
 $_prefs['sort_by'] = array(
     'value' => 'user_uid',
     'locked' => false,
-    'shared' => true,
     'type' => 'enum',
     'enum' => array('user_uid' => _("Username")),
     'desc' => _("Sort by")
@@ -44,7 +43,6 @@ $_prefs['sort_by'] = array(
 $_prefs['sort_dir'] = array(
     'value' => 1,
     'locked' => false,
-    'shared' => true,
     'type' => 'enum',
     'enum' => array(0 => _("Descesending"),
                     1 => _("Ascesending")),
@@ -54,7 +52,6 @@ $_prefs['sort_dir'] = array(
 $_prefs['per_page'] = array(
     'value' => 20,
     'locked' => false,
-    'shared' => true,
     'type' => 'number',
     'desc' => _("Number of users perpage")
 );
@@ -62,7 +59,6 @@ $_prefs['per_page'] = array(
 $_prefs['login_notify'] = array(
     'value' => 1,
     'locked' => false,
-    'shared' => true,
     'type' => 'enum',
     'enum' => array(0 => _("No"),
                     1 => _("Yes")),
@@ -72,7 +68,6 @@ $_prefs['login_notify'] = array(
 $_prefs['friends_approval'] = array(
     'value' => 1,
     'locked' => false,
-    'shared' => true,
     'type' => 'enum',
     'enum' => array(0 => _("No"),
                     1 => _("Yes")),
@@ -82,7 +77,6 @@ $_prefs['friends_approval'] = array(
 $_prefs['log_user_comments'] = array(
     'value' => 1,
     'locked' => false,
-    'shared' => true,
     'type' => 'enum',
     'enum' => array(0 => _("No"),
                     1 => _("Yes")),
@@ -92,7 +86,6 @@ $_prefs['log_user_comments'] = array(
 $_prefs['log_account_changes'] = array(
     'value' => 1,
     'locked' => false,
-    'shared' => true,
     'type' => 'enum',
     'enum' => array(0 => _("No"),
                     1 => _("Yes")),
@@ -110,7 +103,6 @@ asort($apps);
 $_prefs['log_scopes'] = array(
     'value' => 'a:0:{}',
     'locked' => false,
-    'shared' => true,
     'type' => 'multienum',
     'enum' => $apps,
     'desc' => _("Application you would like NOT to log your activitiy when you post a new PUBLIC CONTENT.")
@@ -125,7 +117,6 @@ foreach ($apps as $app) {
 $_prefs['log_scope_comments'] = array(
     'value' => 'a:0:{}',
     'locked' => false,
-    'shared' => true,
     'type' => 'multienum',
     'enum' => $apps,
     'desc' => _("Application you would like NOT to log activitiy when you post a new PUBLIC COMMENT")
diff --git a/folks/lib/Friends/prefs.php b/folks/lib/Friends/prefs.php
index 9085e8f7f..87926d445 100644
--- a/folks/lib/Friends/prefs.php
+++ b/folks/lib/Friends/prefs.php
@@ -7,14 +7,12 @@
  *  $_prefs['whitelist'] = array(
  *      'value' => '',
  *      'locked' => false,
- *      'shared' => false,
  *     'type' => 'implicit'
  *  );
  *
  *  $_prefs['blacklist'] = array(
  *      'value' => '',
  *      'locked' => false,
- *      'shared' => false,
  *      'type' => 'implicit'
  *  );
  *
diff --git a/framework/Prefs/lib/Horde/Prefs.php b/framework/Prefs/lib/Horde/Prefs.php
index cfc9a6dda..9ada1b23e 100644
--- a/framework/Prefs/lib/Horde/Prefs.php
+++ b/framework/Prefs/lib/Horde/Prefs.php
@@ -19,9 +19,6 @@ class Horde_Prefs implements ArrayAccess
     /** Preference is administratively locked. */
     const LOCKED = 1;
 
-    /** Preference is shared amongst applications. */
-    const SHARED = 2;
-
     /** Preference value has been changed. */
     const DIRTY = 4;
 
@@ -413,29 +410,6 @@ class Horde_Prefs implements ArrayAccess
     }
 
     /**
-     * Modifies the "shared" bit for the given preference.
-     *
-     * @param string $pref   The name of the preference to modify.
-     * @param boolean $bool  The new boolean value for the "shared" bit.
-     */
-    public function setShared($pref, $bool)
-    {
-        $this->_setMask($pref, $bool, self::SHARED);
-    }
-
-    /**
-     * Returns the state of the "shared" bit for the given preference.
-     *
-     * @param string $pref  The name of the preference to check.
-     *
-     * @return boolean  The boolean state of $pref's "shared" bit.
-     */
-    public function isShared($pref)
-    {
-        return $this->_getMask($pref, self::SHARED);
-    }
-
-    /**
      * Modifies the "dirty" bit for the given preference.
      *
      * @param string $pref      The name of the preference to modify.
@@ -546,7 +520,7 @@ class Horde_Prefs implements ArrayAccess
      */
     protected function _getPreferenceScope($pref)
     {
-        return $this->isShared($pref) ? 'horde' : $this->getScope();
+        return $this->getScope();
     }
 
     /**
@@ -714,28 +688,14 @@ class Horde_Prefs implements ArrayAccess
                 $mask |= self::LOCKED;
             }
 
-            if (empty($pref['shared'])) {
-                $pref_scope = $scope;
-            } else {
-                $mask |= self::SHARED;
-                $pref_scope = 'horde';
-            }
-
-            if (!empty($pref['shared']) &&
-                isset($this->_scopes[$pref_scope][$name])) {
-                // This is a shared preference that was already retrieved.
-                $this->_scopes[$pref_scope][$name]['m'] = $mask & ~self::PREFS_DEFAULT;
-                $this->_scopes[$pref_scope][$name]['d'] = $pref['value'];
-            } else {
-                $this->_scopes[$pref_scope][$name] = array(
-                    'd' => $pref['value'],
-                    'm' => $mask,
-                    'v' => $pref['value']
-                );
-            }
+            $this->_scopes[$scope][$name] = array(
+                'd' => $pref['value'],
+                'm' => $mask,
+                'v' => $pref['value']
+            );
 
             if (!empty($pref['hook'])) {
-                $this->_hooks[$scope][$name] = $pref_scope;
+                $this->_hooks[$scope][$name] = $scope;
             }
         }
     }
diff --git a/hermes/config/prefs.php.dist b/hermes/config/prefs.php.dist
index 51a579316..f58354de1 100644
--- a/hermes/config/prefs.php.dist
+++ b/hermes/config/prefs.php.dist
@@ -14,7 +14,6 @@ $prefGroups['timer'] = array(
 $_prefs['add_description'] = array(
     'value' => true,
     'locked' => false,
-    'shared' => false,
     'type' => 'checkbox',
     'desc' => _("Add stop watch name and start and end time to the description of the time entry?")
 );
@@ -23,6 +22,5 @@ $_prefs['add_description'] = array(
 $_prefs['running_timers'] = array(
     'value' => '',
     'locked' => false,
-    'shared' => false,
     'type' => 'implicit'
 );
diff --git a/horde/config/prefs.php.dist b/horde/config/prefs.php.dist
index 94872e14e..1ce54a9ae 100644
--- a/horde/config/prefs.php.dist
+++ b/horde/config/prefs.php.dist
@@ -23,8 +23,8 @@
  * type - (string) The prefGroup type.
  *        VALUES:
  *          'identities' - An identities screen. The identities screen will
- *                         always show all the shared identities prefs from
- *                         Horde, as well as the identity switching widget.
+ *                         always show all the identities prefs from Horde
+ *                         along with the identity switching widget.
  *                         Additionally, applications can define additional
  *                         identity information in their prefs.php file that
  *                         will be displayed after the Horde-wide settings.
@@ -53,12 +53,6 @@
  *            false: Show this preference in the UI and allow changing.
  *          DEFAULT: false
  *
- * shared - (boolean) Share with other Horde apps?
- *          VALUES:
- *            true: Share this pref with other Horde apps.
- *            false: Keep this pref local to the current app.
- *          DEFAULT: false
- *
  * help - (string) The help file identifier for this preference.
  *        VALUES:
  *          If present, a help icon will be displayed next to the preference.
@@ -221,7 +215,6 @@ $prefGroups['identities'] = array(
 // horde/config/hooks.php.
 $_prefs['id'] = array(
     'value' => '',
-    'shared' => true,
     'type' => 'text',
     'desc' => _("Identity's name:")
 );
@@ -231,7 +224,6 @@ $_prefs['id'] = array(
 // horde/config/hooks.php.
 $_prefs['fullname'] = array(
     'value' => '',
-    'shared' => true,
     'type' => 'text',
     'desc' => _("Your full name:")
 );
@@ -241,7 +233,6 @@ $_prefs['fullname'] = array(
 // horde/config/hooks.php.
 $_prefs['from_addr'] = array(
     'value' => '',
-    'shared' => true,
     'type' => 'text',
     'desc' =>  _("The default e-mail address to use with this identity:")
 );
@@ -249,22 +240,19 @@ $_prefs['from_addr'] = array(
 // default identity
 // Set locked to true if you don't want the users to have multiple identities.
 $_prefs['default_identity'] = array(
-    'value' => 0,
-    'shared' => true
+    'value' => 0
 );
 
 // identities data
 $_prefs['identities'] = array(
     // default value = serialize(array())
-    'value' => 'a:0:{}',
-    'shared' => true
+    'value' => 'a:0:{}'
 );
 
 // identify email confirmation
 $_prefs['confirm_email'] = array(
     // default value = serialize(array())
-    'value' => 'a:0:{}',
-    'shared' => true
+    'value' => 'a:0:{}'
 );
 
 
@@ -283,7 +271,6 @@ $prefGroups['forgotpass'] = array(
 // user security question
 $_prefs['security_question'] = array(
     'value' => '',
-    'shared' => true,
     'type' => 'text',
     'desc' => _("Enter a security question which you will be asked if you need to reset your password, e.g. 'what is the name of your pet?':")
 );
@@ -291,7 +278,6 @@ $_prefs['security_question'] = array(
 // user security answer
 $_prefs['security_answer'] = array(
     'value' => '',
-    'shared' => true,
     'type' => 'text',
     'desc' => _("Insert the required answer to the security question:")
 );
@@ -299,7 +285,6 @@ $_prefs['security_answer'] = array(
 // user alternate email
 $_prefs['alternate_email'] = array(
     'value' => '',
-    'shared' => true,
     'type' => 'text',
     'desc' => _("Insert an email address to which you can receive the new password:")
 );
@@ -322,7 +307,6 @@ $prefGroups['language'] = array(
 // Language list is dynamically built when prefs screen is displayed
 $_prefs['language'] = array(
     'value' => '',
-    'shared' => true,
     'type' => 'enum',
     'escaped' => true,
     'desc' => _("Select your preferred language:")
@@ -332,7 +316,6 @@ $_prefs['language'] = array(
 // Timezone list is dynamically built when prefs screen is displayed
 $_prefs['timezone'] = array(
     'value' => '',
-    'shared' => true,
     'type' => 'enum',
     'desc' => _("Your current time zone:")
 );
@@ -340,7 +323,6 @@ $_prefs['timezone'] = array(
 // time format
 $_prefs['twentyFour'] = array(
     'value' => false,
-    'shared' => true,
     'type' => 'checkbox',
     'desc' => _("Display 24-hour times?")
 );
@@ -348,7 +330,6 @@ $_prefs['twentyFour'] = array(
 // date format
 $_prefs['date_format'] = array(
     'value' => '%x',
-    'shared' => true,
     'type' => 'enum',
     'enum' => array(
         '%x' => strftime('%x'),
@@ -380,7 +361,6 @@ $_prefs['date_format'] = array(
 // date format (miniature)
 $_prefs['date_format_mini'] = array(
     'value' => '%x',
-    'shared' => true,
     'type' => 'enum',
     'enum' => array(
         '%x' => strftime('%x'),
@@ -422,7 +402,6 @@ $_prefs['time_format'] = array(
 // what day should be displayed as the first day of the week?
 $_prefs['first_week_day'] = array(
     'value' => '0',
-    'shared' => true,
     'type' => 'enum',
     'desc' => _("Which day would you like to be displayed as the first day of the week?"),
     'enum' => array(
@@ -449,14 +428,12 @@ $_prefs['categorymanagement'] = array(
 
 // categories
 $_prefs['categories'] = array(
-    'value' => '',
-    'shared' => true
+    'value' => ''
 );
 
 // category colors
 $_prefs['category_colors'] = array(
-    'value' => '',
-    'shared' => true
+    'value' => ''
 );
 
 
@@ -478,7 +455,6 @@ $prefGroups['display'] = array(
 // Application list is dynamically built when prefs screen is displayed
 $_prefs['initial_application'] = array(
     'value' => 'horde',
-    'shared' => true,
     'type' => 'enum',
     'desc' => sprintf(_("What application should %s display after login?"), $GLOBALS['registry']->get('name'))
 );
@@ -486,7 +462,6 @@ $_prefs['initial_application'] = array(
 // show the last login time of user
 $_prefs['show_last_login'] = array(
     'value' => true,
-    'shared' => true,
     'type' => 'checkbox',
     'desc' => _("Show last login time when logging in?")
 );
@@ -496,15 +471,13 @@ $_prefs['show_last_login'] = array(
 // login, and the host that the last login was from.
 $_prefs['last_login'] = array(
     // value = serialize(array())
-    'value' => 'a:0:{}',
-    'shared' => true
+    'value' => 'a:0:{}'
 );
 
 // UI theme
 // Theme list is dynamically built when prefs screen is displayed
 $_prefs['theme'] = array(
     'value' => 'silver',
-    'shared' => true,
     'type' => 'enum',
     'desc' => _("Select your color scheme.")
 );
@@ -525,7 +498,6 @@ $_prefs['summary_refresh_time'] = array(
 
 $_prefs['show_sidebar'] = array(
     'value' => true,
-    'shared' => true,
     'type' => 'checkbox',
     'desc' => sprintf(_("Show the %s Menu on the left?"), $GLOBALS['registry']->get('name', 'horde'))
 );
@@ -538,7 +510,6 @@ $_prefs['sidebar_width'] = array(
 
 $_prefs['menu_view'] = array(
     'value' => 'both',
-    'shared' => true,
     'type' => 'enum',
     'enum' => array(
         'text' => _("Text Only"),
@@ -550,7 +521,6 @@ $_prefs['menu_view'] = array(
 
 $_prefs['menu_refresh_time'] = array(
     'value' => 300,
-    'shared' => true,
     'type' => 'enum',
     'enum' => array(
         0 => _("Never"),
@@ -565,7 +535,6 @@ $_prefs['menu_refresh_time'] = array(
 // should we create access keys?
 $_prefs['widget_accesskey'] = array(
     'value' => true,
-    'shared' => true,
     'type' => 'checkbox',
     'desc' => _("Should access keys be defined for most links?")
 );
@@ -612,8 +581,7 @@ $_prefs['facebookmanagement'] = array(
 
 $_prefs['facebook'] = array(
     // value = serialize(array())
-    'value' => 'a:0:{}',
-    'shared' => true
+    'value' => 'a:0:{}'
 );
 
 
@@ -687,6 +655,5 @@ $_prefs['activesyncmanagement'] = array(
 // last time login tasks were run.
 $_prefs['last_logintasks'] = array(
     // value = serialize(array())
-    'value' => 'a:0:{}',
-    'shared' => true
+    'value' => 'a:0:{}'
 );
diff --git a/hylax/config/prefs.php.dist b/hylax/config/prefs.php.dist
index 708b10f6e..f4dd852a6 100644
--- a/hylax/config/prefs.php.dist
+++ b/hylax/config/prefs.php.dist
@@ -16,7 +16,6 @@ $prefGroups['display'] = array(
 $_prefs['hylax_default_view'] = array(
     'value' => 'summary',
     'locked' => false,
-    'shared' => false,
     'type' => 'enum',
     'enum' => array('summmary' => _("Summary"),
                     'folder' => _("Folders"),
diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist
index 38522d1bd..5efd168f4 100644
--- a/imp/config/prefs.php.dist
+++ b/imp/config/prefs.php.dist
@@ -525,7 +525,6 @@ $_prefs['compose_cursor'] = array(
 // Select widget for the possible charsets
 $_prefs['sending_charset'] = array(
     'value' => '',
-    'shared' => true,
     'type' => 'enum',
     'enum' => array_merge(array('' => _("Default")), $GLOBALS['registry']->nlsconfig['encodings']),
     'desc' => _("Your default charset for sending messages:")
@@ -1435,7 +1434,6 @@ $_prefs['save_recipients'] = array(
 // slow to display, you may want to disable and lock this preference.
 $_prefs['display_contact'] = array(
     'value' => 1,
-    'shared' => true,
     'type' => 'checkbox',
     'desc' => _("List all contacts when loading the contacts screen? (if disabled, you will only see contacts that you search for explicitly)")
 );
@@ -1476,7 +1474,6 @@ $_prefs['search_fields'] = array(
 $_prefs['add_source'] = array(
 //  'value' => 'localsql',
     'value' => '',
-    'shared' => true,
     'type' => 'enum',
     'desc' => _("Choose the address book to use when adding addresses.")
 );
diff --git a/ingo/config/prefs.php.dist b/ingo/config/prefs.php.dist
index e96446c82..549303a0a 100644
--- a/ingo/config/prefs.php.dist
+++ b/ingo/config/prefs.php.dist
@@ -23,7 +23,6 @@ if (!isset($_SESSION['ingo']['script_generate']) ||
 $_prefs['auto_update'] = array(
     'value' => 1,
     'locked' => false,
-    'shared' => false,
     'type' => 'checkbox',
     'desc' => _("Automatically activate the script after each change?")
 );
@@ -38,7 +37,6 @@ $_prefs['auto_update'] = array(
 $_prefs['show_filter_msg'] = array(
     'value' => 1,
     'locked' => false,
-    'shared' => false,
     'type' => 'implicit'
 );
 
@@ -47,7 +45,6 @@ $_prefs['show_filter_msg'] = array(
 $_prefs['filter_seen'] = array(
     'value' => 0,
     'locked' => false,
-    'shared' => false,
     'type' => 'implicit'
 );
 
@@ -61,7 +58,6 @@ require_once dirname(__FILE__) . '/../lib/Storage.php';
 $_prefs['rules'] = array(
     'value' => 'a:5:{i:0;a:2:{s:4:"name";s:9:"Whitelist";s:6:"action";i:' . Ingo_Storage::ACTION_WHITELIST . ';}i:1;a:3:{s:4:"name";s:8:"Vacation";s:6:"action";i:' . Ingo_Storage::ACTION_VACATION . ';s:7:"disable";b:1;}i:2;a:2:{s:4:"name";s:9:"Blacklist";s:6:"action";i:' . Ingo_Storage::ACTION_BLACKLIST . ';}i:3;a:3:{s:4:"name";s:11:"Spam Filter";s:6:"action";i:' . Ingo_Storage::ACTION_SPAM . ';s:7:"disable";b:1;}i:4;a:2:{s:4:"name";s:7:"Forward";s:6:"action";i:' . Ingo_Storage::ACTION_FORWARD . ';}}',
     'locked' => false,
-    'shared' => false,
     'type' => 'implicit'
 );
 
@@ -70,7 +66,6 @@ $_prefs['blacklist'] = array(
     'value' => 'a:2:{s:1:"a";a:0:{}s:1:"f";s:0:"";}',
     // Lock this preference to disable blacklists.
     'locked' => false,
-    'shared' => false,
     'type' => 'implicit'
 );
 
@@ -79,7 +74,6 @@ $_prefs['whitelist'] = array(
     'value' => 'a:0:{}',
     // Lock this preference to disable whitelists.
     'locked' => false,
-    'shared' => false,
     'type' => 'implicit'
 );
 
@@ -88,7 +82,6 @@ $_prefs['vacation'] = array(
     'value' => 'a:8:{s:9:"addresses";a:0:{}s:4:"days";i:7;s:8:"excludes";a:0:{}s:10:"ignorelist";b:1;s:6:"reason";s:0:"";s:7:"subject";s:0:"";s:5:"start";i:0;s:3:"end";i:0;}',
     // Lock this preference to disable vacation notices.
     'locked' => false,
-    'shared' => false,
     'type' => 'implicit'
 );
 
@@ -97,7 +90,6 @@ $_prefs['forward'] = array(
     'value' => 'a:2:{s:1:"a";a:0:{}s:1:"k";i:0;}',
     // Lock this preference to disable forwarding.
     'locked' => false,
-    'shared' => false,
     'type' => 'implicit'
 );
 
@@ -106,6 +98,5 @@ $_prefs['spam'] = array(
     'value' => 'a:2:{s:6:"folder";N;s:5:"level";i:5;}',
     // Lock this preference to disable the spam rule.
     'locked' => false,
-    'shared' => false,
     'type' => 'implicit'
 );
diff --git a/koward/www/horde/config/prefs.php.dist b/koward/www/horde/config/prefs.php.dist
index 5f9980e7d..e6e323956 100644
--- a/koward/www/horde/config/prefs.php.dist
+++ b/koward/www/horde/config/prefs.php.dist
@@ -43,10 +43,6 @@
  *                    This has no effect on 'link' type preferences.
  *            false:  Show this preference in the UI and allow changing.
  *
- *  shared: Share with other horde apps
- *             true:  Share this pref with other Horde apps
- *            false:  Keep this pref local to the current app
- *
  *    type: Preference type
  *            checkbox:  Provides a checkbox.
  *                enum:  Provides a selection list in the UI, list is
@@ -180,7 +176,6 @@ $prefGroups['syncml'] = array(
 $_prefs['default_identity'] = array(
     'value' => 0,
     'locked' => false,
-    'shared' => true,
     'type' => 'enum',
     'enum' => (isset($GLOBALS['identity']) && is_object($GLOBALS['identity'])) ? $GLOBALS['identity']->getAll('id') : array(),
     'desc' => _("Your default identity:"),
@@ -191,7 +186,6 @@ $_prefs['default_identity'] = array(
 $_prefs['identities'] = array(
     'value' => 'a:0:{}',
     'locked' => false,
-    'shared' => true,
     'type' => 'implicit',
 );
 
@@ -199,20 +193,17 @@ $_prefs['identities'] = array(
 $_prefs['confirm_email'] = array(
     'value' => 'a:0:{}',
     'locked' => false,
-    'shared' => true,
     'type' => 'implicit',
 );
 
 // identity selection widget
 $_prefs['identityselect'] = array(
-    'shared' => true,
     'type' => 'special',
 );
 
 // delete button
 $_prefs['deleteidentity'] = array(
     'type' => 'special',
-    'shared' => true,
 );
 
 // identity name
@@ -221,7 +212,6 @@ $_prefs['deleteidentity'] = array(
 $_prefs['id'] = array(
     'value' => '',
     'locked' => false,
-    'shared' => true,
     'type' => 'text',
     'desc' => _("Identity's name:")
 );
@@ -232,7 +222,6 @@ $_prefs['id'] = array(
 $_prefs['fullname'] = array(
     'value' => '',
     'locked' => false,
-    'shared' => true,
     'type' => 'text',
     'desc' => _("Your full name:")
 );
@@ -243,7 +232,6 @@ $_prefs['fullname'] = array(
 $_prefs['from_addr'] = array(
     'value' => '',
     'locked' => false,
-    'shared' => true,
     'type' => 'text',
     'desc' =>  _("Your From: address:")
 );
@@ -254,13 +242,11 @@ $_prefs['from_addr'] = array(
 $_prefs['credentials'] = array(
     'value' => 'a:0:{}',
     'locked' => false,
-    'shared' => true,
     'type' => 'implicit'
 );
 
 // credentials interface
 $_prefs['credentialsui'] = array(
-    'shared' => true,
     'type' => 'special',
 );
 
@@ -268,7 +254,6 @@ $_prefs['credentialsui'] = array(
 $_prefs['security_question'] = array(
     'value' => '',
     'locked' => false,
-    'shared' => true,
     'type' => 'text',
     'desc' => _("Enter a security question which you will be asked if you need to reset your password, e.g. 'what is the name of your pet?':")
 );
@@ -277,7 +262,6 @@ $_prefs['security_question'] = array(
 $_prefs['security_answer'] = array(
     'value' => '',
     'locked' => false,
-    'shared' => true,
     'type' => 'text',
     'desc' => _("Insert the required answer to the security question:")
 );
@@ -286,7 +270,6 @@ $_prefs['security_answer'] = array(
 $_prefs['alternate_email'] = array(
     'value' => '',
     'locked' => false,
-    'shared' => true,
     'type' => 'text',
     'desc' => _("Insert an email address to which you can receive the new password:")
 );
@@ -295,7 +278,6 @@ $_prefs['alternate_email'] = array(
 $_prefs['language'] = array(
     'value' => '',
     'locked' => false,
-    'shared' => true,
     'type' => 'select',
     'escaped' => true,
     'desc' => _("Select your preferred language:")
@@ -305,7 +287,6 @@ $_prefs['language'] = array(
 $_prefs['timezone'] = array(
     'value' => '',
     'locked' => false,
-    'shared' => true,
     'type' => 'select',
     'desc' => _("Your current time zone:")
 );
@@ -314,7 +295,6 @@ $_prefs['timezone'] = array(
 $_prefs['twentyFour'] = array(
     'value' => false,
     'locked' => false,
-    'shared' => true,
     'type' => 'checkbox',
     'desc' => _("Display 24-hour times?")
 );
@@ -323,7 +303,6 @@ $_prefs['twentyFour'] = array(
 $_prefs['date_format'] = array(
     'value' => '%x',
     'locked' => false,
-    'shared' => true,
     'type' => 'enum',
     'enum' => array(
         '%x' => strftime('%x'),
@@ -356,7 +335,6 @@ $_prefs['date_format'] = array(
 $_prefs['first_week_day'] = array(
     'value' => '0',
     'locked' => false,
-    'shared' => true,
     'type' => 'enum',
     'desc' => _("Which day would you like to be displayed as the first day of the week?"),
     'enum' => array('0' => _("Sunday"),
@@ -367,7 +345,6 @@ $_prefs['first_week_day'] = array(
 $_prefs['theme'] = array(
     'value' => 'bluewhite',
     'locked' => false,
-    'shared' => true,
     'type' => 'select',
     'desc' => _("Select your color scheme.")
 );
@@ -376,7 +353,6 @@ $_prefs['theme'] = array(
 $_prefs['categories'] = array(
     'value' => '',
     'locked' => false,
-    'shared' => true,
     'type' => 'implicit'
 );
 
@@ -384,7 +360,6 @@ $_prefs['categories'] = array(
 $_prefs['category_colors'] = array(
     'value' => '',
     'locked' => false,
-    'shared' => true,
     'type' => 'implicit'
 );
 
@@ -396,7 +371,6 @@ $_prefs['categorymanagement'] = array(
 $_prefs['summary_refresh_time'] = array(
     'value' => 300,
     'locked' => false,
-    'shared' => false,
     'type' => 'enum',
     'enum' => array(0 => _("Never"),
                     30 => _("Every 30 seconds"),
@@ -410,7 +384,6 @@ $_prefs['summary_refresh_time'] = array(
 $_prefs['show_sidebar'] = array(
     'value' => true,
     'locked' => false,
-    'shared' => true,
     'type' => 'checkbox',
     'desc' => sprintf(_("Show the %s Menu on the left?"), $GLOBALS['registry']->get('name', 'horde'))
 );
@@ -418,7 +391,6 @@ $_prefs['show_sidebar'] = array(
 $_prefs['sidebar_width'] = array(
     'value' => 150,
     'locked' => false,
-    'shared' => false,
     'type' => 'number',
     'desc' => sprintf(_("Width of the %s menu on the left:"), $GLOBALS['registry']->get('name', 'horde'))
 );
@@ -436,7 +408,6 @@ $_prefs['moz_sidebar'] = array(
 $_prefs['menu_view'] = array(
     'value' => 'both',
     'locked' => false,
-    'shared' => true,
     'type' => 'enum',
     'enum' => array('text' => _("Text Only"),
                     'icon' => _("Icons Only"),
@@ -447,7 +418,6 @@ $_prefs['menu_view'] = array(
 $_prefs['menu_refresh_time'] = array(
     'value' => 300,
     'locked' => false,
-    'shared' => true,
     'type' => 'enum',
     'enum' => array(0 => _("Never"),
                     30 => _("Every 30 seconds"),
@@ -467,7 +437,6 @@ $_prefs['menu_refresh_time'] = array(
 $_prefs['do_maintenance'] = array(
     'value' => true,
     'locked' => false,
-    'shared' => true,
     'type' => 'checkbox',
     'desc' => _("Perform maintenance operations on login?"),
     'help' => 'prefs-do_maintenance');
@@ -477,7 +446,6 @@ $_prefs['do_maintenance'] = array(
 $_prefs['last_maintenance'] = array(
     'value' => 0,
     'locked' => false,
-    'shared' => true,
     'type' => 'implicit'
 );
 
@@ -486,7 +454,6 @@ $_prefs['last_maintenance'] = array(
 $_prefs['confirm_maintenance'] = array(
     'value' => true,
     'locked' => false,
-    'shared' => true,
     'type' => 'checkbox',
     'desc' => _("Ask for confirmation before doing maintenance operations?"),
     'help' => 'prefs-confirm_maintenance');
@@ -498,7 +465,6 @@ $_prefs['confirm_maintenance'] = array(
 $_prefs['initial_application'] = array(
     'value' => 'horde',
     'locked' => false,
-    'shared' => true,
     'type' => 'select',
     'desc' => sprintf(_("What application should %s display after login?"), $GLOBALS['registry']->get('name'))
 );
@@ -507,7 +473,6 @@ $_prefs['initial_application'] = array(
 $_prefs['widget_accesskey'] = array(
     'value' => true,
     'locked' => false,
-    'shared' => true,
     'type' => 'checkbox',
     'desc' => _("Should access keys be defined for most links?")
 );
@@ -516,7 +481,6 @@ $_prefs['widget_accesskey'] = array(
 $_prefs['portal_layout'] = array(
     'value' => 'a:0:{}',
     'locked' => false,
-    'shared' => false,
     'type' => 'implicit'
 );
 
@@ -524,23 +488,20 @@ $_prefs['portal_layout'] = array(
 $_prefs['remote_summaries'] = array(
     'value' => 'a:0:{}',
     'locked' => false,
-    'shared' => false,
     'type' => 'implicit'
 );
 
 $_prefs['facebook'] = array(
     'value' => 'a:0:{}',
     'locked' => false,
-    'shared' => true,
     'type' => 'implicit');
-    
+
 // last login time of user
 // value is a serialized array of the UNIX timestamp of the last
 // login, and the host that the last login was from.
 $_prefs['last_login'] = array(
     'value' => 'a:0:{}',
     'locked' => false,
-    'shared' => true,
     'type' => 'implicit'
 );
 
@@ -548,7 +509,6 @@ $_prefs['last_login'] = array(
 $_prefs['show_last_login'] = array(
     'value' => true,
     'locked' => false,
-    'shared' => true,
     'type' => 'checkbox',
     'desc' => _("Show last login time when logging in?")
 );
@@ -557,7 +517,6 @@ if (!empty($GLOBALS['conf']['imsp']['enabled'])) {
     $_prefs['imsp_auth_user'] = array(
         'value' => '',
         'locked' => false,
-        'shared' => false,
         'type' => 'text',
         'desc' => _("Alternate IMSP Username")
     );
@@ -565,7 +524,6 @@ if (!empty($GLOBALS['conf']['imsp']['enabled'])) {
     $_prefs['imsp_auth_pass'] = array(
         'value' => '',
         'locked' => false,
-        'shared' => false,
         'type' => 'password',
         'desc' => _("Alternate IMSP Password")
     );
@@ -575,7 +533,6 @@ if (!empty($GLOBALS['conf']['imsp']['enabled'])) {
 $_prefs['editor_plugins'] = array(
     'value' => 'a:2:{i:0;s:8:"ListType";i:1;s:12:"CharacterMap";}',
     'locked' => false,
-    'shared' => true,
     'type' => 'multienum',
     'enum' => array(
         'ContextMenu' => _("Right click context menu"),
diff --git a/kronolith/config/prefs.php.dist b/kronolith/config/prefs.php.dist
index e36015b96..1a977bd92 100644
--- a/kronolith/config/prefs.php.dist
+++ b/kronolith/config/prefs.php.dist
@@ -308,7 +308,6 @@ $_prefs['freebusy_days'] = array(
 // slow to display, you may want to disable and lock this preference.
 $_prefs['display_contact'] = array(
     'value' => 1,
-    'shared' => true,
     'type' => 'checkbox',
     'desc' => _("List all contacts when loading the contacts screen? (if disabled, you will only see contacts that you search for explicitly)"),
 );
diff --git a/nag/config/prefs.php.dist b/nag/config/prefs.php.dist
index bc6148724..854794d49 100644
--- a/nag/config/prefs.php.dist
+++ b/nag/config/prefs.php.dist
@@ -160,7 +160,6 @@ $_prefs['task_notification'] = array(
 $_prefs['task_notification_exclude_self'] = array(
     'value' => 0,
     'locked' => false,
-    'shared' => false,
     'type' => 'checkbox',
     'desc' => _("Don't send me a notification if I've added, changed or deleted the task?")
 );
diff --git a/operator/config/prefs.php.dist b/operator/config/prefs.php.dist
index f34e5e0d5..cb9dbb001 100644
--- a/operator/config/prefs.php.dist
+++ b/operator/config/prefs.php.dist
@@ -15,7 +15,6 @@ $prefGroups['display'] = array(
 $_prefs['rowsperpage'] = array(
     'value' => 100,
     'locked' => false,
-    'shared' => false,
     'type' => 'number',
     'desc' => _("Maximum number of call records to show per search result page.")
 );
@@ -23,7 +22,6 @@ $_prefs['rowsperpage'] = array(
 $_prefs['columns'] = array(
     'value' => 'a:6:{i:0;s:11:"accountcode";i:1;s:4:"clid";i:2;s:3:"dst";i:3;s:5:"start";i:4;s:8:"duration";i:5;s:11:"disposition";}',
     'locked' => false,
-    'shared' => false,
     'type' => 'multienum',
     'enum' => Operator::getColumns(),
     'desc' => _("The columns to be displayed on the Call Detail Review screen")
diff --git a/pastie/config/prefs.php.dist b/pastie/config/prefs.php.dist
index e32cd2bb7..7e3aeb7ee 100644
--- a/pastie/config/prefs.php.dist
+++ b/pastie/config/prefs.php.dist
@@ -15,7 +15,6 @@ $prefGroups['Sample'] = array(
 $_prefs['sample'] = array(
     'value' => '',
     'locked' => false,
-    'shared' => false,
     'type' => 'text',
     'desc' => _("This is your sample preference.")
 );
diff --git a/skeleton/config/prefs.php.dist b/skeleton/config/prefs.php.dist
index e32cd2bb7..7e3aeb7ee 100644
--- a/skeleton/config/prefs.php.dist
+++ b/skeleton/config/prefs.php.dist
@@ -15,7 +15,6 @@ $prefGroups['Sample'] = array(
 $_prefs['sample'] = array(
     'value' => '',
     'locked' => false,
-    'shared' => false,
     'type' => 'text',
     'desc' => _("This is your sample preference.")
 );
diff --git a/trean/config/prefs.php.dist b/trean/config/prefs.php.dist
index 9ad50eb75..9926f9c00 100644
--- a/trean/config/prefs.php.dist
+++ b/trean/config/prefs.php.dist
@@ -16,7 +16,6 @@ $prefGroups['display'] = array(
 $_prefs['sortby'] = array(
     'value' => 'title',
     'locked' => false,
-    'shared' => false,
     'type' => 'enum',
     'enum' => array('title' => _("Title"),
                     'rating' => _("Highest Rated"),
@@ -28,7 +27,6 @@ $_prefs['sortby'] = array(
 $_prefs['sortdir'] = array(
     'value' => 0,
     'locked' => false,
-    'shared' => false,
     'type' => 'enum',
     'enum' => array(0 => _("Ascending (A to Z)"),
                     1 => _("Descending (9 to 1)")),
@@ -40,7 +38,6 @@ $_prefs['sortdir'] = array(
 $_prefs['show_folder_actions'] = array(
     'value' => 1,
     'locked' => false,
-    'shared' => false,
     'type' => 'checkbox',
     'desc' => _("Show folder actions panel?")
 );
@@ -49,7 +46,6 @@ $_prefs['show_folder_actions'] = array(
 $_prefs['show_in_new_window'] = array(
     'value' => 1,
     'locked' => false,
-    'shared' => false,
     'type' => 'checkbox',
     'desc' => _("Open links in a new window?")
 );
@@ -58,7 +54,6 @@ $_prefs['show_in_new_window'] = array(
 $_prefs['expand_tree'] = array(
     'value' => 'first',
     'locked' => false,
-    'shared' => false,
     'type' => 'enum',
     'enum' => array('none' => _("Completely collapsed"),
                     'first' => _("First level shown"),
diff --git a/vilma/config/prefs.php.dist b/vilma/config/prefs.php.dist
index dcb68e0ec..9133e5540 100644
--- a/vilma/config/prefs.php.dist
+++ b/vilma/config/prefs.php.dist
@@ -13,6 +13,5 @@ $prefGroups['display'] = array(
 $_prefs['addresses_perpage'] = array(
      'value' => 20,
      'locked' => false,
-     'shared' => false,
      'type' => 'number',
      'desc' => _("How many domain to display per page."));
diff --git a/wicked/config/prefs.php.dist b/wicked/config/prefs.php.dist
index df628216d..5e3cfb6fe 100644
--- a/wicked/config/prefs.php.dist
+++ b/wicked/config/prefs.php.dist
@@ -8,6 +8,5 @@ $_prefs = array();
 $_prefs['sync_data'] = array(
     'value' => 'a:0:{}',
     'locked' => false,
-    'shared' => false,
     'type' => 'implicit'
 );
-- 
2.11.0