From 89bc36bb53759052ac1981f5729b510c9b925543 Mon Sep 17 00:00:00 2001 From: Deon George Date: Sun, 21 Feb 2021 00:18:50 +1100 Subject: [PATCH] Added System Error frame and Invalid Login frame --- .gitignore | 4 ++++ load/ansiframe.js | 3 +++ load/defs.js | 2 +- load/viewdataframe.js | 10 ++++++++++ main.js | 4 +++- text/983a.tex | 1 + text/983a.vtx | 1 + text/998a.tex | 1 + text/998a.vtx | 1 + 9 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 .gitignore create mode 100644 text/983a.tex create mode 100644 text/983a.vtx create mode 100644 text/998a.tex create mode 100644 text/998a.vtx diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..73e5ff7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.idea +.editorconfig +*.debug +dev/ diff --git a/load/ansiframe.js b/load/ansiframe.js index 338cc4d..32d7e85 100644 --- a/load/ansiframe.js +++ b/load/ansiframe.js @@ -144,6 +144,9 @@ function ANSIFrame() { } catch (error) { log(LOG_ERROR,'Frame error: '+error); + + // Load our system error frame. + this.load('998a'); return null; } diff --git a/load/defs.js b/load/defs.js index 0fd4ca1..9cea74a 100644 --- a/load/defs.js +++ b/load/defs.js @@ -29,7 +29,7 @@ var FRAME_TYPE_RESPONSE ='r'; // Response frame, input fields are embedded in t // response will be submitted to the Service Provider, or to a method var FRAME_TYPE_LOGIN ='l'; // Login frame, enables the user to authenticate to the system, or to a CUG -var NO_HISTORY_FRAMES =['980a','98b','981a','982a']; +var NO_HISTORY_FRAMES =['980a','98b','981a','982a','983a','998a']; var SYSTEM_OWNER =9; var INKEY_TIMEOUT =10000; var INACTIVE_NOLOGIN =30000; diff --git a/load/viewdataframe.js b/load/viewdataframe.js index d4276b6..0d0efe7 100644 --- a/load/viewdataframe.js +++ b/load/viewdataframe.js @@ -77,6 +77,9 @@ function VIEWDATAFrame() { this.type = FRAME_TYPE_INFO; // The frame type - see FRAME_TYPES above this.key=[ null,null,null,null,null,null,null,null,null,null ]; // Key actions [0-9] + /** + * Set the attribute at the current position + */ this.attr=function(field) { //NOOP } @@ -168,6 +171,9 @@ function VIEWDATAFrame() { } catch (error) { log(LOG_ERROR,'Frame error: '+error); + + // Load our system error frame. + this.load('998a'); return null; } @@ -194,6 +200,10 @@ function VIEWDATAFrame() { var output = ''; this.frame_fields = []; + // If there is no text return + if (! text) + return output; + // Default Attributes f = 39; b = 49; diff --git a/main.js b/main.js index 53c214e..2eb647e 100644 --- a/main.js +++ b/main.js @@ -546,6 +546,8 @@ while(bbs.online) { } log(LOG_DEBUG,' ! Login failed for User:'+JSON.stringify(fo.frame_fields[0].fvalue)); + action = ACTION_GOTO; + next_page = { frame: 983,index: 'a' }; break; default: @@ -970,4 +972,4 @@ while(bbs.online) { } exit(); -} \ No newline at end of file +} diff --git a/text/983a.tex b/text/983a.tex new file mode 100644 index 0000000..5afa89a --- /dev/null +++ b/text/983a.tex @@ -0,0 +1 @@ +{"version":1,"frame":983,"index":"a","owner":9,"cost":0,"content":"G1swbRtbMTszMG3ExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMQbWzBtDQogG1sxOzMxbdzcxNwbWzM3bSAbWzMybdzcxNwbWzM3bSAbWzM0bdzcxNwbWzM3bSAbWzMzbdzcG1swbSAbWzMwOzQ3bSDc3CAgINzcxNwg3Nwg3CAbWzM3OzQwbQ0KIBtbMTszMW3c3MSxG1szN20gG1szMm2ysRtbMzdtIBtbMzJtsRtbMzdtIBtbMzRt39/E3BtbMzdtIBtbMzNt3NwbWzBtIBtbMzA7NDdtILKxxCAgsrHE3yDf38LfIBtbMzc7NDBtDQogG1sxOzMxbbGwG1swbSAbWzE7MzFtsBtbMG0gG1sxOzMybbGwG1swbSAbWzE7MzJtsBtbMG0gG1sxOzM0bbGwG1swbSAbWzE7MzRtsBtbMG0gG1sxOzMzbbGwG1swbSAbWzMwOzQ3bSCxsCCwILGwILAgsbAgsCAbWzM3OzQwbQ0KIBtbMTszMW3f38TfG1swbSAbWzE7MzJt398bWzBtIBtbMTszMm3fG1swbSAbWzE7MzRt39/E3xtbMG0gG1sxOzMzbd/fG1swbSAbWzMwOzQ3bSDf38TfIN/fxN8g398g3yAbWzM3OzQwbQ0KG1sxOzMwbcTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExBtbMG0NCg0KG1sxbUxvZ2luIBtbMzFtRkFJTEVEG1szN20uG1swbQ0KDQobWzFtVG8gdHJ5IGFnYWluLCBwbGVhc2UgcHJlc3MgG1szMm0wG1swbQ0K","isPublic":1,"isAccessible":1,"type":"r","key":[0,null,null,null,null,null,null,null,null,null],"frame_fields": [],"date":"2020-08-09T11:42:40.643Z"} diff --git a/text/983a.vtx b/text/983a.vtx new file mode 100644 index 0000000..4c3a40a --- /dev/null +++ b/text/983a.vtx @@ -0,0 +1 @@ +{"version":1,"frame":983,"index":"a","owner":9,"cost":0,"content":"ICARLGwSfGwUfCwTLBc3a38jMzdrIzUgICAgICACMDAwMTAwMDEwMSAgEX9rEn9qFC98E38XNWhvIDw9JCw1ByAgICAgICAgICAgICAgICAgIBEvLhIvKhQsLxMvF3VwenBxdXpwNSAgICAgICAgICAgICAgICAgICAgVmlkZW90ZXggICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBMb2dpbgENRkFJTEVEICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQcmVzcwIwB3RvIHRyeSBhZ2Fpbi4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIElmIHRoaXMga2VlcHMgaGFwcGVuaW5nLCB5b3UgbWF5IGxpa2UgICB0byByZXF1ZXN0IHRoYXQgeW91ciBwYXNzd29yZCBpcyAgICAgICAgcmVzZXQuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCg==","isPublic":1,"isAccessible":1,"type":"r","key":[98,null,null,null,null,null,null,null,null,null],"frame_fields": [],"date":"2020-08-09T11:42:40.643Z"} diff --git a/text/998a.tex b/text/998a.tex new file mode 100644 index 0000000..63d447f --- /dev/null +++ b/text/998a.tex @@ -0,0 +1 @@ +{"version":1,"frame":998,"index":"a","owner":9,"cost":0,"content":"G1swbRtbMTszMG3ExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMQbWzBtDQogG1sxOzMxbdzcxNwbWzM3bSAbWzMybdzcxNwbWzM3bSAbWzM0bdzcxNwbWzM3bSAbWzMzbdzcG1swbSAbWzMwOzQ3bSDc3CAgINzcxNwg3Nwg3CAbWzM3OzQwbQ0KIBtbMTszMW3c3MSxG1szN20gG1szMm2ysRtbMzdtIBtbMzJtsRtbMzdtIBtbMzRt39/E3BtbMzdtIBtbMzNt3NwbWzBtIBtbMzA7NDdtILKxxCAgsrHE3yDf38LfIBtbMzc7NDBtDQogG1sxOzMxbbGwG1swbSAbWzE7MzFtsBtbMG0gG1sxOzMybbGwG1swbSAbWzE7MzJtsBtbMG0gG1sxOzM0bbGwG1swbSAbWzE7MzRtsBtbMG0gG1sxOzMzbbGwG1swbSAbWzMwOzQ3bSCxsCCwILGwILAgsbAgsCAbWzM3OzQwbQ0KIBtbMTszMW3f38TfG1swbSAbWzE7MzJt398bWzBtIBtbMTszMm3fG1swbSAbWzE7MzRt39/E3xtbMG0gG1sxOzMzbd/fG1swbSAbWzMwOzQ3bSDf38TfIN/fxN8g398g3yAbWzM3OzQwbQ0KG1sxOzMwbcTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExBtbMG0NCg0KG1sxbUhtbSwgYSBzeXN0ZW0gG1szMW1FUlJPUhtbMzdtIG9jY3VycmVkLhtbMG0NChtbMW1Ob2RlICA6IBtbMzFtG1hub2RlaWQ7OBtcG1swbQ0KG1sxbVN5c3RlbTogG1szMW1AQkJTLUwxMEAbWzBtDQoNChtbMW1JZiB0aGlzIGtlZXBzIGhhcHBlbmluZywgeW91IG1heSBuZWVkIHRvIHRlbGwgdGhlIHN5c3RlbSBhZG1pbmlzdHJhdG9yG1swbQ0KG1sxbXZpYSBwYWdlIBtbMzJtKjA4G1swbQ0KDQobWzFtVG8gdHJ5IGFnYWluLCBwbGVhc2UgcHJlc3MgG1szMm0wG1swbQ0K","isPublic":1,"isAccessible":1,"type":"i","key":[0,null,null,null,null,null,null,null,null,null],"date":"2021-02-18T00:52:54.117Z"} diff --git a/text/998a.vtx b/text/998a.vtx new file mode 100644 index 0000000..cac3659 --- /dev/null +++ b/text/998a.vtx @@ -0,0 +1 @@ +{"version":1,"frame":998,"index":"a","owner":9,"cost":0,"content":"ICARLGwSfGwUfCwTLBc3a38jMzdrIzUgICAgICACMDAwMTAwMDEwMSAgEX9rEn9qFC98E38XNWhvIDw9JCw1ByAgICAgICAgICAgICAgICAgIBEvLhIvKhQsLxMvF3VwenBxdXpwNSAgICAgICAgICAgICAgICAgICAgVmlkZW90ZXggICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBIbW0sIGFuAQ1FcnJvcgwHb2NjdXJyZWQuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIElmIHRoaXMga2VlcHMgaGFwcGVuaW5nLCB5b3UgbWF5IGxpa2UgICB0byB0ZWxsIHRoZSBzeXN0ZW0gYWRtaW5pc3RyYXRvciB2aWEgICAgcGFnZQIqMDggICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUHJlc3MCMAd0byByZXR1cm4gdG8gdGhlIG1haW4gbWVudS4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIA==","isPublic":1,"isAccessible":1,"type":"i","key":[0,null,null,null,null,null,null,null,null,null],"frame_fields": [],"date":"2020-08-09T11:42:40.643Z"}