mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 16:48:49 +01:00
Remove acl_account_type from phpgw_acl
This commit is contained in:
parent
df34d8c2ba
commit
f9ddd1ef43
@ -68,7 +68,6 @@
|
||||
acl_appname varchar(50),
|
||||
acl_location varchar(255),
|
||||
acl_account int,
|
||||
acl_account_type char(1),
|
||||
acl_rights int
|
||||
)";
|
||||
$phpgw_setup->db->query($sql);
|
||||
@ -292,7 +291,7 @@
|
||||
);";
|
||||
$phpgw_setup->db->query($sql);
|
||||
|
||||
$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.10pre10';
|
||||
$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.10pre11';
|
||||
$phpgw_info['setup']['oldver']['phpgwapi'] = $phpgw_info['setup']['currentver']['phpgwapi'];
|
||||
update_version_table();
|
||||
// $phpgw_setup->update_version_table();
|
||||
|
@ -1000,6 +1000,15 @@
|
||||
$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.10pre10';
|
||||
}
|
||||
|
||||
$test[] = '0.9.10pre10';
|
||||
function upgrade0_9_10pre10()
|
||||
{
|
||||
global $phpgw_info, $phpgw_setup;
|
||||
|
||||
$phpgw_setup->db->query("alter table phpgw_acl drop column acl_account_type",__LINE__,__FILE__);
|
||||
|
||||
$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.10pre11';
|
||||
}
|
||||
|
||||
reset ($test);
|
||||
while (list ($key, $value) = each ($test)){
|
||||
|
@ -67,7 +67,6 @@
|
||||
acl_appname varchar(50),
|
||||
acl_location varchar(255),
|
||||
acl_account int,
|
||||
acl_account_type char(1),
|
||||
acl_rights int
|
||||
)";
|
||||
$phpgw_setup->db->query($sql);
|
||||
|
@ -1065,6 +1065,28 @@
|
||||
$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.10pre10';
|
||||
}
|
||||
|
||||
$test[] = '0.9.10pre10';
|
||||
function upgrade0_9_10pre10()
|
||||
{
|
||||
global $phpgw_info, $phpgw_setup;
|
||||
|
||||
$phpgw_setup->db->query("create table phpgw_temp as select acl_appname,acl_location,acl_account,"
|
||||
. "acl_right from phpgw_acl",__LINE__,__FILE__);
|
||||
|
||||
$sql = "CREATE TABLE phpgw_acl (
|
||||
acl_appname varchar(50),
|
||||
acl_location varchar(255),
|
||||
acl_account int,
|
||||
acl_rights int
|
||||
)";
|
||||
$phpgw_setup->db->query($sql);
|
||||
|
||||
$phpgw_setup->db->query("insert into phpgw_acl select * from phpgw_temp",__LINE__,__FILE__);
|
||||
$phpgw_setup->db->query("drop table phpgw_temp",__LINE__,__FILE__);
|
||||
|
||||
$phpgw_info['setup']['currentver']['phpgwapi'] = '0.9.10pre11';
|
||||
}
|
||||
|
||||
reset ($test);
|
||||
while (list ($key, $value) = each ($test)){
|
||||
if ($phpgw_info["setup"]["currentver"]["phpgwapi"] == $value) {
|
||||
|
@ -11,5 +11,5 @@
|
||||
|
||||
/* $Id$ */
|
||||
|
||||
$phpgw_info["server"]["versions"]["phpgwapi"] = "0.9.10pre10";
|
||||
$phpgw_info["server"]["versions"]["phpgwapi"] = "0.9.10pre11";
|
||||
$phpgw_info["server"]["versions"]["current_header"] = "1.11";
|
||||
|
Loading…
Reference in New Issue
Block a user