Crowdsignal Dashboard – Polls, Surveys & more - Version 2.0.2

Version Description

  • Added support to the shortcode for alignment. Usage: [polldaddy poll=xxxxxx align=right|left]
  • Fixed layout issues in Firefox 4 on embed interface
  • Fixed extraneous dividers bug
  • Changed nav menu icon to sprite to fix hover flash bug
Download this release

Release Info

Developer alternatekev
Plugin Icon 128x128 Crowdsignal Dashboard – Polls, Surveys & more
Version 2.0.2
Comparing to
See all releases

Code changes from version 2.0.1 to 2.0.2

admin-style.php CHANGED
@@ -1,8 +1,18 @@
 
 
 
 
 
 
 
 
 
 
1
  <style type="text/css" media="screen" type="text/css">
2
 
3
  #toplevel_page_polls .wp-menu-image,
4
  #toplevel_page_ratings .wp-menu-image{
5
- background:url('<?php echo $this->base_url; ?>img/pd-wp-icon-<?php echo $color; ?>.png') 7px 7px no-repeat !important;
6
 
7
  }
8
 
@@ -10,7 +20,7 @@
10
  #toplevel_page_ratings:hover .wp-menu-image,
11
  #toplevel_page_polls.wp-has-current-submenu .wp-menu-image,
12
  #toplevel_page_ratings.wp-has-current-submenu .wp-menu-image {
13
- background:url('<?php echo $this->base_url; ?>img/pd-wp-icon-hover.png') 7px 7px no-repeat !important;
14
  }
15
 
16
  #toplevel_page_polls img, #toplevel_page_ratings img{
1
+ <?php
2
+
3
+ if( $color == 'blue' ){
4
+ $yoffset = 7;
5
+ } else {
6
+ $yoffset = -60;
7
+ }
8
+
9
+ ?>
10
+
11
  <style type="text/css" media="screen" type="text/css">
12
 
13
  #toplevel_page_polls .wp-menu-image,
14
  #toplevel_page_ratings .wp-menu-image{
15
+ background:url('<?php echo $this->base_url; ?>img/pd-wp-icons.png') 7px <?php echo $yoffset; ?>px no-repeat !important;
16
 
17
  }
18
 
20
  #toplevel_page_ratings:hover .wp-menu-image,
21
  #toplevel_page_polls.wp-has-current-submenu .wp-menu-image,
22
  #toplevel_page_ratings.wp-has-current-submenu .wp-menu-image {
23
+ background:url('<?php echo $this->base_url; ?>img/pd-wp-icons.png') 7px -77px no-repeat !important;
24
  }
25
 
26
  #toplevel_page_polls img, #toplevel_page_ratings img{
img/pd-wp-icon-blue.png DELETED
Binary file
img/pd-wp-icon-gray.png DELETED
Binary file
img/pd-wp-icon-hover.png DELETED
Binary file
img/pd-wp-icon.png DELETED
Binary file
img/pd-wp-icons.png ADDED
Binary file
polldaddy-org.php CHANGED
@@ -11,7 +11,7 @@ class WPORG_PollDaddy extends WP_PollDaddy {
11
 
12
  function __construct() {
13
  parent::__construct();
14
- $this->version = '2.0.1';
15
  $this->base_url = plugins_url() . '/' . dirname( plugin_basename( __FILE__ ) ) . '/';
16
  $this->polldaddy_client_class = 'WPORG_PollDaddy_Client';
17
  $this->use_ssl = (int) get_option( 'polldaddy_use_ssl' );
@@ -517,8 +517,20 @@ if ( !function_exists( 'polldaddy_shortcode_handler' ) ) {
517
  $mod = ( $poll % ( count( $keywords ) - 1 ) );
518
  $keywords_link = '<a href="' . $keywords[ $mod ][ 'url' ] . '">' . $keywords[ $mod ][ 'keyword' ] . '</a>';
519
  }
 
 
 
 
 
 
 
 
 
 
 
 
520
 
521
- return '<a name="pd_a_' . $poll . '"></a><div class="PDS_Poll" id="PDI_container' . $poll . '" style="display:inline-block;"></div><div id="PD_superContainer"></div><script type="text/javascript" language="javascript" charset="utf-8" src="http://static.polldaddy.com/p/' . $poll . '.js' . $cb . '"></script>
522
  <noscript>
523
  <a href="http://polldaddy.com/poll/' . $poll . '/">View This Poll</a><br/><span style="font-size:10px;">' . $keywords_link . '</span>
524
  </noscript>';
11
 
12
  function __construct() {
13
  parent::__construct();
14
+ $this->version = '2.0.2';
15
  $this->base_url = plugins_url() . '/' . dirname( plugin_basename( __FILE__ ) ) . '/';
16
  $this->polldaddy_client_class = 'WPORG_PollDaddy_Client';
17
  $this->use_ssl = (int) get_option( 'polldaddy_use_ssl' );
517
  $mod = ( $poll % ( count( $keywords ) - 1 ) );
518
  $keywords_link = '<a href="' . $keywords[ $mod ][ 'url' ] . '">' . $keywords[ $mod ][ 'keyword' ] . '</a>';
519
  }
520
+
521
+ if( isset( $align ) )
522
+ $float = "float:" . $align .";";
523
+ else
524
+ $float = null;
525
+
526
+ if( $align == 'left')
527
+ $margins = 'margin:0px 10px 0px 0px;';
528
+ else if ( $margin == 'right' )
529
+ $margins = 'margin: 0px 0px 0px 10px';
530
+ else
531
+ $margins = null;
532
 
533
+ return '<a name="pd_a_' . $poll . '"></a><div class="PDS_Poll" id="PDI_container' . $poll . '" style="display:inline-block;' . $float . '' . $margins . '"></div><div id="PD_superContainer"></div><script type="text/javascript" language="javascript" charset="utf-8" src="http://static.polldaddy.com/p/' . $poll . '.js' . $cb . '"></script>
534
  <noscript>
535
  <a href="http://polldaddy.com/poll/' . $poll . '/">View This Poll</a><br/><span style="font-size:10px;">' . $keywords_link . '</span>
536
  </noscript>';
polldaddy.css CHANGED
@@ -247,6 +247,16 @@ table.answer td.answer-media-icons ul, table.question td.answer-media-icons ul{
247
  z-index: -1;
248
  }
249
 
 
 
 
 
 
 
 
 
 
 
250
 
251
  /* OLD STYLES, PRE-2.0 ------------------------------------------------------------
252
  ---------------------------------------------------------------------------------------------------*/
247
  z-index: -1;
248
  }
249
 
250
+ hardbreak {
251
+ white-space: pre-wrap; /* css-3 */
252
+ white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
253
+ white-space: -pre-wrap; /* Opera 4-6 */
254
+ white-space: -o-pre-wrap; /* Opera 7 */
255
+ word-wrap: break-word;
256
+ }
257
+
258
+
259
+
260
 
261
  /* OLD STYLES, PRE-2.0 ------------------------------------------------------------
262
  ---------------------------------------------------------------------------------------------------*/
polldaddy.php CHANGED
@@ -6,7 +6,7 @@ Plugin URI: http://wordpress.org/extend/plugins/polldaddy/
6
  Description: Create and manage Polldaddy polls and ratings in WordPress
7
  Author: Automattic, Inc.
8
  Author URL: http://automattic.com/
9
- Version: 2.0.1
10
  */
11
 
12
  // You can hardcode your PollDaddy PartnerGUID (API Key) here
@@ -34,7 +34,7 @@ class WP_PollDaddy {
34
  global $current_user;
35
  $this->errors = new WP_Error;
36
  $this->scheme = 'https';
37
- $this->version = '2.0.1';
38
  $this->multiple_accounts = true;
39
  $this->polldaddy_client_class = 'api_client';
40
  $this->polldaddy_clients = array();
@@ -317,7 +317,7 @@ class WP_PollDaddy {
317
 
318
  function set_api_user_code() {
319
 
320
- $this->user_code = get_option( 'pd-usercode' );
321
 
322
  if ( empty( $this->user_code ) ) {
323
  $polldaddy = $this->get_client( WP_POLLDADDY__PARTNERGUID );
@@ -326,7 +326,7 @@ class WP_PollDaddy {
326
  $this->user_code = $polldaddy->get_usercode( $this->id );
327
 
328
  if ( !empty( $this->user_code ) ) {
329
- update_option( 'pd-usercode', $this->user_code );
330
  }
331
  }
332
  }
@@ -454,7 +454,7 @@ class WP_PollDaddy {
454
  check_admin_referer( 'polldaddy-account' );
455
 
456
  $this->user_code = '';
457
- update_option( 'pd-usercode', '' );
458
 
459
  if ( $new_args = $this->management_page_load_signup() )
460
  $query_args = array_merge( $query_args, $new_args );
@@ -714,13 +714,12 @@ class WP_PollDaddy {
714
  if ( isset( $media[999999999] ) )
715
  $poll_data['mediaCode'] = esc_html( $media[999999999] );
716
 
717
- if ( isset( $mediaType[999999999] ) )
718
- $poll_data['mediaType'] = intval( $mediaType[999999999] );
719
-
720
  $polldaddy->reset();
721
 
722
  $update_response = $polldaddy->update_poll( $poll, $poll_data );
723
-
724
  $this->parse_errors( $polldaddy );
725
 
726
  if ( !$update_response )
@@ -1183,7 +1182,7 @@ class WP_PollDaddy {
1183
  <h2 id="poll-list-header"><?php _e( 'Polldaddy Polls', 'polldaddy' ); ?></h2>
1184
  <?php
1185
  } else { ?>
1186
- <h2 id="poll-list-header"><?php printf( __( '<a href="%s">Polldaddy Polls</a>', 'polldaddy' ), esc_url( add_query_arg( array( 'action' => 'polls', 'poll' => false, 'message' => false ) ) ) ); ?></h2>
1187
  <?php
1188
  }
1189
  endif;
@@ -1206,7 +1205,7 @@ class WP_PollDaddy {
1206
  case 'edit-poll' :
1207
  ?>
1208
 
1209
- <h2 id="poll-list-header"><?php _e( 'Edit Poll', 'polldaddy' ); ?></h2>
1210
 
1211
  <?php
1212
 
@@ -1215,7 +1214,7 @@ class WP_PollDaddy {
1215
  case 'create-poll' :
1216
  ?>
1217
 
1218
- <h2 id="poll-list-header"><?php _e( 'Add New Poll', 'polldaddy') ?></h2>
1219
 
1220
  <?php
1221
  $this->poll_edit_form();
@@ -1415,45 +1414,39 @@ class WP_PollDaddy {
1415
  <abbr title="<?php echo date( __( 'Y/m/d g:i:s A', 'polldaddy' ), $poll_time ); ?>"> <?php _e( 'created', 'polldaddy' ); ?> <?php echo date( __( 'M d, Y', 'polldaddy' ), $poll_time ); ?></abbr>
1416
 
1417
  <div class="row-actions">
1418
- <span class="edit"><a href="<?php echo $edit_link; ?>"><?php _e( 'Edit', 'polldaddy' ); ?></a> | </span>
1419
- <?php } else { ?>
1420
  <strong><?php echo esc_html( $poll->___content ); ?></strong>
1421
  <div class="row-actions">
1422
 
1423
  <?php } ?>
1424
 
1425
  <?php if ( !isset( $_GET['iframe'] ) ):?>
1426
- <span class="shortcode"><a href="javascript:void(0);" class="polldaddy-show-shortcode"><?php _e( 'Embed &amp; Link', 'polldaddy' ); ?></a></span> | </span>
1427
  <?php else: ?>
1428
  <input type="hidden" class="polldaddy-poll-id" value="<?php echo $poll_id; ?>" />
1429
- <span><a href="javascript:void(0);" class="polldaddy-send-to-editor"><?php _e( 'Embed in Post', 'polldaddy' ); ?></a></span> | </span>
1430
  <?php endif; ?>
1431
 
1432
 
1433
  <?php
1434
  if ( $poll_closed == 2 ) {
1435
  if ( $open_link ) { ?>
1436
- <span class="open"><a class="open-poll" href="<?php echo $open_link; ?>"><?php _e( 'Open', 'polldaddy' ); ?></a> | </span>
1437
  <?php } } else {
1438
  if ( $close_link ) { ?>
1439
- <span class="close"><a class="close-poll" href="<?php echo $close_link; ?>"><?php _e( 'Close', 'polldaddy' ); ?></a> | </span>
1440
  <?php } }
1441
  if ( !isset( $_GET['iframe'] ) ): ?>
1442
- <span class="view"><a class="thickbox" href="<?php echo $preview_link; ?>"><?php _e( 'Preview', 'polldaddy' ); ?></a> | </span>
1443
  <?php else: ?>
1444
- <span class="view"><a href="<?php echo $preview_link; ?>"><?php _e( 'Preview', 'polldaddy' ); ?></a> | </span>
1445
  <?php endif;
1446
  if ( $delete_link ) { ?>
1447
- <span class="delete"><a class="delete-poll delete" href="<?php echo $delete_link; ?>"><?php _e( 'Delete', 'polldaddy' ); ?></a>
1448
  <?php }
1449
  if ( $poll->_responses > 0 ):?>
1450
- | </span>
1451
- <span class="results"><a href="<?php echo $results_link; ?>"><?php _e( 'Results', 'polldaddy' ); ?></a>
1452
- <?php else:?>
1453
-
1454
- </span>
1455
- <?php endif; ?>
1456
-
1457
  <?php $this->poll_table_add_option( $poll_id ); ?>
1458
  </div>
1459
  </td>
@@ -1484,7 +1477,7 @@ class WP_PollDaddy {
1484
 
1485
 
1486
  <h4 style="padding-top:10px;color:#666;font-weight:normal;"><?php _e( 'JavaScript', 'polldaddy' ); ?></h4>
1487
- <pre style="max-width:542px;text-wrap:word-wrap;margin-bottom:20px;">&lt;script type="text/javascript" language="javascript"
1488
  src="http://static.polldaddy.com/p/<?php echo (int) $poll_id; ?>.js"&gt;&lt;/script&gt;
1489
  &lt;noscript&gt;
1490
  &lt;a href="http://polldaddy.com/poll/<?php echo (int) $poll_id; ?>/"&gt;<?php echo trim( strip_tags( $poll->___content ) ); ?>&lt;/a&gt;&lt;br/&gt;
@@ -4865,10 +4858,12 @@ src="http://static.polldaddy.com/p/<?php echo (int) $poll_id; ?>.js"&gt;&lt;/scr
4865
  return true;
4866
 
4867
  //check to see if poll owner is a member of this blog
4868
- if ( function_exists( 'get_users_of_blog' ) ) { //WP 2.2 +
4869
- if ( !array_key_exists( $poll->_owner, get_users_of_blog() ) )
4870
- return false;
4871
- }
 
 
4872
 
4873
  return (bool) current_user_can( 'edit_others_posts' );
4874
  }
6
  Description: Create and manage Polldaddy polls and ratings in WordPress
7
  Author: Automattic, Inc.
8
  Author URL: http://automattic.com/
9
+ Version: 2.0.2
10
  */
11
 
12
  // You can hardcode your PollDaddy PartnerGUID (API Key) here
34
  global $current_user;
35
  $this->errors = new WP_Error;
36
  $this->scheme = 'https';
37
+ $this->version = '2.0.2';
38
  $this->multiple_accounts = true;
39
  $this->polldaddy_client_class = 'api_client';
40
  $this->polldaddy_clients = array();
317
 
318
  function set_api_user_code() {
319
 
320
+ $this->user_code = get_option( 'pd-usercode-'.$this->id );
321
 
322
  if ( empty( $this->user_code ) ) {
323
  $polldaddy = $this->get_client( WP_POLLDADDY__PARTNERGUID );
326
  $this->user_code = $polldaddy->get_usercode( $this->id );
327
 
328
  if ( !empty( $this->user_code ) ) {
329
+ update_option( 'pd-usercode-'.$this->id, $this->user_code );
330
  }
331
  }
332
  }
454
  check_admin_referer( 'polldaddy-account' );
455
 
456
  $this->user_code = '';
457
+ update_option( 'pd-usercode-'.$this->id, '' );
458
 
459
  if ( $new_args = $this->management_page_load_signup() )
460
  $query_args = array_merge( $query_args, $new_args );
714
  if ( isset( $media[999999999] ) )
715
  $poll_data['mediaCode'] = esc_html( $media[999999999] );
716
 
717
+ if( isset( $GLOBALS['blog_id'] ) )
718
+ $poll_data['parentID'] = (int) $GLOBALS['blog_id'];
719
+
720
  $polldaddy->reset();
721
 
722
  $update_response = $polldaddy->update_poll( $poll, $poll_data );
 
723
  $this->parse_errors( $polldaddy );
724
 
725
  if ( !$update_response )
1182
  <h2 id="poll-list-header"><?php _e( 'Polldaddy Polls', 'polldaddy' ); ?></h2>
1183
  <?php
1184
  } else { ?>
1185
+ <h2 id="poll-list-header"><?php printf( __( 'Preview Poll <a href="%s" class="button add-new-h2">All Polls</a>', 'polldaddy' ), esc_url( add_query_arg( array( 'action' => 'polls', 'poll' => false, 'message' => false ) ) ) ); ?></h2>
1186
  <?php
1187
  }
1188
  endif;
1205
  case 'edit-poll' :
1206
  ?>
1207
 
1208
+ <h2 id="poll-list-header"><?php printf( __( 'Edit Poll <a href="%s" class="button add-new-h2">All Polls</a>', 'polldaddy' ), esc_url( add_query_arg( array( 'action' => 'polls', 'poll' => false, 'message' => false ) ) ) ); ?></h2>
1209
 
1210
  <?php
1211
 
1214
  case 'create-poll' :
1215
  ?>
1216
 
1217
+ <h2 id="poll-list-header"><?php printf( __( 'Add New Poll <a href="%s" class="button add-new-h2">All Polls</a>', 'polldaddy' ), esc_url( add_query_arg( array( 'action' => 'polls', 'poll' => false, 'message' => false ) ) ) ); ?></h2>
1218
 
1219
  <?php
1220
  $this->poll_edit_form();
1414
  <abbr title="<?php echo date( __( 'Y/m/d g:i:s A', 'polldaddy' ), $poll_time ); ?>"> <?php _e( 'created', 'polldaddy' ); ?> <?php echo date( __( 'M d, Y', 'polldaddy' ), $poll_time ); ?></abbr>
1415
 
1416
  <div class="row-actions">
1417
+ <span class="edit"><a href="<?php echo $edit_link; ?>"><?php _e( 'Edit', 'polldaddy' ); ?></a></span><span> | </span> <?php } else { ?>
 
1418
  <strong><?php echo esc_html( $poll->___content ); ?></strong>
1419
  <div class="row-actions">
1420
 
1421
  <?php } ?>
1422
 
1423
  <?php if ( !isset( $_GET['iframe'] ) ):?>
1424
+ <span class="shortcode"><a href="javascript:void(0);" class="polldaddy-show-shortcode"><?php _e( 'Embed &amp; Link', 'polldaddy' ); ?></a></span>
1425
  <?php else: ?>
1426
  <input type="hidden" class="polldaddy-poll-id" value="<?php echo $poll_id; ?>" />
1427
+ <span><a href="javascript:void(0);" class="polldaddy-send-to-editor"><?php _e( 'Embed in Post', 'polldaddy' ); ?></a></span>
1428
  <?php endif; ?>
1429
 
1430
 
1431
  <?php
1432
  if ( $poll_closed == 2 ) {
1433
  if ( $open_link ) { ?>
1434
+ <span> | </span><span class="open"><a class="open-poll" href="<?php echo $open_link; ?>"><?php _e( 'Open', 'polldaddy' ); ?></a></span>
1435
  <?php } } else {
1436
  if ( $close_link ) { ?>
1437
+ <span> | </span><span class="close"><a class="close-poll" href="<?php echo $close_link; ?>"><?php _e( 'Close', 'polldaddy' ); ?></a></span>
1438
  <?php } }
1439
  if ( !isset( $_GET['iframe'] ) ): ?>
1440
+ <span> | </span><span class="view"><a class="thickbox" href="<?php echo $preview_link; ?>"><?php _e( 'Preview', 'polldaddy' ); ?></a></span>
1441
  <?php else: ?>
1442
+ <span> | </span><span class="view"><a href="<?php echo $preview_link; ?>"><?php _e( 'Preview', 'polldaddy' ); ?></a></span>
1443
  <?php endif;
1444
  if ( $delete_link ) { ?>
1445
+ <span> | </span><span class="delete"><a class="delete-poll delete" href="<?php echo $delete_link; ?>"><?php _e( 'Delete', 'polldaddy' ); ?></a></span>
1446
  <?php }
1447
  if ( $poll->_responses > 0 ):?>
1448
+ <span> | </span><span class="results"><a href="<?php echo $results_link; ?>"><?php _e( 'Results', 'polldaddy' ); ?></a></span>
1449
+ <?php endif; ?>
 
 
 
 
 
1450
  <?php $this->poll_table_add_option( $poll_id ); ?>
1451
  </div>
1452
  </td>
1477
 
1478
 
1479
  <h4 style="padding-top:10px;color:#666;font-weight:normal;"><?php _e( 'JavaScript', 'polldaddy' ); ?></h4>
1480
+ <pre class="hardbreak" style="max-width:542px;text-wrap:word-wrap;margin-bottom:20px;">&lt;script type="text/javascript" language="javascript"
1481
  src="http://static.polldaddy.com/p/<?php echo (int) $poll_id; ?>.js"&gt;&lt;/script&gt;
1482
  &lt;noscript&gt;
1483
  &lt;a href="http://polldaddy.com/poll/<?php echo (int) $poll_id; ?>/"&gt;<?php echo trim( strip_tags( $poll->___content ) ); ?>&lt;/a&gt;&lt;br/&gt;
4858
  return true;
4859
 
4860
  //check to see if poll owner is a member of this blog
4861
+ if ( function_exists( 'get_users' ) ) {
4862
+ $user = get_users( array( 'include' => $poll->_owner ) );
4863
+
4864
+ if ( empty( $user ) )
4865
+ return false;
4866
+ }
4867
 
4868
  return (bool) current_user_can( 'edit_others_posts' );
4869
  }
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: eoigal, alternatekev, mdawaffe
3
  Tags: polls, poll, polldaddy, wppolls, vote, polling, surveys, rate, rating, ratings
4
  Requires at least: 2.6
5
  Tested up to: 3.1.3
6
- Stable tag: 2.0.1
7
 
8
  Create and manage Polldaddy polls and ratings from within WordPress.
9
 
@@ -25,7 +25,7 @@ Polldaddy Polls is localizable and currently available in:
25
  * Khmer
26
  * Tegulu
27
 
28
- Want to help translate the plugin or keep an existing translation uptodate? Head on over to http://translate.wordpress.com/projects/polldaddy/plugin
29
 
30
  == Installation ==
31
 
@@ -67,6 +67,12 @@ More info here - http://codex.wordpress.org/Theme_Development#Plugin_API_Hooks
67
  You need to select the synchronize ratings account in the Options menu to make sure the ratings API key is valid.
68
 
69
  == Change Log ==
 
 
 
 
 
 
70
  = 2.0.1 =
71
  * Fixed bug in selecting custom styles in poll editor for webkit browsers
72
 
3
  Tags: polls, poll, polldaddy, wppolls, vote, polling, surveys, rate, rating, ratings
4
  Requires at least: 2.6
5
  Tested up to: 3.1.3
6
+ Stable tag: 2.0.2
7
 
8
  Create and manage Polldaddy polls and ratings from within WordPress.
9
 
25
  * Khmer
26
  * Tegulu
27
 
28
+ Want to help translate the plugin or keep an existing translation up-to-date? Head on over to http://translate.wordpress.com/projects/polldaddy/plugin
29
 
30
  == Installation ==
31
 
67
  You need to select the synchronize ratings account in the Options menu to make sure the ratings API key is valid.
68
 
69
  == Change Log ==
70
+ = 2.0.2 =
71
+ * Added support to the shortcode for alignment. Usage: [polldaddy poll=xxxxxx align=right|left]
72
+ * Fixed layout issues in Firefox 4 on embed interface
73
+ * Fixed extraneous dividers bug
74
+ * Changed nav menu icon to sprite to fix hover flash bug
75
+
76
  = 2.0.1 =
77
  * Fixed bug in selecting custom styles in poll editor for webkit browsers
78