Inspection of "DLUsers\Actions::UserID()" - AgelxNash/DocLister - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( ef387c...215071 )

by Agel_Nash

created 2016-01-17 00:18 UTC

Status

Indentation +395 added lines, -395 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

Spacing +96 added lines, -96 removed lines patch added patch discarded remove patch

@@ -9,7 +9,7 @@  discard block
 block discarded – undo
 use APIHelpers, DocumentParser, DLCollection, DLTemplate;
 use Helpers\FS;
 
-class Actions{
+class Actions {
     protected $modx = null;
     public $userObj = null;
 	/**
@@ -84,20 +84,20 @@  discard block
 block discarded – undo
     /**
      * Сброс авторизации и обновление страницы
      */
-    public function logout($params){
+    public function logout($params) {
     	$LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');
-    	if(is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])){
+    	if (is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])) {
     		$userID = $this->UserID('web');
-    		if($userID){
+    		if ($userID) {
     			$this->userObj->edit($userID);
-    			if($this->userObj->getID()){
+    			if ($this->userObj->getID()) {
 	    			$this->modx->invokeEvent("OnBeforeWebLogout", array(
 		    			"userid"   => $this->userObj->getID(),
 		    			"username" => $this->userObj->get('username')
 		    		));
 	    		}
 		    	$this->userObj->logOut();
-		    	if($this->userObj->getID()){
+		    	if ($this->userObj->getID()) {
 		    		$this->modx->invokeEvent("OnWebLogout", array(
 		    			"userid"        => $this->userObj->getID(),
 		    			"username"      => $this->userObj->get('username')
@@ -105,22 +105,22 @@  discard block
 block discarded – undo
 		    	}
 
 			    $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();
     		}
@@ -132,15 +132,15 @@  discard block
 block discarded – undo
      * Генерация ссылки под кнопку выход
      * @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;
     }
 
     /**
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
      * 		если указан параметр authId, то данные из формы перекидываются в метод AuthPage
      *   	В противном случае вся работа происходит внутри самого блока
      */
-    public function AuthBlock($params){
+    public function AuthBlock($params) {
     	$POST = array('backUrl' => $_SERVER['REQUEST_URI']);
 
     	$error = $errorCode = '';
@@ -157,20 +157,20 @@  discard block
 block discarded – undo
 		$emailField = APIHelpers::getkey($params, 'emailField', 'email');
 		$rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');
 
-    	if($this->UserID('web')){
+    	if ($this->UserID('web')) {
 			$tpl = APIHelpers::getkey($params, 'tplProfile', '');
-			if(empty($tpl)){
+			if (empty($tpl)) {
 				$tpl = $this->getTemplate('tplProfile');
 			}
 			$dataTPL = $this->userObj->toArray();
 			$dataTPL['url.logout'] = $this->logoutUrl($params);
     		$homeID = APIHelpers::getkey($params, 'homeID');
-			if(!empty($homeID)){
+			if (!empty($homeID)) {
 				$dataTPL['url.profile'] = $this->makeUrl($homeID);
 			}
-		}else{
+		} else {
 			$tpl = APIHelpers::getkey($params, 'tplForm', '');
-			if(empty($tpl)){
+			if (empty($tpl)) {
 				$tpl = $this->getTemplate('authForm');
 			}
 			$POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);
@@ -184,9 +184,9 @@  discard block
 block discarded – undo
 				'errorCode' => $errorCode
 			);
 			$authId = APIHelpers::getkey($params, 'authId');
-			if(!empty($authId)){
+			if (!empty($authId)) {
 				$dataTPL['authPage'] = $this->makeUrl($authId);
-				$dataTPL['method'] = strtolower(__CLASS__ . '::'. 'authpage');
+				$dataTPL['method'] = strtolower(__CLASS__ . '::' . 'authpage');
 			}
 		}
 		return DLTemplate::getInstance($this->modx)->parseChunk($tpl, $dataTPL);
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
 	 * Авторизация на сайте со страницы авторизации
 	 * [!Auth? &login=`password` &pwdField=`password` &homeID=`72`!]
 	 */
-	public function AuthPage($params){
+	public function AuthPage($params) {
 		$homeID = APIHelpers::getkey($params, 'homeID');
 		$this->isAuthGoHome(array('id' => $homeID));
 
@@ -208,58 +208,58 @@  discard block
 block discarded – undo
 		$rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');
 
 		$tpl = APIHelpers::getkey($params, 'tpl', '');
-		if(empty($tpl)){
+		if (empty($tpl)) {
 			$tpl = $this->getTemplate('authForm');
 		}
 
 		$request = parse_url($_SERVER['REQUEST_URI']);
-		if(!empty($_SERVER['HTTP_REFERER'])){
+		if (!empty($_SERVER['HTTP_REFERER'])) {
 			/**
 			 * Thank you for super protection against hacking in protect.inc.php:-)
 			 */
 			$refer = htmlspecialchars_decode($_SERVER['HTTP_REFERER'], ENT_QUOTES);
-		}else{
+		} else {
 			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');
-			if(empty( $request['host']) ||  $request['host']==$selfHost){
-				$query = !empty($request['query']) ? '?'.$request['query'] : '';
-			    $refer = !empty($request['path']) ? $request['path'].$query : '';
-			}else{
+			if (empty($request['host']) || $request['host'] == $selfHost) {
+				$query = !empty($request['query']) ? '?' . $request['query'] : '';
+			    $refer = !empty($request['path']) ? $request['path'] . $query : '';
+			} else {
 				$refer = '';
 			}
 		}
 
-		if($_SERVER['REQUEST_METHOD'] == 'POST'){
+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 			$backUrl = APIHelpers::getkey($_POST, 'backUrl', $POST['backUrl']);
-			if(!is_scalar($backUrl)){
+			if (!is_scalar($backUrl)) {
 				$backUrl = $refer;
-			}else{
+			} else {
 				$backUrl = urldecode($backUrl);
 			}
-		}else{
+		} else {
 			$backUrl = $refer;
 		}
 		$backUrl = parse_url($backUrl);
-		if(!empty($backUrl['path']) && $request['path'] != $backUrl['path']){
+		if (!empty($backUrl['path']) && $request['path'] != $backUrl['path']) {
 		    $POST['backUrl'] = $backUrl['path'];
-		}else{
+		} else {
 			$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');
-			if(empty($backUrl['host']) || $backUrl['host']==$selfHost){
-				$query = !empty($backUrl['query']) ? '?'.$backUrl['query'] : '';
-			    $POST['backUrl'] = !empty($backUrl['path']) ? $backUrl['path'].$query : '';
-			}else{
+			if (empty($backUrl['host']) || $backUrl['host'] == $selfHost) {
+				$query = !empty($backUrl['query']) ? '?' . $backUrl['query'] : '';
+			    $POST['backUrl'] = !empty($backUrl['path']) ? $backUrl['path'] . $query : '';
+			} else {
 				$POST['backUrl'] = '';
 			}
 		}
-		if(!empty($POST['backUrl'])){
+		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);
@@ -275,18 +275,18 @@  discard block
 block discarded – undo
 			'errorCode' => $errorCode
 		));
 	}
-	protected function Auth($pwdField, $emailField, $rememberField, $backUrl, $method, &$error, &$errorCode, $params = array()){
+	protected function Auth($pwdField, $emailField, $rememberField, $backUrl, $method, &$error, &$errorCode, $params = array()) {
 		$POST = array(
 			'backUrl' => urlencode($backUrl)
 		);
 		$userObj = &$this->userObj;
-		if($_SERVER['REQUEST_METHOD']=='POST' && APIHelpers::getkey($_POST, 'method', '') == strtolower($method)){
+		if ($_SERVER['REQUEST_METHOD'] == 'POST' && APIHelpers::getkey($_POST, 'method', '') == strtolower($method)) {
 			$POST = array_merge($POST, array(
 				'password' => APIHelpers::getkey($_POST, $pwdField, ''),
 				'email' => APIHelpers::getkey($_POST, $emailField, ''),
 				'remember' => (bool)((int)APIHelpers::getkey($_POST, $rememberField, 0))
 			));
-			if(!empty($POST['email']) && is_scalar($POST['email']) && !$userObj->emailValidate($POST['email'], false)){
+			if (!empty($POST['email']) && is_scalar($POST['email']) && !$userObj->emailValidate($POST['email'], false)) {
 				$userObj->edit($POST['email']);
 
 				$this->modx->invokeEvent("OnBeforeWebLogin", array(
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
 		            "rememberme"	=> $POST['remember'],
 		            'userObj'		=> $userObj
 		        ));
-				if($userObj->getID() && !$userObj->checkBlock($userObj->getID())){
+				if ($userObj->getID() && !$userObj->checkBlock($userObj->getID())) {
 					$pluginFlag = $this->modx->invokeEvent("OnWebAuthentication", array(
 	                    "userid"        => $userObj->getID(),
 	                    "username"      => $userObj->get('username'),
@@ -303,11 +303,11 @@  discard block
 block discarded – undo
 	                    "savedpassword" => $userObj->get('password'),
 	                    "rememberme"    => $POST['remember'],
 	                ));
-					if(
+					if (
 						($pluginFlag === true || $userObj->testAuth($userObj->getID(), $POST['password'], 0))
 							&&
 						$userObj->authUser($userObj->getID(), $POST['remember'])
-					){
+					) {
 						$userObj->set('logincount', (int)$userObj->get('logincount') + 1);
 						$userObj->set('lastlogin', time());
 						$userObj->set('failedlogincount', 0);
@@ -320,21 +320,21 @@  discard block
 block discarded – undo
 			                "rememberme"	=> $POST['remember'],
 			            ));
 						$this->moveTo(array('url' => urldecode($POST['backUrl'])));
-					}else{
+					} else {
 						$userObj->set('failedlogincount', (int)$userObj->get('failedlogincount') + 1);
 						$userObj->save(false, false);
 
 						$error = 'error.incorrect_password';
 					}
-				}else{
+				} else {
 					$error = 'error.no_user';
 				}
-			}else{
+			} else {
 				$error = 'error.incorrect_mail';
 				$POST['email'] = '';
 			}
 		}
-		if(!empty($error)){
+		if (!empty($error)) {
 			$errorCode = $error;
 			$error = APIHelpers::getkey($params, $error, '');
 			$error = static::getLangMsg($error, $error);
@@ -345,16 +345,16 @@  discard block
 block discarded – undo
 	 * Информация о пользователе
 	 * [!DLUsers? &action=`UserInfo` &field=`fullname` &id=`2`!]
 	 */
-	public function UserInfo($params){
+	public function UserInfo($params) {
 		$out = '';
 		$userID = APIHelpers::getkey($params, 'id', 0);
-		if(empty($userID)){
+		if (empty($userID)) {
 			$userID = $this->UserID('web');
 		}
 		$field = APIHelpers::getkey($params, 'field', 'username');
-		if($userID > 0){
+		if ($userID > 0) {
 			$this->userObj->edit($userID);
-			switch(true){
+			switch (true) {
 				case ($field == $this->userObj->fieldPKName()):
 					$out = $this->userObj->getID();
 					break;
@@ -368,14 +368,14 @@  discard block
 block discarded – undo
 	/**
 	 * ID пользователя
 	 */
-	public function UserID($type = 'web'){
+	public function UserID($type = 'web') {
 		return $this->modx->getLoginUserID($type);
 	}
 	/**
 	 * Если не авторизован - то отправить на страницу
 	 */
-	public function isGuestGoHome($params){
-		if(!$this->UserID('web')){
+	public function isGuestGoHome($params) {
+		if (!$this->UserID('web')) {
 			/**
 			 * @see : http://modx.im/blog/triks/105.html
 			 */
@@ -389,11 +389,11 @@  discard block
 block discarded – undo
 	/**
 	 * Если авторизован - то открыть личный кабинет
 	 */
-	public function isAuthGoHome($params){
+	public function isAuthGoHome($params) {
 		$userID = $this->UserID('web');
-		if($userID>0){
+		if ($userID > 0) {
 			$id = APIHelpers::getkey($params, 'homeID');
-		    if(empty($id)){
+		    if (empty($id)) {
 				$id = $this->modx->getConfig('login_home', $this->config['site_start']);
 		    }
 		    $this->moveTo(compact('id'));
@@ -404,29 +404,29 @@  discard block
 block discarded – undo
 	/**
 	 * Редирект
 	 */
-	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;
 	}
@@ -437,52 +437,52 @@  discard block
 block discarded – undo
 	 * @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;
 			}
 		}

Please login to merge, or discard this patch.

		@@ -9,7 +9,7 @@ discard block
		block discarded – undo
9	9	use APIHelpers, DocumentParser, DLCollection, DLTemplate;
10	10	use Helpers\FS;
11	11
12		-class Actions{
	12	+class Actions {
13	13	protected $modx = null;
14	14	public $userObj = null;
15	15	/**
		@@ -84,20 +84,20 @@ discard block
		block discarded – undo
84	84	/**
85	85	* Сброс авторизации и обновление страницы
86	86	*/
87		- public function logout($params){
	87	+ public function logout($params) {
88	88	$LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');
89		- if(is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])){
	89	+ if (is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])) {
90	90	$userID = $this->UserID('web');
91		- if($userID){
	91	+ if ($userID) {
92	92	$this->userObj->edit($userID);
93		- if($this->userObj->getID()){
	93	+ if ($this->userObj->getID()) {
94	94	$this->modx->invokeEvent("OnBeforeWebLogout", array(
95	95	"userid" => $this->userObj->getID(),
96	96	"username" => $this->userObj->get('username')
97	97	));
98	98	}
99	99	$this->userObj->logOut();
100		- if($this->userObj->getID()){
	100	+ if ($this->userObj->getID()) {
101	101	$this->modx->invokeEvent("OnWebLogout", array(
102	102	"userid" => $this->userObj->getID(),
103	103	"username" => $this->userObj->get('username')
		@@ -105,22 +105,22 @@ discard block
		block discarded – undo
105	105	}
106	106
107	107	$go = APIHelpers::getkey($params, 'url', '');
108		- if(empty($go)){
	108	+ if (empty($go)) {
109	109	$go = str_replace(
110		- array("?".$LogoutName, "&".$LogoutName),
	110	+ array("?" . $LogoutName, "&" . $LogoutName),
111	111	array("", ""),
112	112	$_SERVER['REQUEST_URI']
113	113	);
114	114	}
115	115
116	116	$start = $this->makeUrl($this->config['site_start']);
117		- if($start == $go){
	117	+ if ($start == $go) {
118	118	$go = $this->config['site_url'];
119		- }else{
120		- $go = $this->config['site_url'].ltrim($go, '/');
	119	+ } else {
	120	+ $go = $this->config['site_url'] . ltrim($go, '/');
121	121	}
122	122	$this->moveTo(array('url' => $go));
123		- }else{
	123	+ } else {
124	124	//Если юзер не авторизован, то показываем ему 404 ошибку
125	125	$this->modx->sendErrorPage();
126	126	}
		@@ -132,15 +132,15 @@ discard block
		block discarded – undo
132	132	* Генерация ссылки под кнопку выход
133	133	* @return string
134	134	*/
135		- public function logoutUrl($params){
	135	+ public function logoutUrl($params) {
136	136	$LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');
137	137	$request = parse_url($_SERVER['REQUEST_URI']);
138	138
139	139	//Во избежании XSS мы не сохраняем весь REQUEST_URI, а берем только path
140	140	/$query = (!empty($request['query'])) ? $request['query'].'&' : '';/
141		- $query = '?'.$LogoutName;
	141	+ $query = '?' . $LogoutName;
142	142
143		- return $request['path'].$query;
	143	+ return $request['path'] . $query;
144	144	}
145	145
146	146	/**
		@@ -148,7 +148,7 @@ discard block
		block discarded – undo
148	148	* если указан параметр authId, то данные из формы перекидываются в метод AuthPage
149	149	* В противном случае вся работа происходит внутри самого блока
150	150	*/
151		- public function AuthBlock($params){
	151	+ public function AuthBlock($params) {
152	152	$POST = array('backUrl' => $_SERVER['REQUEST_URI']);
153	153
154	154	$error = $errorCode = '';
		@@ -157,20 +157,20 @@ discard block
		block discarded – undo
157	157	$emailField = APIHelpers::getkey($params, 'emailField', 'email');
158	158	$rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');
159	159
160		- if($this->UserID('web')){
	160	+ if ($this->UserID('web')) {
161	161	$tpl = APIHelpers::getkey($params, 'tplProfile', '');
162		- if(empty($tpl)){
	162	+ if (empty($tpl)) {
163	163	$tpl = $this->getTemplate('tplProfile');
164	164	}
165	165	$dataTPL = $this->userObj->toArray();
166	166	$dataTPL['url.logout'] = $this->logoutUrl($params);
167	167	$homeID = APIHelpers::getkey($params, 'homeID');
168		- if(!empty($homeID)){
	168	+ if (!empty($homeID)) {
169	169	$dataTPL['url.profile'] = $this->makeUrl($homeID);
170	170	}
171		- }else{
	171	+ } else {
172	172	$tpl = APIHelpers::getkey($params, 'tplForm', '');
173		- if(empty($tpl)){
	173	+ if (empty($tpl)) {
174	174	$tpl = $this->getTemplate('authForm');
175	175	}
176	176	$POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error, $errorCode, $params);
		@@ -184,9 +184,9 @@ discard block
		block discarded – undo
184	184	'errorCode' => $errorCode
185	185	);
186	186	$authId = APIHelpers::getkey($params, 'authId');
187		- if(!empty($authId)){
	187	+ if (!empty($authId)) {
188	188	$dataTPL['authPage'] = $this->makeUrl($authId);
189		- $dataTPL['method'] = strtolower(__CLASS__ . '::'. 'authpage');
	189	+ $dataTPL['method'] = strtolower(__CLASS__ . '::' . 'authpage');
190	190	}
191	191	}
192	192	return DLTemplate::getInstance($this->modx)->parseChunk($tpl, $dataTPL);
		@@ -196,7 +196,7 @@ discard block
		block discarded – undo
196	196	* Авторизация на сайте со страницы авторизации
197	197	* [!Auth? &login=`password` &pwdField=`password` &homeID=`72`!]
198	198	*/
199		- public function AuthPage($params){
	199	+ public function AuthPage($params) {
200	200	$homeID = APIHelpers::getkey($params, 'homeID');
201	201	$this->isAuthGoHome(array('id' => $homeID));
202	202
		@@ -208,58 +208,58 @@ discard block
		block discarded – undo
208	208	$rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');
209	209
210	210	$tpl = APIHelpers::getkey($params, 'tpl', '');
211		- if(empty($tpl)){
	211	+ if (empty($tpl)) {
212	212	$tpl = $this->getTemplate('authForm');
213	213	}
214	214
215	215	$request = parse_url($_SERVER['REQUEST_URI']);
216		- if(!empty($_SERVER['HTTP_REFERER'])){
	216	+ if (!empty($_SERVER['HTTP_REFERER'])) {
217	217	/**
218	218	* Thank you for super protection against hacking in protect.inc.php:-)
219	219	*/
220	220	$refer = htmlspecialchars_decode($_SERVER['HTTP_REFERER'], ENT_QUOTES);
221		- }else{
	221	+ } else {
222	222	$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');
223		- if(empty( $request['host']) \|\| $request['host']==$selfHost){
224		- $query = !empty($request['query']) ? '?'.$request['query'] : '';
225		- $refer = !empty($request['path']) ? $request['path'].$query : '';
226		- }else{
	223	+ if (empty($request['host']) \|\| $request['host'] == $selfHost) {
	224	+ $query = !empty($request['query']) ? '?' . $request['query'] : '';
	225	+ $refer = !empty($request['path']) ? $request['path'] . $query : '';
	226	+ } else {
227	227	$refer = '';
228	228	}
229	229	}
230	230
231		- if($_SERVER['REQUEST_METHOD'] == 'POST'){
	231	+ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
232	232	$backUrl = APIHelpers::getkey($_POST, 'backUrl', $POST['backUrl']);
233		- if(!is_scalar($backUrl)){
	233	+ if (!is_scalar($backUrl)) {
234	234	$backUrl = $refer;
235		- }else{
	235	+ } else {
236	236	$backUrl = urldecode($backUrl);
237	237	}
238		- }else{
	238	+ } else {
239	239	$backUrl = $refer;
240	240	}
241	241	$backUrl = parse_url($backUrl);
242		- if(!empty($backUrl['path']) && $request['path'] != $backUrl['path']){
	242	+ if (!empty($backUrl['path']) && $request['path'] != $backUrl['path']) {
243	243	$POST['backUrl'] = $backUrl['path'];
244		- }else{
	244	+ } else {
245	245	$selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');
246		- if(empty($backUrl['host']) \|\| $backUrl['host']==$selfHost){
247		- $query = !empty($backUrl['query']) ? '?'.$backUrl['query'] : '';
248		- $POST['backUrl'] = !empty($backUrl['path']) ? $backUrl['path'].$query : '';
249		- }else{
	246	+ if (empty($backUrl['host']) \|\| $backUrl['host'] == $selfHost) {
	247	+ $query = !empty($backUrl['query']) ? '?' . $backUrl['query'] : '';
	248	+ $POST['backUrl'] = !empty($backUrl['path']) ? $backUrl['path'] . $query : '';
	249	+ } else {
250	250	$POST['backUrl'] = '';
251	251	}
252	252	}
253		- if(!empty($POST['backUrl'])){
	253	+ if (!empty($POST['backUrl'])) {
254	254	$idURL = $this->moveTo(array(
255		- 'url' => '/'.ltrim($POST['backUrl'], '/'),
	255	+ 'url' => '/' . ltrim($POST['backUrl'], '/'),
256	256	'validate' => true
257	257	));
258		- }else{
	258	+ } else {
259	259	$idURL = 0;
260	260	}
261		- if(empty($idURL)){
262		- if(empty($homeID)){
	261	+ if (empty($idURL)) {
	262	+ if (empty($homeID)) {
263	263	$homeID = $this->config['site_start'];
264	264	}
265	265	$POST['backUrl'] = $this->makeUrl($homeID);
		@@ -275,18 +275,18 @@ discard block
		block discarded – undo
275	275	'errorCode' => $errorCode
276	276	));
277	277	}
278		- protected function Auth($pwdField, $emailField, $rememberField, $backUrl, $method, &$error, &$errorCode, $params = array()){
	278	+ protected function Auth($pwdField, $emailField, $rememberField, $backUrl, $method, &$error, &$errorCode, $params = array()) {
279	279	$POST = array(
280	280	'backUrl' => urlencode($backUrl)
281	281	);
282	282	$userObj = &$this->userObj;
283		- if($_SERVER['REQUEST_METHOD']=='POST' && APIHelpers::getkey($_POST, 'method', '') == strtolower($method)){
	283	+ if ($_SERVER['REQUEST_METHOD'] == 'POST' && APIHelpers::getkey($_POST, 'method', '') == strtolower($method)) {
284	284	$POST = array_merge($POST, array(
285	285	'password' => APIHelpers::getkey($_POST, $pwdField, ''),
286	286	'email' => APIHelpers::getkey($_POST, $emailField, ''),
287	287	'remember' => (bool)((int)APIHelpers::getkey($_POST, $rememberField, 0))
288	288	));
289		- if(!empty($POST['email']) && is_scalar($POST['email']) && !$userObj->emailValidate($POST['email'], false)){
	289	+ if (!empty($POST['email']) && is_scalar($POST['email']) && !$userObj->emailValidate($POST['email'], false)) {
290	290	$userObj->edit($POST['email']);
291	291
292	292	$this->modx->invokeEvent("OnBeforeWebLogin", array(
		@@ -295,7 +295,7 @@ discard block
		block discarded – undo
295	295	"rememberme" => $POST['remember'],
296	296	'userObj' => $userObj
297	297	));
298		- if($userObj->getID() && !$userObj->checkBlock($userObj->getID())){
	298	+ if ($userObj->getID() && !$userObj->checkBlock($userObj->getID())) {
299	299	$pluginFlag = $this->modx->invokeEvent("OnWebAuthentication", array(
300	300	"userid" => $userObj->getID(),
301	301	"username" => $userObj->get('username'),
		@@ -303,11 +303,11 @@ discard block
		block discarded – undo
303	303	"savedpassword" => $userObj->get('password'),
304	304	"rememberme" => $POST['remember'],
305	305	));
306		- if(
	306	+ if (
307	307	($pluginFlag === true \|\| $userObj->testAuth($userObj->getID(), $POST['password'], 0))
308	308	&&
309	309	$userObj->authUser($userObj->getID(), $POST['remember'])
310		- ){
	310	+ ) {
311	311	$userObj->set('logincount', (int)$userObj->get('logincount') + 1);
312	312	$userObj->set('lastlogin', time());
313	313	$userObj->set('failedlogincount', 0);
		@@ -320,21 +320,21 @@ discard block
		block discarded – undo
320	320	"rememberme" => $POST['remember'],
321	321	));
322	322	$this->moveTo(array('url' => urldecode($POST['backUrl'])));
323		- }else{
	323	+ } else {
324	324	$userObj->set('failedlogincount', (int)$userObj->get('failedlogincount') + 1);
325	325	$userObj->save(false, false);
326	326
327	327	$error = 'error.incorrect_password';
328	328	}
329		- }else{
	329	+ } else {
330	330	$error = 'error.no_user';
331	331	}
332		- }else{
	332	+ } else {
333	333	$error = 'error.incorrect_mail';
334	334	$POST['email'] = '';
335	335	}
336	336	}
337		- if(!empty($error)){
	337	+ if (!empty($error)) {
338	338	$errorCode = $error;
339	339	$error = APIHelpers::getkey($params, $error, '');
340	340	$error = static::getLangMsg($error, $error);
		@@ -345,16 +345,16 @@ discard block
		block discarded – undo
345	345	* Информация о пользователе
346	346	* [!DLUsers? &action=`UserInfo` &field=`fullname` &id=`2`!]
347	347	*/
348		- public function UserInfo($params){
	348	+ public function UserInfo($params) {
349	349	$out = '';
350	350	$userID = APIHelpers::getkey($params, 'id', 0);
351		- if(empty($userID)){
	351	+ if (empty($userID)) {
352	352	$userID = $this->UserID('web');
353	353	}
354	354	$field = APIHelpers::getkey($params, 'field', 'username');
355		- if($userID > 0){
	355	+ if ($userID > 0) {
356	356	$this->userObj->edit($userID);
357		- switch(true){
	357	+ switch (true) {
358	358	case ($field == $this->userObj->fieldPKName()):
359	359	$out = $this->userObj->getID();
360	360	break;
		@@ -368,14 +368,14 @@ discard block
		block discarded – undo
368	368	/**
369	369	* ID пользователя
370	370	*/
371		- public function UserID($type = 'web'){
	371	+ public function UserID($type = 'web') {
372	372	return $this->modx->getLoginUserID($type);
373	373	}
374	374	/**
375	375	* Если не авторизован - то отправить на страницу
376	376	*/
377		- public function isGuestGoHome($params){
378		- if(!$this->UserID('web')){
	377	+ public function isGuestGoHome($params) {
	378	+ if (!$this->UserID('web')) {
379	379	/**
380	380	* @see : http://modx.im/blog/triks/105.html
381	381	*/
		@@ -389,11 +389,11 @@ discard block
		block discarded – undo
389	389	/**
390	390	* Если авторизован - то открыть личный кабинет
391	391	*/
392		- public function isAuthGoHome($params){
	392	+ public function isAuthGoHome($params) {
393	393	$userID = $this->UserID('web');
394		- if($userID>0){
	394	+ if ($userID > 0) {
395	395	$id = APIHelpers::getkey($params, 'homeID');
396		- if(empty($id)){
	396	+ if (empty($id)) {
397	397	$id = $this->modx->getConfig('login_home', $this->config['site_start']);
398	398	}
399	399	$this->moveTo(compact('id'));
		@@ -404,29 +404,29 @@ discard block
		block discarded – undo
404	404	/**
405	405	* Редирект
406	406	*/
407		- public function moveTo($params){
	407	+ public function moveTo($params) {
408	408	$id = (int)APIHelpers::getkey($params, 'id', 0);
409	409	$uri = APIHelpers::getkey($params, 'url', '');
410		- if((empty($uri) && !empty($id)) \|\| !is_string($uri)){
	410	+ if ((empty($uri) && !empty($id)) \|\| !is_string($uri)) {
411	411	$uri = $this->makeUrl($id);
412	412	}
413	413	$code = (int)APIHelpers::getkey($params, 'code', 0);
414	414	$addUrl = APIHelpers::getkey($params, 'addUrl', '');
415		- if(is_scalar($addUrl) && $addUrl!=''){
416		- $uri .= "?".$addUrl;
	415	+ if (is_scalar($addUrl) && $addUrl != '') {
	416	+ $uri .= "?" . $addUrl;
417	417	}
418		- if(APIHelpers::getkey($params, 'validate', false)){
419		- if(isset($this->modx->snippetCache['getPageID'])){
	418	+ if (APIHelpers::getkey($params, 'validate', false)) {
	419	+ if (isset($this->modx->snippetCache['getPageID'])) {
420	420	$out = $this->modx->runSnippet('getPageID', compact('uri'));
421		- if(empty($out)){
	421	+ if (empty($out)) {
422	422	$uri = '';
423	423	}
424		- }else{
	424	+ } else {
425	425	$uri = APIhelpers::sanitarTag($uri);
426	426	}
427		- }else{
	427	+ } else {
428	428	//$modx->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.1 307 Temporary Redirect');
429		- header("Location: ".$uri, true, ($code>0 ? $code : 307));
	429	+ header("Location: " . $uri, true, ($code > 0 ? $code : 307));
430	430	}
431	431	return $uri;
432	432	}
		@@ -437,52 +437,52 @@ discard block
		block discarded – undo
437	437	* @param int $id ID документа
438	438	* @return string
439	439	*/
440		- protected function makeUrl($id = null){
	440	+ protected function makeUrl($id = null) {
441	441	$id = (int)$id;
442		- if($id <= 0){
	442	+ if ($id <= 0) {
443	443	$id = $this->modx->documentObject['id'];
444	444	}
445		- if($this->url->containsKey($id)){
	445	+ if ($this->url->containsKey($id)) {
446	446	$url = $this->url->get($id);
447		- }else{
	447	+ } else {
448	448	$url = $this->modx->makeUrl($id);
449	449	$this->url->set($id, $url);
450	450	}
451	451	return $url;
452	452	}
453		- protected function getTemplate($name){
	453	+ protected function getTemplate($name) {
454	454	$out = '';
455		- $file = dirname(dirname(__FILE__)).'/tpl/'.$name.'.html';
456		- if( FS::getInstance()->checkFile($file)){
457		- $out = '@CODE: '.file_get_contents($file);
	455	+ $file = dirname(dirname(__FILE__)) . '/tpl/' . $name . '.html';
	456	+ if (FS::getInstance()->checkFile($file)) {
	457	+ $out = '@CODE: ' . file_get_contents($file);
458	458	}
459	459	return $out;
460	460	}
461		- protected static function loadLang($lang){
462		- $file = dirname(dirname(__FILE__)).'/lang/'.$lang.'.php';
463		- if( ! FS::getInstance()->checkFile($file)){
	461	+ protected static function loadLang($lang) {
	462	+ $file = dirname(dirname(__FILE__)) . '/lang/' . $lang . '.php';
	463	+ if (!FS::getInstance()->checkFile($file)) {
464	464	$file = false;
465	465	}
466		- if(!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)){
	466	+ if (!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)) {
467	467	static::$langDic[$lang] = include_once($file);
468		- if(is_array(static::$langDic[$lang])){
	468	+ if (is_array(static::$langDic[$lang])) {
469	469	static::$langDic[$lang] = APIHelpers::renameKeyArr(static::$langDic[$lang], $lang);
470		- }else{
	470	+ } else {
471	471	static::$langDic[$lang] = array();
472	472	}
473	473	}
474	474	return !(empty($lang) \|\| empty(static::$langDic[$lang]));
475	475	}
476		- protected static function getLangMsg($key, $default){
	476	+ protected static function getLangMsg($key, $default) {
477	477	$out = $default;
478	478	$lng = static::$lang;
479	479	$dic = static::$langDic;
480		- if(isset($dic[$lng], $dic[$lng][$lng.'.'.$key])){
481		- $out = $dic[$lng][$lng.'.'.$key];
	480	+ if (isset($dic[$lng], $dic[$lng][$lng . '.' . $key])) {
	481	+ $out = $dic[$lng][$lng . '.' . $key];
482	482	}
483		- if(class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])){
484		- $msg = self::$instance->modx->runSnippet('lang', array('a' => 'DLUsers.'.$key));
485		- if(!empty($msg)){
	483	+ if (class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])) {
	484	+ $msg = self::$instance->modx->runSnippet('lang', array('a' => 'DLUsers.' . $key));
	485	+ if (!empty($msg)) {
486	486	$out = $msg;
487	487	}
488	488	}

AgelxNash / DocLister

Push — master ( ef387c...215071 )

Status

Category

Indentation +395 added lines, -395 removed lines patch added patch discarded remove patch

Spacing +96 added lines, -96 removed lines patch added patch discarded remove patch