Changeset 981

Timestamp:

08/13/10 19:40:21 (18 months ago)

Author:

ort

Message:

fix Engine and Entity

Location:

trunk/engine/classes

Files:

• Engine.class.php (modified) (5 diffs)
• Entity.class.php (modified) (2 diffs)

trunk/engine/classes/Engine.class.php

@@ -122 +122 @@
                                 $iTimeId=$oProfiler->Start('InitModule',get_class($oModule));
 
-                                $oModule->Init();
-                                $oModule->SetInit();
+                                $this->InitModule($oModule);
 
                                 $oProfiler->Stop($iTimeId);
                         }
                 }
+        }
+        
+        /**
+         * Инициализирует модуль
+         *
+         * @param unknown_type $oModule
+         */
+        protected function InitModule($oModule){
+                $sOrigClassName = $sClassName = get_class($oModule);            
+                $bRunHooks = false;
+                                
+                if($this->isInitModule('ModuleHook')){
+                        $bRunHooks = true;
+                        while(preg_match('#^Plugin#i', $sClassName)){
+                                $sParentClassName = get_parent_class($sClassName);
+                                if($sParentClassName == 'Module'){
+                                        break;
+                                }
+                                $sClassName = $sParentClassName;
+                        }
+                }
+                
+                if($bRunHooks || $sClassName == 'ModuleHook'){
+                        $sHookPrefix = 'module_';
+                        if($sPluginName = $this->GetPluginName($sClassName)){
+                                $sHookPrefix .= "plugin{$sPluginName}_";
+                        }
+                        $sHookPrefix .= $this->GetModuleName($sClassName).'_init_';
+                }
+                
+                if($bRunHooks){
+                        $this->Hook_Run($sHookPrefix.'before');
+                }
+                $oModule->Init();
+                $oModule->SetInit();            
+                if($bRunHooks || $sClassName == 'ModuleHook'){
+                        $this->Hook_Run($sHookPrefix.'after');
+                }               
+        }
+        
+        /**
+         * Проверяет модуль на инициализацию
+         *
+         * @param unknown_type $sModuleClass
+         * @return unknown
+         */
+        public function isInitModule($sModuleClass) {
+                if(!in_array($sModuleClass,array('ModulePlugin','ModuleHook'))) {
+                        $sModuleClass=$this->Plugin_GetDelegate('module',$sModuleClass);
+                }
+                if(isset($this->aModules[$sModuleClass]) and $this->aModules[$sModuleClass]->isInit()){
+                        return true;
+                }
+                return false;
         }
         
@@ -150 +203 @@
          * Выполняет загрузку модуля по его названию
          *
-         * @param  string $sModuleName
+         * @param  string $sModuleClass
          * @param  bool $bInit - инициализировать модуль или нет
          * @return Module
          */
-        public function LoadModule($sModuleName,$bInit=false) {
+        public function LoadModule($sModuleClass,$bInit=false) {
                 $tm1=microtime(true);
                 
@@ -160 +213 @@
                  * Создаем объект модуля
                  */             
-                $oModule=new $sModuleName($this);
-                if ($bInit or $sModuleName=='Cache') {
-                        $oModule->Init();
-                        $oModule->SetInit();
-                }
-                $this->aModules[$sModuleName]=$oModule;
+                $oModule=new $sModuleClass($this);
+                $this->aModules[$sModuleClass]=$oModule;
+                if ($bInit or $sModuleClass=='ModuleCache') {
+                        $this->InitModule($oModule);
+                }               
                 $tm2=microtime(true);
                 $this->iTimeLoadModule+=$tm2-$tm1;
-                dump("load $sModuleName - \t\t".($tm2-$tm1)."");
+                dump("load $sModuleClass - \t\t".($tm2-$tm1)."");
                 return $oModule;
         }
@@ -327 +379 @@
                 
                 if (!method_exists($oModule,$sMethod)) {
-                        throw new Exception("The module has no required method: ".$sModuleName.'->'.$sMethod.'()');
+                        // comment for ORM testing
+                        //throw new Exception("The module has no required method: ".$sModuleName.'->'.$sMethod.'()');
                 }
                                 
@@ -546 +599 @@
         
         public static function GetEntityName($oEntity) {
-                if (preg_match('/Entity([^_]+)/',is_string($oModule) ? $oModule : get_class($oModule),$aMatches)) {
+                if (preg_match('/Entity([^_]+)/',is_string($oEntity) ? $oEntity : get_class($oEntity),$aMatches)) {
                         if(isset($aMatches[1])) {
                                 return $aMatches[1];

trunk/engine/classes/Entity.class.php

@@ -69 +69 @@
                 $sType=strtolower(substr($sName,0,3));
                 if (!strpos($sName,'_') and in_array($sType,array('get','set'))) {
-                        $sKey=strtolower(preg_replace('/([^A-Z])([A-Z])/',"$1_$2",substr($sName,3)));
+                        $sKey=func_underscore(substr($sName,3));
                         if ($sType=='get') {
                                 if (isset($this->_aData[$sKey])) {
@@ -75 +75 @@
                                 } else {
                                         if (preg_match('/Entity([^_]+)/',get_class($this),$sModulePrefix)) {
-                                                $sModulePrefix=strtolower($sModulePrefix[1]).'_';
+                                                $sModulePrefix=func_underscore($sModulePrefix[1]).'_';
                                                 if (isset($this->_aData[$sModulePrefix.$sKey])) {
                                                         return $this->_aData[$sModulePrefix.$sKey];