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

fixed wrong/positive group-id's in egw_vfs table (filemanger group-dirs were not working)

Browse Source
This commit is contained in:
Ralf Becker 2005-11-30 13:11:16 +00:00
parent 748eb58148
commit c6369e017e
2 changed files with 68 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/setup/setup.inc.php
View File

@ -14,7 +14,7 @@
/* Basic information about this app */ /* Basic information about this app */
$setup_info['phpgwapi']['name'] = 'phpgwapi'; $setup_info['phpgwapi']['name'] = 'phpgwapi';
$setup_info['phpgwapi']['title'] = 'eGroupWare API'; $setup_info['phpgwapi']['title'] = 'eGroupWare API';
$setup_info['phpgwapi']['version'] = '1.2'; $setup_info['phpgwapi']['version'] = '1.2.001';
$setup_info['phpgwapi']['versions']['current_header'] = '1.28'; $setup_info['phpgwapi']['versions']['current_header'] = '1.28';
$setup_info['phpgwapi']['enable'] = 3; $setup_info['phpgwapi']['enable'] = 3;
$setup_info['phpgwapi']['app_order'] = 1; $setup_info['phpgwapi']['app_order'] = 1;

69
phpgwapi/setup/tables_update.inc.php
View File

@ -951,6 +951,8 @@
array('egw_cal_user','cal_user_id',"cal_user_type='u'"), array('egw_cal_user','cal_user_id',"cal_user_type='u'"),
array('egw_wiki_pages','wiki_readable',true), array('egw_wiki_pages','wiki_readable',true),
array('egw_wiki_pages','wiki_writable',true), array('egw_wiki_pages','wiki_writable',true),
array('egw_vfs','vfs_owner_id'),
array('egw_vfs','vfs_createdby_id'),
) as $data) ) as $data)
{ {
$where = false; $where = false;
@ -977,6 +979,69 @@
//echo "<p>$query</p>\n"; //echo "<p>$query</p>\n";
$GLOBALS['egw_setup']->db->query($query,__LINE__,__FILE__); $GLOBALS['egw_setup']->db->query($query,__LINE__,__FILE__);
} }
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.2'; return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.2.001';
} }
?>
$test[] = '1.2';
function phpgwapi_upgrade1_2()
{
// groupid's in egw_vfs.{owner|createdby}_id were not converted
$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table,'config_value',array(
'config_name' => 'account_repository',
'config_app' => 'phpgwapi',
),__LINE__,__FILE__);
if($GLOBALS['egw_setup']->db->next_record() && $GLOBALS['egw_setup']->db->f('config_value') == 'ldap')
{
$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->acl_table,'DISTINCT acl_location',array(
'acl_appname' => 'phpgw_group',
),__LINE__,__FILE__);
}
else
{
$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->accounts_table,'account_id',array(
'account_type' => 'g',
),__LINE__,__FILE__);
}
$groupIDs = array();
while($GLOBALS['egw_setup']->db->next_record())
{
$groupIDs[] = abs($GLOBALS['egw_setup']->db->f(0));
}
$tables = array();
foreach($GLOBALS['egw_setup']->db->table_names() as $data)
{
$tables[] = $data['table_name'];
}
foreach(array(
array('egw_vfs','vfs_owner_id'),
array('egw_vfs','vfs_createdby_id'),
) as $data)
{
$where = false;
list($table,$col,$where) = $data;
if (!in_array($table,$tables)) continue; // app is not installed
if ($col == 'acl_location') // varchar not int!
{
$set = $col.'='.$GLOBALS['egw_setup']->db->concat("'-'",$col);
$in = "$col IN ('".implode("','",$groupIDs)."')";
}
else
{
$set = "$col=-$col";
$in = "$col IN (".implode(',',$groupIDs).')';
}
if ($where === true)
{
$in = '';
$where = '1=1';
}
$query = "UPDATE $table SET $set WHERE $in".($in && $where ? ' AND ' : '').$where;
//echo "<p>$query</p>\n";
$GLOBALS['egw_setup']->db->query($query,__LINE__,__FILE__);
}
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.2.001';
}