Changeset 1204 for trunk/expressoCalendar/inc

Timestamp:

07/28/09 11:20:54 (15 years ago)

Author:

amuller

Message:

Ticket #88 - Adaptação pro expresso2.0

Location:

trunk/expressoCalendar/inc

Files:

• class.bocalendar.inc.php (modified) (1 diff)
• controller.php (modified) (1 diff)
• load_lang.php (modified) (1 diff)

trunk/expressoCalendar/inc/class.bocalendar.inc.php

@@ -103 +103 @@
         function insertEvent ($datetime, $edatetime, $title, $description, $location)
         {
-                //Discover the event id
-                $query = "SELECT max(cal_id) FROM phpgw_cal";
-                if (!$this->db->query($query))
-                        return false;
-
-                while($this->db->next_record())
-                        $id = $this->db->row();
-
                 // Performing SQL insert query
-                $query = "INSERT INTO phpgw_cal VALUES (".($id['max']+1).", '".$_SESSION['calendar']['user']['email']."', ".$this->user_id.", null, null, ".$datetime.", ".time().",".$edatetime.", 2, 'E', 0, '".$title."', '".$description."', '".$location."', 0, null)";
+                //FIXME LOCK the table sequence is desirable
+                $query = "INSERT INTO phpgw_cal VALUES (default, '".$_SESSION['calendar']['user']['email']."', ".$this->user_id.", null, null, ".$datetime.", ".time().",".$edatetime.", default, 'E', default, '".$title."', '".$description."', '".$location."', default, default)";
                 if ($this->db->query($query)){
-                        $query = "INSERT INTO phpgw_cal_user VALUES (".($id['max']+1).", ".$this->user_id.", 'A', 'u')";
+                        $query = "INSERT INTO phpgw_cal_user VALUES (currval('seq_phpgw_cal'::regclass), ".$this->user_id.", 'A', 'u')";
                         if ($this->db->query($query)){
                                 $return = "true ";

trunk/expressoCalendar/inc/controller.php

@@ -1 +1 @@
 <?php
+        if(!isset($GLOBALS['phpgw_info'])){
+                $GLOBALS['phpgw_info']['flags'] = array(
+                 'currentapp' => 'expressoCalendar',
+                 'nonavbar'   => true,
+                 'noheader'   => true
+                );
+        }
+        require_once '../../header.session.inc.php';
+
    //   Explode action from cExecuteForm function
    $cExecuteFormReturn = false;

trunk/expressoCalendar/inc/load_lang.php

@@ -1 +1 @@
 <?
+        if(!isset($GLOBALS['phpgw_info'])){
+                $GLOBALS['phpgw_info']['flags'] = array(
+                 'currentapp' => 'expressoCalendar',
+                 'nonavbar'   => true,
+                 'noheader'   => true
+                );
+        }
+        require_once '../../header.session.inc.php';
+
 // Load the lang of the module.
         if(!$_SESSION['phpgw_info']['expressoCalendar']['lang'])