diff options
Diffstat (limited to 'plugins/squirrelmail_usercopy')
| -rw-r--r-- | plugins/squirrelmail_usercopy/config.inc.php.dist | 18 | ||||
| -rw-r--r-- | plugins/squirrelmail_usercopy/squirrelmail_usercopy.php | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/plugins/squirrelmail_usercopy/config.inc.php.dist b/plugins/squirrelmail_usercopy/config.inc.php.dist index 03ec1cb86..cb62b1b86 100644 --- a/plugins/squirrelmail_usercopy/config.inc.php.dist +++ b/plugins/squirrelmail_usercopy/config.inc.php.dist @@ -1,25 +1,25 @@ <?php // Driver - 'file' or 'sql' -$config['squirrelmail_driver'] = 'sql'; +$rcmail_config['squirrelmail_driver'] = 'sql'; // full path to the squirrelmail data directory -$config['squirrelmail_data_dir'] = ''; -$config['squirrelmail_data_dir_hash_level'] = 0; +$rcmail_config['squirrelmail_data_dir'] = ''; +$rcmail_config['squirrelmail_data_dir_hash_level'] = 0; // 'mysql://dbuser:dbpass@localhost/database' -$config['squirrelmail_dsn'] = 'mysql://user:password@localhost/webmail'; -$config['squirrelmail_db_charset'] = 'iso-8859-1'; +$rcmail_config['squirrelmail_dsn'] = 'mysql://user:password@localhost/webmail'; +$rcmail_config['squirrelmail_db_charset'] = 'iso-8859-1'; -$config['squirrelmail_address_table'] = 'address'; -$config['squirrelmail_userprefs_table'] = 'userprefs'; +$rcmail_config['squirrelmail_address_table'] = 'address'; +$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 -$config['squirrelmail_identities_level'] = null; +$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. -$config['squirrelmail_set_alias'] = true;
\ No newline at end of file +$rcmail_config['squirrelmail_set_alias'] = true;
\ No newline at end of file diff --git a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php index e882a2f37..7849f915e 100644 --- a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php +++ b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php @@ -63,7 +63,7 @@ class squirrelmail_usercopy extends rcube_plugin if ($this->prefs['___sig'.$i.'___']) $ident_data['signature'] = $this->prefs['___sig'.$i.'___']; // insert identity - $rcmail->user->insert_identity($ident_data); + $identid = $rcmail->user->insert_identity($ident_data); } } @@ -73,8 +73,8 @@ class squirrelmail_usercopy extends rcube_plugin foreach ($this->abook as $rec) { // #1487096 handle multi-address and/or too long items $rec['email'] = array_shift(explode(';', $rec['email'])); - if (rcube_utils::check_email(rcube_utils::idn_to_ascii($rec['email']))) { - $rec['email'] = rcube_utils::idn_to_utf8($rec['email']); + if (check_email(rcube_idn_to_ascii($rec['email']))) { + $rec['email'] = rcube_idn_to_utf8($rec['email']); $contacts->insert($rec, true); } } @@ -167,7 +167,7 @@ class squirrelmail_usercopy extends rcube_plugin $sql_result = $db->query('SELECT * FROM '.$userprefs_table.' WHERE user=?', $uname); // ? is replaced with emailaddress while ($sql_array = $db->fetch_assoc($sql_result) ) { // fetch one row from result - $this->prefs[$sql_array['prefkey']] = rcube_charset::convert(rtrim($sql_array['prefval']), $db_charset); + $this->prefs[$sql_array['prefkey']] = rcube_charset_convert(rtrim($sql_array['prefval']), $db_charset); } /* retrieve address table data */ @@ -175,11 +175,11 @@ class squirrelmail_usercopy extends rcube_plugin // parse addres book while ($sql_array = $db->fetch_assoc($sql_result) ) { // fetch one row from result - $rec['name'] = rcube_charset::convert(rtrim($sql_array['nickname']), $db_charset); - $rec['firstname'] = rcube_charset::convert(rtrim($sql_array['firstname']), $db_charset); - $rec['surname'] = rcube_charset::convert(rtrim($sql_array['lastname']), $db_charset); - $rec['email'] = rcube_charset::convert(rtrim($sql_array['email']), $db_charset); - $rec['notes'] = rcube_charset::convert(rtrim($sql_array['label']), $db_charset); + $rec['name'] = rcube_charset_convert(rtrim($sql_array['nickname']), $db_charset); + $rec['firstname'] = rcube_charset_convert(rtrim($sql_array['firstname']), $db_charset); + $rec['surname'] = rcube_charset_convert(rtrim($sql_array['lastname']), $db_charset); + $rec['email'] = rcube_charset_convert(rtrim($sql_array['email']), $db_charset); + $rec['notes'] = rcube_charset_convert(rtrim($sql_array['label']), $db_charset); if ($rec['name'] && $rec['email']) $this->abook[] = $rec; |