Merge branch 'develop'

Author: Dmi3yy

.gitignore

@@ -7,5 +7,10 @@
 # and the config file
 /manager/includes/config.inc.php
 
+# Windows and Mac
+Thumbs.db
+Desktop.ini
+.DS_Store
+
 # except do not ignore .gitignore
 !.gitignore

README.md

@@ -7,14 +7,29 @@ Evolution CMS requires **PHP >= 5.4**, but snippet FormLister need **PHP >=5.6**
 
 ## What is EVO
 
-EVO is an open source Content Management System and Application Framework. Initially inspired by Etomite 0.6, then it been MODX Evolution 0.7 - 1.0.8 is an ongoing project written by Raymond Irving and a core team of contributors MODX, and now its Evolution CMS maintained by Dmytro Lukianenko and a core team of contributors at the EVO Project. EVO is distributed under the GPL license and is now run by a professional team of developers from all over the world. Visit the Forums for more information.
+**EVO** is an open source Content Management System and Application Framework.
 
-EVO provides a fast, lightweight and powerful framework on which to deploy and secure your website and web applications. For example, it gives you a true system for registered web users and groups that is separate from administration users. You can grant some web users access to one page and others access to another page. For content management, you can easily duplicate documents, folders (and all their children!), chunks and snippets. Most significant, though, is EVO's ability to empower you to quickly and easily create and maintain a rich and dynamic website like never before.
+## History
 
+Initially inspired by **Etomite 0.6**, then it been **MODX Evolution 0.7 - 1.0.8** is an ongoing project written by *Raymond Irving* and a core team of contributors **MODX**, and now its **Evolution CMS** maintained by *Dmytro Lukianenko* and a core team of contributors at the **EVO Project**.
 
+## License
 
-### Install
-for easy and fast install you can use [Evo Installer](https://github.com/evolution-cms/installer)
+**EVO** is distributed under the **GPL license** and is now run by a professional team of developers from all over the world. Visit the Forums for more information.
+
+## Features
+
+**EVO** provides a fast, lightweight and powerful framework on which to deploy and secure your website and web applications.
+
+For example, it gives you a true system for registered web users and groups that is separate from administration users. You can grant some web users access to one page and others access to another page.
+
+For content management, you can easily duplicate documents, folders (and all their children!), chunks and snippets.
+
+Most significant, though, is **EVO's** ability to empower you to quickly and easily create and maintain a rich and dynamic website like never before.
+
+
+## Install
+Just use [Evo Installer](https://github.com/evolution-cms/installer)
 
 
 ### Screenshots

assets/docs/changelog.txt

@@ -0,0 +1,5 @@
+IndexIgnore */*
+<Files *.php>
+    Order Deny,Allow
+    Deny from all
+</Files>

assets/images/noimage.jpg

@@ -51,4 +51,4 @@
             }
         }
     });
-})(jQuery);
+})(jQuery);

assets/js/.htaccess

@@ -158,7 +158,7 @@ public static function genPass($len, $data = '')
      * @param $data
      * @return bool|false|string
      */
-    private static function _getEnv($data)
+    public static function getEnv($data)
     {
         switch (true) {
             case (isset($_SERVER[$data])):
@@ -197,25 +197,25 @@ public static function getUserIP($default = '127.0.0.1')
     {
         //Порядок условий зависит от приоритетов
         switch (true) {
-            case ($tmp = self::_getEnv('HTTP_COMING_FROM')):
+            case ($tmp = self::getEnv('HTTP_COMING_FROM')):
                 $out = $tmp;
                 break;
-            case ($tmp = self::_getEnv('HTTP_X_COMING_FROM')):
+            case ($tmp = self::getEnv('HTTP_X_COMING_FROM')):
                 $out = $tmp;
                 break;
-            case ($tmp = self::_getEnv('HTTP_VIA')):
+            case ($tmp = self::getEnv('HTTP_VIA')):
                 $out = $tmp;
                 break;
-            case ($tmp = self::_getEnv('HTTP_FORWARDED')):
+            case ($tmp = self::getEnv('HTTP_FORWARDED')):
                 $out = $tmp;
                 break;
-            case ($tmp = self::_getEnv('HTTP_FORWARDED_FOR')):
+            case ($tmp = self::getEnv('HTTP_FORWARDED_FOR')):
                 $out = $tmp;
                 break;
-            case ($tmp = self::_getEnv('HTTP_X_FORWARDED')):
+            case ($tmp = self::getEnv('HTTP_X_FORWARDED')):
                 $out = $tmp;
                 break;
-            case ($tmp = self::_getEnv('HTTP_X_FORWARDED_FOR')):
+            case ($tmp = self::getEnv('HTTP_X_FORWARDED_FOR')):
                 $out = $tmp;
                 break;
             case (!empty($_SERVER['REMOTE_ADDR'])):

assets/js/easy-ui/editors/imageBrowser.js

@@ -86,10 +86,10 @@ public function getConfig()
      * @param array $cfg массив настроек
      * @return int результат сохранения настроек
      */
-    public function setConfig($cfg)
+    public function setConfig($cfg, $overwrite = false)
     {
         if (is_array($cfg)) {
-            $this->_cfg = array_merge($this->_cfg, $cfg);
+            $this->_cfg = $overwrite ? $cfg : array_merge($this->_cfg, $cfg);
             $ret = count($this->_cfg);
         } else {
             $ret = false;
@@ -98,6 +98,11 @@ public function setConfig($cfg)
         return $ret;
     }
 
+    /**
+     * @param $name
+     * @param null $def
+     * @return mixed
+     */
     public function getCFGDef($name, $def = null)
     {
         return \APIhelpers::getkey($this->_cfg, $name, $def);

assets/lib/APIHelpers.class.php

@@ -290,8 +290,9 @@ public function relativePath($path, $owner = null)
         if (is_null($owner)) {
             $owner = MODX_BASE_PATH;
         }
+        $path = str_replace('\\', '/', $path);
         if (!(empty($path) || !is_scalar($path)) && !preg_match("/^http(s)?:\/\/\w+/", $path)) {
-            $path = trim(preg_replace("#^" . $owner . "#", '', $path), '/');
+            $path = trim(preg_replace("#^" . preg_quote($owner) . "#", '', $path), DIRECTORY_SEPARATOR);
         } else {
             $path = '';
         }

assets/lib/Helpers/Config.php

@@ -1,6 +1,7 @@
 <?php namespace Helpers;
 
 include_once(MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php');
+include_once(MODX_MANAGER_PATH . 'includes/extenders/modxmailer.class.inc.php');
 
 /**
  * Class Mailer
@@ -15,7 +16,7 @@ class Mailer
     protected $modx = null;
     public $config = array();
     protected $debug = false;
-
+    protected $queuePath = 'assets/cache/mail/';
 
     /**
      * Mailer constructor.
@@ -26,10 +27,11 @@ class Mailer
     public function __construct(\DocumentParser $modx, $cfg, $debug = false)
     {
         $this->modx = $modx;
-        $modx->loadExtension('MODxMailer');
-        $this->mail = $modx->mail;
+        $this->mail = new \MODxMailer();
+        $this->mail->init($modx);
         $this->config = $cfg;
         $this->debug = $debug;
+        $this->applyMailConfig();
     }
 
     /**
@@ -88,15 +90,7 @@ public function send($report)
             return false;
         }
 
-        $this->mail->IsHTML($this->getCFGDef('isHtml', 1));
-        $this->mail->From = $this->getCFGDef('from', $this->modx->config['site_name']);
-        $this->mail->FromName = $this->getCFGDef('fromName', $this->modx->config['emailsender']);
-        $this->mail->Subject = $this->getCFGDef('subject');
         $this->mail->Body = $report;
-        $this->addAddressToMailer("replyTo", $this->getCFGDef('replyTo'));
-        $this->addAddressToMailer("to", $this->getCFGDef('to'));
-        $this->addAddressToMailer("cc", $this->getCFGDef('cc'));
-        $this->addAddressToMailer("bcc", $this->getCFGDef('bcc'));
 
         $result = $this->mail->send();
         if ($result) {
@@ -107,6 +101,124 @@ public function send($report)
         return $result;
     }
 
+    /**
+     * @param $report
+     * @return bool
+     */
+    public function toQueue($report)
+    {
+        //если отправлять некуда или незачем, то делаем вид, что отправили
+        if (!$this->getCFGDef('to') || $this->getCFGDef('noemail')) {
+            return true;
+        } elseif (empty($report)) {
+            return false;
+        }
+
+        $this->mail->Body = $report;
+
+        $this->Body = $this->modx->removeSanitizeSeed($this->mail->Body);
+        $this->Subject = $this->modx->removeSanitizeSeed($this->mail->Subject);
+        try {
+            $result = $this->mail->preSend() && $this->saveMessage();
+        } catch (\phpmailerException $e) {
+            $this->mail->SetError($e->getMessage());
+
+            $result = false;
+        }
+
+        if ($result) {
+            $this->mail->ClearAllRecipients();
+            $this->mail->ClearAttachments();
+            $result = $this->getFileName();
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param string $path
+     * @return bool
+     */
+    public function setQueuePath($path = '') {
+        if (!empty($path)) {
+            $this->queuePath = $path;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * @return mixed
+     */
+    protected function saveMessage()
+    {
+        $data = serialize(array(
+            "header" => $this->mail->getMIMEHeader(),
+            "body"   => $this->mail->getMIMEBody(),
+            "config" => $this->config
+        ));
+        $file = $this->getFileName();
+        $dir = MODX_BASE_PATH . $this->queuePath;
+        if (!is_dir($dir)) {
+            @mkdir($dir);
+        }
+        $result = @file_put_contents($dir . $file, $data) !== false;
+        if ($result) {
+            $result = $file;
+        }
+
+        return $result;
+    }
+
+    /**
+     * @return string
+     */
+    protected function getFileName() {
+        return $this->mail->getMessageID() . '.eml';
+    }
+
+    /**
+     * @param $file
+     * @return bool
+     */
+    public function fromQueue($file)
+    {
+        $result = false;
+        $dir = MODX_BASE_PATH . $this->queuePath;
+        if (file_exists($dir . $file) && is_readable($dir . $file)) {
+            $message = unserialize(file_get_contents($dir . $file));
+            $this->config = $message['config'];
+            $this->applyMailConfig();
+            $this->mail->setMIMEHeader($message['header'])->setMIMEBody($message['body']);
+            unset($message);
+            $result = $this->mail->postSend();
+            if ($result) {
+                $this->mail->setMIMEBody()->setMIMEHeader();
+                @unlink($dir . $file);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @return $this
+     */
+    protected function applyMailConfig()
+    {
+        $this->mail->IsHTML($this->getCFGDef('isHtml', 1));
+        $this->mail->From = $this->getCFGDef('from', $this->modx->config['emailsender']);
+        $this->mail->FromName = $this->getCFGDef('fromName', $this->modx->config['site_name']);
+        $this->mail->Subject = $this->getCFGDef('subject');
+        $this->addAddressToMailer("replyTo", $this->getCFGDef('replyTo'));
+        $this->addAddressToMailer("to", $this->getCFGDef('to'));
+        $this->addAddressToMailer("cc", $this->getCFGDef('cc'));
+        $this->addAddressToMailer("bcc", $this->getCFGDef('bcc'));
+
+        return $this;
+    }
+
     /**
      * @param string $param
      * @param mixed $default