Ticket #457

modules/boonex/google_connect/install/sql/enable.sql

@@ -11,7 +11,7 @@ INSERT INTO `sys_objects_auths` (`Name`, `Title`, `Link`, `Icon`) VALUES
 
 -- Alerts
 
-INSERT INTO `sys_alerts_handlers` SET `name` = 'bx_googlecon', `class` = 'BxGoogleConAlerts', `file` = 'modules/boonex/dolphin_connect/classes/BxGoogleConAlerts.php';
+INSERT INTO `sys_alerts_handlers` SET `name` = 'bx_googlecon', `class` = 'BxGoogleConAlerts', `file` = 'modules/boonex/google_connect/classes/BxGoogleConAlerts.php';
 
 SET @iHandlerId := (SELECT `id` FROM `sys_alerts_handlers`  WHERE `name` = 'bx_googlecon');
 
@@ -24,7 +24,7 @@ INSERT INTO `sys_alerts` (`unit`, `action`, `handler_id`) VALUES
 
 SET @iTypeOrder = (SELECT MAX(`order`) FROM `sys_options_types` WHERE `group` = 'modules');
 INSERT INTO `sys_options_types` (`group`, `name`, `caption`, `icon`, `order`) VALUES 
-('modules', 'bx_googlecon', '_bx_googlecon_adm_stg_cpt_type', 'bx_googlecon@modules/boonex/googlecon/|std-icon.svg', IF(NOT ISNULL(@iTypeOrder), @iTypeOrder + 1, 1));
+('modules', 'bx_googlecon', '_bx_googlecon_adm_stg_cpt_type', 'bx_googlecon@modules/boonex/google_connect/|std-icon.svg', IF(NOT ISNULL(@iTypeOrder), @iTypeOrder + 1, 1));
 SET @iTypeId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options_categories` (`type_id`, `name`, `caption`, `order` )  
@@ -42,7 +42,7 @@ INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `c
 -- Pages
 
 INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
-('bx_googlecon_error', 'googlecon-error', '_bx_googlecon_error', '_bx_googlecon_error', 'bx_googlecon', 5, 2147483647, 0, '', '', '', '', 0, 1, 0, 'BxGoogleConPage', 'modules/boonex/googlecon/classes/BxGoogleConPage.php');
+('bx_googlecon_error', 'googlecon-error', '_bx_googlecon_error', '_bx_googlecon_error', 'bx_googlecon', 5, 2147483647, 0, '', '', '', '', 0, 1, 0, 'BxGoogleConPage', 'modules/boonex/google_connect/classes/BxGoogleConPage.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
 ('bx_googlecon_error', 1, 'bx_googlecon', '_bx_googlecon_error', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:12:\"bx_googlecon\";s:6:\"method\";s:10:\"last_error\";}', 0, 0, 1, 1);

modules/boonex/linkedin_connect/install/sql/enable.sql

@@ -11,7 +11,7 @@ INSERT INTO `sys_objects_auths` (`Name`, `Title`, `Link`, `Icon`) VALUES
 
 -- Alerts
 
-INSERT INTO `sys_alerts_handlers` SET `name` = 'bx_linkedin', `class` = 'BxLinkedinAlerts', `file` = 'modules/boonex/dolphin_connect/classes/BxLinkedinAlerts.php';
+INSERT INTO `sys_alerts_handlers` SET `name` = 'bx_linkedin', `class` = 'BxLinkedinAlerts', `file` = 'modules/boonex/linkedin_connect/classes/BxLinkedinAlerts.php';
 
 SET @iHandlerId := (SELECT `id` FROM `sys_alerts_handlers`  WHERE `name` = 'bx_linkedin');
 
@@ -24,7 +24,7 @@ INSERT INTO `sys_alerts` (`unit`, `action`, `handler_id`) VALUES
 
 SET @iTypeOrder = (SELECT MAX(`order`) FROM `sys_options_types` WHERE `group` = 'modules');
 INSERT INTO `sys_options_types` (`group`, `name`, `caption`, `icon`, `order`) VALUES 
-('modules', 'bx_linkedin', '_bx_linkedin_adm_stg_cpt_type', 'bx_linkedin@modules/boonex/linkedin/|std-icon.svg', IF(NOT ISNULL(@iTypeOrder), @iTypeOrder + 1, 1));
+('modules', 'bx_linkedin', '_bx_linkedin_adm_stg_cpt_type', 'bx_linkedin@modules/boonex/linkedin_connect/|std-icon.svg', IF(NOT ISNULL(@iTypeOrder), @iTypeOrder + 1, 1));
 SET @iTypeId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options_categories` (`type_id`, `name`, `caption`, `order` )  
@@ -42,7 +42,7 @@ INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `c
 -- Pages
 
 INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
-('bx_linkedin_error', 'linkedin-error', '_bx_linkedin_error', '_bx_linkedin_error', 'bx_linkedin', 5, 2147483647, 0, '', '', '', '', 0, 1, 0, 'BxLinkedinPage', 'modules/boonex/linkedin/classes/BxLinkedinPage.php');
+('bx_linkedin_error', 'linkedin-error', '_bx_linkedin_error', '_bx_linkedin_error', 'bx_linkedin', 5, 2147483647, 0, '', '', '', '', 0, 1, 0, 'BxLinkedinPage', 'modules/boonex/linkedin_connect/classes/BxLinkedinPage.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
 ('bx_linkedin_error', 1, 'bx_linkedin', '_bx_linkedin_error', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:11:\"bx_linkedin\";s:6:\"method\";s:10:\"last_error\";}', 0, 0, 1, 1);

modules/boonex/trident_connect/install/sql/enable.sql

@@ -11,7 +11,7 @@ INSERT INTO `sys_objects_auths` (`Name`, `Title`, `Link`, `Icon`) VALUES
 
 -- Alerts
 
-INSERT INTO `sys_alerts_handlers` SET `name` = 'bx_tricon', `class` = 'BxTriConAlerts', `file` = 'modules/boonex/dolphin_connect/classes/BxTriConAlerts.php';
+INSERT INTO `sys_alerts_handlers` SET `name` = 'bx_tricon', `class` = 'BxTriConAlerts', `file` = 'modules/boonex/trident_connect/classes/BxTriConAlerts.php';
 
 SET @iHandlerId := (SELECT `id` FROM `sys_alerts_handlers`  WHERE `name` = 'bx_tricon');
 
@@ -24,7 +24,7 @@ INSERT INTO `sys_alerts` (`unit`, `action`, `handler_id`) VALUES
 
 SET @iTypeOrder = (SELECT MAX(`order`) FROM `sys_options_types` WHERE `group` = 'modules');
 INSERT INTO `sys_options_types` (`group`, `name`, `caption`, `icon`, `order`) VALUES 
-('modules', 'bx_tricon', '_bx_tricon_adm_stg_cpt_type', 'bx_tricon@modules/boonex/tricon/|std-icon.svg', IF(NOT ISNULL(@iTypeOrder), @iTypeOrder + 1, 1));
+('modules', 'bx_tricon', '_bx_tricon_adm_stg_cpt_type', 'bx_tricon@modules/boonex/trident_connect/|std-icon.svg', IF(NOT ISNULL(@iTypeOrder), @iTypeOrder + 1, 1));
 SET @iTypeId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options_categories` (`type_id`, `name`, `caption`, `order` )  
@@ -45,7 +45,7 @@ INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `c
 -- Pages
 
 INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
-('bx_tricon_error', 'tricon-error', '_bx_tricon_error', '_bx_tricon_error', 'bx_tricon', 5, 2147483647, 0, '', '', '', '', 0, 1, 0, 'BxTriConPage', 'modules/boonex/tricon/classes/BxTriConPage.php');
+('bx_tricon_error', 'tricon-error', '_bx_tricon_error', '_bx_tricon_error', 'bx_tricon', 5, 2147483647, 0, '', '', '', '', 0, 1, 0, 'BxTriConPage', 'modules/boonex/trident_connect/classes/BxTriConPage.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
 ('bx_tricon_error', 1, 'bx_tricon', '_bx_tricon_error', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_tricon\";s:6:\"method\";s:10:\"last_error\";}', 0, 0, 1, 1);

modules/boonex/twitter_connect/install/sql/enable.sql

@@ -11,7 +11,7 @@ INSERT INTO `sys_objects_auths` (`Name`, `Title`, `Link`, `Icon`) VALUES
 
 -- Alerts
 
-INSERT INTO `sys_alerts_handlers` SET `name` = 'bx_twitter', `class` = 'BxTwitterAlerts', `file` = 'modules/boonex/dolphin_connect/classes/BxTwitterAlerts.php';
+INSERT INTO `sys_alerts_handlers` SET `name` = 'bx_twitter', `class` = 'BxTwitterAlerts', `file` = 'modules/boonex/twitter_connect/classes/BxTwitterAlerts.php';
 
 SET @iHandlerId := (SELECT `id` FROM `sys_alerts_handlers`  WHERE `name` = 'bx_twitter');
 
@@ -24,7 +24,7 @@ INSERT INTO `sys_alerts` (`unit`, `action`, `handler_id`) VALUES
 
 SET @iTypeOrder = (SELECT MAX(`order`) FROM `sys_options_types` WHERE `group` = 'modules');
 INSERT INTO `sys_options_types` (`group`, `name`, `caption`, `icon`, `order`) VALUES 
-('modules', 'bx_twitter', '_bx_twitter_adm_stg_cpt_type', 'bx_twitter@modules/boonex/twitter/|std-icon.svg', IF(NOT ISNULL(@iTypeOrder), @iTypeOrder + 1, 1));
+('modules', 'bx_twitter', '_bx_twitter_adm_stg_cpt_type', 'bx_twitter@modules/boonex/twitter_connect/|std-icon.svg', IF(NOT ISNULL(@iTypeOrder), @iTypeOrder + 1, 1));
 SET @iTypeId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options_categories` (`type_id`, `name`, `caption`, `order` )  
@@ -42,7 +42,7 @@ INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `c
 -- Pages
 
 INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
-('bx_twitter_error', 'twitter-error', '_bx_twitter_error', '_bx_twitter_error', 'bx_twitter', 5, 2147483647, 0, '', '', '', '', 0, 1, 0, 'BxTwitterPage', 'modules/boonex/twitter/classes/BxTwitterPage.php');
+('bx_twitter_error', 'twitter-error', '_bx_twitter_error', '_bx_twitter_error', 'bx_twitter', 5, 2147483647, 0, '', '', '', '', 0, 1, 0, 'BxTwitterPage', 'modules/boonex/twitter_connect/classes/BxTwitterPage.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
 ('bx_twitter_error', 1, 'bx_twitter', '_bx_twitter_error', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:10:\"bx_twitter\";s:6:\"method\";s:10:\"last_error\";}', 0, 0, 1, 1);

studio/classes/BxDolStudioUtils.php

@@ -76,6 +76,14 @@ class BxDolStudioUtils extends BxDol
 			$sModuleIcon = $aModule['name'] . '@modules/' . $aModule['dir'] . '|std-' . $aType2Prefix[$sType] . '.png';
         $sModuleIconUrl = BxDolStudioTemplate::getInstance()->getIconUrl($sModuleIcon);
 
+        if(empty($sModuleIconUrl)) {
+            if(isset($aModule['path']))
+    			$sModuleIcon = $aModule['name'] . '@modules/' . $aModule['path'] . '|std-icon.svg';
+    		else if(isset($aModule['dir']))
+    			$sModuleIcon = $aModule['name'] . '@modules/' . $aModule['dir'] . '|std-icon.svg';
+            $sModuleIconUrl = BxDolStudioTemplate::getInstance()->getIconUrl($sModuleIcon);
+        }
+
         return !empty($sModuleIcon) && !empty($sModuleIconUrl) ? ($bReturnAsUrl ? $sModuleIconUrl : $sModuleIcon) : $sDefaultIcon;
     }