Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Merge trunk. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | mistake |
Files: | files | file ages | folders |
SHA1: |
cfca8ec34d229bfe367ab5e373515251 |
User & Date: | andygoth 2016-04-10 02:10:03.392 |
Context
2016-04-10
| ||
02:10 | Merge trunk. ... (Closed-Leaf check-in: cfca8ec3 user: andygoth tags: mistake) | |
2016-04-09
| ||
16:57 | Update the custom MinGW makefile. ... (check-in: 96dec24e user: mistachkin tags: trunk) | |
2015-06-19
| ||
15:47 | Revert inadvertent merge error in changes.wiki. ... (check-in: b87a4d04 user: andygoth tags: andygoth-brackets-outside-link) | |
Changes
Changes to src/branch.c.
︙ | ︙ | |||
504 505 506 507 508 509 510 | " AND tagxref.tagid=tag.tagid" " AND tagxref.tagtype>0" " AND tag.tagname GLOB 'sym-*'", rid ); while( db_step(&q)==SQLITE_ROW ){ const char *zTagName = db_column_text(&q, 0); | | | 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 | " AND tagxref.tagid=tag.tagid" " AND tagxref.tagtype>0" " AND tag.tagname GLOB 'sym-*'", rid ); while( db_step(&q)==SQLITE_ROW ){ const char *zTagName = db_column_text(&q, 0); @ [%z(href("%R/timeline?r=%T&n=200",zTagName))timeline</a>] } db_finalize(&q); } /* ** WEBPAGE: brtimeline ** |
︙ | ︙ |
Changes to src/browse.c.
︙ | ︙ | |||
1038 1039 1040 1041 1042 1043 1044 | zName); style_header("File Ages"); zGlob = P("glob"); compute_fileage(rid,zGlob); db_multi_exec("CREATE INDEX fileage_ix1 ON fileage(mid,pathname);"); @ <h2>Files in | | | | 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 | zName); style_header("File Ages"); zGlob = P("glob"); compute_fileage(rid,zGlob); db_multi_exec("CREATE INDEX fileage_ix1 ON fileage(mid,pathname);"); @ <h2>Files in @ [%z(href("%R/info/%!S",zUuid))%S(zUuid)</a>] if( zGlob && zGlob[0] ){ @ that match "%h(zGlob)" and } @ ordered by check-in time</h2> @ @ <p>Times are relative to the check-in time for @ [%z(href("%R/ci/%!S",zUuid))%S(zUuid)</a>] which is @ %z(href("%R/timeline?c=%t",zNow))%s(zNow)</a>.</p> @ @ <div class='fileage'><table> @ <tr><th>Time</th><th>Files</th><th>Check-in</th></tr> db_prepare(&q1, "SELECT event.mtime, event.objid, blob.uuid,\n" " coalesce(event.ecomment,event.comment),\n" |
︙ | ︙ | |||
1093 1094 1095 1096 1097 1098 1099 | }else{ @ %z(href("%R/artifact/%!S",zFUuid))%h(zFile)</a><br> } } db_reset(&q2); @ </td> @ <td> | | | 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 | }else{ @ %z(href("%R/artifact/%!S",zFUuid))%h(zFile)</a><br> } } db_reset(&q2); @ </td> @ <td> @ [%z(href("%R/info/%!S",zUuid))%S(zUuid)</a>] if( showId ){ @ (%d(mid)) } @ %W(zComment) (user: @ %z(href("%R/timeline?u=%t&c=%!S&nd&n=200",zUser,zUuid))%h(zUser)</a>, @ branch: @ %z(href("%R/timeline?r=%t&c=%!S&nd&n=200",zBranch,zUuid))%h(zBranch)</a>) |
︙ | ︙ |
Changes to src/diff.c.
︙ | ︙ | |||
2364 2365 2366 2367 2368 2369 2370 | @ artifact %z(href("%R/artifact/%!S",p->zFUuid))%S(p->zFUuid)</a> @ </span> #if 0 if( i>0 ){ char *zLink = xhref("target='infowindow'", "%R/fdiff?v1=%S&v2=%S&sbs=1", p->zFUuid,ann.aVers[0].zFUuid); | | | | 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 | @ artifact %z(href("%R/artifact/%!S",p->zFUuid))%S(p->zFUuid)</a> @ </span> #if 0 if( i>0 ){ char *zLink = xhref("target='infowindow'", "%R/fdiff?v1=%S&v2=%S&sbs=1", p->zFUuid,ann.aVers[0].zFUuid); @ [%z(zLink)diff-to-top</a>] if( i>1 ){ zLink = xhref("target='infowindow'", "%R/fdiff?v1=%S&v2=%S&sbs=1", p->zFUuid,p[-1].zFUuid); @ [%z(zLink)diff-to-previous</a>] } } #endif } @ </ol> @ <hr> } |
︙ | ︙ |
Changes to src/finfo.c.
︙ | ︙ | |||
487 488 489 490 491 492 493 | @ <b>Added</b> }else if( pfnid ){ char *zPrevName = db_text(0, "SELECT name FROM filename WHERE fnid=%d", pfnid); @ <b>Renamed</b> from @ %z(href("%R/finfo?name=%t", zPrevName))%h(zPrevName)</a> } | | | 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 | @ <b>Added</b> }else if( pfnid ){ char *zPrevName = db_text(0, "SELECT name FROM filename WHERE fnid=%d", pfnid); @ <b>Renamed</b> from @ %z(href("%R/finfo?name=%t", zPrevName))%h(zPrevName)</a> } @ [%z(href("%R/artifact/%!S",zUuid))%S(zUuid)</a>] if( fShowId ){ @ (%d(frid)) } @ part of check-in }else{ char *zNewName; zNewName = db_text(0, |
︙ | ︙ | |||
517 518 519 520 521 522 523 | @ (%d(fmid)) } @ %W(zCom) (user: hyperlink_to_user(zUser, zDate, ""); @ branch: %z(href("%R/timeline?t=%T&n=200",zBr))%h(zBr)</a>) if( g.perm.Hyperlink && zUuid ){ const char *z = zFilename; | | < | < | | | | 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 | @ (%d(fmid)) } @ %W(zCom) (user: hyperlink_to_user(zUser, zDate, ""); @ branch: %z(href("%R/timeline?t=%T&n=200",zBr))%h(zBr)</a>) if( g.perm.Hyperlink && zUuid ){ const char *z = zFilename; @ [%z(href("%R/annotate?filename=%h&checkin=%s",z,zCkin))annotate</a>] @ [%z(href("%R/blame?filename=%h&checkin=%s",z,zCkin))blame</a>] @ [%z(href("%R/timeline?n=200&uf=%!S",zUuid))check-ins using</a>] if( fpid>0 ){ @ [%z(href("%R/fdiff?sbs=1&v1=%!S&v2=%!S",zPUuid,zUuid))diff</a>] } } if( fDebug & FINFO_DEBUG_MLINK ){ int ii; char *zAncLink; @ <br>fid=%d(frid) pid=%d(fpid) mid=%d(fmid) if( nParent>0 ){ @ parents=%d(aParent[0]) for(ii=1; ii<nParent; ii++){ @ %d(aParent[ii]) } } zAncLink = href("%R/finfo?name=%T&ci=%!S&debug=1",zFilename,zCkin); @ [%z(zAncLink)ancestry</a>] } tag_private_status(frid); @ </td></tr> } db_finalize(&q); db_finalize(&qparent); if( pGraph ){ |
︙ | ︙ |
Changes to src/info.c.
︙ | ︙ | |||
395 396 397 398 399 400 401 | if( diffFlags ){ append_diff(zOld, zNew, diffFlags, pRe); } }else{ if( zOld && zNew ){ if( fossil_strcmp(zOld, zNew)!=0 ){ @ Modified %z(href("%R/finfo?name=%T",zName))%h(zName)</a> | | | | | | | | 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 | if( diffFlags ){ append_diff(zOld, zNew, diffFlags, pRe); } }else{ if( zOld && zNew ){ if( fossil_strcmp(zOld, zNew)!=0 ){ @ Modified %z(href("%R/finfo?name=%T",zName))%h(zName)</a> @ from [%z(href("%R/artifact/%!S",zOld))%S(zOld)</a>] @ to [%z(href("%R/artifact/%!S",zNew))%S(zNew)</a>]. }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){ @ Name change @ from %z(href("%R/finfo?name=%T",zOldName))%h(zOldName)</a> @ to %z(href("%R/finfo?name=%T",zName))%h(zName)</a>. }else{ @ %z(href("%R/finfo?name=%T",zName))%h(zName)</a> became if( mperm==PERM_EXE ){ @ executable with contents }else if( mperm==PERM_LNK ){ @ a symlink with target }else{ @ a regular file with contents } @ [%z(href("%R/artifact/%!S",zNew))%S(zNew)</a>]. } }else if( zOld ){ @ Deleted %z(href("%R/finfo?name=%T",zName))%h(zName)</a> @ version [%z(href("%R/artifact/%!S",zOld))%S(zOld)</a>]. }else{ @ Added %z(href("%R/finfo?name=%T",zName))%h(zName)</a> @ version [%z(href("%R/artifact/%!S",zNew))%S(zNew)</a>]. } if( diffFlags ){ append_diff(zOld, zNew, diffFlags, pRe); }else if( zOld && zNew && fossil_strcmp(zOld,zNew)!=0 ){ @ @ [%z(href("%R/fdiff?v1=%!S&v2=%!S&sbs=1",zOld,zNew))diff</a>] } } @ </p> } /* ** Generate javascript to enhance HTML diffs. |
︙ | ︙ | |||
1224 1225 1226 1227 1228 1229 1230 | const char *zUser = db_column_text(&q, 3); const char *zVers = db_column_text(&q, 4); int mPerm = db_column_int(&q, 5); const char *zBr = db_column_text(&q, 6); int sameFilename = prevName!=0 && fossil_strcmp(zName,prevName)==0; if( sameFilename && !showDetail ){ if( cnt==1 ){ | | | 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 | const char *zUser = db_column_text(&q, 3); const char *zVers = db_column_text(&q, 4); int mPerm = db_column_int(&q, 5); const char *zBr = db_column_text(&q, 6); int sameFilename = prevName!=0 && fossil_strcmp(zName,prevName)==0; if( sameFilename && !showDetail ){ if( cnt==1 ){ @ [%z(href("%R/whatis/%!S",zUuid))more...</a>] } cnt++; continue; } if( !sameFilename ){ if( prevName && showDetail ) { @ </ul> |
︙ | ︙ | |||
1267 1268 1269 1270 1271 1272 1273 | } if( zBr && zBr[0] ){ @ on branch %z(href("%R/timeline?r=%T",zBr))%h(zBr)</a> } @ — %!W(zCom) (user: hyperlink_to_user(zUser,zDate,")"); if( g.perm.Hyperlink ){ | | | | | < | 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 | } if( zBr && zBr[0] ){ @ on branch %z(href("%R/timeline?r=%T",zBr))%h(zBr)</a> } @ — %!W(zCom) (user: hyperlink_to_user(zUser,zDate,")"); if( g.perm.Hyperlink ){ @ [%z(href("%R/finfo?name=%T&ci=%!S",zName,zVers))ancestry</a>] @ [%z(href("%R/annotate?filename=%T&checkin=%!S",zName,zVers)) @ annotate</a>] @ [%z(href("%R/blame?filename=%T&checkin=%!S",zName,zVers))blame</a>] } cnt++; if( pDownloadName && blob_size(pDownloadName)==0 ){ blob_append(pDownloadName, zName, -1); } } if( prevName && showDetail ){ |
︙ | ︙ | |||
1498 1499 1500 1501 1502 1503 1504 | style_submenu_element("Unified Diff", "udiff", "%s/fdiff?v1=%T&v2=%T&sbs=0%s", g.zTop, P("v1"), P("v2"), zW); } if( P("smhdr")!=0 ){ @ <h2>Differences From Artifact | | | | | | 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 | style_submenu_element("Unified Diff", "udiff", "%s/fdiff?v1=%T&v2=%T&sbs=0%s", g.zTop, P("v1"), P("v2"), zW); } if( P("smhdr")!=0 ){ @ <h2>Differences From Artifact @ [%z(href("%R/artifact/%!S",zV1))%S(zV1)</a>] To @ [%z(href("%R/artifact/%!S",zV2))%S(zV2)</a>].</h2> }else{ @ <h2>Differences From @ Artifact [%z(href("%R/artifact/%!S",zV1))%S(zV1)</a>]:</h2> object_description(v1, objdescFlags, 0); @ <h2>To Artifact [%z(href("%R/artifact/%!S",zV2))%S(zV2)</a>]:</h2> object_description(v2, objdescFlags, 0); } if( pRe ){ @ <b>Only differences that match regular expression "%h(zRe)" @ are shown.</b> } @ <hr /> |
︙ | ︙ |
Changes to src/setup.c.
︙ | ︙ | |||
402 403 404 405 406 407 408 | zCap[i] = 0; zPw = P("pw"); zLogin = P("login"); if( strlen(zLogin)==0 ){ style_header("User Creation Error"); @ <span class="loginError">Empty login not allowed.</span> @ | | | | 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 | zCap[i] = 0; zPw = P("pw"); zLogin = P("login"); if( strlen(zLogin)==0 ){ style_header("User Creation Error"); @ <span class="loginError">Empty login not allowed.</span> @ @ <p>[<a href="setup_uedit?id=%d(uid)">Bummer</a>]</p> style_footer(); return; } if( isValidPwString(zPw) ){ zPw = sha1_shared_secret(zPw, zLogin, 0); }else{ zPw = db_text(0, "SELECT pw FROM user WHERE uid=%d", uid); } zOldLogin = db_text(0, "SELECT login FROM user WHERE uid=%d", uid); if( db_exists("SELECT 1 FROM user WHERE login=%Q AND uid!=%d", zLogin, uid) ){ style_header("User Creation Error"); @ <span class="loginError">Login "%h(zLogin)" is already used by @ a different user.</span> @ @ <p>[<a href="setup_uedit?id=%d(uid)">Bummer</a>]</p> style_footer(); return; } login_verify_csrf_secret(); db_multi_exec( "REPLACE INTO user(uid,login,info,pw,cap,mtime) " "VALUES(nullif(%d,0),%Q,%Q,%Q,%Q,now())", |
︙ | ︙ | |||
462 463 464 465 466 467 468 | "with capabilities [%q].", zLogin, zCap ); if( zErr ){ style_header("User Change Error"); admin_log( "Error updating user '%q': %s'.", zLogin, zErr ); @ <span class="loginError">%s(zErr)</span> @ | | | 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 | "with capabilities [%q].", zLogin, zCap ); if( zErr ){ style_header("User Change Error"); admin_log( "Error updating user '%q': %s'.", zLogin, zErr ); @ <span class="loginError">%s(zErr)</span> @ @ <p>[<a href="setup_uedit?id=%d(uid)">Bummer</a>]</p> style_footer(); return; } } cgi_redirect("setup_ulist"); return; } |
︙ | ︙ |
Changes to src/timeline.c.
︙ | ︙ | |||
39 40 41 42 43 44 45 | } /* ** Generate a hyperlink to a version. */ void hyperlink_to_uuid(const char *zUuid){ if( g.perm.Hyperlink ){ | | | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | } /* ** Generate a hyperlink to a version. */ void hyperlink_to_uuid(const char *zUuid){ if( g.perm.Hyperlink ){ @ [%z(xhref("class='timelineHistLink'","%R/info/%!S",zUuid))%S(zUuid)</a>] }else{ @ <span class="timelineHistDsp">[%S(zUuid)]</span> } } /* ** Generate a hyperlink to a date & time. |
︙ | ︙ | |||
571 572 573 574 575 576 577 | if( isNew ){ @ <li> %s(zA)%h(zFilename)</a>%s(zId) %s(zUnpub) if( isMergeNew ){ @ (added by merge) }else{ @ (new file) } | | | | | 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 | if( isNew ){ @ <li> %s(zA)%h(zFilename)</a>%s(zId) %s(zUnpub) if( isMergeNew ){ @ (added by merge) }else{ @ (new file) } @ [%z(href("%R/artifact/%!S",zNew))view</a>]</li> }else if( isDel ){ @ <li> %s(zA)%h(zFilename)</a> (deleted)</li> }else if( fossil_strcmp(zOld,zNew)==0 && zOldName!=0 ){ @ <li> %h(zOldName) → %s(zA)%h(zFilename)</a>%s(zId) @ %s(zUnpub) [%z(href("%R/artifact/%!S",zNew))view</a>]</li> }else{ if( zOldName!=0 ){ @ <li>%h(zOldName) → %s(zA)%h(zFilename)%s(zId)</a> %s(zUnpub) }else{ @ <li>%s(zA)%h(zFilename)</a>%s(zId) %s(zUnpub) } @ [%z(href("%R/fdiff?sbs=1&v1=%!S&v2=%!S",zOld,zNew))diff</a>]</li> } fossil_free(zA); } db_reset(&fchngQuery); if( inUl ){ @ </ul> } |
︙ | ︙ | |||
1439 1440 1441 1442 1443 1444 1445 | while( p ){ blob_append_sql(&sql, ",%d", p->rid); p = p->u.pTo; } blob_append(&sql, ")", -1); path_reset(); blob_append(&desc, "All nodes on the path from ", -1); | | | | 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 | while( p ){ blob_append_sql(&sql, ",%d", p->rid); p = p->u.pTo; } blob_append(&sql, ")", -1); path_reset(); blob_append(&desc, "All nodes on the path from ", -1); blob_appendf(&desc, "[%z%h</a>]", href("%R/info/%h", zFrom), zFrom); blob_append(&desc, " to ", -1); blob_appendf(&desc, "[%z%h</a>]", href("%R/info/%h",zTo), zTo); tmFlags |= TIMELINE_DISJOINT; db_multi_exec("%s", blob_sql_text(&sql)); }else if( (p_rid || d_rid) && g.perm.Read ){ /* If p= or d= is present, ignore all other parameters other than n= */ char *zUuid; int np, nd; |
︙ | ︙ | |||
1479 1480 1481 1482 1483 1484 1485 | if( np>0 ){ if( nd>0 ) blob_appendf(&desc, " and "); blob_appendf(&desc, "%d ancestors", np); db_multi_exec("%s", blob_sql_text(&sql)); } if( useDividers ) selectedRid = p_rid; } | | < | 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 | if( np>0 ){ if( nd>0 ) blob_appendf(&desc, " and "); blob_appendf(&desc, "%d ancestors", np); db_multi_exec("%s", blob_sql_text(&sql)); } if( useDividers ) selectedRid = p_rid; } blob_appendf(&desc, " of [%z%S</a>]", href("%R/info/%!S", zUuid), zUuid); if( d_rid ){ if( p_rid ){ /* If both p= and d= are set, we don't have the uuid of d yet. */ zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", d_rid); } } style_submenu_entry("n","Max:",4,0); |
︙ | ︙ | |||
1506 1507 1508 1509 1510 1511 1512 | f_rid, f_rid, f_rid ); blob_append_sql(&sql, " AND event.objid IN ok"); db_multi_exec("%s", blob_sql_text(&sql)); if( useDividers ) selectedRid = f_rid; blob_appendf(&desc, "Parents and children of check-in "); zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", f_rid); | | | 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 | f_rid, f_rid, f_rid ); blob_append_sql(&sql, " AND event.objid IN ok"); db_multi_exec("%s", blob_sql_text(&sql)); if( useDividers ) selectedRid = f_rid; blob_appendf(&desc, "Parents and children of check-in "); zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", f_rid); blob_appendf(&desc, "[%z%S</a>]", href("%R/info/%!S", zUuid), zUuid); tmFlags |= TIMELINE_DISJOINT; style_submenu_binary("v","With Files","Without Files", zType[0]!='a' && zType[0]!='c'); if( (tmFlags & TIMELINE_UNHIDE)==0 ){ timeline_submenu(&url, "Unhide", "unhide", "", 0); } }else{ |
︙ | ︙ |
Changes to src/wiki.c.
︙ | ︙ | |||
831 832 833 834 835 836 837 | /* ** Function called to output extra text at the end of each line in ** a wiki history listing. */ static void wiki_history_extra(int rid){ if( db_exists("SELECT 1 FROM tagxref WHERE rid=%d", rid) ){ | | | 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 | /* ** Function called to output extra text at the end of each line in ** a wiki history listing. */ static void wiki_history_extra(int rid){ if( db_exists("SELECT 1 FROM tagxref WHERE rid=%d", rid) ){ @ [%z(href("%R/wdiff?name=%t&a=%d",zWikiPageName,rid))diff</a>] } } /* ** WEBPAGE: whistory ** URL: /whistory?name=PAGENAME ** |
︙ | ︙ |
Changes to src/wikiformat.c.
︙ | ︙ | |||
1223 1224 1225 1226 1227 1228 1229 | if( is_ticket(zTarget, &isClosed) ){ /* Special display processing for tickets. Display the hyperlink ** as crossed out if the ticket is closed. */ if( isClosed ){ if( g.perm.Hyperlink ){ blob_appendf(p->pOut, | | < | | | | | | | | | | | | 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 | if( is_ticket(zTarget, &isClosed) ){ /* Special display processing for tickets. Display the hyperlink ** as crossed out if the ticket is closed. */ if( isClosed ){ if( g.perm.Hyperlink ){ blob_appendf(p->pOut, "[%z<span class=\"wikiTagCancelled\">", href("%R/info/%s",zTarget) ); zTerm = "</span></a>]"; }else{ blob_appendf(p->pOut,"[<span class=\"wikiTagCancelled\">"); zTerm = "</span>]"; } }else{ if( g.perm.Hyperlink ){ blob_appendf(p->pOut,"[%z", href("%R/info/%s", zTarget)); zTerm = "</a>]"; }else{ blob_appendf(p->pOut, "["); zTerm = "]"; } } }else if( !in_this_repo(zTarget) ){ if( (p->state & (WIKI_LINKSONLY|WIKI_NOBADLINKS))!=0 ){ zTerm = ""; }else{ blob_appendf(p->pOut, "[<span class=\"brokenlink\">"); zTerm = "</span>]"; } }else if( g.perm.Hyperlink ){ blob_appendf(p->pOut, "[%z",href("%R/info/%s", zTarget)); zTerm = "</a>]"; }else{ zTerm = ""; } }else if( strlen(zTarget)>=10 && fossil_isdigit(zTarget[0]) && zTarget[4]=='-' && db_int(0, "SELECT datetime(%Q) NOT NULL", zTarget) ){ blob_appendf(p->pOut, "<a href=\"%R/timeline?c=%T\">", zTarget); }else if( (z = validWikiPageName(p, zTarget))!=0 ){ blob_appendf(p->pOut, "<a href=\"%R/wiki?name=%T\">", z); }else if( zTarget>=&zOrig[2] && !fossil_isspace(zTarget[-2]) ){ /* Probably an array subscript in code */ zTerm = ""; }else if( (p->state & (WIKI_NOBADLINKS|WIKI_LINKSONLY))!=0 ){ zTerm = ""; }else{ blob_appendf(p->pOut, "[<span class=\"brokenlink\">%h", zTarget); zTerm = "</span>]"; } assert( strlen(zTerm)<nClose ); sqlite3_snprintf(nClose, zClose, "%s", zTerm); } /* ** Check to see if the given parsed markup is the correct |
︙ | ︙ | |||
1450 1451 1452 1453 1454 1455 1456 | zDisplay = zTarget; }else{ while( fossil_isspace(*zDisplay) ) zDisplay++; } openHyperlink(p, zTarget, zClose, sizeof(zClose), zOrig); if( linksOnly || zClose[0]==0 || p->inVerbatim ){ if( cS1 ) z[iS1] = cS1; | | | 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 | zDisplay = zTarget; }else{ while( fossil_isspace(*zDisplay) ) zDisplay++; } openHyperlink(p, zTarget, zClose, sizeof(zClose), zOrig); if( linksOnly || zClose[0]==0 || p->inVerbatim ){ if( cS1 ) z[iS1] = cS1; if( zClose[strlen(zClose) - 1]!=']' ){ blob_appendf(p->pOut, "[%h]%s", zTarget, zClose); }else{ blob_appendf(p->pOut, "%h%s", zTarget, zClose); } }else{ savedState = p->state; p->state &= ~ALLOW_WIKI; |
︙ | ︙ |