From f825f253773ca6f09e2f0541b3398fb89e9351e2 Mon Sep 17 00:00:00 2001 From: Mzhelskiy Maxim Date: Thu, 25 Sep 2014 17:34:20 +0700 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BA=D0=B0=D1=82=D0=B5=D0=B3=D0=BE=D1=80=D0=B8?= =?UTF-8?q?=D0=B9=20#536?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../classes/actions/ActionRegistration.class.php | 2 +- .../classes/modules/category/Category.class.php | 14 ++++++++++++++ .../category/entity/Category.entity.class.php | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/application/classes/actions/ActionRegistration.class.php b/application/classes/actions/ActionRegistration.class.php index 91412257..1c40eacc 100644 --- a/application/classes/actions/ActionRegistration.class.php +++ b/application/classes/actions/ActionRegistration.class.php @@ -173,7 +173,7 @@ class ActionRegistration extends Action { */ if ($oUser->_Validate()) { $this->Hook_Run('registration_validate_after', array('oUser'=>$oUser)); - $oUser->setPassword(md5($oUser->getPassword())); + $oUser->setPassword(func_encrypt($oUser->getPassword())); if ($this->User_Add($oUser)) { $this->Hook_Run('registration_after', array('oUser'=>$oUser)); /** diff --git a/application/classes/modules/category/Category.class.php b/application/classes/modules/category/Category.class.php index 34072573..39d8a412 100644 --- a/application/classes/modules/category/Category.class.php +++ b/application/classes/modules/category/Category.class.php @@ -496,5 +496,19 @@ class ModuleCategory extends ModuleORM { $oType->Save(); } } + /** + * Парсинг текста с учетом конкретной категории + * + * @param string $sText + * @param ModuleCategory_EntityCategory $oCategory + * + * @return string + */ + public function ParserText($sText,$oCategory) { + $this->Text_AddParams(array('oCategory'=>$oCategory)); + $sResult=$this->Text_Parser($sText); + $this->Text_RemoveParams(array('oCategory')); + return $sResult; + } } \ No newline at end of file diff --git a/application/classes/modules/category/entity/Category.entity.class.php b/application/classes/modules/category/entity/Category.entity.class.php index 455adcb2..52e9b18e 100644 --- a/application/classes/modules/category/entity/Category.entity.class.php +++ b/application/classes/modules/category/entity/Category.entity.class.php @@ -27,6 +27,7 @@ class ModuleCategory_EntityCategory extends EntityORM { */ protected $aValidateRules=array( array('title','string','max'=>200,'min'=>1,'allowEmpty'=>false), + array('description','string','max'=>5000,'min'=>1,'allowEmpty'=>true), array('url','regexp','pattern'=>'/^[\w\-_]+$/i','allowEmpty'=>false), array('order','number','integerOnly'=>true), array('pid','parent_category'),