- Squirrelmail_usercopy: Fix identities_level setting (#1487006)

git-svn-id: https://svn.roundcube.net/trunk@3983 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 18 insertions, 9 deletions

diff --git a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
index 3d1fcbb30..dc7225e76 100644
--- a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
+++ b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
@@ -16,20 +16,15 @@ class squirrelmail_usercopy extends rcube_plugin
 
 	public function init()
 	{
-		$rcmail = rcmail::get_instance();
-
-        // Set identities_level for operations of this plugin
-		$ilevel = $rcmail->config->get('squirrelmail_identities_level');
-        if ($ilevel === null)
-		    $ilevel = $rcmail->config->get('identities_level', 0);
-        $this->identities_level = intval($ilevel);
-
 		$this->add_hook('user_create', array($this, 'create_user'));
 		$this->add_hook('identity_create', array($this, 'create_identity'));
 	}
 
 	public function create_user($p)
 	{
+        // Read plugin's config
+        $this->initialize();
+
 		// read prefs and add email address
 		$this->read_squirrel_prefs($p['user']);
 		if (($this->identities_level == 0 || $this->identities_level == 2) && $this->prefs['email_address'])
@@ -84,9 +79,23 @@ class squirrelmail_usercopy extends rcube_plugin
 		return $p;
 	}
 
-	private function read_squirrel_prefs($uname)
+	private function initialize()
 	{
+		$rcmail = rcmail::get_instance();
+
+        // Load plugin's config file
 		$this->load_config();
+
+        // Set identities_level for operations of this plugin
+		$ilevel = $rcmail->config->get('squirrelmail_identities_level');
+        if ($ilevel === null)
+		    $ilevel = $rcmail->config->get('identities_level', 0);
+
+        $this->identities_level = intval($ilevel);
+    }
+
+	private function read_squirrel_prefs($uname)
+	{
 		$rcmail = rcmail::get_instance();
 
 		/**** File based backend ****/