UNA Market like on Boonex site: Store.

modules/boonex/english/data/langs/system/en.xml

@@ -624,9 +624,9 @@
 	<string name="_adm_err_modules_wrong_version"><![CDATA[The module has incompatible version]]></string>
 	<string name="_adm_err_modules_wrong_version_script"><![CDATA[The module is not compatible with your version of Trident]]></string>
 	<string name="_adm_err_modules_wrong_version_script_update"><![CDATA[The new version of {0} module isn't compatible with your version of Trident. Please upgrade Trident first (Studio &gt; Dashboard &gt; Version) and then try to upgrade the module.]]></string>
-	<string name="_adm_err_oauth_cannot_get_token"><![CDATA[Cannot connect to <b>BoonEx</b>. Please try again later.]]></string>
-	<string name="_adm_err_oauth_cannot_read_answer"><![CDATA[Cannot get a valid answer from <b>BoonEx</b>. Please try again later.]]></string>
-	<string name="_adm_err_oauth_empty_key_secret"><![CDATA[You need to enter Key and Secret provided by <b>BoonEx</b> in Settings -> General.]]></string>
+	<string name="_adm_err_oauth_cannot_get_token"><![CDATA[Cannot connect to <b>UNA</b>. Please try again later.]]></string>
+	<string name="_adm_err_oauth_cannot_read_answer"><![CDATA[Cannot get a valid answer from <b>UNA</b>. Please try again later.]]></string>
+	<string name="_adm_err_oauth_empty_key_secret"><![CDATA[You need to enter Key and Secret provided by <b>UNA</b> in Settings -> General.]]></string>
 	<string name="_adm_err_operation_failed"><![CDATA[Operation failed. Please report.]]></string>
 	<string name="_adm_form_btn_displays_cancel"><![CDATA[Cancel]]></string>
 	<string name="_adm_form_btn_displays_edit"><![CDATA[Edit display]]></string>
@@ -871,7 +871,7 @@
 	<string name="_adm_msg_modules_success_enable"><![CDATA[The package was enabled successfully]]></string>
 	<string name="_adm_msg_modules_success_install"><![CDATA[The package was installed successfully]]></string>
 	<string name="_adm_msg_modules_success_uninstall"><![CDATA[The package was uninstalled successfully]]></string>
-	<string name="_adm_msg_oauth_need_authorize"><![CDATA[You need to to login into your <b>BoonEx</b> account to get data. Click <a href="{0}">here</a> to login.]]></string>
+	<string name="_adm_msg_oauth_need_authorize"><![CDATA[You need to to login into your <b>UNA</b> account to get data. Click <a href="{0}">here</a> to login.]]></string>
 	<string name="_adm_nav_btn_current_icon_image_delete"><![CDATA[Delete]]></string>
 	<string name="_adm_nav_btn_items_add"><![CDATA[Add]]></string>
 	<string name="_adm_nav_btn_items_cancel"><![CDATA[Cancel]]></string>
@@ -1181,8 +1181,8 @@
 	<string name="_adm_stg_cpt_option_sys_ftp_password"><![CDATA[FTP server password]]></string>
 	<string name="_adm_stg_cpt_option_sys_install_time"><![CDATA[Installation date]]></string>
 	<string name="_adm_stg_cpt_option_sys_live_updates_interval"><![CDATA[Live updates interval (in milliseconds)]]></string>
-	<string name="_adm_stg_cpt_option_sys_oauth_key"><![CDATA[BoonEx account key]]></string>
-	<string name="_adm_stg_cpt_option_sys_oauth_secret"><![CDATA[BoonEx account secret]]></string>
+	<string name="_adm_stg_cpt_option_sys_oauth_key"><![CDATA[UNA account key]]></string>
+	<string name="_adm_stg_cpt_option_sys_oauth_secret"><![CDATA[UNA account secret]]></string>
 	<string name="_adm_stg_cpt_option_sys_page_cache_enable"><![CDATA[Enable Page cache]]></string>
 	<string name="_adm_stg_cpt_option_sys_page_cache_engine"><![CDATA[Page cache engine (other than File option may require custom server setup)]]></string>
 	<string name="_adm_stg_cpt_option_sys_pb_cache_enable"><![CDATA[Enable page blocks cache]]></string>
@@ -1294,7 +1294,7 @@
 	<string name="_adm_txt_modules_install"><![CDATA[Install]]></string>
 	<string name="_adm_txt_modules_install_language"><![CDATA[Install language:]]></string>
 	<string name="_adm_txt_modules_login"><![CDATA[Login]]></string>
-	<string name="_adm_txt_modules_market"><![CDATA[BoonEx Market]]></string>
+	<string name="_adm_txt_modules_market"><![CDATA[UNA Market]]></string>
 	<string name="_adm_txt_modules_move_sources"><![CDATA[Move source files:]]></string>
 	<string name="_adm_txt_modules_operation_update"><![CDATA[Installation of update <b>{0}</b> from {1} up to {2}]]></string>
 	<string name="_adm_txt_modules_package_module"><![CDATA[Module]]></string>
@@ -1764,7 +1764,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_inst_conf_desc_db_user"><![CDATA[Your MySQL database user name with read/write access.]]></string>
 	<string name="_sys_inst_conf_desc_language"><![CDATA[Language to install by default.]]></string>
 	<string name="_sys_inst_conf_desc_profiles"><![CDATA[Profiles module to install by default.]]></string>
-	<string name="_sys_inst_conf_desc_oauth_key_secret"><![CDATA[<a target="_blank" href="http://www.boonex.com/oauth/key_and_secret">Get BoonEx Key & Secret</a>]]></string>
+	<string name="_sys_inst_conf_desc_oauth_key_secret"><![CDATA[<a target="_blank" href="http://www.una.io/page/kands-manage">Get UNA Key & Secret</a>]]></string>
 	<string name="_sys_inst_conf_desc_path_to_binary"><![CDATA[If '{0}' binary doesn't exist, you need to install <a target="_blank" href="http://www.imagemagick.org/">ImageMagick</a>.]]></string>
 	<string name="_sys_inst_conf_desc_root_dir"><![CDATA[Path to directory where Trident files are stored.]]></string>
 	<string name="_sys_inst_conf_desc_site_email"><![CDATA[Email to send site messages from.]]></string>
@@ -1783,8 +1783,8 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_inst_conf_field_db_user"><![CDATA[Database user]]></string>
 	<string name="_sys_inst_conf_field_language"><![CDATA[Language]]></string>
 	<string name="_sys_inst_conf_field_profiles"><![CDATA[Profiles]]></string>
-	<string name="_sys_inst_conf_field_oauth_key"><![CDATA[BoonEx key]]></string>
-	<string name="_sys_inst_conf_field_oauth_secret"><![CDATA[BoonEx secret]]></string>
+	<string name="_sys_inst_conf_field_oauth_key"><![CDATA[UNA key]]></string>
+	<string name="_sys_inst_conf_field_oauth_secret"><![CDATA[UNA secret]]></string>
 	<string name="_sys_inst_conf_field_path_to_binary"><![CDATA[Path to '{0}' binary]]></string>
 	<string name="_sys_inst_conf_field_root_dir"><![CDATA[Site directory]]></string>
 	<string name="_sys_inst_conf_field_site_email"><![CDATA[Site e-mail]]></string>
@@ -1795,7 +1795,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_inst_conf_no_example"><![CDATA[no example]]></string>
 	<string name="_sys_inst_conf_not_found"><![CDATA[<span style="color:red">Not found</span>]]></string>
 	<string name="_sys_inst_conf_section_db_config"><![CDATA[DB config]]></string>
-	<string name="_sys_inst_conf_section_link_with_market"><![CDATA[Link with BoonEx market]]></string>
+	<string name="_sys_inst_conf_section_link_with_market"><![CDATA[Link with UNA market]]></string>
 	<string name="_sys_inst_conf_section_modules"><![CDATA[Modules]]></string>
 	<string name="_sys_inst_conf_section_paths"><![CDATA[Site paths]]></string>
 	<string name="_sys_inst_conf_section_site_info"><![CDATA[Site info]]></string>
@@ -2000,7 +2000,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_page_block_title_std_dash_host_tools"><![CDATA[Host Tools]]></string>
 	<string name="_sys_page_block_title_std_dash_cache"><![CDATA[Cache]]></string>
 	<string name="_sys_page_block_title_terms"><![CDATA[Terms of Service]]></string>
-	<string name="_sys_page_lang_block_about"><![CDATA[This site is powered by BoonEx Trident. The rest is a mystery.]]></string>
+	<string name="_sys_page_lang_block_about"><![CDATA[This site is powered by UNA. The rest is a mystery.]]></string>
 	<string name="_sys_page_lang_block_terms"><![CDATA[Our terms of use.]]></string>
 	<string name="_sys_page_lang_block_privacy"><![CDATA[Our privacy policy.]]></string>
 	<string name="_sys_page_title_about"><![CDATA[About]]></string>

modules/boonex/russian/data/langs/system/ru.xml

@@ -624,9 +624,9 @@
 	<string name="_adm_err_modules_wrong_version"><![CDATA[Модуль имеет несовместимую версию]]></string>
 	<string name="_adm_err_modules_wrong_version_script"><![CDATA[Модуль несовместим с Вашей версией Trident]]></string>
 	<string name="_adm_err_modules_wrong_version_script_update"><![CDATA[Новая версия модуля {0} несовместима с Вашей версией Trident. Пожалуйста, сначала обновите Trident (Студия &gt; Панель &gt; Версия) и затем попробуйте обновить модуль.]]></string>
-	<string name="_adm_err_oauth_cannot_get_token"><![CDATA[Невозможно соединиться с <b>BoonEx</b>. Пожалуйста, попробуйте позднее.]]></string>
-	<string name="_adm_err_oauth_cannot_read_answer"><![CDATA[Невозможно получить отклик от <b>BoonEx</b>. Пожалуйста, попробуйте позднее.]]></string>
-	<string name="_adm_err_oauth_empty_key_secret"><![CDATA[Нужно ввести Key и Secret, предоставленные <b>BoonEx</b> в Настройки -> Общие.]]></string>
+	<string name="_adm_err_oauth_cannot_get_token"><![CDATA[Невозможно соединиться с <b>UNA</b>. Пожалуйста, попробуйте позднее.]]></string>
+	<string name="_adm_err_oauth_cannot_read_answer"><![CDATA[Невозможно получить отклик от <b>UNA</b>. Пожалуйста, попробуйте позднее.]]></string>
+	<string name="_adm_err_oauth_empty_key_secret"><![CDATA[Нужно ввести Key и Secret, предоставленные <b>UNA</b> в Настройки -> Общие.]]></string>
 	<string name="_adm_err_operation_failed"><![CDATA[Операция не удалась. Пожалуйста, оповестите нас.]]></string>
 	<string name="_adm_form_btn_displays_cancel"><![CDATA[Отменить]]></string>
 	<string name="_adm_form_btn_displays_edit"><![CDATA[Редактировать дисплей]]></string>
@@ -871,7 +871,7 @@
 	<string name="_adm_msg_modules_success_enable"><![CDATA[Пакет удачно подключён]]></string>
 	<string name="_adm_msg_modules_success_install"><![CDATA[Пакет удачно установлен]]></string>
 	<string name="_adm_msg_modules_success_uninstall"><![CDATA[Пакет удачно отменён]]></string>
-	<string name="_adm_msg_oauth_need_authorize"><![CDATA[Вам нужно зайти в свой <b>BoonEx</b> аккаунт, чтобы запросить данные. Нажмите <a href="{0}">здесь</a> для входа.]]></string>
+	<string name="_adm_msg_oauth_need_authorize"><![CDATA[Вам нужно зайти в свой <b>UNA</b> аккаунт, чтобы запросить данные. Нажмите <a href="{0}">здесь</a> для входа.]]></string>
 	<string name="_adm_nav_btn_current_icon_image_delete"><![CDATA[Удалить]]></string>
 	<string name="_adm_nav_btn_items_add"><![CDATA[Добавить]]></string>
 	<string name="_adm_nav_btn_items_cancel"><![CDATA[Отменить]]></string>
@@ -1181,8 +1181,8 @@
 	<string name="_adm_stg_cpt_option_sys_ftp_password"><![CDATA[FTP-сервер - Пароль]]></string>
 	<string name="_adm_stg_cpt_option_sys_install_time"><![CDATA[Дата установки]]></string>
 	<string name="_adm_stg_cpt_option_sys_live_updates_interval"><![CDATA[Интервал обновлений (в миллисекундах)]]></string>
-	<string name="_adm_stg_cpt_option_sys_oauth_key"><![CDATA[BoonEx-аккаунт - Key (ключ)]]></string>
-	<string name="_adm_stg_cpt_option_sys_oauth_secret"><![CDATA[BoonEx-аккаунт - Secret (секретное слово)]]></string>
+	<string name="_adm_stg_cpt_option_sys_oauth_key"><![CDATA[UNA-аккаунт - Key (ключ)]]></string>
+	<string name="_adm_stg_cpt_option_sys_oauth_secret"><![CDATA[UNA-аккаунт - Secret (секретное слово)]]></string>
 	<string name="_adm_stg_cpt_option_sys_page_cache_enable"><![CDATA[Задействовать кэш для Страниц]]></string>
 	<string name="_adm_stg_cpt_option_sys_page_cache_engine"><![CDATA[Кэш-движок для Страниц (значение, отличное от File, может потребовать дополнительной настройки сервера)]]></string>
 	<string name="_adm_stg_cpt_option_sys_pb_cache_enable"><![CDATA[Задействовать кэш для блоков страниц]]></string>
@@ -1294,7 +1294,7 @@
 	<string name="_adm_txt_modules_install"><![CDATA[Установить]]></string>
 	<string name="_adm_txt_modules_install_language"><![CDATA[Установить язык:]]></string>
 	<string name="_adm_txt_modules_login"><![CDATA[Войти]]></string>
-	<string name="_adm_txt_modules_market"><![CDATA[BoonEx Market]]></string>
+	<string name="_adm_txt_modules_market"><![CDATA[UNA Market]]></string>
 	<string name="_adm_txt_modules_move_sources"><![CDATA[Перенести файлы исходного кода:]]></string>
 	<string name="_adm_txt_modules_operation_update"><![CDATA[Установка обновления <b>{0}</b> от {1} до {2}]]></string>
 	<string name="_adm_txt_modules_package_module"><![CDATA[Модуль]]></string>
@@ -1764,7 +1764,7 @@
 	<string name="_sys_inst_conf_desc_db_user"><![CDATA[MySQL БД - имя пользователя с правами чтения/записи.]]></string>
 	<string name="_sys_inst_conf_desc_language"><![CDATA[Язык для установки по умолчанию.]]></string>
 	<string name="_sys_inst_conf_desc_profiles"><![CDATA[Модуль профилей для установки по умолчанию.]]></string>
-	<string name="_sys_inst_conf_desc_oauth_key_secret"><![CDATA[<a target="_blank" href="http://www.boonex.com/oauth/key_and_secret">Получить BoonEx Key & Secret</a>]]></string>
+	<string name="_sys_inst_conf_desc_oauth_key_secret"><![CDATA[<a target="_blank" href="http://www.una.io/page/kands-manage">Получить UNA Key & Secret</a>]]></string>
 	<string name="_sys_inst_conf_desc_path_to_binary"><![CDATA[If '{0}' программа не существует, нужно установить <a target="_blank" href="http://www.imagemagick.org/">ImageMagick</a>.]]></string>
 	<string name="_sys_inst_conf_desc_root_dir"><![CDATA[Путь к директории, где содержатся файлы Trident.]]></string>
 	<string name="_sys_inst_conf_desc_site_email"><![CDATA[Имейл, с которого будут отправляться сообщения от сайта.]]></string>
@@ -1783,8 +1783,8 @@
 	<string name="_sys_inst_conf_field_db_user"><![CDATA[База Данных - имя пользователя]]></string>
 	<string name="_sys_inst_conf_field_language"><![CDATA[Язык]]></string>
 	<string name="_sys_inst_conf_field_profiles"><![CDATA[Профили]]></string>
-	<string name="_sys_inst_conf_field_oauth_key"><![CDATA[BoonEx key]]></string>
-	<string name="_sys_inst_conf_field_oauth_secret"><![CDATA[BoonEx secret]]></string>
+	<string name="_sys_inst_conf_field_oauth_key"><![CDATA[UNA key]]></string>
+	<string name="_sys_inst_conf_field_oauth_secret"><![CDATA[UNA secret]]></string>
 	<string name="_sys_inst_conf_field_path_to_binary"><![CDATA[Путь к '{0}' программе]]></string>
 	<string name="_sys_inst_conf_field_root_dir"><![CDATA[Директория сайта]]></string>
 	<string name="_sys_inst_conf_field_site_email"><![CDATA[Имейл сайта]]></string>
@@ -1795,7 +1795,7 @@
 	<string name="_sys_inst_conf_no_example"><![CDATA[нет примера]]></string>
 	<string name="_sys_inst_conf_not_found"><![CDATA[<span style="color:red">Не найдено</span>]]></string>
 	<string name="_sys_inst_conf_section_db_config"><![CDATA[БД - конфигурация]]></string>
-	<string name="_sys_inst_conf_section_link_with_market"><![CDATA[Связать с BoonEx market]]></string>
+	<string name="_sys_inst_conf_section_link_with_market"><![CDATA[Связать с UNA market]]></string>
 	<string name="_sys_inst_conf_section_modules"><![CDATA[Модули]]></string>
 	<string name="_sys_inst_conf_section_paths"><![CDATA[пути сайта]]></string>
 	<string name="_sys_inst_conf_section_site_info"><![CDATA[Инфо сайта]]></string>
@@ -2000,7 +2000,7 @@
 	<string name="_sys_page_block_title_std_dash_host_tools"><![CDATA[Хост - Инструменты]]></string>
 	<string name="_sys_page_block_title_std_dash_cache"><![CDATA[Кэш]]></string>
 	<string name="_sys_page_block_title_terms"><![CDATA[Правила пользования]]></string>
-	<string name="_sys_page_lang_block_about"><![CDATA[Этот сайт регулируется BoonEx Trident. Остальное - тайна, покрытая мраком.]]></string>
+	<string name="_sys_page_lang_block_about"><![CDATA[Этот сайт сделан на UNA. Остальное - тайна, покрытая мраком.]]></string>
 	<string name="_sys_page_lang_block_terms"><![CDATA[Правила пользования нашим сайтом.]]></string>
 	<string name="_sys_page_lang_block_privacy"><![CDATA[Политика конфиденциальности нашего сайта.]]></string>
 	<string name="_sys_page_title_about"><![CDATA[Об...]]></string>

studio/classes/BxDolStudioInstallerUtils.php

@@ -9,14 +9,8 @@
 
 bx_import('BxDolLanguages');
 
-define('BX_DOL_STORE_BOONEX', 'boonex');
-define('BX_DOL_STORE_UNA', 'una');
-
-define('BX_DOL_UNITY_URL_ROOT', 'https://www.boonex.com/');
-define('BX_DOL_UNITY_URL_MARKET', BX_DOL_UNITY_URL_ROOT . 'market/');
-
-define('BX_DOL_UNA_URL_ROOT', 'https://d.una.io/');
-define('BX_DOL_UNA_URL_MARKET', BX_DOL_UNA_URL_ROOT . 'm/market_api/');
+define('BX_DOL_MARKET_URL_ROOT', 'https://d.una.io/');
+define('BX_DOL_MARKET_URL_INTEGRATION', BX_DOL_MARKET_URL_ROOT . 'm/market_api/');
 
 define('BX_DOL_STUDIO_IU_RC_SUCCESS', 0);
 define('BX_DOL_STUDIO_IU_RC_FAILED', 1);
@@ -25,9 +19,8 @@ define('BX_DOL_STUDIO_IU_RC_SCHEDULED', 2);
 class BxDolStudioInstallerUtils extends BxDolInstallerUtils implements iBxDolSingleton
 {
 	protected $bUseFtp;
-	protected $sAuthorizedAccessClass;
 
-	protected $sStore;
+	protected $sAuthorizedAccessClass;
 	protected $sStoreDataUrlPublic;
 
     public function __construct()
@@ -39,18 +32,8 @@ class BxDolStudioInstallerUtils extends BxDolInstallerUtils implements iBxDolSin
 
         $this->bUseFtp = BX_FORCE_USE_FTP_FILE_TRANSFER;
 
-        $this->sStore = BX_DOL_STORE_UNA;
-        switch($this->sStore) {
-        	case BX_DOL_STORE_UNA:
-        		$this->sAuthorizedAccessClass = 'BxDolStudioOAuthOAuth2';
-        		$this->sStoreDataUrlPublic = BX_DOL_UNA_URL_MARKET;
-        		break;
-
-        	case BX_DOL_STORE_BOONEX:
-        		$this->sAuthorizedAccessClass = 'BxDolStudioOAuthPlugin';
-        		$this->sStoreDataUrlPublic = BX_DOL_UNITY_URL_MARKET;		
-        		break;
-        }
+		$this->sAuthorizedAccessClass = 'BxDolStudioOAuthOAuth2';
+		$this->sStoreDataUrlPublic = BX_DOL_MARKET_URL_INTEGRATION;
     }
 
     /**
@@ -318,14 +301,12 @@ class BxDolStudioInstallerUtils extends BxDolInstallerUtils implements iBxDolSin
 
     public function checkModules($bAuthorizedAccess = false)
     {
-    	if($bAuthorizedAccess) {
-    		if($this->sStore == BX_DOL_STORE_UNA)
-    			$aParams = array('method' => 'browse_purchased', 'domain' => BX_DOL_URL_ROOT, 'products' => $this->getInstalledInfoShort());
-    		else
-    			$aParams = array('dol_type' => 'purchased_products', 'dol_domain' => BX_DOL_URL_ROOT, 'dol_products' => $this->getInstalledInfoShort());
-
-        	$aProducts = $this->getAccessObject(true)->loadItems($aParams);
-    	}
+    	if($bAuthorizedAccess)
+        	$aProducts = $this->getAccessObject(true)->loadItems(array(
+        		'method' => 'browse_purchased', 
+        		'domain' => BX_DOL_URL_ROOT, 
+        		'products' => $this->getInstalledInfoShort()
+        	));
     	else
 			$aProducts = $this->getAccessObject(false)->load($this->sStoreDataUrlPublic . 'json_browse_purchased', array('key' => getParam('sys_oauth_key')));
 
@@ -346,14 +327,11 @@ class BxDolStudioInstallerUtils extends BxDolInstallerUtils implements iBxDolSin
     {
         $sProducts = $this->getInstalledInfoShort();
 
-        if($bAuthorizedAccess) {
-        	if($this->sStore == BX_DOL_STORE_UNA)
-        		$aParams = array('method' => 'browse_updates', 'products' => $sProducts);
-        	else
-        		$aParams = array('dol_type' => 'available_updates', 'dol_products' => $sProducts);
-
-	        return $this->getAccessObject(true)->loadItems($aParams);
-        }
+        if($bAuthorizedAccess)
+	        return $this->getAccessObject(true)->loadItems(array(
+	        	'method' => 'browse_updates', 
+	        	'products' => $sProducts
+	        ));
 
 		return $this->getAccessObject(false)->load($this->sStoreDataUrlPublic . 'json_browse_updates', array(
 			'key' => getParam('sys_oauth_key'),
@@ -363,12 +341,10 @@ class BxDolStudioInstallerUtils extends BxDolInstallerUtils implements iBxDolSin
 
     public function downloadFileAuthorized($iFileId)
     {
-    	if($this->sStore == BX_DOL_STORE_UNA)
-    		$aParams = array('method' => 'download_file', 'file_id' => $iFileId);
-    	else
-			$aParams = array('dol_type' => 'product_file', 'dol_file_id' => $iFileId);
-
-		$aItem = $this->getAccessObject(true)->loadItems($aParams);
+		$aItem = $this->getAccessObject(true)->loadItems(array(
+			'method' => 'download_file', 
+			'file_id' => $iFileId
+		));
 
 		return $this->downloadFileInit($aItem, array('module_name' => $aItem['module_name']));
     }

studio/classes/BxDolStudioOAuth.php

@@ -83,7 +83,6 @@ class BxDolStudioOAuth extends BxDol
 	protected function unsetAuthorizedUser()
 	{
 		$this->oSession->unsetValue('sys_oauth_token');
-		$this->oSession->unsetValue('sys_oauth_secret');
         $this->oSession->unsetValue('sys_oauth_authorized');
 		$this->oSession->unsetValue('sys_oauth_authorized_user');
 	}

studio/classes/BxDolStudioOAuthOAuth1.php

@@ -8,7 +8,7 @@
  */
 
 
-define('BX_DOL_OAUTH_URL_BASE', BX_DOL_UNITY_URL_ROOT . 'scripts_public/');
+define('BX_DOL_OAUTH_URL_BASE', BX_DOL_MARKET_URL_ROOT . 'scripts_public/');
 define('BX_DOL_OAUTH_URL_REQUEST_TOKEN', BX_DOL_OAUTH_URL_BASE . 'oauth_request_token.php5');
 define('BX_DOL_OAUTH_URL_AUTHORIZE', BX_DOL_OAUTH_URL_BASE . 'oauth_authorize.php5');
 define('BX_DOL_OAUTH_URL_ACCESS_TOKEN', BX_DOL_OAUTH_URL_BASE . 'oauth_access_token.php5');
@@ -20,6 +20,13 @@ class BxDolStudioOAuthOAuth1 extends BxDolStudioOAuth
     {
     	parent::__construct();
     }
+
+	protected function unsetAuthorizedUser()
+	{
+		$this->oSession->unsetValue('sys_oauth_secret');
+
+		parent::unsetAuthorizedUser();
+	}
 }
 
 /** @} */

studio/classes/BxDolStudioOAuthOAuth2.php

@@ -22,7 +22,7 @@ class BxDolStudioOAuthOAuth2 extends BxDolStudioOAuth implements iBxDolSingleton
 
         $this->sKey = getParam('sys_oauth_key');
         $this->sSecret = getParam('sys_oauth_secret');
-        $this->sApiUrl = BX_DOL_UNA_URL_ROOT . 'm/oauth2/';
+        $this->sApiUrl = BX_DOL_MARKET_URL_ROOT . 'm/oauth2/';
         $this->sScope = 'market';
         $this->sPageHandle = BX_DOL_URL_STUDIO . 'store.php?page=goodies';
         $this->sDataRetrieveMethod = 'post';