Ticket #733

modules/boonex/english/data/langs/system/en.xml

@@ -1440,8 +1440,7 @@
 	<string name="_adm_txt_modules_process_storages"><![CDATA[Process storages:]]></string>
 	<string name="_adm_txt_modules_process_failed"><![CDATA[Failed]]></string>
 	<string name="_adm_txt_modules_process_success"><![CDATA[Done]]></string>
-	<string name="_adm_txt_modules_register_esearches"><![CDATA[Register search forms:]]></string>
-	<string name="_adm_txt_modules_unregister_esearches"><![CDATA[Unregister search forms:]]></string>
+	<string name="_adm_txt_modules_process_esearches"><![CDATA[Process search forms:]]></string>
 	<string name="_adm_txt_modules_register_transcoders"><![CDATA[Register transcoders:]]></string>
 	<string name="_adm_txt_modules_unregister_transcoders"><![CDATA[Unregister transcoders:]]></string>
 	<string name="_adm_txt_modules_show_conclusion"><![CDATA[Conclusion from vendor:]]></string>

modules/boonex/russian/data/langs/system/ru.xml

@@ -1438,8 +1438,7 @@
 	<string name="_adm_txt_modules_process_storages"><![CDATA[Обработка хранилищ:]]></string>
 	<string name="_adm_txt_modules_process_failed"><![CDATA[Неудача]]></string>
 	<string name="_adm_txt_modules_process_success"><![CDATA[Выполнено]]></string>
-	<string name="_adm_txt_modules_register_esearches"><![CDATA[Зарегистрировать формы поиска:]]></string>
-	<string name="_adm_txt_modules_unregister_esearches"><![CDATA[Разрегистрировать формы поиска:]]></string>
+	<string name="_adm_txt_modules_process_esearches"><![CDATA[Обработка форм поиска:]]></string>
 	<string name="_adm_txt_modules_register_transcoders"><![CDATA[Зарегистрировать транскодеры:]]></string>
 	<string name="_adm_txt_modules_unregister_transcoders"><![CDATA[Разрегистрировать транскодеры:]]></string>
 	<string name="_adm_txt_modules_show_conclusion"><![CDATA[Вывод от продавца:]]></string>

studio/classes/BxDolStudioInstaller.php

@@ -121,18 +121,15 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
             'process_storages' => array(
                 'title' => _t('_adm_txt_modules_process_storages'),
             ),
+            'process_esearches' => array(
+                'title' => _t('_adm_txt_modules_process_esearches'),
+            ),
             'register_transcoders' => array(
                 'title' => _t('_adm_txt_modules_register_transcoders'),
             ),
             'unregister_transcoders' => array(
                 'title' => _t('_adm_txt_modules_unregister_transcoders'),
             ),
-            'register_esearches' => array(
-                'title' => _t('_adm_txt_modules_register_esearches'),
-            ),
-            'unregister_esearches' => array(
-                'title' => _t('_adm_txt_modules_unregister_esearches'),
-            ),
             'clear_db_cache' => array(
                 'title' => _t('_adm_txt_modules_clear_db_cache'),
             ),
@@ -821,16 +818,20 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
 
 	/**
      * 
-     * Process the list of transcoders provided in config array. 
-     * Transcoder objects to automatically register/unregister necessary alerts for.
+     * Process the list of extended search forms provided in config array. 
      * @param string $sOperation - operation type.
      */
-    protected function actionRegisterTranscoders($sOperation)
+    protected function actionProcessEsearches($sOperation)
     {
-    	if(empty($this->_aConfig['transcoders'])) 
+    	if(empty($this->_aConfig['esearches'])) 
         	return BX_DOL_STUDIO_INSTALLER_FAILED;
 
-		BxDolTranscoderImage::registerHandlersArray($this->_aConfig['transcoders']);
+        foreach($this->_aConfig['esearches'] as $sObject) {
+            if(in_array($sOperation, array('install', 'enable', 'enable_success')))
+		        BxDolSearchExtended::getObjectInstance($sObject);
+            else if(in_array($sOperation, array('uninstall', 'disable')))
+                BxDolSearchExtended::getObjectInstance($sObject)->clean();
+        }		    
 
 		return BX_DOL_STUDIO_INSTALLER_SUCCESS;
     }
@@ -841,45 +842,29 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
      * Transcoder objects to automatically register/unregister necessary alerts for.
      * @param string $sOperation - operation type.
      */
-    protected function actionUnregisterTranscoders($sOperation)
+    protected function actionRegisterTranscoders($sOperation)
     {
     	if(empty($this->_aConfig['transcoders'])) 
         	return BX_DOL_STUDIO_INSTALLER_FAILED;
 
-		BxDolTranscoderImage::unregisterHandlersArray($this->_aConfig['transcoders']);
-        BxDolTranscoderImage::cleanupObjectsArray($this->_aConfig['transcoders']);
-
-		return BX_DOL_STUDIO_INSTALLER_SUCCESS;
-    }
-
-	/**
-     * 
-     * Register the list of extended search forms provided in config array. 
-     * @param string $sOperation - operation type.
-     */
-    protected function actionRegisterEsearches($sOperation)
-    {
-    	if(empty($this->_aConfig['esearches'])) 
-        	return BX_DOL_STUDIO_INSTALLER_FAILED;
-
-        foreach($this->_aConfig['esearches'] as $sObject)
-		    BxDolSearchExtended::getObjectInstance($sObject);
+		BxDolTranscoderImage::registerHandlersArray($this->_aConfig['transcoders']);
 
 		return BX_DOL_STUDIO_INSTALLER_SUCCESS;
     }
 
 	/**
      * 
-     * Unregister the list of extended search forms provided in config array. 
+     * Process the list of transcoders provided in config array. 
+     * Transcoder objects to automatically register/unregister necessary alerts for.
      * @param string $sOperation - operation type.
      */
-    protected function actionUnregisterEsearches($sOperation)
+    protected function actionUnregisterTranscoders($sOperation)
     {
-    	if(empty($this->_aConfig['esearches'])) 
+    	if(empty($this->_aConfig['transcoders'])) 
         	return BX_DOL_STUDIO_INSTALLER_FAILED;
 
-		foreach($this->_aConfig['esearches'] as $sObject)
-		    BxDolSearchExtended::getObjectInstance($sObject)->clean();
+		BxDolTranscoderImage::unregisterHandlersArray($this->_aConfig['transcoders']);
+        BxDolTranscoderImage::cleanupObjectsArray($this->_aConfig['transcoders']);
 
 		return BX_DOL_STUDIO_INSTALLER_SUCCESS;
     }