Changeset 26538

Timestamp:

12/14/07 16:10:52 (7 months ago)

Author:

GamerZ

Message:

Updates

Location:

wp-polls/trunk

Files:

• polls-admin-js-packed.js (added)
• polls-admin-js.js (added)
• polls-admin-js.php (deleted)
• polls-js-packed.js (added)
• polls-js.js (added)
• polls-js.php (deleted)
• polls-manager.php (modified) (2 diffs)
• readme.html (modified) (1 diff)
• wp-polls.mo (modified) (previous)
• wp-polls.php (modified) (2 diffs)
• wp-polls.pot (modified) (18 diffs)

wp-polls/trunk/polls-manager.php

@@ -342 +342 @@
                                                 echo '<td width="20%"><strong>'.sprintf(__('Answer %s:', 'wp-polls'), $i).'</strong></td>'."\n";
                                                 echo "<td width=\"60%\"><input type=\"text\" size=\"50\" maxlength=\"200\" name=\"polla_aid-$polla_aid\" value=\"".htmlspecialchars($polla_answers)."\" />&nbsp;&nbsp;&nbsp;";
-                                                echo "<input type=\"button\" value=\"".__('Delete', 'wp-polls')."\" onclick=\"delete_poll_ans($poll_id, $polla_aid, $polla_votes, '".sprintf(js_escape(__('You are about to delete this poll\'s answer \'%s\'.', 'wp-polls')), htmlspecialchars($polla_answers))."');\" class=\"button\" /></td>\n";
+                                                echo "<input type=\"button\" value=\"".__('Delete', 'wp-polls')."\" onclick=\"delete_poll_ans($poll_id, $polla_aid, $polla_votes, '".sprintf(js_escape(__('You are about to delete this poll\'s answer \'%s\'.', 'wp-polls')), js_escape(htmlspecialchars($polla_answers)))."');\" class=\"button\" /></td>\n";
                                                 echo "<td width=\"20%\" align=\"right\">$polla_votes <input type=\"text\" size=\"4\" id=\"polla_votes-$polla_aid\" name=\"polla_votes-$polla_aid\" value=\"$polla_votes\" onblur=\"check_totalvotes();\" /></td>\n</tr>\n";
                                                 $poll_actual_totalvotes += $polla_votes;
@@ -542 +542 @@
                                           echo "<td><a href=\"$base_page&amp;mode=logs&amp;id=$poll_id\" class=\"edit\">".__('Logs', 'wp-polls')."</a></td>\n";
                                           echo "<td><a href=\"$base_page&amp;mode=edit&amp;id=$poll_id\" class=\"edit\">".__('Edit', 'wp-polls')."</a></td>\n";
-                                          echo "<td><a href=\"#DeletePoll\" onclick=\"delete_poll($poll_id, '".sprintf(js_escape(__('You are about to delete this poll, \'%s\'.', 'wp-polls')), $poll_question)."')\" class=\"delete\">".__('Delete', 'wp-polls')."</a></td>\n";
+                                          echo "<td><a href=\"#DeletePoll\" onclick=\"delete_poll($poll_id, '".sprintf(js_escape(__('You are about to delete this poll, \'%s\'.', 'wp-polls')), js_escape($poll_question))."')\" class=\"delete\">".__('Delete', 'wp-polls')."</a></td>\n";
                                           echo '</tr>';
                                           $i++;

wp-polls/trunk/readme.html

@@ -291 +291 @@
                                     <li>NEW: Uses wp-polls-widget.php Instead Of polls-widget.php</li>
                                     <li>NEW: Use number_format_i18n() Instead</li>
+                                    <li>NEW: Renamed polls-admin-js.php To polls-admin-js.js and Move The Dynamic Javascript Variables To The PHP Pages</li>
+                                    <li>NEW: Renamed polls-js.php To polls-js.js and Move The Dynamic Javascript Variables To The PHP Pages</li>
+                                    <li>NEW: Uses polls-js-packed.js And polls-admin-js-packed.js</li>
+                                    <li>FIXED: Unable To Delete Poll Or Poll Answers If There Is Quotes Within The Poll Or Poll Answer</li>
                                     <li>FIXED: number_format() Not Used In Polls Archive</li>
                                     <li>FIXED: Unable To Schedule Future Poll If The Year Is Different From Current Year</li>

wp-polls/trunk/wp-polls.php

@@ -153 +153 @@
 add_action('wp_head', 'poll_header');
 function poll_header() {      
+      $poll_ajax_style = get_option('poll_ajax_style');
+      $pollbar = get_option('poll_bar');
+      wp_register_script('wp-polls', '/wp-content/plugins/wp-polls/polls-js-packed.js', false, '2.30');
       echo "\n".'<!-- Start Of Script Generated By WP-Polls 2.30 -->'."\n";
-      wp_register_script('wp-polls', '/wp-content/plugins/wp-polls/polls-js.php', false, '2.30');
+      echo '<script type="text/javascript">'."\n";
+      echo '/* <![CDATA[ */'."\n";
+      echo "\t".'var polls_ajax_url = \''.get_option('siteurl').'/wp-content/plugins/wp-polls/wp-polls.php'."';\n";
+      echo "\t".'var polls_text_wait = \''. __('Your last request is still being processed. Please wait a while ...', 'wp-polls').'\';'."\n";
+      echo "\t".'var polls_text_valid = \''.__('Please choose a valid poll answer.', 'wp-polls').'\';'."\n";
+      echo "\t".'var polls_text_multiple = \''.__('Maximum number of choices allowed:', 'wp-polls').'\';'."\n";
+      echo "\t".'var poll_show_loading = \''.intval($poll_ajax_style['loading']).'\';'."\n";
+      echo "\t".'var poll_show_fading = \''.intval($poll_ajax_style['fading']).'\';'."\n";
+      echo '/* ]]> */'."\n";
+      echo '</script>'."\n";
       wp_print_scripts(array('sack', 'wp-polls'));
       echo '<link rel="stylesheet" href="'.get_option('siteurl').'/wp-content/plugins/wp-polls/polls-css.css" type="text/css" media="screen" />'."\n";
-      echo '<style type="text/css">'."\n";
-      $pollbar = get_option('poll_bar');
+      echo '<style type="text/css">'."\n";      
       if($pollbar['style'] == 'use_css') {
             echo '.wp-polls .pollbar {'."\n";
@@ -186 +197 @@
 add_action('admin_head', 'poll_header_admin');
 function poll_header_admin() {
-      wp_register_script('wp-polls-admin', '/wp-content/plugins/wp-polls/polls-admin-js.php', false, '2.30');
+      wp_register_script('wp-polls-admin', '/wp-content/plugins/wp-polls/polls-admin-js-packed.js', false, '2.30');
+      echo "\n".'<!-- Start Of Script Generated By WP-Polls 2.30 -->'."\n";
+      echo '<script type="text/javascript">'."\n";
+      echo '/* <![CDATA[ */'."\n";
+      echo "\t".'var polls_admin_ajax_url = \''.get_option('siteurl').'/wp-content/plugins/wp-polls/polls-admin-ajax.php'."';\n";
+      echo "\t".'var polls_admin_text_delete_poll = \''.__('Delete Poll', 'wp-polls').'\';'."\n";
+      echo "\t".'var polls_admin_text_no_poll_logs = \''.__('No poll logs available.', 'wp-polls').'\';'."\n";
+      echo "\t".'var polls_admin_text_delete_all_logs = \''.__('Delete All Logs', 'wp-polls').'\';'."\n";
+      echo "\t".'var polls_admin_text_checkbox_delete_all_logs = \''.__('Please check the \\\'Yes\\\' checkbox if you want to delete all logs.', 'wp-polls').'\';'."\n";
+      echo "\t".'var polls_admin_text_delete_poll_logs = \''.__('Delete Logs For This Poll Only', 'wp-polls').'\';'."\n";
+      echo "\t".'var polls_admin_text_checkbox_delete_poll_logs = \''.__('Please check the \\\'Yes\\\' checkbox if you want to delete all logs for this poll ONLY.', 'wp-polls').'\';'."\n";
+      echo "\t".'var polls_admin_text_delete_poll_ans = \''.__('Delete Poll Answer', 'wp-polls').'\';'."\n";
+      echo "\t".'var polls_admin_text_open_poll = \''.__('Open Poll', 'wp-polls').'\';'."\n";
+      echo "\t".'var polls_admin_text_close_poll = \''.__('Close Poll', 'wp-polls').'\';'."\n";
+      echo "\t".'var polls_admin_text_enter_poll_id = \''.__('Enter Poll ID', 'wp-polls').'\';'."\n";
+      echo "\t".'var polls_admin_text_enter_poll_id_again = \''.__('Error: Poll ID must be numeric', 'wp-polls').'\n\n'.__('Please enter Poll ID again', 'wp-polls').'\';'."\n";
+      echo '/* ]]> */'."\n";
+      echo '</script>'."\n";
       wp_print_scripts(array('sack', 'wp-polls-admin'));
       echo '<link rel="stylesheet" href="'.get_option('siteurl').'/wp-content/plugins/wp-polls/polls-css.css" type="text/css" media="screen" />'."\n";
+      echo '<!-- End Of Script Generated By WP-Polls 2.30 -->'."\n";
 }
 

wp-polls/trunk/wp-polls.pot

@@ -3 +3 @@
 "Project-Id-Version: WP-Polls 2.30\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-11-29 22:50+0800\n"
+"PO-Revision-Date: 2007-12-15 00:06+0800\n"
 "Last-Translator: Lester 'GaMerZ' Chan <gamerz84@hotmail.com>\n"
 "Language-Team: Lester Chan <gamerz84@hotmail.com>\n"
@@ -139 +139 @@
 
 #: polls-admin-ajax.php:38
-#: polls-admin-js.php:78
 #: polls-manager.php:590
+#: wp-polls.php:206
 msgid "Delete All Logs"
 msgstr ""
@@ -153 +153 @@
 
 #: polls-admin-ajax.php:49
-#: polls-admin-js.php:106
 #: polls-logs.php:382
+#: wp-polls.php:208
 msgid "Delete Logs For This Poll Only"
 msgstr ""
@@ -169 +169 @@
 
 #: polls-admin-ajax.php:62
-#: polls-admin-js.php:148
+#: wp-polls.php:210
 msgid "Delete Poll Answer"
 msgstr ""
@@ -184 +184 @@
 
 #: polls-admin-ajax.php:78
-#: polls-admin-js.php:172
 #: polls-manager.php:442
+#: wp-polls.php:211
 msgid "Open Poll"
 msgstr ""
@@ -200 +200 @@
 
 #: polls-admin-ajax.php:89
-#: polls-admin-js.php:195
 #: polls-manager.php:441
+#: wp-polls.php:212
 msgid "Close Poll"
 msgstr ""
@@ -216 +216 @@
 
 #: polls-admin-ajax.php:100
-#: polls-admin-js.php:56
+#: wp-polls.php:204
 msgid "Delete Poll"
 msgstr ""
@@ -228 +228 @@
 #, php-format
 msgid "Poll '%s' Deleted Successfully"
-msgstr ""
-
-#: polls-admin-js.php:69
-#: polls-manager.php:593
-msgid "No poll logs available."
-msgstr ""
-
-#: polls-admin-js.php:85
-msgid "Please check the 'Yes' checkbox if you want to delete all logs."
-msgstr ""
-
-#: polls-admin-js.php:94
-#: polls-logs.php:371
-#: polls-logs.php:385
-msgid "No poll logs available for this poll."
-msgstr ""
-
-#: polls-admin-js.php:114
-msgid "Please check the 'Yes' checkbox if you want to delete all logs for this poll ONLY."
-msgstr ""
-
-#: polls-admin-js.php:206
-msgid "Enter Poll ID"
-msgstr ""
-
-#: polls-admin-js.php:208
-msgid "Error: Poll ID must be numeric"
-msgstr ""
-
-#: polls-admin-js.php:208
-msgid "Please enter Poll ID again"
-msgstr ""
-
-#: polls-js.php:36
-msgid "Your last request is still being processed. Please wait a while ..."
-msgstr ""
-
-#: polls-js.php:37
-msgid "Please choose a valid poll answer."
-msgstr ""
-
-#: polls-js.php:38
-msgid "Maximum number of choices allowed:"
 msgstr ""
 
@@ -413 +370 @@
 #: polls-manager.php:489
 #: polls-manager.php:497
-#: wp-polls.php:350
-#: wp-polls.php:355
-#: wp-polls.php:466
-#: wp-polls.php:471
-#: wp-polls.php:846
-#: wp-polls.php:850
+#: wp-polls.php:379
+#: wp-polls.php:384
+#: wp-polls.php:495
+#: wp-polls.php:500
+#: wp-polls.php:875
+#: wp-polls.php:879
 #, php-format
 msgid "%s @ %s"
@@ -443 +400 @@
 #: polls-logs.php:369
 msgid "No poll logs matches the filter."
+msgstr ""
+
+#: polls-logs.php:371
+#: polls-logs.php:385
+msgid "No poll logs available for this poll."
 msgstr ""
 
@@ -582 +544 @@
 #: polls-templates.php:116
 #: polls-templates.php:119
-#: wp-polls.php:1314
-#: wp-polls.php:1317
+#: wp-polls.php:1343
+#: wp-polls.php:1346
 msgid "Total Voters"
 msgstr ""
@@ -596 +558 @@
 
 #: polls-manager.php:495
-#: wp-polls.php:353
-#: wp-polls.php:469
-#: wp-polls.php:848
+#: wp-polls.php:382
+#: wp-polls.php:498
+#: wp-polls.php:877
 msgid "No Expiry"
 msgstr ""
@@ -666 +628 @@
 msgstr ""
 
+#: polls-manager.php:593
+#: wp-polls.php:205
+msgid "No poll logs available."
+msgstr ""
+
 #: polls-manager.php:597
 msgid "Note:<br />If your logging method is by IP and Cookie or by Cookie, users may still be unable to vote if they have voted before as the cookie is still stored in their computer."
@@ -829 +796 @@
 #: polls-templates.php:110
 #: polls-templates.php:113
-#: wp-polls.php:1311
-#: wp-polls.php:1312
+#: wp-polls.php:1340
+#: wp-polls.php:1341
 msgid "Votes"
 msgstr ""
@@ -1014 +981 @@
 #: polls-templates.php:104
 #: polls-templates.php:119
-#: wp-polls.php:1305
-#: wp-polls.php:1318
+#: wp-polls.php:1334
+#: wp-polls.php:1347
 msgid "Vote"
 msgstr ""
 
 #: polls-templates.php:104
-#: wp-polls.php:1306
+#: wp-polls.php:1335
 msgid "View Results Of This Poll"
 msgstr ""
 
 #: polls-templates.php:104
-#: wp-polls.php:1306
+#: wp-polls.php:1335
 msgid "View Results"
 msgstr ""
 
 #: polls-templates.php:113
-#: wp-polls.php:1312
+#: wp-polls.php:1341
 msgid "You Have Voted For This Choice"
 msgstr ""
 
 #: polls-templates.php:119
-#: wp-polls.php:1318
+#: wp-polls.php:1347
 msgid "Vote For This Poll"
 msgstr ""
@@ -1041 +1008 @@
 #: polls-templates.php:122
 #: polls-usage.php:80
-#: wp-polls.php:1345
+#: wp-polls.php:1374
 msgid "Polls Archive"
 msgstr ""
@@ -1054 +1021 @@
 
 #: polls-templates.php:131
-#: wp-polls.php:1320
+#: wp-polls.php:1349
 msgid "Sorry, there are no polls available at the moment."
 msgstr ""
 
 #: polls-templates.php:134
-#: wp-polls.php:1321
+#: wp-polls.php:1350
 msgid "An error has occurred when processing your poll."
 msgstr ""
@@ -1513 +1480 @@
 msgstr ""
 
-#: wp-polls.php:201
+#: wp-polls.php:162
+msgid "Your last request is still being processed. Please wait a while ..."
+msgstr ""
+
+#: wp-polls.php:163
+msgid "Please choose a valid poll answer."
+msgstr ""
+
+#: wp-polls.php:164
+msgid "Maximum number of choices allowed:"
+msgstr ""
+
 #: wp-polls.php:207
+msgid "Please check the \\'Yes\\' checkbox if you want to delete all logs."
+msgstr ""
+
+#: wp-polls.php:209
+msgid "Please check the \\'Yes\\' checkbox if you want to delete all logs for this poll ONLY."
+msgstr ""
+
+#: wp-polls.php:213
+msgid "Enter Poll ID"
+msgstr ""
+
+#: wp-polls.php:214
+msgid "Error: Poll ID must be numeric"
+msgstr ""
+
+#: wp-polls.php:214
+msgid "Please enter Poll ID again"
+msgstr ""
+
+#: wp-polls.php:230
+#: wp-polls.php:236
 msgid "Poll"
 msgstr ""
 
-#: wp-polls.php:208
+#: wp-polls.php:237
 msgid "Insert Poll"
 msgstr ""
 
-#: wp-polls.php:431
-#: wp-polls.php:591
+#: wp-polls.php:460
+#: wp-polls.php:620
 msgid "Loading"
 msgstr ""
 
-#: wp-polls.php:634
+#: wp-polls.php:663
 msgid "Note: There is a poll embedded within this post, please visit the site to participate in this post's poll."
 msgstr ""
 
-#: wp-polls.php:975
+#: wp-polls.php:1004
 msgid "Previous Page"
 msgstr ""
 
-#: wp-polls.php:983
+#: wp-polls.php:1012
 msgid "Next Page"
 msgstr ""
 
-#: wp-polls.php:992
+#: wp-polls.php:1021
 msgid "Pages"
 msgstr ""
 
-#: wp-polls.php:994
+#: wp-polls.php:1023
 msgid "Go to First Page"
 msgstr ""
 
-#: wp-polls.php:994
+#: wp-polls.php:1023
 msgid "First"
 msgstr ""
 
-#: wp-polls.php:997
-#: wp-polls.php:1009
+#: wp-polls.php:1026
+#: wp-polls.php:1038
 msgid "Go to Page"
 msgstr ""
 
-#: wp-polls.php:1004
+#: wp-polls.php:1033
 msgid "Page"
 msgstr ""
 
-#: wp-polls.php:1012
+#: wp-polls.php:1041
 msgid "Go to Last Page"
 msgstr ""
 
-#: wp-polls.php:1012
+#: wp-polls.php:1041
 msgid "Last"
 msgstr ""
 
-#: wp-polls.php:1185
+#: wp-polls.php:1214
 #, php-format
 msgid "Unable To Update Poll Total Votes And Poll Total Voters. Poll ID #%s"
 msgstr ""
 
-#: wp-polls.php:1189
+#: wp-polls.php:1218
 #, php-format
 msgid "You Had Already Voted For This Poll. Poll ID #%s"
 msgstr ""
 
-#: wp-polls.php:1193
+#: wp-polls.php:1222
 #, php-format
 msgid "Invalid Poll ID. Poll ID #%s"
 msgstr ""
 
-#: wp-polls.php:1219
-#: wp-polls.php:1221
-#: wp-polls.php:1231
+#: wp-polls.php:1248
+#: wp-polls.php:1250
+#: wp-polls.php:1260
 msgid "WP-Polls"
 msgstr ""
 
-#: wp-polls.php:1233
+#: wp-polls.php:1262
 msgid "polls were created."
 msgstr ""
 
-#: wp-polls.php:1234
+#: wp-polls.php:1263
 msgid "polls' answers were given."
 msgstr ""
 
-#: wp-polls.php:1235
+#: wp-polls.php:1264
 msgid "votes were casted."
 msgstr ""
 
-#: wp-polls.php:1289
+#: wp-polls.php:1318
 msgid "How Is My Site?"
 msgstr ""
 
-#: wp-polls.php:1292
+#: wp-polls.php:1321
 msgid "Good"
 msgstr ""
 
-#: wp-polls.php:1293
+#: wp-polls.php:1322
 msgid "Excellent"
 msgstr ""
 
-#: wp-polls.php:1294
+#: wp-polls.php:1323
 msgid "Bad"
 msgstr ""
 
-#: wp-polls.php:1295
+#: wp-polls.php:1324
 msgid "Can Be Improved"
 msgstr ""
 
-#: wp-polls.php:1296
+#: wp-polls.php:1325
 msgid "No Comments"
 msgstr ""