Changeset 15211 for trunk/xmlrpc
- Timestamp:
- 06/07/11 23:41:51 (12 months ago)
- Location:
- trunk/xmlrpc
- Files:
-
- 9 edited
-
BxDolXMLRPCFriends.php (modified) (6 diffs)
-
BxDolXMLRPCImages.php (modified) (2 diffs)
-
BxDolXMLRPCMedia.php (modified) (7 diffs)
-
BxDolXMLRPCMessages.php (modified) (4 diffs)
-
BxDolXMLRPCProfileView.php (modified) (4 diffs)
-
BxDolXMLRPCSearch.php (modified) (6 diffs)
-
BxDolXMLRPCUser.php (modified) (5 diffs)
-
BxDolXMLRPCUtil.php (modified) (10 diffs)
-
index.php (modified) (13 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/xmlrpc/BxDolXMLRPCFriends.php
r14650 r15211 9 9 return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); 10 10 11 BxDolXMLRPCUtil::setLanguage ($sLang); 11 BxDolXMLRPCUtil::setLanguage ($sLang); 12 12 13 14 15 16 17 18 19 20 21 22 23 13 $sFriendsSQL = " 14 SELECT `p`.*, `f`.`ID` 15 FROM ( 16 SELECT `ID` AS `ID` FROM `sys_friend_list` WHERE `Profile` = '{$iIdProfile}' AND `Check` =1 17 UNION 18 SELECT `Profile` AS `ID` FROM `sys_friend_list` WHERE `ID` = '{$iIdProfile}' AND `Check` =1 19 ) AS `f` 20 INNER JOIN `Profiles` AS `p` ON `p`.`ID` = `f`.`ID` 21 ORDER BY p.`Avatar` DESC 22 "; 23 $r = db_res($sFriendsSQL); 24 24 25 25 /*$r = db_res ("SELECT `Profiles`.* FROM `sys_friend_list` 26 26 LEFT JOIN `Profiles` ON (`Profiles`.`ID` = `sys_friend_list`.`Profile` AND `sys_friend_list`.`ID` = '$iIdProfile' OR `Profiles`.`ID` = `sys_friend_list`.`ID` AND `sys_friend_list`.`Profile` = '$iIdProfile') 27 WHERE (`sys_friend_list`.`Profile` = '$iIdProfile' OR `sys_friend_list`.`ID` = '$iIdProfile') AND `sys_friend_list`.`Check` = '1' 27 WHERE (`sys_friend_list`.`Profile` = '$iIdProfile' OR `sys_friend_list`.`ID` = '$iIdProfile') AND `sys_friend_list`.`Check` = '1' 28 28 ORDER BY `Profiles`.`Avatar` DESC");*/ 29 29 … … 39 39 if (!($iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd))) 40 40 return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); 41 42 BxDolXMLRPCUtil::setLanguage ($sLang); 41 42 BxDolXMLRPCUtil::setLanguage ($sLang); 43 43 44 44 $r = db_res (" … … 64 64 $aCommunicatorSettings = array ('member_id' => $iId); 65 65 $aMembersList = array ($iIdProfile); 66 $oCommunicator = &new BxTemplCommunicator('communicator_page', $aCommunicatorSettings); 66 $oCommunicator = &new BxTemplCommunicator('communicator_page', $aCommunicatorSettings); 67 67 $oCommunicator->execFunction('_deleteRequest', 'sys_friend_list', $aMembersList); 68 68 … … 74 74 $iIdProfile = BxDolXMLRPCUtil::getIdByNickname ($sNick); 75 75 if (!$iIdProfile || !($iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd))) 76 return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); 77 76 return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); 77 78 78 require_once( BX_DIRECTORY_PATH_ROOT . 'templates/tmpl_' . $GLOBALS['tmpl'] . '/scripts/BxTemplCommunicator.php'); 79 79 $aCommunicatorSettings = array ('member_id' => $iId); 80 80 $aMembersList = array ($iIdProfile); 81 $oCommunicator = &new BxTemplCommunicator('communicator_page', $aCommunicatorSettings); 81 $oCommunicator = &new BxTemplCommunicator('communicator_page', $aCommunicatorSettings); 82 82 $oCommunicator->execFunction('_acceptFriendInvite', 'sys_friend_list', $aMembersList); 83 83 … … 94 94 $aCommunicatorSettings = array ('member_id' => $iId); 95 95 $aMembersList = array ($iIdProfile); 96 $oCommunicator = &new BxTemplCommunicator('communicator_page', $aCommunicatorSettings); 96 $oCommunicator = &new BxTemplCommunicator('communicator_page', $aCommunicatorSettings); 97 97 $oCommunicator->execFunction( '_deleteRequest', 'sys_friend_list', $aMembersList, array(1, 1)); 98 98 … … 106 106 return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); 107 107 108 BxDolXMLRPCUtil::setLanguage ($sLang); 108 BxDolXMLRPCUtil::setLanguage ($sLang); 109 109 110 110 ob_start(); -
trunk/xmlrpc/BxDolXMLRPCImages.php
r13589 r15211 45 45 return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); 46 46 47 48 47 if (!BxDolXMLRPCMedia::_isMembershipEnabledFor($iIdProfileViewer, 'BX_PHOTOS_ADD', true)) 48 return new xmlrpcval ("fail access"); 49 49 50 50 // write tmp file … … 61 61 fclose($f); 62 62 63 // upload 63 // upload 64 64 65 66 67 68 65 $aFileInfo = array(); 66 $aFileInfo['medTitle'] = process_db_input($sTitle, BX_TAGS_STRIP, BX_SLASHES_NO_ACTION); 67 $aFileInfo['medDesc'] = process_db_input($sDesc, BX_TAGS_VALIDATE, BX_SLASHES_NO_ACTION); 68 $aFileInfo['medTags'] = process_db_input($sTags, BX_TAGS_STRIP, BX_SLASHES_NO_ACTION); 69 69 $aFileInfo['Categories'] = array (process_db_input($sAlbum, BX_TAGS_STRIP, BX_SLASHES_NO_ACTION)); 70 70 $aFileInfo['album'] = process_db_input($sAlbum, BX_TAGS_STRIP, BX_SLASHES_NO_ACTION); 71 71 72 72 $isUpdateThumb = (int)db_value("SELECT `Avatar` FROM `Profiles` WHERE `ID` = '$iId' LIMIT 1") ? false : true; 73 73 74 74 if (BxDolService::call('photos', 'perform_photo_upload', array($sTmpFilename, $aFileInfo, $isUpdateThumb), 'Uploader')) 75 75 return new xmlrpcval ("ok"); 76 76 else -
trunk/xmlrpc/BxDolXMLRPCMedia.php
r14550 r15211 24 24 25 25 function _getMediaAlbums ($sType, $iIdProfile, $iIdProfileViewer, $isShowEmptyAlbums = false) 26 { 27 26 { 27 $aAlbums = BxDolXMLRPCMedia::_getMediaAlbumsArray ($sType, $iIdProfile, $iIdProfileViewer, $isShowEmptyAlbums); 28 28 29 29 $aXmlRpc = array (); 30 30 31 32 31 foreach ($aAlbums as $r) 32 { 33 33 $a = array ( 34 34 'Id' => new xmlrpcval($r['Id']), … … 40 40 41 41 return new xmlrpcval ($aXmlRpc, "array"); 42 } 42 } 43 43 44 45 46 47 foreach ($a as $r) 48 49 50 44 function _getMediaCount ($sType, $iIdProfile, $iIdProfileViewer) { 45 $a = BxDolXMLRPCMedia::_getMediaAlbumsArray ($sType, $iIdProfile, $iIdProfileViewer); 46 $iNum = 0; 47 foreach ($a as $r) 48 $iNum += $r['Num']; 49 return $iNum; 50 } 51 51 52 52 function _getMediaAlbumsArray ($sType, $iIdProfile, $iIdProfileViewer, $isShowEmptyAlbums = false) 53 { 53 { 54 54 switch ($sType) { 55 55 case 'photo': 56 56 $sModuleName = 'photos'; 57 57 $sType = 'bx_photos'; 58 58 $sMemAction = 'BX_PHOTOS_VIEW'; 59 59 break; 60 60 case 'video': 61 61 $sModuleName = 'videos'; 62 62 $sType = 'bx_videos'; 63 63 $sMemAction = 'BX_VIDEOS_VIEW'; 64 64 break; 65 65 case 'music': 66 66 $sModuleName = 'sounds'; 67 67 $sType = 'bx_sounds'; 68 69 break; 68 $sMemAction = 'BX_SOUNDS_VIEW'; 69 break; 70 70 default: 71 71 return array(); 72 72 } 73 73 74 75 74 if (!BxDolXMLRPCMedia::_isMembershipEnabledFor($iIdProfileViewer, $sMemAction)) 75 return array (); 76 76 77 77 bx_import('BxDolAlbums'); … … 81 81 foreach ($aList as $r) 82 82 { 83 84 85 83 if ($iIdProfile != $iIdProfileViewer && !BxDolService::call ($sModuleName, 'get_album_privacy', array((int)$r['ID'], $iIdProfileViewer), 'Search')) 84 continue; 85 86 86 $aRet[] = array ( 87 87 'Id' => $r['ID'], … … 93 93 } 94 94 95 // ----------------- file list in albums 95 // ----------------- file list in albums 96 96 97 97 function getVideoInAlbum($sUser, $sPwd, $sNick, $iAlbumId) … … 114 114 115 115 function _getFilesInAlbum ($sModuleName, $iIdProfile, $iIdProfileViewer, $iAlbumId, $sWidget = '', $sFuncToken = '', $sTokenUrl = '') 116 { 116 { 117 117 if ($sWidget && preg_match('/^[a-zA-Z0-9_]+$/', $sWidget)) { 118 118 require_once (BX_DIRECTORY_PATH_ROOT . "flash/modules/global/inc/db.inc.php"); … … 127 127 foreach ($a as $k => $aRow) 128 128 { 129 130 131 132 } 133 134 135 136 137 138 139 140 129 if ('youtube' == $aRow['Source']) 130 { 131 $sUrl = $aRow['Video']; 132 } 133 else 134 { 135 $sToken = ''; 136 if ($sFuncToken) 137 $sToken = $sFuncToken($aRow['id']); 138 139 $sUrl = $sTokenUrl && $sToken ? BX_DOL_URL_ROOT . $sTokenUrl . $aRow['id'] . '&token=' . $sToken : $aRow['file']; 140 } 141 141 142 142 $a = array ( … … 158 158 function _isMembershipEnabledFor ($iProfileId, $sMembershipActionConstant, $isPerformAction = false) { 159 159 defineMembershipActions (array('photos add', 'photos view', 'sounds view', 'videos view')); 160 161 162 160 if (!defined($sMembershipActionConstant)) 161 return false; 162 $aCheck = checkAction($iProfileId ? $iProfileId : $_COOKIE['memberID'], constant($sMembershipActionConstant), $isPerformAction); 163 163 return $aCheck[CHECK_ACTION_RESULT] == CHECK_ACTION_RESULT_ALLOWED; 164 } 164 } 165 165 } 166 166 -
trunk/xmlrpc/BxDolXMLRPCMessages.php
r12990 r15211 30 30 return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); 31 31 32 require_once( BX_DIRECTORY_PATH_ROOT . 'templates/tmpl_' . $GLOBALS['tmpl'] . '/scripts/BxTemplMailBox.php'); 32 require_once( BX_DIRECTORY_PATH_ROOT . 'templates/tmpl_' . $GLOBALS['tmpl'] . '/scripts/BxTemplMailBox.php'); 33 33 34 34 $sRecipient = process_db_input ($sRecipient, BX_TAGS_NO_ACTION, BX_SLASHES_NO_ACTION); … … 36 36 if (!$aRecipient) 37 37 return new xmlrpcval (BX_MAILBOX_SEND_UNKNOWN_RECIPIENT); 38 38 39 39 $aMailBoxSettings = array ('member_id' => $iId); 40 40 $oMailBox = &new BxTemplMailBox('mail_page_compose', $aMailBoxSettings); 41 41 42 $aComposeSettings = array ( 42 $aComposeSettings = array ( 43 43 'send_copy' => 'recipient' == $sSendTo || 'both' == $sSendTo ? true : false, 44 44 'notification' => false, … … 58 58 $iMsgId = (int)$iMsgId; 59 59 $sJoinOn = $isInbox ? " `m`.`Sender` = `p`.`ID` " : " `m`.`Recipient` = `p`.`ID` "; 60 $aRow = db_arr ("SELECT 61 `m`.`ID`, `m`.`Date`, `m`.`Sender`, `m`.`Recipient`, `m`.`Subject`, `m`.`Text`, `m`.`New`, 62 `p`.`NickName` AS `Nick` 60 $aRow = db_arr ("SELECT 61 `m`.`ID`, `m`.`Date`, `m`.`Sender`, `m`.`Recipient`, `m`.`Subject`, `m`.`Text`, `m`.`New`, 62 `p`.`NickName` AS `Nick` 63 63 FROM `sys_messages` AS `m` 64 64 LEFT JOIN `Profiles` AS `p` ON ($sJoinOn) … … 97 97 $sWhere = $isInbox ? " `Recipient` = '$iId' " : " `Sender`= '$iId' "; 98 98 $sJoinOn = $isInbox ? " `m`.`Sender` = `p`.`ID` " : " `m`.`Recipient` = `p`.`ID` "; 99 $r = db_res ("SELECT 100 `m`.`ID`, `m`.`Date`, `m`.`Sender`, `m`.`Recipient`, `m`.`Subject`, `m`.`New`, 101 `p`.`NickName` AS `Nick` 99 $r = db_res ("SELECT 100 `m`.`ID`, `m`.`Date`, `m`.`Sender`, `m`.`Recipient`, `m`.`Subject`, `m`.`New`, 101 `p`.`NickName` AS `Nick` 102 102 FROM `sys_messages` AS `m` 103 103 LEFT JOIN `Profiles` AS `p` ON ($sJoinOn) 104 WHERE $sWhere 104 WHERE $sWhere 105 105 ORDER BY `Date` DESC"); 106 106 while ($aRow = mysql_fetch_array ($r)) -
trunk/xmlrpc/BxDolXMLRPCProfileView.php
r14920 r15211 6 6 { 7 7 function BxDolXMLRPCProfileView($iProfileId) 8 { 8 { 9 9 BxBaseProfileGenerator::BxBaseProfileGenerator ((int)$iProfileId); 10 10 } 11 11 12 function getProfileInfoExtra() 12 function getProfileInfoExtra() 13 13 { 14 14 $aRet = array(); … … 23 23 } 24 24 25 function getProfileInfoBlock($sCaption, $sContent) 25 function getProfileInfoBlock($sCaption, $sContent) 26 26 { 27 27 global $site; … … 36 36 37 37 $aRet = array (); 38 foreach( $aItems as $aItem ) { 38 foreach( $aItems as $aItem ) { 39 39 40 40 $sValue1 = $this->oPF->getViewableValue( $aItem, $this->_aProfile[ $aItem['Name'] ] ); 41 41 42 if ($aItem['Name'] == 'Age') 42 if ($aItem['Name'] == 'Age') 43 43 { 44 44 $sValue1 = (isset($this->_aProfile['DateOfBirth'])) ? age($this->_aProfile['DateOfBirth']) : _t("_uknown"); … … 54 54 $aStruct['Value1'] = new xmlrpcval (strip_tags($sValue1)); 55 55 56 if ($this->bCouple) 56 if ($this->bCouple) 57 57 { 58 if (!in_array( $aItem['Name'], $this->aCoupleMutualItems)) 58 if (!in_array( $aItem['Name'], $this->aCoupleMutualItems)) 59 59 { 60 60 $sValue2 = $this->oPF->getViewableValue($aItem, $this->_aCouple[$aItem['Name']]); 61 61 $aStruct['Value1'] = new xmlrpcval (strip_tags($sValue1)); 62 62 } 63 } 63 } 64 64 65 65 $aRet[] = new xmlrpcval ($aStruct, "struct"); 66 66 } 67 67 68 68 return new xmlrpcval (array ( 69 69 'Info' => new xmlrpcval ($aRet, "array"), 70 70 'Title' => new xmlrpcval (_t($sCaption)), 71 71 ), "struct"); 72 } 72 } 73 73 } 74 74 -
trunk/xmlrpc/BxDolXMLRPCSearch.php
r13353 r15211 8 8 return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); 9 9 10 BxDolXMLRPCUtil::setLanguage ($sLang); 10 BxDolXMLRPCUtil::setLanguage ($sLang); 11 11 12 12 $sCountryCode = process_db_input ($sCountryCode, BX_TAGS_NO_ACTION, BX_SLASHES_NO_ACTION); … … 20 20 if ($isWithPhotosOnly) 21 21 $sWhere .= " AND `Avatar` "; 22 if ($isOnlineOnly) 22 if ($isOnlineOnly) 23 23 { 24 24 $iOnlineTime = (int)getParam( 'member_online_time' ); … … 49 49 return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); 50 50 51 BxDolXMLRPCUtil::setLanguage ($sLang); 51 BxDolXMLRPCUtil::setLanguage ($sLang); 52 52 53 53 $sLat = (float)$sLat; … … 64 64 if ($isWithPhotosOnly) 65 65 $sWhere .= " AND `Avatar` "; 66 if ($isOnlineOnly) 66 if ($isOnlineOnly) 67 67 { 68 68 $iOnlineTime = getParam( 'member_online_time' ); … … 94 94 return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); 95 95 96 BxDolXMLRPCUtil::setLanguage ($sLang); 96 BxDolXMLRPCUtil::setLanguage ($sLang); 97 97 98 98 $sKeyword = process_db_input ($sKeyword, BX_TAGS_NO_ACTION, BX_SLASHES_NO_ACTION); … … 106 106 if ($isWithPhotosOnly) 107 107 $sWhere .= " AND `Avatar` "; 108 if ($isOnlineOnly) 108 if ($isOnlineOnly) 109 109 { 110 110 $iOnlineTime = getParam( 'member_online_time' ); -
trunk/xmlrpc/BxDolXMLRPCUser.php
r14986 r15211 8 8 return new xmlrpcresp(new xmlrpcval($iId, "int")); 9 9 } 10 11 function updateUserLocation ($sUser, $sPwd, $sLat, $sLng, $sZoom, $sMapType) 12 { 10 11 function updateUserLocation ($sUser, $sPwd, $sLat, $sLng, $sZoom, $sMapType) 12 { 13 13 if (!($iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd)) || !preg_match('/^[A-Za-z0-9]*$/', $sMapType)) 14 14 return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); … … 19 19 } 20 20 21 function getUserLocation ($sUser, $sPwd, $sNick) 21 function getUserLocation ($sUser, $sPwd, $sNick) 22 22 { 23 23 if (!($iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd))) 24 24 return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); 25 25 26 26 $iProfileId = getID($sNick, false); 27 27 $aLocation = BxDolService::call('map_profiles', 'get_location', array($iProfileId, $iId, true)); … … 61 61 return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); 62 62 63 BxDolXMLRPCUtil::setLanguage ($sLang); 64 65 if ($iIdProfile != $iId) 66 { 67 // privacy 68 bx_import('BxDolPrivacy'); 69 $oPrivacy = new BxDolPrivacy('Profiles', 'ID', 'ID'); 70 if ($iIdProfile != $iId && !$oPrivacy->check('view', $iIdProfile, $iId)) 71 return new xmlrpcval ('-1'); 63 BxDolXMLRPCUtil::setLanguage ($sLang); 72 64 73 // membership 74 $aCheckRes = checkAction($iId, ACTION_ID_VIEW_PROFILES, true, $iIdProfile); 75 if ($aCheckRes[CHECK_ACTION_RESULT] != CHECK_ACTION_RESULT_ALLOWED) 76 return new xmlrpcval ($aCheckRes[CHECK_ACTION_MESSAGE]); 77 } 65 if ($iIdProfile != $iId) 66 { 67 // privacy 68 bx_import('BxDolPrivacy'); 69 $oPrivacy = new BxDolPrivacy('Profiles', 'ID', 'ID'); 70 if ($iIdProfile != $iId && !$oPrivacy->check('view', $iIdProfile, $iId)) 71 return new xmlrpcval ('-1'); 72 73 // membership 74 $aCheckRes = checkAction($iId, ACTION_ID_VIEW_PROFILES, true, $iIdProfile); 75 if ($aCheckRes[CHECK_ACTION_RESULT] != CHECK_ACTION_RESULT_ALLOWED) 76 return new xmlrpcval ($aCheckRes[CHECK_ACTION_MESSAGE]); 77 } 78 78 79 79 $aRet = BxDolXMLRPCUtil::getUserInfo($iIdProfile); … … 87 87 return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); 88 88 89 BxDolXMLRPCUtil::setLanguage ($sLang); 89 BxDolXMLRPCUtil::setLanguage ($sLang); 90 90 91 91 $o = new BxDolXMLRPCProfileView ($iIdProfile); … … 93 93 } 94 94 95 function updateStatusMessage ($sUser, $sPwd, $sStatusMsg) 95 function updateStatusMessage ($sUser, $sPwd, $sStatusMsg) 96 96 { 97 97 if (!($iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd))) -
trunk/xmlrpc/BxDolXMLRPCUtil.php
r13382 r15211 14 14 // hot list 15 15 $r = db_res ("SELECT `p`.`ID`, `p`.`NickName` AS `Nick` FROM `Profiles` AS `p` 16 INNER JOIN `sys_fave_list` AS `h` ON (`h`.`Profile` = `p`.`ID`) 16 INNER JOIN `sys_fave_list` AS `h` ON (`h`.`Profile` = `p`.`ID`) 17 17 WHERE `h`.`ID` = $iId"); 18 18 while ($aRow = mysql_fetch_array ($r)) … … 21 21 // mail contacts received 22 22 $r = db_res ("SELECT `p`.`ID`, `p`.`NickName` AS `Nick` FROM `Profiles` AS `p` 23 INNER JOIN `sys_messages` AS `m` ON (`m`.`Sender` = `p`.`ID`) 23 INNER JOIN `sys_messages` AS `m` ON (`m`.`Sender` = `p`.`ID`) 24 24 WHERE `p`.`ID` != $iId AND `m`.`Recipient` = $iId"); 25 25 while ($aRow = mysql_fetch_array ($r)) … … 38 38 WHERE `fr`.`ID` = '$iId' AND `fr`.`Profile` != $iId AND `fr`.`Check` = '1'"); 39 39 while ($aRow = mysql_fetch_array ($r)) 40 $aAll[$aRow['ID']] = $aRow; 40 $aAll[$aRow['ID']] = $aRow; 41 41 42 42 // friends 2 … … 45 45 WHERE `fr`.`Profile` = '$iId' AND `fr`.`ID` != $iId AND `fr`.`Check` = '1'"); 46 46 while ($aRow = mysql_fetch_array ($r)) 47 $aAll[$aRow['ID']] = $aRow; 47 $aAll[$aRow['ID']] = $aRow; 48 48 49 49 … … 58 58 return new xmlrpcval ($aContacts, "array"); 59 59 } 60 60 61 61 function getCountries($sUser, $sPwd, $sLang) 62 62 { … … 64 64 if (!($iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd))) 65 65 return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct")); 66 67 BxDolXMLRPCUtil::setLanguage ($sLang); 66 67 BxDolXMLRPCUtil::setLanguage ($sLang); 68 68 69 69 $aCountries = array (); … … 88 88 function getUserInfo($iId, $iIdViewer = 0) 89 89 { 90 91 90 if (!$iIdViewer) 91 $iIdViewer = $_COOKIE['memberID']; 92 92 93 93 $aRet = array (); 94 $aSexSql = getProfileInfo((int)$iId); 94 $aSexSql = getProfileInfo((int)$iId); 95 95 $aRet['title'] = new xmlrpcval($aSexSql['Headline']); 96 96 $aRet['thumb'] = new xmlrpcval(BxDolXMLRPCUtil::getThumbLink($iId)); … … 111 111 function fillProfileArray ($a, $sImage = 'icon', $iIdViewer = 0) 112 112 { 113 114 113 if (!$iIdViewer) 114 $iIdViewer = $_COOKIE['memberID']; 115 115 116 116 $sImageKey = ucfirst ($sImage); … … 145 145 //sleep(1); 146 146 $iId = (int)BxDolXMLRPCUtil::getIdByNickname ($sUser); 147 148 if (!$aProfile) 149 147 $aProfile = getProfileInfo((int)$iId); 148 if (!$aProfile) 149 return 0; 150 150 $_COOKIE["memberID" ] = $iId; 151 $_COOKIE["memberPassword"] = sha1($sPwd . $aProfile['Salt']); 151 $_COOKIE["memberPassword"] = sha1($sPwd . $aProfile['Salt']); 152 152 return ($GLOBALS['logged']['member'] = member_auth(0, false)) ? $iId : 0; 153 153 } … … 165 165 function concat($s1, $s2) 166 166 { 167 return new xmlrpcval($s1.$s2); 168 } 167 return new xmlrpcval($s1.$s2); 168 } 169 169 } 170 170 -
trunk/xmlrpc/index.php
r13383 r15211 6 6 require_once(BX_DIRECTORY_PATH_INC . 'admin.inc.php'); 7 7 8 require_once(BX_DIRECTORY_PATH_ROOT . 'xmlrpc/BxDolXMLRPCUtil.php'); 8 require_once(BX_DIRECTORY_PATH_ROOT . 'xmlrpc/BxDolXMLRPCUtil.php'); 9 9 require_once(BX_DIRECTORY_PATH_ROOT . 'xmlrpc/BxDolXMLRPCUser.php'); 10 10 require_once(BX_DIRECTORY_PATH_ROOT . 'xmlrpc/BxDolXMLRPCMessages.php'); 11 11 require_once(BX_DIRECTORY_PATH_ROOT . 'xmlrpc/BxDolXMLRPCSearch.php'); 12 12 require_once(BX_DIRECTORY_PATH_ROOT . 'xmlrpc/BxDolXMLRPCFriends.php'); 13 require_once(BX_DIRECTORY_PATH_ROOT . 'xmlrpc/BxDolXMLRPCMedia.php'); 13 require_once(BX_DIRECTORY_PATH_ROOT . 'xmlrpc/BxDolXMLRPCMedia.php'); 14 14 require_once(BX_DIRECTORY_PATH_ROOT . 'xmlrpc/BxDolXMLRPCImages.php'); 15 15 … … 17 17 18 18 require_once(BX_DIRECTORY_PATH_ROOT . 'xmlrpc/lib/xmlrpc.inc'); 19 20 19 require_once(BX_DIRECTORY_PATH_ROOT . 'xmlrpc/lib/xmlrpcs.inc'); 20 require_once(BX_DIRECTORY_PATH_ROOT . 'xmlrpc/lib/xmlrpc_wrappers.inc'); 21 21 22 22 $s = new xmlrpc_server( … … 24 24 25 25 // util 26 26 27 27 "dolphin.concat" => array( 28 28 "function" => "BxDolXMLRPCUtil::concat", … … 35 35 "signature" => array (array ($xmlrpcArray, $xmlrpcString, $xmlrpcString)), 36 36 "docstring" => "get user contacts", 37 ), 37 ), 38 38 39 39 "dolphin.getCountries" => array( … … 41 41 "signature" => array (array ($xmlrpcArray, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 42 42 "docstring" => "get countries list", 43 ), 43 ), 44 44 45 45 // user related 46 46 47 47 "dolphin.login" => array( 48 48 "function" => "BxDolXMLRPCUser::login", 49 49 "signature" => array (array ($xmlrpcInt, $xmlrpcString, $xmlrpcString)), 50 50 "docstring" => "returns user id on success or 0 if login failed", 51 ), 51 ), 52 52 "dolphin.getHomepageInfo" => array( 53 53 "function" => "BxDolXMLRPCUser::getHomepageInfo", 54 54 "signature" => array (array ($xmlrpcStruct, $xmlrpcString, $xmlrpcString)), 55 55 "docstring" => "return logged in user information to dispay on homepage", 56 ), 56 ), 57 57 "dolphin.getUserInfo" => array( 58 58 "function" => "BxDolXMLRPCUser::getUserInfo", … … 64 64 "signature" => array (array ($xmlrpcArray, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 65 65 "docstring" => "return extended users information", 66 ), 66 ), 67 67 68 68 "dolphin.updateStatusMessage" => array( … … 70 70 "signature" => array (array ($xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 71 71 "docstring" => "update user status message, returns 0 on error, or 1 on success", 72 ), 72 ), 73 73 74 74 "dolphin.getUserLocation" => array( … … 82 82 "signature" => array (array ($xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 83 83 "docstring" => "update user location, returns 1 on succees, 0 on error", 84 ), 84 ), 85 85 86 86 // messages 87 87 88 88 "dolphin.getMessagesInbox" => array( 89 89 "function" => "BxDolXMLRPCMessages::getMessagesInbox", 90 90 "signature" => array (array ($xmlrpcArray, $xmlrpcString, $xmlrpcString)), 91 91 "docstring" => "get user's inbox messages", 92 ), 92 ), 93 93 "dolphin.getMessagesSent" => array( 94 94 "function" => "BxDolXMLRPCMessages::getMessagesSent", 95 95 "signature" => array (array ($xmlrpcArray, $xmlrpcString, $xmlrpcString)), 96 96 "docstring" => "get user's sent messages", 97 ), 97 ), 98 98 "dolphin.getMessageInbox" => array( 99 99 "function" => "BxDolXMLRPCMessages::getMessageInbox", 100 100 "signature" => array (array ($xmlrpcStruct, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 101 101 "docstring" => "get user's inbox message", 102 ), 102 ), 103 103 "dolphin.getMessageSent" => array( 104 104 "function" => "BxDolXMLRPCMessages::getMessageSent", 105 105 "signature" => array (array ($xmlrpcScruct, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 106 106 "docstring" => "get user's sent message", 107 ), 107 ), 108 108 109 109 "dolphin.sendMessage" => array( … … 111 111 "signature" => array (array ($xmlrpcScruct, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 112 112 "docstring" => "send message", 113 ), 113 ), 114 114 115 115 // search … … 119 119 "signature" => array (array ($xmlrpcArray, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 120 120 "docstring" => "get search results by location", 121 ), 121 ), 122 122 "dolphin.getSearchResultsKeyword" => array( 123 123 "function" => "BxDolXMLRPCSearch::getSearchResultsKeyword", 124 124 "signature" => array (array ($xmlrpcArray, $xmlrpcString, $xmlrpcString,$xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 125 125 "docstring" => "get search results by keyword", 126 ), 126 ), 127 127 "dolphin.getSearchResultsNearMe" => array( 128 128 "function" => "BxDolXMLRPCSearch::getSearchResultsNearMe", 129 129 "signature" => array (array ($xmlrpcArray, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 130 130 "docstring" => "get search results near specified location", 131 ), 131 ), 132 132 133 133 // friends … … 137 137 "signature" => array (array ($xmlrpcArray, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 138 138 "docstring" => "get user's friends", 139 ), 139 ), 140 140 "dolphin.getFriendRequests" => array( 141 141 "function" => "BxDolXMLRPCFriends::getFriendRequests", 142 142 "signature" => array (array ($xmlrpcArray, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 143 143 "docstring" => "get friend requests", 144 ), 144 ), 145 145 "dolphin.declineFriendRequest" => array( 146 146 "function" => "BxDolXMLRPCFriends::declineFriendRequest", 147 147 "signature" => array (array ($xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 148 148 "docstring" => "decline friend request", 149 ), 149 ), 150 150 "dolphin.acceptFriendRequest" => array( 151 151 "function" => "BxDolXMLRPCFriends::acceptFriendRequest", 152 152 "signature" => array (array ($xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 153 153 "docstring" => "accept friend request", 154 ), 154 ), 155 155 "dolphin.removeFriend" => array( 156 156 "function" => "BxDolXMLRPCFriends::removeFriend", 157 157 "signature" => array (array ($xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 158 158 "docstring" => "remove friend", 159 ), 159 ), 160 160 "dolphin.addFriend" => array( 161 161 "function" => "BxDolXMLRPCFriends::addFriend", 162 162 "signature" => array (array ($xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 163 163 "docstring" => "add friend", 164 ), 164 ), 165 165 166 166 // images … … 170 170 "signature" => array (array ($xmlrpcArray, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 171 171 "docstring" => "get profile's images", 172 ), 173 */ 172 ), 173 */ 174 174 "dolphin.removeImage" => array( 175 175 "function" => "BxDolXMLRPCImages::removeImage", 176 176 "signature" => array (array ($xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 177 177 "docstring" => "remove user image by id", 178 ), 178 ), 179 179 "dolphin.makeThumbnail" => array( 180 180 "function" => "BxDolXMLRPCImages::makeThumbnail", 181 181 "signature" => array (array ($xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 182 182 "docstring" => "make primary image by image id", 183 ), 183 ), 184 184 "dolphin.getImageAlbums" => array( 185 185 "function" => "BxDolXMLRPCImages::getImageAlbums", 186 186 "signature" => array (array ($xmlrpcArray, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 187 187 "docstring" => "get profile's images albums", 188 ), 188 ), 189 189 "dolphin.uploadImage" => array( 190 190 "function" => "BxDolXMLRPCImages::uploadImage", 191 191 "signature" => array (array ($xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcBase64, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 192 192 "docstring" => "upload new image", 193 ), 193 ), 194 194 195 195 // media … … 210 210 "signature" => array (array ($xmlrpcArray, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 211 211 "docstring" => "get profile's images in specified album", 212 ), 212 ), 213 213 "dolphin.getVideoInAlbum" => array( 214 214 "function" => "BxDolXMLRPCMedia::getVideoInAlbum", 215 215 "signature" => array (array ($xmlrpcArray, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 216 216 "docstring" => "get profile's video in specified album", 217 ), 217 ), 218 218 "dolphin.getAudioInAlbum" => array( 219 219 "function" => "BxDolXMLRPCMedia::getAudioInAlbum", 220 220 "signature" => array (array ($xmlrpcArray, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)), 221 221 "docstring" => "get profile's sounds in specified album", 222 ), 222 ), 223 223 ), 224 224 0
Note: See TracChangeset
for help on using the changeset viewer.
