From 9e9913c4a61e93b5617b04a2e5cd8cf82eab425f Mon Sep 17 00:00:00 2001
From: Alexander Demidov <dimti@bk.ru>
Date: Wed, 14 Aug 2013 10:55:07 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?=
 =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=B8=D1=81=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B3=D0=B3=D0=B5=D1=80=D0=B0=20-=20=D0=B5=D1=81=D0=BB?=
 =?UTF-8?q?=D0=B8=20=D0=BB=D0=BE=D0=B3=D0=B3=D0=B8=D0=BD=D0=B3=20=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD,=20=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B3=D0=B4=D0=B0=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D1=81?=
 =?UTF-8?q?=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=BE=D0=B1?=
 =?UTF-8?q?=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=D1=85=20=D0=B2=D1=8B?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=B4=D0=B8=D1=82=D1=81=D1=8F=20=D0=B2=20=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D0=BD=D0=B4=D0=B0=D1=80=D1=82=D0=BD=D1=8B=D0=B9=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D1=82=D0=BE=D0=BA=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA=20=D0=B2=20php=20?=
 =?UTF-8?q?(=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BF=D0=BE=D1=82=D0=BE=D0=BA=20?=
 =?UTF-8?q?=D0=BD=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BE=D0=BF=D1=80=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8?=
 =?UTF-8?q?=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8=D0=BE=D0=BD=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B9=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B9=20ErrorStream)=20-=20=D0=BF=D1=80=D0=B8=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=80=20=D0=BA=D0=BE=D0=B4=D0=B0=20=D0=B2=D0=B7=D1=8F=D1=82=20?=
 =?UTF-8?q?=D1=81=20CliController.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 File.class.php | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/File.class.php b/File.class.php
index 81d2d05..bb1f121 100644
--- a/File.class.php
+++ b/File.class.php
@@ -14,11 +14,26 @@ abstract class File
 
     public $filename;
 
-    public $logger;
+    private $logger;
+
+    private $error_stream;
 
     public function __construct()
     {
-        $this->logger = Logger::getInstance();
+
+    }
+
+    public function log($message)
+    {
+        if (Config::get('LOGGING')) {
+            if (is_null($this->logger)) {
+                $this->logger = Logger::getInstance();
+            }
+            $this->logger->log($message);
+        } else {
+            $this->error_stream = Config::get('ErrorStream', 'php://stderr');
+            file_put_contents($this->error_stream, PHP_EOL . 'Log ' . '#' . __CLASS__ . ': ' . $message . PHP_EOL, FILE_APPEND);
+        }
     }
 
     /**
@@ -33,7 +48,7 @@ abstract class File
             if (!is_array($data)) {
                 $data = json_decode($data, true);
                 if (json_last_error() != JSON_ERROR_NONE) {
-                    $instance->logger->log('Unable to convert json-string to array. Data ' . print_r($data, true));
+                    $instance->log('Unable to convert json-string to array. Data ' . print_r($data, true));
                 }
             }
             if (is_array($data)) {
@@ -65,6 +80,7 @@ abstract class File
 
     /**
      * @return string
+     * TODO: Сделать настройку для изображения-заглушки применительно к Image
      */
     public function getWebName()
     {