Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace stubs with actual implementation which was missing in the repo

Browse source 
Resolves T595
This commit is contained in:
Thomas Bruederli 2015-07-06 22:37:45 +02:00
parent c7e0545e85
commit bbddeb6345
3 changed files with 162 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
plugins/kolab_2fa/lib/Kolab2FA/Log/Logger.php
View file

@ -1,8 +1,42 @@
<?php
/**
* Logging interface for the Kolab 2-Factor-Authentication components
*
* @author Thomas Bruederli <bruederli@kolabsys.com>
*
* Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
namespace Kolab2FA\Log;
interface Logger {
interface Logger
{
/**
* Setter for the log name
*/
public function set_name($name);
/**
* Setter for the minimum log level
*/
public function set_level($level);
/**
* Do log the given message at the given level
*/
public function log($level, $message);
}
?>

79
plugins/kolab_2fa/lib/Kolab2FA/Log/RcubeLogger.php
View file

@ -1,9 +1,80 @@
<?php
/**
* Kolab 2-Factor-Authentication Logging class to log messages
* through the Roundcube logging facilities.
*
* @author Thomas Bruederli <bruederli@kolabsys.com>
*
* Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
namespace Kolab2FA\Log;
class RcubeLogger implements Logger {
public function log($level, $message) {
error_log($message);
use \rcube;
class RcubeLogger implements Logger
{
protected $name = null;
protected $level = LOG_DEBUG;
public function __construct($name = null)
{
if ($name !== null) {
$this->set_name($name);
}
}
public function set_name($name)
{
$this->name = $name;
}
public function set_level($name)
{
$this->level = $level;
}
public function log($level, $message)
{
if (!is_string($message)) {
$message = var_export($message, true);
}
switch ($level) {
case LOG_DEBUG:
case LOG_INFO:
case LOG_NOTICE:
if ($level >= $this->level) {
rcube::write_log($this->name ?: 'console', $message);
}
break;
case LOG_EMERGE:
case LOG_ALERT:
case LOG_CRIT:
case LOG_ERR:
case LOG_WARNING:
rcube::raise_error(array(
'code' => 600,
'type' => 'php',
'message' => $message,
), true, false);
break;
}
}
}
?>

55
plugins/kolab_2fa/lib/Kolab2FA/Log/Syslog.php
View file

@ -1,9 +1,54 @@
<?php
/**
* Kolab 2-Factor-Authentication Logging class to log messages
* through the Roundcube logging facilities.
*
* @author Thomas Bruederli <bruederli@kolabsys.com>
*
* Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
namespace Kolab2FA\Log;
class Syslog implements Logger {
public function log($level, $message) {
error_log($message);
use \rcube;
class Syslog implements Logger
{
protected $name = 'Kolab2FA';
protected $level = LOG_INFO;
public function set_name($name)
{
$this->name = $name;
}
}
?>
public function set_level($name)
{
$this->level = $level;
}
public function log($level, $message)
{
if ($level >= $this->level) {
if (!is_string($message)) {
$message = var_export($message, true);
}
syslog($level, '[' . $this->name . '] ' . $message);
}
}
}