mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-09 23:48:28 +01:00
fixed prob with not changeable pw's, setup::add_acl created acl_rights=0 rows, instead of no rows
This commit is contained in:
parent
2898b043c9
commit
b4970a5f65
@ -1003,9 +1003,16 @@
|
|||||||
$apps = array($apps);
|
$apps = array($apps);
|
||||||
}
|
}
|
||||||
foreach($apps as $app)
|
foreach($apps as $app)
|
||||||
|
{
|
||||||
|
if ($rights)
|
||||||
{
|
{
|
||||||
$this->db->query("INSERT INTO phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) VALUES('$app','$location',$account,$rights)");
|
$this->db->query("INSERT INTO phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) VALUES('$app','$location',$account,$rights)");
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$this->db->query("DELETE FROM phpgw_acl WHERE acl_appname='$app' AND acl_location='$location' AND acl_account=$account");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
@ -10,12 +10,11 @@
|
|||||||
\**************************************************************************/
|
\**************************************************************************/
|
||||||
|
|
||||||
// $Id$
|
// $Id$
|
||||||
// $Source$
|
|
||||||
|
|
||||||
/* Basic information about this app */
|
/* Basic information about this app */
|
||||||
$setup_info['phpgwapi']['name'] = 'phpgwapi';
|
$setup_info['phpgwapi']['name'] = 'phpgwapi';
|
||||||
$setup_info['phpgwapi']['title'] = 'phpgwapi';
|
$setup_info['phpgwapi']['title'] = 'phpgwapi';
|
||||||
$setup_info['phpgwapi']['version'] = '0.9.99.013';
|
$setup_info['phpgwapi']['version'] = '0.9.99.014';
|
||||||
$setup_info['phpgwapi']['versions']['current_header'] = '1.26';
|
$setup_info['phpgwapi']['versions']['current_header'] = '1.26';
|
||||||
$setup_info['phpgwapi']['enable'] = 3;
|
$setup_info['phpgwapi']['enable'] = 3;
|
||||||
$setup_info['phpgwapi']['app_order'] = 1;
|
$setup_info['phpgwapi']['app_order'] = 1;
|
||||||
|
@ -1017,4 +1017,14 @@
|
|||||||
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.99.013';
|
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.99.013';
|
||||||
return $GLOBALS['setup_info']['phpgwapi']['currentver'];
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'];
|
||||||
}
|
}
|
||||||
?>
|
|
||||||
|
$test[] = '0.9.99.013';
|
||||||
|
function phpgwapi_upgrade0_9_99_013()
|
||||||
|
{
|
||||||
|
// this update fixes the problem that some users cant change their password
|
||||||
|
// it was caused be 0 acl_rights values in groups (inserted by setup::add_acl which is fixed too)
|
||||||
|
$GLOBALS['phpgw_setup']->oProc->query("DELETE FROM phpgw_acl WHERE acl_appname='preferences' AND acl_location='changepassword' AND acl_rights=0");
|
||||||
|
|
||||||
|
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.99.014';
|
||||||
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'];
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user