';
@@ -420,7 +426,7 @@ function theme_pollfield_formatter_block
$node_link=l($node_title,"node/".$nid);
$out .= '
'. $node_link .'
';
}
-
+
$out .= $form;
$permission='view pollfield results '. $field_name;
if (user_access($permission)) {
@@ -460,41 +466,43 @@ function theme_pollfield_formatter_resul
$is_results_allow=$poll_features['ResultsAllow'];
//********* aggragate translation votes ****************
$tnid=db_result(db_query("SELECT tnid FROM {node} WHERE nid = %d",$node->nid));
- $t_nodes_results=db_query("SELECT nid FROM {node} WHERE tnid = %d",$tnid);
-
- while ($t_nodes = db_fetch_object($t_nodes_results)) {
-
- if ($node->nid<>$t_nodes->nid){
- $t_nodes_nid[]=$t_nodes->nid;
- //find start value choices
- //get table name
- $fields = content_fields();
- $db_info = content_database_info($fields[$field_name]);
- $table_content = $db_info['table'];
- $column_choice = $field_name ."_choice";
- $column_question = $field_name ."_question";
- $column = 'delta';
- $is_delta_exist = db_column_exists($table_content, $column);
- if ($is_delta_exist) {
- //get choices
- $choices_start_unser = db_result(db_query("SELECT %s FROM {%s} WHERE nid=%d AND delta=%d", $column_choice, $table_content,$t_nodes->nid, $field_name_delta));
+ // $tnid is 0 for untranslated nodes. We don't want to aggregate all those.
+ if ($tnid) {
+ $t_nodes_results=db_query("SELECT nid FROM {node} WHERE tnid = %d",$tnid);
+
+ while ($t_nodes = db_fetch_object($t_nodes_results)) {
+
+ if ($node->nid<>$t_nodes->nid){
+ $t_nodes_nid[]=$t_nodes->nid;
+ //find start value choices
+ //get table name
+ $fields = content_fields();
+ $db_info = content_database_info($fields[$field_name]);
+ $table_content = $db_info['table'];
+ $column_choice = $field_name ."_choice";
+ $column_question = $field_name ."_question";
+ $column = 'delta';
+ $is_delta_exist = db_column_exists($table_content, $column);
+ if ($is_delta_exist) {
+ //get choices
+ $choices_start_unser = db_result(db_query("SELECT %s FROM {%s} WHERE nid=%d AND delta=%d", $column_choice, $table_content,$t_nodes->nid, $field_name_delta));
- }
- else {
- //get choices
- $choices_start_unser = db_result(db_query("SELECT %s FROM {%s} WHERE nid=%d", $column_choice, $table_content, $t_nodes->nid));
- }
- $choices_start=unserialize($choices_start_unser);
- if (is_array($choices_start)){
- foreach($choices_start as $value){
- $count_translate_votes[]=$value['votes'];
- }
- }
- }
+ }
+ else {
+ //get choices
+ $choices_start_unser = db_result(db_query("SELECT %s FROM {%s} WHERE nid=%d", $column_choice, $table_content, $t_nodes->nid));
+ }
+ $choices_start=unserialize($choices_start_unser);
+ if (is_array($choices_start)){
+ foreach($choices_start as $value){
+ $count_translate_votes[]=$value['votes'];
+ }
+ }
+ }
+
+ }
+ }//end - if tnid
- }
-
-
//************* end of aggregate translated votes ********************
@@ -506,14 +514,14 @@ function theme_pollfield_formatter_resul
$show_form = TRUE;
$choices_array[] = check_plain($choice['choice']);
$count_node = db_result(db_query("SELECT count(*) FROM {pollfield_votes} WHERE nid = %d AND delta=%d
- AND field_table='%s' AND field_name='%s' AND field_name_delta=%d",$node->nid, $delta, $type, $field, $field_name_delta));
+ AND field_table='%s' AND field_name='%s' AND field_name_delta=%d",$node->nid, $delta, $type, $field, $field_name_delta));
$count_translate=0;
foreach($t_nodes_nid as $tnode){
-
+
$count_temp = db_result(db_query("SELECT count(*) FROM {pollfield_votes} WHERE nid= %d AND delta=%d
AND field_table='%s' AND field_name='%s' AND field_name_delta=%d",
$tnode,$node->nid, $delta, $type, $field, $field_name_delta));
- $count_translate=$count_translate+$count_temp;
+ $count_translate=$count_translate+$count_temp;
}
$count=$count_node+$count_translate;
$votes[] = $count+$choice['votes']+$count_translate_votes[$delta];
@@ -521,7 +529,7 @@ function theme_pollfield_formatter_resul
}
}
}
-
+
//geting results
$i=0;
$poll_result='
';
@@ -532,7 +540,7 @@ function theme_pollfield_formatter_resul
//$votes[$i]=$percent;
//$percent_string = $percent .'% ('.format_plural($votes[$i],'1 vote','@count votes').')';
$percent_string = $percent .'% ('.format_plural($votes[$i],'1 vote','@count votes').')';
-
+
//check user voted
$is_this_user_vote = FALSE;
if (is_array($user_votes)) {
@@ -559,9 +567,9 @@ function theme_pollfield_formatter_resul
}
$poll_result .= "
";
-
+
if ($show_form) {
-
+
$form = pollfield_build_voting_form($element);
$out = '
';
@@ -757,7 +765,7 @@ function theme_user_vote($node, $comment
$column_question = $key ."_question";
$column = 'delta';
$is_delta_exist = db_column_exists($table_content, $column);
- $poll_result = db_query("SELECT * FROM {%s} INNER JOIN `node` ON {%s}.nid = node.nid WHERE {%s}.nid = %d AND {%s}.vid = node.vid",
+ $poll_result = db_query("SELECT * FROM {%s} INNER JOIN `node` ON {%s}.nid = node.nid WHERE {%s}.nid = %d AND {%s}.vid = node.vid",
$table_content, $table_content, $table_content, $node->nid, $table_content);
while ($pollfield = db_fetch_object($poll_result)) {
@@ -776,13 +784,13 @@ function theme_user_vote($node, $comment
$node->nid, $field_name_delta, $node->type, $key, $comment->uid));
//get user vote
-
+
$user_choice_result = db_query("SELECT delta FROM {pollfield_votes} WHERE nid = %d AND field_name_delta=%d
AND field_table='%s' AND field_name='%s' AND uid=%d",
$node->nid, $field_name_delta, $node->type, $key, $comment->uid);
while ($user_choice = db_fetch_object($user_choice_result)) {
-
-
+
+
$user_choice_response=$choices[$user_choice->delta]['choice'];
if ($is_vote>0) {
@@ -857,7 +865,7 @@ function pollfield_voting_form($element)
$form['table'] = array('#type' => 'hidden', '#value' => $table);
$form['cancel'] = array('#type' => 'hidden', '#value' => $cancel);
$form['#type'] = 'form';
-
+
}
}
else{
@@ -873,7 +881,7 @@ function pollfield_voting_form($element)
$form['table'] = array('#type' => 'hidden', '#value' => $table);
$form['cancel'] = array('#type' => 'hidden', '#value' => $cancel);
$form['#type'] = 'form';
-
+
}
}
}
@@ -908,7 +916,7 @@ function pollfield_voting_form($element)
}
-
+
$cancel = 0;
$form['field_name_delta'] = array('#type' => 'hidden', '#value' => $field_name_delta);
$form['field_name'] = array('#type' => 'hidden', '#value' => $field_name);
@@ -930,7 +938,7 @@ function pollfield_voting_form($element)
$is_active=$pollfield->active;
}
if ($is_active==1) {
-
+
return $form;
}
@@ -941,14 +949,14 @@ function pollfield_voting_form($element)
*build form function
*/
function pollfield_build_voting_form($element){
-
+
return drupal_get_form('pollfield_voting_function_form',$element);
}
/**
*form function
*/
function pollfield_voting_function_form(&$form_sate,$element){
-
+
$form_1 = pollfield_voting_form($element);
return $form_1;
}
@@ -956,9 +964,9 @@ function pollfield_voting_function_form(
*submit function for voting form
*/
function pollfield_voting_function_form_submit(&$form_values,$element){
-
+
pollfield_vote();
-
+
}
/**
* Implementation of hook_field_info().
@@ -1077,7 +1085,7 @@ function pollfield_field($op, &$node, $f
db_query("DELETE FROM {pollfield_votes} WHERE nid = %d
AND field_table='%s' AND field_name='%s' AND field_name_delta=%d", $node->nid, $field_table, $field_name,$key);
}
-
+
// get total votes
$total_votes = $total_votes+db_result(db_query("SELECT count(*) FROM {pollfield_votes} WHERE nid = %d
AND field_table='%s' AND field_name='%s'", $node->nid, $field_table, $field_name));
@@ -1166,7 +1174,7 @@ function pollfield_field_formatter_info(
'field types' => array('pollfield'),
'multiple values' => CONTENT_HANDLE_CORE,
),
-
+
'choices' => array(
'label' => 'All choices',
'field types' => array('pollfield'),
@@ -1230,7 +1238,7 @@ function pollfield_pollfield_process($el
$access= true;
}
//*********************************
-
+
$field = $cols[0];
$element[$field] = array(
'#type' => 'textfield',
@@ -1286,14 +1294,14 @@ function pollfield_pollfield_process($el
$cancel_vote_allow = $poll_features['CancelVote_Allow'];
$result_allow = $poll_features['ResultsAllow'];
$poll_type = $poll_features['PollType'];
-
+
}
// we are on default value mode and we use default mode value
else{
$cancel_vote_allow = $element['#value'][$cols[6]]['CancelVote_Allow'];
$result_allow = $element['#value'][$cols[6]]['ResultsAllow'];
$poll_type = $element['#value'][$cols[6]]['PollType'];// add poll type
-
+
}
// allow or disallow cancel voting
@@ -1349,7 +1357,7 @@ function pollfield_pollfield_process($el
$wrapper="pollfield-choice-wrapper-".$type_name."-".$field_name."-".$delta;
//**********************************************************************
-
+
$answers = unserialize($element['#value']['choice']);
@@ -1357,9 +1365,9 @@ function pollfield_pollfield_process($el
if ($value_choice) {
//$max = max($blank_fields, intval(sizeof($answers)-1));
$max=intval(sizeof($answers)-1);
-
+
}
- else {//default
+ else {//default
if (isset($element['#value']['group'])) {
// choices is not serialzed in default value settings
$value_choice = $element['#value']['group'][$delta]['choice'];
@@ -1367,7 +1375,7 @@ function pollfield_pollfield_process($el
//$max = max($blank_fields, intval(sizeof($value_choice)-1));
$max=intval(sizeof($element['#value']['group'])-1);
}
- }
+ }
//not using ahah for default values
if ($is_default_values){
$max = max($blank_fields, intval(sizeof($value_choice)-1));
@@ -1378,19 +1386,19 @@ function pollfield_pollfield_process($el
$max = 0;
$no_fields=TRUE;
}
-
+
}
-
+
// Container for just the poll choices.
$element['group'] = array(
'#prefix' => '
',
'#suffix' => '
',
);
-
+
$nid=$form_state['values']['nid'];$max_number=0;
-
+
foreach (range(0, $max+$max_number) as $delta) {
-
+
$value_choice = $answers[$delta]['choice'];
$value_vote = $answers[$delta]['votes'];
if ($value_choice) {
@@ -1402,11 +1410,11 @@ function pollfield_pollfield_process($el
$value_vote = $element['#value']['group'][$delta]['votes'];
}
}
-
+
$first_empty=FALSE;
if ($delta==0 && $first_empty=strlen($value_choice)<1)
$first_empty=TRUE;
-
+
if (strlen($value_choice)>1 || $no_fields || $is_default_values || $first_empty){
$element['group'][$delta] = array(
'#type' => 'fieldset',
@@ -1431,7 +1439,7 @@ function pollfield_pollfield_process($el
$number++;
}
}
-
+
//check if more choice button submit
if (strcmp($form_state['clicked_button']['#name'],$nid."-".$path)==0){
if (strlen($element['group'][$number-1]['choice'])>1){
@@ -1458,7 +1466,7 @@ function pollfield_pollfield_process($el
$number++;
}
else{
-
+
}
}
if (!$is_default_values){
@@ -1492,19 +1500,19 @@ function pollfield_delete_votes($form,&$
*add more choices using ahah formu
*/
function pollfield_add_choice(){
-
+
$splits_get=$nid_parse=preg_split('/\//',$_GET['q']);
$field_name=$splits_get[3];
$field_name_delta=$splits_get[4];
-
+
include_once 'modules/node/node.pages.inc';
$form_state = array('storage' => NULL, 'submitted' => FALSE);
$form_build_id = $_POST['form_build_id'];
// Get the form from the cache.
$form = form_get_cache($form_build_id, $form_state);
$args = $form['#parameters'];
-
-
+
+
$form_id = array_shift($args);
// We will run some of the submit handlers so we need to disable redirecting.
$form['#redirect'] = FALSE;
@@ -1528,7 +1536,7 @@ function pollfield_add_choice(){
}
$is_choice_set=strlen($form_choices[$delta-1]['choice']['#value'])>1;
}
-
+
$_delta=$delta-1;
//genereting new ids and names
@@ -1540,7 +1548,7 @@ function pollfield_add_choice(){
$id_choice=str_replace($_delta.'-choice',$delta.'-choice',$id_choice);
$name_votes=str_replace('['.$_delta.'][votes]','['.$delta.'][votes]',$name_votes);
$id_votes=str_replace($_delta.'-votes',$delta.'-votes',$id_votes);
-
+
if ($is_choice_set){
$element = array(
'#type' => 'fieldset',
@@ -1566,16 +1574,16 @@ function pollfield_add_choice(){
'#size' => 10,
'#weight' => floatval($field1['widget']['weight'] + ($delta / 10) + .1),
);
-
-
+
+
$form_choices[$delta]=$element;
}
-
+
unset($form_choices['#prefix'], $form_choices['#suffix']); // Prevent duplicate wrappers.
$output = drupal_render($form_choices);
-
+
drupal_json(array('status' => TRUE, 'data' => $output));
-
+
}
/*
@@ -1584,7 +1592,7 @@ function pollfield_add_choice(){
function pollfield_more_choices_submit($form, &$form_state){
// Set the form to rebuild and run submit handlers.
node_form_submit_build_node($form, $form_state);
-
+
}
/**
@@ -1769,7 +1777,7 @@ function pollfield_save_single_choice($f
// is user voted
$voted = pollfield_user_voted($node, $field_table, $field_name, $field_name_delta);
-
+
if (!isset($choice)){
drupal_set_message(t('Choice is not selected. Select your answer and vote.'));
return 0;
@@ -1835,7 +1843,7 @@ function pollfield_cancel_single_choice(
$t_nodes_results=db_query("SELECT nid FROM {node} WHERE tnid = %d",$tnid);
}
while ($t_nodes = db_fetch_object($t_nodes_results)) {//check all translations
-
+
if ($is_delta_exist) {
$field_votes = $field_name .'_votes';
$total_votes = db_result(db_query("SELECT %s FROM {%s} WHERE nid=%d AND delta=%d", $field_votes, $table_content, $t_nodes->nid, $field_name_delta));
@@ -1892,7 +1900,7 @@ function pollfield_vote() {
$field_table = $form_values['table'];
$cancel = $form_values['cancel'];
$node = node_load($nid);
-
+
// set add cookie**************************
$cookie = pollfield_cookie_id_generator();
if ($cookie != 0) {
@@ -1947,7 +1955,7 @@ function pollfield_vote() {
$query=$_GET['q'];
if (isset($_GET['page']))
$page='page='.$_GET['page'];
-
+
drupal_goto($query,$page,'pollfield-'.$nid.'-'.$field_name_delta);
pollfield_clear($node);
@@ -2017,7 +2025,7 @@ function pollfield_user_voted($node, $fi
$table_content = $db_info['table'];
$column = 'delta';
$is_delta_exist = db_column_exists($table_content, $column);
-
+
$tnid = db_result(db_query("SELECT tnid FROM {node} WHERE nid=%d",$nid));
if ($tnid==0){//there is no translation
$t_nodes_results=db_query("SELECT nid FROM {node} WHERE nid = %d",$nid);
@@ -2074,7 +2082,7 @@ function pollfield_user_voted($node, $fi
}
-
+
return $is_voted;
}
/**
@@ -2082,7 +2090,7 @@ function pollfield_user_voted($node, $fi
*/
function pollfield_user_votes($node, $field_table, $field_name, $field_name_delta) {
global $user;
-
+
$nid = $node->nid;
$uid = $user->uid;
$hostname = $_SERVER['REMOTE_ADDR'];
@@ -2100,7 +2108,7 @@ function pollfield_user_votes($node, $fi
}else{//there is translation
$t_nodes_results=db_query("SELECT nid FROM {node} WHERE tnid = %d",$tnid);
}
-
+
while ($t_nodes = db_fetch_object($t_nodes_results)) {//check all translations
$t_nid=$t_nodes->nid;
if ($is_delta_exist) {
@@ -2181,7 +2189,3 @@ function pollfield_views_query_substitut
}
return $replace;
}
-
-
-
-