Changeset 3986 in subversion

Timestamp:

Sep 22, 2010 1:38:30 PM (3 years ago)

Author:

thomasb

Message:

Make alias setting configurable (patch by pommi) + fix indentation

Location:

trunk/plugins/squirrelmail_usercopy

Files:

• config.inc.php.dist (modified) (1 diff)
• squirrelmail_usercopy.php (modified) (3 diffs)

trunk/plugins/squirrelmail_usercopy/config.inc.php.dist

@@ -20 +20 @@
 $rcmail_config['squirrelmail_identities_level'] = null;
 
+// Set to false if you don't want the email address of the default identity
+// (squirrelmail preference "email_address") to be saved as alias.
+// Recommended: set to false if your squirrelmail config setting $edit_identity has been true.
+$rcmail_config['squirrelmail_set_alias'] = true;

trunk/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php

@@ -23 +23 @@
         public function create_user($p)
         {
-        // Read plugin's config
-        $this->initialize();
+                $rcmail = rcmail::get_instance();
+
+                // 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'])
+                if (($this->identities_level == 0 || $this->identities_level == 2) && $rcmail->config->get('squirrelmail_set_alias') && $this->prefs['email_address'])
                         $p['user_email'] = $this->prefs['email_address'];
                 return $p;
@@ -84 +86 @@
                 $rcmail = rcmail::get_instance();
 
-        // Load plugin's config file
+                // Load plugin's config file
                 $this->load_config();
 
-        // Set identities_level for operations of this plugin
+                // 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);
+                if ($ilevel === null)
+                        $ilevel = $rcmail->config->get('identities_level', 0);
 
-        $this->identities_level = intval($ilevel);
-    }
+                $this->identities_level = intval($ilevel);
+        }
 
         private function read_squirrel_prefs($uname)
@@ -154 +156 @@
                         $db_charset = $rcmail->config->get('squirrelmail_db_charset');
 
-            if ($db_charset)
-                        $db->query('SET NAMES '.$db_charset);
+                        if ($db_charset)
+                                $db->query('SET NAMES '.$db_charset);
 
                         $sql_result = $db->query('SELECT * FROM '.$userprefs_table.' WHERE user=?', $uname); // ? is replaced with emailaddress