Changeset 2146 for plugins/pollsFactory/inc

Timestamp:

03/30/10 02:37:23 (13 years ago)

Author:

JcDenis

Message:

pollsFactory 1.1:

• Fixed order of queries and selections
• Fixed admin posts list actions
• Fixed adding polls from new post
• Fixed pgSQL bugs

Location:

plugins/pollsFactory/inc

Files:

• class.pollsfactory.php (modified) (3 diffs)
• class.postoption.php (modified) (2 diffs)
• index.polls.php (modified) (1 diff)
• index.result.php (modified) (2 diffs)

plugins/pollsFactory/inc/class.pollsfactory.php

@@ -47 +47 @@
           if($ident > 0)
           {
-               $params['option_type'] = 'pollsresponse';
-               $params['post_id'] = $poll_id;
-               $params['option_title'] = $this->con->escape(http::realIP());
-
-               $rs = $this->getOptions($params);
+               $rs = $this->con->select(
+                    'SELECT option_id '.
+                    'FROM '.$this->table.' '.
+                    'WHERE post_id = '.$poll_id.' '.
+                    "AND option_title = '".$this->con->escape(http::realIP())."' ".
+                    "AND option_type = 'pollsresponse' ".
+                    $this->con->limit(1)
+               );
 
                if (!$rs->isEmpty()) $chk = true;
@@ -76 +79 @@
                "AND option_type = 'pollsresponse' ".
                'GROUP BY option_title, post_id '.
-               'ORDER BY option_upddt DESC '.
+               'ORDER BY option_title DESC '.
                $q
           );
@@ -84 +87 @@
      public function countVotes($poll_id)
      {
-          $params['option_type'] = 'pollsresponse';
-          $params['post_id'] = (integer) $poll_id;
-          $params['group'] = 'option_title';
+          $poll_id = (integer) $poll_id;
 
-          $rs = $this->getOptions($params);
-          
-          return $rs->count();
+          return $this->con->select(
+               'SELECT option_title '.
+               'FROM '.$this->table.' '.
+               'WHERE post_id = '.$poll_id.' '.
+               "AND option_type = 'pollsresponse' ".
+               'GROUP BY option_title '
+          )->count();
      }
 

plugins/pollsFactory/inc/class.postoption.php

@@ -110 +110 @@
      public function getOptions($params=array(),$count_only=false)
      {
-          // This limit field to only one and group results on this field.
-          $group = array();
-          if (!empty($params['group'])) {
-               if (is_array($params['group'])) {
-                    foreach($params['group'] as $k => $v) {
-                         $group[] = $this->con->escape($v);
-                    }
-               }
-               else {
-                    $group[] = $this->con->escape($params['group']);
-               }
-          }
-
           if ($count_only) {
-               if (!empty($group)) {
-                    $q = 'SELECT count('.$group[0].') ';
-               }
-               else {
-                    $q = 'SELECT count(O.option_id) ';
-               }
+               $q = 'SELECT count(O.option_id) ';
           }
           else {
-               if (!empty($group)) {
-                    $q = 'SELECT '.implode(', ',$group).' ';
-               }
-               else {
-                    $q = 'SELECT O.option_id, O.post_id, O.option_meta, ';
-
-                    if (!empty($params['columns']) && is_array($params['columns'])) {
-                         $q .= implode(', ',$params['columns']).', ';
-                    }
-                    $q .= 
-                    'O.option_creadt, O.option_upddt, O.option_type, O.option_format, '.
-                    'O.option_title, O.option_content, O.option_content_xhtml, '.
-                    'O.option_selected, O.option_position, '.
-                    'P.blog_id, P.post_type, P.post_title ';
-               }
+               $q = 'SELECT O.option_id, O.post_id, O.option_meta, ';
+
+               if (!empty($params['columns']) && is_array($params['columns'])) {
+                    $q .= implode(', ',$params['columns']).', ';
+               }
+               $q .= 
+               'O.option_creadt, O.option_upddt, O.option_type, O.option_format, '.
+               'O.option_title, O.option_content, O.option_content_xhtml, '.
+               'O.option_selected, O.option_position, '.
+               'P.blog_id, P.post_type, P.post_title ';
           }
 
@@ -212 +189 @@
                $q .= $params['sql'].' ';
           }
-          # group
-          if (!empty($group)) {
-               if (!$count_only) {
-                    $q .= 'GROUP BY '.implode(', ',$group).' ';
-               }
-               else {
-                    $q .= 'GROUP BY '.$group[0].' ';
-               }
-          }
           # order
           if (!$count_only) {

plugins/pollsFactory/inc/index.polls.php

@@ -451 +451 @@
 );
 
-echo dcPage::helpBlock('pollsFactory').$footer.'</body></html>';
+dcPage::helpBlock('pollsFactory');
+echo $footer.'</body></html>';
 ?>

plugins/pollsFactory/inc/index.result.php

@@ -199 +199 @@
           $queries_params['option_type'] = 'pollsquery';
           $queries_params['post_id'] = $poll_id;
+          $queries_params['order'] = 'option_position ASC';
           $queries = $factory->getOptions($queries_params);
           if (!$queries->isEmpty()) {
@@ -307 +308 @@
      $queries_params['option_type'] = 'pollsquery';
      $queries_params['post_id'] = $poll_id;
+     $queries_params['order'] = 'option_position ASC';
      $queries = $factory->getOptions($queries_params);