From 92f699337f907f4da31c932e72a68d3b19680fed Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 25 May 2018 19:24:54 +0200
Subject: [PATCH 1/2] Properly handle markdown choices inside titles, if no
 text as fallback, use the number of the choice column

Also, unrelated, but finally disabled smarty caching on php's build-in server

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 app/inc/smarty.php              | 17 ++++++++++++++++-
 locale/en.json                  |  1 +
 tpl/part/vote_table_classic.tpl | 18 +++++++++---------
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/app/inc/smarty.php b/app/inc/smarty.php
index f67e7e7..338ba2f 100644
--- a/app/inc/smarty.php
+++ b/app/inc/smarty.php
@@ -45,7 +45,7 @@ if (defined('FAVICON')) {
 }
 
 // Dev Mode
-if (isset($_SERVER['FRAMADATE_DEVMODE']) && $_SERVER['FRAMADATE_DEVMODE']) {
+if (isset($_SERVER['FRAMADATE_DEVMODE']) && $_SERVER['FRAMADATE_DEVMODE'] || php_sapi_name() === 'cli-server') {
     $smarty->force_compile = true;
     $smarty->compile_check = true;
 } else {
@@ -80,6 +80,21 @@ function smarty_modifier_html($html) {
     return Utils::htmlEscape($html);
 }
 
+/**
+ * markdown_to_text
+ * Retrieves a markdown string and tries to make a plain text value
+ *
+ * @param array $options
+ * @return string
+ */
+function smarty_function_markdown_to_text($options, Smarty_Internal_Template $template)
+{
+    $locale = \o80\i18n\I18N::instance()->getLoadedLang();
+    $text = strip_tags(Parsedown::instance()->text($options['markdown']));
+    $number_letters = (new NumberFormatter($locale, NumberFormatter::ORDINAL))->format($options['id'] + 1);
+    return $text !== '' ? $text : __f('Poll results', '%s option', $number_letters);
+}
+
 function smarty_modifier_datepicker_path($lang) {
     $i = 0;
     while (!is_file(path_for_datepicker_locale($lang)) && $i < 3) {
diff --git a/locale/en.json b/locale/en.json
index 14f93d1..8a0093d 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -290,6 +290,7 @@
       "You have to provide a password to access the poll.": "You have to provide a password to access the poll."
    },
    "Poll results": {
+      "%s option": "%s option",
       "Addition": "Total",
       "Anyone will be able to access your email address after your vote": "Anyone will be able to see your email address after you voted",
       "Best choice": "Best choice",
diff --git a/tpl/part/vote_table_classic.tpl b/tpl/part/vote_table_classic.tpl
index 6ce6b38..3ccc43f 100644
--- a/tpl/part/vote_table_classic.tpl
+++ b/tpl/part/vote_table_classic.tpl
@@ -82,19 +82,19 @@
                             <ul class="list-unstyled choice">
                                 <li class="yes">
                                     <input type="radio" id="y-choice-{$id}" name="choices[{$id}]" value="2" {if $choice=='2'}checked {/if}/>
-                                    <label class="btn btn-default btn-xs" for="y-choice-{$id}" title="{__('Poll results', 'Vote yes for')|html} {$slots[$id]->title|html}">
+                                    <label class="btn btn-default btn-xs" for="y-choice-{$id}" title="{__('Poll results', 'Vote yes for')|html} {markdown_to_text markdown=$slots[$id]->title id=$id|html}">
                                         <i class="glyphicon glyphicon-ok"></i><span class="sr-only">{__('Generic', 'Yes')}</span>
                                     </label>
                                 </li>
                                 <li class="ifneedbe">
                                     <input type="radio" id="i-choice-{$id}" name="choices[{$id}]" value="1" {if $choice=='1'}checked {/if}/>
-                                    <label class="btn btn-default btn-xs" for="i-choice-{$id}" title="{__('Poll results', 'Vote ifneedbe for')|html} {$slots[$id]->title|html}">
+                                    <label class="btn btn-default btn-xs" for="i-choice-{$id}" title="{__('Poll results', 'Vote ifneedbe for')|html} {markdown_to_text markdown=$slots[$id]->title id=$id|html}">
                                         (<i class="glyphicon glyphicon-ok"></i>)<span class="sr-only">{__('Generic', 'Ifneedbe')}</span>
                                     </label>
                                 </li>
                                 <li class="no">
                                     <input type="radio" id="n-choice-{$id}" name="choices[{$id}]" value="0" {if $choice=='0'}checked {/if}/>
-                                    <label class="btn btn-default btn-xs" for="n-choice-{$id}" title="{__('Poll results', 'Vote no for')|html} {$slots[$id]->title|html}">
+                                    <label class="btn btn-default btn-xs" for="n-choice-{$id}" title="{__('Poll results', 'Vote no for')|html} {markdown_to_text markdown=$slots[$id]->title id=$id|html}">
                                         <i class="glyphicon glyphicon-ban-circle"></i><span class="sr-only">{__('Generic', 'No')}</span>
                                     </label>
                                 </li>
@@ -204,24 +204,24 @@
                                     	<input type="radio" id="y-choice-{$id}" name="choices[{$id}]" value="2"
                                     		{(!isset($selectedNewVotes[$id]) || ("2" !== $selectedNewVotes[$id])) ? "" : " checked"}
                                     	/>
-                                    	<label class="btn btn-default btn-xs" for="y-choice-{$id}" title="{__('Poll results', 'Vote yes for')|html} {$slot->title|html}">
+                                        <label class="btn btn-default btn-xs" for="y-choice-{$id}" title="{__('Poll results', 'Vote yes for')|html} {markdown_to_text markdown=$slot->title id=$id|html}">
                                        		<i class="glyphicon glyphicon-ok"></i><span class="sr-only">{__('Generic', 'Yes')}</span>
                                     	</label>
                                 	</li>
-                               		 <li class="ifneedbe">
+                                    <li class="ifneedbe">
                                   	  <input type="radio" id="i-choice-{$id}" name="choices[{$id}]" value="1"
                                     		{(!isset($selectedNewVotes[$id]) || ("1" !== $selectedNewVotes[$id])) ? "" : " checked"}
                                     	/>
-                                  	  <label class="btn btn-default btn-xs" for="i-choice-{$id}" title="{__('Poll results', 'Vote ifneedbe for')|html} {$slot->title|html}">
-                                        (<i class="glyphicon glyphicon-ok"></i>)<span class="sr-only">{__('Generic', 'Ifneedbe')}</span>
-                                    	</label>
+                                        <label class="btn btn-default btn-xs" for="i-choice-{$id}" title="{__('Poll results', 'Vote ifneedbe for')|html} {markdown_to_text markdown=$slot->title id=$id|html}">
+                                            (<i class="glyphicon glyphicon-ok"></i>)<span class="sr-only">{__('Generic', 'Ifneedbe')}</span>
+                                        </label>
                                	 	</li>
 								{/if}
                                 <li class="no">
                                     <input type="radio" id="n-choice-{$id}" name="choices[{$id}]" value="0"
                                 		{(!isset($selectedNewVotes[$id]) || ("0" !== $selectedNewVotes[$id])) ? "" : " checked"}
                                 	/>
-                                    <label class="btn btn-default btn-xs {(!isset($selectedNewVotes[$id]) || ("0" !== $selectedNewVotes[$id])) ? "startunchecked" : ""}" for="n-choice-{$id}" title="{__('Poll results', 'Vote no for')|html} {$slot->title|html}">
+                                    <label class="btn btn-default btn-xs {(!isset($selectedNewVotes[$id]) || ("0" !== $selectedNewVotes[$id])) ? "startunchecked" : ""}" for="n-choice-{$id}" title="{__('Poll results', 'Vote no for')|html} {markdown_to_text markdown=$slot->title id=$id|html}">
                                         <i class="glyphicon glyphicon-ban-circle"></i><span class="sr-only">{__('Generic', 'No')}</span>
                                     </label>
                                 </li>

From 14053d20c9215a54437049cd49a68b4edd435eb7 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 25 May 2018 19:34:36 +0200
Subject: [PATCH 2/2] Handle markdown properly in the best choices section

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 tpl/part/vote_table_classic.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tpl/part/vote_table_classic.tpl b/tpl/part/vote_table_classic.tpl
index 3ccc43f..b8b81f1 100644
--- a/tpl/part/vote_table_classic.tpl
+++ b/tpl/part/vote_table_classic.tpl
@@ -361,9 +361,9 @@
 
                 {$i = 0}
                 <ul class="list-unstyled">
-                    {foreach $slots as $slot}
+                    {foreach $slots as $i => $slot}
                         {if $best_choices['y'][$i] == $max}
-                            <li><strong>{$slot->title|markdown:true}</strong></li>
+                            <li><strong>{markdown_to_text markdown=$slot->title id=$i}</strong></li>
                         {/if}
                         {$i = $i+1}
                     {/foreach}