Skip to content

Commit 29d65c5

Browse files
committed
Additions and minor improvements
...to the INI documentation and elements in the Tags section
1 parent 05e28e2 commit 29d65c5

1 file changed

Lines changed: 80 additions & 79 deletions

File tree

WebEdit/Resources/WebEdit.ini

Lines changed: 80 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[Commands]
1+
[Commands]
22
; Syntax: <Item name>=<Left text>|<Right text>
33
; Known escape sequences: \\ \t \n \r
44
; A single, unescaped "|" will be the caret's new position after replacement
@@ -53,8 +53,10 @@ T&r=<tr>|</tr>
5353
; Tags are replaced with their Replacement when you select the
5454
; "WebEdit\Replace Tag" menu item (Alt+Enter by default).
5555
; Syntax: <Tag>=<Replacement>
56-
; Tags can contain characters a-z, A-Z, 0-9. Maximum length of a tag is 32
57-
; characters. The number of Tags is not limited. The pipe character "|" marks
56+
; Tags are Unicode supported (UTF-8 encoding), and can contain
57+
; both non-latin (á, β, の etc.) and latin (a-z, A-Z, 0-9) characters.
58+
; Maximum length of a tag is 32 (single-byte) characters.
59+
; The number of Tags is not limited. The pipe character "|" marks
5860
; the caret position after the tag replacement.
5961
; Known escape sequences:
6062
; \r = carriage return (for Windows line endings)
@@ -65,13 +67,13 @@ T&r=<tr>|</tr>
6567
; \u = Windows username
6668
; \x = current filename (without path) / document name
6769
; \p = current full file path (including filename) / document name
68-
; \d:"..." = Local date/time in the format specified between the quotes, e.g. \d:"yyyy-MM-dd HH:mm:ss" (2025-12-31 23:59:59)
70+
; \d:"..." = Local date/time in the format specified between the quotes, e.g. \d:"yyyy-MM-dd HH:mm:ss" (2025-12-31 23:59:59) -- experimental!
6971
; \| = |
7072
; \\ = \ (for the sequences above, e.g. \\c, \\i etc. -- except.: \|, as it is already escaped)
7173

7274
; MIXED
7375
docs=/**\n * @file \x\n * @brief Description|\n * @author \u <mail@example.com>\n * @date \d:"yyyy-MM-dd"\n */
74-
dox={**\n * @file \x\n * @brief Description|\n * @author \u <mail@example.com>\n * @date \d:"yyyy-MM-dd"\n *\n * @param string $param Parameter_Description\n * @param etc.\n *\n * @details For more imformation see: \n *}
76+
dox={**\n * @file \x\n * @brief Description|\n * @author \u <mail@example.com>\n * @date \d:"yyyy-MM-dd"\n *\n * @param string $param Parameter_Description\n * @param etc.\n *\n * @details For more information see: \n *}
7577
func=/**\n * Description|\n *\n * @param string $var1 param1\n * @param bool $var2 param2\n * @return True on success, false otherwise\n *\n * @details Throw an exception in case of error!\n */
7678
param=* @param string $var| Parameter_Description
7779
yx="|" => "",
@@ -195,13 +197,13 @@ fuu=function() use (|) {\n\i\n}
195197
uu=use (|)
196198
us=use (|)
197199
use=use (|)
198-
trm=trim($|, " \\t\\n\\r\\0\\x0B");
199-
trii=trim($|, " \\t\\n\\r\\0\\x0B");
200-
trim=trim($|, " \\t\\n\\r\\0\\x0B");
200+
trm=trim($|, " \\t\\n\\r\0\\x0B");
201+
trii=trim($|, " \\t\\n\\r\0\\x0B");
202+
trim=trim($|, " \\t\\n\\r\0\\x0B");
201203
tri=trim(
202-
rtr=rtrim($|, " \\t\\n\\r\\0\\x0B");
203-
rtrim=rtrim($|, " \\t\\n\\r\\0\\x0B");
204-
ltrim=ltrim($|, " \\t\\n\\r\\0\\x0B");
204+
rtr=rtrim($|, " \\t\\n\\r\0\\x0B");
205+
rtrim=rtrim($|, " \\t\\n\\r\0\\x0B");
206+
ltrim=ltrim($|, " \\t\\n\\r\0\\x0B");
205207
je=json_encode(|, JSON_FORCE_OBJECT);
206208
jd=json_decode(|, true);
207209
pj=print_r(json_encode([\n\i'result' => '|',\n\i'message' => \n]));
@@ -459,59 +461,59 @@ lto=->toSql();
459461
lts=->toSql();
460462
tos=toSql()
461463
tsq=->toSql();
462-
hat=Capsule::schema()->hasTable('|')
463-
cht=Capsule::schema()->hasTable('|')
464-
ren=Capsule::schema()->rename('|', '');
465-
crea=Capsule::schema()->create('|', function($table)\n{\n\i$table->increments('id');\n\i$table->integer('');\n\i$table->string('');\n\i$table->timestamp('date')->default(Capsule::raw('CURRENT_TIMESTAMP'));
464+
hat=DB::schema()->hasTable('|')
465+
cht=DB::schema()->hasTable('|')
466+
ren=DB::schema()->rename('|', '');
467+
crea=DB::schema()->create('|', function($table)\n{\n\i$table->increments('id');\n\i$table->integer('');\n\i$table->string('');\n\i$table->timestamp('date')->default(DB::raw('CURRENT_TIMESTAMP'));
466468
med=$table->mediumText('\c');
467-
lar=$result = Capsule::table('|')
468-
rat=$result = Capsule::table('|')\n\i->where('', )
469-
lconn=$result = Capsule::connection('\c')\n\i->table('|')\n\i->where('', )
470-
slj=$result = Capsule::table(Capsule::raw('| as '))\n\i->leftJoin(Capsule::raw(' as '), '', '=', '')\n\i->where('', )
471-
rlj=$result = Capsule::table(Capsule::raw('| as '))\n\i->leftJoin(Capsule::raw(' as '), '', '=', '')\n\i->where('', )
472-
tlj=$result = Capsule::table(Capsule::raw('| as '))\n\i->leftJoin(Capsule::raw(' as '), '', '=', '')\n\i->where('', )
473-
clj=$result = Capsule::table(Capsule::raw('| as '))\n\i->leftJoin(Capsule::raw(' as '), '', '=', '')\n\i->where('', )
474-
lr=$result = Capsule::table('|')
475-
rl=$result = Capsule::table('|')
476-
lra=$result = Capsule::table('| as ')
477-
rla=$result = Capsule::table('| as ')
478-
lars=$result = Capsule::table('|')\n\t->select()\n\t->where()\n\t->get();
479-
lac=Capsule::table(|)->where('', )->count();
480-
lde=Capsule::table(|)->where('id', )->delete();
481-
led=Capsule::table(|)->where('id', )->delete();
482-
del=Capsule::table('|')\n\i->where('id', )\n\i->delete();
483-
cad=Capsule::table(|)->where('id', )->delete();
484-
lap=$result = Capsule::table('|')->where('', )->update(['' => ])
485-
lup=Capsule::table('|')\n\i->where('id', )\n\i->update([\n\i\i'' => '',\n\i]);
486-
lut=Capsule::table('|')\n\i->where('id', )\n\i->update([\n\i\i'' => '',\n\i]);
487-
cin=Capsule::table(|)->insert();
488-
lin=Capsule::table('|')->insert([\n\i'' => '',\n\i'' => '',\n]);
489-
linn=Capsule::table('|')->insert([\n\i['' => '', '' => ''],\n\i['' => '', '' => ''],\n]);
490-
ing=Capsule::table('|')->insertGetId(['' => ]);
491-
lig=Capsule::table('|')->insertGetId([\n\i'' => '',\n]);
469+
lar=$result = DB::table('|')
470+
rat=$result = DB::table('|')\n\i->where('', )
471+
lconn=$result = DB::connection('\c')\n\i->table('|')\n\i->where('', )
472+
slj=$result = DB::table(DB::raw('| as '))\n\i->leftJoin(DB::raw(' as '), '', '=', '')\n\i->where('', )
473+
rlj=$result = DB::table(DB::raw('| as '))\n\i->leftJoin(DB::raw(' as '), '', '=', '')\n\i->where('', )
474+
tlj=$result = DB::table(DB::raw('| as '))\n\i->leftJoin(DB::raw(' as '), '', '=', '')\n\i->where('', )
475+
clj=$result = DB::table(DB::raw('| as '))\n\i->leftJoin(DB::raw(' as '), '', '=', '')\n\i->where('', )
476+
lr=$result = DB::table('|')
477+
rl=$result = DB::table('|')
478+
lra=$result = DB::table('| as ')
479+
rla=$result = DB::table('| as ')
480+
lars=$result = DB::table('|')\n\t->select()\n\t->where()\n\t->get();
481+
lac=DB::table(|)->where('', )->count();
482+
lde=DB::table(|)->where('id', )->delete();
483+
led=DB::table(|)->where('id', )->delete();
484+
del=DB::table('|')\n\i->where('id', )\n\i->delete();
485+
cad=DB::table(|)->where('id', )->delete();
486+
lap=$result = DB::table('|')->where('', )->update(['' => ])
487+
lup=DB::table('|')\n\i->where('id', )\n\i->update([\n\i\i'' => '',\n\i]);
488+
lut=DB::table('|')\n\i->where('id', )\n\i->update([\n\i\i'' => '',\n\i]);
489+
cin=DB::table(|)->insert();
490+
lin=DB::table('|')->insert([\n\i'' => '',\n\i'' => '',\n]);
491+
linn=DB::table('|')->insert([\n\i['' => '', '' => ''],\n\i['' => '', '' => ''],\n]);
492+
ing=DB::table('|')->insertGetId(['' => ]);
493+
lig=DB::table('|')->insertGetId([\n\i'' => '',\n]);
492494
catt="concat(`data`, '| => {$}\\n')"
493495
CAT=CONCAT(|, ' ', )
494-
lt=Capsule::table('|')
495-
ct=Capsule::table('|')
496-
lat=Capsule::table(|)
497-
cat=Capsule::table('|')
498-
dbr=Capsule::raw('|')
499-
raw=Capsule::raw('|')
500-
cr=Capsule::raw(
501-
car=Capsule::raw('|')
502-
rab=Capsule::raw('binary |')
503-
ctr=Capsule::table(Capsule::raw('| as '))
504-
ld=Capsule::dropIfExists('|');
505-
dro=Capsule::drop('|');
506-
ltra=Capsule::connection()->transaction(function($conn) {\n\i$conn->table('|')\n});
496+
lt=DB::table('|')
497+
ct=DB::table('|')
498+
lat=DB::table(|)
499+
cat=DB::table('|')
500+
dbr=DB::raw('|')
501+
raw=DB::raw('|')
502+
cr=DB::raw(
503+
car=DB::raw('|')
504+
rab=DB::raw('binary |')
505+
ctr=DB::table(DB::raw('| as '))
506+
ld=DB::dropIfExists('|');
507+
dro=DB::drop('|');
508+
ltra=DB::connection()->transaction(function($conn) {\n\i$conn->table('|')\n});
507509
see=->select('|', '')
508510
se=->select('|')
509511
ase=select('|', '')
510512
asel=select('|', '')
511-
seg=->select(Capsule::raw('GROUP_CONCAT(|) as '))
512-
sec=->select(Capsule::raw('COUNT(*) as |'))
513-
sr=->select(Capsule::raw('|'))
514-
sed=->select(Capsule::raw('|'))
513+
seg=->select(DB::raw('GROUP_CONCAT(|) as '))
514+
sec=->select(DB::raw('COUNT(*) as |'))
515+
sr=->select(DB::raw('|'))
516+
sed=->select(DB::raw('|'))
515517
inse=->insert($|);
516518
ins=->insert(['|' => , '' => ])
517519
ain=insert(['|' => , '' => ])
@@ -535,16 +537,16 @@ awl=where('|', 'like', '')
535537
awel=where('|', 'like', '')
536538
wnl=->where('|', 'not like', '')
537539
awnl=where('|', 'not like', '')
538-
wer=->where(Capsule::raw('|'), )
539-
werl=->where(Capsule::raw('|'), 'like', )
540+
wer=->where(DB::raw('|'), )
541+
werl=->where(DB::raw('|'), 'like', )
540542
were=->where('|', 'regexp', '(^\|\\ \|\\,)'.$.'($\|\\ \|\\,)')
541543
awer=where('|', 'regexp', '(^\|\\ \|\\,)'.$.'($\|\\ \|\\,)')
542544
weg=->where('|', '>', )
543545
welt=->where('|', '<', )
544546
wen=->where('|', '!=', )
545547
awee=where('|', '')
546548
awea=where('|', '!=', )
547-
web=->where(Capsule::raw('binary |'), $)
549+
web=->where(DB::raw('binary |'), $)
548550
webe=->whereBetween('|', [, ]);
549551
wf=->where(function($query) {\n\i$query->where('|', );\n})
550552
wef=->where(function($query) {\n\i$query->where('|', );\n})
@@ -561,7 +563,7 @@ owe=->orWhere('|', )
561563
owel=->orWhere('|', 'like', '')
562564
aow=orWhere('|', )
563565
owl=->orWhere('|', 'like', '')
564-
owera=->orWhere(Capsule::raw('|'), )
566+
owera=->orWhere(DB::raw('|'), )
565567
owf=->orWhere(function($query) {\n\i$query->where('|', );\n})
566568
aowf=orWhere(function($query) {\n\i$query->where('|', );\n})
567569
owfu=->orWhere(function($query) use (|) {\n\i$query->where();\n})
@@ -573,11 +575,11 @@ wenn=->whereNotNull('|')
573575
own=->orWhereNull('|')
574576
owin=->orWhereNull('|')
575577
owen=->orWhereNull('|')
576-
lj=->leftJoin(Capsule::raw('| as '), '', '=', '')
577-
ljj=->leftJoin(Capsule::raw('|'), function($join) {\n\i$join->on('', '=', '')->where('', '=', '');\n})
578-
alj=leftJoin(Capsule::raw('| as '), '', '=', '')
579-
join=->leftJoin(Capsule::raw('|'), function($join) {\n\i$join->on('', '=', '')->orJoin('', '=', '');\n})
580-
onn=->leftJoin(Capsule::raw('|'), function($join) {\n\i$join->on('', '=', '')->orJoin('', '=', '');\n})
578+
lj=->leftJoin(DB::raw('| as '), '', '=', '')
579+
ljj=->leftJoin(DB::raw('|'), function($join) {\n\i$join->on('', '=', '')->where('', '=', '');\n})
580+
alj=leftJoin(DB::raw('| as '), '', '=', '')
581+
join=->leftJoin(DB::raw('|'), function($join) {\n\i$join->on('', '=', '')->orJoin('', '=', '');\n})
582+
onn=->leftJoin(DB::raw('|'), function($join) {\n\i$join->on('', '=', '')->orJoin('', '=', '');\n})
581583
whe=->when(|, function ($query) {\n\ireturn $query->where('', '');\n})
582584
when=->when(|, function ($query) use ($) {\n\ireturn $query->where('', $);\n})
583585
wei=->whereIn('|', $)
@@ -594,7 +596,7 @@ obd=->orderBy('|', 'desc')
594596
aobd=orderBy('|', 'desc')
595597
obr=->orderByRaw('| asc');
596598
aobr=orderByRaw('| asc');
597-
subq=Capsule::table( Capsule::raw("({$sub|->toSql()}) as sub") )\n\i->mergeBindings($sub)\n\i// ->groupBy('domain');
599+
subq=DB::table( DB::raw("({$sub|->toSql()}) as sub") )\n\i->mergeBindings($sub)\n\i// ->groupBy('domain');
598600
lim=->take(|)
599601
alim=->skip(|)->take()
600602
lc=->count()
@@ -623,14 +625,14 @@ alii=lists('|');
623625
toa=->toArray();
624626
asa=->toArray();
625627
ten=$table->enum('|', []);
626-
cif=if ( !Capsule::schema()->hasTable('|') )\n{\n\iCapsule::schema()->create(\n\i\i'',\n\i\ifunction ($table) {\n\i\i\i$table->increments('id');\n\i\i\i$table->string('');\n\i\i\i$table->integer('');\n\i\i\i$table->dateTime('');\n\i\i}\n\i);\n}
627-
ltr=Capsule::transaction(function()\n{\n\iCapsule::table('|')->truncate();\n\iCapsule::table('')->insert($);\n});
628+
cif=if ( !DB::schema()->hasTable('|') )\n{\n\iDB::schema()->create(\n\i\i'',\n\i\ifunction ($table) {\n\i\i\i$table->increments('id');\n\i\i\i$table->string('');\n\i\i\i$table->integer('');\n\i\i\i$table->dateTime('');\n\i\i}\n\i);\n}
629+
ltr=DB::transaction(function()\n{\n\iDB::table('|')->truncate();\n\iDB::table('')->insert($);\n});
628630
lfe=foreach ($result->get() as $row)
629-
lq=$queries = Capsule::getQueryLog();\nend($queries)
630-
lgq=$queries = Capsule::getQueryLog();\nend($queries)
631-
lg=$queries = Capsule::getQueryLog();\necho "<pre style=\"text-align:left;margin:10px;\">";\nprint_r(end($queries));\necho "</pre>";
632-
lqe=$queries = Capsule::getQueryLog();\necho "<pre style=\"text-align:left;margin:10px;\">";\nprint_r(end($queries));\necho "</pre>";
633-
tryy=try {\n\i|\n} catch (\\Exception $e) {\n\i$queries = Capsule::getQueryLog();\n\iecho "<pre style=\"text-align:left;margin:10px;\">";\n\iecho $e->getMessage();\n\iprint_r(end($queries));\n\iecho "</pre>";\n\ireturn false;\n}
631+
lq=$queries = DB::getQueryLog();\nend($queries)
632+
lgq=$queries = DB::getQueryLog();\nend($queries)
633+
lg=$queries = DB::getQueryLog();\necho "<pre style=\"text-align:left;margin:10px;\">";\nprint_r(end($queries));\necho "</pre>";
634+
lqe=$queries = DB::getQueryLog();\necho "<pre style=\"text-align:left;margin:10px;\">";\nprint_r(end($queries));\necho "</pre>";
635+
tryy=try {\n\i|\n} catch (\\Exception $e) {\n\i$queries = DB::getQueryLog();\n\iecho "<pre style=\"text-align:left;margin:10px;\">";\n\iecho $e->getMessage();\n\iprint_r(end($queries));\n\iecho "</pre>";\n\ireturn false;\n}
634636
635637
; MYSQL
636638
SEL=SELECT * FROM | WHERE = ''
@@ -720,7 +722,6 @@ CAST=CAST(| AS UNSIGNED);
720722
SDIFF=(JULIANDAY(datetime(renewalDueAt|, 'localtime')) - julianday(date('now'), 'start of day')) AS 'days'
721723
SDATE=strftime('%Y-%m-%d %H:%M:%S', datetime(renewalDueAt|, 'localtime'))
722724
723-
724725
; JS
725726
ja=javascript:;
726727
jx=' + | + '
@@ -1063,7 +1064,7 @@ RH=|-->
10631064
CH=-->
10641065
HC=-->
10651066
HH=<!-- \c -->
1066-
qw=„|”
1067+
qw=„|”
10671068
qu=&quot;
10681069
nb=&nbsp;
10691070
nd=&ndash;
@@ -1318,8 +1319,8 @@ SELECT=<select name="" class="form-control">\n\i<option value=""></option>\n</se
13181319
POP={capture assign="popover_content"}\n\i|\n{/capture}\n<a href="javascript:;" class="btn btn-info" data-toggle="popover" data-title="" data-html="true" data-content="{$popover_content\|escape:'html'}">\n\i<i class="fas fa-info-circle"></i>\n</a>
13191320
TOOL=<a href="javascript:;" class="btn btn-info" data-toggle="tooltip" title="|">\n\i<i class="fas fa-info-circle"></i>\n</a>
13201321
TOOLTIP={capture assign="tooltip_content"}\n\i|\n{/capture}\n<a href="javascript:;" class="btn btn-info" data-toggle="tooltip" title="" data-placement="top" data-html="true" data-content="{$tooltip_content\|escape:'html'}">\n\i<i class="fas fa-info-circle"></i>\n</a>
1321-
MODAL=<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modal|">\n\i\n</button>\n\n<div id="modal" class="modal fade" tabindex="-1" role="dialog">\n\i<div class="modal-dialog" role="document">\n\i\i<div class="modal-content">\n\i\i\i<div class="modal-header">\n\i\i\i\i<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>\n\i\i\i\i<h4 class="modal-title">\n\i\i\i\i\i\n\i\i\i\i</h4>\n\i\i\i</div>\n\i\i\i<div class="modal-body">\n\i\i\i\i<div id="modalError" class="hidden">{* AJAX: ERRORS *}</div>\n\i\i\i\i<div id="modalLoading">\n\i\i\i\i\i<h3 class="text-muted text-center">\n\i\i\i\i\i\i<i class="fa fa-fw fa-spinner fa-pulse"></i>&nbsp;\n\i\i\i\i\i\iPlease wait…\n\i\i\i\i\i</h3>\n\i\i\i\i</div>\n\i\i\i\i<div id="modalFormBox">{* AJAX *}</div>\n\i\i\i</div>\n\i\i\i<div class="modal-footer">\n\i\i\i\i<button type="button" class="btn btn-primary">\n\i\i\i\i\i<i class="fas fa-save"></i>\n\i\i\i\i\iSave\n\i\i\i\i</button>\n\i\i\i</div>\n\i\i\i\i<button type="button" class="btn btn-default" data-dismiss="modal">\n\i\i\i\i\iClose\n\i\i\i\i</button>\n\i\i</div>\n\i</div>\n</div>
1322-
LOAD={capture assign="loading_text"}\n\i<i class="fa fa-spinner fa-pulse"></i> Please wait…\n{/capture}\n<button type="button" class="btn btn-primary" data-loading-text="{$loading_text\|escape:'html'}">\n\i|\n</button>
1322+
MODAL=<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modal|">\n\i\n</button>\n\n<div id="modal" class="modal fade" tabindex="-1" role="dialog">\n\i<div class="modal-dialog" role="document">\n\i\i<div class="modal-content">\n\i\i\i<div class="modal-header">\n\i\i\i\i<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>\n\i\i\i\i<h4 class="modal-title">\n\i\i\i\i\i\n\i\i\i\i</h4>\n\i\i\i</div>\n\i\i\i<div class="modal-body">\n\i\i\i\i<div id="modalError" class="hidden">{* AJAX: ERRORS *}</div>\n\i\i\i\i<div id="modalLoading">\n\i\i\i\i\i<h3 class="text-muted text-center">\n\i\i\i\i\i\i<i class="fa fa-fw fa-spinner fa-pulse"></i>&nbsp;\n\i\i\i\i\i\iPlease wait…\n\i\i\i\i\i</h3>\n\i\i\i\i</div>\n\i\i\i\i<div id="modalFormBox">{* AJAX *}</div>\n\i\i\i</div>\n\i\i\i<div class="modal-footer">\n\i\i\i\i<button type="button" class="btn btn-primary">\n\i\i\i\i\i<i class="fas fa-save"></i>\n\i\i\i\i\iSave\n\i\i\i\i</button>\n\i\i\i</div>\n\i\i\i\i<button type="button" class="btn btn-default" data-dismiss="modal">\n\i\i\i\i\iClose\n\i\i\i\i</button>\n\i\i</div>\n\i</div>\n</div>
1323+
LOAD={capture assign="loading_text"}\n\i<i class="fa fa-spinner fa-pulse"></i> Please wait\n{/capture}\n<button type="button" class="btn btn-primary" data-loading-text="{$loading_text\|escape:'html'}">\n\i|\n</button>
13231324

13241325
; XML
13251326
tx=$this->XML_data
@@ -1331,6 +1332,6 @@ axx=asXML();
13311332
; mobile
13321333
meta=<meta name="|" content="" />
13331334
vp=<meta name="viewport" content="width=content-width,initial-scale=1" />
1334-
mobil=<meta name="viewport" content="width=device-width, user-scalable=0" />
1335+
mobil=<meta name="viewport" content="width=device-width,user-scalable=0" />
13351336
box=box-sizing: border-box;
13361337
mm=@media (max-width: |px) {\n\i\n}

0 commit comments

Comments
 (0)