Changeset 13382 for trunk/xmlrpc/BxDolXMLRPCUtil.php

Timestamp:

12/07/09 21:07:35 (2 years ago)

Author:

Alexander Trofimov

Message:

Ticket #543

File:

• trunk/xmlrpc/BxDolXMLRPCUtil.php (modified) (3 diffs)

trunk/xmlrpc/BxDolXMLRPCUtil.php

@@ -86 +86 @@
     }
 
-    function getUserInfo($iId)
+    function getUserInfo($iId, $iIdViewer = 0)
     {
+        if (!$iIdViewer)
+            $iIdViewer = $_COOKIE['memberID'];
+
         $aRet = array ();
         $aSexSql = getProfileInfo((int)$iId); 
@@ -99 +102 @@
         $aRet['countFriends'] = new xmlrpcval(getFriendNumber($iId));
 
-        bx_import('BxDolAlbums');
-
-        $o = new BxDolAlbums ('bx_photos', $iId);
-        $aRet['countPhotos'] = new xmlrpcval($o->getObjTotalCount (array('owner' => $iId)));
-
-        $o = new BxDolAlbums ('bx_videos', $iId);
-        $aRet['countVideos'] = new xmlrpcval($o->getObjTotalCount (array('owner' => $iId)));
-
-        $o = new BxDolAlbums ('bx_sounds', $iId);
-        $aRet['countSounds'] = new xmlrpcval($o->getObjTotalCount (array('owner' => $iId)));
+        $aRet['countPhotos'] = new xmlrpcval(BxDolXMLRPCMedia::_getMediaCount('photo', $iId, $iIdViewer));
+        $aRet['countVideos'] = new xmlrpcval(BxDolXMLRPCMedia::_getMediaCount('video', $iId, $iIdViewer));
+        $aRet['countSounds'] = new xmlrpcval(BxDolXMLRPCMedia::_getMediaCount('music', $iId, $iIdViewer));
 
         return $aRet;
     }
 
-    function fillProfileArray ($a, $sImage = 'icon')
+    function fillProfileArray ($a, $sImage = 'icon', $iIdViewer = 0)
     {
+        if (!$iIdViewer)
+            $iIdViewer = $_COOKIE['memberID'];
+
         $sImageKey = ucfirst ($sImage);
         $sImage = BxDolXMLRPCUtil::getThumbLink($a['ID'], $sImage);
 
         bx_import('BxDolAlbums');
-
-        $oPhotos = new BxDolAlbums ('bx_photos', $iId);
-        $oVideos = new BxDolAlbums ('bx_videos', $iId);
-        $oSounds = new BxDolAlbums ('bx_sounds', $iId);
 
         return array (
@@ -132 +127 @@
                'Country' => new xmlrpcval(_t($GLOBALS['aPreValues']['Country'][$a['Country']]['LKey'])),
                'City' => new xmlrpcval($a['City']),
-               'CountPhotos' => new xmlrpcval($oPhotos->getObjTotalCount (array('owner' => $a['ID']))),
-               'CountVideos' => new xmlrpcval($oVideos->getObjTotalCount (array('owner' => $a['ID']))),
-               'CountSounds' => new xmlrpcval($oSounds->getObjTotalCount (array('owner' => $a['ID']))),
+               'CountPhotos' => new xmlrpcval(BxDolXMLRPCMedia::_getMediaCount('photo', $iId, $iIdViewer)),
+               'CountVideos' => new xmlrpcval(BxDolXMLRPCMedia::_getMediaCount('video', $iId, $iIdViewer)),
+               'CountSounds' => new xmlrpcval(BxDolXMLRPCMedia::_getMediaCount('music', $iId, $iIdViewer)),
                'CountFriends' => new xmlrpcval(getFriendNumber($a['ID'])),
                $sImageKey => new xmlrpcval($sImage),