Changeset 947

Timestamp:

03/14/08 18:56:05 (9 months ago)

Author:

_ck_

Message:

xhtml and non-ajax-edit bug fixes, props zmaroti

Files:

• bbpress-polls/trunk/bb-polls.php (modified) (17 diffs)
• bbpress-polls/trunk/readme.txt (modified) (1 diff)

bbpress-polls/trunk/bb-polls.php

@@ -6 +6 @@
-Author: _ck_
-Author URI: http://bbShowcase.org
-1
+.2
-
-License: CC-GNU-GPL http://creativecommons.org/licenses/GPL/2.0/
@@ -190 +190 @@
-}
-
-
+ 
-global $bb_polls,$topic,$poll_options,$page;
-if ($bb_polls['minimum_view_level']=="read" || bb_current_user_can($bb_polls['minimum_view_level']) ) :   
@@ -197 +197 @@
-$administrator=bb_current_user_can('administrate');
-bb_polls_add_javascript($topic_id);     // ajax-ish
+if (!$edit_poll && isset($_GET['edit_poll'])) {$edit_poll= intval($_GET['edit_poll']);}
-if ($edit_poll || ! isset($topic->poll_options)) {      // no saved poll question with options
-
@@ -214 +215 @@
-                } else {        
-                        // ask if they want to start a new poll
-nowrap
+"nowrap"
-                
-                } } }   // end new poll question + end show start_new_poll form 
@@ -296 +297 @@
-if ($bb_polls['minimum_view_level']=="read" || bb_current_user_can($bb_polls['minimum_view_level']) ) {
-$topic_id=bb_polls_check_cache($topic_id);
-poll_question
+"poll_question"
-
-if (!$poll_options['poll_multiple_choice'] && isset($poll_options['poll_count_0'])) {$real_vote_count=intval($poll_options['poll_count_0']);}
@@ -303 +304 @@
-for ($i=1; $i<=$bb_polls['max_options']; $i++) {
-        if (isset($poll_options[$i])) {                 
-poll_label
+"poll_label"
-                $test=(isset($poll_options['poll_count_'.$i]) ? intval($poll_options['poll_count_'.$i]) : 0);
-                $output.= ' ('.$test.' '.$bb_polls['label_votes_text'].')';
@@ -309 +310 @@
-                        $vote_percent=(round($test/$real_vote_count,2)*100);
-                        $vote_width=$vote_percent; if ($vote_width < 5) {$vote_width=5;} else {if ($vote_width >98 ) {$vote_width=98;}}
-
+ 
-                }
-                $output.= ' </p>';
@@ -315 +316 @@
-}
-$test=(isset($poll_options['poll_count_0']) ? intval($poll_options['poll_count_0']) : 0);
-poll_footer
+"poll_footer"
-if (isset($_GET['show_poll_results']) || (bb_get_current_user_info( 'id' ) && !bb_polls_has_voted(bb_get_current_user_info( 'id' ),$topic_id) )) {
-poll_footer
+"poll_footer"
-}
-$output.=bb_polls_edit_link();
@@ -331 +332 @@
-if ($poll_options['poll_multiple_choice']==1) {$poll_type="checkbox";} else {$poll_type="radio";}
-$output='<form action="'.remove_query_arg( 'show_poll_results').'" method="post" name="bb_polls" onSubmit="if (window.bb_polls_insert_ajax) {bb_polls_add_vote_ajax();return false;}">
-poll_question
+"poll_question"
-for ($i=1; $i<=$bb_polls['max_options']; $i++) {
-        if (isset($poll_options[$i])) {
-                if ($poll_options['poll_multiple_choice']==1) {$poll_name="poll_vote_".$i;} else {$poll_name="poll_vote_0";}
-
+ /
-        }
-}
-poll_footer><input class=submit type=submit  name="poll_vote" value="'.$bb_polls['label_vote_text'].'"
-poll_footer
+"poll_footer"><input class="submit" type="submit"  name="poll_vote" value="'.$bb_polls['label_vote_text'].'" /
+"poll_footer"
-$output.=bb_polls_edit_link();
-$output=stripslashes($output);
@@ -390 +391 @@
-$output='<form action="'.remove_query_arg(array('start_new_poll','edit_poll')).'" method="post"><p>'.$bb_polls['poll_instructions'].'</p>';
-                        
-poll_label>'.$bb_polls['label_question_text'].' : <input name="poll_question" type=text style="width:98%" maxlength="'.$bb_polls['max_length'].'" value="'.$poll_options['poll_question'].'"
+"poll_label">'.$bb_polls['label_question_text'].' : <input name="poll_question" type="text" style="width:98%" maxlength="'.$bb_polls['max_length'].'" value="'.$poll_options['poll_question'].'" /
-                        
-poll_label><span class=nowrap
+"poll_label"><span class="nowrap"
-$output.=($poll_options['poll_multiple_choice']) ? ' ' : ' checked="checked" ';
->'.$bb_polls['label_single'].'</span> <span class=nowrap
+ />'.$bb_polls['label_single'].'</span> <span class="nowrap"
-$output.=($poll_options['poll_multiple_choice']) ? ' checked="checked" ' : ' ';
-
+ /
-                        
-for ($i=1; $i<=$bb_polls['max_options']; $i++) {                        
@@ -402 +403 @@
-                $output.='<a href="javascript:void(0)" onClick="this.style.display='."'none'".'; document.getElementById('."'poll_more_options'".').style.display='."'block'".'">[+] '.$bb_polls['label_option_text'].'</a><div id="poll_more_options" style="display:none;">';
-        }
-poll_label>'.$bb_polls['label_option_text'].' #'.$i.' : <input name="poll_option_'.$i.'" type=text style="width:98%" maxlength="'.$bb_polls['max_length'].'" value="'.$poll_options[$i].'"
+"poll_label">'.$bb_polls['label_option_text'].' #'.$i.' : <input name="poll_option_'.$i.'" type="text" style="width:98%" maxlength="'.$bb_polls['max_length'].'" value="'.$poll_options[$i].'" /
-} // loop 
-if ($bb_polls['max_options']>4 && !$poll_options[5]) {$output.='</div>';}
-                
-poll_footer
-submit type=button  value="'.$bb_polls['label_cancel_text'].'" onClick="document.location='."'".remove_query_arg( 'start_new_poll')."'".'"
-submit type=submit  value="'.$bb_polls['label_save_text'].'"
+"poll_footer"
+"submit" type="button"  value="'.$bb_polls['label_cancel_text'].'" onClick="document.location='."'".remove_query_arg( 'start_new_poll')."'".'" /
+"submit" type="submit"  value="'.$bb_polls['label_save_text'].'" /
-$output=stripslashes($output);if ($display) {echo '<li id="bb_polls" class="extra-caps-row">'.$output.'</li>';} else {return $output;}
-}
@@ -460 +461 @@
-global $bb_polls;
-if ($bb_polls['use_ajax']) :
-
+
+
-var dhead = document.getElementsByTagName("head")[0];
-var bb_polls_script = null;
@@ -517 +519 @@
-else {alert("'.$bb_polls['label_nocheck_text'].'"); return false;}
-}
+//-->
-</scr'.'ipt>';
-endif;
@@ -536 +539 @@
-                
-                <form method="post" name="bb_polls_form" id="bb_polls_form" action="<?php echo remove_query_arg(array('bb_polls_reset','bb_polls_recount')); ?>">
-hidden name="bb_polls" value="1"
+"hidden" name="bb_polls" value="1" /
-                        <table class="widefat">
-                                <thead>
@@ -560 +563 @@
-                                                        switch (substr($bb_polls_type[$key],0,strpos($bb_polls_type[$key].",",","))) :
-                                                        case 'binary' :
-radio name="<?php echo $key;  ?>" value="1" <?php echo ($bb_polls[$key]==true ? 'checked="checked"' : ''); ?> 
-radio name="<?php echo $key;  ?>" value="0" <?php echo ($bb_polls[$key]==false ? 'checked="checked"' : ''); ?> 
+"radio" name="<?php echo $key;  ?>" value="1" <?php echo ($bb_polls[$key]==true ? 'checked="checked"' : ''); ?> /
+"radio" name="<?php echo $key;  ?>" value="0" <?php echo ($bb_polls[$key]==false ? 'checked="checked"' : ''); ?> /
-                                                        break;
-                                                        case 'numeric' :
-text maxlength=3 name="<?php echo $key;  ?>" value="<?php echo $bb_polls[$key]; ?>"
+"text" maxlength=3 name="<?php echo $key;  ?>" value="<?php echo $bb_polls[$key]; ?>" /
-                                                        break;
-                                                        case 'textarea' :                                                               
@@ -576 +579 @@
-                                                                echo '</select>';
-                                                                } else {                                                                                                                
-text style="width:98%" name="<?php echo $key;  ?>" value="<?php echo $bb_polls[$key]; ?>"
+"text" style="width:98%" name="<?php echo $key;  ?>" value="<?php echo $bb_polls[$key]; ?>" /
-                                                                }
-                                                        endswitch;                                                      
@@ -588 +591 @@
-                                </tbody>
-                        </table>
-
+ /
-                
-                </form>

bbpress-polls/trunk/readme.txt

@@ -53 +53 @@
-* 0.30  enhancement so admin can edit any poll (don't try to change the order of questions, it's a simple edit for now)
-* 0.50  2008-March-1 basic admin menu  added
+* 0.5.2 2008-March-14 xhtml and non-ajax-edit bug fixes, props zmaroti
-        
-== To Do ==