Changeset 747 for trunk/app

Timestamp:

09/01/08 22:38:27 (3 months ago)

Author:

aarkerio

Message:

Little Bugs fixed

Location:

trunk/app

Files:

• controllers/treasures_controller.php (modified) (1 diff)
• locale/spa/LC_MESSAGES/default.po (modified) (1 diff)
• views/treasures/admin_edit.ctp (modified) (2 diffs)

trunk/app/controllers/treasures_controller.php

@@ -30 +30 @@
  public function chksw()
  {
-   $this->layout    = 'ajax';
-
-   if ( !empty($this->data['ResultTreasure']) ):
-      $this->Sanitize = new Sanitize;
-           
-      $this->Sanitize->clean($this->data['ResultTreasure']);
-
-      $secret = $this->Treasure->field('secret', array('status'=>1,'id'=>$this->data['ResultTreasure']['treasure_id']));
+  $this->layout    = 'ajax';
+
+  if ( !empty($this->data['ResultTreasure']) ):
+    $this->Sanitize = new Sanitize;
+    $this->Sanitize->clean($this->data['ResultTreasure']);
+    $conditions = array('ResultTreasure.treasure_id'=>$this->data['ResultTreasure']['treasure_id'],'ResultTreasure.user_id'=>$this->Auth->user('id'));
+    $answer = $this->Treasure->ResultTreasure->field('id', $conditions);
+
+    if ($answer != false):
+       $this->set('msg', __('You already answered this Scavenger Hunt', true));
+       $this->render('chksw', 'ajax');
+       return false;
+    endif;
+
+    $secret = $this->Treasure->field('secret', array('status'=>1,'id'=>$this->data['ResultTreasure']['treasure_id']));
                  
-      if ( $this->data['ResultTreasure']['secret'] ==  $secret ):
+    if ( $this->data['ResultTreasure']['secret'] ==  $secret ):
         $this->data['ResultTreasure']['user_id'] = $this->Auth->user('id');
-      
     $this->Treasure->ResultTreasure->save($this->data['ResultTreasure']);
-
         $this->set('msg', 'Cool!, the '. $this->data['ResultTreasure']['points'] .' points are yours');
         $this->render('chksw', 'ajax');
      
-      else:
-          $this->set('msg', 'Sorry, word is incorrect');
-      $this->render('chksw', 'ajax');
-      endif; 
+    else:
+        $this->set('msg', __('Sorry, code is incorrect', true));
+    $this->render('chksw', 'ajax');
+    endif; 
    endif;
  }

trunk/app/locale/spa/LC_MESSAGES/default.po

@@ -4 +4 @@
 msgid  "Yes"
 msgstr "Si"
+
+msgid  "You already answered this Scavenger Hunt"
+msgstr "Ya has encontrado este tesoro"
 
 msgid  "Reports"

trunk/app/views/treasures/admin_edit.ctp

@@ -13 +13 @@
 </td><td>
   <?php
-    echo $form->label('Treasure.points', 'Points:'); 
+    echo $form->label('Treasure.points', __('Points', true)); 
     echo $form->select('Treasure.points', array(1=>1,2=>2,3=>3,4=>4,5=>5,6=>6,7=>7,8=>8,9=>9,10=>10)); 
   ?>
@@ -30 +30 @@
 
 <tr><td colspan="3">
-   <?php echo $form->input('Treasure.secret', array('size'=>15, 'maxlength'=>15, 'between'=>': ')); ?>
+   <?php echo $form->input('Treasure.secret', array('size'=>15, 'maxlength'=>15, 'between'=>': ', 'label'=>__('Code', true))); ?>
   </td>
 </tr>