Skip to content

Commit

Permalink
Merge remote-tracking branch 'lantis/multiple_fixes'
Browse files Browse the repository at this point in the history
  • Loading branch information
ericpaulbishop committed Feb 21, 2018
2 parents 9f9a271 + 38db3d9 commit 1acb1e9
Show file tree
Hide file tree
Showing 13 changed files with 105 additions and 105 deletions.
2 changes: 1 addition & 1 deletion package/gargoyle/files/www/data/timezones.txt
Expand Up @@ -11,7 +11,7 @@
"UTC-05:00 TiZ.EST5" "EST5EDT,M3.2.0/2,M11.1.0/2" "us"
"UTC-04:00 TiZ.UTC4" "UTC4" "south-america"
"UTC-04:00 TiZ.AST4" "AST4ADT,M3.2.0/2,M11.1.0/2" "us"
"UTC-04:00 TiZ.BRW" "BRWST4BRWDT,M10.3.0/0,M2.5.0/0" "south-america"
"UTC-04:00 TiZ.AMT" "AMT4AMST,M11.1.0/0,M2.3.0/0" "south-america"
"UTC-03:30 TiZ.NST3" "NST3:30NDT,M3.2.0/0:01,M11.1.0/0:01" "north-america"
"UTC-03:00 TiZ.WGST" "WGST3WGDT,M3.5.6/22,M10.5.6/23" "north-america"
"UTC-03:00 TiZ.BRT" "BRT3BRST,M11.1.0/0,M2.3.0/0" "south-america"
Expand Down
4 changes: 2 additions & 2 deletions package/gargoyle/files/www/js/restrictions.js
Expand Up @@ -304,8 +304,8 @@ function editRule()
}


editRuleType = editRuleType == "restriction_rule" ? "restriction_edit_rule.sh" : "whitelist_edit_rule.sh";
editRuleWindow = openPopupWindow(editRuleType, "edit", 560, 600);
var editRuleWinType = editRuleType == "restriction_rule" ? "restriction_edit_rule.sh" : "whitelist_edit_rule.sh";
editRuleWindow = openPopupWindow(editRuleWinType, "edit", 560, 600);

saveButton = createInput("button", editRuleWindow.document);
closeButton = createInput("button", editRuleWindow.document);
Expand Down
4 changes: 2 additions & 2 deletions package/gargoyle/files/www/js/time.js
Expand Up @@ -217,9 +217,9 @@ function timezoneChanged()
definitionTimezones = timezoneData[3];

newTimezoneDefinition = getSelectedValue("timezone");
if( getSelectedValue("region") == timezoneRegions[ definitionTimezones[previousTimezoneDefinition] ])
if(timezoneRegions[definitionTimezones[newTimezoneDefinition]] != timezoneRegions[definitionTimezones[previousTimezoneDefinition]])
{
setSelectedValue("region", timezoneRegions[ definitionTimezones[newTimezoneDefinition] ]);
setSelectedValue("region", timezoneRegions[definitionTimezones[newTimezoneDefinition]]);
updateServerList();
}

Expand Down
Expand Up @@ -30,13 +30,13 @@ TiZ.UTC6="Mexico";
TiZ.CST6="Central Time";
TiZ.UTC5="Colombia, Panama";
TiZ.EST5="Eastern Time";
TiZ.UTC4="Bolivia, Venezuela";
TiZ.UTC4="Bolivia, Brazil (Manaus), Venezuela";
TiZ.AST4="Atlantic Time";
TiZ.BRW="Brazil West";
TiZ.AMT="Brazil (Cuiaba)";
TiZ.NST3="Newfoundland";
TiZ.WGST="Greenland";
TiZ.BRT="Brazil East";
TiZ.UTC3="Argentina, Guyana";
TiZ.BRT="Brazil (Brasilia)";
TiZ.UTC3="Argentina, Brazil (Fortaleza), Guyana";
TiZ.UTC2="Mid-Atlantic";
TiZ.STD1="Azores";
TiZ.UTC0="Gambia, Liberia, Morocco";
Expand All @@ -53,13 +53,13 @@ TiZ.UTCm5c3="Bombay, Calcutta, Madras, New Delhi";
TiZ.UTCm6="Bangladesh, Russia";
TiZ.UTCm7="Thailand, Russia";
TiZ.UTCm8="China, Hong Kong, Singapore, Taiwan, Russia";
TiZ.AWSTm8="Australia, Western Australia";
TiZ.UTCm8c45="Australia, Eucla, Eyre Highway";
TiZ.AWSTm8="Australia (Western Australia)";
TiZ.UTCm8c45="Australia (Eucla, Eyre Highway)";
TiZ.UTCm9="Japan, Korea";
TiZ.ACSTm9c3="Australia, Northern Territory";
TiZ.ACDT="Australia, South Australia";
TiZ.AESTm10="Australia, Queensland";
TiZ.AEDT="Australia, New South Wales, Victoria, Tasmania";
TiZ.ACSTm9c3="Australia (Northern Territory)";
TiZ.ACDT="Australia (South Australia)";
TiZ.AESTm10="Australia (Queensland)";
TiZ.AEDT="Australia (New South Wales, Victoria, Tasmania)";
TiZ.UTCm10="Guam, Russia";
TiZ.UTCm11="Solomon Islands";
TiZ.UTCm12="Fiji";
Expand Down
Expand Up @@ -30,13 +30,13 @@ TiZ.UTC6="Mexico";
TiZ.CST6="Central Time";
TiZ.UTC5="Colombia, Panama";
TiZ.EST5="Eastern Time";
TiZ.UTC4="Bolivia, Venezuela";
TiZ.UTC4="Bolivia, Brazil (Manaus), Venezuela";
TiZ.AST4="Atlantic Time";
TiZ.BRW="Brazil West";
TiZ.AMT="Brazil (Cuiaba)";
TiZ.NST3="Newfoundland";
TiZ.WGST="Greenland";
TiZ.BRT="Brazil East";
TiZ.UTC3="Argentina, Guyana";
TiZ.BRT="Brazil (Brasilia)";
TiZ.UTC3="Argentina, Brazil (Fortaleza), Guyana";
TiZ.UTC2="Mid-Atlantic";
TiZ.STD1="Azores";
TiZ.UTC0="Gambia, Liberia, Morocco";
Expand All @@ -53,13 +53,13 @@ TiZ.UTCm5c3="Bombay, Calcutta, Madras, New Delhi";
TiZ.UTCm6="Bangladesh, Russia";
TiZ.UTCm7="Thailand, Russia";
TiZ.UTCm8="China, Hong Kong, Singapore, Taiwan, Russia";
TiZ.AWSTm8="Australia, Western Australia";
TiZ.UTCm8c45="Australia, Eucla, Eyre Highway";
TiZ.AWSTm8="Australia (Western Australia)";
TiZ.UTCm8c45="Australia (Eucla, Eyre Highway)";
TiZ.UTCm9="Japan, Korea";
TiZ.ACSTm9c3="Australia, Northern Territory";
TiZ.ACDT="Australia, South Australia";
TiZ.AESTm10="Australia, Queensland";
TiZ.AEDT="Australia, New South Wales, Victoria, Tasmania";
TiZ.ACSTm9c3="Australia (Northern Territory)";
TiZ.ACDT="Australia (South Australia)";
TiZ.AESTm10="Australia (Queensland)";
TiZ.AEDT="Australia (New South Wales, Victoria, Tasmania)";
TiZ.UTCm10="Guam, Russia";
TiZ.UTCm11="Solomon Islands";
TiZ.UTCm12="Fiji";
Expand Down
Expand Up @@ -30,13 +30,13 @@ TiZ.UTC6="Mexiko";
TiZ.CST6="Central Time";
TiZ.UTC5="Colombia, Panama";
TiZ.EST5="Eastern Time";
TiZ.UTC4="Bolivia, Venezuela";
TiZ.UTC4="Bolivia, Brasilien (Manaus), Venezuela";
TiZ.AST4="Atlantic Time";
TiZ.BRW="Brasilien West";
TiZ.AMT="Brasilien (Cuiaba)";
TiZ.NST3="Neufundland";
TiZ.WGST="Grönland";
TiZ.BRT="Brasilien Ost";
TiZ.UTC3="Argentinien, Guyana";
TiZ.BRT="Brasilien (Brasilia)";
TiZ.UTC3="Argentinien, Brasilien (Fortaleza), Guyana";
TiZ.UTC2="Mid-Atlantic";
TiZ.STD1="Azoren";
TiZ.UTC0="Gambia, Liberia, Marokko";
Expand All @@ -53,13 +53,13 @@ TiZ.UTCm5c3="Bombay, Calcutta, Madras, New Delhi";
TiZ.UTCm6="Bangladesh, Russland";
TiZ.UTCm7="Thailand, Russland";
TiZ.UTCm8="China, Hong Kong, Singapore, Taiwan, Russland";
TiZ.AWSTm8="Australien, West Australia";
TiZ.UTCm8c45="Australia, Eucla, Eyre Highway";
TiZ.AWSTm8="Australia (Western Australia)";
TiZ.UTCm8c45="Australia (Eucla, Eyre Highway)";
TiZ.UTCm9="Japan, Korea";
TiZ.ACSTm9c3="Australia, Northern Territory";
TiZ.ACDT="Australia, South Australia";
TiZ.AESTm10="Australia, Queensland";
TiZ.AEDT="Australia, New South Wales, Victoria, Tasmania";
TiZ.ACSTm9c3="Australia (Northern Territory)";
TiZ.ACDT="Australia (South Australia)";
TiZ.AESTm10="Australia (Queensland)";
TiZ.AEDT="Australia (New South Wales, Victoria, Tasmania)";
TiZ.UTCm10="Guam, Russia";
TiZ.UTCm11="Solomon Islands";
TiZ.UTCm12="Fiji";
Expand Down
Expand Up @@ -30,13 +30,13 @@ TiZ.UTC6="Mexico";
TiZ.CST6="Central Time";
TiZ.UTC5="Colombia, Panama";
TiZ.EST5="Eastern Time";
TiZ.UTC4="Bolivia, Venezuela";
TiZ.UTC4="Bolivia, Brazil (Manaus), Venezuela";
TiZ.AST4="Atlantic Time";
TiZ.BRW="Brazil West";
TiZ.AMT="Brazil (Cuiaba)";
TiZ.NST3="Newfoundland";
TiZ.WGST="Greenland";
TiZ.BRT="Brazil East";
TiZ.UTC3="Argentina, Guyana";
TiZ.BRT="Brazil (Brasilia)";
TiZ.UTC3="Argentina, Brazil (Fortaleza), Guyana";
TiZ.UTC2="Mid-Atlantic";
TiZ.STD1="Azores";
TiZ.UTC0="Gambia, Liberia, Morocco";
Expand All @@ -53,13 +53,13 @@ TiZ.UTCm5c3="Bombay, Calcutta, Madras, New Delhi";
TiZ.UTCm6="Bangladesh, Russia";
TiZ.UTCm7="Thailand, Russia";
TiZ.UTCm8="China, Hong Kong, Singapore, Taiwan, Russia";
TiZ.AWSTm8="Australia, Western Australia";
TiZ.UTCm8c45="Australia, Eucla, Eyre Highway";
TiZ.AWSTm8="Australia (Western Australia)";
TiZ.UTCm8c45="Australia (Eucla, Eyre Highway)";
TiZ.UTCm9="Japan, Korea";
TiZ.ACSTm9c3="Australia, Northern Territory";
TiZ.ACDT="Australia, South Australia";
TiZ.AESTm10="Australia, Queensland";
TiZ.AEDT="Australia, New South Wales, Victoria, Tasmania";
TiZ.ACSTm9c3="Australia (Northern Territory)";
TiZ.ACDT="Australia (South Australia)";
TiZ.AESTm10="Australia (Queensland)";
TiZ.AEDT="Australia (New South Wales, Victoria, Tasmania)";
TiZ.UTCm10="Guam, Russia";
TiZ.UTCm11="Solomon Islands";
TiZ.UTCm12="Fiji";
Expand Down
Expand Up @@ -30,13 +30,13 @@ TiZ.UTC6="Meksyk";
TiZ.CST6="Czas centralny";
TiZ.UTC5="Kolumbia, Panama";
TiZ.EST5="Czas wschodni";
TiZ.UTC4="Boliwia, Wenezuela";
TiZ.UTC4="Boliwia, Brazylia (Manaus), Wenezuela";
TiZ.AST4="Czas atlantycki";
TiZ.BRW="Brazylia (zachód)";
TiZ.AMT="Brazylia (Cuiaba)";
TiZ.NST3="Nowa Fundlandia";
TiZ.WGST="Grenlandia";
TiZ.BRT="Brazylia (wschód)";
TiZ.UTC3="Argentyna, Gujana Francuska";
TiZ.BRT="Brazylia (Brasilia)";
TiZ.UTC3="Argentyna, Brazylia (Fortaleza), Gujana Francuska";
TiZ.UTC2="Środkowoatlanydzki";
TiZ.STD1="Azory";
TiZ.UTC0="Gambia, Liberia, Maroko";
Expand All @@ -53,13 +53,13 @@ TiZ.UTCm5c3="Bombaj, Kalkuta, Madras, Nowe Delhi";
TiZ.UTCm6="Bangladesz, Rosja";
TiZ.UTCm7="Tajlandia, Rosja";
TiZ.UTCm8="Chiny, Hong Kong, Singapur, Tajwan, Rosja";
TiZ.AWSTm8="Australia, Australia Południowa";
TiZ.UTCm8c45="Australia, Eucla, Eyre Highway";
TiZ.AWSTm8="Australia (Australia Południowa)";
TiZ.UTCm8c45="Australia (Eucla, Eyre Highway)";
TiZ.UTCm9="Japonia, Korea";
TiZ.ACSTm9c3="Australia, Terytorium Północne";
TiZ.ACDT="Australia, Australia Południowa";
TiZ.AESTm10="Australia, Queensland";
TiZ.AEDT="Australia, Nowa Południowa Walia, Wiktoria, Tasmania";
TiZ.ACSTm9c3="Australia (Terytorium Północne)";
TiZ.ACDT="Australia (Australia Południowa)";
TiZ.AESTm10="Australia (Queensland)";
TiZ.AEDT="Australia (Nowa Południowa Walia, Wiktoria, Tasmania)";
TiZ.UTCm10="Guam, Rosja";
TiZ.UTCm11="Wyspy Salomona";
TiZ.UTCm12="Fidżi";
Expand Down
Expand Up @@ -30,13 +30,13 @@ TiZ.UTC6="Mexico";
TiZ.CST6="Central Time";
TiZ.UTC5="Colombia, Panama";
TiZ.EST5="Eastern Time";
TiZ.UTC4="Bolivia, Venezuela";
TiZ.UTC4="Bolivia, Brazil (Manaus), Venezuela";
TiZ.AST4="Atlantic Time";
TiZ.BRW="Brazil West";
TiZ.AMT="Brazil (Cuiaba)";
TiZ.NST3="Newfoundland";
TiZ.WGST="Greenland";
TiZ.BRT="Brazil East";
TiZ.UTC3="Argentina, Guyana";
TiZ.BRT="Brazil (Brasilia)";
TiZ.UTC3="Argentina, Brazil (Fortaleza), Guyana";
TiZ.UTC2="Mid-Atlantic";
TiZ.STD1="Azores";
TiZ.UTC0="Gambia, Liberia, Morocco";
Expand All @@ -53,13 +53,13 @@ TiZ.UTCm5c3="Bombay, Calcutta, Madras, New Delhi";
TiZ.UTCm6="Bangladesh, Russia";
TiZ.UTCm7="Thailand, Russia";
TiZ.UTCm8="China, Hong Kong, Singapore, Taiwan, Russia";
TiZ.AWSTm8="Australia, Western Australia";
TiZ.UTCm8c45="Australia, Eucla, Eyre Highway";
TiZ.AWSTm8="Australia (Western Australia)";
TiZ.UTCm8c45="Australia (Eucla, Eyre Highway)";
TiZ.UTCm9="Japan, Korea";
TiZ.ACSTm9c3="Australia, Northern Territory";
TiZ.ACDT="Australia, South Australia";
TiZ.AESTm10="Australia, Queensland";
TiZ.AEDT="Australia, New South Wales, Victoria, Tasmania";
TiZ.ACSTm9c3="Australia (Northern Territory)";
TiZ.ACDT="Australia (South Australia)";
TiZ.AESTm10="Australia (Queensland)";
TiZ.AEDT="Australia (New South Wales, Victoria, Tasmania)";
TiZ.UTCm10="Guam, Russia";
TiZ.UTCm11="Solomon Islands";
TiZ.UTCm12="Fiji";
Expand Down
Expand Up @@ -30,13 +30,13 @@ TiZ.UTC6="Мексика";
TiZ.CST6="Центральное время";
TiZ.UTC5="Колумбия, Панама";
TiZ.EST5="Возточное время";
TiZ.UTC4="Боливия, Венисуэлла";
TiZ.UTC4="Боливия, Бразилия (Манаус), Венисуэлла";
TiZ.AST4="Атлантическое время";
TiZ.BRW="Западная Бразилия";
TiZ.AMT="Бразилия (Куяба)";
TiZ.NST3="Ньюфаундленд";
TiZ.WGST="Гринландия";
TiZ.BRT="Восточная Бразилия";
TiZ.UTC3="Аргентина, Гвинея";
TiZ.BRT="Бразилия (Бразилиа)";
TiZ.UTC3="Аргентина, Бразилия (Форталеза), Гвинея";
TiZ.UTC2="Центральноатлантическое время";
TiZ.STD1="Азорские о-ва";
TiZ.UTC0="Гамбия, Либерия, Морокко";
Expand All @@ -53,13 +53,13 @@ TiZ.UTCm5c3="Бомбей, Калькутта, Мадрас, Нью Дэли";
TiZ.UTCm6="Бангладеш, Россия";
TiZ.UTCm7="Тайланд, Россия";
TiZ.UTCm8="Китай, Гонконг, Сингапур, Тайвань, Россия";
TiZ.AWSTm8="Австралия, Западная Австралия";
TiZ.UTCm8c45="Австралия, п-ов Эйр";
TiZ.AWSTm8="Австралия (Западная Австралия)";
TiZ.UTCm8c45="Австралия (п-ов Эйр)";
TiZ.UTCm9="Япония, Корея";
TiZ.ACSTm9c3="Австралия, Северные територии";
TiZ.ACDT="Австралия, Южная Австралия";
TiZ.AESTm10="Австралия, Квинсленд";
TiZ.AEDT="Австралия, Новый Южный Уэльс, Виктория, Тасмания";
TiZ.ACSTm9c3="Австралия (Северные територии)";
TiZ.ACDT="Австралия (Южная Австралия)";
TiZ.AESTm10="Австралия (Квинсленд)";
TiZ.AEDT="Австралия (Новый Южный Уэльс, Виктория, Тасмания)";
TiZ.UTCm10="Гуам, Россия";
TiZ.UTCm11="Соломоновы о-ва";
TiZ.UTCm12="Фиджи";
Expand Down
Expand Up @@ -30,13 +30,13 @@ TiZ.UTC6="墨西哥";
TiZ.CST6="美国中部时间";
TiZ.UTC5="哥伦比亚,巴拿马";
TiZ.EST5="美国东部时间";
TiZ.UTC4="玻利维亚,委内瑞拉";
TiZ.UTC4="玻利维亚,巴西(马瑙斯), 委内瑞拉";
TiZ.AST4="大西洋时间";
TiZ.BRW="巴西西部";
TiZ.AMT="巴西(库亚巴)";
TiZ.NST3="纽芬兰";
TiZ.WGST="格陵兰岛";
TiZ.BRT="巴西东部";
TiZ.UTC3="阿根廷,圭亚那";
TiZ.BRT="巴西(巴西利亚)";
TiZ.UTC3="阿根廷,巴西(福塔莱萨), 圭亚那";
TiZ.UTC2="中大西洋";
TiZ.STD1="亚速尔群岛";
TiZ.UTC0="冈比亚,利比里亚,摩洛哥";
Expand All @@ -53,13 +53,13 @@ TiZ.UTCm5c3="孟买,加尔各答,马德拉斯,新德里";
TiZ.UTCm6="孟加拉,俄罗斯";
TiZ.UTCm7="泰国,俄罗斯";
TiZ.UTCm8="中国,香港,新加坡,台湾,俄罗斯";
TiZ.AWSTm8="澳大利亚西澳大利亚";
TiZ.UTCm8c45="澳大利亚尤克拉,艾尔高速公路";
TiZ.AWSTm8="澳大利亚 (西澳大利亚)";
TiZ.UTCm8c45="澳大利亚 (尤克拉,艾尔高速公路)";
TiZ.UTCm9="日本,韩国";
TiZ.ACSTm9c3="澳大利亚北部地区";
TiZ.ACDT="澳大利亚南澳大利亚";
TiZ.AESTm10="澳大利亚昆士兰州";
TiZ.AEDT="澳大利亚新南威尔士州,维多利亚,塔斯马尼亚";
TiZ.ACSTm9c3="澳大利亚 (北部地区)";
TiZ.ACDT="澳大利亚 (南澳大利亚)";
TiZ.AESTm10="澳大利亚 (昆士兰州)";
TiZ.AEDT="澳大利亚 (新南威尔士州,维多利亚,塔斯马尼亚)";
TiZ.UTCm10="关岛,俄罗斯";
TiZ.UTCm11="所罗门群岛";
TiZ.UTCm12="斐济";
Expand Down
Expand Up @@ -30,13 +30,13 @@ TiZ.UTC6="Mexiko";
TiZ.CST6="Centrálny čas";
TiZ.UTC5="Kolumbia, Panama";
TiZ.EST5="Východný čas";
TiZ.UTC4="Bolívia, Venezuela";
TiZ.UTC4="Bolívia, Brazília (Manaus), Venezuela";
TiZ.AST4="Atlantický čas";
TiZ.BRW="Brazília západ";
TiZ.AMT="Brazília (Cuiaba)";
TiZ.NST3="Newfoundland";
TiZ.WGST="Grónsko";
TiZ.BRT="Brazília východ";
TiZ.UTC3="Argentína, Guyana";
TiZ.BRT="Brazília (Brasilia)";
TiZ.UTC3="Argentína, Brazília (Fortaleza), Guyana";
TiZ.UTC2="Stredný-Atlantik";
TiZ.STD1="Azory";
TiZ.UTC0="Gambia, Libéria, Maroko";
Expand All @@ -53,13 +53,13 @@ TiZ.UTCm5c3="Bombaj, Kalkata, Madras, New Delhi";
TiZ.UTCm6="Bangladéš, Rusko";
TiZ.UTCm7="Thajsko, Rusko";
TiZ.UTCm8="Čína, Hong Kong, Singapúr, Taiwan, Rusko";
TiZ.AWSTm8="Austrália, Západná Austrália";
TiZ.UTCm8c45="Austrália, Eucla, Eyre Highway";
TiZ.AWSTm8="Austrália (Západná Austrália)";
TiZ.UTCm8c45="Austrália (Eucla, Eyre Highway)";
TiZ.UTCm9="Japonsko, Kórea";
TiZ.ACSTm9c3="Austrália, Severné Teritórium";
TiZ.ACDT="Austrália, Južná Austrália";
TiZ.AESTm10="Austrália, Queensland";
TiZ.AEDT="Austrália, New South Wales, Victoria, Tasmánia";
TiZ.ACSTm9c3="Austrália (Severné Teritórium)";
TiZ.ACDT="Austrália (Južná Austrália)";
TiZ.AESTm10="Austrália (Queensland)";
TiZ.AEDT="Austrália (New South Wales, Victoria, Tasmánia)";
TiZ.UTCm10="Guam, Rusko";
TiZ.UTCm11="Šalamúnove ostrovy";
TiZ.UTCm12="Fidži";
Expand Down

0 comments on commit 1acb1e9

Please sign in to comment.