Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ca790d72de | ||
|
|
af54e4b099 | ||
|
|
da17fb896b | ||
|
|
afc4f54594 | ||
|
|
7795a0fbf9 | ||
|
|
6fa82d6ba5 | ||
|
|
fff6c6b95a | ||
|
|
92d0f40e3c |
@@ -32,6 +32,6 @@ This plugin allows users to switch between different accounts (including remote)
|
|||||||
* Versions 1.X (not supported any more) - for Roundcube v1.1
|
* Versions 1.X (not supported any more) - for Roundcube v1.1
|
||||||
* Versions 2.X (not supported any more) - for Roundcube v1.2
|
* Versions 2.X (not supported any more) - for Roundcube v1.2
|
||||||
* Versions 3.X (not supported any more) - for Roundcube v1.3
|
* Versions 3.X (not supported any more) - for Roundcube v1.3
|
||||||
* Versions 4.x - for Roundcube v1.3 and upcoming 1.4.
|
* Versions 4.x - for Roundcube v1.3 and 1.4.
|
||||||
|
|
||||||
Please specify version like "~2.0" in your composer.json file for ident_switch requirement. In this case you will stay inside compatible branch until you manually update your Roundcube installation.
|
Please specify version like "~2.0" in your composer.json file for ident_switch requirement. In this case you will stay inside compatible branch until you manually update your Roundcube installation.
|
||||||
|
|||||||
@@ -34,6 +34,18 @@ CREATE TABLE ident_switch
|
|||||||
smtp_port
|
smtp_port
|
||||||
integer
|
integer
|
||||||
CHECK(smtp_port > 0 AND smtp_port <= 65535),
|
CHECK(smtp_port > 0 AND smtp_port <= 65535),
|
||||||
|
smtp_auth
|
||||||
|
smallint
|
||||||
|
NOT NULL
|
||||||
|
DEFAULT 1,
|
||||||
|
drafts_mbox
|
||||||
|
varchar(64),
|
||||||
|
sent_mbox
|
||||||
|
varchar(64),
|
||||||
|
junk_mbox
|
||||||
|
varchar(64),
|
||||||
|
trash_mbox
|
||||||
|
varchar(64),
|
||||||
UNIQUE (user_id, label)
|
UNIQUE (user_id, label)
|
||||||
);
|
);
|
||||||
CREATE INDEX IX_ident_switch_user_id ON ident_switch(user_id);
|
CREATE INDEX IX_ident_switch_user_id ON ident_switch(user_id);
|
||||||
|
|||||||
92
SQL/sqlite/2020121600.sql
Normal file
92
SQL/sqlite/2020121600.sql
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
PRAGMA foreign_keys=off;
|
||||||
|
BEGIN TRANSACTION;
|
||||||
|
|
||||||
|
ALTER TABLE ident_switch RENAME TO ident_switch_old;
|
||||||
|
|
||||||
|
CREATE TABLE ident_switch
|
||||||
|
(
|
||||||
|
id
|
||||||
|
integer
|
||||||
|
PRIMARY KEY,
|
||||||
|
user_id
|
||||||
|
integer
|
||||||
|
NOT NULL
|
||||||
|
REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE,
|
||||||
|
iid
|
||||||
|
integer
|
||||||
|
NOT NULL
|
||||||
|
REFERENCES identities(identity_id) ON DELETE CASCADE ON UPDATE CASCADE
|
||||||
|
UNIQUE,
|
||||||
|
username
|
||||||
|
varchar(64),
|
||||||
|
password
|
||||||
|
varchar(64),
|
||||||
|
imap_host
|
||||||
|
varchar(64),
|
||||||
|
imap_port
|
||||||
|
integer
|
||||||
|
CHECK(imap_port > 0 AND imap_port <= 65535),
|
||||||
|
imap_delimiter
|
||||||
|
char(1),
|
||||||
|
label
|
||||||
|
varchar(32),
|
||||||
|
flags
|
||||||
|
integer
|
||||||
|
NOT NULL
|
||||||
|
DEFAULT(0),
|
||||||
|
smtp_host
|
||||||
|
varchar(64),
|
||||||
|
smtp_port
|
||||||
|
integer
|
||||||
|
CHECK(smtp_port > 0 AND smtp_port <= 65535),
|
||||||
|
smtp_auth
|
||||||
|
smallint
|
||||||
|
NOT NULL
|
||||||
|
DEFAULT 1,
|
||||||
|
drafts_mbox
|
||||||
|
varchar(64),
|
||||||
|
sent_mbox
|
||||||
|
varchar(64),
|
||||||
|
junk_mbox
|
||||||
|
varchar(64),
|
||||||
|
trash_mbox
|
||||||
|
varchar(64),
|
||||||
|
UNIQUE (user_id, label)
|
||||||
|
);
|
||||||
|
CREATE INDEX IX_ident_switch_user_id ON ident_switch(user_id);
|
||||||
|
CREATE INDEX IX_ident_switch_iid on ident_switch(iid);
|
||||||
|
|
||||||
|
INSERT OR ROLLBACK INTO
|
||||||
|
ident_switch (
|
||||||
|
id,
|
||||||
|
user_id,
|
||||||
|
iid,
|
||||||
|
username,
|
||||||
|
password,
|
||||||
|
imap_host,
|
||||||
|
imap_port,
|
||||||
|
label,
|
||||||
|
flags,
|
||||||
|
smtp_host,
|
||||||
|
smtp_port
|
||||||
|
)
|
||||||
|
SELECT
|
||||||
|
id,
|
||||||
|
user_id,
|
||||||
|
iid,
|
||||||
|
username,
|
||||||
|
password,
|
||||||
|
imap_host,
|
||||||
|
imap_port,
|
||||||
|
label,
|
||||||
|
flags,
|
||||||
|
smtp_host,
|
||||||
|
smtp_port
|
||||||
|
FROM
|
||||||
|
ident_switch_old;
|
||||||
|
|
||||||
|
DROP TABLE
|
||||||
|
ident_switch_old;
|
||||||
|
|
||||||
|
COMMIT;
|
||||||
|
PRAGMA foreign_keys=on;
|
||||||
@@ -163,7 +163,7 @@ class ident_switch extends rcube_plugin
|
|||||||
|
|
||||||
$rc = rcmail::get_instance();
|
$rc = rcmail::get_instance();
|
||||||
|
|
||||||
$sql = 'SELECT smtp_host, flags, smtp_port, username, smtp_auth password FROM ' . $rc->db->table_name(self::TABLE) . ' WHERE iid = ? AND user_id = ?';
|
$sql = 'SELECT smtp_host, flags, smtp_port, username, smtp_auth, password FROM ' . $rc->db->table_name(self::TABLE) . ' WHERE iid = ? AND user_id = ?';
|
||||||
$q = $rc->db->query($sql, $iid ,$rc->user->ID);
|
$q = $rc->db->query($sql, $iid ,$rc->user->ID);
|
||||||
$r = $rc->db->fetch_assoc($q);
|
$r = $rc->db->fetch_assoc($q);
|
||||||
if (is_array($r))
|
if (is_array($r))
|
||||||
|
|||||||
76
localization/sl_SI.inc
Normal file
76
localization/sl_SI.inc
Normal file
@@ -0,0 +1,76 @@
|
|||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* Localization file for ident_switch plugin
|
||||||
|
*/
|
||||||
|
$labels = array();
|
||||||
|
|
||||||
|
// Plugin ident_switch
|
||||||
|
$labels['form.common.caption'] = 'Razširitev ident_switch';
|
||||||
|
|
||||||
|
// Enabled
|
||||||
|
$labels['form.common.enabled'] = 'Omogočeno';
|
||||||
|
|
||||||
|
// Label
|
||||||
|
$labels['form.common.label'] = 'Oznaka';
|
||||||
|
|
||||||
|
// Value in \'Label\' field is too long (32 chars max).
|
||||||
|
$labels['err.label.long'] = 'Število znakov v polju \'Oznaka\' presega maksimalno število znakov (max 32 znakov).';
|
||||||
|
|
||||||
|
|
||||||
|
// IMAP
|
||||||
|
$labels['form.imap.caption'] = 'IMAP';
|
||||||
|
|
||||||
|
// Server host name
|
||||||
|
$labels['form.imap.host'] = 'Ime oz. naslov IMAP strežnika';
|
||||||
|
|
||||||
|
// Secure connection (TLS)
|
||||||
|
$labels['form.imap.tls'] = 'Varna povezava (TLS)';
|
||||||
|
|
||||||
|
// Port
|
||||||
|
$labels['form.imap.port'] = 'Vrata';
|
||||||
|
|
||||||
|
// Folder hierarchy delimiter
|
||||||
|
$labels['form.imap.delimiter'] = 'Ločilo hierarhije map';
|
||||||
|
|
||||||
|
// Username
|
||||||
|
$labels['form.imap.username'] = 'Uporabniško ime';
|
||||||
|
|
||||||
|
// Password
|
||||||
|
$labels['form.imap.password'] = 'Geslo';
|
||||||
|
|
||||||
|
// Value in \'Username\' field is too long (64 chars max).
|
||||||
|
$labels['err.user.long'] = 'Število znakov v polju \'Uporabniško ime\' presega maksimalno število znakov (max 64 znakov).';
|
||||||
|
|
||||||
|
|
||||||
|
// SMTP
|
||||||
|
$labels['form.smtp.caption'] = 'SMTP';
|
||||||
|
|
||||||
|
// Server host name
|
||||||
|
$labels['form.smtp.host'] = 'Ime oz. naslov SMTP strežnika';
|
||||||
|
|
||||||
|
// Secure connection (TLS)
|
||||||
|
$labels['form.smtp.tls'] = 'Varna povezava (TLS)';
|
||||||
|
|
||||||
|
// Port
|
||||||
|
$labels['form.smtp.port'] = 'Vrata';
|
||||||
|
|
||||||
|
// Authorization
|
||||||
|
$labels['form.smtp.auth'] = 'Avtorizacija';
|
||||||
|
|
||||||
|
// As IMAP
|
||||||
|
$labels['form.smtp.auth.imap'] = 'Tako kot IMAP';
|
||||||
|
|
||||||
|
// None
|
||||||
|
$labels['form.smtp.auth.none'] = 'Brez';
|
||||||
|
|
||||||
|
|
||||||
|
// Errors
|
||||||
|
|
||||||
|
// Value in \'Server host name\' field is too long (64 chars max).
|
||||||
|
$labels['err.host.long'] = 'Število znakov v polju \'Ime oz. naslov IMAP strežnika\' presega maksimalno število znakov (max 64 znakov).';
|
||||||
|
|
||||||
|
// Value in \'Port\' field must be a number.
|
||||||
|
$labels['err.port.num'] = 'Vrednost \'Vrata\' mora biti številka.';
|
||||||
|
|
||||||
|
// Value in \'Port\' field must be between 1 and 65535.
|
||||||
|
$labels['err.port.range'] = 'Vrednost v polju \'Vrata\' mora biti med 1 in 65535.';
|
||||||
Reference in New Issue
Block a user