Changeset 13382 for trunk/xmlrpc

Timestamp:

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

Author:

Alexander Trofimov

Message:

Ticket #543

Location:

trunk/xmlrpc

Files:

• BxDolXMLRPCImages.php (modified) (2 diffs)
• BxDolXMLRPCMedia.php (modified) (5 diffs)
• BxDolXMLRPCUtil.php (modified) (3 diffs)

trunk/xmlrpc/BxDolXMLRPCImages.php

@@ -53 +53 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
 
-        return BxDolXMLRPCMedia::_getMediaAlbums ('photo', $iIdProfile, $iIdProfile == $iId);
+        return BxDolXMLRPCMedia::_getMediaAlbums ('photo', $iIdProfile, $iId, $iIdProfile == $iId);
     }
 
@@ -97 +97 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
 
-        return BxDolXMLRPCMedia::_getFilesInAlbum ('photos', $iIdProfile, (int)$iAlbumId);
+        return BxDolXMLRPCMedia::_getFilesInAlbum ('photos', $iIdProfile, $iId, (int)$iAlbumId);
     }
 

trunk/xmlrpc/BxDolXMLRPCMedia.php

@@ -135 +135 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
 
-        return BxDolXMLRPCMedia::_getMediaAlbums ('music', $iIdProfile);
+        return BxDolXMLRPCMedia::_getMediaAlbums ('music', $iIdProfile, $iId);
     }
 
@@ -144 +144 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
 
-        return BxDolXMLRPCMedia::_getMediaAlbums ('video', $iIdProfile);
-    }
-
-    function _getMediaAlbums ($sType, $iIdProfile, $isShowEmptyAlbums = false)
+        return BxDolXMLRPCMedia::_getMediaAlbums ('video', $iIdProfile, $iId);
+    }
+
+    function _getMediaAlbums ($sType, $iIdProfile, $iIdProfileViewer, $isShowEmptyAlbums = false)
+    {        
+        $aAlbums = BxDolXMLRPCMedia::_getMediaAlbumsArray ($sType, $iIdProfile, $iIdProfileViewer, $isShowEmptyAlbums);
+
+        $aXmlRpc = array ();
+
+        foreach ($aAlbums as $r)
+        {
+            $a = array (
+                'Id' => new xmlrpcval($r['Id']),
+                'Title' => new xmlrpcval($r['Title']),
+                'Num' =>new xmlrpcval($r['Num']),
+            );
+            $aXmlRpc[] = new xmlrpcval($a, 'struct');
+        }
+
+        return new xmlrpcval ($aXmlRpc, "array");
+    }    
+
+    function _getMediaCount ($sType, $iIdProfile, $iIdProfileViewer) {
+        $a = BxDolXMLRPCMedia::_getMediaAlbumsArray ($sType, $iIdProfile, $iIdProfileViewer);
+        $iNum = 0;
+        foreach ($a as $r) 
+            $iNum += $r['Num'];
+        return $iNum;
+    }
+
+    function _getMediaAlbumsArray ($sType, $iIdProfile, $iIdProfileViewer, $isShowEmptyAlbums = false)
     {        
         switch ($sType) {
             case 'photo':
+                $sModuleName = 'photos';
                 $sType = 'bx_photos';
                 break;
             case 'video':
+                $sModuleName = 'videos';
                 $sType = 'bx_videos';
                 break;
             case 'music':
+                $sModuleName = 'sounds';
                 $sType = 'bx_sounds';
                 break;          
             default:
-                return new xmlrpcval (array(), "array");
+                return array();
         }
         bx_import('BxDolAlbums');
         $o = new BxDolAlbums ($sType, (int)$iIdProfile);
         $aList = $o->getAlbumList (array('owner' => (int)$iIdProfile, 'show_empty' => $isShowEmptyAlbums));
-        $aXmlRpc = array ();
+        $aRet = array ();
         foreach ($aList as $r)
         {
-            $a = array (
-                'Id' => new xmlrpcval($r['ID']),
-                'Title' => new xmlrpcval($r['Caption']),
-                'Num' =>new xmlrpcval($r['ObjCount']),
-            );
-            $aXmlRpc[] = new xmlrpcval($a, 'struct');
-        }
-        return new xmlrpcval ($aXmlRpc, "array");
-    }    
+            if ($iIdProfile != $iIdProfileViewer && !BxDolService::call ($sModuleName, 'get_album_privacy', array((int)$r['ID'], $iIdProfileViewer), 'Search'))
+                continue;
+            
+            $aRet[] = array (
+                'Id' => $r['ID'],
+                'Title' => $r['Caption'],
+                'Num' => $r['ObjCount'],
+            );
+        }
+        return $aRet;
+    }
 
     // ----------------- file list in albums 
@@ -186 +218 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
 
-        return BxDolXMLRPCMedia::_getFilesInAlbum ('videos', $iIdProfile, $iAlbumId, 'video', 'getToken', 'flash/modules/video/files/get_mobile.php?id=');
+        return BxDolXMLRPCMedia::_getFilesInAlbum ('videos', $iIdProfile, $iId, $iAlbumId, 'video', 'getToken', 'flash/modules/video/files/get_mobile.php?id=');
     }
 
@@ -195 +227 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
 
-        return BxDolXMLRPCMedia::_getFilesInAlbum ('sounds', $iIdProfile, $iAlbumId, 'mp3', 'getMp3Token', 'flash/modules/mp3/files/get_file.php?id=');
-    }
-
-    function _getFilesInAlbum ($sModuleName, $iIdProfile, $iAlbumId, $sWidget = '', $sFuncToken = '', $sTokenUrl = '')
+        return BxDolXMLRPCMedia::_getFilesInAlbum ('sounds', $iIdProfile, $iId, $iAlbumId, 'mp3', 'getMp3Token', 'flash/modules/mp3/files/get_file.php?id=');
+    }
+
+    function _getFilesInAlbum ($sModuleName, $iIdProfile, $iIdProfileViewer, $iAlbumId, $sWidget = '', $sFuncToken = '', $sTokenUrl = '')
     {     
         if ($sWidget && preg_match('/^[a-zA-Z0-9_]+$/', $sWidget)) {
@@ -207 +239 @@
         }
 
-        $a = BxDolService::call ($sModuleName, 'get_files_in_album', array((int)$iAlbumId), 'Search');
+        $a = BxDolService::call ($sModuleName, 'get_files_in_album', array((int)$iAlbumId, $iIdProfileViewer != $iIdProfile, $iIdProfileViewer), 'Search');
         if (!$a)
             return new xmlrpcval (array(), "array");

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),