Changeset 11465 for trunk/xmlrpc

Timestamp:

07/17/09 06:28:35 (3 years ago)

Author:

Alexander Trofimov

Message:

albums for media

Location:

trunk/xmlrpc

Files:

• BxDolXMLRPCImages.php (modified) (1 diff)
• BxDolXMLRPCMedia.php (modified) (9 diffs)
• BxDolXMLRPCUtil.php (modified) (4 diffs)
• index.php (modified) (1 diff)

trunk/xmlrpc/BxDolXMLRPCImages.php

@@ -92 +92 @@
             return new xmlrpcval ("fail upload");
     }
+
+    function getImagesInAlbum($sUser, $sPwd, $sNick, $iAlbumId)
+    {
+        $iIdProfile = BxDolXMLRPCUtil::getIdByNickname ($sNick);
+        if (!$iIdProfile || !($iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd)))
+            return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
+
+        return BxDolXMLRPCMedia::_getFilesInAlbum ('photos', $iIdProfile, $iAlbumId);
+    }
+
 }
 

trunk/xmlrpc/BxDolXMLRPCMedia.php

@@ -11 +11 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
 
-        return BxDolXMLRPCMedia::_getFilesInCategory ('videos', $iIdProfile, $sCat);
+        return BxDolXMLRPCMedia::_getFilesInCategory ('videos', $iIdProfile, $sCat, 'video', 'getToken', 'flash/modules/video/files/get_mobile.php?id=');
     }
 
@@ -20 +20 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
 
-        return BxDolXMLRPCMedia::_getFilesInCategory ('sounds', $iIdProfile, $sCat);
-    }
-
-    function _getFilesInCategory ($sModuleName, $iIdProfile, $sCat)
+        return BxDolXMLRPCMedia::_getFilesInCategory ('sounds', $iIdProfile, $sCat, 'mp3', 'getMp3Token', 'flash/modules/mp3/files/get_file.php?id=');
+    }
+
+    function _getFilesInCategory ($sModuleName, $iIdProfile, $sCat, $sWidget = '', $sFuncToken = '', $sTokenUrl = '')
     {     
+        if ($sWidget) {
+            $GLOBALS['sModule'] = $sWidget;
+            require_once (BX_DIRECTORY_PATH_ROOT . "flash/modules/{$sWidget}/inc/header.inc.php");
+        }
+        
         $a = BxDolService::call ($sModuleName, 'get_files_in_cat', array($iIdProfile, $sCat), 'Search');
         if (!$a)
@@ -30 +35 @@
         foreach ($a as $k => $aRow)
         {
+            $sToken = '';
+            if ($sFuncToken)
+                $sToken = $sFuncToken($aRow['id']);
+
+            $sUrl = $sTokenUrl && $sToken ? BX_DOL_URL_ROOT . $sTokenUrl . $aRow['id'] . '&token=' . $sToken : $aRow['file'];
+
             $a = array (
                 'id' => new xmlrpcval($aRow['id']),
@@ -36 +47 @@
                 'icon' => new xmlrpcval($aRow['icon']),
                 'thumb' => new xmlrpcval($aRow['thumb']),
-                'file' => new xmlrpcval($aRow['file']),
+                'file' => new xmlrpcval($sUrl),
                 'cat' => new xmlrpcval($sCat),
                 'rate' => new xmlrpcval($aRow['voting_rate']),
@@ -150 +161 @@
         $aList = $o->getAlbumList (array('owner' => $iIdProfile));
         $aXmlRpc = array ();
-        while ($aList = mysql_fetch_array ($r))
+        foreach ($aList as $r)
         {
             $a = array (
-                'Id' => new xmlrpcval($a['ID']),
-                'Title' => new xmlrpcval($a['Caption']),
-                'Num' =>new xmlrpcval($a['ObjCount']),
-            );
-            $aXmlRpc[] = new xmlrpcval($aFile, 'struct');
+                '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");
@@ -170 +181 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
 
-        return BxDolXMLRPCMedia::_getFilesInAlbum ('videos', $iIdProfile, $iAlbumId);
+        return BxDolXMLRPCMedia::_getFilesInAlbum ('videos', $iIdProfile, $iAlbumId, 'video', 'getToken', 'flash/modules/video/files/get_mobile.php?id=');
     }
 
@@ -179 +190 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
 
-        return BxDolXMLRPCMedia::_getFilesInAlbum ('sounds', $iIdProfile, $iAlbumId);
-    }
-
-    function _getFilesInAlbum ($sModuleName, $iIdProfile, $iAlbumId)
+        return BxDolXMLRPCMedia::_getFilesInAlbum ('sounds', $iIdProfile, $iAlbumId, 'mp3', 'getMp3Token', 'flash/modules/mp3/files/get_file.php?id=');
+    }
+
+    function _getFilesInAlbum ($sModuleName, $iIdProfile, $iAlbumId, $sWidget = '', $sFuncToken = '', $sTokenUrl = '')
     {     
+        if ($sWidget) {
+            require_once (BX_DIRECTORY_PATH_ROOT . "flash/modules/global/inc/db.inc.php");
+            require_once (BX_DIRECTORY_PATH_ROOT . "flash/modules/{$sWidget}/inc/header.inc.php");
+            require_once (BX_DIRECTORY_PATH_ROOT . "flash/modules/{$sWidget}/inc/constants.inc.php");
+            require_once (BX_DIRECTORY_PATH_ROOT . "flash/modules/{$sWidget}/inc/functions.inc.php");
+        }
+
         $a = BxDolService::call ($sModuleName, 'get_files_in_album', array($iAlbumId), 'Search');
         if (!$a)
@@ -189 +207 @@
         foreach ($a as $k => $aRow)
         {
+            $sToken = '';
+            if ($sFuncToken)
+                $sToken = $sFuncToken($aRow['id']);
+          
+            $sUrl = $sTokenUrl && $sToken ? BX_DOL_URL_ROOT . $sTokenUrl . $aRow['id'] . '&token=' . $sToken : $aRow['file'];
+
             $a = array (
                 'id' => new xmlrpcval($aRow['id']),
@@ -195 +219 @@
                 'icon' => new xmlrpcval($aRow['icon']),
                 'thumb' => new xmlrpcval($aRow['thumb']),
-                'file' => new xmlrpcval($aRow['file']),
+                'file' => new xmlrpcval($sUrl),
                 'cat' => new xmlrpcval($sCat),
-                'rate' => new xmlrpcval($aRow['voting_rate']),
-                'rate_count' => new xmlrpcval((int)$aRow['voting_count']),
+                'rate' => new xmlrpcval($aRow['Rate']),
+                'rate_count' => new xmlrpcval((int)$aRow['RateCount']),
             );
             $aFiles[] = new xmlrpcval($a, 'struct');

trunk/xmlrpc/BxDolXMLRPCUtil.php

@@ -82 +82 @@
     function getThumbLink ($iId, $sType = 'thumb')
     {
-        global $oFunctions;
-        $aProfileInfo = getProfileInfo( $iId );         
-        $aImageFile = BxDolService::call('bx_photos', 'get_image', array($aProfileInfo, $sType), 'Search');
-        return $aImageFile ? $aImageFile['file'] : false;
+        $sType = $sType == 'thumb' ? 'medium' : 'small';
+        return $GLOBALS['oFunctions']->getMemberAvatar ($iId, $sType);
     }
 
@@ -98 +96 @@
         $aRet['country'] = new xmlrpcval($aSexSql['Country']);
         $aRet['city'] = new xmlrpcval($aSexSql['City']);
+        $aRet['countFriends'] = new xmlrpcval(getFriendNumber($iId));
 
         bx_import('BxDolAlbums');
 
         $o = new BxDolAlbums ('bx_photos', $iId);
-        $aRet['countPhotos'] = new xmlrpcval($o->getAlbumList (array('owner' => $iId, 'status' => '')));
+        $aRet['countPhotos'] = new xmlrpcval($o->getObjTotalCount (array('owner' => $iId)));
 
         $o = new BxDolAlbums ('bx_videos', $iId);
-        $aRet['countVideos'] = new xmlrpcval($o->getAlbumList (array('owner' => $iId, 'status' => '')));
+        $aRet['countVideos'] = new xmlrpcval($o->getObjTotalCount (array('owner' => $iId)));
 
         $o = new BxDolAlbums ('bx_sounds', $iId);
-        $aRet['countSounds'] = new xmlrpcval($o->getAlbumList (array('owner' => $iId, 'status' => '')));
+        $aRet['countSounds'] = new xmlrpcval($o->getObjTotalCount (array('owner' => $iId)));
 
         return $aRet;
@@ -116 +115 @@
     {
         $sImageKey = ucfirst ($sImage);
-        $sImage = BxDolXMLRPCUtil::getThumbLink($a['ID'], $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 (
                'ID' => new xmlrpcval($a['ID']),
@@ -125 +131 @@
                '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']))),
+               'CountFriends' => new xmlrpcval(getFriendNumber($a['ID'])),
                $sImageKey => new xmlrpcval($sImage),
             );

trunk/xmlrpc/index.php

@@ -211 +211 @@
                 "docstring" => "get profile's video albums",
             ),
+            "dolphin.getImagesInAlbum" => array(
+                "function" => "BxDolXMLRPCImages::getImagesInAlbum",
+                "signature" => array (array ($xmlrpcArray, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)),
+                "docstring" => "get profile's images in specified album",
+            ),            
+            "dolphin.getVideoInAlbum" => array(
+                "function" => "BxDolXMLRPCMedia::getVideoInAlbum",
+                "signature" => array (array ($xmlrpcArray, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)),
+                "docstring" => "get profile's video in specified album",
+            ),            
+            "dolphin.getAudioInAlbum" => array(
+                "function" => "BxDolXMLRPCMedia::getAudioInAlbum",
+                "signature" => array (array ($xmlrpcArray, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)),
+                "docstring" => "get profile's sounds in specified album",
+            ),            
         ),
         0