#100 - Minor fixes and improvements.

modules/base/general/classes/BxBaseModGeneralGridAdministration.php

@@ -89,7 +89,7 @@ class BxBaseModGeneralGridAdministration extends BxTemplGrid
     	return $this->_getActionDefault ($sType, $sKey, $a, $isSmall, $isDisabled, $aRow);
     }
 
-    protected function _getFilterSelectOne($sFilterName, $aFilterValues)
+    protected function _getFilterSelectOne($sFilterName, $sFilterValue, $aFilterValues)
     {
         if(empty($sFilterName) || empty($aFilterValues))
             return '';
@@ -97,7 +97,6 @@ class BxBaseModGeneralGridAdministration extends BxTemplGrid
 		$CNF = &$this->_oModule->_oConfig->CNF;
 		$sJsObject = $this->_oModule->_oConfig->getJsObject('manage_tools');
 
-		$sFilterField = '_s' . str_replace(' ', '', ucwords(str_replace('_', ' ', $sFilterName)));
 		foreach($aFilterValues as $sKey => $sValue)
 			$aFilterValues[$sKey] = _t($sValue);
 
@@ -108,7 +107,7 @@ class BxBaseModGeneralGridAdministration extends BxTemplGrid
                 'id' => 'bx-grid-' . $sFilterName . '-' . $this->_sObject,
                 'onChange' => 'javascript:' . $sJsObject . '.onChangeFilter(this)'
             ),
-            'value' => $this->$sFilterField,
+            'value' => $sFilterValue,
             'values' => array_merge(array('' => _t($CNF['T']['filter_item_select_one_' . $sFilterName])), $aFilterValues)
         );
 

modules/base/profile/classes/BxBaseModProfileGridAdministration.php

@@ -13,16 +13,27 @@ bx_import('BxBaseModGeneralGridAdministration');
 
 class BxBaseModProfileGridAdministration extends BxBaseModGeneralGridAdministration
 {
-	protected $_sFilter1;
+	protected $_sFilter1Name;
+	protected $_sFilter1Value;
+	protected $_aFilter1Values;
 
     public function __construct ($aOptions, $oTemplate = false)
     {
         parent::__construct ($aOptions, $oTemplate);
 
-    	$sFilter1 = bx_get('filter1');
+        $CNF = &$this->_oModule->_oConfig->CNF;
+
+        $this->_sFilter1Name = 'filter1';
+        $this->_aFilter1Values = array(
+			'active' => $CNF['T']['filter_item_active'],
+            'pending' => $CNF['T']['filter_item_pending'],
+            'suspended' => $CNF['T']['filter_item_suspended'],
+		);
+
+    	$sFilter1 = bx_get($this->_sFilter1Name);
         if(!empty($sFilter1)) {
-            $this->_sFilter1 = bx_process_input($sFilter1);
-            $this->_aQueryAppend['filter1'] = $this->_sFilter1;
+            $this->_sFilter1Value = bx_process_input($sFilter1);
+            $this->_aQueryAppend[$this->_sFilter1Name] = $this->_sFilter1Value;
         }
     }
 
@@ -92,10 +103,10 @@ class BxBaseModProfileGridAdministration extends BxBaseModGeneralGridAdministrat
     protected function _getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage)
     {
         if(strpos($sFilter, $this->_sParamsDivider) !== false)
-            list($this->_sFilter1, $sFilter) = explode($this->_sParamsDivider, $sFilter);
+            list($this->_sFilter1Value, $sFilter) = explode($this->_sParamsDivider, $sFilter);
 
-    	if(!empty($this->_sFilter1))
-        	$this->_aOptions['source'] .= $this->_oModule->_oDb->prepare(" AND `tp`.`status`=?", $this->_sFilter1);
+    	if(!empty($this->_sFilter1Value))
+        	$this->_aOptions['source'] .= $this->_oModule->_oDb->prepare(" AND `tp`.`status`=?", $this->_sFilter1Value);
 
         return parent::_getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage);
     }
@@ -105,16 +116,7 @@ class BxBaseModProfileGridAdministration extends BxBaseModGeneralGridAdministrat
     {
         parent::_getFilterControls();
 
-        $CNF = &$this->_oModule->_oConfig->CNF;
-
-        $sFilterName = 'filter1';
-        $aFilterValues = array(
-			'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();
+        return  $this->_getFilterSelectOne($this->_sFilter1Name, $this->_sFilter1Value, $this->_aFilter1Values) . $this->_getSearchInput();
     }
 
     protected function _getCellFullname($mixedValue, $sKey, $aField, $aRow)

modules/base/text/classes/BxBaseModTextGridAdministration.php

@@ -13,16 +13,26 @@ bx_import('BxBaseModGeneralGridAdministration');
 
 class BxBaseModTextGridAdministration extends BxBaseModGeneralGridAdministration
 {
-	protected $_sFilter1;
+	protected $_sFilter1Name;
+	protected $_sFilter1Value;
+	protected $_aFilter1Values;
 
     public function __construct ($aOptions, $oTemplate = false)
     {
         parent::__construct ($aOptions, $oTemplate);
 
-    	$sFilter1 = bx_get('filter1');
+        $CNF = &$this->_oModule->_oConfig->CNF;
+
+        $this->_sFilter1Name = 'filter1';
+        $this->_aFilter1Values = array(
+        	'active' => $CNF['T']['filter_item_active'],
+            'hidden' => $CNF['T']['filter_item_hidden'],
+		);
+        
+    	$sFilter1 = bx_get($this->_sFilter1Name);
         if(!empty($sFilter1)) {
-            $this->_sFilter1 = bx_process_input($sFilter1);
-            $this->_aQueryAppend['filter1'] = $this->_sFilter1;
+            $this->_sFilter1Value = bx_process_input($sFilter1);
+            $this->_aQueryAppend['filter1'] = $this->_sFilter1Value;
         }
     }
 
@@ -39,10 +49,10 @@ class BxBaseModTextGridAdministration extends BxBaseModGeneralGridAdministration
     protected function _getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage)
     {
         if(strpos($sFilter, $this->_sParamsDivider) !== false)
-            list($this->_sFilter1, $sFilter) = explode($this->_sParamsDivider, $sFilter);
+            list($this->_sFilter1Value, $sFilter) = explode($this->_sParamsDivider, $sFilter);
 
-    	if(!empty($this->_sFilter1))
-        	$this->_aOptions['source'] .= $this->_oModule->_oDb->prepare(" AND `status`=?", $this->_sFilter1);
+    	if(!empty($this->_sFilter1Value))
+        	$this->_aOptions['source'] .= $this->_oModule->_oDb->prepare(" AND `status`=?", $this->_sFilter1Value);
 
         return parent::_getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage);
     }
@@ -52,15 +62,7 @@ class BxBaseModTextGridAdministration extends BxBaseModGeneralGridAdministration
     {
         parent::_getFilterControls();
 
-        $CNF = &$this->_oModule->_oConfig->CNF;
-
-        $sFilterName = 'filter1';
-        $aFilterValues = array(
-        	'active' => $CNF['T']['filter_item_active'],
-            'hidden' => $CNF['T']['filter_item_hidden'],
-		);
-
-        return  $this->_getFilterSelectOne($sFilterName, $aFilterValues) . $this->_getSearchInput();
+        return  $this->_getFilterSelectOne($this->_sFilter1Name, $this->_sFilter1Value, $this->_aFilter1Values) . $this->_getSearchInput();
     }
 
 	protected function _getCellTitle($mixedValue, $sKey, $aField, $aRow)

modules/boonex/organizations/install/sql/enable.sql

@@ -301,10 +301,9 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 ('bx_organizations_moderation', 'account', '_bx_orgs_grid_column_title_adm_account', '25%', 0, '25', '', 4),
 ('bx_organizations_moderation', 'actions', '', '15%', 0, '', '', 5),
 ('bx_organizations_common', 'checkbox', '_sys_select', '2%', 0, '', '', 1),
-('bx_organizations_common', 'switcher', '', '8%', 0, '', '', 2),
-('bx_organizations_common', 'org_name', '_bx_orgs_grid_column_title_adm_org_name', '40%', 0, '', '', 3),
-('bx_organizations_common', 'last_online', '_bx_orgs_grid_column_title_adm_last_online', '30%', 1, '25', '', 4),
-('bx_organizations_common', 'actions', '', '20%', 0, '', '', 5);
+('bx_organizations_common', 'org_name', '_bx_orgs_grid_column_title_adm_org_name', '48%', 0, '', '', 2),
+('bx_organizations_common', 'last_online', '_bx_orgs_grid_column_title_adm_last_online', '30%', 1, '25', '', 3),
+('bx_organizations_common', 'actions', '', '20%', 0, '', '', 4);
 
 INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `confirm`, `order`) VALUES
 ('bx_organizations_administration', 'bulk', 'set_acl_level', '_bx_orgs_grid_action_title_adm_set_acl_level', '', 0, 1),

modules/boonex/persons/install/sql/enable.sql

@@ -303,10 +303,9 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 ('bx_persons_moderation', 'account', '_bx_persons_grid_column_title_adm_account', '25%', 0, '25', '', 4),
 ('bx_persons_moderation', 'actions', '', '15%', 0, '', '', 5),
 ('bx_persons_common', 'checkbox', '_sys_select', '2%', 0, '', '', 1),
-('bx_persons_common', 'switcher', '', '8%', 0, '', '', 2),
-('bx_persons_common', 'fullname', '_bx_persons_grid_column_title_adm_fullname', '40%', 0, '', '', 3),
-('bx_persons_common', 'last_online', '_bx_persons_grid_column_title_adm_last_online', '30%', 1, '25', '', 4),
-('bx_persons_common', 'actions', '', '20%', 0, '', '', 5);
+('bx_persons_common', 'fullname', '_bx_persons_grid_column_title_adm_fullname', '48%', 0, '', '', 2),
+('bx_persons_common', 'last_online', '_bx_persons_grid_column_title_adm_last_online', '30%', 1, '25', '', 3),
+('bx_persons_common', 'actions', '', '20%', 0, '', '', 4);
 
 INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `confirm`, `order`) VALUES
 ('bx_persons_administration', 'bulk', 'set_acl_level', '_bx_persons_grid_action_title_adm_set_acl_level', '', 0, 1),