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

fix nothing to change found, if admin-cli was called with root_admin and config-password

Browse Source
This commit is contained in:
Ralf Becker 2015-07-24 11:42:55 +00:00
parent f1ba35613c
commit 0cf1bd1452
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
admin/inc/class.admin_cmd_change_account_id.inc.php
View File

@ -5,7 +5,7 @@
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @package admin * @package admin
* @copyright (c) 2007-13 by Ralf Becker <RalfBecker-AT-outdoor-training.de> * @copyright (c) 2007-15 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$ * @version $Id$
*/ */
@ -41,8 +41,14 @@ class admin_cmd_change_account_id extends admin_cmd
*/ */
private function get_changes() private function get_changes()
{ {
$changes = array(); // happens if one used "root_admin" and config-password
foreach($GLOBALS['egw_info']['apps'] as $app => $app_data) if (empty($GLOBALS['egw_info']['apps']))
{
$apps = new applications();
$apps->read_installed_apps();
}
$changes = $setup_info = array();
foreach(array_keys($GLOBALS['egw_info']['apps']) as $app)
{ {
if (!file_exists($path=EGW_SERVER_ROOT.'/'.$app.'/setup/setup.inc.php') || !include($path)) continue; if (!file_exists($path=EGW_SERVER_ROOT.'/'.$app.'/setup/setup.inc.php') || !include($path)) continue;
@ -57,8 +63,7 @@ class admin_cmd_change_account_id extends admin_cmd
{ {
foreach((array)$data['meta'] as $key => $val) foreach((array)$data['meta'] as $key => $val)
{ {
unset($subtype); list($type, $subtype) = explode('-', $val.'-');
list($type, $subtype) = explode('-', $val);
if (in_array($type, array('account', 'user', 'group'))) if (in_array($type, array('account', 'user', 'group')))
{ {
if (!is_numeric($key) || !empty($subtype)) if (!is_numeric($key) || !empty($subtype))
@ -101,7 +106,7 @@ class admin_cmd_change_account_id extends admin_cmd
/** /**
* give or remove run rights from a given account and application * give or remove run rights from a given account and application
* *
* @param boolean $check_only=false only run the checks (and throw the exceptions), but not the command itself * @param boolean $check_only =false only run the checks (and throw the exceptions), but not the command itself
* @return string success message * @return string success message
* @throws egw_exception_no_admin * @throws egw_exception_no_admin
* @throws egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$this->account),15); * @throws egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$this->account),15);
@ -200,8 +205,6 @@ class admin_cmd_change_account_id extends admin_cmd
$update_sql .= "WHEN ".$db->quote($from,$db->column_definitions[$column]['type'])." THEN ".$db->quote($to,$db->column_definitions[$column]['type'])." "; $update_sql .= "WHEN ".$db->quote($from,$db->column_definitions[$column]['type'])." THEN ".$db->quote($to,$db->column_definitions[$column]['type'])." ";
} }
$update_sql .= 'END'; $update_sql .= 'END';
$update_sql_prefs .= 'END';
if ($update_sql_abs) $update_sql_abs .= 'END';
switch($type) switch($type)
{ {
@ -214,15 +217,15 @@ class admin_cmd_change_account_id extends admin_cmd
$change = array(); $change = array();
foreach($db->select($table,'DISTINCT '.$column,$select,__LINE__,__FILE__) as $row) foreach($db->select($table,'DISTINCT '.$column,$select,__LINE__,__FILE__) as $row)
{ {
$ids = $type != 'serialized' ? explode(',',$old_ids=$row[$column]) : unserialize($old_ids=$row[$column]); $ids = $type != 'serialized' ? explode(',',$old_ids=$row[$column]) : json_php_unserialize($old_ids=$row[$column]);
foreach($ids as $key => $id) foreach($ids as $key => $id)
{ {
if (isset($ids2change[$id])) $ids[$key] = $ids2change[$id]; if (isset($ids2change[$id])) $ids[$key] = $ids2change[$id];
} }
$ids = $type != 'serialized' ? implode(',',$ids) : serialize($ids); $ids2 = $type != 'serialized' ? implode(',',$ids) : serialize($ids);
if ($ids != $old_ids) if ($ids2 != $old_ids)
{ {
$change[$old_ids] = $ids; $change[$old_ids] = $ids2;
} }
} }
$changed = 0; $changed = 0;
@ -277,8 +280,10 @@ class admin_cmd_change_account_id extends admin_cmd
function __tostring() function __tostring()
{ {
$change = array(); $change = array();
foreach($this->change as $from => $to) $change[] = $from.'->'.$to; foreach($this->change as $from => $to)
{
$change[] = $from.'->'.$to;
}
return lang('Change account_id').': '.implode(', ',$change); return lang('Change account_id').': '.implode(', ',$change);
} }
} }