Merge branch 'master' of https://github.com/unaio/una

install/sql/system.sql

@@ -4268,7 +4268,7 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title_system`, `
 
 ('sys_unsubscribe_news', 1, 'system', '', '_sys_page_block_title_unsubscribe_news', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:16:"unsubscribe_news";s:6:"params";a:0:{}s:5:"class";s:19:"TemplServiceAccount";}', 0, 1, 1, 1),
 
-('sys_cmts_administration', 1, 'system', '_sys_page_block_title_system_cmts_administration', '_sys_page_block_title_cmts_administration', 11, 192, 'service', 'a:3:{s:6:"module";s:6:"system";s:6:"method";s:12:"manage_tools";s:6:"params";a:1:{i:0;s:14:"administration";}s:5:"class";s:27:"TemplCmtsGridAdministration";}', 0, 1, 1, 1),
+('sys_cmts_administration', 1, 'system', '_sys_page_block_title_system_cmts_administration', '_sys_page_block_title_cmts_administration', 11, 192, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:12:"manage_tools";s:6:"params";a:1:{i:0;s:14:"administration";}s:5:"class";s:17:"TemplCmtsServices";}', 0, 1, 1, 1),
 
 -- studio dashboard blocks
 ('sys_std_dashboard', 1, 'system', '', '_sys_page_block_title_std_dash_version', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:17:"get_block_version";s:6:"params";a:0:{}s:5:"class";s:20:"TemplStudioDashboard";}', 0, 0, 1, 1),

modules/boonex/charts/classes/BxChartsModule.php

@@ -45,8 +45,7 @@ class BxChartsModule extends BxDolModule
         $BxDolModuleQuery = BxDolModuleQuery::getInstance();
         $aModules = $BxDolModuleQuery->getModulesBy(array('type' => 'modules', 'active' => 1));
         foreach($aModules as $aModule){
-            $oModule = BxDolModule::getInstance($aModule['name']);
-            if($oModule instanceof iBxDolProfileService){
+            if(BxDolRequest::serviceExists($aModule['name'], 'act_as_profile') && BxDolService::call($aModule['name'], 'act_as_profile') == true){
                 $aResult[$aModule['name']] = $aModule['title'];
             }
         }

modules/boonex/charts/install/langs/en.xml

@@ -6,10 +6,10 @@
 	<string name="_bx_charts_adm_stg_cpt_category_chart_top_contents_by_likes"><![CDATA[Top contents by likes]]></string>
 	<string name="_bx_charts_adm_stg_cpt_category_chart_most_active_profiles"><![CDATA[Most active profiles]]></string>
   <string name="_bx_charts_adm_stg_cpt_chart_top_contents_by_likes_modules_enabled"><![CDATA[Enabled for modules]]></string>
-  <string name="_bx_charts_adm_stg_cpt_chart_top_contents_by_likes_count"><![CDATA[Count]]></string>
-  <string name="_bx_charts_adm_stg_cpt_chart_most_active_profiles_modules_enabled"><![CDATA[Enabled for profiles from]]></string>
-  <string name="_bx_charts_adm_stg_cpt_chart_most_active_profiles_count"><![CDATA[Count]]></string>
-  <string name="_bx_charts_adm_stg_cpt_chart_most_active_profiles_posts_for_module"><![CDATA[For modules]]></string>
+  <string name="_bx_charts_adm_stg_cpt_chart_top_contents_by_likes_count"><![CDATA[Max number of items in the chart ]]></string>
+  <string name="_bx_charts_adm_stg_cpt_chart_most_active_profiles_modules_enabled"><![CDATA[Profiles modules]]></string>
+  <string name="_bx_charts_adm_stg_cpt_chart_most_active_profiles_count"><![CDATA[Max number of items in the chart ]]></string>
+  <string name="_bx_charts_adm_stg_cpt_chart_most_active_profiles_posts_for_module"><![CDATA[Modules to count content in]]></string>
   <string name="_bx_charts_page_block_title_system_chart_top_contents_by_likes"><![CDATA[Top contents by likes]]></string>
   <string name="_bx_charts_page_block_title_chart_top_contents_by_likes"><![CDATA[Top contents by likes]]></string>
   <string name="_bx_charts_page_block_title_system_chart_most_active_profiles"><![CDATA[Most active profiles]]></string>

modules/boonex/charts/install/sql/enable.sql

@@ -13,7 +13,7 @@ SET @iCategoryId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options` (`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_params`, `check_error`, `order`) VALUES
 (@iCategoryId, 'bx_charts_chart_top_contents_by_likes_modules_disabled', '_bx_charts_adm_stg_cpt_chart_top_contents_by_likes_modules_enabled', '', 'rlist', 'a:2:{s:6:"module";s:9:"bx_charts";s:6:"method";s:16:"get_text_modules";}', '', '', '', 1),
-(@iCategoryId, 'bx_charts_chart_top_contents_by_likes_count', '_bx_charts_adm_stg_cpt_chart_top_contents_by_likes_count', '5', 'digit', '', '', '', '', 2);
+(@iCategoryId, 'bx_charts_chart_top_contents_by_likes_count', '_bx_charts_adm_stg_cpt_chart_top_contents_by_likes_count', '4', 'digit', '', '', '', '', 2);
 
 INSERT INTO `sys_options_categories` (`type_id`, `name`, `caption`, `hidden`, `order`) VALUES(@iTypeId,  'bx_charts_chart_most_active_profiles', '_bx_charts_adm_stg_cpt_category_chart_most_active_profiles', 0, 2);
 SET @iCategoryId = LAST_INSERT_ID();
@@ -21,7 +21,7 @@ SET @iCategoryId = LAST_INSERT_ID();
 INSERT INTO `sys_options` (`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_params`, `check_error`, `order`) VALUES
 (@iCategoryId, 'bx_charts_chart_most_active_profiles_modules_disabled', '_bx_charts_adm_stg_cpt_chart_most_active_profiles_modules_enabled', '', 'rlist', 'a:2:{s:6:"module";s:9:"bx_charts";s:6:"method";s:19:"get_profile_modules";}', '', '', '', 1),
 (@iCategoryId, 'bx_charts_chart_most_active_profiles_posts_for_module_disabled', '_bx_charts_adm_stg_cpt_chart_most_active_profiles_posts_for_module', '', 'rlist', 'a:2:{s:6:"module";s:9:"bx_charts";s:6:"method";s:16:"get_text_modules";}', '', '', '', 2),
-(@iCategoryId, 'bx_charts_chart_most_active_profiles_count', '_bx_charts_adm_stg_cpt_chart_most_active_profiles_count', '5', 'digit', '', '', '', '', 3);
+(@iCategoryId, 'bx_charts_chart_most_active_profiles_count', '_bx_charts_adm_stg_cpt_chart_most_active_profiles_count', '4', 'digit', '', '', '', '', 3);
 
 -- PAGES: add page block on dashboard
 SET @iPBCellDashboard = 2;

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

@@ -2152,7 +2152,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_menu_item_title_account_settings_pwd"><![CDATA[Password]]></string>
 	<string name="_sys_menu_item_title_add_content"><![CDATA[Add...]]></string>
 	<string name="_sys_menu_item_title_cart"><![CDATA[Shopping Cart]]></string>
-  <string name="_sys_menu_item_title_cmts_administration"><![CDATA[Manage comments]]></string>
+  <string name="_sys_menu_item_title_cmts_administration"><![CDATA[Manage Сomments]]></string>
 	<string name="_sys_menu_item_title_cmts_item_delete"><![CDATA[Delete]]></string>
 	<string name="_sys_menu_item_title_cmts_item_edit"><![CDATA[Edit]]></string>
 	<string name="_sys_menu_item_title_cmts_item_reply"><![CDATA[]]></string>
@@ -2212,7 +2212,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_menu_item_title_system_account_settings_pwd"><![CDATA[Password]]></string>
 	<string name="_sys_menu_item_title_system_add_content"><![CDATA[Add Content]]></string>
 	<string name="_sys_menu_item_title_system_cart"><![CDATA[Shopping Cart]]></string>
-  <string name="_sys_menu_item_title_system_cmts_administration"><![CDATA[Manage comments]]></string>
+  <string name="_sys_menu_item_title_system_cmts_administration"><![CDATA[Manage Сomments]]></string>
 	<string name="_sys_menu_item_title_system_cmts_item_delete"><![CDATA[Delete]]></string>
 	<string name="_sys_menu_item_title_system_cmts_item_edit"><![CDATA[Edit]]></string>
 	<string name="_sys_menu_item_title_system_cmts_item_reply"><![CDATA[Reply]]></string>
@@ -2347,7 +2347,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_page_block_title_add_content"><![CDATA[Add Content]]></string>
 	<string name="_sys_page_block_title_chart_growth"><![CDATA[Growth Charts]]></string>
 	<string name="_sys_page_block_title_chart_stats"><![CDATA[Content]]></string>
-  <string name="_sys_page_block_title_cmts_administration"><![CDATA[Manage comments]]></string>
+  <string name="_sys_page_block_title_cmts_administration"><![CDATA[Manage Сomments]]></string>
   <string name="_sys_page_block_title_confirm_email"><![CDATA[Email Confirmation]]></string>
 	<string name="_sys_page_block_title_confirm_phone"><![CDATA[Phone Confirmation]]></string>
 	<string name="_sys_page_block_title_create_account"><![CDATA[Sign up]]></string>
@@ -2358,7 +2358,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_page_block_system_title_login_step2"><![CDATA[Log in - step2]]></string>
 	<string name="_sys_page_block_system_title_login_step3"><![CDATA[Log in - step3]]></string>
 	<string name="_sys_page_block_system_title_login_only"><![CDATA[Log in]]></string>
-  <string name="_sys_page_block_title_system_cmts_administration"><![CDATA[Manage comments]]></string>
+  <string name="_sys_page_block_title_system_cmts_administration"><![CDATA[Manage Сomments]]></string>
 	<string name="_sys_page_block_title_login"><![CDATA[Log in]]></string>
 	<string name="_sys_page_block_title_login_step2"><![CDATA[Log in - step 2]]></string>
 	<string name="_sys_page_block_title_login_step3"><![CDATA[Log in - step 3]]></string>
@@ -2383,7 +2383,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_page_title_account_settings_info"><![CDATA[Edit Account]]></string>
 	<string name="_sys_page_title_account_settings_pwd"><![CDATA[Change Password]]></string>
 	<string name="_sys_page_title_add_content"><![CDATA[Add Content]]></string>
-  <string name="_sys_page_title_cmts_administration"><![CDATA[Manage comments]]></string>
+  <string name="_sys_page_title_cmts_administration"><![CDATA[Manage Сomments]]></string>
 	<string name="_sys_page_title_confirm_email"><![CDATA[Email Confirmation]]></string>
 	<string name="_sys_page_title_confirm_phone"><![CDATA[Phone Confirmation]]></string>
 	<string name="_sys_page_title_create_account"><![CDATA[Sign up]]></string>
@@ -2402,7 +2402,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_page_title_system_account_settings_info"><![CDATA[Edit Account]]></string>
 	<string name="_sys_page_title_system_account_settings_pwd"><![CDATA[Change Password]]></string>
 	<string name="_sys_page_title_system_add_content"><![CDATA[Add Content]]></string>
-  <string name="_sys_page_title_system_cmts_administration"><![CDATA[Manage comments]]></string>
+  <string name="_sys_page_title_system_cmts_administration"><![CDATA[Manage Сomments]]></string>
   <string name="_sys_page_title_system_confirm_email"><![CDATA[Email Confirmation]]></string>
 	<string name="_sys_page_title_system_confirm_phone"><![CDATA[Phone Confirmation]]></string>
 	<string name="_sys_page_title_system_create_account"><![CDATA[Sign up]]></string>

modules/boonex/glossary/classes/BxGlsrDb.php

@@ -22,7 +22,8 @@ class BxGlsrDb extends BxBaseModTextDb
     public function getAlphabeticalIndex()
     {
         $CNF = &$this->_oConfig->CNF;
-        return  $this->getAll("SELECT MIN(`id`) AS `row_number`, `letter`, '' AS `url` FROM ( SELECT `a`.`id`, UPPER(LEFT(TRIM(`a`.`" . $CNF['FIELD_TITLE'] . "`) ,1)) as `letter`, COUNT(*) AS `row_number` FROM `" . $CNF['TABLE_ENTRIES'] . "` `a` JOIN `" . $CNF['TABLE_ENTRIES'] . "` `b` ON `a`.`id` >= `b`.`id` AND UPPER(LEFT(TRIM(`a`.`" . $CNF['FIELD_TITLE'] . "`), 1)) = UPPER(LEFT(TRIM(`a`.`" . $CNF['FIELD_TITLE'] . "`), 1)) WHERE `a`.`status_admin`='active' GROUP BY `a`.`id`, UPPER(LEFT(TRIM(`a`.`" . $CNF['FIELD_TITLE'] . "`), 1))) AS `t` GROUP BY `letter` ");
+        $this->pdoExec("SET @row_number = 0;");
+        return  $this->getAll("SELECT MIN(`rn`) AS `row_number`, `letter`, '' AS `url` FROM (SELECT @row_number := @row_number + 1 AS rn, `a`.`id`, UPPER(LEFT(TRIM(`a`.`" . $CNF['FIELD_TITLE'] . "`) ,1)) as `letter` FROM `bx_glossary_terms` `a` WHERE `a`.`status_admin`='active' ORDER BY UPPER(LEFT(TRIM(`a`.`" . $CNF['FIELD_TITLE'] . "`), 1))) AS `t` GROUP BY `letter`");
     }
 }
 

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

@@ -140,10 +140,10 @@
 
   <string name="_bx_spaces_menu_title_submenu"><![CDATA[Пространства - Подменю]]></string>
     <string name="_bx_spaces_menu_set_title_submenu"><![CDATA[Пространства - Подменю]]></string>
-    <string name="_bx_spaces_menu_set_title_view_profile_actions"><![CDATA[Группа - Действия]]></string>
-    <string name="_bx_spaces_menu_title_view_profile_actions"><![CDATA[Группа - Действия]]></string>
-    <string name="_bx_spaces_menu_set_title_view_profile_actions_more"><![CDATA[Группа - Дополнительные действия]]></string>
-    <string name="_bx_spaces_menu_title_view_profile_actions_more"><![CDATA[Группа - Дополнительные действия]]></string>
+    <string name="_bx_spaces_menu_set_title_view_profile_actions"><![CDATA[Пространство - Действия]]></string>
+    <string name="_bx_spaces_menu_title_view_profile_actions"><![CDATA[Пространство - Действия]]></string>
+    <string name="_bx_spaces_menu_set_title_view_profile_actions_more"><![CDATA[Пространство - Дополнительные действия]]></string>
+    <string name="_bx_spaces_menu_title_view_profile_actions_more"><![CDATA[Пространство - Дополнительные действия]]></string>
     <string name="_bx_spaces_menu_set_title_view_profile_submenu"><![CDATA[Подменю просмотра пространства]]></string>
     <string name="_bx_spaces_menu_title_view_profile_submenu"><![CDATA[Подменю просмотра пространства]]></string>
     <string name="_bx_spaces_menu_title_view_profile_submenu_cover"><![CDATA[Подменю пространства на обложке]]></string>
@@ -163,8 +163,8 @@
     <string name="_bx_spaces_menu_item_title_delete_profile"><![CDATA[Удалить пространство]]></string>
     <string name="_bx_spaces_menu_item_title_system_delete_account"><![CDATA[Удалить аккаунт]]></string>
     <string name="_bx_spaces_menu_item_title_delete_account"><![CDATA[Удалить аккаунт]]></string>
-    <string name="_bx_spaces_menu_item_title_system_profile_type"><![CDATA[Группа]]></string>
-    <string name="_bx_spaces_menu_item_title_profile_type"><![CDATA[Группа]]></string>
+    <string name="_bx_spaces_menu_item_title_system_profile_type"><![CDATA[Пространство]]></string>
+    <string name="_bx_spaces_menu_item_title_profile_type"><![CDATA[Пространство]]></string>
     <string name="_bx_spaces_menu_item_title_system_create_profile"><![CDATA[Создать пространство]]></string>
     <string name="_bx_spaces_menu_item_title_create_profile"><![CDATA[Создать пространство]]></string>
     <string name="_bx_spaces_menu_item_title_system_view_profile_friends"><![CDATA[Друзья]]></string>
@@ -177,8 +177,8 @@
     <string name="_bx_spaces_menu_item_title_view_profile_comments"><![CDATA[Комментарии]]></string>
     <string name="_bx_spaces_menu_item_title_system_view_profile_info"><![CDATA[Инфо]]></string>
     <string name="_bx_spaces_menu_item_title_view_profile_info"><![CDATA[Инфо]]></string>
-    <string name="_bx_spaces_menu_item_title_system_view_profile_view"><![CDATA[Группа]]></string>
-    <string name="_bx_spaces_menu_item_title_view_profile_view"><![CDATA[Группа]]></string>
+    <string name="_bx_spaces_menu_item_title_system_view_profile_view"><![CDATA[Пространство]]></string>
+    <string name="_bx_spaces_menu_item_title_view_profile_view"><![CDATA[Пространство]]></string>
     <string name="_bx_spaces_menu_item_title_system_invite"><![CDATA[Пригласить]]></string>
     <string name="_bx_spaces_menu_item_title_invite"><![CDATA[Пригласить]]></string>
     

modules/boonex/timeline/classes/BxTimelineGridAdministration.php

@@ -62,7 +62,16 @@ class BxTimelineGridAdministration extends BxBaseModGeneralGridAdministration
 
     	return $this->_getActionDefault($sType, $sKey, $a, $isSmall, $isDisabled, $aRow);
     }
-    
+
+    protected function _getCellDescription($mixedValue, $sKey, $aField, $aRow)
+    {
+        $mixedValue = $this->_oTemplate->parseHtmlByName('grid_link.html', array(
+            'href' => $this->_oModule->serviceGetLink($aRow['id']),
+            'title' => $aRow['description']
+        ));
+        
+        return parent::_getCellDefault($mixedValue, $sKey, $aField, $aRow);
+    }
 
     protected function _getCellOwnerId($mixedValue, $sKey, $aField, $aRow)
     {

modules/boonex/timeline/template/grid_link.html

@@ -0,0 +1 @@
+<a href="__href__">__title__</a>