Changeset 15386 for trunk/xmlrpc

Timestamp:

07/27/11 00:08:18 (10 months ago)

Author:

Alexander Trofimov

Message:

Ticket #2565

Location:

trunk/xmlrpc

Files:

• BxDolXMLRPCUser.php (modified) (2 diffs)
• BxDolXMLRPCUtil.php (modified) (7 diffs)
• index.php (modified) (4 diffs)

trunk/xmlrpc/BxDolXMLRPCUser.php

@@ -7 +7 @@
         $iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd);
         return new xmlrpcresp(new xmlrpcval($iId, "int"));
+    }
+
+    function login2($sUser, $sPwd)
+    {
+        $iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd);
+        return new xmlrpcresp(new xmlrpcval(array(
+            'member_id' => new xmlrpcval($iId, "int"),
+            'protocol_ver' => new xmlrpcval(BX_XMLRPC_PROTOCOL_VER, "int"),
+        ), "struct"));
     }
 
@@ -55 +64 @@
     }
 
-    function getUserInfo($sUser, $sPwd, $sNick, $sLang)
+    function getHomepageInfo2($sUser, $sPwd, $sLang)
     {
+        if (!($iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd)))
+            return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
+
+        BxDolXMLRPCUtil::setLanguage ($sLang);
+
+        $aRet = BxDolXMLRPCUtil::getUserInfo($iId);
+
+        $aMarkersReplace = array (
+            'member_id' => $iId,
+            'member_username' => $sUser,
+            'member_password' => $sPwd,
+        );
+        $aRet['menu'] = new xmlrpcval(BxDolXMLRPCUtil::getMenu('homepage', $aMarkersReplace), 'array');
+
+        return new xmlrpcval ($aRet, "struct");
+    }
+
+    function getUserInfo2($sUser, $sPwd, $sNick, $sLang) {
         $iIdProfile = BxDolXMLRPCUtil::getIdByNickname ($sNick);
         if (!$iIdProfile || !($iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd)))
             return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
 
-        BxDolXMLRPCUtil::setLanguage ($sLang);
+        BxDolXMLRPCUtil::setLanguage ($sLang); 
 
-        if ($iIdProfile != $iId)
-        {
-            // privacy
-            bx_import('BxDolPrivacy');
-            $oPrivacy = new BxDolPrivacy('Profiles', 'ID', 'ID');
-            if ($iIdProfile != $iId && !$oPrivacy->check('view', $iIdProfile, $iId))
-                return new xmlrpcval ('-1');
+        $mixedRet = BxDolXMLRPCUser::_checkUserPrivacy ($iId, $iIdProfile);
+        if (true !== $mixedRet)
+            return $mixedRet;
 
-            // membership
-            $aCheckRes = checkAction($iId, ACTION_ID_VIEW_PROFILES, true, $iIdProfile);
-            if ($aCheckRes[CHECK_ACTION_RESULT] != CHECK_ACTION_RESULT_ALLOWED)
-                return new xmlrpcval ($aCheckRes[CHECK_ACTION_MESSAGE]);
-        }
+        $aRet['info'] = new xmlrpcval (BxDolXMLRPCUtil::getUserInfo($iIdProfile, 0, false), "struct");
 
-        $aRet = BxDolXMLRPCUtil::getUserInfo($iIdProfile);
+        $aMarkersReplace = array (
+            'member_id' => $iId,
+            'member_username' => $sUser,
+            'member_password' => $sPwd,
+            'profile_id' => $iIdProfile,
+            'profile_username' => $sNick,
+        );
+        $aRet['menu'] = new xmlrpcval(BxDolXMLRPCUtil::getMenu('profile', $aMarkersReplace), 'array');
+
         return new xmlrpcval ($aRet, "struct");
     }
 
+    function getUserInfo($sUser, $sPwd, $sNick, $sLang) {
+        $iIdProfile = BxDolXMLRPCUtil::getIdByNickname ($sNick);
+        if (!$iIdProfile || !($iId = BxDolXMLRPCUtil::checkLogin ($sUser, $sPwd)))
+            return new xmlrpcresp(new xmlrpcval(array('error' => new xmlrpcval(1,"int")), "struct"));
+
+        BxDolXMLRPCUtil::setLanguage ($sLang); 
+
+        $mixedRet = BxDolXMLRPCUser::_checkUserPrivacy ($iId, $iIdProfile);
+        if (true !== $mixedRet)
+            return $mixedRet;
+
+        $aRet = BxDolXMLRPCUtil::getUserInfo($iIdProfile, 0, true);
+        return new xmlrpcval ($aRet, "struct");
+    }
+
+    function _checkUserPrivacy($iId, $iIdProfile)
+    {
+        $mixedAccessDenied = false;
+
+        if ($iIdProfile != $iId)
+        {
+            // privacy
+            bx_import('BxDolPrivacy');
+            $oPrivacy = new BxDolPrivacy('Profiles', 'ID', 'ID');
+            if ($iIdProfile != $iId && !$oPrivacy->check('view', $iIdProfile, $iId))
+                $mixedAccessDenied = '-1';
+            
+            // membership
+            if (false === $mixedAccessDenied) {
+                $aCheckRes = checkAction($iId, ACTION_ID_VIEW_PROFILES, true, $iIdProfile);
+                if ($aCheckRes[CHECK_ACTION_RESULT] != CHECK_ACTION_RESULT_ALLOWED)
+                    $mixedAccessDenied = $aCheckRes[CHECK_ACTION_MESSAGE];
+            }
+        }
+
+        $oZ = new BxDolAlerts('mobile', 'view_profile', $iIdProfile, $iId, array('access_denied' => &$mixedAccessDenied));
+        $oZ->alert(); 
+
+        if (false !== $mixedAccessDenied)
+            return new xmlrpcval ($mixedAccessDenied);
+
+        return true;
+    }
+    
     function getUserInfoExtra($sUser, $sPwd, $sNick, $sLang)
     {

trunk/xmlrpc/BxDolXMLRPCUtil.php

@@ -47 +47 @@
             $aAll[$aRow['ID']] = $aRow;
 
+        $oZ = new BxDolAlerts('mobile', 'contacts', $iId, 0, array('contacts_data' => $aAll));
+        $oZ->alert(); 
 
         foreach ($aAll as $aRow)
@@ -86 +88 @@
     }
 
-    function getUserInfo($iId, $iIdViewer = 0)
+    function getUserInfo($iId, $iIdViewer = 0, $isCountData = true)
     {
         if (!$iIdViewer)
@@ -100 +102 @@
         $aRet['city'] = new xmlrpcval($aSexSql['City']);
         $aRet['status'] = new xmlrpcval($aSexSql['UserStatusMessage']);
-        $aRet['countFriends'] = new xmlrpcval(getFriendNumber($iId));
-
-        $aRet['countPhotos'] = new xmlrpcval(BxDolXMLRPCMedia::_getMediaCount('photo', $iId, $iIdViewer));
-        $aRet['countVideos'] = new xmlrpcval(BxDolXMLRPCMedia::_getMediaCount('video', $iId, $iIdViewer));
-        $aRet['countSounds'] = new xmlrpcval(BxDolXMLRPCMedia::_getMediaCount('music', $iId, $iIdViewer));
-
+
+        if ($isCountData) {
+            $aRet['countFriends'] = new xmlrpcval(getFriendNumber($iId));
+            $aRet['countPhotos'] = new xmlrpcval(BxDolXMLRPCMedia::_getMediaCount('photo', $iId, $iIdViewer));
+            $aRet['countVideos'] = new xmlrpcval(BxDolXMLRPCMedia::_getMediaCount('video', $iId, $iIdViewer));
+            $aRet['countSounds'] = new xmlrpcval(BxDolXMLRPCMedia::_getMediaCount('music', $iId, $iIdViewer));
+        }
+
+        bx_import('BxDolAlerts');
+        $oZ = new BxDolAlerts('mobile', 'user_info', $iId, $iIdViewer, array('profile' => &$aSexSql, 'return_data' => &$aRet));
+        $oZ->alert(); 
+ 
         return $aRet;
     }
@@ -119 +127 @@
         bx_import('BxDolAlbums');
 
-        return array (
+        $aRet = array (
                'ID' => new xmlrpcval($a['ID']),
                'Title' => new xmlrpcval($a['Headline']),
@@ -133 +141 @@
                $sImageKey => new xmlrpcval($sImage),
             );
-    }
+
+        $oZ = new BxDolAlerts('mobile', 'user_info2', $a['ID'], $iIdViewer, array('profile' => &$a, 'return_data' => &$aRet));
+        $oZ->alert();
+
+        return $aRet;
+    }
+
+    function getMenu ($sMenu, $aMarkersReplace = array ()) {
+
+        $aDefaultMarkers = array (
+            'site_url' => BX_DOL_URL_ROOT,
+        );
+        $aMarkersReplace = array_merge($aDefaultMarkers, $aMarkersReplace);
+        $aKeys = array_keys($aMarkersReplace);
+        $aValues = array_values($aMarkersReplace);
+        foreach ($aKeys as $k => $v) 
+            $aKeys[$k] = '{' . $v . '}';
+
+        $aMenu = array ();
+        $aRecords = $GLOBALS['MySQL']->getAll("SELECT * FROM `sys_menu_mobile` WHERE `menu` = '$sMenu' AND `active` = 1 ORDER BY `order`");
+
+        $oZ = new BxDolAlerts('mobile', 'menu', 0, 0, array('menu' => $sMenu, 'data' => &$aRecords, 'markers_replace' => &$aMarkersReplace));
+        $oZ->alert(); 
+
+        foreach ($aRecords as $r) {
+            $a = array (); 
+            if ($r['eval_hidden']) {
+                if ($aMarkersReplace)
+                    $sVal = str_replace($aKeys, $aValues, $r['eval_hidden']);
+                if (@eval($sVal))
+                    continue;
+            }
+            foreach ($r as $sName => $sVal) {                
+                switch ($sName) {
+                    case 'eval_hidden':
+                        break;
+                    case 'eval_bubble':
+                        if ($sVal && $aMarkersReplace)
+                            $sVal = str_replace($aKeys, $aValues, $sVal);
+                        $a['bubble'] = new xmlrpcval($sVal ? @eval($sVal) : '');
+                        break;
+                    case 'icon':
+                    case 'action_data':
+                        if ($sVal && $aMarkersReplace)
+                            $sVal = str_replace($aKeys, $aValues, $sVal);
+                        $a[$sName] = new xmlrpcval($sVal);
+                        break;
+                    case 'title':
+                        $a[$sName] = new xmlrpcval(_t($sVal));
+                        break;
+                    default:
+                        $a[$sName] = new xmlrpcval($sVal);
+                }
+            }
+            $aMenu[] = new xmlrpcval($a, 'struct');
+        }
+        return $aMenu;
+     }
 
     function getIdByNickname ($sUser)
@@ -143 +208 @@
     function checkLogin ($sUser, $sPwd)
     {
-        //sleep(1);
         $iId = (int)BxDolXMLRPCUtil::getIdByNickname ($sUser);
         $aProfile = getProfileInfo((int)$iId);
@@ -150 +214 @@
         $_COOKIE["memberID" ] = $iId;
         $_COOKIE["memberPassword"] = sha1($sPwd . $aProfile['Salt']);
-        return ($GLOBALS['logged']['member'] = member_auth(0, false)) ? $iId : 0;
+        $iRet = ($GLOBALS['logged']['member'] = member_auth(0, false)) ? $iId : 0;
+
+        $oZ = new BxDolAlerts('mobile', 'check_login', $iId, 0, array('password' => $sPwd, 'return_data' => &$iRet));
+        $oZ->alert();
+
+        return $iRet;
     }
 

trunk/xmlrpc/index.php

@@ -20 +20 @@
     require_once(BX_DIRECTORY_PATH_ROOT . 'xmlrpc/lib/xmlrpc_wrappers.inc');
 
+    define('BX_XMLRPC_PROTOCOL_VER', 2);
+
     $s = new xmlrpc_server(
         array(
@@ -50 +52 @@
                 "docstring" => "returns user id on success or 0 if login failed",
             ),
+            "dolphin.login2" => array(
+                "function" => "BxDolXMLRPCUser::login2",
+                "signature" => array (array ($xmlrpcInt, $xmlrpcString, $xmlrpcString)),
+                "docstring" => "returns user id on success or 0 if login failed (v.2)",
+            ), 
             "dolphin.getHomepageInfo" => array(
                 "function" => "BxDolXMLRPCUser::getHomepageInfo",
@@ -55 +62 @@
                 "docstring" => "return logged in user information to dispay on homepage",
             ),
+            "dolphin.getHomepageInfo2" => array(
+                "function" => "BxDolXMLRPCUser::getHomepageInfo2",
+                "signature" => array (array ($xmlrpcStruct, $xmlrpcString, $xmlrpcString, $xmlrpcString)),
+                "docstring" => "return logged in user information to dispay on homepage (v.2)",
+            ),
             "dolphin.getUserInfo" => array(
                 "function" => "BxDolXMLRPCUser::getUserInfo",
@@ -60 +72 @@
                 "docstring" => "return user information",
             ),
+            "dolphin.getUserInfo2" => array(
+                "function" => "BxDolXMLRPCUser::getUserInfo2",
+                "signature" => array (array ($xmlrpcStruct, $xmlrpcString, $xmlrpcString, $xmlrpcString, $xmlrpcString)),
+                "docstring" => "return user information (v.2)",
+             ),
             "dolphin.getUserInfoExtra" => array(
                 "function" => "BxDolXMLRPCUser::getUserInfoExtra",