Skip to content

Commit 41a5344

Browse files
Cat7373Cat7373
committed
删除 PHP_Proxy 模块 -> launcher 清理
1 parent f466379 commit 41a5344

File tree

9 files changed

+4
-80
lines changed

9 files changed

+4
-80
lines changed

‎code/default/launcher/config.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ def recheck_module_path():
6262

6363
xxnet_port = get(["modules", "gae_proxy", "LISTEN_PORT"], 8087)
6464

65-
modules = ["gae_proxy", "launcher", "php_proxy", "x_tunnel"]
65+
modules = ["gae_proxy", "launcher", "x_tunnel"]
6666
for module in modules:
67-
if module not in ["launcher", "php_proxy"]:
67+
if module not in ["launcher"]:
6868
if not os.path.isdir(os.path.join(root_path, module)):
6969
del config[module]
7070
continue
@@ -86,9 +86,6 @@ def recheck_module_path():
8686
#if get(["modules", "gae_proxy", "control_port"], 0) == 0:
8787
# set(["modules", "gae_proxy", "control_port"], 8084)
8888

89-
if get(["modules", "php_proxy", "control_port"], 0) == 0:
90-
set(["modules", "php_proxy", "control_port"], 8083)
91-
9289
return need_save_config
9390

9491

‎code/default/launcher/lang/de_DE/LC_MESSAGES/messages.po‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,6 @@ msgstr ""
131131
msgid "Enable GAE proxy"
132132
msgstr ""
133133

134-
#: web_ui/config.html:98
135-
msgid "Enable PHP proxy"
136-
msgstr ""
137-
138134
#: web_ui/config.html:109
139135
msgid "System configuration options"
140136
msgstr ""
@@ -152,10 +148,6 @@ msgstr ""
152148
msgid "Configuring the service[%s]. This page will refresh within %s seconds."
153149
msgstr ""
154150

155-
#: web_ui/config.html:294
156-
msgid "PHP proxy"
157-
msgstr ""
158-
159151
#: web_ui/config.html:436
160152
msgid "Updating in progress ..."
161153
msgstr ""

‎code/default/launcher/lang/en_US/LC_MESSAGES/messages.po‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,6 @@ msgstr ""
111111
msgid "GAE Proxy"
112112
msgstr ""
113113

114-
msgid "PHP proxy"
115-
msgstr ""
116-
117114
msgid "Updating in progress ..."
118115
msgstr ""
119116

‎code/default/launcher/lang/es_VE/LC_MESSAGES/messages.po‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,6 @@ msgstr ""
131131
msgid "Enable GAE proxy"
132132
msgstr ""
133133

134-
#: web_ui/config.html:98
135-
msgid "Enable PHP proxy"
136-
msgstr ""
137-
138134
#: web_ui/config.html:109
139135
msgid "System configuration options"
140136
msgstr ""
@@ -152,14 +148,6 @@ msgstr ""
152148
msgid "Configuring the service[%s]. This page will refresh within %s seconds."
153149
msgstr ""
154150

155-
#: web_ui/config.html:294
156-
msgid "PHP proxy"
157-
msgstr ""
158-
159-
#: web_ui/config.html:436
160-
msgid "Updating in progress ..."
161-
msgstr ""
162-
163151
#: web_ui/config.html:496
164152
msgid "Updating ..."
165153
msgstr ""

‎code/default/launcher/lang/fa_IR/LC_MESSAGES/messages.po‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@ msgstr "پیکربندی سرویس [٪ s] را. این صفحه را در عر
112112
msgid "GAE Proxy"
113113
msgstr "GAE پروکسی"
114114

115-
msgid "PHP proxy"
116-
msgstr "PHP پروکسی"
117-
118115
msgid "Updating in progress ..."
119116
msgstr "به روز رسانی در حال انجام ..."
120117

‎code/default/launcher/lang/ja_JP/LC_MESSAGES/messages.po‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,6 @@ msgstr ""
131131
msgid "Enable GAE proxy"
132132
msgstr ""
133133

134-
#: web_ui/config.html:98
135-
msgid "Enable PHP proxy"
136-
msgstr ""
137-
138134
#: web_ui/config.html:109
139135
msgid "System configuration options"
140136
msgstr ""
@@ -152,10 +148,6 @@ msgstr ""
152148
msgid "Configuring the service[%s]. This page will refresh within %s seconds."
153149
msgstr ""
154150

155-
#: web_ui/config.html:294
156-
msgid "PHP proxy"
157-
msgstr ""
158-
159151
#: web_ui/config.html:436
160152
msgid "Updating in progress ..."
161153
msgstr ""

‎code/default/launcher/lang/zh_CN/LC_MESSAGES/messages.po‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@ msgstr "正在配置服务[%s], 页面将在%s秒内刷新。"
112112
msgid "GAE Proxy"
113113
msgstr "GAE代理"
114114

115-
msgid "PHP proxy"
116-
msgstr "PHP代理"
117-
118115
msgid "Updating in progress ..."
119116
msgstr "更新进行中..."
120117

‎code/default/launcher/web_control.py‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -231,16 +231,14 @@ def req_config_handler(self):
231231
check_update = "stable"
232232

233233
data = '{ "check_update": "%s", "language": "%s", "popup_webui": %d, "allow_remote_connect": %d, \
234-
"show_systray": %d, "auto_start": %d, "show_detail": %d, "php_enable": %d, "gae_proxy_enable": %d, \
235-
"x_tunnel_enable": %d}' %\
234+
"show_systray": %d, "auto_start": %d, "show_detail": %d, "gae_proxy_enable": %d, "x_tunnel_enable": %d}' %\
236235
(check_update
237236
, config.get(["language"], i18n_translator.lang)
238237
, config.get(["modules", "launcher", "popup_webui"], 1)
239238
, config.get(["modules", "launcher", "allow_remote_connect"], 0)
240239
, config.get(["modules", "launcher", "show_systray"], 1)
241240
, config.get(["modules", "launcher", "auto_start"], 0)
242241
, config.get(["modules", "gae_proxy", "show_detail"], 0)
243-
, config.get(["modules", "php_proxy", "auto_start"], 0)
244242
, config.get(["modules", "gae_proxy", "auto_start"], 0)
245243
, config.get(["modules", "x_tunnel", "auto_start"], 0)
246244
)
@@ -343,19 +341,6 @@ def req_config_handler(self):
343341
module_init.stop("gae_proxy")
344342
self.load_module_menus()
345343
data = '{"res":"success"}'
346-
elif 'php_enable' in reqs :
347-
php_enable = int(reqs['php_enable'][0])
348-
if php_enable != 0 and php_enable != 1:
349-
data = '{"res":"fail, php_enable:%s"}' % php_enable
350-
else:
351-
config.set(["modules", "php_proxy", "auto_start"], php_enable)
352-
config.save()
353-
if php_enable:
354-
module_init.start("php_proxy")
355-
else:
356-
module_init.stop("php_proxy")
357-
self.load_module_menus()
358-
data = '{"res":"success"}'
359344
elif 'x_tunnel_enable' in reqs :
360345
x_tunnel_enable = int(reqs['x_tunnel_enable'][0])
361346
if x_tunnel_enable != 0 and x_tunnel_enable != 1:

‎code/default/launcher/web_ui/config.html‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,6 @@
105105
<input id="gae_proxy-enable" type="checkbox" data-toggle="switch" />
106106
</div> <!-- .span8 -->
107107
</div> <!-- .row-fluid -->
108-
<div class="row-fluid" >
109-
<div class="span4">{{ _( "Enable" ) }} PHP proxy</div> <!-- .span4 -->
110-
<div class="span8">
111-
<input id="php-enable" type="checkbox" data-toggle="switch" />
112-
</div> <!-- .span8 -->
113-
</div> <!-- .row-fluid -->
114108
<div class="row-fluid" >
115109
<div class="span4">{{ _( "Enable" ) }} X_tunnel</div> <!-- .span4 -->
116110
<div class="span8">
@@ -178,12 +172,6 @@
178172

179173
$( "#gae_proxy-enable").prop('checked', true);
180174
}
181-
if ( result['php_enable'] != 0 ) {
182-
$( "#php-enable").parent().removeClass('switch-off');
183-
$( "#php-enable").parent().addClass('switch-on');
184-
185-
$( "#php-enable").prop('checked', true);
186-
}
187175
if ( result['x_tunnel_enable'] != 0 ) {
188176
$( "#x-tunnel-enable").parent().removeClass('switch-off');
189177
$( "#x-tunnel-enable").parent().addClass('switch-on');
@@ -274,13 +262,6 @@
274262
setConfig(key, value);
275263
});
276264

277-
$('#php-enable').change(function() {
278-
var isChecked = $(this).is(':checked'),
279-
key = 'php_enable',
280-
value = isChecked ? 1 : 0;
281-
282-
setConfig(key, value);
283-
});
284265
$('#x-tunnel-enable').change(function() {
285266
var isChecked = $(this).is(':checked'),
286267
key = 'x_tunnel_enable',
@@ -303,7 +284,7 @@
303284
dataType: 'JSON',
304285
success: function(result) {
305286
if ( result['res'] == 'success' ) {
306-
if ( key == 'gae_proxy_enable' || key == 'php_enable' || key == 'x_tunnel_enable') {
287+
if ( key == 'gae_proxy_enable' || key == 'x_tunnel_enable') {
307288
restartingService(key);
308289
} else {
309290
tip('{{ _( "Settings saved successfully." ) }}', 'success');
@@ -332,8 +313,6 @@
332313

333314
if ( serviceNameSlug == 'gae_proxy_enable' ) {
334315
serviceName = '{{ _( "GAE Proxy" ) }}';
335-
} else if ( serviceNameSlug == 'php_enable' ) {
336-
serviceName = '{{ _( "PHP proxy" ) }}';
337316
} else if ( serviceNameSlug == 'x_tunnel_enable' ) {
338317
serviceName = '{{ _( "X_tunnel proxy" ) }}';
339318
} else {

0 commit comments

Comments
 (0)