Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php

1 files changed, 34 insertions, 0 deletions

diff --git a/system/libraries/drivers/Log/Syslog.php b/system/libraries/drivers/Log/Syslog.php
new file mode 100644
index 00000000..5da5d255
--- /dev/null
+++ b/system/libraries/drivers/Log/Syslog.php
@@ -0,0 +1,34 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.');
+/**
+ * Log API driver.
+ *
+ * @package    Kohana_Log
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Log_Syslog_Driver extends Log_Driver {
+
+	protected $syslog_levels = array('error' => LOG_ERR,
+	                                 'alert' => LOG_WARNING,
+	                                 'info'  => LOG_INFO,
+	                                 'debug' => LOG_DEBUG);
+
+	public function save(array $messages)
+	{
+		// Open the connection to syslog
+		openlog($this->config['ident'], LOG_CONS, LOG_USER);
+
+		do
+		{
+			// Load the next message
+			list ($date, $type, $text) = array_shift($messages);
+
+			syslog($this->syslog_levels[$type], $text);
+		}
+		while ( ! empty($messages));
+
+		// Close connection to syslog
+		closelog();
+	}
+}
\ No newline at end of file