', options, globals); - text = text.replace(/^[ ]{0,2}([ ]?\*[ ]?){3,}[ \t]*$/gm, key); - text = text.replace(/^[ ]{0,2}([ ]?\-[ ]?){3,}[ \t]*$/gm, key); - text = text.replace(/^[ ]{0,2}([ ]?_[ ]?){3,}[ \t]*$/gm, key); - - text = showdown.subParser('lists')(text, options, globals); - text = showdown.subParser('codeBlocks')(text, options, globals); - text = showdown.subParser('tables')(text, options, globals); - - // We already ran _HashHTMLBlocks() before, in Markdown(), but that - // was to escape raw HTML in the original Markdown source. This time, - // we're escaping the markup we've just created, so that we don't wrap - //
tags around block-level tags. - text = showdown.subParser('hashHTMLBlocks')(text, options, globals); - text = showdown.subParser('paragraphs')(text, options, globals); - - return text; - -}); - -showdown.subParser('blockQuotes', function (text, options, globals) { - 'use strict'; - - /* - text = text.replace(/ - ( // Wrap whole match in $1 - ( - ^[ \t]*>[ \t]? // '>' at the start of a line - .+\n // rest of the first line - (.+\n)* // subsequent consecutive lines - \n* // blanks - )+ - ) - /gm, function(){...}); - */ - - text = text.replace(/((^[ \t]{0,3}>[ \t]?.+\n(.+\n)*\n*)+)/gm, function (wholeMatch, m1) { - var bq = m1; - - // attacklab: hack around Konqueror 3.5.4 bug: - // "----------bug".replace(/^-/g,"") == "bug" - bq = bq.replace(/^[ \t]*>[ \t]?/gm, '~0'); // trim one level of quoting - - // attacklab: clean up hack - bq = bq.replace(/~0/g, ''); - - bq = bq.replace(/^[ \t]+$/gm, ''); // trim whitespace-only lines - bq = showdown.subParser('githubCodeBlocks')(bq, options, globals); - bq = showdown.subParser('blockGamut')(bq, options, globals); // recurse - - bq = bq.replace(/(^|\n)/g, '$1 '); - // These leading spaces screw with
content, so we need to fix that:
- bq = bq.replace(/(\s*[^\r]+?<\/pre>)/gm, function (wholeMatch, m1) {
- var pre = m1;
- // attacklab: hack around Konqueror 3.5.4 bug:
- pre = pre.replace(/^ /mg, '~0');
- pre = pre.replace(/~0/g, '');
- return pre;
- });
-
- return showdown.subParser('hashBlock')('\n' + bq + '\n
', options, globals);
- });
- return text;
-});
-
-/**
- * Process Markdown `` blocks.
- */
-showdown.subParser('codeBlocks', function (text, options, globals) {
- 'use strict';
-
- /*
- text = text.replace(text,
- /(?:\n\n|^)
- ( // $1 = the code block -- one or more lines, starting with a space/tab
- (?:
- (?:[ ]{4}|\t) // Lines must start with a tab or a tab-width of spaces - attacklab: g_tab_width
- .*\n+
- )+
- )
- (\n*[ ]{0,3}[^ \t\n]|(?=~0)) // attacklab: g_tab_width
- /g,function(){...});
- */
-
- // attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
- text += '~0';
-
- var pattern = /(?:\n\n|^)((?:(?:[ ]{4}|\t).*\n+)+)(\n*[ ]{0,3}[^ \t\n]|(?=~0))/g;
- text = text.replace(pattern, function (wholeMatch, m1, m2) {
- var codeblock = m1,
- nextChar = m2,
- end = '\n';
-
- codeblock = showdown.subParser('outdent')(codeblock);
- codeblock = showdown.subParser('encodeCode')(codeblock);
- codeblock = showdown.subParser('detab')(codeblock);
- codeblock = codeblock.replace(/^\n+/g, ''); // trim leading newlines
- codeblock = codeblock.replace(/\n+$/g, ''); // trim trailing newlines
-
- if (options.omitExtraWLInCodeBlocks) {
- end = '';
- }
-
- codeblock = '' + codeblock + end + '
';
-
- return showdown.subParser('hashBlock')(codeblock, options, globals) + nextChar;
- });
-
- // attacklab: strip sentinel
- text = text.replace(/~0/, '');
-
- return text;
-});
-
-/**
- *
- * * Backtick quotes are used for Just type foo `bar` baz at the prompt.
- *
- * There's no arbitrary limit to the number of backticks you
- * can use as delimters. If you need three consecutive backticks
- * in your code, use four for delimiters, etc.
- *
- * * You can use spaces to get literal backticks at the edges:
- *
- * ... type `` `bar` `` ...
- *
- * Turns to:
- *
- * ... type `bar` ...
- */
-showdown.subParser('codeSpans', function (text) {
- 'use strict';
-
- //special case -> literal html code tag
- text = text.replace(/(<]*?>)([^]*?)<\/code>/g, function (wholeMatch, tag, c) {
- c = c.replace(/^([ \t]*)/g, ''); // leading whitespace
- c = c.replace(/[ \t]*$/g, ''); // trailing whitespace
- c = showdown.subParser('encodeCode')(c);
- return tag + c + ' ';
- });
-
- /*
- text = text.replace(/
- (^|[^\\]) // Character before opening ` can't be a backslash
- (`+) // $2 = Opening run of `
- ( // $3 = The code block
- [^\r]*?
- [^`] // attacklab: work around lack of lookbehind
- )
- \2 // Matching closer
- (?!`)
- /gm, function(){...});
- */
- text = text.replace(/(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm,
- function (wholeMatch, m1, m2, m3) {
- var c = m3;
- c = c.replace(/^([ \t]*)/g, ''); // leading whitespace
- c = c.replace(/[ \t]*$/g, ''); // trailing whitespace
- c = showdown.subParser('encodeCode')(c);
- return m1 + '' + c + '';
- }
- );
-
- return text;
-});
-
-/**
- * Convert all tabs to spaces
- */
-showdown.subParser('detab', function (text) {
- 'use strict';
-
- // expand first n-1 tabs
- text = text.replace(/\t(?=\t)/g, ' '); // g_tab_width
-
- // replace the nth with two sentinels
- text = text.replace(/\t/g, '~A~B');
-
- // use the sentinel to anchor our regex so it doesn't explode
- text = text.replace(/~B(.+?)~A/g, function (wholeMatch, m1) {
- var leadingText = m1,
- numSpaces = 4 - leadingText.length % 4; // g_tab_width
-
- // there *must* be a better way to do this:
- for (var i = 0; i < numSpaces; i++) {
- leadingText += ' ';
- }
-
- return leadingText;
- });
-
- // clean up sentinels
- text = text.replace(/~A/g, ' '); // g_tab_width
- text = text.replace(/~B/g, '');
-
- return text;
-
-});
-
-/**
- * Smart processing for ampersands and angle brackets that need to be encoded.
- */
-showdown.subParser('encodeAmpsAndAngles', function (text) {
- 'use strict';
- // Ampersand-encoding based entirely on Nat Irons's Amputator MT plugin:
- // http://bumppo.net/projects/amputator/
- text = text.replace(/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/g, '&');
-
- // Encode naked <'s
- text = text.replace(/<(?![a-z\/?\$!])/gi, '<');
-
- return text;
-});
-
-/**
- * Returns the string, with after processing the following backslash escape sequences.
- *
- * attacklab: The polite way to do this is with the new escapeCharacters() function:
- *
- * text = escapeCharacters(text,"\\",true);
- * text = escapeCharacters(text,"`*_{}[]()>#+-.!",true);
- *
- * ...but we're sidestepping its use of the (slow) RegExp constructor
- * as an optimization for Firefox. This function gets called a LOT.
- */
-showdown.subParser('encodeBackslashEscapes', function (text) {
- 'use strict';
- text = text.replace(/\\(\\)/g, showdown.helper.escapeCharactersCallback);
- text = text.replace(/\\([`*_{}\[\]()>#+-.!])/g, showdown.helper.escapeCharactersCallback);
- return text;
-});
-
-/**
- * Encode/escape certain characters inside Markdown code runs.
- * The point is that in code, these characters are literals,
- * and lose their special Markdown meanings.
- */
-showdown.subParser('encodeCode', function (text) {
- 'use strict';
-
- // Encode all ampersands; HTML entities are not
- // entities within a Markdown code span.
- text = text.replace(/&/g, '&');
-
- // Do the angle bracket song and dance:
- text = text.replace(//g, '>');
-
- // Now, escape characters that are magic in Markdown:
- text = showdown.helper.escapeCharacters(text, '*_{}[]\\', false);
-
- // jj the line above breaks this:
- //---
- //* Item
- // 1. Subitem
- // special char: *
- // ---
-
- return text;
-});
-
-/**
- * Input: an email address, e.g. "foo@example.com"
- *
- * Output: the email address as a mailto link, with each character
- * of the address encoded as either a decimal or hex entity, in
- * the hopes of foiling most address harvesting spam bots. E.g.:
- *
- * foo
- * @example.com
- *
- * Based on a filter by Matthew Wickline, posted to the BBEdit-Talk
- * mailing list:
- *
- */
-showdown.subParser('encodeEmailAddress', function (addr) {
- 'use strict';
-
- var encode = [
- function (ch) {
- return '&#' + ch.charCodeAt(0) + ';';
- },
- function (ch) {
- return '&#x' + ch.charCodeAt(0).toString(16) + ';';
- },
- function (ch) {
- return ch;
- }
- ];
-
- addr = 'mailto:' + addr;
-
- addr = addr.replace(/./g, function (ch) {
- if (ch === '@') {
- // this *must* be encoded. I insist.
- ch = encode[Math.floor(Math.random() * 2)](ch);
- } else if (ch !== ':') {
- // leave ':' alone (to spot mailto: later)
- var r = Math.random();
- // roughly 10% raw, 45% hex, 45% dec
- ch = (
- r > 0.9 ? encode[2](ch) : r > 0.45 ? encode[1](ch) : encode[0](ch)
- );
- }
- return ch;
- });
-
- addr = '' + addr + '';
- addr = addr.replace(/">.+:/g, '">'); // strip the mailto: from the visible part
-
- return addr;
-});
-
-/**
- * Within tags -- meaning between < and > -- encode [\ ` * _] so they
- * don't conflict with their use in Markdown for code, italics and strong.
- */
-showdown.subParser('escapeSpecialCharsWithinTagAttributes', function (text) {
- 'use strict';
-
- // Build a regex to find HTML tags and comments. See Friedl's
- // "Mastering Regular Expressions", 2nd Ed., pp. 200-201.
- var regex = /(<[a-z\/!$]("[^"]*"|'[^']*'|[^'">])*>|)/gi;
-
- text = text.replace(regex, function (wholeMatch) {
- var tag = wholeMatch.replace(/(.)<\/?code>(?=.)/g, '$1`');
- tag = showdown.helper.escapeCharacters(tag, '\\`*_', false);
- return tag;
- });
-
- return text;
-});
-
-/**
- * Handle github codeblocks prior to running HashHTML so that
- * HTML contained within the codeblock gets escaped properly
- * Example:
- * ```ruby
- * def hello_world(x)
- * puts "Hello, #{x}"
- * end
- * ```
- */
-showdown.subParser('githubCodeBlocks', function (text, options, globals) {
- 'use strict';
-
- // early exit if option is not enabled
- if (!options.ghCodeBlocks) {
- return text;
- }
-
- text += '~0';
-
- text = text.replace(/(?:^|\n)```(.*)\n([\s\S]*?)\n```/g, function (wholeMatch, language, codeblock) {
- var end = (options.omitExtraWLInCodeBlocks) ? '' : '\n';
-
- codeblock = showdown.subParser('encodeCode')(codeblock);
- codeblock = showdown.subParser('detab')(codeblock);
- codeblock = codeblock.replace(/^\n+/g, ''); // trim leading newlines
- codeblock = codeblock.replace(/\n+$/g, ''); // trim trailing whitespace
-
- codeblock = '' + codeblock + end + '
';
-
- return showdown.subParser('hashBlock')(codeblock, options, globals);
- });
-
- // attacklab: strip sentinel
- text = text.replace(/~0/, '');
-
- return text;
-
-});
-
-showdown.subParser('hashBlock', function (text, options, globals) {
- 'use strict';
- text = text.replace(/(^\n+|\n+$)/g, '');
- return '\n\n~K' + (globals.gHtmlBlocks.push(text) - 1) + 'K\n\n';
-});
-
-showdown.subParser('hashElement', function (text, options, globals) {
- 'use strict';
-
- return function (wholeMatch, m1) {
- var blockText = m1;
-
- // Undo double lines
- blockText = blockText.replace(/\n\n/g, '\n');
- blockText = blockText.replace(/^\n/, '');
-
- // strip trailing blank lines
- blockText = blockText.replace(/\n+$/g, '');
-
- // Replace the element text with a marker ("~KxK" where x is its key)
- blockText = '\n\n~K' + (globals.gHtmlBlocks.push(blockText) - 1) + 'K\n\n';
-
- return blockText;
- };
-});
-
-showdown.subParser('hashHTMLBlocks', function (text, options, globals) {
- 'use strict';
-
- // attacklab: Double up blank lines to reduce lookaround
- text = text.replace(/\n/g, '\n\n');
-
- // Hashify HTML blocks:
- // We only want to do this for block-level HTML tags, such as headers,
- // lists, and tables. That's because we still want to wrap s around
- // "paragraphs" that are wrapped in non-block-level tags, such as anchors,
- // phrase emphasis, and spans. The list of tags we're looking for is
- // hard-coded:
- //var block_tags_a =
- // 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del|style|section|header|footer|nav|article|aside';
- // var block_tags_b =
- // 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|style|section|header|footer|nav|article|aside';
-
- // First, look for nested blocks, e.g.:
- //
- //
- // tags for inner block must be indented.
- //
- //
- //
- // The outermost tags must start at the left margin for this to match, and
- // the inner nested divs must be indented.
- // We need to do this before the next, more liberal match, because the next
- // match will start at the first `` and stop at the first ``.
-
- // attacklab: This regex can be expensive when it fails.
- /*
- var text = text.replace(/
- ( // save in $1
- ^ // start of line (with /m)
- <($block_tags_a) // start tag = $2
- \b // word break
- // attacklab: hack around khtml/pcre bug...
- [^\r]*?\n // any number of lines, minimally matching
- // the matching end tag
- [ \t]* // trailing spaces/tabs
- (?=\n+) // followed by a newline
- ) // attacklab: there are sentinel newlines at end of document
- /gm,function(){...}};
- */
- text = text.replace(/^(<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del)\b[^\r]*?\n<\/\2>[ \t]*(?=\n+))/gm,
- showdown.subParser('hashElement')(text, options, globals));
-
- //
- // Now match more liberally, simply from `\n` to ` \n`
- //
-
- /*
- var text = text.replace(/
- ( // save in $1
- ^ // start of line (with /m)
- <($block_tags_b) // start tag = $2
- \b // word break
- // attacklab: hack around khtml/pcre bug...
- [^\r]*? // any number of lines, minimally matching
- // the matching end tag
- [ \t]* // trailing spaces/tabs
- (?=\n+) // followed by a newline
- ) // attacklab: there are sentinel newlines at end of document
- /gm,function(){...}};
- */
- text = text.replace(/^(<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|style|section|header|footer|nav|article|aside|address|audio|canvas|figure|hgroup|output|video)\b[^\r]*?<\/\2>[ \t]*(?=\n+)\n)/gm,
- showdown.subParser('hashElement')(text, options, globals));
-
- // Special case just for
. It was easier to make a special case than
- // to make the other regex more complicated.
-
- /*
- text = text.replace(/
- ( // save in $1
- \n\n // Starting after a blank line
- [ ]{0,3}
- (<(hr) // start tag = $2
- \b // word break
- ([^<>])*? //
- \/?>) // the matching end tag
- [ \t]*
- (?=\n{2,}) // followed by a blank line
- )
- /g,showdown.subParser('hashElement')(text, options, globals));
- */
- text = text.replace(/(\n[ ]{0,3}(<(hr)\b([^<>])*?\/?>)[ \t]*(?=\n{2,}))/g,
- showdown.subParser('hashElement')(text, options, globals));
-
- // Special case for standalone HTML comments:
-
- /*
- text = text.replace(/
- ( // save in $1
- \n\n // Starting after a blank line
- [ ]{0,3} // attacklab: g_tab_width - 1
-
- [ \t]*
- (?=\n{2,}) // followed by a blank line
- )
- /g,showdown.subParser('hashElement')(text, options, globals));
- */
- text = text.replace(/(\n\n[ ]{0,3}[ \t]*(?=\n{2,}))/g,
- showdown.subParser('hashElement')(text, options, globals));
-
- // PHP and ASP-style processor instructions ( and <%...%>)
-
- /*
- text = text.replace(/
- (?:
- \n\n // Starting after a blank line
- )
- ( // save in $1
- [ ]{0,3} // attacklab: g_tab_width - 1
- (?:
- <([?%]) // $2
- [^\r]*?
- \2>
- )
- [ \t]*
- (?=\n{2,}) // followed by a blank line
- )
- /g,showdown.subParser('hashElement')(text, options, globals));
- */
- text = text.replace(/(?:\n\n)([ ]{0,3}(?:<([?%])[^\r]*?\2>)[ \t]*(?=\n{2,}))/g,
- showdown.subParser('hashElement')(text, options, globals));
-
- // attacklab: Undo double lines (see comment at top of this function)
- text = text.replace(/\n\n/g, '\n');
- return text;
-
-});
-
-showdown.subParser('headers', function (text, options, globals) {
- 'use strict';
-
- var prefixHeader = options.prefixHeaderId,
- headerLevelStart = (isNaN(parseInt(options.headerLevelStart))) ? 1 : parseInt(options.headerLevelStart),
-
- // Set text-style headers:
- // Header 1
- // ========
- //
- // Header 2
- // --------
- //
- setextRegexH1 = (options.smoothLivePreview) ? /^(.+)[ \t]*\n={2,}[ \t]*\n+/gm : /^(.+)[ \t]*\n=+[ \t]*\n+/gm,
- setextRegexH2 = (options.smoothLivePreview) ? /^(.+)[ \t]*\n-{2,}[ \t]*\n+/gm : /^(.+)[ \t]*\n-+[ \t]*\n+/gm;
-
- text = text.replace(setextRegexH1, function (wholeMatch, m1) {
-
- var spanGamut = showdown.subParser('spanGamut')(m1, options, globals),
- hID = (options.noHeaderId) ? '' : ' id="' + headerId(m1) + '"',
- hLevel = headerLevelStart,
- hashBlock = '' + spanGamut + ' ';
- return showdown.subParser('hashBlock')(hashBlock, options, globals);
- });
-
- text = text.replace(setextRegexH2, function (matchFound, m1) {
- var spanGamut = showdown.subParser('spanGamut')(m1, options, globals),
- hID = (options.noHeaderId) ? '' : ' id="' + headerId(m1) + '"',
- hLevel = headerLevelStart + 1,
- hashBlock = '' + spanGamut + ' ';
- return showdown.subParser('hashBlock')(hashBlock, options, globals);
- });
-
- // atx-style headers:
- // # Header 1
- // ## Header 2
- // ## Header 2 with closing hashes ##
- // ...
- // ###### Header 6
- //
- text = text.replace(/^(#{1,6})[ \t]*(.+?)[ \t]*#*\n+/gm, function (wholeMatch, m1, m2) {
- var span = showdown.subParser('spanGamut')(m2, options, globals),
- hID = (options.noHeaderId) ? '' : ' id="' + headerId(m2) + '"',
- hLevel = headerLevelStart - 1 + m1.length,
- header = '' + span + ' ';
-
- return showdown.subParser('hashBlock')(header, options, globals);
- });
-
- function headerId(m) {
- var title, escapedId = m.replace(/[^\w]/g, '').toLowerCase();
-
- if (globals.hashLinkCounts[escapedId]) {
- title = escapedId + '-' + (globals.hashLinkCounts[escapedId]++);
- } else {
- title = escapedId;
- globals.hashLinkCounts[escapedId] = 1;
- }
-
- // Prefix id to prevent causing inadvertent pre-existing style matches.
- if (prefixHeader === true) {
- prefixHeader = 'section';
- }
-
- if (showdown.helper.isString(prefixHeader)) {
- return prefixHeader + title;
- }
- return title;
- }
-
- return text;
-});
-
-/**
- * Turn Markdown image shortcuts into ![]()
tags.
- */
-showdown.subParser('images', function (text, options, globals) {
- 'use strict';
-
- var inlineRegExp = /!\[(.*?)]\s?\([ \t]*()?(?: =([*\d]+[A-Za-z%]{0,4})x([*\d]+[A-Za-z%]{0,4}))?[ \t]*(?:(['"])(.*?)\6[ \t]*)?\)/g,
- referenceRegExp = /!\[(.*?)][ ]?(?:\n[ ]*)?\[(.*?)]()()()()()/g;
-
- function writeImageTag (wholeMatch, altText, linkId, url, width, height, m5, title) {
-
- var gUrls = globals.gUrls,
- gTitles = globals.gTitles,
- gDims = globals.gDimensions;
-
- linkId = linkId.toLowerCase();
-
- if (!title) {
- title = '';
- }
-
- if (url === '' || url === null) {
- if (linkId === '' || linkId === null) {
- // lower-case and turn embedded newlines into spaces
- linkId = altText.toLowerCase().replace(/ ?\n/g, ' ');
- }
- url = '#' + linkId;
-
- if (!showdown.helper.isUndefined(gUrls[linkId])) {
- url = gUrls[linkId];
- if (!showdown.helper.isUndefined(gTitles[linkId])) {
- title = gTitles[linkId];
- }
- if (!showdown.helper.isUndefined(gDims[linkId])) {
- width = gDims[linkId].width;
- height = gDims[linkId].height;
- }
- } else {
- return wholeMatch;
- }
- }
-
- altText = altText.replace(/"/g, '"');
- altText = showdown.helper.escapeCharacters(altText, '*_', false);
- url = showdown.helper.escapeCharacters(url, '*_', false);
- var result = '
x "optional title")
- text = text.replace(inlineRegExp, writeImageTag);
-
- return text;
-});
-
-showdown.subParser('italicsAndBold', function (text, options) {
- 'use strict';
-
- if (options.literalMidWordUnderscores) {
- //underscores
- // Since we are consuming a \s character, we need to add it
- text = text.replace(/(^|\s|>|\b)__(?=\S)([^]+?)__(?=\b|<|\s|$)/gm, '$1$2');
- text = text.replace(/(^|\s|>|\b)_(?=\S)([^]+?)_(?=\b|<|\s|$)/gm, '$1$2');
- //asterisks
- text = text.replace(/\*\*(?=\S)([^]+?)\*\*/g, '$1');
- text = text.replace(/\*(?=\S)([^]+?)\*/g, '$1');
-
- } else {
- // must go first:
- text = text.replace(/(\*\*|__)(?=\S)([^\r]*?\S[*_]*)\1/g, '$2');
- text = text.replace(/(\*|_)(?=\S)([^\r]*?\S)\1/g, '$2');
- }
- return text;
-});
-
-/**
- * Form HTML ordered (numbered) and unordered (bulleted) lists.
- */
-showdown.subParser('lists', function (text, options, globals) {
- 'use strict';
-
- /**
- * Process the contents of a single ordered or unordered list, splitting it
- * into individual list items.
- * @param {string} listStr
- * @param {boolean} trimTrailing
- * @returns {string}
- */
- function processListItems (listStr, trimTrailing) {
- // The $g_list_level global keeps track of when we're inside a list.
- // Each time we enter a list, we increment it; when we leave a list,
- // we decrement. If it's zero, we're not in a list anymore.
- //
- // We do this because when we're not inside a list, we want to treat
- // something like this:
- //
- // I recommend upgrading to version
- // 8. Oops, now this line is treated
- // as a sub-list.
- //
- // As a single paragraph, despite the fact that the second line starts
- // with a digit-period-space sequence.
- //
- // Whereas when we're inside a list (or sub-list), that line will be
- // treated as the start of a sub-list. What a kludge, huh? This is
- // an aspect of Markdown's syntax that's hard to parse perfectly
- // without resorting to mind-reading. Perhaps the solution is to
- // change the syntax rules such that sub-lists must start with a
- // starting cardinal number; e.g. "1." or "a.".
- globals.gListLevel++;
-
- // trim trailing blank lines:
- listStr = listStr.replace(/\n{2,}$/, '\n');
-
- // attacklab: add sentinel to emulate \z
- listStr += '~0';
-
- var rgx = /(\n)?(^[ \t]*)([*+-]|\d+[.])[ \t]+((\[(x| )?])?[ \t]*[^\r]+?(\n{1,2}))(?=\n*(~0|\2([*+-]|\d+[.])[ \t]+))/gm,
- isParagraphed = (/\n[ \t]*\n(?!~0)/.test(listStr));
-
- listStr = listStr.replace(rgx, function (wholeMatch, m1, m2, m3, m4, taskbtn, checked) {
- checked = (checked && checked.trim() !== '');
- var item = showdown.subParser('outdent')(m4, options, globals),
- bulletStyle = '';
-
- // Support for github tasklists
- if (taskbtn && options.tasklists) {
- bulletStyle = ' class="task-list-item" style="list-style-type: none;"';
- item = item.replace(/^[ \t]*\[(x| )?]/m, function () {
- var otp = ' -1)) {
- item = showdown.subParser('githubCodeBlocks')(item, options, globals);
- item = showdown.subParser('blockGamut')(item, options, globals);
- } else {
- // Recursion for sub-lists:
- item = showdown.subParser('lists')(item, options, globals);
- item = item.replace(/\n$/, ''); // chomp(item)
- if (isParagraphed) {
- item = showdown.subParser('paragraphs')(item, options, globals);
- } else {
- item = showdown.subParser('spanGamut')(item, options, globals);
- }
- }
- item = '\n' + item + '\n';
- return item;
- });
-
- // attacklab: strip sentinel
- listStr = listStr.replace(/~0/g, '');
-
- globals.gListLevel--;
-
- if (trimTrailing) {
- listStr = listStr.replace(/\s+$/, '');
- }
-
- return listStr;
- }
-
- /**
- * Check and parse consecutive lists (better fix for issue #142)
- * @param {string} list
- * @param {string} listType
- * @param {boolean} trimTrailing
- * @returns {string}
- */
- function parseConsecutiveLists(list, listType, trimTrailing) {
- // check if we caught 2 or more consecutive lists by mistake
- // we use the counterRgx, meaning if listType is UL we look for UL and vice versa
- var counterRxg = (listType === 'ul') ? /^ {0,2}\d+\.[ \t]/gm : /^ {0,2}[*+-][ \t]/gm,
- subLists = [],
- result = '';
-
- if (list.search(counterRxg) !== -1) {
- (function parseCL(txt) {
- var pos = txt.search(counterRxg);
- if (pos !== -1) {
- // slice
- result += '\n\n<' + listType + '>' + processListItems(txt.slice(0, pos), !!trimTrailing) + '\n\n';
-
- // invert counterType and listType
- listType = (listType === 'ul') ? 'ol' : 'ul';
- counterRxg = (listType === 'ul') ? /^ {0,2}\d+\.[ \t]/gm : /^ {0,2}[*+-][ \t]/gm;
-
- //recurse
- parseCL(txt.slice(pos));
- } else {
- result += '\n\n<' + listType + '>' + processListItems(txt, !!trimTrailing) + '\n\n';
- }
- })(list);
- for (var i = 0; i < subLists.length; ++i) {
-
- }
- } else {
- result = '\n\n<' + listType + '>' + processListItems(list, !!trimTrailing) + '\n\n';
- }
-
- return result;
- }
-
- // attacklab: add sentinel to hack around khtml/safari bug:
- // http://bugs.webkit.org/show_bug.cgi?id=11231
- text += '~0';
-
- // Re-usable pattern to match any entire ul or ol list:
- var wholeList = /^(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/gm;
-
- if (globals.gListLevel) {
- text = text.replace(wholeList, function (wholeMatch, list, m2) {
- var listType = (m2.search(/[*+-]/g) > -1) ? 'ul' : 'ol';
- return parseConsecutiveLists(list, listType, true);
- });
- } else {
- wholeList = /(\n\n|^\n?)(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/gm;
- //wholeList = /(\n\n|^\n?)( {0,3}([*+-]|\d+\.)[ \t]+[\s\S]+?)(?=(~0)|(\n\n(?!\t| {2,}| {0,3}([*+-]|\d+\.)[ \t])))/g;
- text = text.replace(wholeList, function (wholeMatch, m1, list, m3) {
-
- var listType = (m3.search(/[*+-]/g) > -1) ? 'ul' : 'ol';
- return parseConsecutiveLists(list, listType);
- });
- }
-
- // attacklab: strip sentinel
- text = text.replace(/~0/, '');
-
- return text;
-});
-
-/**
- * Remove one level of line-leading tabs or spaces
- */
-showdown.subParser('outdent', function (text) {
- 'use strict';
-
- // attacklab: hack around Konqueror 3.5.4 bug:
- // "----------bug".replace(/^-/g,"") == "bug"
- text = text.replace(/^(\t|[ ]{1,4})/gm, '~0'); // attacklab: g_tab_width
-
- // attacklab: clean up hack
- text = text.replace(/~0/g, '');
-
- return text;
-});
-
-/**
- *
- */
-showdown.subParser('paragraphs', function (text, options, globals) {
- 'use strict';
-
- // Strip leading and trailing lines:
- text = text.replace(/^\n+/g, '');
- text = text.replace(/\n+$/g, '');
-
- var grafs = text.split(/\n{2,}/g),
- grafsOut = [],
- end = grafs.length; // Wrap tags
-
- for (var i = 0; i < end; i++) {
- var str = grafs[i];
-
- // if this is an HTML marker, copy it
- if (str.search(/~K(\d+)K/g) >= 0) {
- grafsOut.push(str);
- } else if (str.search(/\S/) >= 0) {
- str = showdown.subParser('spanGamut')(str, options, globals);
- str = str.replace(/^([ \t]*)/g, '
');
- str += '
';
- grafsOut.push(str);
- }
- }
-
- /** Unhashify HTML blocks */
- end = grafsOut.length;
- for (i = 0; i < end; i++) {
- // if this is a marker for an html block...
- while (grafsOut[i].search(/~K(\d+)K/) >= 0) {
- var blockText = globals.gHtmlBlocks[RegExp.$1];
- blockText = blockText.replace(/\$/g, '$$$$'); // Escape any dollar signs
- grafsOut[i] = grafsOut[i].replace(/~K\d+K/, blockText);
- }
- }
-
- return grafsOut.join('\n\n');
-});
-
-/**
- * Run extension
- */
-showdown.subParser('runExtension', function (ext, text, options, globals) {
- 'use strict';
-
- if (ext.filter) {
- text = ext.filter(text, globals.converter, options);
-
- } else if (ext.regex) {
- // TODO remove this when old extension loading mechanism is deprecated
- var re = ext.regex;
- if (!re instanceof RegExp) {
- re = new RegExp(re, 'g');
- }
- text = text.replace(re, ext.replace);
- }
-
- return text;
-});
-
-/**
- * These are all the transformations that occur *within* block-level
- * tags like paragraphs, headers, and list items.
- */
-showdown.subParser('spanGamut', function (text, options, globals) {
- 'use strict';
-
- text = showdown.subParser('codeSpans')(text, options, globals);
- text = showdown.subParser('escapeSpecialCharsWithinTagAttributes')(text, options, globals);
- text = showdown.subParser('encodeBackslashEscapes')(text, options, globals);
-
- // Process anchor and image tags. Images must come first,
- // because ![foo][f] looks like an anchor.
- text = showdown.subParser('images')(text, options, globals);
- text = showdown.subParser('anchors')(text, options, globals);
-
- // Make links out of things like `).
- text = showdown.subParser('autoLinks')(text, options, globals);
- text = showdown.subParser('encodeAmpsAndAngles')(text, options, globals);
- text = showdown.subParser('italicsAndBold')(text, options, globals);
- text = showdown.subParser('strikethrough')(text, options, globals);
-
- // Do hard breaks:
- text = text.replace(/ +\n/g, '
\n');
-
- return text;
-
-});
-
-showdown.subParser('strikethrough', function (text, options) {
- 'use strict';
-
- if (options.strikethrough) {
- text = text.replace(/(?:~T){2}([^~]+)(?:~T){2}/g, '$1');
- }
-
- return text;
-});
-
-/**
- * Strip any lines consisting only of spaces and tabs.
- * This makes subsequent regexs easier to write, because we can
- * match consecutive blank lines with /\n+/ instead of something
- * contorted like /[ \t]*\n+/
- */
-showdown.subParser('stripBlankLines', function (text) {
- 'use strict';
- return text.replace(/^[ \t]+$/mg, '');
-});
-
-/**
- * Strips link definitions from text, stores the URLs and titles in
- * hash references.
- * Link defs are in the form: ^[id]: url "optional title"
- *
- * ^[ ]{0,3}\[(.+)\]: // id = $1 attacklab: g_tab_width - 1
- * [ \t]*
- * \n? // maybe *one* newline
- * [ \t]*
- * ? // url = $2
- * [ \t]*
- * \n? // maybe one newline
- * [ \t]*
- * (?:
- * (\n*) // any lines skipped = $3 attacklab: lookbehind removed
- * ["(]
- * (.+?) // title = $4
- * [")]
- * [ \t]*
- * )? // title is optional
- * (?:\n+|$)
- * /gm,
- * function(){...});
- *
- */
-showdown.subParser('stripLinkDefinitions', function (text, options, globals) {
- 'use strict';
-
- var regex = /^ {0,3}\[(.+)]:[ \t]*\n?[ \t]*?(?: =([*\d]+[A-Za-z%]{0,4})x([*\d]+[A-Za-z%]{0,4}))?[ \t]*\n?[ \t]*(?:(\n*)["|'(](.+?)["|')][ \t]*)?(?:\n+|(?=~0))/gm;
-
- // attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
- text += '~0';
-
- text = text.replace(regex, function (wholeMatch, linkId, url, width, height, blankLines, title) {
- linkId = linkId.toLowerCase();
- globals.gUrls[linkId] = showdown.subParser('encodeAmpsAndAngles')(url); // Link IDs are case-insensitive
-
- if (blankLines) {
- // Oops, found blank lines, so it's not a title.
- // Put back the parenthetical statement we stole.
- return blankLines + title;
-
- } else {
- if (title) {
- globals.gTitles[linkId] = title.replace(/"|'/g, '"');
- }
- if (options.parseImgDimensions && width && height) {
- globals.gDimensions[linkId] = {
- width: width,
- height: height
- };
- }
- }
- // Completely remove the definition from the text
- return '';
- });
-
- // attacklab: strip sentinel
- text = text.replace(/~0/, '');
-
- return text;
-});
-
-showdown.subParser('tables', function (text, options, globals) {
- 'use strict';
-
- var table = function () {
-
- var tables = {},
- filter;
-
- tables.th = function (header, style) {
- var id = '';
- header = header.trim();
- if (header === '') {
- return '';
- }
- if (options.tableHeaderId) {
- id = ' id="' + header.replace(/ /g, '_').toLowerCase() + '"';
- }
- header = showdown.subParser('spanGamut')(header, options, globals);
- if (!style || style.trim() === '') {
- style = '';
- } else {
- style = ' style="' + style + '"';
- }
- return '' + header + '';
- };
-
- tables.td = function (cell, style) {
- var subText = showdown.subParser('spanGamut')(cell.trim(), options, globals);
- if (!style || style.trim() === '') {
- style = '';
- } else {
- style = ' style="' + style + '"';
- }
- return '' + subText + '';
- };
-
- tables.ths = function () {
- var out = '',
- i = 0,
- hs = [].slice.apply(arguments[0]),
- style = [].slice.apply(arguments[1]);
-
- for (i; i < hs.length; i += 1) {
- out += tables.th(hs[i], style[i]) + '\n';
- }
-
- return out;
- };
-
- tables.tds = function () {
- var out = '',
- i = 0,
- ds = [].slice.apply(arguments[0]),
- style = [].slice.apply(arguments[1]);
-
- for (i; i < ds.length; i += 1) {
- out += tables.td(ds[i], style[i]) + '\n';
- }
- return out;
- };
-
- tables.thead = function () {
- var out,
- hs = [].slice.apply(arguments[0]),
- style = [].slice.apply(arguments[1]);
-
- out = '\n';
- out += '\n';
- out += tables.ths.apply(this, [hs, style]);
- out += ' \n';
- out += '\n';
- return out;
- };
-
- tables.tr = function () {
- var out,
- cs = [].slice.apply(arguments[0]),
- style = [].slice.apply(arguments[1]);
-
- out = '\n';
- out += tables.tds.apply(this, [cs, style]);
- out += ' \n';
- return out;
- };
-
- filter = function (text) {
- var i = 0,
- lines = text.split('\n'),
- line,
- hs,
- out = [];
-
- for (i; i < lines.length; i += 1) {
- line = lines[i];
- // looks like a table heading
- if (line.trim().match(/^[|].*[|]$/)) {
- line = line.trim();
-
- var tbl = [],
- align = lines[i + 1].trim(),
- styles = [],
- j = 0;
-
- if (align.match(/^[|][-=|: ]+[|]$/)) {
- styles = align.substring(1, align.length - 1).split('|');
- for (j = 0; j < styles.length; ++j) {
- styles[j] = styles[j].trim();
- if (styles[j].match(/^[:][-=| ]+[:]$/)) {
- styles[j] = 'text-align:center;';
-
- } else if (styles[j].match(/^[-=| ]+[:]$/)) {
- styles[j] = 'text-align:right;';
-
- } else if (styles[j].match(/^[:][-=| ]+$/)) {
- styles[j] = 'text-align:left;';
- } else {
- styles[j] = '';
- }
- }
- }
- tbl.push('');
- hs = line.substring(1, line.length - 1).split('|');
-
- if (styles.length === 0) {
- for (j = 0; j < hs.length; ++j) {
- styles.push('text-align:left');
- }
- }
- tbl.push(tables.thead.apply(this, [hs, styles]));
- line = lines[++i];
- if (!line.trim().match(/^[|][-=|: ]+[|]$/)) {
- // not a table rolling back
- line = lines[--i];
- } else {
- line = lines[++i];
- tbl.push('');
- while (line.trim().match(/^[|].*[|]$/)) {
- line = line.trim();
- tbl.push(tables.tr.apply(this, [line.substring(1, line.length - 1).split('|'), styles]));
- line = lines[++i];
- }
- tbl.push('');
- tbl.push('
');
- // we are done with this table and we move along
- out.push(tbl.join('\n'));
- continue;
- }
- }
- out.push(line);
- }
- return out.join('\n');
- };
- return {parse: filter};
- };
-
- if (options.tables) {
- var tableParser = table();
- return tableParser.parse(text);
- } else {
- return text;
- }
-});
-
-/**
- * Swap back in all the special characters we've hidden.
- */
-showdown.subParser('unescapeSpecialChars', function (text) {
- 'use strict';
-
- text = text.replace(/~E(\d+)E/g, function (wholeMatch, m1) {
- var charCodeToReplace = parseInt(m1);
- return String.fromCharCode(charCodeToReplace);
- });
- return text;
-});
-
-var root = this;
-
-// CommonJS/nodeJS Loader
-if (typeof module !== 'undefined' && module.exports) {
- module.exports = showdown;
-
-// AMD Loader
-} else if (typeof define === 'function' && define.amd) {
- define('showdown', function () {
- 'use strict';
- return showdown;
- });
-
-// Regular Browser loader
-} else {
- root.showdown = showdown;
-}
-}).call(this);
-//# sourceMappingURL=showdown.js.map
\ No newline at end of file
diff --git a/public/index.php b/public/index.php
index f819f62..8f69048 100644
--- a/public/index.php
+++ b/public/index.php
@@ -19,7 +19,7 @@ $template->setTemplate($templateName);
if (isset($_GET['p'])) {
// Set default variables
$renderData['page'] = [
- 'content' => Utils::mdParse("# Unable to load the requested info page.\r\n\r\nCheck the URL and try again."),
+ 'content' => 'Unable to load the requested info page.
Check the URL and try again.
',
];
// Set page id
@@ -31,7 +31,7 @@ if (isset($_GET['p'])) {
$renderData['page'] = [
'id' => $pageId,
'title' => $ipData['page_title'],
- 'content' => Utils::mdParse($ipData['page_content']),
+ 'content' => $ipData['page_content'],
];
}
@@ -52,6 +52,8 @@ $renderData['newsCount'] = Config::get('front_page_news_posts');
$renderData['forum'] = ($forumMode ? (new Forum\Forum()) : null);
+$renderData['latestPosts'] = Database::fetch('posts', true, null, ['post_id', true], [3]);
+
$renderData['stats'] = [
'userCount' => Database::count('users', ['password_algo' => ['nologin', '!='], 'rank_main' => ['1', '!=']])[0],
'newestUser' => ($_INDEX_NEWEST_USER = User::construct(Users::getNewestUserId())),
diff --git a/public/members.php b/public/members.php
index b138dac..fc03e5f 100644
--- a/public/members.php
+++ b/public/members.php
@@ -18,29 +18,17 @@ $template->setTemplate($templateName);
// CHeck if the user is logged in
if (Users::checkLogin()) {
// Add page specific things
- $renderData['page'] = [
-
+ $renderData['memberlist'] = [
'ranks' => ($_MEMBERLIST_RANKS = Users::getAllRanks()),
'active' => ($_MEMBERLIST_ACTIVE = (
isset($_GET['rank'])
&& $_GET['rank']
&& array_key_exists($_GET['rank'], $_MEMBERLIST_RANKS) ? $_GET['rank'] : 0
)),
- 'notfound' => ($_MEMBERLIST_NFOUND = (
- isset($_GET['rank'])
- && !array_key_exists($_GET['rank'], $_MEMBERLIST_RANKS) && $_GET['rank'] != 0
- )),
- 'sorts' => ($_MEMBERLIST_SORTS = ['boxes', 'rectangles', 'list']),
- 'sort' => isset($_GET['sort']) && $_GET['sort'] && in_array($_GET['sort'], $_MEMBERLIST_SORTS) ?
- $_GET['sort'] :
- $_MEMBERLIST_SORTS[0],
-
+ 'users' => ($_MEMBERLIST_ACTIVE && !$_MEMBERLIST_NFOUND ? Users::getUsersInRank($_MEMBERLIST_ACTIVE) : Users::getAllUsers()),
+ 'membersPerPage' => Config::get('members_per_page'),
];
- $renderData['users'] = ($_MEMBERLIST_ACTIVE && !$_MEMBERLIST_NFOUND ? Users::getUsersInRank($_MEMBERLIST_ACTIVE) : Users::getAllUsers());
-
- $renderData['membersPerPage'] = Config::get('members_per_page');
-
// Set parse variables
$template->setVariables($renderData);
diff --git a/public/profile.php b/public/profile.php
index 1c607f6..ba5c7cf 100644
--- a/public/profile.php
+++ b/public/profile.php
@@ -59,9 +59,10 @@ if (isset($_GET['restrict']) && $_GET['restrict'] == session_id() && $currentUse
if ($restricted) {
$profile->removeRanks([Config::get('restricted_rank_id')]);
+ $profile->addRanks([2]);
} else {
$profile->addRanks([Config::get('restricted_rank_id')]);
- $profile->removeRanks($profile->ranks());
+ $profile->removeRanks(array_keys($profile->ranks));
}
$renderData['page'] = [
diff --git a/sakura.php b/sakura.php
index 3aec30a..23e268b 100644
--- a/sakura.php
+++ b/sakura.php
@@ -8,7 +8,7 @@
namespace Sakura;
// Define Sakura version
-define('SAKURA_VERSION', '20160118');
+define('SAKURA_VERSION', '20160120');
define('SAKURA_VLABEL', 'Amethyst');
define('SAKURA_COLOUR', '#9966CC');
diff --git a/templates/misaki/profile/index.twig b/templates/misaki/profile/index.twig
index 17b3290..2387986 100644
--- a/templates/misaki/profile/index.twig
+++ b/templates/misaki/profile/index.twig
@@ -1,3 +1,3 @@
-
+
{{ profile.userPage|raw }}
diff --git a/templates/yuuno/elements/indexPanel.twig b/templates/yuuno/elements/indexPanel.twig
index 20d11b7..e073efa 100644
--- a/templates/yuuno/elements/indexPanel.twig
+++ b/templates/yuuno/elements/indexPanel.twig
@@ -38,11 +38,13 @@
{% else %}
There were no online users in the past {{ sakura.onlineTimeout / 60 }} minute{% if sakura.onlineTimeout != 60 %}s{% endif %}.
{% endif %}
- {#
- Advertisment
+ {% if not user.permission(constant('Sakura\\Perms\\Site::CHANGE_BACKGROUND')) or user.mainRankId == 4 %}
+
- #}
+
+ {% endif %}
diff --git a/templates/yuuno/elements/newsPost.twig b/templates/yuuno/elements/newsPost.twig
index f2490ae..f9ea61a 100644
--- a/templates/yuuno/elements/newsPost.twig
+++ b/templates/yuuno/elements/newsPost.twig
@@ -6,8 +6,8 @@
{{ post.news_poster.username }}
-
- {{ post.news_content_parsed|raw }}
+
+ {{ post.news_content|raw }}
diff --git a/templates/yuuno/global/master.twig b/templates/yuuno/global/master.twig
index 48c5379..cbc6213 100644
--- a/templates/yuuno/global/master.twig
+++ b/templates/yuuno/global/master.twig
@@ -132,10 +132,6 @@
}
{% endif %}
-
- {% if php.self == '/profile.php' ? (profile.background and not profile.optionFields.disableProfileParallax) : (user.permission(constant('Sakura\\Perms\\Site::CHANGE_BACKGROUND')) and user.optionFields.profileBackgroundSiteWide and user.background and not user.optionFields.disableProfileParallax) %}
- initialiseParallax('userBackground');
- {% endif %}
});
// Error reporter
@@ -240,11 +236,15 @@
{{ php.self }} is now printing!
{% endblock %}
- {#
+ {% if not user.permission(constant('Sakura\\Perms\\Site::CHANGE_BACKGROUND')) or user.mainRankId == 4 %}
+
- 
+
+ 
+
- #}
+
+ {% endif %}
diff --git a/templates/yuuno/main/infopage.twig b/templates/yuuno/main/infopage.twig
index 4e68419..fe27191 100644
--- a/templates/yuuno/main/infopage.twig
+++ b/templates/yuuno/main/infopage.twig
@@ -3,7 +3,7 @@
{% block title %}{% if page.title %}{{ page.title }}{% else %}Not found!{% endif %}{% endblock %}
{% block content %}
-
+
{{ page.content|raw }}
diff --git a/templates/yuuno/main/memberlist.twig b/templates/yuuno/main/memberlist.twig
index 32213f5..e871094 100644
--- a/templates/yuuno/main/memberlist.twig
+++ b/templates/yuuno/main/memberlist.twig
@@ -1,50 +1,55 @@
{% extends 'global/master.twig' %}
+{% set sorts = ['boxes', 'rectangles', 'list'] %}
+{% set sort = get.sort in sorts ? get.sort : sorts[0] %}
+
+{% set notfound = memberlist.active == 0 and get.rank is defined %}
+
{% set rankTitle %}
-{% if page.notfound %}Not found{% else %}{% if not page.active %}All members{% else %}{{ page.ranks[page.active].name(true) }}{% endif %}{% endif %}
+{% if notfound %}Not found{% else %}{% if not memberlist.active %}All members{% else %}{{ memberlist.ranks[memberlist.active].name(true) }}{% endif %}{% endif %}
{% endset %}
{% set rankDescription %}
-{% if page.notfound %}The requested rank could not be found!{% else %}{% if not page.active %}The entire user list.{% else %}{{ page.ranks[page.active].description }}{% endif %}{% endif %}
+{% if notfound %}The requested rank could not be found!{% else %}{% if not memberlist.active %}The entire user list.{% else %}{{ memberlist.ranks[memberlist.active].description }}{% endif %}{% endif %}
{% endset %}
-{% set users = users|batch(membersPerPage) %}
+{% set users = memberlist.users|batch(memberlist.membersPerPage) %}
{% set currPage = get.page|default(1) - 1 %}
{% set paginationPages = users %}
-{% set paginationUrl %}{% if page.sort and page.active %}{{ urls.format('MEMBERLIST_ALL', [page.sort, page.active]) }}{% elseif page.sort %}{{ urls.format('MEMBERLIST_SORT', [page.sort]) }}{% elseif page.active %}{{ urls.format('MEMBERLIST_RANK', [page.active]) }}{% else %}{{ urls.format('MEMBERLIST_INDEX') }}{% endif %}{% endset %}
+{% set paginationUrl %}{% if sort and memberlist.active %}{{ urls.format('MEMBERLIST_ALL', [sort, memberlist.active]) }}{% elseif sort %}{{ urls.format('MEMBERLIST_SORT', [sort]) }}{% elseif memberlist.active %}{{ urls.format('MEMBERLIST_RANK', [memberlist.active]) }}{% else %}{{ urls.format('MEMBERLIST_INDEX') }}{% endif %}{% endset %}
{% block title %}{{ rankTitle }}{% endblock %}
{% block content %}
- {{ rankTitle }}
+ {{ rankTitle }}
{{ rankDescription }}
Rank:
- All members
- {% for rank in page.ranks %}
- {% if not rank.hidden or (rank.hidden and page.active == rank.id) %}
- {{ rank.name(true) }}
+ All members
+ {% for rank in memberlist.ranks %}
+ {% if not rank.hidden or (rank.hidden and memberlist.active == rank.id) %}
+ {{ rank.name(true) }}
{% endif %}
{% endfor %}
View:
- {% for sort in page.sorts %}
- {{ sort|capitalize }}
+ {% for s in sorts %}
+ {{ s|capitalize }}
{% endfor %}
{% if not users|length %}
This rank has no members!
- {% elseif not page.notfound %}
-
- {% if page.sort == page.sorts[2] %}
+ {% elseif not notfound %}
+
+ {% if sort == sorts[2] %}
@@ -70,22 +75,22 @@
- #{{ page.active ? count + 1 : count }}
+ #{{ memberlist.active ? count + 1 : count }}
{{ user.username }}
-
+
{{ user.elapsed.joined }}
-
- {% if user.dates.lastOnline == 0 %}Never logged in.{% else %}{{ user.elapsed.lastOnline }}{% endif %}
+
+ {% if user.lastOnline == 0 %}Never logged in.{% else %}{{ user.elapsed.lastOnline }}{% endif %}
- {{ user.userTitle }}
+ {{ user.title }}
- 
+ 
@@ -104,9 +109,9 @@
{% endfor %}
{% endif %}
- {% endif %}
- {% if users|length > 1 %}
- {% include 'elements/pagination.twig' %}
+ {% if users|length > 1 %}
+ {% include 'elements/pagination.twig' %}
+ {% endif %}
{% endif %}
{% endblock %}
diff --git a/templates/yuuno/main/profile.twig b/templates/yuuno/main/profile.twig
index 717f4e1..c187800 100644
--- a/templates/yuuno/main/profile.twig
+++ b/templates/yuuno/main/profile.twig
@@ -29,7 +29,7 @@
 }})
{% if profile.mainRankId > 1 and profile.checkBan|length < 1 %}
{{ profile.title }}
- {{ profile.username }}
+ {{ profile.username }}
{% if profile.isPremium[0] %}
{% endif %}
{{ profile.country.long }}
{% if session.checkLogin %}
diff --git a/templates/yuuno/profile/index.twig b/templates/yuuno/profile/index.twig
index 17b3290..2387986 100644
--- a/templates/yuuno/profile/index.twig
+++ b/templates/yuuno/profile/index.twig
@@ -1,3 +1,3 @@
-
+
{{ profile.userPage|raw }}
diff --git a/templates/yuuno/settings/appearance.userpage.twig b/templates/yuuno/settings/appearance.userpage.twig
index 8aedcad..90dfcca 100644
--- a/templates/yuuno/settings/appearance.userpage.twig
+++ b/templates/yuuno/settings/appearance.userpage.twig
@@ -1,34 +1,23 @@
-{% block js %}
-
-{% endblock %}
-
-
+
-