- Timestamp:
- 09/22/08 16:44:30 (16 years ago)
- Location:
- trunk/calendar_new
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/calendar_new/inc/class.bocalendar.inc.php
r420 r457 53 53 // Performing SQL query 54 54 $query = "SELECT cal_id, title, description, datetime, edatetime FROM phpgw_cal where (owner = '".$this->user_id."') and ((datetime > ".$dayTime." and datetime < ".($dayTime+604800).") or (edatetime > ".$dayTime." and edatetime < ".($dayTime+604800)."))"; 55 if (!$this->db->query($query)) 56 return false; 57 58 while($this->db->next_record()) 59 $result[] = $this->db->row(); 60 61 return $result; 62 } 63 64 function requestDetailsEvent($id) { 65 // Performing SQL query 66 $query = "SELECT title, description, datetime, edatetime, groups, location FROM phpgw_cal where (owner = '".$this->user_id."') and (cal_id = ".$id.")"; 55 67 if (!$this->db->query($query)) 56 68 return false; -
trunk/calendar_new/inc/class.uicalendar.inc.php
r437 r457 23 23 $start = isset ($_REQUEST["start"]) ? $_REQUEST["start"] : NULL; 24 24 $end = isset ($_REQUEST["end"]) ? $_REQUEST["end"] : NULL; 25 $ description = isset ($_REQUEST["desc"]) ? $_REQUEST["desc"] : NULL;26 if ($start == NULL || $end == NULL || $ description== NULL)25 $title = isset ($_REQUEST["title"]) ? $_REQUEST["title"] : NULL; 26 if ($start == NULL || $end == NULL || $title == NULL) 27 27 return "false;Empty field"; 28 if (!eregi("^[a-zA-Z_.0-9-]*",$ description))28 if (!eregi("^[a-zA-Z_.0-9-]*",$title)) 29 29 return "false;Invalid char in description"; 30 30 if (!eregi("^[0-9]*",$start)) … … 33 33 return "false;Wrong formed text"; 34 34 35 return $this->db_obj->insertEvent($start, $end, $ description, $description);35 return $this->db_obj->insertEvent($start, $end, $title); 36 36 } 37 37 … … 66 66 67 67 $retorno = "<today>".date('Ydm',$dayViewTime)."</today>"; 68 include_once("class.bocalendar.inc.php");69 $obj = new bocalendar();70 68 71 $fromBo = $ obj->requestDayCal($dayViewTime);69 $fromBo = $this->db_obj->requestDayCal($dayViewTime); 72 70 73 71 … … 128 126 return $retorno; 129 127 } 128 129 function getDetails (){ 130 $eventId = isset ($_REQUEST["id"]) ? $_REQUEST["id"] : NULL; 131 $fromBo = $this->db_obj->requestDetailsEvent($eventId); 132 $_SESSION['debug'] = $fromBo; 133 foreach ($fromBo[0] as $field => $line) { 134 $buff .= "<".$field.">".$line."</".$field.">"; 135 } 136 return $buff; 137 } 138 130 139 function getViewMonth () { 131 140 $monthViewTime = isset ($_REQUEST["time"]) ? strtotime(substr($_REQUEST["time"],0,4)."-".substr($_REQUEST["time"],6,2)."-".substr($_REQUEST["time"],4,2)) : strtotime(date('Y-m-d', time())); -
trunk/calendar_new/index.php
r420 r457 46 46 echo "<link rel='stylesheet' href='templates/default/main.css' />" 47 47 ."<script language='JavaScript' type='text/javascript' src='js/globals.js'></script>" 48 ."<script language='JavaScript' type='text/javascript' src='js/xtools.js'></script>" 48 49 ."<script src='inc/load_lang.php?".$GLOBALS['phpgw_info']['flags']['update_version']."' type='text/javascript'></script>" 49 50 ."<script language='JavaScript' type='text/javascript' src='js/connector.js'></script>" -
trunk/calendar_new/js/common_functions.js
r437 r457 112 112 var showDetailLink = document.createElement('a'); 113 113 showDetailLink.id = "details_" + eventDiv.id; 114 showDetailLink.href = "javascript: alert('show details');";114 showDetailLink.href = "javascript:showDetails("+eventDiv.id+");"; 115 115 showDetailLink.innerHTML = '<img onmouseover="this.setAttribute(\'width\', \'15\');"'+ 116 116 'onmouseout="this.setAttribute(\'width\', \'10\');"'+ … … 128 128 lnk2.style.visibility="visible"; 129 129 } 130 } 131 function showDetails(eventId){ 132 var handler_getDetails = function (data) 133 { 134 var xtools = new XTools; 135 var divAddDialog = document.getElementById("divAddDialog"); 136 var xsl = XMLTools.load('xsl/detailsDialog.xsl?'+ Date.parse(new Date)); 137 if(!divAddDialog) { 138 divAddDialog = document.createElement("DIV"); 139 divAddDialog.id = 'divAddDialog'; 140 divAddDialog.style.zIndex = "10"; 141 divAddDialog.style.position = "absolute"; 142 divAddDialog.style.display = "none"; 143 document.body.appendChild(divAddDialog); 144 } 145 divAddDialog.style.left = "300px"; 146 divAddDialog.style.top = "200px"; 147 divAddDialog.innerHTML = xtools.parse(data, xsl); 148 divAddDialog.style.display = "block"; 149 } 150 XMLTools.__RETURN_MODE__ = 'XML'; 151 XMLTools.request('$this.uicalendar.getDetails&id='+eventId.id.substr(6), 'GET', handler_getDetails); 130 152 } 131 153 function removeButtons(eventDiv){ … … 161 183 } 162 184 163 function quickAddEvent ( description, startTime, endTime)185 function quickAddEvent (title, startTime, endTime) 164 186 { 165 187 var endDate = new Date(); … … 178 200 var eventDiv = document.createElement('DIV'); 179 201 eventDiv.id = "event_" + serverRet.substr(6,serverRet.length); 180 eventDiv.innerHTML = description;202 eventDiv.innerHTML = title; 181 203 var endDateDiv = document.createElement('DIV'); 182 204 var startDateDiv = document.createElement('DIV'); … … 191 213 192 214 } 193 XMLTools.request('$this.uicalendar.quickAdd&start='+parseInt(id2timeStamp(startTime)/1000)+'&end='+parseInt(endDate.getTime()/1000)+'& desc='+description, 'GET', handler_quickAdd);215 XMLTools.request('$this.uicalendar.quickAdd&start='+parseInt(id2timeStamp(startTime)/1000)+'&end='+parseInt(endDate.getTime()/1000)+'&title='+title, 'GET', handler_quickAdd); 194 216 } 195 217
Note: See TracChangeset
for help on using the changeset viewer.