Просмотр исходного кода

#2216 Add "Update channel" setting with Beta and Stable options.

Alex Trofimov 7 лет назад
Родитель
Сommit
665aeeed96

+ 3 - 2
inc/classes/BxDolUpgrader.php

@@ -9,7 +9,7 @@
 
 class BxDolUpgrader extends BxDol
 {
-    protected $_sUrlVersionCheck = 'https://v.una.io/beta/';
+    protected $_sUrlVersionCheck = 'https://v.una.io/';
     protected $_sError = false;
 
     /**
@@ -101,7 +101,8 @@ class BxDolUpgrader extends BxDol
 
     public function getVersionUpdateInfo ()
     {
-        $s = bx_file_get_contents($this->_sUrlVersionCheck, array ('v' => bx_get_ver()));
+        $sUrlVersionCheck = $this->_sUrlVersionCheck . ('beta' == getParam('sys_upgrade_channel') ? 'beta/' : '');
+        $s = bx_file_get_contents($sUrlVersionCheck, array ('v' => bx_get_ver()));
         if (!$s)
             return null;
 

+ 1 - 0
install/sql/system.sql

@@ -293,6 +293,7 @@ SET @iCategoryId = LAST_INSERT_ID();
 INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_error`, `order`) VALUES
 (@iCategoryId, 'sys_cron_time', '_adm_stg_cpt_option_sys_cron_time', '0', 'digit', '', '', '', 2),
 (@iCategoryId, 'sys_install_time', '_adm_stg_cpt_option_sys_install_time', '0', 'digit', '', '', '', 3),
+(@iCategoryId, 'sys_upgrade_channel', '_adm_stg_cpt_option_sys_upgrade_channel', 'beta', 'select', 'stable,beta', '', '', 4),
 (@iCategoryId, 'sys_revision', '_adm_stg_cpt_option_sys_revision', '0', 'digit', '', '', '', 5),
 (@iCategoryId, 'sys_eq_time', '_adm_stg_cpt_option_sys_eq_time', '0', 'digit', '', '', '', 6),
 (@iCategoryId, 'sys_push_queue_time', '_adm_stg_cpt_option_sys_push_queue_time', '0', 'digit', '', '', '', 7),

+ 1 - 0
modules/boonex/english/data/langs/system/en.xml

@@ -1331,6 +1331,7 @@
 	<string name="_adm_stg_cpt_option_sys_ftp_password"><![CDATA[FTP server password]]></string>
 	<string name="_adm_stg_cpt_option_sys_cron_time"><![CDATA[Last cron execution time]]></string>
 	<string name="_adm_stg_cpt_option_sys_install_time"><![CDATA[Installation date]]></string>
+	<string name="_adm_stg_cpt_option_sys_upgrade_channel"><![CDATA[Upgrade channel]]></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_maps_api_key"><![CDATA[Google Maps API key]]></string>
 	<string name="_adm_stg_cpt_option_sys_embed_default"><![CDATA[Embeds provider]]></string>

+ 2 - 1
modules/boonex/russian/data/langs/system/ru.xml

@@ -1330,7 +1330,8 @@
 	<string name="_adm_stg_cpt_option_sys_ftp_login"><![CDATA[FTP-сервер - Логин]]></string>
 	<string name="_adm_stg_cpt_option_sys_ftp_password"><![CDATA[FTP-сервер - Пароль]]></string>
 	<string name="_adm_stg_cpt_option_sys_cron_time"><![CDATA[Дата последнего запуска планировщика]]></string>
-	<string name="_adm_stg_cpt_option_sys_install_time"><![CDATA[Дата установки]]></string>
+    <string name="_adm_stg_cpt_option_sys_install_time"><![CDATA[Дата установки]]></string>
+    <string name="_adm_stg_cpt_option_sys_upgrade_channel"><![CDATA[Канал обновлений]]></string>
     <string name="_adm_stg_cpt_option_sys_live_updates_interval"><![CDATA[Интервал обновлений (в миллисекундах)]]></string>
     <string name="_adm_stg_cpt_option_sys_maps_api_key"><![CDATA[Ключ Google Maps API]]></string>
     <string name="_adm_stg_cpt_option_sys_embed_default"><![CDATA[Поставщик встраиваемого кода]]></string>