holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed extraneous }

Browse Source
This commit is contained in:
skeeter 2000-12-09 00:58:30 +00:00
parent 7647221d96
commit 6720b21d68
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/CHANGELOG
View File

@ -14,6 +14,7 @@
- Added select box option for multiable domains in login.php
- Fixed proxy server support for headlines and check for new version on main screen.
- Fixed headlines preferences and converted headline preferences to a template
- Fixed pgsql upgrade from beta path.
[0.9.7] - Fixed SQL error in tts
- Fixed table locking in admin -> edit account

33
setup/sql/pgsql_upgrade_beta.inc.php
View File

@ -704,23 +704,22 @@
cal_description text)";
$db->query($sql,__LINE__,__FILE__);
$db->query("SELECT cal_id,cal_owner,cal_group,cal_datetime,cal_mdatetime,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description FROM TEMP ORDER BY cal_id",__LINE__,__FILE__);
while($db->next_record()) {
$db2->query("SELECT preference_value FROM preferences WHERE preference_name='tz_offset' AND preference_appname='common' AND preference_owner=".$db->f("cal_owner"),__LINE__,__FILE__);
$db2->next_record();
$tz = $db2->f("preference_value");
$cal_id = $db->f("cal_id");
$cal_owner = $db->f("cal_owner");
$cal_group = $db->f("cal_group");
$cal_datetime = $db->f("cal_datetime") - ((60 * 60) * $tz);
$cal_mdatetime = $db->f("cal_mdatetime") - ((60 * 60) * $tz);
$cal_edatetime = $cal_datetime + (60 * $db->f("cal_duration"));
$cal_priority = $db->f("cal_priority");
$cal_type = $db->f("cal_type");
$cal_access = $db->f("cal_access");
$cal_name = $db->f("cal_name");
$cal_description = $db->f("cal_description");
$db2->query("INSERT INTO calendar_entry(cal_id,cal_owner,cal_group,cal_datetime,cal_mdatetime,cal_edatetime,cal_priority,cal_type,cal_access,cal_name,cal_description) VALUES(".$cal_id.",".$cal_owner.",'".$cal_group."',".cal_datetime.",".$cal_mdatetime.",".$cal_edatetime.",".$cal_priority.",'".$cal_type."','".$cal_access."','".$cal_name."','".$cal_description."')",__LINE__,__FILE__);
}
while($db->next_record()) {
$db2->query("SELECT preference_value FROM preferences WHERE preference_name='tz_offset' AND preference_appname='common' AND preference_owner=".$db->f("cal_owner"),__LINE__,__FILE__);
$db2->next_record();
$tz = $db2->f("preference_value");
$cal_id = $db->f("cal_id");
$cal_owner = $db->f("cal_owner");
$cal_group = $db->f("cal_group");
$cal_datetime = $db->f("cal_datetime") - ((60 * 60) * $tz);
$cal_mdatetime = $db->f("cal_mdatetime") - ((60 * 60) * $tz);
$cal_edatetime = $cal_datetime + (60 * $db->f("cal_duration"));
$cal_priority = $db->f("cal_priority");
$cal_type = $db->f("cal_type");
$cal_access = $db->f("cal_access");
$cal_name = $db->f("cal_name");
$cal_description = $db->f("cal_description");
$db2->query("INSERT INTO calendar_entry(cal_id,cal_owner,cal_group,cal_datetime,cal_mdatetime,cal_edatetime,cal_priority,cal_type,cal_access,cal_name,cal_description) VALUES(".$cal_id.",".$cal_owner.",'".$cal_group."',".cal_datetime.",".$cal_mdatetime.",".$cal_edatetime.",".$cal_priority.",'".$cal_type."','".$cal_access."','".$cal_name."','".$cal_description."')",__LINE__,__FILE__);
}
$sql = "DROP TABLE TEMP";
$db->query($sql,__LINE__,__FILE__);