Changeset 285

Timestamp:

02/26/08 09:51:06 (11 months ago)

Author:

aarkerio

Message:

tuesday 26 update

Location:

trunk/app

Files:

• app_controller.php (modified) (2 diffs)
• controllers/pollrows_controller.php (modified) (2 diffs)
• models/pollrow.php (modified) (1 diff)

trunk/app/app_controller.php

@@ -8 +8 @@
 class AppController extends Controller {
 
- public $components = array('Auth', 'Cookie');
+ public $components = array('Auth', 'Cookie', 'Security');
 
  public $helpers = array('Html', 'Form', 'Session');
@@ -20 +20 @@
      $this->Auth->loginError = 'Invalid e-mail / password combination. Please try again';
      $this->Auth->authorize = 'controller';  
-     $this->Auth->allow( array('view', 'display', 'subscribe', 'recover', 'register', 'insert') );
+     $this->Auth->allow( array('view', 'display', 'subscribe', 'recover', 'register', 'insert', 'vote') );
 
      $this->set('cU', $this->Auth->user());  // $cU current user array to use in the views if user logged

trunk/app/controllers/pollrows_controller.php

@@ -10 +10 @@
   public $helpers       = array('Ajax');
 
-  public function beforeFiler()
-  {
-    $this->Auth->allow('vote');
-    parent::beforeFilter();
-  }  
   public function isAuthorized()
   {
@@ -29 +24 @@
  public function vote() 
  {
-    $this->layout = 'ajax';
+   $this->layout = 'ajax';
     
-    // adds new vote to database
-    if (!empty($this->data))
-    {  
-           //die(print_r($this->data));
+   // adds new vote to database
+   if (!empty($this->data['Pollrow']))
+   {  
+     //die(print_r($this->data));
            
-           $vote  = $this->Pollrow->field('vote', array("Pollrow.id" => $this->data['Pollrow']['id']));
+      $vote  = $this->Pollrow->field('vote', array("Pollrow.id" => $this->data['Pollrow']['id'])); //
            
-           $vote += 1;
-           //exit("votos " . $vote);
-           $this->data['Pollrow']['vote'] = $vote;  // add vote
-              
-           if ( $this->Pollrow->save( $this->data['Pollrow'] ) )  // add the Poll vote
-            {
-                    $this->Session->write('poll',  $this->data['Pollrow']['poll_id']); //set session, only one vote per session
+      $vote += 1;
+      //exit("votes " . $vote);
+      $this->data['Pollrow']['vote'] = $vote;  // add vote
+             
+      if ( $this->Pollrow->save( $this->data['Pollrow'] ) )  // add the Poll vote
+      {
+           $this->Session->write('poll',  $this->data['Pollrow']['poll_id']); //set session, only one vote per session
                     
-                    $conditions = array("Pollrow.poll_id" => $this->data['Pollrow']['poll_id']);
-                    $fields     = array("Pollrow.answer", "Pollrow.color", "Pollrow.vote", "Pollrow.poll_id", "Poll.id", "Poll.question");
-                    $order      = "Pollrow.id";
+           $conditions = array("Pollrow.poll_id" => $this->data['Pollrow']['poll_id']);
+
+           $fields     = array("Pollrow.answer", "Pollrow.color", "Pollrow.vote", "Pollrow.poll_id", "Poll.id", "Poll.question");
                     
-                    $this->set('poll', $this->Pollrow->findAll($conditions, $fields, $order));
+           $this->set('poll', $this->Pollrow->find($conditions, $fields));
                     
-                    $this->render('results', 'ajax');
-            }
-            else
-            {
-                  echo "Ajax error, check with the company's computer guy...";
-            }
-       }
-  }
+           $this->render('results', 'ajax');
+      }
+      else
+      {
+        echo "Ajax error, check with the company's computer guy...";
+      }
+   }
+ }
   
-  public function admin_add() {
+ public function admin_add() 
+ {
          // adds new pollrow to database
-    if (!empty($this->data))
+    if (!empty($this->data['Pollrow']))
     {
         if ($this->Pollrow->save($this->data))   //save the Poll vote

trunk/app/models/pollrow.php

@@ -11 +11 @@
   public $name      = 'Pollrow';
   
-  public $belongsTo = array('Poll' =>
-                           array('className'  => 'Poll'
+  /* public $belongsTo = array('Poll' =>
+                array(
+                                  'className'  => 'Poll', 
+                                  'foreignKey' => 'poll_id'
                            )
-                     );
+                     ); */
 }
 ?>