Changeset 2240 for plugins/pollsFactory/inc

Timestamp:

05/13/10 20:19:47 (13 years ago)

Author:

JcDenis

Message:

pollsFactory 1.2:

• Fixed results order on image (thanks Kompozitor)
• Fixed minor bug

Location:

plugins/pollsFactory/inc

Files:

• class.pollsfactory.chart.php (modified) (2 diffs)
• index.content.php (modified) (1 diff)
• index.poll.php (modified) (1 diff)
• index.setting.php (modified) (1 diff)

plugins/pollsFactory/inc/class.pollsfactory.chart.php

@@ -182 +182 @@
                }
           }
-          # Lopp through options
+          # Loop through options
           $selections_params['option_type'] = 'pollsselection';
           $selections_params['post_id'] = $poll_id;
@@ -191 +191 @@
                $key = (integer) $selections->option_id;
                # Set bars with no responses
-               $opt[$key] = $selections->option_title;
                if (!isset($chd[$key])) {
                     $chd[$key] = 0;
                }
                # Bar title
-               $chxl[$key] = $selections->option_title;
-          }
+               $chxl[$key] = html::escapeHTML($selections->option_title);
+          }
+          # Sort every tables to preserve title/responses
+          ksort($chd);ksort($chxl);
+          array_multisort($chd,$chxl);
+          krsort($chd);ksort($chxl);
+
           # go go go
           $data = array();

plugins/pollsFactory/inc/index.content.php

@@ -500 +500 @@
      );
 }
-echo '</div>'.dcPage::helpBlock('pollsFactory').$footer.'</body></html>';
+echo '</div>';
+dcPage::helpBlock('pollsFactory');
+echo $footer.'</body></html>';
 
 function addpollForm($section,$title,$poll_id,$query_id,$selection_id,$submit,$action,$content,$tabindex=2,$accesskey='',$sidebar=false)

plugins/pollsFactory/inc/index.poll.php

@@ -38 +38 @@
 $can_delete = false;
 
-$post_headlink = '<link rel="%s" title="%s" href="post.php?id=%s" />';
+$post_headlink = '<link rel="%s" title="%s" href="'.$p_url.'&amp;tab=poll&amp;id=%s" />';
 $post_link = '<a href="'.$p_url.'&amp;tab=poll&amp;id=%s" title="%s">%s</a>';
 

plugins/pollsFactory/inc/index.setting.php

@@ -147 +147 @@
 form::hidden(array('action'),'savesetting').'
 </p></div>
-</form>
-'.dcPage::helpBlock('pollsFactory').$footer.'</body></html>';
+</form>';
+dcPage::helpBlock('pollsFactory');
+echo $footer.'</body></html>';
 ?>