AgelxNash / DocLister

assets/snippets/DLUsers/src/Actions.php

Indentation +403 added lines, -403 removed lines

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

     protected $modx = null;

     public $userObj = null;

-	/**

-	 * @var DLCollection

-	 */

+    /**

+     * @var DLCollection

+     */

     public $url;

     protected static $lang = null;

     protected static $langDic = array();

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

     protected static $instance;

 

-	protected $config = array();

+    protected $config = array();

 

     /**

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

@@ -50,15 +50,15 @@ 
     private function __construct(DocumentParser $modx, $userClass, $debug)

     {

         $this->modx = $modx;

-		$this->userObj = new $userClass($this->modx, $debug);

-		$this->url = new DLCollection($this->modx);

+        $this->userObj = new $userClass($this->modx, $debug);

+        $this->url = new DLCollection($this->modx);

 

-		$site_url = $this->modx->getConfig('site_url');

-		$site_start = $this->modx->getConfig('site_start', 1);

-		$error_page = $this->modx->getConfig('error_page', $site_start);

-		$unauthorized_page = $this->modx->getConfig('unauthorized_page', $error_page);

+        $site_url = $this->modx->getConfig('site_url');

+        $site_start = $this->modx->getConfig('site_start', 1);

+        $error_page = $this->modx->getConfig('error_page', $site_start);

+        $unauthorized_page = $this->modx->getConfig('unauthorized_page', $error_page);

 

-		$this->config = compact('site_url', 'site_start', 'error_page', 'unauthorized_page');

+        $this->config = compact('site_url', 'site_start', 'error_page', 'unauthorized_page');

     }

 

     /**

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

      */

     public function logout($params){

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

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

-    		$type = 'web';

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

-    		if($userID){

-    			$this->userObj->edit($userID);

-    			if($this->userObj->getID()){

-	    			$this->modx->invokeEvent("OnBeforeWebLogout", array(

-		    			"userid"   => $this->userObj->getID(),

-		    			"username" => $this->userObj->get('username')

-		    		));

-	    		}

-		    	$this->userObj->logOut();

-		    	if($this->userObj->getID()){

-		    		$this->modx->invokeEvent("OnWebLogout", array(

-		    			"userid"        => $this->userObj->getID(),

-		    			"username"      => $this->userObj->get('username')

-		    		));

-		    	}

-

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

-			    if(empty($go)){

-			    	$go = str_replace(

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

-			    		array("", ""),

-			    		$_SERVER['REQUEST_URI']

-			    	);

-			    }

-

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

-			    if($start == $go){

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

-			    }else{

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

-			    }

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

-    		}else{

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

-    			$this->modx->sendErrorPage();

-    		}

-		}

-	    return true;

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

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

+            $type = 'web';

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

+            if($userID){

+                $this->userObj->edit($userID);

+                if($this->userObj->getID()){

+                    $this->modx->invokeEvent("OnBeforeWebLogout", array(

+                        "userid"   => $this->userObj->getID(),

+                        "username" => $this->userObj->get('username')

+                    ));

+                }

+                $this->userObj->logOut();

+                if($this->userObj->getID()){

+                    $this->modx->invokeEvent("OnWebLogout", array(

+                        "userid"        => $this->userObj->getID(),

+                        "username"      => $this->userObj->get('username')

+                    ));

+                }

+

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

+                if(empty($go)){

+                    $go = str_replace(

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

+                        array("", ""),

+                        $_SERVER['REQUEST_URI']

+                    );

+                }

+

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

+                if($start == $go){

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

+                }else{

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

+                }

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

+            }else{

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

+                $this->modx->sendErrorPage();

+            }

+        }

+        return true;

     }

 

     /**

@@ -134,14 +134,14 @@ 
      * @return string

      */

     public function logoutUrl($params){

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

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

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

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

 

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

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

-    	$query = '?'.$LogoutName;

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

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

+        $query = '?'.$LogoutName;

 

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

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

     }

 

     /**

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

      */

     public function AuthBlock($params){

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

-

-    	$error = $errorCode = '';

-

-    	$pwdField = APIHelpers::getkey($params, 'pwdField', 'password');

-		$emailField = APIHelpers::getkey($params, 'emailField', 'email');

-		$rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');

-

-    	$type = 'web';

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

-			$tpl = APIHelpers::getkey($params, 'tplProfile', '');

-			if(empty($tpl)){

-				$tpl = $this->getTemplate('tplProfile');

-			}

-			$dataTPL = $this->userObj->toArray();

-			$dataTPL['url.logout'] = $this->logoutUrl($params);

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

-			if(!empty($homeID)){

-				$dataTPL['url.profile'] = $this->makeUrl($homeID);

-			}

-		}else{

-			$tpl = APIHelpers::getkey($params, 'tplForm', '');

-			if(empty($tpl)){

-				$tpl = $this->getTemplate('authForm');

-			}

-			$POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);

-	    	$dataTPL = array(

-				'backUrl' => APIHelpers::getkey($POST, 'backUrl', ''),

-				'emailValue' => APIHelpers::getkey($POST, 'email', ''),

-				'emailField' => $emailField,

-				'pwdField' => $pwdField,

-		    	'method' => strtolower(__METHOD__),

-				'error' => $error,

-				'errorCode' => $errorCode

-			);

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

-			if(!empty($authId)){

-				$dataTPL['authPage'] = $this->makeUrl($authId);

-				$dataTPL['method'] = strtolower(__CLASS__ . '::'. 'authpage');

-			}

-		}

-		return DLTemplate::getInstance($this->modx)->parseChunk($tpl, $dataTPL);

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

+

+        $error = $errorCode = '';

+

+        $pwdField = APIHelpers::getkey($params, 'pwdField', 'password');

+        $emailField = APIHelpers::getkey($params, 'emailField', 'email');

+        $rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');

+

+        $type = 'web';

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

+            $tpl = APIHelpers::getkey($params, 'tplProfile', '');

+            if(empty($tpl)){

+                $tpl = $this->getTemplate('tplProfile');

+            }

+            $dataTPL = $this->userObj->toArray();

+            $dataTPL['url.logout'] = $this->logoutUrl($params);

+            $homeID = APIHelpers::getkey($params, 'homeID');

+            if(!empty($homeID)){

+                $dataTPL['url.profile'] = $this->makeUrl($homeID);

+            }

+        }else{

+            $tpl = APIHelpers::getkey($params, 'tplForm', '');

+            if(empty($tpl)){

+                $tpl = $this->getTemplate('authForm');

+            }

+            $POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);

+            $dataTPL = array(

+                'backUrl' => APIHelpers::getkey($POST, 'backUrl', ''),

+                'emailValue' => APIHelpers::getkey($POST, 'email', ''),

+                'emailField' => $emailField,

+                'pwdField' => $pwdField,

+                'method' => strtolower(__METHOD__),

+                'error' => $error,

+                'errorCode' => $errorCode

+            );

+            $authId = APIHelpers::getkey($params, 'authId');

+            if(!empty($authId)){

+                $dataTPL['authPage'] = $this->makeUrl($authId);

+                $dataTPL['method'] = strtolower(__CLASS__ . '::'. 'authpage');

+            }

+        }

+        return DLTemplate::getInstance($this->modx)->parseChunk($tpl, $dataTPL);

     }

 

-	/**

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

-	 * [!Auth? &login=`password` &pwdField=`password` &homeID=`72`!]

-	 */

-	public function AuthPage($params){

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

-		$this->isAuthGoHome(array('id' => $homeID));

-

-		$error = $errorCode = '';

-		$POST = array('backUrl' => '');

-

-		$pwdField = APIHelpers::getkey($params, 'pwdField', 'password');

-		$emailField = APIHelpers::getkey($params, 'emailField', 'email');

-		$rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');

-

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

-		if(empty($tpl)){

-			$tpl = $this->getTemplate('authForm');

-		}

-

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

-		if(!empty($_SERVER['HTTP_REFERER'])){

-			/**

-			 * Thank you for super protection against hacking in protect.inc.php:-)

-			 */

-			$refer = htmlspecialchars_decode($_SERVER['HTTP_REFERER'], ENT_QUOTES);

-		}else{

-			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');

-			if(empty( $request['host']) ||  $request['host']==$selfHost){

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

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

-			}else{

-				$refer = '';

-			}

-		}

-

-		if($_SERVER['REQUEST_METHOD'] == 'POST'){

-			$backUrl = APIHelpers::getkey($_POST, 'backUrl', $POST['backUrl']);

-			if(!is_scalar($backUrl)){

-				$backUrl = $refer;

-			}else{

-				$backUrl = urldecode($backUrl);

-			}

-		}else{

-			$backUrl = $refer;

-		}

-		$backUrl = parse_url($backUrl);

-		if(!empty($backUrl['path']) && $request['path'] != $backUrl['path']){

-		    $POST['backUrl'] = $backUrl['path'];

-		}else{

-			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');

-			if(empty($uri['host']) || $uri['host']==$selfHost){

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

-			    $POST['backUrl'] = !empty($uri['path']) ? $uri['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)){

-				$openUser = $userObj->edit($POST['email']);

-

-				$this->modx->invokeEvent("OnBeforeWebLogin", array(

-		            "username"		=> $POST['email'],

-		            "userpassword"	=> $POST['password'],

-		            "rememberme"	=> $POST['remember'],

-		            'userObj'		=> $userObj

-		        ));

-				if($userObj->getID() && !$userObj->checkBlock($userObj->getID())){

-					$pluginFlag = $this->modx->invokeEvent("OnWebAuthentication", array(

-	                    "userid"        => $userObj->getID(),

-	                    "username"      => $userObj->get('username'),

-	                    "userpassword"  => $POST['password'],

-	                    "savedpassword" => $userObj->get('password'),

-	                    "rememberme"    => $POST['remember'],

-	                ));

-					if(

-						($pluginFlag === true || $userObj->testAuth($userObj->getID(), $POST['password'], 0))

-							&&

-						$userObj->authUser($userObj->getID(), $POST['remember'])

-					){

-						$userObj->set('logincount', (int)$userObj->get('logincount') + 1);

-						$userObj->set('lastlogin', time());

-						$userObj->set('failedlogincount', 0);

-						$userObj->save(false, false);

-

-						$this->modx->invokeEvent("OnWebLogin", array(

-			                "userid"		=> $userObj->getID(),

-			                "username"		=> $userObj->get('username'),

-			                "userpassword"	=> $POST['password'],

-			                "rememberme"	=> $POST['remember'],

-			            ));

-						$this->moveTo(array('url' => urldecode($POST['backUrl'])));

-					}else{

-						$userObj->set('failedlogincount', (int)$userObj->get('failedlogincount') + 1);

-						$userObj->save(false, false);

-

-						$error = 'error.incorrect_password';

-					}

-				}else{

-					$error = 'error.no_user';

-				}

-			}else{

-				$error = 'error.incorrect_mail';

-				$POST['email'] = '';

-			}

-		}

-		if(!empty($error)){

-			$errorCode = $error;

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

-			$error = static::getLangMsg($error, $error);

-		}

-		return $POST;

-	}

-	/**

-	 * Информация о пользователе

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

-	 */

-	public function UserInfo($params){

-		$out = '';

-		$type = 'web';

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

-		if(empty($userID)){

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

-		}

-		$field = APIHelpers::getkey($params, 'field', 'username');

-		if($userID > 0){

-			$this->userObj->edit($userID);

-			switch(true){

-				case ($field == $this->userObj->fieldPKName()):{

-					$out = $this->userObj->getID();

-					break;

-				}

-				case ($this->userObj->issetField($field)):{

-					$out = $this->userObj->get($field);

-					break;

-				}

-			}

-		}

-		return $out;

-	}

-	/**

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

-	 */

-	public function UserID($params){

-		$type = 'web';

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

-	}

-	/**

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

-	 */

-	public function isGuestGoHome($params){

-		$type = 'web';

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

-			/**

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

-			 */

-			$this->modx->invokeEvent('OnPageUnauthorized');

-			$id = APIHelpers::getkey($params, 'id', $this->config['unauthorized_page']);

-		    $this->moveTo(compact('id'));

-		}

-		return;

-	}

-

-	/**

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

-	 */

-	public function isAuthGoHome($params){

-		$type = 'web';

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

-		if($userID>0){

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

-		    if(empty($id)){

-				$id = $this->modx->getConfig('login_home', $this->config['site_start']);

-		    }

-		    $this->moveTo(compact('id'));

-		}

-		return;

-	}

-

-	/**

-	 * Редирект

-	 */

-	public function moveTo($params){

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

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

-		if((empty($uri) && !empty($id)) || !is_string($uri)){

-			$uri = $this->makeUrl($id);

-		}

-		$code = (int)APIHelpers::getkey($params, 'code', 0);

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

-		if(is_scalar($addUrl) && $addUrl!=''){

-		    $uri .= "?".$addUrl;

-		}

-		if(APIHelpers::getkey($params, 'validate', false)){

-			if(isset($this->modx->snippetCache['getPageID'])){

-				$out = $this->modx->runSnippet('getPageID', compact('uri'));

-				if(empty($out)){

-					$uri = '';

-				}

-			}else{

-				$uri = APIhelpers::sanitarTag($uri);

-			}

-		}else{

-			//$modx->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.1 307 Temporary Redirect');

-			header("Location: ".$uri, true, ($code>0 ? $code : 307));

-		}

-		return $uri;

-	}

-

-	/**

-	 * Создание ссылки на страницу

-	 *

-	 * @param  int $id ID документа

-	 * @return string

-	 */

-	protected function makeUrl($id = null){

-		$id = (int)$id;

-		if($id <= 0){

-			$id = $this->modx->documentObject['id'];

-		}

-		if($this->url->containsKey($id)){

-			$url = $this->url->get($id);

-		}else{

-			$url = $this->modx->makeUrl($id);

-			$this->url->set($id, $url);

-		}

-		return $url;

-	}

-	protected function getTemplate($name){

-		$out = '';

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

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

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

-		}

-		return $out;

-	}

-	protected static function loadLang($lang){

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

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

-			$file = false;

-		}

-		if(!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)){

-			static::$langDic[$lang] = include_once($file);

-			if(is_array(static::$langDic[$lang])){

-				static::$langDic[$lang] = APIHelpers::renameKeyArr(static::$langDic[$lang], $lang);

-			}else{

-				static::$langDic[$lang] = array();

-			}

-		}

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

-	}

-	protected static function getLangMsg($key, $default){

-		$out = $default;

-		$lng = static::$lang;

-		$dic = static::$langDic;

-		if(isset($dic[$lng], $dic[$lng][$lng.'.'.$key])){

-			$out = $dic[$lng][$lng.'.'.$key];

-		}

-		if(class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])){

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

-			if(!empty($msg)){

-				$out = $msg;

-			}

-		}

-		return $out;

-	}

+    /**

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

+     * [!Auth? &login=`password` &pwdField=`password` &homeID=`72`!]

+     */

+    public function AuthPage($params){

+        $homeID = APIHelpers::getkey($params, 'homeID');

+        $this->isAuthGoHome(array('id' => $homeID));

+

+        $error = $errorCode = '';

+        $POST = array('backUrl' => '');

+

+        $pwdField = APIHelpers::getkey($params, 'pwdField', 'password');

+        $emailField = APIHelpers::getkey($params, 'emailField', 'email');

+        $rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');

+

+        $tpl = APIHelpers::getkey($params, 'tpl', '');

+        if(empty($tpl)){

+            $tpl = $this->getTemplate('authForm');

+        }

+

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

+        if(!empty($_SERVER['HTTP_REFERER'])){

+            /**

+             * Thank you for super protection against hacking in protect.inc.php:-)

+             */

+            $refer = htmlspecialchars_decode($_SERVER['HTTP_REFERER'], ENT_QUOTES);

+        }else{

+            $selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');

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

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

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

+            }else{

+                $refer = '';

+            }

+        }

+

+        if($_SERVER['REQUEST_METHOD'] == 'POST'){

+            $backUrl = APIHelpers::getkey($_POST, 'backUrl', $POST['backUrl']);

+            if(!is_scalar($backUrl)){

+                $backUrl = $refer;

+            }else{

+                $backUrl = urldecode($backUrl);

+            }

+        }else{

+            $backUrl = $refer;

+        }

+        $backUrl = parse_url($backUrl);

+        if(!empty($backUrl['path']) && $request['path'] != $backUrl['path']){

+            $POST['backUrl'] = $backUrl['path'];

+        }else{

+            $selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');

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

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

+                $POST['backUrl'] = !empty($uri['path']) ? $uri['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)){

+                $openUser = $userObj->edit($POST['email']);

+

+                $this->modx->invokeEvent("OnBeforeWebLogin", array(

+                    "username"		=> $POST['email'],

+                    "userpassword"	=> $POST['password'],

+                    "rememberme"	=> $POST['remember'],

+                    'userObj'		=> $userObj

+                ));

+                if($userObj->getID() && !$userObj->checkBlock($userObj->getID())){

+                    $pluginFlag = $this->modx->invokeEvent("OnWebAuthentication", array(

+                        "userid"        => $userObj->getID(),

+                        "username"      => $userObj->get('username'),

+                        "userpassword"  => $POST['password'],

+                        "savedpassword" => $userObj->get('password'),

+                        "rememberme"    => $POST['remember'],

+                    ));

+                    if(

+                        ($pluginFlag === true || $userObj->testAuth($userObj->getID(), $POST['password'], 0))

+                            &&

+                        $userObj->authUser($userObj->getID(), $POST['remember'])

+                    ){

+                        $userObj->set('logincount', (int)$userObj->get('logincount') + 1);

+                        $userObj->set('lastlogin', time());

+                        $userObj->set('failedlogincount', 0);

+                        $userObj->save(false, false);

+

+                        $this->modx->invokeEvent("OnWebLogin", array(

+                            "userid"		=> $userObj->getID(),

+                            "username"		=> $userObj->get('username'),

+                            "userpassword"	=> $POST['password'],

+                            "rememberme"	=> $POST['remember'],

+                        ));

+                        $this->moveTo(array('url' => urldecode($POST['backUrl'])));

+                    }else{

+                        $userObj->set('failedlogincount', (int)$userObj->get('failedlogincount') + 1);

+                        $userObj->save(false, false);

+

+                        $error = 'error.incorrect_password';

+                    }

+                }else{

+                    $error = 'error.no_user';

+                }

+            }else{

+                $error = 'error.incorrect_mail';

+                $POST['email'] = '';

+            }

+        }

+        if(!empty($error)){

+            $errorCode = $error;

+            $error = APIHelpers::getkey($params, $error, '');

+            $error = static::getLangMsg($error, $error);

+        }

+        return $POST;

+    }

+    /**

+     * Информация о пользователе

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

+     */

+    public function UserInfo($params){

+        $out = '';

+        $type = 'web';

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

+        if(empty($userID)){

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

+        }

+        $field = APIHelpers::getkey($params, 'field', 'username');

+        if($userID > 0){

+            $this->userObj->edit($userID);

+            switch(true){

+                case ($field == $this->userObj->fieldPKName()):{

+                    $out = $this->userObj->getID();

+                    break;

+                }

+                case ($this->userObj->issetField($field)):{

+                    $out = $this->userObj->get($field);

+                    break;

+                }

+            }

+        }

+        return $out;

+    }

+    /**

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

+     */

+    public function UserID($params){

+        $type = 'web';

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

+    }

+    /**

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

+     */

+    public function isGuestGoHome($params){

+        $type = 'web';

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

+            /**

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

+             */

+            $this->modx->invokeEvent('OnPageUnauthorized');

+            $id = APIHelpers::getkey($params, 'id', $this->config['unauthorized_page']);

+            $this->moveTo(compact('id'));

+        }

+        return;

+    }

+

+    /**

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

+     */

+    public function isAuthGoHome($params){

+        $type = 'web';

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

+        if($userID>0){

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

+            if(empty($id)){

+                $id = $this->modx->getConfig('login_home', $this->config['site_start']);

+            }

+            $this->moveTo(compact('id'));

+        }

+        return;

+    }

+

+    /**

+     * Редирект

+     */

+    public function moveTo($params){

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

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

+        if((empty($uri) && !empty($id)) || !is_string($uri)){

+            $uri = $this->makeUrl($id);

+        }

+        $code = (int)APIHelpers::getkey($params, 'code', 0);

+        $addUrl = APIHelpers::getkey($params, 'addUrl', '');

+        if(is_scalar($addUrl) && $addUrl!=''){

+            $uri .= "?".$addUrl;

+        }

+        if(APIHelpers::getkey($params, 'validate', false)){

+            if(isset($this->modx->snippetCache['getPageID'])){

+                $out = $this->modx->runSnippet('getPageID', compact('uri'));

+                if(empty($out)){

+                    $uri = '';

+                }

+            }else{

+                $uri = APIhelpers::sanitarTag($uri);

+            }

+        }else{

+            //$modx->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.1 307 Temporary Redirect');

+            header("Location: ".$uri, true, ($code>0 ? $code : 307));

+        }

+        return $uri;

+    }

+

+    /**

+     * Создание ссылки на страницу

+     *

+     * @param  int $id ID документа

+     * @return string

+     */

+    protected function makeUrl($id = null){

+        $id = (int)$id;

+        if($id <= 0){

+            $id = $this->modx->documentObject['id'];

+        }

+        if($this->url->containsKey($id)){

+            $url = $this->url->get($id);

+        }else{

+            $url = $this->modx->makeUrl($id);

+            $this->url->set($id, $url);

+        }

+        return $url;

+    }

+    protected function getTemplate($name){

+        $out = '';

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

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

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

+        }

+        return $out;

+    }

+    protected static function loadLang($lang){

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

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

+            $file = false;

+        }

+        if(!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)){

+            static::$langDic[$lang] = include_once($file);

+            if(is_array(static::$langDic[$lang])){

+                static::$langDic[$lang] = APIHelpers::renameKeyArr(static::$langDic[$lang], $lang);

+            }else{

+                static::$langDic[$lang] = array();

+            }

+        }

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

+    }

+    protected static function getLangMsg($key, $default){

+        $out = $default;

+        $lng = static::$lang;

+        $dic = static::$langDic;

+        if(isset($dic[$lng], $dic[$lng][$lng.'.'.$key])){

+            $out = $dic[$lng][$lng.'.'.$key];

+        }

+        if(class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])){

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

+            if(!empty($msg)){

+                $out = $msg;

+            }

+        }

+        return $out;

+    }

 }
\ No newline at end of file

Spacing +96 added lines, -96 removed lines

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

 use Helpers\FS;

 

-class Actions{

+class Actions {

     protected $modx = null;

     public $userObj = null;

 	/**

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

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

      */

-    public function logout($params){

+    public function logout($params) {

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

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

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

     		$type = 'web';

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

-    		if($userID){

+    		if ($userID) {

     			$this->userObj->edit($userID);

-    			if($this->userObj->getID()){

+    			if ($this->userObj->getID()) {

 	    			$this->modx->invokeEvent("OnBeforeWebLogout", array(

 		    			"userid"   => $this->userObj->getID(),

 		    			"username" => $this->userObj->get('username')

 		    		));

 	    		}

 		    	$this->userObj->logOut();

-		    	if($this->userObj->getID()){

+		    	if ($this->userObj->getID()) {

 		    		$this->modx->invokeEvent("OnWebLogout", array(

 		    			"userid"        => $this->userObj->getID(),

 		    			"username"      => $this->userObj->get('username')

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

 

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

-			    if(empty($go)){

+			    if (empty($go)) {

 			    	$go = str_replace(

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

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

 			    		array("", ""),

 			    		$_SERVER['REQUEST_URI']

 			    	);

 			    }

 

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

-			    if($start == $go){

+			    if ($start == $go) {

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

-			    }else{

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

+			    } else {

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

 			    }

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

-    		}else{

+    		} else {

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

     			$this->modx->sendErrorPage();

     		}

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

      * @return string

      */

-    public function logoutUrl($params){

+    public function logoutUrl($params) {

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

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

 

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

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

-    	$query = '?'.$LogoutName;

+    	$query = '?' . $LogoutName;

 

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

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

     }

 

     /**

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

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

      */

-    public function AuthBlock($params){

+    public function AuthBlock($params) {

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

 

     	$error = $errorCode = '';

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

 

     	$type = 'web';

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

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

 			$tpl = APIHelpers::getkey($params, 'tplProfile', '');

-			if(empty($tpl)){

+			if (empty($tpl)) {

 				$tpl = $this->getTemplate('tplProfile');

 			}

 			$dataTPL = $this->userObj->toArray();

 			$dataTPL['url.logout'] = $this->logoutUrl($params);

     		$homeID = APIHelpers::getkey($params, 'homeID');

-			if(!empty($homeID)){

+			if (!empty($homeID)) {

 				$dataTPL['url.profile'] = $this->makeUrl($homeID);

 			}

-		}else{

+		} else {

 			$tpl = APIHelpers::getkey($params, 'tplForm', '');

-			if(empty($tpl)){

+			if (empty($tpl)) {

 				$tpl = $this->getTemplate('authForm');

 			}

 			$POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);

@@ -186,9 +186,9 @@ 
 				'errorCode' => $errorCode

 			);

 			$authId = APIHelpers::getkey($params, 'authId');

-			if(!empty($authId)){

+			if (!empty($authId)) {

 				$dataTPL['authPage'] = $this->makeUrl($authId);

-				$dataTPL['method'] = strtolower(__CLASS__ . '::'. 'authpage');

+				$dataTPL['method'] = strtolower(__CLASS__ . '::' . 'authpage');

 			}

 		}

 		return DLTemplate::getInstance($this->modx)->parseChunk($tpl, $dataTPL);

@@ -198,7 +198,7 @@ 
 	 * Авторизация на сайте со страницы авторизации

 	 * [!Auth? &login=`password` &pwdField=`password` &homeID=`72`!]

 	 */

-	public function AuthPage($params){

+	public function AuthPage($params) {

 		$homeID = APIHelpers::getkey($params, 'homeID');

 		$this->isAuthGoHome(array('id' => $homeID));

 

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

 

 		$tpl = APIHelpers::getkey($params, 'tpl', '');

-		if(empty($tpl)){

+		if (empty($tpl)) {

 			$tpl = $this->getTemplate('authForm');

 		}

 

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

-		if(!empty($_SERVER['HTTP_REFERER'])){

+		if (!empty($_SERVER['HTTP_REFERER'])) {

 			/**

 			 * Thank you for super protection against hacking in protect.inc.php:-)

 			 */

 			$refer = htmlspecialchars_decode($_SERVER['HTTP_REFERER'], ENT_QUOTES);

-		}else{

+		} else {

 			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');

-			if(empty( $request['host']) ||  $request['host']==$selfHost){

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

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

-			}else{

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

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

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

+			} else {

 				$refer = '';

 			}

 		}

 

-		if($_SERVER['REQUEST_METHOD'] == 'POST'){

+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {

 			$backUrl = APIHelpers::getkey($_POST, 'backUrl', $POST['backUrl']);

-			if(!is_scalar($backUrl)){

+			if (!is_scalar($backUrl)) {

 				$backUrl = $refer;

-			}else{

+			} else {

 				$backUrl = urldecode($backUrl);

 			}

-		}else{

+		} else {

 			$backUrl = $refer;

 		}

 		$backUrl = parse_url($backUrl);

-		if(!empty($backUrl['path']) && $request['path'] != $backUrl['path']){

+		if (!empty($backUrl['path']) && $request['path'] != $backUrl['path']) {

 		    $POST['backUrl'] = $backUrl['path'];

-		}else{

+		} else {

 			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');

-			if(empty($uri['host']) || $uri['host']==$selfHost){

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

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

-			}else{

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

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

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

+			} else {

 				$POST['backUrl'] = '';

 			}

 		}

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

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

 			$idURL = $this->moveTo(array(

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

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

 			    'validate' => true

 			));

-		}else{

+		} else {

 			$idURL = 0;

 		}

-		if(empty($idURL)){

-			if(empty($homeID)){

+		if (empty($idURL)) {

+			if (empty($homeID)) {

 				$homeID = $this->config['site_start'];

 			}

 			$POST['backUrl'] = $this->makeUrl($homeID);

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

 		));

 	}

-	protected function Auth($pwdField, $emailField, $rememberField, $backUrl, $method, &$error, &$errorCode, $params = array()){

+	protected function Auth($pwdField, $emailField, $rememberField, $backUrl, $method, &$error, &$errorCode, $params = array()) {

 		$POST = array(

 			'backUrl' => urlencode($backUrl)

 		);

 		$userObj = &$this->userObj;

-		if($_SERVER['REQUEST_METHOD']=='POST' && APIHelpers::getkey($_POST, 'method', '') == strtolower($method)){

+		if ($_SERVER['REQUEST_METHOD'] == 'POST' && APIHelpers::getkey($_POST, 'method', '') == strtolower($method)) {

 			$POST = array_merge($POST, array(

 				'password' => APIHelpers::getkey($_POST, $pwdField, ''),

 				'email' => APIHelpers::getkey($_POST, $emailField, ''),

 				'remember' => (bool)((int)APIHelpers::getkey($_POST, $rememberField, 0))

 			));

-			if(!empty($POST['email']) && is_scalar($POST['email']) && !$userObj->emailValidate($POST['email'], false)){

+			if (!empty($POST['email']) && is_scalar($POST['email']) && !$userObj->emailValidate($POST['email'], false)) {

 				$openUser = $userObj->edit($POST['email']);

 

 				$this->modx->invokeEvent("OnBeforeWebLogin", array(

@@ -297,7 +297,7 @@ 
 		            "rememberme"	=> $POST['remember'],

 		            'userObj'		=> $userObj

 		        ));

-				if($userObj->getID() && !$userObj->checkBlock($userObj->getID())){

+				if ($userObj->getID() && !$userObj->checkBlock($userObj->getID())) {

 					$pluginFlag = $this->modx->invokeEvent("OnWebAuthentication", array(

 	                    "userid"        => $userObj->getID(),

 	                    "username"      => $userObj->get('username'),

@@ -305,11 +305,11 @@ 
 	                    "savedpassword" => $userObj->get('password'),

 	                    "rememberme"    => $POST['remember'],

 	                ));

-					if(

+					if (

 						($pluginFlag === true || $userObj->testAuth($userObj->getID(), $POST['password'], 0))

 							&&

 						$userObj->authUser($userObj->getID(), $POST['remember'])

-					){

+					) {

 						$userObj->set('logincount', (int)$userObj->get('logincount') + 1);

 						$userObj->set('lastlogin', time());

 						$userObj->set('failedlogincount', 0);

@@ -322,21 +322,21 @@ 
 			                "rememberme"	=> $POST['remember'],

 			            ));

 						$this->moveTo(array('url' => urldecode($POST['backUrl'])));

-					}else{

+					} else {

 						$userObj->set('failedlogincount', (int)$userObj->get('failedlogincount') + 1);

 						$userObj->save(false, false);

 

 						$error = 'error.incorrect_password';

 					}

-				}else{

+				} else {

 					$error = 'error.no_user';

 				}

-			}else{

+			} else {

 				$error = 'error.incorrect_mail';

 				$POST['email'] = '';

 			}

 		}

-		if(!empty($error)){

+		if (!empty($error)) {

 			$errorCode = $error;

 			$error = APIHelpers::getkey($params, $error, '');

 			$error = static::getLangMsg($error, $error);

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

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

 	 */

-	public function UserInfo($params){

+	public function UserInfo($params) {

 		$out = '';

 		$type = 'web';

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

-		if(empty($userID)){

+		if (empty($userID)) {

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

 		}

 		$field = APIHelpers::getkey($params, 'field', 'username');

-		if($userID > 0){

+		if ($userID > 0) {

 			$this->userObj->edit($userID);

-			switch(true){

+			switch (true) {

 				case ($field == $this->userObj->fieldPKName()):{

 					$out = $this->userObj->getID();

 					break;

@@ -373,16 +373,16 @@ 
 	/**

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

 	 */

-	public function UserID($params){

+	public function UserID($params) {

 		$type = 'web';

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

 	}

 	/**

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

 	 */

-	public function isGuestGoHome($params){

+	public function isGuestGoHome($params) {

 		$type = 'web';

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

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

 			/**

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

 			 */

@@ -396,12 +396,12 @@ 
 	/**

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

 	 */

-	public function isAuthGoHome($params){

+	public function isAuthGoHome($params) {

 		$type = 'web';

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

-		if($userID>0){

+		if ($userID > 0) {

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

-		    if(empty($id)){

+		    if (empty($id)) {

 				$id = $this->modx->getConfig('login_home', $this->config['site_start']);

 		    }

 		    $this->moveTo(compact('id'));

@@ -412,29 +412,29 @@ 
 	/**

 	 * Редирект

 	 */

-	public function moveTo($params){

+	public function moveTo($params) {

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

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

-		if((empty($uri) && !empty($id)) || !is_string($uri)){

+		if ((empty($uri) && !empty($id)) || !is_string($uri)) {

 			$uri = $this->makeUrl($id);

 		}

 		$code = (int)APIHelpers::getkey($params, 'code', 0);

 		$addUrl = APIHelpers::getkey($params, 'addUrl', '');

-		if(is_scalar($addUrl) && $addUrl!=''){

-		    $uri .= "?".$addUrl;

+		if (is_scalar($addUrl) && $addUrl != '') {

+		    $uri .= "?" . $addUrl;

 		}

-		if(APIHelpers::getkey($params, 'validate', false)){

-			if(isset($this->modx->snippetCache['getPageID'])){

+		if (APIHelpers::getkey($params, 'validate', false)) {

+			if (isset($this->modx->snippetCache['getPageID'])) {

 				$out = $this->modx->runSnippet('getPageID', compact('uri'));

-				if(empty($out)){

+				if (empty($out)) {

 					$uri = '';

 				}

-			}else{

+			} else {

 				$uri = APIhelpers::sanitarTag($uri);

 			}

-		}else{

+		} else {

 			//$modx->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.1 307 Temporary Redirect');

-			header("Location: ".$uri, true, ($code>0 ? $code : 307));

+			header("Location: " . $uri, true, ($code > 0 ? $code : 307));

 		}

 		return $uri;

 	}

@@ -445,52 +445,52 @@ 
 	 * @param  int $id ID документа

 	 * @return string

 	 */

-	protected function makeUrl($id = null){

+	protected function makeUrl($id = null) {

 		$id = (int)$id;

-		if($id <= 0){

+		if ($id <= 0) {

 			$id = $this->modx->documentObject['id'];

 		}

-		if($this->url->containsKey($id)){

+		if ($this->url->containsKey($id)) {

 			$url = $this->url->get($id);

-		}else{

+		} else {

 			$url = $this->modx->makeUrl($id);

 			$this->url->set($id, $url);

 		}

 		return $url;

 	}

-	protected function getTemplate($name){

+	protected function getTemplate($name) {

 		$out = '';

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

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

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

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

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

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

 		}

 		return $out;

 	}

-	protected static function loadLang($lang){

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

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

+	protected static function loadLang($lang) {

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

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

 			$file = false;

 		}

-		if(!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)){

+		if (!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)) {

 			static::$langDic[$lang] = include_once($file);

-			if(is_array(static::$langDic[$lang])){

+			if (is_array(static::$langDic[$lang])) {

 				static::$langDic[$lang] = APIHelpers::renameKeyArr(static::$langDic[$lang], $lang);

-			}else{

+			} else {

 				static::$langDic[$lang] = array();

 			}

 		}

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

 	}

-	protected static function getLangMsg($key, $default){

+	protected static function getLangMsg($key, $default) {

 		$out = $default;

 		$lng = static::$lang;

 		$dic = static::$langDic;

-		if(isset($dic[$lng], $dic[$lng][$lng.'.'.$key])){

-			$out = $dic[$lng][$lng.'.'.$key];

+		if (isset($dic[$lng], $dic[$lng][$lng . '.' . $key])) {

+			$out = $dic[$lng][$lng . '.' . $key];

 		}

-		if(class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])){

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

-			if(!empty($msg)){

+		if (class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])) {

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

+			if (!empty($msg)) {

 				$out = $msg;

 			}

 		}

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

Indentation +121 added lines, -121 removed lines

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

 }

 /**

- * DocLister class

- *

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

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

- *

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

- * @TODO add controller for filter by TV values

- * @TODO add method load default template

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

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

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

- * @TODO depending on the parameters

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

- */

+     * DocLister class

+     *

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

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

+     *

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

+     * @TODO add controller for filter by TV values

+     * @TODO add method load default template

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

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

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

+     * @TODO depending on the parameters

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

+     */

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

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

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

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

 

     /**

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

-    * @var string

-    * @access protected

-    */

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

+     * @var string

+     * @access protected

+     */

     protected $parentField = 'parent';

     /**

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

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

     public $FS = null;

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

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

-    */

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

+     */

     protected $outData = '';

 	

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

-	public $skippedDocs = 0;

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

+    public $skippedDocs = 0;

 

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

-	protected $table = '';

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

+    protected $table = '';

 

-	/** @var null|paginate_DL_Extender  */

-	protected $extPaginate = null;

+    /** @var null|paginate_DL_Extender  */

+    protected $extPaginate = null;

     /**

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

      *

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

         $this->setTimeStart($startTime);

 

-		if (extension_loaded('mbstring')) {

-        	mb_internal_encoding("UTF-8");

-		} else {

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

-		}

+        if (extension_loaded('mbstring')) {

+            mb_internal_encoding("UTF-8");

+        } else {

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

+        }

 

         if ($modx instanceof DocumentParser) {

-        	$this->modx = $modx;

+            $this->modx = $modx;

             $this->setDebug(1);

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

 

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

-		} else {

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

-		}

+        } else {

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

+        }

 

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

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

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

-		}

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

+        }

 

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

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

-		}

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

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

+        }

 

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

 

@@ -266,52 +266,52 @@ 
 

     /**

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

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

+    }

 

     /**

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

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

             }

 

@@ -606,17 +606,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

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

     }

 

-	/**

+    /**

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

      * @return array

      */

@@ -693,7 +693,7 @@ 
      */

     public function setConfig($cfg)

     {

-		if(is_scalar($cfg)) $cfg = array($cfg);

+        if(is_scalar($cfg)) $cfg = array($cfg);

         if (is_array($cfg)) {

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

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

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

     }

 

-	/**

+    /**

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

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

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

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

     {

         if (!is_array($cfg)) {

-			$cfg = array();

+            $cfg = array();

         }

-		$this->_cfg = $cfg;

+        $this->_cfg = $cfg;

         return count($this->_cfg);

     }

 

@@ -997,21 +997,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'

                 ));

@@ -1037,12 +1037,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();

 

@@ -1075,8 +1075,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)){

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

     }

 

-	public function docsCollection(){

+    public function docsCollection(){

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

     }

 

@@ -1511,10 +1511,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 : '';

     }

@@ -1533,7 +1533,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 +29 added lines, -29 removed lines

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

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

      */

-	public function smartSplit($str){

+	public function smartSplit($str) {

 		$res = array();

 		$cur = '';

 		$open = 0;

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

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

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

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

-			switch($e){

+			switch ($e) {

 				case ')': {

 					$open--;

-					if($open == 0){

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

+					if ($open == 0) {

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

 						$cur = '';

 					} else {

 						$cur .= $e;

@@ -293,7 +293,7 @@ 
 					break;

 				}

 				case ';':{

-					if($open == 0){

+					if ($open == 0) {

 						$res[] = $cur;

 						$cur = '';

 					} else {

@@ -307,7 +307,7 @@ 
 			}

 		}

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

-		if ($cur != ''){

+		if ($cur != '') {

 			$res[] = $cur;

 		}

 		return $res;

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

             }

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

-            switch($cfgName[1]){

+            switch ($cfgName[1]) {

                 case 'custom':

                 case 'core':{

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

                     break;

                 }

                 default:{

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

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

                     break;

                 }

             }

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

 

@@ -693,7 +693,7 @@ 
      */

     public function setConfig($cfg)

     {

-		if(is_scalar($cfg)) $cfg = array($cfg);

+		if (is_scalar($cfg)) $cfg = array($cfg);

         if (is_array($cfg)) {

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

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

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

     }

@@ -771,7 +771,7 @@ 
         }

         $out = array();

         foreach ($data as $item) {

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

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

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

             }

         }

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

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

      */

-    public function renderWrap($data){

+    public function renderWrap($data) {

         $out = $data;

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

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

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

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

             $parse = true;

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

             /**

@@ -1015,13 +1015,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",

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

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

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

     */

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

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

         $class = array();

 

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

         $tmp = strtolower($iterationName);

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

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

 

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

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

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

         */

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

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

-            if(is_array($out)){

-                $data =  $out;

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

+            if (is_array($out)) {

+                $data = $out;

             }

         }

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

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

     }

 

-	public function docsCollection(){

+	public function docsCollection() {

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

     }

 

@@ -1479,18 +1479,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;

             }

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

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

     */

-    public function getParentField(){

+    public function getParentField() {

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

     }

     /**

Braces +24 added lines, -8 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');

 		}

@@ -693,7 +695,9 @@ 
      */

     public function setConfig($cfg)

     {

-		if(is_scalar($cfg)) $cfg = array($cfg);

+		if(is_scalar($cfg)) {

+		    $cfg = array($cfg);

+		}

         if (is_array($cfg)) {

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

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

@@ -745,7 +749,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(

@@ -1483,7 +1489,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;

         }

@@ -1530,7 +1538,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();

@@ -1541,9 +1551,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/snippet.DLglossary.php

Indentation +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
     $p = array();

 }

 if (!empty($loadfilter)) {

-	$field = explode(".", $field);

+    $field = explode(".", $field);

     $field = end($field);

     if (!empty($p['filters'])) {

         $p['filters'] = rtrim(trim($p['filters']), ";") . ";";

assets/snippets/DocLister/lib/DLTemplate.class.php

Indentation +19 added lines, -19 removed lines

@@ -195,20 +195,20 @@ 
         return $tpl;

     }

     /**

-    * Рендер документа с подстановкой плейсхолдеров и выполнением сниппетов

-    *

-    * @param int $id ID документа

-    * @param bool $events Во время рендера документа стоит ли вызывать события OnLoadWebDocument и OnLoadDocumentObject (внутри метода getDocumentObject).

-    * @param mixed $tpl Шаблон с которым необходимо отрендерить документ. Возможные значения:

-    *                       null - Использовать шаблон который назначен документу

-    *                       int(0-n) - Получить шаблон из базы данных с указанным ID и применить его к документу

-    *                       string - Применить шаблон указанный в строке к документу

-    * @return string

-    *

-    * Событие OnLoadWebDocument дополнительно передает параметры:

-    *       - с источиком от куда произошел вызов события

-    *       - оригинальный экземпляр класса DocumentParser

-    */

+     * Рендер документа с подстановкой плейсхолдеров и выполнением сниппетов

+     *

+     * @param int $id ID документа

+     * @param bool $events Во время рендера документа стоит ли вызывать события OnLoadWebDocument и OnLoadDocumentObject (внутри метода getDocumentObject).

+     * @param mixed $tpl Шаблон с которым необходимо отрендерить документ. Возможные значения:

+     *                       null - Использовать шаблон который назначен документу

+     *                       int(0-n) - Получить шаблон из базы данных с указанным ID и применить его к документу

+     *                       string - Применить шаблон указанный в строке к документу

+     * @return string

+     *

+     * Событие OnLoadWebDocument дополнительно передает параметры:

+     *       - с источиком от куда произошел вызов события

+     *       - оригинальный экземпляр класса DocumentParser

+     */

     public function renderDoc($id, $events = false, $tpl = null){

         if((int)$id <= 0) return '';

 

@@ -243,13 +243,13 @@ 
     }

 

     /**

-    * Получить содержимое шаблона с определенным номером

-    * @param int $id Номер шаблона

-    * @return string HTML код шаблона

-    */

+     * Получить содержимое шаблона с определенным номером

+     * @param int $id Номер шаблона

+     * @return string HTML код шаблона

+     */

     public function getTemplate($id){

         $tpl = null;

-		if ($id > 0){

+        if ($id > 0){

             $tpl = $this->modx->db->getValue("SELECT `content` FROM {$this->modx->getFullTableName("site_templates")} WHERE `id` = '{$id}'");

         }

         if(is_null($tpl)){

Spacing +13 added lines, -13 removed lines

@@ -209,17 +209,17 @@ 
     *       - с источиком от куда произошел вызов события

     *       - оригинальный экземпляр класса DocumentParser

     */

-    public function renderDoc($id, $events = false, $tpl = null){

-        if((int)$id <= 0) return '';

+    public function renderDoc($id, $events = false, $tpl = null) {

+        if ((int)$id <= 0) return '';

 

         $m = clone $this->modx; //Чтобы была возможность вызывать события

-        $m->documentObject = $m->getDocumentObject('id', (int)$id , $events ? 'prepareResponse' : null);

+        $m->documentObject = $m->getDocumentObject('id', (int)$id, $events ? 'prepareResponse' : null);

         if ($m->documentObject['type'] == "reference") {

             if (is_numeric($m->documentObject['content']) && $m->documentObject['content'] > 0) {

                 $m->documentObject['content'] = $this->renderDoc($m->documentObject['content'], $events);

             }

         }

-        switch(true){

+        switch (true) {

             case is_integer($tpl):{

                 $tpl = $this->getTemplate($tpl);

                 break;

@@ -233,7 +233,7 @@ 
             }

         }

         $m->documentContent = $tpl;

-        if($events){

+        if ($events) {

             $m->invokeEvent("OnLoadWebDocument", array(

                 'source' => 'DLTemplate',

                 'mainModx' => $this->modx,

@@ -247,12 +247,12 @@ 
     * @param int $id Номер шаблона

     * @return string HTML код шаблона

     */

-    public function getTemplate($id){

+    public function getTemplate($id) {

         $tpl = null;

-		if ($id > 0){

+		if ($id > 0) {

             $tpl = $this->modx->db->getValue("SELECT `content` FROM {$this->modx->getFullTableName("site_templates")} WHERE `id` = '{$id}'");

         }

-        if(is_null($tpl)){

+        if (is_null($tpl)) {

             $tpl = '[*content*]';

         }

         return $tpl;

@@ -346,21 +346,21 @@ 
 

     public function parseDocumentSource($out, $modx = null)

     {

-        if(!is_object($modx)){

+        if (!is_object($modx)) {

             $modx = $this->modx;

         }

         $minPasses = empty ($modx->minParserPasses) ? 2 : $modx->minParserPasses;

         $maxPasses = empty ($modx->maxParserPasses) ? 10 : $modx->maxParserPasses;

         $site_status = $modx->getConfig('site_status');

         $modx->config['site_status'] = 0;

-        for($i=1; $i<=$maxPasses; $i++){

+        for ($i = 1; $i <= $maxPasses; $i++) {

             $html = $out;

-            if(preg_match('/\[\!(.*)\!\]/us', $out)){

+            if (preg_match('/\[\!(.*)\!\]/us', $out)) {

                 $out = str_replace(array('[!', '!]'), array('[[', ']]'), $out);

             }

-            if($i <= $minPasses || $out != $html){

+            if ($i <= $minPasses || $out != $html) {

                 $out = $modx->parseDocumentSource($out);

-            }else{

+            } else {

                 break;

             }

         }

assets/snippets/DocLister/lib/DLpaginate.class.php

Spacing +13 added lines, -13 removed lines

@@ -135,13 +135,13 @@ 
 

     public function getOutput() {

         $out = '';

-        if (!$this->calculate && $this->calculate() && !empty($this->pagination)){

+        if (!$this->calculate && $this->calculate() && !empty($this->pagination)) {

             $out = str_replace(array("[+class+]", "[+wrap+]"), array($this->className, $this->pagination), $this->mainTpl) . "\n";

         }

         return $out;

     }

-    protected function getPageQuery($page){

-        switch($this->mode){

+    protected function getPageQuery($page) {

+        switch ($this->mode) {

             case 'offset':

                 $display = isset($this->modeConfig['display']) ? $this->modeConfig['display'] : 0;

                 $out = $display * ($page - 1);

@@ -157,12 +157,12 @@ 
     public function get_pagenum_link($id) {

         $flag = (strpos($this->target, '?') === false);

         $value = $this->getPageQuery($id);

-        if ($flag && $this->urlF){

+        if ($flag && $this->urlF) {

             $out = str_replace($this->urlF, $value, $this->target);

         } else {

             $out = $this->target;

             if ($id > 1) {

-                $out .= ($flag ? "?" : "&") . $this->parameterName."=".$value;

+                $out .= ($flag ? "?" : "&") . $this->parameterName . "=" . $value;

             }

         }

         return $out;

@@ -211,9 +211,9 @@ 
         if ($lastpage > 1) {

             if ($this->page) {

                 if ($this->page > 1) {

-                    $this->pagination .=  $this->prevT ? $this->renderItemTPL( $this->prevT, $prev) : '';

+                    $this->pagination .= $this->prevT ? $this->renderItemTPL($this->prevT, $prev) : '';

                 } else {

-                    $this->pagination .=  $this->prevI ? $this->renderItemTPL( $this->prevI, $prev) : '';

+                    $this->pagination .= $this->prevI ? $this->renderItemTPL($this->prevI, $prev) : '';

                 }

             }

             //pages

@@ -238,7 +238,7 @@ 
                     $this->pagination .= $this->renderItemTPL($this->numberT, 2);

                     $this->pagination .= $this->renderItemTPL($this->dotsT, 3);

 

-                    for ($counter = $this->page - $this->adjacents; $counter <= $this->page + $this->adjacents; $counter++){

+                    for ($counter = $this->page - $this->adjacents; $counter <= $this->page + $this->adjacents; $counter++) {

                         $tpl = ($counter == $this->page) ? $this->currentT : $this->numberT;

                         $this->pagination .= $this->renderItemTPL($tpl, $counter);

                     }

@@ -251,17 +251,17 @@ 
                     $this->pagination .= $this->renderItemTPL($this->numberT, 2);

                     $this->pagination .= $this->renderItemTPL($this->dotsT, 3);

 

-                    for ($counter = $lastpage - (2 + ($this->adjacents * 2)); $counter <= $lastpage; $counter++){

+                    for ($counter = $lastpage - (2 + ($this->adjacents * 2)); $counter <= $lastpage; $counter++) {

                         $tpl = ($counter == $this->page) ? $this->currentT : $this->numberT;

                         $this->pagination .= $this->renderItemTPL($tpl, $counter);

                     }

                 }

             }

             if ($this->page) {

-                if (isset($counter) && $this->page < $counter - 1){

-                    $this->pagination .=  $this->nextT ? $this->renderItemTPL( $this->nextT, $next) : '';

+                if (isset($counter) && $this->page < $counter - 1) {

+                    $this->pagination .= $this->nextT ? $this->renderItemTPL($this->nextT, $next) : '';

                 } else {

-                    $this->pagination .=  $this->nextI ? $this->renderItemTPL( $this->nextI, $next) : '';

+                    $this->pagination .= $this->nextI ? $this->renderItemTPL($this->nextI, $next) : '';

                 }

 

                 if ($this->showCounter) {

@@ -273,7 +273,7 @@ 
         return true;

     }

 

-    protected function renderItemTPL($tpl, $num){

+    protected function renderItemTPL($tpl, $num) {

         return str_replace(array('[+num+]', '[+link+]'), array($num, $this->get_pagenum_link($num)), $tpl);

     }

 }
\ No newline at end of file

assets/snippets/DocLister/lib/DLphx.class.php

Indentation +57 added lines, -57 removed lines

@@ -15,25 +15,25 @@ 
 class DLphx
 {
     public $placeholders = array();
-	public $name = 'PHx';
-	public $version = '2.2.0';
-	public $user = array();
-	public $cache = array(
-		'cm' => array(),
-		'ui' => array(),
-		'mo' => array()
-	);
-	public $safetags = array(
-		array('~(?<![\[]|^\^)\[(?=[^\+\*\(\[]|$)~s', '~(?<=[^\+\*\)\]]|^)\](?=[^\]]|$)~s'),
-		array('&_PHX_INTERNAL_091_&', '&_PHX_INTERNAL_093_&'),
-		array('[', ']')
-	);
-	public $console = array();
-	public $debug = false;
-	public $debugLog = false;
-	public $curPass = 0;
-	public $maxPasses = 50;
-	public $swapSnippetCache = array();
+    public $name = 'PHx';
+    public $version = '2.2.0';
+    public $user = array();
+    public $cache = array(
+        'cm' => array(),
+        'ui' => array(),
+        'mo' => array()
+    );
+    public $safetags = array(
+        array('~(?<![\[]|^\^)\[(?=[^\+\*\(\[]|$)~s', '~(?<=[^\+\*\)\]]|^)\](?=[^\]]|$)~s'),
+        array('&_PHX_INTERNAL_091_&', '&_PHX_INTERNAL_093_&'),
+        array('[', ']')
+    );
+    public $console = array();
+    public $debug = false;
+    public $debugLog = false;
+    public $curPass = 0;
+    public $maxPasses = 50;
+    public $swapSnippetCache = array();
 
     public function __construct($debug = 0, $maxpass = 50)
     {
@@ -42,7 +42,7 @@ 
         $this->user["usrid"] = isset($_SESSION['webInternalKey']) ? intval($_SESSION['webInternalKey']) : 0;
         $this->user["id"] = ($this->user["usrid"] > 0) ? (-$this->user["usrid"]) : $this->user["mgrid"];
 
-		$this->debug = ($debug != '') ? $debug : 0;
+        $this->debug = ($debug != '') ? $debug : 0;
 
         $this->maxPasses = ($maxpass != '') ? $maxpass : 50;
 
@@ -236,9 +236,9 @@ 
                     case "eq":
                         $condition[] = intval(($output == $modifier_value[$i]));
                         break;
-					case "empty":
-						 $condition[] = intval(empty($output));
-						break;
+                    case "empty":
+                         $condition[] = intval(empty($output));
+                        break;
                     case "notequals":
                     case "isnot":
                     case "isnt":
@@ -283,7 +283,7 @@ 
                         if (!$isvalid) {
                             $output = NULL;
                         }
-						break;
+                        break;
                     case "then":
                         $conditional = implode(' ', $condition);
                         $isvalid = intval(eval("return (" . $conditional . ");"));
@@ -295,7 +295,7 @@ 
                         break;
                     case "else":
                         $conditional = implode(' ', $condition);
-						$isvalid = intval(eval("return (" . $conditional . ");"));
+                        $isvalid = intval(eval("return (" . $conditional . ");"));
                         if (!$isvalid) {
                             $output = $modifier_value[$i];
                         }
@@ -303,7 +303,7 @@ 
                     case "select":
                         $raw = explode("&", $modifier_value[$i]);
                         $map = array();
-						$count = count($raw);
+                        $count = count($raw);
                         for ($m = 0; $m < $count; $m++) {
                             $mi = explode("=", $raw[$m]);
                             $map[$mi[0]] = $mi[1];
@@ -313,7 +313,7 @@ 
                     ##### End of Conditional Modifiers
 
                     #####  String Modifiers
-					case "default":{
+                    case "default":{
                         $output = ($output === '') ? $modifier_value[0] : $output;
                         break;
                     }
@@ -423,7 +423,7 @@ 
 
                     // If we haven't yet found the modifier, let's look elsewhere
                     default:
-						$snippet = '';
+                        $snippet = '';
                         // modified by Anton Kuzmin (23.06.2010) //
                         $snippetName = 'phx:' . $modifier_cmd[$i];
                         if (isset($modx->snippetCache[$snippetName])) {
@@ -453,16 +453,16 @@ 
                         $cm = $snippet;
                         // end //
 
-						if(!empty($cm)){
-							ob_start();
-							$options = $modifier_value[$i];
-							$custom = eval($cm);
-							$msg = ob_get_contents();
-							$output = $msg . $custom;
-							ob_end_clean();
-						}else{
-							$output = '';
-						}
+                        if(!empty($cm)){
+                            ob_start();
+                            $options = $modifier_value[$i];
+                            $custom = eval($cm);
+                            $msg = ob_get_contents();
+                            $output = $msg . $custom;
+                            ob_end_clean();
+                        }else{
+                            $output = '';
+                        }
                         break;
                 }
                 if (count($condition)) $this->Log("  |--- Condition = '" . $condition[count($condition) - 1] . "'");
@@ -483,7 +483,7 @@ 
     }
 
     // Returns a cleaned string escaping the HTML and special MODx characters
-	public function LogClean($string)
+    public function LogClean($string)
     {
         $string = preg_replace("/&amp;(#[0-9]+|[a-z]+);/i", "&$1;", $string);
         $string = APIHelpers::sanitarTag($string);
@@ -491,7 +491,7 @@ 
     }
 
     // Simple log entry
-	public function Log($string)
+    public function Log($string)
     {
         if ($this->debug) {
             $this->debugLog = true;
@@ -500,7 +500,7 @@ 
     }
 
     // Log snippet output
-	public function LogSnippet($string)
+    public function LogSnippet($string)
     {
         if ($this->debug) {
             $this->debugLog = true;
@@ -509,13 +509,13 @@ 
     }
 
     // Log pass
-	public function LogPass()
+    public function LogPass()
     {
         $this->console[] = "<div style='margin: 2px;margin-top: 5px;border-bottom: 1px solid black;'>Pass " . $this->curPass . "</div>";
     }
 
     // Log pass
-	public function LogSource($string)
+    public function LogSource($string)
     {
         $this->console[] = "<div style='margin: 2px;margin-top: 5px;border-bottom: 1px solid black;'>Source:</div>" . $this->LogClean($string);
     }
@@ -523,7 +523,7 @@ 
 
     // Returns the specified field from the user record
     // positive userid = manager, negative integer = webuser
-	public function ModUser($userid, $field)
+    public function ModUser($userid, $field)
     {
         global $modx;
         if (!array_key_exists($userid, $this->cache["ui"])) {
@@ -540,7 +540,7 @@ 
     }
 
     // Returns true if the user id is in one the specified webgroups
-	public function isMemberOfWebGroupByUserId($userid = 0, $groupNames = array())
+    public function isMemberOfWebGroupByUserId($userid = 0, $groupNames = array())
     {
         global $modx;
 
@@ -570,7 +570,7 @@ 
     }
 
     // Returns the value of a PHx/MODx placeholder.
-	public function getPHxVariable($name)
+    public function getPHxVariable($name)
     {
         global $modx;
         // Check if this variable is created by PHx
@@ -584,71 +584,71 @@ 
     }
 
     // Sets a placeholder variable which can only be access by PHx
-	public function setPHxVariable($name, $value)
+    public function setPHxVariable($name, $value)
     {
         if ($name != "phx") $this->placeholders[$name] = $value;
     }
 
     //mbstring
-	public function substr($str, $s, $l = null)
+    public function substr($str, $s, $l = null)
     {
         if (function_exists('mb_substr')) return mb_substr($str, $s, $l);
         return substr($str, $s, $l);
     }
 
-	public function strlen($str)
+    public function strlen($str)
     {
         if (function_exists('mb_strlen')) return mb_strlen($str);
         return strlen($str);
     }
 
-	public function strtolower($str)
+    public function strtolower($str)
     {
         if (function_exists('mb_strtolower')) return mb_strtolower($str);
         return strtolower($str);
     }
 
-	public function strtoupper($str)
+    public function strtoupper($str)
     {
         if (function_exists('mb_strtoupper')) return mb_strtoupper($str);
         return strtoupper($str);
     }
 
-	public function ucfirst($str)
+    public function ucfirst($str)
     {
         if (function_exists('mb_strtoupper') && function_exists('mb_substr') && function_exists('mb_strlen'))
             return mb_strtoupper(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str));
         return ucfirst($str);
     }
 
-	public function lcfirst($str)
+    public function lcfirst($str)
     {
         if (function_exists('mb_strtolower') && function_exists('mb_substr') && function_exists('mb_strlen'))
             return mb_strtolower(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str));
         return lcfirst($str);
     }
 
-	public function ucwords($str)
+    public function ucwords($str)
     {
         if (function_exists('mb_convert_case'))
             return mb_convert_case($str, MB_CASE_TITLE);
         return ucwords($str);
     }
 
-	public function strrev($str)
+    public function strrev($str)
     {
         preg_match_all('/./us', $str, $ar);
         return implode(array_reverse($ar[0]));
     }
 
-	public function str_shuffle($str)
+    public function str_shuffle($str)
     {
         preg_match_all('/./us', $str, $ar);
         shuffle($ar[0]);
         return implode($ar[0]);
     }
 
-	public function str_word_count($str)
+    public function str_word_count($str)
     {
         return count(preg_split('~[^\p{L}\p{N}\']+~u', $str));
     }

Spacing +2 added lines, -2 removed lines

@@ -453,14 +453,14 @@
                         $cm = $snippet;
                         // end //
 
-						if(!empty($cm)){
+						if (!empty($cm)) {
 							ob_start();
 							$options = $modifier_value[$i];
 							$custom = eval($cm);
 							$msg = ob_get_contents();
 							$output = $msg . $custom;
 							ob_end_clean();
-						}else{
+						} else {
 							$output = '';
 						}
                         break;

Braces +70 added lines, -28 removed lines

@@ -47,7 +47,9 @@ 
         $this->maxPasses = ($maxpass != '') ? $maxpass : 50;
 
         $modx->setPlaceholder("phx", "&_PHX_INTERNAL_&");
-        if (function_exists('mb_internal_encoding')) mb_internal_encoding($modx->config['modx_charset']);
+        if (function_exists('mb_internal_encoding')) {

+            mb_internal_encoding($modx->config['modx_charset']);

+        }

     }
 
     // Plugin event hook for MODx
@@ -67,7 +69,9 @@ 
     {
         global $modx;
         // If we already reached max passes don't get at it again.
-        if ($this->curPass == $this->maxPasses) return $template;
+        if ($this->curPass == $this->maxPasses) {

+            return $template;

+        }

         // Set template pre-process hash
         $st = md5($template);
         // Replace non-call characters in the template: [, ]
@@ -85,7 +89,9 @@ 
         // Set template post-process hash
         $et = md5($template);
         // If template has changed, parse it once more...
-        if ($st != $et) $template = $this->Parse($template);
+        if ($st != $et) {

+            $template = $this->Parse($template);

+        }

         // Write an event log if debugging is enabled and there is something to log
         if ($this->debug && $this->debugLog) {
             $modx->logEvent($this->curPass, 1, $this->createEventLog(), $this->name . ' ' . $this->version);
@@ -203,9 +209,13 @@ 
         $et = md5($template); // Post-process template hash
 
         // Log an event if this was the maximum pass
-        if ($this->curPass == $this->maxPasses) $this->Log("Max passes reached. infinite loop protection so exiting.\n If you need the extra passes set the max passes to the highest count of nested tags in your template.");
+        if ($this->curPass == $this->maxPasses) {

+            $this->Log("Max passes reached. infinite loop protection so exiting.\n If you need the extra passes set the max passes to the highest count of nested tags in your template.");

+        }

         // If this pass is not at maximum passes and the template hash is not the same, get at it again.
-        if (($this->curPass < $this->maxPasses) && ($st != $et)) $template = $this->ParseValues($template);
+        if (($this->curPass < $this->maxPasses) && ($st != $et)) {

+            $template = $this->ParseValues($template);

+        }

 
         return $template;
     }
@@ -224,7 +234,9 @@ 
             for ($i = 0; $i < $count; $i++) {
                 $output = trim($output);
                 $this->Log("  |--- Modifier = '" . $modifier_cmd[$i] . "'");
-                if ($modifier_value[$i] != '') $this->Log("  |--- Options = '" . $modifier_value[$i] . "'");
+                if ($modifier_value[$i] != '') {

+                    $this->Log("  |--- Options = '" . $modifier_value[$i] . "'");

+                }

                 switch ($modifier_cmd[$i]) {
                     #####  Conditional Modifiers
                     case "input":
@@ -267,7 +279,9 @@ 
                     case "ir":
                     case "memberof":
                     case "mo": // Is Member Of  (same as inrole but this one can be stringed as a conditional)
-                        if ($output == "&_PHX_INTERNAL_&") $output = $this->user["id"];
+                        if ($output == "&_PHX_INTERNAL_&") {

+                            $output = $this->user["id"];

+                        }

                         $grps = ($this->strlen($modifier_value[$i]) > 0) ? explode(",", $modifier_value[$i]) : array();
                         $condition[] = intval($this->isMemberOfWebGroupByUserId($output, $grps));
                         break;
@@ -386,11 +400,15 @@ 
                         $output = eval("return " . $filter . ";");
                         break;
                     case "isnotempty":
-                        if (!empty($output)) $output = $modifier_value[$i];
+                        if (!empty($output)) {

+                            $output = $modifier_value[$i];

+                        }

                         break;
                     case "isempty":
                     case "ifempty":
-                        if (empty($output)) $output = $modifier_value[$i];
+                        if (empty($output)) {

+                            $output = $modifier_value[$i];

+                        }

                         break;
                     case "nl2br":
                         $output = nl2br($output);
@@ -400,7 +418,9 @@ 
                         break;
                     case "set":
                         $c = $i + 1;
-                        if ($count > $c && $modifier_cmd[$c] == "value") $output = preg_replace("~([^a-zA-Z0-9])~", "", $modifier_value[$i]);
+                        if ($count > $c && $modifier_cmd[$c] == "value") {

+                            $output = preg_replace("~([^a-zA-Z0-9])~", "", $modifier_value[$i]);

+                        }

                         break;
                     case "value":
                         if ($i > 0 && $modifier_cmd[$i - 1] == "set") {
@@ -412,11 +432,15 @@ 
                         $output = md5($output);
                         break;
                     case "userinfo":
-                        if ($output == "&_PHX_INTERNAL_&") $output = $this->user["id"];
+                        if ($output == "&_PHX_INTERNAL_&") {

+                            $output = $this->user["id"];

+                        }

                         $output = $this->ModUser($output, $modifier_value[$i]);
                         break;
                     case "inrole": // deprecated
-                        if ($output == "&_PHX_INTERNAL_&") $output = $this->user["id"];
+                        if ($output == "&_PHX_INTERNAL_&") {

+                            $output = $this->user["id"];

+                        }

                         $grps = ($this->strlen($modifier_value[$i]) > 0) ? explode(",", $modifier_value[$i]) : array();
                         $output = intval($this->isMemberOfWebGroupByUserId($output, $grps));
                         break;
@@ -460,12 +484,14 @@ 
 							$msg = ob_get_contents();
 							$output = $msg . $custom;
 							ob_end_clean();
-						}else{
+						} else{
 							$output = '';
 						}
                         break;
                 }
-                if (count($condition)) $this->Log("  |--- Condition = '" . $condition[count($condition) - 1] . "'");
+                if (count($condition)) {

+                    $this->Log("  |--- Condition = '" . $condition[count($condition) - 1] . "'");

+                }

                 $this->Log("  |--- Output = '" . $output . "'");
             }
         }
@@ -545,7 +571,9 @@ 
         global $modx;
 
         // if $groupNames is not an array return false
-        if (!is_array($groupNames)) return false;
+        if (!is_array($groupNames)) {

+            return false;

+        }

 
         // if the user id is a negative number make it positive
         if (intval($userid) < 0) {
@@ -562,8 +590,9 @@ 
             $grpNames = $this->cache["mo"][$userid];
         }
         // Check if a supplied group matches a webgroup from the array we just created
-        foreach ($groupNames as $k => $v)
-            if (in_array(trim($v), $grpNames)) return true;
+        foreach ($groupNames as $k => $v) {

+                    if (in_array(trim($v), $grpNames)) return true;

+        }

 
         // If we get here the above logic did not find a match, so return false
         return false;
@@ -586,52 +615,65 @@ 
     // Sets a placeholder variable which can only be access by PHx
 	public function setPHxVariable($name, $value)
     {
-        if ($name != "phx") $this->placeholders[$name] = $value;
+        if ($name != "phx") {

+            $this->placeholders[$name] = $value;

+        }

     }
 
     //mbstring
 	public function substr($str, $s, $l = null)
     {
-        if (function_exists('mb_substr')) return mb_substr($str, $s, $l);
+        if (function_exists('mb_substr')) {

+            return mb_substr($str, $s, $l);

+        }

         return substr($str, $s, $l);
     }
 
 	public function strlen($str)
     {
-        if (function_exists('mb_strlen')) return mb_strlen($str);
+        if (function_exists('mb_strlen')) {

+            return mb_strlen($str);

+        }

         return strlen($str);
     }
 
 	public function strtolower($str)
     {
-        if (function_exists('mb_strtolower')) return mb_strtolower($str);
+        if (function_exists('mb_strtolower')) {

+            return mb_strtolower($str);

+        }

         return strtolower($str);
     }
 
 	public function strtoupper($str)
     {
-        if (function_exists('mb_strtoupper')) return mb_strtoupper($str);
+        if (function_exists('mb_strtoupper')) {

+            return mb_strtoupper($str);

+        }

         return strtoupper($str);
     }
 
 	public function ucfirst($str)
     {
-        if (function_exists('mb_strtoupper') && function_exists('mb_substr') && function_exists('mb_strlen'))
-            return mb_strtoupper(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str));
+        if (function_exists('mb_strtoupper') && function_exists('mb_substr') && function_exists('mb_strlen')) {

+                    return mb_strtoupper(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str));

+        }

         return ucfirst($str);
     }
 
 	public function lcfirst($str)
     {
-        if (function_exists('mb_strtolower') && function_exists('mb_substr') && function_exists('mb_strlen'))
-            return mb_strtolower(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str));
+        if (function_exists('mb_strtolower') && function_exists('mb_substr') && function_exists('mb_strlen')) {

+                    return mb_strtolower(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str));

+        }

         return lcfirst($str);
     }
 
 	public function ucwords($str)
     {
-        if (function_exists('mb_convert_case'))
-            return mb_convert_case($str, MB_CASE_TITLE);
+        if (function_exists('mb_convert_case')) {

+                    return mb_convert_case($str, MB_CASE_TITLE);

+        }

         return ucwords($str);
     }