Changeset 11678 for trunk/xmlrpc

Timestamp:

07/22/09 23:57:13 (3 years ago)

Author:

Alexander Trofimov

Message:

 

File:

• trunk/xmlrpc/BxDolXMLRPCImages.php (modified) (6 diffs)

trunk/xmlrpc/BxDolXMLRPCImages.php

@@ -15 +15 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
 
-        return parent::_getFilesInCategory ('shared_photo', $iIdProfile, $sCat);
+        return parent::_getFilesInCategory ('photos', $iIdProfile, $sCat);
     }
 
@@ -23 +23 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
 
-        if (BxDolService::call('bx_photos', 'remove_file', array($iImageId)))
+        if (BxDolService::call('photos', 'remove_object', array($iImageId)))
             return new xmlrpcval ("ok");
         return new xmlrpcval ("fail");
@@ -32 +32 @@
         if (!($iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd)))
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
-/*
-        if (BxDolService::call('shared_photo', 'make_thumbnail', array($iImageId), 'Main'))
-            return new xmlrpcval ("ok");*/
+
+        if (BxDolService::call('avatar', 'make_avatar_from_shared_photo_auto', array($iImageId)))
+            return new xmlrpcval ("ok");
         return new xmlrpcval ("fail");
     }
@@ -56 +56 @@
     }
 
-    function uploadImage ($sUser, $sPwd, $aCats, $binImageData, $iDataLength, $sTitle, $sTags, $sDesc)
+    function uploadImage ($sUser, $sPwd, $mixedAlbum, $binImageData, $iDataLength, $sTitle, $sTags, $sDesc)
     {
         if (!($iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd)))
@@ -76 +76 @@
         // upload
         
-        $sProfileCat = BxDolService::call('bx_photos', 'get_profile_cat', array());
+        $aAlbum = array ();
+        if (is_array($mixedAlbum) && count($mixedAlbum) && $mixedAlbum[0])
+            $aAlbum = $mixedAlbum;
+        elseif (is_string($mixedAlbum) && $mixedAlbum)
+            $aAlbum = array ($mixedAlbum);
+        else
+            $aAlbum = 'TODO: use getAlbumDefaultName'; 
 
         $aFileInfo = array();
@@ -82 +88 @@
         $aFileInfo['medDesc'] = process_db_input(htmlspecialchars_adv($sDesc));
         $aFileInfo['medTags'] = process_db_input(htmlspecialchars_adv($sTags));
-        $aFileInfo['Categories'] = is_array($aCats) && count($aCats) ? $aCats : array($sProfileCat); 
+        $aFileInfo['Categories'] = array ();
+        $aFileInfo['album'] = is_array($mixedAlbum) && count($mixedAlbum) ? $mixedAlbum : array($mixedAlbum); 
         
         $isUpdateThumb = (int)db_value("SELECT `Avatar` FROM `Profiles` WHERE `ID` = '$iId' LIMIT 1") ? false : true;
 
         //Todo .. I can`t perform updating of omages by avatars. possible later
-        if (BxDolService::call('bx_photos', 'perform_photo_upload', array($sTmpFilename, $aFileInfo, $isUpdateThumb), 'Uploader'))
+        if (BxDolService::call('photos', 'perform_photo_upload', array($sTmpFilename, $aFileInfo, $isUpdateThumb), 'Uploader'))
             return new xmlrpcval ("ok");
         else