AgelxNash / DocLister

assets/lib/Helpers/Collection.php

Doc Comments +1 added lines, -1 removed lines

@@ -212,7 +212,7 @@
     /**
      * Reduce the collection to a single value.
      *
-     * @param  callable  $callback
+     * @param  Closure  $callback
      * @param  mixed     $initial
      * @return mixed
      */

Spacing +17 added lines, -17 removed lines

@@ -9,10 +9,10 @@ 
 class Collection implements \Countable, \IteratorAggregate, \ArrayAccess{
     protected $data = array();
 
-    public function __construct(array $data = array()){
+    public function __construct(array $data = array()) {
         $this->data = $data;
     }
-    public function create(array $data = array()){
+    public function create(array $data = array()) {
         return new static($data);
     }
     public function getIterator()
@@ -38,7 +38,7 @@ 
     public function forAll(Closure $p)
     {
         foreach ($this->data as $key => $element) {
-            if ( ! $p($key, $element)) {
+            if (!$p($key, $element)) {
                 return false;
             }
         }
@@ -64,7 +64,7 @@ 
     {
         return empty($this->data);
     }
-    public function clear(){
+    public function clear() {
         $this->data = array();
         return $this;
     }
@@ -72,20 +72,20 @@ 
         $this->data[] = $value;
         return $this;
     }
-    public function add($data, $id = null){
-        if((is_int($id) || is_string($id)) && $id !== ''){
+    public function add($data, $id = null) {
+        if ((is_int($id) || is_string($id)) && $id !== '') {
             $this->data[$id] = $data;
-        }else{
+        } else {
             $this->append($data);
         }
         return $this;
     }
-    public function count(){
+    public function count() {
         return count($this->data);
     }
-    public function get($id){
+    public function get($id) {
         $out = null;
-        if(is_scalar($id) && $id!=='' && $this->containsKey($id)){
+        if (is_scalar($id) && $id !== '' && $this->containsKey($id)) {
             $out = $this->data[$id];
         }
         return $out;
@@ -108,7 +108,7 @@ 
     {
         return key($this->data);
     }
-    public function prev(){
+    public function prev() {
         return prev($this->data);
     }
 
@@ -124,7 +124,7 @@ 
 
     public function remove($key)
     {
-        if ( ! isset($this->data[$key]) && ! array_key_exists($key, $this->data)) {
+        if (!isset($this->data[$key]) && !array_key_exists($key, $this->data)) {
             return null;
         }
         $removed = $this->data[$key];
@@ -146,10 +146,10 @@ 
     {
         return $this->containsKey($offset);
     }
-    public function dump(){
+    public function dump() {
         return var_dump($this->data);
     }
-    public function show(){
+    public function show() {
         print_r($this->data);
     }
 
@@ -160,7 +160,7 @@ 
 
     public function offsetSet($offset, $value)
     {
-        if ( ! isset($offset)) {
+        if (!isset($offset)) {
             return $this->add($value);
         }
         $this->set($offset, $value);
@@ -205,7 +205,7 @@ 
         return array_values($this->data);
     }
 
-    public function toArray(){
+    public function toArray() {
         return $this->data;
     }
 
@@ -270,7 +270,7 @@ 
         return $this;
     }
 
-    public function reindex(){
+    public function reindex() {
         $this->data = array_values($this->data);
         return $this;
     }

Braces +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
         $text = mb_substr($text, 0, $len+1, $encoding);
         if(mb_substr($text, -1, null, $encoding) == ' '){
             $out = trim($text);
-        }else{
+        } else{
             $out = mb_substr($text, 0, mb_strripos($text, ' ', null, $encoding), $encoding);
         }
         return preg_replace("/(([\.,\-:!?;\s])|(&\w+;))+$/ui", "", $out);

assets/lib/MODxAPI/modUsers.php

Doc Comments +6 added lines, -5 removed lines

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

Indentation +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
             'gender' => null,
             'country' => null,
             'state' => null,
-	    'city' => null,
+        'city' => null,
             'zip' => null,
             'fax' => null,
             'photo' => null,
@@ -211,8 +211,8 @@ 
             $this->invokeEvent('OnWebChangePassword',array(
                 'userObj'       => $this,
                 'userid'        => $this->id,
-			    'user'	        => $this->toArray(),
-			    'userpassword'	=> $this->givenPassword,
+                'user'	        => $this->toArray(),
+                'userpassword'	=> $this->givenPassword,
                 'internalKey'   => $this->id,
                 'username'      => $this->get('username')
             ),$fire_events);

Spacing +28 added lines, -28 removed lines

@@ -81,7 +81,7 @@ 
 
             if (!$find = $this->findUser($id)) {
                 $this->id = null;
-            }else {
+            } else {
                 $result = $this->query("
                     SELECT * from {$this->makeTable('web_user_attributes')} as attribute
                     LEFT JOIN {$this->makeTable('web_users')} as user ON user.id=attribute.internalKey
@@ -133,17 +133,17 @@ 
     public function save($fire_events = null, $clearCache = false)
     {
         if ($this->get('email') == '' || $this->get('username') == '' || $this->get('password') == '') {
-            $this->log['EmptyPKField'] = 'Email, username or password is empty <pre>' . print_r($this->toArray(), true) . '</pre>';
+            $this->log['EmptyPKField'] = 'Email, username or password is empty <pre>'.print_r($this->toArray(), true).'</pre>';
             return false;
         }
 
         if (!$this->checkUnique('web_users', 'username')) {
-            $this->log['UniqueUsername'] = 'username not unique <pre>' . print_r($this->get('username'), true) . '</pre>';
+            $this->log['UniqueUsername'] = 'username not unique <pre>'.print_r($this->get('username'), true).'</pre>';
             return false;
         }
 
         if (!$this->checkUnique('web_user_attributes', 'email', 'internalKey')) {
-            $this->log['UniqueEmail'] = 'Email not unique <pre>' . print_r($this->get('email'), true) . '</pre>';
+            $this->log['UniqueEmail'] = 'Email not unique <pre>'.print_r($this->get('email'), true).'</pre>';
             return false;
         }
 
@@ -155,8 +155,8 @@ 
         $fld = $this->toArray();
         foreach ($this->default_field['user'] as $key => $value) {
             $tmp = $this->get($key);
-            if ($this->newDoc && ( !is_int($tmp) && $tmp=='')) {
-                if($tmp == $value){
+            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
+                if ($tmp == $value) {
                     //take default value from global config
                 }
                 $this->field[$key] = $value;
@@ -166,9 +166,9 @@ 
         }
         if (!empty($this->set['user'])) {
             if ($this->newDoc) {
-                $SQL = "INSERT into {$this->makeTable('web_users')} SET " . implode(', ', $this->set['user']);
+                $SQL = "INSERT into {$this->makeTable('web_users')} SET ".implode(', ', $this->set['user']);
             } else {
-                $SQL = "UPDATE {$this->makeTable('web_users')} SET " . implode(', ', $this->set['user']) . " WHERE id = " . $this->id;
+                $SQL = "UPDATE {$this->makeTable('web_users')} SET ".implode(', ', $this->set['user'])." WHERE id = ".$this->id;
             }
             $this->query($SQL);
         }
@@ -179,8 +179,8 @@ 
 
         foreach ($this->default_field['attribute'] as $key => $value) {
             $tmp = $this->get($key);
-            if ($this->newDoc && ( !is_int($tmp) && $tmp=='')) {
-                if($tmp == $value){
+            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
+                if ($tmp == $value) {
                     //take default value from global config
                 }
                 $this->field[$key] = $value;
@@ -191,9 +191,9 @@ 
         if (!empty($this->set['attribute'])) {
             if ($this->newDoc) {
                 $this->set('internalKey', $this->id)->Uset('internalKey', 'attribute');
-                $SQL = "INSERT into {$this->makeTable('web_user_attributes')} SET " . implode(', ', $this->set['attribute']);
+                $SQL = "INSERT into {$this->makeTable('web_user_attributes')} SET ".implode(', ', $this->set['attribute']);
             } else {
-                $SQL = "UPDATE {$this->makeTable('web_user_attributes')} SET " . implode(', ', $this->set['attribute']) . " WHERE  internalKey = " . $this->getID();
+                $SQL = "UPDATE {$this->makeTable('web_user_attributes')} SET ".implode(', ', $this->set['attribute'])." WHERE  internalKey = ".$this->getID();
             }
             $this->query($SQL);
         }
@@ -208,21 +208,21 @@ 
             }
         }
         if (!$this->newDoc && $this->givenPassword) {
-            $this->invokeEvent('OnWebChangePassword',array(
+            $this->invokeEvent('OnWebChangePassword', array(
                 'userObj'       => $this,
                 'userid'        => $this->id,
 			    'user'	        => $this->toArray(),
 			    'userpassword'	=> $this->givenPassword,
                 'internalKey'   => $this->id,
                 'username'      => $this->get('username')
-            ),$fire_events);
+            ), $fire_events);
         }
-        $this->invokeEvent('OnWebSaveUser',array (
+        $this->invokeEvent('OnWebSaveUser', array(
             'userObj'   => $this,
             'mode'      => $this->newDoc ? "new" : "upd",
             'id'        => $this->id,
             'user'      => $this->toArray()
-        ),$fire_events);
+        ), $fire_events);
 
         if ($clearCache) {
             $this->clearCache($fire_events);
@@ -274,7 +274,7 @@ 
                 'username'      => $this->get('username'),
                 'userpassword'  => $this->givenPassword,
                 'rememberme'    => $fulltime
-            ),$fire_events);
+            ), $fire_events);
         }
         return $flag;
     }
@@ -317,13 +317,13 @@ 
         if (
             ($tmp->getID()) && (!$blocker || ($blocker && !$tmp->checkBlock($id)))
         ) {
-            $eventResult = $this->getInvokeEventResult('OnWebAuthentication',array(
+            $eventResult = $this->getInvokeEventResult('OnWebAuthentication', array(
                 'userObj'       => $this,
                 'userid'        => $tmp->getID(),
                 'username'      => $tmp->get('username'),
                 'userpassword'  => $password,
                 'savedpassword' => $tmp->get('password')
-            ),$fire_events);
+            ), $fire_events);
             if (is_array($eventResult)) {
                 foreach ($eventResult as $result) {
                     $pluginFlag = (bool)$result;
@@ -351,7 +351,7 @@ 
             $cookie = explode('|', $_COOKIE[$cookieName], 2);
             if (isset($cookie[0], $cookie[1]) && strlen($cookie[0]) == 32 && strlen($cookie[1]) == 32) {
                 $this->close();
-                $q = $this->modx->db->query("SELECT id FROM " . $this->makeTable('web_users') . " WHERE md5(username)='{$this->escape($cookie[0])}'");
+                $q = $this->modx->db->query("SELECT id FROM ".$this->makeTable('web_users')." WHERE md5(username)='{$this->escape($cookie[0])}'");
                 $id = $this->modx->db->getValue($q);
                 if ($this->edit($id) && $this->getID() && $this->get('password') == $cookie[1] && $this->testAuth($this->getID(), $cookie[1], true)) {
                     $flag = $this->authUser($this->getID(), $fulltime, $cookieName, $fire_events);
@@ -410,7 +410,7 @@ 
                     $_SESSION['webUserGroupNames'] = $this->getUserGroups();
                     $_SESSION['webDocgroups'] = $this->getDocumentGroups();
                     if ($remember) {
-                        $cookieValue = md5($this->get('username')) . '|' . $this->get('password');
+                        $cookieValue = md5($this->get('username')).'|'.$this->get('password');
                         $cookieExpires = time() + (is_bool($remember) ? (60 * 60 * 24 * 365 * 5) : (int)$remember);
                         setcookie($cookieName, $cookieValue, $cookieExpires, '/');
                     }
@@ -452,17 +452,17 @@ 
      * @param int $userID
      * @return array
      */
-    public function getDocumentGroups($userID = 0){
+    public function getDocumentGroups($userID = 0) {
         $out = array();
         $user = $this->switchObject($userID);
-        if($user->getID()){
+        if ($user->getID()) {
             $web_groups = $this->modx->getFullTableName('web_groups');
             $webgroup_access = $this->modx->getFullTableName('webgroup_access');
 
             $sql = "SELECT `uga`.`documentgroup` FROM {$web_groups} as `ug`
                 INNER JOIN {$webgroup_access} as `uga` ON `uga`.`webgroup`=`ug`.`webgroup`
                 WHERE `ug`.`webuser` = ".$user->getID();
-            $out = $this->modx->db->getColumn('documentgroup',$this->query($sql));
+            $out = $this->modx->db->getColumn('documentgroup', $this->query($sql));
 
         }
         unset($user);
@@ -473,17 +473,17 @@ 
      * @param int $userID
      * @return array
      */
-    public function getUserGroups($userID = 0){
+    public function getUserGroups($userID = 0) {
         $out = array();
         $user = $this->switchObject($userID);
-        if($user->getID()){
+        if ($user->getID()) {
             $web_groups = $this->makeTable('web_groups');
             $webgroup_names = $this->makeTable('webgroup_names');
 
             $sql = "SELECT `ugn`.`name` FROM {$web_groups} as `ug`
                 INNER JOIN {$webgroup_names} as `ugn` ON `ugn`.`id`=`ug`.`webgroup`
                 WHERE `ug`.`webuser` = ".$user->getID();
-            $out = $this->modx->db->getColumn('name',$this->query($sql));
+            $out = $this->modx->db->getColumn('name', $this->query($sql));
         }
         unset($user);
         return $out;
@@ -491,7 +491,7 @@ 
 
     public function setUserGroups($userID = 0, $groupIds = array()) {
         $user = $this->switchObject($userID);
-        if(($uid = $user->getID()) && is_array($groupIds)) {
+        if (($uid = $user->getID()) && is_array($groupIds)) {
             foreach ($groupIds as $gid) {
                 $this->query("REPLACE INTO {$this->makeTable('web_groups')} (`webgroup`, `webuser`) VALUES ('{$gid}', '{$uid}')");
             }

Braces +10 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
 
             if (!$find = $this->findUser($id)) {
                 $this->id = null;
-            }else {
+            } else {
                 $result = $this->query("
                     SELECT * from {$this->makeTable('web_user_attributes')} as attribute
                     LEFT JOIN {$this->makeTable('web_users')} as user ON user.id=attribute.internalKey
@@ -199,7 +199,9 @@ 
         }
 
         foreach ($fld as $key => $value) {
-            if ($value == '') continue;
+            if ($value == '') {

+                continue;

+            }

             $result = $this->query("SELECT `setting_value` FROM {$this->makeTable('web_user_settings')} WHERE `webuser` = '{$this->id}' AND `setting_name` = '{$key}'");
             if ($this->modx->db->getRecordCount($result) > 0) {
                 $this->query("UPDATE {$this->makeTable('web_user_settings')} SET `setting_value` = '{$value}' WHERE `webuser` = '{$this->id}' AND `setting_name` = '{$key}';");
@@ -263,7 +265,9 @@ 
     public function authUser($id = 0, $fulltime = true, $cookieName = 'WebLoginPE', $fire_events = null)
     {
         $flag = false;
-        if (!$this->getID() && $id) $this->edit($id);
+        if (!$this->getID() && $id) {

+            $this->edit($id);

+        }

         if ($this->getID()) {
             //$this->logOut($cookieName);
             $flag = true;
@@ -368,7 +372,9 @@ 
      */
     public function logOut($cookieName = 'WebLoginPE', $fire_events = null)
     {
-        if (!$uid = $this->modx->getLoginUserID('web')) return;
+        if (!$uid = $this->modx->getLoginUserID('web')) {

+            return;

+        }

         $params = array(
             'username'      => $_SESSION['webShortname'],
             'internalKey'   => $uid,

assets/snippets/DLUsers/src/Actions.php

Unused Use Statements +4 added lines, -1 removed lines

@@ -6,7 +6,10 @@
 include_once(MODX_BASE_PATH . 'assets/snippets/DocLister/lib/DLTemplate.class.php');
 include_once(MODX_BASE_PATH . 'assets/snippets/DocLister/lib/DLCollection.class.php');
 
-use APIHelpers, DocumentParser, DLCollection, DLTemplate;
+use APIHelpers;
+use DocumentParser;
+use DLCollection;
+use DLTemplate;
 use Helpers\FS;
 
 class Actions{

Indentation +395 added lines, -395 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,47 +85,47 @@ 
      * Сброс авторизации и обновление страницы
      */
     public function logout($params){
-    	$LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');
-    	if(is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])){
-    		$userID = $this->UserID('web');
-    		if($userID){
-    			$this->userObj->edit($userID);
-    			if($this->userObj->getID()){
-	    			$this->modx->invokeEvent("OnBeforeWebLogout", array(
-		    			"userid"   => $this->userObj->getID(),
-		    			"username" => $this->userObj->get('username')
-		    		));
-	    		}
-		    	$this->userObj->logOut();
-		    	if($this->userObj->getID()){
-		    		$this->modx->invokeEvent("OnWebLogout", array(
-		    			"userid"        => $this->userObj->getID(),
-		    			"username"      => $this->userObj->get('username')
-		    		));
-		    	}
-
-			    $go = APIHelpers::getkey($params, 'url', '');
-			    if(empty($go)){
-			    	$go = str_replace(
-			    		array("?".$LogoutName, "&".$LogoutName),
-			    		array("", ""),
-			    		$_SERVER['REQUEST_URI']
-			    	);
-			    }
-
-			    $start = $this->makeUrl($this->config['site_start']);
-			    if($start == $go){
-			        $go = $this->config['site_url'];
-			    }else{
-			        $go = $this->config['site_url'].ltrim($go, '/');
-			    }
-			    $this->moveTo(array('url' => $go));
-    		}else{
-    			//Если юзер не авторизован, то показываем ему 404 ошибку
-    			$this->modx->sendErrorPage();
-    		}
-		}
-	    return true;
+        $LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');
+        if(is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])){
+            $userID = $this->UserID('web');
+            if($userID){
+                $this->userObj->edit($userID);
+                if($this->userObj->getID()){
+                    $this->modx->invokeEvent("OnBeforeWebLogout", array(
+                        "userid"   => $this->userObj->getID(),
+                        "username" => $this->userObj->get('username')
+                    ));
+                }
+                $this->userObj->logOut();
+                if($this->userObj->getID()){
+                    $this->modx->invokeEvent("OnWebLogout", array(
+                        "userid"        => $this->userObj->getID(),
+                        "username"      => $this->userObj->get('username')
+                    ));
+                }
+
+                $go = APIHelpers::getkey($params, 'url', '');
+                if(empty($go)){
+                    $go = str_replace(
+                        array("?".$LogoutName, "&".$LogoutName),
+                        array("", ""),
+                        $_SERVER['REQUEST_URI']
+                    );
+                }
+
+                $start = $this->makeUrl($this->config['site_start']);
+                if($start == $go){
+                    $go = $this->config['site_url'];
+                }else{
+                    $go = $this->config['site_url'].ltrim($go, '/');
+                }
+                $this->moveTo(array('url' => $go));
+            }else{
+                //Если юзер не авторизован, то показываем ему 404 ошибку
+                $this->modx->sendErrorPage();
+            }
+        }
+        return true;
     }
 
     /**
@@ -133,14 +133,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;
     }
 
     /**
@@ -149,343 +149,343 @@ 
      *   	В противном случае вся работа происходит внутри самого блока
      */
     public function AuthBlock($params){
-    	$POST = array('backUrl' => $_SERVER['REQUEST_URI']);
-
-    	$error = $errorCode = '';
-
-    	$pwdField = APIHelpers::getkey($params, 'pwdField', 'password');
-		$emailField = APIHelpers::getkey($params, 'emailField', 'email');
-		$rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');
-
-    	if($this->UserID('web')){
-			$tpl = APIHelpers::getkey($params, 'tplProfile', '');
-			if(empty($tpl)){
-				$tpl = $this->getTemplate('tplProfile');
-			}
-			$dataTPL = $this->userObj->toArray();
-			$dataTPL['url.logout'] = $this->logoutUrl($params);
-    		$homeID = APIHelpers::getkey($params, 'homeID');
-			if(!empty($homeID)){
-				$dataTPL['url.profile'] = $this->makeUrl($homeID);
-			}
-		}else{
-			$tpl = APIHelpers::getkey($params, 'tplForm', '');
-			if(empty($tpl)){
-				$tpl = $this->getTemplate('authForm');
-			}
-			$POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);
-	    	$dataTPL = array(
-				'backUrl' => APIHelpers::getkey($POST, 'backUrl', ''),
-				'emailValue' => APIHelpers::getkey($POST, 'email', ''),
-				'emailField' => $emailField,
-				'pwdField' => $pwdField,
-		    	'method' => strtolower(__METHOD__),
-				'error' => $error,
-				'errorCode' => $errorCode
-			);
-			$authId = APIHelpers::getkey($params, 'authId');
-			if(!empty($authId)){
-				$dataTPL['authPage'] = $this->makeUrl($authId);
-				$dataTPL['method'] = strtolower(__CLASS__ . '::'. 'authpage');
-			}
-		}
-		return DLTemplate::getInstance($this->modx)->parseChunk($tpl, $dataTPL);
+        $POST = array('backUrl' => $_SERVER['REQUEST_URI']);
+
+        $error = $errorCode = '';
+
+        $pwdField = APIHelpers::getkey($params, 'pwdField', 'password');
+        $emailField = APIHelpers::getkey($params, 'emailField', 'email');
+        $rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');
+
+        if($this->UserID('web')){
+            $tpl = APIHelpers::getkey($params, 'tplProfile', '');
+            if(empty($tpl)){
+                $tpl = $this->getTemplate('tplProfile');
+            }
+            $dataTPL = $this->userObj->toArray();
+            $dataTPL['url.logout'] = $this->logoutUrl($params);
+            $homeID = APIHelpers::getkey($params, 'homeID');
+            if(!empty($homeID)){
+                $dataTPL['url.profile'] = $this->makeUrl($homeID);
+            }
+        }else{
+            $tpl = APIHelpers::getkey($params, 'tplForm', '');
+            if(empty($tpl)){
+                $tpl = $this->getTemplate('authForm');
+            }
+            $POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);
+            $dataTPL = array(
+                'backUrl' => APIHelpers::getkey($POST, 'backUrl', ''),
+                'emailValue' => APIHelpers::getkey($POST, 'email', ''),
+                'emailField' => $emailField,
+                'pwdField' => $pwdField,
+                'method' => strtolower(__METHOD__),
+                'error' => $error,
+                'errorCode' => $errorCode
+            );
+            $authId = APIHelpers::getkey($params, 'authId');
+            if(!empty($authId)){
+                $dataTPL['authPage'] = $this->makeUrl($authId);
+                $dataTPL['method'] = strtolower(__CLASS__ . '::'. 'authpage');
+            }
+        }
+        return DLTemplate::getInstance($this->modx)->parseChunk($tpl, $dataTPL);
     }
 
-	/**
-	 * Авторизация на сайте со страницы авторизации
-	 * [!Auth? &login=`password` &pwdField=`password` &homeID=`72`!]
-	 */
-	public function AuthPage($params){
-		$homeID = APIHelpers::getkey($params, 'homeID');
-		$this->isAuthGoHome(array('id' => $homeID));
-
-		$error = $errorCode = '';
-		$POST = array('backUrl' => '');
-
-		$pwdField = APIHelpers::getkey($params, 'pwdField', 'password');
-		$emailField = APIHelpers::getkey($params, 'emailField', 'email');
-		$rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');
-
-		$tpl = APIHelpers::getkey($params, 'tpl', '');
-		if(empty($tpl)){
-			$tpl = $this->getTemplate('authForm');
-		}
-
-		$request = parse_url($_SERVER['REQUEST_URI']);
-		if(!empty($_SERVER['HTTP_REFERER'])){
-			/**
-			 * Thank you for super protection against hacking in protect.inc.php:-)
-			 */
-			$refer = htmlspecialchars_decode($_SERVER['HTTP_REFERER'], ENT_QUOTES);
-		}else{
-			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');
-			if(empty( $request['host']) ||  $request['host']==$selfHost){
-				$query = !empty($request['query']) ? '?'.$request['query'] : '';
-			    $refer = !empty($request['path']) ? $request['path'].$query : '';
-			}else{
-				$refer = '';
-			}
-		}
-
-		if($_SERVER['REQUEST_METHOD'] == 'POST'){
-			$backUrl = APIHelpers::getkey($_POST, 'backUrl', $POST['backUrl']);
-			if(!is_scalar($backUrl)){
-				$backUrl = $refer;
-			}else{
-				$backUrl = urldecode($backUrl);
-			}
-		}else{
-			$backUrl = $refer;
-		}
-		$backUrl = parse_url($backUrl);
-		if(!empty($backUrl['path']) && $request['path'] != $backUrl['path']){
-		    $POST['backUrl'] = $backUrl['path'];
-		}else{
-			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');
-			if(empty($backUrl['host']) || $backUrl['host']==$selfHost){
-				$query = !empty($backUrl['query']) ? '?'.$backUrl['query'] : '';
-			    $POST['backUrl'] = !empty($backUrl['path']) ? $backUrl['path'].$query : '';
-			}else{
-				$POST['backUrl'] = '';
-			}
-		}
-		if(!empty($POST['backUrl'])){
-			$idURL = $this->moveTo(array(
-				'url' => '/'.ltrim($POST['backUrl'], '/'),
-			    'validate' => true
-			));
-		}else{
-			$idURL = 0;
-		}
-		if(empty($idURL)){
-			if(empty($homeID)){
-				$homeID = $this->config['site_start'];
-			}
-			$POST['backUrl'] = $this->makeUrl($homeID);
-		}
-		$POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);
-		return DLTemplate::getInstance($this->modx)->parseChunk($tpl, array(
-		    'backUrl' => APIHelpers::getkey($POST, 'backUrl', ''),
-			'emailValue' => APIHelpers::getkey($POST, 'email', ''),
-			'emailField' => $emailField,
-		    'pwdField' => $pwdField,
-		    'method' => strtolower(__METHOD__),
-			'error' => $error,
-			'errorCode' => $errorCode
-		));
-	}
-	protected function Auth($pwdField, $emailField, $rememberField, $backUrl, $method, &$error, &$errorCode, $params = array()){
-		$POST = array(
-			'backUrl' => urlencode($backUrl)
-		);
-		$userObj = &$this->userObj;
-		if($_SERVER['REQUEST_METHOD']=='POST' && APIHelpers::getkey($_POST, 'method', '') == strtolower($method)){
-			$POST = array_merge($POST, array(
-				'password' => APIHelpers::getkey($_POST, $pwdField, ''),
-				'email' => APIHelpers::getkey($_POST, $emailField, ''),
-				'remember' => (bool)((int)APIHelpers::getkey($_POST, $rememberField, 0))
-			));
-			if(!empty($POST['email']) && is_scalar($POST['email']) && !$userObj->emailValidate($POST['email'], false)){
-				$userObj->edit($POST['email']);
-
-				$this->modx->invokeEvent("OnBeforeWebLogin", array(
-		            "username"		=> $POST['email'],
-		            "userpassword"	=> $POST['password'],
-		            "rememberme"	=> $POST['remember'],
-		            'userObj'		=> $userObj
-		        ));
-				if($userObj->getID() && !$userObj->checkBlock($userObj->getID())){
-					$pluginFlag = $this->modx->invokeEvent("OnWebAuthentication", array(
-	                    "userid"        => $userObj->getID(),
-	                    "username"      => $userObj->get('username'),
-	                    "userpassword"  => $POST['password'],
-	                    "savedpassword" => $userObj->get('password'),
-	                    "rememberme"    => $POST['remember'],
-	                ));
-					if(
-						($pluginFlag === true || $userObj->testAuth($userObj->getID(), $POST['password'], 0))
-							&&
-						$userObj->authUser($userObj->getID(), $POST['remember'])
-					){
-						$userObj->set('logincount', (int)$userObj->get('logincount') + 1);
-						$userObj->set('lastlogin', time());
-						$userObj->set('failedlogincount', 0);
-						$userObj->save(false, false);
-
-						$this->modx->invokeEvent("OnWebLogin", array(
-			                "userid"		=> $userObj->getID(),
-			                "username"		=> $userObj->get('username'),
-			                "userpassword"	=> $POST['password'],
-			                "rememberme"	=> $POST['remember'],
-			            ));
-						$this->moveTo(array('url' => urldecode($POST['backUrl'])));
-					}else{
-						$userObj->set('failedlogincount', (int)$userObj->get('failedlogincount') + 1);
-						$userObj->save(false, false);
-
-						$error = 'error.incorrect_password';
-					}
-				}else{
-					$error = 'error.no_user';
-				}
-			}else{
-				$error = 'error.incorrect_mail';
-				$POST['email'] = '';
-			}
-		}
-		if(!empty($error)){
-			$errorCode = $error;
-			$error = APIHelpers::getkey($params, $error, '');
-			$error = static::getLangMsg($error, $error);
-		}
-		return $POST;
-	}
-	/**
-	 * Информация о пользователе
-	 * [!DLUsers? &action=`UserInfo` &field=`fullname` &id=`2`!]
-	 */
-	public function UserInfo($params){
-		$out = '';
-		$userID = APIHelpers::getkey($params, 'id', 0);
-		if(empty($userID)){
-			$userID = $this->UserID('web');
-		}
-		$field = APIHelpers::getkey($params, 'field', 'username');
-		if($userID > 0){
-			$this->userObj->edit($userID);
-			switch(true){
-				case ($field == $this->userObj->fieldPKName()):
-					$out = $this->userObj->getID();
-					break;
-				case ($this->userObj->issetField($field)):
-					$out = $this->userObj->get($field);
-					break;
-			}
-		}
-		return $out;
-	}
-	/**
-	 * ID пользователя
-	 */
-	public function UserID($type = 'web'){
-		return $this->modx->getLoginUserID($type);
-	}
-	/**
-	 * Если не авторизован - то отправить на страницу
-	 */
-	public function isGuestGoHome($params){
-		if(!$this->UserID('web')){
-			/**
-			 * @see : http://modx.im/blog/triks/105.html
-			 */
-			$this->modx->invokeEvent('OnPageUnauthorized');
-			$id = APIHelpers::getkey($params, 'id', $this->config['unauthorized_page']);
-		    $this->moveTo(compact('id'));
-		}
-		return;
-	}
-
-	/**
-	 * Если авторизован - то открыть личный кабинет
-	 */
-	public function isAuthGoHome($params){
-		$userID = $this->UserID('web');
-		if($userID>0){
-			$id = APIHelpers::getkey($params, 'homeID');
-		    if(empty($id)){
-				$id = $this->modx->getConfig('login_home', $this->config['site_start']);
-		    }
-		    $this->moveTo(compact('id'));
-		}
-		return;
-	}
-
-	/**
-	 * Редирект
-	 */
-	public function moveTo($params){
-		$id = (int)APIHelpers::getkey($params, 'id', 0);
-		$uri = APIHelpers::getkey($params, 'url', '');
-		if((empty($uri) && !empty($id)) || !is_string($uri)){
-			$uri = $this->makeUrl($id);
-		}
-		$code = (int)APIHelpers::getkey($params, 'code', 0);
-		$addUrl = APIHelpers::getkey($params, 'addUrl', '');
-		if(is_scalar($addUrl) && $addUrl!=''){
-		    $uri .= "?".$addUrl;
-		}
-		if(APIHelpers::getkey($params, 'validate', false)){
-			if(isset($this->modx->snippetCache['getPageID'])){
-				$out = $this->modx->runSnippet('getPageID', compact('uri'));
-				if(empty($out)){
-					$uri = '';
-				}
-			}else{
-				$uri = APIhelpers::sanitarTag($uri);
-			}
-		}else{
-			//$modx->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.1 307 Temporary Redirect');
-			header("Location: ".$uri, true, ($code>0 ? $code : 307));
-		}
-		return $uri;
-	}
-
-	/**
-	 * Создание ссылки на страницу
-	 *
-	 * @param  int $id ID документа
-	 * @return string
-	 */
-	protected function makeUrl($id = null){
-		$id = (int)$id;
-		if($id <= 0){
-			$id = $this->modx->documentObject['id'];
-		}
-		if($this->url->containsKey($id)){
-			$url = $this->url->get($id);
-		}else{
-			$url = $this->modx->makeUrl($id);
-			$this->url->set($id, $url);
-		}
-		return $url;
-	}
-	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($backUrl['query']) ? '?'.$backUrl['query'] : '';
+                $POST['backUrl'] = !empty($backUrl['path']) ? $backUrl['path'].$query : '';
+            }else{
+                $POST['backUrl'] = '';
+            }
+        }
+        if(!empty($POST['backUrl'])){
+            $idURL = $this->moveTo(array(
+                'url' => '/'.ltrim($POST['backUrl'], '/'),
+                'validate' => true
+            ));
+        }else{
+            $idURL = 0;
+        }
+        if(empty($idURL)){
+            if(empty($homeID)){
+                $homeID = $this->config['site_start'];
+            }
+            $POST['backUrl'] = $this->makeUrl($homeID);
+        }
+        $POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);
+        return DLTemplate::getInstance($this->modx)->parseChunk($tpl, array(
+            'backUrl' => APIHelpers::getkey($POST, 'backUrl', ''),
+            'emailValue' => APIHelpers::getkey($POST, 'email', ''),
+            'emailField' => $emailField,
+            'pwdField' => $pwdField,
+            'method' => strtolower(__METHOD__),
+            'error' => $error,
+            'errorCode' => $errorCode
+        ));
+    }
+    protected function Auth($pwdField, $emailField, $rememberField, $backUrl, $method, &$error, &$errorCode, $params = array()){
+        $POST = array(
+            'backUrl' => urlencode($backUrl)
+        );
+        $userObj = &$this->userObj;
+        if($_SERVER['REQUEST_METHOD']=='POST' && APIHelpers::getkey($_POST, 'method', '') == strtolower($method)){
+            $POST = array_merge($POST, array(
+                'password' => APIHelpers::getkey($_POST, $pwdField, ''),
+                'email' => APIHelpers::getkey($_POST, $emailField, ''),
+                'remember' => (bool)((int)APIHelpers::getkey($_POST, $rememberField, 0))
+            ));
+            if(!empty($POST['email']) && is_scalar($POST['email']) && !$userObj->emailValidate($POST['email'], false)){
+                $userObj->edit($POST['email']);
+
+                $this->modx->invokeEvent("OnBeforeWebLogin", array(
+                    "username"		=> $POST['email'],
+                    "userpassword"	=> $POST['password'],
+                    "rememberme"	=> $POST['remember'],
+                    'userObj'		=> $userObj
+                ));
+                if($userObj->getID() && !$userObj->checkBlock($userObj->getID())){
+                    $pluginFlag = $this->modx->invokeEvent("OnWebAuthentication", array(
+                        "userid"        => $userObj->getID(),
+                        "username"      => $userObj->get('username'),
+                        "userpassword"  => $POST['password'],
+                        "savedpassword" => $userObj->get('password'),
+                        "rememberme"    => $POST['remember'],
+                    ));
+                    if(
+                        ($pluginFlag === true || $userObj->testAuth($userObj->getID(), $POST['password'], 0))
+                            &&
+                        $userObj->authUser($userObj->getID(), $POST['remember'])
+                    ){
+                        $userObj->set('logincount', (int)$userObj->get('logincount') + 1);
+                        $userObj->set('lastlogin', time());
+                        $userObj->set('failedlogincount', 0);
+                        $userObj->save(false, false);
+
+                        $this->modx->invokeEvent("OnWebLogin", array(
+                            "userid"		=> $userObj->getID(),
+                            "username"		=> $userObj->get('username'),
+                            "userpassword"	=> $POST['password'],
+                            "rememberme"	=> $POST['remember'],
+                        ));
+                        $this->moveTo(array('url' => urldecode($POST['backUrl'])));
+                    }else{
+                        $userObj->set('failedlogincount', (int)$userObj->get('failedlogincount') + 1);
+                        $userObj->save(false, false);
+
+                        $error = 'error.incorrect_password';
+                    }
+                }else{
+                    $error = 'error.no_user';
+                }
+            }else{
+                $error = 'error.incorrect_mail';
+                $POST['email'] = '';
+            }
+        }
+        if(!empty($error)){
+            $errorCode = $error;
+            $error = APIHelpers::getkey($params, $error, '');
+            $error = static::getLangMsg($error, $error);
+        }
+        return $POST;
+    }
+    /**
+     * Информация о пользователе
+     * [!DLUsers? &action=`UserInfo` &field=`fullname` &id=`2`!]
+     */
+    public function UserInfo($params){
+        $out = '';
+        $userID = APIHelpers::getkey($params, 'id', 0);
+        if(empty($userID)){
+            $userID = $this->UserID('web');
+        }
+        $field = APIHelpers::getkey($params, 'field', 'username');
+        if($userID > 0){
+            $this->userObj->edit($userID);
+            switch(true){
+                case ($field == $this->userObj->fieldPKName()):
+                    $out = $this->userObj->getID();
+                    break;
+                case ($this->userObj->issetField($field)):
+                    $out = $this->userObj->get($field);
+                    break;
+            }
+        }
+        return $out;
+    }
+    /**
+     * ID пользователя
+     */
+    public function UserID($type = 'web'){
+        return $this->modx->getLoginUserID($type);
+    }
+    /**
+     * Если не авторизован - то отправить на страницу
+     */
+    public function isGuestGoHome($params){
+        if(!$this->UserID('web')){
+            /**
+             * @see : http://modx.im/blog/triks/105.html
+             */
+            $this->modx->invokeEvent('OnPageUnauthorized');
+            $id = APIHelpers::getkey($params, 'id', $this->config['unauthorized_page']);
+            $this->moveTo(compact('id'));
+        }
+        return;
+    }
+
+    /**
+     * Если авторизован - то открыть личный кабинет
+     */
+    public function isAuthGoHome($params){
+        $userID = $this->UserID('web');
+        if($userID>0){
+            $id = APIHelpers::getkey($params, 'homeID');
+            if(empty($id)){
+                $id = $this->modx->getConfig('login_home', $this->config['site_start']);
+            }
+            $this->moveTo(compact('id'));
+        }
+        return;
+    }
+
+    /**
+     * Редирект
+     */
+    public function moveTo($params){
+        $id = (int)APIHelpers::getkey($params, 'id', 0);
+        $uri = APIHelpers::getkey($params, 'url', '');
+        if((empty($uri) && !empty($id)) || !is_string($uri)){
+            $uri = $this->makeUrl($id);
+        }
+        $code = (int)APIHelpers::getkey($params, 'code', 0);
+        $addUrl = APIHelpers::getkey($params, 'addUrl', '');
+        if(is_scalar($addUrl) && $addUrl!=''){
+            $uri .= "?".$addUrl;
+        }
+        if(APIHelpers::getkey($params, 'validate', false)){
+            if(isset($this->modx->snippetCache['getPageID'])){
+                $out = $this->modx->runSnippet('getPageID', compact('uri'));
+                if(empty($out)){
+                    $uri = '';
+                }
+            }else{
+                $uri = APIhelpers::sanitarTag($uri);
+            }
+        }else{
+            //$modx->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.1 307 Temporary Redirect');
+            header("Location: ".$uri, true, ($code>0 ? $code : 307));
+        }
+        return $uri;
+    }
+
+    /**
+     * Создание ссылки на страницу
+     *
+     * @param  int $id ID документа
+     * @return string
+     */
+    protected function makeUrl($id = null){
+        $id = (int)$id;
+        if($id <= 0){
+            $id = $this->modx->documentObject['id'];
+        }
+        if($this->url->containsKey($id)){
+            $url = $this->url->get($id);
+        }else{
+            $url = $this->modx->makeUrl($id);
+            $this->url->set($id, $url);
+        }
+        return $url;
+    }
+    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 +86 added lines, -86 removed lines

@@ -1,15 +1,15 @@ 
 <?php namespace DLUsers;
 
-include_once(MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php');
-include_once(MODX_BASE_PATH . 'assets/lib/Helpers/FS.php');
-include_once(MODX_BASE_PATH . 'assets/lib/MODxAPI/modUsers.php');
-include_once(MODX_BASE_PATH . 'assets/snippets/DocLister/lib/DLTemplate.class.php');
-include_once(MODX_BASE_PATH . 'assets/snippets/DocLister/lib/DLCollection.class.php');
+include_once(MODX_BASE_PATH.'assets/lib/APIHelpers.class.php');
+include_once(MODX_BASE_PATH.'assets/lib/Helpers/FS.php');
+include_once(MODX_BASE_PATH.'assets/lib/MODxAPI/modUsers.php');
+include_once(MODX_BASE_PATH.'assets/snippets/DocLister/lib/DLTemplate.class.php');
+include_once(MODX_BASE_PATH.'assets/snippets/DocLister/lib/DLCollection.class.php');
 
 use APIHelpers, DocumentParser, DLCollection, DLTemplate;
 use Helpers\FS;
 
-class Actions{
+class Actions {
     protected $modx = null;
     public $userObj = null;
 	/**
@@ -84,20 +84,20 @@ 
     /**
      * Сброс авторизации и обновление страницы
      */
-    public function logout($params){
+    public function logout($params) {
     	$LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');
-    	if(is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])){
+    	if (is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])) {
     		$userID = $this->UserID('web');
-    		if($userID){
+    		if ($userID) {
     			$this->userObj->edit($userID);
-    			if($this->userObj->getID()){
+    			if ($this->userObj->getID()) {
 	    			$this->modx->invokeEvent("OnBeforeWebLogout", array(
 		    			"userid"   => $this->userObj->getID(),
 		    			"username" => $this->userObj->get('username')
 		    		));
 	    		}
 		    	$this->userObj->logOut();
-		    	if($this->userObj->getID()){
+		    	if ($this->userObj->getID()) {
 		    		$this->modx->invokeEvent("OnWebLogout", array(
 		    			"userid"        => $this->userObj->getID(),
 		    			"username"      => $this->userObj->get('username')
@@ -105,7 +105,7 @@ 
 		    	}
 
 			    $go = APIHelpers::getkey($params, 'url', '');
-			    if(empty($go)){
+			    if (empty($go)) {
 			    	$go = str_replace(
 			    		array("?".$LogoutName, "&".$LogoutName),
 			    		array("", ""),
@@ -114,13 +114,13 @@ 
 			    }
 
 			    $start = $this->makeUrl($this->config['site_start']);
-			    if($start == $go){
+			    if ($start == $go) {
 			        $go = $this->config['site_url'];
-			    }else{
+			    } else {
 			        $go = $this->config['site_url'].ltrim($go, '/');
 			    }
 			    $this->moveTo(array('url' => $go));
-    		}else{
+    		} else {
     			//Если юзер не авторизован, то показываем ему 404 ошибку
     			$this->modx->sendErrorPage();
     		}
@@ -132,7 +132,7 @@ 
      * Генерация ссылки под кнопку выход
      * @return string
      */
-    public function logoutUrl($params){
+    public function logoutUrl($params) {
     	$LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');
     	$request = parse_url($_SERVER['REQUEST_URI']);
 
@@ -148,7 +148,7 @@ 
      * 		если указан параметр authId, то данные из формы перекидываются в метод AuthPage
      *   	В противном случае вся работа происходит внутри самого блока
      */
-    public function AuthBlock($params){
+    public function AuthBlock($params) {
     	$POST = array('backUrl' => $_SERVER['REQUEST_URI']);
 
     	$error = $errorCode = '';
@@ -157,20 +157,20 @@ 
 		$emailField = APIHelpers::getkey($params, 'emailField', 'email');
 		$rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');
 
-    	if($this->UserID('web')){
+    	if ($this->UserID('web')) {
 			$tpl = APIHelpers::getkey($params, 'tplProfile', '');
-			if(empty($tpl)){
+			if (empty($tpl)) {
 				$tpl = $this->getTemplate('tplProfile');
 			}
 			$dataTPL = $this->userObj->toArray();
 			$dataTPL['url.logout'] = $this->logoutUrl($params);
     		$homeID = APIHelpers::getkey($params, 'homeID');
-			if(!empty($homeID)){
+			if (!empty($homeID)) {
 				$dataTPL['url.profile'] = $this->makeUrl($homeID);
 			}
-		}else{
+		} else {
 			$tpl = APIHelpers::getkey($params, 'tplForm', '');
-			if(empty($tpl)){
+			if (empty($tpl)) {
 				$tpl = $this->getTemplate('authForm');
 			}
 			$POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);
@@ -184,9 +184,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);
@@ -196,7 +196,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));
 
@@ -208,58 +208,58 @@ 
 		$rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');
 
 		$tpl = APIHelpers::getkey($params, 'tpl', '');
-		if(empty($tpl)){
+		if (empty($tpl)) {
 			$tpl = $this->getTemplate('authForm');
 		}
 
 		$request = parse_url($_SERVER['REQUEST_URI']);
-		if(!empty($_SERVER['HTTP_REFERER'])){
+		if (!empty($_SERVER['HTTP_REFERER'])) {
 			/**
 			 * Thank you for super protection against hacking in protect.inc.php:-)
 			 */
 			$refer = htmlspecialchars_decode($_SERVER['HTTP_REFERER'], ENT_QUOTES);
-		}else{
+		} else {
 			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');
-			if(empty( $request['host']) ||  $request['host']==$selfHost){
+			if (empty($request['host']) || $request['host'] == $selfHost) {
 				$query = !empty($request['query']) ? '?'.$request['query'] : '';
 			    $refer = !empty($request['path']) ? $request['path'].$query : '';
-			}else{
+			} else {
 				$refer = '';
 			}
 		}
 
-		if($_SERVER['REQUEST_METHOD'] == 'POST'){
+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 			$backUrl = APIHelpers::getkey($_POST, 'backUrl', $POST['backUrl']);
-			if(!is_scalar($backUrl)){
+			if (!is_scalar($backUrl)) {
 				$backUrl = $refer;
-			}else{
+			} else {
 				$backUrl = urldecode($backUrl);
 			}
-		}else{
+		} else {
 			$backUrl = $refer;
 		}
 		$backUrl = parse_url($backUrl);
-		if(!empty($backUrl['path']) && $request['path'] != $backUrl['path']){
+		if (!empty($backUrl['path']) && $request['path'] != $backUrl['path']) {
 		    $POST['backUrl'] = $backUrl['path'];
-		}else{
+		} else {
 			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');
-			if(empty($backUrl['host']) || $backUrl['host']==$selfHost){
+			if (empty($backUrl['host']) || $backUrl['host'] == $selfHost) {
 				$query = !empty($backUrl['query']) ? '?'.$backUrl['query'] : '';
 			    $POST['backUrl'] = !empty($backUrl['path']) ? $backUrl['path'].$query : '';
-			}else{
+			} else {
 				$POST['backUrl'] = '';
 			}
 		}
-		if(!empty($POST['backUrl'])){
+		if (!empty($POST['backUrl'])) {
 			$idURL = $this->moveTo(array(
 				'url' => '/'.ltrim($POST['backUrl'], '/'),
 			    'validate' => true
 			));
-		}else{
+		} else {
 			$idURL = 0;
 		}
-		if(empty($idURL)){
-			if(empty($homeID)){
+		if (empty($idURL)) {
+			if (empty($homeID)) {
 				$homeID = $this->config['site_start'];
 			}
 			$POST['backUrl'] = $this->makeUrl($homeID);
@@ -275,18 +275,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(
@@ -295,7 +295,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'),
@@ -303,11 +303,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);
@@ -320,21 +320,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);
@@ -345,16 +345,16 @@ 
 	 * Информация о пользователе
 	 * [!DLUsers? &action=`UserInfo` &field=`fullname` &id=`2`!]
 	 */
-	public function UserInfo($params){
+	public function UserInfo($params) {
 		$out = '';
 		$userID = APIHelpers::getkey($params, 'id', 0);
-		if(empty($userID)){
+		if (empty($userID)) {
 			$userID = $this->UserID('web');
 		}
 		$field = APIHelpers::getkey($params, 'field', 'username');
-		if($userID > 0){
+		if ($userID > 0) {
 			$this->userObj->edit($userID);
-			switch(true){
+			switch (true) {
 				case ($field == $this->userObj->fieldPKName()):
 					$out = $this->userObj->getID();
 					break;
@@ -368,14 +368,14 @@ 
 	/**
 	 * ID пользователя
 	 */
-	public function UserID($type = 'web'){
+	public function UserID($type = 'web') {
 		return $this->modx->getLoginUserID($type);
 	}
 	/**
 	 * Если не авторизован - то отправить на страницу
 	 */
-	public function isGuestGoHome($params){
-		if(!$this->UserID('web')){
+	public function isGuestGoHome($params) {
+		if (!$this->UserID('web')) {
 			/**
 			 * @see : http://modx.im/blog/triks/105.html
 			 */
@@ -389,11 +389,11 @@ 
 	/**
 	 * Если авторизован - то открыть личный кабинет
 	 */
-	public function isAuthGoHome($params){
+	public function isAuthGoHome($params) {
 		$userID = $this->UserID('web');
-		if($userID>0){
+		if ($userID > 0) {
 			$id = APIHelpers::getkey($params, 'homeID');
-		    if(empty($id)){
+		    if (empty($id)) {
 				$id = $this->modx->getConfig('login_home', $this->config['site_start']);
 		    }
 		    $this->moveTo(compact('id'));
@@ -404,29 +404,29 @@ 
 	/**
 	 * Редирект
 	 */
-	public function moveTo($params){
+	public function moveTo($params) {
 		$id = (int)APIHelpers::getkey($params, 'id', 0);
 		$uri = APIHelpers::getkey($params, 'url', '');
-		if((empty($uri) && !empty($id)) || !is_string($uri)){
+		if ((empty($uri) && !empty($id)) || !is_string($uri)) {
 			$uri = $this->makeUrl($id);
 		}
 		$code = (int)APIHelpers::getkey($params, 'code', 0);
 		$addUrl = APIHelpers::getkey($params, 'addUrl', '');
-		if(is_scalar($addUrl) && $addUrl!=''){
+		if (is_scalar($addUrl) && $addUrl != '') {
 		    $uri .= "?".$addUrl;
 		}
-		if(APIHelpers::getkey($params, 'validate', false)){
-			if(isset($this->modx->snippetCache['getPageID'])){
+		if (APIHelpers::getkey($params, 'validate', false)) {
+			if (isset($this->modx->snippetCache['getPageID'])) {
 				$out = $this->modx->runSnippet('getPageID', compact('uri'));
-				if(empty($out)){
+				if (empty($out)) {
 					$uri = '';
 				}
-			}else{
+			} else {
 				$uri = APIhelpers::sanitarTag($uri);
 			}
-		}else{
+		} else {
 			//$modx->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.1 307 Temporary Redirect');
-			header("Location: ".$uri, true, ($code>0 ? $code : 307));
+			header("Location: ".$uri, true, ($code > 0 ? $code : 307));
 		}
 		return $uri;
 	}
@@ -437,52 +437,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)){
+		if (FS::getInstance()->checkFile($file)) {
 			$out = '@CODE: '.file_get_contents($file);
 		}
 		return $out;
 	}
-	protected static function loadLang($lang){
+	protected static function loadLang($lang) {
 		$file = dirname(dirname(__FILE__)).'/lang/'.$lang.'.php';
-		if( ! FS::getInstance()->checkFile($file)){
+		if (!FS::getInstance()->checkFile($file)) {
 			$file = false;
 		}
-		if(!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)){
+		if (!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)) {
 			static::$langDic[$lang] = include_once($file);
-			if(is_array(static::$langDic[$lang])){
+			if (is_array(static::$langDic[$lang])) {
 				static::$langDic[$lang] = APIHelpers::renameKeyArr(static::$langDic[$lang], $lang);
-			}else{
+			} else {
 				static::$langDic[$lang] = array();
 			}
 		}
 		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])){
+		if (isset($dic[$lng], $dic[$lng][$lng.'.'.$key])) {
 			$out = $dic[$lng][$lng.'.'.$key];
 		}
-		if(class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])){
+		if (class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])) {
 			$msg = self::$instance->modx->runSnippet('lang', array('a' => 'DLUsers.'.$key));
-			if(!empty($msg)){
+			if (!empty($msg)) {
 				$out = $msg;
 			}
 		}

Braces +17 added lines, -17 removed lines

@@ -116,11 +116,11 @@ 
 			    $start = $this->makeUrl($this->config['site_start']);
 			    if($start == $go){
 			        $go = $this->config['site_url'];
-			    }else{
+			    } else{
 			        $go = $this->config['site_url'].ltrim($go, '/');
 			    }
 			    $this->moveTo(array('url' => $go));
-    		}else{
+    		} else{
     			//Если юзер не авторизован, то показываем ему 404 ошибку
     			$this->modx->sendErrorPage();
     		}
@@ -168,7 +168,7 @@ 
 			if(!empty($homeID)){
 				$dataTPL['url.profile'] = $this->makeUrl($homeID);
 			}
-		}else{
+		} else{
 			$tpl = APIHelpers::getkey($params, 'tplForm', '');
 			if(empty($tpl)){
 				$tpl = $this->getTemplate('authForm');
@@ -218,12 +218,12 @@ 
 			 * 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{
+			} else{
 				$refer = '';
 			}
 		}
@@ -232,21 +232,21 @@ 
 			$backUrl = APIHelpers::getkey($_POST, 'backUrl', $POST['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']){
 		    $POST['backUrl'] = $backUrl['path'];
-		}else{
+		} else{
 			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');
 			if(empty($backUrl['host']) || $backUrl['host']==$selfHost){
 				$query = !empty($backUrl['query']) ? '?'.$backUrl['query'] : '';
 			    $POST['backUrl'] = !empty($backUrl['path']) ? $backUrl['path'].$query : '';
-			}else{
+			} else{
 				$POST['backUrl'] = '';
 			}
 		}
@@ -255,7 +255,7 @@ 
 				'url' => '/'.ltrim($POST['backUrl'], '/'),
 			    'validate' => true
 			));
-		}else{
+		} else{
 			$idURL = 0;
 		}
 		if(empty($idURL)){
@@ -320,16 +320,16 @@ 
 			                "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'] = '';
 			}
@@ -421,10 +421,10 @@ 
 				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));
 		}
@@ -444,7 +444,7 @@ 
 		}
 		if($this->url->containsKey($id)){
 			$url = $this->url->get($id);
-		}else{
+		} else{
 			$url = $this->modx->makeUrl($id);
 			$this->url->set($id, $url);
 		}
@@ -467,7 +467,7 @@ 
 			static::$langDic[$lang] = include_once($file);
 			if(is_array(static::$langDic[$lang])){
 				static::$langDic[$lang] = APIHelpers::renameKeyArr(static::$langDic[$lang], $lang);
-			}else{
+			} else{
 				static::$langDic[$lang] = array();
 			}
 		}

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

Doc Comments +13 added lines, -4 removed lines

@@ -394,6 +394,12 @@ 
     }
 
 
+    /**
+     * @param string $table
+     * @param string $alias
+     *
+     * @return string
+     */
     public function TableAlias($name, $table, $alias)
     {
         if (!$this->checkTableAlias($name, $table)) {
@@ -451,7 +457,7 @@ 
     /**
      * Разбор JSON строки при помощи json_decode
      *
-     * @param $json string строка c JSON
+     * @param string $json string строка c JSON
      * @param array $config ассоциативный массив с настройками для json_decode
      * @param bool $nop создавать ли пустой объект запрашиваемого типа
      * @return array|mixed|xNop
@@ -526,7 +532,7 @@ 
      * Удаление определенных данных из массива
      *
      * @param array $data массив с данными
-     * @param mixed $val значение которые необходимо удалить из массива
+     * @param string $val значение которые необходимо удалить из массива
      * @return array отчищеный массив с данными
      */
     private function unsetArrayVal($data, $val)
@@ -824,7 +830,7 @@ 
     /**
      * Получение строки из языкового пакета
      *
-     * @param $name имя записи в языковом пакете
+     * @param string $name имя записи в языковом пакете
      * @param string $def Строка по умолчанию, если запись в языковом пакете не будет обнаружена
      * @return string строка в соответствии с текущими языковыми настройками
      */
@@ -1113,6 +1119,9 @@ 
         return $this->outData;
     }
 
+    /**
+     * @param summary_DL_Extender $extSummary
+     */
     protected function getSummary(array $item = array(), $extSummary = null, $introField = '', $contentField = '')
     {
         $out = '';
@@ -1159,7 +1168,7 @@ 
     /**
      * Вытащить экземпляр класса экстендера из общего массива экстендеров
      *
-     * @param $name имя экстендера
+     * @param string $name имя экстендера
      * @param bool $autoload Если экстендер не загружен, то пытаться ли его загрузить
      * @param bool $nop если экстендер не загружен, то загружать ли xNop
      * @return null|xNop

Indentation +107 added lines, -107 removed lines

@@ -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);
     }
 
@@ -1363,10 +1363,10 @@ 
                     switch (true) {
                         case ('' != ($tmp = $this->getCFGDef('sortDir', ''))): //higher priority than order
                             $out['order'] = $tmp;
-							// no break
+                            // no break
                         case ('' != ($tmp = $this->getCFGDef('order', ''))):
                             $out['order'] = $tmp;
-							// no break
+                            // no break
                     }
                     if ('' == $out['order'] || !in_array(strtoupper($out['order']), array('ASC', 'DESC'))) {
                         $out['order'] = $orderDef; //Default
@@ -1487,10 +1487,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 : '';
     }
@@ -1509,7 +1509,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;

Spacing +87 added lines, -87 removed lines

@@ -17,13 +17,13 @@ 
  * @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");
-require_once(dirname(dirname(__FILE__)) . "/lib/sqlHelper.class.php");
-require_once(dirname(dirname(__FILE__)) . "/lib/DLTemplate.class.php");
-require_once(dirname(dirname(__FILE__)) . "/lib/DLCollection.class.php");
-require_once(dirname(dirname(__FILE__)) . "/lib/xnop.class.php");
+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");
+require_once(dirname(dirname(__FILE__))."/lib/sqlHelper.class.php");
+require_once(dirname(dirname(__FILE__))."/lib/DLTemplate.class.php");
+require_once(dirname(dirname(__FILE__))."/lib/DLCollection.class.php");
+require_once(dirname(dirname(__FILE__))."/lib/xnop.class.php");
 
 abstract class DocLister
 {
@@ -265,17 +265,17 @@ 
 	 * @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){
+					if ($open == 0) {
 						$res[] = $cur.')';
 						$cur = '';
 					} else {
@@ -287,7 +287,7 @@ 
 					$cur .= $e;
 					break;
 				case ';':
-					if($open == 0){
+					if ($open == 0) {
 						$res[] = $cur;
 						$cur = '';
 					} else {
@@ -299,7 +299,7 @@ 
 			}
 		}
 		$cur = preg_replace("/(\))$/u", '', $cur);
-		if ($cur != ''){
+		if ($cur != '') {
 			$res[] = $cur;
 		}
 		return $res;
@@ -349,8 +349,8 @@ 
                     ini_set('display_errors', 1);
                 }
                 $dir = dirname(dirname(__FILE__));
-                if (file_exists($dir . "/lib/DLdebug.class.php")) {
-                    include_once($dir . "/lib/DLdebug.class.php");
+                if (file_exists($dir."/lib/DLdebug.class.php")) {
+                    include_once($dir."/lib/DLdebug.class.php");
                     if (class_exists("DLdebug", false)) {
                         $this->debug = new DLdebug($this);
                     }
@@ -388,7 +388,7 @@ 
         }
         $table = $this->_table[$name];
         if (!empty($alias) && is_scalar($alias)) {
-            $table .= " as `" . $alias . "`";
+            $table .= " as `".$alias."`";
         }
         return $table;
     }
@@ -415,7 +415,7 @@ 
      */
     public function loadConfig($name)
     {
-        $this->debug->debug('Load json config: ' . $this->debug->dumpData($name), 'loadconfig', 2);
+        $this->debug->debug('Load json config: '.$this->debug->dumpData($name), 'loadconfig', 2);
         if (!is_scalar($name)) {
             $name = '';
         }
@@ -427,13 +427,13 @@ 
                 $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";
+                    $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;
             }
 
@@ -458,7 +458,7 @@ 
      */
     public function jsonDecode($json, $config = array(), $nop = false)
     {
-        $this->debug->debug('Decode JSON: ' . $this->debug->dumpData($json) . "\r\nwith config: " . $this->debug->dumpData($config), 'jsonDecode', 2);
+        $this->debug->debug('Decode JSON: '.$this->debug->dumpData($json)."\r\nwith config: ".$this->debug->dumpData($config), 'jsonDecode', 2);
         $config = jsonHelper::jsonDecode($json, $config, $nop);
         $this->isErrorJSON($json);
         $this->debug->debugEnd("jsonDecode");
@@ -475,7 +475,7 @@ 
     {
         $error = jsonHelper::json_last_error_msg();
         if (!in_array($error, array('error_none', 'other'))) {
-            $this->debug->error($this->getMsg('json.' . $error) . ": " . $this->debug->dumpData($json, 'code'), 'JSON');
+            $this->debug->error($this->getMsg('json.'.$error).": ".$this->debug->dumpData($json, 'code'), 'JSON');
             $error = true;
         }
         return $error;
@@ -600,7 +600,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();
 
@@ -621,8 +621,8 @@ 
     public function ErrorLogger($message, $code, $file, $line, $trace)
     {
         if (abs($this->getCFGDef('debug', '0')) == '1') {
-            echo "CODE #" . $code . "<br />";
-            echo "on file: " . $file . ":" . $line . "<br />";
+            echo "CODE #".$code."<br />";
+            echo "on file: ".$file.":".$line."<br />";
             echo "<pre>";
             var_dump($trace);
             echo "</pre>";
@@ -653,7 +653,7 @@ 
             $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');
 				}
             }
         }
@@ -731,7 +731,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;
     }
@@ -753,12 +753,12 @@ 
         }
         $out = array();
         foreach ($data as $item) {
-            if($item !== ''){
+            if ($item !== '') {
                 $out[] = $this->modx->db->escape($item);
             }
         }
         $q = $quote ? "'" : "";
-        $out = $q . implode($q . "," . $q, $out) . $q;
+        $out = $q.implode($q.",".$q, $out).$q;
         return $out;
     }
 
@@ -778,8 +778,8 @@ 
         if (empty($lang)) {
             $lang = $this->getCFGDef('lang', $this->modx->config['manager_language']);
         }
-        if (file_exists(dirname(dirname(__FILE__)) . "/lang/" . $lang . ".php")) {
-            $tmp = include(dirname(__FILE__) . "/lang/" . $lang . ".php");
+        if (file_exists(dirname(dirname(__FILE__))."/lang/".$lang.".php")) {
+            $tmp = include(dirname(__FILE__)."/lang/".$lang.".php");
             $this->_customLang = is_array($tmp) ? $tmp : array();
         }
         return $this->_customLang;
@@ -799,13 +799,13 @@ 
             $lang = $this->getCFGDef('lang', $this->modx->config['manager_language']);
         }
 
-        $this->debug->debug('Load language ' . $this->debug->dumpData($name) . "." . $this->debug->dumpData($lang), 'loadlang', 2);
+        $this->debug->debug('Load language '.$this->debug->dumpData($name).".".$this->debug->dumpData($lang), 'loadlang', 2);
         if (is_scalar($name)) {
             $name = array($name);
         }
         foreach ($name as $n) {
-            if (file_exists(dirname(__FILE__) . "/lang/" . $lang . "/" . $n . ".inc.php")) {
-                $tmp = include(dirname(__FILE__) . "/lang/" . $lang . "/" . $n . ".inc.php");
+            if (file_exists(dirname(__FILE__)."/lang/".$lang."/".$n.".inc.php")) {
+                $tmp = include(dirname(__FILE__)."/lang/".$lang."/".$n.".inc.php");
                 if (is_array($tmp)) {
                     /**
                      * Переименовыываем элементы массива из array('test'=>'data') в array('name.test'=>'data')
@@ -885,7 +885,7 @@ 
             }
         }
 
-        $data[$this->getCFGDef("sysKey", "dl") . ".wrap"] = $this->renderWrap($out);
+        $data[$this->getCFGDef("sysKey", "dl").".wrap"] = $this->renderWrap($out);
         $out = $this->parseChunk($this->getCFGDef('tpl', ''), $data);
         return $out;
     }
@@ -950,7 +950,7 @@ 
         );
         $out = DLTemplate::getInstance($this->getMODX())->parseChunk($name, $data, $parseDocumentSource);
         if (empty($out)) {
-            $this->debug->debug("Empty chunk: " . $this->debug->dumpData($name), '', 2);
+            $this->debug->debug("Empty chunk: ".$this->debug->dumpData($name), '', 2);
         }
         $this->debug->debugEnd("parseChunk");
         return $out;
@@ -977,13 +977,13 @@ 
      * @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);
+            $plh = array($this->getCFGDef("sysKey", "dl").".wrap" => $data);
             /**
             * @var $extPrepare prepare_DL_Extender
             */
@@ -997,13 +997,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",
@@ -1011,7 +1011,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");
@@ -1025,17 +1025,17 @@ 
     * @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);
 
-        $this->renderTPL = $this->getCFGDef('tplId' . $i, $this->renderTPL);
-        $this->renderTPL = $this->getCFGDef('tpl' . $iterationName, $this->renderTPL);
+        $this->renderTPL = $this->getCFGDef('tplId'.$i, $this->renderTPL);
+        $this->renderTPL = $this->getCFGDef('tpl'.$iterationName, $this->renderTPL);
 
-        $data[$this->getCFGDef("sysKey", "dl") . '.full_iteration'] = ($this->extPaginate) ? ($i + $this->getCFGDef('display', 0) * ($this->extPaginate->currentPage() - 1)) : $i;
+        $data[$this->getCFGDef("sysKey", "dl").'.full_iteration'] = ($this->extPaginate) ? ($i + $this->getCFGDef('display', 0) * ($this->extPaginate->currentPage() - 1)) : $i;
 
         if ($i == 1) {
             $this->renderTPL = $this->getCFGDef('tplFirst', $this->renderTPL);
@@ -1047,22 +1047,22 @@ 
         }
         if ($this->modx->documentIdentifier == $data['id']) {
             $this->renderTPL = $this->getCFGDef('tplCurrent', $this->renderTPL);
-            $data[$this->getCFGDef("sysKey", "dl") . '.active'] = 1; //[+active+] - 1 if $modx->documentIdentifer equal ID this element
+            $data[$this->getCFGDef("sysKey", "dl").'.active'] = 1; //[+active+] - 1 if $modx->documentIdentifer equal ID this element
             $class[] = $this->getCFGDef('currentClass', 'current');
         } else {
-            $data[$this->getCFGDef("sysKey", "dl") . '.active'] = 0;
+            $data[$this->getCFGDef("sysKey", "dl").'.active'] = 0;
         }
 
         $class = implode(" ", $class);
-        $data[$this->getCFGDef("sysKey", "dl") . '.class'] = $class;
+        $data[$this->getCFGDef("sysKey", "dl").'.class'] = $class;
 
         /**
         * @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');
@@ -1148,7 +1148,7 @@ 
      */
     public function checkExtender($name)
     {
-        return (isset($this->extender[$name]) && $this->extender[$name] instanceof $name . "_DL_Extender");
+        return (isset($this->extender[$name]) && $this->extender[$name] instanceof $name."_DL_Extender");
     }
 
     public function setExtender($name, $obj)
@@ -1184,17 +1184,17 @@ 
      */
     protected function _loadExtender($name)
     {
-        $this->debug->debug('Load Extender ' . $this->debug->dumpData($name), 'LoadExtender', 2);
+        $this->debug->debug('Load Extender '.$this->debug->dumpData($name), 'LoadExtender', 2);
         $flag = false;
 
-        $classname = ($name != '') ? $name . "_DL_Extender" : "";
+        $classname = ($name != '') ? $name."_DL_Extender" : "";
         if ($classname != '' && isset($this->extender[$name]) && $this->extender[$name] instanceof $classname) {
             $flag = true;
 
         } else {
             if (!class_exists($classname, false) && $classname != '') {
-                if (file_exists(dirname(__FILE__) . "/extender/" . $name . ".extender.inc")) {
-                    include_once(dirname(__FILE__) . "/extender/" . $name . ".extender.inc");
+                if (file_exists(dirname(__FILE__)."/extender/".$name.".extender.inc")) {
+                    include_once(dirname(__FILE__)."/extender/".$name.".extender.inc");
                 }
             }
             if (class_exists($classname, false) && $classname != '') {
@@ -1203,7 +1203,7 @@ 
             }
         }
         if (!$flag) {
-            $this->debug->debug("Error load Extender " . $this->debug->dumpData($name));
+            $this->debug->debug("Error load Extender ".$this->debug->dumpData($name));
         }
         $this->debug->debugEnd('LoadExtender');
         return $flag;
@@ -1221,7 +1221,7 @@ 
      */
     public function setIDs($IDs)
     {
-        $this->debug->debug('set ID list ' . $this->debug->dumpData($IDs), 'setIDs', 2);
+        $this->debug->debug('set ID list '.$this->debug->dumpData($IDs), 'setIDs', 2);
         $IDs = $this->cleanIDs($IDs);
         $type = $this->getCFGDef('idType', 'parents');
         $depth = $this->getCFGDef('depth', '');
@@ -1252,7 +1252,7 @@ 
      */
     public function cleanIDs($IDs, $sep = ',')
     {
-        $this->debug->debug('clean IDs ' . $this->debug->dumpData($IDs) . ' with separator ' . $this->debug->dumpData($sep), 'cleanIDs', 2);
+        $this->debug->debug('clean IDs '.$this->debug->dumpData($IDs).' with separator '.$this->debug->dumpData($sep), 'cleanIDs', 2);
         $out = array();
         if (!is_array($IDs)) {
             $IDs = explode($sep, $IDs);
@@ -1296,7 +1296,7 @@ 
         return $out;
     }
 
-	public function docsCollection(){
+	public function docsCollection() {
         return new DLCollection($this->modx, $this->_docs);
     }
 
@@ -1324,7 +1324,7 @@ 
     {
         $out = '';
         if ($group != '') {
-            $out = 'GROUP BY ' . $group;
+            $out = 'GROUP BY '.$group;
         }
         return $out;
     }
@@ -1353,7 +1353,7 @@ 
                 $idList = $this->sanitarIn($this->IDs, ',', false);
                 $out = array('orderBy' => "FIND_IN_SET({$this->getCFGDef('sortBy', $this->getPK())}, '{$idList}')");
                 $this->setConfig($out); //reload config;
-                $sort = "ORDER BY " . $out['orderBy'];
+                $sort = "ORDER BY ".$out['orderBy'];
                 break;
             default:
                 $out = array('orderBy' => '', 'order' => '', 'sortBy' => '');
@@ -1373,13 +1373,13 @@ 
                     }
 
                     $out['sortBy'] = (($tmp = $this->getCFGDef('sortBy', '')) != '') ? $tmp : $sortName;
-                    $out['orderBy'] = $out['sortBy'] . " " . $out['order'];
+                    $out['orderBy'] = $out['sortBy']." ".$out['order'];
                 }
                 $this->setConfig($out); //reload config;
-                $sort = "ORDER BY " . $out['orderBy'];
+                $sort = "ORDER BY ".$out['orderBy'];
                 break;
         }
-        $this->debug->debugEnd("sortORDER", 'Get sort order for SQL: ' . $this->debug->dumpData($sort));
+        $this->debug->debugEnd("sortORDER", 'Get sort order for SQL: '.$this->debug->dumpData($sort));
         return $sort;
     }
 
@@ -1406,17 +1406,17 @@ 
         }
 
         if ($limit != 0) {
-            $ret = "LIMIT " . (int)$offset . "," . (int)$limit;
+            $ret = "LIMIT ".(int)$offset.",".(int)$limit;
         } else {
             if ($offset != 0) {
                 /**
                  * To retrieve all rows from a certain offset up to the end of the result set, you can use some large number for the second parameter
                  * @see http://dev.mysql.com/doc/refman/5.0/en/select.html
                  */
-                $ret = "LIMIT " . (int)$offset . ",18446744073709551615";
+                $ret = "LIMIT ".(int)$offset.",18446744073709551615";
             }
         }
-        $this->debug->debugEnd("limitSQL", "Get limit for SQL: " . $this->debug->dumpData($ret));
+        $this->debug->debugEnd("limitSQL", "Get limit for SQL: ".$this->debug->dumpData($ret));
         return $ret;
     }
 
@@ -1455,18 +1455,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;
             }
@@ -1491,7 +1491,7 @@ 
     * По умолчанию это parent. Переопределить можно в контроллере присвоив другое значение переменной parentField
     * @return string Parent Key основной таблицы
     */
-    public function getParentField(){
+    public function getParentField() {
         return isset($this->parentField) ? $this->parentField : '';
     }
     /**
@@ -1503,7 +1503,7 @@ 
      */
     protected function getFilters($filter_string)
     {
-        $this->debug->debug("getFilters: " . $this->debug->dumpData($filter_string), 'getFilter', 1);
+        $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;
@@ -1522,14 +1522,14 @@ 
                     if ($subfilter['where']) $wheres[] = $subfilter['where'];
                 }
                 $output['join'] = !empty($joins) ? implode(' ', $joins) : '';
-                $output['where'] = !empty($wheres) ? '(' . implode($sql, $wheres) . ')' : '';
+                $output['where'] = !empty($wheres) ? '('.implode($sql, $wheres).')' : '';
             }
         }
 
         if (!$logic_op_found) {
             $filter = $this->loadFilter($filter_string);
             if (!$filter) {
-                $this->debug->warning('Error while loading DocLister filter "' . $this->debug->dumpData($filter_string) . '": check syntax!');
+                $this->debug->warning('Error while loading DocLister filter "'.$this->debug->dumpData($filter_string).'": check syntax!');
                 $output = false;
             } else {
                 $output['join'] = $filter->get_join();
@@ -1562,19 +1562,19 @@ 
         $type = trim($type);
         switch (strtoupper($type)) {
             case 'DECIMAL':
-                $field = 'CAST(' . $field . ' as DECIMAL(10,2))';
+                $field = 'CAST('.$field.' as DECIMAL(10,2))';
                 break;
             case 'UNSIGNED':
-                $field = 'CAST(' . $field . ' as UNSIGNED)';
+                $field = 'CAST('.$field.' as UNSIGNED)';
                 break;
             case 'BINARY':
-                $field = 'CAST(' . $field . ' as BINARY)';
+                $field = 'CAST('.$field.' as BINARY)';
                 break;
             case 'DATETIME':
-                $field = 'CAST(' . $field . ' as DATETIME)';
+                $field = 'CAST('.$field.' as DATETIME)';
                 break;
             case 'SIGNED':
-                $field = 'CAST(' . $field . ' as SIGNED)';
+                $field = 'CAST('.$field.' as SIGNED)';
                 break;
         }
         return $field;
@@ -1587,17 +1587,17 @@ 
      */
     protected function loadFilter($filter)
     {
-        $this->debug->debug('Load filter ' . $this->debug->dumpData($filter), 'loadFilter', 2);
+        $this->debug->debug('Load filter '.$this->debug->dumpData($filter), 'loadFilter', 2);
         $out = false;
         $fltr_params = explode(':', $filter, 2);
         $fltr = APIHelpers::getkey($fltr_params, 0, null);
         // check if the filter is implemented
-        if (!is_null($fltr) && file_exists(dirname(__FILE__) . '/filter/' . $fltr . '.filter.php')) {
-            require_once dirname(__FILE__) . '/filter/' . $fltr . '.filter.php';
+        if (!is_null($fltr) && file_exists(dirname(__FILE__).'/filter/'.$fltr.'.filter.php')) {
+            require_once dirname(__FILE__).'/filter/'.$fltr.'.filter.php';
             /**
              * @var tv_DL_filter|content_DL_filter $fltr_class
              */
-            $fltr_class = $fltr . '_DL_filter';
+            $fltr_class = $fltr.'_DL_filter';
             $this->totalFilters++;
             $fltr_obj = new $fltr_class();
             if ($fltr_obj->init($this, $filter)) {
@@ -1655,7 +1655,7 @@ 
     public function getRequest()
     {
         $URL = null;
-        parse_str(parse_url(MODX_SITE_URL . $_SERVER['REQUEST_URI'], PHP_URL_QUERY), $URL);
+        parse_str(parse_url(MODX_SITE_URL.$_SERVER['REQUEST_URI'], PHP_URL_QUERY), $URL);
         return http_build_query(array_merge($URL, array(DocLister::AliasRequest => null)));
     }
 }
\ No newline at end of file

Braces +21 added lines, -7 removed lines

@@ -202,7 +202,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');
 		}
@@ -727,7 +729,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(
@@ -1459,7 +1463,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;
         }
@@ -1506,7 +1512,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();
@@ -1517,9 +1525,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) . ')' : '';

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

Doc Comments -1 removed lines

@@ -61,7 +61,6 @@
      * Вызов экстенедара с параметрами полученными в этой функции
      *
      * @param DocLister $DocLister объект класса DocLister
-     * @param mixed $config , ... неограниченное число параметров (используются для конфигурации экстендера)
      * @return mixed ответ от экстендера (как правило это string)
      */
     public function init($DocLister)

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 if (!defined('MODX_BASE_PATH')) {
     die('HACK???');
 }
-include_once(MODX_BASE_PATH . 'assets/lib/APIHelpers.class.php');
+include_once(MODX_BASE_PATH.'assets/lib/APIHelpers.class.php');
 abstract class extDocLister
 {
     /**
@@ -66,7 +66,7 @@ 
      */
     public function init($DocLister)
     {
-        $this->DocLister->debug->debug('Run extender ' . get_class($this), 'runExtender', 2);
+        $this->DocLister->debug->debug('Run extender '.get_class($this), 'runExtender', 2);
         $flag = false;
         if ($DocLister instanceof DocLister) {
             $this->DocLister = $DocLister;

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

Doc Comments +4 added lines, -4 removed lines

@@ -116,10 +116,10 @@
     /**
      * Конструктор условий для WHERE секции
      *
-     * @param $table_alias алиас таблицы
-     * @param $field поле для фильтрации
-     * @param $operator оператор сопоставления
-     * @param $value искомое значение
+     * @param string $table_alias алиас таблицы
+     * @param string $field поле для фильтрации
+     * @param string $operator оператор сопоставления
+     * @param string $value искомое значение
      * @return string
      */
     protected function build_sql_where($table_alias, $field, $operator, $value)

Spacing +11 added lines, -11 removed lines

@@ -124,35 +124,35 @@ 
      */
     protected function build_sql_where($table_alias, $field, $operator, $value)
     {
-        $this->DocLister->debug->debug('Build SQL query for filters: ' . $this->DocLister->debug->dumpData(func_get_args()), 'buildQuery', 2);
+        $this->DocLister->debug->debug('Build SQL query for filters: '.$this->DocLister->debug->dumpData(func_get_args()), 'buildQuery', 2);
         $output = sqlHelper::tildeField($field, $table_alias);
 
         switch ($operator) {
             case '=':
             case 'eq':
             case 'is':
-                $output .= " = '" . $this->modx->db->escape($value) . "'";
+                $output .= " = '".$this->modx->db->escape($value)."'";
                 break;
             case '!=':
             case 'no':
             case 'isnot':
-                $output .= " != '" . $this->modx->db->escape($value) . "'";
+                $output .= " != '".$this->modx->db->escape($value)."'";
                 break;
             case '>':
             case 'gt':
-                $output .= ' > ' . str_replace(',','.',floatval($value));
+                $output .= ' > '.str_replace(',', '.', floatval($value));
                 break;
             case '<':
             case 'lt':
-                $output .= ' < ' . str_replace(',','.',floatval($value));
+                $output .= ' < '.str_replace(',', '.', floatval($value));
                 break;
             case '<=':
             case 'elt':
-                $output .= ' <= ' . str_replace(',','.',floatval($value));
+                $output .= ' <= '.str_replace(',', '.', floatval($value));
                 break;
             case '>=':
             case 'egt':
-                $output .= ' >= ' . str_replace(',','.',floatval($value));
+                $output .= ' >= '.str_replace(',', '.', floatval($value));
                 break;
             case '%':
             case 'like':
@@ -165,7 +165,7 @@ 
                 $output = $this->DocLister->LikeEscape($output, $value, '=', '%[+value+]');
                 break;
             case 'regexp':
-                $output .= " REGEXP '" . $this->modx->db->escape($value) . "'";
+                $output .= " REGEXP '".$this->modx->db->escape($value)."'";
                 break;
             case 'against':
                 /** content:pagetitle,description,content,introtext:against:искомая строка */
@@ -188,16 +188,16 @@ 
                     $word_arr[] = $this->DocLister->LikeEscape($output, $word);
                 }
                 if (!empty($word_arr)) {
-                    $output = '(' . implode(' OR ', $word_arr) . ')';
+                    $output = '('.implode(' OR ', $word_arr).')';
                 } else {
                     $output = '';
                 }
                 break;
             case 'in':
-                $output .= ' IN(' . $this->DocLister->sanitarIn($value, ',', true) . ')';
+                $output .= ' IN('.$this->DocLister->sanitarIn($value, ',', true).')';
                 break;
             case 'notin':
-                $output .= ' NOT IN(' . $this->DocLister->sanitarIn($value, ',', true) . ')';
+                $output .= ' NOT IN('.$this->DocLister->sanitarIn($value, ',', true).')';
                 break;
             default:
                 $output = '';

assets/snippets/DLUsers/lang/russian-UTF8.php

Indentation +5 added lines, -5 removed lines

@@ -4,11 +4,11 @@
 }
 
 $_lang = array(
-	'error' => array(
-		'incorrect_mail' => 'Указан (если вообще указан) не корректный email',
-		'no_user' => 'Пользователь не обнаружен или заблокирован',
-		'incorrect_password' => 'Не удалось авторизоваться. Пароль указан не верно или в плагине отказали в авторизации'
-	)
+    'error' => array(
+        'incorrect_mail' => 'Указан (если вообще указан) не корректный email',
+        'no_user' => 'Пользователь не обнаружен или заблокирован',
+        'incorrect_password' => 'Не удалось авторизоваться. Пароль указан не верно или в плагине отказали в авторизации'
+    )
 );
 
 return $_lang;
\ No newline at end of file

assets/snippets/DLUsers/plugin.DLLogout.php

Indentation +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 if(!defined('MODX_BASE_PATH')){die('What are you doing? Get out of here!');}
 if ($modx->event->name == 'OnWebPagePrerender' && $modx->getLoginUserID('web')){
-	$snippetName = (isset($snippetName) && is_string($snippetName)) ? $snippetName : 'DLUsers';
+    $snippetName = (isset($snippetName) && is_string($snippetName)) ? $snippetName : 'DLUsers';
     $modx->runSnippet($snippetName, array(
         'action' => 'logout'
     ));

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
-if(!defined('MODX_BASE_PATH')){die('What are you doing? Get out of here!');}
-if ($modx->event->name == 'OnWebPagePrerender' && $modx->getLoginUserID('web')){
+if (!defined('MODX_BASE_PATH')) {die('What are you doing? Get out of here!'); }
+if ($modx->event->name == 'OnWebPagePrerender' && $modx->getLoginUserID('web')) {
 	$snippetName = (isset($snippetName) && is_string($snippetName)) ? $snippetName : 'DLUsers';
     $modx->runSnippet($snippetName, array(
         'action' => 'logout'

assets/snippets/DLUsers/snippet.DLUsers.php

Spacing +2 added lines, -2 removed lines

@@ -1,12 +1,12 @@
 <?php
-include_once(MODX_BASE_PATH . 'assets/snippets/DLUsers/src/Actions.php');
+include_once(MODX_BASE_PATH.'assets/snippets/DLUsers/src/Actions.php');
 $params = is_array($modx->event->params) ? $modx->event->params : array();
 $action = APIHelpers::getkey($params, 'action', '');
 $lang = APIHelpers::getkey($params, 'lang', $modx->getConfig('manager_language'));
 $userClass = APIHelpers::getkey($params, 'userClass', 'modUsers');
 $DLUsers = \DLUsers\Actions::getInstance($modx, $lang, $userClass);
 $out = '';
-if(!empty($action) && method_exists($DLUsers, $action)) {
+if (!empty($action) && method_exists($DLUsers, $action)) {
     $out = call_user_func_array(array($DLUsers, $action), array($params));
 }
 return $out;
\ No newline at end of file