HomeHelpTrac

Changeset 12990 for trunk/xmlrpc


Ignore:
Timestamp:
10/20/09 19:42:05 (3 years ago)
Author:
Alexander Trofimov
Message:

Ticket #1340

Location:
trunk/xmlrpc
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/xmlrpc/BxDolXMLRPCImages.php

    r11678 r12990  
    2323            return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); 
    2424 
    25         if (BxDolService::call('photos', 'remove_object', array($iImageId))) 
     25        if (BxDolService::call('photos', 'remove_object', array((int)$iImageId))) 
    2626            return new xmlrpcval ("ok"); 
    2727        return new xmlrpcval ("fail"); 
     
    3333            return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); 
    3434 
    35         if (BxDolService::call('avatar', 'make_avatar_from_shared_photo_auto', array($iImageId))) 
     35        if (BxDolService::call('avatar', 'make_avatar_from_shared_photo_auto', array((int)$iImageId))) 
    3636            return new xmlrpcval ("ok"); 
    3737        return new xmlrpcval ("fail"); 
     
    6767        if (!$f) 
    6868            return new xmlrpcval ("fail fopen"); 
    69         if (!fwrite ($f, $binImageData, $iDataLength)) 
     69        if (!fwrite ($f, $binImageData, (int)$iDataLength)) 
    7070        { 
    7171            fclose($f); 
     
    8585 
    8686        $aFileInfo = array(); 
    87         $aFileInfo['medTitle'] = htmlspecialchars_adv($sTitle); 
    88         $aFileInfo['medDesc'] = process_db_input(htmlspecialchars_adv($sDesc)); 
    89         $aFileInfo['medTags'] = process_db_input(htmlspecialchars_adv($sTags)); 
     87        $aFileInfo['medTitle'] = process_db_input($sTitle, BX_TAGS_STRIP, BX_SLASHES_NO_ACTION); 
     88        $aFileInfo['medDesc'] = process_db_input($sDesc, BX_TAGS_VALIDATE, BX_SLASHES_NO_ACTION); 
     89        $aFileInfo['medTags'] = process_db_input($sTags, BX_TAGS_STRIP, BX_SLASHES_NO_ACTION); 
    9090        $aFileInfo['Categories'] = array (); 
    9191        $aFileInfo['album'] = is_array($mixedAlbum) && count($mixedAlbum) ? $mixedAlbum : array($mixedAlbum);  
     92        foreach ($aFileInfo['album'] as $k => $v) 
     93            $aFileInfo['album'][$k] = process_db_input($v, BX_TAGS_STRIP, BX_SLASHES_NO_ACTION); 
    9294         
    9395        $isUpdateThumb = (int)db_value("SELECT `Avatar` FROM `Profiles` WHERE `ID` = '$iId' LIMIT 1") ? false : true; 
     
    106108            return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); 
    107109 
    108         return BxDolXMLRPCMedia::_getFilesInAlbum ('photos', $iIdProfile, $iAlbumId); 
     110        return BxDolXMLRPCMedia::_getFilesInAlbum ('photos', $iIdProfile, (int)$iAlbumId); 
    109111    } 
    110112 
  • trunk/xmlrpc/BxDolXMLRPCMedia.php

    r11465 r12990  
    99        $iIdProfile = BxDolXMLRPCUtil::getIdByNickname ($sNick); 
    1010        if (!$iIdProfile || !($iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd))) 
    11             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); 
     11            return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));         
    1212 
    1313        return BxDolXMLRPCMedia::_getFilesInCategory ('videos', $iIdProfile, $sCat, 'video', 'getToken', 'flash/modules/video/files/get_mobile.php?id='); 
     
    2424 
    2525    function _getFilesInCategory ($sModuleName, $iIdProfile, $sCat, $sWidget = '', $sFuncToken = '', $sTokenUrl = '') 
    26     {      
    27         if ($sWidget) { 
     26    {    
     27        if ($sWidget && preg_match('/[a-zA-Z0-9]+/', $sWidget)) { 
    2828            $GLOBALS['sModule'] = $sWidget; 
    2929            require_once (BX_DIRECTORY_PATH_ROOT . "flash/modules/{$sWidget}/inc/header.inc.php"); 
    30         } 
    31          
    32         $a = BxDolService::call ($sModuleName, 'get_files_in_cat', array($iIdProfile, $sCat), 'Search'); 
     30        } else { 
     31            $sWidget = ''; 
     32        } 
     33 
     34        $sCat = process_db_input($sCat, BX_TAGS_NO_ACTION, BX_SLASHES_NO_ACTION); 
     35 
     36        $a = BxDolService::call ($sModuleName, 'get_files_in_cat', array((int)$iIdProfile, $sCat), 'Search'); 
    3337        if (!$a) 
    3438            return new xmlrpcval (array(), "array"); 
     
    7983    function _getMediaCategories ($sType, $iIdProfile) 
    8084    { 
     85        $iIdProfile = (int)$iIdProfile; 
    8186        switch ($sType) { 
    8287            case 'photo': 
     
    158163        } 
    159164        bx_import('BxDolAlbums'); 
    160         $o = new BxDolAlbums ($sType, $iIdProfile); 
    161         $aList = $o->getAlbumList (array('owner' => $iIdProfile)); 
     165        $o = new BxDolAlbums ($sType, (int)$iIdProfile); 
     166        $aList = $o->getAlbumList (array('owner' => (int)$iIdProfile)); 
    162167        $aXmlRpc = array (); 
    163168        foreach ($aList as $r) 
     
    195200    function _getFilesInAlbum ($sModuleName, $iIdProfile, $iAlbumId, $sWidget = '', $sFuncToken = '', $sTokenUrl = '') 
    196201    {      
    197         if ($sWidget) { 
     202        if ($sWidget && preg_match('/[a-zA-Z0-9]+/', $sWidget)) { 
    198203            require_once (BX_DIRECTORY_PATH_ROOT . "flash/modules/global/inc/db.inc.php"); 
    199204            require_once (BX_DIRECTORY_PATH_ROOT . "flash/modules/{$sWidget}/inc/header.inc.php"); 
     
    202207        } 
    203208 
    204         $a = BxDolService::call ($sModuleName, 'get_files_in_album', array($iAlbumId), 'Search'); 
     209        $a = BxDolService::call ($sModuleName, 'get_files_in_album', array((int)$iAlbumId), 'Search'); 
    205210        if (!$a) 
    206211            return new xmlrpcval (array(), "array"); 
     
    227232        } 
    228233        return new xmlrpcval ($aFiles, "array"); 
    229     }     
     234    } 
    230235} 
    231236 
  • trunk/xmlrpc/BxDolXMLRPCMessages.php

    r9985 r12990  
    3232        require_once( BX_DIRECTORY_PATH_ROOT . 'templates/tmpl_' . $GLOBALS['tmpl'] . '/scripts/BxTemplMailBox.php');  
    3333 
     34        $sRecipient = process_db_input ($sRecipient, BX_TAGS_NO_ACTION, BX_SLASHES_NO_ACTION); 
    3435        $aRecipient = db_arr("SELECT * FROM `Profiles` WHERE `NickName` = '$sRecipient'"); 
    3536        if (!$aRecipient) 
     
    4445            'send_copy_to_me' => 'me' == $sSendTo || 'both' == $sSendTo ? true : false, 
    4546        ); 
    46         $oMailBox->sendMessage(strip_tags($sSubj), nl2br(strip_tags($sText)), $aRecipient['ID'], $aComposeSettings); 
     47        $oMailBox->sendMessage(process_db_input ($sSubj, BX_TAGS_STRIP, BX_SLASHES_NO_ACTION), nl2br(process_db_input ($sText, BX_TAGS_STRIP, BX_SLASHES_NO_ACTION)), $aRecipient['ID'], $aComposeSettings); 
    4748        return new xmlrpcval ($oMailBox->iSendMessageStatusCode); 
    4849    } 
     
    5556 
    5657        $aMsgs = array (); 
     58        $iMsgId = (int)$iMsgId; 
    5759        $sJoinOn = $isInbox ? " `m`.`Sender` = `p`.`ID` " : " `m`.`Recipient` = `p`.`ID` "; 
    5860        $aRow = db_arr ("SELECT  
  • trunk/xmlrpc/BxDolXMLRPCProfileView.php

    r9985 r12990  
    77    function BxDolXMLRPCProfileView($iProfileId) 
    88    {         
    9         BxBaseProfileGenerator::BxBaseProfileGenerator ($iProfileId); 
     9        BxBaseProfileGenerator::BxBaseProfileGenerator ((int)$iProfileId); 
    1010    } 
    1111 
  • trunk/xmlrpc/BxDolXMLRPCSearch.php

    r12465 r12990  
    1010        BxDolXMLRPCUtil::setLanguage ($sLang);  
    1111 
     12        $sCountryCode = process_db_input ($sCountryCode, BX_TAGS_NO_ACTION, BX_SLASHES_NO_ACTION); 
     13        $sCity = process_db_input ($sCity, BX_TAGS_NO_ACTION, BX_SLASHES_NO_ACTION); 
     14 
    1215        $sWhere = ''; 
    1316        if ($sCountryCode) 
     
    1922        if ($isOnlineOnly)  
    2023        { 
    21             $iOnlineTime = getParam( 'member_online_time' ); 
     24            $iOnlineTime = (int)getParam( 'member_online_time' ); 
    2225            $sWhere .= " AND `DateLastNav` >= DATE_SUB(NOW(), INTERVAL $iOnlineTime MINUTE)"; 
    2326        } 
     
    4750 
    4851        BxDolXMLRPCUtil::setLanguage ($sLang);  
     52 
     53        $sLat = (float)$sLat; 
     54        $sLng = (float)$sLng; 
    4955 
    5056        $sWhere = ''; 
     
    9096        BxDolXMLRPCUtil::setLanguage ($sLang);  
    9197 
     98        $sKeyword = process_db_input ($sKeyword, BX_TAGS_NO_ACTION, BX_SLASHES_NO_ACTION); 
     99 
    92100        $sMatch = ''; 
    93101        if ($sKeyword && strlen($sKeyword) > 2) 
  • trunk/xmlrpc/BxDolXMLRPCUser.php

    r12465 r12990  
    1111    function updateUserLocation ($sUser, $sPwd, $sLat, $sLng, $sZoom, $sMapType)  
    1212    { 
    13         if (!($iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd))) 
     13        if (!($iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd)) || !preg_match('/[A-Za-z0-9]+/', $sMapType)) 
    1414            return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); 
    1515 
    16         $iRet = BxDolService::call('map_profiles', 'update_profile_location_manually', array ($iId, $sLat, $sLng, $sZoom, $sMapType, '', '')) ? '1' : '0'; 
     16        $iRet = BxDolService::call('map_profiles', 'update_profile_location_manually', array ($iId, (float)$sLat, (float)$sLng, (int)$sZoom, $sMapType, '', '')) ? '1' : '0'; 
    1717 
    1818        return new xmlrpcresp(new xmlrpcval($iRet)); 
  • trunk/xmlrpc/BxDolXMLRPCUtil.php

    r12090 r12990  
    8383    { 
    8484        $sType = $sType == 'thumb' ? 'medium' : 'small'; 
    85         return $GLOBALS['oFunctions']->getMemberAvatar ($iId, $sType); 
     85        return $GLOBALS['oFunctions']->getMemberAvatar ((int)$iId, $sType); 
    8686    } 
    8787 
     
    8989    { 
    9090        $aRet = array (); 
    91         $aSexSql = getProfileInfo($iId); //db_arr( $sSexSql ); 
     91        $aSexSql = getProfileInfo((int)$iId);  
    9292        $aRet['title'] = new xmlrpcval($aSexSql['Headline']); 
    93         $aRet['thumb'] = new xmlrpcval(BxDolXMLRPCUtil::getThumbLink($iId));//$sFileName); 
     93        $aRet['thumb'] = new xmlrpcval(BxDolXMLRPCUtil::getThumbLink($iId)); 
    9494        $aRet['sex'] = new xmlrpcval($aSexSql['Sex']); 
    9595        $aRet['age'] = new xmlrpcval(age($aSexSql['DateOfBirth'])); 
     
    142142    function getIdByNickname ($sUser) 
    143143    { 
     144        $sUser = process_db_input($sUser, BX_TAGS_NO_ACTION, BX_SLASHES_NO_ACTION); 
    144145        return (int)db_value("SELECT `ID` FROM `Profiles` WHERE `NickName` = '$sUser' LIMIT 1"); 
    145146    } 
     
    148149    { 
    149150        //sleep(1); 
    150         $iId = BxDolXMLRPCUtil::getIdByNickname ($sUser); 
     151        $iId = (int)BxDolXMLRPCUtil::getIdByNickname ($sUser); 
    151152        $_COOKIE["memberID" ] = $iId; 
    152         $_COOKIE["memberPassword"] = $sPwd; 
     153        $_COOKIE["memberPassword"] = process_db_input($sPwd, BX_TAGS_NO_ACTION, BX_SLASHES_NO_ACTION); 
    153154        return ($GLOBALS['logged']['member'] = member_auth(0, false)) ? $iId : 0; 
    154155    } 
     
    156157    function setLanguage ($sLang) 
    157158    { 
    158         if ('English' == $sLang) 
     159        if ('English' == $sLang || !preg_match('/[a-zA-Z]+/', $sLang)) 
    159160            $sLang = 'en'; 
    160161        $_GET['lang'] = $sLang; 
Note: See TracChangeset for help on using the changeset viewer.