Changeset 15795 for trunk/inc

Timestamp:

12/25/11 21:58:37 (5 months ago)

Author:

Anton Lesnikov

Message:

1. Studio -> Settings improvement.
2. inc/languages.inc.php -> BxDolLanguages?.php and related changes.
3. Minor fixes and improvements.

Location:

trunk/inc/classes

Files:

• BxDolLanguages.php (added)
• BxDolLanguagesQuery.php (modified) (1 diff)
• BxDolMemberMenu.php (modified) (2 diffs)
• BxDolMenu.php (modified) (1 diff)
• BxDolModuleConfig.php (modified) (2 diffs)
• BxDolPermalinks.php (modified) (2 diffs)
• BxDolStorageLocal.php (modified) (1 diff)
• BxDolStorageQuery.php (modified) (1 diff)
• BxDolTemplate.php (modified) (1 diff)
• BxDolVoting.php (modified) (1 diff)

trunk/inc/classes/BxDolLanguagesQuery.php

@@ -374 +374 @@
         return $this->getPairs($sSql, 'IDParam', 'Description');
     }
-
-    
 }
+/** @} */

trunk/inc/classes/BxDolMemberMenu.php

@@ -233 +233 @@
             $oCache = $this -> getCacheObject();
 
-            $oPermalinks   = new BxDolPermalinks();
+            bx_import('BxDolPermalinks');
+            $oPermalinks   = BxDolPermalinks::getInstance();
             $oUserStatus   = new BxDolUserStatusView();
             $sMemberStatus = $oUserStatus -> getStatusIcon($aMemberInfo['ID']) ;
@@ -575 +576 @@
             $this -> deleteMemberMenuCaches();
 
-            $oPermalink = new BxDolPermalinks();
+            bx_import('BxDolPermalinks');
+            $oPermalink   = BxDolPermalinks::getInstance();
+
             $aCacheData = array();
 

trunk/inc/classes/BxDolMenu.php

@@ -44 +44 @@
         $this->_aObject = $aObject;
         $this->_oQuery = new BxDolMenuQuery($this->_aObject);
-        $this->_oPermalinks = new BxDolPermalinks();
+        $this->_oPermalinks = BxDolPermalinks::getInstance();
     }
 

trunk/inc/classes/BxDolModuleConfig.php

@@ -6 +6 @@
  */
 defined('BX_DOL') or die('hack attempt');
-
-bx_import('BxDolPermalinks');
 
 /**
@@ -105 +103 @@
      */
     function getBaseUri() {
-        $oPermalinks = new BxDolPermalinks();
-        return $oPermalinks->permalink('modules/?r=' . $this->_sUri . '/');
+        bx_import('BxDolPermalinks');
+        return BxDolPermalinks::getInstance()->permalink('modules/?r=' . $this->_sUri . '/');
     }
     /**

trunk/inc/classes/BxDolPermalinks.php

@@ -38 +38 @@
 
     function BxDolPermalinks() {
+        if (isset($GLOBALS['bxDolClasses'][get_class($this)]))
+            trigger_error ('Multiple instances are not allowed for the class: ' . get_class($this), E_USER_ERROR);
+
         parent::BxDolDb();
 
@@ -45 +48 @@
             if(!$this->cache())
                $this->aLinks = array();
+    }
+
+    /**
+     * Prevent cloning the instance
+     */
+    public function __clone() {
+        if (isset($GLOBALS['bxDolClasses'][get_class($this)]))
+            trigger_error('Clone is not allowed for the class: ' . get_class($this), E_USER_ERROR);
+    }
+
+    /**
+     * Get singleton instance of the class
+     */
+    static function getInstance() {
+        if(!isset($GLOBALS['bxDolClasses'][__CLASS__]))
+            $GLOBALS['bxDolClasses'][__CLASS__] = new BxDolPermalinks();
+
+        return $GLOBALS['bxDolClasses'][__CLASS__];
     }
 

trunk/inc/classes/BxDolStorageLocal.php

@@ -129 +129 @@
     protected function getObjectBaseUrl ($isPrivate = false) {
         bx_import('BxDolPermalinks');
-        $oPermalinks = new BxDolPermalinks();
-        return BX_DOL_URL_ROOT . $oPermalinks->permalink('storage.php/?o=' . $this->_aObject['object'] . '&f=');
+        return BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('storage.php/?o=' . $this->_aObject['object'] . '&f=');
     }
 

trunk/inc/classes/BxDolStorageQuery.php

@@ -81 +81 @@
             $a = array ('current_size' => 0, 'current_number' => 0, 'quota_size' => 0, 'quota_number' => 0, 'max_file_size' => 0);
 
-        // get quota_number and quota_size from user's acl/membership 
-        require_once(BX_DIRECTORY_PATH_INC . "membership_levels.inc.php");
-        $aMembershipInfo = getMemberMembershipInfo($iProfileId);
+        // get quota_number and quota_size from user's acl/membership
+        bx_import('BxDolAcl');
+        $aMembershipInfo = BxDolAcl::getInstance()->getMemberMembershipInfo($iProfileId);
         if ($aMembershipInfo) {
-            if (isset($aMembershipInfo['QuotaSize']))
-                $a['quota_size'] = $aMembershipInfo['QuotaSize'];
-            if (isset($aMembershipInfo['QuotaNumber']))
-                $a['quota_number'] = $aMembershipInfo['QuotaNumber'];
-            if (isset($aMembershipInfo['QuotaMaxFileSize']))
-                $a['max_file_size'] = $aMembershipInfo['QuotaMaxFileSize'];
+            if (isset($aMembershipInfo['quota_size']))
+                $a['quota_size'] = $aMembershipInfo['quota_size'];
+            if (isset($aMembershipInfo['quota_number']))
+                $a['quota_number'] = $aMembershipInfo['quota_number'];
+            if (isset($aMembershipInfo['quota_max_file_size']))
+                $a['max_file_size'] = $aMembershipInfo['quota_max_file_size'];
         }
 

trunk/inc/classes/BxDolTemplate.php

@@ -204 +204 @@
             if (isset($_GET[$this->_sCodeKey])) {
                 bx_import('BxDolPermalinks');
-                $oPermalinks = new BxDolPermalinks();
-                if ($oPermalinks->redirectIfNecessary(array($this->_sCodeKey)))
+                if(BxDolPermalinks::getInstance()->redirectIfNecessary(array($this->_sCodeKey)))
                     exit;
             }

trunk/inc/classes/BxDolVoting.php

@@ -242 +242 @@
     function checkAction ()
     {
-        require_once(BX_DIRECTORY_PATH_INC . 'membership_levels.inc.php');
+        bx_import('BxDolAcl');
         if (isset($this->_checkActionResult))
             return $this->_checkActionResult;