Changeset 15751 for trunk/inc

Timestamp:

12/12/11 22:16:28 (6 months ago)

Author:

Anton Lesnikov

Message:

1. Modules/Store? Installer improvements and updates
2. Related changes in Articles module.

Location:

trunk/inc/classes

Files:

• BxDolModuleConfig.php (modified) (1 diff)
• BxDolModuleQuery.php (modified) (3 diffs)
• BxDolTextData.php (modified) (3 diffs)
• BxDolTextDb.php (modified) (1 diff)
• BxDolTextModule.php (modified) (1 diff)
• BxDolTextTemplate.php (modified) (2 diffs)

trunk/inc/classes/BxDolModuleConfig.php

@@ -81 +81 @@
         return $this->_sDbPrefix;
     }
+    function getDirectory() {
+        return $this->_sDirectory;
+    }
     function getHomePath() {
         return $this->_sHomePath;

trunk/inc/classes/BxDolModuleQuery.php

@@ -35 +35 @@
     }
     function getModuleById($iId) {
-        $sSql = $this->prepare("SELECT `id`, `title`, `vendor`, `version`, `product_url`, `update_url`, `path`, `uri`, `class_prefix`, `db_prefix`, `lang_category`, `date`, `enabled` FROM `sys_modules` WHERE `id`=? LIMIT 1", $iId);
+        $sSql = $this->prepare("SELECT `id`, `name`, `title`, `vendor`, `version`, `product_url`, `update_url`, `path`, `uri`, `class_prefix`, `db_prefix`, `lang_category`, `date`, `enabled` FROM `sys_modules` WHERE `id`=? LIMIT 1", $iId);
         return $this->fromMemory('sys_modules_' . $iId, 'getRow', $sSql);
     }
+    function getModuleByName($sName) {
+        $sSql = $this->prepare("SELECT `id`, `name`, `title`, `vendor`, `version`, `product_url`, `update_url`, `path`, `uri`, `class_prefix`, `db_prefix`, `lang_category`, `date`, `enabled` FROM `sys_modules` WHERE `name`=? LIMIT 1", $sName);
+        return $this->fromMemory('sys_modules_' . $sName, 'getRow', $sSql);
+    }
     function getModuleByUri($sUri) {
-        $sSql = $this->prepare("SELECT `id`, `title`, `vendor`, `version`, `product_url`, `update_url`, `path`, `uri`, `class_prefix`, `db_prefix`, `lang_category`, `date`, `enabled` FROM `sys_modules` WHERE `uri`=? LIMIT 1", $sUri);
+        $sSql = $this->prepare("SELECT `id`, `name`, `title`, `vendor`, `version`, `product_url`, `update_url`, `path`, `uri`, `class_prefix`, `db_prefix`, `lang_category`, `date`, `enabled` FROM `sys_modules` WHERE `uri`=? LIMIT 1", $sUri);
         return $this->fromMemory('sys_modules_' . $sUri, 'getRow', $sSql);
     }
@@ -52 +56 @@
     function isModule($sUri) {
         $sSql = $this->prepare("SELECT `id` FROM `sys_modules` WHERE `uri`=? LIMIT 1", $sUri);
+        return (int)$this->getOne($sSql) > 0;
+    }
+    function isModuleByName($sName) {
+        $sSql = $this->prepare("SELECT `id` FROM `sys_modules` WHERE `name`=? LIMIT 1", $sName);
         return (int)$this->getOne($sSql) > 0;
     }
@@ -81 +89 @@
         }
 
-        $sSql = "SELECT `id`, `type`, `title`, `vendor`, `version`, `product_url`, `update_url`, `path`, `uri`, `class_prefix`, `db_prefix`, `lang_category`, `date`, `enabled` FROM `sys_modules` WHERE 1" . $sWhereClause . " ORDER BY `title`";
+        $sSql = "SELECT 
+                `id`,
+                IF(`vendor`='BoonEx', CONCAT('bx_', `uri`), `uri`) AS `name`,
+                `type`, 
+                `title`, 
+                `vendor`, 
+                `version`, 
+                `product_url`, 
+                `update_url`, 
+                `path`, 
+                `uri`, 
+                `class_prefix`, 
+                `db_prefix`, 
+                `lang_category`, 
+                `date`, 
+                `enabled` 
+            FROM `sys_modules` 
+            WHERE 1" . $sWhereClause . " 
+            ORDER BY `title`";
         return $this->fromMemory('sys_modules' . $sPostfix, 'getAll', $sSql);
     }

trunk/inc/classes/BxDolTextData.php

@@ -34 +34 @@
 bx_import('BxDolForm');
 bx_import('BxDolPrivacy');
-bx_import('BxDolCategories');
+//bx_import('BxDolCategories');
 bx_import('BxTemplFormView');
-bx_import('BxDolCategories');
 
 class BxDolTextData {
@@ -50 +49 @@
 
         $this->_iOwnerId = BxDolTextData::getAuthorId();
-        $oCategories = new BxDolCategories();
-        $oCategories->getTagObjectConfig();
+        //$oCategories = new BxDolCategories();
+        //$oCategories->getTagObjectConfig();
 
         $this->_aForm = array(
@@ -156 +155 @@
                     ),
                 ),
-                'categories' => $oCategories->getGroupChooser ('bx_' . $this->_sSystem, $this->_iOwnerId, true),
+                //'categories' => $oCategories->getGroupChooser ('bx_' . $this->_sSystem, $this->_iOwnerId, true),
                 'allow_comment_to' => array(),
                 'allow_vote_to' => array(),

trunk/inc/classes/BxDolTextDb.php

@@ -24 +24 @@
 ***************************************************************************/
 
-bx_import('BxDolModuleQuery');
+bx_import('BxDolModuleDb');
 
-class BxDolTextDb extends BxDolModuleQuery {
+class BxDolTextDb extends BxDolModuleDb {
     var $_oConfig;
 
     function BxDolTextDb(&$oConfig) {
-        parent::BxDolModuleQuery();
+        parent::__construct($oConfig);
 
         $this->_oConfig = &$oConfig;

trunk/inc/classes/BxDolTextModule.php

@@ -28 +28 @@
 bx_import('BxDolModule');
 bx_import('BxDolPaginate');
-bx_import('BxDolCategories');
+//bx_import('BxDolCategories');
 bx_import('BxDolRssFactory');
 bx_import('BxDolSubscription');
-bx_import('BxDolAdminSettings');
-bx_import('BxTemplTagsModule');
-bx_import('BxTemplCategoriesModule');
+//bx_import('BxTemplTagsModule');
+//bx_import('BxTemplCategoriesModule');
 
 require_once(BX_DIRECTORY_PATH_PLUGINS . 'Services_JSON.php');

trunk/inc/classes/BxDolTextTemplate.php

@@ -43 +43 @@
         $this->_oModule = $oModule;
 
+        /*
         $this->oPaginate = new BxDolPaginate(array(
             'page_url' => 'javascript:void(0);',
@@ -51 +52 @@
             'on_change_page' => $this->_oConfig->getJsObject() . '.changePage({start}, {per_page})'
         ));
+        */
     }
     function displayAdminBlock($aParams) {