Merge branch 'master' of github.com:boonex/dolphin

install/sql/system.sql

@@ -5,7 +5,7 @@
 -- --------------------------------------------------------
 
 SET NAMES 'utf8';
-DROP TABLE IF EXISTS `sys_keys`, `sys_objects_editor`, `sys_objects_captcha`, `sys_objects_social_sharing`, `sys_objects_cmts`, `sys_cmts_images`, `sys_cmts_images_preview`, `sys_cmts_images2entries`, `sys_email_templates`, `sys_options`, sys_options_types, `sys_options_categories`, `sys_localization_categories`, `sys_localization_keys`, `sys_localization_languages`, `sys_localization_strings`, `sys_acl_actions`, `sys_acl_actions_track`, `sys_acl_matrix`, `sys_acl_levels`, `sys_sessions`, `sys_acl_levels_members`, `sys_objects_search`, `sys_stat_site`, `sys_alerts`, `sys_alerts_handlers`, `sys_injections`, `sys_injections_admin`, `sys_modules`, `sys_modules_file_tracks`, `sys_modules_connections`, `sys_permalinks`, `sys_objects_privacy`, `sys_privacy_defaults`, `sys_privacy_groups`, `sys_objects_auths`, `sys_objects_vote`, `sys_objects_view`, `sys_cron_jobs`, `sys_objects_storage`, `sys_objects_uploader`, `sys_storage_user_quotas`, `sys_storage_tokens`, `sys_storage_ghosts`, `sys_storage_deletions`, `sys_storage_mime_types`, `sys_objects_transcoder_images`, `sys_transcoder_images_files`, `sys_transcoder_images_filters`, `sys_accounts`, `sys_profiles`, `sys_objects_form`, `sys_form_displays`, `sys_form_inputs`, `sys_form_display_inputs`, `sys_form_pre_lists`, `sys_form_pre_values`, `sys_menu_templates`, `sys_objects_menu`, `sys_menu_sets`, `sys_menu_items`, `sys_objects_grid`, `sys_grid_fields`, `sys_grid_actions`, `sys_objects_connection`, `sys_profiles_conn_subscriptions`, `sys_profiles_conn_friends`, `sys_objects_page`, `sys_pages_layouts`, `sys_pages_design_boxes`, `sys_pages_blocks`, `sys_images`, `sys_std_pages`, `sys_std_widgets`, `sys_std_pages_widgets`;
+DROP TABLE IF EXISTS `sys_keys`, `sys_objects_editor`, `sys_objects_captcha`, `sys_objects_social_sharing`, `sys_objects_cmts`, `sys_cmts_images`, `sys_cmts_images_preview`, `sys_cmts_images2entries`, `sys_email_templates`, `sys_options`, sys_options_types, `sys_options_categories`, `sys_localization_categories`, `sys_localization_keys`, `sys_localization_languages`, `sys_localization_strings`, `sys_acl_actions`, `sys_acl_actions_track`, `sys_acl_matrix`, `sys_acl_levels`, `sys_sessions`, `sys_acl_levels_members`, `sys_objects_search`, `sys_stat_site`, `sys_alerts`, `sys_alerts_handlers`, `sys_injections`, `sys_injections_admin`, `sys_modules`, `sys_modules_file_tracks`, `sys_modules_relations`, `sys_permalinks`, `sys_objects_privacy`, `sys_privacy_defaults`, `sys_privacy_groups`, `sys_objects_auths`, `sys_objects_vote`, `sys_objects_view`, `sys_cron_jobs`, `sys_objects_storage`, `sys_objects_uploader`, `sys_storage_user_quotas`, `sys_storage_tokens`, `sys_storage_ghosts`, `sys_storage_deletions`, `sys_storage_mime_types`, `sys_objects_transcoder_images`, `sys_transcoder_images_files`, `sys_transcoder_images_filters`, `sys_accounts`, `sys_profiles`, `sys_objects_form`, `sys_form_displays`, `sys_form_inputs`, `sys_form_display_inputs`, `sys_form_pre_lists`, `sys_form_pre_values`, `sys_menu_templates`, `sys_objects_menu`, `sys_menu_sets`, `sys_menu_items`, `sys_objects_grid`, `sys_grid_fields`, `sys_grid_actions`, `sys_objects_connection`, `sys_profiles_conn_subscriptions`, `sys_profiles_conn_friends`, `sys_objects_page`, `sys_pages_layouts`, `sys_pages_design_boxes`, `sys_pages_blocks`, `sys_images`, `sys_std_pages`, `sys_std_widgets`, `sys_std_pages_widgets`;
 ALTER DATABASE DEFAULT CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
 
 
@@ -739,7 +739,7 @@ CREATE TABLE `sys_modules_file_tracks` (
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 
-CREATE TABLE `sys_modules_connections` (
+CREATE TABLE `sys_modules_relations` (
   `id` int(11) unsigned NOT NULL auto_increment,
   `module` varchar(32) NOT NULL default '',
   `on_install` varchar(255) NOT NULL default '',

modules/base/notifications/classes/BxBaseModNotificationsInstaller.php

@@ -39,7 +39,7 @@ class BxBaseModNotificationsInstaller extends BxBaseModGeneralInstaller
     	$aModules = $this->oDb->getModules();
 	    foreach($aModules as $aModule) {
 	    	$aConfig = self::getModuleConfig($aModule);
-			if(!empty($aConfig['connections']) && is_array($aConfig['connections']) && in_array($this->_aConfig['name'], $aConfig['connections']))
+			if(!empty($aConfig['relations']) && is_array($aConfig['relations']) && in_array($this->_aConfig['name'], $aConfig['relations']))
 				BxDolService::call($this->_aConfig['name'], $sAction, array($aModule['uri']));
 		}
     }

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

@@ -1237,7 +1237,7 @@
 	<string name="_adm_txt_modules_show_conclusion"><![CDATA[Conclusion from vendor:]]></string>
 	<string name="_adm_txt_modules_show_introduction"><![CDATA[Introduction from vendor:]]></string>
 	<string name="_adm_txt_modules_update_files"><![CDATA[Update files:]]></string>
-	<string name="_adm_txt_modules_update_connections"><![CDATA[Update connections:]]></string>
+	<string name="_adm_txt_modules_update_relations"><![CDATA[Update relations:]]></string>
 	<string name="_adm_txt_modules_update_languages"><![CDATA[Update languages:]]></string>
 	<string name="_adm_txt_modules_update_latest"><![CDATA[You have the most current version.]]></string>
 	<string name="_adm_txt_modules_update_text"><![CDATA[New version {0} is available.]]></string>

modules/boonex/notes/install/config.php

@@ -52,12 +52,12 @@ $aConfig = array(
     'uninstall' => array (
         'execute_sql' => 1,
         'update_languages' => 1,
-    	'update_connections' => 1,
+    	'update_relations' => 1,
         'clear_db_cache' => 1,
     ),
     'enable' => array(
         'execute_sql' => 1,
-    	'update_connections' => 1,
+    	'update_relations' => 1,
         'recompile_menus' => 1,
         'recompile_permalinks' => 1,
         'recompile_alerts' => 1,
@@ -65,7 +65,7 @@ $aConfig = array(
     ),
     'disable' => array (
         'execute_sql' => 1,
-    	'update_connections' => 1,
+    	'update_relations' => 1,
         'recompile_menus' => 1,
         'recompile_permalinks' => 1,
         'recompile_alerts' => 1,
@@ -80,7 +80,7 @@ $aConfig = array(
     /**
      * Connections Section
      */
-    'connections' => array(
+    'relations' => array(
     	'bx_timeline',
     	'bx_notifications'
     ),

modules/boonex/notifications/install/sql/disable.sql

@@ -24,4 +24,4 @@ DELETE FROM `sys_alerts_handlers` WHERE `id` = @iHandlerId LIMIT 1;
 
 
 -- MODULES' CONNECTIONS
-DELETE FROM `sys_modules_connections` WHERE `module`=@sName LIMIT 1;
+DELETE FROM `sys_modules_relations` WHERE `module`=@sName LIMIT 1;

modules/boonex/notifications/install/sql/enable.sql

@@ -36,5 +36,5 @@ INSERT INTO `sys_alerts_handlers`(`name`, `class`, `file`, `service_call`) VALUE
 
 
 -- MODULES' CONNECTIONS
-INSERT INTO `sys_modules_connections` (`module`, `on_install`, `on_uninstall`, `on_enable`, `on_disable`) VALUES
+INSERT INTO `sys_modules_relations` (`module`, `on_install`, `on_uninstall`, `on_enable`, `on_disable`) VALUES
 (@sName, '', 'delete_module_events', 'add_handlers', 'delete_handlers');

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

@@ -2422,7 +2422,7 @@ Without doing that you won't be submitted to our database.</p>
 	<string name="_adm_txt_modules_move_sources"><![CDATA[Move source files:]]></string>
 	<string name="_adm_txt_modules_execute_sql"><![CDATA[Changing database:]]></string>
 	<string name="_adm_txt_modules_install_language"><![CDATA[Install language:]]></string>
-	<string name="_adm_txt_modules_update_connections"><![CDATA[Update connections:]]></string>
+	<string name="_adm_txt_modules_update_relations"><![CDATA[Update relations:]]></string>
 	<string name="_adm_txt_modules_update_languages"><![CDATA[Update languages:]]></string>
 	<string name="_adm_txt_modules_recompile_global_paramaters"><![CDATA[Recompiling global paramaters:]]></string>
 	<string name="_adm_txt_modules_recompile_menus"><![CDATA[Recompiling menus:]]></string>

modules/boonex/timeline/install/sql/disable.sql

@@ -36,4 +36,4 @@ DELETE FROM `sys_objects_vote` WHERE `Name`='bx_timeline' LIMIT 1;
 
 
 -- MODULES' CONNECTIONS
-DELETE FROM `sys_modules_connections` WHERE `module`='bx_timeline' LIMIT 1;
+DELETE FROM `sys_modules_relations` WHERE `module`='bx_timeline' LIMIT 1;

modules/boonex/timeline/install/sql/enable.sql

@@ -132,5 +132,5 @@ INSERT INTO `sys_objects_vote`(`Name`, `TableMain`, `TableTrack`, `PostTimeout`,
 
 
 -- MODULES' CONNECTIONS
-INSERT INTO `sys_modules_connections` (`module`, `on_install`, `on_uninstall`, `on_enable`, `on_disable`) VALUES
+INSERT INTO `sys_modules_relations` (`module`, `on_install`, `on_uninstall`, `on_enable`, `on_disable`) VALUES
 ('bx_timeline', '', 'delete_module_events', 'add_handlers', 'delete_handlers');

studio/classes/BxDolStudioInstaller.php

@@ -106,8 +106,8 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
             'update_languages' => array(
                 'title' => _t('_adm_txt_modules_update_languages'),
             ),
-            'update_connections' => array(
-                'title' => _t('_adm_txt_modules_update_connections'),
+            'update_relations' => array(
+                'title' => _t('_adm_txt_modules_update_relations'),
             ),
             'recompile_global_paramaters' => array(
                 'title' => _t('_adm_txt_modules_recompile_global_paramaters'),
@@ -702,23 +702,23 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
 
         return $bResult && $oLanguages->compileLanguage(0, true) ? BX_DOL_STUDIO_INSTALLER_SUCCESS : BX_DOL_STUDIO_INSTALLER_FAILED;
     }
-	function actionUpdateConnections($sOperation)
+	function actionUpdateRelations($sOperation)
     {
         if(!in_array($sOperation, array('install', 'uninstall', 'enable', 'disable'))) 
         	return BX_DOL_STUDIO_INSTALLER_FAILED;
 
-		if(empty($this->_aConfig['connections']) || !is_array($this->_aConfig['connections']))
+		if(empty($this->_aConfig['relations']) || !is_array($this->_aConfig['relations']))
             return BX_DOL_STUDIO_INSTALLER_SUCCESS;
 
-		foreach($this->_aConfig['connections'] as $sModule) {
+		foreach($this->_aConfig['relations'] as $sModule) {
 			if(!$this->oDb->isModuleByName($sModule))
 				continue;
 
-			$aConnection = $this->oDb->getConnectionsBy(array('type' => 'module', 'value' => $sModule));
-			if(empty($aConnection) || empty($aConnection['on_' . $sOperation]) || !BxDolRequest::serviceExists($aConnection['module'], $aConnection['on_' . $sOperation]))
+			$aRelation = $this->oDb->getRelationsBy(array('type' => 'module', 'value' => $sModule));
+			if(empty($aRelation) || empty($aRelation['on_' . $sOperation]) || !BxDolRequest::serviceExists($aRelation['module'], $aRelation['on_' . $sOperation]))
 				continue;
 
-			BxDolService::call($aConnection['module'], $aConnection['on_' . $sOperation], array($this->_aConfig['home_uri']));
+			BxDolService::call($aRelation['module'], $aRelation['on_' . $sOperation], array($this->_aConfig['home_uri']));
 		}
 
         return BX_DOL_STUDIO_INSTALLER_SUCCESS;

studio/classes/BxDolStudioInstallerQuery.php

@@ -16,7 +16,7 @@ class BxDolStudioInstallerQuery extends BxDolModuleQuery
         parent::__construct();
     }
 
-    function getConnectionsBy($aParams = array())
+    function getRelationsBy($aParams = array())
     {
     	$sMethod = 'getAll';
     	$sWhereClause = "";
@@ -35,7 +35,7 @@ class BxDolStudioInstallerQuery extends BxDolModuleQuery
                 `on_uninstall`,
                 `on_enable`,
                 `on_disable`
-            FROM `sys_modules_connections`
+            FROM `sys_modules_relations`
             WHERE 1" . $sWhereClause;
 
         return $this->$sMethod($sSql);