Changeset 8345 for trunk/xmlrpc

Timestamp:

01/11/09 21:37:12 (3 years ago)

Author:

Alexander Trofimov

Message:

 

Location:

trunk/xmlrpc

Files:

• BxDolXMLRPCImages.php (modified) (8 diffs)
• BxDolXMLRPCMedia.php (modified) (6 diffs)
• BxDolXMLRPCUtil.php (modified) (1 diff)

trunk/xmlrpc/BxDolXMLRPCImages.php

@@ -5 +5 @@
     function getImages($sUser, $sPwd, $sNick)
     {
-        return BxDolXMLRPCImages::getImagesInCategory($sUser, $sPwd, $sNick, PROFILE_PHOTOS_CATEGORY);
+        $sProfileCat = BxDolService::call('shared_photo', 'get_profile_cat', array(), 'Main');
+        return BxDolXMLRPCImages::getImagesInCategory($sUser, $sPwd, $sNick, $sProfileCat);
     }
 
@@ -14 +15 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "scruct"));
 
-        global $tmpl;
-        require_once(BX_DIRECTORY_PATH_ROOT . 'templates/tmpl_'.$tmpl.'/scripts/BxTemplSearchSharedPhoto.php');
-        $oMedia = new BxTemplSearchSharedPhoto();
-        return parent::_getFilesInCategory ($oMedia, $iIdProfile, $sCat);
+        return parent::_getFilesInCategory ('shared_photo', $iIdProfile, $sCat);
     }
 
@@ -25 +23 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "scruct"));
 
-        require_once( BX_DIRECTORY_PATH_CLASSES . 'BxDolSharedPhoto.php' );
-        $aMember = array ('ID' => $iId);
-        $oMedia = new BxDolSharedPhoto(); 
-
-        if ($oMedia->deleteFile($iImageId, $GLOBALS['logged']))
+        if (BxDolService::call('shared_photo', 'remove_file', array($iImageId), 'Main'))
             return new xmlrpcval ("ok");
         return new xmlrpcval ("fail");
@@ -39 +33 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "scruct"));
 
-        require_once(BX_DIRECTORY_PATH_CLASSES . 'BxDolSharedPhoto.php');
-        $aMember = array ('ID' => $iId);
-        $oMedia = new BxDolSharedPhoto(); 
-
-        if ($oMedia->setThumbnail ($iImageId))
+        if (BxDolService::call('shared_photo', 'make_thumbnail', array($iImageId), 'Main'))
             return new xmlrpcval ("ok");
         return new xmlrpcval ("fail");
@@ -54 +44 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "scruct"));
 
-        require_once(BX_DIRECTORY_PATH_CLASSES . 'BxDolSharedPhoto.php');
-        $oMedia = new BxDolSharedPhoto();         
-
-        return parent::_getMediaCategories ($oMedia->sFileTable, $oMedia->aFileFields['medID'], $oMedia->sType, $iIdProfile);
+        return BxDolXMLRPCMedia::_getMediaCategories ('photo', $iIdProfile);
     }
 
@@ -71 +58 @@
         if (!$f)
             return new xmlrpcval ("fail fopen");
-
         if (!fwrite ($f, $binImageData, $iDataLength))
         {
@@ -79 +65 @@
         fclose($f);
 
-        // add image to database
-
-        global $tmpl;
-        require_once( BX_DIRECTORY_PATH_CLASSES . 'BxDolSharedPhoto.php' );
-        require_once( BX_DIRECTORY_PATH_CLASSES . 'BxDolDefPhotoUploader.php' );
+        // upload
+        
+        $sProfileCat = BxDolService::call('shared_photo', 'get_profile_cat', array(), 'Main');
 
         $aFileInfo = array();
@@ -89 +73 @@
         $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(PROFILE_PHOTOS_CATEGORY); 
+        $aFileInfo['Categories'] = is_array($aCats) && count($aCats) ? $aCats : array($sProfileCat); 
         
         $isUpdateThumb = (int)db_value("SELECT `Picture` FROM `Profiles` WHERE `ID` = '$iId' LIMIT 1") ? false : true;
 
-        $oUploader = new BxDolDefPhotoUploader();
-        if ($oUploader->performPhotoUpload('', $aFileInfo, $isUpdateThumb, $sTmpFilename) > 0)
+        if (BxDolService::call('shared_photo', 'perform_photo_upload', array($sTmpFilename, $aFileInfo, $isUpdateThumb), 'Uploader'))
             return new xmlrpcval ("ok");
         else
-            return new xmlrpcval ("fail upload".$isUpdateThumb);
+            return new xmlrpcval ("fail upload");
     }
 }

trunk/xmlrpc/BxDolXMLRPCMedia.php

@@ -9 +9 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "scruct"));
 
-        global $tmpl;
-        require_once(BX_DIRECTORY_PATH_ROOT . 'templates/tmpl_'.$tmpl.'/scripts/BxTemplSearchSharedVideo.php');
-        $oMedia = new BxTemplSearchSharedVideo();
-        return BxDolXMLRPCMedia::_getFilesInCategory ($oMedia, $iIdProfile, $sCat);
+        return BxDolXMLRPCMedia::_getFilesInCategory ('shared_video', $iIdProfile, $sCat);
     }
 
@@ -21 +18 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "scruct"));
 
-        global $tmpl;
-        require_once(BX_DIRECTORY_PATH_ROOT . 'templates/tmpl_'.$tmpl.'/scripts/BxTemplSearchSharedMusic.php');
-        $oMedia = new BxTemplSearchSharedMusic();
-        return BxDolXMLRPCMedia::_getFilesInCategory ($oMedia, $iIdProfile, $sCat);
+        return BxDolXMLRPCMedia::_getFilesInCategory ('shared_music', $iIdProfile, $sCat);
     }
 
@@ -33 +27 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "scruct"));
 
-        require_once(BX_DIRECTORY_PATH_CLASSES . 'BxDolSharedMusic.php');
-        $oMedia = new BxDolSharedMusic();         
-
-        return BxDolXMLRPCMedia::_getMediaCategories ($oMedia->sFileTable, $oMedia->aFileFields['medID'], $oMedia->sType, $iIdProfile);
+        return BxDolXMLRPCMedia::_getMediaCategories ('music', $iIdProfile);
     }
 
@@ -45 +36 @@
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "scruct"));
 
-        require_once(BX_DIRECTORY_PATH_CLASSES . 'BxDolSharedVideo.php');
-        $oMedia = new BxDolSharedVideo();         
-
-        return BxDolXMLRPCMedia::_getMediaCategories ($oMedia->sFileTable, $oMedia->aFileFields['medID'], $oMedia->sType, $iIdProfile);
+        return BxDolXMLRPCMedia::_getMediaCategories ('video', $iIdProfile);
     }
 
-    function _getMediaCategories ($sTable, $sFieldId, $sType, $iIdProfile)
+    function _getMediaCategories ($sType, $iIdProfile)
     {
+        require_once(BX_DIRECTORY_PATH_CLASSES . 'BxDolCategories.php'); 
+        $oCategories = new BxDolCategories();
+        $oCategories->getTagObjectConfig();
+        $aCategories = $oCategories->getCategoriesList($sType, $iIdProfile, true);
+        foreach ($aCategories as $sCat)
+        {
+            $aCat = array (
+                'Id' => new xmlrpcval($sCat),
+                'Title' => new xmlrpcval($sCat),
+                'Num' =>new xmlrpcval(0),
+            );
+            $aCats[] = new xmlrpcval($aCat, 'struct');
+        }
+        return new xmlrpcval ($aCats, "array");
+
+/*        
         if (!($r = db_res ("
             SELECT `c`.`Category`, COUNT(`f`.`$sFieldId`) AS `Num`
@@ -71 +75 @@
         }
         return new xmlrpcval ($aImages, "array");
+ */        
     }   
 
-    function _getFilesInCategory (&$oMedia, $iIdProfile, $sCat)
-    {      
-        $oMedia->aCurrent['restriction']['owner']['value'] = $iIdProfile;  
-        $oMedia->aCurrent['paginate']['perPage'] = 1000;
-        $oMedia->aCurrent['join']['category'] = array(
-            'type' => 'left',
-            'table' => 'Categories',
-            'mainField' => $oMedia->aPseud['id'],
-            'onField' => 'ID',
-            'joinFields' => array('Category')
-        );
-        $oMedia->aCurrent['restriction']['category'] = array(
-            'value' => $sCat,
-            'field' => 'Category',
-            'operator' => '=',
-            'table' => 'Categories' 
-        );         
-
-        $aFiles = array();
-        $a = $oMedia->getSearchData();
+    function _getFilesInCategory ($sModuleName, $iIdProfile, $sCat)
+    {     
+        $a = BxDolService::call ($sModuleName, 'get_files_in_cat', array($iIdProfile, $sCat), 'Search');
         if (!$a)
             return new xmlrpcval (array(), "array");
-
         foreach ($a as $k => $aRow)
         {
@@ -102 +89 @@
                 'title' => new xmlrpcval($aRow['title']),
                 'desc' => new xmlrpcval($aRow['size']),
-                'icon' =>new xmlrpcval($oMedia->getImgUrl($aRow['id'], 'icon')),
-                'thumb' =>new xmlrpcval($oMedia->getImgUrl($aRow['id'], 'thumb')),
-                'file' =>new xmlrpcval($oMedia->getImgUrl($aRow['id'], 'file')),
-                'cat' =>new xmlrpcval($sCat),
+                'icon' => new xmlrpcval($aRow['icon']),
+                'thumb' => new xmlrpcval($aRow['thumb']),
+                'file' => new xmlrpcval($aRow['file']),
+                'cat' => new xmlrpcval($sCat),
+                'rate' => new xmlrpcval($aRow['gal_rating_count'] ? $aRow['gal_rating_sum']/$aRow['gal_rating_count'] : 0),
+                'rate_count' => new xmlrpcval((int)$aRow['gal_rating_count']),
             );
             $aFiles[] = new xmlrpcval($a, 'struct');
         }
-
         return new xmlrpcval ($aFiles, "array");
     }

trunk/xmlrpc/BxDolXMLRPCUtil.php

@@ -84 +84 @@
         global $oFunctions;
         $aProfileInfo = getProfileInfo( $iId );         
-        $aSizes = array ($sType . 'Width' => 0, $sType . 'Height' => 0);
-        $aImageFile = $oFunctions->_getImageShared ($aSizes, $aProfileInfo, $sType);
+        $aImageFile = BxDolService::call('shared_photo', 'get_image', array($aProfileInfo, $sType), 'Search');
         return $aImageFile['file'];
     }