AgelxNash / DocLister

assets/lib/APIHelpers.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
      * @license    GNU General Public License (GPL), http://www.gnu.org/copyleft/gpl.html
      * @param string $email проверяемый email
      * @param boolean $dns проверять ли DNS записи
-     * @return boolean Результат проверки почтового ящика
+     * @return false|string Результат проверки почтового ящика
      * @author Anton Shevchuk
      */
     public static function emailValidate($email, $dns = true)
@@ -146,7 +146,7 @@ 
     }
 
     /**
-     * @param $data
+     * @param string $data
      * @return bool|false|string
      */
     private function _getEnv($data)

assets/lib/Formatter/SqlFormatter.php

Doc Comments +2 added lines, -2 removed lines

@@ -330,8 +330,8 @@
     }
 
     /**
-     * @param $string
-     * @return null
+     * @param string $string
+     * @return string|null
      */
     protected static function getQuotedString($string)
     {

assets/lib/Helpers/PHPThumb.php

Doc Comments +3 added lines, -3 removed lines

@@ -23,8 +23,8 @@ 
     }
 
     /**
-     * @param $inputFile
-     * @param $outputFile
+     * @param string $inputFile
+     * @param string $outputFile
      * @param $options
      * @return bool
      */
@@ -66,7 +66,7 @@ 
     }
 
     /**
-     * @param $options
+     * @param string $options
      */
     private function setOptions($options) {
         $options = strtr($options, Array("," => "&", "_" => "=", '{' => '[', '}' => ']'));

assets/lib/Module/Helper.php

Doc Comments +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
 	}
 
     /**
-     * @param $text
+     * @param string $text
      */
     public static function setMode($text)
 	{
@@ -36,7 +36,7 @@ 
 	}
 
     /**
-     * @param $from
+     * @param string $from
      * @param string $where
      * @return mixed
      */
@@ -105,7 +105,7 @@ 
 
     /**
      * @param $path
-     * @param $callback
+     * @param \Closure $callback
      * @param array $callbackParams
      * @param int $lines
      * @param int $size

Indentation +68 added lines, -68 removed lines

@@ -8,7 +8,7 @@ 
  */
 class Helper extends \APIhelpers{
     protected static $modx = null;
-	protected static $mode = 'list';
+    protected static $mode = 'list';
 
     /**
      * @param \DocumentParser $modx
@@ -16,24 +16,24 @@ 
      */
     public static function init(\DocumentParser $modx, $mode = 'list'){
         self::$modx = $modx;
-		self::setMode($mode);
+        self::setMode($mode);
     }
 
     /**
      * @return string
      */
     public static function getMode()
-	{
-		return self::$mode;
-	}
+    {
+        return self::$mode;
+    }
 
     /**
      * @param $text
      */
     public static function setMode($text)
-	{
-		self::$mode = $text;
-	}
+    {
+        self::$mode = $text;
+    }
 
     /**
      * @param $from
@@ -51,16 +51,16 @@ 
      * @return array
      */
     public static function jeditable($key = 'id', $post = true){
-       $data = array();
-       $request = $post ? $_POST : $_GET;
-       $match = (isset($request[$key]) && is_scalar($request[$key]) && preg_match("/^(.*)_(\d+)$/i", $request[$key], $match)) ? $match : array();
-       if(!empty($match)){
-           $data = array(
-               'key' => $match[1],
-               'id' => $match[2]
-           );
-       }
-       return $data;
+        $data = array();
+        $request = $post ? $_POST : $_GET;
+        $match = (isset($request[$key]) && is_scalar($request[$key]) && preg_match("/^(.*)_(\d+)$/i", $request[$key], $match)) ? $match : array();
+        if(!empty($match)){
+            $data = array(
+                'key' => $match[1],
+                'id' => $match[2]
+            );
+        }
+        return $data;
     }
 
     /**
@@ -71,37 +71,37 @@ 
      * @return mixed
      */
     public static function curl($url, $data = '', $post = false, array $header = array())
-	{
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		$post = (bool)$post;
-		curl_setopt($ch, CURLOPT_POST, $post);
-		if ($post) {
-			curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-		}
-		if (!empty($header)) {
-			curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
-		}
-		curl_setopt($ch, CURLOPT_TIMEOUT, 10);
-		curl_setopt($ch, CURLOPT_URL, $url);
-		return curl_exec($ch);
-	}
+    {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        $post = (bool)$post;
+        curl_setopt($ch, CURLOPT_POST, $post);
+        if ($post) {
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+        }
+        if (!empty($header)) {
+            curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+        }
+        curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+        curl_setopt($ch, CURLOPT_URL, $url);
+        return curl_exec($ch);
+    }
 
-	/**
-	 * Были ли ошибки во время работы с JSON
-	 *
-	 * @param $json string строка с JSON для записи в лог при отладке
-	 * @return bool|string
-	 */
-	public function isErrorJSON($json)
-	{
-		require_once(MODX_BASE_PATH . "assets/snippets/DocLister/lib/jsonHelper.class.php");
-		$error = \jsonHelper::json_last_error_msg();
-		if (!in_array($error, array('error_none', 'other'))) {
-			$error = true;
-		}
-		return $error;
-	}
+    /**
+     * Были ли ошибки во время работы с JSON
+     *
+     * @param $json string строка с JSON для записи в лог при отладке
+     * @return bool|string
+     */
+    public function isErrorJSON($json)
+    {
+        require_once(MODX_BASE_PATH . "assets/snippets/DocLister/lib/jsonHelper.class.php");
+        $error = \jsonHelper::json_last_error_msg();
+        if (!in_array($error, array('error_none', 'other'))) {
+            $error = true;
+        }
+        return $error;
+    }
 
     /**
      * @param $path
@@ -112,24 +112,24 @@ 
      * @return array
      */
     public static function readFileLine($path, $callback, array $callbackParams = array(), $lines = 0, $size = 4096)
-	{
-		$handle = fopen($path, "r");
-		$i = $total = 0;
-		while (!feof($handle)) {
-			$i++;
-			$buffer = fgets($handle, $size);
-			if (is_callable($callback)) {
-				$callbackParams['line'] = $buffer;
-				$callbackParams['numLine'] = $i;
-				if (call_user_func($callback, $callbackParams)) {
-					$total++;
-				}
-			}
-			if ($lines > 0 && $i >= $lines) {
-				break;
-			}
-		}
-		fclose($handle);
-		return array('line' => $i, 'add' => $total);
-	}
+    {
+        $handle = fopen($path, "r");
+        $i = $total = 0;
+        while (!feof($handle)) {
+            $i++;
+            $buffer = fgets($handle, $size);
+            if (is_callable($callback)) {
+                $callbackParams['line'] = $buffer;
+                $callbackParams['numLine'] = $i;
+                if (call_user_func($callback, $callbackParams)) {
+                    $total++;
+                }
+            }
+            if ($lines > 0 && $i >= $lines) {
+                break;
+            }
+        }
+        fclose($handle);
+        return array('line' => $i, 'add' => $total);
+    }
 }
\ No newline at end of file

assets/lib/Module/Template.php

Doc Comments +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
     }
 
     /**
-     * @param $name
+     * @param string $name
      * @return string
      */
     protected function _getMainTpl($name){
@@ -114,7 +114,7 @@ 
     }
 
     /**
-     * @param $TplName
+     * @param string $TplName
      * @param array $tplParams
      * @return string
      */

Indentation +11 added lines, -11 removed lines

@@ -7,7 +7,7 @@ 
 abstract class Template{
     protected $_modx = null;
     protected $_tplFolder = null;
-	protected $_publicFolder;
+    protected $_publicFolder;
     const TPL_EXT = 'html';
 
     public $vars = array(
@@ -35,12 +35,12 @@ 
         self::$_ajax = (boolean) $ajax;
         $this->loadVars();
         if(is_null($tplFolder)){
-		  $tplFolder = dirname(dirname(__FILE__));
+            $tplFolder = dirname(dirname(__FILE__));
         }
         $FS = \Helpers\FS::getInstance();
         $tplFolder = $FS->relativePath($tplFolder);
 
-		$this->_publicFolder = "/".$tplFolder."/public/";
+        $this->_publicFolder = "/".$tplFolder."/public/";
         $this->_tplFolder = MODX_BASE_PATH.$tplFolder."/template/";
 
         if(!defined('MODX_MAIN_URL')){
@@ -59,16 +59,16 @@ 
      * @return string
      */
     public function publicFolder(){
-		return $this->_publicFolder;
-	}
+        return $this->_publicFolder;
+    }
 
     /**
      * @param $path
      * @return string
      */
     public function src($path){
-		return rtrim(MODX_MAIN_URL, '/').$this->publicFolder().ltrim($path, '/');
-	}
+        return rtrim(MODX_MAIN_URL, '/').$this->publicFolder().ltrim($path, '/');
+    }
 
     /**
      * @return string
@@ -160,10 +160,10 @@ 
                 'id' => empty($module) ? self::getParam('id', $content, 0) : (int)$module
             )
         );
-		$out = implode("?", array($this->_modx->getManagerPath(), http_build_query($data)));
-		if ($full) {
-			$out = $this->_modx->getConfig('site_url') . ltrim($out, '/');
-		}
+        $out = implode("?", array($this->_modx->getManagerPath(), http_build_query($data)));
+        if ($full) {
+            $out = $this->_modx->getConfig('site_url') . ltrim($out, '/');
+        }
         return $out;
     }
 

Spacing +22 added lines, -22 removed lines

@@ -4,7 +4,7 @@ 
  * Class Template
  * @package Module
  */
-abstract class Template{
+abstract class Template {
     protected $_modx = null;
     protected $_tplFolder = null;
 	protected $_publicFolder;
@@ -30,11 +30,11 @@ 
      * @param bool $ajax
      * @param null $tplFolder
      */
-    public function __construct(\DocumentParser $modx, $ajax = false, $tplFolder = null){
+    public function __construct(\DocumentParser $modx, $ajax = false, $tplFolder = null) {
         $this->_modx = $modx;
-        self::$_ajax = (boolean) $ajax;
+        self::$_ajax = (boolean)$ajax;
         $this->loadVars();
-        if(is_null($tplFolder)){
+        if (is_null($tplFolder)) {
 		  $tplFolder = dirname(dirname(__FILE__));
         }
         $FS = \Helpers\FS::getInstance();
@@ -43,7 +43,7 @@ 
 		$this->_publicFolder = "/".$tplFolder."/public/";
         $this->_tplFolder = MODX_BASE_PATH.$tplFolder."/template/";
 
-        if(!defined('MODX_MAIN_URL')){
+        if (!defined('MODX_MAIN_URL')) {
             define('MODX_MAIN_URL', MODX_SITE_URL);
         }
     }
@@ -51,14 +51,14 @@ 
     /**
      * @return bool
      */
-    public static function isAjax(){
+    public static function isAjax() {
         return self::$_ajax;
     }
 
     /**
      * @return string
      */
-    public function publicFolder(){
+    public function publicFolder() {
 		return $this->_publicFolder;
 	}
 
@@ -66,14 +66,14 @@ 
      * @param $path
      * @return string
      */
-    public function src($path){
+    public function src($path) {
 		return rtrim(MODX_MAIN_URL, '/').$this->publicFolder().ltrim($path, '/');
 	}
 
     /**
      * @return string
      */
-    public function showHeader(){
+    public function showHeader() {
         return $this->_getMainTpl('header.inc.php');
     }
 
@@ -81,23 +81,23 @@ 
      * @param $name
      * @return string
      */
-    protected function _getMainTpl($name){
+    protected function _getMainTpl($name) {
         $content = '';
-        if( ! self::isAjax()){
+        if (!self::isAjax()) {
 
             ob_start();
             extract($this->vars);
-            if(file_exists($incPath . $name)){
-                include($incPath . $name);
+            if (file_exists($incPath.$name)) {
+                include($incPath.$name);
                 $content = ob_get_contents();
             }
             ob_end_clean();
         }
         return $content;
     }
-    public function loadVars(){
+    public function loadVars() {
         $vars = array();
-        foreach($this->vars as $item){
+        foreach ($this->vars as $item) {
             global $$item;
             $vars[$item] = $$item;
         }
@@ -109,7 +109,7 @@ 
     /**
      * @return string
      */
-    public function showFooter(){
+    public function showFooter() {
         return $this->_getMainTpl('footer.inc.php');
     }
 
@@ -118,9 +118,9 @@ 
      * @param array $tplParams
      * @return string
      */
-    public function showBody($TplName, array $tplParams = array()){
+    public function showBody($TplName, array $tplParams = array()) {
         ob_start();
-        if(file_exists($this->_tplFolder.$TplName.".".self::TPL_EXT)){
+        if (file_exists($this->_tplFolder.$TplName.".".self::TPL_EXT)) {
             extract($this->vars);
             include($this->_tplFolder.$TplName.".".self::TPL_EXT);
         }
@@ -135,7 +135,7 @@ 
      * @param null $default
      * @return mixed|null
      */
-    public static function getParam($key, array $param = array(), $default = null){
+    public static function getParam($key, array $param = array(), $default = null) {
         return isset($param[$key]) ? $param[$key] : $default;
     }
 
@@ -146,7 +146,7 @@ 
      * @param bool $full
      * @return string
      */
-    public function makeUrl($action, array $data = array(), $module = null, $full = false){
+    public function makeUrl($action, array $data = array(), $module = null, $full = false) {
         $action = is_scalar($action) ? $action : '';
         $content = self::getParam('content', $this->vars, array());
         $data = array_merge(
@@ -162,7 +162,7 @@ 
         );
 		$out = implode("?", array($this->_modx->getManagerPath(), http_build_query($data)));
 		if ($full) {
-			$out = $this->_modx->getConfig('site_url') . ltrim($out, '/');
+			$out = $this->_modx->getConfig('site_url').ltrim($out, '/');
 		}
         return $out;
     }
@@ -170,7 +170,7 @@ 
     /**
      * @return string
      */
-    public static function showLog(){
+    public static function showLog() {
         return self::isAjax() ? 'log' : 'main';
     }
     abstract public function Lists();

assets/lib/MODxAPI/modResource.php

Doc Comments +5 added lines, -5 removed lines

@@ -220,7 +220,7 @@ 
     }
 
     /**
-     * @param $key
+     * @param string $key
      * @param $value
      * @return $this
      */
@@ -313,8 +313,8 @@ 
     }
 
     /**
-     * @param $data
-     * @return bool|string
+     * @param integer $data
+     * @return string|false
      */
     protected function findUserBy($data)
     {
@@ -600,7 +600,7 @@ 
     }
 
     /**
-     * @return array
+     * @return integer[]
      */
     private function systemID()
     {
@@ -711,7 +711,7 @@ 
     }
 
     /**
-     * @param $tpl
+     * @param string $tpl
      * @return int
      * @throws Exception
      */

Indentation +36 added lines, -36 removed lines

@@ -143,13 +143,13 @@ 
      * @return null
      */
     public function getUrl(){
-		$out = null;
-		$id = (int)$this->getID();
-		if(!empty($id)){
-			$out = $this->modx->makeUrl($id);
-		}
-		return $out;
-	}
+        $out = null;
+        $id = (int)$this->getID();
+        if(!empty($id)){
+            $out = $this->modx->makeUrl($id);
+        }
+        return $out;
+    }
 
     /**
      * @param string $main
@@ -157,12 +157,12 @@ 
      * @return mixed
      */
     public function getTitle($main = 'menutitle', $second = 'pagetitle'){
-		$title = $this->get($main);
-		if(empty($title) && $title !== '0'){
-			$title = $this->get($second);
-		}
-		return $title;
-	}
+        $title = $this->get($main);
+        if(empty($title) && $title !== '0'){
+            $title = $this->get($second);
+        }
+        return $title;
+    }
 
     /**
      * @return bool
@@ -516,9 +516,9 @@ 
         $ignore = $this->systemID();
         $_ids = $this->cleanIDs($ids, ',', $ignore);
         if (is_array($_ids) && $_ids != array()) {
-        	$id = $this->sanitarIn($_ids);
+            $id = $this->sanitarIn($_ids);
             $this->query("UPDATE {$this->makeTable('site_content')} SET `deleted`='1' WHERE `id` IN ({$id})");
-		} else throw new Exception('Invalid IDs list for mark trash: <pre>' . print_r($ids, 1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
+        } else throw new Exception('Invalid IDs list for mark trash: <pre>' . print_r($ids, 1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
         return $this;
     }
 
@@ -531,7 +531,7 @@ 
         $q = $this->modx->makeArray($q);
         $_ids = array();
         foreach($q as $item){
-              $_ids[] = $item['id'];
+                $_ids[] = $item['id'];
         }
         if (is_array($_ids) && $_ids != array()) {
             $this->invokeEvent('OnBeforeEmptyTrash', array(
@@ -582,19 +582,19 @@ 
         $ids = $this->childrens($ids, true);
         $_ids = $this->cleanIDs($ids, ',', $this->systemID());
         if (is_array($_ids) && $_ids != array()) {
-        	$this->invokeEvent('OnBeforeEmptyTrash', array(
-            	"ids" => $_ids
-			), $fire_events);
-
-			$id = $this->sanitarIn($_ids);
-			if(!empty($id)){
-				$this->query("DELETE from {$this->makeTable('site_content')} where `id` IN ({$id})");
-				$this->query("DELETE from {$this->makeTable('site_tmplvar_contentvalues')} where `contentid` IN ({$id})");
-				$this->invokeEvent('OnEmptyTrash', array(
-					"ids" => $_ids
-				), $fire_events);
-			}
-		} else throw new Exception('Invalid IDs list for delete: <pre>' . print_r($ids, 1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
+            $this->invokeEvent('OnBeforeEmptyTrash', array(
+                "ids" => $_ids
+            ), $fire_events);
+
+            $id = $this->sanitarIn($_ids);
+            if(!empty($id)){
+                $this->query("DELETE from {$this->makeTable('site_content')} where `id` IN ({$id})");
+                $this->query("DELETE from {$this->makeTable('site_tmplvar_contentvalues')} where `contentid` IN ({$id})");
+                $this->invokeEvent('OnEmptyTrash', array(
+                    "ids" => $_ids
+                ), $fire_events);
+            }
+        } else throw new Exception('Invalid IDs list for delete: <pre>' . print_r($ids, 1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
 
         return $this;
     }
@@ -719,13 +719,13 @@ 
     {
         if (!is_numeric($tpl) || $tpl != (int)$tpl) {
             if (is_scalar($tpl)) {
-            	$sql = "SELECT `id` FROM {$this->makeTable('site_templates')} WHERE `templatename` = '".$this->escape($tpl)."'";
-				$rs = $this->query($sql);
-				if (!$rs || $this->modx->db->getRecordCount($rs) <= 0) throw new Exception("Template {$tpl} is not exists");
-				$tpl = $this->modx->db->getValue($rs);
-			} else {
-				throw new Exception("Invalid template name: " . print_r($tpl, 1));
-			}
+                $sql = "SELECT `id` FROM {$this->makeTable('site_templates')} WHERE `templatename` = '".$this->escape($tpl)."'";
+                $rs = $this->query($sql);
+                if (!$rs || $this->modx->db->getRecordCount($rs) <= 0) throw new Exception("Template {$tpl} is not exists");
+                $tpl = $this->modx->db->getValue($rs);
+            } else {
+                throw new Exception("Invalid template name: " . print_r($tpl, 1));
+            }
         }
         return (int)$tpl;
     }

Spacing +56 added lines, -56 removed lines

@@ -110,13 +110,13 @@ 
         $out = array_diff_key(parent::toArray(), $this->default_field);
         $tpl = $this->get('template');
         $tvTPL = APIHelpers::getkey($this->tvTpl, $tpl, array());
-        foreach($tvTPL as $item){
-            if(isset($this->tvid[$item]) && !array_key_exists($this->tvid[$item], $out)){
+        foreach ($tvTPL as $item) {
+            if (isset($this->tvid[$item]) && !array_key_exists($this->tvid[$item], $out)) {
                 $out[$this->tvid[$item]] = $this->get($this->tvid[$item]);
             }
         }
-        if($render){
-            foreach($out as $key => $val){
+        if ($render) {
+            foreach ($out as $key => $val) {
                 $out[$key] = $this->renderTV($key);
             }
         }
@@ -130,7 +130,7 @@ 
      * @param bool $render
      * @return array
      */
-    public function toArray($prefix = '', $suffix = '', $sep = '_', $render = true){
+    public function toArray($prefix = '', $suffix = '', $sep = '_', $render = true) {
         $out = array_merge(
             $this->toArrayMain(),
             $this->toArrayTV($render),
@@ -142,10 +142,10 @@ 
     /**
      * @return null
      */
-    public function getUrl(){
+    public function getUrl() {
 		$out = null;
 		$id = (int)$this->getID();
-		if(!empty($id)){
+		if (!empty($id)) {
 			$out = $this->modx->makeUrl($id);
 		}
 		return $out;
@@ -156,9 +156,9 @@ 
      * @param string $second
      * @return mixed
      */
-    public function getTitle($main = 'menutitle', $second = 'pagetitle'){
+    public function getTitle($main = 'menutitle', $second = 'pagetitle') {
 		$title = $this->get($main);
-		if(empty($title) && $title !== '0'){
+		if (empty($title) && $title !== '0') {
 			$title = $this->get($second);
 		}
 		return $title;
@@ -178,7 +178,7 @@ 
     /**
      * @return $this
      */
-    public function touch(){
+    public function touch() {
         $this->set('editedon', time());
         return $this;
     }
@@ -187,11 +187,11 @@ 
      * @param $tvname
      * @return null
      */
-    public function renderTV($tvname){
+    public function renderTV($tvname) {
         $out = null;
-        if($this->getID() > 0){
-            include_once MODX_MANAGER_PATH . "includes/tmplvars.format.inc.php";
-            include_once MODX_MANAGER_PATH . "includes/tmplvars.commands.inc.php";
+        if ($this->getID() > 0) {
+            include_once MODX_MANAGER_PATH."includes/tmplvars.format.inc.php";
+            include_once MODX_MANAGER_PATH."includes/tmplvars.commands.inc.php";
             $tvval = $this->get($tvname);
             $param = APIHelpers::getkey($this->tvd, $tvname, array());
             $display = APIHelpers::getkey($param, 'display', '');
@@ -206,13 +206,13 @@ 
      * @param $key
      * @return mixed
      */
-    public function get($key){
+    public function get($key) {
         $out = parent::get($key);
-        if(isset($this->tv[$key])){
+        if (isset($this->tv[$key])) {
             $tpl = $this->get('template');
             $tvTPL = APIHelpers::getkey($this->tvTpl, $tpl, array());
             $tvID = APIHelpers::getkey($this->tv, $key, 0);
-            if(in_array($tvID, $tvTPL) && is_null($out)){
+            if (in_array($tvID, $tvTPL) && is_null($out)) {
                 $out = APIHelpers::getkey($this->tvd[$key], 'value', null);
             }
         }
@@ -237,38 +237,38 @@ 
                     break;
                 case 'published':
                     $value = (int)((bool)$value);
-                    if($value){
+                    if ($value) {
                         $this->field['publishedon'] = time() + $this->modxConfig('server_offset_time');
                     }
                     break;
                 case 'pub_date':
                     $value = $this->getTime($value);
-                    if($value > 0 && time() + $this->modxConfig('server_offset_time') > $value){
+                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') > $value) {
                         $this->field['published'] = 1;
                         $this->field['publishedon'] = $value;
                     }
                     break;
                 case 'unpub_date':
                     $value = $this->getTime($value);
-                    if($value > 0 && time() + $this->modxConfig('server_offset_time') > $value){
+                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') > $value) {
                         $this->field['published'] = 0;
                         $this->field['publishedon'] = 0;
                     }
                     break;
                 case 'deleted':
                     $value = (int)((bool)$value);
-                    if($value){
+                    if ($value) {
                         $this->field['deletedon'] = time() + $this->modxConfig('server_offset_time');
-                    }else{
+                    } else {
                         $this->field['deletedon'] = 0;
                     }
                     break;
                 case 'deletedon':
                     $value = $this->getTime($value);
-                    if($value > 0 && time() + $this->modxConfig('server_offset_time') < $value){
+                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') < $value) {
                         $value = 0;
                     }
-                    if($value){
+                    if ($value) {
                         $this->field['deleted'] = 1;
                     }
                     break;
@@ -294,19 +294,19 @@ 
      * @param int $default
      * @return int|mixed
      */
-    protected function getUser($value, $default = 0){
+    protected function getUser($value, $default = 0) {
         $currentAdmin = APIHelpers::getkey($_SESSION, 'mgrInternalKey', 0);
         $value = (int)$value;
-        if(!empty($value)){
+        if (!empty($value)) {
             $by = $this->findUserBy($value);
             $exists = $this->managerUsers->exists(function($key, $val) use ($by, $value){
                 return ($val->containsKey($by) && $val->get($by) === (string)$value);
             });
-            if(!$exists){
+            if (!$exists) {
                 $value = 0;
             }
         }
-        if(empty($value)){
+        if (empty($value)) {
             $value = empty($currentAdmin) ? $default : $currentAdmin;
         }
         return $value;
@@ -338,13 +338,13 @@ 
      * @param $value
      * @return int|mixed|string
      */
-    protected function getTime($value){
+    protected function getTime($value) {
         $value = trim($value);
-        if(!empty($value)){
-            if(!is_numeric($value)){
+        if (!empty($value)) {
+            if (!is_numeric($value)) {
                 $value = (int)strtotime($value);
             }
-            if(!empty($value)){
+            if (!empty($value)) {
                 $value += $this->modxConfig('server_offset_time');
             }
         }
@@ -376,9 +376,9 @@ 
             $this->close();
             $this->newDoc = false;
 
-            $result = $this->query("SELECT * from {$this->makeTable('site_content')} where `id`=" . (int)$id);
+            $result = $this->query("SELECT * from {$this->makeTable('site_content')} where `id`=".(int)$id);
             $this->fromArray($this->modx->db->getRow($result));
-            $result = $this->query("SELECT * from {$this->makeTable('site_tmplvar_contentvalues')} where `contentid`=" . (int)$id);
+            $result = $this->query("SELECT * from {$this->makeTable('site_tmplvar_contentvalues')} where `contentid`=".(int)$id);
             while ($row = $this->modx->db->getRow($result)) {
                 $this->field[$this->tvid[$row['tmplvarid']]] = $row['value'];
             }
@@ -402,7 +402,7 @@ 
     {
         $parent = null;
         if ($this->field['pagetitle'] == '') {
-            $this->log['emptyPagetitle'] = 'Pagetitle is empty in <pre>' . print_r($this->field, true) . '</pre>';
+            $this->log['emptyPagetitle'] = 'Pagetitle is empty in <pre>'.print_r($this->field, true).'</pre>';
             return false;
         }
 
@@ -418,8 +418,8 @@ 
         $fld = $this->toArray(null, null, null, false);
         foreach ($this->default_field as $key => $value) {
             $tmp = $this->get($key);
-            if ($this->newDoc && ( !is_int($tmp) && $tmp=='')) {
-                if($tmp == $value){
+            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
+                if ($tmp == $value) {
                     switch ($key) {
                         case 'cacheable':
                             $value = $this->modxConfig('cache_default');
@@ -440,11 +440,11 @@ 
                 }
                 $this->field[$key] = $value;
             }
-            switch(true){
+            switch (true) {
                 case $key == 'parent':
                     $parent = (int)$this->get($key);
                     $q = $this->query("SELECT count(`id`) FROM {$this->makeTable('site_content')} WHERE `id`='{$parent}'");
-                    if($this->modx->db->getValue($q)!=1){
+                    if ($this->modx->db->getValue($q) != 1) {
                         $parent = $value;
                     }
                     $this->field[$key] = $parent;
@@ -461,9 +461,9 @@ 
 
         if (!empty($this->set)) {
             if ($this->newDoc) {
-                $SQL = "INSERT into {$this->makeTable('site_content')} SET " . implode(', ', $this->set);
+                $SQL = "INSERT into {$this->makeTable('site_content')} SET ".implode(', ', $this->set);
             } else {
-                $SQL = "UPDATE {$this->makeTable('site_content')} SET " . implode(', ', $this->set) . " WHERE `id` = " . $this->id;
+                $SQL = "UPDATE {$this->makeTable('site_content')} SET ".implode(', ', $this->set)." WHERE `id` = ".$this->id;
             }
             $this->query($SQL);
 
@@ -512,13 +512,13 @@ 
      * @return $this
      * @throws Exception
      */
-    public function toTrash($ids){
+    public function toTrash($ids) {
         $ignore = $this->systemID();
         $_ids = $this->cleanIDs($ids, ',', $ignore);
         if (is_array($_ids) && $_ids != array()) {
         	$id = $this->sanitarIn($_ids);
             $this->query("UPDATE {$this->makeTable('site_content')} SET `deleted`='1' WHERE `id` IN ({$id})");
-		} else throw new Exception('Invalid IDs list for mark trash: <pre>' . print_r($ids, 1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
+		} else throw new Exception('Invalid IDs list for mark trash: <pre>'.print_r($ids, 1).'</pre> please, check ignore list: <pre>'.print_r($ignore, 1).'</pre>');
         return $this;
     }
 
@@ -526,11 +526,11 @@ 
      * @param null $fire_events
      * @return $this
      */
-    public function clearTrash($fire_events = null){
+    public function clearTrash($fire_events = null) {
         $q = $this->query("SELECT `id` FROM {$this->makeTable('site_content')} WHERE `deleted`='1'");
         $q = $this->modx->makeArray($q);
         $_ids = array();
-        foreach($q as $item){
+        foreach ($q as $item) {
               $_ids[] = $item['id'];
         }
         if (is_array($_ids) && $_ids != array()) {
@@ -559,10 +559,10 @@ 
         $_ids = $this->cleanIDs($ids, ',');
         if (is_array($_ids) && $_ids != array()) {
             $id = $this->sanitarIn($_ids);
-            if(!empty($id)) {
+            if (!empty($id)) {
                 $q = $this->query("SELECT `id` FROM {$this->makeTable('site_content')} where `parent` IN ({$id})");
                 $id = $this->modx->db->getColumn('id', $q);
-                if($depth > 0 || $depth === true){
+                if ($depth > 0 || $depth === true) {
                     $id = $this->childrens($id, is_bool($depth) ? $depth : ($depth - 1));
                 }
                 $_ids = array_merge($_ids, $id);
@@ -587,14 +587,14 @@ 
 			), $fire_events);
 
 			$id = $this->sanitarIn($_ids);
-			if(!empty($id)){
+			if (!empty($id)) {
 				$this->query("DELETE from {$this->makeTable('site_content')} where `id` IN ({$id})");
 				$this->query("DELETE from {$this->makeTable('site_tmplvar_contentvalues')} where `contentid` IN ({$id})");
 				$this->invokeEvent('OnEmptyTrash', array(
 					"ids" => $_ids
 				), $fire_events);
 			}
-		} else throw new Exception('Invalid IDs list for delete: <pre>' . print_r($ids, 1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
+		} else throw new Exception('Invalid IDs list for delete: <pre>'.print_r($ids, 1).'</pre> please, check ignore list: <pre>'.print_r($ignore, 1).'</pre>');
 
         return $this;
     }
@@ -638,7 +638,7 @@ 
                 $suffix = substr($alias, -2);
                 if (preg_match('/-(\d+)/', $suffix, $tmp) && isset($tmp[1]) && (int)$tmp[1] > 1) {
                     $suffix = (int)$tmp[1] + 1;
-                    $alias = substr($alias, 0, -2) . '-' . $suffix;
+                    $alias = substr($alias, 0, -2).'-'.$suffix;
                 } else {
                     $alias .= '-2';
                 }
@@ -664,12 +664,12 @@ 
     protected function get_TV($reload = false)
     {
         if (empty($this->modx->_TVnames) || $reload) {
-            $result = $this->query('SELECT `id`,`name` FROM ' . $this->makeTable('site_tmplvars'));
+            $result = $this->query('SELECT `id`,`name` FROM '.$this->makeTable('site_tmplvars'));
             while ($row = $this->modx->db->GetRow($result)) {
                 $this->modx->_TVnames[$row['name']] = $row['id'];
             }
         }
-        foreach($this->modx->_TVnames as $name => $id){
+        foreach ($this->modx->_TVnames as $name => $id) {
             $this->tvid[$id] = $name;
             $this->tv[$name] = $id;
         }
@@ -680,11 +680,11 @@ 
     /**
      * @return $this
      */
-    protected function loadTVTemplate(){
+    protected function loadTVTemplate() {
         $q = $this->query("SELECT `tmplvarid`, `templateid` FROM ".$this->makeTable('site_tmplvar_templates'));
         $q = $this->modx->db->makeArray($q);
         $this->tvTpl = array();
-        foreach($q as $item){
+        foreach ($q as $item) {
             $this->tvTpl[$item['templateid']][] = $item['tmplvarid'];
         }
         return $this;
@@ -696,7 +696,7 @@ 
      */
     protected function loadTVDefault(array $tvId = array())
     {
-        if(is_array($tvId) && !empty($tvId)){
+        if (is_array($tvId) && !empty($tvId)) {
             $tbl_site_tmplvars = $this->makeTable('site_tmplvars');
             $fields = 'id,name,default_text as value,display,display_params,type';
             $implodeTvId = implode(',', $tvId);
@@ -724,7 +724,7 @@ 
 				if (!$rs || $this->modx->db->getRecordCount($rs) <= 0) throw new Exception("Template {$tpl} is not exists");
 				$tpl = $this->modx->db->getValue($rs);
 			} else {
-				throw new Exception("Invalid template name: " . print_r($tpl, 1));
+				throw new Exception("Invalid template name: ".print_r($tpl, 1));
 			}
         }
         return (int)$tpl;

assets/lib/MODxAPI/modUsers.php

Doc Comments +7 added lines, -6 removed lines

@@ -54,8 +54,8 @@ 
     }
 
     /**
-     * @param $data
-     * @return bool|string
+     * @param string $data
+     * @return string|false
      */
     protected function findUser($data)
     {
@@ -105,7 +105,7 @@ 
     }
 
     /**
-     * @param $key
+     * @param string $key
      * @param $value
      * @return $this
      */
@@ -240,7 +240,7 @@ 
     /**
      * @param $ids
      * @param null $fire_events
-     * @return bool|null
+     * @return null|false
      */
     public function delete($ids, $fire_events = null)
     {
@@ -314,7 +314,7 @@ 
     /**
      * @param $id
      * @param $password
-     * @param $blocker
+     * @param boolean $blocker
      * @param null $fire_events
      * @return bool
      */
@@ -396,7 +396,8 @@ 
      * Starts the user session on login success. Destroys session on error or logout.
      *
      * @param string $directive ('start' or 'destroy')
-     * @return void
+     * @param string $cookieName
+     * @return modUsers
      * @author Raymond Irving
      * @author Scotty Delicious
      *

assets/lib/MODxAPI/MODx.php

Doc Comments +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
     /**
      * @param $email
      * @param bool $dns
-     * @return bool
+     * @return false|string
      */
     public function emailValidate($email, $dns = true)
     {
@@ -101,7 +101,7 @@ 
     }
 
     /**
-     * @param $flag
+     * @param boolean $flag
      * @return $this
      */
     public function setDebug($flag){
@@ -124,7 +124,7 @@ 
     }
 
     /**
-     * @param $name
+     * @param string $name
      * @param null $default
      * @return mixed
      */
@@ -177,7 +177,7 @@ 
      }
 
     /**
-     * @param $name
+     * @param string $name
      * @param array $data
      * @param bool $flag
      * @return $this
@@ -192,7 +192,7 @@ 
     }
 
     /**
-     * @param $name
+     * @param string $name
      * @param array $data
      * @param null $flag
      * @return mixed
@@ -288,7 +288,7 @@ 
     }
 
     /**
-     * @param $id
+     * @param integer $id
      * @return MODxAPI
      */
     public function switchObject($id){
@@ -399,7 +399,7 @@ 
     /**
      * @param $IDs
      * @param string $sep
-     * @param array $ignore
+     * @param integer[] $ignore
      * @return array
      * @throws Exception
      */
@@ -557,8 +557,8 @@ 
     }
 
     /**
-     * @param $table
-     * @param $field
+     * @param string $table
+     * @param string $field
      * @param string $PK
      * @return bool
      */
@@ -647,7 +647,7 @@ 
     abstract public function save($fire_events = null, $clearCache = false);
 
     /**
-     * @param $ids
+     * @param integer $ids
      * @param null $fire_events
      * @return mixed
      */
@@ -663,7 +663,7 @@ 
     }
 
     /**
-     * @param $version
+     * @param string $version
      * @param bool $dmi3yy
      * @return bool
      */
@@ -685,7 +685,7 @@ 
     }
 
     /**
-     * @param $name
+     * @param string $name
      * @return bool|mixed
      */
     protected function eraseField($name)
@@ -757,7 +757,7 @@ 
 
     /**
      * Получить список не запакованных полей
-     * @return array
+     * @return DLCollection
      */
     public function getNoEncodeFields(){
         return $this->_decodedFields->filter(function($value){
@@ -767,7 +767,7 @@ 
 
     /**
      * Получить список не распакованных полей
-     * @return array
+     * @return DLCollection
      */
     public function getNoDecodeFields(){
        return $this->_decodedFields->filter(function($value){
@@ -834,7 +834,7 @@ 
      * Запаковывает конкретное поле в JSON
      * @param  string $field Имя поля
      * @param  bool $store обновить запакованное поле
-     * @return array json строка
+     * @return string|null json строка
      */
     public function encodeField($field, $store = false){
         $out = null;

Indentation +76 added lines, -76 removed lines

@@ -73,15 +73,15 @@ 
     protected $set = array();
     protected $newDoc = false;
     protected $pkName = 'id';
-	protected $ignoreError = '';
+    protected $ignoreError = '';
     protected $_debug = false;
     protected $_query = array();
     protected $jsonFields = array();
-	/**
-	 * @var DLCollection
-	 */
+    /**
+     * @var DLCollection
+     */
     private $_decodedFields;
-	private $_table = array();
+    private $_table = array();
 
     /**
      * MODxAPI constructor.
@@ -91,12 +91,12 @@ 
      */
     public function __construct(DocumentParser $modx, $debug = false)
     {	
-    	$this->modx = $modx;
+        $this->modx = $modx;
         if(function_exists("get_magic_quotes_gpc") && get_magic_quotes_gpc()){
-        	throw new Exception('Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.');
-		}
+            throw new Exception('Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.');
+        }
 
-		$this->setDebug($debug);
+        $this->setDebug($debug);
         $this->_decodedFields = new DLCollection($this->modx);
     }
 
@@ -174,7 +174,7 @@ 
             $value = $this->modx->db->escape($value);
         }
         return $value;
-     }
+        }
 
     /**
      * @param $name
@@ -251,39 +251,39 @@ 
      */
     final public function clearCache($fire_events = null, $custom = false)
     {
-		$IDs = array();
-		if($custom === false) {
-			$this->modx->clearCache();
-			include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');
-			$sync = new synccache();
-			$path = $this->getCachePath(true);
-			$sync->setCachepath($path);
-			$sync->setReport(false);
-			$sync->emptyCache();
-		}else {
-			if(is_scalar($custom)){
-				$custom = array($custom);
-			}
-			switch ($this->modx->config['cache_type']) {
-				case 2:
-					$cacheFile = "_*.pageCache.php";
-					break;
-				default:
-					$cacheFile = ".pageCache.php";
-			}
-			if(is_array($custom)) {
-				foreach($custom as $id) {
-					$tmp = glob(MODX_BASE_PATH."assets/cache/docid_" . $id . $cacheFile);
-					foreach($tmp as $file){
-						if(is_readable($file)){
-							unlink($file);
-						}
-						$IDs[] = $id;
-					}
-				}
-			}
-			clearstatcache();
-		}
+        $IDs = array();
+        if($custom === false) {
+            $this->modx->clearCache();
+            include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');
+            $sync = new synccache();
+            $path = $this->getCachePath(true);
+            $sync->setCachepath($path);
+            $sync->setReport(false);
+            $sync->emptyCache();
+        }else {
+            if(is_scalar($custom)){
+                $custom = array($custom);
+            }
+            switch ($this->modx->config['cache_type']) {
+                case 2:
+                    $cacheFile = "_*.pageCache.php";
+                    break;
+                default:
+                    $cacheFile = ".pageCache.php";
+            }
+            if(is_array($custom)) {
+                foreach($custom as $id) {
+                    $tmp = glob(MODX_BASE_PATH."assets/cache/docid_" . $id . $cacheFile);
+                    foreach($tmp as $file){
+                        if(is_readable($file)){
+                            unlink($file);
+                        }
+                        $IDs[] = $id;
+                    }
+                }
+            }
+            clearstatcache();
+        }
         $this->invokeEvent('OnSiteRefresh', array('IDs' => $IDs), $fire_events);
     }
 
@@ -314,16 +314,16 @@ 
      * @return $this
      */
     public function useIgnore($flag = true){
-		$this->ignoreError = $flag ? 'IGNORE' : '';
-		return $this;
-	}
+        $this->ignoreError = $flag ? 'IGNORE' : '';
+        return $this;
+    }
 
     /**
      * @return bool
      */
     public function hasIgnore(){
-		return (bool)$this->ignoreError;
-	}
+        return (bool)$this->ignoreError;
+    }
 
     /**
      * @param $key
@@ -382,8 +382,8 @@ 
             $this->log[] = "{$key} is empty";
         } else {
             if ($this->issetField($key) && is_scalar($this->field[$key])) {
-            	$tmp = "`{$key}`='{$this->escape($this->field[$key])}'";
-			} else throw new Exception("{$key} is invalid <pre>" . print_r($this->field[$key], true) . "</pre>");
+                $tmp = "`{$key}`='{$this->escape($this->field[$key])}'";
+            } else throw new Exception("{$key} is invalid <pre>" . print_r($this->field[$key], true) . "</pre>");
         }
         if (!empty($tmp)) {
             if ($id == '') {
@@ -408,11 +408,11 @@ 
         $out = array();
         if (!is_array($IDs)) {
             if (is_scalar($IDs)) {
-            	$IDs = explode($sep, $IDs);
-			} else {
-            	$IDs = array();
+                $IDs = explode($sep, $IDs);
+            } else {
+                $IDs = array();
                 throw new Exception('Invalid IDs list <pre>' . print_r($IDs, 1) . '</pre>');
-			}
+            }
         }
         foreach ($IDs as $item) {
             $item = trim($item);
@@ -437,21 +437,21 @@ 
     final public function fromJson($data, $callback = null)
     {
         if (is_scalar($data) && !empty($data)) {
-        	$json = json_decode($data);
-		} else throw new Exception("json is not string with json data");
-
-		if ($this->jsonError($json)) {
-        	if (isset($callback) && is_callable($callback)) {
-            	call_user_func_array($callback, array($json));
-			} else {
-            	if (isset($callback)) throw new Exception("Can't call callback JSON unpack <pre>" . print_r($callback, 1) . "</pre>");
+            $json = json_decode($data);
+        } else throw new Exception("json is not string with json data");
+
+        if ($this->jsonError($json)) {
+            if (isset($callback) && is_callable($callback)) {
+                call_user_func_array($callback, array($json));
+            } else {
+                if (isset($callback)) throw new Exception("Can't call callback JSON unpack <pre>" . print_r($callback, 1) . "</pre>");
                 foreach ($json as $key => $val) {
-                	$this->set($key, $val);
-				}
-			}
-		} else throw new Exception('Error from JSON decode: <pre>' . print_r($data, 1) . '</pre>');
+                    $this->set($key, $val);
+                }
+            }
+        } else throw new Exception('Error from JSON decode: <pre>' . print_r($data, 1) . '</pre>');
 
-		return $this;
+        return $this;
     }
 
     /**
@@ -463,17 +463,17 @@ 
     {
         $data = $this->toArray();
         if (isset($callback) && is_callable($callback)) {
-        	$data = call_user_func_array($callback, array($data));
-		} else {
-        	if (isset($callback)) throw new Exception("Can't call callback JSON pre pack <pre>" . print_r($callback, 1) . "</pre>");
-		}
+            $data = call_user_func_array($callback, array($data));
+        } else {
+            if (isset($callback)) throw new Exception("Can't call callback JSON pre pack <pre>" . print_r($callback, 1) . "</pre>");
+        }
         $json = json_encode($data);
 
-		if ($this->jsonError($data)) {
-        	throw new Exception('Error from JSON decode: <pre>' . print_r($data, 1) . '</pre>');
-		}
+        if ($this->jsonError($data)) {
+            throw new Exception('Error from JSON decode: <pre>' . print_r($data, 1) . '</pre>');
+        }
 
-		return $json;
+        return $json;
     }
 
     /**
@@ -770,7 +770,7 @@ 
      * @return array
      */
     public function getNoDecodeFields(){
-       return $this->_decodedFields->filter(function($value){
+        return $this->_decodedFields->filter(function($value){
             return ($value === true);
         });
     }

Spacing +68 added lines, -68 removed lines

@@ -92,7 +92,7 @@ 
     public function __construct(DocumentParser $modx, $debug = false)
     {	
     	$this->modx = $modx;
-        if(function_exists("get_magic_quotes_gpc") && get_magic_quotes_gpc()){
+        if (function_exists("get_magic_quotes_gpc") && get_magic_quotes_gpc()) {
         	throw new Exception('Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.');
 		}
 
@@ -104,7 +104,7 @@ 
      * @param $flag
      * @return $this
      */
-    public function setDebug($flag){
+    public function setDebug($flag) {
         $this->_debug = (bool)$flag;
         return $this;
     }
@@ -112,14 +112,14 @@ 
     /**
      * @return bool
      */
-    public function getDebug(){
+    public function getDebug() {
         return $this->_debug;
     }
 
     /**
      * @return array
      */
-    public function getDefaultFields(){
+    public function getDefaultFields() {
         return $this->default_field;
     }
 
@@ -137,8 +137,8 @@ 
      * @param $q
      * @return $this
      */
-    public function addQuery($q){
-        if(is_scalar($q) && !empty($q)){
+    public function addQuery($q) {
+        if (is_scalar($q) && !empty($q)) {
             $this->_query[] = $q;
         }
         return $this;
@@ -147,7 +147,7 @@ 
     /**
      * @return array
      */
-    public function getQueryList(){
+    public function getQueryList() {
         return $this->_query;
     }
 
@@ -157,7 +157,7 @@ 
      */
     final public function query($SQL)
     {
-        if($this->getDebug()){
+        if ($this->getDebug()) {
             $this->addQuery($SQL);
         }
         return empty($SQL) ? null : $this->modx->db->query($SQL);
@@ -167,10 +167,10 @@ 
      * @param $value
      * @return string
      */
-    final public function escape($value){
-        if(!is_scalar($value)){
+    final public function escape($value) {
+        if (!is_scalar($value)) {
             $value = '';
-        }else{
+        } else {
             $value = $this->modx->db->escape($value);
         }
         return $value;
@@ -227,7 +227,7 @@ 
      */
     final public function list_log($flush = false)
     {
-        echo '<pre>' . print_r(APIHelpers::sanitarTag($this->log), true) . '</pre>';
+        echo '<pre>'.print_r(APIHelpers::sanitarTag($this->log), true).'</pre>';
         if ($flush) $this->clearLog();
         return $this;
     }
@@ -240,7 +240,7 @@ 
     {
         $path = $this->modx->getCachePath();
         if ($full) {
-            $path = MODX_BASE_PATH . substr($path, strlen(MODX_BASE_URL));
+            $path = MODX_BASE_PATH.substr($path, strlen(MODX_BASE_URL));
         }
         return $path;
     }
@@ -252,16 +252,16 @@ 
     final public function clearCache($fire_events = null, $custom = false)
     {
 		$IDs = array();
-		if($custom === false) {
+		if ($custom === false) {
 			$this->modx->clearCache();
-			include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');
+			include_once(MODX_MANAGER_PATH.'processors/cache_sync.class.processor.php');
 			$sync = new synccache();
 			$path = $this->getCachePath(true);
 			$sync->setCachepath($path);
 			$sync->setReport(false);
 			$sync->emptyCache();
-		}else {
-			if(is_scalar($custom)){
+		} else {
+			if (is_scalar($custom)) {
 				$custom = array($custom);
 			}
 			switch ($this->modx->config['cache_type']) {
@@ -271,11 +271,11 @@ 
 				default:
 					$cacheFile = ".pageCache.php";
 			}
-			if(is_array($custom)) {
-				foreach($custom as $id) {
-					$tmp = glob(MODX_BASE_PATH."assets/cache/docid_" . $id . $cacheFile);
-					foreach($tmp as $file){
-						if(is_readable($file)){
+			if (is_array($custom)) {
+				foreach ($custom as $id) {
+					$tmp = glob(MODX_BASE_PATH."assets/cache/docid_".$id.$cacheFile);
+					foreach ($tmp as $file) {
+						if (is_readable($file)) {
 							unlink($file);
 						}
 						$IDs[] = $id;
@@ -291,8 +291,8 @@ 
      * @param $id
      * @return MODxAPI
      */
-    public function switchObject($id){
-        switch(true){
+    public function switchObject($id) {
+        switch (true) {
             //Если загружен другой объект - не тот, с которым мы хотим временно поработать
             case ($this->getID() != $id && $id):
                 $obj = clone $this;
@@ -313,7 +313,7 @@ 
      * @param bool $flag
      * @return $this
      */
-    public function useIgnore($flag = true){
+    public function useIgnore($flag = true) {
 		$this->ignoreError = $flag ? 'IGNORE' : '';
 		return $this;
 	}
@@ -321,7 +321,7 @@ 
     /**
      * @return bool
      */
-    public function hasIgnore(){
+    public function hasIgnore() {
 		return (bool)$this->ignoreError;
 	}
 
@@ -383,7 +383,7 @@ 
         } else {
             if ($this->issetField($key) && is_scalar($this->field[$key])) {
             	$tmp = "`{$key}`='{$this->escape($this->field[$key])}'";
-			} else throw new Exception("{$key} is invalid <pre>" . print_r($this->field[$key], true) . "</pre>");
+			} else throw new Exception("{$key} is invalid <pre>".print_r($this->field[$key], true)."</pre>");
         }
         if (!empty($tmp)) {
             if ($id == '') {
@@ -411,14 +411,14 @@ 
             	$IDs = explode($sep, $IDs);
 			} else {
             	$IDs = array();
-                throw new Exception('Invalid IDs list <pre>' . print_r($IDs, 1) . '</pre>');
+                throw new Exception('Invalid IDs list <pre>'.print_r($IDs, 1).'</pre>');
 			}
         }
         foreach ($IDs as $item) {
             $item = trim($item);
             if (is_scalar($item) && (int)$item >= 0) { //Fix 0xfffffffff
                 if (!empty($ignore) && in_array((int)$item, $ignore, true)) {
-                    $this->log[] = 'Ignore id ' . (int)$item;
+                    $this->log[] = 'Ignore id '.(int)$item;
                 } else {
                     $out[] = (int)$item;
                 }
@@ -444,12 +444,12 @@ 
         	if (isset($callback) && is_callable($callback)) {
             	call_user_func_array($callback, array($json));
 			} else {
-            	if (isset($callback)) throw new Exception("Can't call callback JSON unpack <pre>" . print_r($callback, 1) . "</pre>");
+            	if (isset($callback)) throw new Exception("Can't call callback JSON unpack <pre>".print_r($callback, 1)."</pre>");
                 foreach ($json as $key => $val) {
                 	$this->set($key, $val);
 				}
 			}
-		} else throw new Exception('Error from JSON decode: <pre>' . print_r($data, 1) . '</pre>');
+		} else throw new Exception('Error from JSON decode: <pre>'.print_r($data, 1).'</pre>');
 
 		return $this;
     }
@@ -465,12 +465,12 @@ 
         if (isset($callback) && is_callable($callback)) {
         	$data = call_user_func_array($callback, array($data));
 		} else {
-        	if (isset($callback)) throw new Exception("Can't call callback JSON pre pack <pre>" . print_r($callback, 1) . "</pre>");
+        	if (isset($callback)) throw new Exception("Can't call callback JSON pre pack <pre>".print_r($callback, 1)."</pre>");
 		}
         $json = json_encode($data);
 
 		if ($this->jsonError($data)) {
-        	throw new Exception('Error from JSON decode: <pre>' . print_r($data, 1) . '</pre>');
+        	throw new Exception('Error from JSON decode: <pre>'.print_r($data, 1).'</pre>');
 		}
 
 		return $json;
@@ -500,11 +500,11 @@ 
         $tpl = '';
         $plh = '[+key+]';
         if ($prefix !== '') {
-            $tpl = $prefix . $sep;
+            $tpl = $prefix.$sep;
         }
         $tpl .= $plh;
         if ($suffix !== '') {
-            $tpl .= $sep . $suffix;
+            $tpl .= $sep.$suffix;
         }
         $out = array();
         $fields = $this->field;
@@ -522,7 +522,7 @@ 
     /**
      * @return string
      */
-    final public function fieldPKName(){
+    final public function fieldPKName() {
         return $this->pkName;
     }
 
@@ -548,11 +548,11 @@ 
         }
         $out = array();
         foreach ($data as $item) {
-            if($item !== ''){
+            if ($item !== '') {
                 $out[] = $this->escape($item);
             }
         }
-        $out = empty($out) ? '' : "'" . implode("','", $out) . "'";
+        $out = empty($out) ? '' : "'".implode("','", $out)."'";
         return $out;
     }
 
@@ -571,7 +571,7 @@ 
                 if ($val != '')
                     $where[] = "`".$this->escape($_field)."` = '".$this->escape($val)."'";
             }
-            $where = implode(' AND ',$where);
+            $where = implode(' AND ', $where);
         } else {
             $where = '';
             $val = $this->get($field);
@@ -580,7 +580,7 @@ 
         }
         
         if ($where != '') {
-            $sql = $this->query("SELECT `" . $this->escape($PK) . "` FROM " . $this->makeTable($table) . " WHERE ".$where);
+            $sql = $this->query("SELECT `".$this->escape($PK)."` FROM ".$this->makeTable($table)." WHERE ".$where);
             $id = $this->modx->db->getValue($sql);
             if (is_null($id) || (!$this->newDoc && $id == $this->getID())) {
                 $flag = true;
@@ -678,7 +678,7 @@ 
         if (version_compare($tmp, $version, '>=')) {
             $flag = true;
             if ($dmi3yy) {
-                $flag = (boolean)preg_match('/^' . $tmp . '(.*)\-d/', $currentVer);
+                $flag = (boolean)preg_match('/^'.$tmp.'(.*)\-d/', $currentVer);
             }
         }
         return $flag;
@@ -703,7 +703,7 @@ 
      * @param  string $field имя поля
      * @return boolean
      */
-    public function isJsonField($field){
+    public function isJsonField($field) {
         return (is_scalar($field) && in_array($field, $this->jsonFields));
     }
 
@@ -712,8 +712,8 @@ 
      * @param  string $field имя поля
      * @return $this
      */
-    public function markAsDecode($field){
-        if(is_scalar($field)){
+    public function markAsDecode($field) {
+        if (is_scalar($field)) {
             $this->_decodedFields->set($field, false);
         }
         return $this;
@@ -724,8 +724,8 @@ 
      * @param  string $field имя поля
      * @return $this
      */
-    public function markAsEncode($field){
-        if(is_scalar($field)){
+    public function markAsEncode($field) {
+        if (is_scalar($field)) {
             $this->_decodedFields->set($field, true);
         }
         return $this;
@@ -735,9 +735,9 @@ 
      * Пометить все поля как запакованные
      * @return $this
      */
-    public function markAllEncode(){
+    public function markAllEncode() {
         $this->_decodedFields->clear();
-        foreach($this->jsonFields as $field){
+        foreach ($this->jsonFields as $field) {
             $this->markAsEncode($field);
         }
         return $this;
@@ -747,9 +747,9 @@ 
      * Пометить все поля как распакованные
      * @return $this
      */
-    public function markAllDecode(){
+    public function markAllDecode() {
         $this->_decodedFields->clear();
-        foreach($this->jsonFields as $field){
+        foreach ($this->jsonFields as $field) {
             $this->markAsDecode($field);
         }
         return $this;
@@ -759,8 +759,8 @@ 
      * Получить список не запакованных полей
      * @return array
      */
-    public function getNoEncodeFields(){
-        return $this->_decodedFields->filter(function($value){
+    public function getNoEncodeFields() {
+        return $this->_decodedFields->filter(function($value) {
             return ($value === false);
         });
     }
@@ -769,8 +769,8 @@ 
      * Получить список не распакованных полей
      * @return array
      */
-    public function getNoDecodeFields(){
-       return $this->_decodedFields->filter(function($value){
+    public function getNoDecodeFields() {
+       return $this->_decodedFields->filter(function($value) {
             return ($value === true);
         });
     }
@@ -780,12 +780,12 @@ 
      * @param  string $field имя поля
      * @return boolean
      */
-    public function isDecodableField($field){
+    public function isDecodableField($field) {
         $data = $this->get($field);
         /**
          * Если поле скалярного типа и оно не распаковывалось раньше
          */
-        return (is_scalar($data) && is_scalar($field) && $this->_decodedFields->get($field)===true);
+        return (is_scalar($data) && is_scalar($field) && $this->_decodedFields->get($field) === true);
     }
 
     /**
@@ -793,11 +793,11 @@ 
      * @param  string  $field имя поля
      * @return boolean
      */
-    public function isEncodableField($field){
+    public function isEncodableField($field) {
         /**
          * Если поле было распаковано ранее и еще не упаковано
          */
-        return (is_scalar($field) && $this->_decodedFields->get($field)===false);
+        return (is_scalar($field) && $this->_decodedFields->get($field) === false);
     }
 
     /**
@@ -806,13 +806,13 @@ 
      * @param  bool $store обновить распакованное поле
      * @return array ассоциативный массив с данными из json строки
      */
-    public function decodeField($field, $store = false){
+    public function decodeField($field, $store = false) {
         $out = array();
-        if($this->isDecodableField($field)){
+        if ($this->isDecodableField($field)) {
             $data = $this->get($field);
             $out = jsonHelper::jsonDecode($data, array('assoc' => true), true);
         }
-        if($store){
+        if ($store) {
             $this->field[$field] = $out;
             $this->markAsDecode($field);
         }
@@ -823,8 +823,8 @@ 
      * Декодирование всех json полей
      * @return $this
      */
-    protected function decodeFields(){
-        foreach($this->getNoDecodeFields() as $field => $flag){
+    protected function decodeFields() {
+        foreach ($this->getNoDecodeFields() as $field => $flag) {
             $this->decodeField($field, true);
         }
         return $this;
@@ -836,13 +836,13 @@ 
      * @param  bool $store обновить запакованное поле
      * @return array json строка
      */
-    public function encodeField($field, $store = false){
+    public function encodeField($field, $store = false) {
         $out = null;
-        if($this->isEncodableField($field)){
+        if ($this->isEncodableField($field)) {
             $data = $this->get($field);
             $out = json_encode($data);
         }
-        if($store){
+        if ($store) {
             $this->field[$field] = $out;
             $this->markAsEncode($field);
         }
@@ -853,8 +853,8 @@ 
      * Запаковка всех json полей
      * @return $this
      */
-    protected function encodeFields(){
-        foreach($this->getNoEncodeFields() as $field => $flag){
+    protected function encodeFields() {
+        foreach ($this->getNoEncodeFields() as $field => $flag) {
             $this->encodeField($field, true);
         }
         return $this;

assets/snippets/DLUsers/src/Actions.php

Doc Comments +6 added lines, -4 removed lines

@@ -50,6 +50,8 @@ 
     /**
      * is not allowed to call from outside: private!
      *
+     * @param string $userClass
+     * @param boolean $debug
      */
     private function __construct(DocumentParser $modx, $userClass, $debug)
     {
@@ -285,9 +287,9 @@ 
      * @param $emailField
      * @param $rememberField
      * @param $backUrl
-     * @param $method
-     * @param $error
-     * @param $errorCode
+     * @param string $method
+     * @param string $error
+     * @param string $errorCode
      * @param array $params
      * @return array
      */
@@ -468,7 +470,7 @@ 
 	}
 
     /**
-     * @param $name
+     * @param string $name
      * @return string
      */
     protected function getTemplate($name){

Indentation +391 added lines, -391 removed lines

@@ -16,9 +16,9 @@ 
 class Actions{
     protected $modx = null;
     public $userObj = null;
-	/**
-	 * @var DLCollection
-	 */
+    /**
+     * @var DLCollection
+     */
     public $url;
     protected static $lang = null;
     protected static $langDic = array();
@@ -27,7 +27,7 @@ 
      */
     protected static $instance;
 
-	protected $config = array();
+    protected $config = array();
 
     /**
      * gets the instance via lazy initialization (created on first usage)
@@ -54,15 +54,15 @@ 
     private function __construct(DocumentParser $modx, $userClass, $debug)
     {
         $this->modx = $modx;
-		$this->userObj = new $userClass($this->modx, $debug);
-		$this->url = new DLCollection($this->modx);
+        $this->userObj = new $userClass($this->modx, $debug);
+        $this->url = new DLCollection($this->modx);
 
-		$site_url = $this->modx->getConfig('site_url');
-		$site_start = $this->modx->getConfig('site_start', 1);
-		$error_page = $this->modx->getConfig('error_page', $site_start);
-		$unauthorized_page = $this->modx->getConfig('unauthorized_page', $error_page);
+        $site_url = $this->modx->getConfig('site_url');
+        $site_start = $this->modx->getConfig('site_start', 1);
+        $error_page = $this->modx->getConfig('error_page', $site_start);
+        $unauthorized_page = $this->modx->getConfig('unauthorized_page', $error_page);
 
-		$this->config = compact('site_url', 'site_start', 'error_page', 'unauthorized_page');
+        $this->config = compact('site_url', 'site_start', 'error_page', 'unauthorized_page');
     }
 
     /**
@@ -89,47 +89,47 @@ 
      * Сброс авторизации и обновление страницы
      */
     public function logout($params){
-    	$LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');
-    	if(is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])){
-    		$userID = $this->UserID('web');
-    		if($userID){
-    			$this->userObj->edit($userID);
-    			if($this->userObj->getID()){
-	    			$this->modx->invokeEvent("OnBeforeWebLogout", array(
-		    			"userid"   => $this->userObj->getID(),
-		    			"username" => $this->userObj->get('username')
-		    		));
-	    		}
-		    	$this->userObj->logOut();
-		    	if($this->userObj->getID()){
-		    		$this->modx->invokeEvent("OnWebLogout", array(
-		    			"userid"        => $this->userObj->getID(),
-		    			"username"      => $this->userObj->get('username')
-		    		));
-		    	}
-
-			    $go = APIHelpers::getkey($params, 'url', '');
-			    if(empty($go)){
-			    	$go = str_replace(
-			    		array("?".$LogoutName, "&".$LogoutName),
-			    		array("", ""),
-			    		$_SERVER['REQUEST_URI']
-			    	);
-			    }
-
-			    $start = $this->makeUrl($this->config['site_start']);
-			    if($start == $go){
-			        $go = $this->config['site_url'];
-			    }else{
-			        $go = $this->config['site_url'].ltrim($go, '/');
-			    }
-			    $this->moveTo(array('url' => $go));
-    		}else{
-    			//Если юзер не авторизован, то показываем ему 404 ошибку
-    			$this->modx->sendErrorPage();
-    		}
-		}
-	    return true;
+        $LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');
+        if(is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])){
+            $userID = $this->UserID('web');
+            if($userID){
+                $this->userObj->edit($userID);
+                if($this->userObj->getID()){
+                    $this->modx->invokeEvent("OnBeforeWebLogout", array(
+                        "userid"   => $this->userObj->getID(),
+                        "username" => $this->userObj->get('username')
+                    ));
+                }
+                $this->userObj->logOut();
+                if($this->userObj->getID()){
+                    $this->modx->invokeEvent("OnWebLogout", array(
+                        "userid"        => $this->userObj->getID(),
+                        "username"      => $this->userObj->get('username')
+                    ));
+                }
+
+                $go = APIHelpers::getkey($params, 'url', '');
+                if(empty($go)){
+                    $go = str_replace(
+                        array("?".$LogoutName, "&".$LogoutName),
+                        array("", ""),
+                        $_SERVER['REQUEST_URI']
+                    );
+                }
+
+                $start = $this->makeUrl($this->config['site_start']);
+                if($start == $go){
+                    $go = $this->config['site_url'];
+                }else{
+                    $go = $this->config['site_url'].ltrim($go, '/');
+                }
+                $this->moveTo(array('url' => $go));
+            }else{
+                //Если юзер не авторизован, то показываем ему 404 ошибку
+                $this->modx->sendErrorPage();
+            }
+        }
+        return true;
     }
 
     /**
@@ -137,14 +137,14 @@ 
      * @return string
      */
     public function logoutUrl($params){
-    	$LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');
-    	$request = parse_url($_SERVER['REQUEST_URI']);
+        $LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');
+        $request = parse_url($_SERVER['REQUEST_URI']);
 
-    	//Во избежании XSS мы не сохраняем весь REQUEST_URI, а берем только path
-    	/*$query = (!empty($request['query'])) ? $request['query'].'&' : '';*/
-    	$query = '?'.$LogoutName;
+        //Во избежании XSS мы не сохраняем весь REQUEST_URI, а берем только path
+        /*$query = (!empty($request['query'])) ? $request['query'].'&' : '';*/
+        $query = '?'.$LogoutName;
 
-    	return $request['path'].$query;
+        return $request['path'].$query;
     }
 
     /**
@@ -153,132 +153,132 @@ 
      *   	В противном случае вся работа происходит внутри самого блока
      */
     public function AuthBlock($params){
-    	$POST = array('backUrl' => $_SERVER['REQUEST_URI']);
-
-    	$error = $errorCode = '';
-
-    	$pwdField = APIHelpers::getkey($params, 'pwdField', 'password');
-		$emailField = APIHelpers::getkey($params, 'emailField', 'email');
-		$rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');
-
-    	if($this->UserID('web')){
-			$tpl = APIHelpers::getkey($params, 'tplProfile', '');
-			if(empty($tpl)){
-				$tpl = $this->getTemplate('tplProfile');
-			}
-			$dataTPL = $this->userObj->toArray();
-			$dataTPL['url.logout'] = $this->logoutUrl($params);
-    		$homeID = APIHelpers::getkey($params, 'homeID');
-			if(!empty($homeID)){
-				$dataTPL['url.profile'] = $this->makeUrl($homeID);
-			}
-		}else{
-			$tpl = APIHelpers::getkey($params, 'tplForm', '');
-			if(empty($tpl)){
-				$tpl = $this->getTemplate('authForm');
-			}
-			$POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);
-	    	$dataTPL = array(
-				'backUrl' => APIHelpers::getkey($POST, 'backUrl', ''),
-				'emailValue' => APIHelpers::getkey($POST, 'email', ''),
-				'emailField' => $emailField,
-				'pwdField' => $pwdField,
-		    	'method' => strtolower(__METHOD__),
-				'error' => $error,
-				'errorCode' => $errorCode
-			);
-			$authId = APIHelpers::getkey($params, 'authId');
-			if(!empty($authId)){
-				$dataTPL['authPage'] = $this->makeUrl($authId);
-				$dataTPL['method'] = strtolower(__CLASS__ . '::'. 'authpage');
-			}
-		}
-		return DLTemplate::getInstance($this->modx)->parseChunk($tpl, $dataTPL);
+        $POST = array('backUrl' => $_SERVER['REQUEST_URI']);
+
+        $error = $errorCode = '';
+
+        $pwdField = APIHelpers::getkey($params, 'pwdField', 'password');
+        $emailField = APIHelpers::getkey($params, 'emailField', 'email');
+        $rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');
+
+        if($this->UserID('web')){
+            $tpl = APIHelpers::getkey($params, 'tplProfile', '');
+            if(empty($tpl)){
+                $tpl = $this->getTemplate('tplProfile');
+            }
+            $dataTPL = $this->userObj->toArray();
+            $dataTPL['url.logout'] = $this->logoutUrl($params);
+            $homeID = APIHelpers::getkey($params, 'homeID');
+            if(!empty($homeID)){
+                $dataTPL['url.profile'] = $this->makeUrl($homeID);
+            }
+        }else{
+            $tpl = APIHelpers::getkey($params, 'tplForm', '');
+            if(empty($tpl)){
+                $tpl = $this->getTemplate('authForm');
+            }
+            $POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);
+            $dataTPL = array(
+                'backUrl' => APIHelpers::getkey($POST, 'backUrl', ''),
+                'emailValue' => APIHelpers::getkey($POST, 'email', ''),
+                'emailField' => $emailField,
+                'pwdField' => $pwdField,
+                'method' => strtolower(__METHOD__),
+                'error' => $error,
+                'errorCode' => $errorCode
+            );
+            $authId = APIHelpers::getkey($params, 'authId');
+            if(!empty($authId)){
+                $dataTPL['authPage'] = $this->makeUrl($authId);
+                $dataTPL['method'] = strtolower(__CLASS__ . '::'. 'authpage');
+            }
+        }
+        return DLTemplate::getInstance($this->modx)->parseChunk($tpl, $dataTPL);
     }
 
-	/**
-	 * Авторизация на сайте со страницы авторизации
-	 * [!Auth? &login=`password` &pwdField=`password` &homeID=`72`!]
-	 */
-	public function AuthPage($params){
-		$homeID = APIHelpers::getkey($params, 'homeID');
-		$this->isAuthGoHome(array('id' => $homeID));
-
-		$error = $errorCode = '';
-		$POST = array('backUrl' => '');
-
-		$pwdField = APIHelpers::getkey($params, 'pwdField', 'password');
-		$emailField = APIHelpers::getkey($params, 'emailField', 'email');
-		$rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');
-
-		$tpl = APIHelpers::getkey($params, 'tpl', '');
-		if(empty($tpl)){
-			$tpl = $this->getTemplate('authForm');
-		}
-
-		$request = parse_url($_SERVER['REQUEST_URI']);
-		if(!empty($_SERVER['HTTP_REFERER'])){
-			/**
-			 * Thank you for super protection against hacking in protect.inc.php:-)
-			 */
-			$refer = htmlspecialchars_decode($_SERVER['HTTP_REFERER'], ENT_QUOTES);
-		}else{
-			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');
-			if(empty( $request['host']) ||  $request['host']==$selfHost){
-				$query = !empty($request['query']) ? '?'.$request['query'] : '';
-			    $refer = !empty($request['path']) ? $request['path'].$query : '';
-			}else{
-				$refer = '';
-			}
-		}
-
-		if($_SERVER['REQUEST_METHOD'] == 'POST'){
-			$backUrl = APIHelpers::getkey($_POST, 'backUrl', $POST['backUrl']);
-			if(!is_scalar($backUrl)){
-				$backUrl = $refer;
-			}else{
-				$backUrl = urldecode($backUrl);
-			}
-		}else{
-			$backUrl = $refer;
-		}
-		$backUrl = parse_url($backUrl);
-		if(!empty($backUrl['path']) && $request['path'] != $backUrl['path']){
-		    $POST['backUrl'] = $backUrl['path'];
-		}else{
-			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');
-			if(empty($backUrl['host']) || $backUrl['host']==$selfHost){
-				$query = !empty($backUrl['query']) ? '?'.$backUrl['query'] : '';
-			    $POST['backUrl'] = !empty($backUrl['path']) ? $backUrl['path'].$query : '';
-			}else{
-				$POST['backUrl'] = '';
-			}
-		}
-		if(!empty($POST['backUrl'])){
-			$idURL = $this->moveTo(array(
-				'url' => '/'.ltrim($POST['backUrl'], '/'),
-			    'validate' => true
-			));
-		}else{
-			$idURL = 0;
-		}
-		if(empty($idURL)){
-			if(empty($homeID)){
-				$homeID = $this->config['site_start'];
-			}
-			$POST['backUrl'] = $this->makeUrl($homeID);
-		}
-		$POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);
-		return DLTemplate::getInstance($this->modx)->parseChunk($tpl, array(
-		    'backUrl' => APIHelpers::getkey($POST, 'backUrl', ''),
-			'emailValue' => APIHelpers::getkey($POST, 'email', ''),
-			'emailField' => $emailField,
-		    'pwdField' => $pwdField,
-		    'method' => strtolower(__METHOD__),
-			'error' => $error,
-			'errorCode' => $errorCode
-		));
-	}
+    /**
+     * Авторизация на сайте со страницы авторизации
+     * [!Auth? &login=`password` &pwdField=`password` &homeID=`72`!]
+     */
+    public function AuthPage($params){
+        $homeID = APIHelpers::getkey($params, 'homeID');
+        $this->isAuthGoHome(array('id' => $homeID));
+
+        $error = $errorCode = '';
+        $POST = array('backUrl' => '');
+
+        $pwdField = APIHelpers::getkey($params, 'pwdField', 'password');
+        $emailField = APIHelpers::getkey($params, 'emailField', 'email');
+        $rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');
+
+        $tpl = APIHelpers::getkey($params, 'tpl', '');
+        if(empty($tpl)){
+            $tpl = $this->getTemplate('authForm');
+        }
+
+        $request = parse_url($_SERVER['REQUEST_URI']);
+        if(!empty($_SERVER['HTTP_REFERER'])){
+            /**
+             * Thank you for super protection against hacking in protect.inc.php:-)
+             */
+            $refer = htmlspecialchars_decode($_SERVER['HTTP_REFERER'], ENT_QUOTES);
+        }else{
+            $selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');
+            if(empty( $request['host']) ||  $request['host']==$selfHost){
+                $query = !empty($request['query']) ? '?'.$request['query'] : '';
+                $refer = !empty($request['path']) ? $request['path'].$query : '';
+            }else{
+                $refer = '';
+            }
+        }
+
+        if($_SERVER['REQUEST_METHOD'] == 'POST'){
+            $backUrl = APIHelpers::getkey($_POST, 'backUrl', $POST['backUrl']);
+            if(!is_scalar($backUrl)){
+                $backUrl = $refer;
+            }else{
+                $backUrl = urldecode($backUrl);
+            }
+        }else{
+            $backUrl = $refer;
+        }
+        $backUrl = parse_url($backUrl);
+        if(!empty($backUrl['path']) && $request['path'] != $backUrl['path']){
+            $POST['backUrl'] = $backUrl['path'];
+        }else{
+            $selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');
+            if(empty($backUrl['host']) || $backUrl['host']==$selfHost){
+                $query = !empty($backUrl['query']) ? '?'.$backUrl['query'] : '';
+                $POST['backUrl'] = !empty($backUrl['path']) ? $backUrl['path'].$query : '';
+            }else{
+                $POST['backUrl'] = '';
+            }
+        }
+        if(!empty($POST['backUrl'])){
+            $idURL = $this->moveTo(array(
+                'url' => '/'.ltrim($POST['backUrl'], '/'),
+                'validate' => true
+            ));
+        }else{
+            $idURL = 0;
+        }
+        if(empty($idURL)){
+            if(empty($homeID)){
+                $homeID = $this->config['site_start'];
+            }
+            $POST['backUrl'] = $this->makeUrl($homeID);
+        }
+        $POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);
+        return DLTemplate::getInstance($this->modx)->parseChunk($tpl, array(
+            'backUrl' => APIHelpers::getkey($POST, 'backUrl', ''),
+            'emailValue' => APIHelpers::getkey($POST, 'email', ''),
+            'emailField' => $emailField,
+            'pwdField' => $pwdField,
+            'method' => strtolower(__METHOD__),
+            'error' => $error,
+            'errorCode' => $errorCode
+        ));
+    }
 
     /**
      * @param $pwdField
@@ -292,213 +292,213 @@ 
      * @return array
      */
     protected function Auth($pwdField, $emailField, $rememberField, $backUrl, $method, &$error, &$errorCode, $params = array()){
-		$POST = array(
-			'backUrl' => urlencode($backUrl)
-		);
-		$userObj = &$this->userObj;
-		if($_SERVER['REQUEST_METHOD']=='POST' && APIHelpers::getkey($_POST, 'method', '') == strtolower($method)){
-			$POST = array_merge($POST, array(
-				'password' => APIHelpers::getkey($_POST, $pwdField, ''),
-				'email' => APIHelpers::getkey($_POST, $emailField, ''),
-				'remember' => (bool)((int)APIHelpers::getkey($_POST, $rememberField, 0))
-			));
-			if(!empty($POST['email']) && is_scalar($POST['email']) && !$userObj->emailValidate($POST['email'], false)){
-				$userObj->edit($POST['email']);
-
-				$this->modx->invokeEvent("OnBeforeWebLogin", array(
-		            "username"		=> $POST['email'],
-		            "userpassword"	=> $POST['password'],
-		            "rememberme"	=> $POST['remember'],
-		            'userObj'		=> $userObj
-		        ));
-				if($userObj->getID() && !$userObj->checkBlock($userObj->getID())){
-					$pluginFlag = $this->modx->invokeEvent("OnWebAuthentication", array(
-	                    "userid"        => $userObj->getID(),
-	                    "username"      => $userObj->get('username'),
-	                    "userpassword"  => $POST['password'],
-	                    "savedpassword" => $userObj->get('password'),
-	                    "rememberme"    => $POST['remember'],
-	                ));
-					if(
-						($pluginFlag === true || $userObj->testAuth($userObj->getID(), $POST['password'], 0))
-							&&
-						$userObj->authUser($userObj->getID(), $POST['remember'])
-					){
-						$userObj->set('logincount', (int)$userObj->get('logincount') + 1);
-						$userObj->set('lastlogin', time());
-						$userObj->set('failedlogincount', 0);
-						$userObj->save(false, false);
-
-						$this->modx->invokeEvent("OnWebLogin", array(
-			                "userid"		=> $userObj->getID(),
-			                "username"		=> $userObj->get('username'),
-			                "userpassword"	=> $POST['password'],
-			                "rememberme"	=> $POST['remember'],
-			            ));
-						$this->moveTo(array('url' => urldecode($POST['backUrl'])));
-					}else{
-						$userObj->set('failedlogincount', (int)$userObj->get('failedlogincount') + 1);
-						$userObj->save(false, false);
-
-						$error = 'error.incorrect_password';
-					}
-				}else{
-					$error = 'error.no_user';
-				}
-			}else{
-				$error = 'error.incorrect_mail';
-				$POST['email'] = '';
-			}
-		}
-		if(!empty($error)){
-			$errorCode = $error;
-			$error = APIHelpers::getkey($params, $error, '');
-			$error = static::getLangMsg($error, $error);
-		}
-		return $POST;
-	}
-	/**
-	 * Информация о пользователе
-	 * [!DLUsers? &action=`UserInfo` &field=`fullname` &id=`2`!]
-	 */
-	public function UserInfo($params){
-		$out = '';
-		$userID = APIHelpers::getkey($params, 'id', 0);
-		if(empty($userID)){
-			$userID = $this->UserID('web');
-		}
-		$field = APIHelpers::getkey($params, 'field', 'username');
-		if($userID > 0){
-			$this->userObj->edit($userID);
-			switch(true){
-				case ($field == $this->userObj->fieldPKName()):
-					$out = $this->userObj->getID();
-					break;
-				case ($this->userObj->issetField($field)):
-					$out = $this->userObj->get($field);
-					break;
-			}
-		}
-		return $out;
-	}
-	/**
-	 * ID пользователя
-	 */
-	public function UserID($type = 'web'){
-		return $this->modx->getLoginUserID($type);
-	}
-	/**
-	 * Если не авторизован - то отправить на страницу
-	 */
-	public function isGuestGoHome($params){
-		if(!$this->UserID('web')){
-			/**
-			 * @see : http://modx.im/blog/triks/105.html
-			 */
-			$this->modx->invokeEvent('OnPageUnauthorized');
-			$id = APIHelpers::getkey($params, 'id', $this->config['unauthorized_page']);
-		    $this->moveTo(compact('id'));
-		}
-		return;
-	}
-
-	/**
-	 * Если авторизован - то открыть личный кабинет
-	 */
-	public function isAuthGoHome($params){
-		$userID = $this->UserID('web');
-		if($userID>0){
-			$id = APIHelpers::getkey($params, 'homeID');
-		    if(empty($id)){
-				$id = $this->modx->getConfig('login_home', $this->config['site_start']);
-		    }
-		    $this->moveTo(compact('id'));
-		}
-		return;
-	}
-
-	/**
-	 * Редирект
-	 */
-	public function moveTo($params){
-		$id = (int)APIHelpers::getkey($params, 'id', 0);
-		$uri = APIHelpers::getkey($params, 'url', '');
-		if((empty($uri) && !empty($id)) || !is_string($uri)){
-			$uri = $this->makeUrl($id);
-		}
-		$code = (int)APIHelpers::getkey($params, 'code', 0);
-		$addUrl = APIHelpers::getkey($params, 'addUrl', '');
-		if(is_scalar($addUrl) && $addUrl!=''){
-		    $uri .= "?".$addUrl;
-		}
-		if(APIHelpers::getkey($params, 'validate', false)){
-			if(isset($this->modx->snippetCache['getPageID'])){
-				$out = $this->modx->runSnippet('getPageID', compact('uri'));
-				if(empty($out)){
-					$uri = '';
-				}
-			}else{
-				$uri = APIhelpers::sanitarTag($uri);
-			}
-		}else{
-			//$modx->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.1 307 Temporary Redirect');
-			header("Location: ".$uri, true, ($code>0 ? $code : 307));
-		}
-		return $uri;
-	}
-
-	/**
-	 * Создание ссылки на страницу
-	 *
-	 * @param  int $id ID документа
-	 * @return string
-	 */
-	protected function makeUrl($id = null){
-		$id = (int)$id;
-		if($id <= 0){
-			$id = $this->modx->documentObject['id'];
-		}
-		if($this->url->containsKey($id)){
-			$url = $this->url->get($id);
-		}else{
-			$url = $this->modx->makeUrl($id);
-			$this->url->set($id, $url);
-		}
-		return $url;
-	}
+        $POST = array(
+            'backUrl' => urlencode($backUrl)
+        );
+        $userObj = &$this->userObj;
+        if($_SERVER['REQUEST_METHOD']=='POST' && APIHelpers::getkey($_POST, 'method', '') == strtolower($method)){
+            $POST = array_merge($POST, array(
+                'password' => APIHelpers::getkey($_POST, $pwdField, ''),
+                'email' => APIHelpers::getkey($_POST, $emailField, ''),
+                'remember' => (bool)((int)APIHelpers::getkey($_POST, $rememberField, 0))
+            ));
+            if(!empty($POST['email']) && is_scalar($POST['email']) && !$userObj->emailValidate($POST['email'], false)){
+                $userObj->edit($POST['email']);
+
+                $this->modx->invokeEvent("OnBeforeWebLogin", array(
+                    "username"		=> $POST['email'],
+                    "userpassword"	=> $POST['password'],
+                    "rememberme"	=> $POST['remember'],
+                    'userObj'		=> $userObj
+                ));
+                if($userObj->getID() && !$userObj->checkBlock($userObj->getID())){
+                    $pluginFlag = $this->modx->invokeEvent("OnWebAuthentication", array(
+                        "userid"        => $userObj->getID(),
+                        "username"      => $userObj->get('username'),
+                        "userpassword"  => $POST['password'],
+                        "savedpassword" => $userObj->get('password'),
+                        "rememberme"    => $POST['remember'],
+                    ));
+                    if(
+                        ($pluginFlag === true || $userObj->testAuth($userObj->getID(), $POST['password'], 0))
+                            &&
+                        $userObj->authUser($userObj->getID(), $POST['remember'])
+                    ){
+                        $userObj->set('logincount', (int)$userObj->get('logincount') + 1);
+                        $userObj->set('lastlogin', time());
+                        $userObj->set('failedlogincount', 0);
+                        $userObj->save(false, false);
+
+                        $this->modx->invokeEvent("OnWebLogin", array(
+                            "userid"		=> $userObj->getID(),
+                            "username"		=> $userObj->get('username'),
+                            "userpassword"	=> $POST['password'],
+                            "rememberme"	=> $POST['remember'],
+                        ));
+                        $this->moveTo(array('url' => urldecode($POST['backUrl'])));
+                    }else{
+                        $userObj->set('failedlogincount', (int)$userObj->get('failedlogincount') + 1);
+                        $userObj->save(false, false);
+
+                        $error = 'error.incorrect_password';
+                    }
+                }else{
+                    $error = 'error.no_user';
+                }
+            }else{
+                $error = 'error.incorrect_mail';
+                $POST['email'] = '';
+            }
+        }
+        if(!empty($error)){
+            $errorCode = $error;
+            $error = APIHelpers::getkey($params, $error, '');
+            $error = static::getLangMsg($error, $error);
+        }
+        return $POST;
+    }
+    /**
+     * Информация о пользователе
+     * [!DLUsers? &action=`UserInfo` &field=`fullname` &id=`2`!]
+     */
+    public function UserInfo($params){
+        $out = '';
+        $userID = APIHelpers::getkey($params, 'id', 0);
+        if(empty($userID)){
+            $userID = $this->UserID('web');
+        }
+        $field = APIHelpers::getkey($params, 'field', 'username');
+        if($userID > 0){
+            $this->userObj->edit($userID);
+            switch(true){
+                case ($field == $this->userObj->fieldPKName()):
+                    $out = $this->userObj->getID();
+                    break;
+                case ($this->userObj->issetField($field)):
+                    $out = $this->userObj->get($field);
+                    break;
+            }
+        }
+        return $out;
+    }
+    /**
+     * ID пользователя
+     */
+    public function UserID($type = 'web'){
+        return $this->modx->getLoginUserID($type);
+    }
+    /**
+     * Если не авторизован - то отправить на страницу
+     */
+    public function isGuestGoHome($params){
+        if(!$this->UserID('web')){
+            /**
+             * @see : http://modx.im/blog/triks/105.html
+             */
+            $this->modx->invokeEvent('OnPageUnauthorized');
+            $id = APIHelpers::getkey($params, 'id', $this->config['unauthorized_page']);
+            $this->moveTo(compact('id'));
+        }
+        return;
+    }
+
+    /**
+     * Если авторизован - то открыть личный кабинет
+     */
+    public function isAuthGoHome($params){
+        $userID = $this->UserID('web');
+        if($userID>0){
+            $id = APIHelpers::getkey($params, 'homeID');
+            if(empty($id)){
+                $id = $this->modx->getConfig('login_home', $this->config['site_start']);
+            }
+            $this->moveTo(compact('id'));
+        }
+        return;
+    }
+
+    /**
+     * Редирект
+     */
+    public function moveTo($params){
+        $id = (int)APIHelpers::getkey($params, 'id', 0);
+        $uri = APIHelpers::getkey($params, 'url', '');
+        if((empty($uri) && !empty($id)) || !is_string($uri)){
+            $uri = $this->makeUrl($id);
+        }
+        $code = (int)APIHelpers::getkey($params, 'code', 0);
+        $addUrl = APIHelpers::getkey($params, 'addUrl', '');
+        if(is_scalar($addUrl) && $addUrl!=''){
+            $uri .= "?".$addUrl;
+        }
+        if(APIHelpers::getkey($params, 'validate', false)){
+            if(isset($this->modx->snippetCache['getPageID'])){
+                $out = $this->modx->runSnippet('getPageID', compact('uri'));
+                if(empty($out)){
+                    $uri = '';
+                }
+            }else{
+                $uri = APIhelpers::sanitarTag($uri);
+            }
+        }else{
+            //$modx->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.1 307 Temporary Redirect');
+            header("Location: ".$uri, true, ($code>0 ? $code : 307));
+        }
+        return $uri;
+    }
+
+    /**
+     * Создание ссылки на страницу
+     *
+     * @param  int $id ID документа
+     * @return string
+     */
+    protected function makeUrl($id = null){
+        $id = (int)$id;
+        if($id <= 0){
+            $id = $this->modx->documentObject['id'];
+        }
+        if($this->url->containsKey($id)){
+            $url = $this->url->get($id);
+        }else{
+            $url = $this->modx->makeUrl($id);
+            $this->url->set($id, $url);
+        }
+        return $url;
+    }
 
     /**
      * @param $name
      * @return string
      */
     protected function getTemplate($name){
-		$out = '';
-		$file = dirname(dirname(__FILE__)).'/tpl/'.$name.'.html';
-		if( FS::getInstance()->checkFile($file)){
-			$out = '@CODE: '.file_get_contents($file);
-		}
-		return $out;
-	}
+        $out = '';
+        $file = dirname(dirname(__FILE__)).'/tpl/'.$name.'.html';
+        if( FS::getInstance()->checkFile($file)){
+            $out = '@CODE: '.file_get_contents($file);
+        }
+        return $out;
+    }
 
     /**
      * @param $lang
      * @return bool
      */
     protected static function loadLang($lang){
-		$file = dirname(dirname(__FILE__)).'/lang/'.$lang.'.php';
-		if( ! FS::getInstance()->checkFile($file)){
-			$file = false;
-		}
-		if(!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)){
-			static::$langDic[$lang] = include_once($file);
-			if(is_array(static::$langDic[$lang])){
-				static::$langDic[$lang] = APIHelpers::renameKeyArr(static::$langDic[$lang], $lang);
-			}else{
-				static::$langDic[$lang] = array();
-			}
-		}
-		return !(empty($lang) || empty(static::$langDic[$lang]));
-	}
+        $file = dirname(dirname(__FILE__)).'/lang/'.$lang.'.php';
+        if( ! FS::getInstance()->checkFile($file)){
+            $file = false;
+        }
+        if(!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)){
+            static::$langDic[$lang] = include_once($file);
+            if(is_array(static::$langDic[$lang])){
+                static::$langDic[$lang] = APIHelpers::renameKeyArr(static::$langDic[$lang], $lang);
+            }else{
+                static::$langDic[$lang] = array();
+            }
+        }
+        return !(empty($lang) || empty(static::$langDic[$lang]));
+    }
 
     /**
      * @param $key
@@ -506,18 +506,18 @@ 
      * @return mixed
      */
     protected static function getLangMsg($key, $default){
-		$out = $default;
-		$lng = static::$lang;
-		$dic = static::$langDic;
-		if(isset($dic[$lng], $dic[$lng][$lng.'.'.$key])){
-			$out = $dic[$lng][$lng.'.'.$key];
-		}
-		if(class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])){
-			$msg = self::$instance->modx->runSnippet('lang', array('a' => 'DLUsers.'.$key));
-			if(!empty($msg)){
-				$out = $msg;
-			}
-		}
-		return $out;
-	}
+        $out = $default;
+        $lng = static::$lang;
+        $dic = static::$langDic;
+        if(isset($dic[$lng], $dic[$lng][$lng.'.'.$key])){
+            $out = $dic[$lng][$lng.'.'.$key];
+        }
+        if(class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])){
+            $msg = self::$instance->modx->runSnippet('lang', array('a' => 'DLUsers.'.$key));
+            if(!empty($msg)){
+                $out = $msg;
+            }
+        }
+        return $out;
+    }
 }
\ No newline at end of file

Spacing +86 added lines, -86 removed lines

@@ -1,10 +1,10 @@ 
 <?php namespace DLUsers;
 
-include_once(MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php');
-include_once(MODX_BASE_PATH . 'assets/lib/Helpers/FS.php');
-include_once(MODX_BASE_PATH . 'assets/lib/MODxAPI/modUsers.php');
-include_once(MODX_BASE_PATH . 'assets/snippets/DocLister/lib/DLTemplate.class.php');
-include_once(MODX_BASE_PATH . 'assets/snippets/DocLister/lib/DLCollection.class.php');
+include_once(MODX_BASE_PATH.'assets/lib/APIHelpers.class.php');
+include_once(MODX_BASE_PATH.'assets/lib/Helpers/FS.php');
+include_once(MODX_BASE_PATH.'assets/lib/MODxAPI/modUsers.php');
+include_once(MODX_BASE_PATH.'assets/snippets/DocLister/lib/DLTemplate.class.php');
+include_once(MODX_BASE_PATH.'assets/snippets/DocLister/lib/DLCollection.class.php');
 
 use APIHelpers, DocumentParser, DLCollection, DLTemplate;
 use Helpers\FS;
@@ -13,7 +13,7 @@ 
  * Class Actions
  * @package DLUsers
  */
-class Actions{
+class Actions {
     protected $modx = null;
     public $userObj = null;
 	/**
@@ -88,20 +88,20 @@ 
     /**
      * Сброс авторизации и обновление страницы
      */
-    public function logout($params){
+    public function logout($params) {
     	$LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');
-    	if(is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])){
+    	if (is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])) {
     		$userID = $this->UserID('web');
-    		if($userID){
+    		if ($userID) {
     			$this->userObj->edit($userID);
-    			if($this->userObj->getID()){
+    			if ($this->userObj->getID()) {
 	    			$this->modx->invokeEvent("OnBeforeWebLogout", array(
 		    			"userid"   => $this->userObj->getID(),
 		    			"username" => $this->userObj->get('username')
 		    		));
 	    		}
 		    	$this->userObj->logOut();
-		    	if($this->userObj->getID()){
+		    	if ($this->userObj->getID()) {
 		    		$this->modx->invokeEvent("OnWebLogout", array(
 		    			"userid"        => $this->userObj->getID(),
 		    			"username"      => $this->userObj->get('username')
@@ -109,7 +109,7 @@ 
 		    	}
 
 			    $go = APIHelpers::getkey($params, 'url', '');
-			    if(empty($go)){
+			    if (empty($go)) {
 			    	$go = str_replace(
 			    		array("?".$LogoutName, "&".$LogoutName),
 			    		array("", ""),
@@ -118,13 +118,13 @@ 
 			    }
 
 			    $start = $this->makeUrl($this->config['site_start']);
-			    if($start == $go){
+			    if ($start == $go) {
 			        $go = $this->config['site_url'];
-			    }else{
+			    } else {
 			        $go = $this->config['site_url'].ltrim($go, '/');
 			    }
 			    $this->moveTo(array('url' => $go));
-    		}else{
+    		} else {
     			//Если юзер не авторизован, то показываем ему 404 ошибку
     			$this->modx->sendErrorPage();
     		}
@@ -136,7 +136,7 @@ 
      * Генерация ссылки под кнопку выход
      * @return string
      */
-    public function logoutUrl($params){
+    public function logoutUrl($params) {
     	$LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');
     	$request = parse_url($_SERVER['REQUEST_URI']);
 
@@ -152,7 +152,7 @@ 
      * 		если указан параметр authId, то данные из формы перекидываются в метод AuthPage
      *   	В противном случае вся работа происходит внутри самого блока
      */
-    public function AuthBlock($params){
+    public function AuthBlock($params) {
     	$POST = array('backUrl' => $_SERVER['REQUEST_URI']);
 
     	$error = $errorCode = '';
@@ -161,20 +161,20 @@ 
 		$emailField = APIHelpers::getkey($params, 'emailField', 'email');
 		$rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');
 
-    	if($this->UserID('web')){
+    	if ($this->UserID('web')) {
 			$tpl = APIHelpers::getkey($params, 'tplProfile', '');
-			if(empty($tpl)){
+			if (empty($tpl)) {
 				$tpl = $this->getTemplate('tplProfile');
 			}
 			$dataTPL = $this->userObj->toArray();
 			$dataTPL['url.logout'] = $this->logoutUrl($params);
     		$homeID = APIHelpers::getkey($params, 'homeID');
-			if(!empty($homeID)){
+			if (!empty($homeID)) {
 				$dataTPL['url.profile'] = $this->makeUrl($homeID);
 			}
-		}else{
+		} else {
 			$tpl = APIHelpers::getkey($params, 'tplForm', '');
-			if(empty($tpl)){
+			if (empty($tpl)) {
 				$tpl = $this->getTemplate('authForm');
 			}
 			$POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);
@@ -188,9 +188,9 @@ 
 				'errorCode' => $errorCode
 			);
 			$authId = APIHelpers::getkey($params, 'authId');
-			if(!empty($authId)){
+			if (!empty($authId)) {
 				$dataTPL['authPage'] = $this->makeUrl($authId);
-				$dataTPL['method'] = strtolower(__CLASS__ . '::'. 'authpage');
+				$dataTPL['method'] = strtolower(__CLASS__.'::'.'authpage');
 			}
 		}
 		return DLTemplate::getInstance($this->modx)->parseChunk($tpl, $dataTPL);
@@ -200,7 +200,7 @@ 
 	 * Авторизация на сайте со страницы авторизации
 	 * [!Auth? &login=`password` &pwdField=`password` &homeID=`72`!]
 	 */
-	public function AuthPage($params){
+	public function AuthPage($params) {
 		$homeID = APIHelpers::getkey($params, 'homeID');
 		$this->isAuthGoHome(array('id' => $homeID));
 
@@ -212,58 +212,58 @@ 
 		$rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');
 
 		$tpl = APIHelpers::getkey($params, 'tpl', '');
-		if(empty($tpl)){
+		if (empty($tpl)) {
 			$tpl = $this->getTemplate('authForm');
 		}
 
 		$request = parse_url($_SERVER['REQUEST_URI']);
-		if(!empty($_SERVER['HTTP_REFERER'])){
+		if (!empty($_SERVER['HTTP_REFERER'])) {
 			/**
 			 * Thank you for super protection against hacking in protect.inc.php:-)
 			 */
 			$refer = htmlspecialchars_decode($_SERVER['HTTP_REFERER'], ENT_QUOTES);
-		}else{
+		} else {
 			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');
-			if(empty( $request['host']) ||  $request['host']==$selfHost){
+			if (empty($request['host']) || $request['host'] == $selfHost) {
 				$query = !empty($request['query']) ? '?'.$request['query'] : '';
 			    $refer = !empty($request['path']) ? $request['path'].$query : '';
-			}else{
+			} else {
 				$refer = '';
 			}
 		}
 
-		if($_SERVER['REQUEST_METHOD'] == 'POST'){
+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 			$backUrl = APIHelpers::getkey($_POST, 'backUrl', $POST['backUrl']);
-			if(!is_scalar($backUrl)){
+			if (!is_scalar($backUrl)) {
 				$backUrl = $refer;
-			}else{
+			} else {
 				$backUrl = urldecode($backUrl);
 			}
-		}else{
+		} else {
 			$backUrl = $refer;
 		}
 		$backUrl = parse_url($backUrl);
-		if(!empty($backUrl['path']) && $request['path'] != $backUrl['path']){
+		if (!empty($backUrl['path']) && $request['path'] != $backUrl['path']) {
 		    $POST['backUrl'] = $backUrl['path'];
-		}else{
+		} else {
 			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');
-			if(empty($backUrl['host']) || $backUrl['host']==$selfHost){
+			if (empty($backUrl['host']) || $backUrl['host'] == $selfHost) {
 				$query = !empty($backUrl['query']) ? '?'.$backUrl['query'] : '';
 			    $POST['backUrl'] = !empty($backUrl['path']) ? $backUrl['path'].$query : '';
-			}else{
+			} else {
 				$POST['backUrl'] = '';
 			}
 		}
-		if(!empty($POST['backUrl'])){
+		if (!empty($POST['backUrl'])) {
 			$idURL = $this->moveTo(array(
 				'url' => '/'.ltrim($POST['backUrl'], '/'),
 			    'validate' => true
 			));
-		}else{
+		} else {
 			$idURL = 0;
 		}
-		if(empty($idURL)){
-			if(empty($homeID)){
+		if (empty($idURL)) {
+			if (empty($homeID)) {
 				$homeID = $this->config['site_start'];
 			}
 			$POST['backUrl'] = $this->makeUrl($homeID);
@@ -291,18 +291,18 @@ 
      * @param array $params
      * @return array
      */
-    protected function Auth($pwdField, $emailField, $rememberField, $backUrl, $method, &$error, &$errorCode, $params = array()){
+    protected function Auth($pwdField, $emailField, $rememberField, $backUrl, $method, &$error, &$errorCode, $params = array()) {
 		$POST = array(
 			'backUrl' => urlencode($backUrl)
 		);
 		$userObj = &$this->userObj;
-		if($_SERVER['REQUEST_METHOD']=='POST' && APIHelpers::getkey($_POST, 'method', '') == strtolower($method)){
+		if ($_SERVER['REQUEST_METHOD'] == 'POST' && APIHelpers::getkey($_POST, 'method', '') == strtolower($method)) {
 			$POST = array_merge($POST, array(
 				'password' => APIHelpers::getkey($_POST, $pwdField, ''),
 				'email' => APIHelpers::getkey($_POST, $emailField, ''),
 				'remember' => (bool)((int)APIHelpers::getkey($_POST, $rememberField, 0))
 			));
-			if(!empty($POST['email']) && is_scalar($POST['email']) && !$userObj->emailValidate($POST['email'], false)){
+			if (!empty($POST['email']) && is_scalar($POST['email']) && !$userObj->emailValidate($POST['email'], false)) {
 				$userObj->edit($POST['email']);
 
 				$this->modx->invokeEvent("OnBeforeWebLogin", array(
@@ -311,7 +311,7 @@ 
 		            "rememberme"	=> $POST['remember'],
 		            'userObj'		=> $userObj
 		        ));
-				if($userObj->getID() && !$userObj->checkBlock($userObj->getID())){
+				if ($userObj->getID() && !$userObj->checkBlock($userObj->getID())) {
 					$pluginFlag = $this->modx->invokeEvent("OnWebAuthentication", array(
 	                    "userid"        => $userObj->getID(),
 	                    "username"      => $userObj->get('username'),
@@ -319,11 +319,11 @@ 
 	                    "savedpassword" => $userObj->get('password'),
 	                    "rememberme"    => $POST['remember'],
 	                ));
-					if(
+					if (
 						($pluginFlag === true || $userObj->testAuth($userObj->getID(), $POST['password'], 0))
 							&&
 						$userObj->authUser($userObj->getID(), $POST['remember'])
-					){
+					) {
 						$userObj->set('logincount', (int)$userObj->get('logincount') + 1);
 						$userObj->set('lastlogin', time());
 						$userObj->set('failedlogincount', 0);
@@ -336,21 +336,21 @@ 
 			                "rememberme"	=> $POST['remember'],
 			            ));
 						$this->moveTo(array('url' => urldecode($POST['backUrl'])));
-					}else{
+					} else {
 						$userObj->set('failedlogincount', (int)$userObj->get('failedlogincount') + 1);
 						$userObj->save(false, false);
 
 						$error = 'error.incorrect_password';
 					}
-				}else{
+				} else {
 					$error = 'error.no_user';
 				}
-			}else{
+			} else {
 				$error = 'error.incorrect_mail';
 				$POST['email'] = '';
 			}
 		}
-		if(!empty($error)){
+		if (!empty($error)) {
 			$errorCode = $error;
 			$error = APIHelpers::getkey($params, $error, '');
 			$error = static::getLangMsg($error, $error);
@@ -361,16 +361,16 @@ 
 	 * Информация о пользователе
 	 * [!DLUsers? &action=`UserInfo` &field=`fullname` &id=`2`!]
 	 */
-	public function UserInfo($params){
+	public function UserInfo($params) {
 		$out = '';
 		$userID = APIHelpers::getkey($params, 'id', 0);
-		if(empty($userID)){
+		if (empty($userID)) {
 			$userID = $this->UserID('web');
 		}
 		$field = APIHelpers::getkey($params, 'field', 'username');
-		if($userID > 0){
+		if ($userID > 0) {
 			$this->userObj->edit($userID);
-			switch(true){
+			switch (true) {
 				case ($field == $this->userObj->fieldPKName()):
 					$out = $this->userObj->getID();
 					break;
@@ -384,14 +384,14 @@ 
 	/**
 	 * ID пользователя
 	 */
-	public function UserID($type = 'web'){
+	public function UserID($type = 'web') {
 		return $this->modx->getLoginUserID($type);
 	}
 	/**
 	 * Если не авторизован - то отправить на страницу
 	 */
-	public function isGuestGoHome($params){
-		if(!$this->UserID('web')){
+	public function isGuestGoHome($params) {
+		if (!$this->UserID('web')) {
 			/**
 			 * @see : http://modx.im/blog/triks/105.html
 			 */
@@ -405,11 +405,11 @@ 
 	/**
 	 * Если авторизован - то открыть личный кабинет
 	 */
-	public function isAuthGoHome($params){
+	public function isAuthGoHome($params) {
 		$userID = $this->UserID('web');
-		if($userID>0){
+		if ($userID > 0) {
 			$id = APIHelpers::getkey($params, 'homeID');
-		    if(empty($id)){
+		    if (empty($id)) {
 				$id = $this->modx->getConfig('login_home', $this->config['site_start']);
 		    }
 		    $this->moveTo(compact('id'));
@@ -420,29 +420,29 @@ 
 	/**
 	 * Редирект
 	 */
-	public function moveTo($params){
+	public function moveTo($params) {
 		$id = (int)APIHelpers::getkey($params, 'id', 0);
 		$uri = APIHelpers::getkey($params, 'url', '');
-		if((empty($uri) && !empty($id)) || !is_string($uri)){
+		if ((empty($uri) && !empty($id)) || !is_string($uri)) {
 			$uri = $this->makeUrl($id);
 		}
 		$code = (int)APIHelpers::getkey($params, 'code', 0);
 		$addUrl = APIHelpers::getkey($params, 'addUrl', '');
-		if(is_scalar($addUrl) && $addUrl!=''){
+		if (is_scalar($addUrl) && $addUrl != '') {
 		    $uri .= "?".$addUrl;
 		}
-		if(APIHelpers::getkey($params, 'validate', false)){
-			if(isset($this->modx->snippetCache['getPageID'])){
+		if (APIHelpers::getkey($params, 'validate', false)) {
+			if (isset($this->modx->snippetCache['getPageID'])) {
 				$out = $this->modx->runSnippet('getPageID', compact('uri'));
-				if(empty($out)){
+				if (empty($out)) {
 					$uri = '';
 				}
-			}else{
+			} else {
 				$uri = APIhelpers::sanitarTag($uri);
 			}
-		}else{
+		} else {
 			//$modx->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.1 307 Temporary Redirect');
-			header("Location: ".$uri, true, ($code>0 ? $code : 307));
+			header("Location: ".$uri, true, ($code > 0 ? $code : 307));
 		}
 		return $uri;
 	}
@@ -453,14 +453,14 @@ 
 	 * @param  int $id ID документа
 	 * @return string
 	 */
-	protected function makeUrl($id = null){
+	protected function makeUrl($id = null) {
 		$id = (int)$id;
-		if($id <= 0){
+		if ($id <= 0) {
 			$id = $this->modx->documentObject['id'];
 		}
-		if($this->url->containsKey($id)){
+		if ($this->url->containsKey($id)) {
 			$url = $this->url->get($id);
-		}else{
+		} else {
 			$url = $this->modx->makeUrl($id);
 			$this->url->set($id, $url);
 		}
@@ -471,10 +471,10 @@ 
      * @param $name
      * @return string
      */
-    protected function getTemplate($name){
+    protected function getTemplate($name) {
 		$out = '';
 		$file = dirname(dirname(__FILE__)).'/tpl/'.$name.'.html';
-		if( FS::getInstance()->checkFile($file)){
+		if (FS::getInstance()->checkFile($file)) {
 			$out = '@CODE: '.file_get_contents($file);
 		}
 		return $out;
@@ -484,16 +484,16 @@ 
      * @param $lang
      * @return bool
      */
-    protected static function loadLang($lang){
+    protected static function loadLang($lang) {
 		$file = dirname(dirname(__FILE__)).'/lang/'.$lang.'.php';
-		if( ! FS::getInstance()->checkFile($file)){
+		if (!FS::getInstance()->checkFile($file)) {
 			$file = false;
 		}
-		if(!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)){
+		if (!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)) {
 			static::$langDic[$lang] = include_once($file);
-			if(is_array(static::$langDic[$lang])){
+			if (is_array(static::$langDic[$lang])) {
 				static::$langDic[$lang] = APIHelpers::renameKeyArr(static::$langDic[$lang], $lang);
-			}else{
+			} else {
 				static::$langDic[$lang] = array();
 			}
 		}
@@ -505,16 +505,16 @@ 
      * @param $default
      * @return mixed
      */
-    protected static function getLangMsg($key, $default){
+    protected static function getLangMsg($key, $default) {
 		$out = $default;
 		$lng = static::$lang;
 		$dic = static::$langDic;
-		if(isset($dic[$lng], $dic[$lng][$lng.'.'.$key])){
+		if (isset($dic[$lng], $dic[$lng][$lng.'.'.$key])) {
 			$out = $dic[$lng][$lng.'.'.$key];
 		}
-		if(class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])){
+		if (class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])) {
 			$msg = self::$instance->modx->runSnippet('lang', array('a' => 'DLUsers.'.$key));
-			if(!empty($msg)){
+			if (!empty($msg)) {
 				$out = $msg;
 			}
 		}