Changeset 13353 for trunk/xmlrpc

Timestamp:

12/03/09 00:23:07 (2 years ago)

Author:

Alexander Trofimov

Message:

Ticket #543

Location:

trunk/xmlrpc

Files:

• BxDolXMLRPCImages.php (modified) (3 diffs)
• BxDolXMLRPCSearch.php (modified) (1 diff)
• BxDolXMLRPCUtil.php (modified) (1 diff)
• index.php (modified) (1 diff)

trunk/xmlrpc/BxDolXMLRPCImages.php

@@ -56 +56 @@
     }
 
-    function uploadImage ($sUser, $sPwd, $mixedAlbum, $binImageData, $iDataLength, $sTitle, $sTags, $sDesc)
+    function uploadImage ($sUser, $sPwd, $sAlbum, $binImageData, $iDataLength, $sTitle, $sTags, $sDesc)
     {
         if (!($iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd)))
@@ -74 +74 @@
         fclose($f);
 
-        // upload
-        
-        $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'; 
+        // upload 
 
         $aFileInfo = array();
@@ -88 +80 @@
         $aFileInfo['medDesc'] = process_db_input($sDesc, BX_TAGS_VALIDATE, BX_SLASHES_NO_ACTION);
         $aFileInfo['medTags'] = process_db_input($sTags, BX_TAGS_STRIP, BX_SLASHES_NO_ACTION);
-        $aFileInfo['Categories'] = array ();
-        $aFileInfo['album'] = is_array($mixedAlbum) && count($mixedAlbum) ? $mixedAlbum : array($mixedAlbum); 
-        foreach ($aFileInfo['album'] as $k => $v)
-            $aFileInfo['album'][$k] = process_db_input($v, BX_TAGS_STRIP, BX_SLASHES_NO_ACTION);
+        $aFileInfo['Categories'] = array (process_db_input($sAlbum, BX_TAGS_STRIP, BX_SLASHES_NO_ACTION));
+        $aFileInfo['album'] = process_db_input($sAlbum, BX_TAGS_STRIP, BX_SLASHES_NO_ACTION);
         
         $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('photos', 'perform_photo_upload', array($sTmpFilename, $aFileInfo, $isUpdateThumb), 'Uploader'))
             return new xmlrpcval ("ok");

trunk/xmlrpc/BxDolXMLRPCSearch.php

@@ -60 +60 @@
         {
             $sDistance = ", (POW($sLat-`loc`.`lat`, 2)+POW($sLng-`loc`.`lng`, 2)) AS `distance`";
-            $sJoin .= " INNER JOIN `bx_map_profiles` AS `loc` ON  (`loc`.`id` = `ID` AND `loc`.`failed` = 0) ";
+            $sJoin .= " INNER JOIN `bx_map_profiles` AS `loc` ON  (`loc`.`id` = `Profiles`.`ID` AND `loc`.`failed` = 0) ";
         }
         if ($isWithPhotosOnly)

trunk/xmlrpc/BxDolXMLRPCUtil.php

@@ -148 +148 @@
     function checkLogin ($sUser, $sPwd)
     {
-        //sleep(1);
+        sleep(1);
         $iId = (int)BxDolXMLRPCUtil::getIdByNickname ($sUser);
+        $aProfile = getProfileInfo((int)$iId);
+        if (!$aProfile) 
+            return 0;
         $_COOKIE["memberID" ] = $iId;
-        $_COOKIE["memberPassword"] = process_db_input($sPwd, BX_TAGS_NO_ACTION, BX_SLASHES_NO_ACTION);
+        $_COOKIE["memberPassword"] = sha1($sPwd . $aProfile['Salt']);       
         return ($GLOBALS['logged']['member'] = member_auth(0, false)) ? $iId : 0;
     }

trunk/xmlrpc/index.php

@@ -198 +198 @@
             "dolphin.uploadImage" => array(
                 "function" => "BxDolXMLRPCImages::uploadImage",
-                "signature" => array (array ($xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcArray, $xmlrpcBase64, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)),
+                "signature" => array (array ($xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcBase64, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)),
                 "docstring" => "upload new image",
             ),