AgelxNash / DocLister

assets/snippets/DocLister/core/DocLister.abstract.php

Spacing +28 added lines, -28 removed lines

@@ -266,18 +266,18 @@ 
 	 * @param string $str строка с фильтром

      * @return array массив субфильтров

      */

-	public function smartSplit($str){

+	public function smartSplit($str) {

 		$res = array();

 		$cur = '';

 		$open = 0;

 		$strlen = mb_strlen($str, 'UTF-8');

-		for($i=0;$i<=$strlen;$i++){

+		for ($i = 0; $i <= $strlen; $i++) {

 			$e = mb_substr($str, $i, 1, 'UTF-8');

-			switch($e){

+			switch ($e) {

 				case ')': {

 					$open--;

-					if($open == 0){

-						$res[] = $cur.')';

+					if ($open == 0) {

+						$res[] = $cur . ')';

 						$cur = '';

 					} else {

 						$cur .= $e;

@@ -290,7 +290,7 @@ 
 					break;

 				}

 				case ';':{

-					if($open == 0){

+					if ($open == 0) {

 						$res[] = $cur;

 						$cur = '';

 					} else {

@@ -304,7 +304,7 @@ 
 			}

 		}

 		$cur = preg_replace("/(\))$/u", '', $cur);

-		if ($cur != ''){

+		if ($cur != '') {

 			$res[] = $cur;

 		}

 		return $res;

@@ -432,14 +432,14 @@ 
                 $cfgName[1] = 'custom';

             }

             $cfgName[1] = rtrim($cfgName[1], '/');

-            switch($cfgName[1]){

+            switch ($cfgName[1]) {

                 case 'custom':

                 case 'core':{

                     $configFile = dirname(dirname(__FILE__)) . "/config/{$cfgName[1]}/{$cfgName[0]}.json";

                     break;

                 }

                 default:{

-                    $configFile = $this->FS->relativePath( $cfgName[1] . '/' . $cfgName[0] . ".json");

+                    $configFile = $this->FS->relativePath($cfgName[1] . '/' . $cfgName[0] . ".json");

                     break;

                 }

             }

@@ -608,7 +608,7 @@ 
 	 *

 	 * @return int

 	 */

-	 public function getCurrentMODXPageID(){

+	 public function getCurrentMODXPageID() {

 		$id = isset($this->modx->documentIdentifier) ? (int)$this->modx->documentIdentifier : 0;

 		$docData = isset($this->modx->documentObject) ? $this->modx->documentObject : array();

 

@@ -745,7 +745,7 @@ 
         $out = DLTemplate::getInstance($this->getMODX())->toPlaceholders($data, $set, $key, $id);

 

         $this->debug->debugEnd(

-            "toPlaceholders", array($key ." placeholder" => $data), array('html')

+            "toPlaceholders", array($key . " placeholder" => $data), array('html')

         );

         return $out;

     }

@@ -767,7 +767,7 @@ 
         }

         $out = array();

         foreach ($data as $item) {

-            if($item !== ''){

+            if ($item !== '') {

                 $out[] = $this->modx->db->escape($item);

             }

         }

@@ -991,11 +991,11 @@ 
      * @param string $data html код который нужно обернуть в ownerTPL

      * @return string результатирующий html код

      */

-    public function renderWrap($data){

+    public function renderWrap($data) {

         $out = $data;

 		$docs = count($this->_docs) - $this->skippedDocs;

 		if ((($this->getCFGDef("noneWrapOuter", "1") && $docs == 0) || $docs > 0) && !empty($this->ownerTPL)) {

-            $this->debug->debug("","renderWrapTPL",2);

+            $this->debug->debug("", "renderWrapTPL", 2);

             $parse = true;

             $plh = array($this->getCFGDef("sysKey", "dl") . ".wrap" => $data);

             /**

@@ -1011,13 +1011,13 @@ 
                     'nameParam' => 'prepareWrap',

                     'return' => 'placeholders'

                 ));

-                if (is_bool($params) && $params === false){

+                if (is_bool($params) && $params === false) {

                     $out = $data;

                     $parse = false;

                 }

                 $plh = $params;

             }

-            if($parse && !empty($this->ownerTPL)){

+            if ($parse && !empty($this->ownerTPL)) {

                 $this->debug->updateMessage(

                     array("render ownerTPL" => $this->ownerTPL, "With data" => print_r($plh, 1)),

                     "renderWrapTPL",

@@ -1025,7 +1025,7 @@ 
                 );

                 $out = $this->parseChunk($this->ownerTPL, $plh);

             }

-            if(empty($this->ownerTPL)){

+            if (empty($this->ownerTPL)) {

                 $this->debug->updateMessage("empty ownerTPL", "renderWrapTPL");

             }

             $this->debug->debugEnd("renderWrapTPL");

@@ -1039,12 +1039,12 @@ 
     * @param int $i номер итерации в цикле

     * @return array массив с данными которые можно использовать в цикле render метода

     */

-    protected function uniformPrepare(&$data, $i=0){

+    protected function uniformPrepare(&$data, $i = 0) {

         $class = array();

 

         $iterationName = ($i % 2 == 0) ? 'Odd' : 'Even';

         $tmp = strtolower($iterationName);

-        $class[] = $this->getCFGDef($tmp.'Class', $tmp);

+        $class[] = $this->getCFGDef($tmp . 'Class', $tmp);

 

         $this->renderTPL = $this->getCFGDef('tplId' . $i, $this->renderTPL);

         $this->renderTPL = $this->getCFGDef('tpl' . $iterationName, $this->renderTPL);

@@ -1074,9 +1074,9 @@ 
         * @var $extE e_DL_Extender

         */

         $extE = $this->getExtender('e', true, true);

-        if($out = $extE->init($this, compact('data'))){

-            if(is_array($out)){

-                $data =  $out;

+        if ($out = $extE->init($this, compact('data'))) {

+            if (is_array($out)) {

+                $data = $out;

             }

         }

         return compact('class', 'iterationName');

@@ -1310,7 +1310,7 @@ 
         return $out;

     }

 

-	public function docsCollection(){

+	public function docsCollection() {

         return new DLCollection($this->modx, $this->_docs);

     }

 

@@ -1475,18 +1475,18 @@ 
         $children = array(); // children of each ID

         $ids = array();

         foreach ($data as $i => $r) {

-            $row =& $data[$i];

+            $row = & $data[$i];

             $id = $row[$idName];

             $pid = $row[$pidName];

-            $children[$pid][$id] =& $row;

+            $children[$pid][$id] = & $row;

             if (!isset($children[$id])) $children[$id] = array();

-            $row['#childNodes'] =& $children[$id];

+            $row['#childNodes'] = & $children[$id];

             $ids[$row[$idName]] = true;

         }

         // Root elements are elements with non-found PIDs.

         $this->_tree = array();

         foreach ($data as $i => $r) {

-            $row =& $data[$i];

+            $row = & $data[$i];

             if (!isset($ids[$row[$pidName]])) {

                 $this->_tree[$row[$idName]] = $row;

             }

@@ -1511,7 +1511,7 @@ 
     * По умолчанию это parent. Переопределить можно в контроллере присвоив другое значение переменной parentField

     * @return string Parent Key основной таблицы

     */

-    public function getParentField(){

+    public function getParentField() {

         return isset($this->parentField) ? $this->parentField : '';

     }

     /**

Braces +21 added lines, -7 removed lines

@@ -199,7 +199,9 @@ 
             $this->setDebug(1);

             $this->loadLang(array('core', 'json'));

 

-            if (!is_array($cfg) || empty($cfg)) $cfg = $this->modx->Event->params;

+            if (!is_array($cfg) || empty($cfg)) {

+                $cfg = $this->modx->Event->params;

+            }

 		} else {

         	throw new Exception('MODX var is not instaceof DocumentParser');

 		}

@@ -741,7 +743,9 @@ 
         }

         $this->_plh[$key] = $data;

         $id = $this->getCFGDef('id', '');

-        if ($id != '') $id .= ".";

+        if ($id != '') {

+            $id .= ".";

+        }

         $out = DLTemplate::getInstance($this->getMODX())->toPlaceholders($data, $set, $key, $id);

 

         $this->debug->debugEnd(

@@ -1479,7 +1483,9 @@ 
             $id = $row[$idName];

             $pid = $row[$pidName];

             $children[$pid][$id] =& $row;

-            if (!isset($children[$id])) $children[$id] = array();

+            if (!isset($children[$id])) {

+                $children[$id] = array();

+            }

             $row['#childNodes'] =& $children[$id];

             $ids[$row[$idName]] = true;

         }

@@ -1526,7 +1532,9 @@ 
         $this->debug->debug("getFilters: " . $this->debug->dumpData($filter_string), 'getFilter', 1);

         // the filter parameter tells us, which filters can be used in this query

         $filter_string = trim($filter_string, ' ;');

-        if (!$filter_string) return;

+        if (!$filter_string) {

+            return;

+        }

         $output = array('join' => '', 'where' => '');

         $logic_op_found = false;

 		$joins = $wheres = array();

@@ -1537,9 +1545,15 @@ 
                 $subfilters = $this->smartSplit($subfilters);

                 foreach ($subfilters as $subfilter) {

                     $subfilter = $this->getFilters(trim($subfilter));

-                    if (!$subfilter) continue;

-                    if ($subfilter['join']) $joins[] = $subfilter['join'];

-                    if ($subfilter['where']) $wheres[] = $subfilter['where'];

+                    if (!$subfilter) {

+                        continue;

+                    }

+                    if ($subfilter['join']) {

+                        $joins[] = $subfilter['join'];

+                    }

+                    if ($subfilter['where']) {

+                        $wheres[] = $subfilter['where'];

+                    }

                 }

                 $output['join'] = !empty($joins) ? implode(' ', $joins) : '';

                 $output['where'] = !empty($wheres) ? '(' . implode($sql, $wheres) . ')' : '';

Indentation +119 added lines, -119 removed lines

@@ -3,20 +3,20 @@ 
     die('HACK???');

 }

 /**

- * DocLister class

- *

- * @license GNU General Public License (GPL), http://www.gnu.org/copyleft/gpl.html

- * @author Agel_Nash <Agel_Nash@xaker.ru>

- *

- * @TODO add controller for work with plugin http://modx.com/extras/package/quid and get TV value via LEFT JOIN

- * @TODO add controller for filter by TV values

- * @TODO add method load default template

- * @TODO add example custom controller for build google sitemap.xml

- * @TODO add method build tree for replace Wayfinder if need TV value in menu OR sitemap

- * @TODO add controller for show list web-user with filter by group and other user information

- * @TODO depending on the parameters

- * @TODO prepare value before return final data (maybe callback function OR extender)

- */

+     * DocLister class

+     *

+     * @license GNU General Public License (GPL), http://www.gnu.org/copyleft/gpl.html

+     * @author Agel_Nash <Agel_Nash@xaker.ru>

+     *

+     * @TODO add controller for work with plugin http://modx.com/extras/package/quid and get TV value via LEFT JOIN

+     * @TODO add controller for filter by TV values

+     * @TODO add method load default template

+     * @TODO add example custom controller for build google sitemap.xml

+     * @TODO add method build tree for replace Wayfinder if need TV value in menu OR sitemap

+     * @TODO add controller for show list web-user with filter by group and other user information

+     * @TODO depending on the parameters

+     * @TODO prepare value before return final data (maybe callback function OR extender)

+     */

 include_once(MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php');

 include_once(MODX_BASE_PATH . 'assets/lib/Helpers/FS.php');

 require_once(dirname(dirname(__FILE__)) . "/lib/jsonHelper.class.php");

@@ -107,10 +107,10 @@ 
     protected $idField = 'id';

 

     /**

-    * Parent Key основной таблицы

-    * @var string

-    * @access protected

-    */

+     * Parent Key основной таблицы

+     * @var string

+     * @access protected

+     */

     protected $parentField = 'parent';

     /**

      * Дополнительные условия для SQL запросов

@@ -168,18 +168,18 @@ 
 

     public $FS = null;

     /** @var string результатирующая строка которая была последний раз сгенирирована

-    *               вызовами методов DocLister::render и DocLister::getJSON

-    */

+     *               вызовами методов DocLister::render и DocLister::getJSON

+     */

     protected $outData = '';

 	

-	/** @var int Число документов, которые были отфильтрованы через prepare при выводе */

-	public $skippedDocs = 0;

+    /** @var int Число документов, которые были отфильтрованы через prepare при выводе */

+    public $skippedDocs = 0;

 

-	/** @var string Имя таблицы */

-	protected $table = '';

+    /** @var string Имя таблицы */

+    protected $table = '';

 

-	/** @var null|paginate_DL_Extender  */

-	protected $extPaginate = null;

+    /** @var null|paginate_DL_Extender  */

+    protected $extPaginate = null;

     /**

      * Конструктор контроллеров DocLister

      *

@@ -191,30 +191,30 @@ 
     {

         $this->setTimeStart($startTime);

 

-		if (extension_loaded('mbstring')) {

-        	mb_internal_encoding("UTF-8");

-		} else {

-        	throw new Exception('Not found php extension mbstring');

-		}

+        if (extension_loaded('mbstring')) {

+            mb_internal_encoding("UTF-8");

+        } else {

+            throw new Exception('Not found php extension mbstring');

+        }

 

         if ($modx instanceof DocumentParser) {

-        	$this->modx = $modx;

+            $this->modx = $modx;

             $this->setDebug(1);

             $this->loadLang(array('core', 'json'));

 

             if (!is_array($cfg) || empty($cfg)) $cfg = $this->modx->Event->params;

-		} else {

-        	throw new Exception('MODX var is not instaceof DocumentParser');

-		}

+        } else {

+            throw new Exception('MODX var is not instaceof DocumentParser');

+        }

 

         $this->FS = \Helpers\FS::getInstance();

         if (isset($cfg['config'])) {

-        	$cfg = array_merge($this->loadConfig($cfg['config']), $cfg);

-		}

+            $cfg = array_merge($this->loadConfig($cfg['config']), $cfg);

+        }

 

-		if (!$this->setConfig($cfg)) {

-        	throw new Exception('no parameters to run DocLister');

-		}

+        if (!$this->setConfig($cfg)) {

+            throw new Exception('no parameters to run DocLister');

+        }

 

         $this->setDebug($this->getCFGDef('debug', 0));

 

@@ -262,48 +262,48 @@ 
 

     /**

      * Разбиение фильтра на субфильтры с учётом вложенности

-	 * @param string $str строка с фильтром

+     * @param string $str строка с фильтром

      * @return array массив субфильтров

      */

-	public function smartSplit($str){

-		$res = array();

-		$cur = '';

-		$open = 0;

-		$strlen = mb_strlen($str, 'UTF-8');

-		for($i=0;$i<=$strlen;$i++){

-			$e = mb_substr($str, $i, 1, 'UTF-8');

-			switch($e){

-				case ')':

-					$open--;

-					if($open == 0){

-						$res[] = $cur.')';

-						$cur = '';

-					} else {

-						$cur .= $e;

-					}

-					break;

-				case '(':

-					$open++;

-					$cur .= $e;

-					break;

-				case ';':

-					if($open == 0){

-						$res[] = $cur;

-						$cur = '';

-					} else {

-						$cur .= $e;

-					}

-					break;

-				default:

-					$cur .= $e;

-			}

-		}

-		$cur = preg_replace("/(\))$/u", '', $cur);

-		if ($cur != ''){

-			$res[] = $cur;

-		}

-		return $res;

-	}

+    public function smartSplit($str){

+        $res = array();

+        $cur = '';

+        $open = 0;

+        $strlen = mb_strlen($str, 'UTF-8');

+        for($i=0;$i<=$strlen;$i++){

+            $e = mb_substr($str, $i, 1, 'UTF-8');

+            switch($e){

+                case ')':

+                    $open--;

+                    if($open == 0){

+                        $res[] = $cur.')';

+                        $cur = '';

+                    } else {

+                        $cur .= $e;

+                    }

+                    break;

+                case '(':

+                    $open++;

+                    $cur .= $e;

+                    break;

+                case ';':

+                    if($open == 0){

+                        $res[] = $cur;

+                        $cur = '';

+                    } else {

+                        $cur .= $e;

+                    }

+                    break;

+                default:

+                    $cur .= $e;

+            }

+        }

+        $cur = preg_replace("/(\))$/u", '', $cur);

+        if ($cur != ''){

+            $res[] = $cur;

+        }

+        return $res;

+    }

 

     /**

      * Трансформация объекта в строку

@@ -491,7 +491,7 @@ 
         $flag = true;

         $extenders = $this->getCFGDef('extender', '');

         $extenders = explode(",", $extenders);

-        	if (($this->getCFGDef('requestActive', '') != '' || in_array('request', $extenders)) && !$this->_loadExtender('request')) { //OR request in extender's parameter

+            if (($this->getCFGDef('requestActive', '') != '' || in_array('request', $extenders)) && !$this->_loadExtender('request')) { //OR request in extender's parameter

                 throw new Exception('Error load request extender');

             }

 

@@ -595,17 +595,17 @@ 
      ****************** CORE Block *********************

      ***************************************************/

 

-	 /**

-	 * Определение ID страницы открытой во фронте

-	 *

-	 * @return int

-	 */

-	 public function getCurrentMODXPageID(){

-		$id = isset($this->modx->documentIdentifier) ? (int)$this->modx->documentIdentifier : 0;

-		$docData = isset($this->modx->documentObject) ? $this->modx->documentObject : array();

+        /**

+         * Определение ID страницы открытой во фронте

+         *

+         * @return int

+         */

+        public function getCurrentMODXPageID(){

+        $id = isset($this->modx->documentIdentifier) ? (int)$this->modx->documentIdentifier : 0;

+        $docData = isset($this->modx->documentObject) ? $this->modx->documentObject : array();

 

-		return empty($id) ? \APIHelpers::getkey($docData, 'id', 0) : $id;

-	}

+        return empty($id) ? \APIHelpers::getkey($docData, 'id', 0) : $id;

+    }

 

     /**

      * Display and save error information

@@ -653,14 +653,14 @@ 
             $ext = explode(",", $ext);

             foreach ($ext as $item) {

                 if ($item != '' && !$this->_loadExtender($item)) {

-                	throw new Exception('Error load ' . APIHelpers::e($item) . ' extender');

-				}

+                    throw new Exception('Error load ' . APIHelpers::e($item) . ' extender');

+                }

             }

         }

         return $out;

     }

 

-	/**

+    /**

      * Получение всего списка настроек

      * @return array

      */

@@ -676,7 +676,7 @@ 
      */

     public function setConfig($cfg)

     {

-		if (is_array($cfg)) {

+        if (is_array($cfg)) {

             $this->_cfg = array_merge($this->_cfg, $cfg);

             $ret = count($this->_cfg);

         } else {

@@ -685,7 +685,7 @@ 
         return $ret;

     }

 

-	/**

+    /**

      * Полная перезапись настроек вызова сниппета

      * @param array $cfg массив настроек

      * @return int Общее число новых настроек

@@ -693,9 +693,9 @@ 
     public function replaceConfig($cfg)

     {

         if (!is_array($cfg)) {

-			$cfg = array();

+            $cfg = array();

         }

-		$this->_cfg = $cfg;

+        $this->_cfg = $cfg;

         return count($this->_cfg);

     }

 

@@ -979,21 +979,21 @@ 
      */

     public function renderWrap($data){

         $out = $data;

-		$docs = count($this->_docs) - $this->skippedDocs;

-		if ((($this->getCFGDef("noneWrapOuter", "1") && $docs == 0) || $docs > 0) && !empty($this->ownerTPL)) {

+        $docs = count($this->_docs) - $this->skippedDocs;

+        if ((($this->getCFGDef("noneWrapOuter", "1") && $docs == 0) || $docs > 0) && !empty($this->ownerTPL)) {

             $this->debug->debug("","renderWrapTPL",2);

             $parse = true;

             $plh = array($this->getCFGDef("sysKey", "dl") . ".wrap" => $data);

             /**

-            * @var $extPrepare prepare_DL_Extender

-            */

+             * @var $extPrepare prepare_DL_Extender

+             */

             $extPrepare = $this->getExtender('prepare');

             if ($extPrepare) {

                 $params = $extPrepare->init($this, array(

                     'data' => array(

-						'docs' => $this->_docs,

-						'placeholders' => $plh

-					),

+                        'docs' => $this->_docs,

+                        'placeholders' => $plh

+                    ),

                     'nameParam' => 'prepareWrap',

                     'return' => 'placeholders'

                 ));

@@ -1019,12 +1019,12 @@ 
         return $out;

     }

     /**

-    * Единые обработки массива с данными о документе для всех контроллеров

-    *

-    * @param array $data массив с данными о текущем документе

-    * @param int $i номер итерации в цикле

-    * @return array массив с данными которые можно использовать в цикле render метода

-    */

+     * Единые обработки массива с данными о документе для всех контроллеров

+     *

+     * @param array $data массив с данными о текущем документе

+     * @param int $i номер итерации в цикле

+     * @return array массив с данными которые можно использовать в цикле render метода

+     */

     protected function uniformPrepare(&$data, $i=0){

         $class = array();

 

@@ -1057,8 +1057,8 @@ 
         $data[$this->getCFGDef("sysKey", "dl") . '.class'] = $class;

 

         /**

-        * @var $extE e_DL_Extender

-        */

+         * @var $extE e_DL_Extender

+         */

         $extE = $this->getExtender('e', true, true);

         if($out = $extE->init($this, compact('data'))){

             if(is_array($out)){

@@ -1296,7 +1296,7 @@ 
         return $out;

     }

 

-	public function docsCollection(){

+    public function docsCollection(){

         return new DLCollection($this->modx, $this->_docs);

     }

 

@@ -1485,10 +1485,10 @@ 
     }

 

     /**

-    * Получение Parent key

-    * По умолчанию это parent. Переопределить можно в контроллере присвоив другое значение переменной parentField

-    * @return string Parent Key основной таблицы

-    */

+     * Получение Parent key

+     * По умолчанию это parent. Переопределить можно в контроллере присвоив другое значение переменной parentField

+     * @return string Parent Key основной таблицы

+     */

     public function getParentField(){

         return isset($this->parentField) ? $this->parentField : '';

     }

@@ -1507,7 +1507,7 @@ 
         if (!$filter_string) return;

         $output = array('join' => '', 'where' => '');

         $logic_op_found = false;

-		$joins = $wheres = array();

+        $joins = $wheres = array();

         foreach ($this->_logic_ops as $op => $sql) {

             if (strpos($filter_string, $op) === 0) {

                 $logic_op_found = true;

assets/lib/MODxAPI/MODx.php

Indentation +78 added lines, -78 removed lines

@@ -13,23 +13,23 @@ 
     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();

 

     public function __construct(DocumentParser $modx, $debug = false)

     {	

         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);

     }

 

@@ -70,7 +70,7 @@ 
             $value = $this->modx->db->escape($value);

         }

         return $value;

-     }

+        }

     final public function invokeEvent($name, $data = array(), $flag = false)

     {

         $flag = (isset($flag) && $flag != '') ? (bool)$flag : false;

@@ -109,42 +109,42 @@ 
 

     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);

     }

-	public function switchObject($id){

+    public function switchObject($id){

         switch(true){

             //Если загружен другой объект - не тот, с которым мы хотим временно поработать

             case ($this->getID() != $id && $id):

@@ -161,13 +161,13 @@ 
         }

         return $obj;

     }

-	public function useIgnore($flag = true){

-		$this->ignoreError = $flag ? 'IGNORE' : '';

-		return $this;

-	}

-	public function hasIgnore(){

-		return (bool)$this->ignoreError;

-	}

+    public function useIgnore($flag = true){

+        $this->ignoreError = $flag ? 'IGNORE' : '';

+        return $this;

+    }

+    public function hasIgnore(){

+        return (bool)$this->ignoreError;

+    }

 

     public function set($key, $value)

     {

@@ -204,8 +204,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 == '') {

@@ -223,11 +223,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);

@@ -246,38 +246,38 @@ 
     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;

     }

 

     final public function toJson($callback = null)

     {

         $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;

     }

 

     final protected function jsonError($data)

@@ -491,7 +491,7 @@ 
      * @return array

      */

     public function getNoDecodeFields(){

-       return $this->_decodedFields->filter(function($value){

+        return $this->_decodedFields->filter(function($value){

             return ($value === true);

         });

     }

Braces +20 added lines, -8 removed lines

@@ -66,7 +66,7 @@ 
     final public function escape($value){

         if(!is_scalar($value)){

             $value = '';

-        }else{

+        } else{

             $value = $this->modx->db->escape($value);

         }

         return $value;

@@ -94,7 +94,9 @@ 
     final public function list_log($flush = false)

     {

         echo '<pre>' . print_r(APIHelpers::sanitarTag($this->log), true) . '</pre>';

-        if ($flush) $this->clearLog();

+        if ($flush) {

+            $this->clearLog();

+        }

         return $this;

     }

 

@@ -118,7 +120,7 @@ 
 			$sync->setCachepath($path);

 			$sync->setReport(false);

 			$sync->emptyCache();

-		}else {

+		} else {

 			if(is_scalar($custom)){

 				$custom = array($custom);

 			}

@@ -205,7 +207,9 @@ 
         } 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 == '') {

@@ -247,18 +251,24 @@ 
     {

         if (is_scalar($data) && !empty($data)) {

         	$json = json_decode($data);

-		} else throw new Exception("json is not string with json 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>");

+            	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;

     }

@@ -269,7 +279,9 @@ 
         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);

 

assets/lib/MODxAPI/autoTable.abstract.php

Indentation +12 added lines, -12 removed lines

@@ -68,14 +68,14 @@ 
             }
             $result = $this->query($SQL);
         }
-		if($result && $this->modx->db->getAffectedRows() >= 0 ){
-			if ($this->newDoc && !empty($SQL)) $this->id = $this->modx->db->getInsertId();
-			if ($clearCache) $this->clearCache($fire_events);
-			$result = $this->id;
-		}else{
-			if(!empty($SQL)) $this->log['SqlError'] = $SQL;
-			$result = false;
-		}
+        if($result && $this->modx->db->getAffectedRows() >= 0 ){
+            if ($this->newDoc && !empty($SQL)) $this->id = $this->modx->db->getInsertId();
+            if ($clearCache) $this->clearCache($fire_events);
+            $result = $this->id;
+        }else{
+            if(!empty($SQL)) $this->log['SqlError'] = $SQL;
+            $result = false;
+        }
         return $result;
     }
 
@@ -83,12 +83,12 @@ 
     {
         $_ids = $this->cleanIDs($ids, ',');
         if (is_array($_ids) && $_ids != array()) {
-        	$id = $this->sanitarIn($_ids);
+            $id = $this->sanitarIn($_ids);
             if(!empty($id)){
-            	$this->query("DELETE from {$this->makeTable($this->table)} where `" . $this->pkName . "` IN ({$id})");
-			}
+                $this->query("DELETE from {$this->makeTable($this->table)} where `" . $this->pkName . "` IN ({$id})");
+            }
             $this->clearCache($fire_events);
-		} else throw new Exception('Invalid IDs list for delete: <pre>' . print_r($ids, 1) . '</pre>');
+        } else throw new Exception('Invalid IDs list for delete: <pre>' . print_r($ids, 1) . '</pre>');
         return $this;
     }
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -6,13 +6,13 @@ 
     protected $table = null;
     protected $generateField = false;
 
-    public function tableName(){
+    public function tableName() {
         return $this->table;
     }
     public function __construct($modx, $debug = false)
     {
         parent::__construct($modx, $debug);
-        if(empty($this->default_field)){
+        if (empty($this->default_field)) {
             $data = $this->modx->db->getTableMetaData($this->makeTable($this->table));
             foreach ($data as $item) {
                 if (empty($this->pkName) && $item['Key'] == 'PRI') {
@@ -35,12 +35,12 @@ 
             $this->markAllEncode();
             $this->field = array();
             $this->set = array();
-            $result = $this->query("SELECT * from {$this->makeTable($this->table)} where `" . $this->pkName . "`='" . $this->escape($id)."'");
+            $result = $this->query("SELECT * from {$this->makeTable($this->table)} where `" . $this->pkName . "`='" . $this->escape($id) . "'");
             $this->fromArray($this->modx->db->getRow($result));
             $this->id = $this->eraseField($this->pkName);
-            if(is_bool($this->id) && $this->id === false){
+            if (is_bool($this->id) && $this->id === false) {
                 $this->id = null;
-            }else{
+            } else {
                 $this->decodeFields();
             }
         }
@@ -55,7 +55,7 @@ 
             if ($this->newDoc && $this->get($key) === null && $this->get($key) !== $value) {
                 $this->set($key, $value);
             }
-            if((!$this->generateField || isset($fld[$key])) && $this->get($key) !== null){
+            if ((!$this->generateField || isset($fld[$key])) && $this->get($key) !== null) {
                 $this->Uset($key);
             }
             unset($fld[$key]);
@@ -68,12 +68,12 @@ 
             }
             $result = $this->query($SQL);
         }
-		if($result && $this->modx->db->getAffectedRows() >= 0 ){
+		if ($result && $this->modx->db->getAffectedRows() >= 0) {
 			if ($this->newDoc && !empty($SQL)) $this->id = $this->modx->db->getInsertId();
 			if ($clearCache) $this->clearCache($fire_events);
 			$result = $this->id;
-		}else{
-			if(!empty($SQL)) $this->log['SqlError'] = $SQL;
+		} else {
+			if (!empty($SQL)) $this->log['SqlError'] = $SQL;
 			$result = false;
 		}
         return $result;
@@ -84,7 +84,7 @@ 
         $_ids = $this->cleanIDs($ids, ',');
         if (is_array($_ids) && $_ids != array()) {
         	$id = $this->sanitarIn($_ids);
-            if(!empty($id)){
+            if (!empty($id)) {
             	$this->query("DELETE from {$this->makeTable($this->table)} where `" . $this->pkName . "` IN ({$id})");
 			}
             $this->clearCache($fire_events);

Braces +14 added lines, -6 removed lines

@@ -40,7 +40,7 @@ 
             $this->id = $this->eraseField($this->pkName);
             if(is_bool($this->id) && $this->id === false){
                 $this->id = null;
-            }else{
+            } else{
                 $this->decodeFields();
             }
         }
@@ -69,11 +69,17 @@ 
             $result = $this->query($SQL);
         }
 		if($result && $this->modx->db->getAffectedRows() >= 0 ){
-			if ($this->newDoc && !empty($SQL)) $this->id = $this->modx->db->getInsertId();
-			if ($clearCache) $this->clearCache($fire_events);
+			if ($this->newDoc && !empty($SQL)) {

+			    $this->id = $this->modx->db->getInsertId();

+			}

+			if ($clearCache) {

+			    $this->clearCache($fire_events);

+			}

 			$result = $this->id;
-		}else{
-			if(!empty($SQL)) $this->log['SqlError'] = $SQL;
+		} else{
+			if(!empty($SQL)) {

+			    $this->log['SqlError'] = $SQL;

+			}

 			$result = false;
 		}
         return $result;
@@ -88,7 +94,9 @@ 
             	$this->query("DELETE from {$this->makeTable($this->table)} where `" . $this->pkName . "` IN ({$id})");
 			}
             $this->clearCache($fire_events);
-		} else throw new Exception('Invalid IDs list for delete: <pre>' . print_r($ids, 1) . '</pre>');
+		} else {

+		    throw new Exception('Invalid IDs list for delete: <pre>' . print_r($ids, 1) . '</pre>');

+		}

         return $this;
     }
 }
\ No newline at end of file

assets/lib/Helpers/Video.php

Indentation +378 added lines, -378 removed lines

@@ -13,382 +13,382 @@
  */

 class Video

 {

-	/** Ссылка на ролик */

-	protected $link;

-

-	/** Распарсенные части ссылки */

-	protected $link_parts;

-

-	/** Видеохостинг */

-	protected $hosting;

-

-	/** Идентификатор видео */

-	protected $id;

-

-	/** Картинка */

-	protected $image;

-

-	/** Название видео */

-	protected $title;

-

-	/** Видео */

-	protected $video;

-

-	protected $width = 420;

-	protected $height = 315;

-	protected $autoplay = false;

-

-	public $scheme = 'https';

-

-	const YOUTUBE = 'youtube';

-	const VIMEO   = 'vimeo';

-	const RUTUBE  = 'rutube';

-

-	/** Регулярки для определения видеохостинга и идентификатора ролика */

-	protected $regexp = array(

-		self::YOUTUBE => array( //Не используются

-			'/[http|https]+:\/\/(?:www\.|)youtube\.com\/watch\?(?:.*)?v=([a-zA-Z0-9_\-]+)/i',

-			'/[http|https]+:\/\/(?:www\.|)youtube\.com\/embed\/([a-zA-Z0-9_\-]+)/i',

-			'/[http|https]+:\/\/(?:www\.|)youtu\.be\/([a-zA-Z0-9_\-]+)/i'

-		),

-		self::VIMEO   => array( //Не используются

-			'/[http|https]+:\/\/(?:www\.|)vimeo\.com\/([a-zA-Z0-9_\-]+)(&.+)?/i',

-			'/[http|https]+:\/\/player\.vimeo\.com\/video\/([a-zA-Z0-9_\-]+)(&.+)?/i'

-		),

-		self::RUTUBE  => array(

-			'/[http|https]+:\/\/(?:www\.|)rutube\.ru\/video\/embed\/([a-zA-Z0-9_\-]+)/i',

-			'/[http|https]+:\/\/(?:www\.|)rutube\.ru\/tracks\/([a-zA-Z0-9_\-]+)(&.+)?/i'

-		)

-	);

-

-	/** Ссылка на RUtube без идентификатора в адресе */

-	protected $regexp_rutube_extra = '/[http|https]+:\/\/(?:www\.|)rutube\.ru\/video\/([a-zA-Z0-9_\-]+)\//i';

-

-	/** Варианты ссылок, которые поддерживаются */

-	protected static $test = array(

-		'http://youtube.com/watch?v=ShPq2Dmy6X8',

-		'http://www.youtube.com/watch?v=6dwqZw0j_jY&feature=youtu.be',

-		'http://www.youtube.com/watch?v=cKZDdG9FTKY&feature=channel',

-		'www.youtube.com/watch?v=yZ-K7nCVnBI&playnext_from=TL&videos=osPknwzXEas&feature=sub',

-		'http://www.youtube.com/embed/ShPq2Dmy6X8?rel=0',

-		'http://youtu.be/ShPq2Dmy6X8',

-		'youtu.be/6dwqZw0j_jY',

-		'http://www.youtu.be/afa-5HQHiAs',

-

-		'vimeo.com/55028438',

-		'http://player.vimeo.com/video/55028438?title=0&byline=0&portrait=0&badge=0&color=e1a931',

-

-		'http://rutube.ru/video/6fd81c1c212c002673280850a1c56415/#.UMQYln9yTWQ',

-		'http://rutube.ru/video/dec0a58c8cb4d226abc7b1030bbb63b9/?ref=top',

-		'rutube.ru/tracks/6032725.html',

-		'http://www.rutube.ru/video/embed/6032725',

-	);

-

-	protected $info = false;

-

-	/**

-	 * @param $link      ссылка на видео

-	 * @param $autostart сразу определить превью и клип

-	 */

-	public function __construct($link = null, $autostart = true, $info = false)

-	{

-		if ($link) {

-			$this->setLink($link);

-			$this->setInfo($info);

-			if ($autostart) {

-				$this->process();

-			}

-		}

-	}

-	public function getScheme(){

-		switch($this->scheme){

-			case 'http':

-				$out = 'http://';

-				break;

-			case 'https':

-				$out = 'https://';

-				break;

-			default:

-				$out = '//';

-			break;

-		}

-

-		return $out;

-	}

-	public function setInfo($info){

-		$this->info = (bool)$info;

-	}

-	public function getInfo(){

-		return $this->info;

-	}

-	/** Видеохостинг */

-	public function getHosting()

-	{

-		return $this->hosting;

-	}

-

-	/** Идентификатор видео */

-	public function getId()

-	{

-		return $this->id;

-	}

-

-	/** Ссылка на превью */

-	public function getImage()

-	{

-		return $this->getScheme().$this->image;

-	}

-

-	/** Ссылка на видео */

-	public function getVideo($autoplay = false)

-	{

-		$url = $this->video;

-		if($autoplay){

-			$url .= '&autoplay=1';

-		}

-

-		return $this->getScheme().$url;

-	}

-

-	/** Название видео */

-	public function getTitle()

-	{

-		return $this->title;

-	}

-

-	/** Задать ссылку на видео */

-	public function setLink($link)

-	{

-		$this->link = $link;

-

-		return $this;

-	}

-

-	/** Обработка ссылки. Возвращает идентификатор видеохостинга или false */

-	public function process($link = null, $info = null)

-	{

-		if(!empty($link)) $this->setLink($link);

-		if(!empty($info)) $this->setInfo($info);

-

-		if ($this->cleanLink()) {

-			if ($this->maybeYoutube()) {

-				return self::YOUTUBE;

-			}

-

-			if ($this->maybeVimeo()) {

-				return self::VIMEO;

-			}

-

-			if ($this->maybeRutube()) {

-				return self::RUTUBE;

-			}

-		}

-

-		return false;

-	}

-

-	/** Скачать превью. Если не указать имя файла для записи - функция вернет содержимое файла */

-	public function fetchImage($filename = null)

-	{

-		if (!$url = $this->getImage()) {

-			return false;

-		}

-

-		if (!$res = $this->fetchPage($url)) {

-			return false;

-		}

-

-		return $filename

-			? file_put_contents($filename, $res)

-			: $res;

-	}

-

-	/** Проверка и подготовка ссылки и частей */

-	protected function cleanLink()

-	{

-		if (!preg_match('/^(http|https)\:\/\//i', $this->link)) {

-			$this->link = 'http://' . $this->link;

-		}

-

-		if (!$this->link_parts = parse_url($this->link)) {

-			return false;

-		}

-

-		return true;

-	}

-

-	/** Проверка YOUTUBE */

-	protected function maybeYoutube()

-	{

-		$h = str_replace('www.', '', $this->link_parts['host']);

-		$p = isset($this->link_parts['path']) ? $this->link_parts['path'] : false;

-

-		if ('youtube.com' == $h) {

-			parse_str($this->link_parts['query'], $q);

-

-			if ('/watch' == $p && !empty($q['v'])) {

-				return $this->foundYoutube($q['v']);

-			}

-			if (0 === strpos($p, '/embed/')) {

-				return $this->foundYoutube(str_replace('/embed/', '', $p));

-			}

-		} elseif ('youtu.be' == $h) {

-			return $this->foundYoutube(trim($p, '/'));

-		}

-

-		return false;

-	}

-

-	/** Проверка VIMEO */

-	protected function maybeVimeo()

-	{

-		$h = str_replace('www.', '', $this->link_parts['host']);

-		$p = isset($this->link_parts['path']) ? $this->link_parts['path'] : false;

-

-		if ('vimeo.com' == $h) {

-			return $this->foundVimeo(trim($p, '/'));

-		} elseif ('player.vimeo.com' == $h && 0 === strpos($p, '/video/')) {

-			return $this->foundVimeo(str_replace('/video/', '', $p));

-		}

-

-		return false;

-	}

-

-	/** Проверка RUTUBE */

-	protected function maybeRutube($html = null)

-	{

-		$link = $html ?: $this->link;

-

-		foreach ($this->regexp[self::RUTUBE] as $regexp) {

-			if (preg_match($regexp, $link, $matches)) {

-				return $this->foundRutube($matches[1]);

-			}

-		}

-

-		// Проверка на особенную ссылку RUtube`a

-		if (is_null($html) && preg_match($this->regexp_rutube_extra, $this->link, $matches)) {

-			$html = $this->fetchPage($matches[0]);

-			if ($r = $this->maybeRutube($html)) {

-				return $r;

-			}

-		}

-

-		return false;

-	}

-

-	/** Обработка YOUTUBE */

-	protected function foundYoutube($id)

-	{

-		if (empty($id) || strlen($id) != 11) {

-			return false;

-		}

-

-		$this->hosting = self::YOUTUBE;

-		$this->id = $id;

-		$this->image = 'img.youtube.com/vi/' . $id . '/0.jpg';

-		/** @see https://developers.google.com/youtube/player_parameters */

-		$this->video = 'www.youtube.com/embed/' . $id.'?showinfo=0&modestbranding=1&rel=0';

-

-		if ($this->info) {

-			$this->getYoutubeInfo($id);

-		}

-		return true;

-	}

-

-	/** Обработка VIMEO */

-	protected function foundVimeo($id)

-	{

-		if (empty($id) || !is_numeric($id)) {

-			return false;

-		}

-

-		$this->hosting = self::VIMEO;

-		$this->id      = $id;

-		$this->video   = 'player.vimeo.com/video/' . $id.'?';

-

-		if($this->info) {

-			$this->getVimeoInfo($id);

-		}

-		return true;

-	}

-

-	/** Обработка RUTUBE */

-	protected function foundRutube($id)

-	{

-		$this->hosting = self::RUTUBE;

-		$this->id      = $id;

-		$this->video   = 'rutube.ru/video/embed/' . $id.'?';

-

-		if($this->info) {

-			$this->getRutubeInfo($id);

-		}

-		return true;

-	}

-

-	/** Парсинг XML от RUTUBE и определение превьюхи */

-	protected function getRutubeInfo($id)

-	{

-		if (@$xml = simplexml_load_file("http://rutube.ru/cgi-bin/xmlapi.cgi?rt_mode=movie&rt_movie_id=" . $id . "&utf=1")) {

-			$this->title = (string)$xml->title;

-			$this->image = (string)$xml->thumbnail_url;

-		}

-	}

-

-	/** Парсинг XML от VIMEO и определение превьюхи */

-	protected function getVimeoInfo($id)

-	{

-		if (@$xml = simplexml_load_file('http://vimeo.com/api/v2/video/' . $id . '.xml')) {

-			$this->title = (string)$xml->video->title;

-			$this->image = (string)$xml->video->thumbnail_large ? : $xml->video->thumbnail_medium;

-		}

-	}

-

-	/** Получение названия ролика */

-	protected function getYoutubeInfo($id)

-	{

-		if (@$xml = simplexml_load_file('http://gdata.youtube.com/feeds/api/videos/' . $id)) {

-			$this->title = (string)$xml->title;

-		}

-	}

-

-	/** Скачивание страницы с помощью CURL */

-	protected function fetchPage($url)

-	{

-		$ch = curl_init();

-		curl_setopt($ch, CURLOPT_URL, $url);

-		curl_setopt($ch, CURLOPT_FAILONERROR, true);

-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);

-		curl_setopt($ch, CURLOPT_TIMEOUT, 3);

-

-		return curl_exec($ch);

-	}

-

-	public function getEmbed($options){

-		$autoplay = isset($options["autoplay"]) ? $options["autoplay"] : $this->autoplay;

-		$width = isset($options["width"]) ? (int)$options["width"] : $this->width;

-		$height = isset($options["height"]) ? (int)$options["height"] : $this->height;

-		$class = isset($options['class']) ? $options['class'] : '';

-

-		$url = $this->getVideo($autoplay);

-		if(!empty($class)){

-			$class = ' class="'.$class.'"';

-		}

-		return '<iframe src="'.$url.'" width="'.$width.'" height="'.$height.'" frameborder="0" allowfullscreen'.$class.'></iframe>';

-	}

-	/** Прогоняем тест по видам URL */

-	public static function RunTest($links = null)

-	{

-		if (!is_array($links)) {

-			$links = static::$test;

-		}

-

-		foreach ($links as $link) {

-			$v = new static($link);

-			echo "<h1>$link</h1>\n"

-				. "<h3>" . $v->getHosting() . "</h3>"

-				. "<b>Видео:</b> " . $v->getVideo() . "<br />\n"

-				. "<b>Название:</b> " . $v->getTitle() . "<br />\n"

-				. "<b>Картинка:</b> " . $v->getImage() . "<hr />\n";

-		}

-	}

+    /** Ссылка на ролик */

+    protected $link;

+

+    /** Распарсенные части ссылки */

+    protected $link_parts;

+

+    /** Видеохостинг */

+    protected $hosting;

+

+    /** Идентификатор видео */

+    protected $id;

+

+    /** Картинка */

+    protected $image;

+

+    /** Название видео */

+    protected $title;

+

+    /** Видео */

+    protected $video;

+

+    protected $width = 420;

+    protected $height = 315;

+    protected $autoplay = false;

+

+    public $scheme = 'https';

+

+    const YOUTUBE = 'youtube';

+    const VIMEO   = 'vimeo';

+    const RUTUBE  = 'rutube';

+

+    /** Регулярки для определения видеохостинга и идентификатора ролика */

+    protected $regexp = array(

+        self::YOUTUBE => array( //Не используются

+            '/[http|https]+:\/\/(?:www\.|)youtube\.com\/watch\?(?:.*)?v=([a-zA-Z0-9_\-]+)/i',

+            '/[http|https]+:\/\/(?:www\.|)youtube\.com\/embed\/([a-zA-Z0-9_\-]+)/i',

+            '/[http|https]+:\/\/(?:www\.|)youtu\.be\/([a-zA-Z0-9_\-]+)/i'

+        ),

+        self::VIMEO   => array( //Не используются

+            '/[http|https]+:\/\/(?:www\.|)vimeo\.com\/([a-zA-Z0-9_\-]+)(&.+)?/i',

+            '/[http|https]+:\/\/player\.vimeo\.com\/video\/([a-zA-Z0-9_\-]+)(&.+)?/i'

+        ),

+        self::RUTUBE  => array(

+            '/[http|https]+:\/\/(?:www\.|)rutube\.ru\/video\/embed\/([a-zA-Z0-9_\-]+)/i',

+            '/[http|https]+:\/\/(?:www\.|)rutube\.ru\/tracks\/([a-zA-Z0-9_\-]+)(&.+)?/i'

+        )

+    );

+

+    /** Ссылка на RUtube без идентификатора в адресе */

+    protected $regexp_rutube_extra = '/[http|https]+:\/\/(?:www\.|)rutube\.ru\/video\/([a-zA-Z0-9_\-]+)\//i';

+

+    /** Варианты ссылок, которые поддерживаются */

+    protected static $test = array(

+        'http://youtube.com/watch?v=ShPq2Dmy6X8',

+        'http://www.youtube.com/watch?v=6dwqZw0j_jY&feature=youtu.be',

+        'http://www.youtube.com/watch?v=cKZDdG9FTKY&feature=channel',

+        'www.youtube.com/watch?v=yZ-K7nCVnBI&playnext_from=TL&videos=osPknwzXEas&feature=sub',

+        'http://www.youtube.com/embed/ShPq2Dmy6X8?rel=0',

+        'http://youtu.be/ShPq2Dmy6X8',

+        'youtu.be/6dwqZw0j_jY',

+        'http://www.youtu.be/afa-5HQHiAs',

+

+        'vimeo.com/55028438',

+        'http://player.vimeo.com/video/55028438?title=0&byline=0&portrait=0&badge=0&color=e1a931',

+

+        'http://rutube.ru/video/6fd81c1c212c002673280850a1c56415/#.UMQYln9yTWQ',

+        'http://rutube.ru/video/dec0a58c8cb4d226abc7b1030bbb63b9/?ref=top',

+        'rutube.ru/tracks/6032725.html',

+        'http://www.rutube.ru/video/embed/6032725',

+    );

+

+    protected $info = false;

+

+    /**

+     * @param $link      ссылка на видео

+     * @param $autostart сразу определить превью и клип

+     */

+    public function __construct($link = null, $autostart = true, $info = false)

+    {

+        if ($link) {

+            $this->setLink($link);

+            $this->setInfo($info);

+            if ($autostart) {

+                $this->process();

+            }

+        }

+    }

+    public function getScheme(){

+        switch($this->scheme){

+            case 'http':

+                $out = 'http://';

+                break;

+            case 'https':

+                $out = 'https://';

+                break;

+            default:

+                $out = '//';

+            break;

+        }

+

+        return $out;

+    }

+    public function setInfo($info){

+        $this->info = (bool)$info;

+    }

+    public function getInfo(){

+        return $this->info;

+    }

+    /** Видеохостинг */

+    public function getHosting()

+    {

+        return $this->hosting;

+    }

+

+    /** Идентификатор видео */

+    public function getId()

+    {

+        return $this->id;

+    }

+

+    /** Ссылка на превью */

+    public function getImage()

+    {

+        return $this->getScheme().$this->image;

+    }

+

+    /** Ссылка на видео */

+    public function getVideo($autoplay = false)

+    {

+        $url = $this->video;

+        if($autoplay){

+            $url .= '&autoplay=1';

+        }

+

+        return $this->getScheme().$url;

+    }

+

+    /** Название видео */

+    public function getTitle()

+    {

+        return $this->title;

+    }

+

+    /** Задать ссылку на видео */

+    public function setLink($link)

+    {

+        $this->link = $link;

+

+        return $this;

+    }

+

+    /** Обработка ссылки. Возвращает идентификатор видеохостинга или false */

+    public function process($link = null, $info = null)

+    {

+        if(!empty($link)) $this->setLink($link);

+        if(!empty($info)) $this->setInfo($info);

+

+        if ($this->cleanLink()) {

+            if ($this->maybeYoutube()) {

+                return self::YOUTUBE;

+            }

+

+            if ($this->maybeVimeo()) {

+                return self::VIMEO;

+            }

+

+            if ($this->maybeRutube()) {

+                return self::RUTUBE;

+            }

+        }

+

+        return false;

+    }

+

+    /** Скачать превью. Если не указать имя файла для записи - функция вернет содержимое файла */

+    public function fetchImage($filename = null)

+    {

+        if (!$url = $this->getImage()) {

+            return false;

+        }

+

+        if (!$res = $this->fetchPage($url)) {

+            return false;

+        }

+

+        return $filename

+            ? file_put_contents($filename, $res)

+            : $res;

+    }

+

+    /** Проверка и подготовка ссылки и частей */

+    protected function cleanLink()

+    {

+        if (!preg_match('/^(http|https)\:\/\//i', $this->link)) {

+            $this->link = 'http://' . $this->link;

+        }

+

+        if (!$this->link_parts = parse_url($this->link)) {

+            return false;

+        }

+

+        return true;

+    }

+

+    /** Проверка YOUTUBE */

+    protected function maybeYoutube()

+    {

+        $h = str_replace('www.', '', $this->link_parts['host']);

+        $p = isset($this->link_parts['path']) ? $this->link_parts['path'] : false;

+

+        if ('youtube.com' == $h) {

+            parse_str($this->link_parts['query'], $q);

+

+            if ('/watch' == $p && !empty($q['v'])) {

+                return $this->foundYoutube($q['v']);

+            }

+            if (0 === strpos($p, '/embed/')) {

+                return $this->foundYoutube(str_replace('/embed/', '', $p));

+            }

+        } elseif ('youtu.be' == $h) {

+            return $this->foundYoutube(trim($p, '/'));

+        }

+

+        return false;

+    }

+

+    /** Проверка VIMEO */

+    protected function maybeVimeo()

+    {

+        $h = str_replace('www.', '', $this->link_parts['host']);

+        $p = isset($this->link_parts['path']) ? $this->link_parts['path'] : false;

+

+        if ('vimeo.com' == $h) {

+            return $this->foundVimeo(trim($p, '/'));

+        } elseif ('player.vimeo.com' == $h && 0 === strpos($p, '/video/')) {

+            return $this->foundVimeo(str_replace('/video/', '', $p));

+        }

+

+        return false;

+    }

+

+    /** Проверка RUTUBE */

+    protected function maybeRutube($html = null)

+    {

+        $link = $html ?: $this->link;

+

+        foreach ($this->regexp[self::RUTUBE] as $regexp) {

+            if (preg_match($regexp, $link, $matches)) {

+                return $this->foundRutube($matches[1]);

+            }

+        }

+

+        // Проверка на особенную ссылку RUtube`a

+        if (is_null($html) && preg_match($this->regexp_rutube_extra, $this->link, $matches)) {

+            $html = $this->fetchPage($matches[0]);

+            if ($r = $this->maybeRutube($html)) {

+                return $r;

+            }

+        }

+

+        return false;

+    }

+

+    /** Обработка YOUTUBE */

+    protected function foundYoutube($id)

+    {

+        if (empty($id) || strlen($id) != 11) {

+            return false;

+        }

+

+        $this->hosting = self::YOUTUBE;

+        $this->id = $id;

+        $this->image = 'img.youtube.com/vi/' . $id . '/0.jpg';

+        /** @see https://developers.google.com/youtube/player_parameters */

+        $this->video = 'www.youtube.com/embed/' . $id.'?showinfo=0&modestbranding=1&rel=0';

+

+        if ($this->info) {

+            $this->getYoutubeInfo($id);

+        }

+        return true;

+    }

+

+    /** Обработка VIMEO */

+    protected function foundVimeo($id)

+    {

+        if (empty($id) || !is_numeric($id)) {

+            return false;

+        }

+

+        $this->hosting = self::VIMEO;

+        $this->id      = $id;

+        $this->video   = 'player.vimeo.com/video/' . $id.'?';

+

+        if($this->info) {

+            $this->getVimeoInfo($id);

+        }

+        return true;

+    }

+

+    /** Обработка RUTUBE */

+    protected function foundRutube($id)

+    {

+        $this->hosting = self::RUTUBE;

+        $this->id      = $id;

+        $this->video   = 'rutube.ru/video/embed/' . $id.'?';

+

+        if($this->info) {

+            $this->getRutubeInfo($id);

+        }

+        return true;

+    }

+

+    /** Парсинг XML от RUTUBE и определение превьюхи */

+    protected function getRutubeInfo($id)

+    {

+        if (@$xml = simplexml_load_file("http://rutube.ru/cgi-bin/xmlapi.cgi?rt_mode=movie&rt_movie_id=" . $id . "&utf=1")) {

+            $this->title = (string)$xml->title;

+            $this->image = (string)$xml->thumbnail_url;

+        }

+    }

+

+    /** Парсинг XML от VIMEO и определение превьюхи */

+    protected function getVimeoInfo($id)

+    {

+        if (@$xml = simplexml_load_file('http://vimeo.com/api/v2/video/' . $id . '.xml')) {

+            $this->title = (string)$xml->video->title;

+            $this->image = (string)$xml->video->thumbnail_large ? : $xml->video->thumbnail_medium;

+        }

+    }

+

+    /** Получение названия ролика */

+    protected function getYoutubeInfo($id)

+    {

+        if (@$xml = simplexml_load_file('http://gdata.youtube.com/feeds/api/videos/' . $id)) {

+            $this->title = (string)$xml->title;

+        }

+    }

+

+    /** Скачивание страницы с помощью CURL */

+    protected function fetchPage($url)

+    {

+        $ch = curl_init();

+        curl_setopt($ch, CURLOPT_URL, $url);

+        curl_setopt($ch, CURLOPT_FAILONERROR, true);

+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);

+        curl_setopt($ch, CURLOPT_TIMEOUT, 3);

+

+        return curl_exec($ch);

+    }

+

+    public function getEmbed($options){

+        $autoplay = isset($options["autoplay"]) ? $options["autoplay"] : $this->autoplay;

+        $width = isset($options["width"]) ? (int)$options["width"] : $this->width;

+        $height = isset($options["height"]) ? (int)$options["height"] : $this->height;

+        $class = isset($options['class']) ? $options['class'] : '';

+

+        $url = $this->getVideo($autoplay);

+        if(!empty($class)){

+            $class = ' class="'.$class.'"';

+        }

+        return '<iframe src="'.$url.'" width="'.$width.'" height="'.$height.'" frameborder="0" allowfullscreen'.$class.'></iframe>';

+    }

+    /** Прогоняем тест по видам URL */

+    public static function RunTest($links = null)

+    {

+        if (!is_array($links)) {

+            $links = static::$test;

+        }

+

+        foreach ($links as $link) {

+            $v = new static($link);

+            echo "<h1>$link</h1>\n"

+                . "<h3>" . $v->getHosting() . "</h3>"

+                . "<b>Видео:</b> " . $v->getVideo() . "<br />\n"

+                . "<b>Название:</b> " . $v->getTitle() . "<br />\n"

+                . "<b>Картинка:</b> " . $v->getImage() . "<hr />\n";

+        }

+    }

 }
\ No newline at end of file

assets/snippets/DLUsers/src/Actions.php

Indentation +401 added lines, -401 removed lines

@@ -12,9 +12,9 @@ 
 class Actions{

     protected $modx = null;

     public $userObj = null;

-	/**

-	 * @var DLCollection

-	 */

+    /**

+     * @var DLCollection

+     */

     public $url;

     protected static $lang = null;

     protected static $langDic = array();

@@ -23,7 +23,7 @@ 
      */

     protected static $instance;

 

-	protected $config = array();

+    protected $config = array();

 

     /**

      * gets the instance via lazy initialization (created on first usage)

@@ -50,15 +50,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');

     }

 

     /**

@@ -85,48 +85,48 @@ 
      * Сброс авторизации и обновление страницы

      */

     public function logout($params){

-    	$LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');

-    	if(is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])){

-    		$type = 'web';

-    		$userID = $this->UserID(compact('type'));

-    		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])){

+            $type = 'web';

+            $userID = $this->UserID(compact('type'));

+            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;

     }

 

     /**

@@ -134,14 +134,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;

     }

 

     /**

@@ -150,348 +150,348 @@ 
      *   	В противном случае вся работа происходит внутри самого блока

      */

     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');

-

-    	$type = 'web';

-		if($this->UserID(compact('type'))){

-			$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');

+

+        $type = 'web';

+        if($this->UserID(compact('type'))){

+            $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($uri['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

-		));

-	}

-	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 = '';

-		$type = 'web';

-		$userID = APIHelpers::getkey($params, 'id', 0);

-		if(empty($userID)){

-			$userID = $this->UserID(compact('type'));

-		}

-		$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){

-		$type = 'web';

-		if(!$this->UserID(compact('type'))){

-			/**

-			 * @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){

-		$type = 'web';

-		$userID = $this->UserID(compact('type'));

-		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;

-	}

-	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;

-	}

-	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]));

-	}

-	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;

-	}

+    /**

+     * Авторизация на сайте со страницы авторизации

+     * [!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($uri['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

+        ));

+    }

+    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 = '';

+        $type = 'web';

+        $userID = APIHelpers::getkey($params, 'id', 0);

+        if(empty($userID)){

+            $userID = $this->UserID(compact('type'));

+        }

+        $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){

+        $type = 'web';

+        if(!$this->UserID(compact('type'))){

+            /**

+             * @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){

+        $type = 'web';

+        $userID = $this->UserID(compact('type'));

+        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;

+    }

+    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;

+    }

+    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]));

+    }

+    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;

+    }

 }
\ No newline at end of file

Spacing +96 added lines, -96 removed lines

@@ -9,7 +9,7 @@ 
 use APIHelpers, DocumentParser, DLCollection, DLTemplate;

 use Helpers\FS;

 

-class Actions{

+class Actions {

     protected $modx = null;

     public $userObj = null;

 	/**

@@ -84,21 +84,21 @@ 
     /**

      * Сброс авторизации и обновление страницы

      */

-    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])) {

     		$type = 'web';

     		$userID = $this->UserID(compact('type'));

-    		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')

@@ -106,22 +106,22 @@ 
 		    	}

 

 			    $go = APIHelpers::getkey($params, 'url', '');

-			    if(empty($go)){

+			    if (empty($go)) {

 			    	$go = str_replace(

-			    		array("?".$LogoutName, "&".$LogoutName),

+			    		array("?" . $LogoutName, "&" . $LogoutName),

 			    		array("", ""),

 			    		$_SERVER['REQUEST_URI']

 			    	);

 			    }

 

 			    $start = $this->makeUrl($this->config['site_start']);

-			    if($start == $go){

+			    if ($start == $go) {

 			        $go = $this->config['site_url'];

-			    }else{

-			        $go = $this->config['site_url'].ltrim($go, '/');

+			    } else {

+			        $go = $this->config['site_url'] . ltrim($go, '/');

 			    }

 			    $this->moveTo(array('url' => $go));

-    		}else{

+    		} else {

     			//Если юзер не авторизован, то показываем ему 404 ошибку

     			$this->modx->sendErrorPage();

     		}

@@ -133,15 +133,15 @@ 
      * Генерация ссылки под кнопку выход

      * @return string

      */

-    public function logoutUrl($params){

+    public function logoutUrl($params) {

     	$LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');

     	$request = parse_url($_SERVER['REQUEST_URI']);

 

     	//Во избежании XSS мы не сохраняем весь REQUEST_URI, а берем только path

     	/*$query = (!empty($request['query'])) ? $request['query'].'&' : '';*/

-    	$query = '?'.$LogoutName;

+    	$query = '?' . $LogoutName;

 

-    	return $request['path'].$query;

+    	return $request['path'] . $query;

     }

 

     /**

@@ -149,7 +149,7 @@ 
      * 		если указан параметр authId, то данные из формы перекидываются в метод AuthPage

      *   	В противном случае вся работа происходит внутри самого блока

      */

-    public function AuthBlock($params){

+    public function AuthBlock($params) {

     	$POST = array('backUrl' => $_SERVER['REQUEST_URI']);

 

     	$error = $errorCode = '';

@@ -159,20 +159,20 @@ 
 		$rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');

 

     	$type = 'web';

-		if($this->UserID(compact('type'))){

+		if ($this->UserID(compact('type'))) {

 			$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);

@@ -186,9 +186,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);

@@ -198,7 +198,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));

 

@@ -210,58 +210,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){

-				$query = !empty($request['query']) ? '?'.$request['query'] : '';

-			    $refer = !empty($request['path']) ? $request['path'].$query : '';

-			}else{

+			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'){

+		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){

-				$query = !empty($uri['query']) ? '?'.$backUrl['query'] : '';

-			    $POST['backUrl'] = !empty($backUrl['path']) ? $backUrl['path'].$query : '';

-			}else{

+			if (empty($backUrl['host']) || $backUrl['host'] == $selfHost) {

+				$query = !empty($uri['query']) ? '?' . $backUrl['query'] : '';

+			    $POST['backUrl'] = !empty($backUrl['path']) ? $backUrl['path'] . $query : '';

+			} else {

 				$POST['backUrl'] = '';

 			}

 		}

-		if(!empty($POST['backUrl'])){

+		if (!empty($POST['backUrl'])) {

 			$idURL = $this->moveTo(array(

-				'url' => '/'.ltrim($POST['backUrl'], '/'),

+				'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);

@@ -277,18 +277,18 @@ 
 			'errorCode' => $errorCode

 		));

 	}

-	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(

@@ -297,7 +297,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'),

@@ -305,11 +305,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);

@@ -322,21 +322,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);

@@ -347,17 +347,17 @@ 
 	 * Информация о пользователе

 	 * [!DLUsers? &action=`UserInfo` &field=`fullname` &id=`2`!]

 	 */

-	public function UserInfo($params){

+	public function UserInfo($params) {

 		$out = '';

 		$type = 'web';

 		$userID = APIHelpers::getkey($params, 'id', 0);

-		if(empty($userID)){

+		if (empty($userID)) {

 			$userID = $this->UserID(compact('type'));

 		}

 		$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;

@@ -371,16 +371,16 @@ 
 	/**

 	 * ID пользователя

 	 */

-	public function UserID(){

+	public function UserID() {

 		$type = 'web';

 		return $this->modx->getLoginUserID($type);

 	}

 	/**

 	 * Если не авторизован - то отправить на страницу

 	 */

-	public function isGuestGoHome($params){

+	public function isGuestGoHome($params) {

 		$type = 'web';

-		if(!$this->UserID(compact('type'))){

+		if (!$this->UserID(compact('type'))) {

 			/**

 			 * @see : http://modx.im/blog/triks/105.html

 			 */

@@ -394,12 +394,12 @@ 
 	/**

 	 * Если авторизован - то открыть личный кабинет

 	 */

-	public function isAuthGoHome($params){

+	public function isAuthGoHome($params) {

 		$type = 'web';

 		$userID = $this->UserID(compact('type'));

-		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'));

@@ -410,29 +410,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!=''){

-		    $uri .= "?".$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;

 	}

@@ -443,52 +443,52 @@ 
 	 * @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);

 		}

 		return $url;

 	}

-	protected function getTemplate($name){

+	protected function getTemplate($name) {

 		$out = '';

-		$file = dirname(dirname(__FILE__)).'/tpl/'.$name.'.html';

-		if( FS::getInstance()->checkFile($file)){

-			$out = '@CODE: '.file_get_contents($file);

+		$file = dirname(dirname(__FILE__)) . '/tpl/' . $name . '.html';

+		if (FS::getInstance()->checkFile($file)) {

+			$out = '@CODE: ' . file_get_contents($file);

 		}

 		return $out;

 	}

-	protected static function loadLang($lang){

-		$file = dirname(dirname(__FILE__)).'/lang/'.$lang.'.php';

-		if( ! FS::getInstance()->checkFile($file)){

+	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)){

+		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();

 			}

 		}

 		return !(empty($lang) || empty(static::$langDic[$lang]));

 	}

-	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])){

-			$out = $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'])){

-			$msg = self::$instance->modx->runSnippet('lang', array('a' => 'DLUsers.'.$key));

-			if(!empty($msg)){

+		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;

 			}

 		}

assets/snippets/DocLister/core/controller/onetable.php

Indentation +33 added lines, -33 removed lines

@@ -25,9 +25,9 @@ 
      * @absctract

      */

 

-	public function getUrl($id = 0)

+    public function getUrl($id = 0)

     {

-		$id = ((int)$id > 0) ? (int)$id : $this->getCurrentMODXPageID();

+        $id = ((int)$id > 0) ? (int)$id : $this->getCurrentMODXPageID();

 		

         $link = $this->checkExtender('request') ? $this->extender['request']->getLink() : $this->getRequest();

         if($id == $this->modx->config['site_start']){

@@ -84,7 +84,7 @@ 
                  * @var $extPrepare prepare_DL_Extender

                  */

                 $extPrepare = $this->getExtender('prepare');

-				$this->skippedDocs = 0;

+                $this->skippedDocs = 0;

                 foreach ($this->_docs as $item) {

                     $this->renderTPL = $tpl;

                     if ($extUser) {

@@ -103,7 +103,7 @@ 
                     }

 

                     $findTpl = $this->renderTPL;

-					$tmp = $this->uniformPrepare($item, $i);

+                    $tmp = $this->uniformPrepare($item, $i);

                     extract($tmp, EXTR_SKIP);

                     if ($this->renderTPL == '') {

                         $this->renderTPL = $findTpl;

@@ -115,7 +115,7 @@ 
                             'nameParam' => 'prepare'

                         ));

                         if (is_bool($item) && $item === false) {

-							$this->skippedDocs++;

+                            $this->skippedDocs++;

                             continue;

                         }

                     }

@@ -147,13 +147,13 @@ 
         $extSummary = $this->getExtender('summary');

 

         /**

-        * @var $extPrepare prepare_DL_Extender

-        */

+         * @var $extPrepare prepare_DL_Extender

+         */

         $extPrepare = $this->getExtender('prepare');

 

         /**

-        * @var $extE e_DL_Extender

-        */

+         * @var $extE e_DL_Extender

+         */

         $extE = $this->getExtender('e', true, true);

 

         foreach ($data as $num => $item) {

@@ -166,7 +166,7 @@ 
                 case ((array('1') == $fields || in_array('date', $fields)) && $date != 'date'):

                     $tmp = (isset($this->_docs[$num][$date]) && $date != 'createdon' && $this->_docs[$num][$date] != 0 && $this->_docs[$num][$date] == (int)$this->_docs[$num][$date]) ? $this->_docs[$num][$date] : $this->_docs[$num]['createdon'];

                     $row['date'] = strftime($this->getCFGDef('dateFormat', '%d.%b.%y %H:%M'), $tmp + $this->modx->config['server_offset_time']);

-					// no break

+                    // no break

             }

 

             if($extE && $tmp = $extE->init($this, array('data' => $row))){

@@ -233,17 +233,17 @@ 
         if ($sanitarInIDs != "''") {

             $tmpWhere = "(`{$this->getParentField()}` IN (" . $sanitarInIDs . ")";

             switch($this->getCFGDef('showParent', '0')){

-				case -1:

-					$tmpWhere .= ")";

-					break;

-				case 0:

-					$tmpWhere .= " AND `{$this->getPK()}` NOT IN(" . $sanitarInIDs . "))";

-					break;

-				case 1:

-				default:

-					$tmpWhere .= " OR `{$this->getPK()}` IN({$sanitarInIDs}))";

-					break;

-			}

+                case -1:

+                    $tmpWhere .= ")";

+                    break;

+                case 0:

+                    $tmpWhere .= " AND `{$this->getPK()}` NOT IN(" . $sanitarInIDs . "))";

+                    break;

+                case 1:

+                default:

+                    $tmpWhere .= " OR `{$this->getPK()}` IN({$sanitarInIDs}))";

+                    break;

+            }

         }

         if (($addDocs = $this->getCFGDef('documents', '')) != '') {

             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));

@@ -293,18 +293,18 @@ 
                 if ($sanitarInIDs != "''") {

                     switch ($this->getCFGDef('idType', 'parents')) {

                         case 'parents':

-							switch($this->getCFGDef('showParent', '0')){

-								case '-1':

-									$tmpWhere = "`{$this->getParentField()}` IN ({$sanitarInIDs})";

-									break;

-								case 0:

-									$tmpWhere = "`{$this->getParentField()}` IN ({$sanitarInIDs}) AND `{$this->getPK()}` NOT IN({$sanitarInIDs})";

-									break;

-								case 1:

-								default:

-									$tmpWhere = "(`{$this->getParentField()}` IN ({$sanitarInIDs}) OR `{$this->getPK()}` IN({$sanitarInIDs}))";

-									break;

-							}

+                            switch($this->getCFGDef('showParent', '0')){

+                                case '-1':

+                                    $tmpWhere = "`{$this->getParentField()}` IN ({$sanitarInIDs})";

+                                    break;

+                                case 0:

+                                    $tmpWhere = "`{$this->getParentField()}` IN ({$sanitarInIDs}) AND `{$this->getPK()}` NOT IN({$sanitarInIDs})";

+                                    break;

+                                case 1:

+                                default:

+                                    $tmpWhere = "(`{$this->getParentField()}` IN ({$sanitarInIDs}) OR `{$this->getPK()}` IN({$sanitarInIDs}))";

+                                    break;

+                            }

                             if (($addDocs = $this->getCFGDef('documents', '')) != '') {

                                 $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));

                                 $where[] = "((" . $tmpWhere . ") OR `{$this->getPK()}` IN({$addDocs}))";

assets/snippets/DocLister/core/controller/site_content.php

Indentation +32 added lines, -32 removed lines

@@ -136,7 +136,7 @@ 
                     $comments = $extJotCount->countComments(array_keys($this->_docs));

                 }

 

-				$this->skippedDocs = 0;

+                $this->skippedDocs = 0;

                 foreach ($this->_docs as $item) {

                     $this->renderTPL = $tpl;

                     if ($extUser) {

@@ -170,7 +170,7 @@ 
 

                     $findTpl = $this->renderTPL;

                     $tmp = $this->uniformPrepare($item, $i);

-					extract($tmp, EXTR_SKIP);

+                    extract($tmp, EXTR_SKIP);

                     if ($this->renderTPL == '') {

                         $this->renderTPL = $findTpl;

                     }

@@ -181,7 +181,7 @@ 
                             'nameParam' => 'prepare'

                         ));

                         if (is_bool($item) && $item === false) {

-							$this->skippedDocs++;

+                            $this->skippedDocs++;

                             continue;

                         }

                     }

@@ -217,13 +217,13 @@ 
         $extSummary = $this->getExtender('summary');

 

         /**

-        * @var $extPrepare prepare_DL_Extender

-        */

+         * @var $extPrepare prepare_DL_Extender

+         */

         $extPrepare = $this->getExtender('prepare');

 

         /**

-        * @var $extE e_DL_Extender

-        */

+         * @var $extE e_DL_Extender

+         */

         $extE = $this->getExtender('e', true, true);

 

         foreach ($data as $num => $item) {

@@ -231,11 +231,11 @@ 
             switch (true) {

                 case ((array('1') == $fields || in_array('summary', $fields)) && $extSummary):

                     $row['summary'] = $this->getSummary($this->_docs[$num], $extSummary, 'introtext', 'content');

-					// no break

+                    // no break

                 case (array('1') == $fields || in_array('date', $fields)):

                     $tmp = (isset($this->_docs[$num][$date]) && $date != 'createdon' && $this->_docs[$num][$date] != 0 && $this->_docs[$num][$date] == (int)$this->_docs[$num][$date]) ? $this->_docs[$num][$date] : $this->_docs[$num]['createdon'];

                     $row['date'] = strftime($this->getCFGDef('dateFormat', '%d.%b.%y %H:%M'), $tmp + $this->modx->config['server_offset_time']);

-					// no break

+                    // no break

                 case (array('1') == $fields || in_array(array('menutitle', 'pagetitle'), $fields)):

                     $row['title'] = ($row['menutitle'] == '' ? $row['pagetitle'] : $row['menutitle']);

                 case ((array('1') == $fields || in_array(array('content', 'type'), $fields)) && $this->getCFGDef('makeUrl', 1)):

@@ -292,18 +292,18 @@ 
             if ($sanitarInIDs != "''") {

                 switch ($this->getCFGDef('idType', 'parents')) {

                     case 'parents':

-						switch($this->getCFGDef('showParent', '0')){

-							case '-1':

-								$tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";

-								break;

-							case 0:

-								$tmpWhere = "c.parent IN ({$sanitarInIDs}) AND c.id NOT IN({$sanitarInIDs})";

-								break;

-							case 1:

-							default:

-								$tmpWhere = "(c.parent IN ({$sanitarInIDs}) OR c.id IN({$sanitarInIDs}))";

-								break;

-						}

+                        switch($this->getCFGDef('showParent', '0')){

+                            case '-1':

+                                $tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";

+                                break;

+                            case 0:

+                                $tmpWhere = "c.parent IN ({$sanitarInIDs}) AND c.id NOT IN({$sanitarInIDs})";

+                                break;

+                            case 1:

+                            default:

+                                $tmpWhere = "(c.parent IN ({$sanitarInIDs}) OR c.id IN({$sanitarInIDs}))";

+                                break;

+                        }

                         if (($addDocs = $this->getCFGDef('documents', '')) != '') {

                             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));

                             $whereArr[] = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";

@@ -459,17 +459,17 @@ 
         $tmpWhere = null;

         if ($sanitarInIDs != "''") {

             switch($this->getCFGDef('showParent', '0')){

-				case '-1':

-					$tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";

-					break;

-				case 0:

-					$tmpWhere = "c.parent IN (" . $sanitarInIDs . ") AND c.id NOT IN(" . $sanitarInIDs . ")";

-					break;

-				case 1:

-				default:

-					$tmpWhere = "(c.parent IN (" . $sanitarInIDs . ") OR c.id IN({$sanitarInIDs}))";

-					break;

-			}

+                case '-1':

+                    $tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";

+                    break;

+                case 0:

+                    $tmpWhere = "c.parent IN (" . $sanitarInIDs . ") AND c.id NOT IN(" . $sanitarInIDs . ")";

+                    break;

+                case 1:

+                default:

+                    $tmpWhere = "(c.parent IN (" . $sanitarInIDs . ") OR c.id IN({$sanitarInIDs}))";

+                    break;

+            }

         }

         if (($addDocs = $this->getCFGDef('documents', '')) != '') {

             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));

assets/snippets/DocLister/core/controller/shopkeeper.php

Indentation +88 added lines, -88 removed lines

@@ -71,7 +71,7 @@ 
                  */

                 $extPrepare = $this->getExtender('prepare');

 

-				/**

+                /**

                  * @var $extJotCount jotcount_DL_Extender

                  */

                 $extJotCount = $this->getCFGdef('jotcount', 0) ? $this->getExtender('jotcount', true) : NULL;

@@ -80,41 +80,41 @@ 
                     $comments = $extJotCount->countComments(array_keys($this->_docs));

                 }

 

-				$this->skippedDocs = 0;

+                $this->skippedDocs = 0;

                 foreach ($this->_docs as $item) {

-					$this->renderTPL = $tpl;

+                    $this->renderTPL = $tpl;

                     if ($extUser) {

                         $item = $extUser->setUserData($item); //[+user.id.createdby+], [+user.fullname.publishedby+], [+dl.user.publishedby+]....

                     }

 

                     $item['summary'] = $extSummary ? $this->getSummary($item, $extSummary, '', 'content') : '';

 

-					if ($extJotCount) {

+                    if ($extJotCount) {

                         $item['jotcount'] = APIHelpers::getkey($comments, $item['id'], 0);

                     }

 

                     $item = array_merge($item, $sysPlh); //inside the chunks available all placeholders set via $modx->toPlaceholders with prefix id, and with prefix sysKey

-					$item['iteration'] = $i; //[+iteration+] - Number element. Starting from zero

+                    $item['iteration'] = $i; //[+iteration+] - Number element. Starting from zero

 

                     if($this->getCFGDef('makeUrl', 1)){

-						if($item['type'] == 'reference'){

-							$item['url'] = is_numeric($item['content']) ? $this->modx->makeUrl($item['content'], '', '', $this->getCFGDef('urlScheme', '')) : $item['content'];

-						}else{

-							$item['url'] = $this->modx->makeUrl($item['id'], '', '', $this->getCFGDef('urlScheme', ''));

-						}

-					}

+                        if($item['type'] == 'reference'){

+                            $item['url'] = is_numeric($item['content']) ? $this->modx->makeUrl($item['content'], '', '', $this->getCFGDef('urlScheme', '')) : $item['content'];

+                        }else{

+                            $item['url'] = $this->modx->makeUrl($item['id'], '', '', $this->getCFGDef('urlScheme', ''));

+                        }

+                    }

 

                     $item['date'] = $item['createdon'] + $this->modx->config['server_offset_time'];

                     if ($this->getCFGDef('dateFormat', '%d.%b.%y %H:%M') != '') {

                         $item['date'] = strftime($this->getCFGDef('dateFormat', '%d.%b.%y %H:%M'), $item['date']);

                     }

 

-					$findTpl = $this->renderTPL;

-					$tmp = $this->uniformPrepare($item, $i);

-					extract($tmp, EXTR_SKIP);

-					if ($this->renderTPL == '') {

-						$this->renderTPL = $findTpl;

-					}

+                    $findTpl = $this->renderTPL;

+                    $tmp = $this->uniformPrepare($item, $i);

+                    extract($tmp, EXTR_SKIP);

+                    if ($this->renderTPL == '') {

+                        $this->renderTPL = $findTpl;

+                    }

 

                     if ($extPrepare) {

                         $item = $extPrepare->init($this, array(

@@ -122,7 +122,7 @@ 
                             'nameParam' => 'prepare'

                         ));

                         if (is_bool($item) && $item === false) {

-							$this->skippedDocs++;

+                            $this->skippedDocs++;

                             continue;

                         }

                     }

@@ -175,18 +175,18 @@ 
             if ($sanitarInIDs != "''") {

                 switch ($this->getCFGDef('idType', 'parents')) {

                     case 'parents':

-						switch($this->getCFGDef('showParent', '0')){

-							case '-1':

-								$tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";

-								break;

-							case 0:

-								$tmpWhere = "c.parent IN ({$sanitarInIDs}) AND c.id NOT IN({$sanitarInIDs})";

-								break;

-							case 1:

-							default:

-								$tmpWhere = "(c.parent IN ({$sanitarInIDs}) OR c.id IN({$sanitarInIDs}))";

-								break;

-						}

+                        switch($this->getCFGDef('showParent', '0')){

+                            case '-1':

+                                $tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";

+                                break;

+                            case 0:

+                                $tmpWhere = "c.parent IN ({$sanitarInIDs}) AND c.id NOT IN({$sanitarInIDs})";

+                                break;

+                            case 1:

+                            default:

+                                $tmpWhere = "(c.parent IN ({$sanitarInIDs}) OR c.id IN({$sanitarInIDs}))";

+                                break;

+                        }

                         if (($addDocs = $this->getCFGDef('documents', '')) != '') {

                             $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));

                             $whereArr[] = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";

@@ -301,19 +301,19 @@ 
 

     protected function getChildrenList()

     {

-		$where = array();

-		$out = array();

+        $where = array();

+        $out = array();

 		

-		$tmpWhere = $this->getCFGDef('addWhereList', '');

-		$tmpWhere = sqlHelper::trimLogicalOp($tmpWhere);

-		if (!empty($tmpWhere)) {

-			$where[] = $tmpWhere;

-		}

+        $tmpWhere = $this->getCFGDef('addWhereList', '');

+        $tmpWhere = sqlHelper::trimLogicalOp($tmpWhere);

+        if (!empty($tmpWhere)) {

+            $where[] = $tmpWhere;

+        }

 

-		$tmpWhere = sqlHelper::trimLogicalOp($this->_filters['where']);

-		if (!empty($tmpWhere)) {

-			$where[] = $tmpWhere;

-		}

+        $tmpWhere = sqlHelper::trimLogicalOp($this->_filters['where']);

+        if (!empty($tmpWhere)) {

+            $where[] = $tmpWhere;

+        }

 

         $tbl_site_content = $this->getTable('catalog', 'c');

 

@@ -323,53 +323,53 @@ 
 

         $tmpWhere = null;

 

-		if ($sanitarInIDs != "''") {

-			switch($this->getCFGDef('showParent', '0')){

-				case '-1':

-					$tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";

-					break;

-				case 0:

-					$tmpWhere = "c.parent IN (" . $sanitarInIDs . ") AND c.id NOT IN(" . $sanitarInIDs . ")";

-					break;

-				case 1:

-				default:

-					$tmpWhere = "(c.parent IN (" . $sanitarInIDs . ") OR c.id IN({$sanitarInIDs}))";

-					break;

-			}

-		}

-		if (($addDocs = $this->getCFGDef('documents', '')) != '') {

-			$addDocs = $this->sanitarIn($this->cleanIDs($addDocs));

-			if(empty($tmpWhere)){

-				$tmpWhere = "c.id IN({$addDocs})";

-			}else{

-				$tmpWhere = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";

-			}

-		}

-		if (!empty($tmpWhere)) {

-			$where[] = $tmpWhere;

-		}

-		if (!$this->getCFGDef('showNoPublish', 0)) {

-			$where[] = "c.published=1";

-		}

-		if (!empty($where)) {

-			$where = "WHERE " . implode(" AND ", $where);

-		} else {

-			$where = '';

-		}

+        if ($sanitarInIDs != "''") {

+            switch($this->getCFGDef('showParent', '0')){

+                case '-1':

+                    $tmpWhere = "c.parent IN (" . $sanitarInIDs . ")";

+                    break;

+                case 0:

+                    $tmpWhere = "c.parent IN (" . $sanitarInIDs . ") AND c.id NOT IN(" . $sanitarInIDs . ")";

+                    break;

+                case 1:

+                default:

+                    $tmpWhere = "(c.parent IN (" . $sanitarInIDs . ") OR c.id IN({$sanitarInIDs}))";

+                    break;

+            }

+        }

+        if (($addDocs = $this->getCFGDef('documents', '')) != '') {

+            $addDocs = $this->sanitarIn($this->cleanIDs($addDocs));

+            if(empty($tmpWhere)){

+                $tmpWhere = "c.id IN({$addDocs})";

+            }else{

+                $tmpWhere = "((" . $tmpWhere . ") OR c.id IN({$addDocs}))";

+            }

+        }

+        if (!empty($tmpWhere)) {

+            $where[] = $tmpWhere;

+        }

+        if (!$this->getCFGDef('showNoPublish', 0)) {

+            $where[] = "c.published=1";

+        }

+        if (!empty($where)) {

+            $where = "WHERE " . implode(" AND ", $where);

+        } else {

+            $where = '';

+        }

         $fields = $this->getCFGDef('selectFields', 'c.*');

-		$group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));

-		if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {

-			$sql = $this->dbQuery("SELECT {$fields} FROM " . $from . " " . $where . " " .

-				$group . " ".

-				$sort . " " .

-				$this->LimitSQL($this->getCFGDef('queryLimit', 0))

-			);

-

-			$rows = $this->modx->db->makeArray($sql);

-			foreach ($rows as $item) {

-				$out[$item['id']] = $item;

-			}

-		}

-		return $out;

+        $group = $this->getGroupSQL($this->getCFGDef('groupBy', 'c.id'));

+        if ($sanitarInIDs != "''" || $this->getCFGDef('ignoreEmpty', '0')) {

+            $sql = $this->dbQuery("SELECT {$fields} FROM " . $from . " " . $where . " " .

+                $group . " ".

+                $sort . " " .

+                $this->LimitSQL($this->getCFGDef('queryLimit', 0))

+            );

+

+            $rows = $this->modx->db->makeArray($sql);

+            foreach ($rows as $item) {

+                $out[$item['id']] = $item;

+            }

+        }

+        return $out;

     }

 }
\ No newline at end of file

assets/snippets/DocLister/lib/DLTemplate.class.php

Braces +16 added lines, -6 removed lines

@@ -99,7 +99,9 @@ 
                     }

                     break;

                 case '@CHUNK':

-                    if ($subTmp != '') $tpl = $this->modx->getChunk($subTmp);

+                    if ($subTmp != '') {

+                        $tpl = $this->modx->getChunk($subTmp);

+                    }

                     break;

                 case '@INLINE':

                 case '@TPL':

@@ -120,15 +122,21 @@ 
                     break;

                 case '@PLH':

                 case '@PLACEHOLDER':

-                    if ($subTmp != '') $tpl = $this->modx->getPlaceholder($subTmp);

+                    if ($subTmp != '') {

+                        $tpl = $this->modx->getPlaceholder($subTmp);

+                    }

                     break;

                 case '@CFG':

                 case '@CONFIG':

                 case '@OPTIONS':

-                    if ($subTmp != '') $tpl = $this->modx->getConfig($subTmp);

+                    if ($subTmp != '') {

+                        $tpl = $this->modx->getConfig($subTmp);

+                    }

                     break;

                 case '@SNIPPET':

-                    if ($subTmp != '') $tpl = $this->modx->runSnippet($subTmp, $this->modx->event->params);

+                    if ($subTmp != '') {

+                        $tpl = $this->modx->runSnippet($subTmp, $this->modx->event->params);

+                    }

                     break;

                 case '@RENDERPAGE':

                     $tpl = $this->renderDoc($subTmp, false);

@@ -166,7 +174,9 @@ 
     *       - оригинальный экземпляр класса DocumentParser

     */

     public function renderDoc($id, $events = false, $tpl = null){

-        if((int)$id <= 0) return '';

+        if((int)$id <= 0) {

+            return '';

+        }

 

         $m = clone $this->modx; //Чтобы была возможность вызывать события

         $m->documentObject = $m->getDocumentObject('id', (int)$id , $events ? 'prepareResponse' : null);

@@ -313,7 +323,7 @@ 
             }

             if($i <= $minPasses || $out != $html){

                 $out = $modx->parseDocumentSource($out);

-            }else{

+            } else{

                 break;

             }

         }