#423 - Related changes.

modules/base/connect/classes/BxBaseModConnectModule.php

@@ -9,7 +9,7 @@
  * @{
  */
 
-class BxBaseModConnectModule extends BxDolModule
+class BxBaseModConnectModule extends BxBaseModGeneralModule
 {
     function __construct(&$aModule)
     {

modules/base/connect/classes/BxBaseModConnectTemplate.php

@@ -9,7 +9,7 @@
  * @{
  */
 
-class BxBaseModConnectTemplate extends BxDolModuleTemplate
+class BxBaseModConnectTemplate extends BxBaseModGeneralTemplate
 {
     function __construct(&$oConfig, &$oDb)
     {

modules/base/general/classes/BxBaseModGeneralModule.php

@@ -557,6 +557,41 @@ class BxBaseModGeneralModule extends BxDolModule
             return '';
     }
 
+	// ====== COMMON METHODS
+
+    public function getProfileId()
+    {
+    	return bx_get_logged_profile_id();
+    }
+
+	public function getProfileInfo($iUserId = 0)
+    {
+        $oProfile = $this->getObjectUser($iUserId);
+        $oAccount = $oProfile->getAccountObject();
+
+        return array(
+        	'id' => $oProfile->id(),
+            'name' => $oProfile->getDisplayName(),
+        	'email' => $oAccount->getEmail(),
+            'link' => $oProfile->getUrl(),
+            'icon' => $oProfile->getIcon(),
+            'unit' => $oProfile->getUnit(),
+        	'active' => $oProfile->isActive(),
+        );
+    }
+    
+    public function getObjectUser($iUserId = 0)
+    {
+    	bx_import('BxDolProfile');
+        $oProfile = BxDolProfile::getInstance($iUserId);
+        if (!$oProfile) {
+            bx_import('BxDolProfileUndefined');
+            $oProfile = BxDolProfileUndefined::getInstance();
+        }
+
+        return $oProfile;
+    }
+
     // ====== PROTECTED METHODS
 
     protected function _isModerator ($isPerformAction = false)

modules/base/payment/classes/BxBaseModPaymentModule.php

@@ -9,7 +9,7 @@
  * @{
  */
 
-class BxBaseModPaymentModule extends BxDolModule
+class BxBaseModPaymentModule extends BxBaseModGeneralModule
 {
 	protected $_sLangsPrefix;
 
@@ -78,39 +78,6 @@ class BxBaseModPaymentModule extends BxDolModule
         ));
     }
 
-    public function getProfileId()
-    {
-    	return bx_get_logged_profile_id();
-    }
-
-	public function getProfileInfo($iUserId = 0)
-    {
-        $oProfile = $this->getObjectUser($iUserId);
-        $oAccount = $oProfile->getAccountObject();
-
-        return array(
-        	'id' => $oProfile->id(),
-            'name' => $oProfile->getDisplayName(),
-        	'email' => $oAccount->getEmail(),
-            'link' => $oProfile->getUrl(),
-            'icon' => $oProfile->getIcon(),
-            'unit' => $oProfile->getUnit(),
-        	'active' => $oProfile->isActive(),
-        );
-    }
-    
-    public function getObjectUser($iUserId = 0)
-    {
-    	bx_import('BxDolProfile');
-        $oProfile = BxDolProfile::getInstance($iUserId);
-        if (!$oProfile) {
-            bx_import('BxDolProfileUndefined');
-            $oProfile = BxDolProfileUndefined::getInstance();
-        }
-
-        return $oProfile;
-    }
-
 	public function getObjectJoin()
     {
         $sClassName = $this->_oConfig->getClassPrefix() . 'Join';