Changeset 35511

Timestamp:

03/19/08 21:29:02 (4 months ago)

Author:

GamerZ

Message:

First WP 2.5 Commit To WP-Polls

Files:

• wp-polls/trunk/polls-admin-js-packed.js (modified) (1 diff)
• wp-polls/trunk/polls-admin-js.js (modified) (7 diffs)
• wp-polls/trunk/polls-manager.php (modified) (11 diffs)
• wp-polls/trunk/polls-options.php (modified) (5 diffs)
• wp-polls/trunk/polls-uninstall.php (modified) (2 diffs)
• wp-polls/trunk/polls-usage.php (deleted)
• wp-polls/trunk/readme.html (modified) (2 diffs)
• wp-polls/trunk/tinymce/plugins/polls/editor_plugin.js (modified) (1 diff)
• wp-polls/trunk/tinymce/plugins/polls/images (deleted)
• wp-polls/trunk/tinymce/plugins/polls/img (added)
• wp-polls/trunk/tinymce/plugins/polls/img/poll.gif (added)
• wp-polls/trunk/tinymce/plugins/polls/langs/en.js (modified) (1 diff)
• wp-polls/trunk/wp-polls.php (modified) (6 diffs)

wp-polls/trunk/polls-admin-js-packed.js

@@ -1 @@
-x 1=1D 1t(1l);x f=0;x u=0;x F=0;5 P(){3.2(\'4\').8.7="i";g.e("4",h,k,"#s");g.e("l-"+f,h,D,"#O");N("M()",D)}5 M(){3.2("1d").J(3.2("l-"+f))}5 1b(a,b){17=m(b);9(17){f=a;1.p();1.6("r",1s);1.6("v",a);1.j=\'t\';1.n=\'4\';1.o=P;1.q()}}5 19(){3.2(\'4\').8.7="i";g.e("4",h,k,"#s");3.2("S").A=18}5 1f(a){z=m(a);9(z){9(3.2("y").Q==R){1.p();1.6("r",1e);1.6("y","L");1.j=\'t\';1.n=\'4\';1.o=19;1.q()}G{K(1c)}}}5 I(){3.2(\'4\').8.7="i";g.e("4",h,k,"#s");3.2("S").A=18;3.2("1a").8.7=\'E\';3.2("1A").8.7=\'i\'}5 1z(a,b){z=m(b);9(z){9(3.2("y").Q==R){f=a;1.p();1.6("r",1y);1.6("y","L");1.6("v",a);1.j=\'t\';1.n=\'4\';1.o=I;1.q()}G{K(1x)}}}5 16(){3.2(\'4\').8.7="i";g.e("4",h,k,"#s");g.e("l-15-"+u,h,D,"#O");N("14()",D);3.2(\'C\').A=(w(3.2(\'C\').A)-w(F));C=w(3.2(\'13\').H);12=w(3.2("1w-"+u).H);B=(C-12);9(B<0){B=0}3.2(\'13\').H=w(B)}5 14(){3.2("1v").J(3.2("l-15-"+u))}5 1u(a,b,c,d){Y=m(d);9(Y){f=a;u=b;F=c;1.p();1.6("r",1r);1.6("v",a);1.6("1q",b);1.j=\'t\';1.n=\'4\';1.o=16;1.q()}}5 X(){3.2(\'4\').8.7="i";g.e("4",h,k,"#s");3.2("W").8.7="E";3.2("10").8.7="V"}5 1p(a,b){U=m(b);9(U){f=a;1.p();1.6("r",1o);1.6("v",a);1.j=\'t\';1.n=\'4\';1.o=X;1.q()}}5 T(){3.2(\'4\').8.7="i";g.e("4",h,k,"#s");3.2("W").8.7="V";3.2("10").8.7="E"}5 1n(a,b){Z=m(b);9(Z){f=a;1.p();1.6("r",1m);1.6("v",a);1.j=\'t\';1.n=\'4\';1.o=T;1.q()}}5 1k(a,b){x c=11(1j);1i(1h(c)){c=11(1g)}9(c>0){9(a==\'1B\'){1C(b,\'[l=\'+c+\']\')}G{1E\'[l=\'+c+\']\'}}}',62,103,'|polls_admin|getElementById|document|message|function|setVar|display|style|if|||||fade_element|global_poll_id|Fat|null|block|method|3000|poll|confirm|element|onCompletion|reset|runAJAX|do|FFFF00|POST|global_poll_aid|pollq_id|parseInt|var|delete_logs_yes|delete_poll_logs_confirm|innerHTML|poll_total_votes_new|poll_total_votes|1000|none|global_poll_aid_votes|else|value|delete_this_poll_logs_message|removeChild|alert|yes|remove_poll|setTimeout|FF3333|delete_poll_message|checked|true|poll_logs|closing_poll_message|open_poll_confirm|inline|open_poll|opening_poll_message|delete_poll_ans_confirm|close_poll_confirm|close_poll|prompt|poll_answer_vote|pollq_totalvotes|remove_poll_ans|answer|delete_poll_ans_message|delete_poll_confirm|polls_admin_text_no_poll_logs|delete_poll_logs_message|poll_logs_display|delete_poll|polls_admin_text_checkbox_delete_all_logs|manage_polls|polls_admin_text_delete_all_logs|delete_poll_logs|polls_admin_text_enter_poll_id_again|isNaN|while|polls_admin_text_enter_poll_id|insertPoll|polls_admin_ajax_url|polls_admin_text_close_poll|closing_poll|polls_admin_text_open_poll|opening_poll|polla_aid|polls_admin_text_delete_poll_ans|polls_admin_text_delete_poll|sack|delete_poll_ans|poll_answers|polla_votes|polls_admin_text_checkbox_delete_poll_logs|polls_admin_text_delete_poll_logs|delete_this_poll_logs|poll_logs_display_none|code|edInsertContent
+o 1=1x 1n(1d);o e=0;o u=0;o A=0;4 K(){2.3(\'8\').7.6="f";Y("S()",R)}4 S(){2.3("1j").W(2.3("w-"+e))}4 1a(a,b){E=k(b);9(E){e=a;1.l();1.5("n",1w);1.5("p",a);1.g=\'i\';1.j=\'8\';1.m=K;1.h()}}4 M(){2.3(\'8\').7.6="f";2.3("N").s=12}4 1h(a){r=k(a);9(r){9(2.3("t").J==I){1.l();1.5("n",19);1.5("t","H");1.g=\'i\';1.j=\'8\';1.m=M;1.h()}z{G(18)}}}4 F(){2.3(\'8\').7.6="f";2.3("N").s=12;2.3("17").7.6=\'y\';2.3("16").7.6=\'f\'}4 15(a,b){r=k(b);9(r){9(2.3("t").J==I){e=a;1.l();1.5("n",14);1.5("t","H");1.5("p",a);1.g=\'i\';1.j=\'8\';1.m=F;1.h()}z{G(13)}}}4 D(){2.3(\'8\').7.6="f";Y("C()",R);2.3(\'x\').s=(q(2.3(\'x\').s)-q(A));x=q(2.3(\'11\').B);10=q(2.3("1v-"+u).B);v=(x-10);9(v<0){v=0}2.3(\'11\').B=q(v)}4 C(){2.3("1t").W(2.3("w-1s-"+u))}4 1r(a,b,c,d){X=k(d);9(X){e=a;u=b;A=c;1.l();1.5("n",1q);1.5("p",a);1.5("1o",b);1.g=\'i\';1.j=\'8\';1.m=D;1.h()}}4 V(){2.3(\'8\').7.6="f";2.3("U").7.6="y";2.3("T").7.6="L"}4 1m(a,b){Q=k(b);9(Q){e=a;1.l();1.5("n",1l);1.5("p",a);1.g=\'i\';1.j=\'8\';1.m=V;1.h()}}4 P(){2.3(\'8\').7.6="f";2.3("U").7.6="L";2.3("T").7.6="y"}4 1k(a,b){O=k(b);9(O){e=a;1.l();1.5("n",1i);1.5("p",a);1.g=\'i\';1.j=\'8\';1.m=P;1.h()}}4 1p(a,b){o c=Z(1g);1f(1e(c)){c=Z(1u)}9(c>0){9(a==\'1c\'){1b(b,\'[w=\'+c+\']\')}z{1y\'[w=\'+c+\']\'}}}',62,97,'|polls_admin|document|getElementById|function|setVar|display|style|message|if|||||global_poll_id|block|method|runAJAX|POST|element|confirm|reset|onCompletion|do|var|pollq_id|parseInt|delete_poll_logs_confirm|innerHTML|delete_logs_yes|global_poll_aid|poll_total_votes_new|poll|poll_total_votes|none|else|global_poll_aid_votes|value|remove_poll_ans|delete_poll_ans_message|delete_poll_confirm|delete_this_poll_logs_message|alert|yes|true|checked|delete_poll_message|inline|delete_poll_logs_message|poll_logs|close_poll_confirm|closing_poll_message|open_poll_confirm|1000|remove_poll|close_poll|open_poll|opening_poll_message|removeChild|delete_poll_ans_confirm|setTimeout|prompt|poll_answer_vote|pollq_totalvotes|polls_admin_text_no_poll_logs|polls_admin_text_checkbox_delete_poll_logs|polls_admin_text_delete_poll_logs|delete_this_poll_logs|poll_logs_display_none|poll_logs_display|polls_admin_text_checkbox_delete_all_logs|polls_admin_text_delete_all_logs|delete_poll|edInsertContent|code|polls_admin_ajax_url|isNaN|while|polls_admin_text_enter_poll_id|delete_poll_logs|polls_admin_text_close_poll|manage_polls|closing_poll|polls_admin_text_open_poll|opening_poll|sack|polla_aid|insertPoll|polls_admin_text_delete_poll_ans|delete_poll_ans|answer|poll_answers|polls_admin_text_enter_poll_id_again|polla_votes|polls_admin_text_delete_poll

wp-polls/trunk/polls-admin-js.js

@@ -2 +2 @@
-+----------------------------------------------------------------+
-|                                                                                                                                         |
-3
-7
+5
+8
-|                                                                                                                                         |
-|     File Written By:                                                                                                  |
@@ -25 +25 @@
-function delete_poll_message() {
-      document.getElementById('message').style.display = "block";
-      Fat.fade_element("message", null, 3000, "#FFFF00");
-      Fat.fade_element("poll-" + global_poll_id, null, 1000, "#FF3333");
-      setTimeout("remove_poll()", 1000);
-}
@@ -53 +51 @@
-function delete_poll_logs_message() {
-      document.getElementById('message').style.display = "block";
-      Fat.fade_element("message", null, 3000, "#FFFF00");
-      document.getElementById("poll_logs").innerHTML = polls_admin_text_no_poll_logs;
-}
@@ -78 +75 @@
-function delete_this_poll_logs_message() {
-      document.getElementById('message').style.display = "block";
-      Fat.fade_element("message", null, 3000, "#FFFF00");
-      document.getElementById("poll_logs").innerHTML = polls_admin_text_no_poll_logs;
-      document.getElementById("poll_logs_display").style.display = 'none';
@@ -107 +103 @@
-function delete_poll_ans_message() {
-      document.getElementById('message').style.display = "block";
-      Fat.fade_element("message", null, 3000, "#FFFF00");
-      Fat.fade_element("poll-answer-" + global_poll_aid, null, 1000, "#FF3333");
-      setTimeout("remove_poll_ans()", 1000);
-      document.getElementById('poll_total_votes').innerHTML = (parseInt(document.getElementById('poll_total_votes').innerHTML) - parseInt(global_poll_aid_votes));
@@ -146 +140 @@
-function opening_poll_message() {
-      document.getElementById('message').style.display = "block";
-      Fat.fade_element("message", null, 3000, "#FFFF00");
-      document.getElementById("open_poll").style.display = "none";
-      document.getElementById("close_poll").style.display = "inline";
@@ -169 +162 @@
-function closing_poll_message() {
-      document.getElementById('message').style.display = "block";
-      Fat.fade_element("message", null, 3000, "#FFFF00");
-      document.getElementById("open_poll").style.display = "inline";
-      document.getElementById("close_poll").style.display = "none";

wp-polls/trunk/polls-manager.php

@@ -3 +3 @@
-+----------------------------------------------------------------+
-|                                                                                                                                         |
-3
-7
+5
+8
-|                                                                                                                                         |
-|     File Written By:                                                                                                  |
@@ -255 +255 @@
-                        poll_option.setAttribute('id', "pollq-multiple-" + (count_poll_answer+1));
-                        // Elements - TD/TR
-                        if(count_poll_answer%2 != 0) { poll_tr.style.background = "#eee"; }
-                        poll_tr.setAttribute('id', "poll-answer-new-" + count_poll_answer_new);
-                        poll_td1.setAttribute('width', "20%");
@@ -296 +295 @@
-                  /* ]]> */
-            </script>
-            <?php if(!empty($text)) { echo '<!-- Last Action --><div id="message" class="updated fade">'.stripslashes($text).'</div>'; } else { echo '<div id="message" class="updated" style="display: none;"></div>'; } ?>
-
-            <!-- Edit Poll -->
@@ -304 +302 @@
-            <div class="wrap">
-                  <h2><?php _e('Edit Poll', 'wp-polls'); ?></h2>
+
+                  <?php if(!empty($text)) { echo '<!-- Last Action --><br class="clear" /><div id="message" class="updated fade">'.stripslashes($text).'</div>'; } else { echo '<div id="message" class="updated" style="display: none;"></div>'; } ?>
+
-                  <!-- Poll Question -->
-                  <h3><?php _e('Poll Question', 'wp-polls'); ?></h3>
-width="100%"  border="0" cellspacing="3" cellpadding="3
- style="background-color: #eee;"
-d width="20%"><strong><?php _e('Question', 'wp-polls') ?></strong></td
+class="form-table
+
+h scope="row" valign="top"><?php _e('Question', 'wp-polls') ?></th
-                              <td width="80%"><input type="text" size="70" name="pollq_question" value="<?php echo htmlspecialchars($poll_question_text); ?>" /></td>
-                        </tr>
@@ -314 +315 @@
-                  <!-- Poll Answers -->
-                  <h3><?php _e('Poll Answers', 'wp-polls'); ?></h3>
-width="100%"  border="0" cellspacing="3" cellpadding="3
+class="form-table
-                        <thead>
-class="thead"
-:
-:
+
+
+
-                                    <td width="20%" align="right"><strong><?php _e('No. Of Votes', 'wp-polls') ?></strong></td>
-                              </tr>
@@ -330 +331 @@
-                                          $pollip_answers[0] = __('Null Votes', 'wp-polls'); 
-                                          foreach($poll_answers as $poll_answer) {
-                                                if($i%2 == 0) {
-                                                      $style = 'style=\'background: none;\'';                                                                                                                     
-                                                }  else {
-                                                      $style = 'style=\'background-color: #eee;\'';   
-                                                }
-                                                $polla_aid = intval($poll_answer->polla_aid);
-                                                $polla_answers = stripslashes($poll_answer->polla_answers);
-                                                $polla_votes = intval($poll_answer->polla_votes);
-                                                $pollip_answers[$polla_aid] = $polla_answers;
- $style
+
-                                                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;";
@@ -365 +361 @@
-                  <!-- Poll Multiple Answers -->
-                  <h3><?php _e('Poll Multiple Answers', 'wp-polls') ?></h3>
-width="100%"  border="0" cellspacing="3" cellpadding="3
- style="background-color: #eee;"
+class="form-table
+
-                              <td width="40%" valign="top"><strong><?php _e('Allows Users To Select More Than One Answer?', 'wp-polls'); ?></strong></td>
-                              <td width="60%">
@@ -394 +390 @@
-                  <!-- Poll Start/End Date -->
-                  <h3><?php _e('Poll Start/End Date', 'wp-polls'); ?></h3>
-width="100%"  border="0" cellspacing="3" cellpadding="3
- style="background-color: #eee;"
+class="form-table
+
-                              <td width="20%" valign="top"><strong><?php _e('Start Date/Time', 'wp-polls'); ?></strong>:</td>
-                              <td width="80%">
@@ -456 +452 @@
-            <!-- Last Action -->          
-            <div id="message" class="updated" style="display: none;"></div>
-
+
-            <!-- Manage Polls -->
-            <div class="wrap">
-            <h2><?php _e('Manage Polls', 'wp-polls'); ?></h2>
-
+
+
-                  <thead>
- class="thead"
+
-                              <th><?php _e('ID', 'wp-polls'); ?></th>
-                              <th><?php _e('Question', 'wp-polls'); ?></th>                     
@@ -498 +495 @@
-                                          }
-                                          if($i%2 == 0) {
-style=\'background-color: #eee;\'
+class="alternate"
-                                          }  else {
-style=\'background: none;\'
+
-                                          }
-                                          if($current_poll > 0) {
-                                                if($current_poll == $poll_id) {
-style=\'background-color: #b8d4ff;\'
+class="highlight"
-                                                }
-                                          } elseif($current_poll == 0) {
-                                                if($poll_id == $latest_poll) {
-style=\'background-color: #b8d4ff;\'
+class="highlight"
-                                                }
-                                          } else if(in_array($poll_id, $multiple_polls)) {
-style=\'background-color: #b8d4ff;\'
+class="highlight"
-                                          }
-                                          echo "<tr id=\"poll-$poll_id\" $style>\n";
@@ -556 +553 @@
-                  </table>
-            </div>
+            <p>&nbsp;</p>
+
-            <!-- Polls Stats -->
-            <div class="wrap">
-            <h2><?php _e('Polls Stats', 'wp-polls'); ?></h2>
-
+
+
-                  <tr>
-:
+
-                        <td align="left"><?php echo $i; ?></td>
-                  </tr>
-
-:
+ class="alternate"
+
-                        <td align="left"><?php echo number_format_i18n($total_ans); ?></td>
-                  </tr>
-                  <tr>
-:
+
-                        <td align="left"><?php echo number_format_i18n($total_votes); ?></td>
-                  </tr>
-
-:
+ class="alternate"
+
-                        <td align="left"><?php echo number_format_i18n($total_voters); ?></td>
-                  </tr>
-                  </table>
-            </div>
+            <p>&nbsp;</p>
+
-            <!-- Delete Polls Logs -->
-            <div class="wrap">
-                  <h2><?php _e('Polls Logs', 'wp-polls'); ?></h2>
+                  <br style="clear" />
-                  <div align="center" id="poll_logs">
-                  <?php

wp-polls/trunk/polls-options.php

@@ -49 +49 @@
-      $poll_close = intval($_POST['poll_close']);
-      $poll_logging_method = intval($_POST['poll_logging_method']);
+      $poll_cookielog_expiry = intval($_POST['poll_cookielog_expiry']);
-      $poll_allowtovote = intval($_POST['poll_allowtovote']);
-      $update_poll_queries = array();
@@ -65 +66 @@
-      $update_poll_queries[] = update_option('poll_close', $poll_close);
-      $update_poll_queries[] = update_option('poll_logging_method', $poll_logging_method);
+      $update_poll_queries[] = update_option('poll_cookielog_expiry', $poll_cookielog_expiry);
-      $update_poll_queries[] = update_option('poll_allowtovote', $poll_allowtovote);
-      $update_poll_text[] = __('Poll Bar Style', 'wp-polls');
@@ -79 +81 @@
-      $update_poll_text[] = __('Poll Close Option', 'wp-polls');
-      $update_poll_text[] = __('Logging Method', 'wp-polls');
+      $update_poll_text[] = __('Cookie And Log Expiry Option', 'wp-polls');
-      $update_poll_text[] = __('Allow To Vote Option', 'wp-polls');
-      $i=0;
@@ -130 +133 @@
-<div class="wrap"> 
-      <h2><?php _e('Poll Options', 'wp-polls'); ?></h2>
-            <p class="submit">
-                  <input type="submit" name="Submit" class="button" value="<?php _e('Update Options &raquo;', 'wp-polls'); ?>" />
-            </p>
-            <fieldset class="options">
-                  <legend><?php _e('Poll Bar Style', 'wp-polls'); ?></legend>
@@ -297 +297 @@
-                              </td>
-                        </tr>
+                        <tr valign="top">
+                              <th align="left" width="30%"><?php _e('Expiry Time For Cookie And Log:', 'wp-polls'); ?></th>
+                              <td align="left"><input type="text" name="poll_cookielog_expiry" value="<?php echo intval(get_option('poll_cookielog_expiry')); ?>" size="10" /> <?php _e('seconds (0 to disable)', 'wp-polls'); ?></td>
+                        </tr>
-                  </table>
-            </fieldset>

wp-polls/trunk/polls-uninstall.php

@@ -3 +3 @@
-+----------------------------------------------------------------+
-|                                                                                                                                         |
-3
-7
+5
+8
-|                                                                                                                                         |
-|     File Written By:                                                                                                  |
@@ -29 +29 @@
-$mode = trim($_GET['mode']);
-$polls_tables = array($wpdb->pollsq, $wpdb->pollsa, $wpdb->pollsip);
-
+, 'poll_cookielog_expiry'
-
-

wp-polls/trunk/readme.html

@@ -236 +236 @@
-                  <p>
-                        <strong>Download:</strong><br />
-3
- And 2.2
+5
+, 2.2.x And 2.3
-                        <strong>&raquo;</strong> <a href="http://lesterchan.net/others/downloads/wp-polls213.zip" title="http://lesterchan.net/others/downloads/wp-polls213.zip">WP-Polls 2.13 For WordPress 2.0.x</a><br />
-                        <strong>&raquo;</strong> <a href="http://lesterchan.net/others/downloads/wp-polls202a.zip" title="http://lesterchan.net/others/downloads/wp-polls202a.zip">WP-Polls 2.02a For WordPress 1.5.2</a>
@@ -283 +283 @@
-                              <strong>Version 2.30 (01-04-2008)</strong>
-                              <ul>
+                                    <li>NEW: Works For WordPress 2.5 Only</li>
+                                    <li>NEW: Updated WP-Polls TinyMCE Plugin To Work With TinyMCE 3.0</li>
+                                    <li>NEW: Add Time Expiry For Cookie/Log</li>
+                                    <li>NEW: Removed polls-usage.php</li>
+                                    <li>NEW: Removed "Fade Anything Technique" In Polls Admin</li>
-                                    <li>NEW: Uses /wp-polls/ Folder Instead Of /polls/</li>
-                                    <li>NEW: Uses wp-polls.php Instead Of polls.php</li>

wp-polls/trunk/tinymce/plugins/polls/editor_plugin.js

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+

wp-polls/trunk/tinymce/plugins/polls/langs/en.js

@@ -1 @@
-ToLang('polls',
-insert
+I18n("en.polls", 
+     insert_poll
-});

wp-polls/trunk/wp-polls.php

@@ -59 +59 @@
-            add_submenu_page('wp-polls/polls-manager.php', __('Poll Options', 'wp-polls'), __('Poll Options', 'wp-polls'), 'manage_polls', 'wp-polls/polls-options.php');
-            add_submenu_page('wp-polls/polls-manager.php', __('Poll Templates', 'wp-polls'), __('Poll Templates', 'wp-polls'), 'manage_polls', 'wp-polls/polls-templates.php');
-            add_submenu_page('wp-polls/polls-manager.php', __('Poll Usage', 'wp-polls'), __('Poll Usage', 'wp-polls'), 'manage_polls', 'wp-polls/polls-usage.php');
-            add_submenu_page('wp-polls/polls-manager.php', __('Uninstall WP-Polls', 'wp-polls'), __('Uninstall WP-Polls', 'wp-polls'), 'manage_polls', 'wp-polls/polls-uninstall.php');
-      }
@@ -244 +243 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-      array_push($buttons, 'separator', 'polls');
-      return $buttons;
-}
-
-
-
-
+
+
+
-}
-
@@ -337 +339 @@
-function check_voted_ip($poll_id) {
-      global $wpdb;
+      $log_expiry = intval(get_option('poll_cookielog_expiry'));
+      $log_expiry_sql = '';
+      if($log_expiry > 0) {
+            $log_expiry_sql = 'AND ('.current_time('timestamp').'-(pollip_timestamp+0)) < '.$log_expiry;
+      }
-      // Check IP From IP Logging Database
-
+ $log_expiry_sql
-      if($get_voted_aids) {
-            return $get_voted_aids;
@@ -355 +362 @@
-      }
-      $pollsip_userid = intval($user_ID);
+      $log_expiry = intval(get_option('poll_cookielog_expiry'));
+      $log_expiry_sql = '';
+      if($log_expiry > 0) {
+            $log_expiry_sql = 'AND ('.current_time('timestamp').'-(pollip_timestamp+0)) < '.$log_expiry;
+      }
-      // Check User ID From IP Logging Database
-
+ $log_expiry_sql
-      if($get_voted_aids) {
-            return $get_voted_aids;
@@ -1199 +1211 @@
-                        $poll_logging_method = intval(get_option('poll_logging_method'));
-                        if($poll_logging_method == 1 || $poll_logging_method == 3) {
-
+
+
+
+
+
-                        }
-                        foreach($poll_aid_array as $polla_aid) {
@@ -1382 +1398 @@
-            $wpdb->query("UPDATE $wpdb->pollsq SET pollq_totalvoters = pollq_totalvotes");
-      }
+      // Database Upgrade For WP-Polls 2.30
+      add_option('poll_cookielog_expiry', 0, 'Cookie And Log Expiry Time');   
-      // Set 'manage_polls' Capabilities To Administrator   
-      $role = get_role('administrator');