Changeset 15287

Timestamp:

06/29/11 04:12:33 (11 months ago)

Author:

Anton Lesnikov

Message:

Rename BxModuleDb? into BxDolModuleQuery?

Location:

trunk

Files:

• inc/classes/BxDolFilesDb.php (modified) (2 diffs)
• inc/classes/BxDolFriendsPageView.php (modified) (1 diff)
• inc/classes/BxDolInstallerUtils.php (modified) (1 diff)
• inc/classes/BxDolMemberMenu.php (modified) (2 diffs)
• inc/classes/BxDolMenu.php (modified) (1 diff)
• inc/classes/BxDolModule.php (modified) (1 diff)
• inc/classes/BxDolModuleDb.php (deleted)
• inc/classes/BxDolModuleQuery.php (added)
• inc/classes/BxDolProfileFields.php (modified) (2 diffs)
• inc/classes/BxDolRequest.php (modified) (1 diff)
• inc/classes/BxDolService.php (modified) (2 diffs)
• inc/classes/BxDolTextDb.php (modified) (1 diff)
• inc/classes/BxDolTwigModuleDb.php (modified) (2 diffs)
• modules/index.php (modified) (2 diffs)

trunk/inc/classes/BxDolFilesDb.php

@@ -22 +22 @@
 ***************************************************************************/
 
-require_once('BxDolModuleDb.php');
-
-class BxDolFilesDb extends BxDolModuleDb {
+bx_import('BxDolModuleQuery');
+
+class BxDolFilesDb extends BxDolModuleQuery {
     var $_oConfig;
 
@@ -42 +42 @@
      */
     function BxDolFilesDb (&$oConfig) {
-        parent::BxDolModuleDb($oConfig);
+        parent::BxDolModuleQuery();
+
         $this->_oConfig = &$oConfig;
         $this->iViewer = getLoggedId();

trunk/inc/classes/BxDolFriendsPageView.php

@@ -374 +374 @@
         $sWhereParam = "AND p.`DateLastNav` > SUBDATE(NOW(), INTERVAL " . $iOnlineTime . " MINUTE)";
         $aAllFriends = getMyFriendsEx($iMemberId, $sWhereParam, 'last_nav_desc', "LIMIT 5");
-        $oModuleDb   = new BxDolModuleDb();
+        
+        bx_import('BxDolModuleQuery');
+        $oModuleDb   = BxDolModuleQuery::getInstance();
 
         $sVideoMessengerImgPath  = $GLOBALS['oSysTemplate'] -> getIconUrl('video.png');

trunk/inc/classes/BxDolInstallerUtils.php

@@ -37 +37 @@
 
     function isModuleInstalled($sUri) {
-        bx_import('BxDolModuleDb');
-        $oModuleDb = new BxDolModuleDb();
-        return $oModuleDb->isModule($sUri);
+        bx_import('BxDolModuleQuery');
+        return BxDolModuleQuery::getInstance()->isModule($sUri);
     }
 

trunk/inc/classes/BxDolMemberMenu.php

@@ -556 +556 @@
          * @return boolean
          */
-        function deleteMemberMenuCaches()
-        {
+        function deleteMemberMenuCaches() {
             //remove all member_menu_keys files
             $oCache = $this -> getCacheObject();
             $oCache->removeAllByPrefix($this -> sMenuMemberKeysCache);
 
-            return $GLOBALS['MySQL']->cleanCache($this -> sMenuCacheFile);
+            return BxDolDb::getInstance()->cleanCache($this -> sMenuCacheFile);
         }
 
@@ -595 +594 @@
             $oCache = $this -> getCacheObject();
             if (!empty($aCacheData) && is_array($aCacheData)) {
-                $oCache->setData ($GLOBALS['MySQL']->genDbCacheKey($this -> sMenuCacheFile), $aCacheData);
+                $oCache->setData(BxDolDb::getInstance()->genDbCacheKey($this -> sMenuCacheFile), $aCacheData);
             }
 

trunk/inc/classes/BxDolMenu.php

@@ -46 +46 @@
      */
     function getInstance() {
-        if(!isset($GLOBALS['bxDolClasses'][__CLASS__]))
+        if(!isset($GLOBALS['bxDolClasses'][__CLASS__])) {
+            bx_import('BxTemplMenu');
             $GLOBALS['bxDolClasses'][__CLASS__] = new BxTemplMenu();
+        }
 
         return $GLOBALS['bxDolClasses'][__CLASS__];

trunk/inc/classes/BxDolModule.php

@@ -15 +15 @@
  *
  * b. An object of database class.
- * @see BxDolModuleDb
+ * @see BxDolModuleQuery
  *
  * c. An object of template class.

trunk/inc/classes/BxDolProfileFields.php

@@ -1393 +1393 @@
                     break;
 
-                    case 'Membership':
-                        $aMemberships    = getMemberships();
-                        $aMembershipInfo = getMemberMembershipInfo($iProfileID);
-
-                        $aInput = array(
-                            'type' => 'custom',
-                            'content' => $this->getInputMembership( $aMemberships, $aMembershipInfo ),
-                        );
-                    break;
-
                     case 'ID':
                     case 'DateReg':
@@ -1436 +1426 @@
 
         return $aInput;
-    }
-
-    function getInputMembership ( $aMemberships, $aCurMship ) {
-
-        $sCurMship = $aCurMship['Name'];
-        if ( $aCurMship['ID'] != MEMBERSHIP_ID_STANDARD ) {
-            if ( !isset( $aCurMship['DateExpires'] ) )
-                $sCurMship .= ', ' . _t( '_MEMBERSHIP_EXPIRES_NEVER' );
-            else {
-                $iDaysLeft = round( ($aCurMship['DateExpires'] - time()) / (24 * 3600) );
-                $sCurMship .= ', '. _t( '_MEMBERSHIP_EXPIRES_IN_DAYS', $iDaysLeft );
-            }
-        }
-
-        $iMembershipStd  = MEMBERSHIP_ID_STANDARD;
-        $_tSetMembership = _t('_Set membership');
-        $_tFor           = _t('_for');
-        $_tDays          = _t('_days');
-        $_tStartsNow     = _t('_starts immediately');
-        $_tCancel        = _t( '_Cancel' );
-        //_t('_Current membership')
-
-        $sCode .= <<<BLAH
-            <script type="text/javascript">
-                function checkStandard() {
-                    selectMembership = document.getElementById('MembershipID');
-                    if(selectMembership.value == $iMembershipStd) {
-                        document.getElementById('MembershipDays').disabled = true;
-                        document.getElementById('MembershipImmediately').disabled = true;
-                    } else {
-                        document.getElementById('MembershipDays').disabled = false;
-                        document.getElementById('MembershipImmediately').disabled = false;
-                    }
-                }
-
-                function ShowHideMshipForm( bShow ) {
-                    if( bShow ) {
-                        $('#current_membership').hide(400);
-                        $('#set_membership'    ).show(400);
-                        $('#doSetMembership'   ).val( 'yes' );
-                    } else {
-                        $('#current_membership').show(400);
-                        $('#set_membership'    ).hide(400);
-                        $('#doSetMembership'   ).val( '' );
-                    }
-                }
-            </script>
-
-            <div id="current_membership">
-                $sCurMship
-                <br />
-                <div class="button_wrapper">
-                    <input type="button" value="$_tSetMembership" class="form_input_submit" onclick="ShowHideMshipForm( true )" />
-                    <div class="button_wrapper_close"></div>
-                </div>
-            </div>
-BLAH;
-
-        $sCode .= <<<BLAH
-            <div id="set_membership" style="display: none;">
-                <input type="hidden" id="doSetMembership" name="doSetMembership" value="" />
-
-                <select id="MembershipID" name="MembershipID" onchange="checkStandard()" class="select_set_membership">
-BLAH;
-
-        $sUnlimitedC = process_line_output(_t('_pfm_unlimited'));
-
-        foreach ( $aMemberships as $iMembershipID => $sMembershipName ) {
-            if ( $iMembershipID == MEMBERSHIP_ID_NON_MEMBER )
-                continue;
-
-            $sCode .= <<<BLAH
-                    <option value="$iMembershipID">$sMembershipName</option>
-BLAH;
-        }
-
-        $sCode .= <<<BLAH
-                </select>
-
-        $_tFor
-                <input disabled="disabled" id="MembershipDays" type="text" class="no" name="MembershipDays" value="{$sUnlimitedC}"
-                  onfocus="if (MembershipDays.value == '{$sUnlimitedC}') MembershipDays.value = ''"
-                  onblur=" if (MembershipDays.value == ''         ) MembershipDays.value = '{$sUnlimitedC}'" />
-                $_tDays
-
-                <br />
-                <input disabled="disabled" id="MembershipImmediately" type="checkbox" name="MembershipImmediately" style="vertical-align: middle;" />
-                <label for="MembershipImmediately">
-                    $_tStartsNow
-                </label>
-
-                <br />
-                <input type="button" onclick="ShowHideMshipForm( false );" value="$_tCancel" />
-            </div>
-BLAH;
-        return $sCode;
     }
 

trunk/inc/classes/BxDolRequest.php

@@ -107 +107 @@
         $aModule = $mixedModule;
         if(is_string($mixedModule)) {
-            $oModuleDb = new BxDolModuleDb();
-            $aModule = $oModuleDb->getModuleByUri($mixedModule);
+            bx_import('BxDolModuleQuery');
+            $aModule = BxDolModuleQuery::getInstance()->getModuleByUri($mixedModule);
         }
 

trunk/inc/classes/BxDolService.php

@@ -8 +8 @@
 
 bx_import('BxDolRequest');
-bx_import('BxDolModuleDb');
 
 /**
@@ -38 +37 @@
 
     function call($mixed, $sMethod, $aParams = array(), $sClass = 'Module') {
-        $oDb = new BxDolModuleDb();
+        bx_import('BxDolModuleQuery');
+        $oDb = BxDolModuleQuery::getInstance();
 
         $aModule = array();

trunk/inc/classes/BxDolTextDb.php

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

trunk/inc/classes/BxDolTwigModuleDb.php

@@ -23 +23 @@
 ***************************************************************************/
 
-bx_import('BxDolModuleDb');
+bx_import('BxDolModuleQuery');
 
 /**
  * Base database class for modules like events/groups/store
  */
-class BxDolTwigModuleDb extends BxDolModuleDb {
+class BxDolTwigModuleDb extends BxDolModuleQuery {
 
     var $_sTableMain = 'main';
@@ -52 +52 @@
      */
     function BxDolTwigModuleDb(&$oConfig) {
-        parent::BxDolModuleDb($oConfig);
+        parent::BxDolModuleQuery($oConfig);
     }
 

trunk/modules/index.php

@@ -13 +13 @@
     $GLOBALS['iAdminPage'] = 1;
 
-bx_import('BxDolModuleDb');
-
 $sName = bx_process_input(array_shift($GLOBALS['aRequest']));
 
-$oDb = new BxDolModuleDb();
-$GLOBALS['aModule'] = $oDb->getModuleByUri($sName);
+bx_import('BxDolModuleQuery');
+$GLOBALS['aModule'] = BxDolModuleQuery::getInstance()->getModuleByUri($sName);
 
 if (empty($GLOBALS['aModule'])) {
@@ -28 +26 @@
 
 include(BX_DIRECTORY_PATH_MODULES . $GLOBALS['aModule']['path'] . 'request.php');
-