From 5438d7cf64cb1dc686dcd1ebb8ba38cc0c5e4ca1 Mon Sep 17 00:00:00 2001 From: Michael Foster Date: Mon, 19 Aug 2013 20:31:15 +1000 Subject: add alt="" to flags to make it standards-compliant --- templates/post_reply.html | 2 +- templates/post_thread.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/post_reply.html b/templates/post_reply.html index 28cbd7f8..a1feb005 100644 --- a/templates/post_reply.html +++ b/templates/post_reply.html @@ -31,7 +31,7 @@ {% if config.display_flags and post.modifiers.flag %} + {% if post.modifiers['flag alt'] %}alt="{{ post.modifiers['flag alt'] | e('html_attr') }}" title="{{ post.modifiers['flag alt'] | e('html_attr') }}"{% endif %}> {% endif %} diff --git a/templates/post_thread.html b/templates/post_thread.html index 0ee3f6fa..5910bb74 100644 --- a/templates/post_thread.html +++ b/templates/post_thread.html @@ -85,7 +85,7 @@ {% if config.display_flags and post.modifiers.flag %} + {% if post.modifiers['flag alt'] %}alt="{{ post.modifiers['flag alt'] | e('html_attr') }}" title="{{ post.modifiers['flag alt'] | e('html_attr') }}"{% endif %}> {% endif %} -- cgit v1.3 From abfdd38e59458d871f466952776675238f3179fb Mon Sep 17 00:00:00 2001 From: Michael Foster Date: Mon, 19 Aug 2013 23:47:56 +1000 Subject: Unicode bi-directional text: Finally a working fix --- inc/display.php | 45 ++++++++++++++++++++++++++++++++++++++++++--- stylesheets/style.css | 7 +++++-- templates/post_reply.html | 2 +- templates/post_thread.html | 2 +- 4 files changed, 49 insertions(+), 7 deletions(-) (limited to 'templates') diff --git a/inc/display.php b/inc/display.php index 6fa97f4f..81f8c53d 100644 --- a/inc/display.php +++ b/inc/display.php @@ -218,11 +218,50 @@ function truncate($body, $url, $max_lines = false, $max_chars = false) { return $body; } -function bidi_cleanup($str) { - // Removes all embedded RTL and LTR unicode formatting blocks in a string so that +function bidi_cleanup($data) { + // Closes all embedded RTL and LTR unicode formatting blocks in a string so that // it can be used inside another without controlling its direction. - return "$str"; + $explicits = '\xE2\x80\xAA|\xE2\x80\xAB|\xE2\x80\xAD|\xE2\x80\xAE'; + $pdf = '\xE2\x80\xAC'; + + preg_match_all("!$explicits!", $data, $m1, PREG_OFFSET_CAPTURE | PREG_SET_ORDER); + preg_match_all("!$pdf!", $data, $m2, PREG_OFFSET_CAPTURE | PREG_SET_ORDER); + + if (count($m1) || count($m2)){ + + $p = array(); + foreach ($m1 as $m){ $p[$m[0][1]] = 'push'; } + foreach ($m2 as $m){ $p[$m[0][1]] = 'pop'; } + ksort($p); + + $offset = 0; + $stack = 0; + foreach ($p as $pos => $type){ + + if ($type == 'push'){ + $stack++; + }else{ + if ($stack){ + $stack--; + }else{ + # we have a pop without a push - remove it + $data = substr($data, 0, $pos-$offset) + .substr($data, $pos+3-$offset); + $offset += 3; + } + } + } + + # now add some pops if your stack is bigger than 0 + for ($i=0; $i<$stack; $i++){ + $data .= "\xE2\x80\xAC"; + } + + return $data; + } + + return $data; } function secure_link_confirm($text, $title, $confirm_message, $href) { diff --git a/stylesheets/style.css b/stylesheets/style.css index e62891e2..c1725e35 100644 --- a/stylesheets/style.css +++ b/stylesheets/style.css @@ -37,6 +37,10 @@ p.intro a.email:hover span.name { p.intro label { display: inline; } +p.intro time, p.intro a.ip-link, p.intro a.capcode { + direction: ltr; + unicode-bidi: embed; +} h2 { color: #AF0A0F; font-size: 11pt; @@ -406,5 +410,4 @@ table.mod.config-editor input[type="text"] { p.intro.thread-hidden { margin: 0px; padding: 0px; -} - +} \ No newline at end of file diff --git a/templates/post_reply.html b/templates/post_reply.html index a1feb005..c5d24247 100644 --- a/templates/post_reply.html +++ b/templates/post_reply.html @@ -26,7 +26,7 @@ {{ capcode.cap }} {% endif %} {% if post.mod and post.mod|hasPermission(config.mod.show_ip, board.uri) %} - [{{ post.ip }}] + [{{ post.ip }}] {% endif %} {% if config.display_flags and post.modifiers.flag %} {{ post.ip }}] + [{{ post.ip }}] {% endif %} {% if config.display_flags and post.modifiers.flag %} Date: Tue, 20 Aug 2013 23:34:41 +1000 Subject: Remember post password if entered manually --- templates/main.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'templates') diff --git a/templates/main.js b/templates/main.js index 78054a3b..144c5f62 100644 --- a/templates/main.js +++ b/templates/main.js @@ -168,6 +168,9 @@ function dopost(form) { if (form.elements['name']) { localStorage.name = form.elements['name'].value.replace(/( |^)## .+$/, ''); } + if (form.elements['password']) { + localStorage.password = form.elements['password'].value; + } if (form.elements['email'] && form.elements['email'].value != 'sage') { localStorage.email = form.elements['email'].value; } -- cgit v1.3