Changeset 12314

Timestamp:

09/17/07 09:28:36 (1 year ago)

Author:

w_i

Message:

Finishing the missing features

Files:

• trunk/midcom/net.nemein.quickpoll/config/manifest.inc (modified) (2 diffs)
• trunk/midcom/net.nemein.quickpoll/handler/admin.php (modified) (1 diff)
• trunk/midcom/net.nemein.quickpoll/handler/index.php (modified) (3 diffs)
• trunk/midcom/net.nemein.quickpoll/style/index.php (modified) (1 diff)

trunk/midcom/net.nemein.quickpoll/config/manifest.inc

@@ -2 +2 @@
-  'name' => 'net.nemein.quickpoll',
-  'purecode' => false,
-1
+2
-  'state' => 'beta',
-  'privileges' => 
@@ -23 +23 @@
-        'role' => 'lead',
-      ),
+      'w_i' => 
+      array (
+        'name' => 'Jerry Jalava',
+        'email' => 'jerry.jalava@gmail.com',
+        'role' => 'developer',
+      ),
-    ),
-    'dependencies' => 

trunk/midcom/net.nemein.quickpoll/handler/admin.php

@@ -212 +212 @@
-
-            case 'cancel':
-.html
+
-                // This will exit.
-        }

trunk/midcom/net.nemein.quickpoll/handler/index.php

@@ -152 +152 @@
-        $qb_vote_count_total->add_constraint('article', '=', $this->_article->id);
-        $this->_vote_count = $qb_vote_count_total->count();
+
+        $qb_vote = net_nemein_quickpoll_vote_dba::new_query_builder();
+        $qb_vote->add_constraint('article', '=', $this->_article->id);
+        $qb_vote->begin_group('OR');
+            $qb_vote->add_constraint('user', '=', $_MIDGARD['user']);
+            $qb_vote->add_constraint('ip', '=', $_SERVER['REMOTE_ADDR']);
+        $qb_vote->end_group();
+        $vote_count = $qb_vote->count();
+
+        if ($vote_count > 0)
+        {
+            $this->_request_data['voted'] =  true;
+        }
+        else
+        {
+            $this->_request_data['voted'] =  false;
+        }
+        
+        if (   !$this->_config->get('enable_anonymous')
+            && (   !$_MIDCOM->auth->user
+                && !$_MIDCOM->auth->admin))
+        {
+            $this->_request_data['voted'] =  true;
+        }
-        
-        $this->_prepare_request_data();
@@ -230 +254 @@
-        $qb_vote = net_nemein_quickpoll_vote_dba::new_query_builder();
-        $qb_vote->add_constraint('article', '=', $this->_article->id);
-
-
+
+
+
+
-        $vote_count = $qb_vote->count();
-
+
-        if ($vote_count > 0)
-        {
@@ -243 +269 @@
-        }
-        
-
+
+
+
+
+
+
-        
-        return true;

trunk/midcom/net.nemein.quickpoll/style/index.php

@@ -50 +50 @@
-        {
-        ?>
-.html
+
-        &(view["options"]:h);
-        <br /><br /><input type="submit" value="&(submit_string);" />