senior/roundcube-ident_switch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New member fuction to write to log. Make code easy to understand.

Browse Source
This commit is contained in:
Boris Gulay
2018-03-10 00:30:58 +03:00
parent 683b02027b
commit 913065548b
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ident_switch.php
View File

@@ -14,7 +14,6 @@ class ident_switch extends rcube_plugin
const TABLE = 'ident_switch'; const TABLE = 'ident_switch';
const MY_POSTFIX = '_iswitch'; const MY_POSTFIX = '_iswitch';
const MY_LOG = 'ident_switch';
// Flags user in database // Flags user in database
const DB_ENABLED = 1; const DB_ENABLED = 1;
@@ -286,7 +285,7 @@ class ident_switch extends rcube_plugin
unset($_SESSION['createData' . self::MY_POSTFIX]); unset($_SESSION['createData' . self::MY_POSTFIX]);
if (!$data || count($data) == 0) if (!$data || count($data) == 0)
$rc->write_log($this->my_log, 'Object with ident_switch values not found in session for ID = ' . $args['id'] . '.'); self::write_log('Object with ident_switch values not found in session for ID = ' . $args['id'] . '.');
else else
{ {
$data['id'] = $args['id']; $data['id'] = $args['id'];
@@ -304,7 +303,7 @@ class ident_switch extends rcube_plugin
$q = $rc->db->query($sql, $args['id'], $rc->user->ID); $q = $rc->db->query($sql, $args['id'], $rc->user->ID);
if ($rc->db->affected_rows($q)) if ($rc->db->affected_rows($q))
$rc->write_log($this->my_log, 'Deleted associated information for identity with ID = ' . $args['id'] . '.'); self::write_log('Deleted associated information for identity with ID = ' . $args['id'] . '.');
return $args; return $args;
} }
@@ -319,7 +318,7 @@ class ident_switch extends rcube_plugin
if (isset($_SESSION['iid' . self::MY_POSTFIX])) if (isset($_SESSION['iid' . self::MY_POSTFIX]))
$rc->output->add_script('plugin_switchIdent_fixIdent(' . $_SESSION['iid' . self::MY_POSTFIX] . ');', 'docready'); $rc->output->add_script('plugin_switchIdent_fixIdent(' . $_SESSION['iid' . self::MY_POSTFIX] . ');', 'docready');
else else
$rc->write_log($this->my_log, 'Special session variable with active identity ID not found.'); self::write_log('Special session variable with active identity ID not found.');
} }
} }
} }
@@ -430,7 +429,7 @@ class ident_switch extends rcube_plugin
if (-1 == $identId) if (-1 == $identId)
{ // Switch to main account { // Switch to main account
$rc->write_log($this->my_log, 'Switching mailbox back to default.'); self::write_log('Switching mailbox back to default.');
// Restore everything with STORAGE*my_postfix // Restore everything with STORAGE*my_postfix
foreach ($_SESSION as $k => $v) foreach ($_SESSION as $k => $v)
@@ -463,7 +462,7 @@ class ident_switch extends rcube_plugin
} }
$rc->write_log( $rc->write_log(
$this->my_log, self::MY_LOG,
'Switching mailbox to one for identity with ID = ' . $r['iid'] . ' (username = \'' . $r['username'] . '\').' 'Switching mailbox to one for identity with ID = ' . $r['iid'] . ' (username = \'' . $r['username'] . '\').'
); );
@@ -513,7 +512,7 @@ class ident_switch extends rcube_plugin
else else
{ {
// TODO: Show message in browser // TODO: Show message in browser
$rc->write_log($this->my_log, 'Requested remote mailbox with ID = ' . $identId . ' not found.'); self::write_log('Requested remote mailbox with ID = ' . $identId . ' not found.');
return; return;
} }
} }
@@ -561,7 +560,7 @@ class ident_switch extends rcube_plugin
if (is_array($cfg)) if (is_array($cfg))
{ {
rcmail::get_instance()->write_log( rcmail::get_instance()->write_log(
$this->my_log, self::MY_LOG,
'Applying predefined configuration for \'' . $email . '\'.' 'Applying predefined configuration for \'' . $email . '\'.'
); );
@@ -617,5 +616,10 @@ class ident_switch extends rcube_plugin
return null; return null;
return $s; return $s;
} }
private static function write_log($txt)
{
rcmail::get_instance()->write_log('ident_switch', $txt);
}
} }