From 30b0398bdab38c5f8805aae42a95852e02653bc0 Mon Sep 17 00:00:00 2001
From: Mzhelskiy Maxim <rus.engine@gmail.com>
Date: Sun, 28 Aug 2011 15:42:21 +0000
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D1=81=D0=B8=D0=BC=D0=B2=D0=BE=D0=BB=D0=B0=20"?=
 =?UTF-8?q?=5F"=20=D0=B2=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=D1=85=20=D0=BF=D0=BB=D0=B0=D0=B3=D0=B8=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=20Ticket=20#228?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 engine/classes/Engine.class.php        | 18 +++++++++---------
 engine/modules/plugin/Plugin.class.php |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/engine/classes/Engine.class.php b/engine/classes/Engine.class.php
index d136a8ce..790f51f2 100644
--- a/engine/classes/Engine.class.php
+++ b/engine/classes/Engine.class.php
@@ -387,7 +387,7 @@ class Engine extends Object {
 					foreach ($aFiles as $sFile) {
 						if (preg_match("/Hook([^_]+)\.class\.php$/i",basename($sFile),$aMatch)) {
 							//require_once($sFile);
-							$sPluginName = ucfirst($sPluginName);
+							$sPluginName = func_camelize($sPluginName);
 							$sClassName="Plugin{$sPluginName}_Hook{$aMatch[1]}";
 							$oHook=new $sClassName;
 							$oHook->RegisterHook();
@@ -405,7 +405,7 @@ class Engine extends Object {
 	protected function LoadPlugins() {
 		if($aPluginList = func_list_plugins()) {
 			foreach ($aPluginList as $sPluginName) {
-				$sClassName='Plugin'.ucfirst($sPluginName);
+				$sClassName='Plugin'.func_camelize($sPluginName);
 				$oPlugin=new $sClassName;
 				$oPlugin->Delegate();
 				$this->aPlugins[$sPluginName]=$oPlugin;
@@ -836,7 +836,7 @@ class Engine extends Object {
 			// Сущность
 			if($aInfo[self::CI_PLUGIN]){
 				// Сущность модуля плагина
-				$sPath .= 'plugins/'.strtolower($aInfo[self::CI_PLUGIN])
+				$sPath .= 'plugins/'.func_underscore($aInfo[self::CI_PLUGIN])
 					.'/classes/modules/'.strtolower($aInfo[self::CI_MODULE])
 					.'/entity/'.$aInfo[self::CI_ENTITY].'.entity.class.php'
 				;
@@ -850,7 +850,7 @@ class Engine extends Object {
 			// Маппер
 			if($aInfo[self::CI_PLUGIN]){
 				// Маппер модуля плагина
-				$sPath .= 'plugins/'.strtolower($aInfo[self::CI_PLUGIN])
+				$sPath .= 'plugins/'.func_underscore($aInfo[self::CI_PLUGIN])
 					.'/classes/modules/'.strtolower($aInfo[self::CI_MODULE])
 					.'/mapper/'.$aInfo[self::CI_MAPPER].'.mapper.class.php'
 				;
@@ -864,7 +864,7 @@ class Engine extends Object {
 			// Экшн
 			if($aInfo[self::CI_PLUGIN]){
 				// Экшн плагина
-				$sPath .= 'plugins/'.strtolower($aInfo[self::CI_PLUGIN])
+				$sPath .= 'plugins/'.func_underscore($aInfo[self::CI_PLUGIN])
 					.'/classes/actions/Action'.$aInfo[self::CI_ACTION].'.class.php'
 				;
 			}else{
@@ -877,7 +877,7 @@ class Engine extends Object {
 			// Модуль
 			if($aInfo[self::CI_PLUGIN]){
 				// Модуль плагина
-				$sPath .= 'plugins/'.strtolower($aInfo[self::CI_PLUGIN])
+				$sPath .= 'plugins/'.func_underscore($aInfo[self::CI_PLUGIN])
 					.'/classes/modules/'.strtolower($aInfo[self::CI_MODULE])
 					.'/'.$aInfo[self::CI_MODULE].'.class.php';
 				;
@@ -894,7 +894,7 @@ class Engine extends Object {
 			// Хук
 			if($aInfo[self::CI_PLUGIN]){
 				// Хук плагина
-				$sPath .= 'plugins/'.strtolower($aInfo[self::CI_PLUGIN])
+				$sPath .= 'plugins/'.func_underscore($aInfo[self::CI_PLUGIN])
 					.'/classes/hooks/Hook'.$aInfo[self::CI_HOOK]
 					.'.class.php';
 				;
@@ -906,7 +906,7 @@ class Engine extends Object {
 			// Блок
 			if($aInfo[self::CI_PLUGIN]){
 				// Блок плагина
-				$sPath .= 'plugins/'.strtolower($aInfo[self::CI_PLUGIN])
+				$sPath .= 'plugins/'.func_underscore($aInfo[self::CI_PLUGIN])
 					.'/classes/blocks/Block'.$aInfo[self::CI_BLOCK]
 					.'.class.php';
 				;
@@ -916,7 +916,7 @@ class Engine extends Object {
 			}
 		}elseif($aInfo[self::CI_PLUGIN]){
 			// Плагин
-			$sPath .= 'plugins/'.strtolower($aInfo[self::CI_PLUGIN])
+			$sPath .= 'plugins/'.func_underscore($aInfo[self::CI_PLUGIN])
 				.'/Plugin'.$aInfo[self::CI_PLUGIN]
 				.'.class.php';
 			;
diff --git a/engine/modules/plugin/Plugin.class.php b/engine/modules/plugin/Plugin.class.php
index 9168d693..c3fe6464 100644
--- a/engine/modules/plugin/Plugin.class.php
+++ b/engine/modules/plugin/Plugin.class.php
@@ -132,7 +132,7 @@ class ModulePlugin extends Module {
 		$aPlugins=$this->GetList();
 		if(!isset($aPlugins[$sPlugin])) return null;
 		
-		$sPluginName=ucfirst($sPlugin);
+		$sPluginName=func_camelize($sPlugin);
 		
 		switch ($sAction) {
 			case 'activate':
@@ -175,7 +175,7 @@ class ModulePlugin extends Module {
 									$this->Message_AddError(
 										$this->Lang_Get('plugins_activation_requires_error',
 											array(
-												'plugin'=>ucfirst($sReqPlugin)
+												'plugin'=>func_camelize($sReqPlugin)
 											)
 										),
 										$this->Lang_Get('error'),