Changeset 15386

Timestamp:

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

Author:

Alexander Trofimov

Message:

Ticket #2565

Location:

trunk

Files:

• inc/classes/BxDolMobileTemplate.php (added)
• inc/classes/BxDolModuleTemplate.php (modified) (2 diffs)
• inc/classes/BxDolTwigTemplate.php (modified) (2 diffs)
• inc/profiles.inc.php (modified) (1 diff)
• install/langs/lang-en.php (modified) (1 diff)
• install/sql/v70.sql (modified) (2 diffs)
• modules/boonex/map_profiles/install/langs/en.php (modified) (1 diff)
• modules/boonex/map_profiles/install/sql/install.sql (modified) (1 diff)
• modules/boonex/map_profiles/install/sql/uninstall.sql (modified) (1 diff)
• modules/boonex/news/classes/BxNewsModule.php (modified) (1 diff)
• modules/boonex/news/install/sql/install.sql (modified) (1 diff)
• modules/boonex/news/install/sql/uninstall.sql (modified) (1 diff)
• modules/boonex/news/templates/base/images/icons/mobile_icon.png (added)
• modules/boonex/photos/install/sql/install.sql (modified) (1 diff)
• modules/boonex/photos/install/sql/uninstall.sql (modified) (1 diff)
• modules/boonex/sounds/install/sql/install.sql (modified) (1 diff)
• modules/boonex/sounds/install/sql/uninstall.sql (modified) (1 diff)
• modules/boonex/videos/install/sql/install.sql (modified) (1 diff)
• modules/boonex/videos/install/sql/uninstall.sql (modified) (1 diff)
• templates/base/css/mobile.css (added)
• templates/base/images/icons/mobile_next.png (added)
• templates/base/mobile_box.html (added)
• templates/base/mobile_page_padding.html (added)
• templates/base/mobile_row.html (added)
• templates/base/page_11.html (added)
• xmlrpc/BxDolXMLRPCUser.php (modified) (2 diffs)
• xmlrpc/BxDolXMLRPCUtil.php (modified) (7 diffs)
• xmlrpc/index.php (modified) (4 diffs)

trunk/inc/classes/BxDolModuleTemplate.php

@@ -12 +12 @@
     var $_oDb;
     var $_oConfig;
+    var $_bObStarted = 0;
 
     /*
@@ -47 +48 @@
         return $mixedResult;
     }
+    function pageStart () {
+        if (0 == $this->_bObStarted)  {            
+            ob_start ();
+            $this->_bObStarted = 1;
+        }
+    }
+    function pageEnd ($isGetContent = true) {
+        if (1 == $this->_bObStarted)  {            
+            $sRet = '';
+            if ($isGetContent)
+                $sRet = ob_get_clean();
+            else
+                ob_end_clean();
+            $this->_bObStarted = 0;
+            return $sRet;
+        }
+    } 
 }
 

trunk/inc/classes/BxDolTwigTemplate.php

@@ -14 +14 @@
 class BxDolTwigTemplate extends BxDolModuleTemplate {
     var $_iPageIndex = 0;
-    var $_oMain = null;
-    var $_bObStarted = 0;
+    var $_oMain = null;    
 
     function BxDolTwigTemplate(&$oConfig, &$oDb, $sRootPath = BX_DIRECTORY_PATH_ROOT, $sRootUrl = BX_DOL_URL_ROOT) {
@@ -78 +77 @@
     }
 
-    function pageStart () {
-        if (0 == $this->_bObStarted) {
-            ob_start ();
-            $this->_bObStarted = 1;
-        }
-    }
-
-    function pageEnd ($isGetContent = true) {
-        if (1 == $this->_bObStarted)  {
-            $sRet = '';
-            if ($isGetContent)
-                $sRet = ob_get_clean();
-            else
-                ob_end_clean();
-            $this->_bObStarted = 0;
-            return $sRet;
-        }
-    }
-
     // ======================= tags/cat parsing functions
 

trunk/inc/profiles.inc.php

@@ -331 +331 @@
 }
 
+/**
+ * Get number of friend requests sent to the specified profile.
+ * It doesn't count pending friend requests which was sent by specified profile.
+ * @param $iID specified profile
+ * @return number of friend requests
+ */
+function getFriendRequests($iID) {
+    $iID = (int)$iID;
+    $sqlQuery = "SELECT count(*) FROM `sys_friend_list` WHERE `Profile` = {$iID} AND `Check` = '0'";
+    return (int)db_value($sqlQuery);
+}
+
 function getMyFriendsEx($iID, $sWhereParam = '', $sSortParam = '', $sqlLimit = '') {
     $sJoin = $sOrderBy = '';

trunk/install/langs/lang-en.php

@@ -2782 +2782 @@
     '_sys_profile_private_text' => 'Information availability is limited by privacy settings.',
     '_sys_profile_private_text_title' => 'Limited Visibility',
+    '_sys_mobile_status' => 'Status',
+    '_sys_mobile_mail' => 'Messages',
+    '_sys_mobile_friends' => 'Friends',
+    '_sys_mobile_info' => 'Info',
+    '_sys_mobile_search' => 'Search',
+    '_sys_mobile_profile_info' => 'Profile Info',
+    '_sys_mobile_profile_contact' => 'Contact',
+    '_sys_mobile_profile_friends' => 'Friends',    
 );
 ?>

trunk/install/sql/v70.sql

@@ -6 +6 @@
 
 SET NAMES 'utf8';
-DROP TABLE IF EXISTS `sys_account_custom_stat_elements`, `sys_admin_ban_list`, `sys_admin_dashboard`, `sys_menu_admin`, `sys_menu_admin_top`, `sys_menu_bottom`, `sys_albums`, `sys_albums_objects`,`sys_banners`, `sys_banners_clicks`, `sys_banners_shows`, `sys_block_list`, `sys_categories`, `sys_objects_categories`, `sys_objects_cmts`, `sys_cmts_profile`, `sys_cmts_track`, `sys_color_base`, `sys_countries`, `sys_email_templates`, `sys_menu_member`, `sys_friend_list`, `sys_options`, `sys_options_cats`, `sys_fave_list`, `sys_ip_list`, `sys_ip_members_visits`, `sys_localization_categories`, `sys_localization_keys`, `sys_localization_languages`, `sys_localization_string_params`, `sys_localization_strings`, `sys_acl_actions`, `sys_acl_actions_track`, `sys_acl_matrix`, `sys_acl_level_prices`, `sys_acl_levels`, `sys_messages`, `sys_page_compose`, `sys_page_compose_pages`, `sys_page_compose_privacy`, `sys_sessions`, `sys_stat_member`, `sys_pre_values`, `sys_profile_fields`, `sys_acl_levels_members`, `Profiles`, `sys_profile_views_track`, `sys_profiles_match`, `sys_profile_rating`, `sys_profile_voting_track`, `RayBoardCurrentUsers`, `RayBoardBoards`, `RayBoardUsers`, `RayChatCurrentUsers`, `RayChatMessages`, `RayChatProfiles`, `RayChatRooms`, `RayChatRoomsUsers`, `RayChatMembershipsSettings`, `RayChatMemberships`, `RayImContacts`, `RayImMessages`, `RayImPendings`, `RayImProfiles`, `RayMp3Files`, `RayMp3Tokens`, `RayShoutboxMessages`, `RayVideoFiles`, `RayVideoTokens`, `RayVideo_commentsFiles`, `RayVideo_commentsTokens`, `sys_objects_search`, `sys_shared_sites`, `sys_stat_site`, `sys_alerts`, `sys_alerts_handlers`, `sys_injections`, `sys_injections_admin`, `sys_modules`, `sys_modules_file_tracks`, `sys_permalinks`, `sys_privacy_actions`, `sys_privacy_defaults`, `sys_privacy_groups`, `sys_privacy_members`, `sys_tags`, `sys_objects_tag`, `sys_menu_top`, `sys_transactions`, `sys_objects_actions`, `sys_objects_auths`, `sys_greetings`, `sys_zip_codes`, `sys_objects_vote`, `sys_objects_views`, `sys_box_download`, `sys_cron_jobs`, `sys_sbs_users`, `sys_sbs_entries`, `sys_sbs_types`, `sys_sbs_queue`, `sys_sbs_messages`, `sys_profiles_match_mails`, `sys_dnsbl_rules`, `sys_dnsbl_block_log`, `sys_dnsbluri_zones`;
+DROP TABLE IF EXISTS `sys_account_custom_stat_elements`, `sys_admin_ban_list`, `sys_admin_dashboard`, `sys_menu_admin`, `sys_menu_admin_top`, `sys_menu_bottom`, `sys_albums`, `sys_albums_objects`,`sys_banners`, `sys_banners_clicks`, `sys_banners_shows`, `sys_block_list`, `sys_categories`, `sys_objects_categories`, `sys_objects_cmts`, `sys_cmts_profile`, `sys_cmts_track`, `sys_color_base`, `sys_countries`, `sys_email_templates`, `sys_menu_member`, `sys_friend_list`, `sys_options`, `sys_options_cats`, `sys_fave_list`, `sys_ip_list`, `sys_ip_members_visits`, `sys_localization_categories`, `sys_localization_keys`, `sys_localization_languages`, `sys_localization_string_params`, `sys_localization_strings`, `sys_acl_actions`, `sys_acl_actions_track`, `sys_acl_matrix`, `sys_acl_level_prices`, `sys_acl_levels`, `sys_messages`, `sys_page_compose`, `sys_page_compose_pages`, `sys_page_compose_privacy`, `sys_sessions`, `sys_stat_member`, `sys_pre_values`, `sys_profile_fields`, `sys_acl_levels_members`, `Profiles`, `sys_profile_views_track`, `sys_profiles_match`, `sys_profile_rating`, `sys_profile_voting_track`, `RayBoardCurrentUsers`, `RayBoardBoards`, `RayBoardUsers`, `RayChatCurrentUsers`, `RayChatMessages`, `RayChatProfiles`, `RayChatRooms`, `RayChatRoomsUsers`, `RayChatMembershipsSettings`, `RayChatMemberships`, `RayImContacts`, `RayImMessages`, `RayImPendings`, `RayImProfiles`, `RayMp3Files`, `RayMp3Tokens`, `RayShoutboxMessages`, `RayVideoFiles`, `RayVideoTokens`, `RayVideo_commentsFiles`, `RayVideo_commentsTokens`, `sys_objects_search`, `sys_shared_sites`, `sys_stat_site`, `sys_alerts`, `sys_alerts_handlers`, `sys_injections`, `sys_injections_admin`, `sys_modules`, `sys_modules_file_tracks`, `sys_permalinks`, `sys_privacy_actions`, `sys_privacy_defaults`, `sys_privacy_groups`, `sys_privacy_members`, `sys_tags`, `sys_objects_tag`, `sys_menu_top`, `sys_transactions`, `sys_objects_actions`, `sys_objects_auths`, `sys_greetings`, `sys_zip_codes`, `sys_objects_vote`, `sys_objects_views`, `sys_box_download`, `sys_cron_jobs`, `sys_sbs_users`, `sys_sbs_entries`, `sys_sbs_types`, `sys_sbs_queue`, `sys_sbs_messages`, `sys_profiles_match_mails`, `sys_dnsbl_rules`, `sys_dnsbl_block_log`, `sys_dnsbluri_zones`, `sys_menu_mobile`;
 ALTER DATABASE DEFAULT CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
 
@@ -3508 +3508 @@
 
 
+-- --------------------------------------------------------
+
+CREATE TABLE IF NOT EXISTS `sys_menu_mobile` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `type` varchar(32) NOT NULL,
+  `menu` varchar(32) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `icon` varchar(255) NOT NULL,
+  `action` int(11) NOT NULL,
+  `action_data` varchar(255) NOT NULL,
+  `eval_bubble` text NOT NULL,
+  `eval_hidden` text NOT NULL,
+  `order` int(11) NOT NULL,
+  `active` int(11) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+INSERT INTO `sys_menu_mobile` (`type`, `menu`, `title`, `icon`, `action`, `action_data`, `eval_bubble`, `eval_hidden`, `order`, `active`) VALUES
+('system', 'homepage', '_sys_mobile_status', 'home_status.png', 1, '', '', '', 1, 1),
+('system', 'homepage', '_sys_mobile_mail', 'home_messages.png', 3, '', 'return getNewLettersNum({member_id});', '', 2, 1),
+('system', 'homepage', '_sys_mobile_friends', 'home_friends.png', 4, '', 'return getFriendRequests({member_id});', '', 3, 1),
+('system', 'homepage', '_sys_mobile_info', 'home_info.png', 5, '', '', '', 4, 1),
+('system', 'homepage', '_sys_mobile_search', 'home_search.png', 6, '', '', '', 5, 1),
+('system', 'profile', '_sys_mobile_profile_info', '', 8, '', '', '', 1, 1),
+('system', 'profile', '_sys_mobile_profile_contact', '', 3, '', '', '', 2, 1),
+('system', 'profile', '_sys_mobile_profile_friends', '', 4, '', 'return getFriendNumber(''{profile_id}'');', '', 3, 1);
+

trunk/modules/boonex/map_profiles/install/langs/en.php

@@ -59 +59 @@
     '_bx_map_%d_members' => '%d members',
     '_bx_map_unknown_city' => 'Unknown',
+    '_bx_map_location' => 'Location',
 );
 

trunk/modules/boonex/map_profiles/install/sql/install.sql

@@ -190 +190 @@
 ('map_profiles', 'view_location', '_bx_map_privacy_view_location', '3');
 
+-- mobile
+
+SET @iMaxOrderHomepage = (SELECT MAX(`order`)+1 FROM `sys_menu_mobile` WHERE `menu` = 'homepage');
+SET @iMaxOrderProfile = (SELECT MAX(`order`)+1 FROM `sys_menu_mobile` WHERE `menu` = 'profile');
+INSERT INTO `sys_menu_mobile` (`type`, `menu`, `title`, `icon`, `action`, `action_data`, `eval_bubble`, `eval_hidden`, `order`, `active`) VALUES
+('bx_map', 'homepage', '_bx_map_location', 'home_location.png', 2, '', '', '', @iMaxOrderHomepage, 1),
+('bx_map', 'profile', '_bx_map_location', '', 2, '', '', '', @iMaxOrderProfile, 1);
+

trunk/modules/boonex/map_profiles/install/sql/uninstall.sql

@@ -38 +38 @@
 -- privacy
 DELETE FROM `sys_privacy_actions` WHERE `module_uri` = 'map_profiles';
+
+-- mobile
+
+DELETE FROM `sys_menu_mobile` WHERE `type` = 'bx_map';
+

trunk/modules/boonex/news/classes/BxNewsModule.php

@@ -162 +162 @@
 
     /**
+     * View list of latest news from mobile app
+     */
+    function actionMobileLatestNews() {
+
+        bx_import('BxDolMobileTemplate');
+        $oMobileTemplate = new BxDolMobileTemplate($this->_oConfig, $this->_oDb);
+        $oMobileTemplate->pageStart();
+
+        $sCaption = _t('_news_bcaption_latest');
+
+        $aEntries = $this->_oDb->getEntries(array(
+            'sample_type' => 'all',
+            'sample_params' => '',
+            'viewer_type' => $this->_oTextData->getViewerType(), 
+            'start' => 0, 
+            'count' => 10,
+            'filter_value' => '',
+        ));
+
+        if (empty($aEntries)) {
+            $oMobileTemplate->displayNoData($sCaption);
+            return;
+        }
+
+        foreach ($aEntries as $aEntry) {
+            $aVars = array (
+                'content' => '<h2>' . $aEntry['caption'] . '</h2>' . getLocaleDate($aEntry['when_uts'], BX_DOL_LOCALE_DATE),
+                'url' => bx_js_string(BX_DOL_URL_ROOT . $this->_oConfig->getBaseUri() . 'mobile_entry/' . $aEntry['id']),
+            );
+            echo $oMobileTemplate->parseHtmlByName('mobile_row.html', $aVars); 
+        }
+
+        $oMobileTemplate->pageCode($sCaption, false);
+    }
+
+    /**
+     * News entry view from mobile app
+     */
+    function actionMobileEntry($iId) {
+        
+        bx_import('BxDolMobileTemplate');
+        $oMobileTemplate = new BxDolMobileTemplate($this->_oConfig, $this->_oDb);
+        $oMobileTemplate->pageStart();
+
+        $aParams = array(
+            'sample_type' => 'id', 
+            'id' => (int)$iId,
+        );
+        $aEntry = $this->_oDb->getEntries($aParams);
+
+        if (empty($aEntry)) {
+            $oMobileTemplate->displayPageNotFound();
+            return;
+        }
+    
+        echo '<h1>' . $aEntry['caption'] . '</h1>';
+        echo getLocaleDate($aEntry['when_uts'], BX_DOL_LOCALE_DATE);
+        echo $aEntry['content'];
+
+        $oMobileTemplate->pageCode($aEntry['caption']);
+    }
+
+    /**
      * Private methods.
      */

trunk/modules/boonex/news/install/sql/install.sql

@@ -201 +201 @@
 INSERT INTO `sys_cron_jobs` (`name`, `time`, `class`, `file`, `eval`) VALUES
 ('bx_news', '*/5 * * * *', 'BxNewsCron', 'modules/boonex/news/classes/BxNewsCron.php', '');
+
+-- mobile
+
+SET @iMaxOrderHomepage = (SELECT MAX(`order`)+1 FROM `sys_menu_mobile` WHERE `menu` = 'homepage');
+INSERT INTO `sys_menu_mobile` (`type`, `menu`, `title`, `icon`, `action`, `action_data`, `eval_bubble`, `eval_hidden`, `order`, `active`) VALUES
+('bx_news', 'homepage', '_news_bcaption_view_main', '{site_url}modules/boonex/news/templates/base/images/icons/mobile_icon.png', 100, '{site_url}modules/?r=news/mobile_latest_news/', '', '', @iMaxOrderHomepage, 0);
+

trunk/modules/boonex/news/install/sql/uninstall.sql

@@ -38 +38 @@
 
 DELETE FROM `sys_cron_jobs` WHERE `name`='bx_news';
+
+-- mobile
+
+DELETE FROM `sys_menu_mobile` WHERE `type` = 'bx_news';
+

trunk/modules/boonex/photos/install/sql/install.sql

@@ -284 +284 @@
 SET @iHandler := LAST_INSERT_ID();
 INSERT INTO `sys_alerts` (`unit`, `action`, `handler_id`) VALUES ('profile', 'delete', @iHandler);
+
+-- mobile
+
+SET @iMaxOrderHomepage = (SELECT MAX(`order`)+1 FROM `sys_menu_mobile` WHERE `menu` = 'homepage');
+SET @iMaxOrderProfile = (SELECT MAX(`order`)+1 FROM `sys_menu_mobile` WHERE `menu` = 'profile');
+INSERT INTO `sys_menu_mobile` (`type`, `menu`, `title`, `icon`, `action`, `action_data`, `eval_bubble`, `eval_hidden`, `order`, `active`) VALUES
+('[db_prefix]', 'homepage', '_bx_photos', 'home_images.png', 7, '', '', '', @iMaxOrderHomepage, 1),
+('[db_prefix]', 'profile', '_bx_photos', '', 7, '', 'return BxDolXMLRPCMedia::_getMediaCount(''photo'', ''{profile_id}'', ''{member_id}'');', '', @iMaxOrderProfile, 1);
+

trunk/modules/boonex/photos/install/sql/uninstall.sql

@@ -62 +62 @@
 DELETE FROM `sys_alerts` WHERE `handler_id` = @iHandler;
 DELETE FROM `sys_alerts_handlers` WHERE `id` = @iHandler;
+
+-- mobile
+
+DELETE FROM `sys_menu_mobile` WHERE `type` = '[db_prefix]';
+

trunk/modules/boonex/sounds/install/sql/install.sql

@@ -248 +248 @@
 SET @iHandler := LAST_INSERT_ID();
 INSERT INTO `sys_alerts` (`unit`, `action`, `handler_id`) VALUES ('profile', 'delete', @iHandler);
+
+-- mobile
+
+SET @iMaxOrderHomepage = (SELECT MAX(`order`)+1 FROM `sys_menu_mobile` WHERE `menu` = 'homepage');
+SET @iMaxOrderProfile = (SELECT MAX(`order`)+1 FROM `sys_menu_mobile` WHERE `menu` = 'profile');
+INSERT INTO `sys_menu_mobile` (`type`, `menu`, `title`, `icon`, `action`, `action_data`, `eval_bubble`, `eval_hidden`, `order`, `active`) VALUES
+('[db_prefix]', 'homepage', '_bx_sounds', 'home_sounds.png', 9, '', '', '', @iMaxOrderHomepage, 1),
+('[db_prefix]', 'profile', '_bx_sounds', '', 9, '', 'return BxDolXMLRPCMedia::_getMediaCount(''music'', ''{profile_id}'', ''{member_id}'')', '', @iMaxOrderProfile, 1);
+

trunk/modules/boonex/sounds/install/sql/uninstall.sql

@@ -63 +63 @@
 DELETE FROM `sys_alerts` WHERE `handler_id` = @iHandler;
 DELETE FROM `sys_alerts_handlers` WHERE `id` = @iHandler;
+
+-- mobile
+
+DELETE FROM `sys_menu_mobile` WHERE `type` = '[db_prefix]';
+

trunk/modules/boonex/videos/install/sql/install.sql

@@ -251 +251 @@
 SET @iHandler := LAST_INSERT_ID();
 INSERT INTO `sys_alerts` (`unit`, `action`, `handler_id`) VALUES ('profile', 'delete', @iHandler);
+
+-- mobile
+
+SET @iMaxOrderHomepage = (SELECT MAX(`order`)+1 FROM `sys_menu_mobile` WHERE `menu` = 'homepage');
+SET @iMaxOrderProfile = (SELECT MAX(`order`)+1 FROM `sys_menu_mobile` WHERE `menu` = 'profile');
+INSERT INTO `sys_menu_mobile` (`type`, `menu`, `title`, `icon`, `action`, `action_data`, `eval_bubble`, `eval_hidden`, `order`, `active`) VALUES
+('[db_prefix]', 'homepage', '_bx_videos', 'home_videos.png', 8, '', '', '',  @iMaxOrderHomepage, 1),
+('[db_prefix]', 'profile', '_bx_videos', '', 8, '', 'return BxDolXMLRPCMedia::_getMediaCount(''video'', ''{profile_id}'', ''{member_id}'')', '', @iMaxOrderProfile, 1);
+

trunk/modules/boonex/videos/install/sql/uninstall.sql

@@ -63 +63 @@
 DELETE FROM `sys_alerts` WHERE `handler_id` = @iHandler;
 DELETE FROM `sys_alerts_handlers` WHERE `id` = @iHandler;
+
+
+-- mobile
+
+DELETE FROM `sys_menu_mobile` WHERE `type` = '[db_prefix]';
+

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",