Changeset 13378 for trunk/xmlrpc

Timestamp:

12/07/09 18:08:12 (2 years ago)

Author:

Alexander Trofimov

Message:

Ticket #543

Location:

trunk/xmlrpc

Files:

• BxDolXMLRPCImages.php (modified) (1 diff)
• BxDolXMLRPCMedia.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);
+        return BxDolXMLRPCMedia::_getMediaAlbums ('photo', $iIdProfile, $iIdProfile == $iId);
     }
 

trunk/xmlrpc/BxDolXMLRPCMedia.php

@@ -147 +147 @@
     }
 
-    function _getMediaAlbums ($sType, $iIdProfile) 
+    function _getMediaAlbums ($sType, $iIdProfile, $isShowEmptyAlbums = false)
     {        
         switch ($sType) {
@@ -164 +164 @@
         bx_import('BxDolAlbums');
         $o = new BxDolAlbums ($sType, (int)$iIdProfile);
-        $aList = $o->getAlbumList (array('owner' => (int)$iIdProfile));
+        $aList = $o->getAlbumList (array('owner' => (int)$iIdProfile, 'show_empty' => $isShowEmptyAlbums));
         $aXmlRpc = array ();
         foreach ($aList as $r)
@@ -212 +212 @@
         foreach ($a as $k => $aRow)
         {
-            $sToken = '';
-            if ($sFuncToken)
-                $sToken = $sFuncToken($aRow['id']);
+            if ('youtube' == $aRow['Source'])
+            {
+                $sUrl = $aRow['Video'];
+            }       
+            else
+            {
+                $sToken = '';
+                if ($sFuncToken)
+                    $sToken = $sFuncToken($aRow['id']);
           
-            $sUrl = $sTokenUrl && $sToken ? BX_DOL_URL_ROOT . $sTokenUrl . $aRow['id'] . '&token=' . $sToken : $aRow['file'];
+                $sUrl = $sTokenUrl && $sToken ? BX_DOL_URL_ROOT . $sTokenUrl . $aRow['id'] . '&token=' . $sToken : $aRow['file'];
+            }
 
             $a = array (