Ticket #3306

modules/base/general/classes/BxBaseModGeneralDb.php

@@ -61,7 +61,7 @@ class BxBaseModGeneralDb extends BxDolModuleDb
                     break;
 
                 if(is_array($aParams['conditions']))
-                    $sWhereClause .= $this->arrayToSQL($aParams['conditions'], ' AND ');
+                    $sWhereClause .= " AND " . $this->arrayToSQL($aParams['conditions'], ' AND ');
                 else if(is_string($aParams['conditions']) && !empty($aParams['bindings']) && is_array($aParams['bindings'])) {
                     $sWhereClause .= $aParams['conditions'];
                     

modules/boonex/acl/classes/BxAclModule.php

@@ -206,12 +206,16 @@ class BxAclModule extends BxDolModule
         else
             $sTitle = _t('_bx_acl_txt_cart_item_title', _t($aItem['level_name']), $aItem['period'], $aItem['period_unit']);
 
+        $sDescription = _t($aItem['level_description']);
+        if(empty($sDescription))
+            $sDescription = _t('_bx_acl_txt_cart_item_description', getParam('site_title'));
+
         return array (
             'id' => $aItem['id'],
             'author_id' => $this->_oConfig->getOwner(),
             'name' => $aItem['name'],
             'title' => $sTitle,
-            'description' => _t($aItem['level_description']),
+            'description' => $sDescription,
             'url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($CNF['URL_VIEW']),
             'price_single' => $aItem['price'],
             'price_recurring' => $aItem['price'],
@@ -251,13 +255,23 @@ class BxAclModule extends BxDolModule
         $sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($CNF['URL_VIEW']);
 
         $aResult = array();
-        foreach($aItems as $aItem)
+        foreach($aItems as $aItem) {
+            $sTitle = '';
+            if((int)$aItem['period'] == 0)
+                $sTitle = _t('_bx_acl_txt_cart_item_title_lifetime', _t($aItem['level_name']));
+            else
+                $sTitle = _t('_bx_acl_txt_cart_item_title', _t($aItem['level_name']), $aItem['period'], $aItem['period_unit']);
+
+            $sDescription = _t($aItem['level_description']);
+            if(empty($sDescription))
+                $sDescription = _t('_bx_acl_txt_cart_item_description', getParam('site_title'));
+            
             $aResult[] = array(
                 'id' => $aItem['id'],
                 'author_id' => $iSellerIdSetting,
                 'name' => $aItem['name'],
-                'title' => _t('_bx_acl_txt_cart_item_title', _t($aItem['level_name']), $aItem['period'], $aItem['period_unit']),
-                'description' => _t($aItem['level_description']),
+                'title' => $sTitle,
+                'description' => $sDescription,
                 'url' => $sUrl,
                 'price_single' => $aItem['price'],
                 'price_recurring' => $aItem['price'],
@@ -265,6 +279,7 @@ class BxAclModule extends BxDolModule
                 'period_unit_recurring' => $aItem['period_unit'],
                 'trial_recurring' => $aItem['trial']
            );
+        }
 
         return $aResult;
     }

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

@@ -92,6 +92,7 @@
 	<string name="_bx_acl_txt_select_level"><![CDATA[Select level...]]></string>
 	<string name="_bx_acl_txt_cart_item_title"><![CDATA[{0} ({1} {2})]]></string>
         <string name="_bx_acl_txt_cart_item_title_lifetime"><![CDATA[{0} (lifetime)]]></string>
+        <string name="_bx_acl_txt_cart_item_description"><![CDATA[Membership level on {0} site.]]></string>
 	<string name="_bx_acl_txt_upgrade"><![CDATA[Upgrade]]></string>
 	<string name="_bx_acl_txt_manage"><![CDATA[Manage]]></string>
 	<string name="_bx_acl_txt_n_unit"><![CDATA[{0} ({1})]]></string>

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

@@ -92,6 +92,7 @@
 	<string name="_bx_acl_txt_select_level"><![CDATA[Выберите уровень...]]></string>
 	<string name="_bx_acl_txt_cart_item_title"><![CDATA[{0} ({1} {2})]]></string>
         <string name="_bx_acl_txt_cart_item_title_lifetime"><![CDATA[{0} (пожизненно)]]></string>
+        <string name="_bx_acl_txt_cart_item_description"><![CDATA[Членство на сайте {0}.]]></string>
 	<string name="_bx_acl_txt_upgrade"><![CDATA[Улучшить]]></string>
 	<string name="_bx_acl_txt_manage"><![CDATA[Изменить]]></string>
 	<string name="_bx_acl_txt_n_unit"><![CDATA[{0} ({1})]]></string>