Brad Arant
b0cadc3f08
JetCore engine (Tag.cpp/.h, Global.cpp/.h, __*.cpp tag classes): - Numerous __mysql.cpp connection-pooling correctness fixes (stale result sets, double-indirection sessionid bugs, field caching, pool keying) and a session-registration-before-connection-confirmed ordering fix (dangling pointer on a failed connect) - Tag.cpp: large body of fixes to the tag-dispatch/container-scanning logic (bare-name fallback, database aliasing, single-quote handling, @-prefix session variable resolution, TAGDEF caching, nested split-tag scanning for if/while/until/ifrow so an inner one doesn't corrupt an outer one's own boundary scan) plus the process-first rendering order fix (a <process> now runs before <checksession>/page resolution, fixing a real "blank page after successful login" bug) - Global.h/.cpp: added imapSessions (parallel to the existing __mysql* session map) for the new <imap> tag family - __whiledir.cpp/__include.cpp: caching and directory-name-aliasing fixes - __call.cpp/.h: fixed a dangling-pointer bug - __write.cpp: fixed an O_WRONLY-only open that couldn't create a new file - __ifrow.cpp/__sql.cpp: fixed the same sessionid double-indirection bug __mysql.cpp had (resolveKeyword's result was being used as a map key lookup instead of the resolved value itself) jetc compiler (jetc/JetParser.cpp/.h, JetCodegen.cpp/.h, JetAST.h, jetc.cpp, build-shared.sh, build-compiled.sh): - Parser fixes: inline <include>, nested-quote handling, void-tag recognition - Codegen fixes and expanded AST support - build-shared.sh: atomic rename into place for a freshly-built .jtc (a live server dlopen()ing the same path mid-rebuild was corrupting its own already-mapped view of the old file) and a staleness check so a cached JetCore .o doesn't silently keep serving yesterday's fixes forever - Added -lssl to both build scripts' link lines (needed once the new <imap> tag's client-side TLS code existed - previously nothing in this codebase used OpenSSL's SSL/TLS client API, only libcrypto) Site content (jetc/barant-site/): SPA (fetch-and-swap navigation) rollout across essentially every .page/.jet/.section/.tag/.proc/.method file - dynamic-content fixes, fragment-mode stripping, native $[@name] session variables replacing older mechanisms, and this session's own checkout.page redesign, login start-param redirect fix, and per-page side-menu (menu.bar/$[PAGE].menu) refresh support. Completed the earlier main.css/control.css move from assets/ to assets/images/ (git still showed the old paths as tracked-but-deleted until now). Deliberately left out of this commit: dozens of .pre-<description>- <date> manual backup files (this session's and earlier ones' own before/after snapshots, not meant for permanent history), compiled .jtc build outputs, ad hoc test binaries and scripts under jetc/ (login_asan, wcwc_test, optest2_bin, etc.), and jetc/__pycache__/ - none of these are meant to be tracked; a .gitignore covering them would be worth adding separately.
112 lines
3.2 KiB
Plaintext
Executable File
112 lines
3.2 KiB
Plaintext
Executable File
<page secure="yes" loggedin="yes">
|
|
<title>ACCOUNT</title>
|
|
<contents>
|
|
<retain name="download_file">
|
|
<retain name="invoice_id">
|
|
|
|
<sectionframe title="Account Information">
|
|
|
|
<sql>select * from users where id=$[_login_id]</sql>
|
|
<table>
|
|
<tr><th class="left">Name:</th><td class="right">$[.name]</td></tr>
|
|
<if value1="$[company_name]" value2="" type="ne">
|
|
<tr><th class="left">Company Name:</th><td class="right">$[.company_name]</td></tr>
|
|
</if>
|
|
<tr><th class="left">E-Mail:</th><td class="right">$[.email]</td></tr>
|
|
</table>
|
|
|
|
</sectionframe>
|
|
|
|
<sql>select * from user_messages where user_id=$[_login_id]</sql>$[sqlerror]
|
|
<ifrow>
|
|
<sectionframe title="Messages">
|
|
<table>
|
|
<whilerow>
|
|
<tr>
|
|
<td>$[.message]</td>
|
|
<td>$[.link]</td>
|
|
</tr>
|
|
</whilerow>
|
|
</table>
|
|
</sectionframe>
|
|
</ifrow>
|
|
|
|
<sql>select *
|
|
from virtual_machines
|
|
join products on virtual_machines.sku=products.sku
|
|
where user_id=$[_login_id]</sql>
|
|
<ifrow>
|
|
<sectionframe title="Virtual Machines">
|
|
|
|
<whilerow>
|
|
|
|
<div style="margin-bottom: 3px; border: 1pt solid #000; border-radius: 5px;">
|
|
<div style="float: left; padding: 2px 5px 0px 5px; vertical-align: middle; display: inline-block;"><img src="$[.image]" width="40"></div>
|
|
<div style="float: left; background: #ccf; width: 300px; padding: 0px 0px 0px 0px;"><span style="font-size: 7pt;">Ubuntu Server 22.04 LTE</span>
|
|
<br><span style="font-size: 9pt;"><b>barant.com</b></span>
|
|
<br><span style="font-size: 7pt;">IP:</span> <span style="font-size: 9pt; font-family: monospace;">74.80.233.78</span></div>
|
|
|
|
<div style="float: right; padding: 5px;"><img src="/assets/power_on.png" width="32"></div>
|
|
<div style="float: right; width: 90px; height: 48px; background: #444;"></div>
|
|
<div style="float: right; margin-right: 25px;">3 days 2:10:33<br><br>34% of 40.2GB</div>
|
|
<div style="clear: both;"></div>
|
|
</div>
|
|
|
|
</whilerow>
|
|
|
|
</sectionframe>
|
|
</ifrow>
|
|
|
|
<include file="phones.section">
|
|
|
|
<sql>select *
|
|
from files
|
|
join products on files.sku=products.sku
|
|
where user_id=$[_login_id]</sql>
|
|
<ifrow>
|
|
<sectionframe title="Downloadable Content">
|
|
<p>Content that has been purchased and can be downloaded is displayed
|
|
below. Click on the Download button to begin downloading your files.</p>
|
|
|
|
<whilerow>
|
|
<table style="margin: 3px;">
|
|
<tr>
|
|
<td>
|
|
<img src="$[.image]" width="50px"">
|
|
</td>
|
|
<td style="width: 300px; border: 1pt inset #888">
|
|
$[.description]
|
|
</td>
|
|
<td style="width: 300px;">
|
|
<div>$[license_name]</div><div>$[license_key]</div>
|
|
</td>
|
|
<td>
|
|
<a href="/downloadfile.cgi?sku=$[.sku]"><div class="button">Download</div></a>
|
|
</td>
|
|
</tr>
|
|
</table>
|
|
</whilerow>
|
|
|
|
</sectionframe>
|
|
</ifrow>
|
|
|
|
<sectionframe title="Invoices">
|
|
<div style="display: flex;">
|
|
<div style="display: inline-block; padding: 0px 10px 0px 0px;">
|
|
<showtable process="selectinvoice" name="invoice_id" value="X">
|
|
select id as X,id as 'Invoice ID',date_format(created, '%b %D %Y') as 'Date',amount as 'Amount',status as 'Status' from invoices where user_id=$[_login_id]
|
|
</showtable>
|
|
</div>
|
|
<if value1="$[_invoice_id]" value2="" type="ne">
|
|
<div>
|
|
<include file="invoice.method">
|
|
<include file="payment.method">
|
|
</div>
|
|
</if>
|
|
</div>
|
|
</sectionframe>
|
|
|
|
|
|
</contents>
|
|
</page>
|