Cast values.
authorGonçalo Queirós <mail@goncaloqueiros.net>
Mon, 3 Aug 2009 09:21:32 +0000 (11:21 +0200)
committerJan Schneider <jan@horde.org>
Mon, 3 Aug 2009 09:24:27 +0000 (11:24 +0200)
kronolith/ajax.php
nag/lib/Task.php

index d3f59f0..166bf8a 100644 (file)
@@ -9,6 +9,7 @@
  *
  * @author  Michael Slusarz <slusarz@horde.org>
  * @author  Jan Schneider <jan@horde.org>
+ * @author  Gonçalo Queirós <mail@goncaloqueiros.net>
  * @package Kronolith
  */
 
@@ -130,7 +131,7 @@ try {
         }
 
         $taskList = Horde_Util::getFormData('list');
-        $taskType = Horde_Util::getFormData('taskType');
+        $taskType = (int)Horde_Util::getFormData('taskType');
         $tasks = $registry->call('tasks/listTasks',
                                  array(null, null, null, $taskList, $taskType, true));
         if (is_a($tasks, 'PEAR_Error')) {
@@ -338,7 +339,7 @@ try {
             break;
         }
         $taskList = Horde_Util::getFormData('taskList');
-        $taskType = Horde_Util::getFormData('taskType');
+        $taskType = (int)Horde_Util::getFormData('taskType');
         $taskId = Horde_Util::getFormData('taskId');
         $saved = $registry->call('tasks/toggleCompletion',
                                  array($taskId, $taskList));
index 04d6723..42c1ed1 100644 (file)
@@ -667,7 +667,7 @@ class Nag_Task {
             //whitespace
             $json->sd = Horde_String::substr($this->desc, 0, 80);
         }
-        $json->cp = $this->completed;
+        $json->cp = (boolean)$this->completed;
         if ($this->due) {
             $date = new Horde_Date($this->due);
             $json->du = $date->toJson();
@@ -676,7 +676,7 @@ class Nag_Task {
             $date = new Horde_Date($this->start);
             $json->s = $date->toJson();
         }
-        $json->pr = $this->priority;
+        $json->pr = (int)$this->priority;
 
         if ($full) {
             // @todo: do we really need all this?
@@ -687,14 +687,17 @@ class Nag_Task {
             $json->o = $this->owner;
             $json->as = $this->assignee;
             $json->ct = $this->category;
-            $json->e =  $this->estimate;
+            if ($this->estimate) {
+                $date = new Horde_Date($this->estimate);
+                $json->e = $date->toJson();
+            }
             if ($this->completed_date) {
                 $date = new Horde_Date($this->completed_date);
                 $json->cd = $date->toJson();
             }
             $json->a = $this->alarm;
             $json->m = $this->methods;
-            $json->pv = $this->private;
+            $json->pv = (boolean)$this->private;
         }
 
         return $json;