Changeset 3743 in subversion

Timestamp:

Jun 11, 2010 9:14:38 AM (3 years ago)

Author:

alec

Message:

• Added squirrelmail_identities_level (#1486773)

Location:

trunk/plugins/squirrelmail_usercopy

Files:

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

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

@@ -15 +15 @@
 $rcmail_config['squirrelmail_userprefs_table'] = 'userprefs';
 
+// identities_level option value for squirrelmail plugin
+// With this you can bypass/change identities_level checks
+// for operations inside this plugin. See #1486773
+$rcmail_config['squirrelmail_identities_level'] = null;
+

trunk/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php

@@ -4 +4 @@
  * Copy a new users identity and settings from a nearby Squirrelmail installation
  *
- * @version 1.2
+ * @version 1.3
  * @author Thomas Bruederli, Johannes Hessellund, pommi, Thomas Lueder
  */
@@ -18 +18 @@
         {
                 $rcmail = rcmail::get_instance();
-                $this->identities_level = intval($rcmail->config->get('identities_level', 0));
+
+        // 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('create_user', array($this, 'create_user'));
@@ -28 +33 @@
                 // read prefs and add email address
                 $this->read_squirrel_prefs($p['user']);
-                if (($this->identities_level == 0 || $identities_level == 2) && $this->prefs['email_address'])
+                if (($this->identities_level == 0 || $this->identities_level == 2) && $this->prefs['email_address'])
                         $p['user_email'] = $this->prefs['email_address'];
                 return $p;
@@ -72 +77 @@
                                         $contacts->insert($rec, true);
                         }
-                        
+
                         // mark identity as complete for following hooks
                         $p['complete'] = true;
@@ -93 +98 @@
                         $sigfile = slashify($srcdir) . $uname . '.sig';
                         $sigbase = slashify($srcdir) . $uname . '.si';
-      
+
                         if (is_readable($prefsfile)) {
                                 $this->prefs = array();
@@ -108 +113 @@
                                 if (isset($this->prefs['identities']) && $this->prefs['identities'] > 1) {
                                         for ($i=1; $i < $this->prefs['identities']; $i++) {
-                                                // read signature file if exists  
+                                                // read signature file if exists
                                                 if (is_readable($sigbase.$i)) {
                                                         $this->prefs['___sig'.$i.'___'] = utf8_encode(file_get_contents($sigbase.$i));
@@ -134 +139 @@
 
                         // $db->set_debug(true);
-                        
+
                         /* retrieve prefs */
                         $userprefs_table = $rcmail->config->get('squirrelmail_userprefs_table');
@@ -151 +156 @@
                         /* retrieve address table data */
                         $sql_result = $db->query('SELECT * FROM '.$address_table.' WHERE owner=?', $uname); // ? is replaced with emailaddress
-                        
+
                         // parse addres book
                         while ($sql_array = $db->fetch_assoc($sql_result) ) { // fetch one row from result
@@ -159 +164 @@
                                 $rec['email']     = rcube_charset_convert(rtrim($sql_array['email']), $db_charset);
                                 $rec['note']      = rcube_charset_convert(rtrim($sql_array['label']), $db_charset);
-                                
+
                                 if ($rec['name'] && $rec['email'])
                                         $this->abook[] = $rec;
@@ -167 +172 @@
 
 }
-
-?>