#100 - Usage of CNF[T] instead of lang prefix.

modules/base/general/classes/BxBaseModGeneralGridAdministration.php

@@ -31,8 +31,7 @@ class BxBaseModGeneralGridAdministration extends BxTemplGrid
 
 	public function performActionDelete($aParams = array())
     {
-    	$sPrefixLang = $this->_oModule->_oConfig->getPrefix('lang');
-    	$sPrefixClass = $this->_oModule->_oConfig->getClassPrefix();
+    	$CNF = &$this->_oModule->_oConfig->CNF;
 
     	//TODO: remove this check when 'delete with content' feature will be realized in onDelete method.
     	if(isset($aParams['with_content']) && $aParams['with_content'] === true) {
@@ -48,7 +47,7 @@ class BxBaseModGeneralGridAdministration extends BxTemplGrid
         }
 
         bx_import('FormsEntryHelper', $this->_oModule->_aModule);
-        $sClass = $sPrefixClass . 'FormsEntryHelper';
+        $sClass = $this->_oModule->_oConfig->getClassPrefix() . 'FormsEntryHelper';
         $oFormsHelper = new $sClass($this->_oModule);
 
         $aIdsAffected = array ();
@@ -69,7 +68,7 @@ class BxBaseModGeneralGridAdministration extends BxTemplGrid
             $iAffected++;
         }
 
-        $this->_echoResultJson($iAffected ? array('grid' => $this->getCode(false), 'blink' => $aIdsAffected) : array('msg' => _t($sPrefixLang . '_grid_action_err_delete')));
+        $this->_echoResultJson($iAffected ? array('grid' => $this->getCode(false), 'blink' => $aIdsAffected) : array('msg' => _t($CNF['T']['grid_action_err_delete'])));
     }
 
     protected function _getActionSettings($sType, $sKey, $a, $isSmall = false, $isDisabled = false, $aRow = array())
@@ -95,8 +94,8 @@ class BxBaseModGeneralGridAdministration extends BxTemplGrid
         if(empty($sFilterName) || empty($aFilterValues))
             return '';
 
+		$CNF = &$this->_oModule->_oConfig->CNF;
 		$sJsObject = $this->_oModule->_oConfig->getJsObject('manage_tools');
-		$sPrefixLang = $this->_oModule->_oConfig->getPrefix('lang');
 
 		$sFilterField = '_s' . str_replace(' ', '', ucwords(str_replace('_', ' ', $sFilterName)));
 		foreach($aFilterValues as $sKey => $sValue)
@@ -110,7 +109,7 @@ class BxBaseModGeneralGridAdministration extends BxTemplGrid
                 'onChange' => 'javascript:' . $sJsObject . '.onChangeFilter(this)'
             ),
             'value' => $this->$sFilterField,
-            'values' => array_merge(array('' => _t($sPrefixLang . '_grid_filter_item_title_adm_select_one_' . $sFilterName)), $aFilterValues)
+            'values' => array_merge(array('' => _t($CNF['T']['filter_item_select_one_' . $sFilterName])), $aFilterValues)
         );
 
         bx_import('BxTemplFormView');

modules/base/profile/classes/BxBaseModProfileGridAdministration.php

@@ -105,13 +105,13 @@ class BxBaseModProfileGridAdministration extends BxBaseModGeneralGridAdministrat
     {
         parent::_getFilterControls();
 
-        $sPrefixLang = $this->_oModule->_oConfig->getPrefix('lang');
+        $CNF = &$this->_oModule->_oConfig->CNF;
 
         $sFilterName = 'filter1';
         $aFilterValues = array(
-			'active' => $sPrefixLang . '_grid_filter_item_title_adm_active',
-            'pending' => $sPrefixLang . '_grid_filter_item_title_adm_pending',
-            'suspended' => $sPrefixLang . '_grid_filter_item_title_adm_suspended',
+			'active' => $CNF['T']['filter_item_active'],
+            'pending' => $CNF['T']['filter_item_pending'],
+            'suspended' => $CNF['T']['filter_item_suspended'],
 		);
 
         return  $this->_getFilterSelectOne($sFilterName, $aFilterValues) . $this->_getSearchInput();

modules/base/text/classes/BxBaseModTextGridAdministration.php

@@ -52,12 +52,12 @@ class BxBaseModTextGridAdministration extends BxBaseModGeneralGridAdministration
     {
         parent::_getFilterControls();
 
-        $sPrefixLang = $this->_oModule->_oConfig->getPrefix('lang');
+        $CNF = &$this->_oModule->_oConfig->CNF;
 
         $sFilterName = 'filter1';
         $aFilterValues = array(
-			'active' => $sPrefixLang . '_grid_filter_item_title_adm_active',
-            'hidden' => $sPrefixLang . '_grid_filter_item_title_adm_hidden',
+        	'active' => $CNF['T']['filter_item_active'],
+            'pending' => $CNF['T']['filter_item_hidden'],
 		);
 
         return  $this->_getFilterSelectOne($sFilterName, $aFilterValues) . $this->_getSearchInput();

modules/boonex/organizations/classes/BxOrgsConfig.php

@@ -110,14 +110,15 @@ class BxOrgsConfig extends BxBaseModProfileConfig
                 'menu_item_title_unfriend_reject_request' => '_bx_orgs_menu_item_title_unfriend_reject_request',
                 'menu_item_title_befriend' => '_bx_orgs_menu_item_title_befriend',
                 'menu_item_title_unfriend' => '_bx_orgs_menu_item_title_unfriend',
+            	'grid_action_err_delete' => '_bx_orgs_grid_action_err_delete',
+				'filter_item_active' => '_bx_orgs_grid_filter_item_title_adm_active',
+            	'filter_item_pending' => '_bx_orgs_grid_filter_item_title_adm_pending',
+            	'filter_item_suspended' => '_bx_orgs_grid_filter_item_title_adm_suspended',
+            	'filter_item_select_one_filter1' => '_bx_orgs_grid_filter_item_title_adm_select_one_filter1'
             ),
 
         );
 
-        $this->_aPrefixes = array(
-        	'lang' => '_bx_orgs'
-        );
-
         $this->_aJsClass = array(
         	'manage_tools' => 'BxOrgsManageTools'
         );

modules/boonex/persons/classes/BxPersonsConfig.php

@@ -110,14 +110,15 @@ class BxPersonsConfig extends BxBaseModProfileConfig
                 'menu_item_title_unfriend_reject_request' => '_bx_persons_menu_item_title_unfriend_reject_request',
                 'menu_item_title_befriend' => '_bx_persons_menu_item_title_befriend',
                 'menu_item_title_unfriend' => '_bx_persons_menu_item_title_unfriend',
+            	'grid_action_err_delete' => '_bx_persons_grid_action_err_delete',
+            	'filter_item_active' => '_bx_persons_grid_filter_item_title_adm_active',
+            	'filter_item_pending' => '_bx_persons_grid_filter_item_title_adm_pending',
+            	'filter_item_suspended' => '_bx_persons_grid_filter_item_title_adm_suspended',
+            	'filter_item_select_one_filter1' => '_bx_persons_grid_filter_item_title_adm_select_one_filter1'
             ),
 
         );
 
-		$this->_aPrefixes = array(
-        	'lang' => '_bx_persons'
-        );
-
         $this->_aJsClass = array(
         	'manage_tools' => 'BxPersonsManageTools'
         );

modules/boonex/posts/classes/BxPostsConfig.php

@@ -86,13 +86,13 @@ class BxPostsConfig extends BxBaseModTextConfig
             'T' => array (
                 'txt_sample_single' => '_bx_posts_txt_sample_single',
             	'txt_sample_comment_single' => '_bx_posts_txt_sample_comment_single',
+            	'grid_action_err_delete' => '_bx_posts_grid_action_err_delete',
+				'filter_item_active' => '_bx_posts_grid_filter_item_title_adm_active',
+            	'filter_item_hidden' => '_bx_posts_grid_filter_item_title_adm_hidden',
+            	'filter_item_select_one_filter1' => '_bx_posts_grid_filter_item_title_adm_select_one_filter1'
             ),
         );
 
-        $this->_aPrefixes = array(
-        	'lang' => '_bx_posts'
-        );
-
         $this->_aJsClass = array(
         	'manage_tools' => 'BxPostsManageTools'
         );