extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-31 02:21:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed a few table names, moved in mdeans improvements to the acl code and preping for 0.9.5 release

Browse Source
This commit is contained in:
seek3r 2000-11-25 08:32:59 +00:00
parent 3be46e3e1e
commit eedee9d567
7 changed files with 408 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
setup/sql/mysql_droptables.inc.php
View File

@ -16,9 +16,10 @@
$db->query("DROP TABLE accounts");
$db->query("DROP TABLE groups");
$db->query("DROP TABLE preferences");
$db->query("DROP TABLE sessions");
$db->query("DROP TABLE app_sessions");
$db->query("DROP TABLE access_log");
$db->query("DROP TABLE phpgw_sessions");
$db->query("DROP TABLE phpgw_app_sessions");
$db->query("DROP TABLE phpgw_acl");
$db->query("DROP TABLE phpgw_access_log");
$db->query("DROP TABLE profiles");
$db->query("DROP TABLE addressbook");
$db->query("DROP TABLE todo");

18
setup/sql/mysql_newtables.inc.php
View File

@ -64,7 +64,7 @@
)";
$db->query($sql);
$sql = "CREATE TABLE sessions (
$sql = "CREATE TABLE phpgw_sessions (
session_id varchar(255) NOT NULL,
session_lid varchar(255),
session_pwd varchar(255),
@ -75,16 +75,16 @@
)";
$db->query($sql);
$sql = "CREATE TABLE acl (
acl_appname varchar(50) NOT NULL,
$sql = "CREATE TABLE phpgw_acl (
acl_appname varchar(50),
acl_location varchar(255),
acl_account varchar(50),
acl_account_type varchar(15),
acl_account int,
acl_account_type char(1),
acl_rights int
)";
// $db->query($sql);
$db->query($sql);
$sql = "CREATE TABLE app_sessions (
$sql = "CREATE TABLE phpgw_app_sessions (
sessionid varchar(255) NOT NULL,
loginid varchar(20),
app varchar(20),
@ -92,7 +92,7 @@
)";
$db->query($sql);
$sql = "create table access_log (
$sql = "create table phpgw_access_log (
sessionid varchar(255),
loginid varchar(30),
ip varchar(30),
@ -298,6 +298,6 @@
)";
$db->query($sql);
$currentver = "0.9.4";
$currentver = "0.9.5";
update_version_table();
?>

56
setup/sql/mysql_upgrade_beta.inc.php
View File

@ -358,12 +358,9 @@
global $currentver, $phpgw_info, $db;
// The 0.9.4pre1 is only temp until release
//if ($currentver == "0.9.4" || ereg ("^0\.9\.5pre", $currentver)){
if ($currentver == "0.9.4" || ereg ("^0\.9\.5pre", $currentver)){
if ($currentver == "0.9.4") {
$currentver = "0.9.4pre1";
$db->query("delete from languages");
@$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('aa','Afar','No')");
@$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ab','Abkhazian','No')");
@$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('af','Afrikaans','No')");
@ -500,10 +497,55 @@
@$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('yo','Yoruba','No')");
@$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('zh','Chinese','No')");
@$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('zu','Zulu','No')");
$currentver = "0.9.5pre1";
update_version_table();
//}
}
if ($currentver == "0.9.5pre1") {
$db->query("DROP TABLE sessions");
$sql = "CREATE TABLE phpgw_sessions (
session_id varchar(255) NOT NULL,
session_lid varchar(255),
session_pwd varchar(255),
session_ip varchar(255),
session_logintime int(11),
session_dla int(11),
UNIQUE sessionid (session_id)
)";
$db->query($sql);
$db->query("DROP TABLE acl");
$sql = "CREATE TABLE phpgw_acl (
acl_appname varchar(50),
acl_location varchar(255),
acl_account int,
acl_account_type char(1),
acl_rights int
)";
$db->query($sql);
$db->query("DROP TABLE app_sessions");
$sql = "CREATE TABLE phpgw_app_sessions (
sessionid varchar(255) NOT NULL,
loginid varchar(20),
app varchar(20),
content text
)";
$db->query($sql);
$db->query("DROP TABLE access_log");
$sql = "create table phpgw_access_log (
sessionid varchar(255),
loginid varchar(30),
ip varchar(30),
li int,
lo varchar(255)
)";
$db->query($sql);
$currentver = "0.9.5pre2";
update_version_table();
}
echo " <tr bgcolor=\"e6e6e6\">\n";
echo " <td>Upgrade from 0.9.4 to $currentver is completed.</td>\n";
echo " </tr>\n";

7
setup/sql/pgsql_droptables.inc.php
View File

@ -18,9 +18,10 @@
$db->query("drop sequence groups_group_id_seq");
$db->query("DROP TABLE groups");
$db->query("DROP TABLE preferences");
$db->query("DROP TABLE sessions");
$db->query("DROP TABLE app_sessions");
$db->query("DROP TABLE access_log");
$db->query("DROP TABLE phpgw_sessions");
$db->query("DROP TABLE phpgw_app_sessions");
$db->query("DROP TABLE phpgw_acl");
$db->query("DROP TABLE phpgw_access_log");
$db->query("drop sequence profiles_con_seq");
$db->query("DROP TABLE profiles");
$db->query("drop sequence addressbook_ab_id_seq");

31
setup/sql/pgsql_newtables.inc.php
View File

@ -54,7 +54,7 @@
)";
$db->query($sql);
$sql = "create table sessions (
$sql = "create table phpgw_sessions (
session_id varchar(255),
session_lid varchar(255),
session_pwd varchar(255),
@ -65,7 +65,16 @@
)";
$db->query($sql);
$sql = "CREATE TABLE app_sessions (
$sql = "CREATE TABLE phpgw_acl (
acl_appname varchar(50),
acl_location varchar(255),
acl_account int,
acl_account_type char(1),
acl_rights int
)";
$db->query($sql);
$sql = "CREATE TABLE phpgw_app_sessions (
sessionid varchar(255) NOT NULL,
loginid varchar(20),
app varchar(20),
@ -73,6 +82,15 @@
)";
$db->query($sql);
$sql = "create table phpgw_access_log (
sessionid varchar(255),
loginid varchar(30),
ip varchar(30),
li int,
lo varchar(255)
)";
$db->query($sql);
$sql = "create table preferences (
preference_owner varchar(20),
preference_name varchar(50),
@ -81,15 +99,6 @@
)";
$db->query($sql);
$sql = "create table access_log (
sessionid varchar(255),
loginid varchar(30),
ip varchar(30),
li int,
lo varchar(255)
)";
$db->query($sql);
$sql = "CREATE TABLE profiles (
con serial,
owner varchar(20),

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

@ -367,10 +367,9 @@
global $currentver, $phpgw_info, $db;
// The 0.9.4pre1 is only temp until release
// if ($currentver == "0.9.4" || ereg ("^0\.9\.5pre", $currentver)){
if ($currentver == "0.9.4" || ereg ("^0\.9\.5pre", $currentver)){
if ($currentver == "0.9.4") {
$db->query("delete from languages");
@$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('aa','Afar','No')");
@$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('ab','Abkhazian','No')");
@$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('af','Afrikaans','No')");
@ -508,10 +507,55 @@
@$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('zh','Chinese','No')");
@$db->query("INSERT INTO languages (lang_id, lang_name, available) values ('zu','Zulu','No')");
$currentver = "0.9.4pre1";
$currentver = "0.9.5pre1";
update_version_table();
// }
}
if ($currentver == "0.9.5pre1") {
$db->query("DROP TABLE sessions");
$sql = "create table phpgw_sessions (
session_id varchar(255),
session_lid varchar(255),
session_pwd varchar(255),
session_ip varchar(255),
session_logintime int,
session_dla int,
unique(session_id)
)";
$db->query($sql);
$db->query("DROP TABLE acl");
$sql = "CREATE TABLE phpgw_acl (
acl_appname varchar(50),
acl_location varchar(255),
acl_account int,
acl_account_type char(1),
acl_rights int
)";
$db->query($sql);
$db->query("DROP TABLE app_sessions");
$sql = "CREATE TABLE phpgw_app_sessions (
sessionid varchar(255) NOT NULL,
loginid varchar(20),
app varchar(20),
content text
)";
$db->query($sql);
$db->query("DROP TABLE access_log");
$sql = "create table phpgw_access_log (
sessionid varchar(255),
loginid varchar(30),
ip varchar(30),
li int,
lo varchar(255)
)";
$db->query($sql);
$currentver = "0.9.5pre2";
update_version_table();
}
echo " <tr bgcolor=\"e6e6e6\">\n";
echo " <td>Upgrade from 0.9.4 to $currentver is completed.</td>\n";
echo " </tr>\n";

2
version.inc.php
View File

@ -11,5 +11,5 @@
/* $Id$ */
$phpgw_info["server"]["version"] = "0.9.4pre1";
$phpgw_info["server"]["version"] = "0.9.5pre2";
?>